diff --git a/stepmania/Themes/default/Graphics/OptionRow FrameNormal/Focus (doubleres).png b/stepmania/Themes/default/Graphics/OptionRow Frame/Focus (doubleres).png
similarity index 100%
rename from stepmania/Themes/default/Graphics/OptionRow FrameNormal/Focus (doubleres).png
rename to stepmania/Themes/default/Graphics/OptionRow Frame/Focus (doubleres).png
diff --git a/stepmania/Themes/default/Graphics/OptionRow FrameNormal/NoFocus (doubleres).png b/stepmania/Themes/default/Graphics/OptionRow Frame/NoFocus (doubleres).png
similarity index 100%
rename from stepmania/Themes/default/Graphics/OptionRow FrameNormal/NoFocus (doubleres).png
rename to stepmania/Themes/default/Graphics/OptionRow Frame/NoFocus (doubleres).png
diff --git a/stepmania/Themes/default/Graphics/OptionRow FrameExit/default.lua b/stepmania/Themes/default/Graphics/OptionRow Frame/default.lua
similarity index 100%
rename from stepmania/Themes/default/Graphics/OptionRow FrameExit/default.lua
rename to stepmania/Themes/default/Graphics/OptionRow Frame/default.lua
diff --git a/stepmania/Themes/default/Graphics/OptionRow FrameExit/Focus (doubleres).png b/stepmania/Themes/default/Graphics/OptionRowExit Frame/Focus (doubleres).png
similarity index 100%
rename from stepmania/Themes/default/Graphics/OptionRow FrameExit/Focus (doubleres).png
rename to stepmania/Themes/default/Graphics/OptionRowExit Frame/Focus (doubleres).png
diff --git a/stepmania/Themes/default/Graphics/OptionRow FrameExit/NoFocus (doubleres).png b/stepmania/Themes/default/Graphics/OptionRowExit Frame/NoFocus (doubleres).png
similarity index 100%
rename from stepmania/Themes/default/Graphics/OptionRow FrameExit/NoFocus (doubleres).png
rename to stepmania/Themes/default/Graphics/OptionRowExit Frame/NoFocus (doubleres).png
diff --git a/stepmania/Themes/default/Graphics/OptionRow FrameNormal/default.lua b/stepmania/Themes/default/Graphics/OptionRowExit Frame/default.lua
similarity index 100%
rename from stepmania/Themes/default/Graphics/OptionRow FrameNormal/default.lua
rename to stepmania/Themes/default/Graphics/OptionRowExit Frame/default.lua
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 52b8b9573c..241b81817c 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -2231,7 +2231,8 @@ ShowExplanations=true
 AllowRepeatingChangeValueInput=false
 CursorTweenSeconds=0.3
 WrapValueInRow=true
-OptionRowMetricsGroup="OptionRow"
+OptionRowNormalMetricsGroup="OptionRow"
+OptionRowExitMetricsGroup="OptionRowExit"
 
 [OptionRow]
 ShowModIcons=true
@@ -2263,6 +2264,9 @@ ColorSelected=color("1,1,1,1")
 ColorNotSelected=color("0.9,0.9,0.9,1")
 ColorDisabled=color("0.5,0.5,0.5,1")
 
+[OptionRowExit]
+Fallback="OptionRow"
+
 [OptionsCursor]
 LeftX=
 LeftY=