diff --git a/conf-defs/fr_settings.confdef b/conf-defs/fr_settings.confdef
index e35b0daa..bf012a7c 100644
--- a/conf-defs/fr_settings.confdef
+++ b/conf-defs/fr_settings.confdef
@@ -432,7 +432,7 @@
 				<caption>	</caption>
                 <description>Select the file with the primary style</description>
                 <key>StyleTheme</key>
-				<default>styles</default>
+				<default>stylers</default>
 				<aligngroup>1</aligngroup>
                 <file>StyleTheme</file>
             </setting>
diff --git a/src/gui/FRStyleManager.cpp b/src/gui/FRStyleManager.cpp
index 312a9de1..652647e6 100644
--- a/src/gui/FRStyleManager.cpp
+++ b/src/gui/FRStyleManager.cpp
@@ -37,6 +37,7 @@
 
 #include "FRStyleManager.h"
 
+const wxString FRStyleManager::_DARKMODEDEFAULT = "DarkModeDefault";
 
 FRStyleManager& stylerManager()
 {
@@ -349,7 +350,7 @@ void FRStyleManager::loadConfig()
     // user's explicit Preferences choice still wins.
     const wxString systemDefault =
         wxSystemSettings::GetAppearance().IsDark()
-            ? wxString("DarkModeDefault")
+            ? _DARKMODEDEFAULT
             : _default;
 
     wxString fileName = config().get(_PRYMARY, systemDefault);
diff --git a/src/gui/FRStyleManager.h b/src/gui/FRStyleManager.h
index af82a6e9..ddb978fa 100644
--- a/src/gui/FRStyleManager.h
+++ b/src/gui/FRStyleManager.h
@@ -36,6 +36,8 @@ class FRStyleManager : public Subject
     const wxString _SECONDARY = "StyleThemeSecondary";
     const wxString _STYLEACTIVE = "StyleActive";
     const wxString _default = "stylers";
+public:
+    static const wxString _DARKMODEDEFAULT;
 
     wxFileName fileNamePrimaryM;
     wxFileName fileNameSecondaryM;
diff --git a/src/gui/PreferencesDialogStyle.cpp b/src/gui/PreferencesDialogStyle.cpp
index 6ad86306..aec362dd 100644
--- a/src/gui/PreferencesDialogStyle.cpp
+++ b/src/gui/PreferencesDialogStyle.cpp
@@ -220,7 +220,10 @@ bool PrefDlgStyleSetting::loadFromTargetConfig(Config& config)
     if (fileComboBoxM)
     {
         wxString value = defaultM;
-        config.getValue(keyM, value);
+        // If system is dark and no value in config, use DarkModeDefault
+        if (!config.getValue(keyM, value) && wxSystemSettings::GetAppearance().IsDark())
+            value = FRStyleManager::_DARKMODEDEFAULT;
+
         fileComboBoxM->SetValue(value);
 
         loadStylers(fileComboBoxM->GetValue());
@@ -229,7 +232,8 @@ bool PrefDlgStyleSetting::loadFromTargetConfig(Config& config)
     if (fileSecondaryComboBoxM)
     {
         wxString value = defaultM;
-        config.getValue("StyleThemeSecondary", value);
+        if (!config.getValue("StyleThemeSecondary", value) && wxSystemSettings::GetAppearance().IsDark())
+            value = FRStyleManager::_DARKMODEDEFAULT;
         fileSecondaryComboBoxM->SetValue(value);
     }
 
diff --git a/xml-styles/stylers.xml b/xml-styles/stylers.xml
index b791dfb4..76448c0a 100644
--- a/xml-styles/stylers.xml
+++ b/xml-styles/stylers.xml
@@ -33,7 +33,7 @@
     </LexerStyles>
     <GlobalStyles>
         <!-- Attention : Don't modify the name of styleID="0" -->
-        <WidgetStyle name="Global override" styleID="0" fgColor="FFFF80" bgColor="FF8000" fontName="Courier New" fontStyle="0" fontSize="10" caseVisible="0"/>
+        <WidgetStyle name="Global override" styleID="0" fgColor="000000" bgColor="FFFFFF" fontName="Courier New" fontStyle="0" fontSize="10" caseVisible="0"/>
         <WidgetStyle name="Default Style" styleID="32" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" caseVisible="0"/>
         <WidgetStyle name="Indent guideline style" styleID="37" fgColor="C0C0C0" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" caseVisible="0"/>
         <WidgetStyle name="Brace highlight style" styleID="34" fgColor="FF0000" bgColor="FFFFFF" fontName="" fontStyle="1" fontSize="" caseVisible="0"/>