diff --git a/cockatrice/src/interface/theme_config.cpp b/cockatrice/src/interface/theme_config.cpp
index 4420eefe1..8293a82cf 100644
--- a/cockatrice/src/interface/theme_config.cpp
+++ b/cockatrice/src/interface/theme_config.cpp
@@ -16,7 +16,7 @@ QString ThemeConfig::toIni() const
     out += "[Appearance]\n";
     out += QString("ColorScheme = %1\n").arg(colorScheme.isEmpty() ? "System" : colorScheme);
     out += "\n[Style]\n";
-    out += QString("Name = %1\n").arg(styleName.isEmpty() ? "Default" : styleName);
+    out += QString("Name = %1\n").arg(styleName.isEmpty() ? "System" : styleName);
     return out;
 }
 
diff --git a/cockatrice/src/interface/theme_manager.cpp b/cockatrice/src/interface/theme_manager.cpp
index da9f14408..d86ed77f9 100644
--- a/cockatrice/src/interface/theme_manager.cpp
+++ b/cockatrice/src/interface/theme_manager.cpp
@@ -22,7 +22,7 @@
 #include <Qt>
 #include <libcockatrice/settings/paths_settings.h>
 
-#define NONE_THEME_NAME "Default"
+#define SYSTEM_THEME_NAME "System"
 #define FUSION_THEME_NAME "Fusion"
 #define STYLE_CSS_NAME "style.css"
 #define HANDZONE_BG_NAME "handzone"
@@ -96,7 +96,7 @@ struct PaletteColorInfo
 static QString usableDefaultStyle(const QString &style)
 {
     // The Windows 11 native style is broken: when the OS default
-    // ("Default" theme selection) would use it, fall back to the Vista style.
+    // ("System" theme selection) would use it, fall back to the Vista style.
     // Explicitly choosing "windows11" in a theme is still honored.
     return style.compare("windows11", Qt::CaseInsensitive) == 0 ? QStringLiteral("windowsvista") : style;
 }
@@ -119,10 +119,16 @@ ThemeManager::ThemeManager(QObject *parent) : QObject(parent)
 
 void ThemeManager::ensureThemeDirectoryExists()
 {
-    if (SettingsCache::instance().getThemeName().isEmpty() ||
-        !getAvailableThemes().contains(SettingsCache::instance().getThemeName())) {
+    auto &settings = SettingsCache::instance();
+
+    // Migrate the old "Default" theme name to "System"
+    if (settings.getThemeName() == "Default") {
+        settings.setThemeName(SYSTEM_THEME_NAME);
+    }
+
+    if (settings.getThemeName().isEmpty() || !getAvailableThemes().contains(settings.getThemeName())) {
         qCInfo(ThemeManagerLog) << "Theme name not set, setting default value";
-        SettingsCache::instance().setThemeName(NONE_THEME_NAME);
+        settings.setThemeName(FUSION_THEME_NAME);
     }
 }
 
@@ -235,9 +241,7 @@ QStringMap &ThemeManager::getAvailableThemes()
     // load themes from user profile dir
     dir.setPath(SettingsCache::instance().paths().getThemesPath());
 
-    // add default value
-    availableThemes.insert(NONE_THEME_NAME, dir.absoluteFilePath("Default"));
-
+    availableThemes.insert(SYSTEM_THEME_NAME, dir.absoluteFilePath("System"));
     availableThemes.insert(FUSION_THEME_NAME, dir.absoluteFilePath("Fusion"));
 
     for (QString themeName : dir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name)) {
@@ -395,7 +399,7 @@ void ThemeManager::applyStyleAndPalette(const QString &themeName,
     Q_UNUSED(activeScheme)
 #endif
     QString styleName = themeCfg.styleName;
-    if (styleName.isEmpty() || styleName.compare("Default", Qt::CaseInsensitive) == 0) {
+    if (styleName.isEmpty() || styleName.compare("System", Qt::CaseInsensitive) == 0) {
         if (themeName == FUSION_THEME_NAME) {
             styleName = "Fusion";
         } else {
diff --git a/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.cpp
index e4e6b6ace..15f0e827c 100644
--- a/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.cpp
+++ b/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.cpp
@@ -59,8 +59,8 @@ AppearanceSettingsPage::AppearanceSettingsPage()
     connect(&schemeCombo, &QComboBox::currentIndexChanged, this,
             [this] { themeManager->setColorScheme(schemeCombo.currentData().toString()); });
 
-    // Qt widget style; "Default" lets the application decide
-    styleCombo.addItem(tr("Default"), QStringLiteral("Default"));
+    // Qt widget style; "System" lets the application decide
+    styleCombo.addItem(tr("System"), QStringLiteral("System"));
     for (const QString &key : QStyleFactory::keys()) {
         styleCombo.addItem(key, key);
     }
diff --git a/cockatrice/themes/CMakeLists.txt b/cockatrice/themes/CMakeLists.txt
index 577977551..70344d95a 100644
--- a/cockatrice/themes/CMakeLists.txt
+++ b/cockatrice/themes/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 # add themes subfolders
 
-set(defthemes Default Fabric Fusion Leather Plasma VelvetMarble)
+set(defthemes Fabric Fusion Leather Plasma VelvetMarble System)
 
 if(UNIX)
   if(APPLE)
diff --git a/cockatrice/themes/Default/palette-default-dark.toml b/cockatrice/themes/System/palette-default-dark.toml
similarity index 100%
rename from cockatrice/themes/Default/palette-default-dark.toml
rename to cockatrice/themes/System/palette-default-dark.toml
diff --git a/cockatrice/themes/Default/palette-default-light.toml b/cockatrice/themes/System/palette-default-light.toml
similarity index 100%
rename from cockatrice/themes/Default/palette-default-light.toml
rename to cockatrice/themes/System/palette-default-light.toml
diff --git a/cockatrice/themes/Default/theme.cfg b/cockatrice/themes/System/theme.cfg
similarity index 73%
rename from cockatrice/themes/Default/theme.cfg
rename to cockatrice/themes/System/theme.cfg
index d2016a238..4b756a5e8 100644
--- a/cockatrice/themes/Default/theme.cfg
+++ b/cockatrice/themes/System/theme.cfg
@@ -2,4 +2,4 @@
 ColorScheme = Light
 
 [Style]
-Name = Default
+Name = System
diff --git a/libcockatrice_settings/libcockatrice/settings/settings_migration.cpp b/libcockatrice_settings/libcockatrice/settings/settings_migration.cpp
index 37dc9a0a0..f6e107dad 100644
--- a/libcockatrice_settings/libcockatrice/settings/settings_migration.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/settings_migration.cpp
@@ -374,7 +374,11 @@ static void migrateAppearanceSettings(const QString &settingsPath, QSettings &gl
     QSettings appearanceIni(settingsPath + "appearance.ini", QSettings::IniFormat);
     for (auto it = appearanceKeyMap.constBegin(); it != appearanceKeyMap.constEnd(); ++it) {
         if (globalIni.contains(it.key())) {
-            appearanceIni.setValue(it.value(), globalIni.value(it.key()));
+            QVariant value = globalIni.value(it.key());
+            if (it.key() == "theme/name" && value.toString() == "Default") {
+                value = "System";
+            }
+            appearanceIni.setValue(it.value(), value);
         }
     }
 }