[Settings] Split cache_settings monolith into multiple SettingsManager sub-classes (#7050)

* [Settings] Split cache_settings into multiple files

Took 9 minutes

Took 4 minutes

* [Settings] Fwd declare settings classes in cache_settings

Took 15 minutes

* Fix oracle includes.

Took 8 minutes

* Address comments, fix windows CI

Took 8 minutes

* fix copy constructor visibility

Took 3 minutes

* lint

Took 2 minutes

* Fix native format tests.

Took 5 minutes

* Remove test header guard

Took 4 seconds

* Remove tests invalid in CI environ

Took 24 seconds

* Adjust to rebase.

Took 11 minutes

* Change settings file name.

Took 8 minutes

---------

Co-authored-by: Lukas Brübach <lukas.bruebach@bdosecurity.de>
Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>

cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp

@@ -14,6 +14,7 @@
 #include <QThread>
 #include <libcockatrice/network/client/remote/remote_client.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
+#include <libcockatrice/settings/servers_settings.h>
 
 ConnectionController::ConnectionController(QWidget *dialogParent, QObject *parent)
     : QObject(parent), dialogParent(dialogParent)

cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp

@@ -14,6 +14,8 @@
 #include <QtConcurrent>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/settings/paths_settings.h>
+#include <libcockatrice/settings/personal_settings.h>
 #include <version_string.h>
 
 #define SPOILERS_STATUS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/SpoilerSeasonEnabled"
@@ -21,7 +23,7 @@
 
 SpoilerBackgroundUpdater::SpoilerBackgroundUpdater(QObject *apParent) : QObject(apParent), cardUpdateProcess(nullptr)
 {
-    isSpoilerDownloadEnabled = SettingsCache::instance().getDownloadSpoilersStatus();
+    isSpoilerDownloadEnabled = SettingsCache::instance().personal().getDownloadSpoilersStatus();
     if (isSpoilerDownloadEnabled) {
         // Start the process of checking if we're in spoiler season
         // File exists means we're in spoiler season
@@ -75,7 +77,7 @@ void SpoilerBackgroundUpdater::actDownloadFinishedSpoilersFile()
 
 bool SpoilerBackgroundUpdater::deleteSpoilerFile()
 {
-    QString fileName = SettingsCache::instance().getSpoilerCardDatabasePath();
+    QString fileName = SettingsCache::instance().paths().getSpoilerCardDatabasePath();
     QFileInfo fi(fileName);
     QDir fileDir(fi.path());
     QFile file(fileName);
@@ -126,7 +128,7 @@ void SpoilerBackgroundUpdater::actCheckIfSpoilerSeasonEnabled()
 
 bool SpoilerBackgroundUpdater::saveDownloadedFile(QByteArray data)
 {
-    QString fileName = SettingsCache::instance().getSpoilerCardDatabasePath();
+    QString fileName = SettingsCache::instance().paths().getSpoilerCardDatabasePath();
     QFileInfo fi(fileName);
     QDir fileDir(fi.path());
 

cockatrice/src/client/sound_engine.cpp

@@ -6,7 +6,9 @@
 #include <QMediaPlayer>
 
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+#include <QApplication>
 #include <QAudioOutput>
+#include <libcockatrice/settings/sound_settings.h>
 #endif
 
 #define DEFAULT_THEME_NAME "Default"
@@ -15,8 +17,10 @@
 SoundEngine::SoundEngine(QObject *parent) : QObject(parent), audioOutput(nullptr), player(nullptr)
 {
     ensureThemeDirectoryExists();
-    connect(&SettingsCache::instance(), &SettingsCache::soundThemeChanged, this, &SoundEngine::themeChangedSlot);
+    connect(&SettingsCache::instance().sound(), &SoundSettings::soundThemeChanged, this,
-    connect(&SettingsCache::instance(), &SettingsCache::soundEnabledChanged, this, &SoundEngine::soundEnabledChanged);
+            &SoundEngine::themeChangedSlot);
+    connect(&SettingsCache::instance().sound(), &SoundSettings::soundEnabledChanged, this,
+            &SoundEngine::soundEnabledChanged);
 
     soundEnabledChanged();
     themeChangedSlot();
@@ -36,7 +40,7 @@ SoundEngine::~SoundEngine()
 
 void SoundEngine::soundEnabledChanged()
 {
-    if (SettingsCache::instance().getSoundEnabled()) {
+    if (SettingsCache::instance().sound().getSoundEnabled()) {
         qCInfo(SoundEngineLog) << "SoundEngine: enabling sound with" << audioData.size() << "sounds";
         if (!player) {
             player = new QMediaPlayer;
@@ -70,7 +74,7 @@ void SoundEngine::playSound(const QString &fileName)
     }
 
     player->stop();
-    int volumeSliderValue = SettingsCache::instance().getMasterVolume();
+    int volumeSliderValue = SettingsCache::instance().sound().getMasterVolume();
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
     player->audioOutput()->setVolume(qreal(volumeSliderValue) / 100);
     player->setSource(QUrl::fromLocalFile(audioData[fileName]));
@@ -88,10 +92,10 @@ void SoundEngine::testSound()
 
 void SoundEngine::ensureThemeDirectoryExists()
 {
-    if (SettingsCache::instance().getSoundThemeName().isEmpty() ||
+    if (SettingsCache::instance().sound().getSoundThemeName().isEmpty() ||
-        !getAvailableThemes().contains(SettingsCache::instance().getSoundThemeName())) {
+        !getAvailableThemes().contains(SettingsCache::instance().sound().getSoundThemeName())) {
         qCInfo(SoundEngineLog) << "Sounds theme name not set, setting default value";
-        SettingsCache::instance().setSoundThemeName(DEFAULT_THEME_NAME);
+        SettingsCache::instance().sound().setSoundThemeName(DEFAULT_THEME_NAME);
     }
 }
 
@@ -132,7 +136,7 @@ QStringMap &SoundEngine::getAvailableThemes()
 
 void SoundEngine::themeChangedSlot()
 {
-    QString themeName = SettingsCache::instance().getSoundThemeName();
+    QString themeName = SettingsCache::instance().sound().getSoundThemeName();
     qCInfo(SoundEngineLog) << "Sound theme changed:" << themeName;
 
     QDir dir = getAvailableThemes().value(themeName);

cockatrice/src/database/interface/settings_card_database_path_provider.h

@@ -0,0 +1,41 @@
+#ifndef SETTINGS_CARD_DATABASE_PATH_PROVIDER_H
+#define SETTINGS_CARD_DATABASE_PATH_PROVIDER_H
+
+#include "../../client/settings/cache_settings.h"
+
+#include <libcockatrice/interfaces/interface_card_database_path_provider.h>
+#include <libcockatrice/settings/paths_settings.h>
+
+class SettingsCardDatabasePathProvider : public ICardDatabasePathProvider
+{
+    Q_OBJECT
+
+public:
+    explicit SettingsCardDatabasePathProvider(QObject *parent = nullptr) : ICardDatabasePathProvider(parent)
+    {
+        connect(&SettingsCache::instance().paths(), &PathsSettings::cardDatabasePathChanged, this,
+                &ICardDatabasePathProvider::cardDatabasePathChanged);
+    }
+
+    [[nodiscard]] QString getCardDatabasePath() const override
+    {
+        return SettingsCache::instance().paths().getCardDatabasePath();
+    }
+
+    [[nodiscard]] QString getCustomCardDatabasePath() const override
+    {
+        return SettingsCache::instance().paths().getCustomCardDatabasePath();
+    }
+
+    [[nodiscard]] QString getTokenDatabasePath() const override
+    {
+        return SettingsCache::instance().paths().getTokenDatabasePath();
+    }
+
+    [[nodiscard]] virtual QString getSpoilerCardDatabasePath() const override
+    {
+        return SettingsCache::instance().paths().getSpoilerCardDatabasePath();
+    }
+};
+
+#endif // SETTINGS_CARD_DATABASE_PATH_PROVIDER_H

cockatrice/src/database/interface/settings_card_preference_provider.h

@@ -3,6 +3,8 @@
 #include "../../client/settings/cache_settings.h"
 
 #include <libcockatrice/interfaces/interface_card_preference_provider.h>
+#include <libcockatrice/settings/card_override_settings.h>
+#include <libcockatrice/settings/cards_display_settings.h>
 
 class SettingsCardPreferenceProvider : public ICardPreferenceProvider
 {
@@ -14,7 +16,7 @@ public:
 
     [[nodiscard]] bool getIncludeRebalancedCards() const override
     {
-        return SettingsCache::instance().getIncludeRebalancedCards();
+        return SettingsCache::instance().cardsDisplay().getIncludeRebalancedCards();
     }
 };
 

cockatrice/src/game/player/player_actions.cpp

@@ -27,6 +27,8 @@
 #include <libcockatrice/protocol/pb/command_shuffle.pb.h>
 #include <libcockatrice/protocol/pb/command_undo_draw.pb.h>
 #include <libcockatrice/protocol/pb/context_move_card.pb.h>
+#include <libcockatrice/settings/card_override_settings.h>
+#include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/utility/clamped_arithmetic.h>
 #include <libcockatrice/utility/counter_limits.h>
 #include <libcockatrice/utility/expression.h>
@@ -67,7 +69,7 @@ void PlayerActions::playCard(CardItem *card, bool faceDown)
     const CardInfo &info = exactCard.getInfo();
 
     int tableRow = info.getUiAttributes().tableRow;
-    bool playToStack = SettingsCache::instance().getPlayToStack();
+    bool playToStack = SettingsCache::instance().interface().getPlayToStack();
     QString currentZone = card->getZone()->getName();
     if (!faceDown && currentZone == ZoneNames::STACK && tableRow == 3) {
         cmd.set_target_zone(ZoneNames::GRAVE);
@@ -310,7 +312,7 @@ void PlayerActions::actDrawCard()
 
 void PlayerActions::actRequestMulliganDialog()
 {
-    int startSize = SettingsCache::instance().getStartingHandSize();
+    int startSize = SettingsCache::instance().interface().getStartingHandSize();
     int handSize = player->getHandZone()->getCards().size();
     int deckSize = player->getDeckZone()->getCards().size() + handSize;
 
@@ -326,7 +328,7 @@ void PlayerActions::actMulligan(int number)
     }
 
     doMulligan(number);
-    SettingsCache::instance().setStartingHandSize(number);
+    SettingsCache::instance().interface().setStartingHandSize(number);
 }
 
 void PlayerActions::actMulliganSameSize()
@@ -933,7 +935,7 @@ void PlayerActions::setLastTokenInfo(CardInfoPtr cardInfo)
     lastTokenInfo = {.name = cardInfo->getName(),
                      .color = cardInfo->getColors().isEmpty() ? QString() : cardInfo->getColors().left(1).toLower(),
                      .pt = cardInfo->getPowTough(),
-                     .annotation = SettingsCache::instance().getAnnotateTokens() ? cardInfo->getText() : "",
+                     .annotation = SettingsCache::instance().interface().getAnnotateTokens() ? cardInfo->getText() : "",
                      .destroy = true,
                      .providerId =
                          SettingsCache::instance().cardOverrides().getCardPreferenceOverride(cardInfo->getName())};
@@ -1169,7 +1171,7 @@ void PlayerActions::createCard(const CardItem *sourceCard,
     }
 
     cmd.set_pt(cardInfo->getPowTough().toStdString());
-    if (SettingsCache::instance().getAnnotateTokens()) {
+    if (SettingsCache::instance().interface().getAnnotateTokens()) {
         cmd.set_annotation(cardInfo->getText().toStdString());
     } else {
         cmd.set_annotation("");

cockatrice/src/game/zones/view_zone_logic.cpp

@@ -3,6 +3,7 @@
 #include "../../client/settings/cache_settings.h"
 #include "../../game_graphics/board/card_item.h"
 
+#include <libcockatrice/settings/interface_settings.h>
 /**
  * @param _player the player that the cards are revealed to.
  * @param _origZone the zone the cards were revealed from.
@@ -57,7 +58,7 @@ bool ZoneViewZoneLogic::prepareAddCard(int x)
 
     // autoclose check is done both here and in removeCard
 
-    if (cards.isEmpty() && !doInsert && SettingsCache::instance().getCloseEmptyCardView()) {
+    if (cards.isEmpty() && !doInsert && SettingsCache::instance().interface().getCloseEmptyCardView()) {
         emit closeView();
     }
 
@@ -144,7 +145,7 @@ void ZoneViewZoneLogic::removeCard(int position, bool toNewZone)
     // card gets dragged within the view.
     // Another autoclose check is done in prepareAddCard so that the view autocloses if the last card was moved to an
     // unrevealed portion of the same zone.
-    if (cards.isEmpty() && SettingsCache::instance().getCloseEmptyCardView() && toNewZone) {
+    if (cards.isEmpty() && SettingsCache::instance().interface().getCloseEmptyCardView() && toNewZone) {
         emit closeView();
         return;
     }

cockatrice/src/game_graphics/board/abstract_card_drag_item.cpp

@@ -7,6 +7,7 @@
 #include <QDebug>
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
+#include <libcockatrice/settings/cards_display_settings.h>
 
 const QColor GHOST_MASK = QColor(255, 255, 255, 50);
 
@@ -34,12 +35,13 @@ AbstractCardDragItem::AbstractCardDragItem(AbstractCardItem *_item,
 
     setCacheMode(DeviceCoordinateCache);
 
-    connect(&SettingsCache::instance(), &SettingsCache::roundCardCornersChanged, this, [this](bool _roundCardCorners) {
+    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::roundCardCornersChanged, this,
-        Q_UNUSED(_roundCardCorners);
+            [this](bool _roundCardCorners) {
+                Q_UNUSED(_roundCardCorners);
 
-        prepareGeometryChange();
+                prepareGeometryChange();
-        update();
+                update();
-    });
+            });
 
     connect(item, &QObject::destroyed, this, &AbstractCardDragItem::deleteLater);
 }
@@ -47,7 +49,8 @@ AbstractCardDragItem::AbstractCardDragItem(AbstractCardItem *_item,
 QPainterPath AbstractCardDragItem::shape() const
 {
     QPainterPath shape;
-    qreal cardCornerRadius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * CardDimensions::WIDTH_F : 0.0;
+    qreal cardCornerRadius =
+        SettingsCache::instance().cardsDisplay().getRoundCardCorners() ? 0.05 * CardDimensions::WIDTH_F : 0.0;
     shape.addRoundedRect(boundingRect(), cardCornerRadius, cardCornerRadius);
     return shape;
 }

cockatrice/src/game_graphics/board/abstract_card_item.cpp

@@ -12,6 +12,9 @@
 #include <algorithm>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/settings/cards_display_settings.h>
+#include <libcockatrice/settings/debug_settings.h>
+#include <libcockatrice/settings/personal_settings.h>
 
 AbstractCardItem::AbstractCardItem(QGraphicsItem *parent, const CardRef &cardRef, PlayerLogic *_owner, int _id)
     : ArrowTarget(_owner, parent), id(_id), cardRef(cardRef), tapped(false), facedown(false), tapAngle(0),
@@ -21,15 +24,17 @@ AbstractCardItem::AbstractCardItem(QGraphicsItem *parent, const CardRef &cardRef
     setFlag(ItemIsSelectable);
     setCacheMode(DeviceCoordinateCache);
 
-    connect(&SettingsCache::instance(), &SettingsCache::displayCardNamesChanged, this, [this] { update(); });
+    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::displayCardNamesChanged, this,
+            [this] { update(); });
     refreshCardInfo();
 
-    connect(&SettingsCache::instance(), &SettingsCache::roundCardCornersChanged, this, [this](bool _roundCardCorners) {
+    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::roundCardCornersChanged, this,
-        Q_UNUSED(_roundCardCorners);
+            [this](bool _roundCardCorners) {
+                Q_UNUSED(_roundCardCorners);
 
-        prepareGeometryChange();
+                prepareGeometryChange();
-        update();
+                update();
-    });
+            });
 }
 
 AbstractCardItem::~AbstractCardItem()
@@ -45,7 +50,8 @@ QRectF AbstractCardItem::boundingRect() const
 QPainterPath AbstractCardItem::shape() const
 {
     QPainterPath shape;
-    qreal cardCornerRadius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * CardDimensions::WIDTH_F : 0.0;
+    qreal cardCornerRadius =
+        SettingsCache::instance().cardsDisplay().getRoundCardCorners() ? 0.05 * CardDimensions::WIDTH_F : 0.0;
     shape.addRoundedRect(boundingRect(), cardCornerRadius, cardCornerRadius);
     return shape;
 }
@@ -101,7 +107,7 @@ QSizeF AbstractCardItem::getTranslatedSize(QPainter *painter) const
 
 void AbstractCardItem::transformPainter(QPainter *painter, const QSizeF &translatedSize, int angle)
 {
-    const int MAX_FONT_SIZE = SettingsCache::instance().getMaxFontSize();
+    const int MAX_FONT_SIZE = SettingsCache::instance().personal().getMaxFontSize();
     const int fontSize = std::max(9, MAX_FONT_SIZE);
 
     QRectF totalBoundingRect = painter->combinedTransform().mapRect(boundingRect());
@@ -151,7 +157,7 @@ void AbstractCardItem::paintPicture(QPainter *painter, const QSizeF &translatedS
         painter->drawPath(shape());
     }
 
-    if (translatedPixmap.isNull() || SettingsCache::instance().getDisplayCardNames() || facedown) {
+    if (translatedPixmap.isNull() || SettingsCache::instance().cardsDisplay().getDisplayCardNames() || facedown) {
         painter->save();
         transformPainter(painter, translatedSize, angle);
         painter->setPen(Qt::white);
@@ -234,7 +240,7 @@ void AbstractCardItem::setHovered(bool _hovered)
 
     isHovered = _hovered;
     setZValue(_hovered ? ZValues::HOVERED_CARD : realZValue);
-    setScale(_hovered && SettingsCache::instance().getScaleCards() ? 1.1 : 1);
+    setScale(_hovered && SettingsCache::instance().cardsDisplay().getScaleCards() ? 1.1 : 1);
     setTransformOriginPoint(_hovered ? CardDimensions::WIDTH_HALF_F : 0, _hovered ? CardDimensions::HEIGHT_HALF_F : 0);
     update();
 }
@@ -287,7 +293,7 @@ void AbstractCardItem::setTapped(bool _tapped, bool canAnimate)
     }
 
     tapped = _tapped;
-    if (SettingsCache::instance().getTapAnimation() && canAnimate) {
+    if (SettingsCache::instance().cardsDisplay().getTapAnimation() && canAnimate) {
         static_cast<GameScene *>(scene())->registerAnimationItem(this);
     } else {
         tapAngle = tapped ? 90 : 0;

cockatrice/src/game_graphics/board/abstract_counter.cpp

@@ -1,6 +1,7 @@
 #include "abstract_counter.h"
 
 #include "../../client/settings/cache_settings.h"
+#include "../../client/settings/shortcuts_settings.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
 #include "../../game_graphics/board/translate_counter_name.h"

cockatrice/src/game_graphics/board/arrow_item.cpp

@@ -18,6 +18,7 @@
 #include <libcockatrice/protocol/pb/command_attach_card.pb.h>
 #include <libcockatrice/protocol/pb/command_create_arrow.pb.h>
 #include <libcockatrice/protocol/pb/command_delete_arrow.pb.h>
+#include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/utility/color.h>
 #include <libcockatrice/utility/zone_names.h>
 
@@ -261,7 +262,7 @@ void ArrowDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
         if (startZone->getName() == ZoneNames::HAND) {
             startCard->playCard(false);
             CardInfoPtr ci = startCard->getCard().getCardPtr();
-            bool playToStack = SettingsCache::instance().getPlayToStack();
+            bool playToStack = SettingsCache::instance().interface().getPlayToStack();
             if (ci && ((!playToStack && ci->getUiAttributes().tableRow == 3) ||
                        (playToStack && ci->getUiAttributes().tableRow != 0 &&
                         startCard->getZone()->getName() != ZoneNames::STACK))) {

cockatrice/src/game_graphics/board/card_item.cpp

@@ -1,6 +1,7 @@
 #include "card_item.h"
 
 #include "../../client/settings/cache_settings.h"
+#include "../../client/settings/card_counter_settings.h"
 #include "../../game/phase.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
@@ -19,6 +20,7 @@
 #include <QPainter>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
+#include <libcockatrice/settings/interface_settings.h>
 
 CardItem::CardItem(PlayerLogic *_owner,
                    QGraphicsItem *parent,
@@ -279,7 +281,7 @@ void CardItem::drawArrow(const QColor &arrowColor)
     auto *game = owner->getGame();
     PlayerLogic *arrowOwner = game->getPlayerManager()->getActiveLocalPlayer(game->getGameState()->getActivePlayer());
     int phase = 0; // 0 means to not set the phase
-    if (SettingsCache::instance().getDoNotDeleteArrowsInSubPhases()) {
+    if (SettingsCache::instance().interface().getDoNotDeleteArrowsInSubPhases()) {
         int currentPhase = game->getGameState()->getCurrentPhase();
         phase = Phases::getLastSubphase(currentPhase) + 1;
     }
@@ -398,7 +400,7 @@ void CardItem::playCard(bool faceDown)
     if (tz) {
         emit tz->toggleTapped();
     } else {
-        if (SettingsCache::instance().getClickPlaysAllSelected()) {
+        if (SettingsCache::instance().interface().getClickPlaysAllSelected()) {
             if (faceDown) {
                 emit playSelectedFaceDown(this);
             } else {
@@ -462,7 +464,7 @@ static bool isUnwritableRevealZone(CardZoneLogic *zone)
 void CardItem::handleClickedToPlay(bool shiftHeld)
 {
     if (isUnwritableRevealZone(state->getZone())) {
-        if (SettingsCache::instance().getClickPlaysAllSelected()) {
+        if (SettingsCache::instance().interface().getClickPlaysAllSelected()) {
             emit hideSelected(this);
         } else {
             state->getZone()->removeCard(this);
@@ -479,7 +481,7 @@ void CardItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
         return;
     }
     if ((event->modifiers() != Qt::AltModifier) && (event->button() == Qt::LeftButton) &&
-        (!SettingsCache::instance().getDoubleClickToPlay())) {
+        (!SettingsCache::instance().interface().getDoubleClickToPlay())) {
         handleClickedToPlay(event->modifiers().testFlag(Qt::ShiftModifier));
     }
     if (owner != nullptr) {
@@ -491,7 +493,7 @@ void CardItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 void CardItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
 {
     if ((event->modifiers() != Qt::AltModifier) && (event->buttons() == Qt::LeftButton) &&
-        (SettingsCache::instance().getDoubleClickToPlay())) {
+        (SettingsCache::instance().interface().getDoubleClickToPlay())) {
         handleClickedToPlay(event->modifiers().testFlag(Qt::ShiftModifier));
     }
     event->accept();

cockatrice/src/game_graphics/deckview/deck_view.cpp

@@ -11,6 +11,7 @@
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/deck_list/tree/deck_list_card_node.h>
+#include <libcockatrice/settings/cards_display_settings.h>
 
 DeckViewCardDragItem::DeckViewCardDragItem(DeckViewCard *_item,
                                            const QPointF &_hotSpot,
@@ -77,11 +78,12 @@ DeckViewCard::DeckViewCard(QGraphicsItem *parent, const CardRef &cardRef, const
 {
     setAcceptHoverEvents(true);
 
-    connect(&SettingsCache::instance(), &SettingsCache::roundCardCornersChanged, this, [this](bool _roundCardCorners) {
+    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::roundCardCornersChanged, this,
-        Q_UNUSED(_roundCardCorners);
+            [this](bool _roundCardCorners) {
+                Q_UNUSED(_roundCardCorners);
 
-        update();
+                update();
-    });
+            });
 }
 
 DeckViewCard::~DeckViewCard()
@@ -99,7 +101,8 @@ void DeckViewCard::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
     pen.setJoinStyle(Qt::MiterJoin);
     pen.setColor(originZone == DECK_ZONE_MAIN ? Qt::green : Qt::red);
     painter->setPen(pen);
-    qreal cardRadius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * (CardDimensions::WIDTH_F - 3) : 0.0;
+    qreal cardRadius =
+        SettingsCache::instance().cardsDisplay().getRoundCardCorners() ? 0.05 * (CardDimensions::WIDTH_F - 3) : 0.0;
     painter->drawRoundedRect(QRectF(1.5, 1.5, CardDimensions::WIDTH_F - 3, CardDimensions::HEIGHT_F - 3), cardRadius,
                              cardRadius);
     painter->restore();

cockatrice/src/game_graphics/deckview/deck_view_container.cpp

@@ -1,6 +1,7 @@
 #include "deck_view_container.h"
 
 #include "../../client/settings/cache_settings.h"
+#include "../../client/settings/shortcuts_settings.h"
 #include "../../interface/card_picture_loader/card_picture_loader.h"
 #include "../../interface/deck_loader/deck_loader.h"
 #include "../../interface/widgets/dialogs/dlg_load_deck.h"
@@ -19,6 +20,7 @@
 #include <libcockatrice/protocol/pb/command_set_sideboard_plan.pb.h>
 #include <libcockatrice/protocol/pb/response_deck_download.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
+#include <libcockatrice/settings/visual_deck_storage_settings.h>
 #include <libcockatrice/utility/string_limits.h>
 
 ToggleButton::ToggleButton(QWidget *parent) : QPushButton(parent), state(false)
@@ -95,8 +97,8 @@ DeckViewContainer::DeckViewContainer(int _playerId, TabGame *parent)
             &DeckViewContainer::refreshShortcuts);
     refreshShortcuts();
 
-    connect(&SettingsCache::instance(), &SettingsCache::visualDeckStorageInGameChanged, this,
+    connect(&SettingsCache::instance().visualDeckStorage(), &VisualDeckStorageSettings::visualDeckStorageInGameChanged,
-            &DeckViewContainer::setVisualDeckStorageExists);
+            this, &DeckViewContainer::setVisualDeckStorageExists);
 
     switchToDeckSelectView();
 }
@@ -138,7 +140,7 @@ static void setVisibility(QPushButton *button, bool visible)
 
 void DeckViewContainer::switchToDeckSelectView()
 {
-    if (SettingsCache::instance().getVisualDeckStorageInGame()) {
+    if (SettingsCache::instance().visualDeckStorage().getVisualDeckStorageInGame()) {
         deckView->setHidden(true);
 
         tryCreateVisualDeckStorageWidget();

cockatrice/src/game_graphics/dialogs/dlg_create_token.cpp

@@ -20,6 +20,9 @@
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/models/database/card_database_model.h>
 #include <libcockatrice/models/database/token/token_display_model.h>
+#include <libcockatrice/settings/card_override_settings.h>
+#include <libcockatrice/settings/interface_settings.h>
+#include <libcockatrice/settings/layouts_settings.h>
 #include <libcockatrice/utility/string_limits.h>
 
 DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *parent)
@@ -186,7 +189,7 @@ void DlgCreateToken::tokenSelectionChanged(const QModelIndex &current, const QMo
         const QChar cardColor = cardInfo->getColorChar();
         colorEdit->setCurrentIndex(colorEdit->findData(cardColor, Qt::UserRole, Qt::MatchFixedString));
         ptEdit->setText(cardInfo->getPowTough());
-        if (SettingsCache::instance().getAnnotateTokens()) {
+        if (SettingsCache::instance().interface().getAnnotateTokens()) {
             annotationEdit->setText(cardInfo->getText());
         }
     } else {

cockatrice/src/game_graphics/game_scene.cpp

@@ -19,6 +19,7 @@
 #include <QGraphicsView>
 #include <QSet>
 #include <QtMath>
+#include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/utility/zone_names.h>
 #include <numeric>
 
@@ -36,7 +37,7 @@ GameScene::GameScene(PhasesToolbar *_phasesToolbar, QObject *parent)
 {
     animationTimer = new QBasicTimer;
     addItem(phasesToolbar);
-    connect(&SettingsCache::instance(), &SettingsCache::minPlayersForMultiColumnLayoutChanged, this,
+    connect(&SettingsCache::instance().interface(), &InterfaceSettings::minPlayersForMultiColumnLayoutChanged, this,
             &GameScene::rearrange);
 
     rearrange();
@@ -324,7 +325,7 @@ QList<PlayerLogic *> GameScene::rotatePlayers(const QList<PlayerLogic *> &active
 
 int GameScene::determineColumnCount(int playerCount)
 {
-    return playerCount < SettingsCache::instance().getMinPlayersForMultiColumnLayout() ? 1 : 2;
+    return playerCount < SettingsCache::instance().interface().getMinPlayersForMultiColumnLayout() ? 1 : 2;
 }
 
 /**

cockatrice/src/game_graphics/game_view.cpp

@@ -1,6 +1,7 @@
 #include "game_view.h"
 
 #include "../client/settings/cache_settings.h"
+#include "../client/settings/shortcuts_settings.h"
 #include "game_scene.h"
 
 #include <QAction>
@@ -9,6 +10,7 @@
 #include <QLayout>
 #include <QResizeEvent>
 #include <QRubberBand>
+#include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/utility/qt_utils.h>
 
 // QRubberBand calls raise() in showEvent() and changeEvent() to stay on top of siblings.
@@ -45,11 +47,12 @@ GameView::GameView(GameScene *scene, QWidget *parent) : QGraphicsView(scene, par
     connect(scene, &GameScene::sigResizeRubberBand, this, &GameView::resizeRubberBand);
     connect(scene, &GameScene::sigStopRubberBand, this, &GameView::stopRubberBand);
     connect(scene, &QGraphicsScene::selectionChanged, this, [this]() { updateTotalSelectionCount(); });
-    connect(&SettingsCache::instance(), &SettingsCache::tallyTypeChanged, this,
+    connect(&SettingsCache::instance().interface(), &InterfaceSettings::tallyTypeChanged, this,
             [this] { updateTotalSelectionCount(); });
 
-    setFocusDisabled(SettingsCache::instance().getKeepGameChatFocus());
+    setFocusDisabled(SettingsCache::instance().interface().getKeepGameChatFocus());
-    connect(&SettingsCache::instance(), &SettingsCache::keepGameChatFocusChanged, this, &GameView::setFocusDisabled);
+    connect(&SettingsCache::instance().interface(), &InterfaceSettings::keepGameChatFocusChanged, this,
+            &GameView::setFocusDisabled);
 
     aCloseMostRecentZoneView = new QAction(this);
 
@@ -127,7 +130,7 @@ void GameView::resizeRubberBand(const QPointF &cursorPoint, int selectedCount)
     QRect rect = QRect(mapFromScene(selectionOrigin), cursor).normalized();
     rubberBand->setGeometry(rect);
 
-    if (!SettingsCache::instance().getShowDragSelectionCount()) {
+    if (!SettingsCache::instance().interface().getShowDragSelectionCount()) {
         dragCountLabel->hide();
         return;
     }
@@ -236,7 +239,7 @@ void GameView::updateTotalSelectionCount(const QSize &viewSize)
 
     int count = scene()->selectedItems().count();
 
-    if (!SettingsCache::instance().getShowTotalSelectionCount() || count <= 1) {
+    if (!SettingsCache::instance().interface().getShowTotalSelectionCount() || count <= 1) {
         totalCountLabel->hide();
     } else {
         totalCountLabel->setText(QString::number(count));
@@ -248,7 +251,7 @@ void GameView::updateTotalSelectionCount(const QSize &viewSize)
         totalCountLabel->show();
     }
 
-    TallyType tallyType = Tally::intToType(SettingsCache::instance().getTallyType());
+    TallyType tallyType = Tally::intToType(SettingsCache::instance().interface().getTallyType());
 
     GameScene *gameScene = static_cast<GameScene *>(scene());
     QList<TallyRow> entries = Tally::compute(gameScene->selectedCards(), tallyType);

cockatrice/src/game_graphics/player/menu/card_menu.cpp

@@ -1,6 +1,7 @@
 #include "card_menu.h"
 
 #include "../../../client/settings/card_counter_settings.h"
+#include "../../../client/settings/shortcuts_settings.h"
 #include "../../../interface/widgets/tabs/tab_game.h"
 #include "../../board/card_item.h"
 #include "../../game/player/player_actions.h"

cockatrice/src/game_graphics/player/menu/grave_menu.cpp

@@ -1,5 +1,6 @@
 #include "grave_menu.h"
 
+#include "../../../client/settings/shortcuts_settings.h"
 #include "../../game/abstract_game.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"

cockatrice/src/game_graphics/player/menu/move_menu.cpp

@@ -1,5 +1,6 @@
 #include "move_menu.h"
 
+#include "../../../client/settings/shortcuts_settings.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
 #include "../card_menu_action_type.h"

cockatrice/src/game_graphics/player/menu/player_menu.cpp

@@ -1,5 +1,6 @@
 #include "player_menu.h"
 
+#include "../../../client/settings/shortcuts_settings.h"
 #include "../../../game_graphics/zones/hand_zone.h"
 #include "../../../game_graphics/zones/pile_zone.h"
 #include "../../../game_graphics/zones/table_zone.h"

cockatrice/src/game_graphics/player/menu/player_menu.h

@@ -21,6 +21,7 @@
 #include <QList>
 #include <QMenu>
 #include <QObject>
+#include <libcockatrice/utility/card_ref.h>
 
 class CardItem;
 class CardMenu;

cockatrice/src/game_graphics/player/menu/pt_menu.cpp

@@ -1,5 +1,6 @@
 #include "pt_menu.h"
 
+#include "../../../client/settings/shortcuts_settings.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
 #include "../player_graphics_item.h"

cockatrice/src/game_graphics/player/menu/say_menu.cpp

@@ -5,6 +5,7 @@
 #include "../../game/player/player_logic.h"
 #include "../player_graphics_item.h"
 
+#include <libcockatrice/settings/message_settings.h>
 SayMenu::SayMenu(PlayerGraphicsItem *_player) : player(_player)
 {
     connect(&SettingsCache::instance().messages(), &MessageSettings::messageMacrosChanged, this, &SayMenu::initSayMenu);

cockatrice/src/game_graphics/player/menu/sideboard_menu.cpp

@@ -1,5 +1,6 @@
 #include "sideboard_menu.h"
 
+#include "../../../client/settings/shortcuts_settings.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
 #include "../player_graphics_item.h"

cockatrice/src/game_graphics/player/menu/tally_menu.cpp

@@ -21,14 +21,14 @@ TallyMenu::TallyMenu()
 
 QAction *TallyMenu::createTallyAction(TallyType tallyType)
 {
-    TallyType currentType = Tally::intToType(SettingsCache::instance().getTallyType());
+    TallyType currentType = Tally::intToType(SettingsCache::instance().interface().getTallyType());
 
     QAction *action = new QAction(this);
     action->setCheckable(true);
     action->setChecked(tallyType == currentType);
 
-    connect(action, &QAction::triggered, &SettingsCache::instance(),
+    connect(action, &QAction::triggered, &SettingsCache::instance().interface(),
-            [tallyType] { SettingsCache::instance().setTallyType(static_cast<int>(tallyType)); });
+            [tallyType] { SettingsCache::instance().interface().setTallyType(static_cast<int>(tallyType)); });
 
     actionGroup->addAction(action);
 

cockatrice/src/game_graphics/player/menu/utility_menu.cpp

@@ -1,5 +1,6 @@
 #include "utility_menu.h"
 
+#include "../../../client/settings/shortcuts_settings.h"
 #include "../../../interface/deck_loader/deck_loader.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"

cockatrice/src/game_graphics/player/player_graphics_item.cpp

@@ -13,12 +13,13 @@
 #include "player_dialogs.h"
 
 #include <QGraphicsView>
+#include <libcockatrice/settings/interface_settings.h>
 
 PlayerGraphicsItem::PlayerGraphicsItem(PlayerLogic *_player) : player(_player)
 {
-    connect(&SettingsCache::instance(), &SettingsCache::horizontalHandChanged, this,
+    connect(&SettingsCache::instance().interface(), &InterfaceSettings::horizontalHandChanged, this,
             &PlayerGraphicsItem::rearrangeZones);
-    connect(&SettingsCache::instance(), &SettingsCache::handJustificationChanged, this,
+    connect(&SettingsCache::instance().interface(), &InterfaceSettings::handJustificationChanged, this,
             &PlayerGraphicsItem::rearrangeZones);
     connect(player, &PlayerLogic::rearrangeCounters, this, &PlayerGraphicsItem::rearrangeCounters);
     connect(player, &PlayerLogic::activeChanged, this, &PlayerGraphicsItem::onPlayerActiveChanged);
@@ -148,7 +149,7 @@ qreal PlayerGraphicsItem::getMinimumWidth() const
 {
     qreal result = tableZoneGraphicsItem->getMinimumWidth() + CardDimensions::HEIGHT_F + 15 + counterAreaWidth +
                    stackZoneGraphicsItem->boundingRect().width();
-    if (!SettingsCache::instance().getHorizontalHand()) {
+    if (!SettingsCache::instance().interface().getHorizontalHand()) {
         result += handZoneGraphicsItem->boundingRect().width();
     }
     return result;
@@ -165,7 +166,7 @@ void PlayerGraphicsItem::processSceneSizeChange(int newPlayerWidth)
     // Extend table (and hand, if horizontal) to accommodate the new player width.
     qreal tableWidth = newPlayerWidth - CardDimensions::HEIGHT_F - 15 - counterAreaWidth -
                        stackZoneGraphicsItem->boundingRect().width();
-    if (!SettingsCache::instance().getHorizontalHand()) {
+    if (!SettingsCache::instance().interface().getHorizontalHand()) {
         tableWidth -= handZoneGraphicsItem->boundingRect().width();
     }
 
@@ -233,7 +234,7 @@ void PlayerGraphicsItem::rearrangeCounters()
 void PlayerGraphicsItem::rearrangeZones()
 {
     auto base = QPointF(CardDimensions::HEIGHT_F + counterAreaWidth + 15, 0);
-    if (SettingsCache::instance().getHorizontalHand()) {
+    if (SettingsCache::instance().interface().getHorizontalHand()) {
         if (mirrored) {
             if (player->getHandZone()->contentsKnown()) {
                 handVisible = true;
@@ -284,7 +285,7 @@ void PlayerGraphicsItem::updateBoundingRect()
 {
     prepareGeometryChange();
     qreal width = CardDimensions::HEIGHT_F + 15 + counterAreaWidth + stackZoneGraphicsItem->boundingRect().width();
-    if (SettingsCache::instance().getHorizontalHand()) {
+    if (SettingsCache::instance().interface().getHorizontalHand()) {
         qreal handHeight = handVisible ? handZoneGraphicsItem->boundingRect().height() : 0;
         bRect = QRectF(0, 0, width + tableZoneGraphicsItem->boundingRect().width(),
                        tableZoneGraphicsItem->boundingRect().height() + handHeight);

cockatrice/src/game_graphics/zones/hand_zone.cpp

@@ -9,6 +9,7 @@
 
 #include <QPainter>
 #include <libcockatrice/protocol/pb/command_move_card.pb.h>
+#include <libcockatrice/settings/interface_settings.h>
 
 HandZone::HandZone(HandZoneLogic *_logic, int _zoneHeight, QGraphicsItem *parent)
     : SelectZone(_logic, parent), zoneHeight(_zoneHeight)
@@ -33,7 +34,7 @@ void HandZone::handleDropEvent(const QList<CardDragItem *> &dragItems,
 
     QPoint point = dropPoint + scenePos().toPoint();
     int x = -1;
-    if (SettingsCache::instance().getHorizontalHand()) {
+    if (SettingsCache::instance().interface().getHorizontalHand()) {
         for (x = 0; x < getLogic()->getCards().size(); x++) {
             if (point.x() < static_cast<CardItem *>(getLogic()->getCards().at(x))->scenePos().x()) {
                 break;
@@ -60,7 +61,7 @@ void HandZone::handleDropEvent(const QList<CardDragItem *> &dragItems,
 
 QRectF HandZone::boundingRect() const
 {
-    if (SettingsCache::instance().getHorizontalHand()) {
+    if (SettingsCache::instance().interface().getHorizontalHand()) {
         return QRectF(0, 0, width, CardDimensions::HEIGHT_F + 10);
     } else {
         return QRectF(0, 0, CardDimensions::WIDTH_F * 1.5, zoneHeight);
@@ -77,8 +78,8 @@ void HandZone::reorganizeCards()
 {
     if (!getLogic()->getCards().isEmpty()) {
         const int cardCount = getLogic()->getCards().size();
-        if (SettingsCache::instance().getHorizontalHand()) {
+        if (SettingsCache::instance().interface().getHorizontalHand()) {
-            bool leftJustified = SettingsCache::instance().getLeftJustified();
+            bool leftJustified = SettingsCache::instance().interface().getLeftJustified();
             qreal cardWidth = getLogic()->getCards().at(0)->boundingRect().width();
             const int xPadding = leftJustified ? cardWidth * 1.4 : 5;
             qreal totalWidth =
@@ -126,7 +127,7 @@ void HandZone::sortHand(const QList<CardList::SortOption> &options)
 
 void HandZone::setWidth(qreal _width)
 {
-    if (SettingsCache::instance().getHorizontalHand()) {
+    if (SettingsCache::instance().interface().getHorizontalHand()) {
         prepareGeometryChange();
         width = _width;
         reorganizeCards();

cockatrice/src/game_graphics/zones/pile_zone.cpp

@@ -1,5 +1,6 @@
 #include "pile_zone.h"
 
+#include "../../client/settings/cache_settings.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
 #include "../../game/zones/pile_zone_logic.h"
@@ -11,6 +12,7 @@
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
 #include <libcockatrice/protocol/pb/command_move_card.pb.h>
+#include <libcockatrice/settings/cards_display_settings.h>
 
 PileZone::PileZone(PileZoneLogic *_logic, QGraphicsItem *parent) : CardZone(_logic, parent)
 {
@@ -23,12 +25,13 @@ PileZone::PileZone(PileZoneLogic *_logic, QGraphicsItem *parent) : CardZone(_log
                      .rotate(90)
                      .translate(-CardDimensions::WIDTH_HALF_F, -CardDimensions::HEIGHT_HALF_F));
 
-    connect(&SettingsCache::instance(), &SettingsCache::roundCardCornersChanged, this, [this](bool _roundCardCorners) {
+    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::roundCardCornersChanged, this,
-        Q_UNUSED(_roundCardCorners);
+            [this](bool _roundCardCorners) {
+                Q_UNUSED(_roundCardCorners);
 
-        prepareGeometryChange();
+                prepareGeometryChange();
-        update();
+                update();
-    });
+            });
 }
 
 QRectF PileZone::boundingRect() const
@@ -39,7 +42,8 @@ QRectF PileZone::boundingRect() const
 QPainterPath PileZone::shape() const
 {
     QPainterPath shape;
-    qreal cardCornerRadius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * CardDimensions::WIDTH_F : 0.0;
+    qreal cardCornerRadius =
+        SettingsCache::instance().cardsDisplay().getRoundCardCorners() ? 0.05 * CardDimensions::WIDTH_F : 0.0;
     shape.addRoundedRect(boundingRect(), cardCornerRadius, cardCornerRadius);
     return shape;
 }

cockatrice/src/game_graphics/zones/select_zone.cpp

@@ -7,10 +7,11 @@
 #include <QGraphicsRectItem>
 #include <QGraphicsSceneMouseEvent>
 #include <QtMath>
+#include <libcockatrice/settings/cards_display_settings.h>
 
 static qreal stackingOffset(qreal cardHeight)
 {
-    const qreal overlapPercent = SettingsCache::instance().getStackCardOverlapPercent();
+    const qreal overlapPercent = SettingsCache::instance().cardsDisplay().getStackCardOverlapPercent();
     return cardHeight * (100.0 - overlapPercent) / 100.0;
 }
 

cockatrice/src/game_graphics/zones/table_zone.cpp

@@ -15,6 +15,7 @@
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/protocol/pb/command_move_card.pb.h>
 #include <libcockatrice/protocol/pb/command_set_card_attr.pb.h>
+#include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/utility/zone_names.h>
 
 const QColor TableZone::BACKGROUND_COLOR = QColor(100, 100, 100);
@@ -28,7 +29,7 @@ TableZone::TableZone(TableZoneLogic *_logic, bool _mirrored, QGraphicsItem *pare
     connect(_logic, &TableZoneLogic::contentSizeChanged, this, &TableZone::resizeToContents);
     connect(_logic, &TableZoneLogic::toggleTapped, this, &TableZone::toggleTapped);
     connect(themeManager, &ThemeManager::themeChanged, this, &TableZone::updateBg);
-    connect(&SettingsCache::instance(), &SettingsCache::invertVerticalCoordinateChanged, this,
+    connect(&SettingsCache::instance().interface(), &InterfaceSettings::invertVerticalCoordinateChanged, this,
             &TableZone::reorganizeCards);
 
     updateBg();
@@ -59,8 +60,8 @@ void TableZone::setMirrored(bool isMirrored)
 
 bool TableZone::isInverted() const
 {
-    return ((mirrored && !SettingsCache::instance().getInvertVerticalCoordinate()) ||
+    return ((mirrored && !SettingsCache::instance().interface().getInvertVerticalCoordinate()) ||
-            (!mirrored && SettingsCache::instance().getInvertVerticalCoordinate()));
+            (!mirrored && SettingsCache::instance().interface().getInvertVerticalCoordinate()));
 }
 
 void TableZone::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/)

cockatrice/src/game_graphics/zones/view_zone_widget.cpp

@@ -21,6 +21,7 @@
 #include <QStyle>
 #include <QStyleOption>
 #include <libcockatrice/protocol/pb/command_shuffle.pb.h>
+#include <libcockatrice/settings/interface_settings.h>
 
 namespace
 {
@@ -65,7 +66,7 @@ ZoneViewWidget::ZoneViewWidget(PlayerLogic *_player,
 
         connect(help, &QAction::triggered, this, [this] { createSearchSyntaxHelpWindow(&searchEdit); });
 
-        if (SettingsCache::instance().getFocusCardViewSearchBar()) {
+        if (SettingsCache::instance().interface().getFocusCardViewSearchBar()) {
             this->setActive(true);
             searchEdit.setFocus();
         }
@@ -76,8 +77,8 @@ ZoneViewWidget::ZoneViewWidget(PlayerLogic *_player,
         vbox->addItem(searchEditProxy);
 
         // hide search bar if chat autofocus setting is enabled, since typing into it will no longer work anyway
-        searchEditProxy->setVisible(!SettingsCache::instance().getKeepGameChatFocus());
+        searchEditProxy->setVisible(!SettingsCache::instance().interface().getKeepGameChatFocus());
-        connect(&SettingsCache::instance(), &SettingsCache::keepGameChatFocusChanged, searchEditProxy,
+        connect(&SettingsCache::instance().interface(), &InterfaceSettings::keepGameChatFocusChanged, searchEditProxy,
                 [searchEditProxy](bool keepFocus) { searchEditProxy->setVisible(!keepFocus); });
 
         // top row
@@ -158,9 +159,9 @@ ZoneViewWidget::ZoneViewWidget(PlayerLogic *_player,
         connect(&sortBySelector, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
                 &ZoneViewWidget::processSortBy);
         connect(&pileViewCheckBox, &QCheckBox::QT_STATE_CHANGED, this, &ZoneViewWidget::processSetPileView);
-        groupBySelector.setCurrentIndex(SettingsCache::instance().getZoneViewGroupByIndex());
+        groupBySelector.setCurrentIndex(SettingsCache::instance().interface().getZoneViewGroupByIndex());
-        sortBySelector.setCurrentIndex(SettingsCache::instance().getZoneViewSortByIndex());
+        sortBySelector.setCurrentIndex(SettingsCache::instance().interface().getZoneViewSortByIndex());
-        pileViewCheckBox.setChecked(SettingsCache::instance().getZoneViewPileView());
+        pileViewCheckBox.setChecked(SettingsCache::instance().interface().getZoneViewPileView());
 
         if (CardList::NoSort == static_cast<CardList::SortOption>(groupBySelector.currentData().toInt())) {
             pileViewCheckBox.setEnabled(false);
@@ -190,7 +191,7 @@ ZoneViewWidget::ZoneViewWidget(PlayerLogic *_player,
 void ZoneViewWidget::processGroupBy(int index)
 {
     auto option = static_cast<CardList::SortOption>(groupBySelector.itemData(index).toInt());
-    SettingsCache::instance().setZoneViewGroupByIndex(index);
+    SettingsCache::instance().interface().setZoneViewGroupByIndex(index);
     zone->setGroupBy(option);
 
     // disable pile view checkbox if we're not grouping by anything
@@ -214,13 +215,13 @@ void ZoneViewWidget::processSortBy(int index)
         return;
     }
 
-    SettingsCache::instance().setZoneViewSortByIndex(index);
+    SettingsCache::instance().interface().setZoneViewSortByIndex(index);
     zone->setSortBy(option);
 }
 
 void ZoneViewWidget::processSetPileView(QT_STATE_CHANGED_T value)
 {
-    SettingsCache::instance().setZoneViewPileView(value);
+    SettingsCache::instance().interface().setZoneViewPileView(value);
     zone->setPileView(value);
 }
 
@@ -477,7 +478,7 @@ static qreal rowsToHeight(int rows)
  **/
 static qreal calcMaxInitialHeight()
 {
-    return rowsToHeight(SettingsCache::instance().getCardViewInitialRowsMax());
+    return rowsToHeight(SettingsCache::instance().interface().getCardViewInitialRowsMax());
 }
 
 /**
@@ -559,7 +560,7 @@ void ZoneViewWidget::initStyleOption(QStyleOption *option) const
 void ZoneViewWidget::expandWindow()
 {
     qreal maxInitialHeight = calcMaxInitialHeight();
-    qreal maxExpandedHeight = rowsToHeight(SettingsCache::instance().getCardViewExpandedRowsMax());
+    qreal maxExpandedHeight = rowsToHeight(SettingsCache::instance().interface().getCardViewExpandedRowsMax());
     qreal height = rect().height() - extraHeight - 10;
     qreal maxHeight = maximumHeight() - extraHeight - 10;
 

cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp

@@ -1,6 +1,8 @@
 #include "card_picture_loader.h"
 
 #include "../../client/settings/cache_settings.h"
+#include "card_picture_loader_cache_method.h"
+#include "card_picture_loader_local_schemes.h"
 
 #include <QApplication>
 #include <QBuffer>
@@ -16,6 +18,9 @@
 #include <QStatusBar>
 #include <QThread>
 #include <algorithm>
+#include <libcockatrice/settings/cache_storage_settings.h>
+#include <libcockatrice/settings/paths_settings.h>
+#include <libcockatrice/settings/personal_settings.h>
 #include <utility>
 
 // never cache more than 300 cards at once for a single deck
@@ -24,8 +29,9 @@
 CardPictureLoader::CardPictureLoader() : QObject(nullptr)
 {
     worker = new CardPictureLoaderWorker;
-    connect(&SettingsCache::instance(), &SettingsCache::picsPathChanged, this, &CardPictureLoader::picsPathChanged);
+    connect(&SettingsCache::instance().paths(), &PathsSettings::picsPathChanged, this,
-    connect(&SettingsCache::instance(), &SettingsCache::picDownloadChanged, this,
+            &CardPictureLoader::picsPathChanged);
+    connect(&SettingsCache::instance().personal(), &PersonalSettings::picDownloadChanged, this,
             &CardPictureLoader::picDownloadChanged);
 
     qRegisterMetaType<ExactCard>();
@@ -169,7 +175,8 @@ void CardPictureLoader::imageLoaded(const ExactCard &card, const QImage &image)
 
     QPixmapCache::insert(card.getPixmapCacheKey(), finalPixmap);
 
-    if (SettingsCache::instance().getCardPictureLoaderCacheMethod() ==
+    if (static_cast<CardPictureLoaderCacheMethod::CacheMethod>(
+            SettingsCache::instance().cacheStorage().getCardPictureLoaderCacheMethod()) ==
         CardPictureLoaderCacheMethod::CacheMethod::FILESYSTEM_CACHE) {
         saveCardImageToLocalStorage(card, finalPixmap);
     }
@@ -189,9 +196,9 @@ void CardPictureLoader::saveCardImageToLocalStorage(const ExactCard &card, const
         return;
     }
 
-    const QString picsRoot = SettingsCache::instance().getPicsPath();
+    const QString picsRoot = SettingsCache::instance().paths().getPicsPath();
-    CardPictureLoaderLocalSchemes::NamingScheme scheme =
+    CardPictureLoaderLocalSchemes::NamingScheme scheme = static_cast<CardPictureLoaderLocalSchemes::NamingScheme>(
-        SettingsCache::instance().getLocalCardImageStorageNamingScheme();
+        SettingsCache::instance().cacheStorage().getLocalCardImageStorageNamingScheme());
 
     QString pattern;
 
@@ -306,7 +313,7 @@ void CardPictureLoader::picsPathChanged()
 
 bool CardPictureLoader::hasCustomArt()
 {
-    auto picsPath = SettingsCache::instance().getPicsPath();
+    auto picsPath = SettingsCache::instance().paths().getPicsPath();
     QDirIterator it(picsPath, QDir::Dirs | QDir::NoDotAndDotDot);
 
     // Check if there is at least one non-directory file in the pics path, other

cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp

@@ -7,15 +7,16 @@
 #include <QDirIterator>
 #include <QMovie>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/settings/paths_settings.h>
 
 static constexpr int REFRESH_INTERVAL_MS = 10 * 1000;
 
 CardPictureLoaderLocal::CardPictureLoaderLocal(QObject *parent)
-    : QObject(parent), picsPath(SettingsCache::instance().getPicsPath()),
+    : QObject(parent), picsPath(SettingsCache::instance().paths().getPicsPath()),
-      customPicsPath(SettingsCache::instance().getCustomPicsPath())
+      customPicsPath(SettingsCache::instance().paths().getCustomPicsPath())
 {
     // Hook up signals to settings
-    connect(&SettingsCache::instance(), &SettingsCache::picsPathChanged, this,
+    connect(&SettingsCache::instance().paths(), &PathsSettings::picsPathChanged, this,
             &CardPictureLoaderLocal::picsPathChanged);
 
     refreshIndex();
@@ -127,6 +128,6 @@ QImage CardPictureLoaderLocal::tryLoadCardImageFromDisk(const QString &setName,
 
 void CardPictureLoaderLocal::picsPathChanged()
 {
-    picsPath = SettingsCache::instance().getPicsPath();
+    picsPath = SettingsCache::instance().paths().getPicsPath();
-    customPicsPath = SettingsCache::instance().getCustomPicsPath();
+    customPicsPath = SettingsCache::instance().paths().getCustomPicsPath();
 }

cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp

@@ -1,6 +1,7 @@
 #include "card_picture_loader_worker.h"
 
 #include "../../client/settings/cache_settings.h"
+#include "card_picture_loader_cache_method.h"
 #include "card_picture_loader_local.h"
 #include "card_picture_loader_worker_work.h"
 
@@ -9,13 +10,17 @@
 #include <QNetworkDiskCache>
 #include <QNetworkReply>
 #include <QThread>
+#include <libcockatrice/settings/cache_storage_settings.h>
+#include <libcockatrice/settings/paths_settings.h>
+#include <libcockatrice/settings/personal_settings.h>
 #include <utility>
 #include <version_string.h>
 
 static constexpr int MAX_REQUESTS_PER_SEC = 10;
 
 CardPictureLoaderWorker::CardPictureLoaderWorker()
-    : QObject(nullptr), picDownload(SettingsCache::instance().getPicDownload()), requestQuota(MAX_REQUESTS_PER_SEC)
+    : QObject(nullptr), picDownload(SettingsCache::instance().personal().getPicDownload()),
+      requestQuota(MAX_REQUESTS_PER_SEC)
 {
     networkManager = new QNetworkAccessManager(this);
     // We need a timeout to ensure requests don't hang indefinitely in case of
@@ -25,13 +30,14 @@ CardPictureLoaderWorker::CardPictureLoaderWorker()
     cache = new QNetworkDiskCache(this);
     cache->setCacheDirectory(SettingsCache::instance().getNetworkCachePath());
     cache->setMaximumCacheSize(1024L * 1024L *
-                               static_cast<qint64>(SettingsCache::instance().getNetworkCacheSizeInMB()));
+                               static_cast<qint64>(SettingsCache::instance().cacheStorage().getNetworkCacheSizeInMB()));
 
-    connect(&SettingsCache::instance(), &SettingsCache::networkCacheSizeChanged, cache, [this](int newSizeInMB) {
+    connect(&SettingsCache::instance().cacheStorage(), &CacheStorageSettings::networkCacheSizeChanged, cache,
-        if (cache) {
+            [this](int newSizeInMB) {
-            cache->setMaximumCacheSize(1024L * 1024L * static_cast<qint64>(newSizeInMB));
+                if (cache) {
-        }
+                    cache->setMaximumCacheSize(1024L * 1024L * static_cast<qint64>(newSizeInMB));
-    });
+                }
+            });
 
     networkManager->setCache(cache);
 
@@ -39,7 +45,7 @@ CardPictureLoaderWorker::CardPictureLoaderWorker()
     // We can't use NoLessSafeRedirectPolicy because it is not applied with AlwaysCache
     networkManager->setRedirectPolicy(QNetworkRequest::ManualRedirectPolicy);
 
-    cacheFilePath = SettingsCache::instance().getRedirectCachePath() + REDIRECT_CACHE_FILENAME;
+    cacheFilePath = SettingsCache::instance().paths().getRedirectCachePath() + REDIRECT_CACHE_FILENAME;
     loadRedirectCache();
     cleanStaleEntries();
 
@@ -72,7 +78,8 @@ void CardPictureLoaderWorker::queueRequest(const QUrl &url, CardPictureLoaderWor
         queueRequest(cachedRedirect, worker);
         return;
     }
-    if (SettingsCache::instance().getCardPictureLoaderCacheMethod() ==
+    if (static_cast<CardPictureLoaderCacheMethod::CacheMethod>(
+            SettingsCache::instance().cacheStorage().getCardPictureLoaderCacheMethod()) ==
             CardPictureLoaderCacheMethod::CacheMethod::NETWORK_CACHE &&
         cache->metaData(url).isValid()) {
         // If we hit a cached url, we get to make the request for free, since it won't contribute towards the
@@ -98,8 +105,10 @@ QNetworkReply *CardPictureLoaderWorker::makeRequest(const QUrl &url, CardPicture
     req.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
     req.setRawHeader("Accept", "image/avif,image/webp,image/apng,image/,/*;q=0.8");
 
-    bool useNetworkCache = !picDownload && SettingsCache::instance().getCardPictureLoaderCacheMethod() ==
+    bool useNetworkCache =
-                                               CardPictureLoaderCacheMethod::CacheMethod::NETWORK_CACHE;
+        !picDownload && static_cast<CardPictureLoaderCacheMethod::CacheMethod>(
+                            SettingsCache::instance().cacheStorage().getCardPictureLoaderCacheMethod()) ==
+                            CardPictureLoaderCacheMethod::CacheMethod::NETWORK_CACHE;
 
     req.setAttribute(QNetworkRequest::CacheLoadControlAttribute,
                      useNetworkCache ? QNetworkRequest::AlwaysCache : QNetworkRequest::AlwaysNetwork);
@@ -229,7 +238,7 @@ void CardPictureLoaderWorker::cleanStaleEntries()
 
     auto it = redirectCache.begin();
     while (it != redirectCache.end()) {
-        if (it.value().second.addDays(SettingsCache::instance().getRedirectCacheTtl()) < now) {
+        if (it.value().second.addDays(SettingsCache::instance().cacheStorage().getRedirectCacheTtl()) < now) {
             it = redirectCache.erase(it); // Remove stale entry
         } else {
             ++it;

cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp

@@ -10,6 +10,7 @@
 #include <QNetworkReply>
 #include <QThread>
 #include <QThreadPool>
+#include <libcockatrice/settings/personal_settings.h>
 
 // Card back returned by gatherer when card is not found
 static const QStringList MD5_BLACKLIST = {
@@ -19,7 +20,7 @@ static const QStringList MD5_BLACKLIST = {
 
 CardPictureLoaderWorkerWork::CardPictureLoaderWorkerWork(const CardPictureLoaderWorker *worker, const ExactCard &toLoad)
     : QObject(nullptr), cardToDownload(CardPictureToLoad(toLoad)),
-      picDownload(SettingsCache::instance().getPicDownload())
+      picDownload(SettingsCache::instance().personal().getPicDownload())
 {
     // Hook up signals to the orchestrator
     connect(this, &CardPictureLoaderWorkerWork::requestImageDownload, worker, &CardPictureLoaderWorker::queueRequest);
@@ -31,7 +32,7 @@ CardPictureLoaderWorkerWork::CardPictureLoaderWorkerWork(const CardPictureLoader
             &CardPictureLoaderWorker::imageRequestSucceeded);
 
     // Hook up signals to settings
-    connect(&SettingsCache::instance(), SIGNAL(picDownloadChanged()), this, SLOT(picDownloadChanged()));
+    connect(&SettingsCache::instance().personal(), SIGNAL(picDownloadChanged()), this, SLOT(picDownloadChanged()));
 
     startNextPicDownload();
 }
@@ -210,5 +211,5 @@ void CardPictureLoaderWorkerWork::concludeImageLoad(const QImage &image)
 
 void CardPictureLoaderWorkerWork::picDownloadChanged()
 {
-    picDownload = SettingsCache::instance().getPicDownload();
+    picDownload = SettingsCache::instance().personal().getPicDownload();
 }

cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp

@@ -9,6 +9,8 @@
 #include <algorithm>
 #include <libcockatrice/card/set/card_set_comparator.h>
 #include <libcockatrice/interfaces/noop_card_set_priority_controller.h>
+#include <libcockatrice/settings/cards_display_settings.h>
+#include <libcockatrice/settings/download_settings.h>
 
 CardPictureToLoad::CardPictureToLoad(const ExactCard &_card)
     : card(_card), urlTemplates(SettingsCache::instance().downloads().getAllURLs())
@@ -34,7 +36,7 @@ QList<CardSetPtr> CardPictureToLoad::extractSetsSorted(const ExactCard &card)
     std::sort(sortedSets.begin(), sortedSets.end(), SetPriorityComparator());
 
     // If the user hasn't disabled arts other than their personal preference...
-    if (!SettingsCache::instance().getOverrideAllCardArtWithPersonalPreference()) {
+    if (!SettingsCache::instance().cardsDisplay().getOverrideAllCardArtWithPersonalPreference()) {
         // If the pixmapCacheKey corresponds to a specific set, we have to try to load it first.
         qsizetype setIndex = sortedSets.indexOf(card.getPrinting().getSet());
         if (setIndex > 0) { // we don't need to move the set if it's already first

cockatrice/src/interface/theme_manager.cpp

@@ -17,6 +17,7 @@
 #include <QStyleHints>
 #include <QWidget>
 #include <Qt>
+#include <libcockatrice/settings/paths_settings.h>
 
 #define NONE_THEME_NAME "Default"
 #define FUSION_THEME_NAME "Fusion"
@@ -162,7 +163,7 @@ QStringMap &ThemeManager::getAvailableThemes()
     availableThemes.clear();
 
     // load themes from user profile dir
-    dir.setPath(SettingsCache::instance().getThemesPath());
+    dir.setPath(SettingsCache::instance().paths().getThemesPath());
 
     // add default value
     availableThemes.insert(NONE_THEME_NAME, dir.absoluteFilePath("Default"));

cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp

@@ -8,6 +8,7 @@
 #include <QRegularExpression>
 #include <QResizeEvent>
 #include <QSize>
+#include <libcockatrice/settings/visual_deck_storage_settings.h>
 #include <libcockatrice/utility/qt_utils.h>
 
 ColorIdentityWidget::ColorIdentityWidget(QWidget *parent, const QString &_colorIdentity)
@@ -21,7 +22,8 @@ ColorIdentityWidget::ColorIdentityWidget(QWidget *parent, const QString &_colorI
 
     populateManaSymbolWidgets();
 
-    connect(&SettingsCache::instance(), &SettingsCache::visualDeckStorageDrawUnusedColorIdentitiesChanged, this,
+    connect(&SettingsCache::instance().visualDeckStorage(),
+            &VisualDeckStorageSettings::visualDeckStorageDrawUnusedColorIdentitiesChanged, this,
             &ColorIdentityWidget::toggleUnusedVisibility);
 }
 
@@ -40,7 +42,7 @@ void ColorIdentityWidget::populateManaSymbolWidgets()
     QtUtils::clearLayoutRec(layout);
 
     // populate mana symbols
-    if (SettingsCache::instance().getVisualDeckStorageDrawUnusedColorIdentities()) {
+    if (SettingsCache::instance().visualDeckStorage().getVisualDeckStorageDrawUnusedColorIdentities()) {
         for (const QString symbol : fullColorIdentity) {
             auto *manaSymbol = new ManaSymbolWidget(this, symbol, symbols.contains(symbol));
             layout->addWidget(manaSymbol);

cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp

@@ -3,6 +3,7 @@
 #include "../../../../client/settings/cache_settings.h"
 
 #include <QResizeEvent>
+#include <libcockatrice/settings/visual_deck_storage_settings.h>
 
 ManaSymbolWidget::ManaSymbolWidget(QWidget *parent, QString _symbol, bool _isActive, bool _mayBeToggled)
     : QLabel(parent), symbol(_symbol), isActive(_isActive), mayBeToggled(_mayBeToggled)
@@ -16,7 +17,8 @@ ManaSymbolWidget::ManaSymbolWidget(QWidget *parent, QString _symbol, bool _isAct
     setGraphicsEffect(opacityEffect);
     updateOpacity();
 
-    connect(&SettingsCache::instance(), &SettingsCache::visualDeckStorageUnusedColorIdentitiesOpacityChanged, this,
+    connect(&SettingsCache::instance().visualDeckStorage(),
+            &VisualDeckStorageSettings::visualDeckStorageUnusedColorIdentitiesOpacityChanged, this,
             &ManaSymbolWidget::updateOpacity);
 }
 
@@ -42,7 +44,11 @@ void ManaSymbolWidget::updateOpacity()
         opacity = isActive ? 1.0 : 0.5;
     } else {
         // It's just for display, they can do whatever they want.
-        opacity = isActive ? 1.0 : SettingsCache::instance().getVisualDeckStorageUnusedColorIdentitiesOpacity() / 100.0;
+        opacity =
+            isActive
+                ? 1.0
+                : SettingsCache::instance().visualDeckStorage().getVisualDeckStorageUnusedColorIdentitiesOpacity() /
+                      100.0;
     }
     opacityEffect->setOpacity(opacity);
 }

cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp

@@ -10,6 +10,7 @@
 #include <QVBoxLayout>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
+#include <libcockatrice/settings/cards_display_settings.h>
 
 CardInfoFrameWidget::CardInfoFrameWidget(QWidget *parent)
     : QTabWidget(parent), viewTransformationButton(nullptr), cardTextOnly(false)
@@ -60,7 +61,7 @@ CardInfoFrameWidget::CardInfoFrameWidget(QWidget *parent)
     tab3Layout->addWidget(splitter);
     tab3->setLayout(tab3Layout);
 
-    setViewMode(SettingsCache::instance().getCardInfoViewMode());
+    setViewMode(SettingsCache::instance().cardsDisplay().getCardInfoViewMode());
 }
 
 void CardInfoFrameWidget::retranslateUi()
@@ -127,7 +128,7 @@ void CardInfoFrameWidget::setViewMode(int mode)
 
     refreshLayout();
 
-    SettingsCache::instance().setCardInfoViewMode(mode);
+    SettingsCache::instance().cardsDisplay().setCardInfoViewMode(mode);
 }
 
 static bool hasTransformation(const CardInfo &info)

cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp

@@ -5,6 +5,7 @@
 
 #include <QPainterPath>
 #include <QStylePainter>
+#include <libcockatrice/settings/cards_display_settings.h>
 
 /**
  * @brief Constructs a CardPictureEnlargedWidget.
@@ -17,11 +18,12 @@ CardInfoPictureEnlargedWidget::CardInfoPictureEnlargedWidget(QWidget *parent) :
     setWindowFlags(Qt::ToolTip); // Keeps this widget on top of everything
     setAttribute(Qt::WA_TranslucentBackground);
 
-    connect(&SettingsCache::instance(), &SettingsCache::roundCardCornersChanged, this, [this](bool _roundCardCorners) {
+    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::roundCardCornersChanged, this,
-        Q_UNUSED(_roundCardCorners);
+            [this](bool _roundCardCorners) {
+                Q_UNUSED(_roundCardCorners);
 
-        update();
+                update();
-    });
+            });
 }
 
 /**
@@ -99,7 +101,8 @@ void CardInfoPictureEnlargedWidget::paintEvent(QPaintEvent *event)
     QPoint topLeft{(width() - scaledLogicalSize.width()) / 2, (height() - scaledLogicalSize.height()) / 2};
 
     // Rounded corner radius based on logical width
-    qreal radius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * scaledLogicalSize.width() : 0.0;
+    qreal radius =
+        SettingsCache::instance().cardsDisplay().getRoundCardCorners() ? 0.05 * scaledLogicalSize.width() : 0.0;
 
     QStylePainter painter(this);
     // Fill the background with transparent color to ensure rounded corners are rendered properly

cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp

@@ -13,6 +13,7 @@
 #include <QWidget>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
+#include <libcockatrice/settings/cards_display_settings.h>
 #include <utility>
 
 static constexpr qreal MTG_CARD_ASPECT_RATIO = 1.396;
@@ -66,11 +67,12 @@ CardInfoPictureWidget::CardInfoPictureWidget(QWidget *parent, const bool _hoverT
     animation->setStartValue(originalPos);
     animation->setEndValue(originalPos - QPoint(0, ANIMATION_OFFSET));
 
-    connect(&SettingsCache::instance(), &SettingsCache::roundCardCornersChanged, this, [this](bool _roundCardCorners) {
+    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::roundCardCornersChanged, this,
-        Q_UNUSED(_roundCardCorners);
+            [this](bool _roundCardCorners) {
+                Q_UNUSED(_roundCardCorners);
 
-        update();
+                update();
-    });
+            });
 }
 
 /**
@@ -190,7 +192,7 @@ void CardInfoPictureWidget::paintEvent(QPaintEvent *event)
     }
 
     QPixmap transformedPixmap = resizedPixmap; // Default pixmap
-    if (SettingsCache::instance().getAutoRotateSidewaysLayoutCards()) {
+    if (SettingsCache::instance().cardsDisplay().getAutoRotateSidewaysLayoutCards()) {
         if (exactCard.getInfo().getUiAttributes().landscapeOrientation) {
             // Rotate pixmap 90 degrees to the left
             QTransform transform;
@@ -220,7 +222,9 @@ void CardInfoPictureWidget::paintEvent(QPaintEvent *event)
 
     // Compute rounded corner radius
     // Ensure consistent rounding
-    qreal radius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * static_cast<qreal>(targetRect.width()) : 0.;
+    qreal radius = SettingsCache::instance().cardsDisplay().getRoundCardCorners()
+                       ? 0.05 * static_cast<qreal>(targetRect.width())
+                       : 0.;
 
     // Draw the pixmap with rounded corners
     QStylePainter painter(this);

cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp

@@ -8,6 +8,7 @@
 #include <QMouseEvent>
 #include <QPainterPath>
 #include <QStylePainter>
+#include <libcockatrice/settings/visual_deck_storage_settings.h>
 
 /**
  * @brief Constructs a CardPictureWithTextOverlay widget.
@@ -38,7 +39,8 @@ DeckPreviewCardPictureWidget::DeckPreviewCardPictureWidget(QWidget *parent,
     singleClickTimer = new QTimer(this);
     singleClickTimer->setSingleShot(true);
     connect(singleClickTimer, &QTimer::timeout, this, [this]() { emit imageClicked(lastMouseEvent, this); });
-    connect(&SettingsCache::instance(), &SettingsCache::visualDeckStorageSelectionAnimationChanged, this,
+    connect(&SettingsCache::instance().visualDeckStorage(),
+            &VisualDeckStorageSettings::visualDeckStorageSelectionAnimationChanged, this,
             &CardInfoPictureWidget::setRaiseOnEnterEnabled);
 }
 

cockatrice/src/interface/widgets/deck_editor/card_database_view.cpp

@@ -11,6 +11,7 @@
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
 #include <libcockatrice/deck_list/tree/inner_deck_list_node.h>
+#include <libcockatrice/settings/layouts_settings.h>
 
 static bool canBeCommander(const CardInfo &cardInfo)
 {

cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp

@@ -1,6 +1,7 @@
 #include "deck_editor_deck_dock_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../../../client/settings/shortcuts_settings.h"
 #include "deck_list_style_proxy.h"
 #include "deck_state_manager.h"
 
@@ -11,6 +12,8 @@
 #include <QSplitter>
 #include <QTextEdit>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/settings/cards_display_settings.h>
+#include <libcockatrice/utility/macros.h>
 #include <libcockatrice/utility/string_limits.h>
 
 static int findRestoreIndex(const CardRef &wanted, const QComboBox *combo)
@@ -108,18 +111,20 @@ void DeckEditorDeckDockWidget::createDeckDock()
 
     showBannerCardCheckBox = new QCheckBox();
     showBannerCardCheckBox->setObjectName("showBannerCardCheckBox");
-    showBannerCardCheckBox->setChecked(SettingsCache::instance().getDeckEditorBannerCardComboBoxVisible());
+    showBannerCardCheckBox->setChecked(
-    connect(showBannerCardCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+        SettingsCache::instance().cardsDisplay().getDeckEditorBannerCardComboBoxVisible());
-            &SettingsCache::setDeckEditorBannerCardComboBoxVisible);
+    connect(showBannerCardCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().cardsDisplay(),
-    connect(&SettingsCache::instance(), &SettingsCache::deckEditorBannerCardComboBoxVisibleChanged, this,
+            &CardsDisplaySettings::setDeckEditorBannerCardComboBoxVisible);
+    connect(&SettingsCache::instance().cardsDisplay(),
+            &CardsDisplaySettings::deckEditorBannerCardComboBoxVisibleChanged, this,
             &DeckEditorDeckDockWidget::updateShowBannerCardComboBox);
 
     showTagsWidgetCheckBox = new QCheckBox();
     showTagsWidgetCheckBox->setObjectName("showTagsWidgetCheckBox");
-    showTagsWidgetCheckBox->setChecked(SettingsCache::instance().getDeckEditorTagsWidgetVisible());
+    showTagsWidgetCheckBox->setChecked(SettingsCache::instance().cardsDisplay().getDeckEditorTagsWidgetVisible());
-    connect(showTagsWidgetCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+    connect(showTagsWidgetCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().cardsDisplay(),
-            &SettingsCache::setDeckEditorTagsWidgetVisible);
+            &CardsDisplaySettings::setDeckEditorTagsWidgetVisible);
-    connect(&SettingsCache::instance(), &SettingsCache::deckEditorTagsWidgetVisibleChanged, this,
+    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::deckEditorTagsWidgetVisibleChanged, this,
             &DeckEditorDeckDockWidget::updateShowTagsWidget);
 
     quickSettingsWidget->addSettingsWidget(showBannerCardCheckBox);
@@ -151,7 +156,7 @@ void DeckEditorDeckDockWidget::createDeckDock()
     bannerCardLabel = new QLabel();
     bannerCardLabel->setObjectName("bannerCardLabel");
     bannerCardLabel->setText(tr("Banner Card"));
-    bannerCardLabel->setHidden(!SettingsCache::instance().getDeckEditorBannerCardComboBoxVisible());
+    bannerCardLabel->setHidden(!SettingsCache::instance().cardsDisplay().getDeckEditorBannerCardComboBoxVisible());
     bannerCardComboBox = new QComboBox(this);
     connect(getModel(), &DeckListModel::cardNodesChanged, this, [this]() {
         // Delay the update to avoid race conditions
@@ -162,10 +167,10 @@ void DeckEditorDeckDockWidget::createDeckDock()
 
     connect(bannerCardComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
             &DeckEditorDeckDockWidget::writeBannerCard);
-    bannerCardComboBox->setHidden(!SettingsCache::instance().getDeckEditorBannerCardComboBoxVisible());
+    bannerCardComboBox->setHidden(!SettingsCache::instance().cardsDisplay().getDeckEditorBannerCardComboBoxVisible());
 
     deckTagsDisplayWidget = new DeckPreviewDeckTagsDisplayWidget(this, {});
-    deckTagsDisplayWidget->setHidden(!SettingsCache::instance().getDeckEditorTagsWidgetVisible());
+    deckTagsDisplayWidget->setHidden(!SettingsCache::instance().cardsDisplay().getDeckEditorTagsWidgetVisible());
     connect(deckTagsDisplayWidget, &DeckPreviewDeckTagsDisplayWidget::tagsChanged, deckStateManager,
             &DeckStateManager::setTags);
 

cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp

@@ -1,6 +1,7 @@
 #include "deck_editor_filter_dock_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../../../client/settings/shortcuts_settings.h"
 #include "../../../filters/filter_builder.h"
 #include "../../../filters/filter_tree_model.h"
 

cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp

@@ -5,6 +5,7 @@
 #include "printing_disabled_info_widget.h"
 
 #include <QVBoxLayout>
+#include <libcockatrice/settings/cards_display_settings.h>
 
 DeckEditorPrintingSelectorDockWidget::DeckEditorPrintingSelectorDockWidget(AbstractTabDeckEditor *parent)
     : QDockWidget(parent), deckEditor(parent)
@@ -18,8 +19,9 @@ DeckEditorPrintingSelectorDockWidget::DeckEditorPrintingSelectorDockWidget(Abstr
     createPrintingSelectorDock();
     printingDisabledInfoWidget = new PrintingDisabledInfoWidget(this);
 
-    setVisibleWidget(SettingsCache::instance().getOverrideAllCardArtWithPersonalPreference());
+    setVisibleWidget(SettingsCache::instance().cardsDisplay().getOverrideAllCardArtWithPersonalPreference());
-    connect(&SettingsCache::instance(), &SettingsCache::overrideAllCardArtWithPersonalPreferenceChanged, this,
+    connect(&SettingsCache::instance().cardsDisplay(),
+            &CardsDisplaySettings::overrideAllCardArtWithPersonalPreferenceChanged, this,
             &DeckEditorPrintingSelectorDockWidget::setVisibleWidget);
 
     retranslateUi();

cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp

@@ -12,6 +12,7 @@
 #include <QMessageBox>
 #include <QPushButton>
 #include <QRadioButton>
+#include <libcockatrice/settings/servers_settings.h>
 #include <libcockatrice/utility/string_limits.h>
 
 DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent)

cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp

@@ -17,6 +17,7 @@
 #include <QSpinBox>
 #include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
+#include <libcockatrice/settings/game_settings.h>
 #include <libcockatrice/utility/string_limits.h>
 
 void DlgCreateGame::sharedCtor()
@@ -49,7 +50,7 @@ void DlgCreateGame::sharedCtor()
         auto *gameTypeRadioButton = new QRadioButton(gameTypeIterator.value(), this);
         gameTypeLayout->addWidget(gameTypeRadioButton);
         gameTypeCheckBoxes.insert(gameTypeIterator.key(), gameTypeRadioButton);
-        bool isChecked = SettingsCache::instance().getGameTypes().contains(gameTypeIterator.value() + ", ");
+        bool isChecked = SettingsCache::instance().game().getGameTypes().contains(gameTypeIterator.value() + ", ");
         gameTypeCheckBoxes[gameTypeIterator.key()]->setChecked(isChecked);
     }
     auto *gameTypeGroupBox = new QGroupBox(tr("Game type"));
@@ -154,23 +155,23 @@ DlgCreateGame::DlgCreateGame(TabRoom *_room, const QMap<int, QString> &_gameType
 {
     sharedCtor();
 
-    rememberGameSettings->setChecked(SettingsCache::instance().getRememberGameSettings());
+    rememberGameSettings->setChecked(SettingsCache::instance().game().getRememberGameSettings());
-    descriptionEdit->setText(SettingsCache::instance().getGameDescription());
+    descriptionEdit->setText(SettingsCache::instance().game().getGameDescription());
-    maxPlayersEdit->setValue(SettingsCache::instance().getMaxPlayers());
+    maxPlayersEdit->setValue(SettingsCache::instance().game().getMaxPlayers());
     if (room && room->getUserInfo()->user_level() & ServerInfo_User::IsRegistered) {
-        onlyBuddiesCheckBox->setChecked(SettingsCache::instance().getOnlyBuddies());
+        onlyBuddiesCheckBox->setChecked(SettingsCache::instance().game().getOnlyBuddies());
-        onlyRegisteredCheckBox->setChecked(SettingsCache::instance().getOnlyRegistered());
+        onlyRegisteredCheckBox->setChecked(SettingsCache::instance().game().getOnlyRegistered());
     } else {
         onlyBuddiesCheckBox->setEnabled(false);
         onlyRegisteredCheckBox->setEnabled(false);
     }
-    spectatorsAllowedCheckBox->setChecked(SettingsCache::instance().getSpectatorsAllowed());
+    spectatorsAllowedCheckBox->setChecked(SettingsCache::instance().game().getSpectatorsAllowed());
-    spectatorsNeedPasswordCheckBox->setChecked(SettingsCache::instance().getSpectatorsNeedPassword());
+    spectatorsNeedPasswordCheckBox->setChecked(SettingsCache::instance().game().getSpectatorsNeedPassword());
-    spectatorsCanTalkCheckBox->setChecked(SettingsCache::instance().getSpectatorsCanTalk());
+    spectatorsCanTalkCheckBox->setChecked(SettingsCache::instance().game().getSpectatorsCanTalk());
-    spectatorsSeeEverythingCheckBox->setChecked(SettingsCache::instance().getSpectatorsCanSeeEverything());
+    spectatorsSeeEverythingCheckBox->setChecked(SettingsCache::instance().game().getSpectatorsCanSeeEverything());
-    createGameAsSpectatorCheckBox->setChecked(SettingsCache::instance().getCreateGameAsSpectator());
+    createGameAsSpectatorCheckBox->setChecked(SettingsCache::instance().game().getCreateGameAsSpectator());
-    startingLifeTotalEdit->setValue(SettingsCache::instance().getDefaultStartingLifeTotal());
+    startingLifeTotalEdit->setValue(SettingsCache::instance().game().getDefaultStartingLifeTotal());
-    shareDecklistsOnLoadCheckBox->setChecked(SettingsCache::instance().getShareDecklistsOnLoad());
+    shareDecklistsOnLoadCheckBox->setChecked(SettingsCache::instance().game().getShareDecklistsOnLoad());
 
     if (!rememberGameSettings->isChecked()) {
         actReset();
@@ -291,20 +292,20 @@ void DlgCreateGame::actOK()
         }
     }
 
-    SettingsCache::instance().setRememberGameSettings(rememberGameSettings->isChecked());
+    SettingsCache::instance().game().setRememberGameSettings(rememberGameSettings->isChecked());
     if (rememberGameSettings->isChecked()) {
-        SettingsCache::instance().setGameDescription(descriptionEdit->text());
+        SettingsCache::instance().game().setGameDescription(descriptionEdit->text());
-        SettingsCache::instance().setMaxPlayers(maxPlayersEdit->value());
+        SettingsCache::instance().game().setMaxPlayers(maxPlayersEdit->value());
-        SettingsCache::instance().setOnlyBuddies(onlyBuddiesCheckBox->isChecked());
+        SettingsCache::instance().game().setOnlyBuddies(onlyBuddiesCheckBox->isChecked());
-        SettingsCache::instance().setOnlyRegistered(onlyRegisteredCheckBox->isChecked());
+        SettingsCache::instance().game().setOnlyRegistered(onlyRegisteredCheckBox->isChecked());
-        SettingsCache::instance().setSpectatorsAllowed(spectatorsAllowedCheckBox->isChecked());
+        SettingsCache::instance().game().setSpectatorsAllowed(spectatorsAllowedCheckBox->isChecked());
-        SettingsCache::instance().setSpectatorsNeedPassword(spectatorsNeedPasswordCheckBox->isChecked());
+        SettingsCache::instance().game().setSpectatorsNeedPassword(spectatorsNeedPasswordCheckBox->isChecked());
-        SettingsCache::instance().setSpectatorsCanTalk(spectatorsCanTalkCheckBox->isChecked());
+        SettingsCache::instance().game().setSpectatorsCanTalk(spectatorsCanTalkCheckBox->isChecked());
-        SettingsCache::instance().setSpectatorsCanSeeEverything(spectatorsSeeEverythingCheckBox->isChecked());
+        SettingsCache::instance().game().setSpectatorsCanSeeEverything(spectatorsSeeEverythingCheckBox->isChecked());
-        SettingsCache::instance().setCreateGameAsSpectator(createGameAsSpectatorCheckBox->isChecked());
+        SettingsCache::instance().game().setCreateGameAsSpectator(createGameAsSpectatorCheckBox->isChecked());
-        SettingsCache::instance().setDefaultStartingLifeTotal(startingLifeTotalEdit->value());
+        SettingsCache::instance().game().setDefaultStartingLifeTotal(startingLifeTotalEdit->value());
-        SettingsCache::instance().setShareDecklistsOnLoad(shareDecklistsOnLoadCheckBox->isChecked());
+        SettingsCache::instance().game().setShareDecklistsOnLoad(shareDecklistsOnLoadCheckBox->isChecked());
-        SettingsCache::instance().setGameTypes(_gameTypes);
+        SettingsCache::instance().game().setGameTypes(_gameTypes);
     }
     PendingCommand *pend = room->prepareRoomCommand(cmd);
     connect(pend, &PendingCommand::finished, this, &DlgCreateGame::checkResponse);

cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp

@@ -5,6 +5,7 @@
 #include <QMessageBox>
 #include <QPushButton>
 #include <QVBoxLayout>
+#include <libcockatrice/settings/visual_deck_storage_settings.h>
 
 DlgDefaultTagsEditor::DlgDefaultTagsEditor(QWidget *parent) : QDialog(parent)
 {
@@ -54,7 +55,7 @@ void DlgDefaultTagsEditor::retranslateUi()
 void DlgDefaultTagsEditor::loadStringList()
 {
     listWidget->clear();
-    QStringList tags = SettingsCache::instance().getVisualDeckStorageDefaultTagsList();
+    QStringList tags = SettingsCache::instance().visualDeckStorage().getVisualDeckStorageDefaultTagsList();
     for (const QString &tag : tags) {
         auto *item = new QListWidgetItem(); // Create item but don't insert yet
 
@@ -147,6 +148,6 @@ void DlgDefaultTagsEditor::confirmChanges()
             updatedList.append(lineEdit->text());
         }
     }
-    SettingsCache::instance().setVisualDeckStorageDefaultTagsList(updatedList);
+    SettingsCache::instance().visualDeckStorage().setVisualDeckStorageDefaultTagsList(updatedList);
     accept(); // Close dialog and confirm changes
 }

cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp

@@ -7,6 +7,7 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QMessageBox>
+#include <libcockatrice/settings/servers_settings.h>
 #include <libcockatrice/utility/string_limits.h>
 
 DlgEditPassword::DlgEditPassword(QWidget *parent) : QDialog(parent)

cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp

@@ -7,6 +7,7 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QMessageBox>
+#include <libcockatrice/settings/servers_settings.h>
 #include <libcockatrice/utility/string_limits.h>
 
 DlgForgotPasswordChallenge::DlgForgotPasswordChallenge(QWidget *parent) : QDialog(parent)

cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.cpp

@@ -7,6 +7,7 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QMessageBox>
+#include <libcockatrice/settings/servers_settings.h>
 #include <libcockatrice/utility/string_limits.h>
 
 DlgForgotPasswordRequest::DlgForgotPasswordRequest(QWidget *parent) : QDialog(parent)

cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp

@@ -7,6 +7,7 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QMessageBox>
+#include <libcockatrice/settings/servers_settings.h>
 #include <libcockatrice/utility/string_limits.h>
 
 DlgForgotPasswordReset::DlgForgotPasswordReset(QWidget *parent) : QDialog(parent)

cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp

@@ -3,11 +3,13 @@
 #include "../../../client/settings/cache_settings.h"
 #include "../../deck_loader/deck_loader.h"
 
+#include <libcockatrice/settings/paths_settings.h>
+#include <libcockatrice/settings/recents_settings.h>
 DlgLoadDeck::DlgLoadDeck(QWidget *parent) : QFileDialog(parent, tr("Load Deck"))
 {
     QString startingDir = SettingsCache::instance().recents().getLatestDeckDirPath();
     if (startingDir.isEmpty()) {
-        startingDir = SettingsCache::instance().getDeckPath();
+        startingDir = SettingsCache::instance().paths().getDeckPath();
     }
 
     setDirectory(startingDir);

cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp

@@ -1,6 +1,7 @@
 #include "dlg_load_deck_from_clipboard.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../../../client/settings/shortcuts_settings.h"
 #include "../../deck_loader/card_node_function.h"
 #include "../../deck_loader/deck_loader.h"
 #include "dlg_settings.h"

cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.cpp

@@ -9,6 +9,7 @@
 #include <QLabel>
 #include <QSpinBox>
 #include <QVBoxLayout>
+#include <libcockatrice/settings/game_settings.h>
 
 DlgLocalGameOptions::DlgLocalGameOptions(QWidget *parent) : QDialog(parent)
 {
@@ -53,10 +54,10 @@ DlgLocalGameOptions::DlgLocalGameOptions(QWidget *parent) : QDialog(parent)
     mainLayout->addWidget(buttonBox);
     setLayout(mainLayout);
 
-    rememberSettingsCheckBox->setChecked(SettingsCache::instance().getLocalGameRememberSettings());
+    rememberSettingsCheckBox->setChecked(SettingsCache::instance().game().getLocalGameRememberSettings());
     if (rememberSettingsCheckBox->isChecked()) {
-        numberPlayersEdit->setValue(SettingsCache::instance().getLocalGameMaxPlayers());
+        numberPlayersEdit->setValue(SettingsCache::instance().game().getLocalGameMaxPlayers());
-        startingLifeTotalEdit->setValue(SettingsCache::instance().getLocalGameStartingLifeTotal());
+        startingLifeTotalEdit->setValue(SettingsCache::instance().game().getLocalGameStartingLifeTotal());
     }
 
     setWindowTitle(tr("Local game options"));
@@ -67,10 +68,10 @@ DlgLocalGameOptions::DlgLocalGameOptions(QWidget *parent) : QDialog(parent)
 
 void DlgLocalGameOptions::actOK()
 {
-    SettingsCache::instance().setLocalGameRememberSettings(rememberSettingsCheckBox->isChecked());
+    SettingsCache::instance().game().setLocalGameRememberSettings(rememberSettingsCheckBox->isChecked());
     if (rememberSettingsCheckBox->isChecked()) {
-        SettingsCache::instance().setLocalGameMaxPlayers(numberPlayersEdit->value());
+        SettingsCache::instance().game().setLocalGameMaxPlayers(numberPlayersEdit->value());
-        SettingsCache::instance().setLocalGameStartingLifeTotal(startingLifeTotalEdit->value());
+        SettingsCache::instance().game().setLocalGameStartingLifeTotal(startingLifeTotalEdit->value());
     }
 
     accept();

cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp

@@ -20,6 +20,9 @@
 #include <algorithm>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/models/database/card_set/card_sets_model.h>
+#include <libcockatrice/settings/cards_display_settings.h>
+#include <libcockatrice/settings/download_settings.h>
+#include <libcockatrice/settings/layouts_settings.h>
 
 WndSets::WndSets(QWidget *parent) : QMainWindow(parent)
 {
@@ -153,7 +156,7 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent)
     sortWarning->setLayout(sortWarningLayout);
     sortWarning->setVisible(false);
 
-    includeRebalancedCards = SettingsCache::instance().getIncludeRebalancedCards();
+    includeRebalancedCards = SettingsCache::instance().cardsDisplay().getIncludeRebalancedCards();
     QCheckBox *includeRebalancedCardsCheckBox =
         new QCheckBox(tr("Include cards rebalanced for Alchemy [requires restart]"));
     includeRebalancedCardsCheckBox->setChecked(includeRebalancedCards);
@@ -253,7 +256,7 @@ void WndSets::includeRebalancedCardsChanged(bool _includeRebalancedCards)
 void WndSets::actSave()
 {
     model->save(CardDatabaseManager::getInstance());
-    SettingsCache::instance().setIncludeRebalancedCards(includeRebalancedCards);
+    SettingsCache::instance().cardsDisplay().setIncludeRebalancedCards(includeRebalancedCards);
     CardPictureLoader::clearPixmapCache();
     const auto reloadOk1 = QtConcurrent::run([] {
         CardDatabaseManager::getInstance()->reloadCardDatabasesAndNotify();

cockatrice/src/interface/widgets/dialogs/dlg_register.cpp

@@ -8,6 +8,7 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QMessageBox>
+#include <libcockatrice/settings/servers_settings.h>
 #include <libcockatrice/utility/string_limits.h>
 
 DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent)

cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp

@@ -24,6 +24,8 @@
 #include <QScrollBar>
 #include <QStackedWidget>
 #include <QVBoxLayout>
+#include <libcockatrice/settings/paths_settings.h>
+#include <libcockatrice/settings/personal_settings.h>
 
 static QScrollArea *makeScrollable(QWidget *widget)
 {
@@ -43,7 +45,7 @@ DlgSettings::DlgSettings(QWidget *parent) : QDialog(parent)
     auto rec = QGuiApplication::primaryScreen()->availableGeometry();
     this->setMinimumSize(qMin(700, rec.width()), qMin(700, rec.height()));
 
-    connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &DlgSettings::updateLanguage);
+    connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this, &DlgSettings::updateLanguage);
 
     contentsWidget = new QListWidget;
     contentsWidget->setViewMode(QListView::IconMode);
@@ -79,7 +81,7 @@ DlgSettings::DlgSettings(QWidget *parent) : QDialog(parent)
     mainLayout->addWidget(buttonBox);
     setLayout(mainLayout);
 
-    connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &DlgSettings::retranslateUi);
+    connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this, &DlgSettings::retranslateUi);
     retranslateUi();
 
     adjustSize();
@@ -205,7 +207,8 @@ void DlgSettings::closeEvent(QCloseEvent *event)
         }
     }
 
-    if (!QDir(SettingsCache::instance().getDeckPath()).exists() || SettingsCache::instance().getDeckPath().isEmpty()) {
+    if (!QDir(SettingsCache::instance().paths().getDeckPath()).exists() ||
+        SettingsCache::instance().paths().getDeckPath().isEmpty()) {
         //! \todo Prompt to create the deck directory.
         if (QMessageBox::critical(
                 this, tr("Error"),
@@ -216,7 +219,8 @@ void DlgSettings::closeEvent(QCloseEvent *event)
         }
     }
 
-    if (!QDir(SettingsCache::instance().getPicsPath()).exists() || SettingsCache::instance().getPicsPath().isEmpty()) {
+    if (!QDir(SettingsCache::instance().paths().getPicsPath()).exists() ||
+        SettingsCache::instance().paths().getPicsPath().isEmpty()) {
         //! \todo Prompt to create the pictures directory.
         if (QMessageBox::critical(this, tr("Error"),
                                   tr("The path to your card pictures directory is invalid. Would you like to go back "

cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.cpp

@@ -3,6 +3,7 @@
 #include "../../../client/settings/cache_settings.h"
 
 #include <QDate>
+#include <libcockatrice/settings/updates_settings.h>
 
 DlgStartupCardCheck::DlgStartupCardCheck(QWidget *parent) : QDialog(parent)
 {
@@ -10,7 +11,7 @@ DlgStartupCardCheck::DlgStartupCardCheck(QWidget *parent) : QDialog(parent)
 
     layout = new QVBoxLayout(this);
 
-    QDate lastCheckDate = SettingsCache::instance().getLastCardUpdateCheck();
+    QDate lastCheckDate = SettingsCache::instance().updates().getLastCardUpdateCheck();
     int daysAgo = lastCheckDate.daysTo(QDate::currentDate());
 
     instructionLabel = new QLabel(

cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp

@@ -9,6 +9,7 @@
 #include <QDialogButtonBox>
 #include <QLabel>
 #include <QPushButton>
+#include <libcockatrice/settings/personal_settings.h>
 
 #define MIN_TIP_IMAGE_HEIGHT 200
 #define MIN_TIP_IMAGE_WIDTH 200
@@ -41,7 +42,7 @@ DlgTipOfTheDay::DlgTipOfTheDay(QWidget *parent) : QDialog(parent)
     tipNumber = new QLabel();
     tipNumber->setAlignment(Qt::AlignCenter);
 
-    QList<int> seenTips = SettingsCache::instance().getSeenTips();
+    QList<int> seenTips = SettingsCache::instance().personal().getSeenTips();
     newTipsAvailable = false;
     currentTip = 0;
     for (int i = 0; i < tipDatabase->rowCount(); i++) {
@@ -73,9 +74,9 @@ DlgTipOfTheDay::DlgTipOfTheDay(QWidget *parent) : QDialog(parent)
     connect(previousButton, &QPushButton::clicked, this, &DlgTipOfTheDay::previousClicked);
 
     showTipsOnStartupCheck = new QCheckBox("Show tips on startup");
-    showTipsOnStartupCheck->setChecked(SettingsCache::instance().getShowTipsOnStartup());
+    showTipsOnStartupCheck->setChecked(SettingsCache::instance().personal().getShowTipsOnStartup());
-    connect(showTipsOnStartupCheck, &QCheckBox::clicked, &SettingsCache::instance(),
+    connect(showTipsOnStartupCheck, &QCheckBox::clicked, &SettingsCache::instance().personal(),
-            &SettingsCache::setShowTipsOnStartup);
+            &PersonalSettings::setShowTipsOnStartup);
     buttonBar = new QHBoxLayout();
     buttonBar->addWidget(showTipsOnStartupCheck);
     buttonBar->addWidget(tipNumber);
@@ -130,10 +131,10 @@ void DlgTipOfTheDay::updateTip(int tipId)
     }
 
     // Store tip id as seen
-    QList<int> seenTips = SettingsCache::instance().getSeenTips();
+    QList<int> seenTips = SettingsCache::instance().personal().getSeenTips();
     if (!seenTips.contains(tipId)) {
         seenTips.append(tipId);
-        SettingsCache::instance().setSeenTips(seenTips);
+        SettingsCache::instance().personal().setSeenTips(seenTips);
     }
 
     TipOfTheDay tip = tipDatabase->getTip(tipId);

cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp

@@ -3,11 +3,13 @@
 #include "../../../client/settings/cache_settings.h"
 #include "../../logger.h"
 
+#include <QApplication>
 #include <QClipboard>
 #include <QPlainTextEdit>
 #include <QPushButton>
 #include <QRegularExpression>
 #include <QVBoxLayout>
+#include <libcockatrice/settings/servers_settings.h>
 
 DlgViewLog::DlgViewLog(QWidget *parent) : QDialog(parent)
 {

cockatrice/src/interface/widgets/dialogs/override_printing_warning.cpp

@@ -3,6 +3,7 @@
 #include "../../card_picture_loader/card_picture_loader.h"
 #include "../../client/settings/cache_settings.h"
 
+#include <libcockatrice/settings/cards_display_settings.h>
 bool OverridePrintingWarning::execMessageBox(QWidget *parent, bool enable)
 {
     QString message;
@@ -27,7 +28,7 @@ bool OverridePrintingWarning::execMessageBox(QWidget *parent, bool enable)
         QMessageBox::question(parent, QObject::tr("Confirm Change"), message, QMessageBox::Yes | QMessageBox::No);
 
     if (result == QMessageBox::Yes) {
-        SettingsCache::instance().setOverrideAllCardArtWithPersonalPreference(static_cast<Qt::CheckState>(enable));
+        SettingsCache::instance().cardsDisplay().setOverrideAllCardArtWithPersonalPreference(enable);
         // Caches are now invalid.
         CardPictureLoader::clearPixmapCache();
         CardPictureLoader::clearNetworkCache();

cockatrice/src/interface/widgets/general/home_widget.cpp

@@ -14,6 +14,8 @@
 #include <QVBoxLayout>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/network/client/remote/remote_client.h>
+#include <libcockatrice/settings/paths_settings.h>
+#include <libcockatrice/settings/personal_settings.h>
 
 HomeWidget::HomeWidget(QWidget *parent, TabSupervisor *_tabSupervisor)
     : QWidget(parent), tabSupervisor(_tabSupervisor), background("theme:backgrounds/home"), overlay("theme:cockatrice")
@@ -41,12 +43,13 @@ HomeWidget::HomeWidget(QWidget *parent, TabSupervisor *_tabSupervisor)
     updateConnectButton(tabSupervisor->getClient()->getStatus());
 
     connect(tabSupervisor->getClient(), &RemoteClient::statusChanged, this, &HomeWidget::updateConnectButton);
-    connect(&SettingsCache::instance(), &SettingsCache::homeTabBackgroundSourceChanged, this,
+    connect(&SettingsCache::instance().personal(), &PersonalSettings::homeTabBackgroundSourceChanged, this,
             &HomeWidget::initializeBackgroundFromSource);
-    connect(&SettingsCache::instance(), &SettingsCache::homeTabBackgroundShuffleFrequencyChanged, this,
+    connect(&SettingsCache::instance().personal(), &PersonalSettings::homeTabBackgroundShuffleFrequencyChanged, this,
             &HomeWidget::onBackgroundShuffleFrequencyChanged);
     // Lambda is cleaner to read than overloading this
-    connect(&SettingsCache::instance(), &SettingsCache::homeTabDisplayCardNameChanged, this, [this] { repaint(); });
+    connect(&SettingsCache::instance().personal(), &PersonalSettings::homeTabDisplayCardNameChanged, this,
+            [this] { repaint(); });
     connect(&SettingsCache::instance(), &SettingsCache::themeChanged, this,
             &HomeWidget::initializeBackgroundFromSource);
     connect(&SettingsCache::instance(), &SettingsCache::themeChanged, this,
@@ -61,7 +64,8 @@ void HomeWidget::initializeBackgroundFromSource()
         return;
     }
 
-    auto backgroundSourceType = BackgroundSources::fromId(SettingsCache::instance().getHomeTabBackgroundSource());
+    auto backgroundSourceType =
+        BackgroundSources::fromId(SettingsCache::instance().personal().getHomeTabBackgroundSource());
 
     switch (backgroundSourceType) {
         case BackgroundSources::Theme:
@@ -88,7 +92,7 @@ void HomeWidget::initializeBackgroundFromSource()
 void HomeWidget::loadBackgroundSourceDeck()
 {
     std::optional<LoadedDeck> deckOpt = DeckLoader::loadFromFile(
-        SettingsCache::instance().getDeckPath() + "background.cod", DeckFileFormat::Cockatrice, false);
+        SettingsCache::instance().paths().getDeckPath() + "background.cod", DeckFileFormat::Cockatrice, false);
     backgroundSourceDeck = deckOpt.has_value() ? deckOpt.value().deckList : DeckList();
 }
 
@@ -108,7 +112,8 @@ void HomeWidget::setRandomCard(ExactCard &newCard)
 
 void HomeWidget::updateRandomCard()
 {
-    auto backgroundSourceType = BackgroundSources::fromId(SettingsCache::instance().getHomeTabBackgroundSource());
+    auto backgroundSourceType =
+        BackgroundSources::fromId(SettingsCache::instance().personal().getHomeTabBackgroundSource());
 
     ExactCard newCard;
 
@@ -151,8 +156,8 @@ void HomeWidget::updateRandomCard()
 void HomeWidget::onBackgroundShuffleFrequencyChanged()
 {
     cardChangeTimer->stop();
-    if (SettingsCache::instance().getHomeTabBackgroundShuffleFrequency() > 0) {
+    if (SettingsCache::instance().personal().getHomeTabBackgroundShuffleFrequency() > 0) {
-        cardChangeTimer->start(SettingsCache::instance().getHomeTabBackgroundShuffleFrequency() * 1000);
+        cardChangeTimer->start(SettingsCache::instance().personal().getHomeTabBackgroundShuffleFrequency() * 1000);
     }
 }
 
@@ -260,8 +265,8 @@ void HomeWidget::updateConnectButton(const ClientStatus status)
 
 QPair<QColor, QColor> HomeWidget::extractDominantColors(const QPixmap &pixmap)
 {
-    if (themeManager->isBuiltInTheme() &&
+    if (themeManager->isBuiltInTheme() && SettingsCache::instance().personal().getHomeTabBackgroundSource() ==
-        SettingsCache::instance().getHomeTabBackgroundSource() == BackgroundSources::toId(BackgroundSources::Theme)) {
+                                              BackgroundSources::toId(BackgroundSources::Theme)) {
         return QPair<QColor, QColor>(QColor::fromRgb(20, 140, 60), QColor::fromRgb(120, 200, 80));
     }
 
@@ -347,7 +352,7 @@ void HomeWidget::paintEvent(QPaintEvent *event)
         }
     }
 
-    if (!cardName.isEmpty() && SettingsCache::instance().getHomeTabDisplayCardName()) {
+    if (!cardName.isEmpty() && SettingsCache::instance().personal().getHomeTabDisplayCardName()) {
         QFont font = painter.font();
         font.setPointSize(14);
         font.setBold(true);

cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp

@@ -4,6 +4,7 @@
 #include "../../../client/settings/shortcuts_settings.h"
 #include "../tabs/abstract_tab_deck_editor.h"
 
+#include <libcockatrice/settings/recents_settings.h>
 DeckEditorMenu::DeckEditorMenu(AbstractTabDeckEditor *parent) : QMenu(parent), deckEditor(parent)
 {
     aNewDeck = new QAction(QString(), this);

cockatrice/src/interface/widgets/menus/tearoff_menu.h

@@ -9,22 +9,23 @@
 #include "../../../client/settings/cache_settings.h"
 
 #include <QMenu>
+#include <libcockatrice/settings/interface_settings.h>
 
 class TearOffMenu : public QMenu
 {
 public:
     explicit TearOffMenu(const QString &title, QWidget *parent = nullptr) : QMenu(title, parent)
     {
-        connect(&SettingsCache::instance(), &SettingsCache::useTearOffMenusChanged, this,
+        connect(&SettingsCache::instance().interface(), &InterfaceSettings::useTearOffMenusChanged, this,
                 [this](const bool state) { setTearOffEnabled(state); });
-        setTearOffEnabled(SettingsCache::instance().getUseTearOffMenus());
+        setTearOffEnabled(SettingsCache::instance().interface().getUseTearOffMenus());
     }
 
     explicit TearOffMenu(QWidget *parent = nullptr) : QMenu(parent)
     {
-        connect(&SettingsCache::instance(), &SettingsCache::useTearOffMenusChanged, this,
+        connect(&SettingsCache::instance().interface(), &InterfaceSettings::useTearOffMenusChanged, this,
                 [this](const bool state) { setTearOffEnabled(state); });
-        setTearOffEnabled(SettingsCache::instance().getUseTearOffMenus());
+        setTearOffEnabled(SettingsCache::instance().interface().getUseTearOffMenus());
     }
 
     TearOffMenu *addTearOffMenu(const QString &title)

cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp

@@ -12,6 +12,8 @@
 
 #include <QBoxLayout>
 #include <QScrollBar>
+#include <libcockatrice/settings/cards_display_settings.h>
+#include <libcockatrice/utility/macros.h>
 
 /**
  * @brief Constructs a PrintingSelector widget to display and manage card printings.
@@ -45,16 +47,17 @@ PrintingSelector::PrintingSelector(QWidget *parent, AbstractTabDeckEditor *_deck
 
     // Create the checkbox for navigation buttons visibility
     navigationCheckBox = new QCheckBox(this);
-    navigationCheckBox->setChecked(SettingsCache::instance().getPrintingSelectorNavigationButtonsVisible());
+    navigationCheckBox->setChecked(
+        SettingsCache::instance().cardsDisplay().getPrintingSelectorNavigationButtonsVisible());
     connect(navigationCheckBox, &QCheckBox::QT_STATE_CHANGED, this,
             &PrintingSelector::toggleVisibilityNavigationButtons);
-    connect(navigationCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+    connect(navigationCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().cardsDisplay(),
-            &SettingsCache::setPrintingSelectorNavigationButtonsVisible);
+            &CardsDisplaySettings::setPrintingSelectorNavigationButtonsVisible);
 
-    cardSizeWidget =
+    cardSizeWidget = new CardSizeWidget(displayOptionsWidget, flowWidget,
-        new CardSizeWidget(displayOptionsWidget, flowWidget, SettingsCache::instance().getPrintingSelectorCardSize());
+                                        SettingsCache::instance().cardsDisplay().getPrintingSelectorCardSize());
-    connect(cardSizeWidget, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance(),
+    connect(cardSizeWidget, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance().cardsDisplay(),
-            &SettingsCache::setPrintingSelectorCardSize);
+            &CardsDisplaySettings::setPrintingSelectorCardSize);
 
     displayOptionsWidget->addSettingsWidget(sortToolBar);
     displayOptionsWidget->addSettingsWidget(navigationCheckBox);
@@ -81,7 +84,8 @@ PrintingSelector::PrintingSelector(QWidget *parent, AbstractTabDeckEditor *_deck
     flowWidget->setVisible(false);
 
     cardSelectionBar = new PrintingSelectorCardSelectionWidget(this, deckStateManager);
-    cardSelectionBar->setVisible(SettingsCache::instance().getPrintingSelectorNavigationButtonsVisible());
+    cardSelectionBar->setVisible(
+        SettingsCache::instance().cardsDisplay().getPrintingSelectorNavigationButtonsVisible());
     layout->addWidget(cardSelectionBar);
 
     // Connect deck model data change signal to update display
@@ -98,7 +102,7 @@ void PrintingSelector::retranslateUi()
 
 void PrintingSelector::printingsInDeckChanged()
 {
-    if (SettingsCache::instance().getBumpSetsWithCardsInDeckToTop()) {
+    if (SettingsCache::instance().cardsDisplay().getBumpSetsWithCardsInDeckToTop()) {
         // Delay the update to avoid race conditions
         QTimer::singleShot(100, this, &PrintingSelector::updateDisplay);
     }
@@ -211,7 +215,7 @@ void PrintingSelector::getAllSetsForCurrentCard()
         sortToolBar->filterSets(sortedPrintings, searchBar->getSearchText().trimmed().toLower());
     QList<PrintingInfo> printingsToUse;
 
-    if (SettingsCache::instance().getBumpSetsWithCardsInDeckToTop()) {
+    if (SettingsCache::instance().cardsDisplay().getBumpSetsWithCardsInDeckToTop()) {
         printingsToUse =
             sortToolBar->prependPrintingsInDeck(filteredPrintings, selectedCard, deckStateManager->getModel());
     } else {

cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp

@@ -11,6 +11,7 @@
 #include <QtMath>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
+#include <libcockatrice/settings/card_override_settings.h>
 #include <utility>
 
 /**

cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp

@@ -3,6 +3,9 @@
 #include "../../../client/settings/cache_settings.h"
 
 #include <libcockatrice/card/set/card_set_comparator.h>
+#include <libcockatrice/settings/card_database_settings.h>
+#include <libcockatrice/settings/card_override_settings.h>
+#include <libcockatrice/settings/cards_display_settings.h>
 
 const QString PrintingSelectorCardSortingWidget::SORT_OPTIONS_ALPHABETICAL = tr("Alphabetical");
 const QString PrintingSelectorCardSortingWidget::SORT_OPTIONS_PREFERENCE = tr("Preference");
@@ -26,7 +29,7 @@ PrintingSelectorCardSortingWidget::PrintingSelectorCardSortingWidget(PrintingSel
     sortOptionsSelector = new QComboBox(this);
     sortOptionsSelector->setFocusPolicy(Qt::StrongFocus);
     sortOptionsSelector->addItems(SORT_OPTIONS);
-    sortOptionsSelector->setCurrentIndex(SettingsCache::instance().getPrintingSelectorSortOrder());
+    sortOptionsSelector->setCurrentIndex(SettingsCache::instance().cardsDisplay().getPrintingSelectorSortOrder());
     connect(sortOptionsSelector, &QComboBox::currentTextChanged, this,
             &PrintingSelectorCardSortingWidget::updateSortSetting);
     connect(sortOptionsSelector, &QComboBox::currentTextChanged, parent, &PrintingSelector::updateDisplay);
@@ -62,7 +65,7 @@ void PrintingSelectorCardSortingWidget::updateSortOrder()
  */
 void PrintingSelectorCardSortingWidget::updateSortSetting()
 {
-    SettingsCache::instance().setPrintingSelectorSortOrder(sortOptionsSelector->currentIndex());
+    SettingsCache::instance().cardsDisplay().setPrintingSelectorSortOrder(sortOptionsSelector->currentIndex());
 }
 
 /**
@@ -90,7 +93,7 @@ QList<PrintingInfo> PrintingSelectorCardSortingWidget::sortSets(const SetToPrint
     }
 
     if (sortedSets.empty()) {
-        sortedSets << CardSet::newInstance(SettingsCache::instance().cardDatabase(), "", "", "", QDate());
+        sortedSets << CardSet::newInstance(&SettingsCache::instance().cardDatabase(), "", "", "", QDate());
     }
 
     if (sortOptionsSelector->currentText() == SORT_OPTIONS_PREFERENCE) {

cockatrice/src/interface/widgets/replay/replay_manager.cpp

@@ -1,5 +1,6 @@
 #include "replay_manager.h"
 
+#include "../../../client/settings/shortcuts_settings.h"
 #include "../interface/widgets/tabs/tab_game.h"
 #include "replay_quick_settings_widget.h"
 
@@ -124,7 +125,7 @@ void ReplayManager::replayPlayButtonToggled(bool checked)
 
 void ReplayManager::updateTimeScaleFactor(bool isFastForward)
 {
-    qreal factor = isFastForward ? SettingsCache::instance().getFastForwardSpeed() : 1.0;
+    qreal factor = isFastForward ? SettingsCache::instance().interface().getFastForwardSpeed() : 1.0;
     timelineWidget->setTimeScaleFactor(factor);
 }
 

cockatrice/src/interface/widgets/replay/replay_quick_settings_widget.cpp

@@ -5,6 +5,8 @@
 #include <QGridLayout>
 #include <QLabel>
 #include <QWidget>
+#include <libcockatrice/settings/interface_settings.h>
+#include <libcockatrice/settings/personal_settings.h>
 
 ReplayQuickSettingsWidget::ReplayQuickSettingsWidget(QWidget *parent) : SettingsButtonWidget(parent)
 {
@@ -12,7 +14,7 @@ ReplayQuickSettingsWidget::ReplayQuickSettingsWidget(QWidget *parent) : Settings
     fastForwardSpeedBox.setMinimum(1);
     fastForwardSpeedBox.setMaximum(99.9);
     fastForwardSpeedBox.setDecimals(1);
-    fastForwardSpeedBox.setValue(SettingsCache::instance().getFastForwardSpeed());
+    fastForwardSpeedBox.setValue(SettingsCache::instance().interface().getFastForwardSpeed());
     connect(&fastForwardSpeedBox, qOverload<double>(&QDoubleSpinBox::valueChanged), this,
             &ReplayQuickSettingsWidget::actUpdateFastForwardSpeed);
 
@@ -25,7 +27,8 @@ ReplayQuickSettingsWidget::ReplayQuickSettingsWidget(QWidget *parent) : Settings
 
     this->addSettingsWidget(widget);
 
-    connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &ReplayQuickSettingsWidget::retranslateUi);
+    connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this,
+            &ReplayQuickSettingsWidget::retranslateUi);
     retranslateUi();
 }
 
@@ -37,6 +40,6 @@ void ReplayQuickSettingsWidget::retranslateUi()
 
 void ReplayQuickSettingsWidget::actUpdateFastForwardSpeed(qreal value)
 {
-    SettingsCache::instance().setFastForwardSpeed(value);
+    SettingsCache::instance().interface().setFastForwardSpeed(value);
     emit fastForwardSpeedChanged(value);
 }

cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp

@@ -5,6 +5,7 @@
 #include <QPainter>
 #include <QPainterPath>
 #include <QTimer>
+#include <libcockatrice/settings/interface_settings.h>
 
 ReplayTimelineWidget::ReplayTimelineWidget(QWidget *parent)
     : QWidget(parent), maxBinValue(1), maxTime(1), timeScaleFactor(1.0), currentVisualTime(0), currentProcessedTime(0),
@@ -117,7 +118,7 @@ void ReplayTimelineWidget::handleBackwardsSkip(bool doRewindBuffering)
         // The rewind only happens once the timer runs out.
         // If another backwards skip happens, the timer will just get reset instead of rewinding.
         rewindBufferingTimer->stop();
-        rewindBufferingTimer->start(SettingsCache::instance().getRewindBufferingMs());
+        rewindBufferingTimer->start(SettingsCache::instance().interface().getRewindBufferingMs());
     } else {
         // otherwise, process the rewind immediately
         processRewind();

cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp

@@ -14,6 +14,7 @@
 #include <QMouseEvent>
 #include <QScrollBar>
 #include <libcockatrice/network/server/remote/user_level.h>
+#include <libcockatrice/settings/chat_settings.h>
 
 const QColor DEFAULT_MENTION_COLOR = QColor(194, 31, 47);
 
@@ -292,8 +293,8 @@ void ChatView::appendMessage(QString message,
     }
     cursor.setCharFormat(defaultFormat);
 
-    bool mentionEnabled = SettingsCache::instance().getChatMention();
+    bool mentionEnabled = SettingsCache::instance().chat().getChatMention();
-    highlightedWords = SettingsCache::instance().getHighlightWords().split(' ', Qt::SkipEmptyParts);
+    highlightedWords = SettingsCache::instance().chat().getHighlightWords().split(' ', Qt::SkipEmptyParts);
 
     // parse the message
     while (message.size()) {
@@ -395,8 +396,9 @@ void ChatView::checkMention(QTextCursor &cursor, QString &message, const QString
                 // You have received a valid mention!!
                 soundEngine->playSound("chat_mention");
                 mentionFormat.setBackground(QBrush(getCustomMentionColor()));
-                mentionFormat.setForeground(SettingsCache::instance().getChatMentionForeground() ? QBrush(Qt::white)
+                mentionFormat.setForeground(SettingsCache::instance().chat().getChatMentionForeground()
-                                                                                                 : QBrush(Qt::black));
+                                                ? QBrush(Qt::white)
+                                                : QBrush(Qt::black));
                 cursor.insertText(mention, mentionFormat);
                 message = message.mid(mention.size());
                 showSystemPopup(userName);
@@ -417,8 +419,8 @@ void ChatView::checkMention(QTextCursor &cursor, QString &message, const QString
             // Moderator Sending Global Message
             soundEngine->playSound("all_mention");
             mentionFormat.setBackground(QBrush(getCustomMentionColor()));
-            mentionFormat.setForeground(SettingsCache::instance().getChatMentionForeground() ? QBrush(Qt::white)
+            mentionFormat.setForeground(
-                                                                                             : QBrush(Qt::black));
+                SettingsCache::instance().chat().getChatMentionForeground() ? QBrush(Qt::white) : QBrush(Qt::black));
             cursor.insertText("@" + fullMentionUpToSpaceOrEnd, mentionFormat);
             message = message.mid(fullMentionUpToSpaceOrEnd.size() + 1);
             showSystemPopup(userName);
@@ -465,8 +467,8 @@ void ChatView::checkWord(QTextCursor &cursor, QString &message)
         if (fullWordUpToSpaceOrEnd.compare(word, Qt::CaseInsensitive) == 0) {
             // You have received a valid mention of custom word!!
             highlightFormat.setBackground(QBrush(getCustomHighlightColor()));
-            highlightFormat.setForeground(SettingsCache::instance().getChatHighlightForeground() ? QBrush(Qt::white)
+            highlightFormat.setForeground(
-                                                                                                 : QBrush(Qt::black));
+                SettingsCache::instance().chat().getChatHighlightForeground() ? QBrush(Qt::white) : QBrush(Qt::black));
             cursor.insertText(fullWordUpToSpaceOrEnd, highlightFormat);
             cursor.insertText(rest, defaultFormat);
             QApplication::alert(this);
@@ -522,7 +524,7 @@ void ChatView::actMessageClicked()
 void ChatView::showSystemPopup(const QString &userName)
 {
     QApplication::alert(this);
-    if (SettingsCache::instance().getShowMentionPopup()) {
+    if (SettingsCache::instance().chat().getShowMentionPopup()) {
         emit showMentionPopup(userName);
     }
 }
@@ -530,10 +532,10 @@ void ChatView::showSystemPopup(const QString &userName)
 QColor ChatView::getCustomMentionColor()
 {
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 4, 0))
-    QColor customColor = QColor::fromString("#" + SettingsCache::instance().getChatMentionColor());
+    QColor customColor = QColor::fromString("#" + SettingsCache::instance().chat().getChatMentionColor());
 #else
     QColor customColor;
-    customColor.setNamedColor("#" + SettingsCache::instance().getChatMentionColor());
+    customColor.setNamedColor("#" + SettingsCache::instance().chat().getChatMentionColor());
 #endif
     return customColor.isValid() ? customColor : DEFAULT_MENTION_COLOR;
 }
@@ -541,10 +543,10 @@ QColor ChatView::getCustomMentionColor()
 QColor ChatView::getCustomHighlightColor()
 {
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 4, 0))
-    QColor customColor = QColor::fromString("#" + SettingsCache::instance().getChatMentionColor());
+    QColor customColor = QColor::fromString("#" + SettingsCache::instance().chat().getChatMentionColor());
 #else
     QColor customColor;
-    customColor.setNamedColor("#" + SettingsCache::instance().getChatMentionColor());
+    customColor.setNamedColor("#" + SettingsCache::instance().chat().getChatMentionColor());
 #endif
     return customColor.isValid() ? customColor : DEFAULT_MENTION_COLOR;
 }

cockatrice/src/interface/widgets/server/game_selector.cpp

@@ -21,6 +21,7 @@
 #include <libcockatrice/protocol/pb/room_commands.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
+#include <libcockatrice/settings/cards_display_settings.h>
 
 GameSelector::GameSelector(AbstractClient *_client,
                            TabSupervisor *_tabSupervisor,
@@ -78,11 +79,13 @@ GameSelector::GameSelector(AbstractClient *_client,
     if (showFilters && restoresettings) {
         quickFilterToolBar = new GameSelectorQuickFilterToolBar(this, tabSupervisor, gameListProxyModel, gameTypeMap);
         quickFilterToolBar->setVisible(showFilters && restoresettings &&
-                                       SettingsCache::instance().getShowGameSelectorFilterToolbar());
+                                       SettingsCache::instance().cardsDisplay().getShowGameSelectorFilterToolbar());
 
-        connect(&SettingsCache::instance(), &SettingsCache::showGameSelectorFilterToolbarChanged, this, [this] {
+        connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::showGameSelectorFilterToolbarChanged,
-            quickFilterToolBar->setVisible(SettingsCache::instance().getShowGameSelectorFilterToolbar());
+                this, [this] {
-        });
+                    quickFilterToolBar->setVisible(
+                        SettingsCache::instance().cardsDisplay().getShowGameSelectorFilterToolbar());
+                });
     } else {
         quickFilterToolBar = nullptr;
     }

cockatrice/src/interface/widgets/server/games_model.cpp

@@ -10,6 +10,7 @@
 #include <QIcon>
 #include <QTimeZone>
 #include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
+#include <libcockatrice/settings/game_filters_settings.h>
 
 enum GameListColumn
 {

cockatrice/src/interface/widgets/server/handle_public_servers.cpp

@@ -5,6 +5,7 @@
 #include <QJsonDocument>
 #include <QNetworkReply>
 #include <QUrl>
+#include <libcockatrice/settings/servers_settings.h>
 
 #define PUBLIC_SERVERS_JSON "https://cockatrice.github.io/public-servers.json"
 

cockatrice/src/interface/widgets/server/user/user_info_connection.cpp

@@ -3,6 +3,7 @@
 #include "../../../../client/settings/cache_settings.h"
 
 #include <QDebug>
+#include <libcockatrice/settings/servers_settings.h>
 #include <utility>
 
 UserConnection_Information::UserConnection_Information() = default;

cockatrice/src/interface/widgets/server/user/user_list_widget.cpp

@@ -30,6 +30,7 @@
 #include <libcockatrice/protocol/pb/response_get_games_of_user.pb.h>
 #include <libcockatrice/protocol/pb/response_get_user_info.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
+#include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/utility/string_limits.h>
 
 BanDialog::BanDialog(const ServerInfo_User &info, QWidget *parent) : QDialog(parent)
@@ -352,7 +353,7 @@ bool UserListItemDelegate::editorEvent(QEvent *event,
 
 QSize UserListItemDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
-    if (!SettingsCache::instance().getStyleUserList()) {
+    if (!SettingsCache::instance().interface().getStyleUserList()) {
         return QStyledItemDelegate::sizeHint(option, index);
     }
     return UserListPainter::sizeHint();
@@ -360,7 +361,7 @@ QSize UserListItemDelegate::sizeHint(const QStyleOptionViewItem &option, const Q
 
 void UserListItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
-    if (!SettingsCache::instance().getStyleUserList()) {
+    if (!SettingsCache::instance().interface().getStyleUserList()) {
         QStyledItemDelegate::paint(painter, option, index);
         return;
     }
@@ -524,7 +525,7 @@ UserListWidget::UserListWidget(TabSupervisor *_tabSupervisor,
 
     // Pin on item click
     connect(userTree, &QTreeWidget::itemClicked, this, [this](QTreeWidgetItem *item, int) {
-        if (!SettingsCache::instance().getStyleUserList()) {
+        if (!SettingsCache::instance().interface().getStyleUserList()) {
             return;
         }
         const QString name = static_cast<UserListTWI *>(item)->getUserInfo().name().c_str();
@@ -556,7 +557,8 @@ UserListWidget::UserListWidget(TabSupervisor *_tabSupervisor,
     connect(cardArtProvider, &UserCardArtProvider::cardArtUpdated, this,
             [this](const QString &) { userTree->viewport()->update(); });
 
-    connect(&SettingsCache::instance(), &SettingsCache::styleUserListChanged, this, &UserListWidget::applyDisplayMode);
+    connect(&SettingsCache::instance().interface(), &InterfaceSettings::styleUserListChanged, this,
+            &UserListWidget::applyDisplayMode);
     applyDisplayMode();
 
     QVBoxLayout *vbox = new QVBoxLayout;
@@ -661,7 +663,7 @@ void UserListWidget::hideEvent(QHideEvent *e)
 
 void UserListWidget::applyDisplayMode()
 {
-    const bool styled = SettingsCache::instance().getStyleUserList();
+    const bool styled = SettingsCache::instance().interface().getStyleUserList();
 
     if (styled) {
         userTree->header()->setSectionResizeMode(0, QHeaderView::Stretch);
@@ -720,7 +722,7 @@ bool UserListWidget::eventFilter(QObject *obj, QEvent *event)
 {
     if (obj == userTree->viewport()) {
         if (event->type() == QEvent::MouseMove) {
-            if (!SettingsCache::instance().getStyleUserList()) {
+            if (!SettingsCache::instance().interface().getStyleUserList()) {
                 return QGroupBox::eventFilter(obj, event);
             }
             auto *me = static_cast<QMouseEvent *>(event);

cockatrice/src/interface/widgets/settings_page/appearance_settings_page.cpp

@@ -1,18 +1,24 @@
 #include "appearance_settings_page.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../../../client/settings/card_counter_settings.h"
 #include "../../client/settings/card_counter_settings.h"
 #include "../../palette_editor/palette_editor_dialog.h"
 #include "../dialogs/override_printing_warning.h"
 #include "../interface/theme_manager.h"
 #include "../interface/widgets/general/background_sources.h"
 
+#include <QApplication>
 #include <QColorDialog>
 #include <QDesktopServices>
 #include <QGridLayout>
 #include <QMessageBox>
 #include <QStyleFactory>
 #include <QTimer>
+#include <libcockatrice/settings/cards_display_settings.h>
+#include <libcockatrice/settings/interface_settings.h>
+#include <libcockatrice/settings/paths_settings.h>
+#include <libcockatrice/settings/personal_settings.h>
 
 AppearanceSettingsPage::AppearanceSettingsPage()
 {
@@ -98,7 +104,7 @@ AppearanceSettingsPage::AppearanceSettingsPage()
         homeTabBackgroundSourceBox.addItem(QObject::tr(entry.trKey), QVariant::fromValue(entry.type));
     }
 
-    QString homeTabBackgroundSource = SettingsCache::instance().getHomeTabBackgroundSource();
+    QString homeTabBackgroundSource = SettingsCache::instance().personal().getHomeTabBackgroundSource();
     int homeTabBackgroundSourceId =
         homeTabBackgroundSourceBox.findData(BackgroundSources::fromId(homeTabBackgroundSource));
     if (homeTabBackgroundSourceId != -1) {
@@ -107,19 +113,20 @@ AppearanceSettingsPage::AppearanceSettingsPage()
 
     connect(&homeTabBackgroundSourceBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this]() {
         auto type = homeTabBackgroundSourceBox.currentData().value<BackgroundSources::Type>();
-        SettingsCache::instance().setHomeTabBackgroundSource(BackgroundSources::toId(type));
+        SettingsCache::instance().personal().setHomeTabBackgroundSource(BackgroundSources::toId(type));
         updateHomeTabSettingsVisibility();
     });
 
     homeTabBackgroundShuffleFrequencySpinBox.setRange(0, 3600);
     homeTabBackgroundShuffleFrequencySpinBox.setSuffix(tr(" seconds"));
-    homeTabBackgroundShuffleFrequencySpinBox.setValue(SettingsCache::instance().getHomeTabBackgroundShuffleFrequency());
+    homeTabBackgroundShuffleFrequencySpinBox.setValue(
-    connect(&homeTabBackgroundShuffleFrequencySpinBox, qOverload<int>(&QSpinBox::valueChanged),
+        SettingsCache::instance().personal().getHomeTabBackgroundShuffleFrequency());
-            &SettingsCache::instance(), &SettingsCache::setHomeTabBackgroundShuffleFrequency);
+    connect(&homeTabBackgroundShuffleFrequencySpinBox, qOverload<int>(&QSpinBox::valueChanged), &settings.personal(),
+            &PersonalSettings::setHomeTabBackgroundShuffleFrequency);
 
-    homeTabDisplayCardNameCheckBox.setChecked(settings.getHomeTabDisplayCardName());
+    homeTabDisplayCardNameCheckBox.setChecked(settings.personal().getHomeTabDisplayCardName());
-    connect(&homeTabDisplayCardNameCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings,
+    connect(&homeTabDisplayCardNameCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings.personal(),
-            &SettingsCache::setHomeTabDisplayCardName);
+            &PersonalSettings::setHomeTabDisplayCardName);
 
     updateHomeTabSettingsVisibility();
 
@@ -133,8 +140,9 @@ AppearanceSettingsPage::AppearanceSettingsPage()
     homeTabGroupBox = new QGroupBox;
     homeTabGroupBox->setLayout(homeTabGrid);
 
-    styleUserListCheckBox.setChecked(settings.getStyleUserList());
+    styleUserListCheckBox.setChecked(settings.interface().getStyleUserList());
-    connect(&styleUserListCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, &SettingsCache::setStyleUserList);
+    connect(&styleUserListCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings.interface(),
+            &InterfaceSettings::setStyleUserList);
 
     auto stylingTabGrid = new QGridLayout;
     stylingTabGrid->addWidget(&styleUserListCheckBox, 0, 0, 1, 2);
@@ -143,12 +151,12 @@ AppearanceSettingsPage::AppearanceSettingsPage()
     stylingGroupBox->setLayout(stylingTabGrid);
 
     // Menu settings
-    showShortcutsCheckBox.setChecked(settings.getShowShortcuts());
+    showShortcutsCheckBox.setChecked(settings.cardsDisplay().getShowShortcuts());
     connect(&showShortcutsCheckBox, &QCheckBox::QT_STATE_CHANGED, this, &AppearanceSettingsPage::showShortcutsChanged);
 
-    showGameSelectorFilterToolbarCheckBox.setChecked(settings.getShowGameSelectorFilterToolbar());
+    showGameSelectorFilterToolbarCheckBox.setChecked(settings.cardsDisplay().getShowGameSelectorFilterToolbar());
-    connect(&showGameSelectorFilterToolbarCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings,
+    connect(&showGameSelectorFilterToolbarCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings.cardsDisplay(),
-            &SettingsCache::setShowGameSelectorFilterToolbar);
+            &CardsDisplaySettings::setShowGameSelectorFilterToolbar);
 
     auto *menuGrid = new QGridLayout;
     menuGrid->addWidget(&showShortcutsCheckBox, 0, 0);
@@ -158,13 +166,14 @@ AppearanceSettingsPage::AppearanceSettingsPage()
     menuGroupBox->setLayout(menuGrid);
 
     // Printings settings
-    overrideAllCardArtWithPersonalPreferenceCheckBox.setChecked(settings.getOverrideAllCardArtWithPersonalPreference());
+    overrideAllCardArtWithPersonalPreferenceCheckBox.setChecked(
+        settings.cardsDisplay().getOverrideAllCardArtWithPersonalPreference());
     connect(&overrideAllCardArtWithPersonalPreferenceCheckBox, &QCheckBox::QT_STATE_CHANGED, this,
             &AppearanceSettingsPage::overrideAllCardArtWithPersonalPreferenceToggled);
 
-    bumpSetsWithCardsInDeckToTopCheckBox.setChecked(settings.getBumpSetsWithCardsInDeckToTop());
+    bumpSetsWithCardsInDeckToTopCheckBox.setChecked(settings.cardsDisplay().getBumpSetsWithCardsInDeckToTop());
-    connect(&bumpSetsWithCardsInDeckToTopCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings,
+    connect(&bumpSetsWithCardsInDeckToTopCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings.cardsDisplay(),
-            &SettingsCache::setBumpSetsWithCardsInDeckToTop);
+            &CardsDisplaySettings::setBumpSetsWithCardsInDeckToTop);
 
     auto *printingsGrid = new QGridLayout;
     printingsGrid->addWidget(&overrideAllCardArtWithPersonalPreferenceCheckBox, 0, 0, 1, 2);
@@ -174,22 +183,25 @@ AppearanceSettingsPage::AppearanceSettingsPage()
     printingsGroupBox->setLayout(printingsGrid);
 
     // Card rendering
-    displayCardNamesCheckBox.setChecked(settings.getDisplayCardNames());
+    displayCardNamesCheckBox.setChecked(settings.cardsDisplay().getDisplayCardNames());
-    connect(&displayCardNamesCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, &SettingsCache::setDisplayCardNames);
+    connect(&displayCardNamesCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings.cardsDisplay(),
+            &CardsDisplaySettings::setDisplayCardNames);
 
-    autoRotateSidewaysLayoutCardsCheckBox.setChecked(settings.getAutoRotateSidewaysLayoutCards());
+    autoRotateSidewaysLayoutCardsCheckBox.setChecked(settings.cardsDisplay().getAutoRotateSidewaysLayoutCards());
-    connect(&autoRotateSidewaysLayoutCardsCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings,
+    connect(&autoRotateSidewaysLayoutCardsCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings.cardsDisplay(),
-            &SettingsCache::setAutoRotateSidewaysLayoutCards);
+            &CardsDisplaySettings::setAutoRotateSidewaysLayoutCards);
 
-    cardScalingCheckBox.setChecked(settings.getScaleCards());
+    cardScalingCheckBox.setChecked(settings.cardsDisplay().getScaleCards());
-    connect(&cardScalingCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, &SettingsCache::setCardScaling);
+    connect(&cardScalingCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings.cardsDisplay(),
+            &CardsDisplaySettings::setCardScaling);
 
-    roundCardCornersCheckBox.setChecked(settings.getRoundCardCorners());
+    roundCardCornersCheckBox.setChecked(settings.cardsDisplay().getRoundCardCorners());
-    connect(&roundCardCornersCheckBox, &QAbstractButton::toggled, &settings, &SettingsCache::setRoundCardCorners);
+    connect(&roundCardCornersCheckBox, &QAbstractButton::toggled, &settings.cardsDisplay(),
+            &CardsDisplaySettings::setRoundCardCorners);
 
-    connect(&maxFontSizeForCardsEdit, qOverload<int>(&QSpinBox::valueChanged), &settings,
+    connect(&maxFontSizeForCardsEdit, qOverload<int>(&QSpinBox::valueChanged), &settings.personal(),
-            &SettingsCache::setMaxFontSize);
+            &PersonalSettings::setMaxFontSize);
-    maxFontSizeForCardsEdit.setValue(settings.getMaxFontSize());
+    maxFontSizeForCardsEdit.setValue(settings.personal().getMaxFontSize());
     maxFontSizeForCardsLabel.setBuddy(&maxFontSizeForCardsEdit);
     maxFontSizeForCardsEdit.setMinimum(9);
     maxFontSizeForCardsEdit.setMaximum(100);
@@ -206,18 +218,18 @@ AppearanceSettingsPage::AppearanceSettingsPage()
     cardsGroupBox->setLayout(cardsGrid);
 
     // Card layout
-    verticalCardOverlapPercentBox.setValue(settings.getStackCardOverlapPercent());
+    verticalCardOverlapPercentBox.setValue(settings.cardsDisplay().getStackCardOverlapPercent());
     verticalCardOverlapPercentBox.setRange(0, 80);
-    connect(&verticalCardOverlapPercentBox, qOverload<int>(&QSpinBox::valueChanged), &settings,
+    connect(&verticalCardOverlapPercentBox, qOverload<int>(&QSpinBox::valueChanged), &settings.cardsDisplay(),
-            &SettingsCache::setStackCardOverlapPercent);
+            &CardsDisplaySettings::setStackCardOverlapPercent);
 
     cardViewInitialRowsMaxBox.setRange(1, 999);
-    cardViewInitialRowsMaxBox.setValue(SettingsCache::instance().getCardViewInitialRowsMax());
+    cardViewInitialRowsMaxBox.setValue(SettingsCache::instance().interface().getCardViewInitialRowsMax());
     connect(&cardViewInitialRowsMaxBox, qOverload<int>(&QSpinBox::valueChanged), this,
             &AppearanceSettingsPage::cardViewInitialRowsMaxChanged);
 
     cardViewExpandedRowsMaxBox.setRange(1, 999);
-    cardViewExpandedRowsMaxBox.setValue(SettingsCache::instance().getCardViewExpandedRowsMax());
+    cardViewExpandedRowsMaxBox.setValue(SettingsCache::instance().interface().getCardViewExpandedRowsMax());
     connect(&cardViewExpandedRowsMaxBox, qOverload<int>(&QSpinBox::valueChanged), this,
             &AppearanceSettingsPage::cardViewExpandedRowsMaxChanged);
 
@@ -279,11 +291,13 @@ AppearanceSettingsPage::AppearanceSettingsPage()
     cardCountersGroupBox->setLayout(cardCountersLayout);
 
     // Hand layout
-    horizontalHandCheckBox.setChecked(settings.getHorizontalHand());
+    horizontalHandCheckBox.setChecked(settings.interface().getHorizontalHand());
-    connect(&horizontalHandCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, &SettingsCache::setHorizontalHand);
+    connect(&horizontalHandCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings.interface(),
+            &InterfaceSettings::setHorizontalHand);
 
-    leftJustifiedHandCheckBox.setChecked(settings.getLeftJustified());
+    leftJustifiedHandCheckBox.setChecked(settings.interface().getLeftJustified());
-    connect(&leftJustifiedHandCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, &SettingsCache::setLeftJustified);
+    connect(&leftJustifiedHandCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings.interface(),
+            &InterfaceSettings::setLeftJustified);
 
     auto *handGrid = new QGridLayout;
     handGrid->addWidget(&horizontalHandCheckBox, 0, 0, 1, 2);
@@ -293,14 +307,14 @@ AppearanceSettingsPage::AppearanceSettingsPage()
     handGroupBox->setLayout(handGrid);
 
     // table grid layout
-    invertVerticalCoordinateCheckBox.setChecked(settings.getInvertVerticalCoordinate());
+    invertVerticalCoordinateCheckBox.setChecked(settings.interface().getInvertVerticalCoordinate());
-    connect(&invertVerticalCoordinateCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings,
+    connect(&invertVerticalCoordinateCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings.interface(),
-            &SettingsCache::setInvertVerticalCoordinate);
+            &InterfaceSettings::setInvertVerticalCoordinate);
 
     minPlayersForMultiColumnLayoutEdit.setMinimum(2);
-    minPlayersForMultiColumnLayoutEdit.setValue(settings.getMinPlayersForMultiColumnLayout());
+    minPlayersForMultiColumnLayoutEdit.setValue(settings.interface().getMinPlayersForMultiColumnLayout());
-    connect(&minPlayersForMultiColumnLayoutEdit, qOverload<int>(&QSpinBox::valueChanged), &settings,
+    connect(&minPlayersForMultiColumnLayoutEdit, qOverload<int>(&QSpinBox::valueChanged), &settings.interface(),
-            &SettingsCache::setMinPlayersForMultiColumnLayout);
+            &InterfaceSettings::setMinPlayersForMultiColumnLayout);
     minPlayersForMultiColumnLayoutLabel.setBuddy(&minPlayersForMultiColumnLayoutEdit);
 
     auto *tableGrid = new QGridLayout;
@@ -327,7 +341,8 @@ AppearanceSettingsPage::AppearanceSettingsPage()
 
     setLayout(mainLayout);
 
-    connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &AppearanceSettingsPage::retranslateUi);
+    connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this,
+            &AppearanceSettingsPage::retranslateUi);
     retranslateUi();
 }
 
@@ -341,7 +356,7 @@ void AppearanceSettingsPage::themeBoxChanged(int index)
 
 void AppearanceSettingsPage::openThemeLocation()
 {
-    QString dir = SettingsCache::instance().getThemesPath();
+    QString dir = SettingsCache::instance().paths().getThemesPath();
     QDir dirDir = dir;
     dirDir.cdUp();
     // open if dir exists, create if parent dir does exist
@@ -360,8 +375,8 @@ void AppearanceSettingsPage::editPalette()
 
 void AppearanceSettingsPage::updateHomeTabSettingsVisibility()
 {
-    bool visible =
+    bool visible = SettingsCache::instance().personal().getHomeTabBackgroundSource() !=
-        SettingsCache::instance().getHomeTabBackgroundSource() != BackgroundSources::toId(BackgroundSources::Theme);
+                   BackgroundSources::toId(BackgroundSources::Theme);
 
     homeTabBackgroundShuffleFrequencyLabel.setVisible(visible);
     homeTabBackgroundShuffleFrequencySpinBox.setVisible(visible);
@@ -370,7 +385,7 @@ void AppearanceSettingsPage::updateHomeTabSettingsVisibility()
 
 void AppearanceSettingsPage::showShortcutsChanged(QT_STATE_CHANGED_T value)
 {
-    SettingsCache::instance().setShowShortcuts(value);
+    SettingsCache::instance().cardsDisplay().setShowShortcuts(value);
     qApp->setAttribute(Qt::AA_DontShowShortcutsInContextMenus, value == 0); // 0 = unchecked
 }
 
@@ -397,7 +412,7 @@ void AppearanceSettingsPage::overrideAllCardArtWithPersonalPreferenceToggled(QT_
  */
 void AppearanceSettingsPage::cardViewInitialRowsMaxChanged(int value)
 {
-    SettingsCache::instance().setCardViewInitialRowsMax(value);
+    SettingsCache::instance().interface().setCardViewInitialRowsMax(value);
     if (cardViewExpandedRowsMaxBox.value() < value) {
         cardViewExpandedRowsMaxBox.setValue(value);
     }
@@ -410,7 +425,7 @@ void AppearanceSettingsPage::cardViewInitialRowsMaxChanged(int value)
  */
 void AppearanceSettingsPage::cardViewExpandedRowsMaxChanged(int value)
 {
-    SettingsCache::instance().setCardViewExpandedRowsMax(value);
+    SettingsCache::instance().interface().setCardViewExpandedRowsMax(value);
     if (cardViewInitialRowsMaxBox.value() > value) {
         cardViewInitialRowsMaxBox.setValue(value);
     }

cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.cpp

@@ -10,12 +10,16 @@
 #include <QLineEdit>
 #include <QMessageBox>
 #include <QToolBar>
+#include <libcockatrice/settings/download_settings.h>
+#include <libcockatrice/settings/paths_settings.h>
+#include <libcockatrice/settings/personal_settings.h>
+#include <libcockatrice/utility/macros.h>
 
 DeckEditorSettingsPage::DeckEditorSettingsPage()
 {
-    picDownloadCheckBox.setChecked(SettingsCache::instance().getPicDownload());
+    picDownloadCheckBox.setChecked(SettingsCache::instance().personal().getPicDownload());
-    connect(&picDownloadCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+    connect(&picDownloadCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().personal(),
-            &SettingsCache::setPicDownload);
+            &PersonalSettings::setPicDownload);
 
     urlLinkLabel.setTextInteractionFlags(Qt::LinksAccessibleByMouse);
     urlLinkLabel.setOpenExternalLinks(true);
@@ -25,7 +29,7 @@ DeckEditorSettingsPage::DeckEditorSettingsPage()
     auto *lpGeneralGrid = new QGridLayout;
     auto *lpSpoilerGrid = new QGridLayout;
 
-    mcDownloadSpoilersCheckBox.setChecked(SettingsCache::instance().getDownloadSpoilersStatus());
+    mcDownloadSpoilersCheckBox.setChecked(SettingsCache::instance().personal().getDownloadSpoilersStatus());
 
     mpSpoilerSavePathLineEdit = new QLineEdit(SettingsCache::instance().getSpoilerCardDatabasePath());
     mpSpoilerSavePathLineEdit->setReadOnly(true);
@@ -87,8 +91,8 @@ DeckEditorSettingsPage::DeckEditorSettingsPage()
     lpSpoilerGrid->addWidget(&infoOnSpoilersLabel, 3, 0, 1, 3, Qt::AlignTop);
 
     // On a change to the checkbox, hide/un-hide the other fields
-    connect(&mcDownloadSpoilersCheckBox, &QCheckBox::toggled, &SettingsCache::instance(),
+    connect(&mcDownloadSpoilersCheckBox, &QCheckBox::toggled, &SettingsCache::instance().personal(),
-            &SettingsCache::setDownloadSpoilerStatus);
+            &PersonalSettings::setDownloadSpoilerStatus);
     connect(&mcDownloadSpoilersCheckBox, &QCheckBox::toggled, this, &DeckEditorSettingsPage::setSpoilersEnabled);
 
     mpGeneralGroupBox = new QGroupBox;
@@ -103,7 +107,8 @@ DeckEditorSettingsPage::DeckEditorSettingsPage()
 
     setLayout(lpMainLayout);
 
-    connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &DeckEditorSettingsPage::retranslateUi);
+    connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this,
+            &DeckEditorSettingsPage::retranslateUi);
     retranslateUi();
 }
 
@@ -203,7 +208,7 @@ void DeckEditorSettingsPage::spoilerPathButtonClicked()
     }
 
     mpSpoilerSavePathLineEdit->setText(lsPath + "/spoiler.xml");
-    SettingsCache::instance().setSpoilerDatabasePath(lsPath + "/spoiler.xml");
+    SettingsCache::instance().paths().setSpoilerDatabasePath(lsPath + "/spoiler.xml");
 }
 
 void DeckEditorSettingsPage::setSpoilersEnabled(bool anInput)

cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp

@@ -9,6 +9,10 @@
 #include <QGridLayout>
 #include <QLineEdit>
 #include <QTranslator>
+#include <libcockatrice/settings/paths_settings.h>
+#include <libcockatrice/settings/personal_settings.h>
+#include <libcockatrice/settings/updates_settings.h>
+#include <libcockatrice/utility/macros.h>
 
 enum startupCardUpdateCheckBehaviorIndex
 {
@@ -50,17 +54,18 @@ GeneralSettingsPage::GeneralSettingsPage()
 
     // version settings
     SettingsCache &settings = SettingsCache::instance();
-    startupUpdateCheckCheckBox.setChecked(settings.getCheckUpdatesOnStartup());
+    startupUpdateCheckCheckBox.setChecked(settings.updates().getCheckUpdatesOnStartup());
 
-    connect(&startupUpdateCheckCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings,
+    connect(&startupUpdateCheckCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings.updates(),
-            &SettingsCache::setCheckUpdatesOnStartup);
+            &UpdatesSettings::setCheckUpdatesOnStartup);
 
     updateNotificationCheckBox.setChecked(settings.getNotifyAboutUpdates());
 
-    connect(&updateNotificationCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, &SettingsCache::setNotifyAboutUpdate);
+    connect(&updateNotificationCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings.updates(),
+            &UpdatesSettings::setNotifyAboutUpdates);
 
-    connect(&newVersionOracleCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings,
+    connect(&newVersionOracleCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings.updates(),
-            &SettingsCache::setNotifyAboutNewVersion);
+            &UpdatesSettings::setNotifyAboutNewVersion);
 
     auto *versionGrid = new QGridLayout;
     versionGrid->addWidget(&updateReleaseChannelLabel, 0, 0);
@@ -76,9 +81,9 @@ GeneralSettingsPage::GeneralSettingsPage()
     startupCardUpdateCheckBehaviorSelector.addItem(""); // these will be set in retranslateUI
     startupCardUpdateCheckBehaviorSelector.addItem("");
     startupCardUpdateCheckBehaviorSelector.addItem("");
-    if (SettingsCache::instance().getStartupCardUpdateCheckPromptForUpdate()) {
+    if (SettingsCache::instance().updates().getStartupCardUpdateCheckPromptForUpdate()) {
         startupCardUpdateCheckBehaviorSelector.setCurrentIndex(startupCardUpdateCheckBehaviorIndexPrompt);
-    } else if (SettingsCache::instance().getStartupCardUpdateCheckAlwaysUpdate()) {
+    } else if (SettingsCache::instance().updates().getStartupCardUpdateCheckAlwaysUpdate()) {
         startupCardUpdateCheckBehaviorSelector.setCurrentIndex(startupCardUpdateCheckBehaviorIndexAlways);
     } else {
         startupCardUpdateCheckBehaviorSelector.setCurrentIndex(startupCardUpdateCheckBehaviorIndexNone);
@@ -86,20 +91,20 @@ GeneralSettingsPage::GeneralSettingsPage()
 
     connect(&startupCardUpdateCheckBehaviorSelector, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
             [](int index) {
-                SettingsCache::instance().setStartupCardUpdateCheckPromptForUpdate(
+                SettingsCache::instance().updates().setStartupCardUpdateCheckPromptForUpdate(
                     index == startupCardUpdateCheckBehaviorIndexPrompt);
-                SettingsCache::instance().setStartupCardUpdateCheckAlwaysUpdate(
+                SettingsCache::instance().updates().setStartupCardUpdateCheckAlwaysUpdate(
                     index == startupCardUpdateCheckBehaviorIndexAlways);
             });
 
     cardUpdateCheckIntervalSpinBox.setMinimum(1);
     cardUpdateCheckIntervalSpinBox.setMaximum(30);
-    cardUpdateCheckIntervalSpinBox.setValue(settings.getCardUpdateCheckInterval());
+    cardUpdateCheckIntervalSpinBox.setValue(settings.updates().getCardUpdateCheckInterval());
 
-    connect(&cardUpdateCheckIntervalSpinBox, qOverload<int>(&QSpinBox::valueChanged), &settings,
+    connect(&cardUpdateCheckIntervalSpinBox, qOverload<int>(&QSpinBox::valueChanged), &settings.updates(),
-            &SettingsCache::setCardUpdateCheckInterval);
+            &UpdatesSettings::setCardUpdateCheckInterval);
 
-    newVersionOracleCheckBox.setChecked(settings.getNotifyAboutNewVersion());
+    newVersionOracleCheckBox.setChecked(settings.updates().getNotifyAboutNewVersion());
 
     auto *cardDatabaseGrid = new QGridLayout;
     cardDatabaseGrid->addWidget(&startupCardUpdateCheckBehaviorLabel, 0, 0);
@@ -112,9 +117,9 @@ GeneralSettingsPage::GeneralSettingsPage()
     cardDatabaseGroupBox->setLayout(cardDatabaseGrid);
 
     // startup settings
-    showTipsOnStartup.setChecked(settings.getShowTipsOnStartup());
+    showTipsOnStartup.setChecked(settings.personal().getShowTipsOnStartup());
 
-    connect(&showTipsOnStartup, &QCheckBox::clicked, &settings, &SettingsCache::setShowTipsOnStartup);
+    connect(&showTipsOnStartup, &QCheckBox::clicked, &settings.personal(), &PersonalSettings::setShowTipsOnStartup);
 
     auto *startupGrid = new QGridLayout;
     startupGrid->addWidget(&showTipsOnStartup, 0, 0, 1, 2);
@@ -123,22 +128,22 @@ GeneralSettingsPage::GeneralSettingsPage()
     startupGroupBox->setLayout(startupGrid);
 
     // paths settings
-    deckPathEdit = new QLineEdit(settings.getDeckPath());
+    deckPathEdit = new QLineEdit(settings.paths().getDeckPath());
     deckPathEdit->setReadOnly(true);
     auto *deckPathButton = new QPushButton("...");
     connect(deckPathButton, &QPushButton::clicked, this, &GeneralSettingsPage::deckPathButtonClicked);
 
-    filtersPathEdit = new QLineEdit(settings.getFiltersPath());
+    filtersPathEdit = new QLineEdit(settings.paths().getFiltersPath());
     filtersPathEdit->setReadOnly(true);
     auto *filtersPathButton = new QPushButton("...");
     connect(filtersPathButton, &QPushButton::clicked, this, &GeneralSettingsPage::filtersPathButtonClicked);
 
-    replaysPathEdit = new QLineEdit(settings.getReplaysPath());
+    replaysPathEdit = new QLineEdit(settings.paths().getReplaysPath());
     replaysPathEdit->setReadOnly(true);
     auto *replaysPathButton = new QPushButton("...");
     connect(replaysPathButton, &QPushButton::clicked, this, &GeneralSettingsPage::replaysPathButtonClicked);
 
-    picsPathEdit = new QLineEdit(settings.getPicsPath());
+    picsPathEdit = new QLineEdit(settings.paths().getPicsPath());
     picsPathEdit->setReadOnly(true);
     auto *picsPathButton = new QPushButton("...");
     connect(picsPathButton, &QPushButton::clicked, this, &GeneralSettingsPage::picsPathButtonClicked);
@@ -224,13 +229,14 @@ GeneralSettingsPage::GeneralSettingsPage()
     GeneralSettingsPage::retranslateUi();
 
     // connect the ReleaseChannel combo box only after the entries are inserted in retranslateUi
-    connect(&updateReleaseChannelBox, qOverload<int>(&QComboBox::currentIndexChanged), &settings,
+    connect(&updateReleaseChannelBox, qOverload<int>(&QComboBox::currentIndexChanged), &settings.updates(),
-            &SettingsCache::setUpdateReleaseChannelIndex);
+            &UpdatesSettings::setUpdateReleaseChannelIndex);
     updateReleaseChannelBox.setCurrentIndex(settings.getUpdateReleaseChannelIndex());
 
     setLayout(mainLayout);
 
-    connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &GeneralSettingsPage::retranslateUi);
+    connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this,
+            &GeneralSettingsPage::retranslateUi);
     retranslateUi();
 }
 
@@ -264,7 +270,7 @@ void GeneralSettingsPage::deckPathButtonClicked()
     }
 
     deckPathEdit->setText(path);
-    SettingsCache::instance().setDeckPath(path);
+    SettingsCache::instance().paths().setDeckPath(path);
 }
 
 void GeneralSettingsPage::filtersPathButtonClicked()
@@ -275,7 +281,7 @@ void GeneralSettingsPage::filtersPathButtonClicked()
     }
 
     filtersPathEdit->setText(path);
-    SettingsCache::instance().setFiltersPath(path);
+    SettingsCache::instance().paths().setFiltersPath(path);
 }
 
 void GeneralSettingsPage::replaysPathButtonClicked()
@@ -286,7 +292,7 @@ void GeneralSettingsPage::replaysPathButtonClicked()
     }
 
     replaysPathEdit->setText(path);
-    SettingsCache::instance().setReplaysPath(path);
+    SettingsCache::instance().paths().setReplaysPath(path);
 }
 
 void GeneralSettingsPage::picsPathButtonClicked()
@@ -297,7 +303,7 @@ void GeneralSettingsPage::picsPathButtonClicked()
     }
 
     picsPathEdit->setText(path);
-    SettingsCache::instance().setPicsPath(path);
+    SettingsCache::instance().paths().setPicsPath(path);
 }
 
 void GeneralSettingsPage::cardDatabasePathButtonClicked()
@@ -308,7 +314,7 @@ void GeneralSettingsPage::cardDatabasePathButtonClicked()
     }
 
     cardDatabasePathEdit->setText(path);
-    SettingsCache::instance().setCardDatabasePath(path);
+    SettingsCache::instance().paths().setCardDatabasePath(path);
 }
 
 void GeneralSettingsPage::customCardDatabaseButtonClicked()
@@ -319,7 +325,7 @@ void GeneralSettingsPage::customCardDatabaseButtonClicked()
     }
 
     customCardDatabasePathEdit->setText(path);
-    SettingsCache::instance().setCustomCardDatabasePath(path);
+    SettingsCache::instance().paths().setCustomCardDatabasePath(path);
 }
 
 void GeneralSettingsPage::tokenDatabasePathButtonClicked()
@@ -330,16 +336,16 @@ void GeneralSettingsPage::tokenDatabasePathButtonClicked()
     }
 
     tokenDatabasePathEdit->setText(path);
-    SettingsCache::instance().setTokenDatabasePath(path);
+    SettingsCache::instance().paths().setTokenDatabasePath(path);
 }
 
 void GeneralSettingsPage::resetAllPathsClicked()
 {
     SettingsCache &settings = SettingsCache::instance();
     settings.resetPaths();
-    deckPathEdit->setText(settings.getDeckPath());
+    deckPathEdit->setText(settings.paths().getDeckPath());
-    replaysPathEdit->setText(settings.getReplaysPath());
+    replaysPathEdit->setText(settings.paths().getReplaysPath());
-    picsPathEdit->setText(settings.getPicsPath());
+    picsPathEdit->setText(settings.paths().getPicsPath());
     cardDatabasePathEdit->setText(settings.getCardDatabasePath());
     customCardDatabasePathEdit->setText(settings.getCustomCardDatabasePath());
     tokenDatabasePathEdit->setText(settings.getTokenDatabasePath());
@@ -348,7 +354,7 @@ void GeneralSettingsPage::resetAllPathsClicked()
 
 void GeneralSettingsPage::languageBoxChanged(int index)
 {
-    SettingsCache::instance().setLang(languageBox.itemData(index).toString());
+    SettingsCache::instance().personal().setLang(languageBox.itemData(index).toString());
 }
 
 void GeneralSettingsPage::retranslateUi()
@@ -391,7 +397,7 @@ void GeneralSettingsPage::retranslateUi()
 
     const auto &settings = SettingsCache::instance();
 
-    QDate lastCheckDate = settings.getLastCardUpdateCheck();
+    QDate lastCheckDate = settings.updates().getLastCardUpdateCheck();
     int daysAgo = lastCheckDate.daysTo(QDate::currentDate());
 
     lastCardUpdateCheckDateLabel.setText(

cockatrice/src/interface/widgets/settings_page/messages_settings_page.cpp

@@ -6,58 +6,63 @@
 #include <QGridLayout>
 #include <QLineEdit>
 #include <QToolBar>
+#include <libcockatrice/settings/chat_settings.h>
+#include <libcockatrice/settings/message_settings.h>
+#include <libcockatrice/settings/personal_settings.h>
 #include <libcockatrice/utility/string_limits.h>
 
 MessagesSettingsPage::MessagesSettingsPage()
 {
-    chatMentionCheckBox.setChecked(SettingsCache::instance().getChatMention());
+    chatMentionCheckBox.setChecked(SettingsCache::instance().chat().getChatMention());
-    connect(&chatMentionCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+    connect(&chatMentionCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().chat(),
-            &SettingsCache::setChatMention);
+            &ChatSettings::setChatMention);
 
-    chatMentionCompleterCheckbox.setChecked(SettingsCache::instance().getChatMentionCompleter());
+    chatMentionCompleterCheckbox.setChecked(SettingsCache::instance().chat().getChatMentionCompleter());
-    connect(&chatMentionCompleterCheckbox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+    connect(&chatMentionCompleterCheckbox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().chat(),
-            &SettingsCache::setChatMentionCompleter);
+            &ChatSettings::setChatMentionCompleter);
 
     explainMessagesLabel.setTextInteractionFlags(Qt::LinksAccessibleByMouse);
     explainMessagesLabel.setOpenExternalLinks(true);
 
-    ignoreUnregUsersMainChat.setChecked(SettingsCache::instance().getIgnoreUnregisteredUsers());
+    ignoreUnregUsersMainChat.setChecked(SettingsCache::instance().chat().getIgnoreUnregisteredUsers());
-    ignoreUnregUserMessages.setChecked(SettingsCache::instance().getIgnoreUnregisteredUserMessages());
+    ignoreUnregUserMessages.setChecked(SettingsCache::instance().chat().getIgnoreUnregisteredUserMessages());
-    ignoreNonBuddyUserMessages.setChecked(SettingsCache::instance().getIgnoreNonBuddyUserMessages());
+    ignoreNonBuddyUserMessages.setChecked(SettingsCache::instance().chat().getIgnoreNonBuddyUserMessages());
 
-    connect(&ignoreUnregUsersMainChat, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+    connect(&ignoreUnregUsersMainChat, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().chat(),
-            &SettingsCache::setIgnoreUnregisteredUsers);
+            &ChatSettings::setIgnoreUnregisteredUsers);
-    connect(&ignoreUnregUserMessages, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+    connect(&ignoreUnregUserMessages, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().chat(),
-            &SettingsCache::setIgnoreUnregisteredUserMessages);
+            &ChatSettings::setIgnoreUnregisteredUserMessages);
-    connect(&ignoreNonBuddyUserMessages, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+    connect(&ignoreNonBuddyUserMessages, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().chat(),
-            &SettingsCache::setIgnoreNonBuddyUserMessages);
+            &ChatSettings::setIgnoreNonBuddyUserMessages);
 
-    invertMentionForeground.setChecked(SettingsCache::instance().getChatMentionForeground());
+    invertMentionForeground.setChecked(SettingsCache::instance().chat().getChatMentionForeground());
     connect(&invertMentionForeground, &QCheckBox::QT_STATE_CHANGED, this, &MessagesSettingsPage::updateTextColor);
 
-    invertHighlightForeground.setChecked(SettingsCache::instance().getChatHighlightForeground());
+    invertHighlightForeground.setChecked(SettingsCache::instance().chat().getChatHighlightForeground());
     connect(&invertHighlightForeground, &QCheckBox::QT_STATE_CHANGED, this,
             &MessagesSettingsPage::updateTextHighlightColor);
 
     mentionColor = new QLineEdit();
-    mentionColor->setText(SettingsCache::instance().getChatMentionColor());
+    mentionColor->setText(SettingsCache::instance().chat().getChatMentionColor());
     updateMentionPreview();
     connect(mentionColor, &QLineEdit::textChanged, this, &MessagesSettingsPage::updateColor);
 
-    messagePopups.setChecked(SettingsCache::instance().getShowMessagePopup());
+    messagePopups.setChecked(SettingsCache::instance().chat().getShowMessagePopup());
-    connect(&messagePopups, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+    connect(&messagePopups, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().chat(),
-            &SettingsCache::setShowMessagePopups);
+            &ChatSettings::setShowMessagePopups);
 
-    mentionPopups.setChecked(SettingsCache::instance().getShowMentionPopup());
+    mentionPopups.setChecked(SettingsCache::instance().chat().getShowMentionPopup());
-    connect(&mentionPopups, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+    connect(&mentionPopups, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().chat(),
-            &SettingsCache::setShowMentionPopups);
+            &ChatSettings::setShowMentionPopups);
 
-    roomHistory.setChecked(SettingsCache::instance().getRoomHistory());
+    roomHistory.setChecked(SettingsCache::instance().chat().getRoomHistory());
-    connect(&roomHistory, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), &SettingsCache::setRoomHistory);
+    connect(&roomHistory, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().chat(),
+            &ChatSettings::setRoomHistory);
 
     customAlertString = new QLineEdit();
-    customAlertString->setText(SettingsCache::instance().getHighlightWords());
+    customAlertString->setText(SettingsCache::instance().chat().getHighlightWords());
-    connect(customAlertString, &QLineEdit::textChanged, &SettingsCache::instance(), &SettingsCache::setHighlightWords);
+    connect(customAlertString, &QLineEdit::textChanged, &SettingsCache::instance().chat(),
+            &ChatSettings::setHighlightWords);
 
     auto *chatGrid = new QGridLayout;
     chatGrid->addWidget(&chatMentionCheckBox, 0, 0);
@@ -75,7 +80,7 @@ MessagesSettingsPage::MessagesSettingsPage()
     chatGroupBox->setLayout(chatGrid);
 
     highlightColor = new QLineEdit();
-    highlightColor->setText(SettingsCache::instance().getChatHighlightColor());
+    highlightColor->setText(SettingsCache::instance().chat().getChatHighlightColor());
     updateHighlightPreview();
     connect(highlightColor, &QLineEdit::textChanged, this, &MessagesSettingsPage::updateHighlightColor);
 
@@ -132,7 +137,8 @@ MessagesSettingsPage::MessagesSettingsPage()
 
     setLayout(mainLayout);
 
-    connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &MessagesSettingsPage::retranslateUi);
+    connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this,
+            &MessagesSettingsPage::retranslateUi);
     retranslateUi();
 }
 
@@ -145,7 +151,7 @@ void MessagesSettingsPage::updateColor(const QString &value)
     colorToSet.setNamedColor("#" + value);
 #endif
     if (colorToSet.isValid()) {
-        SettingsCache::instance().setChatMentionColor(value);
+        SettingsCache::instance().chat().setChatMentionColor(value);
         updateMentionPreview();
     }
 }
@@ -159,35 +165,35 @@ void MessagesSettingsPage::updateHighlightColor(const QString &value)
     colorToSet.setNamedColor("#" + value);
 #endif
     if (colorToSet.isValid()) {
-        SettingsCache::instance().setChatHighlightColor(value);
+        SettingsCache::instance().chat().setChatHighlightColor(value);
         updateHighlightPreview();
     }
 }
 
 void MessagesSettingsPage::updateTextColor(QT_STATE_CHANGED_T value)
 {
-    SettingsCache::instance().setChatMentionForeground(value);
+    SettingsCache::instance().chat().setChatMentionForeground(value);
     updateMentionPreview();
 }
 
 void MessagesSettingsPage::updateTextHighlightColor(QT_STATE_CHANGED_T value)
 {
-    SettingsCache::instance().setChatHighlightForeground(value);
+    SettingsCache::instance().chat().setChatHighlightForeground(value);
     updateHighlightPreview();
 }
 
 void MessagesSettingsPage::updateMentionPreview()
 {
     mentionColor->setStyleSheet(
-        "QLineEdit{background:#" + SettingsCache::instance().getChatMentionColor() +
+        "QLineEdit{background:#" + SettingsCache::instance().chat().getChatMentionColor() +
-        ";color: " + (SettingsCache::instance().getChatMentionForeground() ? "white" : "black") + ";}");
+        ";color: " + (SettingsCache::instance().chat().getChatMentionForeground() ? "white" : "black") + ";}");
 }
 
 void MessagesSettingsPage::updateHighlightPreview()
 {
     highlightColor->setStyleSheet(
-        "QLineEdit{background:#" + SettingsCache::instance().getChatHighlightColor() +
+        "QLineEdit{background:#" + SettingsCache::instance().chat().getChatHighlightColor() +
-        ";color: " + (SettingsCache::instance().getChatHighlightForeground() ? "white" : "black") + ";}");
+        ";color: " + (SettingsCache::instance().chat().getChatHighlightForeground() ? "white" : "black") + ";}");
 }
 
 void MessagesSettingsPage::storeSettings()

cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.cpp

@@ -2,11 +2,13 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcut_treeview.h"
+#include "../../../client/settings/shortcuts_settings.h"
 #include "../interface/widgets/utility/custom_line_edit.h"
 #include "../interface/widgets/utility/sequence_edit.h"
 
 #include <QAbstractItemView>
 #include <QMessageBox>
+#include <libcockatrice/settings/personal_settings.h>
 
 ShortcutSettingsPage::ShortcutSettingsPage()
 {
@@ -78,7 +80,8 @@ ShortcutSettingsPage::ShortcutSettingsPage()
 
     connect(shortcutsTable, &ShortcutTreeView::currentItemChanged, this, &ShortcutSettingsPage::currentItemChanged);
 
-    connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &ShortcutSettingsPage::retranslateUi);
+    connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this,
+            &ShortcutSettingsPage::retranslateUi);
     retranslateUi();
 }
 

cockatrice/src/interface/widgets/settings_page/sound_settings_page.cpp

@@ -4,14 +4,17 @@
 #include "../client/sound_engine.h"
 
 #include <QGridLayout>
+#include <libcockatrice/settings/personal_settings.h>
+#include <libcockatrice/settings/sound_settings.h>
+#include <libcockatrice/utility/macros.h>
 
 SoundSettingsPage::SoundSettingsPage()
 {
-    soundEnabledCheckBox.setChecked(SettingsCache::instance().getSoundEnabled());
+    soundEnabledCheckBox.setChecked(SettingsCache::instance().sound().getSoundEnabled());
-    connect(&soundEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+    connect(&soundEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().sound(),
-            &SettingsCache::setSoundEnabled);
+            &SoundSettings::setSoundEnabled);
 
-    QString themeName = SettingsCache::instance().getSoundThemeName();
+    QString themeName = SettingsCache::instance().sound().getSoundThemeName();
 
     QStringList themeDirs = soundEngine->getAvailableThemes().keys();
     for (int i = 0; i < themeDirs.size(); i++) {
@@ -27,17 +30,18 @@ SoundSettingsPage::SoundSettingsPage()
     masterVolumeSlider = new QSlider(Qt::Horizontal);
     masterVolumeSlider->setMinimum(0);
     masterVolumeSlider->setMaximum(100);
-    masterVolumeSlider->setValue(SettingsCache::instance().getMasterVolume());
+    masterVolumeSlider->setValue(SettingsCache::instance().sound().getMasterVolume());
-    masterVolumeSlider->setToolTip(QString::number(SettingsCache::instance().getMasterVolume()));
+    masterVolumeSlider->setToolTip(QString::number(SettingsCache::instance().sound().getMasterVolume()));
-    connect(&SettingsCache::instance(), &SettingsCache::masterVolumeChanged, this,
+    connect(&SettingsCache::instance().sound(), &SoundSettings::masterVolumeChanged, this,
             &SoundSettingsPage::masterVolumeChanged);
     connect(masterVolumeSlider, &QSlider::sliderReleased, soundEngine, &SoundEngine::testSound);
-    connect(masterVolumeSlider, &QSlider::valueChanged, &SettingsCache::instance(), &SettingsCache::setMasterVolume);
+    connect(masterVolumeSlider, &QSlider::valueChanged, &SettingsCache::instance().sound(),
+            &SoundSettings::setMasterVolume);
 
     masterVolumeSpinBox = new QSpinBox();
     masterVolumeSpinBox->setMinimum(0);
     masterVolumeSpinBox->setMaximum(100);
-    masterVolumeSpinBox->setValue(SettingsCache::instance().getMasterVolume());
+    masterVolumeSpinBox->setValue(SettingsCache::instance().sound().getMasterVolume());
     connect(masterVolumeSlider, &QSlider::valueChanged, masterVolumeSpinBox, &QSpinBox::setValue);
     connect(masterVolumeSpinBox, qOverload<int>(&QSpinBox::valueChanged), masterVolumeSlider, &QSlider::setValue);
 
@@ -59,7 +63,8 @@ SoundSettingsPage::SoundSettingsPage()
 
     setLayout(mainLayout);
 
-    connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &SoundSettingsPage::retranslateUi);
+    connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this,
+            &SoundSettingsPage::retranslateUi);
     retranslateUi();
 }
 
@@ -67,7 +72,7 @@ void SoundSettingsPage::themeBoxChanged(int index)
 {
     QStringList themeDirs = soundEngine->getAvailableThemes().keys();
     if (index >= 0 && index < themeDirs.count()) {
-        SettingsCache::instance().setSoundThemeName(themeDirs.at(index));
+        SettingsCache::instance().sound().setSoundThemeName(themeDirs.at(index));
     }
 }
 

cockatrice/src/interface/widgets/settings_page/storage_settings_page.cpp

@@ -1,11 +1,16 @@
 #include "storage_settings_page.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../../card_picture_loader/card_picture_loader_cache_method.h"
+#include "../../card_picture_loader/card_picture_loader_local_schemes.h"
 #include "../interface/card_picture_loader/card_picture_loader.h"
 
 #include <QDir>
 #include <QGridLayout>
 #include <QMessageBox>
+#include <libcockatrice/settings/cache_storage_settings.h>
+#include <libcockatrice/settings/paths_settings.h>
+#include <libcockatrice/settings/personal_settings.h>
 
 StorageSettingsPage::StorageSettingsPage()
 {
@@ -27,7 +32,7 @@ StorageSettingsPage::StorageSettingsPage()
     // 2047 is the max value to avoid overflowing of QPixmapCache::setCacheLimit(int size)
     pixmapCacheEdit.setMaximum(PIXMAPCACHE_SIZE_MAX);
     pixmapCacheEdit.setSingleStep(64);
-    pixmapCacheEdit.setValue(SettingsCache::instance().getPixmapCacheSize());
+    pixmapCacheEdit.setValue(SettingsCache::instance().cacheStorage().getPixmapCacheSize());
     pixmapCacheEdit.setSuffix(" MB");
 
     // Caching method
@@ -37,7 +42,8 @@ StorageSettingsPage::StorageSettingsPage()
         cardPictureLoaderCacheMethodComboBox->addItem(method.displayName, static_cast<int>(method.id));
     }
 
-    int currentCacheMethod = static_cast<int>(SettingsCache::instance().getCardPictureLoaderCacheMethod());
+    int currentCacheMethod =
+        static_cast<int>(SettingsCache::instance().cacheStorage().getCardPictureLoaderCacheMethod());
 
     int currentIndex = cardPictureLoaderCacheMethodComboBox->findData(currentCacheMethod);
     if (currentIndex >= 0) {
@@ -60,7 +66,7 @@ StorageSettingsPage::StorageSettingsPage()
                 mpNetworkCacheGroupBox->setEnabled(useNetworkCache);
                 mpImageBackupGroupBox->setEnabled(!useNetworkCache);
 
-                SettingsCache::instance().setCardImageCacheMethod(cacheMethod);
+                SettingsCache::instance().cacheStorage().setCardImageCacheMethod(static_cast<int>(cacheMethod));
             });
 
     // Network Cache
@@ -68,13 +74,13 @@ StorageSettingsPage::StorageSettingsPage()
     networkCacheEdit.setMinimum(NETWORK_CACHE_SIZE_MIN);
     networkCacheEdit.setMaximum(NETWORK_CACHE_SIZE_MAX);
     networkCacheEdit.setSingleStep(1);
-    networkCacheEdit.setValue(SettingsCache::instance().getNetworkCacheSizeInMB());
+    networkCacheEdit.setValue(SettingsCache::instance().cacheStorage().getNetworkCacheSizeInMB());
     networkCacheEdit.setSuffix(" MB");
 
     networkRedirectCacheTtlEdit.setMinimum(NETWORK_REDIRECT_CACHE_TTL_MIN);
     networkRedirectCacheTtlEdit.setMaximum(NETWORK_REDIRECT_CACHE_TTL_MAX);
     networkRedirectCacheTtlEdit.setSingleStep(1);
-    networkRedirectCacheTtlEdit.setValue(SettingsCache::instance().getRedirectCacheTtl());
+    networkRedirectCacheTtlEdit.setValue(SettingsCache::instance().cacheStorage().getRedirectCacheTtl());
 
     // Image Backup
     localCardImageStorageNamingSchemeComboBox = new QComboBox;
@@ -82,7 +88,7 @@ StorageSettingsPage::StorageSettingsPage()
         localCardImageStorageNamingSchemeComboBox->addItem(scheme.displayName, static_cast<int>(scheme.id));
     }
 
-    int current = static_cast<int>(SettingsCache::instance().getLocalCardImageStorageNamingScheme());
+    int current = static_cast<int>(SettingsCache::instance().cacheStorage().getLocalCardImageStorageNamingScheme());
 
     int index = localCardImageStorageNamingSchemeComboBox->findData(current);
     if (index >= 0) {
@@ -93,7 +99,7 @@ StorageSettingsPage::StorageSettingsPage()
             [this](int index) {
                 auto scheme = static_cast<CardPictureLoaderLocalSchemes::NamingScheme>(
                     localCardImageStorageNamingSchemeComboBox->itemData(index).toInt());
-                SettingsCache::instance().setLocalCardImageStorageNamingScheme(scheme);
+                SettingsCache::instance().cacheStorage().setLocalCardImageStorageNamingScheme(static_cast<int>(scheme));
             });
 
     connect(&clearBackupsButton, &QPushButton::clicked, this, &StorageSettingsPage::clearImageBackupsButtonClicked);
@@ -132,12 +138,12 @@ StorageSettingsPage::StorageSettingsPage()
     lpPixmapCacheGrid->addWidget(&pixmapCacheExplainerLabel, 0, 0);
     lpPixmapCacheGrid->addLayout(pixmapCacheLayout, 1, 0);
 
-    connect(&pixmapCacheEdit, qOverload<int>(&QSpinBox::valueChanged), &SettingsCache::instance(),
+    connect(&pixmapCacheEdit, qOverload<int>(&QSpinBox::valueChanged), &SettingsCache::instance().cacheStorage(),
-            &SettingsCache::setPixmapCacheSize);
+            &CacheStorageSettings::setPixmapCacheSize);
-    connect(&networkCacheEdit, qOverload<int>(&QSpinBox::valueChanged), &SettingsCache::instance(),
+    connect(&networkCacheEdit, qOverload<int>(&QSpinBox::valueChanged), &SettingsCache::instance().cacheStorage(),
-            &SettingsCache::setNetworkCacheSizeInMB);
+            &CacheStorageSettings::setNetworkCacheSizeInMB);
-    connect(&networkRedirectCacheTtlEdit, qOverload<int>(&QSpinBox::valueChanged), &SettingsCache::instance(),
+    connect(&networkRedirectCacheTtlEdit, qOverload<int>(&QSpinBox::valueChanged),
-            &SettingsCache::setNetworkRedirectCacheTtl);
+            &SettingsCache::instance().cacheStorage(), &CacheStorageSettings::setNetworkRedirectCacheTtl);
 
     mpCacheMethodGroupBox = new QGroupBox;
     mpCacheMethodGroupBox->setLayout(cacheMethodLayout);
@@ -161,13 +167,15 @@ StorageSettingsPage::StorageSettingsPage()
 
     setLayout(lpMainLayout);
 
-    bool useNetworkCache = SettingsCache::instance().getCardPictureLoaderCacheMethod() ==
+    bool useNetworkCache = static_cast<CardPictureLoaderCacheMethod::CacheMethod>(
+                               SettingsCache::instance().cacheStorage().getCardPictureLoaderCacheMethod()) ==
                            CardPictureLoaderCacheMethod::CacheMethod::NETWORK_CACHE;
 
     mpNetworkCacheGroupBox->setEnabled(useNetworkCache);
     mpImageBackupGroupBox->setEnabled(!useNetworkCache);
 
-    connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &StorageSettingsPage::retranslateUi);
+    connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this,
+            &StorageSettingsPage::retranslateUi);
     retranslateUi();
 }
 
@@ -180,7 +188,7 @@ void StorageSettingsPage::clearDownloadedPicsButtonClicked()
 
 void StorageSettingsPage::clearImageBackupsButtonClicked()
 {
-    QString picsPath = SettingsCache::instance().getPicsPath() + "/downloadedPics";
+    QString picsPath = SettingsCache::instance().paths().getPicsPath() + "/downloadedPics";
 
     QDir dir(picsPath);
     bool success = dir.removeRecursively();

cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.cpp

@@ -4,6 +4,10 @@
 #include "../interface/widgets/tabs/tab_supervisor.h"
 
 #include <QGridLayout>
+#include <libcockatrice/settings/cards_display_settings.h>
+#include <libcockatrice/settings/interface_settings.h>
+#include <libcockatrice/settings/personal_settings.h>
+#include <libcockatrice/settings/visual_deck_storage_settings.h>
 
 enum visualDeckStoragePromptForConversionIndex
 {
@@ -15,66 +19,71 @@ enum visualDeckStoragePromptForConversionIndex
 UserInterfaceSettingsPage::UserInterfaceSettingsPage()
 {
     // general settings and notification settings
-    notificationsEnabledCheckBox.setChecked(SettingsCache::instance().getNotificationsEnabled());
+    notificationsEnabledCheckBox.setChecked(SettingsCache::instance().interface().getNotificationsEnabled());
-    connect(&notificationsEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+    connect(&notificationsEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().interface(),
-            &SettingsCache::setNotificationsEnabled);
+            &InterfaceSettings::setNotificationsEnabled);
     connect(&notificationsEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, this,
             &UserInterfaceSettingsPage::setNotificationEnabled);
 
-    specNotificationsEnabledCheckBox.setChecked(SettingsCache::instance().getSpectatorNotificationsEnabled());
+    specNotificationsEnabledCheckBox.setChecked(
-    specNotificationsEnabledCheckBox.setEnabled(SettingsCache::instance().getNotificationsEnabled());
+        SettingsCache::instance().interface().getSpectatorNotificationsEnabled());
-    connect(&specNotificationsEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+    specNotificationsEnabledCheckBox.setEnabled(SettingsCache::instance().interface().getNotificationsEnabled());
-            &SettingsCache::setSpectatorNotificationsEnabled);
+    connect(&specNotificationsEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().interface(),
+            &InterfaceSettings::setSpectatorNotificationsEnabled);
 
     buddyConnectNotificationsEnabledCheckBox.setChecked(
-        SettingsCache::instance().getBuddyConnectNotificationsEnabled());
+        SettingsCache::instance().interface().getBuddyConnectNotificationsEnabled());
-    buddyConnectNotificationsEnabledCheckBox.setEnabled(SettingsCache::instance().getNotificationsEnabled());
+    buddyConnectNotificationsEnabledCheckBox.setEnabled(
-    connect(&buddyConnectNotificationsEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+        SettingsCache::instance().interface().getNotificationsEnabled());
-            &SettingsCache::setBuddyConnectNotificationsEnabled);
+    connect(&buddyConnectNotificationsEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED,
+            &SettingsCache::instance().interface(), &InterfaceSettings::setBuddyConnectNotificationsEnabled);
 
-    doubleClickToPlayCheckBox.setChecked(SettingsCache::instance().getDoubleClickToPlay());
+    doubleClickToPlayCheckBox.setChecked(SettingsCache::instance().interface().getDoubleClickToPlay());
-    connect(&doubleClickToPlayCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+    connect(&doubleClickToPlayCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().interface(),
-            &SettingsCache::setDoubleClickToPlay);
+            &InterfaceSettings::setDoubleClickToPlay);
 
-    clickPlaysAllSelectedCheckBox.setChecked(SettingsCache::instance().getClickPlaysAllSelected());
+    clickPlaysAllSelectedCheckBox.setChecked(SettingsCache::instance().interface().getClickPlaysAllSelected());
-    connect(&clickPlaysAllSelectedCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+    connect(&clickPlaysAllSelectedCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().interface(),
-            &SettingsCache::setClickPlaysAllSelected);
+            &InterfaceSettings::setClickPlaysAllSelected);
 
-    playToStackCheckBox.setChecked(SettingsCache::instance().getPlayToStack());
+    playToStackCheckBox.setChecked(SettingsCache::instance().interface().getPlayToStack());
-    connect(&playToStackCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+    connect(&playToStackCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().interface(),
-            &SettingsCache::setPlayToStack);
+            &InterfaceSettings::setPlayToStack);
 
-    doNotDeleteArrowsInSubPhasesCheckBox.setChecked(SettingsCache::instance().getDoNotDeleteArrowsInSubPhases());
+    doNotDeleteArrowsInSubPhasesCheckBox.setChecked(
-    connect(&doNotDeleteArrowsInSubPhasesCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+        SettingsCache::instance().interface().getDoNotDeleteArrowsInSubPhases());
-            &SettingsCache::setDoNotDeleteArrowsInSubPhases);
+    connect(&doNotDeleteArrowsInSubPhasesCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().interface(),
+            &InterfaceSettings::setDoNotDeleteArrowsInSubPhases);
 
-    closeEmptyCardViewCheckBox.setChecked(SettingsCache::instance().getCloseEmptyCardView());
+    closeEmptyCardViewCheckBox.setChecked(SettingsCache::instance().interface().getCloseEmptyCardView());
-    connect(&closeEmptyCardViewCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+    connect(&closeEmptyCardViewCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().interface(),
-            &SettingsCache::setCloseEmptyCardView);
+            &InterfaceSettings::setCloseEmptyCardView);
 
-    focusCardViewSearchBarCheckBox.setChecked(SettingsCache::instance().getFocusCardViewSearchBar());
+    focusCardViewSearchBarCheckBox.setChecked(SettingsCache::instance().interface().getFocusCardViewSearchBar());
-    connect(&focusCardViewSearchBarCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+    connect(&focusCardViewSearchBarCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().interface(),
-            &SettingsCache::setFocusCardViewSearchBar);
+            &InterfaceSettings::setFocusCardViewSearchBar);
 
-    annotateTokensCheckBox.setChecked(SettingsCache::instance().getAnnotateTokens());
+    annotateTokensCheckBox.setChecked(SettingsCache::instance().interface().getAnnotateTokens());
-    connect(&annotateTokensCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+    connect(&annotateTokensCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().interface(),
-            &SettingsCache::setAnnotateTokens);
+            &InterfaceSettings::setAnnotateTokens);
 
-    showDragSelectionCountCheckBox.setChecked(SettingsCache::instance().getShowDragSelectionCount());
+    showDragSelectionCountCheckBox.setChecked(SettingsCache::instance().interface().getShowDragSelectionCount());
-    connect(&showDragSelectionCountCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+    connect(&showDragSelectionCountCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().interface(),
-            &SettingsCache::setShowDragSelectionCount);
+            &InterfaceSettings::setShowDragSelectionCount);
 
-    showTotalSelectionCountCheckBox.setChecked(SettingsCache::instance().getShowTotalSelectionCount());
+    showTotalSelectionCountCheckBox.setChecked(SettingsCache::instance().interface().getShowTotalSelectionCount());
-    connect(&showTotalSelectionCountCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+    connect(&showTotalSelectionCountCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().interface(),
-            &SettingsCache::setShowTotalSelectionCount);
+            &InterfaceSettings::setShowTotalSelectionCount);
 
-    useTearOffMenusCheckBox.setChecked(SettingsCache::instance().getUseTearOffMenus());
+    useTearOffMenusCheckBox.setChecked(SettingsCache::instance().interface().getUseTearOffMenus());
-    connect(&useTearOffMenusCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+    connect(&useTearOffMenusCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().interface(),
-            [](const QT_STATE_CHANGED_T state) { SettingsCache::instance().setUseTearOffMenus(state == Qt::Checked); });
+            [](const QT_STATE_CHANGED_T state) {
+                SettingsCache::instance().interface().setUseTearOffMenus(state == Qt::Checked);
+            });
 
-    keepGameChatFocusCheckBox.setChecked(SettingsCache::instance().getKeepGameChatFocus());
+    keepGameChatFocusCheckBox.setChecked(SettingsCache::instance().interface().getKeepGameChatFocus());
-    connect(&keepGameChatFocusCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+    connect(&keepGameChatFocusCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().interface(),
-            &SettingsCache::setKeepGameChatFocus);
+            &InterfaceSettings::setKeepGameChatFocus);
 
     auto *generalGrid = new QGridLayout;
     generalGrid->addWidget(&doubleClickToPlayCheckBox, 0, 0);
@@ -101,9 +110,9 @@ UserInterfaceSettingsPage::UserInterfaceSettingsPage()
     notificationsGroupBox->setLayout(notificationsGrid);
 
     // animation settings
-    tapAnimationCheckBox.setChecked(SettingsCache::instance().getTapAnimation());
+    tapAnimationCheckBox.setChecked(SettingsCache::instance().cardsDisplay().getTapAnimation());
-    connect(&tapAnimationCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+    connect(&tapAnimationCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().cardsDisplay(),
-            &SettingsCache::setTapAnimation);
+            &CardsDisplaySettings::setTapAnimation);
 
     auto *animationGrid = new QGridLayout;
     animationGrid->addWidget(&tapAnimationCheckBox, 0, 0);
@@ -112,42 +121,45 @@ UserInterfaceSettingsPage::UserInterfaceSettingsPage()
     animationGroupBox->setLayout(animationGrid);
 
     // deck editor settings
-    openDeckInNewTabCheckBox.setChecked(SettingsCache::instance().getOpenDeckInNewTab());
+    openDeckInNewTabCheckBox.setChecked(SettingsCache::instance().interface().getOpenDeckInNewTab());
-    connect(&openDeckInNewTabCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+    connect(&openDeckInNewTabCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().interface(),
-            &SettingsCache::setOpenDeckInNewTab);
+            &InterfaceSettings::setOpenDeckInNewTab);
 
-    visualDeckStorageInGameCheckBox.setChecked(SettingsCache::instance().getVisualDeckStorageInGame());
+    visualDeckStorageInGameCheckBox.setChecked(
-    connect(&visualDeckStorageInGameCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+        SettingsCache::instance().visualDeckStorage().getVisualDeckStorageInGame());
-            &SettingsCache::setVisualDeckStorageInGame);
+    connect(&visualDeckStorageInGameCheckBox, &QCheckBox::QT_STATE_CHANGED,
+            &SettingsCache::instance().visualDeckStorage(), &VisualDeckStorageSettings::setVisualDeckStorageInGame);
 
     visualDeckStorageSelectionAnimationCheckBox.setChecked(
-        SettingsCache::instance().getVisualDeckStorageSelectionAnimation());
+        SettingsCache::instance().visualDeckStorage().getVisualDeckStorageSelectionAnimation());
-    connect(&visualDeckStorageSelectionAnimationCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+    connect(&visualDeckStorageSelectionAnimationCheckBox, &QCheckBox::QT_STATE_CHANGED,
-            &SettingsCache::setVisualDeckStorageSelectionAnimation);
+            &SettingsCache::instance().visualDeckStorage(),
+            &VisualDeckStorageSettings::setVisualDeckStorageSelectionAnimation);
 
     visualDeckStoragePromptForConversionSelector.addItem(""); // these will be set in retranslateUI
     visualDeckStoragePromptForConversionSelector.addItem("");
     visualDeckStoragePromptForConversionSelector.addItem("");
-    if (SettingsCache::instance().getVisualDeckStoragePromptForConversion()) {
+    if (SettingsCache::instance().visualDeckStorage().getVisualDeckStoragePromptForConversion()) {
         visualDeckStoragePromptForConversionSelector.setCurrentIndex(visualDeckStoragePromptForConversionIndexPrompt);
-    } else if (SettingsCache::instance().getVisualDeckStorageAlwaysConvert()) {
+    } else if (SettingsCache::instance().visualDeckStorage().getVisualDeckStorageAlwaysConvert()) {
         visualDeckStoragePromptForConversionSelector.setCurrentIndex(visualDeckStoragePromptForConversionIndexAlways);
     } else {
         visualDeckStoragePromptForConversionSelector.setCurrentIndex(visualDeckStoragePromptForConversionIndexNone);
     }
     connect(&visualDeckStoragePromptForConversionSelector, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
             [](int index) {
-                SettingsCache::instance().setVisualDeckStoragePromptForConversion(
+                SettingsCache::instance().visualDeckStorage().setVisualDeckStoragePromptForConversion(
                     index == visualDeckStoragePromptForConversionIndexPrompt);
-                SettingsCache::instance().setVisualDeckStorageAlwaysConvert(
+                SettingsCache::instance().visualDeckStorage().setVisualDeckStorageAlwaysConvert(
                     index == visualDeckStoragePromptForConversionIndexAlways);
             });
 
     defaultDeckEditorTypeSelector.addItem(""); // these will be set in retranslateUI
     defaultDeckEditorTypeSelector.addItem("");
-    defaultDeckEditorTypeSelector.setCurrentIndex(SettingsCache::instance().getDefaultDeckEditorType());
+    defaultDeckEditorTypeSelector.setCurrentIndex(
+        SettingsCache::instance().visualDeckStorage().getDefaultDeckEditorType());
     connect(&defaultDeckEditorTypeSelector, QOverload<int>::of(&QComboBox::currentIndexChanged),
-            &SettingsCache::instance(), &SettingsCache::setDefaultDeckEditorType);
+            &SettingsCache::instance().visualDeckStorage(), &VisualDeckStorageSettings::setDefaultDeckEditorType);
 
     auto *deckEditorGrid = new QGridLayout;
     deckEditorGrid->addWidget(&openDeckInNewTabCheckBox, 0, 0);
@@ -163,9 +175,9 @@ UserInterfaceSettingsPage::UserInterfaceSettingsPage()
 
     // replay settings
     rewindBufferingMsBox.setRange(0, 9999);
-    rewindBufferingMsBox.setValue(SettingsCache::instance().getRewindBufferingMs());
+    rewindBufferingMsBox.setValue(SettingsCache::instance().interface().getRewindBufferingMs());
-    connect(&rewindBufferingMsBox, qOverload<int>(&QSpinBox::valueChanged), &SettingsCache::instance(),
+    connect(&rewindBufferingMsBox, qOverload<int>(&QSpinBox::valueChanged), &SettingsCache::instance().interface(),
-            &SettingsCache::setRewindBufferingMs);
+            &InterfaceSettings::setRewindBufferingMs);
 
     auto *replayGrid = new QGridLayout;
     replayGrid->addWidget(&rewindBufferingMsLabel, 0, 0, 1, 1);
@@ -185,7 +197,8 @@ UserInterfaceSettingsPage::UserInterfaceSettingsPage()
 
     setLayout(mainLayout);
 
-    connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &UserInterfaceSettingsPage::retranslateUi);
+    connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this,
+            &UserInterfaceSettingsPage::retranslateUi);
     retranslateUi();
 }
 

cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp

@@ -10,6 +10,7 @@
 #include "abstract_tab_deck_editor.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../../../client/settings/shortcuts_settings.h"
 #include "../client/network/interfaces/deck_stats_interface.h"
 #include "../client/network/interfaces/tapped_out_interface.h"
 #include "../deck_editor/deck_state_manager.h"
@@ -43,6 +44,9 @@
 #include <libcockatrice/protocol/pb/command_deck_upload.pb.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
+#include <libcockatrice/settings/interface_settings.h>
+#include <libcockatrice/settings/paths_settings.h>
+#include <libcockatrice/settings/recents_settings.h>
 #include <libcockatrice/utility/string_limits.h>
 
 /**
@@ -199,7 +203,7 @@ void AbstractTabDeckEditor::cleanDeckAndResetModified()
  */
 AbstractTabDeckEditor::DeckOpenLocation AbstractTabDeckEditor::confirmOpen(const bool openInSameTabIfBlank)
 {
-    if (SettingsCache::instance().getOpenDeckInNewTab()) {
+    if (SettingsCache::instance().interface().getOpenDeckInNewTab()) {
         if (openInSameTabIfBlank && deckStateManager->isBlankNewDeck()) {
             return SAME_TAB;
         } else {
@@ -350,7 +354,7 @@ bool AbstractTabDeckEditor::actSaveDeckAs()
     DeckList deckList = deckStateManager->getDeckList();
 
     QFileDialog dialog(this, tr("Save deck"));
-    dialog.setDirectory(SettingsCache::instance().getDeckPath());
+    dialog.setDirectory(SettingsCache::instance().paths().getDeckPath());
     dialog.setAcceptMode(QFileDialog::AcceptSave);
     dialog.setDefaultSuffix("cod");
     dialog.setNameFilters(DeckLoader::FILE_NAME_FILTERS);

cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp

@@ -27,6 +27,7 @@
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/models/database/card/card_completer_proxy_model.h>
 #include <libcockatrice/models/database/card/card_search_model.h>
+#include <libcockatrice/settings/visual_deck_storage_settings.h>
 #include <version_string.h>
 
 TabArchidekt::TabArchidekt(TabSupervisor *_tabSupervisor)
@@ -131,7 +132,8 @@ void TabArchidekt::initializeUi()
 
     // Settings
     settingsButton = new SettingsButtonWidget(primaryToolbar);
-    cardSizeSlider = new CardSizeWidget(primaryToolbar, nullptr, SettingsCache::instance().getArchidektPreviewSize());
+    cardSizeSlider = new CardSizeWidget(primaryToolbar, nullptr,
+                                        SettingsCache::instance().visualDeckStorage().getArchidektPreviewSize());
     settingsButton->addSettingsWidget(cardSizeSlider);
 
     // Assemble primary toolbar
@@ -337,8 +339,8 @@ void TabArchidekt::connectSignals()
         doSearch();
     });
 
-    connect(cardSizeSlider, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance(),
+    connect(cardSizeSlider, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance().visualDeckStorage(),
-            &SettingsCache::setArchidektPreviewCardSize);
+            &VisualDeckStorageSettings::setArchidektPreviewCardSize);
 
     // Search button triggers immediate search
     connect(searchButton, &QPushButton::clicked, this, &TabArchidekt::doSearchImmediate);

cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp

@@ -25,6 +25,7 @@
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/models/database/card/card_completer_proxy_model.h>
 #include <libcockatrice/models/database/card/card_search_model.h>
+#include <libcockatrice/settings/visual_deck_storage_settings.h>
 #include <version_string.h>
 
 static bool canBeCommander(const CardInfoPtr &cardInfo)
@@ -94,9 +95,10 @@ TabEdhRecMain::TabEdhRecMain(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor
 
     settingsButton = new SettingsButtonWidget(this);
 
-    cardSizeSlider = new CardSizeWidget(this, nullptr, SettingsCache::instance().getEDHRecCardSize());
+    cardSizeSlider =
-    connect(cardSizeSlider, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance(),
+        new CardSizeWidget(this, nullptr, SettingsCache::instance().visualDeckStorage().getEDHRecCardSize());
-            &SettingsCache::setEDHRecCardSize);
+    connect(cardSizeSlider, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance().visualDeckStorage(),
+            &VisualDeckStorageSettings::setEDHRecCardSize);
 
     settingsButton->addSettingsWidget(cardSizeSlider);
 

cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp

@@ -1,6 +1,7 @@
 #include "tab_deck_editor.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../../../client/settings/shortcuts_settings.h"
 #include "../deck_editor/deck_state_manager.h"
 #include "../filters/filter_builder.h"
 #include "../interface/pixel_map_generator.h"
@@ -21,6 +22,8 @@
 #include <libcockatrice/models/database/card_database_model.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pending_command.h>
+#include <libcockatrice/settings/cards_display_settings.h>
+#include <libcockatrice/settings/layouts_settings.h>
 
 /**
  * @brief Constructs a new TabDeckEditor object.
@@ -59,7 +62,8 @@ void TabDeckEditor::createMenus()
     registerDockWidget(viewMenu, filterDockWidget, {250, 250});
     registerDockWidget(viewMenu, printingSelectorDockWidget, {525, 250});
 
-    connect(&SettingsCache::instance(), &SettingsCache::overrideAllCardArtWithPersonalPreferenceChanged, this,
+    connect(&SettingsCache::instance().cardsDisplay(),
+            &CardsDisplaySettings::overrideAllCardArtWithPersonalPreferenceChanged, this,
             [this](bool enabled) { dockToActions[printingSelectorDockWidget].menu->setEnabled(!enabled); });
 
     viewMenu->addSeparator();

cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp

@@ -28,6 +28,7 @@
 #include <libcockatrice/protocol/pb/response_deck_download.pb.h>
 #include <libcockatrice/protocol/pb/response_deck_upload.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
+#include <libcockatrice/settings/paths_settings.h>
 #include <libcockatrice/utility/string_limits.h>
 
 TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor,
@@ -36,7 +37,7 @@ TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor,
     : Tab(_tabSupervisor), client(_client)
 {
     localDirModel = new QFileSystemModel(this);
-    localDirModel->setRootPath(SettingsCache::instance().getDeckPath());
+    localDirModel->setRootPath(SettingsCache::instance().paths().getDeckPath());
     localDirModel->sort(0, Qt::AscendingOrder);
 
     localDirView = new QTreeView;

cockatrice/src/interface/widgets/tabs/tab_game.cpp

@@ -1,6 +1,7 @@
 #include "tab_game.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../../../client/settings/shortcuts_settings.h"
 #include "../game/game.h"
 #include "../game/player/player_logic.h"
 #include "../game/replay.h"
@@ -44,6 +45,10 @@
 #include <libcockatrice/protocol/pb/game_replay.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_player.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
+#include <libcockatrice/settings/chat_settings.h>
+#include <libcockatrice/settings/debug_settings.h>
+#include <libcockatrice/settings/interface_settings.h>
+#include <libcockatrice/settings/layouts_settings.h>
 #include <libcockatrice/utility/string_limits.h>
 
 TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
@@ -252,8 +257,8 @@ void TabGame::resetChatAndPhase()
 
 void TabGame::emitUserEvent()
 {
-    bool globalEvent =
+    bool globalEvent = !game->getPlayerManager()->isSpectator() ||
-        !game->getPlayerManager()->isSpectator() || SettingsCache::instance().getSpectatorNotificationsEnabled();
+                       SettingsCache::instance().interface().getSpectatorNotificationsEnabled();
     emit userEvent(globalEvent);
     updatePlayerListDockTitle();
 }
@@ -626,8 +631,8 @@ void TabGame::actRotateViewCCW()
 
 void TabGame::actCompleterChanged()
 {
-    SettingsCache::instance().getChatMentionCompleter() ? completer->setCompletionRole(2)
+    SettingsCache::instance().chat().getChatMentionCompleter() ? completer->setCompletionRole(2)
-                                                        : completer->setCompletionRole(1);
+                                                               : completer->setCompletionRole(1);
 }
 
 void TabGame::notifyPlayerJoin(QString playerName)
@@ -1265,7 +1270,7 @@ void TabGame::createMessageDock(bool bReplay)
     if (!bReplay) {
         connect(messageLog, &MessageLogWidget::openMessageDialog, this, &TabGame::openMessageDialog);
         connect(messageLog, &MessageLogWidget::addMentionTag, this, &TabGame::addMentionTag);
-        connect(&SettingsCache::instance(), &SettingsCache::chatMentionCompleterChanged, this,
+        connect(&SettingsCache::instance().chat(), &ChatSettings::chatMentionCompleterChanged, this,
                 &TabGame::actCompleterChanged);
     }
 

cockatrice/src/interface/widgets/tabs/tab_message.cpp

@@ -17,6 +17,7 @@
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <libcockatrice/protocol/pb/session_commands.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
+#include <libcockatrice/settings/chat_settings.h>
 #include <libcockatrice/utility/string_limits.h>
 
 TabMessage::TabMessage(TabSupervisor *_tabSupervisor,
@@ -126,7 +127,7 @@ void TabMessage::processUserMessageEvent(const Event_UserMessage &event)
     if (tabSupervisor->currentIndex() != tabSupervisor->indexOf(this)) {
         soundEngine->playSound("private_message");
     }
-    if (SettingsCache::instance().getShowMessagePopup() && shouldShowSystemPopup(event)) {
+    if (SettingsCache::instance().chat().getShowMessagePopup() && shouldShowSystemPopup(event)) {
         showSystemPopup(event);
     }
     if (QString::fromStdString(event.sender_name()).toLower().simplified() == "servatrice") {

cockatrice/src/interface/widgets/tabs/tab_replays.cpp

@@ -29,6 +29,7 @@
 #include <libcockatrice/protocol/pb/response_replay_download.pb.h>
 #include <libcockatrice/protocol/pb/response_replay_get_code.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
+#include <libcockatrice/settings/paths_settings.h>
 
 inline Q_LOGGING_CATEGORY(TabReplaysLog, "replays_tab");
 
@@ -59,7 +60,7 @@ TabReplays::TabReplays(TabSupervisor *_tabSupervisor, AbstractClient *_client, c
 QGroupBox *TabReplays::createLeftLayout()
 {
     localDirModel = new QFileSystemModel(this);
-    localDirModel->setRootPath(SettingsCache::instance().getReplaysPath());
+    localDirModel->setRootPath(SettingsCache::instance().paths().getReplaysPath());
     localDirModel->sort(0, Qt::AscendingOrder);
 
     localDirView = new QTreeView;

cockatrice/src/interface/widgets/tabs/tab_room.cpp

@@ -1,6 +1,7 @@
 #include "tab_room.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../../../client/settings/shortcuts_settings.h"
 #include "../interface/widgets/dialogs/dlg_settings.h"
 #include "../interface/widgets/server/chat_view/chat_view.h"
 #include "../interface/widgets/server/game_selector.h"
@@ -31,6 +32,7 @@
 #include <libcockatrice/protocol/pb/room_commands.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_room.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
+#include <libcockatrice/settings/chat_settings.h>
 #include <libcockatrice/utility/string_limits.h>
 
 TabRoom::TabRoom(TabSupervisor *_tabSupervisor,
@@ -75,7 +77,7 @@ TabRoom::TabRoom(TabSupervisor *_tabSupervisor,
     connect(chatView, &ChatView::showCardInfoPopup, this, &TabRoom::showCardInfoPopup);
     connect(chatView, &ChatView::deleteCardInfoPopup, this, &TabRoom::deleteCardInfoPopup);
     connect(chatView, &ChatView::addMentionTag, this, &TabRoom::addMentionTag);
-    connect(&SettingsCache::instance(), &SettingsCache::chatMentionCompleterChanged, this,
+    connect(&SettingsCache::instance().chat(), &ChatSettings::chatMentionCompleterChanged, this,
             &TabRoom::actCompleterChanged);
     sayLabel = new QLabel;
     sayEdit = new LineEditCompleter;
@@ -246,8 +248,8 @@ void TabRoom::actOpenChatSettings()
 
 void TabRoom::actCompleterChanged()
 {
-    SettingsCache::instance().getChatMentionCompleter() ? completer->setCompletionRole(2)
+    SettingsCache::instance().chat().getChatMentionCompleter() ? completer->setCompletionRole(2)
-                                                        : completer->setCompletionRole(1);
+                                                               : completer->setCompletionRole(1);
 }
 
 void TabRoom::processRoomEvent(const RoomEvent &event)
@@ -307,13 +309,13 @@ void TabRoom::processRoomSayEvent(const Event_RoomSay &event)
     ServerInfo_User userInfo = {};
     if (twi) {
         userInfo = twi->getUserInfo();
-        if (SettingsCache::instance().getIgnoreUnregisteredUsers() &&
+        if (SettingsCache::instance().chat().getIgnoreUnregisteredUsers() &&
             !UserLevelFlags(userInfo.user_level()).testFlag(ServerInfo_User::IsRegistered)) {
             return;
         }
     }
 
-    if (event.message_type() == Event_RoomSay::ChatHistory && !SettingsCache::instance().getRoomHistory()) {
+    if (event.message_type() == Event_RoomSay::ChatHistory && !SettingsCache::instance().chat().getRoomHistory()) {
         return;
     }