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/Fonts/ScreenOptions text 16x16.png b/stepmania/Themes/default/Fonts/ScreenOptions text 16x16.png
deleted file mode 100644
index 30027cbd62..0000000000
Binary files a/stepmania/Themes/default/Fonts/ScreenOptions text 16x16.png and /dev/null differ
diff --git a/stepmania/Themes/default/Fonts/ScreenOptions text.ini b/stepmania/Themes/default/Fonts/ScreenOptions text.ini
deleted file mode 100644
index 725a87928c..0000000000
--- a/stepmania/Themes/default/Fonts/ScreenOptions text.ini	
+++ /dev/null
@@ -1,257 +0,0 @@
-[Char Widths]
-0=11
-1=11
-2=11
-3=11
-4=11
-5=11
-6=11
-7=11
-8=11
-9=72
-10=0
-11=11
-12=11
-13=0
-14=11
-15=11
-16=11
-17=11
-18=11
-19=11
-20=11
-21=11
-22=11
-23=11
-24=11
-25=11
-26=11
-27=11
-28=0
-29=0
-30=0
-31=0
-32=4
-33=6
-34=8
-35=13
-36=12
-37=15
-38=12
-39=4
-40=7
-41=7
-42=6
-43=11
-44=4
-45=6
-46=4
-47=8
-48=11
-49=8
-50=11
-51=11
-52=10
-53=11
-54=11
-55=8
-56=11
-57=11
-58=4
-59=4
-60=11
-61=11
-62=11
-63=11
-64=16
-65=10
-66=12
-67=12
-68=12
-69=9
-70=8
-71=12
-72=12
-73=6
-74=7
-75=11
-76=8
-77=15
-78=11
-79=11
-80=11
-81=11
-82=11
-83=11
-84=10
-85=11
-86=10
-87=16
-88=10
-89=10
-90=8
-91=6
-92=8
-93=6
-94=10
-95=12
-96=7
-97=11
-98=11
-99=10
-100=11
-101=11
-102=6
-103=11
-104=11
-105=5
-106=5
-107=10
-108=5
-109=15
-110=11
-111=11
-112=11
-113=11
-114=8
-115=10
-116=6
-117=11
-118=9
-119=13
-120=9
-121=9
-122=7
-123=8
-124=6
-125=8
-126=11
-127=11
-128=11
-129=6
-130=4
-131=9
-132=7
-133=12
-134=11
-135=11
-136=7
-137=22
-138=11
-139=4
-140=14
-141=6
-142=8
-143=6
-144=6
-145=4
-146=4
-147=7
-148=7
-149=7
-150=11
-151=21
-152=7
-153=16
-154=10
-155=4
-156=16
-157=6
-158=7
-159=10
-160=4
-161=6
-162=11
-163=11
-164=12
-165=10
-166=6
-167=10
-168=7
-169=16
-170=7
-171=8
-172=11
-173=6
-174=16
-175=12
-176=7
-177=11
-178=7
-179=7
-180=7
-181=10
-182=12
-183=7
-184=7
-185=5
-186=7
-187=8
-188=13
-189=14
-190=15
-191=11
-192=10
-193=10
-194=10
-195=10
-196=10
-197=10
-198=15
-199=12
-200=9
-201=9
-202=9
-203=9
-204=6
-205=6
-206=6
-207=6
-208=12
-209=11
-210=11
-211=11
-212=11
-213=11
-214=11
-215=11
-216=11
-217=11
-218=11
-219=11
-220=11
-221=10
-222=11
-223=12
-224=11
-225=11
-226=11
-227=11
-228=11
-229=11
-230=16
-231=10
-232=11
-233=11
-234=11
-235=11
-236=5
-237=5
-238=5
-239=5
-240=11
-241=11
-242=11
-243=11
-244=11
-245=11
-246=11
-247=11
-248=11
-249=11
-250=11
-251=11
-252=11
-253=9
-254=11
-255=9
diff --git a/stepmania/Themes/default/Graphics/OptionRowSimple FrameExit.redir b/stepmania/Themes/default/Graphics/OptionRowSimple FrameExit.redir
new file mode 100644
index 0000000000..9c5f65a928
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/OptionRowSimple FrameExit.redir	
@@ -0,0 +1 @@
+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
new file mode 100644
index 0000000000..c4f374fad9
Binary files /dev/null and b/stepmania/Themes/default/Graphics/OptionRowSimple FrameNormal (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/OptionsCursor CanGoLeft.png b/stepmania/Themes/default/Graphics/OptionsCursor CanGoLeft.png
new file mode 100644
index 0000000000..6eb9f0351d
Binary files /dev/null and b/stepmania/Themes/default/Graphics/OptionsCursor CanGoLeft.png differ
diff --git a/stepmania/Themes/default/Graphics/OptionsCursor CanGoRight.lua b/stepmania/Themes/default/Graphics/OptionsCursor CanGoRight.lua
new file mode 100644
index 0000000000..28377fafba
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/OptionsCursor CanGoRight.lua	
@@ -0,0 +1,3 @@
+return LoadActor("OptionsCursor CanGoLeft") .. {
+	InitCommand=cmd(zoomx,-1;);
+};
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenOptions cursor p2 3x1 (doubleres).png b/stepmania/Themes/default/Graphics/OptionsCursorP1 Left (doubleres).png
similarity index 67%
rename from stepmania/Themes/default/Graphics/ScreenOptions cursor p2 3x1 (doubleres).png
rename to stepmania/Themes/default/Graphics/OptionsCursorP1 Left (doubleres).png
index 6a715b5da6..62b6cc9bcf 100644
Binary files a/stepmania/Themes/default/Graphics/ScreenOptions cursor p2 3x1 (doubleres).png and b/stepmania/Themes/default/Graphics/OptionsCursorP1 Left (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/ScreenOptions cursor p1 3x1 (doubleres).png b/stepmania/Themes/default/Graphics/OptionsCursorP1 Middle (doubleres).png
similarity index 66%
rename from stepmania/Themes/default/Graphics/ScreenOptions cursor p1 3x1 (doubleres).png
rename to stepmania/Themes/default/Graphics/OptionsCursorP1 Middle (doubleres).png
index 181d703832..78e6d39a2e 100644
Binary files a/stepmania/Themes/default/Graphics/ScreenOptions cursor p1 3x1 (doubleres).png and b/stepmania/Themes/default/Graphics/OptionsCursorP1 Middle (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/OptionsCursorP1 Right (doubleres).png b/stepmania/Themes/default/Graphics/OptionsCursorP1 Right (doubleres).png
new file mode 100644
index 0000000000..6ef1672eb3
Binary files /dev/null and b/stepmania/Themes/default/Graphics/OptionsCursorP1 Right (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/OptionsCursorP2 Left (doubleres).png b/stepmania/Themes/default/Graphics/OptionsCursorP2 Left (doubleres).png
new file mode 100644
index 0000000000..9cb2a21d33
Binary files /dev/null and b/stepmania/Themes/default/Graphics/OptionsCursorP2 Left (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/OptionsCursorP2 Middle (doubleres).png b/stepmania/Themes/default/Graphics/OptionsCursorP2 Middle (doubleres).png
new file mode 100644
index 0000000000..f08fa03268
Binary files /dev/null and b/stepmania/Themes/default/Graphics/OptionsCursorP2 Middle (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/OptionsCursorP2 Right (doubleres).png b/stepmania/Themes/default/Graphics/OptionsCursorP2 Right (doubleres).png
new file mode 100644
index 0000000000..925c8a28bb
Binary files /dev/null and b/stepmania/Themes/default/Graphics/OptionsCursorP2 Right (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/ScreenOptions CanGoLeft.redir b/stepmania/Themes/default/Graphics/OptionsUnderlineP1 Left.redir
similarity index 87%
rename from stepmania/Themes/default/Graphics/ScreenOptions CanGoLeft.redir
rename to stepmania/Themes/default/Graphics/OptionsUnderlineP1 Left.redir
index c700c90d39..56cf597902 100644
--- a/stepmania/Themes/default/Graphics/ScreenOptions CanGoLeft.redir	
+++ b/stepmania/Themes/default/Graphics/OptionsUnderlineP1 Left.redir	
@@ -1 +1 @@
-_blank
+_blank
diff --git a/stepmania/Themes/default/Graphics/OptionRow underline p2 3x1 (doubleres).png b/stepmania/Themes/default/Graphics/OptionsUnderlineP1 Middle (doubleres).png
similarity index 96%
rename from stepmania/Themes/default/Graphics/OptionRow underline p2 3x1 (doubleres).png
rename to stepmania/Themes/default/Graphics/OptionsUnderlineP1 Middle (doubleres).png
index 92c5bfa0ed..c5e68975ca 100644
Binary files a/stepmania/Themes/default/Graphics/OptionRow underline p2 3x1 (doubleres).png and b/stepmania/Themes/default/Graphics/OptionsUnderlineP1 Middle (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/ScreenOptions CanGoRight.redir b/stepmania/Themes/default/Graphics/OptionsUnderlineP1 Right.redir
similarity index 87%
rename from stepmania/Themes/default/Graphics/ScreenOptions CanGoRight.redir
rename to stepmania/Themes/default/Graphics/OptionsUnderlineP1 Right.redir
index c700c90d39..56cf597902 100644
--- a/stepmania/Themes/default/Graphics/ScreenOptions CanGoRight.redir	
+++ b/stepmania/Themes/default/Graphics/OptionsUnderlineP1 Right.redir	
@@ -1 +1 @@
-_blank
+_blank
diff --git a/stepmania/Themes/default/Graphics/OptionsUnderlineP2 Left.redir b/stepmania/Themes/default/Graphics/OptionsUnderlineP2 Left.redir
new file mode 100644
index 0000000000..56cf597902
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/OptionsUnderlineP2 Left.redir	
@@ -0,0 +1 @@
+_blank
diff --git a/stepmania/Themes/default/Graphics/OptionRow underline p1 3x1 (doubleres).png b/stepmania/Themes/default/Graphics/OptionsUnderlineP2 Middle (doubleres).png
similarity index 94%
rename from stepmania/Themes/default/Graphics/OptionRow underline p1 3x1 (doubleres).png
rename to stepmania/Themes/default/Graphics/OptionsUnderlineP2 Middle (doubleres).png
index 5ffc43bff5..8c415fce79 100644
Binary files a/stepmania/Themes/default/Graphics/OptionRow underline p1 3x1 (doubleres).png and b/stepmania/Themes/default/Graphics/OptionsUnderlineP2 Middle (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/OptionsUnderlineP2 Right.redir b/stepmania/Themes/default/Graphics/OptionsUnderlineP2 Right.redir
new file mode 100644
index 0000000000..56cf597902
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/OptionsUnderlineP2 Right.redir	
@@ -0,0 +1 @@
+_blank
diff --git a/stepmania/Themes/default/Graphics/ScreenOptions Page (doubleres).png b/stepmania/Themes/default/Graphics/ScreenOptions Page (doubleres).png
new file mode 100644
index 0000000000..ccbac0a697
Binary files /dev/null and b/stepmania/Themes/default/Graphics/ScreenOptions Page (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/ScreenOptionsServiceChild footer.redir b/stepmania/Themes/default/Graphics/ScreenOptionsServiceChild footer.redir
new file mode 100644
index 0000000000..ef927067c9
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/ScreenOptionsServiceChild footer.redir	
@@ -0,0 +1 @@
+_footer shared
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenOptions page.redir b/stepmania/Themes/default/Graphics/ScreenOptionsSimple Page.redir
similarity index 100%
rename from stepmania/Themes/default/Graphics/ScreenOptions page.redir
rename to stepmania/Themes/default/Graphics/ScreenOptionsSimple Page.redir
diff --git a/stepmania/Themes/default/Graphics/ScreenOptionsSimple footer.redir b/stepmania/Themes/default/Graphics/ScreenOptionsSimple footer.redir
new file mode 100644
index 0000000000..ef927067c9
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/ScreenOptionsSimple footer.redir	
@@ -0,0 +1 @@
+_footer shared
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/_footer shared (doubleres).png b/stepmania/Themes/default/Graphics/_footer shared (doubleres).png
new file mode 100644
index 0000000000..0d6bb934d4
Binary files /dev/null and b/stepmania/Themes/default/Graphics/_footer shared (doubleres).png differ