diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index 709ecd221..9e2f31f8f 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -517,25 +517,25 @@ qt6_add_executable(
 )
 
 qt6_add_shaders(
-    cockatrice
-    "onboarding_shaders"
-    PREFIX
-    "/onboarding/shaders"
-    BASE
-    "src/interface/widgets/onboarding/shaders"
-    FILES
-    src/interface/widgets/onboarding/shaders/brand_banner.frag
+  cockatrice
+  "onboarding_shaders"
+  PREFIX
+  "/onboarding/shaders"
+  BASE
+  "src/interface/widgets/onboarding/shaders"
+  FILES
+  src/interface/widgets/onboarding/shaders/brand_banner.frag
 )
 
 qt6_add_resources(
-    cockatrice
-    "onboarding_qml"
-    PREFIX
-    "/onboarding/qml"
-    BASE
-    "src/interface/widgets/onboarding/qml"
-    FILES
-    src/interface/widgets/onboarding/qml/BrandBanner.qml
+  cockatrice
+  "onboarding_qml"
+  PREFIX
+  "/onboarding/qml"
+  BASE
+  "src/interface/widgets/onboarding/qml"
+  FILES
+  src/interface/widgets/onboarding/qml/BrandBanner.qml
 )
 
 target_link_libraries(
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/preferences_setup_page.cpp b/cockatrice/src/interface/widgets/onboarding/pages/preferences_setup_page.cpp
index 0f4f500be..ca52753f3 100644
--- a/cockatrice/src/interface/widgets/onboarding/pages/preferences_setup_page.cpp
+++ b/cockatrice/src/interface/widgets/onboarding/pages/preferences_setup_page.cpp
@@ -1,6 +1,9 @@
 #include "preferences_setup_page.h"
 
 #include "../../client/settings/cache_settings.h"
+#include "libcockatrice/settings/appearance_settings.h"
+#include "libcockatrice/settings/download_settings.h"
+#include "libcockatrice/settings/network_settings.h"
 
 #include <QCheckBox>
 #include <QGroupBox>
@@ -80,7 +83,7 @@ PreferencesSetupPage::PreferencesSetupPage(QWidget *parent) : FirstRunWizardPage
 
     SettingsCache &settings = SettingsCache::instance();
 
-    connect(styleUserListCheckBox, &QCheckBox::toggled, &settings.interface(), &InterfaceSettings::setStyleUserList);
+    connect(styleUserListCheckBox, &QCheckBox::toggled, &settings.appearance(), &AppearanceSettings::setStyleUserList);
     connect(cardScalingCheckBox, &QCheckBox::toggled, &settings.cardsDisplay(), &CardsDisplaySettings::setCardScaling);
     connect(roundCardCornersCheckBox, &QCheckBox::toggled, &settings.cardsDisplay(),
             &CardsDisplaySettings::setRoundCardCorners);
@@ -91,19 +94,20 @@ PreferencesSetupPage::PreferencesSetupPage(QWidget *parent) : FirstRunWizardPage
     connect(tapAnimationCheckBox, &QCheckBox::toggled, &settings.cardsDisplay(),
             &CardsDisplaySettings::setTapAnimation);
 
-    connect(notificationsEnabledCheckBox, &QCheckBox::toggled, &settings.interface(),
+    connect(notificationsEnabledCheckBox, &QCheckBox::toggled, &settings.userInterface(),
             &InterfaceSettings::setNotificationsEnabled);
     connect(soundEnabledCheckBox, &QCheckBox::toggled, &settings.sound(), &SoundSettings::setSoundEnabled);
 
-    connect(doubleClickToPlayCheckBox, &QCheckBox::toggled, &settings.interface(),
+    connect(doubleClickToPlayCheckBox, &QCheckBox::toggled, &settings.userInterface(),
             &InterfaceSettings::setDoubleClickToPlay);
-    connect(horizontalHandCheckBox, &QCheckBox::toggled, &settings.interface(), &InterfaceSettings::setHorizontalHand);
-    connect(playToStackCheckBox, &QCheckBox::toggled, &settings.interface(), &InterfaceSettings::setPlayToStack);
+    connect(horizontalHandCheckBox, &QCheckBox::toggled, &settings.userInterface(),
+            &InterfaceSettings::setHorizontalHand);
+    connect(playToStackCheckBox, &QCheckBox::toggled, &settings.userInterface(), &InterfaceSettings::setPlayToStack);
 
-    connect(showShortcutsCheckBox, &QCheckBox::toggled, &settings.cardsDisplay(),
-            &CardsDisplaySettings::setShowShortcuts);
+    connect(showShortcutsCheckBox, &QCheckBox::toggled, &settings.userInterface(),
+            &InterfaceSettings::setShowShortcuts);
 
-    connect(picDownloadCheckBox, &QCheckBox::toggled, &settings.personal(), &PersonalSettings::setPicDownload);
+    connect(picDownloadCheckBox, &QCheckBox::toggled, &settings.downloads(), &DownloadSettings::setPicDownload);
     connect(checkUpdatesOnStartupCheckBox, &QCheckBox::toggled, &settings.updates(),
             &UpdatesSettings::setCheckUpdatesOnStartup);
     connect(showTipsOnStartupCheckBox, &QCheckBox::toggled, &settings.personal(),
@@ -116,23 +120,23 @@ void PreferencesSetupPage::initializePage()
 {
     SettingsCache &settings = SettingsCache::instance();
 
-    styleUserListCheckBox->setChecked(settings.interface().getStyleUserList());
+    styleUserListCheckBox->setChecked(settings.appearance().getStyleUserList());
     cardScalingCheckBox->setChecked(settings.cardsDisplay().getScaleCards());
     roundCardCornersCheckBox->setChecked(settings.cardsDisplay().getRoundCardCorners());
     displayCardNamesCheckBox->setChecked(settings.cardsDisplay().getDisplayCardNames());
     autoRotateCardsCheckBox->setChecked(settings.cardsDisplay().getAutoRotateSidewaysLayoutCards());
     tapAnimationCheckBox->setChecked(settings.cardsDisplay().getTapAnimation());
 
-    notificationsEnabledCheckBox->setChecked(settings.interface().getNotificationsEnabled());
+    notificationsEnabledCheckBox->setChecked(settings.userInterface().getNotificationsEnabled());
     soundEnabledCheckBox->setChecked(settings.sound().getSoundEnabled());
 
-    doubleClickToPlayCheckBox->setChecked(settings.interface().getDoubleClickToPlay());
-    horizontalHandCheckBox->setChecked(settings.interface().getHorizontalHand());
-    playToStackCheckBox->setChecked(settings.interface().getPlayToStack());
+    doubleClickToPlayCheckBox->setChecked(settings.userInterface().getDoubleClickToPlay());
+    horizontalHandCheckBox->setChecked(settings.userInterface().getHorizontalHand());
+    playToStackCheckBox->setChecked(settings.userInterface().getPlayToStack());
 
-    showShortcutsCheckBox->setChecked(settings.cardsDisplay().getShowShortcuts());
+    showShortcutsCheckBox->setChecked(settings.userInterface().getShowShortcuts());
 
-    picDownloadCheckBox->setChecked(settings.personal().getPicDownload());
+    picDownloadCheckBox->setChecked(settings.downloads().getPicDownload());
     checkUpdatesOnStartupCheckBox->setChecked(settings.updates().getCheckUpdatesOnStartup());
     showTipsOnStartupCheckBox->setChecked(settings.personal().getShowTipsOnStartup());
 }
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.cpp b/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.cpp
index a775d6d19..3293b19ac 100644
--- a/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.cpp
+++ b/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.cpp
@@ -5,6 +5,7 @@
 #include "../../interface/palette_editor/quick_setup_panel.h"
 #include "../../interface/theme_manager.h"
 #include "../../interface/widgets/general/background_sources.h"
+#include "libcockatrice/settings/appearance_settings.h"
 
 #include <QComboBox>
 #include <QDir>
@@ -95,7 +96,7 @@ void ThemeSetupPage::initializePage()
     schemeCombo->blockSignals(false);
 
     homeTabBackgroundCombo->blockSignals(true);
-    QString homeTabSource = SettingsCache::instance().personal().getHomeTabBackgroundSource();
+    QString homeTabSource = SettingsCache::instance().appearance().getHomeTabBackgroundSource();
     int homeTabIdx = homeTabBackgroundCombo->findData(BackgroundSources::fromId(homeTabSource));
     homeTabBackgroundCombo->setCurrentIndex(homeTabIdx >= 0 ? homeTabIdx : 0);
     homeTabBackgroundCombo->blockSignals(false);
@@ -142,7 +143,7 @@ void ThemeSetupPage::onHomeTabBackgroundChanged(int index)
         return;
     }
     auto type = homeTabBackgroundCombo->currentData().value<BackgroundSources::Type>();
-    SettingsCache::instance().personal().setHomeTabBackgroundSource(BackgroundSources::toId(type));
+    SettingsCache::instance().appearance().setHomeTabBackgroundSource(BackgroundSources::toId(type));
 }
 
 void ThemeSetupPage::onGenerateFromAccent(const QColor &accent, int intensity)