diff --git a/stepmania/Themes/default/Fonts/OptionRow Item.redir b/stepmania/Themes/default/Fonts/OptionRow Item.redir
new file mode 100644
index 0000000000..203a465dde
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/OptionRow Item.redir	
@@ -0,0 +1 @@
+_Arial 14 shadow
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/OptionRow Title.redir b/stepmania/Themes/default/Fonts/OptionRow Title.redir
new file mode 100644
index 0000000000..0a288cabe1
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/OptionRow Title.redir	
@@ -0,0 +1 @@
+_terminator two 32
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/OptionRowSimple Frame (doubleres).png b/stepmania/Themes/default/Graphics/OptionRowSimple Frame (doubleres).png
new file mode 100644
index 0000000000..97a5d4601d
Binary files /dev/null and b/stepmania/Themes/default/Graphics/OptionRowSimple Frame (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/OptionRowSimple FrameExit.redir b/stepmania/Themes/default/Graphics/OptionRowSimple FrameExit.redir
deleted file mode 100644
index 9c5f65a928..0000000000
--- a/stepmania/Themes/default/Graphics/OptionRowSimple FrameExit.redir	
+++ /dev/null
@@ -1 +0,0 @@
-OptionRowSimple FrameNormal
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/OptionRowSimple FrameNormal (doubleres).png b/stepmania/Themes/default/Graphics/OptionRowSimple FrameNormal (doubleres).png
deleted file mode 100644
index c4f374fad9..0000000000
Binary files a/stepmania/Themes/default/Graphics/OptionRowSimple FrameNormal (doubleres).png and /dev/null differ
diff --git a/stepmania/Themes/default/Graphics/OptionRowSimpleExit Frame (doubleres).png b/stepmania/Themes/default/Graphics/OptionRowSimpleExit Frame (doubleres).png
new file mode 100644
index 0000000000..f0b40c7c32
Binary files /dev/null and b/stepmania/Themes/default/Graphics/OptionRowSimpleExit Frame (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/ScreenOptions Page (doubleres).png b/stepmania/Themes/default/Graphics/ScreenOptions Page (doubleres).png
index ccbac0a697..e9fef31d87 100644
Binary files a/stepmania/Themes/default/Graphics/ScreenOptions Page (doubleres).png and b/stepmania/Themes/default/Graphics/ScreenOptions Page (doubleres).png differ
diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini
index acc1cd7386..f50b6a59b8 100644
--- a/stepmania/Themes/default/Languages/en.ini
+++ b/stepmania/Themes/default/Languages/en.ini
@@ -319,8 +319,6 @@ EditorShowBGChangesPlay=Choose whether to display song backgrounds while playing
 Effect=Effect
 EventMode=When set to &oq;ON&cq;, and you can continue playing forever.  Failing will also take you back to the the Select Music or Select Course screen.
 Exit=
-ExitItem=
-ExitTitle=
 Fail=Fail
 FastLoad=If enabled, don't check songs for changes on load.
 Fill Machine Stats=
@@ -741,7 +739,7 @@ EditorShowBGChangesPlay=Show Backgrounds
 Effect=Effect
 Entry %d=Entry %d
 EventMode=Event Mode
-Exit=
+Exit=Exit
 Fail=Fail
 FastLoad=Fast\nLoad
 File1 Global BGAnimation=File1 Global BGAnimation
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 68c24a71c6..d393df5b9c 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -596,6 +596,7 @@ BannerY=0
 BannerOnCommand=scaletoclipped,322,120;visible,false;ztest,1
 BannerOffCommand=
 ShowStageDisplay=true
+ShowStageFrame=true
 CDTitleX=SCREEN_CENTER_X+240
 CDTitleY=SCREEN_CENTER_Y-50
 CDTitleFrontCommand=roll,1;spin;effectmagnitude,0,150,0;cullmode,"CullMode_Back";
@@ -940,6 +941,7 @@ CombinedLifeY=SCREEN_CENTER_Y-212
 CombinedLifeOnCommand=addy,-100;linear,0.5;addy,100
 CombinedLifeOffCommand=linear,0.5;addy,-100
 ShowStageDisplay=not GAMESTATE:IsCourseMode()
+ShowStageFrame=true
 StageDisplayX=SCREEN_CENTER_X+0
 StageDisplayY=SCREEN_CENTER_Y-206
 StageDisplayOnCommand=draworder,-1;addy,-100;linear,0.5;addy,100
@@ -1598,6 +1600,7 @@ ShowWinArea=false
 ShowScoreArea=true
 ShowTimeArea=false
 ShowStageDisplay=true
+ShowStageFrame=true
 
 TryExtraStageX=SCREEN_CENTER_X+0
 TryExtraStageY=SCREEN_CENTER_Y+188
@@ -1651,6 +1654,7 @@ ShowWinArea=false
 ShowScoreArea=true
 ShowTimeArea=false
 ShowStageDisplay=false
+ShowStageFrame=false
 
 [ScreenEvaluationOni]
 Fallback="ScreenEvaluation"
@@ -1664,6 +1668,7 @@ ShowWinArea=false
 ShowScoreArea=false
 ShowTimeArea=true
 ShowStageDisplay=false
+ShowStageFrame=false
 PercentFrameP1X=SCREEN_CENTER_X-226
 PercentFrameP1Y=SCREEN_CENTER_Y-140
 PercentFrameP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,SCREEN_WIDTH/2
@@ -1711,6 +1716,7 @@ ShowTimeArea=false
 FailedSoundTime=0
 PassedSoundTime=0
 ShowStageDisplay=true
+ShowStageFrame=true
 StageDisplayX=SCREEN_CENTER_X+0
 StageDisplayY=SCREEN_CENTER_Y-168
 StageDisplayOnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
@@ -2096,14 +2102,14 @@ Fallback="DifficultyDisplayGameplay"
 Fallback="Screen"
 AllowDisabledPlayerInput=false
 ShowStyleIcon=true
-ShowStageDisplay=true
+ShowStageDisplay=false
 StageDisplayStageToShow=GAMESTATE:GetCurrentStage()
 StageDisplayStageIndex=GAMESTATE:GetStageIndex()
 StageDisplayX=SCREEN_CENTER_X+220
 StageDisplayY=SCREEN_CENTER_Y-172
 StageDisplayOnCommand=draworder,-2;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6
 StageDisplayOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6
-ShowStageFrame=true
+ShowStageFrame=false
 StageFrameX=SCREEN_CENTER_X+220
 StageFrameY=SCREEN_CENTER_Y-172
 StageFrameOnCommand=draworder,-2;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6
@@ -2115,8 +2121,8 @@ HeaderY=SCREEN_TOP+35
 HeaderOnCommand=addy,-50;linear,0.25;addy,50
 HeaderOffCommand=linear,0.25;addy,-50;
 FooterX=SCREEN_CENTER_X
-FooterY=SCREEN_BOTTOM-34
-FooterOnCommand=
+FooterY=SCREEN_BOTTOM
+FooterOnCommand=vertalign,bottom
 FooterOffCommand=
 HelpX=SCREEN_CENTER_X
 HelpY=SCREEN_BOTTOM-40
@@ -2183,7 +2189,7 @@ NumRowsShown=8
 RowInitCommand=
 RowOnCommand=
 RowOffCommand=
-RowPositionTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:y(SCREEN_CENTER_Y-136+35*offsetFromCenter) end
+RowPositionTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:y(SCREEN_CENTER_Y-146+36*offsetFromCenter) end
 ExplanationP1X=SCREEN_CENTER_X-250
 ExplanationP1Y=SCREEN_CENTER_Y+172
 ExplanationP2X=SCREEN_CENTER_X+250
@@ -2205,8 +2211,10 @@ DisqualifyP2Y=
 DisqualifyP2OnCommand=visible,false
 DisqualifyP2OffCommand=
 PageX=SCREEN_CENTER_X
-PageY=SCREEN_CENTER_Y+8
+PageY=SCREEN_CENTER_Y-2
 PageOnCommand=
+ContainerOnCommand=draworder,-1;addx,-SCREEN_WIDTH;decelerate,0.5;addx,SCREEN_WIDTH;
+ContainerOffCommand=accelerate,0.5;addx,SCREEN_WIDTH;
 CursorOnCommand=
 LineHighlightOnCommand=
 LineHighlightChangeCommand=
@@ -2242,8 +2250,10 @@ ModIconP1X=SCREEN_CENTER_X-280
 ModIconP2X=SCREEN_CENTER_X+280
 ModIconOnCommand=x,-30
 FrameX=SCREEN_CENTER_X-222
+FrameY=0
 FrameOnCommand=
 TitleX=SCREEN_CENTER_X-222
+TitleY=-2
 TitleOnCommand=shadowlength,0;uppercase,true;wrapwidthpixels,250;
 TitleGainFocusCommand=diffuse,color("#fff600");strokecolor,color("#7f6739");
 TitleLoseFocusCommand=diffuse,color("#ffffff");strokecolor,color("#37537d");
@@ -2257,7 +2267,6 @@ ItemsLongRowSharedX=SCREEN_CENTER_X+20
 ItemOnCommand=zoom,0.5;shadowlength,0;
 ItemGainFocusCommand=
 ItemLoseFocusCommand=
-ExitHideItem=false
 TweenSeconds=0.2
 ModIconMetricsGroup="ModIcon"
 ColorSelected=color("1,1,1,1")
@@ -2266,6 +2275,8 @@ ColorDisabled=color("0.5,0.5,0.5,1")
 
 [OptionRowExit]
 Fallback="OptionRow"
+FrameOnCommand=visible,false
+TitleOnCommand=visible,false
 
 [OptionsCursor]
 LeftX=
@@ -2529,8 +2540,8 @@ HoldJudgmentHeldCommand=shadowlength,0;diffusealpha,1;zoom,1.25;linear,0.3;zoomx
 
 [Combo]
 ShowComboAt=2
-LabelOnCommand=x,SCREEN_CENTER_X-314;y,SCREEN_CENTER_Y-220;shadowlength,0;HorizAlign,left;VertAlign,bottom
-NumberOnCommand=y,SCREEN_CENTER_Y-216;shadowlength,0;HorizAlign,right;VertAlign,bottom
+LabelOnCommand=x,SCREEN_CENTER_X-314;y,SCREEN_CENTER_Y-220;shadowlength,0;HorizAlign,left;vertalign,bottom
+NumberOnCommand=y,SCREEN_CENTER_Y-216;shadowlength,0;HorizAlign,right;vertalign,bottom
 NumberMinZoom=0.5
 NumberMaxZoom=0.8
 NumberMaxZoomAt=200
@@ -2992,7 +3003,6 @@ Line17="conf,ShowDancingCharacters"
 Line18="conf,ShowBeginnerHelper"
 Line19="conf,NumBackgrounds"
 
-
 [ScreenAttract]
 ResetGameState=true
 StartScreen=ScreenTitleBranch()
@@ -3020,7 +3030,6 @@ TimerX=
 TimerY=
 TimerOnCommand=visible,false
 TimerOffCommand=
-ShowStyleIcon=false
 
 [ScreenSelectBlank]
 Fallback="ScreenWithMenuElementsBlank"
@@ -3415,20 +3424,30 @@ Fallback="EditCoursesMenu"
 
 [ScreenOptionsSimple]
 Fallback="ScreenOptionsMaster"
-TitleX=SCREEN_CENTER_X-180
-TitleOnCommand=horizalign,left;shadowlength,0
+NumRowsShown=9
+RowPositionTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:y(SCREEN_CENTER_Y-154+33*offsetFromCenter) end
 NavigationMode="menu"
 ForceAllPlayers=true
 InputMode="together"
 ShowStyleIcon=false
-OptionRowMetricsGroup="OptionRowSimple"
 CursorOnCommand=visible,false
+OptionRowNormalMetricsGroup="OptionRowSimple"
+OptionRowExitMetricsGroup="OptionRowSimpleExit"
+SeparateExitRowY=SCREEN_CENTER_Y+142
 
 [OptionRowSimple]
 Fallback="OptionRow"
 FrameX=SCREEN_CENTER_X
+FrameY=2
 TitleX=SCREEN_CENTER_X
+TitleY=-2
 TitleOnCommand=shadowlength,0;uppercase,true
+FrameGainFocusCommand=diffuse,1,1,1,1;glowshift;effectcolor2,color("#fffdd4");
+FrameLoseFocusCommand=diffuse,1,1,1,1;stopeffect
+
+[OptionRowSimpleExit]
+Fallback="OptionRowSimple"
+ItemOnCommand=visible,false
 
 [ScreenOptionsService]
 Class="ScreenOptionsMaster"
@@ -3635,14 +3654,6 @@ DancePadAngle=36
 HelperX=SCREEN_CENTER_X+0
 HelperY=SCREEN_CENTER_Y+80
 
-[OptionTitles]
-ExitItem=""
-ExitTitle=ScreenString("Exit")
-
-[OptionNames]
-ExitItem=ScreenString("Exit")
-ExitTitle=""
-
 [ScreenOptionsMaster]
 Fallback="ScreenOptions"
 Class="ScreenOptionsMaster"
@@ -4304,10 +4315,6 @@ DifficultyP1ReverseOnCommand=visible,false
 DifficultyP2OnCommand=visible,false
 DifficultyP2ReverseOnCommand=visible,false
 SongOptionsOnCommand=visible,false
-FooterX=SCREEN_CENTER_X
-FooterY=SCREEN_BOTTOM-16
-FooterOnCommand=draworder,95;ZoomToWidth,SCREEN_WIDTH
-FooterOffCommand=
 HelpX=SCREEN_CENTER_X
 HelpY=SCREEN_BOTTOM-24
 HelpOnCommand=draworder,1;zoomy,0;linear,0.5;zoomy,1