diff --git a/cockatrice/src/client/network/spoiler_background_updater.cpp b/cockatrice/src/client/network/spoiler_background_updater.cpp
index 691c4574f..68fdc4c4c 100644
--- a/cockatrice/src/client/network/spoiler_background_updater.cpp
+++ b/cockatrice/src/client/network/spoiler_background_updater.cpp
@@ -2,9 +2,9 @@
 
 #include "../../database/card_database.h"
 #include "../../database/card_database_manager.h"
+#include "../../interface/window_main.h"
 #include "../../main.h"
 #include "../../settings/cache_settings.h"
-#include "../../interface/window_main.h"
 
 #include <QApplication>
 #include <QCryptographicHash>
diff --git a/cockatrice/src/client/replay_manager.h b/cockatrice/src/client/replay_manager.h
index 890c57401..4dc7869b9 100644
--- a/cockatrice/src/client/replay_manager.h
+++ b/cockatrice/src/client/replay_manager.h
@@ -4,8 +4,8 @@
 #include "network/replay_timeline_widget.h"
 #include "pb/game_replay.pb.h"
 
-#include <QWidget>
 #include <QToolButton>
+#include <QWidget>
 
 class TabGame;
 
diff --git a/cockatrice/src/dialogs/dlg_create_game.cpp b/cockatrice/src/dialogs/dlg_create_game.cpp
index ba354dae5..02c595121 100644
--- a/cockatrice/src/dialogs/dlg_create_game.cpp
+++ b/cockatrice/src/dialogs/dlg_create_game.cpp
@@ -1,8 +1,8 @@
 #include "dlg_create_game.h"
 
-#include "../tabs/tab_room.h"
 #include "../server/pending_command.h"
 #include "../settings/cache_settings.h"
+#include "../tabs/tab_room.h"
 #include "pb/serverinfo_game.pb.h"
 #include "trice_limits.h"
 
diff --git a/cockatrice/src/dialogs/dlg_manage_sets.cpp b/cockatrice/src/dialogs/dlg_manage_sets.cpp
index d67c49a3e..890afc075 100644
--- a/cockatrice/src/dialogs/dlg_manage_sets.cpp
+++ b/cockatrice/src/dialogs/dlg_manage_sets.cpp
@@ -1,10 +1,10 @@
 #include "dlg_manage_sets.h"
 
 #include "../client/network/sets_model.h"
-#include "../picture_loader/picture_loader.h"
 #include "../database/card_database_manager.h"
 #include "../deck/custom_line_edit.h"
 #include "../main.h"
+#include "../picture_loader/picture_loader.h"
 #include "../settings/cache_settings.h"
 
 #include <QAction>
diff --git a/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp b/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp
index 7b5b9e937..ac23e4159 100644
--- a/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp
+++ b/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp
@@ -1,9 +1,9 @@
 #include "dlg_select_set_for_cards.h"
 
-#include "../interface/widgets/cards/card_info_picture_widget.h"
-#include "../interface/widgets/general/layout_containers/flow_widget.h"
 #include "../database/card_database_manager.h"
 #include "../deck/deck_loader.h"
+#include "../interface/widgets/cards/card_info_picture_widget.h"
+#include "../interface/widgets/general/layout_containers/flow_widget.h"
 #include "dlg_select_set_for_cards.h"
 
 #include <QCheckBox>
diff --git a/cockatrice/src/dialogs/dlg_select_set_for_cards.h b/cockatrice/src/dialogs/dlg_select_set_for_cards.h
index 006ce90b9..8b7b79a9f 100644
--- a/cockatrice/src/dialogs/dlg_select_set_for_cards.h
+++ b/cockatrice/src/dialogs/dlg_select_set_for_cards.h
@@ -1,8 +1,8 @@
 #ifndef DLG_SELECT_SET_FOR_CARDS_H
 #define DLG_SELECT_SET_FOR_CARDS_H
 
-#include "../interface/widgets/general/layout_containers/flow_widget.h"
 #include "../deck/deck_list_model.h"
+#include "../interface/widgets/general/layout_containers/flow_widget.h"
 
 #include <QCheckBox>
 #include <QDialog>
diff --git a/cockatrice/src/dialogs/dlg_settings.cpp b/cockatrice/src/dialogs/dlg_settings.cpp
index e1069bbfa..6948a8e8b 100644
--- a/cockatrice/src/dialogs/dlg_settings.cpp
+++ b/cockatrice/src/dialogs/dlg_settings.cpp
@@ -4,17 +4,17 @@
 #include "../client/network/release_channel.h"
 #include "../client/network/spoiler_background_updater.h"
 #include "../client/sound_engine.h"
-#include "../tabs/tab_supervisor.h"
-#include "../picture_loader/picture_loader.h"
-#include "../interface/theme_manager.h"
-#include "../interface/widgets/general/background_sources.h"
 #include "../database/card_database.h"
 #include "../database/card_database_manager.h"
 #include "../deck/custom_line_edit.h"
+#include "../interface/theme_manager.h"
+#include "../interface/widgets/general/background_sources.h"
 #include "../main.h"
+#include "../picture_loader/picture_loader.h"
 #include "../settings/cache_settings.h"
 #include "../settings/card_counter_settings.h"
 #include "../settings/shortcut_treeview.h"
+#include "../tabs/tab_supervisor.h"
 #include "../utility/sequence_edit.h"
 
 #include <QAbstractButton>
diff --git a/cockatrice/src/dialogs/dlg_tip_of_the_day.cpp b/cockatrice/src/dialogs/dlg_tip_of_the_day.cpp
index 231795892..eb8e8dc47 100644
--- a/cockatrice/src/dialogs/dlg_tip_of_the_day.cpp
+++ b/cockatrice/src/dialogs/dlg_tip_of_the_day.cpp
@@ -1,7 +1,7 @@
 #include "dlg_tip_of_the_day.h"
 
-#include "tip_of_the_day.h"
 #include "../settings/cache_settings.h"
+#include "tip_of_the_day.h"
 
 #include <QCheckBox>
 #include <QDate>
diff --git a/cockatrice/src/game/board/abstract_card_item.cpp b/cockatrice/src/game/board/abstract_card_item.cpp
index c247e7bdf..7fdc25ffe 100644
--- a/cockatrice/src/game/board/abstract_card_item.cpp
+++ b/cockatrice/src/game/board/abstract_card_item.cpp
@@ -1,8 +1,8 @@
 #include "abstract_card_item.h"
 
-#include "../../picture_loader/picture_loader.h"
 #include "../../database/card_database.h"
 #include "../../database/card_database_manager.h"
+#include "../../picture_loader/picture_loader.h"
 #include "../../settings/cache_settings.h"
 #include "../game_scene.h"
 
diff --git a/cockatrice/src/game/board/abstract_counter.cpp b/cockatrice/src/game/board/abstract_counter.cpp
index f965c6ad2..c821dc4f8 100644
--- a/cockatrice/src/game/board/abstract_counter.cpp
+++ b/cockatrice/src/game/board/abstract_counter.cpp
@@ -1,12 +1,12 @@
 #include "abstract_counter.h"
 
-#include "../../tabs/tab_game.h"
-#include "translate_counter_name.h"
 #include "../../settings/cache_settings.h"
+#include "../../tabs/tab_game.h"
 #include "../player/player.h"
 #include "expression.h"
 #include "pb/command_inc_counter.pb.h"
 #include "pb/command_set_counter.pb.h"
+#include "translate_counter_name.h"
 
 #include <QAction>
 #include <QApplication>
diff --git a/cockatrice/src/game/board/card_item.cpp b/cockatrice/src/game/board/card_item.cpp
index f7f324218..da347098f 100644
--- a/cockatrice/src/game/board/card_item.cpp
+++ b/cockatrice/src/game/board/card_item.cpp
@@ -1,9 +1,9 @@
 #include "card_item.h"
 
 #include "../../card/card_info.h"
-#include "../../tabs/tab_game.h"
 #include "../../settings/cache_settings.h"
 #include "../../settings/card_counter_settings.h"
+#include "../../tabs/tab_game.h"
 #include "../game_scene.h"
 #include "../player/player.h"
 #include "../zones/card_zone.h"
diff --git a/cockatrice/src/game/deckview/deck_view_container.cpp b/cockatrice/src/game/deckview/deck_view_container.cpp
index 9c583891a..2f6e9a105 100644
--- a/cockatrice/src/game/deckview/deck_view_container.cpp
+++ b/cockatrice/src/game/deckview/deck_view_container.cpp
@@ -1,7 +1,5 @@
 #include "deck_view_container.h"
 
-#include "../../tabs/tab_game.h"
-#include "../../picture_loader/picture_loader.h"
 #include "../../database/card_database.h"
 #include "../../database/card_database_manager.h"
 #include "../../deck/deck_loader.h"
@@ -9,8 +7,10 @@
 #include "../../dialogs/dlg_load_deck_from_clipboard.h"
 #include "../../dialogs/dlg_load_deck_from_website.h"
 #include "../../dialogs/dlg_load_remote_deck.h"
+#include "../../picture_loader/picture_loader.h"
 #include "../../server/pending_command.h"
 #include "../../settings/cache_settings.h"
+#include "../../tabs/tab_game.h"
 #include "../game_scene.h"
 #include "deck_view.h"
 #include "pb/command_deck_select.pb.h"
diff --git a/cockatrice/src/game/dialogs/dlg_create_token.cpp b/cockatrice/src/game/dialogs/dlg_create_token.cpp
index 44e3b5329..132ee988c 100644
--- a/cockatrice/src/game/dialogs/dlg_create_token.cpp
+++ b/cockatrice/src/game/dialogs/dlg_create_token.cpp
@@ -1,8 +1,8 @@
 #include "dlg_create_token.h"
 
-#include "../../interface/widgets/cards/card_info_picture_widget.h"
 #include "../../database/card_database_manager.h"
 #include "../../database/card_database_model.h"
+#include "../../interface/widgets/cards/card_info_picture_widget.h"
 #include "../../main.h"
 #include "../../settings/cache_settings.h"
 #include "deck_list.h"
diff --git a/cockatrice/src/game/game_event_handler.cpp b/cockatrice/src/game/game_event_handler.cpp
index 18c445a2c..ef5ca96db 100644
--- a/cockatrice/src/game/game_event_handler.cpp
+++ b/cockatrice/src/game/game_event_handler.cpp
@@ -1,8 +1,8 @@
 #include "game_event_handler.h"
 
-#include "../tabs/tab_game.h"
 #include "../server/abstract_client.h"
 #include "../server/pending_command.h"
+#include "../tabs/tab_game.h"
 #include "abstract_game.h"
 #include "get_pb_extension.h"
 #include "log/message_log_widget.h"
diff --git a/cockatrice/src/game/game_scene.cpp b/cockatrice/src/game/game_scene.cpp
index 67f2c822a..f0e82532b 100644
--- a/cockatrice/src/game/game_scene.cpp
+++ b/cockatrice/src/game/game_scene.cpp
@@ -1,8 +1,8 @@
 #include "game_scene.h"
 
-#include "phases_toolbar.h"
 #include "../settings/cache_settings.h"
 #include "board/card_item.h"
+#include "phases_toolbar.h"
 #include "player/player.h"
 #include "player/player_graphics_item.h"
 #include "zones/view_zone.h"
diff --git a/cockatrice/src/game/log/message_log_widget.cpp b/cockatrice/src/game/log/message_log_widget.cpp
index d3c0929a6..ed8a4e49c 100644
--- a/cockatrice/src/game/log/message_log_widget.cpp
+++ b/cockatrice/src/game/log/message_log_widget.cpp
@@ -1,10 +1,10 @@
 #include "message_log_widget.h"
 
 #include "../../client/sound_engine.h"
-#include "../../tabs/tab_game.h"
-#include "../board/translate_counter_name.h"
 #include "../../settings/card_counter_settings.h"
+#include "../../tabs/tab_game.h"
 #include "../board/card_item.h"
+#include "../board/translate_counter_name.h"
 #include "../phase.h"
 #include "../player/player.h"
 #include "../zones/card_zone.h"
diff --git a/cockatrice/src/game/phases_toolbar.cpp b/cockatrice/src/game/phases_toolbar.cpp
index 7a4f47c58..2fef5321c 100644
--- a/cockatrice/src/game/phases_toolbar.cpp
+++ b/cockatrice/src/game/phases_toolbar.cpp
@@ -1,10 +1,10 @@
 #include "phases_toolbar.h"
 
+#include "../interface/pixel_map_generator.h"
 #include "pb/command_draw_cards.pb.h"
 #include "pb/command_next_turn.pb.h"
 #include "pb/command_set_active_phase.pb.h"
 #include "pb/command_set_card_attr.pb.h"
-#include "../interface/pixel_map_generator.h"
 
 #include <QAction>
 #include <QDebug>
diff --git a/cockatrice/src/game/player/menu/card_menu.cpp b/cockatrice/src/game/player/menu/card_menu.cpp
index bcc0a6b26..114655cb8 100644
--- a/cockatrice/src/game/player/menu/card_menu.cpp
+++ b/cockatrice/src/game/player/menu/card_menu.cpp
@@ -1,8 +1,8 @@
 #include "card_menu.h"
 
-#include "../../../tabs/tab_game.h"
 #include "../../../database/card_database_manager.h"
 #include "../../../settings/card_counter_settings.h"
+#include "../../../tabs/tab_game.h"
 #include "../../board/card_item.h"
 #include "../../zones/logic/view_zone_logic.h"
 #include "../card_menu_action_type.h"
diff --git a/cockatrice/src/game/player/menu/player_menu.cpp b/cockatrice/src/game/player/menu/player_menu.cpp
index 7def59c8d..4d3f12510 100644
--- a/cockatrice/src/game/player/menu/player_menu.cpp
+++ b/cockatrice/src/game/player/menu/player_menu.cpp
@@ -1,8 +1,8 @@
 #include "player_menu.h"
 
-#include "../../../tabs/tab_game.h"
 #include "../../../common/pb/command_reveal_cards.pb.h"
 #include "../../../database/card_database_manager.h"
+#include "../../../tabs/tab_game.h"
 #include "../../board/card_item.h"
 #include "../../zones/hand_zone.h"
 #include "../card_menu_action_type.h"
diff --git a/cockatrice/src/game/player/player.cpp b/cockatrice/src/game/player/player.cpp
index d1f1a9c2d..b7faa0868 100644
--- a/cockatrice/src/game/player/player.cpp
+++ b/cockatrice/src/game/player/player.cpp
@@ -1,7 +1,7 @@
 #include "player.h"
 
-#include "../../tabs/tab_game.h"
 #include "../../interface/theme_manager.h"
+#include "../../tabs/tab_game.h"
 #include "../board/arrow_item.h"
 #include "../board/card_item.h"
 #include "../board/card_list.h"
diff --git a/cockatrice/src/game/player/player.h b/cockatrice/src/game/player/player.h
index 7e4a8ef40..7226f165b 100644
--- a/cockatrice/src/game/player/player.h
+++ b/cockatrice/src/game/player/player.h
@@ -2,10 +2,10 @@
 #define PLAYER_H
 
 #include "../../card/card_info.h"
-#include "../../interface/tearoff_menu.h"
-#include "../dialogs/dlg_create_token.h"
 #include "../../filters/filter_string.h"
+#include "../../interface/tearoff_menu.h"
 #include "../board/abstract_graphics_item.h"
+#include "../dialogs/dlg_create_token.h"
 #include "menu/player_menu.h"
 #include "pb/card_attributes.pb.h"
 #include "pb/game_event.pb.h"
diff --git a/cockatrice/src/game/player/player_actions.cpp b/cockatrice/src/game/player/player_actions.cpp
index bf9feab2c..e7b50dac0 100644
--- a/cockatrice/src/game/player/player_actions.cpp
+++ b/cockatrice/src/game/player/player_actions.cpp
@@ -2,11 +2,11 @@
 
 #include "../../../common/pb/context_move_card.pb.h"
 #include "../../client/get_text_with_max.h"
-#include "../../tabs/tab_game.h"
 #include "../../database/card_database_manager.h"
+#include "../../tabs/tab_game.h"
+#include "../board/card_item.h"
 #include "../dialogs/dlg_move_top_cards_until.h"
 #include "../dialogs/dlg_roll_dice.h"
-#include "../board/card_item.h"
 #include "../zones/logic/view_zone_logic.h"
 #include "card_menu_action_type.h"
 #include "pb/command_attach_card.pb.h"
diff --git a/cockatrice/src/game/player/player_list_widget.cpp b/cockatrice/src/game/player/player_list_widget.cpp
index 8da318325..9df7e94da 100644
--- a/cockatrice/src/game/player/player_list_widget.cpp
+++ b/cockatrice/src/game/player/player_list_widget.cpp
@@ -1,13 +1,13 @@
 #include "player_list_widget.h"
 
-#include "../../tabs/tab_account.h"
-#include "../../tabs/tab_game.h"
-#include "../../tabs/tab_supervisor.h"
 #include "../../interface/pixel_map_generator.h"
 #include "../../server/abstract_client.h"
 #include "../../server/user/user_context_menu.h"
 #include "../../server/user/user_list_manager.h"
 #include "../../server/user/user_list_widget.h"
+#include "../../tabs/tab_account.h"
+#include "../../tabs/tab_game.h"
+#include "../../tabs/tab_supervisor.h"
 #include "pb/command_kick_from_game.pb.h"
 #include "pb/serverinfo_playerproperties.pb.h"
 #include "pb/session_commands.pb.h"
diff --git a/cockatrice/src/game/zones/view_zone_widget.cpp b/cockatrice/src/game/zones/view_zone_widget.cpp
index 2bf45acb5..f0615d256 100644
--- a/cockatrice/src/game/zones/view_zone_widget.cpp
+++ b/cockatrice/src/game/zones/view_zone_widget.cpp
@@ -1,7 +1,7 @@
 #include "view_zone_widget.h"
 
-#include "../../interface/pixel_map_generator.h"
 #include "../../filters/syntax_help.h"
+#include "../../interface/pixel_map_generator.h"
 #include "../../settings/cache_settings.h"
 #include "../board/card_item.h"
 #include "../game_scene.h"
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp
index c2588fe47..02ba37b74 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp
@@ -1,7 +1,7 @@
 #include "card_info_picture_enlarged_widget.h"
 
-#include "../../../settings/cache_settings.h"
 #include "../../../picture_loader/picture_loader.h"
+#include "../../../settings/cache_settings.h"
 
 #include <QPainterPath>
 #include <QStylePainter>
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp
index 75261767f..7ca14d490 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp
@@ -2,9 +2,9 @@
 
 #include "../../../database/card_database_manager.h"
 #include "../../../game/board/card_item.h"
+#include "../../../picture_loader/picture_loader.h"
 #include "../../../settings/cache_settings.h"
 #include "../../../tabs/tab_supervisor.h"
-#include "../../../picture_loader/picture_loader.h"
 #include "../../window_main.h"
 
 #include <QMenu>
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h
index 08bf03a0e..40bd95062 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h
@@ -3,8 +3,8 @@
 
 #include "../../../database/card_database_model.h"
 #include "../../../deck/custom_line_edit.h"
-#include "../../../utility/key_signals.h"
 #include "../../../tabs/abstract_tab_deck_editor.h"
+#include "../../../utility/key_signals.h"
 
 #include <QHBoxLayout>
 #include <QWidget>
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h
index 44fcb0e85..2fbea169a 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h
@@ -3,8 +3,8 @@
 
 #include "../../../card/card_info.h"
 #include "../../../deck/custom_line_edit.h"
-#include "../../../utility/key_signals.h"
 #include "../../../tabs/abstract_tab_deck_editor.h"
+#include "../../../utility/key_signals.h"
 #include "../visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h"
 
 #include <QComboBox>
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h
index 9d1a18267..25c2d79e2 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h
@@ -1,8 +1,8 @@
 #ifndef DECK_EDITOR_FILTER_DOCK_WIDGET_H
 #define DECK_EDITOR_FILTER_DOCK_WIDGET_H
 
-#include "../../../utility/key_signals.h"
 #include "../../../tabs/abstract_tab_deck_editor.h"
+#include "../../../utility/key_signals.h"
 
 #include <QDockWidget>
 #include <QTreeView>
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp
index 2c9c4fb95..e49fd2c9d 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp
@@ -1,8 +1,8 @@
 #include "printing_selector.h"
 
 #include "../../../dialogs/dlg_select_set_for_cards.h"
-#include "../../../settings/cache_settings.h"
 #include "../../../picture_loader/picture_loader.h"
+#include "../../../settings/cache_settings.h"
 #include "printing_selector_card_display_widget.h"
 #include "printing_selector_card_search_widget.h"
 #include "printing_selector_card_selection_widget.h"
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h
index d524c4b28..d981f5f9a 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h
@@ -2,9 +2,9 @@
 #define PRINTING_SELECTOR_CARD_OVERLAY_WIDGET_H
 
 #include "../../../card/card_info.h"
-#include "../cards/card_info_picture_widget.h"
 #include "../../../deck/deck_list_model.h"
 #include "../../../tabs/abstract_tab_deck_editor.h"
+#include "../cards/card_info_picture_widget.h"
 #include "all_zones_card_amount_widget.h"
 #include "card_amount_widget.h"
 #include "set_name_and_collectors_number_display_widget.h"
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h
index 5bced1d8e..ea9deebc0 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h
@@ -6,8 +6,8 @@
 #include "../../../deck/custom_line_edit.h"
 #include "../../../deck/deck_list_model.h"
 #include "../../../filters/filter_tree_model.h"
-#include "../../../utility/key_signals.h"
 #include "../../../tabs/abstract_tab_deck_editor.h"
+#include "../../../utility/key_signals.h"
 #include "../../layouts/flow_layout.h"
 #include "../cards/card_info_picture_with_text_overlay_widget.h"
 #include "../cards/card_size_widget.h"
diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h
index 8eb6b9afe..4688c6ac4 100644
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h
@@ -1,8 +1,8 @@
 #ifndef VISUAL_DECK_EDITOR_SAMPLE_HAND_WIDGET_H
 #define VISUAL_DECK_EDITOR_SAMPLE_HAND_WIDGET_H
 
-#include "../cards/card_size_widget.h"
 #include "../../../deck/deck_list_model.h"
+#include "../cards/card_size_widget.h"
 #include "../general/layout_containers/flow_widget.h"
 
 #include <QPushButton>
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h
index 1b1899c2d..13323c326 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h
@@ -2,8 +2,8 @@
 #define VISUAL_DECK_STORAGE_WIDGET_H
 
 #include "../../../deck/deck_list_model.h"
-#include "../general/layout_containers/flow_widget.h"
 #include "../cards/card_size_widget.h"
+#include "../general/layout_containers/flow_widget.h"
 #include "../quick_settings/settings_button_widget.h"
 #include "deck_preview/deck_preview_color_identity_filter_widget.h"
 #include "deck_preview/deck_preview_widget.h"
diff --git a/cockatrice/src/interface/window_main.cpp b/cockatrice/src/interface/window_main.cpp
index 6d212b79c..7b5746520 100644
--- a/cockatrice/src/interface/window_main.cpp
+++ b/cockatrice/src/interface/window_main.cpp
@@ -19,6 +19,9 @@
  ***************************************************************************/
 #include "window_main.h"
 
+#include "../client/get_text_with_max.h"
+#include "../client/network/client_update_checker.h"
+#include "../client/network/release_channel.h"
 #include "../database/card_database.h"
 #include "../database/card_database_manager.h"
 #include "../dialogs/dlg_connect.h"
@@ -39,12 +42,9 @@
 #include "../server/local_server_interface.h"
 #include "../server/remote/remote_client.h"
 #include "../settings/cache_settings.h"
-#include "../utility/logger.h"
-#include "../client/get_text_with_max.h"
-#include "../client/network/client_update_checker.h"
-#include "../client/network/release_channel.h"
 #include "../tabs/tab_game.h"
 #include "../tabs/tab_supervisor.h"
+#include "../utility/logger.h"
 #include "pb/event_connection_closed.pb.h"
 #include "pb/event_server_shutdown.pb.h"
 #include "pb/game_replay.pb.h"
diff --git a/cockatrice/src/server/chat_view/chat_view.cpp b/cockatrice/src/server/chat_view/chat_view.cpp
index af570cc20..b6a6b3f98 100644
--- a/cockatrice/src/server/chat_view/chat_view.cpp
+++ b/cockatrice/src/server/chat_view/chat_view.cpp
@@ -1,9 +1,9 @@
 #include "chat_view.h"
 
 #include "../../client/sound_engine.h"
-#include "../../tabs/tab_account.h"
 #include "../../interface/pixel_map_generator.h"
 #include "../../settings/cache_settings.h"
+#include "../../tabs/tab_account.h"
 #include "../user/user_context_menu.h"
 #include "../user/user_list_manager.h"
 #include "../user/user_list_proxy.h"
diff --git a/cockatrice/src/server/game_selector.cpp b/cockatrice/src/server/game_selector.cpp
index 80be4c9d6..3cfd3315a 100644
--- a/cockatrice/src/server/game_selector.cpp
+++ b/cockatrice/src/server/game_selector.cpp
@@ -1,19 +1,19 @@
 #include "game_selector.h"
 
 #include "../client/get_text_with_max.h"
+#include "../dialogs/dlg_create_game.h"
+#include "../dialogs/dlg_filter_games.h"
 #include "../tabs/tab_account.h"
 #include "../tabs/tab_game.h"
 #include "../tabs/tab_room.h"
 #include "../tabs/tab_supervisor.h"
-#include "../dialogs/dlg_create_game.h"
-#include "../dialogs/dlg_filter_games.h"
 #include "abstract_client.h"
-#include "pending_command.h"
-#include "user/user_list_manager.h"
 #include "games_model.h"
 #include "pb/response.pb.h"
 #include "pb/room_commands.pb.h"
 #include "pb/serverinfo_game.pb.h"
+#include "pending_command.h"
+#include "user/user_list_manager.h"
 
 #include <QApplication>
 #include <QCheckBox>
diff --git a/cockatrice/src/server/games_model.cpp b/cockatrice/src/server/games_model.cpp
index 96651a063..5c336738c 100644
--- a/cockatrice/src/server/games_model.cpp
+++ b/cockatrice/src/server/games_model.cpp
@@ -1,11 +1,11 @@
 #include "games_model.h"
 
-#include "../tabs/tab_account.h"
 #include "../interface/pixel_map_generator.h"
+#include "../settings/cache_settings.h"
+#include "../tabs/tab_account.h"
+#include "pb/serverinfo_game.pb.h"
 #include "user/user_list_manager.h"
 #include "user/user_list_widget.h"
-#include "../settings/cache_settings.h"
-#include "pb/serverinfo_game.pb.h"
 
 #include <QDateTime>
 #include <QDebug>
diff --git a/cockatrice/src/server/user/user_context_menu.cpp b/cockatrice/src/server/user/user_context_menu.cpp
index b1941941a..c6782ef18 100644
--- a/cockatrice/src/server/user/user_context_menu.cpp
+++ b/cockatrice/src/server/user/user_context_menu.cpp
@@ -3,9 +3,9 @@
 #include "../../tabs/tab_account.h"
 #include "../../tabs/tab_game.h"
 #include "../../tabs/tab_supervisor.h"
-#include "../game_selector.h"
 #include "../abstract_client.h"
 #include "../chat_view/chat_view.h"
+#include "../game_selector.h"
 #include "../pending_command.h"
 #include "pb/command_kick_from_game.pb.h"
 #include "pb/commands.pb.h"
diff --git a/cockatrice/src/server/user/user_info_box.cpp b/cockatrice/src/server/user/user_info_box.cpp
index 5592c8391..cec0c38e8 100644
--- a/cockatrice/src/server/user/user_info_box.cpp
+++ b/cockatrice/src/server/user/user_info_box.cpp
@@ -1,10 +1,10 @@
 #include "user_info_box.h"
 
 #include "../../client/get_text_with_max.h"
-#include "../../interface/pixel_map_generator.h"
 #include "../../dialogs/dlg_edit_avatar.h"
 #include "../../dialogs/dlg_edit_password.h"
 #include "../../dialogs/dlg_edit_user.h"
+#include "../../interface/pixel_map_generator.h"
 #include "../abstract_client.h"
 #include "../pending_command.h"
 #include "passwordhasher.h"
diff --git a/cockatrice/src/server/user/user_list_widget.cpp b/cockatrice/src/server/user/user_list_widget.cpp
index ddec2f841..d4dad5919 100644
--- a/cockatrice/src/server/user/user_list_widget.cpp
+++ b/cockatrice/src/server/user/user_list_widget.cpp
@@ -1,11 +1,10 @@
 #include "user_list_widget.h"
 
+#include "../../interface/pixel_map_generator.h"
 #include "../../tabs/tab_account.h"
 #include "../../tabs/tab_supervisor.h"
-#include "../../interface/pixel_map_generator.h"
-#include "../game_selector.h"
-#include "user_list_manager.h"
 #include "../abstract_client.h"
+#include "../game_selector.h"
 #include "../pending_command.h"
 #include "pb/moderator_commands.pb.h"
 #include "pb/response_get_games_of_user.pb.h"
@@ -13,6 +12,7 @@
 #include "pb/session_commands.pb.h"
 #include "trice_limits.h"
 #include "user_context_menu.h"
+#include "user_list_manager.h"
 
 #include <QApplication>
 #include <QCheckBox>
diff --git a/cockatrice/src/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/tabs/abstract_tab_deck_editor.cpp
index 210394a13..f5717cd85 100644
--- a/cockatrice/src/tabs/abstract_tab_deck_editor.cpp
+++ b/cockatrice/src/tabs/abstract_tab_deck_editor.cpp
@@ -1,18 +1,18 @@
 #include "abstract_tab_deck_editor.h"
 
 #include "../client/tapped_out_interface.h"
-#include "../interface/widgets/cards/card_info_frame_widget.h"
 #include "../database/card_database_manager.h"
 #include "../database/card_database_model.h"
 #include "../deck/deck_stats_interface.h"
 #include "../dialogs/dlg_load_deck.h"
 #include "../dialogs/dlg_load_deck_from_clipboard.h"
 #include "../dialogs/dlg_load_deck_from_website.h"
+#include "../interface/pixel_map_generator.h"
+#include "../interface/widgets/cards/card_info_frame_widget.h"
+#include "../picture_loader/picture_loader.h"
 #include "../server/abstract_client.h"
 #include "../server/pending_command.h"
 #include "../settings/cache_settings.h"
-#include "../picture_loader/picture_loader.h"
-#include "../interface/pixel_map_generator.h"
 #include "pb/command_deck_upload.pb.h"
 #include "pb/response.pb.h"
 #include "tab_supervisor.h"
diff --git a/cockatrice/src/tabs/tab_account.cpp b/cockatrice/src/tabs/tab_account.cpp
index aaef525cc..ba82857fe 100644
--- a/cockatrice/src/tabs/tab_account.cpp
+++ b/cockatrice/src/tabs/tab_account.cpp
@@ -1,12 +1,12 @@
 #include "tab_account.h"
 
+#include "../client/sound_engine.h"
 #include "../deck/custom_line_edit.h"
 #include "../server/abstract_client.h"
 #include "../server/pending_command.h"
 #include "../server/user/user_info_box.h"
 #include "../server/user/user_list_manager.h"
 #include "../server/user/user_list_widget.h"
-#include "../client/sound_engine.h"
 #include "pb/event_add_to_list.pb.h"
 #include "pb/event_remove_from_list.pb.h"
 #include "pb/event_user_joined.pb.h"
diff --git a/cockatrice/src/tabs/tab_deck_editor.cpp b/cockatrice/src/tabs/tab_deck_editor.cpp
index 2dc791265..e6e0258d4 100644
--- a/cockatrice/src/tabs/tab_deck_editor.cpp
+++ b/cockatrice/src/tabs/tab_deck_editor.cpp
@@ -1,19 +1,19 @@
 #include "tab_deck_editor.h"
 
+#include "../client/deck_editor_menu.h"
 #include "../client/tapped_out_interface.h"
-#include "../interface/widgets/cards/card_info_frame_widget.h"
 #include "../database/card_database_manager.h"
 #include "../database/card_database_model.h"
 #include "../dialogs/dlg_load_deck.h"
 #include "../dialogs/dlg_load_deck_from_clipboard.h"
 #include "../filters/filter_builder.h"
 #include "../filters/filter_tree_model.h"
+#include "../interface/pixel_map_generator.h"
+#include "../interface/widgets/cards/card_info_frame_widget.h"
+#include "../interface/widgets/deck_editor/deck_editor_filter_dock_widget.h"
 #include "../server/abstract_client.h"
 #include "../server/pending_command.h"
 #include "../settings/cache_settings.h"
-#include "../client/deck_editor_menu.h"
-#include "../interface/pixel_map_generator.h"
-#include "../interface/widgets/deck_editor/deck_editor_filter_dock_widget.h"
 #include "tab_supervisor.h"
 #include "trice_limits.h"
 
diff --git a/cockatrice/src/tabs/tab_deck_editor.h b/cockatrice/src/tabs/tab_deck_editor.h
index b4f966843..078560da1 100644
--- a/cockatrice/src/tabs/tab_deck_editor.h
+++ b/cockatrice/src/tabs/tab_deck_editor.h
@@ -2,8 +2,8 @@
 #define WINDOW_DECKEDITOR_H
 
 #include "../card/card_info.h"
-#include "../utility/key_signals.h"
 #include "../interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h"
+#include "../utility/key_signals.h"
 #include "abstract_tab_deck_editor.h"
 
 class CardDatabaseModel;
diff --git a/cockatrice/src/tabs/tab_deck_storage.cpp b/cockatrice/src/tabs/tab_deck_storage.cpp
index 5d762f31a..898612e6f 100644
--- a/cockatrice/src/tabs/tab_deck_storage.cpp
+++ b/cockatrice/src/tabs/tab_deck_storage.cpp
@@ -1,10 +1,10 @@
 #include "tab_deck_storage.h"
 
+#include "../client/get_text_with_max.h"
 #include "../deck/deck_loader.h"
 #include "../server/pending_command.h"
 #include "../server/remote/remote_decklist_tree_widget.h"
 #include "../settings/cache_settings.h"
-#include "../client/get_text_with_max.h"
 #include "deck_list.h"
 #include "pb/command_deck_del.pb.h"
 #include "pb/command_deck_del_dir.pb.h"
diff --git a/cockatrice/src/tabs/tab_game.cpp b/cockatrice/src/tabs/tab_game.cpp
index 840775da9..c8ea5e7fe 100644
--- a/cockatrice/src/tabs/tab_game.cpp
+++ b/cockatrice/src/tabs/tab_game.cpp
@@ -1,6 +1,6 @@
 #include "tab_game.h"
 
-#include "../interface/widgets/cards/card_info_frame_widget.h"
+#include "../client/network/replay_timeline_widget.h"
 #include "../database/card_database.h"
 #include "../database/card_database_manager.h"
 #include "../dialogs/dlg_create_game.h"
@@ -12,19 +12,19 @@
 #include "../game/game_scene.h"
 #include "../game/game_view.h"
 #include "../game/log/message_log_widget.h"
+#include "../game/phases_toolbar.h"
 #include "../game/player/player.h"
 #include "../game/player/player_list_widget.h"
 #include "../game/replay.h"
 #include "../game/zones/card_zone.h"
+#include "../interface/line_edit_completer.h"
+#include "../interface/widgets/cards/card_info_frame_widget.h"
+#include "../interface/window_main.h"
 #include "../main.h"
+#include "../picture_loader/picture_loader.h"
 #include "../server/abstract_client.h"
 #include "../server/user/user_list_manager.h"
 #include "../settings/cache_settings.h"
-#include "../client/network/replay_timeline_widget.h"
-#include "../interface/line_edit_completer.h"
-#include "../game/phases_toolbar.h"
-#include "../picture_loader/picture_loader.h"
-#include "../interface/window_main.h"
 #include "pb/event_game_joined.pb.h"
 #include "pb/game_replay.pb.h"
 #include "pb/serverinfo_player.pb.h"
diff --git a/cockatrice/src/tabs/tab_game.h b/cockatrice/src/tabs/tab_game.h
index f036f8d42..660e64506 100644
--- a/cockatrice/src/tabs/tab_game.h
+++ b/cockatrice/src/tabs/tab_game.h
@@ -1,11 +1,11 @@
 #ifndef TAB_GAME_H
 #define TAB_GAME_H
 
-#include "../interface/tearoff_menu.h"
+#include "../client/replay_manager.h"
 #include "../game/abstract_game.h"
 #include "../game/log/message_log_widget.h"
 #include "../game/player/player.h"
-#include "../client/replay_manager.h"
+#include "../interface/tearoff_menu.h"
 #include "../interface/widgets/visual_deck_storage/visual_deck_storage_widget.h"
 #include "pb/event_leave.pb.h"
 #include "tab.h"
diff --git a/cockatrice/src/tabs/tab_home.h b/cockatrice/src/tabs/tab_home.h
index 7a6aee3ff..d2cacb65d 100644
--- a/cockatrice/src/tabs/tab_home.h
+++ b/cockatrice/src/tabs/tab_home.h
@@ -1,8 +1,8 @@
 #ifndef TAB_HOME_H
 #define TAB_HOME_H
 
-#include "../server/abstract_client.h"
 #include "../interface/widgets/general/home_widget.h"
+#include "../server/abstract_client.h"
 #include "tab.h"
 
 #include <QHBoxLayout>
diff --git a/cockatrice/src/tabs/tab_message.cpp b/cockatrice/src/tabs/tab_message.cpp
index 30267e035..6b4b7044b 100644
--- a/cockatrice/src/tabs/tab_message.cpp
+++ b/cockatrice/src/tabs/tab_message.cpp
@@ -1,5 +1,6 @@
 #include "tab_message.h"
 
+#include "../client/sound_engine.h"
 #include "../deck/custom_line_edit.h"
 #include "../main.h"
 #include "../server/abstract_client.h"
@@ -7,7 +8,6 @@
 #include "../server/pending_command.h"
 #include "../server/user/user_list_manager.h"
 #include "../settings/cache_settings.h"
-#include "../client/sound_engine.h"
 #include "pb/event_user_message.pb.h"
 #include "pb/serverinfo_user.pb.h"
 #include "pb/session_commands.pb.h"
diff --git a/cockatrice/src/tabs/tab_room.cpp b/cockatrice/src/tabs/tab_room.cpp
index d0d1542bb..ff6507b29 100644
--- a/cockatrice/src/tabs/tab_room.cpp
+++ b/cockatrice/src/tabs/tab_room.cpp
@@ -1,10 +1,10 @@
 #include "tab_room.h"
 
 #include "../dialogs/dlg_settings.h"
-#include "../server/game_selector.h"
 #include "../main.h"
 #include "../server/abstract_client.h"
 #include "../server/chat_view/chat_view.h"
+#include "../server/game_selector.h"
 #include "../server/pending_command.h"
 #include "../server/user/user_list_manager.h"
 #include "../server/user/user_list_widget.h"
diff --git a/cockatrice/src/tabs/tab_supervisor.cpp b/cockatrice/src/tabs/tab_supervisor.cpp
index 8f77e6625..78fce4516 100644
--- a/cockatrice/src/tabs/tab_supervisor.cpp
+++ b/cockatrice/src/tabs/tab_supervisor.cpp
@@ -1,11 +1,11 @@
 #include "tab_supervisor.h"
 
+#include "../interface/pixel_map_generator.h"
 #include "../main.h"
 #include "../server/abstract_client.h"
 #include "../server/user/user_list_manager.h"
 #include "../server/user/user_list_widget.h"
 #include "../settings/cache_settings.h"
-#include "../interface/pixel_map_generator.h"
 #include "api/edhrec/tab_edhrec_main.h"
 #include "pb/event_game_joined.pb.h"
 #include "pb/event_notify_user.pb.h"
diff --git a/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp b/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
index 9db1b5d21..502ef09e1 100644
--- a/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
+++ b/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
@@ -4,12 +4,12 @@
 #include "../../deck/deck_list_model.h"
 #include "../../deck/deck_stats_interface.h"
 #include "../../filters/filter_builder.h"
-#include "../../server/pending_command.h"
-#include "../../settings/cache_settings.h"
 #include "../../interface/pixel_map_generator.h"
 #include "../../interface/widgets/cards/card_info_frame_widget.h"
 #include "../../interface/widgets/deck_analytics/deck_analytics_widget.h"
 #include "../../interface/widgets/visual_deck_editor/visual_deck_editor_widget.h"
+#include "../../server/pending_command.h"
+#include "../../settings/cache_settings.h"
 #include "../tab_deck_editor.h"
 #include "../tab_supervisor.h"
 #include "pb/command_deck_upload.pb.h"
diff --git a/cockatrice/src/utility/deck_list_sort_filter_proxy_model.cpp b/cockatrice/src/utility/deck_list_sort_filter_proxy_model.cpp
index 0a6a178d5..65d7d17e7 100644
--- a/cockatrice/src/utility/deck_list_sort_filter_proxy_model.cpp
+++ b/cockatrice/src/utility/deck_list_sort_filter_proxy_model.cpp
@@ -1,55 +1,55 @@
 #include "deck_list_sort_filter_proxy_model.h"
+
 #include "../deck/deck_list_model.h"
 
-    bool DeckListSortFilterProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
-    {
-        auto *src = sourceModel();
+bool DeckListSortFilterProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
+{
+    auto *src = sourceModel();
 
-        // Inner nodes? -> sort alphabetically by column 1
-        bool leftIsCard = src->data(left, Qt::UserRole + 1).toBool();
-        bool rightIsCard = src->data(right, Qt::UserRole + 1).toBool();
+    // Inner nodes? -> sort alphabetically by column 1
+    bool leftIsCard = src->data(left, Qt::UserRole + 1).toBool();
+    bool rightIsCard = src->data(right, Qt::UserRole + 1).toBool();
 
-        if (!leftIsCard || !rightIsCard) {
-            QString lName = src->data(left.siblingAtColumn(1), Qt::EditRole).toString();
-            QString rName = src->data(right.siblingAtColumn(1), Qt::EditRole).toString();
-            return lName.localeAwareCompare(rName) < 0;
-        }
-
-        // Both are cards -> apply sort criteria
-        auto *lNode = static_cast<DecklistModelCardNode *>(left.internalPointer());
-        auto *rNode = static_cast<DecklistModelCardNode *>(right.internalPointer());
-
-        CardInfoPtr lInfo = CardDatabaseManager::getInstance()->guessCard({lNode->getName()}).getCardPtr();
-        CardInfoPtr rInfo = CardDatabaseManager::getInstance()->guessCard({rNode->getName()}).getCardPtr();
-
-        // Example: multiple tie-break criteria (colors > cmc > name)
-        for (const QString &crit : sortCriteria) {
-            if (crit == "name") {
-                QString ln = lNode->getName();
-                QString rn = rNode->getName();
-                int cmp = ln.localeAwareCompare(rn);
-                if (cmp != 0)
-                    return cmp < 0;
-            } else if (crit == "cmc") {
-                int lc = lInfo ? lInfo->getCmc().toInt() : 0;
-                int rc = rInfo ? rInfo->getCmc().toInt() : 0;
-                if (lc != rc)
-                    return lc < rc;
-            } else if (crit == "colors") {
-                QString lr = lInfo ? lInfo->getColors() : QString();
-                QString rr = rInfo ? rInfo->getColors() : QString();
-                int cmp = lr.localeAwareCompare(rr);
-                if (cmp != 0)
-                    return cmp < 0;
-            } else if (crit == "maintype") {
-                QString lr = lInfo ? lInfo->getMainCardType() : QString();
-                QString rr = rInfo ? rInfo->getMainCardType() : QString();
-                int cmp = lr.localeAwareCompare(rr);
-                if (cmp != 0)
-                    return cmp < 0;
-            }
-        }
-
-        return false;
+    if (!leftIsCard || !rightIsCard) {
+        QString lName = src->data(left.siblingAtColumn(1), Qt::EditRole).toString();
+        QString rName = src->data(right.siblingAtColumn(1), Qt::EditRole).toString();
+        return lName.localeAwareCompare(rName) < 0;
     }
 
+    // Both are cards -> apply sort criteria
+    auto *lNode = static_cast<DecklistModelCardNode *>(left.internalPointer());
+    auto *rNode = static_cast<DecklistModelCardNode *>(right.internalPointer());
+
+    CardInfoPtr lInfo = CardDatabaseManager::getInstance()->guessCard({lNode->getName()}).getCardPtr();
+    CardInfoPtr rInfo = CardDatabaseManager::getInstance()->guessCard({rNode->getName()}).getCardPtr();
+
+    // Example: multiple tie-break criteria (colors > cmc > name)
+    for (const QString &crit : sortCriteria) {
+        if (crit == "name") {
+            QString ln = lNode->getName();
+            QString rn = rNode->getName();
+            int cmp = ln.localeAwareCompare(rn);
+            if (cmp != 0)
+                return cmp < 0;
+        } else if (crit == "cmc") {
+            int lc = lInfo ? lInfo->getCmc().toInt() : 0;
+            int rc = rInfo ? rInfo->getCmc().toInt() : 0;
+            if (lc != rc)
+                return lc < rc;
+        } else if (crit == "colors") {
+            QString lr = lInfo ? lInfo->getColors() : QString();
+            QString rr = rInfo ? rInfo->getColors() : QString();
+            int cmp = lr.localeAwareCompare(rr);
+            if (cmp != 0)
+                return cmp < 0;
+        } else if (crit == "maintype") {
+            QString lr = lInfo ? lInfo->getMainCardType() : QString();
+            QString rr = rInfo ? rInfo->getMainCardType() : QString();
+            int cmp = lr.localeAwareCompare(rr);
+            if (cmp != 0)
+                return cmp < 0;
+        }
+    }
+
+    return false;
+}