diff --git a/stepmania/Themes/default/Fonts/OptionIconRow icon.redir b/stepmania/Themes/default/Fonts/OptionIconRow icon.redir
new file mode 100644
index 0000000000..e9d2ccd770
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/OptionIconRow icon.redir	
@@ -0,0 +1 @@
+_option icon
diff --git a/stepmania/Themes/default/Fonts/ScreenOptions icon.redir b/stepmania/Themes/default/Fonts/ScreenOptions icon.redir
new file mode 100644
index 0000000000..e9d2ccd770
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/ScreenOptions icon.redir	
@@ -0,0 +1 @@
+_option icon
diff --git a/stepmania/Themes/default/Fonts/_option icon 16x16.png b/stepmania/Themes/default/Fonts/_option icon 16x16.png
new file mode 100644
index 0000000000..30027cbd62
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_option icon 16x16.png differ
diff --git a/stepmania/Themes/default/Fonts/_option icon.ini b/stepmania/Themes/default/Fonts/_option icon.ini
new file mode 100644
index 0000000000..725a87928c
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/_option icon.ini	
@@ -0,0 +1,257 @@
+[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/OptionIconRow icon 3x2.redir b/stepmania/Themes/default/Graphics/OptionIconRow icon 3x2.redir
new file mode 100644
index 0000000000..981679ace0
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/OptionIconRow icon 3x2.redir	
@@ -0,0 +1 @@
+_option icon 3x2
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenMiniMenu icon 3x2.redir b/stepmania/Themes/default/Graphics/ScreenMiniMenu icon 3x2.redir
index c700c90d39..981679ace0 100644
--- a/stepmania/Themes/default/Graphics/ScreenMiniMenu icon 3x2.redir	
+++ b/stepmania/Themes/default/Graphics/ScreenMiniMenu icon 3x2.redir	
@@ -1 +1 @@
-_blank
+_option icon 3x2
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenOptions icon 3x2.redir b/stepmania/Themes/default/Graphics/ScreenOptions icon 3x2.redir
new file mode 100644
index 0000000000..981679ace0
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/ScreenOptions icon 3x2.redir	
@@ -0,0 +1 @@
+_option icon 3x2
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/_option icon 3x2.png b/stepmania/Themes/default/Graphics/_option icon 3x2.png
new file mode 100644
index 0000000000..3de58f1cad
Binary files /dev/null and b/stepmania/Themes/default/Graphics/_option icon 3x2.png differ
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 1d4ca862aa..f1e5f7ffc6 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -960,6 +960,7 @@ PrepareScreen=0
 
 [ScreenStage]
 Class=ScreenStage
+Fallback=Screen
 NextScreen=@SelectGameplayScreen()
 PrevScreen=@SongSelectionScreen()
 // This is the minimum delay after the "in" transition before the
@@ -995,6 +996,7 @@ OverlayOffCommand=
 
 [ScreenGameplay]
 Class=ScreenGameplay
+Fallback=Screen
 ShowEvaluationOnFail=0
 StaticBGY=SCREEN_CENTER_Y+0
 StaticBGX=SCREEN_CENTER_X+0
@@ -2534,7 +2536,7 @@ Fallback=ScreenOperatorMenu
 
 [ScreenNetworkOptions]
 Class=ScreenNetworkOptions
-Fallback=ScreenOperatorMenu
+Fallback=ScreenOptionsSubmenu
 
 [ScreenBookkeeping]
 Class=ScreenBookkeeping
@@ -3031,6 +3033,8 @@ IdleTimeoutSeconds=0
 AllowOperatorMenuButton=0
 Fallback=ScreenOperatorMenu
 Class=ScreenOptionsMaster
+ThemeItems=0
+ThemeTitles=1
 
 [ScreenOperatorMenu]
 Fallback=ScreenOptionsMaster
@@ -3040,8 +3044,6 @@ MemoryCardIcons=0
 TimerSeconds=0
 PrevScreen=ScreenOptionsMenu
 NextScreen=ScreenOptionsMenu
-ThemeTitles=0
-ThemeItems=0
 
 [ScreenInputOptions]
 Fallback=ScreenOptionsSubmenu
@@ -3159,7 +3161,7 @@ Line3=conf,SoundVolume
 
 [ScreenProfileOptions]
 Class=ScreenProfileOptions
-Fallback=ScreenOperatorMenu
+Fallback=ScreenOptionsSubmenu
 Player1Profile=
 Player2Profile=
 CreateNew=
@@ -3651,8 +3653,9 @@ Line13=list,Other Options
 Line14=list,Network Options
 Line15=list,Reload Songs/Courses
 Line16=list,Test Input
-
-ShowUnderlines=1
+ThemeTitles=1
+ThemeItems=1
+ShowUnderlines=0
 
 [ScreenOptionsTestMenu]
 Fallback=ScreenOptionsSubmenu
@@ -3779,6 +3782,7 @@ Game=Change the current game type with this option.
 TimerSeconds=30
 StyleIcon=0
 MemoryCardIcons=0
+PlayMusic=0
 LineNames=1,2,3,4,5,6,7,8
 OptionMenuFlags=
 Line1=list,LifeType
@@ -4034,76 +4038,76 @@ SaveScores,2=mod,savescore;name,On
 # ScreenOptionsMenu
 Appearance Options=1;together;SelectNone
 Appearance OptionsDefault=
-Appearance Options,1=screen,ScreenAppearanceOptions;name,AppearanceOptions
+Appearance Options,1=screen,ScreenAppearanceOptions;name,Appearance Options
 Other Options=1;together;SelectNone
 Other OptionsDefault=
-Other Options,1=screen,ScreenOtherOptions;name,OtherOptions
+Other Options,1=screen,ScreenOtherOptions;name,Other Options
 Background Options=1;together;SelectNone
 Background OptionsDefault=
-Background Options,1=screen,ScreenBackgroundOptions;name,BackgroundOptions
+Background Options,1=screen,ScreenBackgroundOptions;name,Background Options
 Bookkeeping=1;together;SelectNone
 BookkeepingDefault=
 Bookkeeping,1=screen,ScreenBookkeeping;name,Bookkeeping
 Clear Bookkeeping Data=1;together;SelectNone
 Clear Bookkeeping DataDefault=
-Clear Bookkeeping Data,1=ClearBookkeepingData;name,ClearBookkeepingData
+Clear Bookkeeping Data,1=ClearBookkeepingData;name,Clear Bookkeeping Data
 Center Image=1;together;SelectNone
 Center ImageDefault=
-Center Image,1=screen,ScreenCenterImage;name,CenterImage
+Center Image,1=screen,ScreenCenterImage;name,Center Image
 Coin Options=1;together;SelectNone
 Coin OptionsDefault=
-Coin Options,1=screen,ScreenCoinOptions;name,CoinOptions
+Coin Options,1=screen,ScreenCoinOptions;name,Coin Options
 Config Key/Joy Mappings=1;together;SelectNone
 Config Key/Joy MappingsDefault=
-Config Key/Joy Mappings,1=screen,ScreenMapControllers;name,KeyJoyMappings
+Config Key/Joy Mappings,1=screen,ScreenMapControllers;name,Key Joy Mappings
 Clear Machine Stats=1;together;SelectNone
 Clear Machine StatsDefault=
-Clear Machine Stats,1=ClearMachineStats;name,ClearMachineStats;screen,ScreenOptionsMenu
+Clear Machine Stats,1=ClearMachineStats;name,ClearMachineStats;screen,Screen Options Menu
 Input Options=1;together;SelectNone
 Input OptionsDefault=
-Input Options,1=screen,ScreenInputOptions;name,InputOptions
+Input Options,1=screen,ScreenInputOptions;name,Input Options
 Insert Credit=1;together;SelectNone
 Insert CreditDefault=
-Insert Credit,1=InsertCredit;name,InsertCredit;screen,ScreenOptionsMenu
+Insert Credit,1=screen,ScreenOptionsMenu;InsertCredit;name,Insert Credit
 Gameplay Options=1;together;SelectNone
 Gameplay OptionsDefault=
-Gameplay Options,1=screen,ScreenGameplayOptions;name,GameplayOptions
+Gameplay Options,1=screen,ScreenGameplayOptions;name,Gameplay Options
 Graphic Options=1;together;SelectNone
 Graphic OptionsDefault=
-Graphic Options,1=screen,ScreenGraphicOptions;name,GraphicOptions
+Graphic Options,1=screen,ScreenGraphicOptions;name,Graphic Options
 Machine Options=1;together;SelectNone
 Machine OptionsDefault=
-Machine Options,1=screen,ScreenMachineOptions;name,MachineOptions
+Machine Options,1=screen,ScreenMachineOptions;name,Machine Options
 Sound Options=1;together;SelectNone
 Sound OptionsDefault=
-Sound Options,1=screen,ScreenSoundOptions;name,SoundOptions
+Sound Options,1=screen,ScreenSoundOptions;name,Sound Options
 Profile Options=1;together;SelectNone
 Profile OptionsDefault=
-Profile Options,1=screen,ScreenProfileOptions;name,ProfileOptions
+Profile Options,1=screen,ScreenProfileOptions;name,Profile Options
 Reload Songs/Courses=1;together;SelectNone
 Reload Songs/CoursesDefault=
-Reload Songs/Courses,1=screen,ScreenReloadSongs;name,ReloadSongs
+Reload Songs/Courses,1=screen,ScreenReloadSongs;name,Reload Songs
 Reset To Defaults=1;together;SelectNone
 Reset To DefaultsDefault=
-Reset To Defaults,1=ResetToFactoryDefaults;name,ResetToDefaults;screen,ScreenOptionsMenu
+Reset To Defaults,1=ResetToFactoryDefaults;screen,ScreenOptionsMenu;name,Reset To Defaults
 Test Input=1;together;SelectNone
 Test InputDefault=
-Test Input,1=screen,ScreenTestInput;name,TestInput
+Test Input,1=screen,ScreenTestInput;name,Test Input
 Test Lights=1;together;SelectNone
 Test LightsDefault=
-Test Lights,1=screen,ScreenTestLights;name,TestLights
+Test Lights,1=screen,ScreenTestLights;name,Test Lights
 Transfer Stats From Machine=1;together;SelectNone
 Transfer Stats From MachineDefault=
-Transfer Stats From Machine,1=TransferStatsFromMachine;name,TransferStatsFromMachine;screen,ScreenOptionsMenu
+Transfer Stats From Machine,1=TransferStatsFromMachine;screen,ScreenOptionsMenu;name,Transfer Stats From Machine
 Transfer Stats To Machine=1;together;SelectNone
 Transfer Stats To MachineDefault=
-Transfer Stats To Machine,1=TransferStatsToMachine;name,TransferStatsToMachine;screen,ScreenOptionsMenu
+Transfer Stats To Machine,1=TransferStatsToMachine;screen,ScreenOptionsMenu;name,Transfer Stats To Machine
 Set Machine Time=1;together;SelectNone
 Set Machine TimeDefault=
-Set Machine Time,1=screen,ScreenSetTime;name,SetMachineTime
+Set Machine Time,1=screen,ScreenSetTime;name,Set Machine Time
 Network Options=1;together;SelectNone
 Network OptionsDefault=
-Network Options,1=screen,ScreenNetworkOptions;name,NetworkOptions
+Network Options,1=screen,ScreenNetworkOptions;name,Network Options
 
 #ScreenJukeboxMenu
 RandomModifiers=2;together