diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index d6f75a5bf4..02e8d5d009 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -1395,9 +1395,7 @@ UserSelCommand=zoomx,1.0;zoomy,1.0;linear,0.1;zoomx,1.4;zoomy,1.4
 
 [ScreenEvaluationStage]
 Fallback=ScreenEvaluation
-NextScreen=@ScreenEvaluationExitBranch()
-EndScreen=ScreenEvaluationSummary
-FailedScreen=ScreenGameOver
+NextScreen=@GetEvaluationNextScreen( ScreenEvaluationExitBranch(), "ScreenGameOver", "ScreenEvaluationSummary" )
 Type=stage
 ShowGradeArea=1
 ShowPointsArea=0
@@ -1564,9 +1562,7 @@ NoMarvelousShiftUp=15
 
 [ScreenEvaluationSummary]
 Fallback=ScreenEvaluation
-NextScreen=ScreenNameEntry
-EndScreen=ScreenNameEntry
-FailedScreen=ScreenGameOver
+NextScreen=@GetEvaluationNextScreen( "ScreenNameEntry", "ScreenGameOver", "ScreenNameEntry" )
 Type=summary
 ShowGradeArea=1
 ShowPointsArea=0
@@ -1736,9 +1732,7 @@ NoMarvelousShiftUp=15
 
 [ScreenEvaluationNonstop]
 Fallback=ScreenEvaluation
-NextScreen=ScreenSelectCourseNonstop
-EndScreen=ScreenNameEntry
-FailedScreen=ScreenNameEntry
+NextScreen=@GetEvaluationNextScreen( "ScreenSelectCourseNonstop", "ScreenNameEntry", "ScreenNameEntry" )
 Type=course
 ShowGradeArea=1
 ShowPointsArea=0
@@ -1816,9 +1810,7 @@ NoMarvelousShiftUp=15
 
 [ScreenEvaluationOni]
 Fallback=ScreenEvaluation
-NextScreen=ScreenSelectCourseOni
-EndScreen=ScreenNameEntry
-FailedScreen=ScreenNameEntry
+NextScreen=@GetEvaluationNextScreen( "ScreenSelectCourseOni", "ScreenNameEntry", "ScreenNameEntry" )
 Type=course
 ShowGradeArea=0
 ShowPointsArea=1
@@ -1895,9 +1887,7 @@ NoMarvelousShiftUp=15
 
 [ScreenEvaluationEndless]
 Fallback=ScreenEvaluation
-NextScreen=ScreenSelectCourseEndless
-EndScreen=ScreenNameEntry
-FailedScreen=ScreenNameEntry
+NextScreen=@GetEvaluationNextScreen( "ScreenSelectCourseEndless", "ScreenNameEntry", "ScreenNameEntry" )
 Type=course
 ShowGradeArea=0
 ShowPointsArea=1
@@ -1986,9 +1976,7 @@ NoMarvelousShiftUp=15
 
 [ScreenEvaluationRave]
 Fallback=ScreenEvaluation
-NextScreen=ScreenSelectMusic
-EndScreen=ScreenEvaluationSummary
-FailedScreen=ScreenGameOver
+NextScreen=@GetEvaluationNextScreen( "ScreenSelectMusic", "ScreenGameOver", "ScreenEvaluationSummary" )
 Type=stage
 ShowGradeArea=1
 ShowPointsArea=0