From 90a90f45ff2edca317e6df79978eef886685df19 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Sun, 25 Apr 2010 18:49:56 -0500
Subject: [PATCH] fixup from midi

---
 Themes/_fallback/Scripts/02 Colors.lua |  3 ++-
 Themes/_fallback/metrics.ini           | 24 ++++++++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Themes/_fallback/Scripts/02 Colors.lua b/Themes/_fallback/Scripts/02 Colors.lua
index d99b7853aa..1150beb21e 100644
--- a/Themes/_fallback/Scripts/02 Colors.lua	
+++ b/Themes/_fallback/Scripts/02 Colors.lua	
@@ -1,6 +1,6 @@
 -- SSC Color Module and Library
 local nilColor = color("0,0,0,0");
--- Double Entree.
+-- Original Color Module.
 Color = {
 -- UI Colors
 -- These colors are common to the theme interface and should be used
@@ -159,6 +159,7 @@ Color = {
 		return { c[1],c[2],c[3],fAlpha };
 	end,
 };
+-- Remapped Color Module, since some themes are crazy
 Colors = Color;
 local DifficultyColors = {
 	--[[ These are for 'Custom' Difficulty Ranks. It can be very  useful
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 5482a9fb57..db3cd37349 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -202,10 +202,14 @@ Mines=""
 Dark=""
 CancelAll="Left,Right,Left,Right,Left,Right,Left,Right"
 # Codes on the title screen.
-NextTheme="Left,Left,Left,Right,Right,Right,Left,Right"
-NextTheme2="MenuLeft,MenuLeft,MenuLeft,MenuRight,MenuRight,MenuRight,MenuLeft,MenuRight"
-NextAnnouncer="Left,Left,Right,Right,Left,Left,Right,Right"
-NextAnnouncer2="MenuLeft,MenuLeft,MenuRight,MenuRight,MenuLeft,MenuLeft,MenuRight,MenuRight"
+NextTheme=""
+NextTheme2=""
+NextAnnouncer=""
+NextAnnouncer2=""
+# NextTheme="Left,Left,Left,Right,Right,Right,Left,Right"
+# NextTheme2="MenuLeft,MenuLeft,MenuLeft,MenuRight,MenuRight,MenuRight,MenuLeft,MenuRight"
+# NextAnnouncer="Left,Left,Right,Right,Left,Left,Right,Right"
+# NextAnnouncer2="MenuLeft,MenuLeft,MenuRight,MenuRight,MenuLeft,MenuLeft,MenuRight,MenuRight"
 # Various.
 NextGroup="MenuUp,MenuRight,MenuRight"
 PrevGroup="MenuUp,MenuDown,MenuUp,MenuDown"
@@ -1330,7 +1334,7 @@ NumChoicesOnPage1=100
 ChoiceNames="1,4,7"
 #~ ChoiceNames="1,2,3,4,5,6,7"
 DefaultChoice="1"
-Choice1="applydefaultoptions;screen,ScreenProfileLoad;text,Game Start"
+Choice1="applydefaultoptions;screen,ScreenSelectProfile;text,Game Start"
 Choice2="screen,ScreenNetworkOptions;text,Play Online"
 Choice3="screen,ScreenSelectGame;text,Select Game"
 Choice4="screen,ScreenOptionsService;text,Options"
@@ -1341,7 +1345,7 @@ Choice8="screen,ScreenTest;text,Sandbox"
 Choice9="screen,ScreenQuickSetupOverview;text,Setup"
 # Aliases for the future.
 ChoiceSetup="screen,ScreenQuickSetupOverview;text,Setup"
-ChoiceGameStart="applydefaultoptions;screen,ScreenProfileLoad;text,Game Start"
+ChoiceGameStart="applydefaultoptions;screen,ScreenSelectProfile;text,Game Start"
 ChoiceOnline="screen,ScreenNetworkOptions;text,Play Online"
 ChoiceGameSelect="screen,ScreenSelectGame;text,Select Game"
 ChoiceOptions="screen,ScreenOptionsSystemDirection;text,Options"
@@ -1498,15 +1502,15 @@ LoadEdits=true
 Fallback="ScreenWithMenuElements"
 Class="ScreenSelectProfile"
 #
-NextScreen="ScreenSelectStyle"
+NextScreen="ScreenProfileLoad"
 PrevScreen="ScreenTitleMenu"
-StartScreen="ScreenSelectStyle"
+StartScreen="ScreenProfileLoad"
 #
 TimerSeconds=40
 #
 CodeNames="Up,Down,Start,Back"
-CodeUp="+Up"
-CodeDown="+Down"
+CodeUp="+MenuUp"
+CodeDown="+MenuDown"
 CodeStart="Start"
 CodeBack="Back"