diff --git a/Themes/_fallback/Scripts/03 ThemeAndGamePrefs.lua b/Themes/_fallback/Scripts/03 ThemeAndGamePrefs.lua
index cc4ade9f22..fd2eea7913 100644
--- a/Themes/_fallback/Scripts/03 ThemeAndGamePrefs.lua	
+++ b/Themes/_fallback/Scripts/03 ThemeAndGamePrefs.lua	
@@ -23,14 +23,14 @@ function InitGamePrefs()
 	end;
 end
 function InitUserPrefs()
-	if GetUserPrefB("UserPrefShowLotsaOptions") == nil then
-		SetUserPref("UserPrefShowLotsaOptions", true);
+	if GetUserPrefB("ShowLotsaOptions") == nil then
+		SetUserPref("ShowLotsaOptions", true);
 	end;
 
 	local Prefs =
 	{
-		{ "UserPrefGameplayShowStepsDisplay",	true },
-		{ "UserPrefGameplayShowScore",		false},
+		{ "GameplayShowStepsDisplay",	true },
+		{ "GameplayShowScore",		false},
 --[[		{ "ProTimingP1",	false},
 		{ "ProTimingP2",	false},
 --]]
@@ -38,13 +38,13 @@ function InitUserPrefs()
 
 	local BPrefs = 
 	{
-		{ "UserPrefAutoSetStyle",		false },
-		{ "UserPrefComboUnderField",	true },
-		{ "UserPrefLongFail",			false},
-		{ "UserPrefNotePosition",		true },
+		{ "AutoSetStyle",		false },
+		{ "ComboUnderField",	true },
+		{ "LongFail",			false},
+		{ "NotePosition",		true },
 		{ "UserPrefProtimingP1",		false},
 		{ "UserPrefProtimingP2",		false},
-		{ "UserPrefShowLotsaOptions",	true},
+		{ "ShowLotsaOptions",	true},
 		{ "ComboOnRolls",	false},
 		{ "FlashyCombos",	false},
 		{ "GameplayFooter",	false},
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index b3c1f180e9..af930d9c74 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -24,7 +24,7 @@ ScreenHeight=480
 # Allows you to pick all available game modes for your gametype: for example,
 # inserting enough coins for 1p would let you choose between solo, single
 # and double before each game
-AutoSetStyle=GetUserPrefB("UserPrefAutoSetStyle")
+AutoSetStyle=ThemePrefs.Get("AutoSetStyle")
 
 # Default modifiers and noteskin.
 DefaultModifiers="1x"