diff --git a/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/cursor p1 (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/cursor p1 (doubleres).png
deleted file mode 100644
index 493d4b2c47..0000000000
Binary files a/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/cursor p1 (doubleres).png and /dev/null differ
diff --git a/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/cursor p2 (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/cursor p2 (doubleres).png
deleted file mode 100644
index d09ac1c468..0000000000
Binary files a/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/cursor p2 (doubleres).png and /dev/null differ
diff --git a/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/done frame (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/done frame (doubleres).png
deleted file mode 100644
index 097cdbe195..0000000000
Binary files a/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/done frame (doubleres).png and /dev/null differ
diff --git a/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/row focus (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/row focus (doubleres).png
deleted file mode 100644
index b82cf9a94d..0000000000
Binary files a/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/row focus (doubleres).png and /dev/null differ
diff --git a/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/row nofocus (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/row nofocus (doubleres).png
deleted file mode 100644
index ae8ee4e29b..0000000000
Binary files a/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/row nofocus (doubleres).png and /dev/null differ
diff --git a/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/underline p1 (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/underline p1 (doubleres).png
deleted file mode 100644
index 188de6bb60..0000000000
Binary files a/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/underline p1 (doubleres).png and /dev/null differ
diff --git a/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/underline p2 (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/underline p2 (doubleres).png
deleted file mode 100644
index fbae2ebfae..0000000000
Binary files a/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/underline p2 (doubleres).png and /dev/null differ
diff --git a/stepmania/Themes/default/Graphics/ScreenOptions RowFrameExit/Focus (doubleres).png b/stepmania/Themes/default/Graphics/ScreenOptions RowFrameExit/Focus (doubleres).png
new file mode 100644
index 0000000000..de101c1f9e
Binary files /dev/null and b/stepmania/Themes/default/Graphics/ScreenOptions RowFrameExit/Focus (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/ScreenOptions RowFrameExit/NoFocus (doubleres).png b/stepmania/Themes/default/Graphics/ScreenOptions RowFrameExit/NoFocus (doubleres).png
new file mode 100644
index 0000000000..480a79ed81
Binary files /dev/null and b/stepmania/Themes/default/Graphics/ScreenOptions RowFrameExit/NoFocus (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/ScreenOptions RowFrameExit/default.lua b/stepmania/Themes/default/Graphics/ScreenOptions RowFrameExit/default.lua
new file mode 100644
index 0000000000..79617a4c34
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/ScreenOptions RowFrameExit/default.lua	
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 0000000000..bd84aa0ea0
Binary files /dev/null and b/stepmania/Themes/default/Graphics/ScreenOptions RowFrameNormal/Focus (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/ScreenOptions RowFrameNormal/NoFocus (doubleres).png b/stepmania/Themes/default/Graphics/ScreenOptions RowFrameNormal/NoFocus (doubleres).png
new file mode 100644
index 0000000000..9584cdc8ff
Binary files /dev/null and b/stepmania/Themes/default/Graphics/ScreenOptions RowFrameNormal/NoFocus (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/ScreenOptions RowFrameNormal/default.lua b/stepmania/Themes/default/Graphics/ScreenOptions RowFrameNormal/default.lua
new file mode 100644
index 0000000000..79617a4c34
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/ScreenOptions RowFrameNormal/default.lua	
@@ -0,0 +1,10 @@
+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 bullet.png b/stepmania/Themes/default/Graphics/ScreenOptions bullet.png
deleted file mode 100644
index 4854bdaa1e..0000000000
Binary files a/stepmania/Themes/default/Graphics/ScreenOptions bullet.png and /dev/null differ
diff --git a/stepmania/Themes/default/Graphics/ScreenOptions cursor 3x2.png b/stepmania/Themes/default/Graphics/ScreenOptions cursor 3x2.png
deleted file mode 100644
index 58ca1dc896..0000000000
Binary files a/stepmania/Themes/default/Graphics/ScreenOptions cursor 3x2.png and /dev/null differ
diff --git a/stepmania/Themes/default/Graphics/ScreenOptions cursor p1 3x1 (doubleres).png b/stepmania/Themes/default/Graphics/ScreenOptions cursor p1 3x1 (doubleres).png
new file mode 100644
index 0000000000..181d703832
Binary files /dev/null and b/stepmania/Themes/default/Graphics/ScreenOptions cursor p1 3x1 (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/ScreenOptions cursor p2 3x1 (doubleres).png b/stepmania/Themes/default/Graphics/ScreenOptions cursor p2 3x1 (doubleres).png
new file mode 100644
index 0000000000..6a715b5da6
Binary files /dev/null and b/stepmania/Themes/default/Graphics/ScreenOptions cursor p2 3x1 (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/ScreenOptions page.png b/stepmania/Themes/default/Graphics/ScreenOptions page.png
deleted file mode 100644
index fb6c9fb542..0000000000
Binary files a/stepmania/Themes/default/Graphics/ScreenOptions page.png and /dev/null differ
diff --git a/stepmania/Themes/default/Graphics/ScreenOptions page.redir b/stepmania/Themes/default/Graphics/ScreenOptions page.redir
new file mode 100644
index 0000000000..04b2ead777
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/ScreenOptions page.redir	
@@ -0,0 +1 @@
+_blank
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenOptions underline 3x2.png b/stepmania/Themes/default/Graphics/ScreenOptions underline 3x2.png
deleted file mode 100644
index a92edc8613..0000000000
Binary files a/stepmania/Themes/default/Graphics/ScreenOptions underline 3x2.png and /dev/null differ
diff --git a/stepmania/Themes/default/Graphics/ScreenOptions underline p1 3x1 (doubleres).png b/stepmania/Themes/default/Graphics/ScreenOptions underline p1 3x1 (doubleres).png
new file mode 100644
index 0000000000..5ffc43bff5
Binary files /dev/null and b/stepmania/Themes/default/Graphics/ScreenOptions underline p1 3x1 (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/ScreenOptions underline p2 3x1 (doubleres).png b/stepmania/Themes/default/Graphics/ScreenOptions underline p2 3x1 (doubleres).png
new file mode 100644
index 0000000000..92c5bfa0ed
Binary files /dev/null and b/stepmania/Themes/default/Graphics/ScreenOptions underline p2 3x1 (doubleres).png differ
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 2800677064..c3ec4eb5b0 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -2172,7 +2172,7 @@ Warning1Command=stoptweening;linear,0.2;zoomx,1;sleep,0.6;linear,0.2;zoomx,0
 Warning0Command=stoptweening;stopeffect;linear,0.2;zoomx,1
 
 [ScreenOptions]
-Fallback="ScreenWithMenuElements"
+Fallback="ScreenWithMenuElements2"
 NavigationMode="normal"
 InputMode="individual"
 ForceAllPlayers=false
@@ -2237,8 +2237,8 @@ WrapValueInRow=true
 
 IconsP1X=SCREEN_CENTER_X-280
 IconsP2X=SCREEN_CENTER_X+280
-BulletX=SCREEN_CENTER_X-232
-BulletOnCommand=
+RowFrameX=SCREEN_CENTER_X-232
+RowFrameOnCommand=
 TitleX=SCREEN_CENTER_X-180
 TitleOnCommand=zoom,0.7;horizalign,right;shadowlength,0
 TitleGainFocusCommand=
@@ -4028,7 +4028,7 @@ AllowRepeatingChangeValueInput=true
 IconsP1X=SCREEN_CENTER_X-280
 IconsP2X=SCREEN_CENTER_X+280
 IconsOnCommand=x,-30
-BulletX=SCREEN_CENTER_X-232
+RowFrameX=SCREEN_CENTER_X-232
 TitleX=SCREEN_CENTER_X-150
 TitleOnCommand=horizalign,left;shadowlength,2
 ItemsStartX=SCREEN_CENTER_X-160
@@ -4199,7 +4199,7 @@ 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
-BulletOnCommand=visible,false
+RowFrameOnCommand=visible,false
 
 [ScreenOptionsManageCourses]
 Class="ScreenOptionsManageCourses"