diff --git a/Themes/default/Scripts/02 ThemePrefs.lua b/Themes/default/Scripts/02 ThemePrefs.lua
index 59191cfd54..a26b214d63 100644
--- a/Themes/default/Scripts/02 ThemePrefs.lua	
+++ b/Themes/default/Scripts/02 ThemePrefs.lua	
@@ -8,7 +8,7 @@ local Prefs =
 {
 	AutoSetStyle =
 	{
-		Default = false,
+		Default = true,
 		Choices = { OptionNameString('Off'), OptionNameString('On') },
 		Values = { false, true }
 	},
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index a4b780813a..c3f0b85053 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -8,7 +8,7 @@ FallbackTheme=_fallback
 # for 480p, it would be enlarged for bigger screens!
 ScreenWidth=1
 ScreenHeight=720
-AutoSetStyle=true
+AutoSetStyle=ThemePrefs.Get("AutoSetStyle")
 
 # 02 #
 [LightsManager]
@@ -542,7 +542,7 @@ TitleOnCommand=halign,0;strokecolor,color("#222222FF");shadowlength,1;zoom,0.5
 Fallback="ScreenOptionsServiceChild"
 NextScreen="ScreenOptionsService"
 PrevScreen="ScreenOptionsService"
-LineNames="gNotePos,gScore,TimingDisplay,gOpts,gLongFail,gComboUnderField,FlashyCombo,FancyUIBG,PrefMeter"
+LineNames="gAuto,gNotePos,gScore,TimingDisplay,gOpts,gLongFail,gComboUnderField,FlashyCombo,FancyUIBG,PrefMeter"
 LinegNotePos="lua,ThemePrefRow('NotePosition')"
 LinegScore="lua,ThemePrefRow('GameplayShowScore')"
 LineTimingDisplay="lua,ThemePrefRow('TimingDisplay')"