diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 73fa4e60f5..f4fe729b5c 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -31,6 +31,7 @@ AllowOperatorMenuButton=1
 PrepareScreens=
 PersistScreens=
 GroupedScreens=
+CancelCancelCommand=
 
 [ModeSwitcher]
 PrevModeX=-200
@@ -255,7 +256,8 @@ CharacterIconP2OffCommand=linear,0.3;diffusealpha,0;sleep,10
 [ScreenSelectDifficulty]
 Class=ScreenSelectDifficulty
 Fallback=ScreenSelect
-ScreenOnCommand=lockinput,0.8
+ScreenOnCommand=
+LockInputSeconds=0.8
 ChoiceNames=1,2,3,4,5,6,7,8
 Choice1=@'PlayMode,regular;Difficulty,beginner;name,beginner;screen,'..ScreenSelectGroupBranch()
 Choice2=@'PlayMode,regular;Difficulty,easy;name,easy;screen,'..ScreenSelectGroupBranch()
@@ -1097,6 +1099,7 @@ PlayerP2OnePlayerTwoSidesX=SCREEN_CENTER_X
 PlayerP1TwoPlayersSharedSidesX=SCREEN_CENTER_X
 PlayerP2TwoPlayersSharedSidesX=SCREEN_CENTER_X
 StopCourseEarly=0
+ShowEvaluationOnFail=1
 
 [ScreenGameplayExtra]
 Fallback=ScreenGameplay
@@ -3424,6 +3427,7 @@ DancePointsZoom=2
 Class=ScreenRankingLines
 Fallback=ScreenAttract
 NextScreen=ScreenUnlockStatus
+PrevScreen=ScreenHowToPlay
 TimerSeconds=-1
 StepsTypesToHide=dance-couple,dance-solo,pump-halfdouble
 Type=Category
@@ -3564,6 +3568,7 @@ NextScreen=ScreenCompany
 Class=ScreenAttract
 Fallback=ScreenAttract
 NextScreen=ScreenLogo
+PrevScreen=ScreenCompany
 
 [ScreenAlbums]
 Class=ScreenAttract
@@ -3574,12 +3579,14 @@ NextScreen=ScreenLogo
 Class=ScreenAttract
 Fallback=ScreenAttract
 NextScreen=ScreenHowToPlay
+PrevScreen=ScreenCompany
 
 [ScreenHowToPlay]
 Class=ScreenHowToPlay
 Fallback=ScreenAttract
 TimerSeconds=25
 NextScreen=ScreenDemonstration
+PrevScreen=ScreenLogo
 SecondsToShow=25
 UseLifeMeterBar=1
 LifeMeterBarX=SCREEN_CENTER_X+160