diff --git a/Themes/_fallback/Scripts/03 Gameplay.lua b/Themes/_fallback/Scripts/03 Gameplay.lua
index 7433a84107..863f130900 100644
--- a/Themes/_fallback/Scripts/03 Gameplay.lua	
+++ b/Themes/_fallback/Scripts/03 Gameplay.lua	
@@ -26,6 +26,19 @@ function GetExtraColorThreshold()
 	return Modes[CurGameName()]
 end
 
+-- AllowOptionsMenu()
+-- [en] returns if you are able to select options
+-- on ScreenSelectMusic.
+function AllowOptionsMenu()
+  if GAMESTATE:IsAnExtraStage() then
+    return false
+  elseif GAMESTATE:GetPlayMode() == "PlayMode_Oni" then 
+    return false
+  else
+    return true
+  end
+end
+
 -- GameCompatibleModes:
 -- [en] returns possible modes for ScreenSelectPlayMode
 function GameCompatibleModes()
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 692e484aaf..7028a02a48 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -2009,7 +2009,7 @@ OptionsListTimeout=0.25
 #
 UsePlayerSelectMenu=false
 SelectMenuScreenName="ScreenPlayerOptions"
-OptionsMenuAvailable=GAMESTATE:GetPlayMode() ~= "PlayMode_Oni"
+OptionsMenuAvailable=AllowOptionsMenu()
 SelectMenuAvailable=false
 ModeMenuAvailable=true
 #
diff --git a/Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua b/Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua
index 63e69566e5..5394ab5d25 100644
--- a/Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua	
+++ b/Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua	
@@ -1,7 +1,6 @@
 local curScreen = Var "LoadingScreen";
 local curStage = GAMESTATE:GetCurrentStage();
 local curStageIndex = GAMESTATE:GetCurrentStageIndex();
-
 local t = Def.ActorFrame {};
 
 t[#t+1] = Def.ActorFrame {
@@ -22,7 +21,7 @@ t[#t+1] = Def.ActorFrame {
               self:zoom(1);
             end;
           end;
-          --
+          -- StepMania is being stupid so we have to do this here;
           self:diffuse(StageToColor(curStage));
           self:diffusetopedge(ColorLightTone(StageToColor(curStage)));
         end;