diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 56ca0b3f38..4790d8cbc7 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -3382,60 +3382,60 @@ Row6Y=SCREEN_CENTER_Y+80
 Row7Y=SCREEN_CENTER_Y+120
 
 Label1X=SCREEN_CENTER_X-250
-Label1Y=THEME:GetMetric("EditMode","Row1Y")
+Label1Y=THEME:GetMetric("EditMenu","Row1Y")
 Label1OnCommand=shadowlength,1;zoom,0.75
 Label1OffCommand=
 Label2X=SCREEN_CENTER_X-250
-Label2Y=THEME:GetMetric("EditMode","Row2Y")
+Label2Y=THEME:GetMetric("EditMenu","Row2Y")
 Label2OnCommand=shadowlength,1;zoom,0.75
 Label2OffCommand=
 Label3X=SCREEN_CENTER_X-250
-Label3Y=THEME:GetMetric("EditMode","Row3Y")
+Label3Y=THEME:GetMetric("EditMenu","Row3Y")
 Label3OnCommand=shadowlength,1;zoom,0.75
 Label3OffCommand=
 Label4X=SCREEN_CENTER_X-250
-Label4Y=THEME:GetMetric("EditMode","Row4Y")
+Label4Y=THEME:GetMetric("EditMenu","Row4Y")
 Label4OnCommand=shadowlength,1;zoom,0.75
 Label4OffCommand=
 Label5X=SCREEN_CENTER_X-250
-Label5Y=THEME:GetMetric("EditMode","Row5Y")
+Label5Y=THEME:GetMetric("EditMenu","Row5Y")
 Label5OnCommand=shadowlength,1;zoom,0.75
 Label5OffCommand=
 Label6X=SCREEN_CENTER_X-250
-Label6Y=THEME:GetMetric("EditMode","Row6Y")
+Label6Y=THEME:GetMetric("EditMenu","Row6Y")
 Label6OnCommand=shadowlength,1;zoom,0.75
 Label6OffCommand=
 Label7X=SCREEN_CENTER_X-250
-Label7Y=THEME:GetMetric("EditMode","Row7Y")
+Label7Y=THEME:GetMetric("EditMenu","Row7Y")
 Label7OnCommand=shadowlength,1;zoom,0.75
 Label7OffCommand=
 
 Value1X=SCREEN_CENTER_X
-Value1Y=THEME:GetMetric("EditMode","Row1Y")
+Value1Y=THEME:GetMetric("EditMenu","Row1Y")
 Value1OnCommand=shadowlength,1;zoom,0.75;maxwidth,SCREEN_CENTER_X*0.65
 Value1OffCommand=
 Value2X=SCREEN_CENTER_X+60
-Value2Y=THEME:GetMetric("EditMode","Row2Y")
+Value2Y=THEME:GetMetric("EditMenu","Row2Y")
 Value2OnCommand=shadowlength,1;zoom,0.75;maxwidth,SCREEN_CENTER_X*0.65
 Value2OffCommand=
 Value3X=SCREEN_CENTER_X+60
-Value3Y=THEME:GetMetric("EditMode","Row3Y")
+Value3Y=THEME:GetMetric("EditMenu","Row3Y")
 Value3OnCommand=shadowlength,1;zoom,0.75;maxwidth,SCREEN_CENTER_X*0.65
 Value3OffCommand=
 Value4X=SCREEN_CENTER_X
-Value4Y=THEME:GetMetric("EditMode","Row4Y")
+Value4Y=THEME:GetMetric("EditMenu","Row4Y")
 Value4OnCommand=shadowlength,1;zoom,0.75;maxwidth,SCREEN_CENTER_X*0.65
 Value4OffCommand=
 Value5X=SCREEN_CENTER_X+60
-Value5Y=THEME:GetMetric("EditMode","Row5Y")
+Value5Y=THEME:GetMetric("EditMenu","Row5Y")
 Value5OnCommand=shadowlength,1;zoom,0.75;maxwidth,SCREEN_CENTER_X*0.65
 Value5OffCommand=
 Value6X=SCREEN_CENTER_X
-Value6Y=THEME:GetMetric("EditMode","Row6Y")
+Value6Y=THEME:GetMetric("EditMenu","Row6Y")
 Value6OnCommand=shadowlength,1;zoom,0.75;maxwidth,SCREEN_CENTER_X*0.65
 Value6OffCommand=
 Value7X=SCREEN_CENTER_X+60
-Value7Y=THEME:GetMetric("EditMode","Row7Y")
+Value7Y=THEME:GetMetric("EditMenu","Row7Y")
 Value7OnCommand=shadowlength,1;zoom,0.75;maxwidth,SCREEN_CENTER_X*0.65
 Value7OffCommand=