From 33fdcb5cf3b7139c24e2669dc8fca9ff4c22b89c Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Sun, 27 Apr 2008 21:34:43 +0000
Subject: [PATCH] OptionIcon -> ModIcon to reduce confusion between OptionRow,
 OptionIconRow

---
 .../default.lua                               |   8 +-
 .../ScreenGameplay decorations/default.lua    |   8 +-
 .../ScreenSelectMusic decorations/default.lua |   6 +-
 ...nIconRow icon.redir => ModIcon text.redir} |   2 +-
 ...ptions item.redir => OptionRow item.redir} |   2 +-
 ...ions title.redir => OptionRow title.redir} |   2 +-
 .../default/Fonts/ScreenOptions icon.redir    |   1 -
 ...y icon empty.redir => ModIcon Empty.redir} |   0
 .../Graphics/ModIcon Filled (doubleres).png   | Bin 0 -> 4277 bytes
 .../Graphics/ModIconSelectMusic Empty.redir   |   1 +
 ...ModIconSelectMusic Filled (doubleres).png} | Bin
 .../Graphics/OptionIconRow icon empty.redir   |   1 -
 ...tionIconRowGameplay filled (doubleres).png | Bin 1869 -> 0 bytes
 .../Graphics/OptionRow IconEmpty.redir        |   1 +
 .../Graphics/OptionRow IconFilled.redir       |   1 +
 ...ptionRow underline p1 3x1 (doubleres).png} | Bin
 ...ptionRow underline p2 3x1 (doubleres).png} | Bin
 .../Focus (doubleres).png                     | Bin 6116 -> 0 bytes
 .../NoFocus (doubleres).png                   | Bin 6566 -> 0 bytes
 .../ScreenOptions RowFrameExit/default.lua    |  10 --
 .../Focus (doubleres).png                     | Bin 8189 -> 0 bytes
 .../NoFocus (doubleres).png                   | Bin 7623 -> 0 bytes
 .../ScreenOptions RowFrameNormal/default.lua  |  10 --
 .../Graphics/ScreenOptions footer.redir       |   1 +
 .../ScreenOptionsService header.redir         |   1 -
 .../ScreenOptionsServiceChild header.redir    |   1 -
 ...redir => ScreenOptionsSimple cursor.redir} |   0
 stepmania/Themes/default/Languages/en.ini     |   2 +
 stepmania/Themes/default/metrics.ini          |  98 +++++++++---------
 29 files changed, 68 insertions(+), 88 deletions(-)
 rename stepmania/Themes/default/Fonts/{OptionIconRow icon.redir => ModIcon text.redir} (92%)
 rename stepmania/Themes/default/Fonts/{ScreenOptions item.redir => OptionRow item.redir} (94%)
 rename stepmania/Themes/default/Fonts/{ScreenOptions title.redir => OptionRow title.redir} (90%)
 delete mode 100644 stepmania/Themes/default/Fonts/ScreenOptions icon.redir
 rename stepmania/Themes/default/Graphics/{OptionIconRowGameplay icon empty.redir => ModIcon Empty.redir} (100%)
 create mode 100644 stepmania/Themes/default/Graphics/ModIcon Filled (doubleres).png
 create mode 100644 stepmania/Themes/default/Graphics/ModIconSelectMusic Empty.redir
 rename stepmania/Themes/default/Graphics/{OptionIconRow icon filled (doubleres).png => ModIconSelectMusic Filled (doubleres).png} (100%)
 mode change 100755 => 100644
 delete mode 100755 stepmania/Themes/default/Graphics/OptionIconRow icon empty.redir
 delete mode 100644 stepmania/Themes/default/Graphics/OptionIconRowGameplay filled (doubleres).png
 create mode 100644 stepmania/Themes/default/Graphics/OptionRow IconEmpty.redir
 create mode 100644 stepmania/Themes/default/Graphics/OptionRow IconFilled.redir
 rename stepmania/Themes/default/Graphics/{ScreenOptions underline p1 3x1 (doubleres).png => OptionRow underline p1 3x1 (doubleres).png} (100%)
 rename stepmania/Themes/default/Graphics/{ScreenOptions underline p2 3x1 (doubleres).png => OptionRow underline p2 3x1 (doubleres).png} (100%)
 delete mode 100644 stepmania/Themes/default/Graphics/ScreenOptions RowFrameExit/Focus (doubleres).png
 delete mode 100644 stepmania/Themes/default/Graphics/ScreenOptions RowFrameExit/NoFocus (doubleres).png
 delete mode 100644 stepmania/Themes/default/Graphics/ScreenOptions RowFrameExit/default.lua
 delete mode 100644 stepmania/Themes/default/Graphics/ScreenOptions RowFrameNormal/Focus (doubleres).png
 delete mode 100644 stepmania/Themes/default/Graphics/ScreenOptions RowFrameNormal/NoFocus (doubleres).png
 delete mode 100644 stepmania/Themes/default/Graphics/ScreenOptions RowFrameNormal/default.lua
 create mode 100644 stepmania/Themes/default/Graphics/ScreenOptions footer.redir
 delete mode 100644 stepmania/Themes/default/Graphics/ScreenOptionsService header.redir
 delete mode 100644 stepmania/Themes/default/Graphics/ScreenOptionsServiceChild header.redir
 rename stepmania/Themes/default/Graphics/{ScreenOptionsSimple cursor 3x2.redir => ScreenOptionsSimple cursor.redir} (100%)

diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua
index ca9ecea4ed..10f0f1c15c 100644
--- a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua	
+++ b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua	
@@ -48,13 +48,13 @@ t[#t+1] = LoadFont( Var "LoadingScreen", "TimingDifficultyNumber" ) .. {
 	InitCommand=function(self) self:name("TimingDifficultyNumber"); self:settext(GetTimingDifficulty()); ActorUtil.LoadAllCommandsAndSetXY(self,Var "LoadingScreen"); end;
 };
 
-t[#t+1] = Def.OptionIconRow {
-		InitCommand=cmd(x,SCREEN_CENTER_X-316;y,SCREEN_CENTER_Y-130;draworder,1;Load,"OptionIconRowEvaluationP1",PLAYER_1,player,PLAYER_1);
+t[#t+1] = Def.ModIconRow {
+		InitCommand=cmd(x,SCREEN_CENTER_X-316;y,SCREEN_CENTER_Y-130;draworder,1;Load,"ModIconRowEvaluationP1",PLAYER_1,player,PLAYER_1);
 		OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1);
 		OffCommand=cmd(linear,0.5;zoomy,0);
 	};
-t[#t+1] = Def.OptionIconRow {
-		InitCommand=cmd(x,SCREEN_CENTER_X+316;y,SCREEN_CENTER_Y-130;draworder,1;Load,"OptionIconRowEvaluationP2",PLAYER_2;player,PLAYER_2);
+t[#t+1] = Def.ModIconRow {
+		InitCommand=cmd(x,SCREEN_CENTER_X+316;y,SCREEN_CENTER_Y-130;draworder,1;Load,"ModIconRowEvaluationP2",PLAYER_2;player,PLAYER_2);
 		OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1);
 		OffCommand=cmd(linear,0.5;zoomy,0);
 	};
diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua
index 7aa5882085..4a8bf01dcb 100644
--- a/stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua	
+++ b/stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua	
@@ -18,13 +18,13 @@ t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "LeftFr
 t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "RightFrame", "RightFrame" );
 
 
-t[#t+1] = Def.OptionIconRow {
-		InitCommand=cmd(x,SCREEN_CENTER_X-300;y,SCREEN_CENTER_Y;Load,"OptionIconRowGameplay",PLAYER_1;player,PLAYER_1;);
+t[#t+1] = Def.ModIconRow {
+		InitCommand=cmd(x,SCREEN_CENTER_X-300;y,SCREEN_CENTER_Y;Load,"ModIconRowGameplay",PLAYER_1;player,PLAYER_1;);
 		OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1);
 		OffCommand=cmd(linear,0.5;zoomy,0);
 	};
-t[#t+1] = Def.OptionIconRow {
-		InitCommand=cmd(x,SCREEN_CENTER_X+300;y,SCREEN_CENTER_Y;Load,"OptionIconRowGameplay",PLAYER_2;player,PLAYER_2;);
+t[#t+1] = Def.ModIconRow {
+		InitCommand=cmd(x,SCREEN_CENTER_X+300;y,SCREEN_CENTER_Y;Load,"ModIconRowGameplay",PLAYER_2;player,PLAYER_2;);
 		OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1);
 		OffCommand=cmd(linear,0.5;zoomy,0);
 	};
diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua
index bae070dacf..37f7bb50d8 100644
--- a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua	
+++ b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua	
@@ -45,7 +45,7 @@ end
 local function OptionsArea(pn)
 	local t = Def.ActorFrame {};
 	t[#t+1] = Def.ActorFrame {
-		InitCommand=cmd(x,-1*THEME:GetMetric("OptionIconRowSelectMusic","SpacingX");y,-1*THEME:GetMetric("OptionIconRowSelectMusic","SpacingY"););
+		InitCommand=cmd(x,-1*THEME:GetMetric("ModIconRowSelectMusic","SpacingX");y,-1*THEME:GetMetric("ModIconRowSelectMusic","SpacingY"););
 		LoadActor( "option icon header" ) .. {
 		
 		};
@@ -53,8 +53,8 @@ local function OptionsArea(pn)
 			InitCommand=cmd(y,-4;settext,PlayerNumberToLocalizedString(pn);zoom,0.5;zoom,0.5;diffuse,color("#baa200");shadowlength,0;strokecolor,color("#00000000"););
 		};
 	};
-	t[#t+1] = Def.OptionIconRow {
-		InitCommand=cmd(Load,"OptionIconRowSelectMusic",pn;);
+	t[#t+1] = Def.ModIconRow {
+		InitCommand=cmd(Load,"ModIconRowSelectMusic",pn;);
 		OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1;);
 		OffCommand=cmd(linear,0.5;zoomy,0;);
 	};
diff --git a/stepmania/Themes/default/Fonts/OptionIconRow icon.redir b/stepmania/Themes/default/Fonts/ModIcon text.redir
similarity index 92%
rename from stepmania/Themes/default/Fonts/OptionIconRow icon.redir
rename to stepmania/Themes/default/Fonts/ModIcon text.redir
index e9d2ccd770..8f50bdf9db 100644
--- a/stepmania/Themes/default/Fonts/OptionIconRow icon.redir	
+++ b/stepmania/Themes/default/Fonts/ModIcon text.redir	
@@ -1 +1 @@
-_option icon
+_option icon
diff --git a/stepmania/Themes/default/Fonts/ScreenOptions item.redir b/stepmania/Themes/default/Fonts/OptionRow item.redir
similarity index 94%
rename from stepmania/Themes/default/Fonts/ScreenOptions item.redir
rename to stepmania/Themes/default/Fonts/OptionRow item.redir
index c58932a797..a8d7028b1f 100644
--- a/stepmania/Themes/default/Fonts/ScreenOptions item.redir	
+++ b/stepmania/Themes/default/Fonts/OptionRow item.redir	
@@ -1 +1 @@
-_Arial 14 shadow
+_Arial 14 shadow
diff --git a/stepmania/Themes/default/Fonts/ScreenOptions title.redir b/stepmania/Themes/default/Fonts/OptionRow title.redir
similarity index 90%
rename from stepmania/Themes/default/Fonts/ScreenOptions title.redir
rename to stepmania/Themes/default/Fonts/OptionRow title.redir
index ba41a9d72b..045e488229 100644
--- a/stepmania/Themes/default/Fonts/ScreenOptions title.redir	
+++ b/stepmania/Themes/default/Fonts/OptionRow title.redir	
@@ -1 +1 @@
-_shared2
+_shared2
diff --git a/stepmania/Themes/default/Fonts/ScreenOptions icon.redir b/stepmania/Themes/default/Fonts/ScreenOptions icon.redir
deleted file mode 100644
index e9d2ccd770..0000000000
--- a/stepmania/Themes/default/Fonts/ScreenOptions icon.redir	
+++ /dev/null
@@ -1 +0,0 @@
-_option icon
diff --git a/stepmania/Themes/default/Graphics/OptionIconRowGameplay icon empty.redir b/stepmania/Themes/default/Graphics/ModIcon Empty.redir
similarity index 100%
rename from stepmania/Themes/default/Graphics/OptionIconRowGameplay icon empty.redir
rename to stepmania/Themes/default/Graphics/ModIcon Empty.redir
diff --git a/stepmania/Themes/default/Graphics/ModIcon Filled (doubleres).png b/stepmania/Themes/default/Graphics/ModIcon Filled (doubleres).png
new file mode 100644
index 0000000000000000000000000000000000000000..874b5f2a5bf0b60713a80980eefd9a502ae56f7c
GIT binary patch
literal 4277
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
P0HC3&qf()4{qDa2(hcWB

literal 0
HcmV?d00001

diff --git a/stepmania/Themes/default/Graphics/ModIconSelectMusic Empty.redir b/stepmania/Themes/default/Graphics/ModIconSelectMusic Empty.redir
new file mode 100644
index 0000000000..76b570e983
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/ModIconSelectMusic Empty.redir	
@@ -0,0 +1 @@
+ModIconRow icon filled
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/OptionIconRow icon filled (doubleres).png b/stepmania/Themes/default/Graphics/ModIconSelectMusic Filled (doubleres).png
old mode 100755
new mode 100644
similarity index 100%
rename from stepmania/Themes/default/Graphics/OptionIconRow icon filled (doubleres).png
rename to stepmania/Themes/default/Graphics/ModIconSelectMusic Filled (doubleres).png
diff --git a/stepmania/Themes/default/Graphics/OptionIconRow icon empty.redir b/stepmania/Themes/default/Graphics/OptionIconRow icon empty.redir
deleted file mode 100755
index 8c395a284f..0000000000
--- a/stepmania/Themes/default/Graphics/OptionIconRow icon empty.redir	
+++ /dev/null
@@ -1 +0,0 @@
-OptionIconRow icon filled
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/OptionIconRowGameplay filled (doubleres).png b/stepmania/Themes/default/Graphics/OptionIconRowGameplay filled (doubleres).png
deleted file mode 100644
index 4c8f3b705d4e347ba72289ab29d16402a8eea312..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1869
zcmai#c{JNu8^?d7i4KNVYc!>i($o^IDF!1-sM@NDTE`Mp6I(1T(b{U6w^UzKp;b#w
zQEJ*jWh9o8Cfd=~65+LrMAR6y#8MICO+!u0oSFZ6`p3PWbI-l!p7T8C`#H}oSB%4#
z@`vRC0Ql0$(aufEJn5qCg-G|1)O&C#_JrD;w*df3ml^oK3(_-`boM)vdrS!F+QnD`
zV1thdCcvGdE`}1^2p92*SGoz7005bCva|6>m{{UPIUY>Zc(GQ(*_ifqw@_wVl9%K$
z$Yr$N!Q8znm3;dnstm<SGp87>WDYA^H;F?JI9Ie;DR(pwT#}b~gBR|oT;Eo#Qz~df
zq2k)}ePXWq_s6sSLN_Iun)Kx>O*Bc#&Q>SN?fj5OHue0BHXPWWz8Ad*uJswp?)&@Q
zrzw-Y7hQ07t97fx)6;WQtoFc9=f$ScH%6XDTs*U3$EVt54Weo55;Bo$WoWEzj5tsr
z*1d!mLhD9DKC<49_%mA#WJbD&SxXJ&G4HIpwh+e0*J0>ZP$TZA3nAsbEil}&HEZkW
zx>s&;@QEF*bgG=FsuyeYG_g5;z6e@4qY3`s8ySnp{<PHQ+*2A9y}oS+a}BSMkdOjb
z-A67MjQ-0YSE#0@H#0?C*~@0@<vZdR2JVZ+;_6%WRXGQ8UKeC$f)OyXVeZK2Q@?vz
zSy`{u^Lu)no0!Z1PJ3GWD34bMvrKRuF^Ost48@5R%aWmaX$P1(ME8_mnUPO#9KQ%U
z6)UzsQEV8<B(>kPQyI(Gc1Up`!#uHNmJ78tHO@B|etG+g*ElRgl+XSDM(A=}Do%#H
zarX5xO7rwsg3-&3_tPD(s?QaPCMG7vIkeCj!+_^sdyP+R>*pPoX=K*XYi5ixOput~
zvKuohvn3>)nWkkzUKo*>6Hg+&;xm%xtRRA7vO?u)pr_tVLY;k6#l5VEz$SeV{X8%{
ze2^Y5C@g~vd|~4uU(pmARfrsXJHUAMTU}w~IJ>V8v)ywK8EvNu<(UIro=v?ERp0*}
zZx+KJrnj~6IujjNlv+T#>x)B?h3haZRoyIl9s~mE70utdb0-NP@Rb*$|D*6Tw<YGW
z28}o9SAI*rVhMm|LguA~K+>rc19nuhjjAHVJ=bTb5lDXmXQ~5H{O>Y$)Axz+eL8Ia
zgmE`?d*HJBK25;x@B7aa(Axb6u=|%2U8FI}h^<6LHUr&rN<AwdaD8`M&7z{Pu(05g
z(#?*e(yAr4?R90}#vPw6KJ(CZADROas;N|h<dnkZ`pY*_f$C6bgBRfdx@6;Vug)0p
zZ02P>E+e^RVsaAa;qU)kG|@;}8gIBjMDD5R6<}$~`h9cvo-{OE5C{ZFersH4&#l3!
zshv?~LlD^a48<Gmfe#!M9w#=nUR}PQ78Fzw)|q=mF99Ma=YZdU-g$h5Qim>GV2LLK
z;_u_K>o(_U{mvc8(05ejiB)gx1B+@LBWa}N+A5!*vr=jnW7U=V1Y2g$Xq1g=rqNOP
zj)$zuSLal{v;}9*kLOul$?`3#8G4K*s-5(IFO|A_a*UC*v3Q+GBvRt#3~51{+UZnF
z_q5W|Qi+GJ?}wb9!e_(bh$-4aIzAfWIy&3kRvQr!;l|~1n{soN*w;&9O;ITI>!SGq
zZrofSqj@bMV#8<4*2VbRs`PurWVs=wmaJ*b*9x@tgYOFq?1%}su-dAgGKZ0o3JMC&
zCWmo9Iv%5%j|$rA4b^?XMX<Y<4!s$y`lkE$*hjvX_4W0KarCQ%l(}&(7d6P?h<#7u
zhJ>taP(PJLI@zv`m37vl!lY(L%o;==bi9o~AXEeRXx5Pr&m+sM{}73OkoJ7;E(pVG
z5E@9(Kmiyor-ht)ouhV6>hyDLpQueJ6k5FWSOJ?D8yl}zRaHHlo}TU&j8VwBw{Igh
zza4$Gw2k?d5g|K|1Y#-ne~^#Vp^SDI$(uEPzP^jnW<-EJ2tGa>Q;zYhs8c02+}QS^
zYeH~vu-6Nh(}_a-Zy&cML#74KW-eUgDHhi*CjyNabhy_s_Ni`eN}9L#So7lI;tA^h
zO*0dd6rJR+JelqzNxUbQ4ryp?8Axhh4G()PtxVF>P(jDMznWYNGhc<zj<eI0zd)-i
zg@IlAMx5d-y>V5#fjidZ;(9iH;h8pR3US}bWTpQFE8SA!9?+?lpW^Z;qiKJb(aT0f
zXXd;97LYS2$MoxuMP9-cSoW^4QbqnU_H*1FD+4=RYgt8LHu8b#8pY5+Iu8M-vlzR2
I+o13N1bst0*Z=?k

diff --git a/stepmania/Themes/default/Graphics/OptionRow IconEmpty.redir b/stepmania/Themes/default/Graphics/OptionRow IconEmpty.redir
new file mode 100644
index 0000000000..70a66198c3
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/OptionRow IconEmpty.redir	
@@ -0,0 +1 @@
+ModIconRow IconEmpty
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/OptionRow IconFilled.redir b/stepmania/Themes/default/Graphics/OptionRow IconFilled.redir
new file mode 100644
index 0000000000..70a66198c3
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/OptionRow IconFilled.redir	
@@ -0,0 +1 @@
+ModIconRow IconEmpty
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenOptions underline p1 3x1 (doubleres).png b/stepmania/Themes/default/Graphics/OptionRow underline p1 3x1 (doubleres).png
similarity index 100%
rename from stepmania/Themes/default/Graphics/ScreenOptions underline p1 3x1 (doubleres).png
rename to stepmania/Themes/default/Graphics/OptionRow underline p1 3x1 (doubleres).png
diff --git a/stepmania/Themes/default/Graphics/ScreenOptions underline p2 3x1 (doubleres).png b/stepmania/Themes/default/Graphics/OptionRow underline p2 3x1 (doubleres).png
similarity index 100%
rename from stepmania/Themes/default/Graphics/ScreenOptions underline p2 3x1 (doubleres).png
rename to stepmania/Themes/default/Graphics/OptionRow underline p2 3x1 (doubleres).png
diff --git a/stepmania/Themes/default/Graphics/ScreenOptions RowFrameExit/Focus (doubleres).png b/stepmania/Themes/default/Graphics/ScreenOptions RowFrameExit/Focus (doubleres).png
deleted file mode 100644
index de101c1f9e5696bd74f26c23aa1237487db45b7a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6116
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

diff --git a/stepmania/Themes/default/Graphics/ScreenOptions RowFrameExit/NoFocus (doubleres).png b/stepmania/Themes/default/Graphics/ScreenOptions RowFrameExit/NoFocus (doubleres).png
deleted file mode 100644
index 480a79ed812092564408ca68580ea3e4ae0441c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6566
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

diff --git a/stepmania/Themes/default/Graphics/ScreenOptions RowFrameExit/default.lua b/stepmania/Themes/default/Graphics/ScreenOptions RowFrameExit/default.lua
deleted file mode 100644
index 79617a4c34..0000000000
--- a/stepmania/Themes/default/Graphics/ScreenOptions RowFrameExit/default.lua	
+++ /dev/null
@@ -1,10 +0,0 @@
-return Def.ActorFrame {
-	LoadActor("focus") .. {
-		GainFocusCommand=cmd(visible,true;);
-		LoseFocusCommand=cmd(visible,false;);
-	};
-	LoadActor("nofocus") .. {
-		GainFocusCommand=cmd(visible,false;);
-		LoseFocusCommand=cmd(visible,true;);
-	};
-};
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenOptions RowFrameNormal/Focus (doubleres).png b/stepmania/Themes/default/Graphics/ScreenOptions RowFrameNormal/Focus (doubleres).png
deleted file mode 100644
index bd84aa0ea0a1d3485b99843c7e878f0d24282fb2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8189
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
F{|}UWKdk@&

diff --git a/stepmania/Themes/default/Graphics/ScreenOptions RowFrameNormal/NoFocus (doubleres).png b/stepmania/Themes/default/Graphics/ScreenOptions RowFrameNormal/NoFocus (doubleres).png
deleted file mode 100644
index 9584cdc8ff44a2c68066180254ee9310129d9af5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7623
zcmYLO2UrtJ*Iq;csfrW<5m1T*q!*D6f`ncYs(^qHdRLl+CSB>F_fBZiLT@6VR0#qq
zy@V=oB{Zpjyz#sLJWsOOJ@1@3`_7p;?`|TsHJ?(DGLixSKmk^Hq6+|5OL4!Skr3g&
zRpZ}D;11VaRg63Ufb7<v4*`&#c^d#owd@oXwY6<sJY76&U0hkgii)hR?k+ZVj@AI+
z{Ub{c2GQG~lRlc;S5S)xOj2{vr6pn2RfrCxiRT2dUB96k!It-(R;T->lG0VCPq`6<
zF)@K}X?1wXqe#CIudwCEgcL+X4V*6e6*x?`9jy*uG)&2?RbaE~Mv1#f$dgrsbwmTn
z%M|Y3TnOp^*tfXCCl^G@?h4!>se8fZaekiwIEG6}@!abo?f?k9$H_>5E{%*Xfji-s
zRGSKE&j<qF5OjIQKT;zJqygl7V-$)3Ic0*ttW-`tAonWpe9+2r8PI+RJm(5n9R~ul
zj??@I0Fxv(T7ukofc2Jj#1p_)5~vu}k5U2*1ppcwwT}|Ow}*fL*uX{wc;5(gjocus
z1xUyN0iB3YZs4jP@ch&L``*BtG=N5V&p_%IPt}bz5RR#|TB&As38f$tl80`@1_pe0
zAB=$Md1%Beu2`hY@qO?~V-N}wp<2KW0YGj%E$(iy=iVcfRU;!}F(^v&hnt;5m-j3!
zmoG4*<*sr7u;>XNyWr)oV+@oe3Us>2=h(SwYets)@+jJ-mP)Px$lds1fOY-DjZ$7*
z^Y`zVm6dO*9~De21`PZ!U?0r849*>Y!==uS4i-9=*n@;jgPvYJUidJyuU>R#G~xOi
z%bC^Kr)Q01muJl5_dbFxn+-uU%R1C<F;CLpVugzCMJgn4_i~^wUo6e@o)XH;ivsWM
zWeEJ@AC{V05gw{>-7xg*S~>!Ny;hg*uMbEF18qYVN4+k0WzV1HasYug-~=}SFnhwz
z2N|f7?I!_%C%HkO_wr2p-M4wWi0*V>o9QMydoK1yf&JqLg&PW_F9PqlKj*FpR(KFL
z{GJ)~od2sFvq+bYZCIi!CEo{V6Q#5()rkd3cK3s}pzBxVKat$BVEYk4U>Rk2KZb-p
zE%cbJTjeTsG&}3(2pXMxYVo2fg1S)<R;UW|p0xWFiSTF2E%B0{0HNTsu(qdyNkO$b
z(qG9N6q`%M8Q&=9lYM#NDVQEhmz(j$y`E9}tytdLmvURGAF(ou{Q_O<w~2*6ItuXh
z^(fRl;=P_|HCS`6g1o$s@x6WpVQb`p)o6{^Rq7z6uIpk~y%bn2?#inesvBy4Qz>P=
z!!C03$93`Rgl}{{aNSERRjcQ0x%vC!ZA&4+a6=W|`;*kMxA<@PMJRq0XQz%-6yj=*
zy8^B$grKR>%4lcZ`y0Gv86ql-_Y*(=c;Qe>ERn>^%JV67C2OT;MR<j2g>BD-G|N)X
zt?*cH>4ENmy($Cd21W!!WSuG`4=qU7oh{9S+!T#9R;bKF=~nB6m);V2nJzILLI+kW
zs?0}>GuqPI9@$l|d$!!1Mcma)`C@<`+<3a4vQD_~MNSb$8`2*Ed%%!!oA@@2!RvN)
zs(LZQcr-&lL_l0{D|Ic6D$NCI2tt8g)5Z^wB2*Ea2qq9eqzqY%oI{d9vCu(CY?+y!
zf0Z&+SZ}%P`q$)gC^AcXOOHtpRwh{*j)axEKx7NyM(2@4Mm_31T8f1_xi#j?ZGEg{
zRt$CCylf5><zX*_L_c!Y41a(93e=i<&fFR;jV#NPP!v`bHmK9ZCfUdmFQ>X4XL@R0
zUwcrJf`v!T(d=?BaWfT*s5c8*KXX7Prz9JetCZ`MKiz5<tJ*HfDsES5H98HVl<!yN
zddBq>7CUk+YfbOF-fRhJ37v-Y<AW+bq(c!?Uh5ODPUn)H)a(wkz-)Dwk~yFDwUayk
z{O6E!r<0O{r{so2b>!?s)8r$!rFuo(T%?%!`=@{DD4O=jDHd5EEK(NV#5a#g6-+3<
zQ>J=r*Y|9hec7qcsjq;Oh?9*|O=DAICtX*gxtP0HQe9HLe|Ts(e|R!YG(%c&N@y)(
zEn_NUzVW%Sw=plO6xC!6u3a%MHrhe8Ifoic7!?^pjZN#6E3+y&CR;08OKz4lYbI)z
zXHUX<-v2^<MwK-(yvKYanyx}Qq5Lgimh`a3-m0FR#P&r07XNqW(!><u-zm$PjhW#d
z_3ku}^&iirk7Vx1`uFZ9Z}7tmM{kUN6JAE$8sz?Hm!+36{uD+JYxW4iMnp%d1rPG2
z$na$__04{2Us3fua5G)>MIU5k)Mb3wE}gF45!<ob37^Rs63OAtHWK#u((_4iK?gG?
zOO}HWaG0-vYbk04!5Y@?^IP%98&pocZ!Gdc9$D<t%N)wM=Pb)CONq}3%^8^wiFY-A
zY8=$+amh9homULFfBE9l_i_v<3FIJv5k>~d2bo+sJ@$Rg))^!Fc-s1~_WQQ{+uUY(
zTKU-E%3w@)C7bQ1pK+CJM{B7g@gsJWq1y2E$uGnfs}|8caB{BD@KA#=*%;RdL&h<|
z6j86S8AXrzCnrympUh>z1hpipAF7IiWRQIJQa{97L|SC~_-u@ZCJeI-!H#NoB=|s8
zV$O~o^Jm-G@TIIJvSmN|RQ^w<u0DAqANE5_=*sx0c^@assYhr&O8Q6s2B?(oEyvz1
zFOC>epAXC*VE6dP#Kt1NDLw<;)!b77Y4|4mjBgY5Veb_#;>9$-;VO%3Q>Rd$&3K$m
zm;Q>?Nl5x}yI@E{e4LvCl1(EK1>1zJ+PoU9unw)g=yi^6<iCp`{_Ic}S8>hgAt_3s
zcpYN=U<yQB3$r$`=^Tz6kVr1i<{91|svDS&6VKeux!k7yK)slNDhg9Gc*tzH+FoHV
zQ7h%<GflcodyOYdpQu8rDGCL0n$RlWHb|+0w{!YxI0Tt>4+M8N5IAg+K}j*8{#!Fs
z+ooEE{6_N)7AIj@Ofs~QQB^e4^eMCf-yY0(W0=BS20GJblIqLKKQ_M@wL#l#tj;~m
zHla*LrmUt=I#YcAQBN_iU%!2Ds5H%=GW=k=H3X&DT+k`i)Mj1sd1P2p7E%b=hnzsf
zcF?m87E{O0V>?WKZHFR1C#Fr>j?QI1cT7VGpc)f46V|8T)4C(ssz~I<aq_8?X{Dx<
z+jc)8n(&<XJ|$|Z`RfETS{kAoJIS;4l(L_t<05O<>mh|01@v8J-_m{8Cq641N7v_%
z?ovGd@#?K##Uk-I%PVFWGrzq;`d+$nhF<!qiKR)4){xBD<mR03+0$tjs!S0nBOg^P
z<g?w6jo|S_*xu;dEJT(+obUI{^XYt)-<s9Pygil6Zp#hNMYPgo^qORw<jAwVCeOXv
zY0NEyCWG|q$L3C(o|{q^iQ`)Rt(mRqRn5;Fns<EL8~kjJHkh)-M`riieSXnhPEKS?
zNYA!oeO-=vj}GSPX5sE!=Ocry-@UkYD%-T$%=hKC<-aS=hEK?vT+Dpioe8k-^2)`I
z%{)CK3Jn>(h(Cy>QoI(M7CRV55w?~6NJc_pN!I;*<E%t+^u;J=HvL8Z#b6aZ9Y6ed
zVryz-EOjg|WiKVM)9H25`DWJ^L-lmuhrYWVpS^_z&Gz+Ax4XS&yqI?j=Bcz+Ub6-~
zxU~IUbD;O7<TQ~XG4b*$VJh~_O8DV4PH$d?$!o|1Kuyf+Q=LTIIjfb5t_A@3asWVJ
z2mt)P#2q&P;H3ZnY(58o$Eg57?~-8Ns|*0tOW-H+5bqy9XZ;*$rY!q^&A(+yO%Vil
zbFvYvQJ-?&5YSMd&YTkwFRZyv-9mpo-^3Kkngl{zHaq3NNtPXFOqxRnAfxneB9X|*
zI2Xjn=eCK#1#!e|1i{U0eSy&g8BZewe@(Ye%f9ND5tbBgb*T3FeHzc%x;At=^z%w*
zri4SUr62(=Xj~Il+tHW{$SXYMK&XI{MKsXlV7(?0yv=Cp{ziHs3x{daSGJ9c!m11(
z?MaPwc_?UuD`9|Rc&P&qYueybJJCdQgJFGE#L3ni6B5l3{VT|*so^Z2BR=M;2@x=D
z0v-39$sYlaYmLQ}V2y;BualD(>k#K3^>*q^6lA48f5{Z|H2A8bc@p#^T=CEaeS>`O
z80<i?Mn-naP02frcOl`8wjG6-gn{76txbfCB)6!SN(rB;L2FTr=7znNrAg0aWamk8
z&#KXmRRYF`<^7QBcb7EC^w8>A+)+=zb(@xhZ1&0GV-HC?XGxy5tvdesWj)`mP%}S|
z=J!6?euE8;UtW)*&Xd7Es^`T%$W%0b5r-~M8ca;R)CifCMOK%qg-Fjb9{*|y^Ys(`
zHd~o@A)|ESOUrx*;^?X!rR==^YxXUw)_H8(NZi}hfrhD0XeJ2Jtz*c*5{}pdDn&*<
z)S@ModEODdM<3_E*L|ILT(v5p!lM*IY;MAH@Up(*%Wr*^5F>6z5yuW%cX@Qinun9i
zf)r2I7Hz%eI^6jqs#cq&em>VB8SMW>dfCL~_q-*+QNym->y(DG&hgi>dhndyz|j)x
z-vQ!pDt1q*z$X{~TrM@dzEH6G4ZrlBI;t-zcWQH5GC!0w8}tY+0Qp_)*}OwaB`?2E
zknw`&DDJNH?7?5@B`udQ>Z1~NxOvv^Qb_Q1p0YzF3jD*9&Sfr>cl~pgF7~;(0@#(^
z=EG)g1@$A&dViX)VPkI$uCeeZpY24iJRZ%u?LMQwki(o8FjA;P?`hU?)HpBAyx*)^
zC-d9y)z1L4l63k>y6?x5=&xmZP(#B~yYXVX$qFM7AD_ORT^XlV_MJoV78`Jmsy*{~
zr<Q`R_PasWjqt{GSOR=Uyc#Blyfn6#V)KU!J;JTBKTYn{OE0hT)>e~bj)wYr@~M>M
zWMoB!daTr5#2yygUXI`>zC`T*^1frBPl&v4BKi~!0w4LVnQp~jyv*6}Hb5VAcwX!Z
z;hj0Z5r&Pd52Xp)J34+{>WzjP8Es6JZ>~jMuA8<O9y;#GIuK06R~p|dQ`JR}iQkEb
zxAI(&u>9?;;qUMN*!!Q{7#7(oS{{Ad#Sfu#N;`;sSOOzE^YA3Rj#``fJF<k9MQRW;
z11&q0-WXrq@B5DL-8DQlJ6m})=clEiq2aq2N)LfRUX1X??URAWIs6meom(#(oMp#p
zJvv~?QQ5i>ysL>{%?pPfC;N8o=ZDiLdxQMvHr3iv^o(^ihq=f&h?D-4eDwU3+V1Q0
z(%dPUe+TMva(Mn+js<?4S7p|YT+0bCLv3&FLLQcxqvLCSTJcJks<OA+>XR!McAk0N
z&%A=~#Jspw-KlSCnsqNe!fP@*YVApZSaRT|64*zRjT&)rB3l&Oi3!F>G!toTY`lMQ
zy351(E`7ph&(m_?t1TgNB4J0E=i;!l@KT~L6z{evG3$|=g5TlKU;6VU-ew}8g6pLh
z+GyRnr7W$YdFGWXc!%m&pT^#uFfjMWRGJ~Zos(+R36WR8qfM0Smxc3_9u{~4ITK=K
zPE^)LvatHH1>W$acpOSLL8OO!pF%ZbK9VYi@?TtF<bCSM(vA+ZkdP3Y1M*&M!P^(q
z+Ou3`=!)YMsv^{GGb`TTtuZRuvs^-AO7C(W3`46FLj4Ld)Ml}j4BaW}&h~fATK<k>
z1$us59pN8(!DM$0f=dA`yR_ZpIW|Bo{sBGy2A<!GRxUVMNz`ha(Bj-HtS_Y1rlp}d
z`^YQa06q;Ey@q!d=()E7ZfI<5-E8yGO-&+zs;LdKgVlywwpq~s;32mch3TM5_Y73I
zMRIF-2h+t}=BODuXQt-3nU7<XiT?$4MU0ndmDkmcSAa7A*avGXAX~*h<q;_<Ym6_?
zz03s;@tFY3<d2nh{9a`;$PzaorM|6glx*G5&_Ju=`>o<~;ReNDzFy$+aSj>k<m7a%
z%vUG$FgIP=?~pLTJ<JPD7x0k^AJ{*eo15t0*tKDhWITW99z|&;golf34PJLqU?uXm
zv;=2K`Jka<dqrJl5DV#2-oe_{G+Oh_!gxGMH!2z$CZL)tYH89-Yx~(h+Wow;ou)Z7
z{pWK%m#(}c|97Ck=P7)q=!Jy^*YBw9gxOZFHIAqbdFXR0BxW#W-XS?-WN*tK9})@u
zJLQSFxg8{SRozUU0D;KKF}KwJ;`g^AZLF`ayCS$W(mi9*%pn73pJk^}yFzPOr`dh@
z`H-`psxtLJJRAfGMbBXf{j@QwtLZ$OXHZ6Z`~YP>gvci&Nn_Q=M!LGSMIKin`0FZ)
zFjz^s<BB>1MS?Rp-BI83;7ikAQ)Of0l!>U(#(u6)UrsIiXVkWoM|U>Ce=aG=n?l&9
zQCu8z#@SQHuSZW-6@IV2&4&L!fRfU;+@1D@CU`OS7*8C)P`6$9iMx1=Jb};dQw8s*
z0yn%N&KTaY)h(q|ptF|NIYb1GRW7LNFx2B5`(HG}Oxoa010vj9z!p{5mriCo^2<c{
z@S*Bri6HSRA2&!uGo{n6_-QNMi|4De)V%qQ>|cA}S5h)EQ_PbQnz@jH+KR$!CnqP5
zhxg6{<d*Sko3$ZL7}hc{m&tAMD7Mxg^bowcv-9d8x8;cMznd9O73_hExpNL;LEI}h
zJ5eYUW!+MqpWQQj2!;B(x=SD~_u_hDFw5a;hD*y8q|%X^gc!yDk^$x9Fp?=z_1I-3
zsXnGeD)Ytmj|PX*&d$pOJ-$zga9^tb(xwhJs&8gC=h}=jqN_|>!`>>PFKA`Kx-i(9
zPu<za5RtznAb2=Ob{=}Tss?W(fDZ9y;*ves2)=5;$bb*3n~v9T0py3}@Y&<yZX<^N
ztZbaKPo#MX0<EffMA_QnQS3atykBRUJxpIlzUHPwnQ6<>CKhH%dL5cJyBGCl>a-{I
z{dtjzD_^zYEU#qYUYG&I>K{8tR1h12LA&>iPA1^ub*qsX_G;%UeqjUR(<rEp&LS?M
zRY^bPID(^kE#cSo)pZ@QtHZ<R=jXGUn3>k10e41bd=U5VdM^;r($Z3-oSvSx;`V}>
ziYI+5bpx)Z>-XUa5OeeSsUJU1vLvvh24B|kU2f~(Djuj2g@PO4%rHpNK}1g7^C7Iv
z;dfY0mMFckXU=~AS^nRO$1Z)m5Rxtoiz(-e=jvU_5pRBTkjt1oS#2JWS5#E=`Pl+O
z)`A!JIuX|bBS%n9(&zi*RV~TM$;Ag-Q|578R-`jwTBbPnoZKj{-MR5q1<a93=LN%m
z`=$xXF)b=O8b{-u&-|%-6lLg5c@A!UJ-u=G+3_!{RR#X)xSiGvGJL`d+#Jr75VreS
zw%i}fQeIYOm!j1{Q_tKfSUPkxLW7{GEGv`vF+DxK%qzfQ?u+H%<_{;sXRAQ`%F2rE
z1QI$hI?7VDwY|MvhQlJ`rMN52AUy<7UOF|#JF}A8^PQcIH8sCVn}ay8g`LK|O89|O
zRkHndB!;sjr=U~czIl6IUYxh9QkI+%sj(!F+=uIUAgiim#%5+-4?H_A!l3z6+$`{X
za|Uy$C9jV?WqCOvDlVS$2gatAT<A!d;OyMg)^^r~+t#X6dCrIV3)kq}g7BSoUSKd7
z+=GDoglWg?->N=7zX^&ci~B@WTAF`F6xupDZFk#>JYK1Yvr;pGbDaNV<NI6svuwMA
zuNk-dHaPmR>qaRTDB`wzV(S&<J*qPFmb~>_MUEnpGL+NwtD>r^ow#PWS<F6FXY%Af
zP5AllVlK+hS8$lD(9w)Jo!Y}~`IJu6sO=~;RY@>0_(*`bLP&g*-Qp&AtifR_+uqjp
zk!4k?m0CsscYBK}=+p8No~)UXy}iA9%U)8bfkCUUCRkTdu_yjdj|47ZUH4*k>qkV0
zw}>mmYF@8e+%W?#M?15AL#=x`G7q=U-qp9gCA<DF4X%=)hYu(E-Z32<FUN8XPq%vQ
z)*yHc;5=Reh+oV830iU(pCPS1mXHBaC=|*(Ut`suhihyez0F?W%X+hu)|Y70@uolj
zD&SgUNSR)V{lVsh??zDyPI|4Ri;IYe)LZq(DB^neV-jz1OB4!O<2bHU(B=oh!WARA
zYb|=h#zjR%SsEJ~y?n(Xrfd`E$|ukwk@mo7{0`;H1A6e_ORe?bK2DoC;PfCEi%UOA
z2YY*&x%U=5c0RRi%{|<m&$zX#%&mFpqHz^C4I25*B$7MdyUCiv%n3YsxINuD-{F7S
z5f&B}j+=D2y|YIj&Bg?MQKz@r$pVkv{B9Aymd7HVTW1um2$$pZZ!|r>J{;b$D}+;5
z5;~@)=amVHWr7FU30JNl18L6{K!d3(ZTbcV0jED4s!eB`+?IoDYiqx+5|yl|ZDmJk
znYN>0Tt%yt8()<+>>IxxwtKecFcJPs73(x9DXECZs=7vom`0t=u&$e1jjEcOsL$R?
z*UR*b4F2tJH3im#$q(s8sWsE|v>ze#ce%l}3E`PSHZlA8LVl{>6Wpowssu4U1I-EU
zbN)xO*UI%PjRmX+l3qLG#|WHO)Y2N2!>OskmX}+`EAY(GG$MqVHb$y4rJjl_Wq>``
zos%oK7D19nL#+)S@cCKOU)=VqkLk!jUw=+dS63)Y?e7#gY_6|2!56xM$Z(s9gx~s?
zyt^E+N;^1-;xp2OnY#<IA}eK|j{`xqkcEK*sXwR81N;x`MrHht&_!y|u+eO3#2{V@
zxq6tkc$S_1v)Ds_v^{-vK3QqP|M~pBk30eNaqKa7GD%J!jW&nag8$c1a^#r;^3LyY
zh)t8V?C+Jt#HkA0yTh@3rBLkJXpW5k$vzmz9O%>N=;-p~zpMhEs)B-ox(8GEk4!t^
z?VSw`2fliGdIqMZvs5_&7e3X>!5mzUdt@bT@`(BBqvpHY9*0@mfuMCaS*|49Wp~Ui
zZ9Dd#?i97oZDDum8fpLa+V$R$XfU-}vvegZQvmd!P$-0VK4@&5qSSr-aqF>1aPnxR
zGNI;IDG6*lgDp<ajJ^4vh|$u1grO*HlP+z`gFImf(<@sk_9rS+MCK+6YoW!=h64wD
z5F~#WPhW_+9A?=0><Y-`ku{(2s;lY%Yp%Okwz3v7Hy4!ey<7G^Fe(l&yjV{^+}*~K
zm7XbpTm%pZ98@6J{Z#@En!03>WWHM#5!|1*C$qzKQx~7oZ<U6ybCTEI$zmu9hx&il
z(rJPVNJ=xad=!wW34YSOBGht92(#U?++TmA5%7g;wS^w!lWsml?5p`RT0P=;Cxjcr
z{tYDA&2_|YdhNwHMM+yXjXa(sxm8OUjHe<p^{l5Xwf43q*y@jaVyPXj<{r>4u(5HN
zc`p@TCT_RBH~$AqRu+7B87GgdC`$?ji6A5L><XY=ux|)g$q0G*Sul5B4j%o9uhR`z
zdFJ9kyh#K0k2tK^a)qe+O2iT7+8i9=dTINa_v-OT5;`?2Gea%V2GKRWn3;;~_5c^q
zT6<#(MEe1TUhbwUo{1NHbh`9(`oD)`>1*$3f{iFkheF6nkeTj=4-n3`m2C04Rp6dj
z6z0Q+Qa7sNJI%|J_xj|+$qRSB{wn{gi<kM6!9G%o+<H3{64<X62=US=w@!QtzRl?R
ziBS&KEuLY5AF^>t>_J%ZhQ7gJlDrRwjo*IZ&z}d^*x@4wX4Efn&j6Q~gaFL4AWm;<
R=Jp>5SV{9qmBRDj{{t!|1@iy^

diff --git a/stepmania/Themes/default/Graphics/ScreenOptions RowFrameNormal/default.lua b/stepmania/Themes/default/Graphics/ScreenOptions RowFrameNormal/default.lua
deleted file mode 100644
index 79617a4c34..0000000000
--- a/stepmania/Themes/default/Graphics/ScreenOptions RowFrameNormal/default.lua	
+++ /dev/null
@@ -1,10 +0,0 @@
-return Def.ActorFrame {
-	LoadActor("focus") .. {
-		GainFocusCommand=cmd(visible,true;);
-		LoseFocusCommand=cmd(visible,false;);
-	};
-	LoadActor("nofocus") .. {
-		GainFocusCommand=cmd(visible,false;);
-		LoseFocusCommand=cmd(visible,true;);
-	};
-};
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenOptions footer.redir b/stepmania/Themes/default/Graphics/ScreenOptions footer.redir
new file mode 100644
index 0000000000..f4b815b926
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/ScreenOptions footer.redir	
@@ -0,0 +1 @@
+_footer large
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenOptionsService header.redir b/stepmania/Themes/default/Graphics/ScreenOptionsService header.redir
deleted file mode 100644
index c700c90d39..0000000000
--- a/stepmania/Themes/default/Graphics/ScreenOptionsService header.redir	
+++ /dev/null
@@ -1 +0,0 @@
-_blank
diff --git a/stepmania/Themes/default/Graphics/ScreenOptionsServiceChild header.redir b/stepmania/Themes/default/Graphics/ScreenOptionsServiceChild header.redir
deleted file mode 100644
index c700c90d39..0000000000
--- a/stepmania/Themes/default/Graphics/ScreenOptionsServiceChild header.redir	
+++ /dev/null
@@ -1 +0,0 @@
-_blank
diff --git a/stepmania/Themes/default/Graphics/ScreenOptionsSimple cursor 3x2.redir b/stepmania/Themes/default/Graphics/ScreenOptionsSimple cursor.redir
similarity index 100%
rename from stepmania/Themes/default/Graphics/ScreenOptionsSimple cursor 3x2.redir
rename to stepmania/Themes/default/Graphics/ScreenOptionsSimple cursor.redir
diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini
index 605e58cc0a..2bec2393b0 100644
--- a/stepmania/Themes/default/Languages/en.ini
+++ b/stepmania/Themes/default/Languages/en.ini
@@ -1304,6 +1304,8 @@ Off=Off
 Error mounting card: %s=Error mounting card: %s
 
 [ScreenOptionsService]
+HeaderText=Options
+HeaderSubText=You can configure the game here
 HelpText=&UP; &DOWN; to change line   then press START
 
 [ScreenOtherOptions]
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index c3ec4eb5b0..714bb50b48 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -723,14 +723,14 @@ BPMDisplayX=SCREEN_CENTER_X-120
 BPMDisplayY=SCREEN_CENTER_Y+185
 BPMDisplayOnCommand=horizalign,right;shadowlength,0;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6
 BPMDisplayOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6
-OptionIconsP1X=SCREEN_CENTER_X-300
-OptionIconsP1Y=SCREEN_CENTER_Y-182
-OptionIconsP1OnCommand=zoomy,0;linear,0.5;zoomy,1
-OptionIconsP1OffCommand=linear,0.5;zoomy,0
-OptionIconsP2X=SCREEN_CENTER_X-300
-OptionIconsP2Y=SCREEN_CENTER_Y-164
-OptionIconsP2OnCommand=zoomy,0;linear,0.5;zoomy,1
-OptionIconsP2OffCommand=linear,0.5;zoomy,0
+ModIconsP1X=SCREEN_CENTER_X-300
+ModIconsP1Y=SCREEN_CENTER_Y-182
+ModIconsP1OnCommand=zoomy,0;linear,0.5;zoomy,1
+ModIconsP1OffCommand=linear,0.5;zoomy,0
+ModIconsP2X=SCREEN_CENTER_X-300
+ModIconsP2Y=SCREEN_CENTER_Y-164
+ModIconsP2OnCommand=zoomy,0;linear,0.5;zoomy,1
+ModIconsP2OffCommand=linear,0.5;zoomy,0
 ChatInputBoxY=SCREEN_CENTER_Y+110
 ChatInputBoxX=SCREEN_CENTER_X-157
 ChatInputBoxOnCommand=addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6
@@ -2214,7 +2214,6 @@ ShowScrollBar=false
 ScrollBarHeight=0
 ScrollBarTime=0
 LineHighlightX=SCREEN_CENTER_X
-ShowBpmInSpeedTitle=false
 FrameOnCommand=x,-SCREEN_WIDTH;decelerate,0.3;addx,SCREEN_WIDTH
 FrameOffCommand=accelerate,0.3;addx,SCREEN_WIDTH
 ShowExitRow=true
@@ -2228,17 +2227,20 @@ MoreExitSelectedP2Command=
 MoreExitUnselectedP1Command=
 MoreExitUnselectedP2Command=
 ShowExplanations=true
-ShowOptionIcons=true
-ShowUnderlines=true
-IconsOnCommand=x,-30
 AllowRepeatingChangeValueInput=false
 CursorTweenSeconds=0.3
 WrapValueInRow=true
+OptionRowMetricsGroup="OptionRow"
 
-IconsP1X=SCREEN_CENTER_X-280
-IconsP2X=SCREEN_CENTER_X+280
-RowFrameX=SCREEN_CENTER_X-232
-RowFrameOnCommand=
+[OptionRow]
+ShowModIcons=true
+ShowUnderlines=true
+ShowBpmInSpeedTitle=false
+ModIconP1X=SCREEN_CENTER_X-280
+ModIconP2X=SCREEN_CENTER_X+280
+ModIconOnCommand=x,-30
+FrameX=SCREEN_CENTER_X
+FrameOnCommand=
 TitleX=SCREEN_CENTER_X-180
 TitleOnCommand=zoom,0.7;horizalign,right;shadowlength,0
 TitleGainFocusCommand=
@@ -2259,9 +2261,7 @@ ColorNotSelected=color("0.5,0.5,0.5,1")
 ColorDisabled=color("0.1,0.1,0.1,1")
 CapitalizeAllOptionNames=false
 TweenSeconds=0.3
-
-LineExitItem=list,ExitItem
-LineExitTitle=list,ExitTitle
+ModIconMetricsGroup="ModIcon"
 
 [ScreenMapControllers]
 Class="ScreenMapControllers"
@@ -2625,42 +2625,43 @@ MountainsBaseY=
 MountainWidth=
 MountainHeight=
 
-[OptionIcon]
-TextOffsetX=0
-TextOffsetY=-2
-TextHAlign=1	-- 0,1,2 = left,center,right
-TextVAlign=1	-- 0,1,2 = top,middle,bottom
-TextWidth=72
-TextZoom=0.5
-Uppercase=false
+[ModIcon]
+TextX=0
+TextY=-2
+TextOnCommand=zoom,0.5;maxwidth,72;uppercase,true
 
-[OptionIconRow]
-NumOptionIcons=6
-OptionIconOnCommand=
+[ModIconSelectMusic]
+Fallback="ModIcon"
+
+[ModIconRow]
+NumModIcons=6
+ModIconOnCommand=
 SpacingX=46
 SpacingY=0
+ModIconMetircsGroup="ModIcon"
 
-[OptionIconRowSelectMusic]
-Fallback="OptionIconRow"
+[ModIconRowSelectMusic]
+Fallback="ModIconRow"
+ModIconMetircsGroup="ModIconSelectMusic"
 
-[OptionIconRowGameplay]
-Fallback="OptionIconRow"
+[ModIconRowGameplay]
+Fallback="ModIconRow"
 SpacingX=0
 SpacingY=46
 
-[OptionIconRowGameplayP1]
-Fallback="OptionIconRowGameplay"
-OptionIconOnCommand=rotationz,-90;
+[ModIconRowGameplayP1]
+Fallback="ModIconRowGameplay"
+ModIconOnCommand=rotationz,-90;
 
-[OptionIconRowGameplayP2]
-Fallback="OptionIconRowGameplay"
-OptionIconOnCommand=rotationz,90;
+[ModIconRowGameplayP2]
+Fallback="ModIconRowGameplay"
+ModIconOnCommand=rotationz,90;
 
-[OptionIconRowEvaluationP1]
-Fallback="OptionIconRowGameplayP1"
+[ModIconRowEvaluationP1]
+Fallback="ModIconRowGameplayP1"
 
-[OptionIconRowEvaluationP2]
-Fallback="OptionIconRowGameplayP2"
+[ModIconRowEvaluationP2]
+Fallback="ModIconRowGameplayP2"
 
 [TransitionOniFade]
 BannerWidth=512
@@ -3405,7 +3406,6 @@ PrevScreen=ScreenTitleBranch()
 # when using entries that change the screen; otherwise, the only way to
 # exit the screen when in regular mode is "exit".
 
-IconsOnCommand=x,-30
 TimerOnCommand=visible,false
 ShowStyleIcon=false
 TimerSeconds=-1
@@ -4024,11 +4024,13 @@ HeaderY=SCREEN_TOP+40
 HeaderOnCommand=
 HeaderOffCommand=
 AllowRepeatingChangeValueInput=true
+OptionRowMetricsGroup="OptionRowMiniMenu"
 
+[OptionRowMiniMenu]
 IconsP1X=SCREEN_CENTER_X-280
 IconsP2X=SCREEN_CENTER_X+280
 IconsOnCommand=x,-30
-RowFrameX=SCREEN_CENTER_X-232
+FrameX=SCREEN_CENTER_X-232
 TitleX=SCREEN_CENTER_X-150
 TitleOnCommand=horizalign,left;shadowlength,2
 ItemsStartX=SCREEN_CENTER_X-160
@@ -4196,10 +4198,6 @@ WrapValueInRow=false
 NavigationMode="menu"
 ForceAllPlayers=true
 InputMode="together"
-TitleOnCommand=horizalign,left;shadowlength,0
-TitleGainFocusCommand=diffuseshift;effectcolor1,1.3,1.3,1.3,1;effectcolor2,0.3,0.3,0.3,1
-TitleLoseFocusCommand=stopeffect
-RowFrameOnCommand=visible,false
 
 [ScreenOptionsManageCourses]
 Class="ScreenOptionsManageCourses"