diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index 92b388032e..ac083920b9 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -24,6 +24,11 @@ ExtraColor=color("#F5BCBC")	-- purple
 
 [UnlockManager]
 
+[GameState]
+# Tier 05 is closest to the old AA tier
+GradeTierForExtra1="Grade_Tier05"
+GradeTierForExtra2="Grade_Tier05"
+
 [ScreenSystemLayer]
 ShowClock=true
 CreditsP1OnCommand=horizalign,left;vertalign,bottom;zoom,1;shadowlength,1;diffuse,color("#FFFFFF");strokecolor,ColorDarkTone(PlayerColor(PLAYER_1));
@@ -1093,11 +1098,11 @@ MeterHeight=80
 # Copied from Simply Love, which was in turn copied from freem's ITG3 port
 NumGradeTiersUsed=17
 GradeTier01IsAllW2s=false
-GradeTier02IsAllW2s=false
+GradeTier02IsAllW2s=true
 # ★★★★
-GradePercentTier01=1.00
+GradePercentTier01=1.000000
 # ★★★
-GradePercentTier02=0.99
+GradePercentTier02=1.000000
 # ★★
 GradePercentTier03=0.98
 # ★