diff --git a/Themes/default/BGAnimations/ScreenOptionsService in.lua b/Themes/default/BGAnimations/ScreenOptionsService in.lua
new file mode 100644
index 0000000000..c5355f0dde
--- /dev/null
+++ b/Themes/default/BGAnimations/ScreenOptionsService in.lua	
@@ -0,0 +1,5 @@
+return Def.Actor{
+	StartTransitioningCommand=function(self)
+		ThemePrefs.Save()
+	end
+}
\ No newline at end of file
diff --git a/Themes/default/BGAnimations/ScreenTitleMenu decorations.lua b/Themes/default/BGAnimations/ScreenTitleMenu decorations.lua
index f2288395f7..e942af2272 100644
--- a/Themes/default/BGAnimations/ScreenTitleMenu decorations.lua	
+++ b/Themes/default/BGAnimations/ScreenTitleMenu decorations.lua	
@@ -2,17 +2,6 @@ InitUserPrefs();
 
 local t = Def.ActorFrame {}
 
-t[#t+1] = Def.ActorFrame {
-	OnCommand=function(self)
-		if not FILEMAN:DoesFileExist("Save/ThemePrefs.ini") then
-			Trace("ThemePrefs doesn't exist; creating file")
-			ThemePrefs.ForceSave()
-		end
-
-		ThemePrefs.Save()
-	end;
-};
-
 t[#t+1] = StandardDecorationFromFileOptional("Footer","Footer");
 t[#t+1] = StandardDecorationFromFileOptional("Logo","Logo");
 t[#t+1] = StandardDecorationFromFileOptional("VersionInfo","VersionInfo");