diff --git a/OpenRA.Mods.Common/Widgets/Logic/Settings/AudioSettingsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Settings/AudioSettingsLogic.cs
index 5c2368b9f2..560a4f11c6 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/Settings/AudioSettingsLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Settings/AudioSettingsLogic.cs
@@ -113,7 +113,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 				s => WidgetUtils.TruncateText(s.Label, audioDeviceDropdown.UsableWidth, deviceFont));
 			audioDeviceDropdown.GetText = () => deviceLabel.Update(soundDevice);
 
-			var restartDesc = panel.Get("RESTART_REQUIRED_DESC");
+			var restartDesc = panel.Get("AUDIO_RESTART_REQUIRED_DESC");
 			restartDesc.IsVisible = () => soundDevice.Device != OriginalSoundDevice;
 
 			SettingsUtils.AdjustSettingsScrollPanelLayout(scrollPanel);
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Settings/DisplaySettingsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Settings/DisplaySettingsLogic.cs
index 46321ba4e3..6e0c6a2acb 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/Settings/DisplaySettingsLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Settings/DisplaySettingsLogic.cs
@@ -222,7 +222,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			var origHeightText = windowHeight.Text = ds.WindowedSize.Y.ToString(NumberFormatInfo.CurrentInfo);
 			windowHeight.Text = ds.WindowedSize.Y.ToString(NumberFormatInfo.CurrentInfo);
 
-			var restartDesc = panel.Get("RESTART_REQUIRED_DESC");
+			var restartDesc = panel.Get("VIDEO_RESTART_REQUIRED_DESC");
 			restartDesc.IsVisible = () => ds.Mode != OriginalGraphicsMode || ds.VideoDisplay != OriginalVideoDisplay || ds.GLProfile != OriginalGLProfile ||
 				(ds.Mode == WindowMode.Windowed && (origWidthText != windowWidth.Text || origHeightText != windowHeight.Text));
 
diff --git a/mods/cnc/chrome/connection.yaml b/mods/cnc/chrome/connection.yaml
index c90640ab88..e53182bdf3 100644
--- a/mods/cnc/chrome/connection.yaml
+++ b/mods/cnc/chrome/connection.yaml
@@ -5,7 +5,7 @@ Container@CONNECTING_PANEL:
 	Width: 370
 	Height: 125
 	Children:
-		Label@TITLE:
+		Label@CONNECTING_TITLE:
 			Width: PARENT_RIGHT
 			Y: 0 - 22
 			Font: BigBold
diff --git a/mods/cnc/chrome/lobby-players.yaml b/mods/cnc/chrome/lobby-players.yaml
index fa6eec4bd9..0ad22fe136 100644
--- a/mods/cnc/chrome/lobby-players.yaml
+++ b/mods/cnc/chrome/lobby-players.yaml
@@ -8,48 +8,48 @@ Container@LOBBY_PLAYER_BIN:
 			Width: PARENT_RIGHT
 			Height: PARENT_BOTTOM
 			Children:
-				Label@NAME:
+				Label@LABEL_LOBBY_NAME:
 					Width: 200
 					Height: 25
 					Text: Player
 					Align: Center
 					Font: Bold
-				Label@COLOR:
+				Label@LABEL_LOBBY_COLOR:
 					X: 210
 					Width: 94
 					Height: 25
 					Text: Color
 					Align: Center
 					Font: Bold
-				Label@FACTION:
+				Label@LABEL_LOBBY_FACTION:
 					X: 309
 					Width: 120
 					Height: 25
 					Text: Faction
 					Align: Center
 					Font: Bold
-				Label@TEAM:
+				Label@LABEL_LOBBY_TEAM:
 					X: 460 - 25
 					Width: 50
 					Height: 25
 					Text: Team
 					Align: Center
 					Font: Bold
-				Label@HANDICAP:
+				Label@LABEL_LOBBY_HANDICAP:
 					X: 491
 					Width: 75
 					Height: 25
 					Text: Handicap
 					Align: Center
 					Font: Bold
-				Label@SPAWN:
+				Label@LABEL_LOBBY_SPAWN:
 					X: 571
 					Width: 50
 					Height: 25
 					Text: Spawn
 					Align: Left
 					Font: Bold
-				Label@STATUS:
+				Label@LABEL_LOBBY_STATUS:
 					X: 627
 					Width: 20
 					Height: 25
diff --git a/mods/cnc/chrome/mainmenu-prompts.yaml b/mods/cnc/chrome/mainmenu-prompts.yaml
index 3cad4f01b3..8bbb0f85ef 100644
--- a/mods/cnc/chrome/mainmenu-prompts.yaml
+++ b/mods/cnc/chrome/mainmenu-prompts.yaml
@@ -41,7 +41,7 @@ Container@MAINMENU_INTRODUCTION_PROMPT:
 					ItemSpacing: 10
 					ScrollBar: Hidden
 					Children:
-						Background@SECTION_HEADER:
+						Background@PROFILE_SECTION_HEADER:
 							X: 5
 							Width: PARENT_RIGHT - 10
 							Height: 13
@@ -93,7 +93,7 @@ Container@MAINMENU_INTRODUCTION_PROMPT:
 													Width: PARENT_RIGHT - 35
 													Height: PARENT_BOTTOM - 12
 						Container@SPACER:
-						Background@SECTION_HEADER:
+						Background@INPUT_SECTION_HEADER:
 							X: 5
 							Width: PARENT_RIGHT - 10
 							Height: 13
@@ -237,7 +237,7 @@ Container@MAINMENU_INTRODUCTION_PROMPT:
 											Text: Screen Edge Panning
 						Container@SPACER:
 							Height: 30
-						Background@SECTION_HEADER:
+						Background@DISPLAY_SECTION_HEADER:
 							X: 5
 							Width: PARENT_RIGHT - 10
 							Height: 13
@@ -309,7 +309,7 @@ Container@MAINMENU_SYSTEM_INFO_PROMPT:
 	Width: 600
 	Height: 350
 	Children:
-		Label@TITLE:
+		Label@PROMPT_TITLE:
 			Width: PARENT_RIGHT
 			Y: 0 - 25
 			Font: BigBold
diff --git a/mods/cnc/chrome/multiplayer-directconnect.yaml b/mods/cnc/chrome/multiplayer-directconnect.yaml
index b6e9bf8ac8..a1fa4d5291 100644
--- a/mods/cnc/chrome/multiplayer-directconnect.yaml
+++ b/mods/cnc/chrome/multiplayer-directconnect.yaml
@@ -5,7 +5,7 @@ Container@DIRECTCONNECT_PANEL:
 	Width: 370
 	Height: 125
 	Children:
-		Label@TITLE:
+		Label@DIRECTCONNECT_LABEL_TITLE:
 			Width: PARENT_RIGHT
 			Y: 0 - 22
 			Font: BigBold
diff --git a/mods/cnc/chrome/settings-advanced.yaml b/mods/cnc/chrome/settings-advanced.yaml
index c29b07613e..808bd37d97 100644
--- a/mods/cnc/chrome/settings-advanced.yaml
+++ b/mods/cnc/chrome/settings-advanced.yaml
@@ -10,7 +10,7 @@ Container@ADVANCED_PANEL:
 			TopBottomSpacing: 5
 			ItemSpacing: 10
 			Children:
-				Background@SECTION_HEADER:
+				Background@NETWORK_SECTION_HEADER:
 					X: 5
 					Width: PARENT_RIGHT - 24 - 10
 					Height: 13
@@ -97,7 +97,7 @@ Container@ADVANCED_PANEL:
 									WordWrap: True
 									Text: Your Operating System, OpenGL and .NET runtime versions, and language settings will be sent along with an anonymous ID to help prioritize future development.
 				Container@SPACER:
-				Background@SECTION_HEADER:
+				Background@DEBUG_SECTION_HEADER:
 					X: 5
 					Width: PARENT_RIGHT - 24 - 10
 					Height: 13
diff --git a/mods/cnc/chrome/settings-audio.yaml b/mods/cnc/chrome/settings-audio.yaml
index 12f5b5e878..ae12d9508d 100644
--- a/mods/cnc/chrome/settings-audio.yaml
+++ b/mods/cnc/chrome/settings-audio.yaml
@@ -10,7 +10,7 @@ Container@AUDIO_PANEL:
 			TopBottomSpacing: 5
 			ItemSpacing: 10
 			Children:
-				Background@SECTION_HEADER:
+				Background@AUDIO_SECTION_HEADER:
 					X: 5
 					Width: PARENT_RIGHT - 24 - 10
 					Height: 13
@@ -137,7 +137,7 @@ Container@AUDIO_PANEL:
 							X: 10
 							Width: PARENT_RIGHT - 10
 							Children:
-								Label@RESTART_REQUIRED_DESC:
+								Label@AUDIO_RESTART_REQUIRED_DESC:
 									Width: PARENT_RIGHT
 									Height: 20
 									Font: Tiny
diff --git a/mods/cnc/chrome/settings-display.yaml b/mods/cnc/chrome/settings-display.yaml
index 04cdf63139..a31785279f 100644
--- a/mods/cnc/chrome/settings-display.yaml
+++ b/mods/cnc/chrome/settings-display.yaml
@@ -10,7 +10,7 @@ Container@DISPLAY_PANEL:
 			TopBottomSpacing: 5
 			ItemSpacing: 10
 			Children:
-				Background@SECTION_HEADER:
+				Background@PROFILE_SECTION_HEADER:
 					X: 5
 					Width: PARENT_RIGHT - 24 - 10
 					Height: 13
@@ -64,7 +64,7 @@ Container@DISPLAY_PANEL:
 											Width: PARENT_RIGHT - 35
 											Height: PARENT_BOTTOM - 12
 				Container@SPACER:
-				Background@SECTION_HEADER:
+				Background@DISPLAY_SECTION_HEADER:
 					X: 5
 					Width: PARENT_RIGHT - 24 - 10
 					Height: 13
@@ -202,7 +202,7 @@ Container@DISPLAY_PANEL:
 									Font: Regular
 									Text: Hide Chat in Replays
 				Container@SPACER:
-				Background@SECTION_HEADER:
+				Background@VIDEO_SECTION_HEADER:
 					X: 5
 					Width: PARENT_RIGHT - 24 - 10
 					Height: 13
@@ -344,7 +344,7 @@ Container@DISPLAY_PANEL:
 							X: 10
 							Width: PARENT_RIGHT - 20
 							Children:
-								Label@RESTART_REQUIRED_DESC:
+								Label@VIDEO_RESTART_REQUIRED_DESC:
 									Width: PARENT_RIGHT
 									Height: 20
 									Font: Tiny
diff --git a/mods/cnc/chrome/settings-input.yaml b/mods/cnc/chrome/settings-input.yaml
index 81332f7322..e0ab452b99 100644
--- a/mods/cnc/chrome/settings-input.yaml
+++ b/mods/cnc/chrome/settings-input.yaml
@@ -10,7 +10,7 @@ Container@INPUT_PANEL:
 			TopBottomSpacing: 5
 			ItemSpacing: 10
 			Children:
-				Background@SECTION_HEADER:
+				Background@INPUT_SECTION_HEADER:
 					X: 5
 					Width: PARENT_RIGHT - 24 - 10
 					Height: 13
diff --git a/mods/cnc/chrome/settings.yaml b/mods/cnc/chrome/settings.yaml
index ba96bd366e..b36a7f25ee 100644
--- a/mods/cnc/chrome/settings.yaml
+++ b/mods/cnc/chrome/settings.yaml
@@ -12,7 +12,7 @@ Container@SETTINGS_PANEL:
 	Width: 640
 	Height: 435
 	Children:
-		Label@TITLE:
+		Label@SETTINGS_LABEL_TITLE:
 			Width: PARENT_RIGHT
 			Y: 0 - 22
 			Font: BigBold
diff --git a/mods/common/chrome/mainmenu-prompts.yaml b/mods/common/chrome/mainmenu-prompts.yaml
index 87eb281364..de48b45c86 100644
--- a/mods/common/chrome/mainmenu-prompts.yaml
+++ b/mods/common/chrome/mainmenu-prompts.yaml
@@ -36,7 +36,7 @@ Background@MAINMENU_INTRODUCTION_PROMPT:
 			ItemSpacing: 10
 			ScrollBar: Hidden
 			Children:
-				Background@SECTION_HEADER:
+				Background@PROFILE_SECTION_HEADER:
 					X: 5
 					Width: PARENT_RIGHT - 10
 					Height: 13
@@ -88,7 +88,7 @@ Background@MAINMENU_INTRODUCTION_PROMPT:
 											Width: PARENT_RIGHT - 35
 											Height: PARENT_BOTTOM - 12
 				Container@SPACER:
-				Background@SECTION_HEADER:
+				Background@INPUT_SECTION_HEADER:
 					X: 5
 					Width: PARENT_RIGHT - 10
 					Height: 13
@@ -232,7 +232,7 @@ Background@MAINMENU_INTRODUCTION_PROMPT:
 									Text: Screen Edge Panning
 				Container@SPACER:
 					Height: 30
-				Background@SECTION_HEADER:
+				Background@DISPLAY_SECTION_HEADER:
 					X: 5
 					Width: PARENT_RIGHT - 10
 					Height: 13
diff --git a/mods/common/chrome/settings-advanced.yaml b/mods/common/chrome/settings-advanced.yaml
index c29b07613e..808bd37d97 100644
--- a/mods/common/chrome/settings-advanced.yaml
+++ b/mods/common/chrome/settings-advanced.yaml
@@ -10,7 +10,7 @@ Container@ADVANCED_PANEL:
 			TopBottomSpacing: 5
 			ItemSpacing: 10
 			Children:
-				Background@SECTION_HEADER:
+				Background@NETWORK_SECTION_HEADER:
 					X: 5
 					Width: PARENT_RIGHT - 24 - 10
 					Height: 13
@@ -97,7 +97,7 @@ Container@ADVANCED_PANEL:
 									WordWrap: True
 									Text: Your Operating System, OpenGL and .NET runtime versions, and language settings will be sent along with an anonymous ID to help prioritize future development.
 				Container@SPACER:
-				Background@SECTION_HEADER:
+				Background@DEBUG_SECTION_HEADER:
 					X: 5
 					Width: PARENT_RIGHT - 24 - 10
 					Height: 13
diff --git a/mods/common/chrome/settings-audio.yaml b/mods/common/chrome/settings-audio.yaml
index 12f5b5e878..ae12d9508d 100644
--- a/mods/common/chrome/settings-audio.yaml
+++ b/mods/common/chrome/settings-audio.yaml
@@ -10,7 +10,7 @@ Container@AUDIO_PANEL:
 			TopBottomSpacing: 5
 			ItemSpacing: 10
 			Children:
-				Background@SECTION_HEADER:
+				Background@AUDIO_SECTION_HEADER:
 					X: 5
 					Width: PARENT_RIGHT - 24 - 10
 					Height: 13
@@ -137,7 +137,7 @@ Container@AUDIO_PANEL:
 							X: 10
 							Width: PARENT_RIGHT - 10
 							Children:
-								Label@RESTART_REQUIRED_DESC:
+								Label@AUDIO_RESTART_REQUIRED_DESC:
 									Width: PARENT_RIGHT
 									Height: 20
 									Font: Tiny
diff --git a/mods/common/chrome/settings-display.yaml b/mods/common/chrome/settings-display.yaml
index 4410417c49..1cf15684f1 100644
--- a/mods/common/chrome/settings-display.yaml
+++ b/mods/common/chrome/settings-display.yaml
@@ -10,7 +10,7 @@ Container@DISPLAY_PANEL:
 			TopBottomSpacing: 5
 			ItemSpacing: 10
 			Children:
-				Background@SECTION_HEADER:
+				Background@PROFILE_SECTION_HEADER:
 					X: 5
 					Width: PARENT_RIGHT - 24 - 10
 					Height: 13
@@ -64,7 +64,7 @@ Container@DISPLAY_PANEL:
 											Width: PARENT_RIGHT - 35
 											Height: PARENT_BOTTOM - 12
 				Container@SPACER:
-				Background@SECTION_HEADER:
+				Background@DISPLAY_SECTION_HEADER:
 					X: 5
 					Width: PARENT_RIGHT - 24 - 10
 					Height: 13
@@ -211,7 +211,7 @@ Container@DISPLAY_PANEL:
 									Font: Regular
 									Text: Hide Chat in Replays
 				Container@SPACER:
-				Background@SECTION_HEADER:
+				Background@VIDEO_SECTION_HEADER:
 					X: 5
 					Width: PARENT_RIGHT - 24 - 10
 					Height: 13
@@ -353,7 +353,7 @@ Container@DISPLAY_PANEL:
 							X: 10
 							Width: PARENT_RIGHT - 20
 							Children:
-								Label@RESTART_REQUIRED_DESC:
+								Label@VIDEO_RESTART_REQUIRED_DESC:
 									Width: PARENT_RIGHT
 									Height: 20
 									Font: Tiny
diff --git a/mods/common/chrome/settings-input.yaml b/mods/common/chrome/settings-input.yaml
index 81332f7322..e0ab452b99 100644
--- a/mods/common/chrome/settings-input.yaml
+++ b/mods/common/chrome/settings-input.yaml
@@ -10,7 +10,7 @@ Container@INPUT_PANEL:
 			TopBottomSpacing: 5
 			ItemSpacing: 10
 			Children:
-				Background@SECTION_HEADER:
+				Background@INPUT_SECTION_HEADER:
 					X: 5
 					Width: PARENT_RIGHT - 24 - 10
 					Height: 13