Find OpenSSL on Windows

2025-12-21 23:00:24 -08:00 · 2023-01-11 18:58:02 -05:00
786 changed files with 58785 additions and 116520 deletions
--- a/.ci/ArchLinux/Dockerfile
+++ b/.ci/ArchLinux/Dockerfile
@@ -9,7 +9,6 @@ RUN pacman --sync --refresh --sysupgrade --needed --noconfirm \
        mariadb-libs \
        protobuf \
        qt6-base \
-        qt6-imageformats \
        qt6-multimedia \
        qt6-svg \
        qt6-tools \
--- a/.ci/Debian10/Dockerfile
+++ b/.ci/Debian10/Dockerfile
@@ -0,0 +1,25 @@
+FROM debian:10
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        build-essential \
+        ccache \
+        clang-format \
+        cmake \
+        file \
+        g++ \
+        git \
+        liblzma-dev \
+        libmariadb-dev-compat \
+        libprotobuf-dev \
+        libqt5multimedia5-plugins \
+        libqt5sql5-mysql \
+        libqt5svg5-dev \
+        libqt5websockets5-dev \
+        protobuf-compiler \
+        qt5-default \
+        qtbase5-dev \
+        qtmultimedia5-dev \
+        qttools5-dev \
+        qttools5-dev-tools \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
--- a/.ci/Debian11/Dockerfile
+++ b/.ci/Debian11/Dockerfile
@@ -17,7 +17,6 @@ RUN apt-get update && \
        libqt5svg5-dev \
        libqt5websockets5-dev \
        protobuf-compiler \
-        qt5-image-formats-plugins \
        qtmultimedia5-dev \
        qttools5-dev \
        qttools5-dev-tools \
--- a/.ci/Debian12/Dockerfile
+++ b/.ci/Debian12/Dockerfile
@@ -1,27 +0,0 @@
-FROM debian:12
-
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-        build-essential \
-        ccache \
-        clang-format \
-        cmake \
-        file \
-        g++ \
-        git \
-        libgl-dev \
-        liblzma-dev \
-        libmariadb-dev-compat \
-        libprotobuf-dev \
-        libqt6multimedia6 \
-        libqt6sql6-mysql \
-        qt6-svg-dev \
-        qt6-websockets-dev \
-        protobuf-compiler \
-        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/*
--- a/.ci/Fedora35/Dockerfile
+++ b/.ci/Fedora35/Dockerfile
@@ -0,0 +1,21 @@
+FROM fedora:35
+
+RUN dnf install -y \
+        @development-tools \
+        ccache \
+        cmake \
+        desktop-file-utils \
+        file \
+        gcc-c++ \
+        git \
+        hicolor-icon-theme \
+        libappstream-glib \
+        mariadb-devel \
+        protobuf-devel \
+        qt5-{qttools,qtsvg,qtmultimedia,qtwebsockets}-devel \
+        rpm-build \
+        sqlite-devel \
+        wget \
+        xz-devel \
+        zlib-devel \
+    && dnf clean all
--- a/.ci/Fedora36/Dockerfile
+++ b/.ci/Fedora36/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:40
+FROM fedora:36

 RUN dnf install -y \
        ccache \
@@ -8,7 +8,6 @@ RUN dnf install -y \
        mariadb-devel \
        protobuf-devel \
        qt6-{qttools,qtsvg,qtmultimedia,qtwebsockets}-devel \
-        qt6-qtimageformats \
        rpm-build \
        xz-devel \
        zlib-devel \
--- a/.ci/Fedora41/Dockerfile
+++ b/.ci/Fedora41/Dockerfile
@@ -1,15 +0,0 @@
-FROM fedora:41
-
-RUN dnf install -y \
-        ccache \
-        cmake \
-        gcc-c++ \
-        git \
-        mariadb-devel \
-        protobuf-devel \
-        qt6-{qttools,qtsvg,qtmultimedia,qtwebsockets}-devel \
-        qt6-qtimageformats \
-        rpm-build \
-        xz-devel \
-        zlib-devel \
-    && dnf clean all
--- a/.ci/Ubuntu24.04/Dockerfile
+++ b/.ci/Ubuntu24.04/Dockerfile
@@ -1,27 +0,0 @@
-FROM ubuntu:24.04
-
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-        build-essential \
-        ccache \
-        clang-format \
-        cmake \
-        file \
-        g++ \
-        git \
-        libgl-dev \
-        liblzma-dev \
-        libmariadb-dev-compat \
-        libprotobuf-dev \
-        libqt6multimedia6 \
-        libqt6sql6-mysql \
-        qt6-svg-dev \
-        qt6-websockets-dev \
-        protobuf-compiler \
-        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/*
--- a/.ci/UbuntuBionic/Dockerfile
+++ b/.ci/UbuntuBionic/Dockerfile
@@ -0,0 +1,24 @@
+FROM ubuntu:bionic
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        build-essential \
+        ccache \
+        clang-format \
+        cmake \
+        file \
+        g++ \
+        git \
+        liblzma-dev \
+        libmariadb-dev-compat \
+        libprotobuf-dev \
+        libqt5multimedia5-plugins \
+        libqt5sql5-mysql \
+        libqt5svg5-dev \
+        libqt5websockets5-dev \
+        protobuf-compiler \
+        qt5-default \
+        qtmultimedia5-dev \
+        qttools5-dev \
+        qttools5-dev-tools \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
--- a/.ci/UbuntuFocal/Dockerfile
+++ b/.ci/UbuntuFocal/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:focal

 RUN apt-get update && \
    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -18,7 +18,6 @@ RUN apt-get update && \
        libqt5websockets5-dev \
        protobuf-compiler \
        qt5-default \
-        qt5-image-formats-plugins \
        qtmultimedia5-dev \
        qttools5-dev \
        qttools5-dev-tools \
--- a/.ci/UbuntuJammy/Dockerfile
+++ b/.ci/UbuntuJammy/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:jammy

 RUN apt-get update && \
    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -18,7 +18,6 @@ RUN apt-get update && \
        libqt6svg6-dev \
        libqt6websockets6-dev \
        protobuf-compiler \
-        qt6-image-formats-plugins \
        qt6-l10n-tools \
        qt6-multimedia-dev \
        qt6-tools-dev \
--- a/.ci/compile.sh
+++ b/.ci/compile.sh
@@ -127,7 +127,7 @@ fi
 # Add cmake --build flags
 buildflags=(--config "$BUILDTYPE")
 if [[ $PARALLEL_COUNT ]]; then
-  if [[ $(cmake --build /not_a_dir --parallel 2>&1 | head -1) =~ parallel ]]; then
+  if [[ $(cmake --build /not_a_dir --parallel |& head -1) =~ parallel ]]; then
    # workaround for bionic having an old cmake
    echo "this version of cmake does not support --parallel, using native build tool -j instead"
    buildflags+=(-- -j "$PARALLEL_COUNT")
@@ -160,13 +160,7 @@ cmake .. "${flags[@]}"
 echo "::endgroup::"

 echo "::group::Build project"
-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
+cmake --build . "${buildflags[@]}"
 echo "::endgroup::"

 if [[ $USE_CCACHE ]]; then
@@ -177,7 +171,7 @@ fi

 if [[ $MAKE_TEST ]]; then
  echo "::group::Run tests"
-  ctest -C "$BUILDTYPE" --output-on-failure
+  ctest -C "$BUILDTYPE"
  echo "::endgroup::"
 fi

@@ -189,12 +183,6 @@ 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::"

--- a/.ci/macos.entitlements
+++ b/.ci/macos.entitlements
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>com.apple.security.app-sandbox</key>
-    <false/>
-
-    <key>com.apple.security.cs.disable-library-validation</key>
-    <true/>
-
-    <key>com.apple.security.cs.disable-executable-page-protection</key>
-    <true/>
-
-    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-    <true/>
-</dict>
-</plist>
--- a/.ci/release_template.md
+++ b/.ci/release_template.md
@@ -4,24 +4,25 @@
 git push -d origin --REPLACE-WITH-BETA-LIST--
 -->

-<!-- This list of binaries should be updated every time the CI is changed to
+<!-- This list of binaries should be updated every time the ci is changed to
 include different targets -->
 <pre>
 <b>Pre-compiled binaries we serve:</b>
- - <kbd>Windows 10+</kbd>
- - <kbd>Windows 7+</kbd>
- - <kbd>macOS 14+</kbd> ("Sonoma") / Apple M
- - <kbd>macOS 13+</kbd> ("Ventura") / Intel
- - <kbd>Ubuntu 24.04 LTS</kbd> ("Noble Numbat")
- - <kbd>Ubuntu 22.04 LTS</kbd> ("Jammy Jellyfish")
- - <kbd>Ubuntu 20.04 LTS</kbd> ("Focal Fossa")
- - <kbd>Debian 12</kbd> ("Bookworm")
+ - <kbd>Windows 7/8/10/11 (32-bit)</kbd>
+ - <kbd>Windows 7/8 (64-bit)</kbd>
+ - <kbd>Windows 10/11 (64-bit)</kbd>
+ - <kbd>macOS 10.14</kbd> ("Mojave")
+ - <kbd>macOS 10.15</kbd> ("Catalina")
+ - <kbd>macOS 11.0+</kbd> ("Big Sur")
+ - <kbd>Ubuntu 18.04</kbd> ("Bionic Beaver")
+ - <kbd>Ubuntu 20.04</kbd> ("Focal Fossa")
+ - <kbd>Ubuntu 22.04</kbd> ("Jammy Jellyfish")
+ - <kbd>Debian 10</kbd> ("Buster")
 - <kbd>Debian 11</kbd> ("Bullseye")
- - <kbd>Fedora 41</kbd>
- - <kbd>Fedora 40</kbd>
- 
-<i>We are also packaged in <kbd>Arch Linux</kbd>'s official "extra" repository, courtesy of @FFY00</i>
-<i>General Linux support is available via a <kbd>flatpak</kbd> package (Flathub)</i>
+ - <kbd>Fedora 35</kbd>
+ - <kbd>Fedora 36</kbd>
+<kbd>We are also packaged in Arch Linux's official community repository, courtesy of @FFY00</kbd></i>
+<kbd>General linux support is available via a flatpak package (Flathub)</kbd></i>
 </pre>


@@ -29,24 +30,22 @@ include different targets -->

 We're pleased to announce the newest official release: <kbd>--REPLACE-WITH-RELEASE-TITLE--</kbd>

-We hope you enjoy the changes made! All improvements with their corresponding tickets since the last version of Cockatrice are listed in the changelog below.
+We hope you enjoy the changes made and we have listed all changes, with their corresponding tickets, since the last version of Cockatrice was released for your convenience.

-If you ever encounter a bug, have a suggestion or idea, or feel a need for a developer to look into something, please feel free to [open a ticket](https://github.com/Cockatrice/Cockatrice/issues). ([How to create a Ticket for Cockatrice](https://github.com/Cockatrice/Cockatrice/wiki/How-to-Create-a-GitHub-Ticket-Regarding-Cockatrice))
+If you ever encounter a bug, have a suggestion or idea, or feel a need for a developer to look into something, please feel free to [open a ticket](https://github.com/Cockatrice/Cockatrice/issues). ([How to create a GitHub Ticket for Cockatrice](https://github.com/Cockatrice/Cockatrice/wiki/How-to-Create-a-GitHub-Ticket-Regarding-Cockatrice))

-For basic information related to the app and getting started, please take a look at our official site: **https://cockatrice.github.io**
+For any information relating to Cockatrice, please take a look at our official site: **https://cockatrice.github.io**

-If you'd like to help and contribute to Cockatrice in any way, check out our [README](https://github.com/Cockatrice/Cockatrice#get-involved-).  
-We're always available to answer questions you may have on how the program works and how you can provide a meaningful contribution.
+If you'd like to help contribute to Cockatrice in any way, check out our [README](https://github.com/Cockatrice/Cockatrice#get-involved-). We're always available to answer questions you may have on how the program works and how you can provide a meaningful contribution.


 ## Upgrading Cockatrice
 <!-- this optional section puts a warning banner for problems with updating
-> [!IMPORTANT]  
-> **With this release, we no longer provide a ready-to-install binary for:**  
+> ⚠️ **With this release, we no longer provide a ready-to-install binary for:**
 > --DEPRECATED-OS-HERE--
 -->

-Run the internal software updater: <kbd>Help → Check for Client Updates</kbd>
+- Run the internal software updater: <kbd>Help → Check for Client Updates</kbd>

 Don't forget to update your card database right after! (<kbd>Help → Check for Card Updates...</kbd>)

@@ -63,14 +62,14 @@ Remove empty headers when done.
 -->

 <!-- Highlights of the release -->
-### 🔖 Highlights:
+### ⚠️ Important:
 ### ✨ New Features:
-### 🐛 Fixed Bugs / Resolved Issues:
+### 🐛 Fixed Bugs / Resolved issues:

 <!-- Complete list of changes (foldable) -->
 <details>
 <summary>
-<b>Show all changes</b> (--REPLACE-WITH-COMMIT-COUNT-- commits)
+📘 <b>Show all changes</b> (--REPLACE-WITH-COMMIT-COUNT-- commits)
 </summary>

 ### User Interface
@@ -91,6 +90,5 @@ Remove empty headers when done.

 ## Special Thanks
 <!-- Personalise this a bit! -->
-It's amazing that so many people contribute their time, knowledge, code, testing and more to the project.  
-We'd like to thank the entire Cockatrice community for their efforts! 🙏
+We continue to find it amazing that so many people contribute their time, knowledge, code, testing and more to the project. We'd like to thank the entire Cockatrice community for their efforts.
 <!-- We'd like to especially recognize @ZeldaZach, --ADD-CONTRIBUTORS-HERE-- for their help in preparing so many amazing new features for the user base. -->
--- a/.ci/update_translation_source_strings.sh
+++ b/.ci/update_translation_source_strings.sh
@@ -1,58 +0,0 @@
-#!/bin/bash
-
-# ci script to update translation files
-# usage:
-# $0 cockatrice/cockatrice_en@source.ts cockatrice/src common
-# or
-# FILE="cockatrice/cockatrice_en@source.ts"
-# DIRS="cockatrice/src common"
-# $0
-# note: directories can't contain spaces
-
-# check parameters
-if [[ ! $FILE ]]; then
-  FILE="$1"
-  shift
-fi
-if [[ ! $FILE ]]; then
-  echo "no output file selected" >&2
-  exit 2;
-fi
-if [[ ! $DIRS ]]; then
-  DIRS="$*"
-fi
-if [[ ! $DIRS ]]; then
-  echo "no source directories selected to translate" >&2
-  exit 2;
-fi
-if [[ ! -e $FILE ]]; then
-  echo "output file does not exist at: $FILE" >&2
-  exit 3;
-fi
-
-# print version
-if ! lupdate -version; then
-  echo "failed to run lupdate" >&2
-  exit 4;
-fi
-
-# run lupdate, duplicating the output in stderr and saving it
-# for convenience we ignore that $DIRS will be split on spaces 
-# shellcheck disable=SC2086
-if ! got="$(lupdate $DIRS -ts "$FILE" | tee /dev/stderr)"; then
-  echo "failed to update $FILE with $DIRS" >&2
-  exit 4;
-fi
-
-# trim output
-# the line we are interested in is:
-# Found xxx source text(s) (x new and xxx already existing)
-output="${got##* source text(s) (}" # get stuff in between brackets
-output="${output%%)*}" # trim everything after first )
-if [[ $output == "$got" ]]; then
-  echo "could not parse generated output" >&2
-  exit 4;
-fi
-
-# write output to ci environment file
-echo "output=$output" >> "$GITHUB_OUTPUT"
--- a/.ci/update_translation_source_strings_template.md
+++ b/.ci/update_translation_source_strings_template.md
@@ -1,14 +0,0 @@
-Updated source strings for translations:
- {{ .cockatrice_output }} (Cockatrice)
- {{ .oracle_output }} (Oracle)
-
-<br>
-
-Last changes are based on commit {{ .commit }}.
-
---
-*This PR is automatically generated and updated by the workflow at `.github/workflows/translations-push.yml`. Review [action runs][2].*<br>
-*After merging, all changes to the source language are available for translation at [Transifex][1] shortly.*
-
-[1]: https://app.transifex.com/cockatrice/cockatrice/
-[2]: https://github.com/Cockatrice/Cockatrice/actions/workflows/translations-push.yml?query=branch%3Amaster
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -290,21 +290,20 @@ be included in the next release 👍

 Basic workflow for translations:
 1. Developer adds a `tr("foo")` string in the code;
- 2. CI updates the `*_en@source.ts files` regularly and creates a PR automatically;
- 3. Maintainer verifies and merges the change;
- 4. Transifex picks up the new files from GitHub automatically;
- 5. Translators translate the new untranslated strings on Transifex;
- 6. Before a release, a maintainer fetches the updated translations from Transifex.
+ 2. Every few days, a maintainer updates the `*_en@source.ts files` with the new strings;
+ 3. Transifex picks up the new files from GitHub every 24 hours;
+ 4. Translators translate the new untranslated strings on Transifex;
+ 5. Before a release, a maintainer fetches the updated translations from Transifex.

 ### Using Translations (for developers) ###

-All user interface strings inside Cockatrice's source code must be written
-in English (US).
+All the user-interface strings inside Cockatrice's source code must be written
+in English(US).
 Translations to other languages are managed using [Transifex](
 https://www.transifex.com/projects/p/cockatrice/).

 Adding a new string to translate is as easy as adding the string in the
-`tr("")` function, the string will be picked up as translatable automatically
+'tr("")' function, the string will be picked up as translatable automatically
 and translated as needed.
 For example, setting the text of a label in the way that the string
 `"My name is:"` can be translated:
@@ -313,7 +312,7 @@ nameLabel.setText(tr("My name is:"));
 ```

 To translate a string that would have plural forms you can add the amount to
-the tr() call, also you can add an extra string as a hint for translators:
+the tr call, also you can add an extra string as a hint for translators:
 ```c++
 QString message = tr("Everyone draws %n cards", "pop up message", amount);
 ```
@@ -322,46 +321,20 @@ https://doc.qt.io/qt-5/i18n-source-translation.html#handling-plurals)

 If you're about to propose a change that adds or modifies any translatable
 string in the code, you don't need to take care of adding the new strings to
-the translation files.<br>
-We have an automated process to update our language source files on a schedule
-and provide the translators on Transifex with the new contents.<br>
-Maintainers can also manually trigger this on demand.
+the translation files.
+Every few days, or when a lot of new strings have been added, someone from the
+development team will take care of extracting all the new strings and adding
+them to the english translation files and making them available to translators
+on Transifex.

 ### Maintaining Translations (for maintainers) ###

-When new translatable strings have been added to the code, a maintainer has to
-make them available to translators on Transifex.
+When new translatable strings have been added to the code, a maintainer should
+make them available to translators on Transifex. Every few days, or when a lot
+of new strings have been added, a maintainer should take care of extracting all
+the new strings and add them to the english translation files.

-To help with that, we have an automated CI workflow, that regularly looks at the
-code in the master branch, extracts all strings and updates dedicated source string
-files with any changes. These updates are not commited right away, the CI creates a
-PR for reviewing instead.<br>
-After approval, our translation tool automatically picks the changes up and deploys
-them to our translators. Be mindful when merging only a few changes!
-
-Once a release is planned, or when a lot of strings have been added or changed, a
-maintainer can manually trigger a CI run to extract all strings on demand.
-
-<details>
-<summary><b>Manually trigger CI run (Workflow Dispatch)</b></summary>
-
-Maintainers can always request the CI to run on demand if it's required.
-
-Go to the `Actions` tab and select our dedicated translation workflow:
-https://github.com/Cockatrice/Cockatrice/actions/workflows/translations.yml
-
-You see a "This workflow has a workflow_dispatch event trigger." hint at the top of
-the list.<br>
-Select `Run workflow` on the right and trigger a run from master branch.
-
-The CI will now check for changed strings and create a PR if there are any updates.
-
-</details>
-
-<details>
-<summary><b>Manually update source strings locally</b></summary>
-
-To update the english source files for translation, re-run cmake enabling the appropriate
+To update the english translation files, re-run cmake enabling the appropriate
 parameter and then run make:
 ```sh
 cd cockatrice/build
@@ -384,13 +357,11 @@ It is recommended to disable the parameter afterwards using:
 ```sh
 cmake .. -DUPDATE_TRANSLATIONS=OFF
 ```
-Now you are ready to commit your changes and open a PR.
+Now you are ready to propose your change.

-</details>
-
-Once the changes get merged, Transifex will pick up the modified files
-automatically (checked every few hours) and update their online editor where
-translators will be able to translate the new strings right in the browser.
+Once your change gets merged, Transifex will pick up the modified files
+automatically (checked every 24 hours) and update the interface where
+translators will be able to translate the new strings.

 ### Releasing Translations (for maintainers) ###

--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,49 +0,0 @@
-# Configuration options: https://docs.github.com/en/github/administering-a-repository/configuration-options-for-dependency-updates
-
-version: 2
-updates:
- # # 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
- # 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:
- # https://github.com/dependabot/dependabot-core/issues/2247
- # - package-ecosystem: "docker"
- #   # Look for a `Dockerfile` in the `root` directory
- #   directory: "/"
- #   # Check for updates once a week
- #   schedule:
- #     interval: "weekly"
- #   # Limit the amout of open PR's (default = 5, disabled = 0, security updates are not impacted)
- #   open-pull-requests-limit: 1
-
-  # Enable version updates for GitHub Actions
-  - package-ecosystem: "github-actions"
-    # Directory must be set to "/" to check for workflow files in .github/workflows
-    directory: "/"
-    # Check for updates to GitHub Actions once a week
-    schedule:
-      interval: "weekly"
-    # Limit the amout of open PR's (default = 5, disabled = 0, security updates are not impacted)
-    open-pull-requests-limit: 2
-
- # # Enable version updates for npm
- # - package-ecosystem: "npm"
- #   # Look for `package.json` and `lock` files in the `webclient` subdirectory
- #   directory: "/webclient"
- #   # Check the npm registry for updates once a week
- #   schedule:
- #     interval: "weekly"
- #   # Limit the amout of open PR's (default = 5, disabled = 0, security updates are not impacted)
- #   open-pull-requests-limit: 5
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -8,7 +8,6 @@ on:
      - '**.md'
      - 'webclient/**'
      - '.github/workflows/web-*.yml'
-      - '.github/workflows/translations-*.yml'
    tags:
      - '*'
  pull_request:
@@ -16,12 +15,6 @@ on:
      - '**.md'
      - 'webclient/**'
      - '.github/workflows/web-*.yml'
-      - '.github/workflows/translations-*.yml'
-
-# 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_name != 'master' }}

 jobs:
  configure:
@@ -30,27 +23,33 @@ jobs:
    outputs:
      tag: ${{steps.configure.outputs.tag}}
      sha: ${{steps.configure.outputs.sha}}
+      upload_url: ${{steps.create_release.outputs.upload_url}}
+
+    steps:
+      - name: Cancel previous runs
+        uses: styfle/cancel-workflow-action@0.11.0
+        with:
+          access_token: ${{github.token}} # needs other token https://github.com/styfle/cancel-workflow-action/issues/7

-    steps:  
      - name: Configure
        id: configure
        shell: bash
        run: |
          tag_regex='^refs/tags/'
-          if [[ $GITHUB_EVENT_NAME == pull-request ]]; then    # pull request
+          if [[ $GITHUB_EVENT_NAME == pull-request ]]; then # pull request
            sha="${{github.event.pull_request.head.sha}}"
-          elif [[ $GITHUB_REF =~ $tag_regex ]]; then    # release
+          elif [[ $GITHUB_REF =~ $tag_regex ]]; then # release
            sha="$GITHUB_SHA"
            tag="${GITHUB_REF/refs\/tags\//}"
            echo "tag=$tag" >>"$GITHUB_OUTPUT"
-          else    # push to branch
+          else # push to branch
            sha="$GITHUB_SHA"
          fi
          echo "sha=$sha" >>"$GITHUB_OUTPUT"

      - name: Checkout
        if: steps.configure.outputs.tag != null
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0

@@ -65,174 +64,172 @@ jobs:
      - name: Create release
        if: steps.configure.outputs.tag != null
        id: create_release
-        shell: bash
+        uses: actions/create-release@v1
        env:
-          GH_TOKEN: ${{github.token}}
-          tag_name: ${{steps.configure.outputs.tag}}
-          target: ${{steps.configure.outputs.sha}}
+          GITHUB_TOKEN: ${{github.token}}
+        with:
+          tag_name: ${{github.ref}}
          release_name: ${{steps.prepare.outputs.title}}
          body_path: ${{steps.prepare.outputs.body_path}}
-          prerelease: ${{steps.prepare.outputs.is_beta}}
-        run: |
-          if [[ $prerelease == yes ]]; then
-            args="--prerelease"
-          fi
-          gh release create "$tag_name" --draft --verify-tag $args \
-              --target "$target" --title "$release_name" \
-              --notes-file "$body_path"
+          draft: true
+          prerelease: ${{steps.prepare.outputs.is_beta == 'yes'}}

  build-linux:
    strategy:
      fail-fast: false
      matrix:
-        # These names correspond to the files in ".ci/$distro$version"
+        # these names correspond to the files in .ci/$distro
        include:
-          - distro: Arch
-            package: skip    # We are packaged in Arch already
+          - distro: ArchLinux
+            package: skip # we are packaged in arch already
            allow-failure: yes

-          - distro: Debian
-            version: 11
+          - distro: Debian10
            package: DEB
-            test: skip    # Running tests on all distros is superfluous
+            test: skip # running tests on all distros is superfluous

-          - distro: Debian
-            version: 12
+          - distro: Debian11
            package: DEB

-          - distro: Fedora
-            version: 40
+          - distro: Fedora35
            package: RPM
-            test: skip    # Running tests on all distros is superfluous
+            test: skip

-          - distro: Fedora
-            version: 41
+          - distro: Fedora36
            package: RPM

-          - distro: Ubuntu
-            version: 20.04
-            package: DEB
-            test: skip    # Ubuntu 20.04 has a broken Qt for debug builds
-
-          - distro: Ubuntu
-            version: 22.04
-            package: DEB
-            test: skip    # Running tests on all distros is superfluous
-
-          - distro: Ubuntu
-            version: 24.04
+          - distro: UbuntuBionic
            package: DEB

-    name: ${{matrix.distro}} ${{matrix.version}}
+          - distro: UbuntuFocal
+            package: DEB
+            test: skip # UbuntuFocal has a broken qt for debug builds
+
+          - distro: UbuntuJammy
+            package: DEB
+
+    name: ${{matrix.distro}}
    needs: configure
    runs-on: ubuntu-latest
    continue-on-error: ${{matrix.allow-failure == 'yes'}}
    env:
-      NAME: ${{matrix.distro}}${{matrix.version}}
-      CACHE: /tmp/${{matrix.distro}}${{matrix.version}}-cache    # ${{runner.temp}} does not work?
-      # Cache size over the entire repo is 10Gi:
+      NAME: ${{matrix.distro}}
+      CACHE: /tmp/${{matrix.distro}}-cache # ${{runner.temp}} does not work?
+      # cache size over the entire repo is 10Gi link:
      # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
      CCACHE_SIZE: 200M

    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3

-      - name: Generate cache timestamp
+      - name: Get cache timestamp
        id: cache_timestamp
        shell: bash
        run: echo "timestamp=$(date -u '+%Y%m%d%H%M%S')" >>"$GITHUB_OUTPUT"

      - name: Restore cache
-        uses: actions/cache@v4
+        uses: actions/cache@v3
        env:
          timestamp: ${{steps.cache_timestamp.outputs.timestamp}}
        with:
          path: ${{env.CACHE}}
-          key: docker-${{matrix.distro}}${{matrix.version}}-cache-${{env.timestamp}}
+          key: docker-${{matrix.distro}}-cache-${{env.timestamp}}
          restore-keys: |
-            docker-${{matrix.distro}}${{matrix.version}}-cache-
+            docker-${{matrix.distro}}-cache-

-      - name: Build ${{matrix.distro}} ${{matrix.version}} Docker image
+      - name: Build ${{matrix.distro}} Docker image
        shell: bash
        run: source .ci/docker.sh --build

      - name: Build debug and test
        if: matrix.test != 'skip'
        shell: bash
+        env:
+          distro: '${{matrix.distro}}'
        run: |
          source .ci/docker.sh
-          RUN --server --debug --test --ccache "$CCACHE_SIZE" --parallel 4
+          RUN --server --debug --test --ccache "$CCACHE_SIZE" --parallel 2

      - name: Build release package
-        id: build
+        id: package
        if: matrix.package != 'skip'
        shell: bash
        env:
          BUILD_DIR: build
-          SUFFIX: '-${{matrix.distro}}${{matrix.version}}'
+          SUFFIX: '-${{matrix.distro}}'
+          distro: '${{matrix.distro}}'
          type: '${{matrix.package}}'
        run: |
          source .ci/docker.sh
          RUN --server --release --package "$type" --dir "$BUILD_DIR" \
-                  --ccache "$CCACHE_SIZE" --parallel 4
+                  --ccache "$CCACHE_SIZE" --parallel 2
          .ci/name_build.sh

      - name: Upload artifact
        if: matrix.package != 'skip'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        with:
-          name: ${{matrix.distro}}${{matrix.version}}-package
-          path: ${{steps.build.outputs.path}}
+          name: ${{matrix.distro}}-package
+          path: ${{steps.package.outputs.path}}
          if-no-files-found: error

      - name: Upload to release
        if: matrix.package != 'skip' && needs.configure.outputs.tag != null
-        shell: bash
+        uses: actions/upload-release-asset@v1
        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"
+          GITHUB_TOKEN: ${{github.token}}
+        with:
+          upload_url: ${{needs.configure.outputs.upload_url}}
+          asset_path: ${{steps.package.outputs.path}}
+          asset_name: ${{steps.package.outputs.name}}
+          asset_content_type: application/octet-stream

  build-macos:
    strategy:
      fail-fast: false
      matrix:
        include:
-          - target: 13
-            soc: Intel
-            os: macos-13
-            xcode: "14.3.1"
-            type: Release
-            core_count: 4
-            make_package: 1
-
-          - target: 14
-            soc: Apple
-            os: macos-14
-            xcode: "15.4"
-            type: Release
-            core_count: 3
-            make_package: 1
-
-          - target: 15
-            soc: Apple
-            os: macos-15
-            xcode: "16.2"
-            type: Release
-            core_count: 3
-            make_package: 1
-
-          - target: 15
-            soc: Apple
-            os: macos-15
-            xcode: "16.2"
+          - target: Debug # tests only
+            os: macos-latest
+            xcode: 12.5.1
+            qt_version: 6
            type: Debug
-            core_count: 3
+            do_tests: 1

-    name: macOS ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }}
+          - target: 10.14_Mojave
+            os: macos-10.15 # runs on Catalina
+            xcode: 10.3 # allows compatibility with macOS 10.14
+            qt_version: 5
+            type: Release
+            # do_tests: 1 # tests do not work on qt5?
+            make_package: 1
+
+          - target: 10.15_Catalina
+            os: macos-10.15
+            xcode: 12.4
+            qt_version: 6
+            type: Release
+            do_tests: 1
+            make_package: 1
+
+          - target: 11_Big_Sur
+            os: macos-11
+            xcode: 13.2
+            qt_version: 6
+            type: Release
+            do_tests: 1
+            make_package: 1
+
+#          - target: 12_Monterey
+#            os: macos-12
+#            xcode: 13.3
+#            qt_version: 6
+#            type: Release
+#            do_tests: 1
+#            make_package: 1
+
+    name: macOS ${{matrix.target}}
    needs: configure
    runs-on: ${{matrix.os}}
    continue-on-error: ${{matrix.allow-failure == 'yes'}}
@@ -242,193 +239,140 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3

-      - name: Install dependencies using Homebrew
+      - name: Install dependencies using homebrew
        shell: bash
-        # CMake cannot find the MySQL connector
-        # Neither of these works: mariadb-connector-c mysql-connector-c++
+        # cmake cannot find the mysql connector
+        # neither of these works: mariadb-connector-c mysql-connector-c++
        env:
-          HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
+          qt_version: 'qt@${{matrix.qt_version}}'
        run: |
          brew update
-          brew install protobuf qt --force-bottle
+          brew install protobuf
+          brew install "$qt_version" --force-bottle

-      - name: Build & Sign on Xcode ${{matrix.xcode}}
+      - name: Build on Xcode ${{matrix.xcode}}
        shell: bash
        id: build
        env:
          BUILDTYPE: '${{matrix.type}}'
-          MAKE_TEST: 1
+          MAKE_TEST: '${{matrix.do_tests}}'
          MAKE_PACKAGE: '${{matrix.make_package}}'
-          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 }}
-        # macOS runner have 3 cores usually - only the macos-13 image has 4:
-        # https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
-        # https://github.com/actions/runner-images?tab=readme-ov-file#available-images
-        run: |
-          if [[ -n "$MACOS_CERTIFICATE_NAME" ]]
-          then
-            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
-            security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
-            security import certificate.p12 -k build.keychain -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
-            security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$MACOS_CI_KEYCHAIN_PWD" build.keychain
-          fi
-          .ci/compile.sh --server --parallel ${{matrix.core_count}}
-
-      - name: Sign app bundle
-        if: matrix.make_package
-        env:
-          MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}
-          MACOS_CI_KEYCHAIN_PWD: ${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }}
-        run: |
-          if [[ -n "$MACOS_CERTIFICATE_NAME" ]]
-          then
-            security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
-            /usr/bin/codesign --sign="$MACOS_CERTIFICATE_NAME" --entitlements=".ci/macos.entitlements" --options=runtime --force --deep --timestamp --verbose ${{steps.build.outputs.path}}
-          fi
-
-      - name: Notarize app bundle
-        if: matrix.make_package
-        env:
-          MACOS_NOTARIZATION_APPLE_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_APPLE_ID }}
-          MACOS_NOTARIZATION_TEAM_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_TEAM_ID }}
-          MACOS_NOTARIZATION_PWD: ${{ secrets.PROD_MACOS_NOTARIZATION_PWD }}
-        run: |
-          if [[ -n "$MACOS_NOTARIZATION_APPLE_ID" ]]
-          then
-            # 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"
-            xcrun stapler staple ${{steps.build.outputs.path}}
-          fi
+          PACKAGE_SUFFIX: '-macOS-${{matrix.target}}'
+          # set QTDIR to find qt5, qt6 can be found without this
+          QTDIR: '/usr/local/opt/qt5'
+        # Mac machines actually have 3 cores
+        run: .ci/compile.sh --server --parallel 3

      - name: Upload artifact
        if: matrix.make_package
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        with:
-          name: macOS${{matrix.target}}${{ matrix.soc == 'Intel' && '_Intel' || '' }}${{ matrix.type == 'Debug' && '_Debug' || '' }}-dmg
+          name: macOS-${{matrix.target}}-dmg
          path: ${{steps.build.outputs.path}}
          if-no-files-found: error

      - name: Upload to release
-        if: matrix.package != 'skip' && needs.configure.outputs.tag != null
-        shell: bash
+        if: matrix.make_package && needs.configure.outputs.tag != null
+        uses: actions/upload-release-asset@v1
        env:
-          GH_TOKEN: ${{github.token}}
-          tag_name: ${{needs.configure.outputs.tag}}
+          GITHUB_TOKEN: ${{github.token}}
+        with:
+          upload_url: ${{needs.configure.outputs.upload_url}}
          asset_path: ${{steps.build.outputs.path}}
          asset_name: ${{steps.build.outputs.name}}
-        run: gh release upload "$tag_name" "$asset_path#$asset_name"
+          asset_content_type: application/octet-stream

  build-windows:
    strategy:
      fail-fast: false
      matrix:
        include:
-          - target: 7
+          - target: Win-32bit
+            bit: 32
+            arch: x86
+            cmake_generator_platform: Win32
+            qt_version: 5.15.*
+            qt_arch: msvc2019
+            qt_tools: "tools_openssl_x86"
+
+          - target: Win7+-64bit
+            bit: 64
+            arch: x64
+            cmake_generator_platform: x64
            qt_version: 5.15.*
            qt_arch: msvc2019_64
+            qt_tools: "tools_openssl_x64"

-          - target: 10
-            qt_version: 6.6.*
+          - target: Win10+-64bit
+            bit: 64
+            arch: x64
+            cmake_generator_platform: x64
+            qt_version: 6.3.*
            qt_arch: msvc2019_64
-            qt_modules: "qtimageformats qtmultimedia qtwebsockets"
+            qt_tools: "tools_openssl_x64"
+            qt_modules: "qtmultimedia qtwebsockets"

-    name: Windows ${{matrix.target}}
+    name: ${{matrix.target}}
    needs: configure
-    runs-on: windows-2022
+    runs-on: windows-2019
    env:
-      CMAKE_GENERATOR: 'Visual Studio 17 2022'
+      CMAKE_GENERATOR: 'Visual Studio 16 2019'

    steps:
      - name: Add msbuild to PATH
        id: add-msbuild
-        uses: microsoft/setup-msbuild@v2
-        with:
-          msbuild-architecture: x64
+        uses: microsoft/setup-msbuild@v1.1

      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          submodules: recursive

-      - name: Install Qt ${{matrix.qt_version}}
-        uses: jurplel/install-qt-action@v4
+      - name: Install Qt ${{matrix.qt_version}} for ${{matrix.target}}
+        uses: jurplel/install-qt-action@v3
        with:
          cache: true
          setup-python: false
          version: ${{matrix.qt_version}}
-          arch: win64_${{matrix.qt_arch}}
+          arch: win${{matrix.bit}}_${{matrix.qt_arch}}
          tools: ${{matrix.qt_tools}}
          modules: ${{matrix.qt_modules}}

      - name: Run vcpkg
-        uses: lukka/run-vcpkg@v11
+        uses: lukka/run-vcpkg@v10.6
        with:
          runVcpkgInstall: true
-          doNotCache: false
+          appendedCacheKey: ${{matrix.bit}}-bit
        env:
-          VCPKG_DEFAULT_TRIPLET: 'x64-windows'
+          VCPKG_DEFAULT_TRIPLET: '${{matrix.arch}}-windows'
          VCPKG_DISABLE_METRICS: 1

      - name: Build Cockatrice
        id: build
        shell: bash
        env:
-          PACKAGE_SUFFIX: '-Win${{matrix.target}}'
+          PACKAGE_SUFFIX: '-${{matrix.target}}'
          CMAKE_GENERATOR: '${{env.CMAKE_GENERATOR}}'
-          CMAKE_GENERATOR_PLATFORM: 'x64'
-          QTDIR: '${{github.workspace}}\Qt\${{matrix.qt_version}}\win64_${{matrix.qt_arch}}'
-        # 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
+          CMAKE_GENERATOR_PLATFORM: '${{matrix.cmake_generator_platform}}'
+          QTDIR: '${{github.workspace}}\Qt\${{matrix.qt_version}}\win${{matrix.bit}}_${{matrix.qt_arch}}'
+        run: .ci/compile.sh --server --release --test --package --parallel 2

      - name: Upload artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        with:
-          name: Windows${{matrix.target}}-installer
+          name: ${{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
-        if: matrix.package != 'skip' && needs.configure.outputs.tag != null
-        shell: bash
+        if: needs.configure.outputs.tag != null
+        uses: actions/upload-release-asset@v1
        env:
-          GH_TOKEN: ${{github.token}}
-          tag_name: ${{needs.configure.outputs.tag}}
+          GITHUB_TOKEN: ${{github.token}}
+        with:
+          upload_url: ${{needs.configure.outputs.upload_url}}
          asset_path: ${{steps.build.outputs.path}}
          asset_name: ${{steps.build.outputs.name}}
-        run: gh release upload "$tag_name" "$asset_path#$asset_name"
+          asset_content_type: application/octet-stream
--- a/.github/workflows/desktop-lint.yml
+++ b/.github/workflows/desktop-lint.yml
@@ -6,7 +6,6 @@ on:
      - '**.md'
      - 'webclient/**'
      - '.github/workflows/web-*.yml'
-      - '.github/workflows/translations-*.yml'

 jobs:
  format:
@@ -14,7 +13,7 @@ jobs:

    steps:
    - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
      with:
        fetch-depth: 20 # should be enough to find merge base

--- a/.github/workflows/translations-pull.yml
+++ b/.github/workflows/translations-pull.yml
@@ -1,72 +0,0 @@
-name: Update Translations
-
-on:
-  workflow_dispatch:
-  schedule:
-    # runs in the middle of each month starting a quarter (UTC) = two weeks after new strings are built
-    - cron: '0 0 15 1,4,7,10 *'
-  pull_request:
-    paths:
-      - '.github/workflows/translations-pull.yml'
-
-jobs:
-  translations:
-    # Do not run the scheduled workflow on forks
-    if: github.event_name != 'schedule' || github.repository_owner == 'Cockatrice'
-
-    name: Pull languages
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-
-      - name: Pull translated strings from Transifex
-        uses: transifex/cli-action@v2
-        with:
-          # used config file: https://github.com/Cockatrice/Cockatrice/blob/master/.tx/config
-          # https://github.com/transifex/cli#pulling-files-from-transifex
-          token: ${{ secrets.TX_TOKEN }}
-          args: pull --force --all
-
-      - name: Create pull request
-        if: github.event_name != 'pull_request'
-        id: create_pr
-        uses: peter-evans/create-pull-request@v7
-        with:
-          add-paths: |
-            cockatrice/translations/*.ts
-            oracle/translations/*.ts
-            webclient/public/locales/*/translation.json
-          commit-message: Update translation files
-          # author is the owner of the commit
-          author: github-actions <github-actions@github.com>
-          branch: ci-update_translations
-          delete-branch: true
-          title: 'Update translations'
-          body: |
-            Pulled all translated strings from [Transifex][1].
-            
-            ---
-            *This PR is automatically generated and updated by the workflow at `.github/workflows/translations-pull.yml`. Review [action runs][2].*<br>
-            *After merging, all new languages and translations are available in the next build.*
-            
-            [1]: https://app.transifex.com/cockatrice/cockatrice/
-            [2]: https://github.com/Cockatrice/Cockatrice/actions/workflows/translations-pull.yml?query=branch%3Amaster
-          labels: |
-            CI
-            Translation
-          draft: false
-
-      - name: PR Status
-        if: github.event_name != 'pull_request'
-        shell: bash
-        env:
-          STATUS: ${{ steps.create_pr.outputs.pull-request-operation }}
-        run: |
-          if [[ "$STATUS" == "none" ]]; then
-            echo "PR #${{ steps.create_pr.outputs.pull-request-number }} unchanged!" >> $GITHUB_STEP_SUMMARY
-          else
-            echo "PR #${{ steps.create_pr.outputs.pull-request-number }} $STATUS!" >> $GITHUB_STEP_SUMMARY
-          fi
-          echo "URL: ${{ steps.create_pr.outputs.pull-request-url }}" >> $GITHUB_STEP_SUMMARY
--- a/.github/workflows/translations-push.yml
+++ b/.github/workflows/translations-push.yml
@@ -1,87 +0,0 @@
-name: Update Translation Source
-
-on:
-  workflow_dispatch:
-  schedule:
-    # runs at the start of each quarter (UTC)
-    - cron: '0 0 1 1,4,7,10 *'
-  pull_request:
-    paths:
-      - '.github/workflows/translations-push.yml'
-
-jobs:
-  translations:
-    # Do not run the scheduled workflow on forks
-    if: github.event_name != 'schedule' || github.repository_owner == 'Cockatrice'
-
-    name: Push strings
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-
-      - name: Install lupdate
-        shell: bash
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y --no-install-recommends qttools5-dev-tools
-
-      - name: Update Cockatrice translation source
-        id: cockatrice
-        shell: bash
-        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
-        shell: bash
-        env:
-          FILE: 'oracle/oracle_en@source.ts'
-          DIRS: 'oracle/src'
-        run: .ci/update_translation_source_strings.sh
-
-      - name: Render template
-        id: template
-        uses: chuhlomin/render-template@v1
-        with:
-          template: .ci/update_translation_source_strings_template.md
-          vars: |
-            cockatrice_output: ${{ steps.cockatrice.outputs.output }}
-            oracle_output: ${{ steps.oracle.outputs.output }}
-            commit: ${{ github.sha }}
-
-      - name: Create pull request
-        if: github.event_name != 'pull_request'
-        id: create_pr
-        uses: peter-evans/create-pull-request@v7
-        with:
-          add-paths: |
-            cockatrice/cockatrice_en@source.ts
-            oracle/oracle_en@source.ts
-          commit-message: Update translation source strings
-          # author is the owner of the commit
-          author: github-actions <github-actions@github.com>
-          branch: ci-update_translation_source
-          delete-branch: true
-          title: 'Update source strings'
-          body: ${{ steps.template.outputs.result }}
-          labels: |
-            CI
-            Translation
-          draft: false
-
-      - name: PR Status
-        if: github.event_name != 'pull_request'
-        shell: bash
-        env:
-          STATUS: ${{ steps.create_pr.outputs.pull-request-operation }}
-        run: |
-          if [[ "$STATUS" == "none" ]]; then
-            echo "PR #${{ steps.create_pr.outputs.pull-request-number }} unchanged!" >> $GITHUB_STEP_SUMMARY
-          else
-            echo "PR #${{ steps.create_pr.outputs.pull-request-number }} $STATUS!" >> $GITHUB_STEP_SUMMARY
-          fi
-          echo "URL: ${{ steps.create_pr.outputs.pull-request-url }}" >> $GITHUB_STEP_SUMMARY
--- a/.github/workflows/translations.yml
+++ b/.github/workflows/translations.yml
@@ -0,0 +1,66 @@
+name: Update translation source
+
+on:
+  workflow_dispatch:
+  schedule:
+    # runs once per month
+    - cron: '0 0 1 * *'
+
+jobs:
+  translations:
+    # Do not run the scheduled workflow on forks
+    if: github.event_name != 'schedule' || github.repository_owner == 'Cockatrice'
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Install lupdate
+        shell: bash
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y --no-install-recommends qttools5-dev-tools
+
+      - name: Checkout repo
+        uses: actions/checkout@v3
+
+      - name: Update cockatrice translations
+        shell: bash
+        run: |
+          shopt -s globstar # globstar is needed for recursive **
+          lupdate -version
+          echo "reading the following source files:"
+          # note: there are three strings to translate in common right now
+          echo {cockatrice,common}/**/*.{cpp,h}
+          echo "$(echo {cockatrice,common}/**/*.{cpp,h} | wc -w) files total"
+          lupdate {cockatrice,common}/**/*.{cpp,h} -ts cockatrice/translations/cockatrice_en@source.ts
+
+      - name: Update oracle translations
+        shell: bash
+        run: |
+          shopt -s globstar # globstar is needed for recursive **
+          lupdate -version
+          echo "reading the following source files:"
+          echo oracle/**/*.{cpp,h}
+          echo "$(echo oracle/**/*.{cpp,h} | wc -w) files total"
+          lupdate oracle/**/*.{cpp,h} -ts oracle/translations/oracle_en@source.ts
+
+      - name: Check for updates
+        id: check
+        shell: bash
+        run: |
+          set +e # do not fail, just save the exit state
+          git diff --exit-code
+          echo "deploy=$?" >>"$GITHUB_OUTPUT"
+
+      - name: Commit changes
+        if: steps.check.outputs.deploy == '1'
+        shell: bash
+        working-directory: ${{env.OUTPUT_PATH}}
+        run: |
+          git config user.name github-actions
+          git config user.email github-actions@github.com
+          git add cockatrice/translations/cockatrice_en@source.ts oracle/translations/oracle_en@source.ts
+          git commit -m "Automated translation update ( $GITHUB_SHA )"
+          git push
+          deploy_commit=$(git rev-parse HEAD)
+          echo "Created commit: $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/commit/$deploy_commit"
--- a/.github/workflows/web-build.yml
+++ b/.github/workflows/web-build.yml
@@ -33,10 +33,10 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3

      - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v2
        with:
          node-version: ${{matrix.node_version}}
          cache: 'npm'
@@ -50,3 +50,4 @@ jobs:

      - name: Test app
        run: npm run test
+        
--- a/.github/workflows/web-lint.yml
+++ b/.github/workflows/web-lint.yml
@@ -17,10 +17,10 @@ jobs:

    steps:
    - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3

    - name: Setup Node.js
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v2
      with:
        cache: 'npm'
        cache-dependency-path: 'webclient/package-lock.json'
--- a/.gitignore
+++ b/.gitignore
@@ -6,11 +6,8 @@ mysql.cnf
 .DS_Store
 .idea/
 *.aps
-cmake-build*
+cmake-build-debug*
 preferences
 compile_commands.json
 .vs/
 .vscode/
-.cache
-.gdb_history
-cockatrice/resources/config/qtlogging.ini
--- a/.tx/config
+++ b/.tx/config
@@ -1,26 +1,13 @@
 [main]
-host = https://app.transifex.com
+host = https://www.transifex.com

-[o:cockatrice:p:cockatrice:r:cockatrice-cockatrice-en-source-ts--master]
-resource_name = Cockatrice
-source_lang = en
-source_file = cockatrice/cockatrice_en@source.ts
+[cockatrice.cockatrice-translations-cockatrice-en-source-ts--master]
 file_filter = cockatrice/translations/cockatrice_<lang>.ts
-type = QT
-minimum_perc = 10
-
-[o:cockatrice:p:cockatrice:r:oracle-oracle-en-source-ts--master]
-resource_name = Oracle
+source_file = cockatrice/translations/cockatrice_en@source.ts
 source_lang = en
-source_file = oracle/oracle_en@source.ts
+
+[cockatrice.oracle-translations-oracle-en-source-ts--master]
 file_filter = oracle/translations/oracle_<lang>.ts
-type = QT
-minimum_perc = 10
-
-[o:cockatrice:p:cockatrice:r:webclient-src-i18n-default-json--master]
-resource_name = Webclient
+source_file = oracle/translations/oracle_en@source.ts
 source_lang = en
-source_file = webclient/src/i18n-default.json
-file_filter = webclient/public/locales/<lang>/translation.json
-type = KEYVALUEJSON
-minimum_perc = 10
+
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,16 +74,16 @@ endif()

 # A project name is needed for CPack
 # Version can be overriden by git tags, see cmake/getversion.cmake
-project("Cockatrice" VERSION 2.10.0)
+project("Cockatrice" VERSION 2.8.1)

 # Set release name if not provided via env/cmake var
 if(NOT DEFINED GIT_TAG_RELEASENAME)
-  set(GIT_TAG_RELEASENAME "Rings of the Wild")
+  set(GIT_TAG_RELEASENAME "Prismatic Bridge")
 endif()

-# Use c++20 for all targets
+# Use c++17 for all targets
 set(CMAKE_CXX_STANDARD
-    20
+    17
    CACHE STRING "C++ ISO Standard"
 )
 set(CMAKE_CXX_STANDARD_REQUIRED True)
@@ -140,17 +140,10 @@ endif()

 # Define proper compilation flags
 if(MSVC)
-  # Disable Warning C4251, C++20 compatibility, Multi-threaded Builds, Warn Detection, Unwind Semantics, Debug Symbols
-  set(CMAKE_CXX_FLAGS "/wd4251 /Zc:__cplusplus /std:c++20 /permissive- /W4 /MP /EHsc /Zi")
-  # Visual Studio: Maximum Optimization, Multi-threaded DLL
-  set(CMAKE_CXX_FLAGS_RELEASE "/Ox /MD")
-  # Visual Studio: No Optimization, Multi-threaded Debug DLL
-  set(CMAKE_CXX_FLAGS_DEBUG "/Od /MDd")
-
-  # Generate PDB, even when in release (So developers can better analyze crash logs)
-  set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
-
-  add_compile_definitions(_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING)
+  # Visual Studio: Maximum optimization, disable warning C4251, establish C++17 compatibility
+  set(CMAKE_CXX_FLAGS_RELEASE "/Ox /MD /wd4251 /Zc:__cplusplus /std:c++17 /permissive-")
+  # Generate complete debugging information
+  #set(CMAKE_CXX_FLAGS_DEBUG "/Zi")
 elseif(CMAKE_COMPILER_IS_GNUCXX)
  # linux/gcc, bsd/gcc, windows/mingw
  include(CheckCXXCompilerFlag)
@@ -163,7 +156,7 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
  endif()

  if(APPLE)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++20")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17")
  endif()

  set(ADDITIONAL_DEBUG_FLAGS
@@ -186,7 +179,7 @@ else()
  # other: osx/llvm, bsd/llvm
  set(CMAKE_CXX_FLAGS_RELEASE "-O2")
  if(WARNING_AS_ERROR)
-    set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall -Wextra -Werror -Wno-unused-parameter")
+    set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall -Wextra -Werror")
  else()
    set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall -Wextra")
  endif()
@@ -223,26 +216,16 @@ include(FindQtRuntime)
 set(CMAKE_AUTOMOC TRUE)

 # Find other needed libraries
-find_package(Protobuf CONFIG)
-if(NOT Protobuf_FOUND)
-  find_package(Protobuf REQUIRED)
-endif()
-
-if(${Protobuf_VERSION} VERSION_LESS "3.21.0.0" AND NOT EXISTS "${Protobuf_PROTOC_EXECUTABLE}")
+find_package(Protobuf REQUIRED)
+if(NOT EXISTS "${Protobuf_PROTOC_EXECUTABLE}")
  message(FATAL_ERROR "No protoc command found!")
+else()
+  message(STATUS "Found Protobuf ${Protobuf_VERSION} at: ${Protobuf_LIBRARIES}")
 endif()

 #Find OpenSSL
 if(WIN32)
-  find_package(OpenSSL REQUIRED)
-  if(OPENSSL_FOUND)
-    include_directories(${OPENSSL_INCLUDE_DIRS})
-  else()
-    message(
-      WARNING
-        "Could not find OpenSSL runtime libraries. They are not required for compiling, but needs to be available at runtime."
-    )
-  endif()
+  find_package(Win32SslRuntime)
 endif()

 #Find VCredist
@@ -269,16 +252,13 @@ if(UNIX)
    set(CPACK_DMG_VOLUME_NAME "${PROJECT_NAME}")
    set(CPACK_SYSTEM_NAME "OSX")
    set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/cockatrice/resources/appicon.icns")
-    set(CPACK_DMG_DS_STORE_SETUP_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/cmake/CMakeDMGSetup.script")
-    set(CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/dmgBackground.tif")
-    set(CPACK_PRE_BUILD_SCRIPTS "${CMAKE_CURRENT_SOURCE_DIR}/cmake/SignMacApplications.cmake")
  else()
    # linux
    if(CPACK_GENERATOR STREQUAL "RPM")
      set(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
      set(CPACK_RPM_MAIN_COMPONENT "cockatrice")
      if(Qt6_FOUND)
-        set(CPACK_RPM_PACKAGE_REQUIRES "protobuf, qt6-qttools, qt6-qtsvg, qt6-qtmultimedia, qt6-qtimageformats")
+        set(CPACK_RPM_PACKAGE_REQUIRES "protobuf, qt6-qttools, qt6-qtsvg, qt6-qtmultimedia")
      elseif(Qt5_FOUND)
        set(CPACK_RPM_PACKAGE_REQUIRES "protobuf, qt5-qttools, qt5-qtsvg, qt5-qtmultimedia")
      endif()
@@ -300,7 +280,7 @@ if(UNIX)
      set(CPACK_DEBIAN_PACKAGE_SECTION "games")
      set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "http://github.com/Cockatrice/Cockatrice")
      if(Qt6_FOUND)
-        set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt6multimedia6, libqt6svg6, qt6-qpa-plugins, qt6-image-formats-plugins")
+        set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt6multimedia6, libqt6svg6, qt6-qpa-plugins")
      elseif(Qt5_FOUND)
        set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt5multimedia5-plugins, libqt5svg5")
      endif()
--- a/32
+++ b/32
@@ -1,20 +1,19 @@
-FROM ubuntu:24.04
-
-ARG DEBIAN_FRONTEND=noninteractive
+FROM ubuntu:bionic
+MAINTAINER Zach Halpern <zahalpern+github@gmail.com>

 RUN apt-get update && apt-get install -y\
-  build-essential \
-  cmake \
-  file \
-  g++ \
-  git \
-  libmariadb-dev-compat \
-  libprotobuf-dev \
-  libqt6sql6-mysql \
-  qt6-websockets-dev \
-  protobuf-compiler \
-  qt6-tools-dev \
-  qt6-tools-dev-tools
+  build-essential\
+  cmake\
+  git\
+  libprotobuf-dev\
+  libqt5sql5-mysql\
+  libmysqlclient-dev\
+  libqt5websockets5-dev\
+  protobuf-compiler\
+  qt5-default\
+  qtbase5-dev\
+  qttools5-dev-tools\
+  qttools5-dev

 COPY . /home/servatrice/code/
 WORKDIR /home/servatrice/code
@@ -26,6 +25,7 @@ RUN cmake .. -DWITH_SERVER=1 -DWITH_CLIENT=0 -DWITH_ORACLE=0 -DWITH_DBCONVERTER=

 WORKDIR /home/servatrice

-EXPOSE 4747 4748
+EXPOSE 4747

 ENTRYPOINT [ "servatrice", "--log-to-console" ]
+
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 <p align='center'>
   <a href="#cockatrice"><b>Cockatrice</b></a> <b>|</b>
   <a href="#download-">Download</a> <b>|</b>
-   <a href="#get-involved-">Get Involved</a> <b>|</b>
+   <a href="#get-involved--">Get Involved</a> <b>|</b>
   <a href="#community-resources">Community</a> <b>|</b>
   <a href="#translations-">Translations</a> <b>|</b>
   <a href="#build--">Build</a> <b>|</b>
@@ -18,7 +18,7 @@
 <br><pre>
 <b>To get started, &#8674; [view our webpage](https://cockatrice.github.io/)</b><br>
 <b>To get support or suggest changes &#8674; [file an issue](https://github.com/Cockatrice/Cockatrice/issues) ([How?](https://github.com/Cockatrice/Cockatrice/wiki/How-to-Create-a-GitHub-Ticket-Regarding-Cockatrice))</b>
-<b>To help with development, see how to [get involved](#get-involved-)</b>
+<b>To help with development, see how to [get involved](#get-involved--)</b>
 </pre><br>


@@ -40,9 +40,9 @@ Downloads are available for full releases and the current beta version in develo
   - To be a Cockatrice Beta Tester, use this version. Find more information [here](https://github.com/Cockatrice/Cockatrice/wiki/Release-Channels)!
   

-# Get Involved [![Discord](https://img.shields.io/discord/314987288398659595?label=Discord&logo=discord&logoColor=white)](https://discord.gg/3Z9yzmA)
+# Get Involved [![Discord](https://img.shields.io/discord/314987288398659595?label=Discord&logo=discord&logoColor=white)](https://discord.gg/3Z9yzmA) [![Gitter Chat](https://img.shields.io/gitter/room/Cockatrice/Cockatrice)](https://gitter.im/Cockatrice/Cockatrice)

-Join our [Discord community](https://discord.gg/3Z9yzmA) to connect with the project, contributors or fellow users of the app. Come here to talk about the application, features, or just to hang out.<br>
+Join our [Discord community](https://discord.gg/3Z9yzmA) to connect with the project or fellow users of the app. The Cockatrice developers are also available on [Gitter](https://gitter.im/Cockatrice/Cockatrice). Come here to talk about the application, features, or just to hang out.<br>
 For support regarding specific servers, please contact that server's admin or forum for support rather than asking here.<br>

 To contribute code to the project, please review [the guidelines](https://github.com/Cockatrice/Cockatrice/blob/master/.github/CONTRIBUTING.md).
@@ -65,9 +65,13 @@ Cockatrice uses the [Google Developer Documentation Style Guide](https://develop
 - [reddit r/Cockatrice](https://reddit.com/r/cockatrice)


-# Translations [![Transifex Project](https://img.shields.io/badge/translate-on%20transifex-brightgreen)](https://transifex.com/cockatrice/cockatrice/)
+# Translations [![Transifex Project](https://img.shields.io/badge/translate-on%20transifex-brightgreen)](https://www.transifex.com/projects/p/cockatrice/)

-Cockatrice uses Transifex for translations. You can help us bring Cockatrice, Oracle and Webatrice to your language or just adjust single wordings right from within your browser by visiting our [Transifex project page](https://transifex.com/cockatrice/cockatrice/).<br>
+Cockatrice uses Transifex for translations. You can help us bring Cockatrice and Oracle to your language or just edit single wordings right from within your browser by visiting our [Transifex project page](https://www.transifex.com/projects/p/cockatrice/).<br>
+
+| Cockatrice | Oracle |
+|:-:|:-:|
+| [![Cockatrice Translation Status](https://www.transifex.com/projects/p/cockatrice/resource/cockatrice/chart/image_png/)](https://www.transifex.com/projects/p/cockatrice/) | [![Oracle Translation Status](https://www.transifex.com/projects/p/cockatrice/resource/oracle/chart/image_png/)](https://www.transifex.com/projects/p/cockatrice/) |

 Check out our [Translator FAQ](https://github.com/Cockatrice/Cockatrice/wiki/Translation-FAQ) for more information about contributing!<br>

--- a/cmake/CMakeDMGSetup.script
+++ b/cmake/CMakeDMGSetup.script
@@ -1,55 +0,0 @@
-on run argv
-set image_name to item 1 of argv
-
-tell application "Finder"
-tell disk image_name
-
-  -- wait for the image to finish mounting
-  set open_attempts to 0
-  repeat while open_attempts < 4
-    try
-      open
-        delay 1
-        set open_attempts to 5
-      close
-      on error errStr number errorNumber
-        set open_attempts to open_attempts + 1
-        delay 10
-    end try
-  end repeat
-  delay 5
-
-  -- open the image the first time and save a DS_Store with just
-  -- background and icon setup
-  open
-    set current view of container window to icon view
-    set theViewOptions to the icon view options of container window
-    set background picture of theViewOptions to file ".background:background.tif"
-    set arrangement of theViewOptions to not arranged
-    set icon size of theViewOptions to 128
-    delay 5
-  close
-
-  -- next setup the position of the app and Applications symlink
-  -- plus hide all the window decoration
-  open
-    update without registering applications
-    tell container window
-      set sidebar width to 0
-      set statusbar visible to false
-      set toolbar visible to false
-      set the bounds to { 400, 100, 1400, 922 }
-      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
-    delay 5
-  close
-
-end tell
-delay 1
-end tell
-end run
--- a/cmake/FindQtRuntime.cmake
+++ b/cmake/FindQtRuntime.cmake
@@ -23,7 +23,6 @@ if(WITH_CLIENT)
      Svg
      WebSockets
      Widgets
-      Xml
  )
 endif()
 if(WITH_ORACLE)
--- a/cmake/FindVCredistRuntime.cmake
+++ b/cmake/FindVCredistRuntime.cmake
@@ -9,8 +9,7 @@ if(WIN32)
    set(REDIST_ARCH x86)
  endif()

-  # VS 2017 uses vcredist_ARCH.exe, VS 2022 uses vc_redist.ARCH.exe
-  set(REDIST_FILE_NAMES vcredist_${REDIST_ARCH}.exe vcredist.${REDIST_ARCH}.exe vc_redist.${REDIST_ARCH}.exe)
+  set(REDIST_FILE vc_redist.${REDIST_ARCH}.exe)

  set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
  include(InstallRequiredSystemLibraries)
@@ -23,20 +22,18 @@ if(WIN32)
    get_filename_component(_path ${_path} DIRECTORY)
    get_filename_component(_path ${_path}/../../ ABSOLUTE)

-    foreach(redist_file ${REDIST_FILE_NAMES})
-      if(EXISTS "${_path}/${redist_file}")
-        set(VCREDISTRUNTIME_FOUND "YES")
-        set(VCREDISTRUNTIME_FILE ${_path}/${redist_file})
-        break()
-      endif()
-    endforeach()
+    if(EXISTS "${_path}/${REDIST_FILE}") # VS 2017
+      set(VCREDISTRUNTIME_FOUND "YES")
+      set(VCREDISTRUNTIME_FILE ${_path}/${REDIST_FILE})
+    endif()
  endif()

  if(VCREDISTRUNTIME_FOUND)
    message(STATUS "Found VCredist ${VCREDISTRUNTIME_FILE}")
  else()
    message(
-      WARNING "Could not find VCredist package. It's not required for compiling, but needs to be available at runtime."
+      WARNING
+        "Could not find VCredist package in \"${_path}/${REDIST_FILE}\". It's not required for compiling, but needs to be available at runtime."
    )
  endif()
 endif()
--- a/cmake/FindWin32SslRuntime.cmake
+++ b/cmake/FindWin32SslRuntime.cmake
@@ -0,0 +1,81 @@
+# Find the OpenSSL runtime libraries (.dll) for Windows that
+# will be needed by Qt in order to access https urls.
+if(NOT DEFINED WIN32 OR NOT ${WIN32})
+  message(STATUS "Non-Windows device trying to execute FindWin32SslRuntime, skipping")
+  return()
+endif()
+
+if("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64")
+  message(STATUS "Looking for OpenSSL for ${CMAKE_GENERATOR_PLATFORM}")
+  file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles)
+  set(_OPENSSL_ROOT_PATHS
+      "$ENV{VCPKG_PACKAGES_DIR}/x64-windows/bin"
+      "C:/OpenSSL-Win64/bin"
+      "C:/OpenSSL-Win64"
+      "C:/Tools/vcpkg/installed/x64-windows/bin"
+      "${_programfiles}/OpenSSL-Win64"
+      "D:/a/Cockatrice/Qt/Tools/OpenSSL/Win_x64/bin"
+      expanduser
+      ("~/Documents/Development/Qt/Tools/OpenSSL/Win_x64/bin")
+  )
+  unset(_programfiles)
+elseif("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "Win32")
+  message(STATUS "Looking for OpenSSL for ${CMAKE_GENERATOR_PLATFORM}")
+  file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles)
+  set(_OPENSSL_ROOT_PATHS
+      "$ENV{VCPKG_PACKAGES_DIR}/x86-windows/bin"
+      "C:/OpenSSL-Win32/bin"
+      "C:/OpenSSL-Win32"
+      "C:/OpenSSL"
+      "C:/Tools/vcpkg/installed/x86-windows/bin"
+      "${_programfiles}/OpenSSL"
+      "${_programfiles}/OpenSSL-Win32"
+      "D:/a/Cockatrice/Qt/Tools/OpenSSL/Win_x86/bin"
+      expanduser
+      ("~/Documents/Development/Qt/Tools/OpenSSL/Win_x86/bin")
+  )
+  unset(_programfiles)
+endif()
+
+message(STATUS "Looking for OpenSSL @ ${CMAKE_GENERATOR_PLATFORM} in ${_OPENSSL_ROOT_PATHS}")
+if("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64")
+  find_file(
+    WIN32SSLRUNTIME_LIBEAY
+    NAMES libcrypto-1_1-x64.dll libcrypto.dll
+    PATHS ${_OPENSSL_ROOT_PATHS}
+    NO_DEFAULT_PATH
+  )
+  find_file(
+    WIN32SSLRUNTIME_SSLEAY
+    NAMES libssl-1_1-x64.dll libssl.dll
+    PATHS ${_OPENSSL_ROOT_PATHS}
+    NO_DEFAULT_PATH
+  )
+elseif("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "Win32")
+  find_file(
+    WIN32SSLRUNTIME_LIBEAY
+    NAMES libcrypto-1_1.dll libcrypto.dll
+    PATHS ${_OPENSSL_ROOT_PATHS}
+    NO_DEFAULT_PATH
+  )
+  find_file(
+    WIN32SSLRUNTIME_SSLEAY
+    NAMES libssl-1_1.dll libssl.dll
+    PATHS ${_OPENSSL_ROOT_PATHS}
+    NO_DEFAULT_PATH
+  )
+endif()
+
+if(WIN32SSLRUNTIME_LIBEAY AND WIN32SSLRUNTIME_SSLEAY)
+  set(WIN32SSLRUNTIME_LIBRARIES "${WIN32SSLRUNTIME_LIBEAY}" "${WIN32SSLRUNTIME_SSLEAY}")
+  set(WIN32SSLRUNTIME_FOUND "YES")
+  message(STATUS "Found OpenSSL ${WIN32SSLRUNTIME_LIBRARIES}")
+else()
+  set(WIN32SSLRUNTIME_FOUND "NO")
+  message(
+    WARNING
+      "Could not find OpenSSL runtime libraries. They are not required for compiling, but needs to be available at runtime."
+  )
+endif()
+
+mark_as_advanced(WIN32SSLRUNTIME_LIBEAY WIN32SSLRUNTIME_SSLEAY)
--- a/cmake/NSIS.template.in
+++ b/cmake/NSIS.template.in
@@ -5,7 +5,7 @@ OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"

 !define INST_DIR "@CPACK_TEMPORARY_DIRECTORY@"

-RequestExecutionlevel admin
+RequestExecutionlevel highest
 SetCompressor LZMA

 Var NormalDestDir
@@ -235,13 +235,6 @@ ${If} $PortableMode = 0
 	WriteUninstaller "$INSTDIR\uninstall.exe"
 	${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
 	IntFmt $0 "0x%08X" $0
-
-	; Enable Windows User-Mode Dumps
-	; https://learn.microsoft.com/en-us/windows/win32/wer/collecting-user-mode-dumps
-	WriteRegExpandStr HKLM "Software\Microsoft\Windows\Windows Error Reporting\LocalDumps\cockatrice.exe" "DumpFolder" "%LOCALAPPDATA%\CrashDumps\Cockatrice"
-	WriteRegDWORD HKLM "Software\Microsoft\Windows\Windows Error Reporting\LocalDumps\cockatrice.exe" "DumpCount" "5"
-	WriteRegDWORD HKLM "Software\Microsoft\Windows\Windows Error Reporting\LocalDumps\cockatrice.exe" "DumpType" "2"
-
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "DisplayIcon" "$INSTDIR\cockatrice.exe"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "DisplayName" "Cockatrice"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "DisplayVersion" "@CPACK_PACKAGE_VERSION_MAJOR@.@CPACK_PACKAGE_VERSION_MINOR@.@CPACK_PACKAGE_VERSION_PATCH@"
@@ -255,20 +248,20 @@ ${If} $PortableMode = 0
 	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "VersionMajor" "@CPACK_PACKAGE_VERSION_MAJOR@"
 	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "VersionMinor" "@CPACK_PACKAGE_VERSION_MINOR@"

-	IfFileExists "$INSTDIR\vc_redist.x86.exe" VcRedist86Exists PastVcRedist86Check
+	IfFileExists "$INSTDIR\vcredist_x86.exe" VcRedist86Exists PastVcRedist86Check
 	VcRedist86Exists:
-		ExecWait '"$INSTDIR\vc_redist.x86.exe" /passive /norestart'
+		ExecWait '"$INSTDIR\vcredist_x86.exe" /passive /norestart'
 		DetailPrint "Wait to ensure unlock of vc_redist file after installation..."
 		Sleep 3000
-		Delete "$INSTDIR\vc_redist.x86.exe"
+		Delete "$INSTDIR\vcredist_x86.exe"
 	PastVcRedist86Check:

-	IfFileExists "$INSTDIR\vc_redist.x64.exe" VcRedist64Exists PastVcRedist64Check
+	IfFileExists "$INSTDIR\vcredist_x64.exe" VcRedist64Exists PastVcRedist64Check
 	VcRedist64Exists:
-		ExecWait '"$INSTDIR\vc_redist.x64.exe" /passive /norestart'
+		ExecWait '"$INSTDIR\vcredist_x64.exe" /passive /norestart'
 		DetailPrint "Sleep to ensure unlock of vc_redist file after installation..."
 		Sleep 3000
-		Delete "$INSTDIR\vc_redist.x64.exe"
+		Delete "$INSTDIR\vcredist_x64.exe"
 	PastVcRedist64Check:

 ${Else}
--- a/cmake/SignMacApplications.cmake
+++ b/cmake/SignMacApplications.cmake
@@ -1,27 +0,0 @@
-# This script re-signs all apps after CPack packages them. This is necessary because CPack modifies
-# the library references used by Cockatrice to App relative paths, invalidating the code signature.
-string(LENGTH "$ENV{MACOS_CERTIFICATE_NAME}" MACOS_CERTIFICATE_NAME_LEN)
-
-if(APPLE AND MACOS_CERTIFICATE_NAME_LEN GREATER 0)
-  set(APPLICATIONS "cockatrice" "servatrice" "oracle" "dbconverter")
-  foreach(app_name IN LISTS APPLICATIONS)
-    set(FULL_APP_PATH "${CPACK_TEMPORARY_INSTALL_DIRECTORY}/${app_name}.app")
-
-    message(STATUS "Signing Interior Dynamically Loaded Libraries for ${app_name}.app")
-    execute_process(COMMAND "find" "${FULL_APP_PATH}" "-name" "*.dylib" OUTPUT_VARIABLE INTERIOR_DLLS)
-    string(REPLACE "\n" ";" INTERIOR_DLLS_LIST ${INTERIOR_DLLS})
-
-    foreach(INTERIOR_DLL IN LISTS INTERIOR_DLLS_LIST)
-      execute_process(
-        COMMAND "codesign" "--sign" "$ENV{MACOS_CERTIFICATE_NAME}" "--entitlements" "../.ci/macos.entitlements"
-                "--options" "runtime" "--force" "--deep" "--timestamp" "--verbose" "${INTERIOR_DLL}"
-      )
-    endforeach()
-
-    message(STATUS "Signing Exterior Applications ${app_name}.app")
-    execute_process(
-      COMMAND "codesign" "--sign" "$ENV{MACOS_CERTIFICATE_NAME}" "--entitlements" "../.ci/macos.entitlements"
-              "--options" "runtime" "--force" "--deep" "--timestamp" "--verbose" "${FULL_APP_PATH}"
-    )
-  endforeach()
-endif()
--- a/cmake/dmgBackground.tif
+++ b/cmake/dmgBackground.tif
--- a/cmake/expanduser.cmake
+++ b/cmake/expanduser.cmake
@@ -0,0 +1,19 @@
+# expands ~ to user home directory
+#
+# usage:
+# expanduser("~/code" x)
+
+function(expanduser in outvar)
+
+  if(CMAKE_VERSION VERSION_LESS 3.21)
+    get_filename_component(out ${in} ABSOLUTE)
+  else()
+    file(REAL_PATH ${in} out EXPAND_TILDE)
+  endif()
+
+  set(${outvar}
+      ${out}
+      PARENT_SCOPE
+  )
+
+endfunction(expanduser)
--- a/cmake/getversion.cmake
+++ b/cmake/getversion.cmake
@@ -19,7 +19,7 @@ function(get_commit_id)
      PARENT_SCOPE
  )
  set(PROJECT_VERSION_LABEL
-      "custom-${GIT_COM_ID}"
+      "custom(${GIT_COM_ID})"
      PARENT_SCOPE
  )
 endfunction()
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -5,201 +5,132 @@
 project(Cockatrice VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")

 set(cockatrice_SOURCES
-    src/game/cards/abstract_card_drag_item.cpp
-    src/game/cards/abstract_card_item.cpp
-    src/client/game_logic/abstract_client.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/cards/card_database.cpp
-    src/game/cards/card_database_manager.cpp
-    src/game/cards/card_database_model.cpp
-    src/game/cards/card_database_parser/card_database_parser.cpp
-    src/game/cards/card_database_parser/cockatrice_xml_3.cpp
-    src/game/cards/card_database_parser/cockatrice_xml_4.cpp
-    src/game/cards/card_drag_item.cpp
-    src/game/filters/filter_card.cpp
-    src/client/ui/widgets/cards/card_info_frame_widget.cpp
-    src/client/ui/widgets/cards/card_info_picture_widget.cpp
-    src/client/ui/widgets/cards/card_info_text_widget.cpp
-    src/client/ui/widgets/cards/card_info_display_widget.cpp
-    src/client/ui/widgets/cards/card_size_widget.cpp
-    src/game/cards/card_item.cpp
-    src/game/cards/card_list.cpp
-    src/game/zones/card_zone.cpp
-    src/server/chat_view/chat_view.cpp
-    src/game/board/counter_general.cpp
-    src/deck/custom_line_edit.cpp
-    src/deck/deck_loader.cpp
-    src/deck/deck_list_model.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_token.cpp
-    src/dialogs/dlg_create_game.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_from_clipboard.cpp
-    src/dialogs/dlg_load_remote_deck.cpp
-    src/dialogs/dlg_manage_sets.cpp
-    src/dialogs/dlg_move_top_cards_until.cpp
-    src/dialogs/dlg_register.cpp
-    src/dialogs/dlg_roll_dice.cpp
-    src/dialogs/dlg_settings.cpp
-    src/dialogs/dlg_tip_of_the_day.cpp
-    src/dialogs/dlg_update.cpp
-    src/dialogs/dlg_view_log.cpp
-    src/dialogs/dlg_load_deck.cpp
-    src/game/deckview/deck_view.cpp
-    src/game/deckview/deck_view_container.cpp
-    src/game/filters/filter_string.cpp
-    src/game/filters/filter_builder.cpp
-    src/game/filters/filter_tree.cpp
-    src/game/filters/filter_tree_model.cpp
-    src/client/ui/layouts/flow_layout.cpp
-    src/client/ui/widgets/general/layout_containers/flow_widget.cpp
-    src/game/game_scene.cpp
-    src/game/game_selector.cpp
-    src/game/games_model.cpp
-    src/game/game_view.cpp
-    src/client/get_text_with_max.cpp
-    src/game/hand_counter.cpp
-    src/server/handle_public_servers.cpp
-    src/game/zones/hand_zone.cpp
-    src/client/game_logic/key_signals.cpp
-    src/client/ui/line_edit_completer.cpp
-    src/server/local_client.cpp
-    src/server/local_server.cpp
-    src/server/local_server_interface.cpp
-    src/utility/logger.cpp
-    src/client/ui/widgets/cards/card_info_picture_enlarged_widget.cpp
-    src/client/ui/widgets/cards/card_info_picture_with_text_overlay_widget.cpp
-    src/client/ui/widgets/general/display/banner_widget.cpp
-    src/client/ui/widgets/general/display/labeled_input.cpp
-    src/client/ui/widgets/general/display/dynamic_font_size_label.cpp
-    src/client/ui/widgets/general/display/dynamic_font_size_push_button.cpp
-    src/client/ui/widgets/general/display/shadow_background_label.cpp
+    src/abstractcarddragitem.cpp
+    src/abstractcarditem.cpp
+    src/abstractclient.cpp
+    src/abstractcounter.cpp
+    src/abstractgraphicsitem.cpp
+    src/arrowitem.cpp
+    src/arrowtarget.cpp
+    src/carddatabase.cpp
+    src/carddatabasemodel.cpp
+    src/carddbparser/carddatabaseparser.cpp
+    src/carddbparser/cockatricexml3.cpp
+    src/carddbparser/cockatricexml4.cpp
+    src/carddragitem.cpp
+    src/cardfilter.cpp
+    src/cardframe.cpp
+    src/cardinfopicture.cpp
+    src/cardinfotext.cpp
+    src/cardinfowidget.cpp
+    src/carditem.cpp
+    src/cardlist.cpp
+    src/cardzone.cpp
+    src/chatview/chatview.cpp
+    src/counter_general.cpp
+    src/customlineedit.cpp
+    src/deck_loader.cpp
+    src/decklistmodel.cpp
+    src/deckstats_interface.cpp
+    src/deckview.cpp
+    src/dlg_connect.cpp
+    src/dlg_create_token.cpp
+    src/dlg_creategame.cpp
+    src/dlg_edit_avatar.cpp
+    src/dlg_edit_password.cpp
+    src/dlg_edit_tokens.cpp
+    src/dlg_edit_user.cpp
+    src/dlg_filter_games.cpp
+    src/dlg_forgotpasswordchallenge.cpp
+    src/dlg_forgotpasswordrequest.cpp
+    src/dlg_forgotpasswordreset.cpp
+    src/dlg_load_deck_from_clipboard.cpp
+    src/dlg_load_remote_deck.cpp
+    src/dlg_manage_sets.cpp
+    src/dlg_register.cpp
+    src/dlg_settings.cpp
+    src/dlg_tip_of_the_day.cpp
+    src/dlg_update.cpp
+    src/dlg_viewlog.cpp
+    src/filter_string.cpp
+    src/filterbuilder.cpp
+    src/filtertree.cpp
+    src/filtertreemodel.cpp
+    src/gamescene.cpp
+    src/gameselector.cpp
+    src/gamesmodel.cpp
+    src/gameview.cpp
+    src/gettextwithmax.cpp
+    src/handcounter.cpp
+    src/handle_public_servers.cpp
+    src/handzone.cpp
+    src/keysignals.cpp
+    src/lineeditcompleter.cpp
+    src/localclient.cpp
+    src/localserver.cpp
+    src/localserverinterface.cpp
+    src/logger.cpp
    src/main.cpp
-    src/server/message_log_widget.cpp
-    src/client/ui/layouts/overlap_layout.cpp
-    src/client/ui/widgets/general/layout_containers/overlap_widget.cpp
-    src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp
-    src/server/pending_command.cpp
-    src/game/phase.cpp
-    src/client/ui/phases_toolbar.cpp
-    src/client/ui/picture_loader/picture_loader.cpp
-    src/client/ui/picture_loader/picture_loader_worker.cpp
-    src/client/ui/picture_loader/picture_to_load.cpp
-    src/game/zones/pile_zone.cpp
-    src/client/ui/pixel_map_generator.cpp
-    src/game/player/player.cpp
-    src/game/player/player_list_widget.cpp
-    src/game/player/player_target.cpp
-    src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp
-    src/client/ui/widgets/printing_selector/card_amount_widget.cpp
-    src/client/ui/widgets/printing_selector/printing_selector.cpp
-    src/client/ui/widgets/printing_selector/printing_selector_card_display_widget.cpp
-    src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
-    src/client/ui/widgets/printing_selector/printing_selector_card_search_widget.cpp
-    src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp
-    src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
-    src/client/ui/widgets/printing_selector/printing_selector_view_options_toolbar_widget.cpp
-    src/client/ui/widgets/printing_selector/printing_selector_view_options_widget.cpp
-    src/client/ui/widgets/printing_selector/set_name_and_collectors_number_display_widget.cpp
-    src/client/network/release_channel.cpp
-    src/client/network/client_update_checker.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/client/network/replay_timeline_widget.cpp
-    src/game/zones/select_zone.cpp
-    src/utility/sequence_edit.cpp
-    src/client/network/sets_model.cpp
-    src/settings/card_database_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/cache_settings.cpp
-    src/settings/shortcuts_settings.cpp
-    src/settings/shortcut_treeview.cpp
-    src/settings/card_override_settings.cpp
-    src/settings/debug_settings.cpp
-    src/client/sound_engine.cpp
-    src/client/network/spoiler_background_updater.cpp
-    src/game/zones/stack_zone.cpp
-    src/client/tabs/tab.cpp
-    src/client/tabs/tab_account.cpp
-    src/client/tabs/tab_admin.cpp
-    src/client/tabs/tab_deck_editor.cpp
-    src/client/tabs/tab_deck_storage.cpp
-    src/client/tabs/tab_game.cpp
-    src/client/tabs/tab_logs.cpp
-    src/client/tabs/tab_message.cpp
-    src/client/tabs/tab_replays.cpp
-    src/client/tabs/tab_room.cpp
-    src/client/tabs/tab_server.cpp
-    src/client/tabs/tab_supervisor.cpp
-    src/client/tabs/api/edhrec/tab_edhrec.cpp
-    src/client/tabs/api/edhrec/edhrec_commander_api_response_display_widget.cpp
-    src/client/tabs/api/edhrec/edhrec_commander_api_response_card_details_display_widget.cpp
-    src/client/tabs/api/edhrec/edhrec_commander_api_response_card_list_display_widget.cpp
-    src/client/tabs/api/edhrec/edhrec_commander_api_response_commander_details_display_widget.cpp
-    src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_archidekt_links.cpp
-    src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_average_deck_statistics.cpp
-    src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_card_details.cpp
-    src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_card_list.cpp
-    src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_card_container.cpp
-    src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_card_prices.cpp
-    src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_commander_details.cpp
-    src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response.cpp
-    src/game/zones/table_zone.cpp
-    src/client/tapped_out_interface.cpp
-    src/client/ui/theme_manager.cpp
-    src/client/ui/tip_of_the_day.cpp
-    src/client/translate_counter_name.cpp
-    src/client/update_downloader.cpp
-    src/server/user/user_context_menu.cpp
-    src/server/user/user_info_connection.cpp
-    src/server/user/user_info_box.cpp
-    src/server/user/user_list_manager.cpp
-    src/server/user/user_list_widget.cpp
-    src/client/ui/window_main.cpp
-    src/game/zones/view_zone_widget.cpp
-    src/game/zones/view_zone.cpp
-    src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
-    src/client/ui/widgets/cards/deck_preview_card_picture_widget.cpp
-    src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_widget.cpp
-    src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp
-    src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp
-    src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp
-    src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp
-    src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.cpp
-    src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp
-    src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp
-    src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
-    src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp
-    src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp
-    src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp
-    src/client/ui/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp
+    src/messagelogwidget.cpp
+    src/pending_command.cpp
+    src/phase.cpp
+    src/phasestoolbar.cpp
+    src/pictureloader.cpp
+    src/pilezone.cpp
+    src/pixmapgenerator.cpp
+    src/player.cpp
+    src/playerlistwidget.cpp
+    src/playertarget.cpp
+    src/releasechannel.cpp
+    src/remoteclient.cpp
+    src/remotedecklist_treewidget.cpp
+    src/remotereplaylist_treewidget.cpp
+    src/replay_timeline_widget.cpp
+    src/selectzone.cpp
+    src/sequenceEdit/sequenceedit.cpp
+    src/setsmodel.cpp
+    src/settings/carddatabasesettings.cpp
+    src/settings/downloadsettings.cpp
+    src/settings/gamefilterssettings.cpp
+    src/settings/layoutssettings.cpp
+    src/settings/messagesettings.cpp
+    src/settings/serverssettings.cpp
+    src/settings/settingsmanager.cpp
+    src/settingscache.cpp
+    src/shortcutssettings.cpp
+    src/soundengine.cpp
+    src/spoilerbackgroundupdater.cpp
+    src/stackzone.cpp
+    src/tab.cpp
+    src/tab_account.cpp
+    src/tab_admin.cpp
+    src/tab_deck_editor.cpp
+    src/tab_deck_storage.cpp
+    src/tab_game.cpp
+    src/tab_logs.cpp
+    src/tab_message.cpp
+    src/tab_replays.cpp
+    src/tab_room.cpp
+    src/tab_server.cpp
+    src/tab_supervisor.cpp
+    src/tablezone.cpp
+    src/tappedout_interface.cpp
+    src/thememanager.cpp
+    src/tip_of_the_day.cpp
+    src/translatecountername.cpp
+    src/update_downloader.cpp
+    src/user_context_menu.cpp
+    src/userconnection_information.cpp
+    src/userinfobox.cpp
+    src/userlist.cpp
+    src/window_main.cpp
+    src/zoneviewwidget.cpp
+    src/zoneviewzone.cpp
    ${VERSION_STRING_CPP}
 )

 add_subdirectory(sounds)
 add_subdirectory(themes)
-configure_file(
-  ${CMAKE_SOURCE_DIR}/cockatrice/resources/config/qtlogging.ini ${CMAKE_BINARY_DIR}/cockatrice/qtlogging.ini COPYONLY
-)

 set(cockatrice_RESOURCES cockatrice.qrc)

@@ -320,7 +251,7 @@ if(APPLE)
  set(plugin_dest_dir cockatrice.app/Contents/Plugins)
  set(qtconf_dest_dir cockatrice.app/Contents/Resources)

-  # Qt plugins: audio (Qt5), iconengines, imageformats, multimedia (Qt6), platforms, printsupport (Qt5), styles, tls (Qt6)
+  # Qt plugins: audio (Qt5), iconengines, imageformats, platforms, printsupport (Qt5), styles, tls (Qt6)
  install(
    DIRECTORY "${QT_PLUGINS_DIR}/"
    DESTINATION ${plugin_dest_dir}
@@ -331,7 +262,6 @@ if(APPLE)
    PATTERN "audio/*.dylib"
    PATTERN "iconengines/*.dylib"
    PATTERN "imageformats/*.dylib"
-    PATTERN "multimedia/*.dylib"
    PATTERN "platforms/*.dylib"
    PATTERN "printsupport/*.dylib"
    PATTERN "styles/*.dylib"
@@ -372,14 +302,7 @@ if(WIN32)
    PATTERN "*.dll"
  )

-  install(
-    DIRECTORY "${CMAKE_BINARY_DIR}/cockatrice/"
-    DESTINATION ./
-    FILES_MATCHING
-    PATTERN "*.ini"
-  )
-
-  # Qt plugins: audio (Qt5), iconengines, imageformats, multimedia (Qt6) platforms, printsupport (Qt5), styles, tls (Qt6)
+  # Qt plugins: audio (Qt5), iconengines, imageformats, platforms, printsupport (Qt5), styles, tls (Qt6)
  install(
    DIRECTORY "${QT_PLUGINS_DIR}/"
    DESTINATION ${plugin_dest_dir}
@@ -388,10 +311,15 @@ if(WIN32)
    PATTERN "audio/qtaudio_wasapi.dll"
    PATTERN "audio/qtaudio_windows.dll"
    PATTERN "iconengines/qsvgicon.dll"
-    PATTERN "imageformats/*.dll"
-    PATTERN "mediaservice/dsengine.dll"
-    PATTERN "mediaservice/wmfengine.dll"
-    PATTERN "multimedia/*.dll"
+    PATTERN "imageformats/qgif.dll"
+    PATTERN "imageformats/qicns.dll"
+    PATTERN "imageformats/qico.dll"
+    PATTERN "imageformats/qjpeg.dll"
+    PATTERN "imageformats/qsvg.dll"
+    PATTERN "imageformats/qtga.dll"
+    PATTERN "imageformats/qtiff.dll"
+    PATTERN "imageformats/qwbmp.dll"
+    PATTERN "imageformats/qwebp.dll"
    PATTERN "platforms/qdirect2d.dll"
    PATTERN "platforms/qminimal.dll"
    PATTERN "platforms/qoffscreen.dll"
@@ -427,8 +355,8 @@ Data = Resources\")
    COMPONENT Runtime
  )

-  if(OPENSSL_FOUND)
-    install(FILES ${OPENSSL_INCLUDE_DIRS} DESTINATION ./)
+  if(WIN32SSLRUNTIME_FOUND)
+    install(FILES ${WIN32SSLRUNTIME_LIBRARIES} DESTINATION ./)
  endif()
 endif()

--- a/cockatrice/cockatrice.qrc
+++ b/cockatrice/cockatrice.qrc
@@ -29,7 +29,6 @@
        <file>resources/icons/search.svg</file>
        <file>resources/icons/settings.svg</file>
        <file>resources/icons/spectator.svg</file>
-        <file>resources/icons/swap.svg</file>
        <file>resources/icons/sync.svg</file>
        <file>resources/icons/tab_changed.svg</file>
        <file>resources/icons/update.png</file>
@@ -42,8 +41,6 @@
        <file>resources/config/deckeditor.svg</file>
        <file>resources/config/shorcuts.svg</file>
        <file>resources/config/sound.svg</file>
-        <file>resources/config/debug.ini</file>
-        <file>resources/config/qtlogging.ini</file>

        <file>resources/counters/w.svg</file>
        <file>resources/counters/w_highlight.svg</file>
@@ -329,16 +326,23 @@
        <file>resources/replay/fastforward.svg</file>
        <file>resources/replay/pause.svg</file>

-        <file>resources/usericons/pawn_single.svg</file>
-        <file>resources/usericons/pawn_double.svg</file>
-        <file>resources/usericons/pawn_donator_single.svg</file>
-        <file>resources/usericons/pawn_donator_double.svg</file>
-        <file>resources/usericons/pawn_judge_single.svg</file>
-        <file>resources/usericons/pawn_judge_double.svg</file>
-        <file>resources/usericons/pawn_vip_single.svg</file>
-        <file>resources/usericons/pawn_vip_double.svg</file>
-        <file>resources/usericons/star_single.svg</file>
-        <file>resources/usericons/star_double.svg</file>
+        <file>resources/userlevels/normal.svg</file>
+        <file>resources/userlevels/registered.svg</file>
+        <file>resources/userlevels/registered_buddy.svg</file>
+        <file>resources/userlevels/registered_vip.svg</file>
+        <file>resources/userlevels/registered_vip_buddy.svg</file>
+        <file>resources/userlevels/registered_donator.svg</file>
+        <file>resources/userlevels/registered_donator_buddy.svg</file>
+
+        <file>resources/userlevels/moderator.svg</file>
+        <file>resources/userlevels/moderator_buddy.svg</file>
+        <file>resources/userlevels/moderator_vip.svg</file>
+        <file>resources/userlevels/moderator_vip_buddy.svg</file>
+
+        <file>resources/userlevels/admin.svg</file>
+        <file>resources/userlevels/admin_buddy.svg</file>
+        <file>resources/userlevels/admin_vip.svg</file>
+        <file>resources/userlevels/admin_vip_buddy.svg</file>

        <!-- ADD TIP OF THE DAY IMAGES HERE -->
        <file>resources/tips/images/accounts_tab.png</file>
@@ -347,10 +351,10 @@
        <file>resources/tips/images/cockatrice_wiki.png</file>
        <file>resources/tips/images/coin_flip.png</file>
        <file>resources/tips/images/counter_expression.png</file>
-        <file>resources/tips/images/discord.png</file>
        <file>resources/tips/images/face_down.png</file>
        <file>resources/tips/images/filter_games.png</file>
        <file>resources/tips/images/github_logo.png</file>
+        <file>resources/tips/images/gitter.png</file>
        <file>resources/tips/images/setpt.png</file>
        <file>resources/tips/images/shortcuts.png</file>
        <file>resources/tips/images/themes.png</file>
--- a/cockatrice/cockatrice_en@source.ts
+++ b/cockatrice/cockatrice_en@source.ts
--- a/cockatrice/resources/appicon.icns
+++ b/cockatrice/resources/appicon.icns
--- a/cockatrice/resources/config/debug.ini
+++ b/cockatrice/resources/config/debug.ini
@@ -1,11 +0,0 @@
-[debug]
-showCardId=false
-
-[localgame]
-onStartup=false
-playerCount=1
-;deck\Player 1=path/to/deck
-;deck\Player 2=path/to/deck
-
-; Fun Fact: You can assign a deck to your username and it will auto load and ready when you join a server game
-;deck\Your Username Here=path/to/deck
--- a/cockatrice/resources/config/qtlogging.ini
+++ b/cockatrice/resources/config/qtlogging.ini
@@ -1,55 +0,0 @@
-[Rules]
-# Uncomment a rule to disable logging for that category
-
-# main = false
-# qt_translator = false
-# window_main.* = false
-# release_channel = false
-# spoiler_background_updater = false
-# theme_manager = false
-# sound_engine = false
-# tapped_out_interface = false
-
-# tab_game = false
-# tab_message = false
-# tab_supervisor = false
-
-# dlg_edit_avatar = false
-# dlg_settings = false
-# dlg_tip_of_the_day = false
-# dlg_update = false
-
-# settings_cache = false
-# servers_settings = false
-# shortcuts_settings = false
-
-# remote_client = false
-
-# player = false
-# game_scene = false
-# game_scene.player_addition_removal = false
-# card_zone = false
-# view_zone = false
-
-# user_info_connection = false
-
-# picture_loader = false
-# picture_loader.worker = false
-# picture_loader.card_back_cache_fail = false
-# picture_loader.picture_to_load = false
-# deck_loader = false
-# card_database = false
-# card_database.loading = false
-# card_database.loading.success_or_failure = false
-# cockatrice_xml.* = false
-# cockatrice_xml.xml_3_parser = false
-# cockatrice_xml.xml_4_parser = false
-# card_list = false
-
-flow_layout.debug = false
-flow_widget.debug = false
-flow_widget.size.debug = false
-
-# pixel_map_generator = false
-
-# filter_string = false
--- a/cockatrice/resources/help/search.md
+++ b/cockatrice/resources/help/search.md
@@ -1,7 +1,6 @@
-## Search Syntax Help
+## 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.
+The search bar recognizes a set of special commands similar to some other card databases. Here is a list with examples. Each entry can be clicked to test the query and has a small explanation. 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>
@@ -47,7 +46,8 @@ 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,leb](#e:lea,leb) <small>(Cards that appear in Alpha or Beta)</small></dd>
+<dd><a href="#e:lea,leb -(e:lea e:leb)">e:lea,leb -(e:lea e:leb)</a> <small>(Cards that appear in Alpha or Beta but not in both editions)</small></dd>

 <dt>Negate:</dt>
 <dd>[c:wu -c:m](#c:wu -c:m) <small>(Any card that is white or blue, but not multicolored)</small></dd>
--- a/cockatrice/resources/icons/swap.svg
+++ b/cockatrice/resources/icons/swap.svg
@@ -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 xmlns:xlink="http://www.w3.org/1999/xlink" fill="#000000" version="1.1" id="Capa_1"
-     xmlns="http://www.w3.org/2000/svg"
-     width="800px" height="800px" viewBox="0 0 71.753 71.753"
-     xml:space="preserve">
-<g>
-	<path d="M39.798,20.736H28.172v20.738L11.625,41.47V20.736H0L19.899,0.839L39.798,20.736z M51.855,70.914l19.897-19.896H60.129
-		V30.282l-16.547-0.004v20.74H31.957L51.855,70.914z"/>
-</g>
-</svg>
--- a/cockatrice/resources/tips/images/discord.png
+++ b/cockatrice/resources/tips/images/discord.png
--- a/cockatrice/resources/tips/images/gitter.png
+++ b/cockatrice/resources/tips/images/gitter.png
--- a/cockatrice/resources/tips/tips_of_the_day.xml
+++ b/cockatrice/resources/tips/tips_of_the_day.xml
@@ -7,9 +7,9 @@
    </tip>
    <tip>
        <title>Suggesting New Tips</title>
-        <text>You can suggest new Tips of the Day by reaching out to the development team on &lt;a href="https://discord.gg/3Z9yzmA"&gt;Discord&lt;/a&gt;!</text>
-        <image>discord.png</image>
-        <date>2023-10-18</date>
+        <text>You can suggest new Tips of the Day by reaching out to the development team on &lt;a href="https://gitter.im/cockatrice/cockatrice"&gt;Gitter&lt;/a&gt;!</text>
+        <image>gitter.png</image>
+        <date>2018-03-01</date>
    </tip>
    <tip>
        <title>Reporting Bugs</title>
--- a/cockatrice/resources/usericons/pawn_donator_single.svg
+++ b/cockatrice/resources/usericons/pawn_donator_single.svg
@@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="100"
-   height="100"
-   id="svg5322"
-   version="1.1"
-   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
-   sodipodi:docname="pawn_donator_single.svg"
-   xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
-     id="defs3"><linearGradient
-       id="linearGradient2"
-       inkscape:collect="always"><stop
-         style="stop-color:#8c5fd3;stop-opacity:1;"
-         offset="0"
-         id="stop2" /><stop
-         style="stop-color:#b284e9;stop-opacity:1;"
-         offset="0.5"
-         id="stop1" /></linearGradient><inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective5328" /><inkscape:perspective
-       id="perspective5305"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" /><linearGradient
-       id="linearGradient5181"><stop
-         style="stop-color:#0fbb00;stop-opacity:1;"
-         offset="0"
-         id="stop5183" /><stop
-         style="stop-color:#064400;stop-opacity:1;"
-         offset="1"
-         id="stop5185" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600-2"
-       id="radialGradient3606-7"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
-       fy="131.40274"
-       r="25.501276"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" /><linearGradient
-       id="linearGradient3600-2"><stop
-         style="stop-color:#ffc33d;stop-opacity:1;"
-         offset="0"
-         id="stop3602-4" /><stop
-         style="stop-color:#e09900;stop-opacity:1;"
-         offset="1"
-         id="stop3604-9" /></linearGradient><inkscape:perspective
-       id="perspective5478"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" /><linearGradient
-       id="linearGradient5189"><stop
-         style="stop-color:#000ec9;stop-opacity:1;"
-         offset="0"
-         id="stop5191" /><stop
-         style="stop-color:#000657;stop-opacity:1;"
-         offset="1"
-         id="stop5193" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600-4"
-       id="radialGradient3606-1"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
-       fy="131.40274"
-       r="25.501276"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" /><linearGradient
-       id="linearGradient3600-4"><stop
-         style="stop-color:#ffc33d;stop-opacity:1;"
-         offset="0"
-         id="stop3602-3" /><stop
-         style="stop-color:#e09900;stop-opacity:1;"
-         offset="1"
-         id="stop3604-5" /></linearGradient><inkscape:perspective
-       id="perspective5559"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5173"
-       id="linearGradient5179"
-       x1="167.33386"
-       y1="178.83276"
-       x2="244.78181"
-       y2="178.83276"
-       gradientUnits="userSpaceOnUse" /><linearGradient
-       id="linearGradient5173"><stop
-         style="stop-color:#f50000;stop-opacity:1;"
-         offset="0"
-         id="stop5175" /><stop
-         style="stop-color:#950000;stop-opacity:1;"
-         offset="1"
-         id="stop5177" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600"
-       id="radialGradient5169"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
-       fy="131.40274"
-       r="25.501276" /><linearGradient
-       id="linearGradient3600"><stop
-         style="stop-color:#ffc13d;stop-opacity:1;"
-         offset="0"
-         id="stop3602" /><stop
-         style="stop-color:#e09900;stop-opacity:1;"
-         offset="1"
-         id="stop3604" /></linearGradient><radialGradient
-       r="25.501276"
-       fy="131.40274"
-       fx="324.32715"
-       cy="131.40274"
-       cx="324.32715"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5574"
-       xlink:href="#linearGradient3600"
-       inkscape:collect="always" /><inkscape:perspective
-       id="perspective5663"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600-7"
-       id="radialGradient3606-8"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
-       fy="131.40274"
-       r="25.501276"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" /><linearGradient
-       id="linearGradient3600-7"><stop
-         style="stop-color:#ffc13d;stop-opacity:1;"
-         offset="0"
-         id="stop3602-7" /><stop
-         style="stop-color:#e09900;stop-opacity:1;"
-         offset="1"
-         id="stop3604-6" /></linearGradient><radialGradient
-       r="25.501276"
-       fy="131.40274"
-       fx="324.32715"
-       cy="131.40274"
-       cx="324.32715"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5676"
-       xlink:href="#linearGradient3600-7"
-       inkscape:collect="always" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2"
-       id="linearGradient3"
-       x1="49.889599"
-       y1="87.971054"
-       x2="50.103622"
-       y2="27.668242"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2878408,0,0,1.2878408,-14.204016,-15.239682)" /></defs><sodipodi:namedview
-     inkscape:document-units="mm"
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="55.179583"
-     inkscape:cy="45.519999"
-     inkscape:current-layer="layer2"
-     showgrid="false"
-     inkscape:window-width="1147"
-     inkscape:window-height="1211"
-     inkscape:window-x="3260"
-     inkscape:window-y="138"
-     inkscape:window-maximized="0"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showguides="true"><sodipodi:guide
-       position="50.002551,111.99556"
-       orientation="1,0"
-       id="guide3"
-       inkscape:locked="false" /></sodipodi:namedview><metadata
-     id="metadata4"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-952.36218)"
-     style="display:inline"><path
-       style="display:inline;opacity:1;fill-opacity:1;stroke:#000000;stroke-width:2.7822;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 49.84375,1.71875 C 36.719738,1.71875 26.0625,12.375988 26.0625,25.5 c 0,7.477454 3.475825,14.112734 8.875,18.46875 -10.497549,5.974948 -17.018351,18.227376 -20.625,31.6875 -5.2744126,19.6844 15.911513,22.5625 35.53125,22.5625 19.619736,0 40.705577,-3.2516 35.53125,-22.5625 C 81.693381,61.916246 75.224585,49.827177 64.8125,43.9375 70.181573,39.580662 73.59375,32.953205 73.59375,25.5 c 0,-13.124012 -10.625988,-23.78125 -23.75,-23.78125 z"
-       id="left"
-       transform="translate(0,952.36218)" /></g><g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer 2"><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"
-       d="M 32.759215,70.975878 C 21.325591,59.527249 15.285457,53.364742 14.83416,52.687661 9.63501,44.887358 10.761698,34.682189 17.532813,28.244167 c 0.714467,-0.67932 1.7595,-1.547825 2.322296,-1.930012 1.523368,-1.034499 4.16292,-2.238249 5.970504,-2.722807 1.443337,-0.386915 1.89368,-0.430056 4.60804,-0.441421 3.235152,-0.01355 4.137158,0.122126 6.533598,0.982701 3.134814,1.125736 4.852536,2.328512 8.590659,6.015311 1.655211,1.632489 3.214977,3.046293 3.466142,3.141784 0.581823,0.221209 1.425484,0.221963 2.004581,0.0018 0.248578,-0.09451 1.808341,-1.50526 3.466143,-3.135003 3.106188,-3.053615 4.561863,-4.183076 6.729637,-5.221531 5.163233,-2.473409 10.985326,-2.505514 16.312741,-0.08995 2.006474,0.909779 3.995303,2.393791 5.679043,4.166785 1.393273,1.467129 2.577641,3.132133 3.390238,4.833386 1.300107,2.721904 1.79207,4.98307 1.79207,8.23671 0,4.676126 -1.161204,8.043076 -4.066015,11.789548 -0.567611,0.732076 -8.293484,8.531153 -17.668765,17.836181 l -16.660107,16.53525 z"
-       id="path2"
-       sodipodi:nodetypes="sssssssssssssssssscs"
-       inkscape:label="heart" /></g></svg>
--- a/cockatrice/resources/usericons/pawn_judge_single.svg
+++ b/cockatrice/resources/usericons/pawn_judge_single.svg
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="100"
-   height="100"
-   id="svg5322"
-   version="1.1"
-   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
-   sodipodi:docname="pawn_judge_single.svg"
-   xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
-     id="defs3"><inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective5328" /><inkscape:perspective
-       id="perspective5305"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" /><linearGradient
-       id="linearGradient5181"><stop
-         style="stop-color:#0fbb00;stop-opacity:1;"
-         offset="0"
-         id="stop5183" /><stop
-         style="stop-color:#064400;stop-opacity:1;"
-         offset="1"
-         id="stop5185" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600-2"
-       id="radialGradient3606-7"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
-       fy="131.40274"
-       r="25.501276"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" /><linearGradient
-       id="linearGradient3600-2"><stop
-         style="stop-color:#ffc33d;stop-opacity:1;"
-         offset="0"
-         id="stop3602-4" /><stop
-         style="stop-color:#e09900;stop-opacity:1;"
-         offset="1"
-         id="stop3604-9" /></linearGradient><inkscape:perspective
-       id="perspective5478"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" /><linearGradient
-       id="linearGradient5189"><stop
-         style="stop-color:#000ec9;stop-opacity:1;"
-         offset="0"
-         id="stop5191" /><stop
-         style="stop-color:#000657;stop-opacity:1;"
-         offset="1"
-         id="stop5193" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600-4"
-       id="radialGradient3606-1"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
-       fy="131.40274"
-       r="25.501276"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" /><linearGradient
-       id="linearGradient3600-4"><stop
-         style="stop-color:#ffc33d;stop-opacity:1;"
-         offset="0"
-         id="stop3602-3" /><stop
-         style="stop-color:#e09900;stop-opacity:1;"
-         offset="1"
-         id="stop3604-5" /></linearGradient><inkscape:perspective
-       id="perspective5559"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5173"
-       id="linearGradient5179"
-       x1="167.33386"
-       y1="178.83276"
-       x2="244.78181"
-       y2="178.83276"
-       gradientUnits="userSpaceOnUse" /><linearGradient
-       id="linearGradient5173"><stop
-         style="stop-color:#f50000;stop-opacity:1;"
-         offset="0"
-         id="stop5175" /><stop
-         style="stop-color:#950000;stop-opacity:1;"
-         offset="1"
-         id="stop5177" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600"
-       id="radialGradient5169"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
-       fy="131.40274"
-       r="25.501276" /><linearGradient
-       id="linearGradient3600"><stop
-         style="stop-color:#ffc13d;stop-opacity:1;"
-         offset="0"
-         id="stop3602" /><stop
-         style="stop-color:#e09900;stop-opacity:1;"
-         offset="1"
-         id="stop3604" /></linearGradient><radialGradient
-       r="25.501276"
-       fy="131.40274"
-       fx="324.32715"
-       cy="131.40274"
-       cx="324.32715"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5574"
-       xlink:href="#linearGradient3600"
-       inkscape:collect="always" /><inkscape:perspective
-       id="perspective5663"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600-7"
-       id="radialGradient3606-8"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
-       fy="131.40274"
-       r="25.501276"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" /><linearGradient
-       id="linearGradient3600-7"><stop
-         style="stop-color:#ffc13d;stop-opacity:1;"
-         offset="0"
-         id="stop3602-7" /><stop
-         style="stop-color:#e09900;stop-opacity:1;"
-         offset="1"
-         id="stop3604-6" /></linearGradient><radialGradient
-       r="25.501276"
-       fy="131.40274"
-       fx="324.32715"
-       cy="131.40274"
-       cx="324.32715"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5676"
-       xlink:href="#linearGradient3600-7"
-       inkscape:collect="always" /></defs><sodipodi:namedview
-     inkscape:document-units="mm"
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6"
-     inkscape:cx="58.035715"
-     inkscape:cy="30.982143"
-     inkscape:current-layer="svg5322"
-     showgrid="false"
-     inkscape:window-width="2560"
-     inkscape:window-height="1369"
-     inkscape:window-x="2552"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showguides="true"><sodipodi:guide
-       position="50.002551,111.99556"
-       orientation="1,0"
-       id="guide3"
-       inkscape:locked="false" /></sodipodi:namedview><metadata
-     id="metadata4"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-952.36218)"
-     style="display:inline">
-    <path
-       style="display:inline;opacity:1;fill-opacity:1;stroke:#000000;stroke-width:2.7822;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 49.84375,1.71875 C 36.719738,1.71875 26.0625,12.375988 26.0625,25.5 c 0,7.477454 3.475825,14.112734 8.875,18.46875 -10.497549,5.974948 -17.018351,18.227376 -20.625,31.6875 -5.2744126,19.6844 15.911513,22.5625 35.53125,22.5625 19.619736,0 40.705577,-3.2516 35.53125,-22.5625 C 81.693381,61.916246 75.224585,49.827177 64.8125,43.9375 70.181573,39.580662 73.59375,32.953205 73.59375,25.5 c 0,-13.124012 -10.625988,-23.78125 -23.75,-23.78125 z"
-       id="left"
-       sodipodi:insensitive="true"
-       transform="translate(0,952.36218)" />
-    <path
-       d="m 46.233565,28.34179 -1.622479,1.622479 a 0.59382712,0.59382712 0 0 1 -0.840444,-0.01135 0.60031703,0.60031703 0 0 1 -0.09086,-0.739851 l -0.713891,-0.71389 -0.579225,0.580848 a 0.62303175,0.62303175 0 0 1 -0.181718,0.515948 l -2.524576,2.521331 a 0.62870157,0.62870157 0 0 1 -0.889118,-0.889117 l 2.522954,-2.521332 a 0.63438908,0.63438908 0 0 1 0.686308,-0.137911 l 0.515949,-0.515947 -0.713891,-0.713892 a 0.603562,0.603562 0 0 1 -0.751204,-0.9313 l 1.622478,-1.62248 a 0.603562,0.603562 0 0 1 0.929682,0.754453 l 1.872338,1.87234 a 0.603562,0.603562 0 0 1 0.7577,0.92968 z"
-       id="path1-2"
-       style="display:inline;fill:#e1964c;fill-rule:nonzero;stroke:#000000;stroke-width:0.34015748;stroke-opacity:1;fill-opacity:1;stroke-dasharray:none"
-       transform="matrix(0,-11.111111,11.111111,0,-268.32014,1478.2316)"
-       inkscape:label="gavel" /></g></svg>
--- a/cockatrice/resources/userlevels/admin.svg
+++ b/cockatrice/resources/userlevels/admin.svg
@@ -0,0 +1,301 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="100"
+   height="100"
+   id="svg5322"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="admin.svg">
+  <defs
+     id="defs3">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective5328" />
+    <inkscape:perspective
+       id="perspective5305"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient5181">
+      <stop
+         style="stop-color:#0fbb00;stop-opacity:1;"
+         offset="0"
+         id="stop5183" />
+      <stop
+         style="stop-color:#064400;stop-opacity:1;"
+         offset="1"
+         id="stop5185" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-2"
+       id="radialGradient3606-7"
+       cx="324.32715"
+       cy="131.40274"
+       fx="324.32715"
+       fy="131.40274"
+       r="25.501276"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" />
+    <linearGradient
+       id="linearGradient3600-2">
+      <stop
+         style="stop-color:#ffc33d;stop-opacity:1;"
+         offset="0"
+         id="stop3602-4" />
+      <stop
+         style="stop-color:#e09900;stop-opacity:1;"
+         offset="1"
+         id="stop3604-9" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective5478"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient5189">
+      <stop
+         style="stop-color:#000ec9;stop-opacity:1;"
+         offset="0"
+         id="stop5191" />
+      <stop
+         style="stop-color:#000657;stop-opacity:1;"
+         offset="1"
+         id="stop5193" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-4"
+       id="radialGradient3606-1"
+       cx="324.32715"
+       cy="131.40274"
+       fx="324.32715"
+       fy="131.40274"
+       r="25.501276"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" />
+    <linearGradient
+       id="linearGradient3600-4">
+      <stop
+         style="stop-color:#ffc33d;stop-opacity:1;"
+         offset="0"
+         id="stop3602-3" />
+      <stop
+         style="stop-color:#e09900;stop-opacity:1;"
+         offset="1"
+         id="stop3604-5" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective5559"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5173"
+       id="linearGradient5179"
+       x1="167.33386"
+       y1="178.83276"
+       x2="244.78181"
+       y2="178.83276"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient5173">
+      <stop
+         style="stop-color:#f50000;stop-opacity:1;"
+         offset="0"
+         id="stop5175" />
+      <stop
+         style="stop-color:#950000;stop-opacity:1;"
+         offset="1"
+         id="stop5177" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="radialGradient5169"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
+       cx="324.32715"
+       cy="131.40274"
+       fx="324.32715"
+       fy="131.40274"
+       r="25.501276" />
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ffc13d;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#e09900;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <radialGradient
+       r="25.501276"
+       fy="131.40274"
+       fx="324.32715"
+       cy="131.40274"
+       cx="324.32715"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5574"
+       xlink:href="#linearGradient3600"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       id="perspective5663"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-7"
+       id="radialGradient3606-8"
+       cx="324.32715"
+       cy="131.40274"
+       fx="324.32715"
+       fy="131.40274"
+       r="25.501276"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" />
+    <linearGradient
+       id="linearGradient3600-7">
+      <stop
+         style="stop-color:#ffc13d;stop-opacity:1;"
+         offset="0"
+         id="stop3602-7" />
+      <stop
+         style="stop-color:#e09900;stop-opacity:1;"
+         offset="1"
+         id="stop3604-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5189-1"
+       id="linearGradient5394"
+       gradientUnits="userSpaceOnUse"
+       x1="385.03503"
+       y1="180.09546"
+       x2="462.48297"
+       y2="180.09546"
+       gradientTransform="matrix(0.96839241,0,0,0.96839241,-360.365,847.52359)" />
+    <linearGradient
+       id="linearGradient5189-1">
+      <stop
+         style="stop-color:#000ec9;stop-opacity:1;"
+         offset="0"
+         id="stop5191-0" />
+      <stop
+         style="stop-color:#000657;stop-opacity:1;"
+         offset="1"
+         id="stop5193-4" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5173-1"
+       id="linearGradient5436"
+       x1="12.105612"
+       y1="1021.5341"
+       x2="87.549789"
+       y2="1021.5341"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-952.36218)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5173-1"
+       id="linearGradient5581"
+       gradientUnits="userSpaceOnUse"
+       x1="167.33386"
+       y1="178.83276"
+       x2="244.78181"
+       y2="178.83276"
+       gradientTransform="matrix(0.96839241,0,0,0.96839241,-149.54484,848.74636)" />
+    <linearGradient
+       id="linearGradient5173-1">
+      <stop
+         style="stop-color:#ff2700;stop-opacity:1;"
+         offset="0"
+         id="stop5175-5" />
+      <stop
+         style="stop-color:#ff2700;stop-opacity:1;"
+         offset="1"
+         id="stop5177-3" />
+    </linearGradient>
+    <linearGradient
+       y2="178.83276"
+       x2="244.78181"
+       y1="178.83276"
+       x1="167.33386"
+       gradientTransform="matrix(0.96839241,0,0,0.96839241,-52.401983,877.75333)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5598"
+       xlink:href="#linearGradient5173-1"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-units="mm"
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="-32.045264"
+     inkscape:cy="65.284297"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1028"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-952.36218)">
+    <path
+       style="fill:url(#linearGradient5436);fill-opacity:1;stroke:black;stroke-width:2.78220295999999980;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="path3597-8" />
+  </g>
+</svg>
--- a/cockatrice/resources/userlevels/admin_buddy.svg
+++ b/cockatrice/resources/userlevels/admin_buddy.svg
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 64 64"
+   enable-background="new 0 0 64 64"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   width="100%"
+   height="100%"
+   sodipodi:docname="admin_buddy.svg">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10">
+    <linearGradient
+       id="linearGradient3766">
+      <stop
+         style="stop-color:#ff2700;stop-opacity:1;"
+         offset="0"
+         id="stop3768" />
+      <stop
+         style="stop-color:#820000;stop-opacity:1;"
+         offset="1"
+         id="stop3770" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5225">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5227" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5229" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5219"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5221" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3758">
+      <stop
+         id="stop3760"
+         offset="0"
+         style="stop-color:#0fbb00;stop-opacity:1;" />
+      <stop
+         id="stop3762"
+         offset="1"
+         style="stop-color:#064400;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3750">
+      <stop
+         style="stop-color:#ece400;stop-opacity:1;"
+         offset="0"
+         id="stop3752" />
+      <stop
+         style="stop-color:#ece400;stop-opacity:0;"
+         offset="1"
+         id="stop3754" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3758-7"
+       id="linearGradient3756-1"
+       x1="1.960216"
+       y1="31.261461"
+       x2="60.456024"
+       y2="31.261461"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3758-7">
+      <stop
+         id="stop3760-4"
+         offset="0"
+         style="stop-color:#ece400;stop-opacity:1;" />
+      <stop
+         id="stop3762-0"
+         offset="1"
+         style="stop-color:#ec8b00;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1028"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="5.2149125"
+     inkscape:cx="-37.840247"
+     inkscape:cy="51.245759"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     d="M 61.442826,23.621762 38.532402,23.515555 31.556101,0.331013 24.578789,23.515555 1.6673502,23.621765 20.267785,38.422001 10.863888,63.668987 31.556101,47.626631 52.258426,63.668987 42.843404,38.422001 z"
+     id="path4-9"
+     style="fill:#000000;fill-opacity:1"
+     inkscape:connector-curvature="0" />
+  <path
+     d="M 57.150089,25.064396 37.504323,24.973324 31.522122,5.092503 25.539054,24.973324 5.8924192,25.064399 21.842354,37.75565 13.778482,59.405024 31.522122,45.64865 49.274434,59.405024 41.201022,37.75565 z"
+     id="path4"
+     style="fill:#ff2700;fill-opacity:1;fill-rule:nonzero"
+     inkscape:connector-curvature="0" />
+</svg>
--- a/cockatrice/resources/usericons/pawn_vip_single.svg
+++ b/cockatrice/resources/usericons/pawn_vip_single.svg
@@ -337,14 +337,14 @@
     id="layer1"
     transform="translate(0,-952.36218)">
    <path
-       style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#ff0000;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="path3597-8" />
    <path
       sodipodi:type="star"
       style="fill:url(#linearGradient3425);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="star"
+       id="path3415"
       sodipodi:sides="5"
       sodipodi:cx="27.80283"
       sodipodi:cy="970.9433"
--- a/cockatrice/resources/userlevels/admin_vip_buddy.svg
+++ b/cockatrice/resources/userlevels/admin_vip_buddy.svg
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 64 64"
+   enable-background="new 0 0 64 64"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   width="100%"
+   height="100%"
+   sodipodi:docname="admin_buddy.svg">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10">
+    <linearGradient
+       id="linearGradient3766">
+      <stop
+         style="stop-color:#ff2700;stop-opacity:1;"
+         offset="0"
+         id="stop3768" />
+      <stop
+         style="stop-color:#820000;stop-opacity:1;"
+         offset="1"
+         id="stop3770" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5225">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5227" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5229" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5219"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5221" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3758">
+      <stop
+         id="stop3760"
+         offset="0"
+         style="stop-color:#0fbb00;stop-opacity:1;" />
+      <stop
+         id="stop3762"
+         offset="1"
+         style="stop-color:#064400;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3750">
+      <stop
+         style="stop-color:#ece400;stop-opacity:1;"
+         offset="0"
+         id="stop3752" />
+      <stop
+         style="stop-color:#ece400;stop-opacity:0;"
+         offset="1"
+         id="stop3754" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3758-7"
+       id="linearGradient3756-1"
+       x1="1.960216"
+       y1="31.261461"
+       x2="60.456024"
+       y2="31.261461"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3758-7">
+      <stop
+         id="stop3760-4"
+         offset="0"
+         style="stop-color:#ece400;stop-opacity:1;" />
+      <stop
+         id="stop3762-0"
+         offset="1"
+         style="stop-color:#ec8b00;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1028"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="5.2149125"
+     inkscape:cx="-37.840247"
+     inkscape:cy="51.245759"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     d="M 61.442826,23.621762 38.532402,23.515555 31.556101,0.331013 24.578789,23.515555 1.6673502,23.621765 20.267785,38.422001 10.863888,63.668987 31.556101,47.626631 52.258426,63.668987 42.843404,38.422001 z"
+     id="path4-9"
+     style="fill:#000000;fill-opacity:1"
+     inkscape:connector-curvature="0" />
+  <path
+     d="M 57.150089,25.064396 37.504323,24.973324 31.522122,5.092503 25.539054,24.973324 5.8924192,25.064399 21.842354,37.75565 13.778482,59.405024 31.522122,45.64865 49.274434,59.405024 41.201022,37.75565 z"
+     id="path4"
+     style="fill:#ff2700;fill-opacity:1;fill-rule:nonzero"
+     inkscape:connector-curvature="0" />
+</svg>
--- a/cockatrice/resources/userlevels/moderator.svg
+++ b/cockatrice/resources/userlevels/moderator.svg
@@ -0,0 +1,294 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="100"
+   height="100"
+   id="svg5322"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="moderator.svg">
+  <defs
+     id="defs3">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective5328" />
+    <inkscape:perspective
+       id="perspective5305"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient5181">
+      <stop
+         style="stop-color:#0fbb00;stop-opacity:1;"
+         offset="0"
+         id="stop5183" />
+      <stop
+         style="stop-color:#064400;stop-opacity:1;"
+         offset="1"
+         id="stop5185" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-2"
+       id="radialGradient3606-7"
+       cx="324.32715"
+       cy="131.40274"
+       fx="324.32715"
+       fy="131.40274"
+       r="25.501276"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" />
+    <linearGradient
+       id="linearGradient3600-2">
+      <stop
+         style="stop-color:#ffc33d;stop-opacity:1;"
+         offset="0"
+         id="stop3602-4" />
+      <stop
+         style="stop-color:#e09900;stop-opacity:1;"
+         offset="1"
+         id="stop3604-9" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective5478"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient5189">
+      <stop
+         style="stop-color:#000ec9;stop-opacity:1;"
+         offset="0"
+         id="stop5191" />
+      <stop
+         style="stop-color:#000657;stop-opacity:1;"
+         offset="1"
+         id="stop5193" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-4"
+       id="radialGradient3606-1"
+       cx="324.32715"
+       cy="131.40274"
+       fx="324.32715"
+       fy="131.40274"
+       r="25.501276"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" />
+    <linearGradient
+       id="linearGradient3600-4">
+      <stop
+         style="stop-color:#ffc33d;stop-opacity:1;"
+         offset="0"
+         id="stop3602-3" />
+      <stop
+         style="stop-color:#e09900;stop-opacity:1;"
+         offset="1"
+         id="stop3604-5" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective5559"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5173"
+       id="linearGradient5179"
+       x1="167.33386"
+       y1="178.83276"
+       x2="244.78181"
+       y2="178.83276"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient5173">
+      <stop
+         style="stop-color:#f50000;stop-opacity:1;"
+         offset="0"
+         id="stop5175" />
+      <stop
+         style="stop-color:#950000;stop-opacity:1;"
+         offset="1"
+         id="stop5177" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="radialGradient5169"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
+       cx="324.32715"
+       cy="131.40274"
+       fx="324.32715"
+       fy="131.40274"
+       r="25.501276" />
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ffc13d;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#e09900;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <radialGradient
+       r="25.501276"
+       fy="131.40274"
+       fx="324.32715"
+       cy="131.40274"
+       cx="324.32715"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5574"
+       xlink:href="#linearGradient3600"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       id="perspective5663"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-7"
+       id="radialGradient3606-8"
+       cx="324.32715"
+       cy="131.40274"
+       fx="324.32715"
+       fy="131.40274"
+       r="25.501276"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" />
+    <linearGradient
+       id="linearGradient3600-7">
+      <stop
+         style="stop-color:#ffc13d;stop-opacity:1;"
+         offset="0"
+         id="stop3602-7" />
+      <stop
+         style="stop-color:#e09900;stop-opacity:1;"
+         offset="1"
+         id="stop3604-6" />
+    </linearGradient>
+    <radialGradient
+       r="25.501276"
+       fy="131.40274"
+       fx="324.32715"
+       cy="131.40274"
+       cx="324.32715"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5676"
+       xlink:href="#linearGradient3600-7"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-units="mm"
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6"
+     inkscape:cx="63.241533"
+     inkscape:cy="46.246766"
+     inkscape:current-layer="g5249"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1028"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-952.36218)">
+    <g
+       id="g5249"
+       transform="translate(0.53874115,0.90502985)">
+      <path
+         style="fill:#ffffff;stroke:#000000;stroke-width:4.45809746000000030;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
+         d="m 49.582319,954.34642 c -12.850034,0 -23.284789,10.43476 -23.284789,23.28479 0,7.32135 3.403263,13.81811 8.689724,18.08319 -10.278401,5.8502 -16.663073,17.8469 -20.19443,31.0259 -5.1178053,19.1 15.207096,22.0401 34.269334,22.0915 l 0,0.031 c 0.290839,0 0.566498,0.031 0.856734,0.031 19.210152,0 39.855802,-3.1837 34.789494,-22.0914 -3.636192,-13.5705 -10.027831,-25.4711 -20.378015,-31.17899 5.208701,-4.26694 8.506139,-10.73278 8.506139,-17.9914 0,-12.85003 -10.404159,-23.28479 -23.254191,-23.28479 z"
+         id="path3597-8"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.97203517px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 50.522358,952.70715 0,95.71425"
+         id="path5303"
+         inkscape:connector-curvature="0" />
+      <path
+         style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 51.062274,1000.5844 0,-46.66155 1.096703,0.005 c 3.640423,0.0175 9.166159,2.51708 12.389647,5.60443 4.895085,4.68835 7.418012,11.18204 6.97848,17.96172 -0.388976,5.99986 -2.630586,10.87224 -6.948405,15.1031 l -2.054611,2.01323 2.95836,2.1147 c 3.465395,2.47714 7.400043,6.67727 9.661364,10.31317 3.324266,5.3451 6.789556,14.1029 8.149825,20.5971 2.583182,12.3327 -5.995009,18.5909 -26.579121,19.3908 l -5.652242,0.2196 0,-46.6616 z"
+         id="path5343"
+         inkscape:connector-curvature="0" />
+      <path
+         style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 51.062274,1000.5844 0,-46.66155 1.096703,0.005 c 3.711439,0.0179 9.230395,2.54932 12.52612,5.74551 2.710429,2.62858 4.363146,5.23853 5.699734,9.00096 0.930917,2.62048 1.042531,3.35671 1.066373,7.03397 0.02902,4.47725 -0.343832,6.4262 -1.860873,9.72679 -1.358173,2.95494 -2.652341,4.81714 -4.971275,7.15326 l -2.043484,2.05863 2.932618,2.09329 c 6.98445,4.98544 12.210204,12.81934 15.750058,23.61084 3.543721,10.8033 3.39602,15.1985 -0.654452,19.4747 -4.329667,4.571 -11.449354,6.7169 -23.88928,7.2003 l -5.652242,0.2196 0,-46.6616 z"
+         id="path5345"
+         inkscape:connector-curvature="0" />
+      <path
+         style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 51.062274,1000.5844 0,-46.66155 1.127086,0 c 1.963684,0 6.316627,1.3793 8.624731,2.73288 1.305624,0.76568 3.277555,2.429 4.764529,4.01888 4.347263,4.6481 6.318993,10.15893 5.954049,16.6411 -0.326518,5.79966 -2.122114,9.97998 -6.25177,14.55473 -1.44716,1.60313 -2.388203,2.91735 -2.210758,3.08744 0.169927,0.16289 1.447842,1.10199 2.839812,2.08691 6.268453,4.43531 11.362918,11.94641 14.960201,22.05661 2.740177,7.7013 3.480992,12.7857 2.399253,16.4664 -0.490882,1.6703 -1.040601,2.5538 -2.66191,4.2781 -4.29247,4.5651 -11.326737,6.6778 -23.892981,7.176 l -5.652242,0.2241 0,-46.6616 z"
+         id="path5347"
+         inkscape:connector-curvature="0" />
+      <path
+         style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 51.062274,1000.5855 0,-46.66265 1.127086,0 c 1.830826,0 6.182017,1.32383 8.427379,2.56398 3.074383,1.69804 7.222246,6.22736 8.789514,9.59784 4.043357,8.69543 2.602054,18.25614 -3.837601,25.45626 -1.482649,1.65774 -2.695724,3.09743 -2.695724,3.19932 0,0.10189 1.186029,0.99046 2.635621,1.97461 3.078254,2.08987 6.81705,5.92344 9.062839,9.29254 3.274171,4.9119 7.232757,14.564 8.731682,21.29 0.646579,2.9014 0.614978,6.1318 -0.08275,8.4594 -0.86467,2.8846 -4.147214,6.2392 -7.573604,7.74 -5.13932,2.251 -10.156844,3.194 -18.763476,3.5265 l -5.820965,0.2249 0,-46.6627 z"
+         id="path5349"
+         inkscape:connector-curvature="0" />
+      <path
+         style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 51.062274,1000.5853 0,-46.66245 1.164456,0 c 4.764705,0 11.112502,3.49049 14.697127,8.08157 5.260553,6.73756 6.190324,16.72129 2.284493,24.53056 -0.608066,1.21576 -2.304134,3.5367 -3.77148,5.16099 -1.466571,1.62342 -2.603753,3.01808 -2.527074,3.09924 0.07667,0.0811 1.300896,0.95003 2.720481,1.93083 6.904062,4.77006 12.487313,13.40446 16.085176,24.87536 1.733472,5.5268 2.208105,8.1847 2.003089,11.2173 -0.604468,8.9414 -9.318247,13.5855 -26.66658,14.2125 l -5.989688,0.2165 0,-46.6624 z"
+         id="path5351"
+         inkscape:connector-curvature="0" />
+      <path
+         style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 51.062274,1000.7111 0,-46.78825 1.265427,0.005 c 4.153532,0.0173 9.758512,2.75815 13.295303,6.50137 1.792452,1.89707 2.63621,3.17089 3.798098,5.73397 1.746736,3.85324 2.225454,6.0014 2.225454,9.98629 0,6.50755 -2.416561,12.11247 -7.223569,16.75421 -0.945331,0.91283 -1.642858,1.7317 -1.550059,1.81971 0.0928,0.088 1.155757,0.85585 2.362131,1.70631 3.35942,2.36829 4.992087,3.86859 7.229212,6.64329 3.924869,4.8681 7.249491,11.7229 9.87191,20.3544 1.173448,3.8623 1.289753,4.5994 1.289753,8.1737 0,3.6878 -0.0614,4.0459 -1.001592,5.8425 -1.309266,2.5017 -3.108338,4.122 -6.422247,5.7839 -4.375689,2.1945 -9.62921,3.3669 -16.70364,3.7278 -2.134354,0.1088 -4.905639,0.2757 -6.158413,0.3708 l -2.277768,0.1729 0,-46.7882 z"
+         id="path5353"
+         inkscape:connector-curvature="0" />
+      <path
+         style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 51.062274,1000.6174 0,-46.98372 1.434151,0.16768 c 5.155008,0.60274 9.462857,2.72154 12.938259,6.36366 4.743924,4.9715 6.879132,11.35611 6.164642,18.43328 -0.537028,5.31935 -3.090083,10.59498 -6.838339,14.13074 l -1.940717,1.83069 3.040832,2.20427 c 3.580837,2.59571 7.189745,6.4912 9.552957,10.3116 4.895721,7.9144 9.235933,21.4918 8.504868,26.6055 -0.813112,5.6877 -5.438715,9.6977 -13.622159,11.8093 -3.808212,0.9826 -7.680557,1.4713 -14.763317,1.8633 l -4.471177,0.2474 0,-46.9837 z"
+         id="path5355"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
--- a/cockatrice/resources/userlevels/moderator_buddy.svg
+++ b/cockatrice/resources/userlevels/moderator_buddy.svg
@@ -114,18 +114,18 @@
     inkscape:current-layer="svg2" />
  <path
     d="M 61.442826,23.621762 38.532402,23.515555 31.556101,0.331013 24.578789,23.515555 1.6673502,23.621765 20.267785,38.422001 10.863888,63.668987 31.556101,47.626631 52.258426,63.668987 42.843404,38.422001 z"
-     id="outline"
+     id="path4-9"
     style="fill:#000000;fill-opacity:1"
     inkscape:connector-curvature="0" />
  <path
     d="M 55.041981,25.814432 36.921945,25.730432 31.404334,7.3935963 25.885923,25.730432 7.7650846,25.814434 22.476316,37.520057 15.0387,57.488097 31.404334,44.800071 47.777965,57.488097 40.331551,37.520057 z"
-     id="left"
-     style="fill-opacity:1;fill-rule:nonzero"
+     id="path4"
+     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero"
     inkscape:connector-curvature="0" />
  <path
     d="M 56.276895,25.211993 37.3433,24.856806 31.486705,5.7742084 c 0.04705,37.4359336 -0.01851,2.6744908 -0.0678,40.1841446 L 48.19932,58.580578 40.956295,37.527792 z"
-     id="right"
-     style="fill-opacity:1;fill-rule:nonzero"
+     id="path4-1"
+     style="fill:#000000;fill-opacity:1;fill-rule:nonzero"
     inkscape:connector-curvature="0"
     sodipodi:nodetypes="ccccccc" />
 </svg>
--- a/cockatrice/resources/usericons/pawn_vip_double.svg
+++ b/cockatrice/resources/usericons/pawn_vip_double.svg
@@ -337,19 +337,19 @@
     id="layer1"
     transform="translate(0,-952.36218)">
    <path
-       style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#ffffff;fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
       d="M 49.84375 1.71875 C 36.719738 1.71875 26.0625 12.375988 26.0625 25.5 C 26.0625 32.977454 29.538325 39.612734 34.9375 43.96875 C 24.439951 49.943698 17.919149 62.196126 14.3125 75.65625 C 9.0380874 95.34065 30.224013 98.21875 49.84375 98.21875 C 69.463486 98.21875 90.549327 94.96715 85.375 75.65625 C 81.693381 61.916246 75.224585 49.827177 64.8125 43.9375 C 70.181573 39.580662 73.59375 32.953205 73.59375 25.5 C 73.59375 12.375988 62.967762 1.71875 49.84375 1.71875 z "
       transform="translate(0,952.36218)"
-       id="right" />
+       id="path3597-8" />
    <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"
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
       d="m 51.28696,1001.834 0,-46.98372 1.434151,0.16768 c 5.155008,0.60274 9.462857,2.72154 12.938257,6.36366 4.74393,4.9715 6.87913,11.35611 6.16464,18.43328 -0.53702,5.31935 -3.09008,10.59498 -6.83833,14.13074 l -1.94072,1.83069 3.04083,2.20427 c 3.58084,2.5957 7.18975,6.4912 9.55296,10.3116 4.89572,7.9144 9.23593,21.4918 8.50487,26.6055 -0.81312,5.6877 -5.43872,9.6977 -13.62216,11.8093 -3.80822,0.9826 -7.68056,1.4713 -14.763321,1.8633 l -4.471177,0.2474 0,-46.9837 z"
-       id="left"
+       id="path5355"
       inkscape:connector-curvature="0" />
    <path
       sodipodi:type="star"
       style="fill:url(#linearGradient3425-5);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="star"
+       id="path3415-0"
       sodipodi:sides="5"
       sodipodi:cx="27.80283"
       sodipodi:cy="970.9433"
--- a/cockatrice/resources/userlevels/moderator_vip_buddy.svg
+++ b/cockatrice/resources/userlevels/moderator_vip_buddy.svg
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 64 64"
+   enable-background="new 0 0 64 64"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   width="100%"
+   height="100%"
+   sodipodi:docname="moderator_buddy.svg">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10">
+    <linearGradient
+       id="linearGradient5225">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5227" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5229" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5219"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5221" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3758">
+      <stop
+         id="stop3760"
+         offset="0"
+         style="stop-color:#0fbb00;stop-opacity:1;" />
+      <stop
+         id="stop3762"
+         offset="1"
+         style="stop-color:#064400;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3750">
+      <stop
+         style="stop-color:#ece400;stop-opacity:1;"
+         offset="0"
+         id="stop3752" />
+      <stop
+         style="stop-color:#ece400;stop-opacity:0;"
+         offset="1"
+         id="stop3754" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3758-7"
+       id="linearGradient3756-1"
+       x1="1.960216"
+       y1="31.261461"
+       x2="60.456024"
+       y2="31.261461"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3758-7">
+      <stop
+         id="stop3760-4"
+         offset="0"
+         style="stop-color:#ece400;stop-opacity:1;" />
+      <stop
+         id="stop3762-0"
+         offset="1"
+         style="stop-color:#ec8b00;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1028"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="5.2149125"
+     inkscape:cx="-26.445493"
+     inkscape:cy="31.598459"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     d="M 61.442826,23.621762 38.532402,23.515555 31.556101,0.331013 24.578789,23.515555 1.6673502,23.621765 20.267785,38.422001 10.863888,63.668987 31.556101,47.626631 52.258426,63.668987 42.843404,38.422001 z"
+     id="path4-9"
+     style="fill:#000000;fill-opacity:1"
+     inkscape:connector-curvature="0" />
+  <path
+     d="M 55.041981,25.814432 36.921945,25.730432 31.404334,7.3935963 25.885923,25.730432 7.7650846,25.814434 22.476316,37.520057 15.0387,57.488097 31.404334,44.800071 47.777965,57.488097 40.331551,37.520057 z"
+     id="path4"
+     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero"
+     inkscape:connector-curvature="0" />
+  <path
+     d="M 56.276895,25.211993 37.3433,24.856806 31.486705,5.7742084 c 0.04705,37.4359336 -0.01851,2.6744908 -0.0678,40.1841446 L 48.19932,58.580578 40.956295,37.527792 z"
+     id="path4-1"
+     style="fill:#000000;fill-opacity:1;fill-rule:nonzero"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccc" />
+</svg>
--- a/cockatrice/resources/usericons/pawn_double.svg
+++ b/cockatrice/resources/usericons/pawn_double.svg
@@ -2,20 +2,20 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->

 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   width="100"
   height="100"
   id="svg5322"
   version="1.1"
-   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
-   sodipodi:docname="pawn_double.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="normal.svg">
  <defs
     id="defs3">
    <inkscape:perspective
@@ -195,16 +195,66 @@
         id="stop3604-6" />
    </linearGradient>
    <radialGradient
-       r="25.501276"
-       fy="131.40274"
-       fx="324.32715"
-       cy="131.40274"
-       cx="324.32715"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5676"
+       inkscape:collect="always"
       xlink:href="#linearGradient3600-7"
+       id="radialGradient5254"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
+       cx="324.32715"
+       cy="131.40274"
+       fx="324.32715"
+       fy="131.40274"
+       r="25.501276" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5189-1"
+       id="linearGradient5394"
+       gradientUnits="userSpaceOnUse"
+       x1="385.03503"
+       y1="180.09546"
+       x2="462.48297"
+       y2="180.09546"
+       gradientTransform="matrix(0.96839241,0,0,0.96839241,-360.365,847.52359)" />
+    <linearGradient
+       id="linearGradient5189-1">
+      <stop
+         style="stop-color:#32c8ed;stop-opacity:1;"
+         offset="0"
+         id="stop5191-0" />
+      <stop
+         style="stop-color:#32c8ed;stop-opacity:1;"
+         offset="1"
+         id="stop5193-4" />
+    </linearGradient>
+    <linearGradient
+       y2="180.09546"
+       x2="462.48297"
+       y1="180.09546"
+       x1="385.03503"
+       gradientTransform="matrix(0.96839241,0,0,0.96839241,-318.22214,876.88769)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5411"
+       xlink:href="#linearGradient5189-1"
       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5189-1"
+       id="linearGradient5436"
+       x1="12.105612"
+       y1="1021.5341"
+       x2="87.549789"
+       y2="1021.5341"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5189-1"
+       id="linearGradient3795"
+       gradientUnits="userSpaceOnUse"
+       x1="12.105612"
+       y1="1021.5341"
+       x2="87.549789"
+       y2="1021.5341"
+       gradientTransform="translate(0,-952.36218)" />
  </defs>
  <sodipodi:namedview
     inkscape:document-units="mm"
@@ -214,19 +264,16 @@
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
-     inkscape:zoom="5.6"
-     inkscape:cx="63.214286"
-     inkscape:cy="46.160714"
-     inkscape:current-layer="g5249"
+     inkscape:zoom="2.8"
+     inkscape:cx="-150.71429"
+     inkscape:cy="59.570011"
+     inkscape:current-layer="layer1"
     showgrid="false"
-     inkscape:window-width="1147"
-     inkscape:window-height="1211"
-     inkscape:window-x="2842"
-     inkscape:window-y="58"
-     inkscape:window-maximized="0"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1028"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
  <metadata
     id="metadata4">
    <rdf:RDF>
@@ -244,25 +291,10 @@
     inkscape:groupmode="layer"
     id="layer1"
     transform="translate(0,-952.36218)">
-    <g
-       id="g5249"
-       transform="translate(0.53874115,0.90502985)">
-      <path
-         style="stroke:#000000;stroke-width:4.45809746000000030;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
-         d="m 49.582319,954.34642 c -12.850034,0 -23.284789,10.43476 -23.284789,23.28479 0,7.32135 3.403263,13.81811 8.689724,18.08319 -10.278401,5.8502 -16.663073,17.8469 -20.19443,31.0259 -5.1178053,19.1 15.207096,22.0401 34.269334,22.0915 l 0,0.031 c 0.290839,0 0.566498,0.031 0.856734,0.031 19.210152,0 39.855802,-3.1837 34.789494,-22.0914 -3.636192,-13.5705 -10.027831,-25.4711 -20.378015,-31.17899 5.208701,-4.26694 8.506139,-10.73278 8.506139,-17.9914 0,-12.85003 -10.404159,-23.28479 -23.254191,-23.28479 z"
-         id="left"
-         inkscape:connector-curvature="0" />
-      <path
-         fill="none"
-         style="stroke:#000000;stroke-width:1.97203517px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 50.522358,952.70715 0,95.71425"
-         id="center"
-         inkscape:connector-curvature="0" />
-      <path
-         style="opacity:1;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.71966;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 51.054254,1001.4773 v -45.77683 l 1.097241,0.005 c 3.642211,0.0172 9.170661,2.46935 12.395732,5.49816 4.897489,4.59945 7.421654,10.97001 6.981907,17.62114 -0.389167,5.88609 -2.631878,10.66609 -6.951818,14.81672 l -2.05562,1.97506 2.959813,2.0746 c 3.467097,2.43015 7.403677,6.55065 9.666109,10.11765 3.325898,5.2437 6.79289,13.8355 8.153827,20.2065 2.584451,12.0989 -5.997953,18.2384 -26.592174,19.0232 l -5.655017,0.2154 v -45.7768 z"
-         id="right"
-         inkscape:connector-curvature="0" />
-    </g>
+    <path
+       style="fill:url(#linearGradient3795);fill-opacity:1;stroke:black;stroke-width:2.78220295999999980;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;opacity:1"
+       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="path3597-8" />
  </g>
 </svg>
--- a/cockatrice/resources/usericons/pawn_donator_double.svg
+++ b/cockatrice/resources/usericons/pawn_donator_double.svg
@@ -2,20 +2,20 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->

 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   width="100"
   height="100"
   id="svg5322"
   version="1.1"
-   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
-   sodipodi:docname="pawn_donator_double.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="registered.svg">
  <defs
     id="defs3">
    <inkscape:perspective
@@ -226,6 +226,16 @@
         offset="1"
         id="stop5193-4" />
    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5181-9"
+       id="linearGradient5436"
+       x1="12.105612"
+       y1="1021.5341"
+       x2="87.549789"
+       y2="1021.5341"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-952.36218)" />
    <linearGradient
       inkscape:collect="always"
       xlink:href="#linearGradient5173-1"
@@ -278,28 +288,6 @@
       id="linearGradient5799"
       xlink:href="#linearGradient5181-9"
       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2"
-       id="linearGradient3"
-       x1="49.889599"
-       y1="87.971054"
-       x2="50.103622"
-       y2="27.668242"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2878408,0,0,1.2878408,-14.204862,937.12313)" />
-    <linearGradient
-       id="linearGradient2"
-       inkscape:collect="always">
-      <stop
-         style="stop-color:#8c5fd3;stop-opacity:1;"
-         offset="0"
-         id="stop2" />
-      <stop
-         style="stop-color:#b284e9;stop-opacity:1;"
-         offset="0.5"
-         id="stop1" />
-    </linearGradient>
  </defs>
  <sodipodi:namedview
     inkscape:document-units="mm"
@@ -309,26 +297,16 @@
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
-     inkscape:zoom="6.0735294"
-     inkscape:cx="53.675545"
-     inkscape:cy="53.922518"
+     inkscape:zoom="2.8"
+     inkscape:cx="-150.71429"
+     inkscape:cy="59.570011"
     inkscape:current-layer="layer1"
     showgrid="false"
-     inkscape:window-width="1147"
-     inkscape:window-height="1211"
-     inkscape:window-x="2678"
-     inkscape:window-y="120"
-     inkscape:window-maximized="0"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showguides="true">
-    <sodipodi:guide
-       position="49.829627,61.114263"
-       orientation="1,0"
-       id="guide1"
-       inkscape:locked="false" />
-  </sodipodi:namedview>
+     inkscape:window-width="1920"
+     inkscape:window-height="1028"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
  <metadata
     id="metadata4">
    <rdf:RDF>
@@ -347,20 +325,9 @@
     id="layer1"
     transform="translate(0,-952.36218)">
    <path
-       style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:url(#linearGradient5436);fill-opacity:1;stroke:black;stroke-width:2.78220295999999980;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
       d="M 49.84375 1.71875 C 36.719738 1.71875 26.0625 12.375988 26.0625 25.5 C 26.0625 32.977454 29.538325 39.612734 34.9375 43.96875 C 24.439951 49.943698 17.919149 62.196126 14.3125 75.65625 C 9.0380874 95.34065 30.224013 98.21875 49.84375 98.21875 C 69.463486 98.21875 90.549327 94.96715 85.375 75.65625 C 81.693381 61.916246 75.224585 49.827177 64.8125 43.9375 C 70.181573 39.580662 73.59375 32.953205 73.59375 25.5 C 73.59375 12.375988 62.967762 1.71875 49.84375 1.71875 z "
       transform="translate(0,952.36218)"
-       id="right" />
-    <path
-       style="opacity:1;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 51.28696,1001.834 0,-46.98372 1.434151,0.16768 c 5.155008,0.60274 9.462857,2.72154 12.938257,6.36366 4.74393,4.9715 6.87913,11.35611 6.16464,18.43328 -0.53702,5.31935 -3.09008,10.59498 -6.83833,14.13074 l -1.94072,1.83069 3.04083,2.20427 c 3.58084,2.5957 7.18975,6.4912 9.55296,10.3116 4.89572,7.9144 9.23593,21.4918 8.50487,26.6055 -0.81312,5.6877 -5.43872,9.6977 -13.62216,11.8093 -3.80822,0.9826 -7.68056,1.4713 -14.763321,1.8633 l -4.471177,0.2474 0,-46.9837 z"
-       id="left"
-       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"
-       d="m 32.758369,1023.3386 c -11.433625,-11.4486 -17.473759,-17.611 -17.925056,-18.2881 -5.1991493,-7.80033 -4.072462,-18.0055 2.698653,-24.44352 0.714467,-0.67932 1.7595,-1.54783 2.322296,-1.93001 1.523368,-1.0345 4.16292,-2.23825 5.970504,-2.72281 1.443337,-0.38692 1.89368,-0.43006 4.608041,-0.44142 3.235152,-0.0136 4.137158,0.12212 6.533598,0.9827 3.134814,1.12573 4.852536,2.32851 8.590659,6.01531 1.655211,1.63249 3.214977,3.04629 3.466142,3.14178 0.581823,0.22121 1.425484,0.22197 2.004581,0.002 0.248578,-0.0945 1.808341,-1.50526 3.466143,-3.135 3.106188,-3.05362 4.561863,-4.18308 6.729637,-5.22153 5.163233,-2.47341 10.985326,-2.50551 16.312741,-0.0899 2.006474,0.90978 3.995303,2.39379 5.679043,4.16678 1.393273,1.46713 2.577641,3.13214 3.390238,4.83339 1.300107,2.7219 1.79207,4.98307 1.79207,8.23671 0,4.67613 -1.161204,8.04312 -4.066015,11.78952 -0.567611,0.7321 -8.293484,8.5311 -17.668765,17.8362 l -16.660107,16.5352 z"
-       id="path2"
-       sodipodi:nodetypes="sssssssssssssssssscs"
-       inkscape:label="heart" />
+       id="path3597-8" />
  </g>
 </svg>
--- a/cockatrice/resources/userlevels/registered_buddy.svg
+++ b/cockatrice/resources/userlevels/registered_buddy.svg
@@ -109,7 +109,7 @@
     inkscape:connector-curvature="0" />
  <path
     d="M 57.150089,25.064396 37.504323,24.973324 31.522122,5.092503 25.539054,24.973324 5.8924192,25.064399 21.842354,37.75565 13.778482,59.405024 31.522122,45.64865 49.274434,59.405024 41.201022,37.75565 z"
-     id="left"
-     style="fill-opacity:1"
+     id="path4"
+     style="fill:url(#linearGradient3756);fill-opacity:1"
     inkscape:connector-curvature="0" />
 </svg>
--- a/cockatrice/resources/userlevels/registered_donator.svg
+++ b/cockatrice/resources/userlevels/registered_donator.svg
@@ -2,20 +2,20 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->

 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   width="100"
   height="100"
   id="svg5322"
   version="1.1"
-   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
-   sodipodi:docname="pawn_single.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="vip.svg">
  <defs
     id="defs3">
    <inkscape:perspective
@@ -194,16 +194,57 @@
         offset="1"
         id="stop3604-6" />
    </linearGradient>
-    <radialGradient
-       r="25.501276"
-       fy="131.40274"
-       fx="324.32715"
-       cy="131.40274"
-       cx="324.32715"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5189-1"
+       id="linearGradient5394"
       gradientUnits="userSpaceOnUse"
-       id="radialGradient5676"
-       xlink:href="#linearGradient3600-7"
+       x1="385.03503"
+       y1="180.09546"
+       x2="462.48297"
+       y2="180.09546"
+       gradientTransform="matrix(0.96839241,0,0,0.96839241,-360.365,847.52359)" />
+    <linearGradient
+       id="linearGradient5189-1">
+      <stop
+         style="stop-color:#000ec9;stop-opacity:1;"
+         offset="0"
+         id="stop5191-0" />
+      <stop
+         style="stop-color:#000657;stop-opacity:1;"
+         offset="1"
+         id="stop5193-4" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5173-1"
+       id="linearGradient5581"
+       gradientUnits="userSpaceOnUse"
+       x1="167.33386"
+       y1="178.83276"
+       x2="244.78181"
+       y2="178.83276"
+       gradientTransform="matrix(0.96839241,0,0,0.96839241,-149.54484,848.74636)" />
+    <linearGradient
+       id="linearGradient5173-1">
+      <stop
+         style="stop-color:#ff2700;stop-opacity:1;"
+         offset="0"
+         id="stop5175-5" />
+      <stop
+         style="stop-color:#ff2700;stop-opacity:1;"
+         offset="1"
+         id="stop5177-3" />
+    </linearGradient>
+    <linearGradient
+       y2="178.83276"
+       x2="244.78181"
+       y1="178.83276"
+       x1="167.33386"
+       gradientTransform="matrix(0.96839241,0,0,0.96839241,-52.401983,877.75333)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5598"
+       xlink:href="#linearGradient5173-1"
       inkscape:collect="always" />
  </defs>
  <sodipodi:namedview
@@ -214,19 +255,16 @@
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
-     inkscape:zoom="5.6"
-     inkscape:cx="63.214286"
-     inkscape:cy="46.160714"
+     inkscape:zoom="1.979899"
+     inkscape:cx="-59.166471"
+     inkscape:cy="4.9508223"
     inkscape:current-layer="layer1"
     showgrid="false"
-     inkscape:window-width="1147"
-     inkscape:window-height="1211"
-     inkscape:window-x="3185"
-     inkscape:window-y="44"
-     inkscape:window-maximized="0"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1" />
+     inkscape:window-width="1440"
+     inkscape:window-height="792"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
  <metadata
     id="metadata4">
    <rdf:RDF>
@@ -245,9 +283,9 @@
     id="layer1"
     transform="translate(0,-952.36218)">
    <path
-       style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;opacity:1"
+       style="fill:#8d5fd3;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 "
-       id="left"
+       id="path3597-8"
       transform="translate(0,952.36218)" />
  </g>
 </svg>
--- a/cockatrice/resources/userlevels/registered_donator_buddy.svg
+++ b/cockatrice/resources/userlevels/registered_donator_buddy.svg
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 64 64"
+   enable-background="new 0 0 64 64"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   width="100%"
+   height="100%"
+   sodipodi:docname="vip_buddy.svg">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10">
+    <linearGradient
+       id="linearGradient3766">
+      <stop
+         style="stop-color:#ff2700;stop-opacity:1;"
+         offset="0"
+         id="stop3768" />
+      <stop
+         style="stop-color:#820000;stop-opacity:1;"
+         offset="1"
+         id="stop3770" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5225">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5227" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5229" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5219"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5221" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3758">
+      <stop
+         id="stop3760"
+         offset="0"
+         style="stop-color:#0fbb00;stop-opacity:1;" />
+      <stop
+         id="stop3762"
+         offset="1"
+         style="stop-color:#064400;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3750">
+      <stop
+         style="stop-color:#ece400;stop-opacity:1;"
+         offset="0"
+         id="stop3752" />
+      <stop
+         style="stop-color:#ece400;stop-opacity:0;"
+         offset="1"
+         id="stop3754" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3758-7"
+       id="linearGradient3756-1"
+       x1="1.960216"
+       y1="31.261461"
+       x2="60.456024"
+       y2="31.261461"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3758-7">
+      <stop
+         id="stop3760-4"
+         offset="0"
+         style="stop-color:#ece400;stop-opacity:1;" />
+      <stop
+         id="stop3762-0"
+         offset="1"
+         style="stop-color:#ec8b00;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1440"
+     inkscape:window-height="792"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="5.2149125"
+     inkscape:cx="14.509163"
+     inkscape:cy="51.245759"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     d="M 61.442826,23.621762 38.532402,23.515555 31.556101,0.331013 24.578789,23.515555 1.6673502,23.621765 20.267785,38.422001 10.863888,63.668987 31.556101,47.626631 52.258426,63.668987 42.843404,38.422001 z"
+     id="path4-9"
+     style="fill:#000000;fill-opacity:1"
+     inkscape:connector-curvature="0" />
+  <path
+     d="M 57.150089,25.064396 37.504323,24.973324 31.522122,5.092503 25.539054,24.973324 5.8924192,25.064399 21.842354,37.75565 13.778482,59.405024 31.522122,45.64865 49.274434,59.405024 41.201022,37.75565 z"
+     id="path4"
+     style="fill:#8d5fd3;fill-opacity:1;fill-rule:nonzero"
+     inkscape:connector-curvature="0" />
+</svg>
--- a/cockatrice/resources/usericons/pawn_judge_double.svg
+++ b/cockatrice/resources/usericons/pawn_judge_double.svg
@@ -2,22 +2,33 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->

 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   width="100"
   height="100"
   id="svg5322"
   version="1.1"
-   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
-   sodipodi:docname="pawn_judge_double.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="registered_vip.svg">
  <defs
     id="defs3">
+    <linearGradient
+       id="linearGradient5181-9-1">
+      <stop
+         id="stop4188"
+         offset="0"
+         style="stop-color:#ece400;stop-opacity:1" />
+      <stop
+         id="stop4190"
+         offset="1"
+         style="stop-color:#ec8b00;stop-opacity:1" />
+    </linearGradient>
    <inkscape:perspective
       sodipodi:type="inkscape:persp3d"
       inkscape:vp_x="0 : 526.18109 : 1"
@@ -226,6 +237,16 @@
         offset="1"
         id="stop5193-4" />
    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5181-9-1"
+       id="linearGradient5436"
+       x1="47.268291"
+       y1="933.14362"
+       x2="48.665382"
+       y2="1050.2666"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-952.36218)" />
    <linearGradient
       inkscape:collect="always"
       xlink:href="#linearGradient5173-1"
@@ -288,18 +309,15 @@
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
     inkscape:zoom="4.2946338"
-     inkscape:cx="34.112338"
-     inkscape:cy="64.964794"
-     inkscape:current-layer="svg5322"
+     inkscape:cx="35.27742"
+     inkscape:cy="65.175571"
+     inkscape:current-layer="layer1"
     showgrid="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="792"
-     inkscape:window-x="2921"
-     inkscape:window-y="661"
-     inkscape:window-maximized="0"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1" />
+     inkscape:window-width="1152"
+     inkscape:window-height="811"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
  <metadata
     id="metadata4">
    <rdf:RDF>
@@ -308,7 +326,7 @@
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
@@ -318,20 +336,9 @@
     id="layer1"
     transform="translate(0,-952.36218)">
    <path
-       style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:url(#linearGradient5436);fill-opacity:1;stroke:black;stroke-width:2.78149606;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
       d="M 49.84375 1.71875 C 36.719738 1.71875 26.0625 12.375988 26.0625 25.5 C 26.0625 32.977454 29.538325 39.612734 34.9375 43.96875 C 24.439951 49.943698 17.919149 62.196126 14.3125 75.65625 C 9.0380874 95.34065 30.224013 98.21875 49.84375 98.21875 C 69.463486 98.21875 90.549327 94.96715 85.375 75.65625 C 81.693381 61.916246 75.224585 49.827177 64.8125 43.9375 C 70.181573 39.580662 73.59375 32.953205 73.59375 25.5 C 73.59375 12.375988 62.967762 1.71875 49.84375 1.71875 z "
       transform="translate(0,952.36218)"
-       id="right" />
-    <path
-       style="opacity:1;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 51.28696,1001.834 0,-46.98372 1.434151,0.16768 c 5.155008,0.60274 9.462857,2.72154 12.938257,6.36366 4.74393,4.9715 6.87913,11.35611 6.16464,18.43328 -0.53702,5.31935 -3.09008,10.59498 -6.83833,14.13074 l -1.94072,1.83069 3.04083,2.20427 c 3.58084,2.5957 7.18975,6.4912 9.55296,10.3116 4.89572,7.9144 9.23593,21.4918 8.50487,26.6055 -0.81312,5.6877 -5.43872,9.6977 -13.62216,11.8093 -3.80822,0.9826 -7.68056,1.4713 -14.763321,1.8633 l -4.471177,0.2474 0,-46.9837 z"
-       id="left"
-       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"
-       id="path1-2"
-       style="display:inline;fill:#e1964c;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.7852;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:label="gavel"
-       transform="translate(0,952.36218)" />
+       id="path3597-8" />
  </g>
 </svg>
--- a/cockatrice/resources/userlevels/registered_vip_buddy.svg
+++ b/cockatrice/resources/userlevels/registered_vip_buddy.svg
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 64 64"
+   enable-background="new 0 0 64 64"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   width="100%"
+   height="100%"
+   sodipodi:docname="registered_vip_buddy.svg">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10">
+    <linearGradient
+       id="linearGradient4153">
+      <stop
+         style="stop-color:#ffec79;stop-opacity:1"
+         offset="0"
+         id="stop4155" />
+      <stop
+         style="stop-color:#f2c15b;stop-opacity:1"
+         offset="1"
+         id="stop4157" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3758">
+      <stop
+         id="stop3760"
+         offset="0"
+         style="stop-color:#80d600;stop-opacity:1;" />
+      <stop
+         id="stop3762"
+         offset="1"
+         style="stop-color:#80d600;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3750">
+      <stop
+         style="stop-color:#ece400;stop-opacity:1;"
+         offset="0"
+         id="stop3752" />
+      <stop
+         style="stop-color:#ece400;stop-opacity:0;"
+         offset="1"
+         id="stop3754" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3758-7"
+       id="linearGradient3756"
+       x1="31.290251"
+       y1="-19.003599"
+       x2="31.135509"
+       y2="67.496323"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.87626222,0,0,0.87626222,4.174756,4.8555263)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3758-7"
+       id="linearGradient3756-1"
+       x1="1.960216"
+       y1="31.261461"
+       x2="60.456024"
+       y2="31.261461"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3758-7">
+      <stop
+         id="stop3760-4"
+         offset="0"
+         style="stop-color:#ece400;stop-opacity:1;" />
+      <stop
+         id="stop3762-0"
+         offset="1"
+         style="stop-color:#ec8b00;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1152"
+     inkscape:window-height="811"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="7.375"
+     inkscape:cx="29.258475"
+     inkscape:cy="35.341768"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     d="M 61.442826,23.621762 38.532402,23.515555 31.556101,0.331013 24.578789,23.515555 1.6673502,23.621765 20.267785,38.422001 10.863888,63.668987 31.556101,47.626631 52.258426,63.668987 42.843404,38.422001 z"
+     id="path4-9"
+     style="fill:#000000;fill-opacity:1"
+     inkscape:connector-curvature="0" />
+  <path
+     d="M 57.150089,25.064396 37.504323,24.973324 31.522122,5.092503 25.539054,24.973324 5.8924192,25.064399 21.842354,37.75565 13.778482,59.405024 31.522122,45.64865 49.274434,59.405024 41.201022,37.75565 z"
+     id="path4"
+     style="fill:url(#linearGradient3756);fill-opacity:1"
+     inkscape:connector-curvature="0" />
+</svg>
--- a/cockatrice/src/game/cards/abstract_card_drag_item.cpp
+++ b/cockatrice/src/game/cards/abstract_card_drag_item.cpp
@@ -1,6 +1,6 @@
-#include "abstract_card_drag_item.h"
+#include "abstractcarddragitem.h"

-#include "card_database.h"
+#include "carddatabase.h"

 #include <QCursor>
 #include <QDebug>
@@ -20,8 +20,13 @@ AbstractCardDragItem::AbstractCardDragItem(AbstractCardItem *_item,
        parentDrag->addChildDrag(this);
        setZValue(2000000007 + hotSpot.x() * 1000000 + hotSpot.y() * 1000 + 1000);
    } else {
-        hotSpot = QPointF{qBound(0.0, hotSpot.x(), static_cast<qreal>(CARD_WIDTH - 1)),
-                          qBound(0.0, hotSpot.y(), static_cast<qreal>(CARD_HEIGHT - 1))};
+        if ((hotSpot.x() < 0) || (hotSpot.y() < 0)) {
+            qDebug() << "CardDragItem: coordinate overflow: x =" << hotSpot.x() << ", y =" << hotSpot.y();
+            hotSpot = QPointF();
+        } else if ((hotSpot.x() > CARD_WIDTH) || (hotSpot.y() > CARD_HEIGHT)) {
+            qDebug() << "CardDragItem: coordinate overflow: x =" << hotSpot.x() << ", y =" << hotSpot.y();
+            hotSpot = QPointF(CARD_WIDTH, CARD_HEIGHT);
+        }
        setCursor(Qt::ClosedHandCursor);
        setZValue(2000000007);
    }
@@ -40,19 +45,12 @@ AbstractCardDragItem::~AbstractCardDragItem()
        delete childDrags[i];
 }

-QPainterPath AbstractCardDragItem::shape() const
-{
-    QPainterPath shape;
-    shape.addRoundedRect(boundingRect(), 0.05 * CARD_WIDTH, 0.05 * CARD_WIDTH);
-    return shape;
-}
-
 void AbstractCardDragItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
    item->paint(painter, option, widget);

    // adds a mask to the card so it looks like the card hasnt been placed yet
-    painter->fillPath(shape(), GHOST_MASK);
+    painter->fillRect(boundingRect(), GHOST_MASK);
 }

 void AbstractCardDragItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
--- a/cockatrice/src/game/cards/abstract_card_drag_item.h
+++ b/cockatrice/src/game/cards/abstract_card_drag_item.h
@@ -1,7 +1,7 @@
 #ifndef ABSTRACTCARDDRAGITEM_H
 #define ABSTRACTCARDDRAGITEM_H

-#include "abstract_card_item.h"
+#include "abstractcarditem.h"

 class QGraphicsScene;
 class CardZone;
@@ -21,18 +21,17 @@ public:
    {
        Type = typeCardDrag
    };
-    int type() const override
+    int type() const
    {
        return Type;
    }
    AbstractCardDragItem(AbstractCardItem *_item, const QPointF &_hotSpot, AbstractCardDragItem *parentDrag = 0);
-    ~AbstractCardDragItem() override;
-    QRectF boundingRect() const override
+    ~AbstractCardDragItem();
+    QRectF boundingRect() const
    {
        return QRectF(0, 0, CARD_WIDTH, CARD_HEIGHT);
    }
-    QPainterPath shape() const override;
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
    AbstractCardItem *getItem() const
    {
        return item;
@@ -45,7 +44,7 @@ public:
    virtual void updatePosition(const QPointF &cursorScenePos) = 0;

 protected:
-    void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
 };

 #endif
--- a/cockatrice/src/game/cards/abstract_card_item.cpp
+++ b/cockatrice/src/game/cards/abstract_card_item.cpp
@@ -1,10 +1,10 @@
-#include "abstract_card_item.h"
+#include "abstractcarditem.h"

-#include "../../client/ui/picture_loader/picture_loader.h"
-#include "../../settings/cache_settings.h"
-#include "../game_scene.h"
-#include "card_database.h"
-#include "card_database_manager.h"
+#include "carddatabase.h"
+#include "gamescene.h"
+#include "main.h"
+#include "pictureloader.h"
+#include "settingscache.h"

 #include <QCursor>
 #include <QGraphicsScene>
@@ -12,20 +12,16 @@
 #include <QPainter>
 #include <algorithm>

-AbstractCardItem::AbstractCardItem(QGraphicsItem *parent,
-                                   const QString &_name,
-                                   const QString &_providerId,
-                                   Player *_owner,
-                                   int _id)
-    : ArrowTarget(_owner, parent), id(_id), name(_name), providerId(_providerId), tapped(false), facedown(false),
-      tapAngle(0), bgColor(Qt::transparent), isHovered(false), realZValue(0)
+AbstractCardItem::AbstractCardItem(const QString &_name, Player *_owner, int _id, QGraphicsItem *parent)
+    : ArrowTarget(_owner, parent), id(_id), name(_name), tapped(false), facedown(false), tapAngle(0),
+      bgColor(Qt::transparent), isHovered(false), realZValue(0)
 {
    setCursor(Qt::OpenHandCursor);
    setFlag(ItemIsSelectable);
    setCacheMode(DeviceCoordinateCache);

-    connect(&SettingsCache::instance(), &SettingsCache::displayCardNamesChanged, this, [this] { update(); });
-    refreshCardInfo();
+    connect(&SettingsCache::instance(), SIGNAL(displayCardNamesChanged()), this, SLOT(callUpdate()));
+    cardInfoUpdated();
 }

 AbstractCardItem::~AbstractCardItem()
@@ -38,31 +34,24 @@ QRectF AbstractCardItem::boundingRect() const
    return QRectF(0, 0, CARD_WIDTH, CARD_HEIGHT);
 }

-QPainterPath AbstractCardItem::shape() const
-{
-    QPainterPath shape;
-    shape.addRoundedRect(boundingRect(), 0.05 * CARD_WIDTH, 0.05 * CARD_WIDTH);
-    return shape;
-}
-
 void AbstractCardItem::pixmapUpdated()
 {
    update();
    emit sigPixmapUpdated();
 }

-void AbstractCardItem::refreshCardInfo()
+void AbstractCardItem::cardInfoUpdated()
 {
-    info = CardDatabaseManager::getInstance()->getCardByNameAndProviderId(name, providerId);
+    info = db->getCard(name);

    if (!info && !name.isEmpty()) {
        QVariantHash properties = QVariantHash();

        info = CardInfo::newInstance(name, "", true, QVariantHash(), QList<CardRelation *>(), QList<CardRelation *>(),
-                                     CardInfoPerSetMap(), false, false, -1, false);
+                                     CardInfoPerSetMap(), false, -1, false);
    }
    if (info.data()) {
-        connect(info.data(), &CardInfo::pixmapUpdated, this, &AbstractCardItem::pixmapUpdated);
+        connect(info.data(), SIGNAL(pixmapUpdated()), this, SLOT(pixmapUpdated()));
    }

    cacheBgColor();
@@ -124,14 +113,24 @@ void AbstractCardItem::paintPicture(QPainter *painter, const QSizeF &translatedS

    if (paintImage) {
        painter->save();
-        painter->setClipPath(shape());
-        painter->drawPixmap(boundingRect(), translatedPixmap, QRectF({0, 0}, translatedPixmap.size()));
+        transformPainter(painter, translatedSize, angle);
+        painter->drawPixmap(QPointF(1, 1), translatedPixmap);
        painter->restore();
    } else {
        painter->setBrush(bgColor);
-        painter->drawPath(shape());
    }

+    QPen pen(Qt::black);
+    pen.setJoinStyle(Qt::MiterJoin);
+    const int penWidth = 2;
+    pen.setWidth(penWidth);
+    painter->setPen(pen);
+
+    if (!angle)
+        painter->drawRect(QRectF(0, 0, CARD_WIDTH - 1, CARD_HEIGHT - penWidth));
+    else
+        painter->drawRect(QRectF(1, 1, CARD_WIDTH - 2, CARD_HEIGHT - 1.5));
+
    if (translatedPixmap.isNull() || SettingsCache::instance().getDisplayCardNames() || facedown) {
        painter->save();
        transformPainter(painter, translatedSize, angle);
@@ -141,13 +140,8 @@ void AbstractCardItem::paintPicture(QPainter *painter, const QSizeF &translatedS
        QString nameStr;
        if (facedown)
            nameStr = "# " + QString::number(id);
-        else {
-            QString prefix = "";
-            if (SettingsCache::instance().debug().getShowCardId()) {
-                prefix = "#" + QString::number(id) + " ";
-            }
-            nameStr = prefix + name;
-        }
+        else
+            nameStr = name;
        painter->drawText(QRectF(3 * scaleFactor, 3 * scaleFactor, translatedSize.width() - 6 * scaleFactor,
                                 translatedSize.height() - 6 * scaleFactor),
                          Qt::AlignTop | Qt::AlignLeft | Qt::TextWrapAnywhere, nameStr);
@@ -164,7 +158,9 @@ void AbstractCardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *
    QSizeF translatedSize = getTranslatedSize(painter);
    paintPicture(painter, translatedSize, tapAngle);

+    painter->save();
    painter->setRenderHint(QPainter::Antialiasing, false);
+    transformPainter(painter, translatedSize, tapAngle);

    if (isSelected() || isHovered) {
        QPen pen;
@@ -172,12 +168,15 @@ void AbstractCardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *
            pen.setColor(Qt::yellow);
        if (isSelected())
            pen.setColor(Qt::red);
-        pen.setWidth(0); // Cosmetic pen
+        const int penWidth = 1;
+        pen.setWidth(penWidth);
        painter->setPen(pen);
-        painter->drawPath(shape());
+        painter->drawRect(QRectF(0, 0, translatedSize.width() + penWidth, translatedSize.height() - penWidth));
    }

    painter->restore();
+
+    painter->restore();
 }

 void AbstractCardItem::setName(const QString &_name)
@@ -190,22 +189,7 @@ void AbstractCardItem::setName(const QString &_name)
        disconnect(info.data(), nullptr, this, nullptr);
    name = _name;

-    refreshCardInfo();
-}
-
-void AbstractCardItem::setProviderId(const QString &_providerId)
-{
-    if (providerId == _providerId) {
-        return;
-    }
-
-    emit deleteCardInfoPopup(name);
-    if (info) {
-        disconnect(info.data(), nullptr, this, nullptr);
-    }
-    providerId = _providerId;
-
-    refreshCardInfo();
+    cardInfoUpdated();
 }

 void AbstractCardItem::setHovered(bool _hovered)
@@ -301,7 +285,7 @@ void AbstractCardItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
    if (event->button() == Qt::LeftButton)
        setCursor(Qt::ClosedHandCursor);
    else if (event->button() == Qt::MiddleButton)
-        emit showCardInfoPopup(event->screenPos(), name, providerId);
+        emit showCardInfoPopup(event->screenPos(), name);
    event->accept();
 }

--- a/cockatrice/src/game/cards/abstract_card_item.h
+++ b/cockatrice/src/game/cards/abstract_card_item.h
@@ -1,8 +1,8 @@
 #ifndef ABSTRACTCARDITEM_H
 #define ABSTRACTCARDITEM_H

-#include "../board/arrow_target.h"
-#include "card_database.h"
+#include "arrowtarget.h"
+#include "carddatabase.h"

 class Player;

@@ -16,7 +16,6 @@ protected:
    CardInfoPtr info;
    int id;
    QString name;
-    QString providerId;
    bool tapped;
    bool facedown;
    int tapAngle;
@@ -28,13 +27,14 @@ private:
    qreal realZValue;
 private slots:
    void pixmapUpdated();
-
-public slots:
-    void refreshCardInfo();
-
+    void cardInfoUpdated();
+    void callUpdate()
+    {
+        update();
+    }
 signals:
    void hovered(AbstractCardItem *card);
-    void showCardInfoPopup(const QPoint &pos, const QString &cardName, const QString &providerId);
+    void showCardInfoPopup(QPoint pos, QString cardName);
    void deleteCardInfoPopup(QString cardName);
    void sigPixmapUpdated();
    void cardShiftClicked(QString cardName);
@@ -44,21 +44,19 @@ public:
    {
        Type = typeCard
    };
-    int type() const override
+    int type() const
    {
        return Type;
    }
-    explicit AbstractCardItem(QGraphicsItem *parent = nullptr,
-                              const QString &_name = QString(),
-                              const QString &_providerId = QString(),
-                              Player *_owner = nullptr,
-                              int _id = -1);
-    ~AbstractCardItem() override;
-    QRectF boundingRect() const override;
-    QPainterPath shape() const override;
+    AbstractCardItem(const QString &_name = QString(),
+                     Player *_owner = nullptr,
+                     int _id = -1,
+                     QGraphicsItem *parent = nullptr);
+    ~AbstractCardItem();
+    QRectF boundingRect() const;
    QSizeF getTranslatedSize(QPainter *painter) const;
    void paintPicture(QPainter *painter, const QSizeF &translatedSize, int angle);
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
    CardInfoPtr getInfo() const
    {
        return info;
@@ -76,11 +74,6 @@ public:
        return name;
    }
    void setName(const QString &_name = QString());
-    QString getProviderId() const
-    {
-        return providerId;
-    }
-    void setProviderId(const QString &_providerId = QString());
    qreal getRealZValue() const
    {
        return realZValue;
@@ -110,9 +103,9 @@ public:

 protected:
    void transformPainter(QPainter *painter, const QSizeF &translatedSize, int angle);
-    void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
-    QVariant itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value) override;
+    void mousePressEvent(QGraphicsSceneMouseEvent *event);
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+    QVariant itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value);
    void cacheBgColor();
 };

--- a/cockatrice/src/client/game_logic/abstract_client.cpp
+++ b/cockatrice/src/client/game_logic/abstract_client.cpp
@@ -1,6 +1,6 @@
-#include "abstract_client.h"
+#include "abstractclient.h"

-#include "../../server/pending_command.h"
+#include "client_metatypes.h"
 #include "featureset.h"
 #include "get_pb_extension.h"
 #include "pb/commands.pb.h"
@@ -18,6 +18,7 @@
 #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>

@@ -52,7 +53,7 @@ AbstractClient::AbstractClient(QObject *parent)
    FeatureSet features;
    features.initalizeFeatureList(clientFeatures);

-    connect(this, &AbstractClient::sigQueuePendingCommand, this, &AbstractClient::queuePendingCommand);
+    connect(this, SIGNAL(sigQueuePendingCommand(PendingCommand *)), this, SLOT(queuePendingCommand(PendingCommand *)));
 }

 AbstractClient::~AbstractClient()
--- a/cockatrice/src/client/game_logic/abstract_client.h
+++ b/cockatrice/src/client/game_logic/abstract_client.h
@@ -48,7 +48,6 @@ class AbstractClient : public QObject
    Q_OBJECT
 signals:
    void statusChanged(ClientStatus _status);
-    void maxPingTime(int seconds, int maxSeconds);

    // Room events
    void roomEventReceived(const RoomEvent &event);
@@ -98,8 +97,8 @@ protected:
    virtual void sendCommandContainer(const CommandContainer &cont) = 0;

 public:
-    explicit AbstractClient(QObject *parent = nullptr);
-    ~AbstractClient() override;
+    AbstractClient(QObject *parent = nullptr);
+    ~AbstractClient();

    ClientStatus getStatus() const
    {
--- a/cockatrice/src/game/board/abstract_counter.cpp
+++ b/cockatrice/src/game/board/abstract_counter.cpp
@@ -1,11 +1,11 @@
-#include "abstract_counter.h"
+#include "abstractcounter.h"

-#include "../../client/translate_counter_name.h"
-#include "../../settings/cache_settings.h"
-#include "../player/player.h"
 #include "expression.h"
 #include "pb/command_inc_counter.pb.h"
 #include "pb/command_set_counter.pb.h"
+#include "player.h"
+#include "settingscache.h"
+#include "translatecountername.h"

 #include <QAction>
 #include <QApplication>
@@ -36,7 +36,7 @@ AbstractCounter::AbstractCounter(Player *_player,
        QString displayName = TranslateCounterName::getDisplayName(_name);
        menu = new TearOffMenu(displayName);
        aSet = new QAction(this);
-        connect(aSet, &QAction::triggered, this, &AbstractCounter::setCounter);
+        connect(aSet, SIGNAL(triggered()), this, SLOT(setCounter()));
        menu->addAction(aSet);
        menu->addSeparator();
        for (int i = 10; i >= -10; --i) {
@@ -49,7 +49,7 @@ AbstractCounter::AbstractCounter(Player *_player,
                else if (i == 1)
                    aInc = aIncrement;
                aIncrement->setData(i);
-                connect(aIncrement, &QAction::triggered, this, &AbstractCounter::incrementCounter);
+                connect(aIncrement, SIGNAL(triggered()), this, SLOT(incrementCounter()));
                menu->addAction(aIncrement);
            }
        }
@@ -57,8 +57,7 @@ AbstractCounter::AbstractCounter(Player *_player,
        menu = nullptr;
    }

-    connect(&SettingsCache::instance().shortcuts(), &ShortcutsSettings::shortCutChanged, this,
-            &AbstractCounter::refreshShortcuts);
+    connect(&SettingsCache::instance().shortcuts(), SIGNAL(shortCutChanged()), this, SLOT(refreshShortcuts()));
    refreshShortcuts();
    retranslateUi();
 }
--- a/cockatrice/src/game/board/abstract_counter.h
+++ b/cockatrice/src/game/board/abstract_counter.h
@@ -1,7 +1,7 @@
 #ifndef COUNTER_H
 #define COUNTER_H

-#include "../../client/tearoff_menu.h"
+#include "tearoffmenu.h"

 #include <QGraphicsItem>
 #include <QInputDialog>
@@ -88,7 +88,7 @@ public:
    AbstractCounterDialog(const QString &name, const QString &value, QWidget *parent = nullptr);

 protected:
-    bool eventFilter(QObject *obj, QEvent *event) override;
+    bool eventFilter(QObject *obj, QEvent *event);
    void changeValue(int diff);
 };

--- a/cockatrice/src/game/board/abstract_graphics_item.cpp
+++ b/cockatrice/src/game/board/abstract_graphics_item.cpp
@@ -1,4 +1,4 @@
-#include "abstract_graphics_item.h"
+#include "abstractgraphicsitem.h"

 #include <QPainter>

--- a/cockatrice/src/game/board/abstract_graphics_item.h
+++ b/cockatrice/src/game/board/abstract_graphics_item.h
@@ -13,9 +13,6 @@ enum GraphicsItemType
    typeOther = QGraphicsItem::UserType + 6
 };

-/**
- * Parent class of all objects that appear in a game.
- */
 class AbstractGraphicsItem : public QObject, public QGraphicsItem
 {
    Q_OBJECT
@@ -24,7 +21,7 @@ protected:
    void paintNumberEllipse(int number, int radius, const QColor &color, int position, int count, QPainter *painter);

 public:
-    explicit AbstractGraphicsItem(QGraphicsItem *parent = nullptr) : QGraphicsItem(parent)
+    AbstractGraphicsItem(QGraphicsItem *parent = nullptr) : QObject(), QGraphicsItem(parent)
    {
    }
 };
--- a/cockatrice/src/game/board/arrow_item.cpp
+++ b/cockatrice/src/game/board/arrow_item.cpp
@@ -1,16 +1,16 @@
 #define _USE_MATH_DEFINES
-#include "arrow_item.h"
+#include "arrowitem.h"

-#include "../../settings/cache_settings.h"
-#include "../cards/card_database.h"
-#include "../cards/card_item.h"
-#include "../player/player.h"
-#include "../player/player_target.h"
-#include "../zones/card_zone.h"
+#include "carddatabase.h"
+#include "carditem.h"
+#include "cardzone.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 "player.h"
+#include "playertarget.h"
+#include "settingscache.h"

 #include <QDebug>
 #include <QGraphicsScene>
@@ -19,9 +19,10 @@
 #include <QtMath>

 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)
+    : QGraphicsItem(), player(_player), id(_id), startItem(_startItem), targetItem(_targetItem), color(_color),
+      fullColor(true)
 {
+    qDebug() << "ArrowItem constructor: startItem=" << static_cast<QGraphicsItem *>(startItem);
    setZValue(2000000005);

    if (startItem)
@@ -35,6 +36,7 @@ ArrowItem::ArrowItem(Player *_player, int _id, ArrowTarget *_startItem, ArrowTar

 ArrowItem::~ArrowItem()
 {
+    qDebug() << "ArrowItem destructor";
 }

 void ArrowItem::delArrow()
@@ -165,7 +167,7 @@ void ArrowDragItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
    // This ensures that if a mouse move event happens after a call to delArrow(),
    // the event will be discarded as it would create some stray pointers.
-    if (targetLocked || !startItem)
+    if (!startItem)
        return;

    QPointF endPos = event->scenePos();
@@ -266,7 +268,7 @@ void ArrowAttachItem::addChildArrow(ArrowAttachItem *childArrow)

 void ArrowAttachItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
-    if (targetLocked || !startItem)
+    if (!startItem)
        return;

    QPointF endPos = event->scenePos();
@@ -305,48 +307,25 @@ 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() != "table") {
-        return;
-    }
-
-    CardZone *startZone = startCard->getZone();
-    CardZone *targetZone = targetCard->getZone();
-
-    // move card onto table first if attaching from some other zone
-    if (startZone->getName() != "table") {
-        player->playCardToTable(startCard, false);
-    }
-
-    Command_AttachCard cmd;
-    cmd.set_start_zone("table");
-    cmd.set_card_id(startCard->getId());
-    cmd.set_target_player_id(targetZone->getPlayer()->getId());
-    cmd.set_target_zone(targetZone->getName().toStdString());
-    cmd.set_target_card_id(targetCard->getId());
-
-    player->sendGameCommand(cmd);
-}
-
 void ArrowAttachItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
    if (!startItem)
        return;

-    // Attaching could move startItem under the current cursor position, causing all children to retarget to it right
-    // before they are processed. Prevent that.
-    for (ArrowAttachItem *child : childArrows) {
-        child->setTargetLocked(true);
-    }
-
    if (targetItem && (targetItem != startItem)) {
-        auto startCard = qgraphicsitem_cast<CardItem *>(startItem);
-        auto targetCard = qgraphicsitem_cast<CardItem *>(targetItem);
-        if (startCard && targetCard) {
-            attachCards(startCard, targetCard);
-        }
+        CardItem *startCard = qgraphicsitem_cast<CardItem *>(startItem);
+        CardZone *startZone = startCard->getZone();
+        CardItem *targetCard = qgraphicsitem_cast<CardItem *>(targetItem);
+        CardZone *targetZone = targetCard->getZone();
+
+        Command_AttachCard cmd;
+        cmd.set_start_zone(startZone->getName().toStdString());
+        cmd.set_card_id(startCard->getId());
+        cmd.set_target_player_id(targetZone->getPlayer()->getId());
+        cmd.set_target_zone(targetZone->getName().toStdString());
+        cmd.set_target_card_id(targetCard->getId());
+
+        player->sendGameCommand(cmd);
    }

    delArrow();
--- a/cockatrice/src/game/board/arrow_item.h
+++ b/cockatrice/src/game/board/arrow_item.h
@@ -21,20 +21,19 @@ protected:
    Player *player;
    int id;
    ArrowTarget *startItem, *targetItem;
-    bool targetLocked;
    QColor color;
    bool fullColor;
-    void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
+    void mousePressEvent(QGraphicsSceneMouseEvent *event);

 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;
-    QRectF boundingRect() const override
+    ~ArrowItem();
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    QRectF boundingRect() const
    {
        return path.boundingRect();
    }
-    QPainterPath shape() const override
+    QPainterPath shape() const
    {
        return path;
    }
@@ -65,10 +64,6 @@ public:
    {
        return targetItem;
    }
-    void setTargetLocked(bool _targetLocked)
-    {
-        targetLocked = _targetLocked;
-    }
    void delArrow();
 };

@@ -83,8 +78,8 @@ public:
    void addChildArrow(ArrowDragItem *childArrow);

 protected:
-    void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
 };

 class ArrowAttachItem : public ArrowItem
@@ -93,15 +88,13 @@ class ArrowAttachItem : public ArrowItem
 private:
    QList<ArrowAttachItem *> childArrows;

-    void attachCards(CardItem *startCard, const CardItem *targetCard);
-
 public:
-    explicit ArrowAttachItem(ArrowTarget *_startItem);
+    ArrowAttachItem(ArrowTarget *_startItem);
    void addChildArrow(ArrowAttachItem *childArrow);

 protected:
-    void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
 };

 #endif // ARROWITEM_H
--- a/cockatrice/src/game/board/arrow_target.cpp
+++ b/cockatrice/src/game/board/arrow_target.cpp
@@ -1,7 +1,7 @@
-#include "arrow_target.h"
+#include "arrowtarget.h"

-#include "../player/player.h"
-#include "arrow_item.h"
+#include "arrowitem.h"
+#include "player.h"

 ArrowTarget::ArrowTarget(Player *_owner, QGraphicsItem *parent)
    : AbstractGraphicsItem(parent), owner(_owner), beingPointedAt(false)
--- a/cockatrice/src/game/board/arrow_target.h
+++ b/cockatrice/src/game/board/arrow_target.h
@@ -1,7 +1,7 @@
 #ifndef ARROWTARGET_H
 #define ARROWTARGET_H

-#include "abstract_graphics_item.h"
+#include "abstractgraphicsitem.h"

 #include <QList>

@@ -19,8 +19,8 @@ private:
    QList<ArrowItem *> arrowsFrom, arrowsTo;

 public:
-    explicit ArrowTarget(Player *_owner, QGraphicsItem *parent = nullptr);
-    ~ArrowTarget() override;
+    ArrowTarget(Player *_owner, QGraphicsItem *parent = nullptr);
+    ~ArrowTarget();

    Player *getOwner() const
    {
--- a/cockatrice/src/game/cards/card_database.cpp
+++ b/cockatrice/src/game/cards/card_database.cpp
@@ -1,12 +1,11 @@
-#include "card_database.h"
+#include "carddatabase.h"

-#include "../../client/network/spoiler_background_updater.h"
-#include "../../client/ui/picture_loader/picture_loader.h"
-#include "../../settings/cache_settings.h"
-#include "../../utility/card_set_comparator.h"
-#include "../game_specific_terms.h"
-#include "./card_database_parser/cockatrice_xml_3.h"
-#include "./card_database_parser/cockatrice_xml_4.h"
+#include "carddbparser/cockatricexml3.h"
+#include "carddbparser/cockatricexml4.h"
+#include "game_specific_terms.h"
+#include "pictureloader.h"
+#include "settingscache.h"
+#include "spoilerbackgroundupdater.h"

 #include <QCryptographicHash>
 #include <QDebug>
@@ -23,9 +22,8 @@ const char *CardDatabase::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)
+                 const QDate &_releaseDate)
+    : shortName(_shortName), longName(_longName), releaseDate(_releaseDate), setType(_setType)
 {
    loadSetOptions();
 }
@@ -33,10 +31,9 @@ CardSet::CardSet(const QString &_shortName,
 CardSetPtr CardSet::newInstance(const QString &_shortName,
                                const QString &_longName,
                                const QString &_setType,
-                                const QDate &_releaseDate,
-                                const Priority _priority)
+                                const QDate &_releaseDate)
 {
-    CardSetPtr ptr(new CardSet(_shortName, _longName, _setType, _releaseDate, _priority));
+    CardSetPtr ptr(new CardSet(_shortName, _longName, _setType, _releaseDate));
    // ptr->setSmartPointer(ptr);
    return ptr;
 }
@@ -102,7 +99,7 @@ public:
    inline bool operator()(const CardSetPtr &a, const CardSetPtr &b) const
    {
        if (a.isNull() || b.isNull()) {
-            qCDebug(CardDatabaseLog) << "SetList::KeyCompareFunctor a or b is null";
+            qDebug() << "SetList::KeyCompareFunctor a or b is null";
            return false;
        }

@@ -170,7 +167,7 @@ void SetList::enableAll()
        CardSetPtr set = at(i);

        if (set == nullptr) {
-            qCDebug(CardDatabaseLog) << "enabledAll has null";
+            qDebug() << "enabledAll has null";
            continue;
        }

@@ -197,29 +194,23 @@ void SetList::markAllAsKnown()

 void SetList::guessSortKeys()
 {
-    defaultSort();
+    // sort by release date DESC; invalid dates to the bottom.
+    QDate distantFuture(2050, 1, 1);
+    int aHundredYears = 36500;
    for (int i = 0; i < size(); ++i) {
        CardSetPtr set = at(i);
        if (set.isNull()) {
-            qCDebug(CardDatabaseLog) << "guessSortKeys set is null";
+            qDebug() << "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
+        QDate date = set->getReleaseDate();
+        if (date.isNull()) {
+            set->setSortKey(static_cast<unsigned int>(aHundredYears));
        } else {
-            return a->getShortName() < b->getShortName(); // alphabetically
+            set->setSortKey(static_cast<unsigned int>(date.daysTo(distantFuture)));
        }
-    });
+    }
 }

 CardInfoPerSet::CardInfoPerSet(const CardSetPtr &_set) : set(_set)
@@ -234,12 +225,11 @@ CardInfo::CardInfo(const QString &_name,
                   const QList<CardRelation *> &_reverseRelatedCards,
                   CardInfoPerSetMap _sets,
                   bool _cipt,
-                   bool _landscapeOrientation,
                   int _tableRow,
                   bool _upsideDownArt)
    : name(_name), text(_text), isToken(_isToken), properties(std::move(_properties)), relatedCards(_relatedCards),
-      reverseRelatedCards(_reverseRelatedCards), sets(std::move(_sets)), cipt(_cipt),
-      landscapeOrientation(_landscapeOrientation), tableRow(_tableRow), upsideDownArt(_upsideDownArt)
+      reverseRelatedCards(_reverseRelatedCards), sets(std::move(_sets)), cipt(_cipt), tableRow(_tableRow),
+      upsideDownArt(_upsideDownArt)
 {
    pixmapCacheKey = QLatin1String("card_") + name;
    simpleName = CardInfo::simplifyName(name);
@@ -252,12 +242,6 @@ CardInfo::~CardInfo()
    PictureLoader::clearPixmapCache(smartThis);
 }

-CardInfoPtr CardInfo::newInstance(const QString &_name)
-{
-    return newInstance(_name, QString(), false, QVariantHash(), QList<CardRelation *>(), QList<CardRelation *>(),
-                       CardInfoPerSetMap(), false, false, 0, false);
-}
-
 CardInfoPtr CardInfo::newInstance(const QString &_name,
                                  const QString &_text,
                                  bool _isToken,
@@ -266,19 +250,15 @@ CardInfoPtr CardInfo::newInstance(const QString &_name,
                                  const QList<CardRelation *> &_reverseRelatedCards,
                                  CardInfoPerSetMap _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));
+                                 _sets, _cipt, _tableRow, _upsideDownArt));
    ptr->setSmartPointer(ptr);

-    for (const auto &cardInfoPerSetList : _sets) {
-        for (const CardInfoPerSet &set : cardInfoPerSetList) {
-            set.getPtr()->append(ptr);
-            break;
-        }
+    for (const CardInfoPerSet &set : _sets) {
+        set.getPtr()->append(ptr);
    }

    return ptr;
@@ -286,45 +266,26 @@ CardInfoPtr CardInfo::newInstance(const QString &_name,

 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);
+    return result.remove(" // ").remove(':').remove('"').remove('?').replace('/', ' ');
 }

 void CardInfo::addToSet(const CardSetPtr &_set, const CardInfoPerSet _info)
 {
    _set->append(smartThis);
-    sets[_set->getShortName()].append(_info);
+    sets.insert(_set->getShortName(), _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 &cardInfoPerSetList : sets) {
-        for (const auto &set : cardInfoPerSetList) {
-            if (set.getPtr()->getEnabled()) {
-                setList << set.getPtr()->getShortName();
-            }
-            break;
+    for (const auto &set : sets) {
+        if (set.getPtr()->getEnabled()) {
+            setList << set.getPtr()->getShortName();
        }
    }
    setsNames = setList.join(", ");
@@ -375,12 +336,11 @@ CardDatabase::CardDatabase(QObject *parent) : QObject(parent), loadStatus(NotLoa
    availableParsers << new CockatriceXml3Parser;

    for (auto &parser : availableParsers) {
-        connect(parser, &ICardDatabaseParser::addCard, this, &CardDatabase::addCard, Qt::DirectConnection);
-        connect(parser, &ICardDatabaseParser::addSet, this, &CardDatabase::addSet, Qt::DirectConnection);
+        connect(parser, SIGNAL(addCard(CardInfoPtr)), this, SLOT(addCard(CardInfoPtr)), Qt::DirectConnection);
+        connect(parser, SIGNAL(addSet(CardSetPtr)), this, SLOT(addSet(CardSetPtr)), Qt::DirectConnection);
    }

-    connect(&SettingsCache::instance(), &SettingsCache::cardDatabasePathChanged, this,
-            &CardDatabase::loadCardDatabases);
+    connect(&SettingsCache::instance(), SIGNAL(cardDatabasePathChanged()), this, SLOT(loadCardDatabases()));
 }

 CardDatabase::~CardDatabase()
@@ -415,17 +375,15 @@ void CardDatabase::clear()
 void CardDatabase::addCard(CardInfoPtr card)
 {
    if (card == nullptr) {
-        qCDebug(CardDatabaseLog) << "CardDatabase::addCard(nullptr)";
+        qDebug() << "addCard(nullptr)";
        return;
    }

    // if card already exists just add the new set property
    if (cards.contains(card->getName())) {
        CardInfoPtr sameCard = cards[card->getName()];
-        for (const auto &cardInfoPerSetList : card->getSets()) {
-            for (const CardInfoPerSet &set : cardInfoPerSetList) {
-                sameCard->addToSet(set.getPtr(), set);
-            }
+        for (const CardInfoPerSet &set : card->getSets()) {
+            sameCard->addToSet(set.getPtr(), set);
        }
        return;
    }
@@ -440,7 +398,7 @@ void CardDatabase::addCard(CardInfoPtr card)
 void CardDatabase::removeCard(CardInfoPtr card)
 {
    if (card.isNull()) {
-        qCDebug(CardDatabaseLog) << "CardDatabase::removeCard(nullptr)";
+        qDebug() << "removeCard(nullptr)";
        return;
    }

@@ -468,7 +426,7 @@ CardInfoPtr CardDatabase::getCard(const QString &cardName) const
 QList<CardInfoPtr> CardDatabase::getCards(const QStringList &cardNames) const
 {
    QList<CardInfoPtr> cardInfos;
-    for (const QString &cardName : cardNames) {
+    foreach (QString cardName, cardNames) {
        CardInfoPtr ptr = getCardFromMap(cards, cardName);
        if (ptr)
            cardInfos.append(ptr);
@@ -477,39 +435,18 @@ QList<CardInfoPtr> CardDatabase::getCards(const QStringList &cardNames) const
    return cardInfos;
 }

-CardInfoPtr CardDatabase::getCardByNameAndProviderId(const QString &cardName, const QString &providerId) const
-{
-    auto info = getCard(cardName);
-    if (providerId.isNull() || providerId.isEmpty() || info.isNull()) {
-        return info;
-    }
-
-    for (const auto &cardInfoPerSetList : info->getSets()) {
-        for (const auto &set : cardInfoPerSetList) {
-            if (set.getProperty("uuid") == providerId) {
-                CardInfoPtr cardFromSpecificSet = info->clone();
-                cardFromSpecificSet->setPixmapCacheKey(QLatin1String("card_") + QString(info->getName()) +
-                                                       QString("_") + QString(set.getProperty("uuid")));
-                return cardFromSpecificSet;
-            }
-        }
-    }
-    return {};
-}
-
 CardInfoPtr CardDatabase::getCardBySimpleName(const QString &cardName) const
 {
    return getCardFromMap(simpleNameCards, CardInfo::simplifyName(cardName));
 }

-CardInfoPtr CardDatabase::guessCard(const QString &cardName, const QString &providerId) const
+CardInfoPtr CardDatabase::guessCard(const QString &cardName) const
 {
-    CardInfoPtr temp = providerId.isEmpty() ? getCard(cardName) : getCardByNameAndProviderId(cardName, providerId);
-
+    CardInfoPtr temp = getCard(cardName);
    if (temp == nullptr) { // get card by simple name instead
        temp = getCardBySimpleName(cardName);
        if (temp == nullptr) { // still could not find the card, so simplify the cardName too
-            const auto &simpleCardName = CardInfo::simplifyName(cardName);
+            QString simpleCardName = CardInfo::simplifyName(cardName);
            temp = getCardBySimpleName(simpleCardName);
        }
    }
@@ -582,8 +519,8 @@ LoadStatus CardDatabase::loadCardDatabase(const QString &path)
    }

    int msecs = startTime.msecsTo(QTime::currentTime());
-    qCDebug(CardDatabaseLoadingLog) << "Path =" << path << "Status =" << tempLoadStatus << "Cards =" << cards.size()
-                                    << "Sets =" << sets.size() << QString("%1ms").arg(msecs);
+    qDebug() << "[CardDatabase] loadCardDatabase(): Path =" << path << "Status =" << tempLoadStatus
+             << "Cards =" << cards.size() << "Sets =" << sets.size() << QString("%1ms").arg(msecs);

    return tempLoadStatus;
 }
@@ -592,7 +529,7 @@ LoadStatus CardDatabase::loadCardDatabases()
 {
    reloadDatabaseMutex->lock();

-    qCDebug(CardDatabaseLoadingLog) << "Started";
+    qDebug() << "CardDatabase::loadCardDatabases start";

    clear(); // remove old db

@@ -613,23 +550,20 @@ LoadStatus CardDatabase::loadCardDatabases()

    for (auto i = 0; i < databasePaths.size(); ++i) {
        const auto &databasePath = databasePaths.at(i);
-        qCDebug(CardDatabaseLoadingLog) << "Loading Custom Set" << i << "(" << databasePath << ")";
+        qDebug() << "Loading Custom Set" << i << "(" << databasePath << ")";
        loadCardDatabase(databasePath);
    }

    // AFTER all the cards have been loaded

-    // Refresh the pixmap cache keys for all cards by setting them to the UUID of the preferred printing
-    refreshPreferredPrintings();
    // resolve the reverse-related tags
    refreshCachedReverseRelatedCards();

    if (loadStatus == Ok) {
        checkUnknownSets(); // update deck editors, etc
-        qCDebug(CardDatabaseLoadingSuccessOrFailureLog) << "Success";
-        emit cardDatabaseLoadingFinished();
+        qDebug() << "CardDatabase::loadCardDatabases success";
    } else {
-        qCDebug(CardDatabaseLoadingSuccessOrFailureLog) << "Failed";
+        qDebug() << "CardDatabase::loadCardDatabases failed";
        emit cardDatabaseLoadingFailed(); // bring up the settings dialog
    }

@@ -637,142 +571,6 @@ LoadStatus CardDatabase::loadCardDatabases()
    return loadStatus;
 }

-void CardDatabase::refreshPreferredPrintings()
-{
-    for (const CardInfoPtr &card : cards) {
-        card->setPixmapCacheKey(QLatin1String("card_") + QString(card->getName()) + QString("_") +
-                                QString(getPreferredPrintingProviderIdForCard(card->getName())));
-    }
-}
-
-CardInfoPerSet CardDatabase::getPreferredSetForCard(const QString &cardName) const
-{
-    CardInfoPtr cardInfo = getCard(cardName);
-    if (!cardInfo) {
-        return CardInfoPerSet(nullptr);
-    }
-
-    CardInfoPerSetMap setMap = cardInfo->getSets();
-    if (setMap.empty()) {
-        return CardInfoPerSet(nullptr);
-    }
-
-    CardSetPtr preferredSet = nullptr;
-    CardInfoPerSet preferredCard;
-    SetPriorityComparator comparator;
-
-    for (const auto &cardInfoPerSetList : setMap) {
-        for (auto &cardInfoForSet : cardInfoPerSetList) {
-            CardSetPtr currentSet = cardInfoForSet.getPtr();
-            if (!preferredSet || comparator(currentSet, preferredSet)) {
-                preferredSet = currentSet;
-                preferredCard = cardInfoForSet;
-            }
-        }
-    }
-
-    if (preferredSet) {
-        return preferredCard;
-    }
-
-    return CardInfoPerSet(nullptr);
-}
-
-CardInfoPerSet CardDatabase::getSpecificSetForCard(const QString &cardName, const QString &providerId) const
-{
-    CardInfoPtr cardInfo = getCard(cardName);
-    if (!cardInfo) {
-        return CardInfoPerSet(nullptr);
-    }
-
-    CardInfoPerSetMap setMap = cardInfo->getSets();
-    if (setMap.empty()) {
-        return CardInfoPerSet(nullptr);
-    }
-
-    for (const auto &cardInfoPerSetList : setMap) {
-        for (auto &cardInfoForSet : cardInfoPerSetList) {
-            if (cardInfoForSet.getProperty("uuid") == providerId) {
-                return cardInfoForSet;
-            }
-        }
-    }
-
-    if (providerId.isNull()) {
-        return getPreferredSetForCard(cardName);
-    }
-
-    return CardInfoPerSet(nullptr);
-}
-
-CardInfoPerSet CardDatabase::getSpecificSetForCard(const QString &cardName,
-                                                   const QString &setShortName,
-                                                   const QString &collectorNumber) const
-{
-    CardInfoPtr cardInfo = getCard(cardName);
-    if (!cardInfo) {
-        return CardInfoPerSet(nullptr);
-    }
-
-    CardInfoPerSetMap setMap = cardInfo->getSets();
-    if (setMap.empty()) {
-        return CardInfoPerSet(nullptr);
-    }
-
-    for (const auto &cardInfoPerSetList : setMap) {
-        for (auto &cardInfoForSet : cardInfoPerSetList) {
-            if (cardInfoForSet.getPtr()->getShortName() == setShortName &&
-                cardInfoForSet.getProperty("num") == collectorNumber) {
-                return cardInfoForSet;
-            }
-        }
-    }
-
-    return CardInfoPerSet(nullptr);
-}
-
-QString CardDatabase::getPreferredPrintingProviderIdForCard(const QString &cardName)
-{
-    CardInfoPerSet preferredSetCardInfo = getPreferredSetForCard(cardName);
-    QString preferredPrintingProviderId = preferredSetCardInfo.getProperty(QString("uuid"));
-    if (preferredPrintingProviderId.isEmpty()) {
-        CardInfoPtr defaultCardInfo = getCard(cardName);
-        if (defaultCardInfo.isNull()) {
-            return cardName;
-        }
-        return defaultCardInfo->getName();
-    }
-    return preferredPrintingProviderId;
-}
-
-bool CardDatabase::isProviderIdForPreferredPrinting(const QString &cardName, const QString &providerId)
-{
-    if (providerId.startsWith("card_")) {
-        return providerId ==
-               QLatin1String("card_") + cardName + QString("_") + getPreferredPrintingProviderIdForCard(cardName);
-    }
-    return providerId == getPreferredPrintingProviderIdForCard(cardName);
-}
-
-CardInfoPerSet CardDatabase::getSetInfoForCard(const CardInfoPtr &_card)
-{
-    const CardInfoPerSetMap &setMap = _card->getSets();
-    if (setMap.empty()) {
-        return CardInfoPerSet(nullptr);
-    }
-
-    for (const auto &cardInfoPerSetList : setMap) {
-        for (const auto &cardInfoForSet : cardInfoPerSetList) {
-            if (QLatin1String("card_") + _card->getName() + QString("_") + cardInfoForSet.getProperty("uuid") ==
-                _card->getPixmapCacheKey()) {
-                return cardInfoForSet;
-            }
-        }
-    }
-
-    return CardInfoPerSet(nullptr);
-}
-
 void CardDatabase::refreshCachedReverseRelatedCards()
 {
    for (const CardInfoPtr &card : cards)
@@ -783,15 +581,15 @@ void CardDatabase::refreshCachedReverseRelatedCards()
            continue;
        }

-        for (CardRelation *cardRelation : card->getReverseRelatedCards()) {
+        foreach (CardRelation *cardRelation, card->getReverseRelatedCards()) {
            const QString &targetCard = cardRelation->getName();
            if (!cards.contains(targetCard)) {
                continue;
            }

-            auto *newCardRelation = new CardRelation(
-                card->getName(), cardRelation->getAttachType(), cardRelation->getIsCreateAllExclusion(),
-                cardRelation->getIsVariable(), cardRelation->getDefaultCount(), cardRelation->getIsPersistent());
+            auto *newCardRelation = new CardRelation(card->getName(), cardRelation->getDoesAttach(),
+                                                     cardRelation->getIsCreateAllExclusion(),
+                                                     cardRelation->getIsVariable(), cardRelation->getDefaultCount());
            cards.value(targetCard)->addReverseRelatedCards2Me(newCardRelation);
        }
    }
@@ -809,22 +607,22 @@ QStringList CardDatabase::getAllMainCardTypes() const

 void CardDatabase::checkUnknownSets()
 {
-    auto _sets = getSetList();
+    SetList sets = getSetList();

-    if (_sets.getEnabledSetsNum()) {
+    if (sets.getEnabledSetsNum()) {
        // if some sets are first found on this run, ask the user
-        int numUnknownSets = _sets.getUnknownSetsNum();
-        QStringList unknownSetNames = _sets.getUnknownSetsNames();
+        int numUnknownSets = sets.getUnknownSetsNum();
+        QStringList unknownSetNames = sets.getUnknownSetsNames();
        if (numUnknownSets > 0) {
            emit cardDatabaseNewSetsFound(numUnknownSets, unknownSetNames);
        } else {
-            _sets.markAllAsKnown();
+            sets.markAllAsKnown();
        }
    } else {
        // No set enabled. Probably this is the first time running trice
-        _sets.guessSortKeys();
-        _sets.sortByKey();
-        _sets.enableAll();
+        sets.guessSortKeys();
+        sets.sortByKey();
+        sets.enableAll();
        notifyEnabledSetsChanged();

        emit cardDatabaseAllNewSetsEnabled();
@@ -833,14 +631,14 @@ void CardDatabase::checkUnknownSets()

 void CardDatabase::enableAllUnknownSets()
 {
-    auto _sets = getSetList();
-    _sets.enableAllUnknown();
+    SetList sets = getSetList();
+    sets.enableAllUnknown();
 }

 void CardDatabase::markAllSetsAsKnown()
 {
-    auto _sets = getSetList();
-    _sets.markAllAsKnown();
+    SetList sets = getSetList();
+    sets.markAllAsKnown();
 }

 void CardDatabase::notifyEnabledSetsChanged()
@@ -874,19 +672,19 @@ bool CardDatabase::saveCustomTokensToFile()
 }

 CardRelation::CardRelation(const QString &_name,
-                           AttachType _attachType,
+                           bool _doesAttach,
                           bool _isCreateAllExclusion,
                           bool _isVariableCount,
                           int _defaultCount,
                           bool _isPersistent)
-    : name(_name), attachType(_attachType), isCreateAllExclusion(_isCreateAllExclusion),
+    : name(_name), doesAttach(_doesAttach), isCreateAllExclusion(_isCreateAllExclusion),
      isVariableCount(_isVariableCount), defaultCount(_defaultCount), isPersistent(_isPersistent)
 {
 }

 void CardInfo::resetReverseRelatedCards2Me()
 {
-    for (CardRelation *cardRelation : this->getReverseRelatedCards2Me()) {
+    foreach (CardRelation *cardRelation, this->getReverseRelatedCards2Me()) {
        cardRelation->deleteLater();
    }
    reverseRelatedCardsToMe = QList<CardRelation *>();
--- a/cockatrice/src/game/cards/card_database.h
+++ b/cockatrice/src/game/cards/card_database.h
@@ -5,7 +5,6 @@
 #include <QDate>
 #include <QHash>
 #include <QList>
-#include <QLoggingCategory>
 #include <QMap>
 #include <QMetaType>
 #include <QSharedPointer>
@@ -14,10 +13,6 @@
 #include <QVector>
 #include <utility>

-inline Q_LOGGING_CATEGORY(CardDatabaseLog, "card_database");
-inline Q_LOGGING_CATEGORY(CardDatabaseLoadingLog, "card_database.loading");
-inline Q_LOGGING_CATEGORY(CardDatabaseLoadingSuccessOrFailureLog, "card_database.loading.success_or_failure");
-
 class CardDatabase;
 class CardInfo;
 class CardInfoPerSet;
@@ -28,42 +23,28 @@ class ICardDatabaseParser;
 typedef QMap<QString, QString> QStringMap;
 typedef QSharedPointer<CardInfo> CardInfoPtr;
 typedef QSharedPointer<CardSet> CardSetPtr;
-typedef QMap<QString, QList<CardInfoPerSet>> CardInfoPerSetMap;
+typedef QMap<QString, CardInfoPerSet> CardInfoPerSetMap;

 Q_DECLARE_METATYPE(CardInfoPtr)

 class CardSet : public QList<CardInfoPtr>
 {
-public:
-    enum Priority
-    {
-        PriorityFallback = 0,
-        PriorityPrimary = 10,
-        PrioritySecondary = 20,
-        PriorityReprint = 30,
-        PriorityOther = 40,
-        PriorityLowest = 100,
-    };
-
 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);
+                     const QDate &_releaseDate = QDate());
    static CardSetPtr newInstance(const QString &_shortName = QString(),
                                  const QString &_longName = QString(),
                                  const QString &_setType = QString(),
-                                  const QDate &_releaseDate = QDate(),
-                                  const Priority _priority = PriorityFallback);
+                                  const QDate &_releaseDate = QDate());
    QString getCorrectedShortName() const;
    QString getShortName() const
    {
@@ -81,10 +62,6 @@ public:
    {
        return releaseDate;
    }
-    Priority getPriority() const
-    {
-        return priority;
-    }
    void setLongName(const QString &_longName)
    {
        longName = _longName;
@@ -97,10 +74,6 @@ public:
    {
        releaseDate = _releaseDate;
    }
-    void setPriority(const Priority _priority)
-    {
-        priority = _priority;
-    }

    void loadSetOptions();
    int getSortKey() const
@@ -140,7 +113,6 @@ public:
    int getEnabledSetsNum();
    int getUnknownSetsNum();
    QStringList getUnknownSetsNames();
-    void defaultSort();
 };

 class CardInfoPerSet
@@ -149,11 +121,6 @@ public:
    explicit CardInfoPerSet(const CardSetPtr &_set = QSharedPointer<CardSet>(nullptr));
    ~CardInfoPerSet() = default;

-    bool operator==(const CardInfoPerSet &other) const
-    {
-        return this->set == other.set && this->properties == other.properties;
-    }
-
 private:
    CardSetPtr set;
    // per-set card properties;
@@ -207,53 +174,32 @@ private:
    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,
-                      CardInfoPerSetMap _sets,
-                      bool _cipt,
-                      bool _landscapeOrientation,
-                      int _tableRow,
-                      bool _upsideDownArt);
-    CardInfo(const CardInfo &other)
-        : QObject(other.parent()), name(other.name), simpleName(other.simpleName), pixmapCacheKey(other.pixmapCacheKey),
-          text(other.text), isToken(other.isToken), properties(other.properties), relatedCards(other.relatedCards),
-          reverseRelatedCards(other.reverseRelatedCards), reverseRelatedCardsToMe(other.reverseRelatedCardsToMe),
-          sets(other.sets), setsNames(other.setsNames), cipt(other.cipt),
-          landscapeOrientation(other.landscapeOrientation), tableRow(other.tableRow), upsideDownArt(other.upsideDownArt)
-    {
-    }
+    explicit CardInfo(const QString &_name = QString(),
+                      const QString &_text = QString(),
+                      bool _isToken = false,
+                      QVariantHash _properties = QVariantHash(),
+                      const QList<CardRelation *> &_relatedCards = QList<CardRelation *>(),
+                      const QList<CardRelation *> &_reverseRelatedCards = QList<CardRelation *>(),
+                      CardInfoPerSetMap _sets = CardInfoPerSetMap(),
+                      bool _cipt = false,
+                      int _tableRow = 0,
+                      bool _upsideDownArt = false);
    ~CardInfo() override;

-    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,
-                                   CardInfoPerSetMap _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;
-    }
+    static CardInfoPtr newInstance(const QString &_name = QString(),
+                                   const QString &_text = QString(),
+                                   bool _isToken = false,
+                                   QVariantHash _properties = QVariantHash(),
+                                   const QList<CardRelation *> &_relatedCards = QList<CardRelation *>(),
+                                   const QList<CardRelation *> &_reverseRelatedCards = QList<CardRelation *>(),
+                                   CardInfoPerSetMap _sets = CardInfoPerSetMap(),
+                                   bool _cipt = false,
+                                   int _tableRow = 0,
+                                   bool _upsideDownArt = false);

    void setSmartPointer(CardInfoPtr _ptr)
    {
@@ -269,10 +215,6 @@ public:
    {
        return simpleName;
    }
-    void setPixmapCacheKey(QString _pixmapCacheKey)
-    {
-        pixmapCacheKey = _pixmapCacheKey;
-    }
    const QString &getPixmapCacheKey() const
    {
        return pixmapCacheKey;
@@ -321,15 +263,15 @@ public:
    {
        if (!sets.contains(setName))
            return "";
+        return sets[setName].getProperty(propertyName);
+    }
+    void setSetProperty(const QString &setName, const QString &_name, const QString &_value)
+    {
+        if (!sets.contains(setName))
+            return;

-        for (const auto &set : sets[setName]) {
-            if (QLatin1String("card_") + this->getName() + QString("_") + QString(set.getProperty("uuid")) ==
-                this->getPixmapCacheKey()) {
-                return set.getProperty(propertyName);
-            }
-        }
-
-        return sets[setName][0].getProperty(propertyName);
+        sets[setName].setProperty(_name, _value);
+        emit cardInfoChanged(smartThis);
    }

    // related cards
@@ -363,10 +305,6 @@ public:
    {
        return cipt;
    }
-    bool getLandscapeOrientation() const
-    {
-        return landscapeOrientation;
-    }
    int getTableRow() const
    {
        return tableRow;
@@ -400,7 +338,6 @@ public:
    }
    QString getCorrectedName() const;
    void addToSet(const CardSetPtr &_set, CardInfoPerSet _info = CardInfoPerSet());
-    void combineLegalities(const QVariantHash &props);
    void emitPixmapUpdated()
    {
        emit pixmapUpdated();
@@ -470,28 +407,20 @@ public:
    ~CardDatabase() override;
    void clear();
    void removeCard(CardInfoPtr card);
-    [[nodiscard]] CardInfoPtr getCard(const QString &cardName) const;
-    [[nodiscard]] QList<CardInfoPtr> getCards(const QStringList &cardNames) const;
-    [[nodiscard]] CardInfoPtr getCardByNameAndProviderId(const QString &cardName, const QString &providerId) const;
-    [[nodiscard]] CardInfoPerSet getPreferredSetForCard(const QString &cardName) const;
-    [[nodiscard]] CardInfoPerSet getSpecificSetForCard(const QString &cardName, const QString &providerId) const;
-    CardInfoPerSet
-    getSpecificSetForCard(const QString &cardName, const QString &setShortName, const QString &collectorNumber) const;
-    QString getPreferredPrintingProviderIdForCard(const QString &cardName);
-    [[nodiscard]] CardInfoPtr guessCard(const QString &cardName, const QString &providerId = QString()) const;
+    CardInfoPtr getCard(const QString &cardName) const;
+    QList<CardInfoPtr> getCards(const QStringList &cardNames) const;
+    CardInfoPtr guessCard(const QString &cardName) 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;
+    CardInfoPtr getCardBySimpleName(const QString &cardName) const;

    CardSetPtr getSet(const QString &setName);
-    bool isProviderIdForPreferredPrinting(const QString &cardName, const QString &providerId);
-    static CardInfoPerSet getSetInfoForCard(const CardInfoPtr &_card);
-    const CardNameMap &getCardList() const
+    QList<CardInfoPtr> getCardList() const
    {
-        return cards;
+        return cards.values();
    }
    SetList getSetList() const;
    LoadStatus loadFromFile(const QString &fileName);
@@ -507,13 +436,11 @@ public:

 public slots:
    LoadStatus loadCardDatabases();
-    void refreshPreferredPrintings();
    void addCard(CardInfoPtr card);
    void addSet(CardSetPtr set);
 protected slots:
    LoadStatus loadCardDatabase(const QString &path);
 signals:
-    void cardDatabaseLoadingFinished();
    void cardDatabaseLoadingFailed();
    void cardDatabaseNewSetsFound(int numUnknownSets, QStringList unknownSetsNames);
    void cardDatabaseAllNewSetsEnabled();
@@ -525,17 +452,9 @@ signals:
 class CardRelation : public QObject
 {
    Q_OBJECT
-public:
-    enum AttachType
-    {
-        DoesNotAttach = 0,
-        AttachTo = 1,
-        TransformInto = 2,
-    };
-
 private:
    QString name;
-    AttachType attachType;
+    bool doesAttach;
    bool isCreateAllExclusion;
    bool isVariableCount;
    int defaultCount;
@@ -543,7 +462,7 @@ private:

 public:
    explicit CardRelation(const QString &_name = QString(),
-                          AttachType _attachType = DoesNotAttach,
+                          bool _doesAttach = false,
                          bool _isCreateAllExclusion = false,
                          bool _isVariableCount = false,
                          int _defaultCount = 1,
@@ -553,32 +472,13 @@ public:
    {
        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 "";
-        }
+        return doesAttach;
    }
    bool getCanCreateAnother() const
    {
-        return !getDoesAttach();
+        return !doesAttach;
    }
    bool getIsCreateAllExclusion() const
    {
--- a/cockatrice/src/game/cards/card_database_model.cpp
+++ b/cockatrice/src/game/cards/card_database_model.cpp
@@ -1,6 +1,6 @@
-#include "card_database_model.h"
+#include "carddatabasemodel.h"

-#include "../filters/filter_tree.h"
+#include "filtertree.h"

 #include <QMap>

@@ -9,10 +9,9 @@
 CardDatabaseModel::CardDatabaseModel(CardDatabase *_db, bool _showOnlyCardsFromEnabledSets, QObject *parent)
    : QAbstractListModel(parent), db(_db), showOnlyCardsFromEnabledSets(_showOnlyCardsFromEnabledSets)
 {
-    connect(db, &CardDatabase::cardAdded, this, &CardDatabaseModel::cardAdded);
-    connect(db, &CardDatabase::cardRemoved, this, &CardDatabaseModel::cardRemoved);
-    connect(db, &CardDatabase::cardDatabaseEnabledSetsChanged, this,
-            &CardDatabaseModel::cardDatabaseEnabledSetsChanged);
+    connect(db, SIGNAL(cardAdded(CardInfoPtr)), this, SLOT(cardAdded(CardInfoPtr)));
+    connect(db, SIGNAL(cardRemoved(CardInfoPtr)), this, SLOT(cardRemoved(CardInfoPtr)));
+    connect(db, SIGNAL(cardDatabaseEnabledSetsChanged()), this, SLOT(cardDatabaseEnabledSetsChanged()));

    cardDatabaseEnabledSetsChanged();
 }
@@ -98,11 +97,9 @@ bool CardDatabaseModel::checkCardHasAtLeastOneEnabledSet(CardInfoPtr card)
    if (!showOnlyCardsFromEnabledSets)
        return true;

-    for (const auto &cardInfoPerSetList : card->getSets()) {
-        for (const auto &set : cardInfoPerSetList) {
-            if (set.getPtr()->getEnabled())
-                return true;
-        }
+    for (const auto &set : card->getSets()) {
+        if (set.getPtr()->getEnabled())
+            return true;
    }

    return false;
@@ -111,17 +108,15 @@ bool CardDatabaseModel::checkCardHasAtLeastOneEnabledSet(CardInfoPtr card)
 void CardDatabaseModel::cardDatabaseEnabledSetsChanged()
 {
    // remove all the cards no more present in at least one enabled set
-    for (const CardInfoPtr &card : cardList) {
-        if (!checkCardHasAtLeastOneEnabledSet(card)) {
+    foreach (CardInfoPtr card, cardList) {
+        if (!checkCardHasAtLeastOneEnabledSet(card))
            cardRemoved(card);
-        }
    }

    // re-check all the card currently not shown, maybe their part of a newly-enabled set
-    for (const CardInfoPtr &card : db->getCardList()) {
-        if (!cardListSet.contains(card)) {
+    foreach (CardInfoPtr card, db->getCardList()) {
+        if (!cardList.contains(card))
            cardAdded(card);
-        }
    }
 }

@@ -131,8 +126,7 @@ void CardDatabaseModel::cardAdded(CardInfoPtr card)
        // add the card if it's present in at least one enabled set
        beginInsertRows(QModelIndex(), cardList.size(), cardList.size());
        cardList.append(card);
-        cardListSet.insert(card);
-        connect(card.data(), &CardInfo::cardInfoChanged, this, &CardDatabaseModel::cardInfoChanged);
+        connect(card.data(), SIGNAL(cardInfoChanged(CardInfoPtr)), this, SLOT(cardInfoChanged(CardInfoPtr)));
        endInsertRows();
    }
 }
@@ -146,7 +140,6 @@ void CardDatabaseModel::cardRemoved(CardInfoPtr card)

    beginRemoveRows(QModelIndex(), row, row);
    disconnect(card.data(), nullptr, this, nullptr);
-    cardListSet.remove(card);
    card.clear();
    cardList.removeAt(row);
    endRemoveRows();
@@ -175,12 +168,7 @@ void CardDatabaseDisplayModel::fetchMore(const QModelIndex &index)
    int remainder = sourceModel()->rowCount(index) - loadedRowCount;
    int itemsToFetch = qMin(100, remainder);

-    if (itemsToFetch == 0) {
-        return;
-    }
-
-    const auto startIndex = qMin(rowCount(QModelIndex()), loadedRowCount);
-    beginInsertRows(QModelIndex(), startIndex, startIndex + itemsToFetch - 1);
+    beginInsertRows(QModelIndex(), loadedRowCount, loadedRowCount + itemsToFetch - 1);

    loadedRowCount += itemsToFetch;
    endInsertRows();
@@ -188,7 +176,7 @@ void CardDatabaseDisplayModel::fetchMore(const QModelIndex &index)

 int CardDatabaseDisplayModel::rowCount(const QModelIndex &parent) const
 {
-    return QSortFilterProxyModel::rowCount(parent);
+    return qMin(QSortFilterProxyModel::rowCount(parent), loadedRowCount);
 }

 bool CardDatabaseDisplayModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
@@ -338,13 +326,13 @@ void CardDatabaseDisplayModel::clearFilterAll()
    invalidateFilter();
 }

-void CardDatabaseDisplayModel::setFilterTree(FilterTree *_filterTree)
+void CardDatabaseDisplayModel::setFilterTree(FilterTree *filterTree)
 {
    if (this->filterTree != nullptr)
        disconnect(this->filterTree, nullptr, this, nullptr);

-    this->filterTree = _filterTree;
-    connect(this->filterTree, &FilterTree::changed, this, &CardDatabaseDisplayModel::filterTreeChanged);
+    this->filterTree = filterTree;
+    connect(this->filterTree, SIGNAL(changed()), this, SLOT(filterTreeChanged()));
    invalidate();
 }

--- a/cockatrice/src/game/cards/card_database_model.h
+++ b/cockatrice/src/game/cards/card_database_model.h
@@ -1,8 +1,8 @@
 #ifndef CARDDATABASEMODEL_H
 #define CARDDATABASEMODEL_H

-#include "../filters/filter_string.h"
-#include "card_database.h"
+#include "carddatabase.h"
+#include "filter_string.h"

 #include <QAbstractListModel>
 #include <QList>
@@ -46,7 +46,6 @@ public:

 private:
    QList<CardInfoPtr> cardList;
-    QSet<CardInfoPtr> cardListSet; // Supports faster lookups in cardDatabaseEnabledSetsChanged()
    CardDatabase *db;
    bool showOnlyCardsFromEnabledSets;

@@ -83,7 +82,7 @@ private:

 public:
    explicit CardDatabaseDisplayModel(QObject *parent = nullptr);
-    void setFilterTree(FilterTree *_filterTree);
+    void setFilterTree(FilterTree *filterTree);
    void setIsToken(FilterBool _isToken)
    {
        isToken = _isToken;
@@ -117,15 +116,14 @@ public:
    }
    void clearFilterAll();
    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-    bool canFetchMore(const QModelIndex &parent) const override;
-    void fetchMore(const QModelIndex &parent) override;

 protected:
    bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
    static int lessThanNumerically(const QString &left, const QString &right);
    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
    bool rowMatchesCardName(CardInfoPtr info) const;
-
+    bool canFetchMore(const QModelIndex &parent) const override;
+    void fetchMore(const QModelIndex &parent) override;
 private slots:
    void filterTreeChanged();
    /** Will translate all undesirable characters in DIRTYNAME according to the TABLE. */
--- a/cockatrice/src/game/cards/card_database_parser/card_database_parser.cpp
+++ b/cockatrice/src/game/cards/card_database_parser/card_database_parser.cpp
@@ -1,4 +1,4 @@
-#include "card_database_parser.h"
+#include "carddatabaseparser.h"

 SetNameMap ICardDatabaseParser::sets;

@@ -10,8 +10,7 @@ void ICardDatabaseParser::clearSetlist()
 CardSetPtr ICardDatabaseParser::internalAddSet(const QString &setName,
                                               const QString &longName,
                                               const QString &setType,
-                                               const QDate &releaseDate,
-                                               const CardSet::Priority priority)
+                                               const QDate &releaseDate)
 {
    if (sets.contains(setName)) {
        return sets.value(setName);
@@ -21,9 +20,8 @@ CardSetPtr ICardDatabaseParser::internalAddSet(const QString &setName,
    newSet->setLongName(longName);
    newSet->setSetType(setType);
    newSet->setReleaseDate(releaseDate);
-    newSet->setPriority(priority);

    sets.insert(setName, newSet);
    emit addSet(newSet);
    return newSet;
-}
+}
--- a/cockatrice/src/game/cards/card_database_parser/card_database_parser.h
+++ b/cockatrice/src/game/cards/card_database_parser/card_database_parser.h
@@ -1,7 +1,7 @@
 #ifndef CARDDATABASE_PARSER_H
 #define CARDDATABASE_PARSER_H

-#include "../card_database.h"
+#include "../carddatabase.h"

 #include <QIODevice>
 #include <QString>
@@ -10,7 +10,6 @@

 class ICardDatabaseParser : public QObject
 {
-    Q_OBJECT
 public:
    ~ICardDatabaseParser() override = default;

@@ -33,13 +32,12 @@ protected:
    CardSetPtr internalAddSet(const QString &setName,
                              const QString &longName = "",
                              const QString &setType = "",
-                              const QDate &releaseDate = QDate(),
-                              const CardSet::Priority priority = CardSet::PriorityFallback);
+                              const QDate &releaseDate = QDate());
 signals:
-    void addCard(CardInfoPtr card);
-    void addSet(CardSetPtr set);
+    virtual void addCard(CardInfoPtr card) = 0;
+    virtual void addSet(CardSetPtr set) = 0;
 };

 Q_DECLARE_INTERFACE(ICardDatabaseParser, "ICardDatabaseParser")

-#endif
+#endif
--- a/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp
+++ b/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp
@@ -1,4 +1,4 @@
-#include "cockatrice_xml_3.h"
+#include "cockatricexml3.h"

 #include <QCoreApplication>
 #include <QDebug>
@@ -13,10 +13,10 @@

 bool CockatriceXml3Parser::getCanParseFile(const QString &fileName, QIODevice &device)
 {
-    qCDebug(CockatriceXml3Log) << "Trying to parse: " << fileName;
+    qDebug() << "[CockatriceXml3Parser] Trying to parse: " << fileName;

    if (!fileName.endsWith(".xml", Qt::CaseInsensitive)) {
-        qCDebug(CockatriceXml3Log) << "Parsing failed: wrong extension";
+        qDebug() << "[CockatriceXml3Parser] Parsing failed: wrong extension";
        return false;
    }

@@ -28,12 +28,12 @@ bool CockatriceXml3Parser::getCanParseFile(const QString &fileName, QIODevice &d
                if (version == COCKATRICE_XML3_TAGVER) {
                    return true;
                } else {
-                    qCDebug(CockatriceXml3Log) << "Parsing failed: wrong version" << version;
+                    qDebug() << "[CockatriceXml3Parser] Parsing failed: wrong version" << version;
                    return false;
                }

            } else {
-                qCDebug(CockatriceXml3Log) << "Parsing failed: wrong element tag" << xml.name();
+                qDebug() << "[CockatriceXml3Parser] Parsing failed: wrong element tag" << xml.name();
                return false;
            }
        }
@@ -58,7 +58,7 @@ void CockatriceXml3Parser::parseFile(QIODevice &device)
                } else if (name == "cards") {
                    loadCardsFromXml(xml);
                } else if (!name.isEmpty()) {
-                    qCDebug(CockatriceXml3Log) << "Unknown item" << name << ", trying to continue anyway";
+                    qDebug() << "[CockatriceXml3Parser] Unknown item" << name << ", trying to continue anyway";
                    xml.skipCurrentElement();
                }
            }
@@ -93,7 +93,7 @@ void CockatriceXml3Parser::loadSetsFromXml(QXmlStreamReader &xml)
                    releaseDate =
                        QDate::fromString(xml.readElementText(QXmlStreamReader::IncludeChildElements), Qt::ISODate);
                } else if (!name.isEmpty()) {
-                    qCDebug(CockatriceXml3Log) << "Unknown set property" << name << ", trying to continue anyway";
+                    qDebug() << "[CockatriceXml3Parser] Unknown set property" << name << ", trying to continue anyway";
                    xml.skipCurrentElement();
                }
            }
@@ -155,10 +155,9 @@ void CockatriceXml3Parser::loadCardsFromXml(QXmlStreamReader &xml)
            QVariantHash properties = QVariantHash();
            QString colors = QString("");
            QList<CardRelation *> relatedCards, reverseRelatedCards;
-            auto _sets = CardInfoPerSetMap();
+            CardInfoPerSetMap sets = CardInfoPerSetMap();
            int tableRow = 0;
            bool cipt = false;
-            bool landscapeOrientation = false;
            bool isToken = false;
            bool upsideDown = false;

@@ -195,8 +194,6 @@ void CockatriceXml3Parser::loadCardsFromXml(QXmlStreamReader &xml)
                    tableRow = xml.readElementText(QXmlStreamReader::IncludeChildElements).toInt();
                } else if (xmlName == "cipt") {
                    cipt = (xml.readElementText(QXmlStreamReader::IncludeChildElements) == "1");
-                } else if (xmlName == "landscapeOrientation") {
-                    landscapeOrientation = (xml.readElementText(QXmlStreamReader::IncludeChildElements) == "1");
                } else if (xmlName == "upsidedown") {
                    upsideDown = (xml.readElementText(QXmlStreamReader::IncludeChildElements) == "1");
                    // sets
@@ -224,10 +221,10 @@ void CockatriceXml3Parser::loadCardsFromXml(QXmlStreamReader &xml)
                    if (attrs.hasAttribute("rarity")) {
                        setInfo.setProperty("rarity", attrs.value("rarity").toString());
                    }
-                    _sets[setName].append(setInfo);
+                    sets.insert(setName, setInfo);
                    // related cards
                } else if (xmlName == "related" || xmlName == "reverse-related") {
-                    CardRelation::AttachType attach = CardRelation::DoesNotAttach;
+                    bool attach = false;
                    bool exclude = false;
                    bool variable = false;
                    int count = 1;
@@ -249,7 +246,7 @@ void CockatriceXml3Parser::loadCardsFromXml(QXmlStreamReader &xml)
                    }

                    if (attrs.hasAttribute("attach")) {
-                        attach = CardRelation::AttachTo;
+                        attach = true;
                    }

                    if (attrs.hasAttribute("exclude")) {
@@ -263,15 +260,15 @@ void CockatriceXml3Parser::loadCardsFromXml(QXmlStreamReader &xml)
                        relatedCards << relation;
                    }
                } else if (!xmlName.isEmpty()) {
-                    qCDebug(CockatriceXml3Log) << "Unknown card property" << xmlName << ", trying to continue anyway";
+                    qDebug() << "[CockatriceXml3Parser] Unknown card property" << xmlName
+                             << ", trying to continue anyway";
                    xml.skipCurrentElement();
                }
            }

            properties.insert("colors", colors);
-            CardInfoPtr newCard =
-                CardInfo::newInstance(name, text, isToken, properties, relatedCards, reverseRelatedCards, _sets, cipt,
-                                      landscapeOrientation, tableRow, upsideDown);
+            CardInfoPtr newCard = CardInfo::newInstance(name, text, isToken, properties, relatedCards,
+                                                        reverseRelatedCards, sets, cipt, tableRow, upsideDown);
            emit addCard(newCard);
        }
    }
@@ -280,7 +277,7 @@ void CockatriceXml3Parser::loadCardsFromXml(QXmlStreamReader &xml)
 static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardSetPtr &set)
 {
    if (set.isNull()) {
-        qCDebug(CockatriceXml3Log) << "&operator<< set is nullptr";
+        qDebug() << "&operator<< set is nullptr";
        return xml;
    }

@@ -297,7 +294,7 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardSetPtr &set
 static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &info)
 {
    if (info.isNull()) {
-        qCDebug(CockatriceXml3Log) << "operator<< info is nullptr";
+        qDebug() << "operator<< info is nullptr";
        return xml;
    }

@@ -334,26 +331,24 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in

    // sets
    const CardInfoPerSetMap sets = info->getSets();
-    for (const auto &cardInfoPerSetList : sets) {
-        for (const CardInfoPerSet &set : cardInfoPerSetList) {
-            xml.writeStartElement("set");
-            xml.writeAttribute("rarity", set.getProperty("rarity"));
-            xml.writeAttribute("muId", set.getProperty("muid"));
-            xml.writeAttribute("uuId", set.getProperty("uuid"));
+    for (CardInfoPerSet set : sets) {
+        xml.writeStartElement("set");
+        xml.writeAttribute("rarity", set.getProperty("rarity"));
+        xml.writeAttribute("muId", set.getProperty("muid"));
+        xml.writeAttribute("uuId", set.getProperty("uuid"));

-            tmpString = set.getProperty("num");
-            if (!tmpString.isEmpty()) {
-                xml.writeAttribute("num", tmpString);
-            }
-
-            tmpString = set.getProperty("picurl");
-            if (!tmpString.isEmpty()) {
-                xml.writeAttribute("picURL", tmpString);
-            }
-
-            xml.writeCharacters(set.getPtr()->getShortName());
-            xml.writeEndElement();
+        tmpString = set.getProperty("num");
+        if (!tmpString.isEmpty()) {
+            xml.writeAttribute("num", tmpString);
        }
+
+        tmpString = set.getProperty("picurl");
+        if (!tmpString.isEmpty()) {
+            xml.writeAttribute("picURL", tmpString);
+        }
+
+        xml.writeCharacters(set.getPtr()->getShortName());
+        xml.writeEndElement();
    }

    // related cards
@@ -408,9 +403,6 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in
    if (info->getCipt()) {
        xml.writeTextElement("cipt", "1");
    }
-    if (info->getLandscapeOrientation()) {
-        xml.writeTextElement("landscapeOrientation", "1");
-    }
    if (info->getUpsideDownArt()) {
        xml.writeTextElement("upsidedown", "1");
    }
@@ -420,7 +412,7 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in
    return xml;
 }

-bool CockatriceXml3Parser::saveToFile(SetNameMap _sets,
+bool CockatriceXml3Parser::saveToFile(SetNameMap sets,
                                      CardNameMap cards,
                                      const QString &fileName,
                                      const QString &sourceUrl,
@@ -447,9 +439,9 @@ bool CockatriceXml3Parser::saveToFile(SetNameMap _sets,
    xml.writeTextElement("sourceVersion", sourceVersion);
    xml.writeEndElement();

-    if (_sets.count() > 0) {
+    if (sets.count() > 0) {
        xml.writeStartElement("sets");
-        for (CardSetPtr set : _sets) {
+        for (CardSetPtr set : sets) {
            xml << set;
        }
        xml.writeEndElement();
@@ -467,4 +459,4 @@ bool CockatriceXml3Parser::saveToFile(SetNameMap _sets,
    xml.writeEndDocument();

    return true;
-}
+}
--- a/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.h
+++ b/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.h
@@ -1,13 +1,10 @@
 #ifndef COCKATRICE_XML3_H
 #define COCKATRICE_XML3_H

-#include "card_database_parser.h"
+#include "carddatabaseparser.h"

-#include <QLoggingCategory>
 #include <QXmlStreamReader>

-inline Q_LOGGING_CATEGORY(CockatriceXml3Log, "cockatrice_xml.xml_3_parser");
-
 class CockatriceXml3Parser : public ICardDatabaseParser
 {
    Q_OBJECT
@@ -17,7 +14,7 @@ public:
    ~CockatriceXml3Parser() override = default;
    bool getCanParseFile(const QString &name, QIODevice &device) override;
    void parseFile(QIODevice &device) override;
-    bool saveToFile(SetNameMap _sets,
+    bool saveToFile(SetNameMap sets,
                    CardNameMap cards,
                    const QString &fileName,
                    const QString &sourceUrl = "unknown",
@@ -27,6 +24,9 @@ private:
    void loadCardsFromXml(QXmlStreamReader &xml);
    void loadSetsFromXml(QXmlStreamReader &xml);
    QString getMainCardType(QString &type);
+signals:
+    void addCard(CardInfoPtr card) override;
+    void addSet(CardSetPtr set) override;
 };

 #endif
--- a/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp
+++ b/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp
@@ -1,4 +1,4 @@
-#include "cockatrice_xml_4.h"
+#include "cockatricexml4.h"

 #include <QCoreApplication>
 #include <QDebug>
@@ -13,10 +13,10 @@

 bool CockatriceXml4Parser::getCanParseFile(const QString &fileName, QIODevice &device)
 {
-    qCDebug(CockatriceXml4Log) << "Trying to parse: " << fileName;
+    qDebug() << "[CockatriceXml4Parser] Trying to parse: " << fileName;

    if (!fileName.endsWith(".xml", Qt::CaseInsensitive)) {
-        qCDebug(CockatriceXml4Log) << "Parsing failed: wrong extension";
+        qDebug() << "[CockatriceXml4Parser] Parsing failed: wrong extension";
        return false;
    }

@@ -28,12 +28,12 @@ bool CockatriceXml4Parser::getCanParseFile(const QString &fileName, QIODevice &d
                if (version == COCKATRICE_XML4_TAGVER) {
                    return true;
                } else {
-                    qCDebug(CockatriceXml4Log) << "Parsing failed: wrong version" << version;
+                    qDebug() << "[CockatriceXml4Parser] Parsing failed: wrong version" << version;
                    return false;
                }

            } else {
-                qCDebug(CockatriceXml4Log) << "Parsing failed: wrong element tag" << xml.name();
+                qDebug() << "[CockatriceXml4Parser] Parsing failed: wrong element tag" << xml.name();
                return false;
            }
        }
@@ -58,7 +58,7 @@ void CockatriceXml4Parser::parseFile(QIODevice &device)
                } else if (xmlName == "cards") {
                    loadCardsFromXml(xml);
                } else if (!xmlName.isEmpty()) {
-                    qCDebug(CockatriceXml4Log) << "Unknown item" << xmlName << ", trying to continue anyway";
+                    qDebug() << "[CockatriceXml4Parser] Unknown item" << xmlName << ", trying to continue anyway";
                    xml.skipCurrentElement();
                }
            }
@@ -77,7 +77,6 @@ void CockatriceXml4Parser::loadSetsFromXml(QXmlStreamReader &xml)
        if (xmlName == "set") {
            QString shortName, longName, setType;
            QDate releaseDate;
-            short priority;
            while (!xml.atEnd()) {
                if (xml.readNext() == QXmlStreamReader::EndElement) {
                    break;
@@ -93,15 +92,14 @@ void CockatriceXml4Parser::loadSetsFromXml(QXmlStreamReader &xml)
                } else if (xmlName == "releasedate") {
                    releaseDate =
                        QDate::fromString(xml.readElementText(QXmlStreamReader::IncludeChildElements), Qt::ISODate);
-                } else if (xmlName == "priority") {
-                    priority = xml.readElementText(QXmlStreamReader::IncludeChildElements).toShort();
                } else if (!xmlName.isEmpty()) {
-                    qCDebug(CockatriceXml4Log) << "Unknown set property" << xmlName << ", trying to continue anyway";
+                    qDebug() << "[CockatriceXml4Parser] Unknown set property" << xmlName
+                             << ", trying to continue anyway";
                    xml.skipCurrentElement();
                }
            }

-            internalAddSet(shortName, longName, setType, releaseDate, static_cast<CardSet::Priority>(priority));
+            internalAddSet(shortName, longName, setType, releaseDate);
        }
    }
 }
@@ -136,10 +134,9 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
            QString text = QString("");
            QVariantHash properties = QVariantHash();
            QList<CardRelation *> relatedCards, reverseRelatedCards;
-            auto _sets = CardInfoPerSetMap();
+            CardInfoPerSetMap sets = CardInfoPerSetMap();
            int tableRow = 0;
            bool cipt = false;
-            bool landscapeOrientation = false;
            bool isToken = false;
            bool upsideDown = false;

@@ -165,8 +162,6 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
                    tableRow = xml.readElementText(QXmlStreamReader::IncludeChildElements).toInt();
                } else if (xmlName == "cipt") {
                    cipt = (xml.readElementText(QXmlStreamReader::IncludeChildElements) == "1");
-                } else if (xmlName == "landscapeOrientation") {
-                    landscapeOrientation = (xml.readElementText(QXmlStreamReader::IncludeChildElements) == "1");
                } else if (xmlName == "upsidedown") {
                    upsideDown = (xml.readElementText(QXmlStreamReader::IncludeChildElements) == "1");
                    // sets
@@ -183,11 +178,11 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
                                attrName = "picurl";
                            setInfo.setProperty(attrName, attr.value().toString());
                        }
-                        _sets[setName].append(setInfo);
+                        sets.insert(setName, setInfo);
                    }
                    // related cards
                } else if (xmlName == "related" || xmlName == "reverse-related") {
-                    CardRelation::AttachType attachType = CardRelation::DoesNotAttach;
+                    bool attach = false;
                    bool exclude = false;
                    bool variable = false;
                    bool persistent = false;
@@ -210,8 +205,7 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
                    }

                    if (attrs.hasAttribute("attach")) {
-                        attachType = attrs.value("attach").toString() == "transform" ? CardRelation::TransformInto
-                                                                                     : CardRelation::AttachTo;
+                        attach = true;
                    }

                    if (attrs.hasAttribute("exclude")) {
@@ -222,21 +216,21 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
                        persistent = true;
                    }

-                    auto *relation = new CardRelation(cardName, attachType, exclude, variable, count, persistent);
+                    auto *relation = new CardRelation(cardName, attach, exclude, variable, count, persistent);
                    if (xmlName == "reverse-related") {
                        reverseRelatedCards << relation;
                    } else {
                        relatedCards << relation;
                    }
                } else if (!xmlName.isEmpty()) {
-                    qCDebug(CockatriceXml4Log) << "Unknown card property" << xmlName << ", trying to continue anyway";
+                    qDebug() << "[CockatriceXml4Parser] Unknown card property" << xmlName
+                             << ", trying to continue anyway";
                    xml.skipCurrentElement();
                }
            }

-            CardInfoPtr newCard =
-                CardInfo::newInstance(name, text, isToken, properties, relatedCards, reverseRelatedCards, _sets, cipt,
-                                      landscapeOrientation, tableRow, upsideDown);
+            CardInfoPtr newCard = CardInfo::newInstance(name, text, isToken, properties, relatedCards,
+                                                        reverseRelatedCards, sets, cipt, tableRow, upsideDown);
            emit addCard(newCard);
        }
    }
@@ -245,7 +239,7 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
 static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardSetPtr &set)
 {
    if (set.isNull()) {
-        qCDebug(CockatriceXml4Log) << "&operator<< set is nullptr";
+        qDebug() << "&operator<< set is nullptr";
        return xml;
    }

@@ -254,7 +248,6 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardSetPtr &set
    xml.writeTextElement("longname", set->getLongName());
    xml.writeTextElement("settype", set->getSetType());
    xml.writeTextElement("releasedate", set->getReleaseDate().toString(Qt::ISODate));
-    xml.writeTextElement("priority", QString::number(set->getPriority()));
    xml.writeEndElement();

    return xml;
@@ -263,7 +256,7 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardSetPtr &set
 static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &info)
 {
    if (info.isNull()) {
-        qCDebug(CockatriceXml4Log) << "operator<< info is nullptr";
+        qDebug() << "operator<< info is nullptr";
        return xml;
    }

@@ -286,16 +279,14 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in
    xml.writeEndElement();

    // sets
-    for (const auto &cardInfoPerSetList : info->getSets()) {
-        for (const CardInfoPerSet &set : cardInfoPerSetList) {
-            xml.writeStartElement("set");
-            for (const QString &propName : set.getProperties()) {
-                xml.writeAttribute(propName, set.getProperty(propName));
-            }
-
-            xml.writeCharacters(set.getPtr()->getShortName());
-            xml.writeEndElement();
+    for (CardInfoPerSet set : info->getSets()) {
+        xml.writeStartElement("set");
+        for (QString propName : set.getProperties()) {
+            xml.writeAttribute(propName, set.getProperty(propName));
        }
+
+        xml.writeCharacters(set.getPtr()->getShortName());
+        xml.writeEndElement();
    }

    // related cards
@@ -303,7 +294,7 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in
    for (auto i : related) {
        xml.writeStartElement("related");
        if (i->getDoesAttach()) {
-            xml.writeAttribute("attach", i->getAttachTypeAsString());
+            xml.writeAttribute("attach", "attach");
        }
        if (i->getIsCreateAllExclusion()) {
            xml.writeAttribute("exclude", "exclude");
@@ -327,7 +318,7 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in
    for (auto i : reverseRelated) {
        xml.writeStartElement("reverse-related");
        if (i->getDoesAttach()) {
-            xml.writeAttribute("attach", i->getAttachTypeAsString());
+            xml.writeAttribute("attach", "attach");
        }

        if (i->getIsCreateAllExclusion()) {
@@ -355,9 +346,6 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in
    if (info->getCipt()) {
        xml.writeTextElement("cipt", "1");
    }
-    if (info->getLandscapeOrientation()) {
-        xml.writeTextElement("landscapeOrientation", "1");
-    }
    if (info->getUpsideDownArt()) {
        xml.writeTextElement("upsidedown", "1");
    }
@@ -367,7 +355,7 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in
    return xml;
 }

-bool CockatriceXml4Parser::saveToFile(SetNameMap _sets,
+bool CockatriceXml4Parser::saveToFile(SetNameMap sets,
                                      CardNameMap cards,
                                      const QString &fileName,
                                      const QString &sourceUrl,
@@ -394,9 +382,9 @@ bool CockatriceXml4Parser::saveToFile(SetNameMap _sets,
    xml.writeTextElement("sourceVersion", sourceVersion);
    xml.writeEndElement();

-    if (_sets.count() > 0) {
+    if (sets.count() > 0) {
        xml.writeStartElement("sets");
-        for (CardSetPtr set : _sets) {
+        for (CardSetPtr set : sets) {
            xml << set;
        }
        xml.writeEndElement();
--- a/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.h
+++ b/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.h
@@ -1,13 +1,10 @@
 #ifndef COCKATRICE_XML4_H
 #define COCKATRICE_XML4_H

-#include "card_database_parser.h"
+#include "carddatabaseparser.h"

-#include <QLoggingCategory>
 #include <QXmlStreamReader>

-inline Q_LOGGING_CATEGORY(CockatriceXml4Log, "cockatrice_xml.xml_4_parser");
-
 class CockatriceXml4Parser : public ICardDatabaseParser
 {
    Q_OBJECT
@@ -17,7 +14,7 @@ public:
    ~CockatriceXml4Parser() override = default;
    bool getCanParseFile(const QString &name, QIODevice &device) override;
    void parseFile(QIODevice &device) override;
-    bool saveToFile(SetNameMap _sets,
+    bool saveToFile(SetNameMap sets,
                    CardNameMap cards,
                    const QString &fileName,
                    const QString &sourceUrl = "unknown",
@@ -27,6 +24,9 @@ private:
    QVariantHash loadCardPropertiesFromXml(QXmlStreamReader &xml);
    void loadCardsFromXml(QXmlStreamReader &xml);
    void loadSetsFromXml(QXmlStreamReader &xml);
+signals:
+    void addCard(CardInfoPtr card) override;
+    void addSet(CardSetPtr set) override;
 };

 #endif
--- a/cockatrice/src/game/cards/card_drag_item.cpp
+++ b/cockatrice/src/game/cards/card_drag_item.cpp
@@ -1,10 +1,10 @@
-#include "card_drag_item.h"
+#include "carddragitem.h"

-#include "../game_scene.h"
-#include "../zones/card_zone.h"
-#include "../zones/table_zone.h"
-#include "../zones/view_zone.h"
-#include "card_item.h"
+#include "carditem.h"
+#include "cardzone.h"
+#include "gamescene.h"
+#include "tablezone.h"
+#include "zoneviewzone.h"

 #include <QCursor>
 #include <QGraphicsSceneMouseEvent>
@@ -24,7 +24,7 @@ void CardDragItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
    AbstractCardDragItem::paint(painter, option, widget);

    if (occupied)
-        painter->fillPath(shape(), QColor(200, 0, 0, 100));
+        painter->fillRect(boundingRect(), QColor(200, 0, 0, 100));
 }

 void CardDragItem::updatePosition(const QPointF &cursorScenePos)
@@ -53,20 +53,8 @@ void CardDragItem::updatePosition(const QPointF &cursorScenePos)

    QPointF zonePos = currentZone->scenePos();
    QPointF cursorPosInZone = cursorScenePos - zonePos;
-
-    // If we are on a Table, we center the card around the cursor, because we
-    // snap it into place and no longer see it being dragged.
-    //
-    // For other zones (where we do display the card under the cursor), we use
-    // the hotspot to feel like the card was dragged at the corresponding
-    // position.
-    TableZone *tableZone = qobject_cast<TableZone *>(cursorZone);
-    QPointF closestGridPoint;
-    if (tableZone)
-        closestGridPoint = tableZone->closestGridPoint(cursorPosInZone);
-    else
-        closestGridPoint = cursorPosInZone - hotSpot;
-
+    QPointF cardTopLeft = cursorPosInZone - hotSpot;
+    QPointF closestGridPoint = cursorZone->closestGridPoint(cardTopLeft);
    QPointF newPos = zonePos + closestGridPoint;

    if (newPos != pos()) {
@@ -96,23 +84,17 @@ void CardDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
    QList<CardDragItem *> dragItemList;
    CardZone *startZone = static_cast<CardItem *>(item)->getZone();
    if (currentZone && !(static_cast<CardItem *>(item)->getAttachedTo() && (startZone == currentZone))) {
-        if (!occupied) {
-            dragItemList.append(this);
-        }
-
+        dragItemList.append(this);
        for (int i = 0; i < childDrags.size(); i++) {
            CardDragItem *c = static_cast<CardDragItem *>(childDrags[i]);
-            if (!occupied && !(static_cast<CardItem *>(c->item)->getAttachedTo() && (startZone == currentZone)) &&
-                !c->occupied) {
+            if (!(static_cast<CardItem *>(c->item)->getAttachedTo() && (startZone == currentZone)) && !c->occupied)
                dragItemList.append(c);
-            }
            sc->removeItem(c);
        }
    }

-    if (currentZone) {
+    if (currentZone)
        currentZone->handleDropEvent(dragItemList, startZone, (sp - currentZone->scenePos()).toPoint());
-    }

    event->accept();
 }
--- a/cockatrice/src/game/cards/card_drag_item.h
+++ b/cockatrice/src/game/cards/card_drag_item.h
@@ -1,7 +1,7 @@
 #ifndef CARDDRAGITEM_H
 #define CARDDRAGITEM_H

-#include "abstract_card_drag_item.h"
+#include "abstractcarddragitem.h"

 class CardItem;

@@ -28,11 +28,11 @@ public:
    {
        return faceDown;
    }
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
-    void updatePosition(const QPointF &cursorScenePos) override;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    void updatePosition(const QPointF &cursorScenePos);

 protected:
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
 };

 #endif
--- a/cockatrice/src/game/filters/filter_card.cpp
+++ b/cockatrice/src/game/filters/filter_card.cpp
@@ -1,4 +1,4 @@
-#include "filter_card.h"
+#include "cardfilter.h"

 const QString CardFilter::typeName(Type t)
 {
--- a/cockatrice/src/game/filters/filter_card.h
+++ b/cockatrice/src/game/filters/filter_card.h
--- a/cockatrice/src/cardframe.cpp
+++ b/cockatrice/src/cardframe.cpp
@@ -0,0 +1,123 @@
+#include "cardframe.h"
+
+#include "cardinfopicture.h"
+#include "cardinfotext.h"
+#include "carditem.h"
+#include "main.h"
+#include "settingscache.h"
+
+#include <QSplitter>
+#include <QVBoxLayout>
+#include <utility>
+
+CardFrame::CardFrame(const QString &cardName, QWidget *parent) : QTabWidget(parent), info(nullptr), cardTextOnly(false)
+{
+    setContentsMargins(3, 3, 3, 3);
+    pic = new CardInfoPicture();
+    pic->setObjectName("pic");
+    text = new CardInfoText();
+    text->setObjectName("text");
+    connect(text, SIGNAL(linkActivated(const QString &)), this, SLOT(setCard(const QString &)));
+
+    tab1 = new QWidget(this);
+    tab2 = new QWidget(this);
+    tab3 = new QWidget(this);
+
+    tab1->setObjectName("tab1");
+    tab2->setObjectName("tab2");
+    tab3->setObjectName("tab3");
+
+    insertTab(ImageOnlyView, tab1, QString());
+    insertTab(TextOnlyView, tab2, QString());
+    insertTab(ImageAndTextView, tab3, QString());
+    connect(this, SIGNAL(currentChanged(int)), this, SLOT(setViewMode(int)));
+
+    tab1Layout = new QVBoxLayout();
+    tab1Layout->setObjectName("tab1Layout");
+    tab1Layout->setContentsMargins(0, 0, 0, 0);
+    tab1Layout->setSpacing(0);
+    tab1->setLayout(tab1Layout);
+
+    tab2Layout = new QVBoxLayout();
+    tab2Layout->setObjectName("tab2Layout");
+    tab2Layout->setContentsMargins(0, 0, 0, 0);
+    tab2Layout->setSpacing(0);
+    tab2->setLayout(tab2Layout);
+
+    splitter = new QSplitter();
+    splitter->setObjectName("splitter");
+    splitter->setOrientation(Qt::Vertical);
+
+    tab3Layout = new QVBoxLayout();
+    tab3Layout->setObjectName("tab3Layout");
+    tab3Layout->setContentsMargins(0, 0, 0, 0);
+    tab3Layout->setSpacing(0);
+    tab3Layout->addWidget(splitter);
+    tab3->setLayout(tab3Layout);
+
+    setViewMode(SettingsCache::instance().getCardInfoViewMode());
+
+    setCard(db->getCard(cardName));
+}
+
+void CardFrame::retranslateUi()
+{
+    setTabText(ImageOnlyView, tr("Image"));
+    setTabText(TextOnlyView, tr("Description"));
+    setTabText(ImageAndTextView, tr("Both"));
+}
+
+void CardFrame::setViewMode(int mode)
+{
+    if (currentIndex() != mode)
+        setCurrentIndex(mode);
+
+    switch (mode) {
+        case ImageOnlyView:
+        case TextOnlyView:
+            tab1Layout->addWidget(pic);
+            tab2Layout->addWidget(text);
+            break;
+        case ImageAndTextView:
+            splitter->addWidget(pic);
+            splitter->addWidget(text);
+            break;
+        default:
+            break;
+    }
+
+    SettingsCache::instance().setCardInfoViewMode(mode);
+}
+
+void CardFrame::setCard(CardInfoPtr card)
+{
+    if (info) {
+        disconnect(info.data(), nullptr, this, nullptr);
+    }
+
+    info = std::move(card);
+
+    if (info) {
+        connect(info.data(), SIGNAL(destroyed()), this, SLOT(clearCard()));
+    }
+
+    text->setCard(info);
+    pic->setCard(info);
+}
+
+void CardFrame::setCard(const QString &cardName)
+{
+    setCard(db->guessCard(cardName));
+}
+
+void CardFrame::setCard(AbstractCardItem *card)
+{
+    if (card) {
+        setCard(card->getInfo());
+    }
+}
+
+void CardFrame::clearCard()
+{
+    setCard((CardInfoPtr) nullptr);
+}
--- a/cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.h
+++ b/cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.h
@@ -1,33 +1,28 @@
 #ifndef CARDFRAME_H
 #define CARDFRAME_H

-#include "../../../../game/cards/card_database.h"
+#include "carddatabase.h"

-#include <QPushButton>
 #include <QTabWidget>

 class AbstractCardItem;
-class CardInfoPictureWidget;
-class CardInfoTextWidget;
+class CardInfoPicture;
+class CardInfoText;
 class QVBoxLayout;
 class QSplitter;

-class CardInfoFrameWidget : public QTabWidget
+class CardFrame : public QTabWidget
 {
    Q_OBJECT
 private:
    CardInfoPtr info;
-    CardInfoPictureWidget *pic;
-    CardInfoTextWidget *text;
-    QPushButton *viewTransformationButton;
+    CardInfoPicture *pic;
+    CardInfoText *text;
    bool cardTextOnly;
    QWidget *tab1, *tab2, *tab3;
    QVBoxLayout *tab1Layout, *tab2Layout, *tab3Layout;
    QSplitter *splitter;

-    void setViewTransformationButtonVisibility(bool visible);
-    void refreshLayout();
-
 public:
    enum ViewMode
    {
@@ -35,20 +30,13 @@ public:
        TextOnlyView,
        ImageAndTextView
    };
-
-    explicit CardInfoFrameWidget(const QString &cardName = QString(), QWidget *parent = nullptr);
-    CardInfoPtr getInfo()
-    {
-        return info;
-    }
+    explicit CardFrame(const QString &cardName = QString(), QWidget *parent = nullptr);
    void retranslateUi();

 public slots:
    void setCard(CardInfoPtr card);
    void setCard(const QString &cardName);
-    void setCard(const QString &cardName, const QString &providerId);
    void setCard(AbstractCardItem *card);
-    void viewTransformation();
    void clearCard();
    void setViewMode(int mode);
 };
--- a/cockatrice/src/cardinfopicture.cpp
+++ b/cockatrice/src/cardinfopicture.cpp
@@ -0,0 +1,60 @@
+#include "cardinfopicture.h"
+
+#include "carditem.h"
+#include "main.h"
+#include "pictureloader.h"
+
+#include <QPainter>
+#include <QStyle>
+#include <QWidget>
+
+CardInfoPicture::CardInfoPicture(QWidget *parent) : QWidget(parent), info(nullptr), pixmapDirty(true)
+{
+    setMinimumHeight(100);
+}
+
+void CardInfoPicture::setCard(CardInfoPtr card)
+{
+    if (info) {
+        disconnect(info.data(), nullptr, this, nullptr);
+    }
+
+    info = card;
+
+    if (info) {
+        connect(info.data(), SIGNAL(pixmapUpdated()), this, SLOT(updatePixmap()));
+    }
+
+    updatePixmap();
+}
+
+void CardInfoPicture::resizeEvent(QResizeEvent *)
+{
+    updatePixmap();
+}
+
+void CardInfoPicture::updatePixmap()
+{
+    pixmapDirty = true;
+    update();
+}
+
+void CardInfoPicture::loadPixmap()
+{
+    if (info)
+        PictureLoader::getPixmap(resizedPixmap, info, size());
+    else
+        PictureLoader::getCardBackPixmap(resizedPixmap, size());
+}
+
+void CardInfoPicture::paintEvent(QPaintEvent *)
+{
+    if (width() == 0 || height() == 0)
+        return;
+
+    if (pixmapDirty)
+        loadPixmap();
+
+    QPainter painter(this);
+    style()->drawItemPixmap(&painter, rect(), Qt::AlignHCenter, resizedPixmap);
+}
--- a/cockatrice/src/cardinfopicture.h
+++ b/cockatrice/src/cardinfopicture.h
@@ -0,0 +1,31 @@
+#ifndef CARDINFOPICTURE_H
+#define CARDINFOPICTURE_H
+
+#include "carddatabase.h"
+
+#include <QWidget>
+
+class AbstractCardItem;
+
+class CardInfoPicture : public QWidget
+{
+    Q_OBJECT
+
+private:
+    CardInfoPtr info;
+    QPixmap resizedPixmap;
+    bool pixmapDirty;
+
+public:
+    CardInfoPicture(QWidget *parent = nullptr);
+
+protected:
+    void resizeEvent(QResizeEvent *event);
+    void paintEvent(QPaintEvent *);
+    void loadPixmap();
+public slots:
+    void setCard(CardInfoPtr card);
+    void updatePixmap();
+};
+
+#endif
--- a/cockatrice/src/client/ui/widgets/cards/card_info_text_widget.cpp
+++ b/cockatrice/src/client/ui/widgets/cards/card_info_text_widget.cpp
@@ -1,13 +1,14 @@
-#include "card_info_text_widget.h"
+#include "cardinfotext.h"

-#include "../../../../game/cards/card_item.h"
-#include "../../../../game/game_specific_terms.h"
+#include "carditem.h"
+#include "game_specific_terms.h"
+#include "main.h"

 #include <QGridLayout>
 #include <QLabel>
 #include <QTextEdit>

-CardInfoTextWidget::CardInfoTextWidget(QWidget *parent) : QFrame(parent), info(nullptr)
+CardInfoText::CardInfoText(QWidget *parent) : QFrame(parent), info(nullptr)
 {
    nameLabel = new QLabel;
    nameLabel->setOpenExternalLinks(false);
@@ -26,7 +27,7 @@ CardInfoTextWidget::CardInfoTextWidget(QWidget *parent) : QFrame(parent), info(n
    retranslateUi();
 }

-void CardInfoTextWidget::setCard(CardInfoPtr card)
+void CardInfoText::setCard(CardInfoPtr card)
 {
    if (card == nullptr) {
        nameLabel->setText("");
@@ -64,13 +65,13 @@ void CardInfoTextWidget::setCard(CardInfoPtr card)
    textLabel->setText(card->getText());
 }

-void CardInfoTextWidget::setInvalidCardName(const QString &cardName)
+void CardInfoText::setInvalidCardName(const QString &cardName)
 {
    nameLabel->setText(tr("Unknown card:") + " " + cardName);
    textLabel->setText("");
 }

-void CardInfoTextWidget::retranslateUi()
+void CardInfoText::retranslateUi()
 {
    /*
     * There's no way we can really translate the text currently being rendered.
--- a/Show More
+++ b/Show More