Attempt fix crash case

Update QT_LOGGING_CONF if not set (#5578 )
Support logging config on install (#5577 )
2025-12-21 06:42:41 -08:00 · 2025-02-08 20:18:06 -05:00 · 2025-02-08 16:10:45 +00:00 · 2025-02-08 16:10:37 +00:00 · 2025-02-07 14:19:53 -05:00 · 2025-02-07 15:36:41 +00:00
260 changed files with 6787 additions and 4481 deletions
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -414,6 +414,15 @@ jobs:
          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
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -140,12 +140,15 @@ endif()

 # Define proper compilation flags
 if(MSVC)
-  # Visual Studio: Disable Warning C4251, C++20 compatibility, Multi-threaded Builds, Warn Detection, Unwind Semantics
-  set(CMAKE_CXX_FLAGS "/wd4251 /Zc:__cplusplus /std:c++20 /permissive- /W4 /MP /EHsc")
+  # 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, Debug Symbols
-  set(CMAKE_CXX_FLAGS_DEBUG "/Od /MDd /Zi")
+  # 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)
 elseif(CMAKE_COMPILER_IS_GNUCXX)
--- a/cmake/FindQtRuntime.cmake
+++ b/cmake/FindQtRuntime.cmake
@@ -23,6 +23,7 @@ if(WITH_CLIENT)
      Svg
      WebSockets
      Widgets
+      Xml
  )
 endif()
 if(WITH_ORACLE)
--- a/cmake/NSIS.template.in
+++ b/cmake/NSIS.template.in
@@ -238,7 +238,7 @@ ${If} $PortableMode = 0

 	; Enable Windows User-Mode Dumps
 	; https://learn.microsoft.com/en-us/windows/win32/wer/collecting-user-mode-dumps
-	WriteRegStr HKLM "Software\Microsoft\Windows\Windows Error Reporting\LocalDumps\cockatrice.exe" "DumpFolder" "%LOCALAPPDATA%\CrashDumps\Cockatrice"
+	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"

--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -35,6 +35,7 @@ set(cockatrice_SOURCES
    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
@@ -63,8 +64,6 @@ set(cockatrice_SOURCES
    src/game/filters/filter_tree.cpp
    src/game/filters/filter_tree_model.cpp
    src/client/ui/layouts/flow_layout.cpp
-    src/client/ui/layouts/horizontal_flow_layout.cpp
-    src/client/ui/layouts/vertical_flow_layout.cpp
    src/client/ui/widgets/general/layout_containers/flow_widget.cpp
    src/game/game_scene.cpp
    src/game/game_selector.cpp
@@ -82,6 +81,7 @@ set(cockatrice_SOURCES
    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
@@ -150,6 +150,19 @@ set(cockatrice_SOURCES
    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
@@ -175,6 +188,7 @@ set(cockatrice_SOURCES
    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
@@ -358,6 +372,13 @@ 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)
  install(
    DIRECTORY "${QT_PLUGINS_DIR}/"
--- a/cockatrice/cockatrice.qrc
+++ b/cockatrice/cockatrice.qrc
@@ -329,23 +329,16 @@
        <file>resources/replay/fastforward.svg</file>
        <file>resources/replay/pause.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>
+        <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>

        <!-- ADD TIP OF THE DAY IMAGES HERE -->
        <file>resources/tips/images/accounts_tab.png</file>
--- a/cockatrice/cockatrice_en@source.ts
+++ b/cockatrice/cockatrice_en@source.ts
--- a/cockatrice/resources/config/qtlogging.ini
+++ b/cockatrice/resources/config/qtlogging.ini
@@ -1,3 +1,55 @@
 [Rules]
-picture_loader.debug = true
-deck_loader.debug = true
+# 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/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="0.48.5 r10040"
-   sodipodi:docname="registered.svg">
+   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/">
  <defs
     id="defs3">
    <inkscape:perspective
@@ -226,16 +226,6 @@
         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"
@@ -288,6 +278,28 @@
       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"
@@ -297,16 +309,26 @@
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
-     inkscape:zoom="2.8"
-     inkscape:cx="-150.71429"
-     inkscape:cy="59.570011"
+     inkscape:zoom="6.0735294"
+     inkscape:cx="53.675545"
+     inkscape:cy="53.922518"
     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" />
+     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>
  <metadata
     id="metadata4">
    <rdf:RDF>
@@ -325,9 +347,20 @@
     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"
+       style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
       d="M 49.84375 1.71875 C 36.719738 1.71875 26.0625 12.375988 26.0625 25.5 C 26.0625 32.977454 29.538325 39.612734 34.9375 43.96875 C 24.439951 49.943698 17.919149 62.196126 14.3125 75.65625 C 9.0380874 95.34065 30.224013 98.21875 49.84375 98.21875 C 69.463486 98.21875 90.549327 94.96715 85.375 75.65625 C 81.693381 61.916246 75.224585 49.827177 64.8125 43.9375 C 70.181573 39.580662 73.59375 32.953205 73.59375 25.5 C 73.59375 12.375988 62.967762 1.71875 49.84375 1.71875 z "
       transform="translate(0,952.36218)"
-       id="path3597-8" />
+       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" />
  </g>
 </svg>
--- a/cockatrice/resources/usericons/pawn_donator_single.svg
+++ b/cockatrice/resources/usericons/pawn_donator_single.svg
@@ -0,0 +1,229 @@
+<?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_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="0.48.5 r10040"
-   sodipodi:docname="normal.svg">
+   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/">
  <defs
     id="defs3">
    <inkscape:perspective
@@ -195,66 +195,16 @@
         id="stop3604-6" />
    </linearGradient>
    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600-7"
-       id="radialGradient5254"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
+       r="25.501276"
       fy="131.40274"
-       r="25.501276" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5189-1"
-       id="linearGradient5394"
+       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"
-       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"
+       id="radialGradient5676"
+       xlink:href="#linearGradient3600-7"
       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"
@@ -264,16 +214,19 @@
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
-     inkscape:zoom="2.8"
-     inkscape:cx="-150.71429"
-     inkscape:cy="59.570011"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="5.6"
+     inkscape:cx="63.214286"
+     inkscape:cy="46.160714"
+     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" />
+     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" />
  <metadata
     id="metadata4">
    <rdf:RDF>
@@ -291,10 +244,25 @@
     inkscape:groupmode="layer"
     id="layer1"
     transform="translate(0,-952.36218)">
-    <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
+       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>
  </g>
 </svg>
--- a/cockatrice/resources/usericons/pawn_judge_double.svg
+++ b/cockatrice/resources/usericons/pawn_judge_double.svg
@@ -2,33 +2,22 @@
 <!-- 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.91 r13725"
-   sodipodi:docname="registered_vip.svg">
+   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/">
  <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"
@@ -237,16 +226,6 @@
         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"
@@ -309,15 +288,18 @@
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
     inkscape:zoom="4.2946338"
-     inkscape:cx="35.27742"
-     inkscape:cy="65.175571"
-     inkscape:current-layer="layer1"
+     inkscape:cx="34.112338"
+     inkscape:cy="64.964794"
+     inkscape:current-layer="svg5322"
     showgrid="false"
-     inkscape:window-width="1152"
-     inkscape:window-height="811"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
+     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" />
  <metadata
     id="metadata4">
    <rdf:RDF>
@@ -326,7 +308,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>
@@ -336,9 +318,20 @@
     id="layer1"
     transform="translate(0,-952.36218)">
    <path
-       style="fill:url(#linearGradient5436);fill-opacity:1;stroke:black;stroke-width:2.78149606;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
       d="M 49.84375 1.71875 C 36.719738 1.71875 26.0625 12.375988 26.0625 25.5 C 26.0625 32.977454 29.538325 39.612734 34.9375 43.96875 C 24.439951 49.943698 17.919149 62.196126 14.3125 75.65625 C 9.0380874 95.34065 30.224013 98.21875 49.84375 98.21875 C 69.463486 98.21875 90.549327 94.96715 85.375 75.65625 C 81.693381 61.916246 75.224585 49.827177 64.8125 43.9375 C 70.181573 39.580662 73.59375 32.953205 73.59375 25.5 C 73.59375 12.375988 62.967762 1.71875 49.84375 1.71875 z "
       transform="translate(0,952.36218)"
-       id="path3597-8" />
+       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)" />
  </g>
 </svg>
--- a/cockatrice/resources/usericons/pawn_judge_single.svg
+++ b/cockatrice/resources/usericons/pawn_judge_single.svg
@@ -0,0 +1,212 @@
+<?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/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="0.91 r13725"
-   sodipodi:docname="vip.svg">
+   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/">
  <defs
     id="defs3">
    <inkscape:perspective
@@ -194,57 +194,16 @@
         offset="1"
         id="stop3604-6" />
    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5189-1"
-       id="linearGradient5394"
+    <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"
-       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"
+       id="radialGradient5676"
+       xlink:href="#linearGradient3600-7"
       inkscape:collect="always" />
  </defs>
  <sodipodi:namedview
@@ -255,16 +214,19 @@
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="-59.166471"
-     inkscape:cy="4.9508223"
+     inkscape:zoom="5.6"
+     inkscape:cx="63.214286"
+     inkscape:cy="46.160714"
     inkscape:current-layer="layer1"
     showgrid="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="792"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
+     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" />
  <metadata
     id="metadata4">
    <rdf:RDF>
@@ -283,9 +245,9 @@
     id="layer1"
     transform="translate(0,-952.36218)">
    <path
-       style="fill:#8d5fd3;fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill-opacity:1;stroke:black;stroke-width:2.78220296;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 "
-       id="path3597-8"
+       id="left"
       transform="translate(0,952.36218)" />
  </g>
 </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:#ffffff;fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
       d="M 49.84375 1.71875 C 36.719738 1.71875 26.0625 12.375988 26.0625 25.5 C 26.0625 32.977454 29.538325 39.612734 34.9375 43.96875 C 24.439951 49.943698 17.919149 62.196126 14.3125 75.65625 C 9.0380874 95.34065 30.224013 98.21875 49.84375 98.21875 C 69.463486 98.21875 90.549327 94.96715 85.375 75.65625 C 81.693381 61.916246 75.224585 49.827177 64.8125 43.9375 C 70.181573 39.580662 73.59375 32.953205 73.59375 25.5 C 73.59375 12.375988 62.967762 1.71875 49.84375 1.71875 z "
       transform="translate(0,952.36218)"
-       id="path3597-8" />
+       id="right" />
    <path
-       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"
+       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="path5355"
+       id="left"
       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="path3415-0"
+       id="star"
       sodipodi:sides="5"
       sodipodi:cx="27.80283"
       sodipodi:cy="970.9433"
--- 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:#ff0000;fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
       d="M 49.84375 1.71875 C 36.719738 1.71875 26.0625 12.375988 26.0625 25.5 C 26.0625 32.977454 29.538325 39.612734 34.9375 43.96875 C 24.439951 49.943698 17.919149 62.196126 14.3125 75.65625 C 9.0380874 95.34065 30.224013 98.21875 49.84375 98.21875 C 69.463486 98.21875 90.549327 94.96715 85.375 75.65625 C 81.693381 61.916246 75.224585 49.827177 64.8125 43.9375 C 70.181573 39.580662 73.59375 32.953205 73.59375 25.5 C 73.59375 12.375988 62.967762 1.71875 49.84375 1.71875 z "
       transform="translate(0,952.36218)"
-       id="path3597-8" />
+       id="left" />
    <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="path3415"
+       id="star"
       sodipodi:sides="5"
       sodipodi:cx="27.80283"
       sodipodi:cy="970.9433"
--- 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="path4-9"
+     id="outline"
     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"
+     id="left"
+     style="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"
+     id="right"
+     style="fill-opacity:1;fill-rule:nonzero"
     inkscape:connector-curvature="0"
     sodipodi:nodetypes="ccccccc" />
 </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="path4"
-     style="fill:url(#linearGradient3756);fill-opacity:1"
+     id="left"
+     style="fill-opacity:1"
     inkscape:connector-curvature="0" />
 </svg>
--- a/cockatrice/resources/userlevels/admin.svg
+++ b/cockatrice/resources/userlevels/admin.svg
@@ -1,301 +0,0 @@
-<?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
@@ -1,136 +0,0 @@
-<?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/admin_vip_buddy.svg
+++ b/cockatrice/resources/userlevels/admin_vip_buddy.svg
@@ -1,136 +0,0 @@
-<?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
@@ -1,294 +0,0 @@
-<?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_vip_buddy.svg
+++ b/cockatrice/resources/userlevels/moderator_vip_buddy.svg
@@ -1,131 +0,0 @@
-<?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/userlevels/registered_donator_buddy.svg
+++ b/cockatrice/resources/userlevels/registered_donator_buddy.svg
@@ -1,137 +0,0 @@
-<?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/userlevels/registered_vip_buddy.svg
+++ b/cockatrice/resources/userlevels/registered_vip_buddy.svg
@@ -1,127 +0,0 @@
-<?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/client/game_logic/abstract_client.h
+++ b/cockatrice/src/client/game_logic/abstract_client.h
@@ -98,8 +98,8 @@ protected:
    virtual void sendCommandContainer(const CommandContainer &cont) = 0;

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

    ClientStatus getStatus() const
    {
--- a/cockatrice/src/client/game_logic/key_signals.h
+++ b/cockatrice/src/client/game_logic/key_signals.h
@@ -23,7 +23,7 @@ signals:
    void onCtrlC();

 protected:
-    virtual bool eventFilter(QObject *, QEvent *event);
+    bool eventFilter(QObject *, QEvent *event) override;
 };

 #endif
--- a/cockatrice/src/client/network/release_channel.cpp
+++ b/cockatrice/src/client/network/release_channel.cpp
@@ -33,7 +33,7 @@ ReleaseChannel::~ReleaseChannel()
 void ReleaseChannel::checkForUpdates()
 {
    QString releaseChannelUrl = getReleaseChannelUrl();
-    qDebug() << "Searching for updates on the channel: " << releaseChannelUrl;
+    qCDebug(ReleaseChannelLog) << "Searching for updates on the channel: " << releaseChannelUrl;
    response = netMan->get(QNetworkRequest(releaseChannelUrl));
    connect(response, &QNetworkReply::finished, this, &ReleaseChannel::releaseListFinished);
 }
@@ -145,15 +145,15 @@ void StableReleaseChannel::releaseListFinished()

    QString shortHash = lastRelease->getCommitHash().left(GIT_SHORT_HASH_LEN);
    QString myHash = QString(VERSION_COMMIT);
-    qDebug() << "Current hash=" << myHash << "update hash=" << shortHash;
+    qCDebug(ReleaseChannelLog) << "Current hash=" << myHash << "update hash=" << shortHash;

-    qDebug() << "Got reply from release server, name=" << lastRelease->getName()
-             << "desc=" << lastRelease->getDescriptionUrl() << "date=" << lastRelease->getPublishDate()
-             << "url=" << lastRelease->getDownloadUrl();
+    qCDebug(ReleaseChannelLog) << "Got reply from release server, name=" << lastRelease->getName()
+                               << "desc=" << lastRelease->getDescriptionUrl()
+                               << "date=" << lastRelease->getPublishDate() << "url=" << lastRelease->getDownloadUrl();

    const QString &tagName = resultMap["tag_name"].toString();
    QString url = QString(STABLETAG_URL) + tagName;
-    qDebug() << "Searching for commit hash corresponding to stable channel tag: " << tagName;
+    qCDebug(ReleaseChannelLog) << "Searching for commit hash corresponding to stable channel tag: " << tagName;
    response = netMan->get(QNetworkRequest(url));
    connect(response, &QNetworkReply::finished, this, &StableReleaseChannel::tagListFinished);
 }
@@ -178,11 +178,11 @@ void StableReleaseChannel::tagListFinished()
    }

    lastRelease->setCommitHash(resultMap["object"].toMap()["sha"].toString());
-    qDebug() << "Got reply from tag server, commit=" << lastRelease->getCommitHash();
+    qCDebug(ReleaseChannelLog) << "Got reply from tag server, commit=" << lastRelease->getCommitHash();

    QString shortHash = lastRelease->getCommitHash().left(GIT_SHORT_HASH_LEN);
    QString myHash = QString(VERSION_COMMIT);
-    qDebug() << "Current hash=" << myHash << "update hash=" << shortHash;
+    qCDebug(ReleaseChannelLog) << "Current hash=" << myHash << "update hash=" << shortHash;
    const bool needToUpdate = (QString::compare(shortHash, myHash, Qt::CaseInsensitive) != 0);

    emit finishedCheck(needToUpdate, lastRelease->isCompatibleVersionFound(), lastRelease);
@@ -249,13 +249,13 @@ void BetaReleaseChannel::releaseListFinished()
    lastRelease->setName(QString("%1 (%2)").arg(resultMap["tag_name"].toString()).arg(shortHash));
    lastRelease->setDescriptionUrl(QString(BETARELEASE_CHANGESURL).arg(VERSION_COMMIT, shortHash));

-    qDebug() << "Got reply from release server, size=" << resultMap.size() << "name=" << lastRelease->getName()
-             << "desc=" << lastRelease->getDescriptionUrl() << "commit=" << lastRelease->getCommitHash()
-             << "date=" << lastRelease->getPublishDate();
+    qCDebug(ReleaseChannelLog) << "Got reply from release server, size=" << resultMap.size()
+                               << "name=" << lastRelease->getName() << "desc=" << lastRelease->getDescriptionUrl()
+                               << "commit=" << lastRelease->getCommitHash() << "date=" << lastRelease->getPublishDate();

    QString betaBuildDownloadUrl = resultMap["assets_url"].toString();

-    qDebug() << "Searching for a corresponding file on the beta channel: " << betaBuildDownloadUrl;
+    qCDebug(ReleaseChannelLog) << "Searching for a corresponding file on the beta channel: " << betaBuildDownloadUrl;
    response = netMan->get(QNetworkRequest(betaBuildDownloadUrl));
    connect(response, &QNetworkReply::finished, this, &BetaReleaseChannel::fileListFinished);
 }
@@ -275,7 +275,7 @@ void BetaReleaseChannel::fileListFinished()
    QVariantList resultList = jsonResponse.toVariant().toList();
    QString shortHash = lastRelease->getCommitHash().left(GIT_SHORT_HASH_LEN);
    QString myHash = QString(VERSION_COMMIT);
-    qDebug() << "Current hash=" << myHash << "update hash=" << shortHash;
+    qCDebug(ReleaseChannelLog) << "Current hash=" << myHash << "update hash=" << shortHash;

    bool needToUpdate = (QString::compare(shortHash, myHash, Qt::CaseInsensitive) != 0);
    bool compatibleVersion = false;
@@ -292,7 +292,7 @@ void BetaReleaseChannel::fileListFinished()
        if (downloadMatchesCurrentOS(*url)) {
            compatibleVersion = true;
            lastRelease->setDownloadUrl(*url);
-            qDebug() << "Found compatible version url=" << *url;
+            qCDebug(ReleaseChannelLog) << "Found compatible version url=" << *url;
            break;
        }
    }
--- a/cockatrice/src/client/network/release_channel.h
+++ b/cockatrice/src/client/network/release_channel.h
@@ -2,11 +2,14 @@
 #define RELEASECHANNEL_H

 #include <QDate>
+#include <QLoggingCategory>
 #include <QObject>
 #include <QString>
 #include <QVariantMap>
 #include <utility>

+inline Q_LOGGING_CATEGORY(ReleaseChannelLog, "release_channel");
+
 class QNetworkReply;
 class QNetworkAccessManager;

--- a/cockatrice/src/client/network/sets_model.h
+++ b/cockatrice/src/client/network/sets_model.h
@@ -57,28 +57,29 @@ public:
        SortRole = Qt::UserRole
    };

-    SetsModel(CardDatabase *_db, QObject *parent = nullptr);
-    ~SetsModel();
-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    int columnCount(const QModelIndex &parent = QModelIndex()) const
+    explicit SetsModel(CardDatabase *_db, QObject *parent = nullptr);
+    ~SetsModel() override;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const override
    {
        Q_UNUSED(parent);
        return NUM_COLS;
    }
-    QVariant data(const QModelIndex &index, int role) const;
-    bool setData(const QModelIndex &index, const QVariant &value, int role);
-    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
-    Qt::ItemFlags flags(const QModelIndex &index) const;
-    Qt::DropActions supportedDropActions() const;
+    QVariant data(const QModelIndex &index, int role) const override;
+    bool setData(const QModelIndex &index, const QVariant &value, int role) override;
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+    Qt::ItemFlags flags(const QModelIndex &index) const override;
+    Qt::DropActions supportedDropActions() const override;

-    QMimeData *mimeData(const QModelIndexList &indexes) const;
-    bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent);
-    QStringList mimeTypes() const;
+    QMimeData *mimeData(const QModelIndexList &indexes) const override;
+    bool
+    dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override;
+    QStringList mimeTypes() const override;
    void swapRows(int oldRow, int newRow);
    void toggleRow(int row, bool enable);
    void toggleRow(int row);
    void toggleAll(bool);
-    void sort(int column, Qt::SortOrder order = Qt::AscendingOrder);
+    void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override;
    void save(CardDatabase *db);
    void restore(CardDatabase *db);
    void restoreOriginalOrder();
@@ -88,7 +89,7 @@ class SetsDisplayModel : public QSortFilterProxyModel
 {
    Q_OBJECT
 public:
-    SetsDisplayModel(QObject *parent = NULL);
+    explicit SetsDisplayModel(QObject *parent = nullptr);

 protected:
    bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
--- a/cockatrice/src/client/network/spoiler_background_updater.cpp
+++ b/cockatrice/src/client/network/spoiler_background_updater.cpp
@@ -28,7 +28,7 @@ SpoilerBackgroundUpdater::SpoilerBackgroundUpdater(QObject *apParent) : QObject(
        // File exists means we're in spoiler season
        startSpoilerDownloadProcess(SPOILERS_STATUS_URL, false);
    } else {
-        qDebug() << "Spoilers Disabled";
+        qCDebug(SpoilerBackgroundUpdaterLog) << "Spoilers Disabled";
    }
 }

@@ -67,7 +67,7 @@ void SpoilerBackgroundUpdater::actDownloadFinishedSpoilersFile()
        reply->deleteLater();
        emit spoilerCheckerDone();
    } else {
-        qDebug() << "Error downloading spoilers file" << errorCode;
+        qCDebug(SpoilerBackgroundUpdaterLog) << "Error downloading spoilers file" << errorCode;
        emit spoilerCheckerDone();
    }
 }
@@ -81,11 +81,11 @@ bool SpoilerBackgroundUpdater::deleteSpoilerFile()

    // Delete the spoiler.xml file
    if (file.exists() && file.remove()) {
-        qDebug() << "Deleting spoiler.xml";
+        qCDebug(SpoilerBackgroundUpdaterLog) << "Deleting spoiler.xml";
        return true;
    }

-    qDebug() << "Error: Spoiler.xml not found or not deleted";
+    qCDebug(SpoilerBackgroundUpdaterLog) << "Error: Spoiler.xml not found or not deleted";
    return false;
 }

@@ -101,24 +101,24 @@ void SpoilerBackgroundUpdater::actCheckIfSpoilerSeasonEnabled()
            trayIcon->showMessage(tr("Spoilers season has ended"), tr("Deleting spoiler.xml. Please run Oracle"));
        }

-        qDebug() << "Spoiler Season Offline";
+        qCDebug(SpoilerBackgroundUpdaterLog) << "Spoiler Season Offline";
        emit spoilerCheckerDone();
    } else if (errorCode == QNetworkReply::NoError) {
-        qDebug() << "Spoiler Service Online";
+        qCDebug(SpoilerBackgroundUpdaterLog) << "Spoiler Service Online";
        startSpoilerDownloadProcess(SPOILERS_URL, true);
    } else if (errorCode == QNetworkReply::HostNotFoundError) {
        if (trayIcon) {
            trayIcon->showMessage(tr("Spoilers download failed"), tr("No internet connection"));
        }

-        qDebug() << "Spoiler download failed due to no internet connection";
+        qCDebug(SpoilerBackgroundUpdaterLog) << "Spoiler download failed due to no internet connection";
        emit spoilerCheckerDone();
    } else {
        if (trayIcon) {
            trayIcon->showMessage(tr("Spoilers download failed"), tr("Error") + " " + (short)errorCode);
        }

-        qDebug() << "Spoiler download failed with reason" << errorCode;
+        qCDebug(SpoilerBackgroundUpdaterLog) << "Spoiler download failed with reason" << errorCode;
        emit spoilerCheckerDone();
    }
 }
@@ -139,19 +139,19 @@ bool SpoilerBackgroundUpdater::saveDownloadedFile(QByteArray data)
            trayIcon->showMessage(tr("Spoilers already up to date"), tr("No new spoilers added"));
        }

-        qDebug() << "Spoilers Up to Date";
+        qCDebug(SpoilerBackgroundUpdaterLog) << "Spoilers Up to Date";
        return false;
    }

    QFile file(fileName);
    if (!file.open(QIODevice::WriteOnly)) {
-        qDebug() << "Spoiler Service Error: File open (w) failed for" << fileName;
+        qCDebug(SpoilerBackgroundUpdaterLog) << "Spoiler Service Error: File open (w) failed for" << fileName;
        file.close();
        return false;
    }

    if (file.write(data) == -1) {
-        qDebug() << "Spoiler Service Error: File write (w) failed for" << fileName;
+        qCDebug(SpoilerBackgroundUpdaterLog) << "Spoiler Service Error: File write (w) failed for" << fileName;
        file.close();
        return false;
    }
@@ -159,7 +159,7 @@ bool SpoilerBackgroundUpdater::saveDownloadedFile(QByteArray data)
    file.close();

    // Data written, so reload the card database
-    qDebug() << "Spoiler Service Data Written";
+    qCDebug(SpoilerBackgroundUpdaterLog) << "Spoiler Service Data Written";
    const auto reloadOk = QtConcurrent::run([] { CardDatabaseManager::getInstance()->loadCardDatabases(); });

    // If the user has notifications enabled, let them know
@@ -202,12 +202,12 @@ QByteArray SpoilerBackgroundUpdater::getHash(const QString fileName)
        QCryptographicHash hash(QCryptographicHash::Algorithm::Md5);
        hash.addData(bytes);

-        qDebug() << "File Hash =" << hash.result();
+        qCDebug(SpoilerBackgroundUpdaterLog) << "File Hash =" << hash.result();

        file.close();
        return hash.result();
    } else {
-        qDebug() << "getHash ReadOnly failed!";
+        qCDebug(SpoilerBackgroundUpdaterLog) << "getHash ReadOnly failed!";
        file.close();
        return QByteArray();
    }
@@ -221,7 +221,7 @@ QByteArray SpoilerBackgroundUpdater::getHash(QByteArray data)
    QCryptographicHash hash(QCryptographicHash::Algorithm::Md5);
    hash.addData(bytes);

-    qDebug() << "Data Hash =" << hash.result();
+    qCDebug(SpoilerBackgroundUpdaterLog) << "Data Hash =" << hash.result();

    return hash.result();
 }
--- a/cockatrice/src/client/network/spoiler_background_updater.h
+++ b/cockatrice/src/client/network/spoiler_background_updater.h
@@ -2,9 +2,12 @@
 #define COCKATRICE_SPOILER_DOWNLOADER_H

 #include <QByteArray>
+#include <QLoggingCategory>
 #include <QObject>
 #include <QProcess>

+inline Q_LOGGING_CATEGORY(SpoilerBackgroundUpdaterLog, "spoiler_background_updater");
+
 class SpoilerBackgroundUpdater : public QObject
 {
    Q_OBJECT
--- a/cockatrice/src/client/sound_engine.cpp
+++ b/cockatrice/src/client/sound_engine.cpp
@@ -37,7 +37,7 @@ SoundEngine::~SoundEngine()
 void SoundEngine::soundEnabledChanged()
 {
    if (SettingsCache::instance().getSoundEnabled()) {
-        qDebug() << "SoundEngine: enabling sound with" << audioData.size() << "sounds";
+        qCDebug(SoundEngineLog) << "SoundEngine: enabling sound with" << audioData.size() << "sounds";
        if (!player) {
            player = new QMediaPlayer;
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
@@ -46,7 +46,7 @@ void SoundEngine::soundEnabledChanged()
 #endif
        }
    } else {
-        qDebug() << "SoundEngine: disabling sound";
+        qCDebug(SoundEngineLog) << "SoundEngine: disabling sound";
        if (player) {
            player->stop();
            player->deleteLater();
@@ -90,7 +90,7 @@ void SoundEngine::ensureThemeDirectoryExists()
 {
    if (SettingsCache::instance().getSoundThemeName().isEmpty() ||
        !getAvailableThemes().contains(SettingsCache::instance().getSoundThemeName())) {
-        qDebug() << "Sounds theme name not set, setting default value";
+        qCDebug(SoundEngineLog) << "Sounds theme name not set, setting default value";
        SettingsCache::instance().setSoundThemeName(DEFAULT_THEME_NAME);
    }
 }
@@ -131,7 +131,7 @@ QStringMap &SoundEngine::getAvailableThemes()
 void SoundEngine::themeChangedSlot()
 {
    QString themeName = SettingsCache::instance().getSoundThemeName();
-    qDebug() << "Sound theme changed:" << themeName;
+    qCDebug(SoundEngineLog) << "Sound theme changed:" << themeName;

    QDir dir = getAvailableThemes().value(themeName);

--- a/cockatrice/src/client/sound_engine.h
+++ b/cockatrice/src/client/sound_engine.h
@@ -2,11 +2,14 @@
 #define SOUNDENGINE_H

 #include <QAudioOutput>
+#include <QLoggingCategory>
 #include <QMap>
 #include <QMediaPlayer>
 #include <QObject>
 #include <QString>

+inline Q_LOGGING_CATEGORY(SoundEngineLog, "sound_engine");
+
 class QBuffer;

 typedef QMap<QString, QString> QStringMap;
--- a/cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response.cpp
+++ b/cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response.cpp
@@ -0,0 +1,45 @@
+#include "edhrec_commander_api_response.h"
+
+#include <QDebug>
+#include <QJsonArray>
+
+void EdhrecCommanderApiResponse::fromJson(const QJsonObject &json)
+{
+    // Parse the collapsed DeckStatistics
+    deckStats.fromJson(json);
+
+    // Parse Archidekt section
+    QJsonArray archidektJson = json.value("archidekt").toArray();
+    archidekt.fromJson(archidektJson);
+
+    // Parse other fields
+    similar = json.value("similar").toObject();
+    header = json.value("header").toString();
+    panels = json.value("panels").toObject();
+    description = json.value("description").toString();
+    QJsonObject containerJson = json.value("container").toObject();
+    container.fromJson(containerJson);
+}
+
+void EdhrecCommanderApiResponse::debugPrint() const
+{
+    qDebug() << "Deck Statistics:";
+    qDebug() << "  Creature:" << deckStats.creature;
+    qDebug() << "  Instant:" << deckStats.instant;
+    qDebug() << "  Sorcery:" << deckStats.sorcery;
+    qDebug() << "  Artifact:" << deckStats.artifact;
+    qDebug() << "  Enchantment:" << deckStats.enchantment;
+    qDebug() << "  Battle:" << deckStats.battle;
+    qDebug() << "  Planeswalker:" << deckStats.planeswalker;
+    qDebug() << "  Land:" << deckStats.land;
+    qDebug() << "  Basic:" << deckStats.basic;
+    qDebug() << "  Nonbasic:" << deckStats.nonbasic;
+
+    archidekt.debugPrint();
+
+    qDebug() << "Similar:" << similar;
+    qDebug() << "Header:" << header;
+    qDebug() << "Panels:" << panels;
+    qDebug() << "Description:" << description;
+    container.debugPrint();
+}
--- a/cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response.h
+++ b/cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response.h
@@ -0,0 +1,28 @@
+#ifndef DECKDATA_H
+#define DECKDATA_H
+
+#include "edhrec_commander_api_response_archidekt_links.h"
+#include "edhrec_commander_api_response_average_deck_statistics.h"
+#include "edhrec_commander_api_response_card_container.h"
+
+#include <QDebug>
+#include <QJsonObject>
+#include <QString>
+
+// Represents the main structure of the JSON
+class EdhrecCommanderApiResponse
+{
+public:
+    EdhrecCommanderApiResponseAverageDeckStatistics deckStats;
+    EdhrecCommanderApiResponseArchidektLinks archidekt;
+    QJsonObject similar;
+    QString header;
+    QJsonObject panels;
+    QString description;
+    EdhrecCommanderApiResponseCardContainer container;
+
+    void fromJson(const QJsonObject &json);
+    void debugPrint() const;
+};
+
+#endif // DECKDATA_H
--- a/cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_archidekt_links.cpp
+++ b/cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_archidekt_links.cpp
@@ -0,0 +1,43 @@
+#include "edhrec_commander_api_response_archidekt_links.h"
+
+#include <QDebug>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
+
+void EdhrecCommanderApiResponseArchidektLink::fromJson(const QJsonObject &json)
+{
+    c = json.value("c").toString();
+    f = json.value("f").toInt(0);
+    q = json.value("q").toInt(0);
+    u = json.value("u").toString();
+}
+
+void EdhrecCommanderApiResponseArchidektLink::debugPrint() const
+{
+    qDebug() << "  C:" << c;
+    qDebug() << "  F:" << f;
+    qDebug() << "  Q:" << q;
+    qDebug() << "  U:" << u;
+}
+
+void EdhrecCommanderApiResponseArchidektLinks::fromJson(const QJsonArray &json)
+{
+    entries.clear();
+    for (const QJsonValue &value : json) {
+        if (value.isObject()) {
+            QJsonObject entryJson = value.toObject();
+            EdhrecCommanderApiResponseArchidektLink entry;
+            entry.fromJson(entryJson);
+            entries.append(entry);
+        }
+    }
+}
+
+void EdhrecCommanderApiResponseArchidektLinks::debugPrint() const
+{
+    qDebug() << "Archidekt Entries:";
+    for (const auto &entry : entries) {
+        entry.debugPrint();
+    }
+}
--- a/cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_archidekt_links.h
+++ b/cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_archidekt_links.h
@@ -0,0 +1,32 @@
+#ifndef ARCHIDEKTENTRY_H
+#define ARCHIDEKTENTRY_H
+
+#include <QDebug>
+#include <QJsonObject>
+#include <QString>
+#include <QVector>
+
+// Represents a single Archidekt entry
+class EdhrecCommanderApiResponseArchidektLink
+{
+public:
+    QString c;
+    int f = 0;
+    int q = 0;
+    QString u;
+
+    void fromJson(const QJsonObject &json);
+    void debugPrint() const;
+};
+
+// Represents the Archidekt section as a list of entries
+class EdhrecCommanderApiResponseArchidektLinks
+{
+public:
+    QVector<EdhrecCommanderApiResponseArchidektLink> entries;
+
+    void fromJson(const QJsonArray &json);
+    void debugPrint() const;
+};
+
+#endif // ARCHIDEKTENTRY_H
--- a/cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_average_deck_statistics.cpp
+++ b/cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_average_deck_statistics.cpp
@@ -0,0 +1,15 @@
+#include "edhrec_commander_api_response_average_deck_statistics.h"
+
+void EdhrecCommanderApiResponseAverageDeckStatistics::fromJson(const QJsonObject &json)
+{
+    creature = json.value("creature").toInt(0);
+    instant = json.value("instant").toInt(0);
+    sorcery = json.value("sorcery").toInt(0);
+    artifact = json.value("artifact").toInt(0);
+    enchantment = json.value("enchantment").toInt(0);
+    battle = json.value("battle").toInt(0);
+    planeswalker = json.value("planeswalker").toInt(0);
+    land = json.value("land").toInt(0);
+    basic = json.value("basic").toInt(0);
+    nonbasic = json.value("nonbasic").toInt(0);
+}
--- a/cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_average_deck_statistics.h
+++ b/cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_average_deck_statistics.h
@@ -0,0 +1,22 @@
+#ifndef AVERAGE_DECK_STATISTICS_H
+#define AVERAGE_DECK_STATISTICS_H
+
+#include <QJsonObject>
+
+// Represents the typical deck statistics (collapsed section)
+struct EdhrecCommanderApiResponseAverageDeckStatistics
+{
+    int creature = 0;
+    int instant = 0;
+    int sorcery = 0;
+    int artifact = 0;
+    int enchantment = 0;
+    int battle = 0;
+    int planeswalker = 0;
+    int land = 0;
+    int basic = 0;
+    int nonbasic = 0;
+
+    void fromJson(const QJsonObject &json);
+};
+#endif // AVERAGE_DECK_STATISTICS_H
--- a/cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_card_container.cpp
+++ b/cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_card_container.cpp
@@ -0,0 +1,49 @@
+#include "edhrec_commander_api_response_card_container.h"
+
+#include <QDebug>
+#include <QJsonArray>
+#include <QJsonObject>
+
+void EdhrecCommanderApiResponseCardContainer::fromJson(const QJsonObject &json)
+{
+    // Parse breadcrumb
+    QJsonArray breadcrumbArray = json.value("breadcrumb").toArray();
+    for (const QJsonValue &breadcrumbValue : breadcrumbArray) {
+        breadcrumb.push_back(breadcrumbValue.toObject());
+    }
+
+    description = json.value("description").toString();
+    QJsonObject jsonDict = json.value("json_dict").toObject();
+    card.fromJson(jsonDict.value("card").toObject());
+    QJsonArray cardlistsArray = jsonDict.value("cardlists").toArray();
+
+    for (const QJsonValue &cardlistValue : cardlistsArray) {
+        QJsonObject cardlistObj = cardlistValue.toObject();
+        QJsonArray cardviewsArray = cardlistObj.value("cardviews").toArray();
+        EdhrecCommanderApiResponseCardList cardView;
+        cardView.fromJson(cardlistValue.toObject());
+        cardlists.push_back(cardView);
+    }
+
+    keywords = json.value("keywords").toString();
+    title = json.value("title").toString();
+}
+
+void EdhrecCommanderApiResponseCardContainer::debugPrint() const
+{
+    qDebug() << "Breadcrumb:";
+    for (const auto &breadcrumbEntry : breadcrumb) {
+        qDebug() << breadcrumbEntry;
+    }
+
+    qDebug() << "Description:" << description;
+    card.debugPrint();
+
+    qDebug() << "Cardlists:";
+    for (const auto &cardlist : cardlists) {
+        cardlist.debugPrint();
+    }
+
+    qDebug() << "Keywords:" << keywords;
+    qDebug() << "Title:" << title;
+}
--- a/cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_card_container.h
+++ b/cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_card_container.h
@@ -0,0 +1,60 @@
+#ifndef CONTAINER_ENTRY_H
+#define CONTAINER_ENTRY_H
+
+#include "edhrec_commander_api_response_card_list.h"
+#include "edhrec_commander_api_response_commander_details.h"
+
+#include <QDebug>
+#include <QJsonArray>
+#include <QJsonObject>
+#include <QString>
+#include <QVector>
+
+class EdhrecCommanderApiResponseCardContainer
+{
+public:
+    // Constructor
+    EdhrecCommanderApiResponseCardContainer() = default;
+
+    // Parse deck-related data from JSON
+    void fromJson(const QJsonObject &json);
+
+    // Debug method for logging
+    void debugPrint() const;
+
+    // Getter methods for deck container
+    const QString &getDescription() const
+    {
+        return description;
+    }
+    const QVector<QJsonObject> &getBreadcrumb() const
+    {
+        return breadcrumb;
+    }
+    const EdhrecCommanderApiResponseCommanderDetails &getCommanderDetails() const
+    {
+        return card;
+    }
+    const QVector<EdhrecCommanderApiResponseCardList> &getCardlists() const
+    {
+        return cardlists;
+    }
+    const QString &getKeywords() const
+    {
+        return keywords;
+    }
+    const QString &getTitle() const
+    {
+        return title;
+    }
+
+private:
+    QString description;
+    QVector<QJsonObject> breadcrumb;
+    EdhrecCommanderApiResponseCommanderDetails card;
+    QVector<EdhrecCommanderApiResponseCardList> cardlists;
+    QString keywords;
+    QString title;
+};
+
+#endif // CONTAINER_ENTRY_H
--- a/cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_card_details.cpp
+++ b/cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_card_details.cpp
@@ -0,0 +1,36 @@
+#include "edhrec_commander_api_response_card_details.h"
+
+#include <QDebug>
+
+EdhrecCommanderApiResponseCardDetails::EdhrecCommanderApiResponseCardDetails()
+    : synergy(0.0), inclusion(0), numDecks(0), potentialDecks(0)
+{
+}
+
+void EdhrecCommanderApiResponseCardDetails::fromJson(const QJsonObject &json)
+{
+    // Parse the fields from the JSON object
+    name = json.value("name").toString();
+    sanitized = json.value("sanitized").toString();
+    sanitizedWo = json.value("sanitized_wo").toString();
+    url = json.value("url").toString();
+    synergy = json.value("synergy").toDouble(0.0);
+    inclusion = json.value("inclusion").toInt(0);
+    label = json.value("label").toString();
+    numDecks = json.value("num_decks").toInt(0);
+    potentialDecks = json.value("potential_decks").toInt(0);
+}
+
+void EdhrecCommanderApiResponseCardDetails::debugPrint() const
+{
+    // Print out all the fields for debugging
+    qDebug() << "Name:" << name;
+    qDebug() << "Sanitized:" << sanitized;
+    qDebug() << "Sanitized Wo:" << sanitizedWo;
+    qDebug() << "URL:" << url;
+    qDebug() << "Synergy:" << synergy;
+    qDebug() << "Inclusion:" << inclusion;
+    qDebug() << "Label:" << label;
+    qDebug() << "Num Decks:" << numDecks;
+    qDebug() << "Potential Decks:" << potentialDecks;
+}
--- a/cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_card_details.h
+++ b/cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_card_details.h
@@ -0,0 +1,29 @@
+#ifndef CARD_VIEW_H
+#define CARD_VIEW_H
+
+#include <QJsonObject>
+#include <QString>
+
+class EdhrecCommanderApiResponseCardDetails
+{
+public:
+    QString name;
+    QString sanitized;
+    QString sanitizedWo;
+    QString url;
+    double synergy;
+    int inclusion;
+    QString label;
+    int numDecks;
+    int potentialDecks;
+
+    EdhrecCommanderApiResponseCardDetails();
+
+    // Method to populate the object from a JSON object
+    void fromJson(const QJsonObject &json);
+
+    // Debug method to print out the data
+    void debugPrint() const;
+};
+
+#endif // CARD_VIEW_H
--- a/cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_card_list.cpp
+++ b/cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_card_list.cpp
@@ -0,0 +1,33 @@
+#include "edhrec_commander_api_response_card_list.h"
+
+#include <QDebug>
+
+EdhrecCommanderApiResponseCardList::EdhrecCommanderApiResponseCardList()
+{
+}
+
+void EdhrecCommanderApiResponseCardList::fromJson(const QJsonObject &json)
+{
+    // Parse the header from the JSON object
+    header = json.value("header").toString();
+
+    // Parse the cardviews array and populate cardViews
+    QJsonArray cardviewsArray = json.value("cardviews").toArray();
+    for (const QJsonValue &value : cardviewsArray) {
+        QJsonObject cardviewObj = value.toObject();
+        EdhrecCommanderApiResponseCardDetails cardView;
+        cardView.fromJson(cardviewObj);
+        cardViews.append(cardView);
+    }
+}
+
+void EdhrecCommanderApiResponseCardList::debugPrint() const
+{
+    // Print out the header
+    qDebug() << "Header:" << header;
+
+    // Print out all the CardView objects
+    for (const EdhrecCommanderApiResponseCardDetails &cardView : cardViews) {
+        cardView.debugPrint();
+    }
+}
--- a/cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_card_list.h
+++ b/cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_card_list.h
@@ -0,0 +1,27 @@
+#ifndef CARD_LIST_H
+#define CARD_LIST_H
+
+#include "edhrec_commander_api_response_card_details.h"
+
+#include <QJsonArray>
+#include <QJsonObject>
+#include <QList>
+#include <QString>
+
+class EdhrecCommanderApiResponseCardList
+{
+public:
+    QString header;
+    QList<EdhrecCommanderApiResponseCardDetails> cardViews;
+
+    // Default constructor
+    EdhrecCommanderApiResponseCardList();
+
+    // Method to populate the object from a JSON object
+    void fromJson(const QJsonObject &json);
+
+    // Debug method to print out the data
+    void debugPrint() const;
+};
+
+#endif // CARD_LIST_H
--- a/cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_card_prices.cpp
+++ b/cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_card_prices.cpp
@@ -0,0 +1,31 @@
+#include "edhrec_commander_api_response_card_prices.h"
+
+#include <QDebug>
+
+void CardPrices::fromJson(const QJsonObject &json)
+{
+    // Parse prices from various sources
+    cardhoarder = json.value("cardhoarder").toObject();
+    cardkingdom = json.value("cardkingdom").toObject();
+    cardmarket = json.value("cardmarket").toObject();
+    face2face = json.value("face2face").toObject();
+    manapool = json.value("manapool").toObject();
+    mtgstocks = json.value("mtgstocks").toObject();
+    scg = json.value("scg").toObject();
+    tcgl = json.value("tcgl").toObject();
+    tcgplayer = json.value("tcgplayer").toObject();
+}
+
+void CardPrices::debugPrint() const
+{
+    qDebug() << "Card Prices:";
+    qDebug() << "Cardhoarder:" << cardhoarder;
+    qDebug() << "Cardkingdom:" << cardkingdom;
+    qDebug() << "Cardmarket:" << cardmarket;
+    qDebug() << "Face2Face:" << face2face;
+    qDebug() << "Manapool:" << manapool;
+    qDebug() << "Mtgstocks:" << mtgstocks;
+    qDebug() << "SCG:" << scg;
+    qDebug() << "TCGL:" << tcgl;
+    qDebug() << "Tcgplayer:" << tcgplayer;
+}
--- a/cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_card_prices.h
+++ b/cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_card_prices.h
@@ -0,0 +1,66 @@
+#ifndef EDHREC_COMMANDER_API_RESPONSE_CARD_PRICES_H
+#define EDHREC_COMMANDER_API_RESPONSE_CARD_PRICES_H
+
+#include <QJsonObject>
+
+class CardPrices
+{
+public:
+    // Constructor
+    CardPrices() = default;
+
+    // Parse prices from JSON
+    void fromJson(const QJsonObject &json);
+    void debugPrint() const;
+
+    // Getter methods for card prices
+    const QJsonObject &getCardhoarder() const
+    {
+        return cardhoarder;
+    }
+    const QJsonObject &getCardkingdom() const
+    {
+        return cardkingdom;
+    }
+    const QJsonObject &getCardmarket() const
+    {
+        return cardmarket;
+    }
+    const QJsonObject &getFace2face() const
+    {
+        return face2face;
+    }
+    const QJsonObject &getManapool() const
+    {
+        return manapool;
+    }
+    const QJsonObject &getMtgstocks() const
+    {
+        return mtgstocks;
+    }
+    const QJsonObject &getScg() const
+    {
+        return scg;
+    }
+    const QJsonObject &getTcgl() const
+    {
+        return tcgl;
+    }
+    const QJsonObject &getTcgplayer() const
+    {
+        return tcgplayer;
+    }
+
+private:
+    QJsonObject cardhoarder;
+    QJsonObject cardkingdom;
+    QJsonObject cardmarket;
+    QJsonObject face2face;
+    QJsonObject manapool;
+    QJsonObject mtgstocks;
+    QJsonObject scg;
+    QJsonObject tcgl;
+    QJsonObject tcgplayer;
+};
+
+#endif // EDHREC_COMMANDER_API_RESPONSE_CARD_PRICES_H
--- a/cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_commander_details.cpp
+++ b/cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_commander_details.cpp
@@ -0,0 +1,90 @@
+#include "edhrec_commander_api_response_commander_details.h"
+
+#include <QDebug>
+
+void EdhrecCommanderApiResponseCommanderDetails::fromJson(const QJsonObject &json)
+{
+    // Parse card-related data
+    aetherhubUri = json.value("aetherhub_uri").toString();
+    archidektUri = json.value("archidekt_uri").toString();
+    cmc = json.value("cmc").toInt(0);
+    colorIdentity = json.value("color_identity").toArray();
+    combos = json.value("combos").toBool(false);
+    deckstatsUri = json.value("deckstats_uri").toString();
+
+    // Parse image URIs
+    QJsonArray imageUrisArray = json.value("image_uris").toArray();
+    for (const QJsonValue &imageValue : imageUrisArray) {
+        QJsonObject imageObject = imageValue.toObject();
+        imageUris.push_back(imageObject.value("normal").toString());
+        imageUris.push_back(imageObject.value("art_crop").toString());
+    }
+
+    inclusion = json.value("inclusion").toInt(0);
+    isCommander = json.value("is_commander").toBool(false);
+    label = json.value("label").toString();
+    layout = json.value("layout").toString();
+    legalCommander = json.value("legal_commander").toBool(false);
+    moxfieldUri = json.value("moxfield_uri").toString();
+    mtggoldfishUri = json.value("mtggoldfish_uri").toString();
+    name = json.value("name").toString();
+    names = json.value("names").toArray();
+    numDecks = json.value("num_decks").toInt(0);
+    potentialDecks = json.value("potential_decks").toInt(0);
+    precon = json.value("precon").toString();
+
+    // Parse prices
+    prices.fromJson(json.value("prices").toObject());
+
+    primaryType = json.value("primary_type").toString();
+    rarity = json.value("rarity").toString();
+    salt = json.value("salt").toDouble(0.0);
+    sanitized = json.value("sanitized").toString();
+    sanitizedWo = json.value("sanitized_wo").toString();
+    scryfallUri = json.value("scryfall_uri").toString();
+    spellbookUri = json.value("spellbook_uri").toString();
+    type = json.value("type").toString();
+    url = json.value("url").toString();
+}
+
+void EdhrecCommanderApiResponseCommanderDetails::debugPrint() const
+{
+    qDebug() << "Card Data:";
+    qDebug() << "Aetherhub URI:" << aetherhubUri;
+    qDebug() << "Archidekt URI:" << archidektUri;
+    qDebug() << "CMC:" << cmc;
+    qDebug() << "Color Identity:" << colorIdentity;
+    qDebug() << "Combos:" << combos;
+    qDebug() << "Deckstats URI:" << deckstatsUri;
+
+    qDebug() << "Image URIs:";
+    for (const auto &uri : imageUris) {
+        qDebug() << uri;
+    }
+
+    qDebug() << "Inclusion:" << inclusion;
+    qDebug() << "Is Commander:" << isCommander;
+    qDebug() << "Label:" << label;
+    qDebug() << "Layout:" << layout;
+    qDebug() << "Legal Commander:" << legalCommander;
+    qDebug() << "Moxfield URI:" << moxfieldUri;
+    qDebug() << "MTGGoldfish URI:" << mtggoldfishUri;
+    qDebug() << "Name:" << name;
+    qDebug() << "Names:" << names;
+    qDebug() << "Number of Decks:" << numDecks;
+    qDebug() << "Potential Decks:" << potentialDecks;
+    qDebug() << "Precon:" << precon;
+
+    // Print the prices using the debugPrint method from CardPrices
+    prices.debugPrint();
+
+    qDebug() << "Primary Type:" << primaryType;
+    qDebug() << "Rarity:" << rarity;
+    qDebug() << "Salt:" << salt;
+    qDebug() << "Sanitized:" << sanitized;
+    qDebug() << "Sanitized WO:" << sanitizedWo;
+    qDebug() << "Scryfall URI:" << scryfallUri;
+    qDebug() << "Spellbook URI:" << spellbookUri;
+    qDebug() << "Type:" << type;
+    qDebug() << "URL:" << url;
+}
--- a/cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_commander_details.h
+++ b/cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_commander_details.h
@@ -0,0 +1,173 @@
+#ifndef EDHREC_COMMANDER_API_RESPONSE_COMMANDER_DETAILS_H
+#define EDHREC_COMMANDER_API_RESPONSE_COMMANDER_DETAILS_H
+
+#include "edhrec_commander_api_response_card_prices.h"
+
+#include <QJsonArray>
+#include <QJsonObject>
+#include <QString>
+#include <QVector>
+
+class EdhrecCommanderApiResponseCommanderDetails
+{
+public:
+    // Constructor
+    EdhrecCommanderApiResponseCommanderDetails() = default;
+
+    // Parse card-related data from JSON
+    void fromJson(const QJsonObject &json);
+
+    // Debug method for logging
+    void debugPrint() const;
+
+    // Getters for the card data
+    const QString &getAetherhubUri() const
+    {
+        return aetherhubUri;
+    }
+    const QString &getArchidektUri() const
+    {
+        return archidektUri;
+    }
+    int getCmc() const
+    {
+        return cmc;
+    }
+    const QJsonArray &getColorIdentity() const
+    {
+        return colorIdentity;
+    }
+    bool isCombos() const
+    {
+        return combos;
+    }
+    const QString &getDeckstatsUri() const
+    {
+        return deckstatsUri;
+    }
+    const QVector<QString> &getImageUris() const
+    {
+        return imageUris;
+    }
+    int getInclusion() const
+    {
+        return inclusion;
+    }
+    bool getIsCommander() const
+    {
+        return isCommander;
+    }
+    const QString &getLabel() const
+    {
+        return label;
+    }
+    const QString &getLayout() const
+    {
+        return layout;
+    }
+    bool getLegalCommander() const
+    {
+        return legalCommander;
+    }
+    const QString &getMoxfieldUri() const
+    {
+        return moxfieldUri;
+    }
+    const QString &getMtggoldfishUri() const
+    {
+        return mtggoldfishUri;
+    }
+    const QString &getName() const
+    {
+        return name;
+    }
+    const QJsonArray &getNames() const
+    {
+        return names;
+    }
+    int getNumDecks() const
+    {
+        return numDecks;
+    }
+    int getPotentialDecks() const
+    {
+        return potentialDecks;
+    }
+    const QString &getPrecon() const
+    {
+        return precon;
+    }
+    const CardPrices &getPrices() const
+    {
+        return prices;
+    }
+    const QString &getPrimaryType() const
+    {
+        return primaryType;
+    }
+    const QString &getRarity() const
+    {
+        return rarity;
+    }
+    double getSalt() const
+    {
+        return salt;
+    }
+    const QString &getSanitized() const
+    {
+        return sanitized;
+    }
+    const QString &getSanitizedWo() const
+    {
+        return sanitizedWo;
+    }
+    const QString &getScryfallUri() const
+    {
+        return scryfallUri;
+    }
+    const QString &getSpellbookUri() const
+    {
+        return spellbookUri;
+    }
+    const QString &getType() const
+    {
+        return type;
+    }
+    const QString &getUrl() const
+    {
+        return url;
+    }
+
+private:
+    QString aetherhubUri;
+    QString archidektUri;
+    int cmc = 0;
+    QJsonArray colorIdentity;
+    bool combos = false;
+    QString deckstatsUri;
+    QVector<QString> imageUris;
+    int inclusion = 0;
+    bool isCommander = false;
+    QString label;
+    QString layout;
+    bool legalCommander = false;
+    QString moxfieldUri;
+    QString mtggoldfishUri;
+    QString name;
+    QJsonArray names;
+    int numDecks = 0;
+    int potentialDecks = 0;
+    QString precon;
+    CardPrices prices;
+    QString primaryType;
+    QString rarity;
+    double salt = 0.0;
+    QString sanitized;
+    QString sanitizedWo;
+    QString scryfallUri;
+    QString spellbookUri;
+    QString type;
+    QString url;
+};
+
+#endif // EDHREC_COMMANDER_API_RESPONSE_COMMANDER_DETAILS_H
--- a/cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_card_details_display_widget.cpp
+++ b/cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_card_details_display_widget.cpp
@@ -0,0 +1,41 @@
+#include "edhrec_commander_api_response_card_details_display_widget.h"
+
+#include "../../../../game/cards/card_database_manager.h"
+
+EdhrecCommanderApiResponseCardDetailsDisplayWidget::EdhrecCommanderApiResponseCardDetailsDisplayWidget(
+    QWidget *parent,
+    const EdhrecCommanderApiResponseCardDetails &_toDisplay)
+    : QWidget(parent), toDisplay(_toDisplay)
+{
+    layout = new QVBoxLayout(this);
+    setLayout(layout);
+
+    cardPictureWidget = new CardInfoPictureWidget(this);
+    cardPictureWidget->setCard(CardDatabaseManager::getInstance()->getCard(toDisplay.name));
+
+    label = new QLabel(this);
+    label->setText(toDisplay.name + "\n" + toDisplay.label);
+    label->setAlignment(Qt::AlignHCenter);
+
+    // Set label color based on inclusion rate
+    int inclusionRate = (toDisplay.numDecks * 100) / toDisplay.potentialDecks;
+
+    QColor labelColor;
+    if (inclusionRate <= 30) {
+        labelColor = QColor(255, 0, 0); // Red
+    } else if (inclusionRate <= 60) {
+        int red = 255 - ((inclusionRate - 30) * 2);
+        int green = (inclusionRate - 30) * 4; // Adjust green to make the transition smoother
+        labelColor = QColor(red, green, 0);   // purple-ish
+    } else if (inclusionRate <= 90) {
+        int green = (inclusionRate - 60) * 5; // Increase green
+        labelColor = QColor(100, green, 100); // Green shades
+    } else {
+        labelColor = QColor(100, 200, 100); // Dark Green
+    }
+
+    label->setStyleSheet(QString("color: %1").arg(labelColor.name()));
+
+    layout->addWidget(cardPictureWidget);
+    layout->addWidget(label);
+}
--- a/cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_card_details_display_widget.h
+++ b/cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_card_details_display_widget.h
@@ -0,0 +1,26 @@
+#ifndef EDHREC_COMMANDER_API_RESPONSE_CARD_DETAILS_DISPLAY_WIDGET_H
+#define EDHREC_COMMANDER_API_RESPONSE_CARD_DETAILS_DISPLAY_WIDGET_H
+
+#include "../../../ui/widgets/cards/card_info_picture_widget.h"
+#include "api_response/edhrec_commander_api_response_card_details.h"
+
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QWidget>
+
+class EdhrecCommanderApiResponseCardDetailsDisplayWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit EdhrecCommanderApiResponseCardDetailsDisplayWidget(
+        QWidget *parent,
+        const EdhrecCommanderApiResponseCardDetails &_toDisplay);
+
+private:
+    EdhrecCommanderApiResponseCardDetails toDisplay;
+    QVBoxLayout *layout;
+    CardInfoPictureWidget *cardPictureWidget;
+    QLabel *label;
+};
+
+#endif // EDHREC_COMMANDER_API_RESPONSE_CARD_DETAILS_DISPLAY_WIDGET_H
--- a/cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_card_list_display_widget.cpp
+++ b/cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_card_list_display_widget.cpp
@@ -0,0 +1,34 @@
+#include "edhrec_commander_api_response_card_list_display_widget.h"
+
+#include "../../../ui/widgets/general/display/banner_widget.h"
+#include "edhrec_commander_api_response_card_details_display_widget.h"
+
+#include <QLabel>
+
+EdhrecCommanderApiResponseCardListDisplayWidget::EdhrecCommanderApiResponseCardListDisplayWidget(
+    QWidget *parent,
+    EdhrecCommanderApiResponseCardList toDisplay)
+    : QWidget(parent)
+{
+    layout = new QVBoxLayout(this);
+    setLayout(layout);
+
+    header = new BannerWidget(this, toDisplay.header);
+
+    flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAlwaysOff);
+    header->setBuddy(flowWidget);
+
+    foreach (EdhrecCommanderApiResponseCardDetails card_detail, toDisplay.cardViews) {
+        auto widget = new EdhrecCommanderApiResponseCardDetailsDisplayWidget(flowWidget, card_detail);
+        flowWidget->addWidget(widget);
+    }
+
+    layout->addWidget(header);
+    layout->addWidget(flowWidget);
+}
+
+void EdhrecCommanderApiResponseCardListDisplayWidget::resizeEvent(QResizeEvent *event)
+{
+    QWidget::resizeEvent(event);
+    qDebug() << event->size();
+}
--- a/cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_card_list_display_widget.h
+++ b/cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_card_list_display_widget.h
@@ -0,0 +1,30 @@
+#ifndef EDHREC_COMMANDER_API_RESPONSE_CARD_LIST_DISPLAY_WIDGET_H
+#define EDHREC_COMMANDER_API_RESPONSE_CARD_LIST_DISPLAY_WIDGET_H
+
+#include "../../../ui/widgets/general/display/banner_widget.h"
+#include "../../../ui/widgets/general/layout_containers/flow_widget.h"
+#include "api_response/edhrec_commander_api_response_card_list.h"
+
+#include <QResizeEvent>
+#include <QVBoxLayout>
+#include <QWidget>
+
+class EdhrecCommanderApiResponseCardListDisplayWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit EdhrecCommanderApiResponseCardListDisplayWidget(QWidget *parent,
+                                                             EdhrecCommanderApiResponseCardList toDisplay);
+    void resizeEvent(QResizeEvent *event) override;
+    [[nodiscard]] QString getBannerText() const
+    {
+        return header->getText();
+    };
+
+private:
+    QVBoxLayout *layout;
+    BannerWidget *header;
+    FlowWidget *flowWidget;
+};
+
+#endif // EDHREC_COMMANDER_API_RESPONSE_CARD_LIST_DISPLAY_WIDGET_H
--- a/cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_commander_details_display_widget.cpp
+++ b/cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_commander_details_display_widget.cpp
@@ -0,0 +1,36 @@
+#include "edhrec_commander_api_response_commander_details_display_widget.h"
+
+#include "../../../../game/cards/card_database_manager.h"
+#include "../../../ui/widgets/cards/card_info_picture_widget.h"
+
+#include <QLabel>
+
+EdhrecCommanderResponseCommanderDetailsDisplayWidget::EdhrecCommanderResponseCommanderDetailsDisplayWidget(
+    QWidget *parent,
+    const EdhrecCommanderApiResponseCommanderDetails &_commanderDetails)
+    : QWidget(parent), commanderDetails(_commanderDetails)
+{
+    layout = new QVBoxLayout(this);
+    setLayout(layout);
+
+    commanderPicture = new CardInfoPictureWidget(this);
+    commanderPicture->setCard(CardDatabaseManager::getInstance()->getCard(commanderDetails.getName()));
+
+    commanderDetails.debugPrint();
+
+    label = new QLabel(this);
+    label->setAlignment(Qt::AlignCenter);
+    salt = new QLabel(this);
+    salt->setAlignment(Qt::AlignCenter);
+
+    layout->addWidget(commanderPicture);
+    layout->addWidget(label);
+    layout->addWidget(salt);
+    retranslateUi();
+}
+
+void EdhrecCommanderResponseCommanderDetailsDisplayWidget::retranslateUi()
+{
+    label->setText(commanderDetails.getLabel());
+    salt->setText(tr("Salt: ") + QString::number(commanderDetails.getSalt()));
+}
--- a/cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_commander_details_display_widget.h
+++ b/cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_commander_details_display_widget.h
@@ -0,0 +1,28 @@
+#ifndef EDHREC_COMMANDER_API_RESPONSE_COMMANDER_DETAILS_DISPLAY_WIDGET_H
+#define EDHREC_COMMANDER_API_RESPONSE_COMMANDER_DETAILS_DISPLAY_WIDGET_H
+
+#include "../../../ui/widgets/cards/card_info_picture_widget.h"
+#include "api_response/edhrec_commander_api_response_commander_details.h"
+
+#include <QLabel>
+#include <QVBoxLayout>
+#include <QWidget>
+
+class EdhrecCommanderResponseCommanderDetailsDisplayWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit EdhrecCommanderResponseCommanderDetailsDisplayWidget(
+        QWidget *parent,
+        const EdhrecCommanderApiResponseCommanderDetails &_commanderDetails);
+    void retranslateUi();
+
+private:
+    QLabel *label;
+    QLabel *salt;
+    QVBoxLayout *layout;
+    CardInfoPictureWidget *commanderPicture;
+    EdhrecCommanderApiResponseCommanderDetails commanderDetails;
+};
+
+#endif // EDHREC_COMMANDER_API_RESPONSE_COMMANDER_DETAILS_DISPLAY_WIDGET_H
--- a/cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_display_widget.cpp
+++ b/cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_display_widget.cpp
@@ -0,0 +1,102 @@
+#include "edhrec_commander_api_response_display_widget.h"
+
+#include "../../../ui/widgets/cards/card_info_picture_widget.h"
+#include "api_response/edhrec_commander_api_response.h"
+#include "edhrec_commander_api_response_card_list_display_widget.h"
+#include "edhrec_commander_api_response_commander_details_display_widget.h"
+
+#include <QListView>
+#include <QResizeEvent>
+#include <QScrollArea>
+#include <QSplitter>
+#include <QStringListModel>
+
+EdhrecCommanderApiResponseDisplayWidget::EdhrecCommanderApiResponseDisplayWidget(QWidget *parent,
+                                                                                 EdhrecCommanderApiResponse response)
+    : QWidget(parent)
+{
+    layout = new QHBoxLayout(this);
+    setLayout(layout);
+
+    cardDisplayLayout = new QVBoxLayout(this);
+
+    // Create a QSplitter to hold the ListView and ScrollArea holding CardListdisplayWidgets side by side
+    auto splitter = new QSplitter(this);
+    splitter->setOrientation(Qt::Horizontal);
+
+    auto listView = new QListView(splitter);
+    listView->setMinimumWidth(50);
+    listView->setMaximumWidth(150);
+    auto listModel = new QStringListModel(this);
+    QStringList widgetNames;
+
+    // Add commander details
+    auto commanderPicture =
+        new EdhrecCommanderResponseCommanderDetailsDisplayWidget(this, response.container.getCommanderDetails());
+    cardDisplayLayout->addWidget(commanderPicture);
+    widgetNames.append("Commander Details");
+
+    // Add card list widgets
+    auto edhrec_commander_api_response_card_lists = response.container.getCardlists();
+    for (const EdhrecCommanderApiResponseCardList &card_list : edhrec_commander_api_response_card_lists) {
+        auto cardListDisplayWidget = new EdhrecCommanderApiResponseCardListDisplayWidget(this, card_list);
+        cardDisplayLayout->addWidget(cardListDisplayWidget);
+        widgetNames.append(cardListDisplayWidget->getBannerText());
+    }
+
+    // Create a QScrollArea to hold the card display widgets
+    scrollArea = new QScrollArea(splitter);
+    scrollArea->setWidgetResizable(true);
+    scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+    scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+
+    // Set the cardDisplayLayout inside the scroll area
+    auto scrollWidget = new QWidget(scrollArea);
+    scrollWidget->setLayout(cardDisplayLayout);
+    connect(splitter, &QSplitter::splitterMoved, this, &EdhrecCommanderApiResponseDisplayWidget::onSplitterChange);
+    scrollArea->setWidget(scrollWidget);
+
+    // Configure the list view
+    listModel->setStringList(widgetNames);
+    listView->setModel(listModel);
+    listView->setEditTriggers(QAbstractItemView::NoEditTriggers);
+
+    // Connect the list view to ensure the corresponding widget is visible
+    connect(listView, &QListView::clicked, this, [this](const QModelIndex &index) {
+        int widgetIndex = index.row();
+        qDebug() << "clicked: " << widgetIndex;
+        auto targetWidget = cardDisplayLayout->itemAt(widgetIndex)->widget();
+        if (targetWidget) {
+            qDebug() << "Found targetWidget" << targetWidget;
+            // Attempt to cast the parent to QScrollArea
+            auto scrollArea = qobject_cast<QScrollArea *>(this->scrollArea); // Use the scroll area instance
+            if (scrollArea) {
+                qDebug() << "ScrollArea" << scrollArea;
+                scrollArea->ensureWidgetVisible(targetWidget);
+            }
+        }
+    });
+
+    // Add splitter to the main layout
+    splitter->addWidget(listView);
+    splitter->addWidget(scrollArea);
+
+    layout->addWidget(splitter);
+}
+
+void EdhrecCommanderApiResponseDisplayWidget::onSplitterChange()
+{
+    scrollArea->widget()->resize(scrollArea->size());
+}
+
+void EdhrecCommanderApiResponseDisplayWidget::resizeEvent(QResizeEvent *event)
+{
+    QWidget::resizeEvent(event);
+    qDebug() << event->size();
+    layout->invalidate();
+    layout->activate();
+    layout->update();
+    if (scrollArea && scrollArea->widget()) {
+        scrollArea->widget()->resize(event->size());
+    }
+}
--- a/cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_display_widget.h
+++ b/cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_display_widget.h
@@ -0,0 +1,27 @@
+#ifndef EDHREC_COMMANDER_API_RESPONSE_DISPLAY_WIDGET_H
+#define EDHREC_COMMANDER_API_RESPONSE_DISPLAY_WIDGET_H
+
+#include "api_response/edhrec_commander_api_response.h"
+
+#include <QScrollArea>
+#include <QVBoxLayout>
+#include <QWidget>
+
+class EdhrecCommanderApiResponseDisplayWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit EdhrecCommanderApiResponseDisplayWidget(QWidget *parent, EdhrecCommanderApiResponse response);
+    void resizeEvent(QResizeEvent *event) override;
+
+public slots:
+    void onSplitterChange();
+
+private:
+    QHBoxLayout *layout;
+    QVBoxLayout *cardDisplayLayout;
+    QScrollArea *scrollArea;
+};
+
+#endif // EDHREC_COMMANDER_API_RESPONSE_DISPLAY_WIDGET_H
--- a/cockatrice/src/client/tabs/api/edhrec/tab_edhrec.cpp
+++ b/cockatrice/src/client/tabs/api/edhrec/tab_edhrec.cpp
@@ -0,0 +1,112 @@
+#include "tab_edhrec.h"
+
+#include "api_response/edhrec_commander_api_response.h"
+#include "edhrec_commander_api_response_display_widget.h"
+
+#include <QDebug>
+#include <QHBoxLayout>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QRegularExpression>
+#include <QResizeEvent>
+
+TabEdhRec::TabEdhRec(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor)
+{
+    networkManager = new QNetworkAccessManager(this);
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
+    networkManager->setTransferTimeout(); // Use Qt's default timeout
+#endif
+
+    networkManager->setRedirectPolicy(QNetworkRequest::ManualRedirectPolicy);
+    connect(networkManager, SIGNAL(finished(QNetworkReply *)), this, SLOT(processApiJson(QNetworkReply *)));
+}
+
+void TabEdhRec::retranslateUi()
+{
+}
+
+void TabEdhRec::setCard(CardInfoPtr _cardToQuery, bool isCommander)
+{
+    cardToQuery = _cardToQuery;
+
+    if (!cardToQuery) {
+        qDebug() << "Invalid card information provided.";
+        return;
+    }
+
+    QString cardName = cardToQuery->getName();
+    QString formattedName = cardName.toLower().replace(" ", "-").remove(QRegularExpression("[^a-z0-9\\-]"));
+
+    QString url;
+    if (isCommander) {
+        url = QString("https://json.edhrec.com/pages/commanders/%1.json").arg(formattedName);
+    } else {
+        url = QString("https://json.edhrec.com/pages/cards/%1.json").arg(formattedName);
+    }
+
+    QNetworkRequest request{QUrl(url)};
+
+    networkManager->get(request);
+}
+
+void TabEdhRec::processApiJson(QNetworkReply *reply)
+{
+    if (reply->error() != QNetworkReply::NoError) {
+        qDebug() << "Network error occurred:" << reply->errorString();
+        reply->deleteLater();
+        return;
+    }
+
+    QByteArray responseData = reply->readAll();
+    QJsonDocument jsonDoc = QJsonDocument::fromJson(responseData);
+
+    if (!jsonDoc.isObject()) {
+        qDebug() << "Invalid JSON response received.";
+        reply->deleteLater();
+        return;
+    }
+
+    QJsonObject jsonObj = jsonDoc.object();
+
+    // qDebug() << jsonObj;
+
+    EdhrecCommanderApiResponse deckData;
+    deckData.fromJson(jsonObj);
+
+    displayWidget = new EdhrecCommanderApiResponseDisplayWidget(this, deckData);
+    // flowWidget->addWidget(displayWidget);
+    setCentralWidget(displayWidget);
+
+    reply->deleteLater();
+    update();
+}
+
+void TabEdhRec::prettyPrintJson(const QJsonValue &value, int indentLevel)
+{
+    const QString indent(indentLevel * 2, ' '); // Adjust spacing as needed for pretty printing
+
+    if (value.isObject()) {
+        QJsonObject obj = value.toObject();
+        for (auto it = obj.begin(); it != obj.end(); ++it) {
+            qDebug().noquote() << indent + it.key() + ":";
+            prettyPrintJson(it.value(), indentLevel + 1);
+        }
+    } else if (value.isArray()) {
+        QJsonArray array = value.toArray();
+        for (int i = 0; i < array.size(); ++i) {
+            qDebug().noquote() << indent + QString("[%1]:").arg(i);
+            prettyPrintJson(array[i], indentLevel + 1);
+        }
+    } else if (value.isString()) {
+        qDebug().noquote() << indent + "\"" + value.toString() + "\"";
+    } else if (value.isDouble()) {
+        qDebug().noquote() << indent + QString::number(value.toDouble());
+    } else if (value.isBool()) {
+        qDebug().noquote() << indent + (value.toBool() ? "true" : "false");
+    } else if (value.isNull()) {
+        qDebug().noquote() << indent + "null";
+    }
+}
--- a/cockatrice/src/client/tabs/api/edhrec/tab_edhrec.h
+++ b/cockatrice/src/client/tabs/api/edhrec/tab_edhrec.h
@@ -0,0 +1,37 @@
+#ifndef TAB_EDHREC_H
+#define TAB_EDHREC_H
+
+#include "../../../../game/cards/card_database.h"
+#include "../../../ui/widgets/general/layout_containers/flow_widget.h"
+#include "../../tab.h"
+#include "edhrec_commander_api_response_display_widget.h"
+
+#include <QHBoxLayout>
+#include <QNetworkAccessManager>
+
+class TabEdhRec : public Tab
+{
+    Q_OBJECT
+public:
+    explicit TabEdhRec(TabSupervisor *_tabSupervisor);
+
+    void retranslateUi() override;
+    QString getTabText() const override
+    {
+        auto cardName = cardToQuery.isNull() ? QString() : cardToQuery->getName();
+        return tr("EDHREC: ") + cardName;
+    }
+
+    QNetworkAccessManager *networkManager;
+
+public slots:
+    void processApiJson(QNetworkReply *reply);
+    void prettyPrintJson(const QJsonValue &value, int indentLevel);
+    void setCard(CardInfoPtr _cardToQuery, bool isCommander = false);
+
+private:
+    CardInfoPtr cardToQuery;
+    EdhrecCommanderApiResponseDisplayWidget *displayWidget;
+};
+
+#endif // TAB_EDHREC_H
--- a/cockatrice/src/client/tabs/tab_admin.cpp
+++ b/cockatrice/src/client/tabs/tab_admin.cpp
@@ -87,18 +87,23 @@ TabAdmin::TabAdmin(TabSupervisor *_tabSupervisor, AbstractClient *_client, bool
    activateUserLayout->addWidget(userToActivate, 0, 0);
    activateUserLayout->addWidget(activateUserButton, 0, 1);

-    QVBoxLayout *vbox = new QVBoxLayout;
-    vbox->addWidget(updateServerMessageButton);
-    vbox->addWidget(shutdownServerButton);
-    vbox->addWidget(reloadConfigButton);
-    vbox->addLayout(grandReplayAccessLayout);
-    vbox->addLayout(activateUserLayout);
-    vbox->addStretch();
+    auto *adminVBox = new QVBoxLayout;
+    adminVBox->addWidget(updateServerMessageButton);
+    adminVBox->addWidget(shutdownServerButton);
+    adminVBox->addWidget(reloadConfigButton);

    adminGroupBox = new QGroupBox;
-    adminGroupBox->setLayout(vbox);
+    adminGroupBox->setLayout(adminVBox);
    adminGroupBox->setEnabled(false);

+    auto *moderatorVBox = new QVBoxLayout;
+    moderatorVBox->addLayout(grandReplayAccessLayout);
+    moderatorVBox->addLayout(activateUserLayout);
+
+    moderatorGroupBox = new QGroupBox;
+    moderatorGroupBox->setLayout(moderatorVBox);
+    moderatorGroupBox->setEnabled(false);
+
    unlockButton = new QPushButton;
    connect(unlockButton, &QPushButton::clicked, this, &TabAdmin::actUnlock);
    lockButton = new QPushButton;
@@ -107,6 +112,8 @@ TabAdmin::TabAdmin(TabSupervisor *_tabSupervisor, AbstractClient *_client, bool

    QVBoxLayout *mainLayout = new QVBoxLayout;
    mainLayout->addWidget(adminGroupBox);
+    mainLayout->addWidget(moderatorGroupBox);
+    mainLayout->addStretch();
    mainLayout->addWidget(unlockButton);
    mainLayout->addWidget(lockButton);

@@ -125,6 +132,7 @@ void TabAdmin::retranslateUi()
    shutdownServerButton->setText(tr("&Shut down server"));
    reloadConfigButton->setText(tr("&Reload configuration"));
    adminGroupBox->setTitle(tr("Server administration functions"));
+    moderatorGroupBox->setTitle(tr("Server moderator functions"));

    replayIdToGrant->setPlaceholderText(tr("Replay ID"));
    grantReplayAccessButton->setText(tr("Grant Replay Access"));
@@ -229,20 +237,28 @@ void TabAdmin::activateUserProcessResponse(const Response &response)

 void TabAdmin::actUnlock()
 {
-    if (fullAdmin)
+    if (fullAdmin) {
        adminGroupBox->setEnabled(true);
+    }
+
+    moderatorGroupBox->setEnabled(true);
    lockButton->setEnabled(true);
    unlockButton->setEnabled(false);
    locked = false;
+
    emit adminLockChanged(false);
 }

 void TabAdmin::actLock()
 {
-    if (fullAdmin)
+    if (fullAdmin) {
        adminGroupBox->setEnabled(false);
+    }
+
+    moderatorGroupBox->setEnabled(false);
    lockButton->setEnabled(false);
    unlockButton->setEnabled(true);
    locked = true;
+
    emit adminLockChanged(true);
 }
--- a/cockatrice/src/client/tabs/tab_admin.h
+++ b/cockatrice/src/client/tabs/tab_admin.h
@@ -36,7 +36,7 @@ private:
    bool fullAdmin;
    QPushButton *updateServerMessageButton, *shutdownServerButton, *reloadConfigButton, *grantReplayAccessButton,
        *activateUserButton;
-    QGroupBox *adminGroupBox;
+    QGroupBox *adminGroupBox, *moderatorGroupBox;
    QPushButton *unlockButton, *lockButton;
    QLineEdit *replayIdToGrant, *userToActivate;
 signals:
--- a/cockatrice/src/client/tabs/tab_deck_editor.cpp
+++ b/cockatrice/src/client/tabs/tab_deck_editor.cpp
@@ -51,6 +51,13 @@
 #include <QUrl>
 #include <QVBoxLayout>

+static bool canBeCommander(const CardInfoPtr &cardInfo)
+{
+    return ((cardInfo->getCardType().contains("Legendary", Qt::CaseInsensitive) &&
+             cardInfo->getCardType().contains("Creature", Qt::CaseInsensitive))) ||
+           cardInfo->getText().contains("can be your commander", Qt::CaseInsensitive);
+}
+
 void TabDeckEditor::createDeckDock()
 {
    deckModel = new DeckListModel(this);
@@ -540,31 +547,40 @@ void TabDeckEditor::databaseCustomMenu(QPoint point)
    QMenu menu;
    const CardInfoPtr info = currentCardInfo();

-    // add to deck and sideboard options
-    QAction *addToDeck, *addToSideboard, *selectPrinting;
-    addToDeck = menu.addAction(tr("Add to Deck"));
-    addToSideboard = menu.addAction(tr("Add to Sideboard"));
-    selectPrinting = menu.addAction(tr("Select Printing"));
-
-    connect(addToDeck, SIGNAL(triggered()), this, SLOT(actAddCard()));
-    connect(addToSideboard, SIGNAL(triggered()), this, SLOT(actAddCardToSideboard()));
-    connect(selectPrinting, &QAction::triggered, this, [this, info] { this->showPrintingSelector(); });
-
-    // filling out the related cards submenu
-    auto *relatedMenu = new QMenu(tr("Show Related cards"));
-    menu.addMenu(relatedMenu);
-    auto relatedCards = info->getAllRelatedCards();
-    if (relatedCards.isEmpty()) {
-        relatedMenu->setDisabled(true);
-    } else {
-        for (const CardRelation *rel : relatedCards) {
-            const QString &relatedCardName = rel->getName();
-            QAction *relatedCard = relatedMenu->addAction(relatedCardName);
-            connect(relatedCard, &QAction::triggered, cardInfo,
-                    [this, relatedCardName] { cardInfo->setCard(relatedCardName); });
+    if (info) {
+        // add to deck and sideboard options
+        QAction *addToDeck, *addToSideboard, *selectPrinting, *edhRecCommander, *edhRecCard;
+        addToDeck = menu.addAction(tr("Add to Deck"));
+        addToSideboard = menu.addAction(tr("Add to Sideboard"));
+        selectPrinting = menu.addAction(tr("Select Printing"));
+        if (canBeCommander(info)) {
+            edhRecCommander = menu.addAction(tr("Show on EDHREC (Commander)"));
+            connect(edhRecCommander, &QAction::triggered, this,
+                    [this, info] { this->tabSupervisor->addEdhrecTab(info, true); });
        }
+        edhRecCard = menu.addAction(tr("Show on EDHREC (Card)"));
+
+        connect(addToDeck, SIGNAL(triggered()), this, SLOT(actAddCard()));
+        connect(addToSideboard, SIGNAL(triggered()), this, SLOT(actAddCardToSideboard()));
+        connect(selectPrinting, &QAction::triggered, this, [this, info] { this->showPrintingSelector(); });
+        connect(edhRecCard, &QAction::triggered, this, [this, info] { this->tabSupervisor->addEdhrecTab(info); });
+
+        // filling out the related cards submenu
+        auto *relatedMenu = new QMenu(tr("Show Related cards"));
+        menu.addMenu(relatedMenu);
+        auto relatedCards = info->getAllRelatedCards();
+        if (relatedCards.isEmpty()) {
+            relatedMenu->setDisabled(true);
+        } else {
+            for (const CardRelation *rel : relatedCards) {
+                const QString &relatedCardName = rel->getName();
+                QAction *relatedCard = relatedMenu->addAction(relatedCardName);
+                connect(relatedCard, &QAction::triggered, cardInfo,
+                        [this, relatedCardName] { cardInfo->setCard(relatedCardName); });
+            }
+        }
+        menu.exec(databaseView->mapToGlobal(point));
    }
-    menu.exec(databaseView->mapToGlobal(point));
 }

 void TabDeckEditor::decklistCustomMenu(QPoint point)
@@ -765,11 +781,10 @@ void TabDeckEditor::retranslateUi()
    aAddCard->setText(tr("Add card to &maindeck"));
    aAddCardToSideboard->setText(tr("Add card to &sideboard"));

-    aRemoveCard->setText(tr("&Remove row"));
-
    aIncrement->setText(tr("&Increment number"));
-
    aDecrement->setText(tr("&Decrement number"));
+    aRemoveCard->setText(tr("&Remove row"));
+    aSwapCard->setText(tr("Swap card to/from sideboard"));

    deckMenu->setTitle(tr("&Deck Editor"));

@@ -1384,9 +1399,8 @@ QModelIndexList TabDeckEditor::getSelectedCardNodes() const
    return selectedRows;
 }

-void TabDeckEditor::addCardHelper(QString zoneName)
+void TabDeckEditor::addCardHelper(const CardInfoPtr info, QString zoneName)
 {
-    const CardInfoPtr info = currentCardInfo();
    if (!info)
        return;
    if (info->getIsToken())
@@ -1462,13 +1476,13 @@ void TabDeckEditor::actAddCard()
    if (QApplication::keyboardModifiers() & Qt::ControlModifier)
        actAddCardToSideboard();
    else
-        addCardHelper(DECK_ZONE_MAIN);
+        addCardHelper(currentCardInfo(), DECK_ZONE_MAIN);
    setSaveStatus(true);
 }

 void TabDeckEditor::actAddCardToSideboard()
 {
-    addCardHelper(DECK_ZONE_SIDE);
+    addCardHelper(currentCardInfo(), DECK_ZONE_SIDE);
    setSaveStatus(true);
 }

@@ -1578,12 +1592,10 @@ void TabDeckEditor::actDecrement()

 void TabDeckEditor::setDeck(DeckLoader *_deck)
 {
-    qDebug() << " ORIGINAL BANNER CARD " << _deck->getBannerCard().first;
    deckModel->setDeckList(_deck);

    nameEdit->setText(deckModel->getDeckList()->getName());
    commentsEdit->setText(deckModel->getDeckList()->getComments());
-    qDebug() << deckModel->getDeckList()->getBannerCard() << " was the banner card";
    bannerCardComboBox->setCurrentText(deckModel->getDeckList()->getBannerCard().first);
    updateBannerCardComboBox();
    updateHash();
--- a/cockatrice/src/client/tabs/tab_deck_editor.h
+++ b/cockatrice/src/client/tabs/tab_deck_editor.h
@@ -110,7 +110,6 @@ private:

    bool isBlankNewDeck() const;
    CardInfoPtr currentCardInfo() const;
-    void addCardHelper(QString zoneName);
    void offsetCountAtIndex(const QModelIndex &idx, int offset);
    void decrementCardHelper(QString zoneName);
    bool swapCard(const QModelIndex &idx);
@@ -179,6 +178,7 @@ public:
    void createMenus();
    void createCentralFrame();
    void updateCardInfo(CardInfoPtr _card);
+    void addCardHelper(CardInfoPtr info, QString zoneName);

 public slots:
    void closeRequest(bool forced = false) override;
--- a/cockatrice/src/client/tabs/tab_deck_storage.cpp
+++ b/cockatrice/src/client/tabs/tab_deck_storage.cpp
@@ -4,7 +4,6 @@
 #include "../../server/pending_command.h"
 #include "../../server/remote/remote_decklist_tree_widget.h"
 #include "../../settings/cache_settings.h"
-#include "../game_logic/abstract_client.h"
 #include "../get_text_with_max.h"
 #include "decklist.h"
 #include "pb/command_deck_del.pb.h"
@@ -31,7 +30,9 @@
 #include <QUrl>
 #include <QVBoxLayout>

-TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor, AbstractClient *_client)
+TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor,
+                               AbstractClient *_client,
+                               const ServerInfo_User *currentUserInfo)
    : Tab(_tabSupervisor), client(_client)
 {
    localDirModel = new QFileSystemModel(this);
@@ -151,6 +152,10 @@ TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor, AbstractClient *_c
    QWidget *mainWidget = new QWidget(this);
    mainWidget->setLayout(hbox);
    setCentralWidget(mainWidget);
+
+    connect(client, &AbstractClient::userInfoChanged, this, &TabDeckStorage::handleConnected);
+    connect(client, &AbstractClient::statusChanged, this, &TabDeckStorage::handleConnectionChanged);
+    setRemoteEnabled(currentUserInfo && currentUserInfo->user_level() & ServerInfo_User::IsRegistered);
 }

 void TabDeckStorage::retranslateUi()
@@ -187,6 +192,36 @@ QString TabDeckStorage::getTargetPath() const
    }
 }

+void TabDeckStorage::handleConnected(const ServerInfo_User &userInfo)
+{
+    setRemoteEnabled(userInfo.user_level() & ServerInfo_User::IsRegistered);
+}
+
+/**
+ * This is only responsible for handling the disconnect. The connect is already handled elsewhere
+ */
+void TabDeckStorage::handleConnectionChanged(ClientStatus status)
+{
+    if (status == StatusDisconnected) {
+        setRemoteEnabled(false);
+    }
+}
+
+void TabDeckStorage::setRemoteEnabled(bool enabled)
+{
+    aUpload->setEnabled(enabled);
+    aOpenRemoteDeck->setEnabled(enabled);
+    aDownload->setEnabled(enabled);
+    aNewFolder->setEnabled(enabled);
+    aDeleteRemoteDeck->setEnabled(enabled);
+
+    if (enabled) {
+        serverDirView->refreshTree();
+    } else {
+        serverDirView->clearTree();
+    }
+}
+
 void TabDeckStorage::actLocalDoubleClick(const QModelIndex &curLeft)
 {
    if (!localDirModel->isDir(curLeft)) {
--- a/cockatrice/src/client/tabs/tab_deck_storage.h
+++ b/cockatrice/src/client/tabs/tab_deck_storage.h
@@ -2,8 +2,10 @@
 #define TAB_DECK_STORAGE_H

 #include "../../server/remote/remote_decklist_tree_widget.h"
+#include "../game_logic/abstract_client.h"
 #include "tab.h"

+class ServerInfo_User;
 class AbstractClient;
 class QTreeView;
 class QFileSystemModel;
@@ -31,12 +33,17 @@ private:
    QAction *aOpenRemoteDeck, *aDownload, *aNewFolder, *aDeleteRemoteDeck;
    QString getTargetPath() const;

+    void setRemoteEnabled(bool enabled);
+
    void uploadDeck(const QString &filePath, const QString &targetPath);
    void deleteRemoteDeck(const RemoteDeckList_TreeModel::Node *node);

    void downloadNodeAtIndex(const QModelIndex &curLeft, const QModelIndex &curRight);

 private slots:
+    void handleConnected(const ServerInfo_User &userInfo);
+    void handleConnectionChanged(ClientStatus status);
+
    void actLocalDoubleClick(const QModelIndex &curLeft);
    void actOpenLocalDeck();

@@ -63,11 +70,11 @@ private slots:
    void deleteDeckFinished(const Response &response, const CommandContainer &commandContainer);

 public:
-    TabDeckStorage(TabSupervisor *_tabSupervisor, AbstractClient *_client);
+    TabDeckStorage(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User *currentUserInfo);
    void retranslateUi() override;
    QString getTabText() const override
    {
-        return tr("Deck storage");
+        return tr("Deck Storage");
    }
 signals:
    void openDeckEditor(const DeckLoader *deckLoader);
--- a/cockatrice/src/client/tabs/tab_game.cpp
+++ b/cockatrice/src/client/tabs/tab_game.cpp
@@ -15,6 +15,7 @@
 #include "../../main.h"
 #include "../../server/message_log_widget.h"
 #include "../../server/pending_command.h"
+#include "../../server/user/user_list_manager.h"
 #include "../../settings/cache_settings.h"
 #include "../game_logic/abstract_client.h"
 #include "../network/replay_timeline_widget.h"
@@ -65,8 +66,8 @@
 #include <QToolButton>
 #include <QWidget>

-TabGame::TabGame(TabSupervisor *_tabSupervisor, UserListProxy *_userListProxy, GameReplay *_replay)
-    : Tab(_tabSupervisor), userListProxy(_userListProxy), secondsElapsed(0), hostId(-1), localPlayerId(-1),
+TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
+    : Tab(_tabSupervisor), secondsElapsed(0), hostId(-1), localPlayerId(-1),
      isLocalGame(_tabSupervisor->getIsLocalGame()), spectator(true), judge(false), gameStateKnown(false),
      resuming(false), currentPhase(-1), activeCard(nullptr), gameClosed(false), replay(_replay), currentReplayStep(0),
      sayLabel(nullptr), sayEdit(nullptr)
@@ -123,16 +124,16 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, UserListProxy *_userListProxy, G
 }

 TabGame::TabGame(TabSupervisor *_tabSupervisor,
-                 UserListProxy *_userListProxy,
                 QList<AbstractClient *> &_clients,
                 const Event_GameJoined &event,
                 const QMap<int, QString> &_roomGameTypes)
-    : Tab(_tabSupervisor), userListProxy(_userListProxy), clients(_clients), gameInfo(event.game_info()),
-      roomGameTypes(_roomGameTypes), hostId(event.host_id()), localPlayerId(event.player_id()),
-      isLocalGame(_tabSupervisor->getIsLocalGame()), spectator(event.spectator()), judge(event.judge()),
-      gameStateKnown(false), resuming(event.resuming()), currentPhase(-1), activeCard(nullptr), gameClosed(false),
-      replay(nullptr), replayPlayButton(nullptr), replayFastForwardButton(nullptr), aReplaySkipForward(nullptr),
-      aReplaySkipBackward(nullptr), aReplaySkipForwardBig(nullptr), aReplaySkipBackwardBig(nullptr), replayDock(nullptr)
+    : Tab(_tabSupervisor), userListProxy(_tabSupervisor->getUserListManager()), clients(_clients),
+      gameInfo(event.game_info()), roomGameTypes(_roomGameTypes), hostId(event.host_id()),
+      localPlayerId(event.player_id()), isLocalGame(_tabSupervisor->getIsLocalGame()), spectator(event.spectator()),
+      judge(event.judge()), gameStateKnown(false), resuming(event.resuming()), currentPhase(-1), activeCard(nullptr),
+      gameClosed(false), replay(nullptr), replayPlayButton(nullptr), replayFastForwardButton(nullptr),
+      aReplaySkipForward(nullptr), aReplaySkipBackward(nullptr), aReplaySkipForwardBig(nullptr),
+      aReplaySkipBackwardBig(nullptr), replayDock(nullptr)
 {
    // THIS CTOR IS USED ON GAMES
    gameInfo.set_started(false);
@@ -188,14 +189,7 @@ void TabGame::emitUserEvent()

 TabGame::~TabGame()
 {
-    scene->clearViews();
-
    delete replay;
-
-    QMapIterator<int, Player *> i(players);
-    while (i.hasNext()) {
-        delete i.next().value();
-    }
 }

 void TabGame::updatePlayerListDockTitle()
@@ -759,7 +753,7 @@ void TabGame::processGameEventContainer(const GameEventContainer &cont,
                default: {
                    Player *player = players.value(playerId, 0);
                    if (!player) {
-                        qDebug() << "unhandled game event: invalid player id";
+                        qCDebug(TabGameLog) << "unhandled game event: invalid player id";
                        break;
                    }
                    player->processGameEvent(eventType, event, context, options);
@@ -888,8 +882,7 @@ void TabGame::closeGame()
 void TabGame::eventSpectatorSay(const Event_GameSay &event, int eventPlayerId, const GameEventContext & /*context*/)
 {
    const ServerInfo_User &userInfo = spectators.value(eventPlayerId);
-    messageLog->logSpectatorSay(QString::fromStdString(userInfo.name()), UserLevelFlags(userInfo.user_level()),
-                                QString::fromStdString(userInfo.privlevel()), QString::fromStdString(event.message()));
+    messageLog->logSpectatorSay(userInfo, QString::fromStdString(event.message()));
 }

 void TabGame::eventSpectatorLeave(const Event_Leave &event, int eventPlayerId, const GameEventContext & /*context*/)
@@ -1096,6 +1089,7 @@ void TabGame::eventLeave(const Event_Leave &event, int eventPlayerId, const Game
    players.remove(eventPlayerId);
    emit playerRemoved(player);
    player->clear();
+    scene->removePlayer(player);
    player->deleteLater();

    // Rearrange all remaining zones so that attachment relationship updates take place
@@ -1684,7 +1678,7 @@ void TabGame::createPlayerListDock(bool bReplay)

 void TabGame::createMessageDock(bool bReplay)
 {
-    messageLog = new MessageLogWidget(tabSupervisor, userListProxy, this);
+    messageLog = new MessageLogWidget(tabSupervisor, this);
    connect(messageLog, SIGNAL(cardNameHovered(QString)), cardInfoFrameWidget, SLOT(setCard(QString)));
    connect(messageLog, &MessageLogWidget::showCardInfoPopup, this, &TabGame::showCardInfoPopup);
    connect(messageLog, SIGNAL(deleteCardInfoPopup(QString)), this, SLOT(deleteCardInfoPopup(QString)));
--- a/cockatrice/src/client/tabs/tab_game.h
+++ b/cockatrice/src/client/tabs/tab_game.h
@@ -9,8 +9,11 @@
 #include "tab.h"

 #include <QCompleter>
+#include <QLoggingCategory>
 #include <QMap>

+inline Q_LOGGING_CATEGORY(TabGameLog, "tab_game");
+
 class UserListProxy;
 class DeckViewContainer;
 class AbstractClient;
@@ -67,7 +70,7 @@ class TabGame : public Tab
 private:
    QTimer *gameTimer;
    int secondsElapsed;
-    UserListProxy *userListProxy;
+    const UserListProxy *userListProxy;
    QList<AbstractClient *> clients;
    ServerInfo_Game gameInfo;
    QMap<int, QString> roomGameTypes;
@@ -212,11 +215,10 @@ private slots:

 public:
    TabGame(TabSupervisor *_tabSupervisor,
-            UserListProxy *_userListProxy,
            QList<AbstractClient *> &_clients,
            const Event_GameJoined &event,
            const QMap<int, QString> &_roomGameTypes);
-    TabGame(TabSupervisor *_tabSupervisor, UserListProxy *_userListProxy, GameReplay *replay);
+    TabGame(TabSupervisor *_tabSupervisor, GameReplay *replay);
    ~TabGame() override;
    void retranslateUi() override;
    void updatePlayerListDockTitle();
--- a/cockatrice/src/client/tabs/tab_message.cpp
+++ b/cockatrice/src/client/tabs/tab_message.cpp
@@ -26,7 +26,7 @@ TabMessage::TabMessage(TabSupervisor *_tabSupervisor,
    : Tab(_tabSupervisor), client(_client), ownUserInfo(new ServerInfo_User(_ownUserInfo)),
      otherUserInfo(new ServerInfo_User(_otherUserInfo)), userOnline(true)
 {
-    chatView = new ChatView(tabSupervisor, tabSupervisor->getUserListManager(), 0, true);
+    chatView = new ChatView(tabSupervisor, 0, true);
    connect(chatView, &ChatView::showCardInfoPopup, this, &TabMessage::showCardInfoPopup);
    connect(chatView, SIGNAL(deleteCardInfoPopup(QString)), this, SLOT(deleteCardInfoPopup(QString)));
    connect(chatView, SIGNAL(addMentionTag(QString)), this, SLOT(addMentionTag(QString)));
@@ -118,11 +118,8 @@ void TabMessage::messageSent(const Response &response)
 void TabMessage::processUserMessageEvent(const Event_UserMessage &event)
 {
    auto userInfo = event.sender_name() == otherUserInfo->name() ? otherUserInfo : ownUserInfo;
-    const UserLevelFlags userLevel(userInfo->user_level());
-    const QString userPriv = QString::fromStdString(userInfo->privlevel());

-    chatView->appendMessage(QString::fromStdString(event.message()), {}, QString::fromStdString(event.sender_name()),
-                            userLevel, userPriv, true);
+    chatView->appendMessage(QString::fromStdString(event.message()), {}, *userInfo, true);
    if (tabSupervisor->currentIndex() != tabSupervisor->indexOf(this))
        soundEngine->playSound("private_message");
    if (SettingsCache::instance().getShowMessagePopup() && shouldShowSystemPopup(event))
@@ -148,7 +145,7 @@ void TabMessage::showSystemPopup(const Event_UserMessage &event)
                              event.message().c_str());
        connect(trayIcon, SIGNAL(messageClicked()), this, SLOT(messageClicked()));
    } else {
-        qDebug() << "Error: trayIcon is NULL. TabMessage::showSystemPopup failed";
+        qCDebug(TabMessageLog) << "Error: trayIcon is NULL. TabMessage::showSystemPopup failed";
    }
 }

--- a/cockatrice/src/client/tabs/tab_message.h
+++ b/cockatrice/src/client/tabs/tab_message.h
@@ -3,6 +3,10 @@

 #include "tab.h"

+#include <QLoggingCategory>
+
+inline Q_LOGGING_CATEGORY(TabMessageLog, "tab_message");
+
 class AbstractClient;
 class ChatView;
 class LineEditUnfocusable;
--- a/cockatrice/src/client/tabs/tab_replays.cpp
+++ b/cockatrice/src/client/tabs/tab_replays.cpp
@@ -27,7 +27,8 @@
 #include <QUrl>
 #include <QVBoxLayout>

-TabReplays::TabReplays(TabSupervisor *_tabSupervisor, AbstractClient *_client) : Tab(_tabSupervisor), client(_client)
+TabReplays::TabReplays(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User *currentUserInfo)
+    : Tab(_tabSupervisor), client(_client)
 {
    localDirModel = new QFileSystemModel(this);
    localDirModel->setRootPath(SettingsCache::instance().getReplaysPath());
@@ -147,6 +148,10 @@ TabReplays::TabReplays(TabSupervisor *_tabSupervisor, AbstractClient *_client) :

    connect(client, SIGNAL(replayAddedEventReceived(const Event_ReplayAdded &)), this,
            SLOT(replayAddedEventReceived(const Event_ReplayAdded &)));
+
+    connect(client, &AbstractClient::userInfoChanged, this, &TabReplays::handleConnected);
+    connect(client, &AbstractClient::statusChanged, this, &TabReplays::handleConnectionChanged);
+    setRemoteEnabled(currentUserInfo && currentUserInfo->user_level() & ServerInfo_User::IsRegistered);
 }

 void TabReplays::retranslateUi()
@@ -165,6 +170,35 @@ void TabReplays::retranslateUi()
    aDeleteRemoteReplay->setText(tr("Delete"));
 }

+void TabReplays::handleConnected(const ServerInfo_User &userInfo)
+{
+    setRemoteEnabled(userInfo.user_level() & ServerInfo_User::IsRegistered);
+}
+
+/**
+ * This is only responsible for handling the disconnect. The connect is already handled elsewhere
+ */
+void TabReplays::handleConnectionChanged(ClientStatus status)
+{
+    if (status == StatusDisconnected) {
+        setRemoteEnabled(false);
+    }
+}
+
+void TabReplays::setRemoteEnabled(bool enabled)
+{
+    aOpenRemoteReplay->setEnabled(enabled);
+    aDownload->setEnabled(enabled);
+    aKeep->setEnabled(enabled);
+    aDeleteRemoteReplay->setEnabled(enabled);
+
+    if (enabled) {
+        serverDirView->refreshTree();
+    } else {
+        serverDirView->clearTree();
+    }
+}
+
 void TabReplays::actLocalDoubleClick(const QModelIndex &curLeft)
 {
    if (!localDirModel->isDir(curLeft)) {
--- a/cockatrice/src/client/tabs/tab_replays.h
+++ b/cockatrice/src/client/tabs/tab_replays.h
@@ -1,8 +1,10 @@
 #ifndef TAB_REPLAYS_H
 #define TAB_REPLAYS_H

+#include "../game_logic/abstract_client.h"
 #include "tab.h"

+class ServerInfo_User;
 class Response;
 class AbstractClient;
 class QTreeView;
@@ -29,9 +31,14 @@ private:
    QAction *aOpenReplaysFolder;
    QAction *aOpenRemoteReplay, *aDownload, *aKeep, *aDeleteRemoteReplay;

+    void setRemoteEnabled(bool enabled);
+
    void downloadNodeAtIndex(const QModelIndex &curLeft, const QModelIndex &curRight);

 private slots:
+    void handleConnected(const ServerInfo_User &userInfo);
+    void handleConnectionChanged(ClientStatus status);
+
    void actLocalDoubleClick(const QModelIndex &curLeft);
    void actRenameLocal();
    void actOpenLocalReplay();
@@ -58,11 +65,11 @@ signals:
    void openReplay(GameReplay *replay);

 public:
-    TabReplays(TabSupervisor *_tabSupervisor, AbstractClient *_client);
+    TabReplays(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User *currentUserInfo);
    void retranslateUi() override;
    QString getTabText() const override
    {
-        return tr("Game replays");
+        return tr("Game Replays");
    }
 };

--- a/cockatrice/src/client/tabs/tab_room.cpp
+++ b/cockatrice/src/client/tabs/tab_room.cpp
@@ -36,10 +36,9 @@
 TabRoom::TabRoom(TabSupervisor *_tabSupervisor,
                 AbstractClient *_client,
                 ServerInfo_User *_ownUser,
-                 const UserListProxy *_userListProxy,
                 const ServerInfo_Room &info)
    : Tab(_tabSupervisor), client(_client), roomId(info.room_id()), roomName(QString::fromStdString(info.name())),
-      ownUser(_ownUser), userListProxy(_userListProxy)
+      ownUser(_ownUser), userListProxy(_tabSupervisor->getUserListManager())
 {
    const int gameTypeListSize = info.gametype_list_size();
    for (int i = 0; i < gameTypeListSize; ++i)
@@ -53,7 +52,7 @@ TabRoom::TabRoom(TabSupervisor *_tabSupervisor,
    connect(userList, SIGNAL(openMessageDialog(const QString &, bool)), this,
            SIGNAL(openMessageDialog(const QString &, bool)));

-    chatView = new ChatView(tabSupervisor, userListProxy, nullptr, true, this);
+    chatView = new ChatView(tabSupervisor, nullptr, true, this);
    connect(chatView, SIGNAL(showMentionPopup(const QString &)), this, SLOT(actShowMentionPopup(const QString &)));
    connect(chatView, SIGNAL(messageClickedSignal()), this, SLOT(focusTab()));
    connect(chatView, SIGNAL(openMessageDialog(QString, bool)), this, SIGNAL(openMessageDialog(QString, bool)));
@@ -284,17 +283,15 @@ void TabRoom::processRoomSayEvent(const Event_RoomSay &event)
    QString senderName = QString::fromStdString(event.name());
    QString message = QString::fromStdString(event.message());

-    if (userListProxy->getOnlineUser(senderName))
+    if (userListProxy->isUserIgnored(senderName))
        return;

    UserListTWI *twi = userList->getUsers().value(senderName);
-    UserLevelFlags userLevel;
-    QString userPrivLevel;
+    ServerInfo_User userInfo = {};
    if (twi) {
-        userLevel = UserLevelFlags(twi->getUserInfo().user_level());
-        userPrivLevel = QString::fromStdString(twi->getUserInfo().privlevel());
+        userInfo = twi->getUserInfo();
        if (SettingsCache::instance().getIgnoreUnregisteredUsers() &&
-            !userLevel.testFlag(ServerInfo_User::IsRegistered))
+            !UserLevelFlags(userInfo.user_level()).testFlag(ServerInfo_User::IsRegistered))
            return;
    }

@@ -307,7 +304,7 @@ void TabRoom::processRoomSayEvent(const Event_RoomSay &event)
            QString(QDateTime::fromMSecsSinceEpoch(event.time_of()).toLocalTime().toString("d MMM yyyy HH:mm:ss")) +
            "] " + message;

-    chatView->appendMessage(message, event.message_type(), senderName, userLevel, userPrivLevel, true);
+    chatView->appendMessage(message, event.message_type(), userInfo, true);
    emit userEvent(false);
 }

--- a/cockatrice/src/client/tabs/tab_room.h
+++ b/cockatrice/src/client/tabs/tab_room.h
@@ -92,7 +92,6 @@ public:
    TabRoom(TabSupervisor *_tabSupervisor,
            AbstractClient *_client,
            ServerInfo_User *_ownUser,
-            const UserListProxy *_userListProxy,
            const ServerInfo_Room &info);
    void retranslateUi() override;
    void closeRequest(bool forced = false) override;
--- a/cockatrice/src/client/tabs/tab_supervisor.cpp
+++ b/cockatrice/src/client/tabs/tab_supervisor.cpp
@@ -176,11 +176,11 @@ void TabSupervisor::retranslateUi()
 {
    // tab menu actions
    aTabDeckEditor->setText(tr("Deck Editor"));
-    aTabVisualDeckStorage->setText(tr("&Visual Deck storage"));
+    aTabVisualDeckStorage->setText(tr("&Visual Deck Storage"));
    aTabServer->setText(tr("Server"));
    aTabAccount->setText(tr("Account"));
-    aTabDeckStorage->setText(tr("Deck storage"));
-    aTabReplays->setText(tr("Game replays"));
+    aTabDeckStorage->setText(tr("Deck Storage"));
+    aTabReplays->setText(tr("Game Replays"));
    aTabAdmin->setText(tr("Administration"));
    aTabLog->setText(tr("Logs"));

@@ -222,7 +222,14 @@ void TabSupervisor::retranslateUi()
 void TabSupervisor::refreshShortcuts()
 {
    ShortcutsSettings &shortcuts = SettingsCache::instance().shortcuts();
-    aTabDeckEditor->setShortcuts(shortcuts.getShortcut("MainWindow/aDeckEditor"));
+    aTabDeckEditor->setShortcuts(shortcuts.getShortcut("Tabs/aTabDeckEditor"));
+    aTabVisualDeckStorage->setShortcuts(shortcuts.getShortcut("Tabs/aTabVisualDeckStorage"));
+    aTabServer->setShortcuts(shortcuts.getShortcut("Tabs/aTabServer"));
+    aTabAccount->setShortcuts(shortcuts.getShortcut("Tabs/aTabAccount"));
+    aTabDeckStorage->setShortcuts(shortcuts.getShortcut("Tabs/aTabDeckStorage"));
+    aTabReplays->setShortcuts(shortcuts.getShortcut("Tabs/aTabReplays"));
+    aTabAdmin->setShortcuts(shortcuts.getShortcut("Tabs/aTabAdmin"));
+    aTabLog->setShortcuts(shortcuts.getShortcut("Tabs/aTabLog"));
 }

 bool TabSupervisor::closeRequest()
@@ -279,6 +286,8 @@ void TabSupervisor::initStartupTabs()
    addDeckEditorTab(nullptr);

    checkAndTrigger(aTabVisualDeckStorage, SettingsCache::instance().getTabVisualDeckStorageOpen());
+    checkAndTrigger(aTabDeckStorage, SettingsCache::instance().getTabDeckStorageOpen());
+    checkAndTrigger(aTabReplays, SettingsCache::instance().getTabReplaysOpen());
 }

 /**
@@ -334,6 +343,8 @@ void TabSupervisor::resetTabsMenu()
    tabsMenu->addAction(aTabDeckEditor);
    tabsMenu->addSeparator();
    tabsMenu->addAction(aTabVisualDeckStorage);
+    tabsMenu->addAction(aTabDeckStorage);
+    tabsMenu->addAction(aTabReplays);
 }

 void TabSupervisor::start(const ServerInfo_User &_userInfo)
@@ -354,14 +365,6 @@ void TabSupervisor::start(const ServerInfo_User &_userInfo)

    updatePingTime(0, -1);

-    if (userInfo->user_level() & ServerInfo_User::IsRegistered) {
-        tabsMenu->addAction(aTabDeckStorage);
-        tabsMenu->addAction(aTabReplays);
-
-        checkAndTrigger(aTabDeckStorage, SettingsCache::instance().getTabDeckStorageOpen());
-        checkAndTrigger(aTabReplays, SettingsCache::instance().getTabReplaysOpen());
-    }
-
    if (userInfo->user_level() & ServerInfo_User::IsModerator) {
        tabsMenu->addSeparator();
        tabsMenu->addAction(aTabAdmin);
@@ -379,8 +382,6 @@ void TabSupervisor::startLocal(const QList<AbstractClient *> &_clients)
    resetTabsMenu();

    tabAccount = nullptr;
-    tabDeckStorage = nullptr;
-    tabReplays = nullptr;
    tabAdmin = nullptr;
    tabLog = nullptr;
    isLocalGame = true;
@@ -416,12 +417,6 @@ void TabSupervisor::stop()
        if (tabServer) {
            tabServer->closeRequest(true);
        }
-        if (tabDeckStorage) {
-            tabDeckStorage->closeRequest(true);
-        }
-        if (tabReplays) {
-            tabReplays->closeRequest(true);
-        }
        if (tabAdmin) {
            tabAdmin->closeRequest(true);
        }
@@ -460,7 +455,6 @@ void TabSupervisor::actTabVisualDeckStorage(bool checked)
    if (checked && !tabVisualDeckStorage) {
        tabVisualDeckStorage = new TabDeckStorageVisual(this);
        myAddTab(tabVisualDeckStorage, aTabVisualDeckStorage);
-        setCurrentWidget(tabVisualDeckStorage);
        connect(tabVisualDeckStorage, &Tab::closed, this, [this] {
            tabVisualDeckStorage = nullptr;
            aTabVisualDeckStorage->setChecked(false);
@@ -508,7 +502,7 @@ void TabSupervisor::actTabDeckStorage(bool checked)
 {
    SettingsCache::instance().setTabDeckStorageOpen(checked);
    if (checked && !tabDeckStorage) {
-        tabDeckStorage = new TabDeckStorage(this, client);
+        tabDeckStorage = new TabDeckStorage(this, client, userInfo);
        connect(tabDeckStorage, &TabDeckStorage::openDeckEditor, this, &TabSupervisor::addDeckEditorTab);
        myAddTab(tabDeckStorage, aTabDeckStorage);
        connect(tabDeckStorage, &Tab::closed, this, [this] {
@@ -524,7 +518,7 @@ void TabSupervisor::actTabReplays(bool checked)
 {
    SettingsCache::instance().setTabReplaysOpen(checked);
    if (checked && !tabReplays) {
-        tabReplays = new TabReplays(this, client);
+        tabReplays = new TabReplays(this, client, userInfo);
        connect(tabReplays, &TabReplays::openReplay, this, &TabSupervisor::openReplay);
        myAddTab(tabReplays, aTabReplays);
        connect(tabReplays, &Tab::closed, this, [this] {
@@ -588,7 +582,7 @@ void TabSupervisor::gameJoined(const Event_GameJoined &event)
            roomGameTypes.insert(event.game_types(i).game_type_id(),
                                 QString::fromStdString(event.game_types(i).description()));

-    auto *tab = new TabGame(this, userListManager, QList<AbstractClient *>() << client, event, roomGameTypes);
+    auto *tab = new TabGame(this, QList<AbstractClient *>() << client, event, roomGameTypes);
    connect(tab, &TabGame::gameClosing, this, &TabSupervisor::gameLeft);
    connect(tab, &TabGame::openMessageDialog, this, &TabSupervisor::addMessageTab);
    connect(tab, &TabGame::openDeckEditor, this, &TabSupervisor::addDeckEditorTab);
@@ -599,7 +593,7 @@ void TabSupervisor::gameJoined(const Event_GameJoined &event)

 void TabSupervisor::localGameJoined(const Event_GameJoined &event)
 {
-    auto *tab = new TabGame(this, userListManager, localClients, event, QMap<int, QString>());
+    auto *tab = new TabGame(this, localClients, event, QMap<int, QString>());
    connect(tab, &TabGame::gameClosing, this, &TabSupervisor::gameLeft);
    connect(tab, &TabGame::openDeckEditor, this, &TabSupervisor::addDeckEditorTab);
    myAddTab(tab);
@@ -627,7 +621,7 @@ void TabSupervisor::gameLeft(TabGame *tab)

 void TabSupervisor::addRoomTab(const ServerInfo_Room &info, bool setCurrent)
 {
-    auto *tab = new TabRoom(this, client, userInfo, userListManager, info);
+    auto *tab = new TabRoom(this, client, userInfo, info);
    connect(tab, &TabRoom::maximizeClient, this, &TabSupervisor::maximizeMainWindow);
    connect(tab, &TabRoom::roomClosing, this, &TabSupervisor::roomLeft);
    connect(tab, &TabRoom::openMessageDialog, this, &TabSupervisor::addMessageTab);
@@ -648,7 +642,7 @@ void TabSupervisor::roomLeft(TabRoom *tab)

 void TabSupervisor::openReplay(GameReplay *replay)
 {
-    auto *replayTab = new TabGame(this, userListManager, replay);
+    auto *replayTab = new TabGame(this, replay);
    connect(replayTab, &TabGame::gameClosing, this, &TabSupervisor::replayLeft);
    myAddTab(replayTab);
    replayTabs.append(replayTab);
@@ -720,6 +714,18 @@ TabDeckEditor *TabSupervisor::addDeckEditorTab(const DeckLoader *deckToOpen)
    return tab;
 }

+TabEdhRec *TabSupervisor::addEdhrecTab(const CardInfoPtr &cardToQuery, bool isCommander)
+{
+    auto *tab = new TabEdhRec(this);
+    if (cardToQuery) {
+        tab->setCard(cardToQuery, isCommander);
+    }
+
+    myAddTab(tab);
+    setCurrentWidget(tab);
+    return tab;
+}
+
 void TabSupervisor::deckEditorClosed(TabDeckEditor *tab)
 {
    if (tab == currentWidget())
@@ -760,7 +766,7 @@ void TabSupervisor::processGameEventContainer(const GameEventContainer &cont)
    if (tab)
        tab->processGameEventContainer(cont, qobject_cast<AbstractClient *>(sender()), {});
    else
-        qDebug() << "gameEvent: invalid gameId";
+        qCDebug(TabSupervisorLog) << "gameEvent: invalid gameId";
 }

 void TabSupervisor::processUserMessageEvent(const Event_UserMessage &event)
@@ -787,9 +793,9 @@ void TabSupervisor::processUserMessageEvent(const Event_UserMessage &event)

 void TabSupervisor::actShowPopup(const QString &message)
 {
-    qDebug() << "ACT SHOW POPUP";
+    qCDebug(TabSupervisorLog) << "ACT SHOW POPUP";
    if (trayIcon && (QApplication::activeWindow() == nullptr || QApplication::focusWidget() == nullptr)) {
-        qDebug() << "LAUNCHING POPUP";
+        qCDebug(TabSupervisorLog) << "LAUNCHING POPUP";
        // disconnect(trayIcon, SIGNAL(messageClicked()), nullptr, nullptr);
        trayIcon->showMessage(message, tr("Click to view"));
        // connect(trayIcon, SIGNAL(messageClicked()), chatView, SLOT(actMessageClicked()));
@@ -810,10 +816,10 @@ void TabSupervisor::processUserJoined(const ServerInfo_User &userInfoJoined)
        if (auto *tab = getTabAccount()) {
            if (tab != currentWidget()) {
                tab->setContentsChanged(true);
-                QPixmap avatarPixmap =
-                    UserLevelPixmapGenerator::generatePixmap(13, (UserLevelFlags)userInfoJoined.user_level(), true,
-                                                             QString::fromStdString(userInfoJoined.privlevel()));
-                setTabIcon(indexOf(tab), QPixmap(avatarPixmap));
+                QIcon avatarIcon = UserLevelPixmapGenerator::generateIcon(
+                    13, (UserLevelFlags)userInfoJoined.user_level(), userInfoJoined.pawn_colors(), true,
+                    QString::fromStdString(userInfoJoined.privlevel()));
+                setTabIcon(indexOf(tab), avatarIcon);
            }
        }

--- a/cockatrice/src/client/tabs/tab_supervisor.h
+++ b/cockatrice/src/client/tabs/tab_supervisor.h
@@ -3,14 +3,18 @@

 #include "../../deck/deck_loader.h"
 #include "../../server/user/user_list_proxy.h"
+#include "api/edhrec/tab_edhrec.h"
 #include "visual_deck_storage/tab_deck_storage_visual.h"

 #include <QAbstractButton>
 #include <QCommonStyle>
+#include <QLoggingCategory>
 #include <QMap>
 #include <QProxyStyle>
 #include <QTabWidget>

+inline Q_LOGGING_CATEGORY(TabSupervisorLog, "tab_supervisor");
+
 class UserListManager;
 class QMenu;
 class AbstractClient;
@@ -128,6 +132,10 @@ public:
    {
        return roomTabs;
    }
+    QList<TabDeckEditor *> getDeckEditorTabs() const
+    {
+        return deckEditorTabs;
+    }
    bool getAdminLocked() const;
    bool closeRequest();
    bool switchToGameTabIfAlreadyExists(const int gameId);
@@ -140,6 +148,7 @@ signals:

 public slots:
    TabDeckEditor *addDeckEditorTab(const DeckLoader *deckToOpen);
+    TabEdhRec *addEdhrecTab(const CardInfoPtr &cardToQuery, bool isCommander = false);
    void openReplay(GameReplay *replay);
    void maximizeMainWindow();
 private slots:
--- a/cockatrice/src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
+++ b/cockatrice/src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
@@ -25,7 +25,7 @@ TabDeckStorageVisual::TabDeckStorageVisual(TabSupervisor *_tabSupervisor)
 void TabDeckStorageVisual::actOpenLocalDeck(QMouseEvent * /*event*/, DeckPreviewWidget *instance)
 {
    DeckLoader deckLoader;
-    if (!deckLoader.loadFromFile(instance->filePath, DeckLoader::CockatriceFormat, true)) {
+    if (!deckLoader.loadFromFile(instance->filePath, DeckLoader::getFormatFromName(instance->filePath), true)) {
        return;
    }

--- a/cockatrice/src/client/tabs/visual_deck_storage/tab_deck_storage_visual.h
+++ b/cockatrice/src/client/tabs/visual_deck_storage/tab_deck_storage_visual.h
@@ -24,7 +24,7 @@ public:
    void retranslateUi() override{};
    [[nodiscard]] QString getTabText() const override
    {
-        return tr("Visual Deck storage");
+        return tr("Visual Deck Storage");
    }

 public slots:
--- a/cockatrice/src/client/tapped_out_interface.cpp
+++ b/cockatrice/src/client/tapped_out_interface.cpp
@@ -33,7 +33,7 @@ void TappedOutInterface::queryFinished(QNetworkReply *reply)
         * can be extracted from the header. The http status is a 302 "redirect".
         */
        QString deckUrl = reply->rawHeader("Location");
-        qDebug() << "Tappedout: good reply, http status" << httpStatus << "location" << deckUrl;
+        qCDebug(TappedOutInterfaceLog) << "Tappedout: good reply, http status" << httpStatus << "location" << deckUrl;
        QDesktopServices::openUrl("https://tappedout.net" + deckUrl);
    } else {
        /*
@@ -57,8 +57,8 @@ void TappedOutInterface::queryFinished(QNetworkReply *reply)
        }

        QString errorMessage = errorMessageList.join("\n");
-        qDebug() << "Tappedout: bad reply, http status" << httpStatus << "size" << data.size() << "message"
-                 << errorMessage;
+        qCDebug(TappedOutInterfaceLog) << "Tappedout: bad reply, http status" << httpStatus << "size" << data.size()
+                                       << "message" << errorMessage;

        QMessageBox::critical(nullptr, tr("Error"), errorMessage);
    }
--- a/cockatrice/src/client/tapped_out_interface.h
+++ b/cockatrice/src/client/tapped_out_interface.h
@@ -4,8 +4,11 @@
 #include "../game/cards/card_database.h"
 #include "decklist.h"

+#include <QLoggingCategory>
 #include <QObject>

+inline Q_LOGGING_CATEGORY(TappedOutInterfaceLog, "tapped_out_interface");
+
 class QByteArray;
 class QNetworkAccessManager;
 class QNetworkReply;
@@ -30,7 +33,7 @@ private slots:
    void getAnalyzeRequestData(DeckList *deck, QByteArray *data);

 public:
-    TappedOutInterface(CardDatabase &_cardDatabase, QObject *parent = nullptr);
+    explicit TappedOutInterface(CardDatabase &_cardDatabase, QObject *parent = nullptr);
    void analyzeDeck(DeckList *deck);
 };

--- a/cockatrice/src/client/ui/layouts/flow_layout.cpp
+++ b/cockatrice/src/client/ui/layouts/flow_layout.cpp
@@ -20,8 +20,12 @@
 * @param hSpacing The horizontal spacing between items.
 * @param vSpacing The vertical spacing between items.
 */
-FlowLayout::FlowLayout(QWidget *parent, const int margin, const int hSpacing, const int vSpacing)
-    : QLayout(parent), horizontalMargin(hSpacing), verticalMargin(vSpacing)
+FlowLayout::FlowLayout(QWidget *parent,
+                       const Qt::Orientation _flowDirection,
+                       const int margin,
+                       const int hSpacing,
+                       const int vSpacing)
+    : QLayout(parent), flowDirection(_flowDirection), horizontalMargin(hSpacing), verticalMargin(vSpacing)
 {
    setContentsMargins(margin, margin, margin, margin);
 }
@@ -62,27 +66,51 @@ bool FlowLayout::hasHeightForWidth() const
 */
 int FlowLayout::heightForWidth(const int width) const
 {
-    int height = 0;
-    int rowWidth = 0;
-    int rowHeight = 0;
+    if (flowDirection == Qt::Vertical) {
+        int height = 0;
+        int rowWidth = 0;
+        int rowHeight = 0;

-    for (const QLayoutItem *item : items) {
-        if (item == nullptr || item->isEmpty()) {
-            continue;
-        }
+        for (const QLayoutItem *item : items) {
+            if (item == nullptr || item->isEmpty()) {
+                continue;
+            }

-        int itemWidth = item->sizeHint().width() + horizontalSpacing();
-        if (rowWidth + itemWidth > width) { // Start a new row if the row width exceeds available width
-            height += rowHeight + verticalSpacing();
-            rowWidth = itemWidth;
-            rowHeight = item->sizeHint().height() + verticalSpacing();
-        } else {
-            rowWidth += itemWidth;
-            rowHeight = qMax(rowHeight, item->sizeHint().height());
+            int itemWidth = item->sizeHint().width() + horizontalSpacing();
+            if (rowWidth + itemWidth > width) {
+                height += rowHeight + verticalSpacing();
+                rowWidth = itemWidth;
+                rowHeight = item->sizeHint().height();
+            } else {
+                rowWidth += itemWidth;
+                rowHeight = qMax(rowHeight, item->sizeHint().height());
+            }
        }
+        height += rowHeight; // Add height of the last row
+        return height;
+    } else {
+        int width = 0;
+        int colWidth = 0;
+        int colHeight = 0;
+
+        for (const QLayoutItem *item : items) {
+            if (item == nullptr || item->isEmpty()) {
+                continue;
+            }
+
+            int itemHeight = item->sizeHint().height();
+            if (colHeight + itemHeight > width) {
+                width += colWidth;
+                colHeight = itemHeight;
+                colWidth = item->sizeHint().width();
+            } else {
+                colHeight += itemHeight;
+                colWidth = qMax(colWidth, item->sizeHint().width());
+            }
+        }
+        width += colWidth; // Add width of the last column
+        return width;
    }
-    height += rowHeight; // Add the final row's height
-    return height;
 }

 /**
@@ -93,132 +121,420 @@ void FlowLayout::setGeometry(const QRect &rect)
 {
    QLayout::setGeometry(rect); // Sets the geometry of the layout based on the given rectangle.

-    int left, top, right, bottom;
-    getContentsMargins(&left, &top, &right, &bottom); // Retrieves the layout's content margins.
+    if (flowDirection == Qt::Horizontal) {
+        // If we have a parent scroll area, we're clamped to that, else we use our own rectangle.
+        const int availableWidth = getParentScrollAreaWidth() == 0 ? rect.width() : getParentScrollAreaWidth();

-    // Adjust the rectangle to exclude margins.
-    const QRect adjustedRect = rect.adjusted(+left, +top, -right, -bottom);
+        const int totalHeight = layoutAllRows(rect.x(), rect.y(), availableWidth);

-    // Calculate the available width for items, considering either the adjusted rectangle's width
-    // or the parent scroll area width, if applicable.
-    const int availableWidth = qMax(adjustedRect.width(), getParentScrollAreaWidth());
+        if (QWidget *parentWidgetPtr = parentWidget()) {
+            parentWidgetPtr->setFixedSize(availableWidth, totalHeight);
+        }
+    } else {
+        const int availableHeight = qMax(rect.height(), getParentScrollAreaHeight());

-    // Arrange all rows of items within the available width and get the total height used.
-    const int totalHeight = layoutAllRows(adjustedRect.x(), adjustedRect.y(), availableWidth);
+        const int totalWidth = layoutAllColumns(rect.x(), rect.y(), availableHeight);

-    // If the layout's parent is a QWidget, update its minimum size to ensure it can accommodate
-    // the arranged items' dimensions.
-    if (QWidget *parentWidgetPtr = parentWidget()) {
-        parentWidgetPtr->setMinimumSize(availableWidth, totalHeight);
+        if (QWidget *parentWidgetPtr = parentWidget()) {
+            parentWidgetPtr->setFixedSize(totalWidth, availableHeight);
+        }
    }
 }

 /**
- * @brief Arranges items in rows based on the available width.
- *        Items are added to a row until the row's width exceeds `availableWidth`.
- *        Then, a new row is started.
- * @param originX The starting x-coordinate for the row layout.
- * @param originY The starting y-coordinate for the row layout.
- * @param availableWidth The available width to lay out items.
- * @return The y-coordinate of the final row's end position.
+ * @brief Lays out items into rows according to the available width, starting from a given origin.
+ *        Each row is arranged within `availableWidth`, wrapping to a new row as necessary.
+ * @param originX The x-coordinate for the layout start position.
+ * @param originY The y-coordinate for the layout start position.
+ * @param availableWidth The width within which each row is constrained.
+ * @return The total height after arranging all rows.
 */
 int FlowLayout::layoutAllRows(const int originX, const int originY, const int availableWidth)
 {
-    QVector<QLayoutItem *> rowItems; // Temporary storage for items in the current row.
-    int currentXPosition = originX;  // Tracks the x-coordinate for placing items in the current row.
-    int currentYPosition = originY;  // Tracks the y-coordinate, updated after each row.
+    QVector<QLayoutItem *> rowItems; // Holds items for the current row
+    int currentXPosition = originX;  // Tracks the x-coordinate while placing items
+    int currentYPosition = originY;  // Tracks the y-coordinate, moving down after each row

-    int rowHeight = 0; // Tracks the maximum height of items in the current row.
+    int rowHeight = 0; // Tracks the maximum height of items in the current row

-    // Iterate through all layout items to arrange them.
    for (QLayoutItem *item : items) {
        if (item == nullptr || item->isEmpty()) {
            continue;
        }

-        QSize itemSize = item->sizeHint(); // The suggested size for the item.
-        const int itemWidth = itemSize.width() + horizontalSpacing();
+        QSize itemSize = item->sizeHint();                      // The suggested size for the current item
+        int itemWidth = itemSize.width() + horizontalSpacing(); // Item width plus spacing

-        // Check if the item fits in the current row's remaining width.
+        // Check if the current item fits in the remaining width of the current row
        if (currentXPosition + itemWidth > availableWidth) {
-            // If not, layout the current row and start a new row.
+            // If not, layout the current row and start a new row
            layoutSingleRow(rowItems, originX, currentYPosition);
-            rowItems.clear();                                  // Clear the temporary storage for the new row.
-            currentXPosition = originX;                        // Reset x-position to the start of the new row.
-            currentYPosition += rowHeight + verticalSpacing(); // Move y-position down for the new row.
-            rowHeight = 0;                                     // Reset row height for the new row.
+            rowItems.clear();                                  // Reset the list for the new row
+            currentXPosition = originX;                        // Reset x-position to the row's start
+            currentYPosition += rowHeight + verticalSpacing(); // Move y-position down to the next row
+            rowHeight = 0;                                     // Reset row height for the new row
        }

-        // Add the item to the current row.
+        // Add the item to the current row
        rowItems.append(item);
-        rowHeight = qMax(rowHeight, itemSize.height());             // Update the row height to the tallest item.
-        currentXPosition += itemSize.width() + horizontalSpacing(); // Move x-position for the next item.
+        rowHeight = qMax(rowHeight, itemSize.height());      // Update the row's height to the tallest item
+        currentXPosition += itemWidth + horizontalSpacing(); // Move x-position for the next item
    }

-    // Layout the final row if there are remaining items.
+    // Layout the final row if there are any remaining items
    layoutSingleRow(rowItems, originX, currentYPosition);

-    currentYPosition += rowHeight; // Add the final row's height
-    return currentYPosition;
+    // Return the total height used, including the last row's height
+    return currentYPosition + rowHeight;
 }

 /**
- * @brief Helper function for arranging a single row of items within specified bounds.
- * @param rowItems Items to be arranged in the row.
- * @param x The x-coordinate for starting the row.
- * @param y The y-coordinate for starting the row.
+ * @brief Arranges a single row of items within specified x and y starting positions.
+ * @param rowItems A list of items to be arranged in the row.
+ * @param x The starting x-coordinate for the row.
+ * @param y The starting y-coordinate for the row.
 */
 void FlowLayout::layoutSingleRow(const QVector<QLayoutItem *> &rowItems, int x, const int y)
 {
-    // Iterate through each item in the row and position it.
    for (QLayoutItem *item : rowItems) {
        if (item == nullptr || item->isEmpty()) {
            continue;
        }

-        QSize itemMaxSize = item->widget()->maximumSize(); // Get the item's maximum allowable size.
-        // Constrain the item's width and height to its size hint or maximum size.
-        int itemWidth = qMin(item->sizeHint().width(), itemMaxSize.width());
-        int itemHeight = qMin(item->sizeHint().height(), itemMaxSize.height());
-        // Set the item's geometry based on the calculated size and position.
+        // Get the maximum allowed size for the item
+        QSize itemMaxSize = item->widget()->maximumSize();
+        // Constrain the item's width and height to its size hint or maximum size
+        const int itemWidth = qMin(item->sizeHint().width(), itemMaxSize.width());
+        const int itemHeight = qMin(item->sizeHint().height(), itemMaxSize.height());
+        // Set the item's geometry based on the computed size and position
        item->setGeometry(QRect(QPoint(x, y), QSize(itemWidth, itemHeight)));
-        // Move the x-position for the next item, including horizontal spacing.
+        // Move the x-position to the right, leaving space for horizontal spacing
        x += itemWidth + horizontalSpacing();
    }
 }

 /**
- * @brief Returns the preferred size for this layout.
- * @return The maximum of all item size hints as a QSize.
+ * @brief Lays out items into columns according to the available height, starting from a given origin.
+ *        Each column is arranged within `availableHeight`, wrapping to a new column as necessary.
+ * @param originX The x-coordinate for the layout start position.
+ * @param originY The y-coordinate for the layout start position.
+ * @param availableHeight The height within which each column is constrained.
+ * @return The total width after arranging all columns.
 */
-QSize FlowLayout::sizeHint() const
+int FlowLayout::layoutAllColumns(const int originX, const int originY, const int availableHeight)
 {
-    QSize size;
-    for (const QLayoutItem *item : items) {
-        if (item != nullptr && !item->isEmpty()) {
-            size = size.expandedTo(item->sizeHint());
+    QVector<QLayoutItem *> colItems; // Holds items for the current column
+    int currentXPosition = originX;  // Tracks the x-coordinate while placing items
+    int currentYPosition = originY;  // Tracks the y-coordinate, resetting for each new column
+
+    int colWidth = 0; // Tracks the maximum width of items in the current column
+
+    for (QLayoutItem *item : items) {
+        if (item == nullptr || item->isEmpty()) {
+            continue;
        }
+
+        QSize itemSize = item->sizeHint(); // The suggested size for the current item
+
+        // Check if the current item fits in the remaining height of the current column
+        if (currentYPosition + itemSize.height() > availableHeight) {
+            // If not, layout the current column and start a new column
+            layoutSingleColumn(colItems, currentXPosition, originY);
+            colItems.clear();             // Reset the list for the new column
+            currentYPosition = originY;   // Reset y-position to the column's start
+            currentXPosition += colWidth; // Move x-position to the next column
+            colWidth = 0;                 // Reset column width for the new column
+        }
+
+        // Add the item to the current column
+        colItems.append(item);
+        colWidth = qMax(colWidth, itemSize.width()); // Update the column's width to the widest item
+        currentYPosition += itemSize.height();       // Move y-position for the next item
    }
-    return size.isValid() ? size : QSize(0, 0);
+
+    // Layout the final column if there are any remaining items
+    layoutSingleColumn(colItems, currentXPosition, originY);
+
+    // Return the total width used, including the last column's width
+    return currentXPosition + colWidth;
 }

 /**
- * @brief Returns the minimum size required to display all layout items.
- * @return The minimum QSize needed by the layout.
+ * @brief Arranges a single column of items within specified x and y starting positions.
+ * @param colItems A list of items to be arranged in the column.
+ * @param x The starting x-coordinate for the column.
+ * @param y The starting y-coordinate for the column.
+ */
+void FlowLayout::layoutSingleColumn(const QVector<QLayoutItem *> &colItems, const int x, int y)
+{
+    for (QLayoutItem *item : colItems) {
+        if (item == nullptr) {
+            qCDebug(FlowLayoutLog) << "Item is null.";
+            continue;
+        }
+
+        if (item->isEmpty()) {
+            qCDebug(FlowLayoutLog) << "Skipping empty item.";
+            continue;
+        }
+
+        // Debugging: Print the item's widget class name and size hint
+        QWidget *widget = item->widget();
+        if (widget) {
+            qCDebug(FlowLayoutLog) << "Widget class:" << widget->metaObject()->className();
+            qCDebug(FlowLayoutLog) << "Widget size hint:" << widget->sizeHint();
+            qCDebug(FlowLayoutLog) << "Widget maximum size:" << widget->maximumSize();
+            qCDebug(FlowLayoutLog) << "Widget minimum size:" << widget->minimumSize();
+
+            // Debugging: Print child widgets
+            const QObjectList &children = widget->children();
+            qCDebug(FlowLayoutLog) << "Child widgets:";
+            for (QObject *child : children) {
+                if (QWidget *childWidget = qobject_cast<QWidget *>(child)) {
+                    qCDebug(FlowLayoutLog) << "  - Child widget class:" << childWidget->metaObject()->className();
+                    qCDebug(FlowLayoutLog) << "    Size hint:" << childWidget->sizeHint();
+                    qCDebug(FlowLayoutLog) << "    Maximum size:" << childWidget->maximumSize();
+                }
+            }
+        } else {
+            qCDebug(FlowLayoutLog) << "Item does not have a widget.";
+        }
+
+        // Get the maximum allowed size for the item
+        QSize itemMaxSize = widget->maximumSize();
+        // Constrain the item's width and height to its size hint or maximum size
+        const int itemWidth = qMin(item->sizeHint().width(), itemMaxSize.width());
+        const int itemHeight = qMin(item->sizeHint().height(), itemMaxSize.height());
+        // Debugging: Print the computed geometry
+        qCDebug(FlowLayoutLog) << "Computed geometry: x=" << x << ", y=" << y << ", width=" << itemWidth
+                               << ", height=" << itemHeight;
+
+        // Set the item's geometry based on the computed size and position
+        item->setGeometry(QRect(QPoint(x, y), QSize(itemWidth, itemHeight)));
+
+        // Move the y-position down by the item's height to place the next item below
+        y += itemHeight;
+    }
+}
+
+/**
+ * @brief Calculates the preferred size of the layout based on the flow direction.
+ * @return A QSize representing the ideal dimensions of the layout.
+ */
+QSize FlowLayout::sizeHint() const
+{
+    if (flowDirection == Qt::Horizontal) {
+        return calculateSizeHintHorizontal();
+    } else {
+        return calculateSizeHintVertical();
+    }
+}
+
+/**
+ * @brief Calculates the minimum size required by the layout based on the flow direction.
+ * @return A QSize representing the minimum required dimensions.
 */
 QSize FlowLayout::minimumSize() const
 {
-    QSize size;
+    if (flowDirection == Qt::Horizontal) {
+        return calculateMinimumSizeHorizontal();
+    } else {
+        return calculateMinimumSizeVertical();
+    }
+}
+
+/**
+ * @brief Calculates the size hint for horizontal flow direction.
+ * @return A QSize representing the preferred dimensions.
+ */
+QSize FlowLayout::calculateSizeHintHorizontal() const
+{
+    int maxWidth = 0;     // Tracks the maximum width needed
+    int totalHeight = 0;  // Tracks the total height across all rows
+    int rowHeight = 0;    // Tracks the height of the current row
+    int currentWidth = 0; // Tracks the current row's width
+
+    const int availableWidth = getParentScrollAreaWidth() == 0 ? parentWidget()->width() : getParentScrollAreaWidth();
+
+    qCDebug(FlowLayoutLog) << "Calculating horizontal size hint. Available width:" << availableWidth;
+
    for (const QLayoutItem *item : items) {
-        if (item != nullptr && !item->isEmpty()) {
-            size = size.expandedTo(item->minimumSize());
+        if (!item || item->isEmpty()) {
+            qCDebug(FlowLayoutLog) << "Skipping empty item.";
+            continue;
        }
+
+        QSize itemSize = item->sizeHint();
+        int itemWidth = itemSize.width() + horizontalSpacing();
+        qCDebug(FlowLayoutLog) << "Processing item. Size:" << itemSize << "Width with spacing:" << itemWidth;
+
+        if (currentWidth + itemWidth > availableWidth) {
+            qCDebug(FlowLayoutLog) << "Row overflow. Current width:" << currentWidth << "Row height:" << rowHeight;
+            maxWidth = qMax(maxWidth, currentWidth);
+            totalHeight += rowHeight + verticalSpacing();
+            qCDebug(FlowLayoutLog) << "Updated total height:" << totalHeight << "Max width so far:" << maxWidth;
+
+            currentWidth = 0;
+            rowHeight = 0;
+        }
+
+        currentWidth += itemWidth;
+        rowHeight = qMax(rowHeight, itemSize.height());
+        qCDebug(FlowLayoutLog) << "Updated current width:" << currentWidth << "Updated row height:" << rowHeight;
    }

-    size.setWidth(qMin(size.width(), getParentScrollAreaWidth()));
-    size.setHeight(qMin(size.height(), getParentScrollAreaHeight()));
+    // Account for the final row
+    maxWidth = qMax(maxWidth, currentWidth);
+    totalHeight += rowHeight;
+    qCDebug(FlowLayoutLog) << "Final total height:" << totalHeight << "Final max width:" << maxWidth;

-    return size.isValid() ? size : QSize(0, 0);
+    return QSize(maxWidth, totalHeight);
+}
+
+/**
+ * @brief Calculates the minimum size for horizontal flow direction.
+ * @return A QSize representing the minimum required dimensions.
+ */
+QSize FlowLayout::calculateMinimumSizeHorizontal() const
+{
+    int maxWidth = 0;     // Tracks the maximum width of a row
+    int totalHeight = 0;  // Tracks the total height across all rows
+    int rowHeight = 0;    // Tracks the height of the current row
+    int currentWidth = 0; // Tracks the current row's width
+
+    const int availableWidth = getParentScrollAreaWidth() == 0 ? parentWidget()->width() : getParentScrollAreaWidth();
+
+    qCDebug(FlowLayoutLog) << "Calculating horizontal minimum size. Available width:" << availableWidth;
+
+    for (const QLayoutItem *item : items) {
+        if (!item || item->isEmpty()) {
+            qCDebug(FlowLayoutLog) << "Skipping empty item.";
+            continue;
+        }
+
+        QSize itemMinSize = item->minimumSize();
+        int itemWidth = itemMinSize.width() + horizontalSpacing();
+        qCDebug(FlowLayoutLog) << "Processing item. Minimum size:" << itemMinSize << "Width with spacing:" << itemWidth;
+
+        if (currentWidth + itemWidth > availableWidth) {
+            qCDebug(FlowLayoutLog) << "Row overflow. Current width:" << currentWidth << "Row height:" << rowHeight;
+            maxWidth = qMax(maxWidth, currentWidth);
+            totalHeight += rowHeight + verticalSpacing();
+            qCDebug(FlowLayoutLog) << "Updated total height:" << totalHeight << "Max width so far:" << maxWidth;
+
+            currentWidth = 0;
+            rowHeight = 0;
+        }
+
+        currentWidth += itemWidth;
+        rowHeight = qMax(rowHeight, itemMinSize.height());
+        qCDebug(FlowLayoutLog) << "Updated current width:" << currentWidth << "Updated row height:" << rowHeight;
+    }
+
+    // Account for the final row
+    maxWidth = qMax(maxWidth, currentWidth);
+    totalHeight += rowHeight;
+    qCDebug(FlowLayoutLog) << "Final total height:" << totalHeight << "Final max width:" << maxWidth;
+
+    return QSize(maxWidth, totalHeight);
+}
+
+/**
+ * @brief Calculates the size hint for vertical flow direction.
+ * @return A QSize representing the preferred dimensions.
+ */
+QSize FlowLayout::calculateSizeHintVertical() const
+{
+    int totalWidth = 0;
+    int maxHeight = 0;
+    int colWidth = 0;
+    int currentHeight = 0;
+
+    const int availableHeight = qMax(parentWidget()->height(), getParentScrollAreaHeight());
+
+    qCDebug(FlowLayoutLog) << "Calculating vertical size hint. Available height:" << availableHeight;
+
+    for (const QLayoutItem *item : items) {
+        if (!item || item->isEmpty()) {
+            qCDebug(FlowLayoutLog) << "Skipping empty item.";
+            continue;
+        }
+
+        QSize itemSize = item->sizeHint();
+        qCDebug(FlowLayoutLog) << "Processing item. Size:" << itemSize;
+
+        if (currentHeight + itemSize.height() > availableHeight) {
+            qCDebug(FlowLayoutLog) << "Column overflow. Current height:" << currentHeight
+                                   << "Column width:" << colWidth;
+            totalWidth += colWidth + horizontalSpacing();
+            maxHeight = qMax(maxHeight, currentHeight);
+            qCDebug(FlowLayoutLog) << "Updated total width:" << totalWidth << "Max height so far:" << maxHeight;
+
+            currentHeight = 0;
+            colWidth = 0;
+        }
+
+        currentHeight += itemSize.height() + verticalSpacing();
+        colWidth = qMax(colWidth, itemSize.width());
+        qCDebug(FlowLayoutLog) << "Updated current height:" << currentHeight << "Updated column width:" << colWidth;
+    }
+
+    // Account for the final column
+    totalWidth += colWidth;
+    maxHeight = qMax(maxHeight, currentHeight);
+    qCDebug(FlowLayoutLog) << "Final total width:" << totalWidth << "Final max height:" << maxHeight;
+
+    return QSize(totalWidth, maxHeight);
+}
+
+/**
+ * @brief Calculates the minimum size for vertical flow direction.
+ * @return A QSize representing the minimum required dimensions.
+ */
+QSize FlowLayout::calculateMinimumSizeVertical() const
+{
+    int totalWidth = 0;    // Tracks the total width across all columns
+    int maxHeight = 0;     // Tracks the maximum height of a column
+    int colWidth = 0;      // Tracks the width of the current column
+    int currentHeight = 0; // Tracks the current column's height
+
+    const int availableHeight = qMax(parentWidget()->height(), getParentScrollAreaHeight());
+
+    qCDebug(FlowLayoutLog) << "Calculating vertical minimum size. Available height:" << availableHeight;
+
+    for (const QLayoutItem *item : items) {
+        if (!item || item->isEmpty()) {
+            qCDebug(FlowLayoutLog) << "Skipping empty item.";
+            continue;
+        }
+
+        QSize itemMinSize = item->minimumSize();
+        int itemHeight = itemMinSize.height() + verticalSpacing();
+        qCDebug(FlowLayoutLog) << "Processing item. Minimum size:" << itemMinSize
+                               << "Height with spacing:" << itemHeight;
+
+        if (currentHeight + itemHeight > availableHeight) {
+            qCDebug(FlowLayoutLog) << "Column overflow. Current height:" << currentHeight
+                                   << "Column width:" << colWidth;
+            totalWidth += colWidth + horizontalSpacing();
+            maxHeight = qMax(maxHeight, currentHeight);
+            qCDebug(FlowLayoutLog) << "Updated total width:" << totalWidth << "Max height so far:" << maxHeight;
+
+            currentHeight = 0;
+            colWidth = 0;
+        }
+
+        currentHeight += itemHeight;
+        colWidth = qMax(colWidth, itemMinSize.width());
+        qCDebug(FlowLayoutLog) << "Updated current height:" << currentHeight << "Updated column width:" << colWidth;
+    }
+
+    // Account for the final column
+    totalWidth += colWidth;
+    maxHeight = qMax(maxHeight, currentHeight);
+    qCDebug(FlowLayoutLog) << "Final total width:" << totalWidth << "Final max height:" << maxHeight;
+
+    return QSize(totalWidth, maxHeight);
 }

 /**
--- a/cockatrice/src/client/ui/layouts/flow_layout.h
+++ b/cockatrice/src/client/ui/layouts/flow_layout.h
@@ -3,16 +3,22 @@

 #include <QLayout>
 #include <QList>
+#include <QLoggingCategory>
 #include <QWidget>
 #include <qstyle.h>

+inline Q_LOGGING_CATEGORY(FlowLayoutLog, "flow_layout");
+
 class FlowLayout : public QLayout
 {
 public:
    explicit FlowLayout(QWidget *parent = nullptr);
-    FlowLayout(QWidget *parent, int margin, int hSpacing, int vSpacing);
+    FlowLayout(QWidget *parent, Qt::Orientation _flowDirection, int margin = 0, int hSpacing = 0, int vSpacing = 0);
    ~FlowLayout() override;

+    QSize calculateMinimumSizeHorizontal() const;
+    QSize calculateSizeHintVertical() const;
+    QSize calculateMinimumSizeVertical() const;
    void addItem(QLayoutItem *item) override;
    [[nodiscard]] int count() const override;
    [[nodiscard]] QLayoutItem *itemAt(int index) const override;
@@ -31,11 +37,15 @@ public:
    void setGeometry(const QRect &rect) override;
    virtual int layoutAllRows(int originX, int originY, int availableWidth);
    virtual void layoutSingleRow(const QVector<QLayoutItem *> &rowItems, int x, int y);
+    int layoutAllColumns(int originX, int originY, int availableHeight);
+    void layoutSingleColumn(const QVector<QLayoutItem *> &colItems, int x, int y);
    [[nodiscard]] QSize sizeHint() const override;
    [[nodiscard]] QSize minimumSize() const override;
+    QSize calculateSizeHintHorizontal() const;

 protected:
    QList<QLayoutItem *> items; // List to store layout items
+    Qt::Orientation flowDirection;
    int horizontalMargin;
    int verticalMargin;
 };
--- a/cockatrice/src/client/ui/layouts/horizontal_flow_layout.cpp
+++ b/cockatrice/src/client/ui/layouts/horizontal_flow_layout.cpp
@@ -1,142 +0,0 @@
-#include "horizontal_flow_layout.h"
-
-/**
- * @brief Constructs a HorizontalFlowLayout instance with the specified parent widget.
- *        This layout arranges items in columns within the given height, automatically adjusting its width.
- * @param parent The parent widget to which this layout belongs.
- * @param margin The layout margin.
- * @param hSpacing The horizontal spacing between items.
- * @param vSpacing The vertical spacing between items.
- */
-HorizontalFlowLayout::HorizontalFlowLayout(QWidget *parent, const int margin, const int hSpacing, const int vSpacing)
-    : FlowLayout(parent, margin, hSpacing, vSpacing)
-{
-}
-
-/**
- * @brief Destructor for HorizontalFlowLayout, responsible for cleaning up layout items.
- */
-HorizontalFlowLayout::~HorizontalFlowLayout()
-{
-    QLayoutItem *item;
-    while ((item = FlowLayout::takeAt(0))) {
-        delete item;
-    }
-}
-
-/**
- * @brief Calculates the required width to display all items, given a specified height.
- *        This method arranges items into columns and determines the total width needed.
- * @param height The available height for arranging layout items.
- * @return The total width required to fit all items, organized in columns constrained by the given height.
- */
-int HorizontalFlowLayout::heightForWidth(const int height) const
-{
-    int width = 0;
-    int colWidth = 0;
-    int colHeight = 0;
-
-    for (const QLayoutItem *item : items) {
-        if (item == nullptr || item->isEmpty()) {
-            continue;
-        }
-
-        int itemHeight = item->sizeHint().height();
-        if (colHeight + itemHeight > height) {
-            width += colWidth;
-            colHeight = itemHeight;
-            colWidth = item->sizeHint().width();
-        } else {
-            colHeight += itemHeight;
-            colWidth = qMax(colWidth, item->sizeHint().width());
-        }
-    }
-    width += colWidth; // Add width of the last column
-    return width;
-}
-
-/**
- * @brief Sets the geometry of the layout items, arranging them in columns within the given height.
- * @param rect The rectangle area defining the layout space.
- */
-void HorizontalFlowLayout::setGeometry(const QRect &rect)
-{
-    const int availableHeight = qMax(rect.height(), getParentScrollAreaHeight());
-
-    const int totalWidth = layoutAllColumns(rect.x(), rect.y(), availableHeight);
-
-    if (QWidget *parentWidgetPtr = parentWidget()) {
-        parentWidgetPtr->setMinimumSize(totalWidth, availableHeight);
-    }
-}
-
-/**
- * @brief Lays out items into columns according to the available height, starting from a given origin.
- *        Each column is arranged within `availableHeight`, wrapping to a new column as necessary.
- * @param originX The x-coordinate for the layout start position.
- * @param originY The y-coordinate for the layout start position.
- * @param availableHeight The height within which each column is constrained.
- * @return The total width after arranging all columns.
- */
-int HorizontalFlowLayout::layoutAllColumns(const int originX, const int originY, const int availableHeight)
-{
-    QVector<QLayoutItem *> colItems; // Holds items for the current column
-    int currentXPosition = originX;  // Tracks the x-coordinate while placing items
-    int currentYPosition = originY;  // Tracks the y-coordinate, resetting for each new column
-
-    int colWidth = 0; // Tracks the maximum width of items in the current column
-
-    for (QLayoutItem *item : items) {
-        if (item == nullptr || item->isEmpty()) {
-            continue;
-        }
-
-        QSize itemSize = item->sizeHint(); // The suggested size for the current item
-
-        // Check if the current item fits in the remaining height of the current column
-        if (currentYPosition + itemSize.height() > availableHeight) {
-            // If not, layout the current column and start a new column
-            layoutSingleColumn(colItems, currentXPosition, originY);
-            colItems.clear();             // Reset the list for the new column
-            currentYPosition = originY;   // Reset y-position to the column's start
-            currentXPosition += colWidth; // Move x-position to the next column
-            colWidth = 0;                 // Reset column width for the new column
-        }
-
-        // Add the item to the current column
-        colItems.append(item);
-        colWidth = qMax(colWidth, itemSize.width()); // Update the column's width to the widest item
-        currentYPosition += itemSize.height();       // Move y-position for the next item
-    }
-
-    // Layout the final column if there are any remaining items
-    layoutSingleColumn(colItems, currentXPosition, originY);
-
-    // Return the total width used, including the last column's width
-    return currentXPosition + colWidth;
-}
-
-/**
- * @brief Arranges a single column of items within specified x and y starting positions.
- * @param colItems A list of items to be arranged in the column.
- * @param x The starting x-coordinate for the column.
- * @param y The starting y-coordinate for the column.
- */
-void HorizontalFlowLayout::layoutSingleColumn(const QVector<QLayoutItem *> &colItems, const int x, int y)
-{
-    for (QLayoutItem *item : colItems) {
-        if (item != nullptr && item->isEmpty()) {
-            continue;
-        }
-
-        // Get the maximum allowed size for the item
-        QSize itemMaxSize = item->widget()->maximumSize();
-        // Constrain the item's width and height to its size hint or maximum size
-        const int itemWidth = qMin(item->sizeHint().width(), itemMaxSize.width());
-        const int itemHeight = qMin(item->sizeHint().height(), itemMaxSize.height());
-        // Set the item's geometry based on the computed size and position
-        item->setGeometry(QRect(QPoint(x, y), QSize(itemWidth, itemHeight)));
-        // Move the y-position down by the item's height to place the next item below
-        y += itemHeight;
-    }
-}
--- a/cockatrice/src/client/ui/layouts/horizontal_flow_layout.h
+++ b/cockatrice/src/client/ui/layouts/horizontal_flow_layout.h
@@ -1,19 +0,0 @@
-#ifndef HORIZONTAL_FLOW_LAYOUT_H
-#define HORIZONTAL_FLOW_LAYOUT_H
-
-#include "flow_layout.h"
-
-class HorizontalFlowLayout : public FlowLayout
-{
-public:
-    explicit HorizontalFlowLayout(QWidget *parent = nullptr, int margin = 0, int hSpacing = 0, int vSpacing = 0);
-    ~HorizontalFlowLayout() override;
-
-    [[nodiscard]] int heightForWidth(int height) const override;
-
-    void setGeometry(const QRect &rect) override;
-    int layoutAllColumns(int originX, int originY, int availableHeight);
-    static void layoutSingleColumn(const QVector<QLayoutItem *> &colItems, int x, int y);
-};
-
-#endif // HORIZONTAL_FLOW_LAYOUT_H
--- a/cockatrice/src/client/ui/layouts/vertical_flow_layout.cpp
+++ b/cockatrice/src/client/ui/layouts/vertical_flow_layout.cpp
@@ -1,144 +0,0 @@
-#include "vertical_flow_layout.h"
-
-/**
- * @brief Constructs a VerticalFlowLayout instance with the specified parent widget.
- *        This layout arranges items in rows within the given width, automatically adjusting its height.
- * @param parent The parent widget to which this layout belongs.
- * @param margin The layout margin.
- * @param hSpacing The horizontal spacing between items.
- * @param vSpacing The vertical spacing between items.
- */
-VerticalFlowLayout::VerticalFlowLayout(QWidget *parent, const int margin, const int hSpacing, const int vSpacing)
-    : FlowLayout(parent, margin, hSpacing, vSpacing)
-{
-}
-
-/**
- * @brief Destructor for VerticalFlowLayout, responsible for cleaning up layout items.
- */
-VerticalFlowLayout::~VerticalFlowLayout()
-{
-    QLayoutItem *item;
-    while ((item = FlowLayout::takeAt(0))) {
-        delete item;
-    }
-}
-
-/**
- * @brief Calculates the required height to display all items, given a specified width.
- *        This method arranges items into rows and determines the total height needed.
- * @param width The available width for arranging layout items.
- * @return The total height required to fit all items, organized in rows constrained by the given width.
- */
-int VerticalFlowLayout::heightForWidth(const int width) const
-{
-    int height = 0;
-    int rowWidth = 0;
-    int rowHeight = 0;
-
-    for (const QLayoutItem *item : items) {
-        if (item == nullptr || item->isEmpty()) {
-            continue;
-        }
-
-        int itemWidth = item->sizeHint().width() + horizontalSpacing();
-        if (rowWidth + itemWidth > width) {
-            height += rowHeight + verticalSpacing();
-            rowWidth = itemWidth;
-            rowHeight = item->sizeHint().height();
-        } else {
-            rowWidth += itemWidth;
-            rowHeight = qMax(rowHeight, item->sizeHint().height());
-        }
-    }
-    height += rowHeight; // Add height of the last row
-    return height;
-}
-
-/**
- * @brief Sets the geometry of the layout items, arranging them in rows within the given width.
- * @param rect The rectangle area defining the layout space.
- */
-void VerticalFlowLayout::setGeometry(const QRect &rect)
-{
-    // If we have a parent scroll area, we're clamped to that, else we use our own rectangle.
-    const int availableWidth = getParentScrollAreaWidth() == 0 ? rect.width() : getParentScrollAreaWidth();
-
-    const int totalHeight = layoutAllRows(rect.x(), rect.y(), availableWidth);
-
-    if (QWidget *parentWidgetPtr = parentWidget()) {
-        parentWidgetPtr->setMinimumSize(availableWidth, totalHeight);
-    }
-}
-
-/**
- * @brief Lays out items into rows according to the available width, starting from a given origin.
- *        Each row is arranged within `availableWidth`, wrapping to a new row as necessary.
- * @param originX The x-coordinate for the layout start position.
- * @param originY The y-coordinate for the layout start position.
- * @param availableWidth The width within which each row is constrained.
- * @return The total height after arranging all rows.
- */
-int VerticalFlowLayout::layoutAllRows(const int originX, const int originY, const int availableWidth)
-{
-    QVector<QLayoutItem *> rowItems; // Holds items for the current row
-    int currentXPosition = originX;  // Tracks the x-coordinate while placing items
-    int currentYPosition = originY;  // Tracks the y-coordinate, moving down after each row
-
-    int rowHeight = 0; // Tracks the maximum height of items in the current row
-
-    for (QLayoutItem *item : items) {
-        if (item == nullptr || item->isEmpty()) {
-            continue;
-        }
-
-        QSize itemSize = item->sizeHint();                      // The suggested size for the current item
-        int itemWidth = itemSize.width() + horizontalSpacing(); // Item width plus spacing
-
-        // Check if the current item fits in the remaining width of the current row
-        if (currentXPosition + itemWidth > availableWidth) {
-            // If not, layout the current row and start a new row
-            layoutSingleRow(rowItems, originX, currentYPosition);
-            rowItems.clear();                                  // Reset the list for the new row
-            currentXPosition = originX;                        // Reset x-position to the row's start
-            currentYPosition += rowHeight + verticalSpacing(); // Move y-position down to the next row
-            rowHeight = 0;                                     // Reset row height for the new row
-        }
-
-        // Add the item to the current row
-        rowItems.append(item);
-        rowHeight = qMax(rowHeight, itemSize.height());      // Update the row's height to the tallest item
-        currentXPosition += itemWidth + horizontalSpacing(); // Move x-position for the next item
-    }
-
-    // Layout the final row if there are any remaining items
-    layoutSingleRow(rowItems, originX, currentYPosition);
-
-    // Return the total height used, including the last row's height
-    return currentYPosition + rowHeight;
-}
-
-/**
- * @brief Arranges a single row of items within specified x and y starting positions.
- * @param rowItems A list of items to be arranged in the row.
- * @param x The starting x-coordinate for the row.
- * @param y The starting y-coordinate for the row.
- */
-void VerticalFlowLayout::layoutSingleRow(const QVector<QLayoutItem *> &rowItems, int x, const int y)
-{
-    for (QLayoutItem *item : rowItems) {
-        if (item == nullptr || item->isEmpty()) {
-            continue;
-        }
-
-        // Get the maximum allowed size for the item
-        QSize itemMaxSize = item->widget()->maximumSize();
-        // Constrain the item's width and height to its size hint or maximum size
-        const int itemWidth = qMin(item->sizeHint().width(), itemMaxSize.width());
-        const int itemHeight = qMin(item->sizeHint().height(), itemMaxSize.height());
-        // Set the item's geometry based on the computed size and position
-        item->setGeometry(QRect(QPoint(x, y), QSize(itemWidth, itemHeight)));
-        // Move the x-position to the right, leaving space for horizontal spacing
-        x += itemWidth + horizontalSpacing();
-    }
-}
--- a/cockatrice/src/client/ui/layouts/vertical_flow_layout.h
+++ b/cockatrice/src/client/ui/layouts/vertical_flow_layout.h
@@ -1,19 +0,0 @@
-#ifndef VERTICAL_FLOW_LAYOUT_H
-#define VERTICAL_FLOW_LAYOUT_H
-
-#include "flow_layout.h"
-
-class VerticalFlowLayout : public FlowLayout
-{
-public:
-    explicit VerticalFlowLayout(QWidget *parent = nullptr, int margin = 0, int hSpacing = 0, int vSpacing = 0);
-    ~VerticalFlowLayout() override;
-
-    [[nodiscard]] int heightForWidth(int width) const override;
-
-    void setGeometry(const QRect &rect) override;
-    int layoutAllRows(int originX, int originY, int availableWidth) override;
-    void layoutSingleRow(const QVector<QLayoutItem *> &rowItems, int x, int y) override;
-};
-
-#endif // VERTICAL_FLOW_LAYOUT_H
--- a/cockatrice/src/client/ui/picture_loader/picture_loader.cpp
+++ b/cockatrice/src/client/ui/picture_loader/picture_loader.cpp
@@ -15,11 +15,8 @@
 #include <QScreen>
 #include <QThread>
 #include <algorithm>
-#include <qloggingcategory.h>
 #include <utility>

-Q_LOGGING_CATEGORY(PictureLoaderLog, "picture_loader")
-
 // never cache more than 300 cards at once for a single deck
 #define CACHED_CARD_PER_DECK_MAX 300

@@ -52,7 +49,7 @@ void PictureLoader::getCardBackLoadingInProgressPixmap(QPixmap &pixmap, QSize si
 {
    QString backCacheKey = "_trice_card_back_" + QString::number(size.width()) + QString::number(size.height());
    if (!QPixmapCache::find(backCacheKey, &pixmap)) {
-        qCDebug(PictureLoaderLog) << "PictureLoader: cache fail for" << backCacheKey;
+        qCDebug(PictureLoaderCardBackCacheFailLog) << "PictureLoader: cache fail for" << backCacheKey;
        pixmap = QPixmap("theme:cardback").scaled(size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
        QPixmapCache::insert(backCacheKey, pixmap);
    }
@@ -62,7 +59,7 @@ void PictureLoader::getCardBackLoadingFailedPixmap(QPixmap &pixmap, QSize size)
 {
    QString backCacheKey = "_trice_card_back_" + QString::number(size.width()) + QString::number(size.height());
    if (!QPixmapCache::find(backCacheKey, &pixmap)) {
-        qCDebug(PictureLoaderLog) << "PictureLoader: cache fail for" << backCacheKey;
+        qCDebug(PictureLoaderCardBackCacheFailLog) << "PictureLoader: cache fail for" << backCacheKey;
        pixmap = QPixmap("theme:cardback").scaled(size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
        QPixmapCache::insert(backCacheKey, pixmap);
    }
@@ -92,6 +89,7 @@ void PictureLoader::getPixmap(QPixmap &pixmap, CardInfoPtr card, QSize size)
    }

    // add the card to the load queue
+    qCDebug(PictureLoaderLog) << "Enqueuing " << card->getName() << " for " << card->getPixmapCacheKey();
    getInstance().worker->enqueueImageLoad(card);
 }

--- a/cockatrice/src/client/ui/picture_loader/picture_loader.h
+++ b/cockatrice/src/client/ui/picture_loader/picture_loader.h
@@ -4,6 +4,11 @@
 #include "../../../game/cards/card_database.h"
 #include "picture_loader_worker.h"

+#include <QLoggingCategory>
+
+inline Q_LOGGING_CATEGORY(PictureLoaderLog, "picture_loader");
+inline Q_LOGGING_CATEGORY(PictureLoaderCardBackCacheFailLog, "picture_loader.card_back_cache_fail");
+
 class PictureLoader : public QObject
 {
    Q_OBJECT
--- a/cockatrice/src/client/ui/picture_loader/picture_loader_worker.cpp
+++ b/cockatrice/src/client/ui/picture_loader/picture_loader_worker.cpp
@@ -5,14 +5,11 @@

 #include <QBuffer>
 #include <QDirIterator>
-#include <QLoggingCategory>
 #include <QMovie>
 #include <QNetworkDiskCache>
 #include <QNetworkReply>
 #include <QThread>

-Q_LOGGING_CATEGORY(PictureLoaderWorkerLog, "picture_loader.worker");
-
 // Card back returned by gatherer when card is not found
 QStringList PictureLoaderWorker::md5Blacklist = QStringList() << "db0c48db407a907c16ade38de048a441";

@@ -84,7 +81,7 @@ void PictureLoaderWorker::processLoadQueue()
        QString correctedCardName = cardBeingLoaded.getCard()->getCorrectedName();

        qCDebug(PictureLoaderWorkerLog).nospace()
-            << "PictureLoader: [card: " << cardName << " set: " << setName << "]: Trying to load picture";
+            << "[card: " << cardName << " set: " << setName << "]: Trying to load picture";

        if (CardDatabaseManager::getInstance()->isProviderIdForPreferredPrinting(
                cardName, cardBeingLoaded.getCard()->getPixmapCacheKey())) {
@@ -93,8 +90,8 @@ void PictureLoaderWorker::processLoadQueue()
            }
        }

-        qCDebug(PictureLoaderWorkerLog).nospace() << "PictureLoader: [card: " << cardName << " set: " << setName
-                                                  << "]: No custom picture, trying to download";
+        qCDebug(PictureLoaderWorkerLog).nospace()
+            << "[card: " << cardName << " set: " << setName << "]: No custom picture, trying to download";
        cardsToDownload.append(cardBeingLoaded);
        cardBeingLoaded.clear();
        if (!downloadRunning) {
@@ -137,21 +134,21 @@ bool PictureLoaderWorker::cardImageExistsOnDisk(QString &setName, QString &corre
        imgReader.setFileName(_picsPath);
        if (imgReader.read(&image)) {
            qCDebug(PictureLoaderWorkerLog).nospace()
-                << "PictureLoader: [card: " << correctedCardname << " set: " << setName << "]: Picture found on disk.";
+                << "[card: " << correctedCardname << " set: " << setName << "]: Picture found on disk.";
            imageLoaded(cardBeingLoaded.getCard(), image);
            return true;
        }
        imgReader.setFileName(_picsPath + ".full");
        if (imgReader.read(&image)) {
-            qCDebug(PictureLoaderWorkerLog).nospace() << "PictureLoader: [card: " << correctedCardname
-                                                      << " set: " << setName << "]: Picture.full found on disk.";
+            qCDebug(PictureLoaderWorkerLog).nospace()
+                << "[card: " << correctedCardname << " set: " << setName << "]: Picture.full found on disk.";
            imageLoaded(cardBeingLoaded.getCard(), image);
            return true;
        }
        imgReader.setFileName(_picsPath + ".xlhq");
        if (imgReader.read(&image)) {
-            qCDebug(PictureLoaderWorkerLog).nospace() << "PictureLoader: [card: " << correctedCardname
-                                                      << " set: " << setName << "]: Picture.xlhq found on disk.";
+            qCDebug(PictureLoaderWorkerLog).nospace()
+                << "[card: " << correctedCardname << " set: " << setName << "]: Picture.xlhq found on disk.";
            imageLoaded(cardBeingLoaded.getCard(), image);
            return true;
        }
@@ -179,10 +176,9 @@ void PictureLoaderWorker::startNextPicDownload()
        picDownloadFailed();
    } else {
        QUrl url(picUrl);
-        qCDebug(PictureLoaderWorkerLog).nospace()
-            << "PictureLoader: [card: " << cardBeingDownloaded.getCard()->getCorrectedName()
-            << " set: " << cardBeingDownloaded.getSetName() << "]: Trying to fetch picture from url "
-            << url.toDisplayString();
+        qCDebug(PictureLoaderWorkerLog).nospace() << "[card: " << cardBeingDownloaded.getCard()->getCorrectedName()
+                                                  << " set: " << cardBeingDownloaded.getSetName()
+                                                  << "]: Trying to fetch picture from url " << url.toDisplayString();
        makeRequest(url);
    }
 }
@@ -199,7 +195,7 @@ void PictureLoaderWorker::picDownloadFailed()
        mutex.unlock();
    } else {
        qCDebug(PictureLoaderWorkerLog).nospace()
-            << "PictureLoader: [card: " << cardBeingDownloaded.getCard()->getCorrectedName()
+            << "[card: " << cardBeingDownloaded.getCard()->getCorrectedName()
            << " set: " << cardBeingDownloaded.getSetName() << "]: Picture NOT found, "
            << (picDownload ? "download failed" : "downloads disabled")
            << ", no more url combinations to try: BAILING OUT";
@@ -221,7 +217,7 @@ QNetworkReply *PictureLoaderWorker::makeRequest(const QUrl &url)
    QUrl cachedRedirect = getCachedRedirect(url);
    if (!cachedRedirect.isEmpty()) {
        qCDebug(PictureLoaderWorkerLog).nospace()
-            << "PictureLoader: [card: " << cardBeingDownloaded.getCard()->getCorrectedName()
+            << "[card: " << cardBeingDownloaded.getCard()->getCorrectedName()
            << " set: " << cardBeingDownloaded.getSetName() << "]: Using cached redirect for " << url.toDisplayString()
            << " to " << cachedRedirect.toDisplayString();
        return makeRequest(cachedRedirect); // Use the cached redirect
@@ -246,7 +242,7 @@ QNetworkReply *PictureLoaderWorker::makeRequest(const QUrl &url)

            cacheRedirect(url, redirectUrl);
            qCDebug(PictureLoaderWorkerLog).nospace()
-                << "PictureLoader: [card: " << cardBeingDownloaded.getCard()->getCorrectedName()
+                << "[card: " << cardBeingDownloaded.getCard()->getCorrectedName()
                << " set: " << cardBeingDownloaded.getSetName() << "]: Caching redirect from " << url.toDisplayString()
                << " to " << redirectUrl.toDisplayString();
        }
@@ -326,18 +322,18 @@ void PictureLoaderWorker::picDownloadFinished(QNetworkReply *reply)
    if (reply->error()) {
        if (isFromCache) {
            qCDebug(PictureLoaderWorkerLog).nospace()
-                << "PictureLoader: [card: " << cardBeingDownloaded.getCard()->getName()
-                << " set: " << cardBeingDownloaded.getSetName() << "]: Removing corrupted cache file for url "
-                << reply->url().toDisplayString() << " and retrying (" << reply->errorString() << ")";
+                << "[card: " << cardBeingDownloaded.getCard()->getName() << " set: " << cardBeingDownloaded.getSetName()
+                << "]: Removing corrupted cache file for url " << reply->url().toDisplayString() << " and retrying ("
+                << reply->errorString() << ")";

            networkManager->cache()->remove(reply->url());

            makeRequest(reply->url());
        } else {
            qCDebug(PictureLoaderWorkerLog).nospace()
-                << "PictureLoader: [card: " << cardBeingDownloaded.getCard()->getName()
-                << " set: " << cardBeingDownloaded.getSetName() << "]: " << (picDownload ? "Download" : "Cache search")
-                << " failed for url " << reply->url().toDisplayString() << " (" << reply->errorString() << ")";
+                << "[card: " << cardBeingDownloaded.getCard()->getName() << " set: " << cardBeingDownloaded.getSetName()
+                << "]: " << (picDownload ? "Download" : "Cache search") << " failed for url "
+                << reply->url().toDisplayString() << " (" << reply->errorString() << ")";

            picDownloadFailed();
            startNextPicDownload();
@@ -353,9 +349,9 @@ void PictureLoaderWorker::picDownloadFinished(QNetworkReply *reply)
        statusCode == 308) {
        QUrl redirectUrl = reply->header(QNetworkRequest::LocationHeader).toUrl();
        qCDebug(PictureLoaderWorkerLog).nospace()
-            << "PictureLoader: [card: " << cardBeingDownloaded.getCard()->getName()
-            << " set: " << cardBeingDownloaded.getSetName() << "]: following "
-            << (isFromCache ? "cached redirect" : "redirect") << " to " << redirectUrl.toDisplayString();
+            << "[card: " << cardBeingDownloaded.getCard()->getName() << " set: " << cardBeingDownloaded.getSetName()
+            << "]: following " << (isFromCache ? "cached redirect" : "redirect") << " to "
+            << redirectUrl.toDisplayString();
        makeRequest(redirectUrl);
        reply->deleteLater();
        return;
@@ -366,8 +362,7 @@ void PictureLoaderWorker::picDownloadFinished(QNetworkReply *reply)

    if (imageIsBlackListed(picData)) {
        qCDebug(PictureLoaderWorkerLog).nospace()
-            << "PictureLoader: [card: " << cardBeingDownloaded.getCard()->getName()
-            << " set: " << cardBeingDownloaded.getSetName()
+            << "[card: " << cardBeingDownloaded.getCard()->getName() << " set: " << cardBeingDownloaded.getSetName()
            << "]: Picture found, but blacklisted, will consider it as not found";

        picDownloadFailed();
@@ -402,18 +397,18 @@ void PictureLoaderWorker::picDownloadFinished(QNetworkReply *reply)
        logSuccessMessage = true;
    } else {
        qCDebug(PictureLoaderWorkerLog).nospace()
-            << "PictureLoader: [card: " << cardBeingDownloaded.getCard()->getName()
-            << " set: " << cardBeingDownloaded.getSetName() << "]: Possible " << (isFromCache ? "cached" : "downloaded")
-            << " picture at " << reply->url().toDisplayString() << " could not be loaded: " << reply->errorString();
+            << "[card: " << cardBeingDownloaded.getCard()->getName() << " set: " << cardBeingDownloaded.getSetName()
+            << "]: Possible " << (isFromCache ? "cached" : "downloaded") << " picture at "
+            << reply->url().toDisplayString() << " could not be loaded: " << reply->errorString();

        picDownloadFailed();
    }

    if (logSuccessMessage) {
        qCDebug(PictureLoaderWorkerLog).nospace()
-            << "PictureLoader: [card: " << cardBeingDownloaded.getCard()->getName()
-            << " set: " << cardBeingDownloaded.getSetName() << "]: Image successfully "
-            << (isFromCache ? "loaded from cached" : "downloaded from") << " url " << reply->url().toDisplayString();
+            << "[card: " << cardBeingDownloaded.getCard()->getName() << " set: " << cardBeingDownloaded.getSetName()
+            << "]: Image successfully " << (isFromCache ? "loaded from cached" : "downloaded from") << " url "
+            << reply->url().toDisplayString();
    }

    reply->deleteLater();
--- a/cockatrice/src/client/ui/picture_loader/picture_loader_worker.h
+++ b/cockatrice/src/client/ui/picture_loader/picture_loader_worker.h
@@ -4,6 +4,7 @@
 #include "../../../game/cards/card_database.h"
 #include "picture_to_load.h"

+#include <QLoggingCategory>
 #include <QMutex>
 #include <QNetworkAccessManager>
 #include <QObject>
@@ -14,6 +15,8 @@
 #define REDIRECT_TIMESTAMP "timestamp"
 #define REDIRECT_CACHE_FILENAME "cache.ini"

+inline Q_LOGGING_CATEGORY(PictureLoaderWorkerLog, "picture_loader.worker");
+
 class PictureLoaderWorker : public QObject
 {
    Q_OBJECT
--- a/cockatrice/src/client/ui/picture_loader/picture_to_load.cpp
+++ b/cockatrice/src/client/ui/picture_loader/picture_to_load.cpp
@@ -7,9 +7,6 @@
 #include <QRegularExpression>
 #include <QUrl>
 #include <algorithm>
-#include <qloggingcategory.h>
-
-Q_LOGGING_CATEGORY(PictureToLoadLog, "picture_loader.picture_to_load")

 PictureToLoad::PictureToLoad(CardInfoPtr _card)
    : card(std::move(_card)), urlTemplates(SettingsCache::instance().downloads().getAllURLs())
--- a/cockatrice/src/client/ui/picture_loader/picture_to_load.h
+++ b/cockatrice/src/client/ui/picture_loader/picture_to_load.h
@@ -3,6 +3,10 @@

 #include "../../../game/cards/card_database.h"

+#include <QLoggingCategory>
+
+inline Q_LOGGING_CATEGORY(PictureToLoadLog, "picture_loader.picture_to_load");
+
 class PictureToLoad
 {
 private:
--- a/cockatrice/src/client/ui/pixel_map_generator.cpp
+++ b/cockatrice/src/client/ui/pixel_map_generator.cpp
@@ -3,9 +3,75 @@
 #include "pb/serverinfo_user.pb.h"

 #include <QApplication>
-#include <QDebug>
+#include <QDomDocument>
+#include <QFile>
 #include <QPainter>
 #include <QPalette>
+#include <QSvgRenderer>
+
+#define DEFAULT_COLOR_UNREGISTERED "#32c8ec";
+#define DEFAULT_COLOR_REGISTERED "#5ed900";
+#define DEFAULT_COLOR_MODERATOR_LEFT "#ffffff";
+#define DEFAULT_COLOR_MODERATOR_RIGHT "#000000";
+#define DEFAULT_COLOR_ADMIN "#ff2701";
+
+/**
+ * Loads in an svg from file and scales it without affecting image quality.
+ *
+ * @param svgPath The path to the svg file, with file extension.
+ * @param size The desired size of the pixmap.
+ * @param expandOnly If true, then keep the size of the initial pixmap to at least the svg size.
+ *
+ * @return The svg loaded into a Pixmap with the given size, or an empty Pixmap if the loading failed.
+ */
+static QPixmap loadSvg(const QString &svgPath, const QSize &size, bool expandOnly = false)
+{
+    QSvgRenderer svgRenderer(svgPath);
+
+    if (!svgRenderer.isValid()) {
+        qCWarning(PixelMapGeneratorLog) << "Failed to load" << svgPath;
+        return {};
+    }
+
+    // If expandOnly, make sure the pixmap is at least as large as the svg, so that we don't lose any detail.
+    // QIcon.pixmap(size) will automatically scale down the image, but it won't scale it up.
+    QSize pixmapSize = expandOnly ? svgRenderer.defaultSize().expandedTo(size) : size;
+    QPixmap pix(pixmapSize);
+    pix.fill(Qt::transparent);
+
+    QPainter pixPainter(&pix);
+    svgRenderer.render(&pixPainter);
+
+    // Converting the pixmap to a QIcon and back is the easiest way to scale down a svg without affecting image quality
+    if (expandOnly) {
+        return QIcon(pix).pixmap(size);
+    }
+
+    return pix;
+}
+
+/**
+ * Try to load path image from non-SVG formats, otherwise fall back to SVG.
+ * This is to allow custom themes to support non-SVG format type overrides, since SVG requires custom loading.
+ * @param path The path to the file, with no file extension. File formats will be automatically detected.
+ * @param size The desired size of the pixmap.
+ * @param expandOnly If true, then keep the size of the initial pixmap to at least the size (Only relevant if SVG).
+ *
+ * @return The loaded image into a Pixmap with the given size, or an empty Pixmap if the loading failed.
+ */
+static QPixmap tryLoadImage(const QString &path, const QSize &size, bool expandOnly = false)
+{
+    const auto formats = {"png", "jpg"};
+
+    QPixmap returnPixmap;
+    for (const auto &format : formats) {
+        if (returnPixmap.load(path, format)) {
+            return returnPixmap.scaled(size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+        }
+    }
+
+    return loadSvg(path + ".svg", size, expandOnly);
+}

 QMap<QString, QPixmap> PhasePixmapGenerator::pmCache;

@@ -15,8 +81,7 @@ QPixmap PhasePixmapGenerator::generatePixmap(int height, QString name)
    if (pmCache.contains(key))
        return pmCache.value(key);

-    QPixmap pixmap =
-        QPixmap("theme:phases/" + name).scaled(height, height, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+    QPixmap pixmap = tryLoadImage("theme:phases/" + name, QSize(height, height));

    pmCache.insert(key, pixmap);
    return pixmap;
@@ -26,20 +91,25 @@ QMap<QString, QPixmap> CounterPixmapGenerator::pmCache;

 QPixmap CounterPixmapGenerator::generatePixmap(int height, QString name, bool highlight)
 {
+    // The colorless counter is named "x" by the server but the file is named "general.svg"
+    if (name == "x") {
+        name = "general";
+    }
+
    if (highlight)
        name.append("_highlight");
    QString key = name + QString::number(height);
    if (pmCache.contains(key))
        return pmCache.value(key);

-    QPixmap pixmap =
-        QPixmap("theme:counters/" + name).scaled(height, height, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+    QPixmap pixmap = tryLoadImage("theme:counters/" + name, QSize(height, height));
+
+    // fall back to colorless counter if the name can't be found
    if (pixmap.isNull()) {
        name = "general";
        if (highlight)
            name.append("_highlight");
-        pixmap =
-            QPixmap("theme:counters/" + name).scaled(height, height, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+        pixmap = tryLoadImage("theme:counters/" + name, QSize(height, height));
    }

    pmCache.insert(key, pixmap);
@@ -83,12 +153,17 @@ QPixmap CountryPixmapGenerator::generatePixmap(int height, const QString &countr
        return pmCache.value(key);

    int width = height * 2;
-    QPixmap pixmap = QPixmap("theme:countries/" + countryCode.toLower())
-                         .scaled(width, height, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+    QPixmap pixmap = tryLoadImage("theme:countries/" + countryCode.toLower(), QSize(width, height), true);

    QPainter painter(&pixmap);
    painter.setPen(Qt::black);
+
+    // width/height offset was determined through trial-and-error
+#ifdef Q_OS_MACOS
+    painter.drawRect(0, 0, pixmap.width() / 2, pixmap.height() / 2);
+#else
    painter.drawRect(0, 0, pixmap.width() - 1, pixmap.height() - 1);
+#endif

    pmCache.insert(key, pixmap);
    return pixmap;
@@ -96,40 +171,177 @@ QPixmap CountryPixmapGenerator::generatePixmap(int height, const QString &countr

 QMap<QString, QPixmap> CountryPixmapGenerator::pmCache;

-QPixmap UserLevelPixmapGenerator::generatePixmap(int height, UserLevelFlags userLevel, bool isBuddy, QString privLevel)
+/**
+ * Updates tags in the svg
+ *
+ * @param elem The svg
+ * @param tagName tag with attribute to update
+ * @param attrName attribute to be updated
+ * @param idName id that the tag has to match
+ * @param attrValue the value to update the attribute to
+ */
+void setAttrRecur(QDomElement &elem,
+                  const QString &tagName,
+                  const QString &attrName,
+                  const QString &idName,
+                  const QString &attrValue)
 {
+    if (elem.tagName().compare(tagName) == 0) {
+        if (elem.attribute("id").compare(idName) == 0) {
+            elem.setAttribute(attrName, attrValue);
+        }
+    }

-    QString key = QString::number(height * 10000) + ":" + (short)userLevel + ":" + (short)isBuddy + ":" + privLevel;
-    if (pmCache.contains(key))
-        return pmCache.value(key);
-
-    QString levelString;
-    if (userLevel.testFlag(ServerInfo_User::IsAdmin)) {
-        levelString = "admin";
-        if (privLevel.toLower() == "vip")
-            levelString.append("_" + privLevel.toLower());
-    } else if (userLevel.testFlag(ServerInfo_User::IsModerator)) {
-        levelString = "moderator";
-        if (privLevel.toLower() == "vip")
-            levelString.append("_" + privLevel.toLower());
-    } else if (userLevel.testFlag(ServerInfo_User::IsRegistered)) {
-        levelString = "registered";
-        if (privLevel.toLower() != "none")
-            levelString.append("_" + privLevel.toLower());
-    } else
-        levelString = "normal";
-
-    if (isBuddy)
-        levelString.append("_buddy");
-
-    QPixmap pixmap = QPixmap("theme:userlevels/" + levelString)
-                         .scaled(height, height, Qt::KeepAspectRatio, Qt::SmoothTransformation);
-
-    pmCache.insert(key, pixmap);
-    return pixmap;
+    for (int i = 0; i < elem.childNodes().count(); i++) {
+        if (!elem.childNodes().at(i).isElement()) {
+            continue;
+        }
+        auto docElem = elem.childNodes().at(i).toElement();
+        setAttrRecur(docElem, tagName, attrName, idName, attrValue);
+    }
 }

-QMap<QString, QPixmap> UserLevelPixmapGenerator::pmCache;
+/**
+ * Loads the usericon svg and fills in its colors.
+ * The image is kept as a QIcon to preserve the image quality.
+ *
+ * Call icon.pixmap(w, h) in order to convert this icon into a pixmap with the given dimensions.
+ * Avoid scaling the pixmap in other ways, as that destroys image quality.
+ *
+ * @param minSize If the dimensions of the source svg is smaller than this, then it will be scaled up to this size
+ */
+static QIcon loadAndColorSvg(const QString &iconPath,
+                             const QString &colorLeft,
+                             const std::optional<QString> &colorRight,
+                             const int minSize)
+{
+    QFile file(iconPath);
+    if (!file.open(QIODevice::ReadOnly)) {
+        qCWarning(PixelMapGeneratorLog) << "Unable to open" << iconPath;
+        return {};
+    }
+
+    const auto &baData = file.readAll();
+    QDomDocument doc;
+    doc.setContent(baData);
+
+    auto docElem = doc.documentElement();
+
+    setAttrRecur(docElem, "path", "fill", "left", colorLeft);
+    if (colorRight.has_value()) {
+        setAttrRecur(docElem, "path", "fill", "right", colorRight.value());
+    }
+
+    QSvgRenderer svgRenderer(doc.toByteArray());
+
+    QPixmap pix(svgRenderer.defaultSize().expandedTo(QSize(minSize, minSize)));
+    pix.fill(Qt::transparent);
+
+    QPainter pixPainter(&pix);
+    svgRenderer.render(&pixPainter);
+
+    return QIcon(pix);
+}
+
+QPixmap UserLevelPixmapGenerator::generatePixmap(int height,
+                                                 UserLevelFlags userLevel,
+                                                 ServerInfo_User::PawnColorsOverride pawnColorsOverride,
+                                                 bool isBuddy,
+                                                 const QString &privLevel)
+{
+    return generateIcon(height, userLevel, pawnColorsOverride, isBuddy, privLevel).pixmap(height, height);
+}
+
+QIcon UserLevelPixmapGenerator::generateIcon(int minHeight,
+                                             UserLevelFlags userLevel,
+                                             ServerInfo_User::PawnColorsOverride pawnColorsOverride,
+                                             bool isBuddy,
+                                             const QString &privLevel)
+{
+    std::optional<QString> colorLeft = std::nullopt;
+    if (pawnColorsOverride.has_left_side()) {
+        colorLeft = QString::fromStdString(pawnColorsOverride.left_side());
+    }
+
+    std::optional<QString> colorRight = std::nullopt;
+    if (pawnColorsOverride.has_right_side()) {
+        colorRight = QString::fromStdString(pawnColorsOverride.right_side());
+    }
+
+    QString key = QString::number(minHeight * 10000) + ":" + static_cast<short>(userLevel) + ":" +
+                  static_cast<short>(isBuddy) + ":" + privLevel.toLower() + ":" + colorLeft.value_or("") + ":" +
+                  colorRight.value_or("");
+
+    if (iconCache.contains(key)) {
+        return iconCache.value(key);
+    }
+
+    QIcon icon = colorLeft.has_value()
+                     ? generateIconWithColorOverride(minHeight, isBuddy, userLevel, privLevel, colorLeft, colorRight)
+                     : generateIconDefault(minHeight, userLevel, isBuddy, privLevel);
+
+    iconCache.insert(key, icon);
+    return icon;
+}
+
+static QString getIconType(const bool isBuddy, const UserLevelFlags &userLevelFlags, const QString &privLevel)
+{
+    if (isBuddy) {
+        return "star";
+    }
+
+    if (userLevelFlags.testFlag(ServerInfo_User_UserLevelFlag_IsJudge)) {
+        return "pawn_judge";
+    }
+
+    if (!privLevel.isEmpty() && privLevel.toLower() != "none") {
+        return QString("pawn_%1").arg(privLevel.toLower());
+    }
+
+    return "pawn";
+}
+
+QIcon UserLevelPixmapGenerator::generateIconDefault(int height,
+                                                    UserLevelFlags userLevel,
+                                                    bool isBuddy,
+                                                    const QString &privLevel)
+{
+    const auto &iconType = getIconType(isBuddy, userLevel, privLevel);
+
+    QString arity = "single";
+    QString colorLeft;
+    std::optional<QString> colorRight = std::nullopt;
+
+    if (userLevel.testFlag(ServerInfo_User::IsAdmin)) {
+        colorLeft = DEFAULT_COLOR_ADMIN;
+    } else if (userLevel.testFlag(ServerInfo_User::IsModerator)) {
+        colorLeft = DEFAULT_COLOR_MODERATOR_LEFT;
+        colorRight = DEFAULT_COLOR_MODERATOR_RIGHT;
+        arity = "double";
+    } else if (userLevel.testFlag(ServerInfo_User::IsRegistered)) {
+        colorLeft = DEFAULT_COLOR_REGISTERED;
+    } else {
+        colorLeft = DEFAULT_COLOR_UNREGISTERED;
+    }
+
+    const auto &iconPath = QString("theme:usericons/%1_%2.svg").arg(iconType, arity);
+    return loadAndColorSvg(iconPath, colorLeft, colorRight, height);
+}
+
+QIcon UserLevelPixmapGenerator::generateIconWithColorOverride(int height,
+                                                              bool isBuddy,
+                                                              const UserLevelFlags &userLevelFlags,
+                                                              const QString &privLevel,
+                                                              const std::optional<QString> &colorLeft,
+                                                              const std::optional<QString> &colorRight)
+{
+    const auto &iconType = getIconType(isBuddy, userLevelFlags, privLevel);
+    const QString &arity = colorRight.has_value() ? "double" : "single";
+    const auto &iconPath = QString("theme:usericons/%1_%2.svg").arg(iconType, arity);
+    return loadAndColorSvg(iconPath, colorLeft.value(), colorRight, height);
+}
+
+QMap<QString, QIcon> UserLevelPixmapGenerator::iconCache;

 QPixmap LockPixmapGenerator::generatePixmap(int height)
 {
@@ -138,14 +350,14 @@ QPixmap LockPixmapGenerator::generatePixmap(int height)
    if (pmCache.contains(key))
        return pmCache.value(key);

-    QPixmap pixmap = QPixmap("theme:icons/lock").scaled(height, height, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+    QPixmap pixmap = tryLoadImage("theme:icons/lock", QSize(height, height), true);
    pmCache.insert(key, pixmap);
    return pixmap;
 }

 QMap<int, QPixmap> LockPixmapGenerator::pmCache;

-const QPixmap loadColorAdjustedPixmap(QString name)
+QPixmap loadColorAdjustedPixmap(const QString &name)
 {
    if (qApp->palette().windowText().color().lightness() > 200) {
        QImage img(name);
--- a/cockatrice/src/client/ui/pixel_map_generator.h
+++ b/cockatrice/src/client/ui/pixel_map_generator.h
@@ -3,9 +3,13 @@

 #include "user_level.h"

+#include <QIcon>
+#include <QLoggingCategory>
 #include <QMap>
 #include <QPixmap>

+inline Q_LOGGING_CATEGORY(PixelMapGeneratorLog, "pixel_map_generator");
+
 class PhasePixmapGenerator
 {
 private:
@@ -61,13 +65,31 @@ public:
 class UserLevelPixmapGenerator
 {
 private:
-    static QMap<QString, QPixmap> pmCache;
+    static QMap<QString, QIcon> iconCache;
+
+    static QIcon generateIconDefault(int height, UserLevelFlags userLevel, bool isBuddy, const QString &privLevel);
+    static QIcon generateIconWithColorOverride(int height,
+                                               bool isBuddy,
+                                               const UserLevelFlags &userLevelFlags,
+                                               const QString &privLevel,
+                                               const std::optional<QString> &colorLeft,
+                                               const std::optional<QString> &colorRight);

 public:
-    static QPixmap generatePixmap(int height, UserLevelFlags userLevel, bool isBuddy, QString privLevel = "NONE");
+    static QPixmap generatePixmap(int height,
+                                  UserLevelFlags userLevel,
+                                  ServerInfo_User::PawnColorsOverride pawnColors,
+                                  bool isBuddy,
+                                  const QString &privLevel);
+
+    static QIcon generateIcon(int minHeight,
+                              UserLevelFlags userLevel,
+                              ServerInfo_User::PawnColorsOverride pawnColors,
+                              bool isBuddy,
+                              const QString &privLevel);
    static void clear()
    {
-        pmCache.clear();
+        iconCache.clear();
    }
 };

@@ -84,6 +106,6 @@ public:
    }
 };

-const QPixmap loadColorAdjustedPixmap(QString name);
+QPixmap loadColorAdjustedPixmap(const QString &name);

 #endif
--- a/cockatrice/src/client/ui/theme_manager.cpp
+++ b/cockatrice/src/client/ui/theme_manager.cpp
@@ -32,7 +32,7 @@ void ThemeManager::ensureThemeDirectoryExists()
 {
    if (SettingsCache::instance().getThemeName().isEmpty() ||
        !getAvailableThemes().contains(SettingsCache::instance().getThemeName())) {
-        qDebug() << "Theme name not set, setting default value";
+        qCDebug(ThemeManagerLog) << "Theme name not set, setting default value";
        SettingsCache::instance().setThemeName(NONE_THEME_NAME);
    }
 }
@@ -105,7 +105,7 @@ QBrush ThemeManager::loadExtraBrush(QString fileName, QBrush &fallbackBrush)
 void ThemeManager::themeChangedSlot()
 {
    QString themeName = SettingsCache::instance().getThemeName();
-    qDebug() << "Theme changed:" << themeName;
+    qCDebug(ThemeManagerLog) << "Theme changed:" << themeName;

    QString dirPath = getAvailableThemes().value(themeName);
    QDir dir = dirPath;
--- a/cockatrice/src/client/ui/theme_manager.h
+++ b/cockatrice/src/client/ui/theme_manager.h
@@ -3,11 +3,14 @@

 #include <QBrush>
 #include <QDir>
+#include <QLoggingCategory>
 #include <QMap>
 #include <QObject>
 #include <QPixmap>
 #include <QString>

+inline Q_LOGGING_CATEGORY(ThemeManagerLog, "theme_manager");
+
 typedef QMap<QString, QString> QStringMap;
 typedef QMap<int, QBrush> QBrushMap;

--- a/cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.cpp
+++ b/cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.cpp
@@ -12,7 +12,7 @@
 #include <utility>

 CardInfoFrameWidget::CardInfoFrameWidget(const QString &cardName, QWidget *parent)
-    : QTabWidget(parent), info(nullptr), cardTextOnly(false)
+    : QTabWidget(parent), info(nullptr), viewTransformationButton(nullptr), cardTextOnly(false)
 {
    setContentsMargins(3, 3, 3, 3);
    pic = new CardInfoPictureWidget();
@@ -69,30 +69,82 @@ void CardInfoFrameWidget::retranslateUi()
    setTabText(ImageOnlyView, tr("Image"));
    setTabText(TextOnlyView, tr("Description"));
    setTabText(ImageAndTextView, tr("Both"));
+
+    if (viewTransformationButton) {
+        viewTransformationButton->setText(tr("View transformation"));
+    }
 }

-void CardInfoFrameWidget::setViewMode(int mode)
+void CardInfoFrameWidget::setViewTransformationButtonVisibility(bool visible)
 {
-    if (currentIndex() != mode)
-        setCurrentIndex(mode);
+    if (!viewTransformationButton && visible) {
+        viewTransformationButton = new QPushButton();
+        viewTransformationButton->setObjectName("viewTransformationButton");
+        connect(viewTransformationButton, &QPushButton::clicked, this, &CardInfoFrameWidget::viewTransformation);
+        refreshLayout();
+    } else if (viewTransformationButton && !visible) {
+        // Deleting a widget automatically removes it from its parent
+        viewTransformationButton->deleteLater();
+        viewTransformationButton = nullptr;
+    }
+}

-    switch (mode) {
+/**
+ * Adds the widgets to the layouts that are relevant to the currently active tab.
+ *
+ * QWidgets can only have one parent, so we need to re-parent the shared widgets whenever we switch tabs.
+ */
+void CardInfoFrameWidget::refreshLayout()
+{
+    switch (currentIndex()) {
        case ImageOnlyView:
        case TextOnlyView:
+            // We need to always parent all widgets, even the ones that aren't visible,
+            // since an unparented widget becomes free-floating.
            tab1Layout->addWidget(pic);
+            if (viewTransformationButton) {
+                tab1Layout->addWidget(viewTransformationButton);
+            }
            tab2Layout->addWidget(text);
            break;
        case ImageAndTextView:
            splitter->addWidget(pic);
+            if (viewTransformationButton) {
+                splitter->addWidget(viewTransformationButton);
+            }
            splitter->addWidget(text);
            break;
        default:
            break;
    }
+    retranslateUi();
+}
+
+void CardInfoFrameWidget::setViewMode(int mode)
+{
+    if (currentIndex() != mode) {
+        setCurrentIndex(mode);
+    }
+
+    refreshLayout();

    SettingsCache::instance().setCardInfoViewMode(mode);
 }

+static bool hasTransformation(const CardInfoPtr &info)
+{
+    if (!info) {
+        return false;
+    }
+
+    for (const auto &cardRelation : info->getAllRelatedCards()) {
+        if (cardRelation->getDoesTransform()) {
+            return true;
+        }
+    }
+    return false;
+}
+
 void CardInfoFrameWidget::setCard(CardInfoPtr card)
 {
    if (info) {
@@ -105,6 +157,8 @@ void CardInfoFrameWidget::setCard(CardInfoPtr card)
        connect(info.data(), SIGNAL(destroyed()), this, SLOT(clearCard()));
    }

+    setViewTransformationButtonVisibility(hasTransformation(info));
+
    text->setCard(info);
    pic->setCard(info);
 }
@@ -126,6 +180,19 @@ void CardInfoFrameWidget::setCard(AbstractCardItem *card)
    }
 }

+void CardInfoFrameWidget::viewTransformation()
+{
+    if (info) {
+        const auto &cardRelations = info->getAllRelatedCards();
+        for (const auto &cardRelation : cardRelations) {
+            if (cardRelation->getDoesTransform()) {
+                setCard(cardRelation->getName());
+                break;
+            }
+        }
+    }
+}
+
 void CardInfoFrameWidget::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
@@ -3,6 +3,7 @@

 #include "../../../../game/cards/card_database.h"

+#include <QPushButton>
 #include <QTabWidget>

 class AbstractCardItem;
@@ -18,11 +19,15 @@ private:
    CardInfoPtr info;
    CardInfoPictureWidget *pic;
    CardInfoTextWidget *text;
+    QPushButton *viewTransformationButton;
    bool cardTextOnly;
    QWidget *tab1, *tab2, *tab3;
    QVBoxLayout *tab1Layout, *tab2Layout, *tab3Layout;
    QSplitter *splitter;

+    void setViewTransformationButtonVisibility(bool visible);
+    void refreshLayout();
+
 public:
    enum ViewMode
    {
@@ -43,6 +48,7 @@ public slots:
    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/client/ui/widgets/cards/card_info_picture_widget.cpp
+++ b/cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.cpp
@@ -3,7 +3,10 @@
 #include "../../../../game/cards/card_database_manager.h"
 #include "../../../../game/cards/card_item.h"
 #include "../../../../settings/cache_settings.h"
+#include "../../../tabs/tab_deck_editor.h"
+#include "../../../tabs/tab_supervisor.h"
 #include "../../picture_loader/picture_loader.h"
+#include "../../window_main.h"

 #include <QMenu>
 #include <QMouseEvent>
@@ -253,22 +256,27 @@ QMenu *CardInfoPictureWidget::createRightClickMenu()
        return cardMenu;
    }

-    auto viewRelatedCards = new QMenu(tr("View related cards"));
-    cardMenu->addMenu(viewRelatedCards);
+    cardMenu->addMenu(createViewRelatedCardsMenu());
+    cardMenu->addMenu(createAddToOpenDeckMenu());
+
+    return cardMenu;
+}
+
+QMenu *CardInfoPictureWidget::createViewRelatedCardsMenu()
+{
+    auto viewRelatedCards = new QMenu(tr("View related cards"));

-    bool atLeastOneGoodRelationFound = false;
    QList<CardRelation *> relatedCards = info->getAllRelatedCards();
-    for (const CardRelation *cardRelation : relatedCards) {
-        CardInfoPtr relatedCard = CardDatabaseManager::getInstance()->getCard(cardRelation->getName());
-        if (relatedCard != nullptr) {
-            atLeastOneGoodRelationFound = true;
-            break;
-        }
-    }
+
+    auto relatedCardExists = [](const CardRelation *cardRelation) {
+        return CardDatabaseManager::getInstance()->getCard(cardRelation->getName()) != nullptr;
+    };
+
+    bool atLeastOneGoodRelationFound = std::any_of(relatedCards.begin(), relatedCards.end(), relatedCardExists);

    if (!atLeastOneGoodRelationFound) {
        viewRelatedCards->setEnabled(false);
-        return cardMenu;
+        return viewRelatedCards;
    }

    for (const auto &relatedCard : relatedCards) {
@@ -280,7 +288,38 @@ QMenu *CardInfoPictureWidget::createRightClickMenu()
        viewRelatedCards->addAction(viewCard);
    }

-    return cardMenu;
+    return viewRelatedCards;
+}
+
+QMenu *CardInfoPictureWidget::createAddToOpenDeckMenu()
+{
+    auto addToOpenDeckMenu = new QMenu(tr("Add card to deck"));
+
+    auto *mainWindow = qobject_cast<MainWindow *>(window());
+    QList<TabDeckEditor *> deckEditorTabs = mainWindow->getTabSupervisor()->getDeckEditorTabs();
+
+    if (deckEditorTabs.isEmpty()) {
+        addToOpenDeckMenu->setEnabled(false);
+        return addToOpenDeckMenu;
+    }
+
+    for (auto &deckEditorTab : deckEditorTabs) {
+        auto *addCardMenu = addToOpenDeckMenu->addMenu(deckEditorTab->getTabText());
+
+        QAction *addCard = addCardMenu->addAction(tr("Mainboard"));
+        connect(addCard, &QAction::triggered, this, [this, deckEditorTab] {
+            deckEditorTab->updateCardInfo(info);
+            deckEditorTab->addCardHelper(info, DECK_ZONE_MAIN);
+        });
+
+        QAction *addCardSideboard = addCardMenu->addAction(tr("Sideboard"));
+        connect(addCardSideboard, &QAction::triggered, this, [this, deckEditorTab] {
+            deckEditorTab->updateCardInfo(info);
+            deckEditorTab->addCardHelper(info, DECK_ZONE_SIDE);
+        });
+    }
+
+    return addToOpenDeckMenu;
 }

 /**
--- a/cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.h
+++ b/cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.h
@@ -68,6 +68,8 @@ private:
    QTimer *hoverTimer;

    QMenu *createRightClickMenu();
+    QMenu *createViewRelatedCardsMenu();
+    QMenu *createAddToOpenDeckMenu();
 };

 #endif
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
ZeldaZach	7daa9a0ca9	Attempt fix crash case	2025-02-08 20:18:06 -05:00
Zach H	07ca243d48	Update QT_LOGGING_CONF if not set (#5578 )	2025-02-08 16:10:45 +00:00
Zach H	edaca772c5	Support logging config on install (#5577 ) * Support logging config on install * Support logging config on install	2025-02-08 16:10:37 +00:00
ZeldaZach	b30b72b7c3	Fix building & logging out	2025-02-07 14:19:53 -05:00
RickyRister	57eab3d48a	turn off flow_widget logger (#5576 )	2025-02-07 15:36:41 +00:00
RickyRister	2c6e7d4d3a	Add option to hide folder structure in Visual Deck Storage (#5575 )	2025-02-07 15:36:24 +00:00
RickyRister	9ec621a1ae	fix wrong size flag bounding rect on linux (#5573 ) * fix flag bounding box on linux * use the non-deprecated macro	2025-02-07 06:21:56 +00:00
RickyRister	23223e10b5	actually delete VDS when hiding it in game lobby (#5572 )	2025-02-07 05:20:42 +00:00
github-actions[bot]	94129607e5	Update translation source strings (#5571 ) Co-authored-by: github-actions <github-actions@github.com>	2025-02-07 04:59:23 +00:00
RickyRister	d951b082c4	Add setting to hide visual deck storage in game lobby (#5570 )	2025-02-06 13:44:33 +00:00
RickyRister	1ee0e87ba7	remove debug log that was accidentally left in (#5569 )	2025-02-06 13:43:37 +00:00
Zach H	67091fff9c	Fixup custom theme image loading (#5568 )	2025-02-06 13:40:10 +00:00
Zach H	9b4f51d1e4	Increase Icon Size in User Lists (#5567 )	2025-02-06 05:51:19 +00:00
Zach H	a6649d5401	Add Judge Pawns (+ Resize Donator Pawns) (#5566 )	2025-02-06 05:51:01 +00:00
RickyRister	b509eed3e0	support shortcuts for tab menu actions (#5564 ) * support shortcuts for tab menu actions * refactor * add migration	2025-02-06 04:00:43 +00:00
RickyRister	12ae7a9eeb	Ignore unknown shortcut names in settings (#5565 )	2025-02-06 04:00:31 +00:00
fluidvanadium	e6e3333673	Deck limit (#5559 ) * increased MAX_FILE_LENGTH * set MAX_FILE_LENGTH to about 2 megabytes	2025-02-04 22:22:15 +00:00
RickyRister	218ed726b6	Fix wrong position and scaling of svg pixmaps when zoomed out (#5563 ) * fix scaling for player icon profile pic * fix scaling for other svgs	2025-02-04 22:22:05 +00:00
RickyRister	0503fe589c	fix playericon missing in local games (#5562 )	2025-02-04 05:53:52 +00:00
Zach H	e599c6bdac	Mods/Admins/PrivLevels not subject to server idle timeout policy (#5561 )	2025-02-04 05:20:20 +00:00
Zach H	c2292c11a6	Support Purple Heart for Donators (#5560 )	2025-02-04 05:06:05 +00:00
RickyRister	ec9feb9f50	fix wrong size flag bounding rect on windows (#5556 ) * fix wrong size flag bounding rect on windows * fix the values	2025-02-03 05:43:58 +00:00
RickyRister	9680e47bbc	Deprecate userlevels icons (#5555 ) * map old info to colors * move caching up a level * delete userlevels folder * remove default vip color	2025-02-03 05:43:48 +00:00
RickyRister	f782bd709a	preserve image quality when scaling svg (#5554 ) * preserve image quality when scaling svg * fix missing colorless counter * do it in a way that doesn't cause warnings to be logged	2025-02-03 02:50:21 +00:00
RickyRister	c00b41f3bd	add logging category for remote_client (#5553 ) * add logging category for remote_client * remove ifdef QT_DEBUG	2025-02-03 01:57:34 +00:00
BruebachL	94e2d64e55	Update sort order on VDS load. (#5552 ) Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>	2025-02-02 20:16:38 +00:00
Zach H	4535a70b57	Define qtlogging.ini location (#5551 )	2025-02-02 19:27:14 +00:00
BruebachL	6c1b7c83ec	Debounce writing the setting to cache when adjusting card sizes. (#5550 ) * Debounce writing the setting to cache when adjusting card sizes. * Lint. --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>	2025-02-02 18:45:26 +00:00
Zach H	f0adafb275	Reconnect Servatrice if DB Connection Dies (#5548 )	2025-02-02 18:25:01 +00:00
BruebachL	9dd60d74d1	Hotfix VDS sizing scrollArea widget incorrectly when created while not visible by setting size in showEvent (#5547 ) * Only resize on folder widget to make sure it doesn't squish the loading indicator. * Clamp scrollArea widget to viewport width on showEvent to prevent widget being instantiated with wrong width when not visible. --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>	2025-02-02 17:36:56 +00:00
RickyRister	1de09deb59	Fix size and image quality issues with new user icons (#5546 )	2025-02-02 15:08:23 +00:00
BruebachL	a0b52ce450	Implement folder support for VDS. (#5545 )	2025-02-02 15:08:04 +00:00
RickyRister	95cea0f191	Add custom server-side pawn colors (#5543 )	2025-02-02 03:25:25 +00:00
RickyRister	0fc05e15cd	pass ServerInfo_User down the chain (#5542 )	2025-02-02 01:04:49 +00:00
RickyRister	26c0cdc072	Make settings window scrollable (#5539 )	2025-02-01 05:03:30 +00:00
RickyRister	b1b48d50f3	move deck conversion settings into deck settings group (#5538 )	2025-02-01 04:32:12 +00:00
Zach H	349c18aa6a	Fix Crash with "c:" in deck editor (#5537 )	2025-02-01 04:32:01 +00:00
Zach H	b956fd4bac	Fix windows deck searching (#5536 )	2025-02-01 04:13:46 +00:00
RickyRister	34e0130b90	fix view transform button disappearing on click (#5535 )	2025-02-01 03:31:09 +00:00
BruebachL	33d8edeb9a	Get file format from name. (#5532 ) Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>	2025-01-27 19:41:29 -05:00
RickyRister	5d1e905255	remove refreshTree call in remote model's constructors (#5533 )	2025-01-27 19:40:59 -05:00
RickyRister	51c542aa04	Disable add to deck submenu if no deck editor tabs are open (#5530 ) * refactor * just have the deck name * clean up submenu parenting * disable add to deck menu if no deck editor tabs are open	2025-01-26 10:24:09 -05:00
BruebachL	4d791f4d7a	Edhrec tab (#5512 ) --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de> Co-authored-by: Zach H <zahalpern+github@gmail.com>	2025-01-25 22:29:27 +00:00
RickyRister	aee68f8b00	add missing override and explicit specifiers in common (#5527 )	2025-01-25 14:06:03 +00:00
RickyRister	b911ea6e28	add missing override and explicit specifiers in src/server (#5526 )	2025-01-25 14:05:25 +00:00
RickyRister	a41e7c75c1	add missing override and explicit specifiers in src/deck and src/utility (#5525 ) * add missing override and explicit specifiers in src/deck * add missing override and explicit specifiers in src/utility	2025-01-25 14:05:00 +00:00
RickyRister	9f729bf636	add missing override and explicit specifiers in src/dialogs (#5524 )	2025-01-25 14:04:26 +00:00
RickyRister	42e4c14a82	add missing override and explicit specifiers in src/client (#5523 )	2025-01-25 14:03:54 +00:00
Zach H	37a0c00b3f	Support right-click on game list menu (#5522 )	2025-01-25 14:03:29 +00:00
Zach H	f6c31bf901	Invert "Show" games, so all games are visible by default (#5521 )	2025-01-25 07:03:36 +00:00
Zach H	b48fe8b99c	Better capitalization & Deck open first (#5520 )	2025-01-25 05:45:44 +00:00
RickyRister	19b758591b	Allow offline Replays tab (#5519 )	2025-01-25 05:44:48 +00:00
Zach H	ec6a23de56	Support more indices (#5505 ) * Support more indices * Support more indices	2025-01-25 04:16:41 +00:00
BruebachL	ce416df3fb	Add a dialog to prompt user to convert to .cod format if trying to apply tags to a .txt deck. (#5514 ) * Add a dialog to prompt user to convert to .cod format if trying to apply tags to a .txt deck. * Lint mocks. * Address comments, move dialog to appropriate folder. * Unlint. --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>	2025-01-25 03:20:30 +00:00
BruebachL	4e96157091	Flow Layout fixes (#5515 ) * Flow Layout fixes. * Remove some comments. --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>	2025-01-25 03:17:39 +00:00
RickyRister	f428148f64	Allow offline Deck Storage tab (#5518 ) * make deck storage tab no longer close on disconnect * add method for clearing remote decklist model * handle connect/disconnect in deck storage tab	2025-01-25 03:16:40 +00:00
RickyRister	e8b1e3ef0c	don't autoclose card view if single card gets dragged into same zone (#5517 ) * rename canResize param to toNewZone * pass toNewZone down * don't autoclose card view if card gets dragged into same zone	2025-01-25 02:08:28 +00:00
RickyRister	085f0dd26c	reduce unnecessary CardItem creation in ViewZone addCard process (#5513 )	2025-01-24 05:13:08 +00:00
BruebachL	1d2ab8d3d3	Convert lastLoaded timestamp into proper QDateTime for correct comparison. (#5506 ) * Convert lastLoaded timestamp into proper QDateTime for correct comparison. * Reintroduce null check. --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>	2025-01-22 12:58:19 +00:00
RickyRister	66e2e7a473	add missing override and explicit specifiers to all classes in src/game (#5511 )	2025-01-22 12:57:56 +00:00
RickyRister	af161f00b7	Remove spacing in CardInfoWidget caused by invisible view transformation button (#5510 )	2025-01-22 12:55:21 +00:00
RickyRister	420cca2402	fix after merge to use ZoneView::close (#5509 )	2025-01-20 22:43:05 -05:00
RickyRister	97fdf11c8f	Add setting to auto close card view when empty (#5502 )	2025-01-21 03:08:01 +00:00
RickyRister	aeb1b9fb4f	Fix segfault when game is closed while card view window is open (#5507 )	2025-01-21 03:06:55 +00:00
RickyRister	b004e91aa4	fix segfault when bottoming card in deck view (#5508 )	2025-01-21 03:06:00 +00:00
Zach H	090cc8c144	Support more indices (#5503 )	2025-01-20 01:42:24 -05:00
tooomm	0467fae51b	Add label to swap button (#5501 )	2025-01-19 17:26:25 +00:00
BruebachL	aa24502129	Move logging from QDebug to QCDebug and introduce LoggingCategories. (#5491 ) * Move logging from QDebug to QCDebug and introduce LoggingCategories. * Lint. * Unlint like one change. * Remove .debug category since this is autofilled by Qt and used to differentiate between QCDebug and QCWarning and QCError. * Uncomment defaults, include main category. * Make PictureLoader logging a bit more useful. * Lint...? * Address comments. * Clean up some unnecessary classes in logging statements. * Add a new message format to the logging handler. * Lint. * Lint. * Support Windows in Regex --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de> Co-authored-by: ZeldaZach <zahalpern+github@gmail.com>	2025-01-19 13:14:23 +00:00
BruebachL	e752578d15	Add a button to easily view the transformed version of a card. (#5498 ) * Add a button to easily view the transformed version of a card. * Minor reword * Minor fix --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de> Co-authored-by: ZeldaZach <zahalpern+github@gmail.com>	2025-01-19 12:59:53 +00:00
BruebachL	724db755af	Hide load from remote button in local games (#5499 ) * Hide load from remote button in local games. * Minor fix --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de> Co-authored-by: ZeldaZach <zahalpern+github@gmail.com>	2025-01-19 12:59:33 +00:00
BruebachL	ec0caaf421	Give deckList a signal to emit when the tags change and hook up the display widget to that. (#5497 ) * Give deckList a signal to emit when the tags change and hook up the display widget to that. * Reload from file when loading a visual deck to ensure latest changes propagate to the decklist. * Eliminate loadVisualDeck and use loadDeckFromFile instead. --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>	2025-01-19 12:32:39 +00:00
Zach H	55b490ade0	Generate PDBs for Windows Builds (#5494 )	2025-01-18 07:54:01 +00:00
ZeldaZach	1392bdd258	Fix Windows 7 Crash Dump	2025-01-18 00:33:30 -05:00
Zach H	648c96ac3d	Allow Moderators to Grant Replay & Activate in TabAdmin (#5492 )	2025-01-18 02:23:24 +00:00
Zach H	d3a1538af3	Fix Windows Crash Reporter (#5493 ) * Fix Windows Crash Reporter * Fix NSIS template	2025-01-18 02:23:05 +00:00
RickyRister	2bc71095dd	get UserListProxy from TabSupervisor instead of passing it in the constructor (#5490 )	2025-01-17 15:27:52 +00:00
RickyRister	92a903b035	fix chat messages not showing in the client (#5489 )	2025-01-17 03:11:13 -05:00
transifex-integration[bot]	cd373edf3d	Translate cockatrice_en@source.ts in pt_BR (#5487 ) 100% translated source file: 'cockatrice_en@source.ts' on 'pt_BR'. Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>	2025-01-17 07:41:59 +00:00