diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index bd31a6a068..013e1d02ea 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -143,7 +143,7 @@ NextScreen=ScreenCautionBranch()
 PrevScreen=ScreenTitleBranch()
 TimerSeconds=-1
 LoadEdits=true
-FooterOnCommand=hidden,1
+FooterOnCommand=visible,false
 
 [ScreenProfileSave]
 Class="ScreenProfileSave"
@@ -487,7 +487,7 @@ SampleMusicFallbackFadeInSeconds=0
 ShowOptionsMessageSeconds=1.5
 BannerX=0
 BannerY=0
-BannerOnCommand=scaletoclipped,256,80;hidden,1
+BannerOnCommand=scaletoclipped,256,80;visible,false
 BannerOffCommand=
 ShowStage=true
 StageX=SCREEN_CENTER_X-272-SCREEN_WIDTH*0.6
@@ -544,8 +544,8 @@ TwoPartSelection=false
 [ScreenSelectCourse]
 Class="ScreenSelectMusic"
 Fallback="ScreenSelectMusic"
-BPMDisplayOnCommand=hidden,1
-CDTitleOnCommand=hidden,1
+BPMDisplayOnCommand=visible,false
+CDTitleOnCommand=visible,false
 ExplanationX=SCREEN_CENTER_X-188
 ExplanationY=SCREEN_CENTER_Y-172
 ExplanationOnCommand=addx,-SCREEN_WIDTH;sleep,0.5;bounceend,0.5;addx,SCREEN_WIDTH
@@ -561,10 +561,10 @@ DefaultSort="Nonstop"
 [ScreenSelectCourseOni]
 Fallback="ScreenSelectCourse"
 DefaultSort="Oni"
-ScoreP1OnCommand=hidden,1
-ScoreP2OnCommand=hidden,1
-ScoreFrameP1OnCommand=hidden,1
-ScoreFrameP2OnCommand=hidden,1
+ScoreP1OnCommand=visible,false
+ScoreP2OnCommand=visible,false
+ScoreFrameP1OnCommand=visible,false
+ScoreFrameP2OnCommand=visible,false
 
 [ScreenSelectCourseEndless]
 Fallback="ScreenSelectCourse"
@@ -848,7 +848,7 @@ StageOnCommand=draworder,100;addy,-100;linear,0.5;addy,100
 StageOffCommand=linear,0.5;addy,-100
 StageFrameX=
 StageFrameY=
-StageFrameOnCommand=hidden,1
+StageFrameOnCommand=visible,false
 StageFrameOffCommand=
 SongNumberP1X=SCREEN_CENTER_X-25
 SongNumberP1Y=SCREEN_CENTER_Y-206
@@ -909,11 +909,11 @@ ScoreboardC3P2OnCommand=zoom,1
 ScoreboardC3P2OffCommand=zoom,1
 StepsDescriptionP1X=
 StepsDescriptionP1Y=
-StepsDescriptionP1OnCommand=hidden,1
+StepsDescriptionP1OnCommand=visible,false
 StepsDescriptionP1OffCommand=
 StepsDescriptionP2X=
 StepsDescriptionP2Y=
-StepsDescriptionP2OnCommand=hidden,1
+StepsDescriptionP2OnCommand=visible,false
 StepsDescriptionP2OffCommand=
 SongOptionsX=SCREEN_CENTER_X+0
 SongOptionsY=SCREEN_CENTER_Y+230
@@ -941,11 +941,11 @@ LyricsDefaultColor=color("0,1,0,1")
 
 ActiveAttackListP1X=
 ActiveAttackListP1Y=
-ActiveAttackListP1OnCommand=hidden,1
+ActiveAttackListP1OnCommand=visible,false
 ActiveAttackListP1OffCommand=
 ActiveAttackListP2X=
 ActiveAttackListP2Y=
-ActiveAttackListP2OnCommand=hidden,1
+ActiveAttackListP2OnCommand=visible,false
 ActiveAttackListP2OffCommand=
 SurviveTimeX=SCREEN_CENTER_X+0
 SurviveTimeY=SCREEN_CENTER_Y+100
@@ -1197,7 +1197,7 @@ HeldNumberP2OffCommand=sleep,0.1;accelerate,0.3;addx,SCREEN_WIDTH/2
 MaxComboMaxDigits=5
 MaxComboLabelX=
 MaxComboLabelY=
-MaxComboLabelOnCommand=hidden,1
+MaxComboLabelOnCommand=visible,false
 MaxComboLabelOffCommand=
 
 MaxComboNumberP1X=SCREEN_CENTER_X-186
@@ -1647,7 +1647,7 @@ ExplanationY=SCREEN_BOTTOM-70
 ExplanationOnCommand=wrapwidthpixels,900;zoom,0.7
 NumStepsLoadedFromProfileX=SCREEN_RIGHT-180
 NumStepsLoadedFromProfileY=SCREEN_TOP+42
-NumStepsLoadedFromProfileOnCommand=hidden,1
+NumStepsLoadedFromProfileOnCommand=visible,false
 StyleIcon=false
 TimerSeconds=-1
 
@@ -1951,11 +1951,11 @@ ExplanationP2OnCommand=shadowlength,0;zoom,0.5;wrapwidthpixels,500;horizalign,ri
 ExplanationP2OffCommand=
 DisqualifyP1X=
 DisqualifyP1Y=
-DisqualifyP1OnCommand=hidden,1
+DisqualifyP1OnCommand=visible,false
 DisqualifyP1OffCommand=
 DisqualifyP2X=
 DisqualifyP2Y=
-DisqualifyP2OnCommand=hidden,1
+DisqualifyP2OnCommand=visible,false
 DisqualifyP2OffCommand=
 PageX=SCREEN_CENTER_X
 PageY=SCREEN_CENTER_Y
@@ -1976,7 +1976,7 @@ SeparateExitRow=false
 SeparateExitRowY=0
 MoreX=
 MoreY=
-MoreOnCommand=hidden,1
+MoreOnCommand=visible,false
 MoreExitSelectedP1Command=
 MoreExitSelectedP2Command=
 MoreExitUnselectedP1Command=
@@ -2023,8 +2023,8 @@ NextScreen="ScreenOptionsService"
 ButtonsToMap=""
 LineScrollerOnCommand=%function(self) self:y(50) self:SetTransformFromHeight(24) end
 LineScrollerOffCommand=
-LineHideCommand=hidden,1
-LineOnCommand=%function(self) self:y(0); self:hidden(false); local LeftToRight = math.mod(self.ItemIndex, 2) == 0 and 1 or -1; self:addx(SCREEN_WIDTH * LeftToRight); self:decelerate(0.5); self:addx(-SCREEN_WIDTH * LeftToRight); end
+LineHideCommand=visible,false
+LineOnCommand=%function(self) self:y(0); self:visible(true); local LeftToRight = math.mod(self.ItemIndex, 2) == 0 and 1 or -1; self:addx(SCREEN_WIDTH * LeftToRight); self:decelerate(0.5); self:addx(-SCREEN_WIDTH * LeftToRight); end
 LineOffCommand=%function(self) local LeftToRight = math.mod(self.ItemIndex, 2) == 0 and 1 or -1; self:stoptweening() self:accelerate(0.3); self:addx(SCREEN_WIDTH * LeftToRight); self:queuecommand('Hide') end
 ErrorX=SCREEN_CENTER_X
 ErrorY=SCREEN_CENTER_Y
@@ -2055,7 +2055,7 @@ DevicesOffCommand=linear,0.5;diffusealpha,0
 Class="ScreenCenterImage"
 Fallback="ScreenOptionsServiceChild"
 AllowResize=true
-TimerOnCommand=hidden,1
+TimerOnCommand=visible,false
 NextScreen="ScreenOptionsService"
 PrevScreen="ScreenOptionsService"
 
@@ -2564,26 +2564,26 @@ ExplanationPage1X=0
 ExplanationPage1Y=0
 ExplanationPage1SwitchToPage1Command=
 ExplanationPage1SwitchToPage2Command=
-ExplanationPage1OnCommand=hidden,1
+ExplanationPage1OnCommand=visible,false
 ExplanationPage1OffCommand=
 ExplanationPage2X=0
 ExplanationPage2Y=0
 ExplanationPage2SwitchToPage1Command=
 ExplanationPage2SwitchToPage2Command=
-ExplanationPage2OnCommand=hidden,1
+ExplanationPage2OnCommand=visible,false
 ExplanationPage2OffCommand=
 
 MorePage1X=0
 MorePage1Y=0
 MorePage1SwitchToPage1Command=
 MorePage1SwitchToPage2Command=
-MorePage1OnCommand=hidden,1
+MorePage1OnCommand=visible,false
 MorePage1OffCommand=
 MorePage2X=0
 MorePage2Y=0
 MorePage2SwitchToPage1Command=
 MorePage2SwitchToPage2Command=
-MorePage2OnCommand=hidden,1
+MorePage2OnCommand=visible,false
 MorePage2OffCommand=
 IdleCommentSeconds=0
 IdleTimeoutSeconds=0
@@ -2702,11 +2702,11 @@ LightsMode="LightsMode_Attract"
 Fallback="ScreenWithMenuElements"
 HeaderX=
 HeaderY=
-HeaderOnCommand=hidden,1
+HeaderOnCommand=visible,false
 HeaderOffCommand=
 FooterX=
 FooterY=
-FooterOnCommand=hidden,1
+FooterOnCommand=visible,false
 FooterOffCommand=
 StyleIcon=false
 TimerSeconds=6
@@ -2714,7 +2714,7 @@ TimerStealth=true
 ForceTimer=true
 TimerX=
 TimerY=
-TimerOnCommand=hidden,1
+TimerOnCommand=visible,false
 TimerOffCommand=
 
 [ScreenSelectBlank]
@@ -2763,19 +2763,19 @@ DisabledColor=#606060
 
 ExplanationPage1X=
 ExplanationPage1Y=
-ExplanationPage1OnCommand=hidden,1
+ExplanationPage1OnCommand=visible,false
 ExplanationPage1OffCommand=
 ExplanationPage2X=
 ExplanationPage2Y=
-ExplanationPage2OnCommand=hidden,1
+ExplanationPage2OnCommand=visible,false
 ExplanationPage2OffCommand=
 MorePage1X=
 MorePage1Y=
-MorePage1OnCommand=hidden,1
+MorePage1OnCommand=visible,false
 MorePage1OffCommand=
 MorePage2X=
 MorePage2Y=
-MorePage2OnCommand=hidden,1
+MorePage2OnCommand=visible,false
 MorePage2OffCommand=
 IdleCommentSeconds=15
 IdleTimeoutSeconds=0
@@ -3131,7 +3131,7 @@ PrevScreen=ScreenTitleBranch()
 
 IconsOnCommand=x,-30
 
-TimerOnCommand=hidden,1
+TimerOnCommand=visible,false
 StyleIcon=false
 TimerSeconds=-1
 
@@ -3163,7 +3163,7 @@ Fallback="ScreenOptionsMaster"
 NavigationMode="normal"
 InputMode="together"
 IconsOnCommand=x,-30
-TimerOnCommand=hidden,1
+TimerOnCommand=visible,false
 StyleIcon=false
 TimerSeconds=-1
 AllowOperatorMenuButton=false
@@ -3581,7 +3581,7 @@ LevelP2OnCommand=addy,-140
 FrameOnCommand=
 TimeRemainingOnCommand=
 DeltaSecondsOnCommand=addx,50;zoom,0.75;
-DeltaSecondsNoneCommand=hidden,1;
+DeltaSecondsNoneCommand=visible,false;
 DeltaSecondsHitMineCommand=shadowlength,4;diffusealpha,1;zoom,1.25;linear,0.3;zoomx,1;zoomy,1;sleep,0.5;linear,0;diffusealpha,0
 DeltaSecondsAvoidMineCommand=shadowlength,4;diffusealpha,1;zoom,1.25;linear,0.3;zoomx,1;zoomy,1;sleep,0.5;linear,0;diffusealpha,0
 DeltaSecondsCheckpointMissCommand=shadowlength,4;diffusealpha,1;zoom,1.25;linear,0.3;zoomx,1;zoomy,1;sleep,0.5;linear,0;diffusealpha,0
@@ -3616,7 +3616,7 @@ EmptyName="STEP"
 Class="ScreenSetTime"
 StyleIcon=false
 TimerSeconds=-1
-TimerOnCommand=hidden,1
+TimerOnCommand=visible,false
 Fallback="ScreenWithMenuElements"
 NextScreen="ScreenOptionsService"
 PrevScreen="ScreenOptionsService"
@@ -3971,7 +3971,7 @@ InputMode="together"
 TitleOnCommand=zoom,0.5;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=hidden,1
+BulletOnCommand=visible,false
 
 [ScreenOptionsManageCourses]
 Class="ScreenOptionsManageCourses"
@@ -4041,18 +4041,18 @@ Fallback="ScreenGameplay"
 PrevScreen="ScreenOptionsService"
 NextScreen="ScreenOptionsService"
 PlayerType="PlayerSyncMachine"
-LifeP1OnCommand=hidden,1
-LifeP2OnCommand=hidden,1
-ScoreP1OnCommand=hidden,1
-ScoreP2OnCommand=hidden,1
-StageOnCommand=hidden,1
-ScoreFrameOnCommand=hidden,1
-LifeFrameOnCommand=hidden,1
-DifficultyP1OnCommand=hidden,1
-DifficultyP1ReverseOnCommand=hidden,1
-DifficultyP2OnCommand=hidden,1
-DifficultyP2ReverseOnCommand=hidden,1
-SongOptionsOnCommand=hidden,1
+LifeP1OnCommand=visible,false
+LifeP2OnCommand=visible,false
+ScoreP1OnCommand=visible,false
+ScoreP2OnCommand=visible,false
+StageOnCommand=visible,false
+ScoreFrameOnCommand=visible,false
+LifeFrameOnCommand=visible,false
+DifficultyP1OnCommand=visible,false
+DifficultyP1ReverseOnCommand=visible,false
+DifficultyP2OnCommand=visible,false
+DifficultyP2ReverseOnCommand=visible,false
+SongOptionsOnCommand=visible,false
 FooterX=SCREEN_CENTER_X
 FooterY=SCREEN_BOTTOM-16
 FooterOnCommand=draworder,95;ZoomToWidth,SCREEN_WIDTH
@@ -4071,9 +4071,9 @@ ShiftP2X=60
 ShiftP2Y=0
 UnderOnCommand=
 UnderOffCommand=
-OverOnCommand=hidden,1;
+OverOnCommand=visible,false;
 OverOffCommand=
-OverOnCommand=hidden,1;
+OverOnCommand=visible,false;
 OverOffCommand=
 SongNumStepsTextX=-40
 SongNumStepsTextY=-25
@@ -4180,14 +4180,14 @@ MachineHighScoreLevel11=99;diffuse,#00FF00  -- 90-99% (Green)
 MachineHighScoreLevel12=101;diffuse,#00C0FF -- 100% (AJ Blue)
 MachineNumPlaysTextX=0
 MachineNumPlaysTextY=-25
-MachineNumPlaysTextOnCommand=hidden,1;
+MachineNumPlaysTextOnCommand=visible,false;
 MachineNumPlaysTextOffCommand=
 MachineNumPlaysLabelX=0
 MachineNumPlaysLabelY=-25
 MachineNumPlaysLabelOffCommand=
 MachineRankTextX=-40
 MachineRankTextY=50
-MachineRankTextOnCommand=hidden,1;
+MachineRankTextOnCommand=visible,false;
 MachineRankTextOffCommand=linear,0.1;diffusealpha,0;
 MachineRankLabelX=320
 MachineRankLabelY=240
@@ -4201,7 +4201,7 @@ MachineRankLevel5=5;diffuse,#00C0FF    -- 5 (AJ Blue)
 MachineRankLevel6=9999;diffuse,#FFFFFF -- 6-inf (white)
 MachineHighNameTextX=-20
 MachineHighNameTextY=20
-MachineHighNameTextOnCommand=hidden,1;
+MachineHighNameTextOnCommand=visible,false;
 MachineHighNameTextOffCommand=
 MachineHighNameLabelX=320
 MachineHighNameLabelY=240
@@ -4210,7 +4210,7 @@ MachineHighNameLabelOffCommand=
 MachineHighNameNumLevels=0
 ProfileHighScoreTextX=-40
 ProfileHighScoreTextY=45
-ProfileHighScoreTextOnCommand=hidden,1;
+ProfileHighScoreTextOnCommand=visible,false;
 ProfileHighScoreTextOffCommand=
 ProfileHighScoreLabelX=320
 ProfileHighScoreLabelY=240
@@ -4219,14 +4219,14 @@ ProfileHighScoreLabelOffCommand=
 ProfileHighScoreNumLevels=0
 ProfileNumPlaysTextX=0
 ProfileNumPlaysTextY=-25
-ProfileNumPlaysTextOnCommand=hidden,1;
+ProfileNumPlaysTextOnCommand=visible,false;
 ProfileNumPlaysTextOffCommand=
 ProfileNumPlaysLabelX=0
 ProfileNumPlaysLabelY=-15
 ProfileNumPlaysLabelOffCommand=
 ProfileRankTextX=-20
 ProfileRankTextY=-25
-ProfileRankTextOnCommand=hidden,1;
+ProfileRankTextOnCommand=visible,false;
 ProfileRankTextOffCommand=
 ProfileRankLabelX=320
 ProfileRankLabelY=240
@@ -4253,7 +4253,7 @@ CourseMachineHighScoreLevel11=99;diffuse,#00FF00  -- 90-99% (Green)
 CourseMachineHighScoreLevel12=101;diffuse,#00C0FF -- 100% (AJ Blue)
 CourseMachineHighNameTextX=320
 CourseMachineHighNameTextY=240
-CourseMachineHighNameTextOnCommand=hidden,1;
+CourseMachineHighNameTextOnCommand=visible,false;
 CourseMachineHighNameTextOffCommand=
 CourseMachineHighNameLabelX=320
 CourseMachineHighNameLabelY=240
@@ -4262,7 +4262,7 @@ CourseMachineHighNameLabelOffCommand=
 CourseMachineHighNameNumLevels=0
 CourseProfileHighScoreTextX=320
 CourseProfileHighScoreTextY=240
-CourseProfileHighScoreTextOnCommand=hidden,1;
+CourseProfileHighScoreTextOnCommand=visible,false;
 CourseProfileHighScoreTextOffCommand=
 CourseProfileHighScoreLabelX=320
 CourseProfileHighScoreLabelY=240
@@ -4271,7 +4271,7 @@ CourseProfileHighScoreLabelOffCommand=
 CourseProfileHighScoreNumLevels=0
 CourseProfileHighNameTextX=320
 CourseProfileHighNameTextY=240
-CourseProfileHighNameTextOnCommand=hidden,1;
+CourseProfileHighNameTextOnCommand=visible,false;
 CourseProfileHighNameTextOffCommand=
 CourseProfileHighNameLabelX=320
 CourseProfileHighNameLabelY=240
@@ -4352,7 +4352,7 @@ Fallback="Screen"
 
 [PlayerSyncMachine]
 Fallback="Player"
-ComboOnCommand=hidden,1
+ComboOnCommand=visible,false
 
 [Profile]
 ShowCoinData=true