diff --git a/mods/cnc/chrome/color-picker.yaml b/mods/cnc/chrome/color-picker.yaml
new file mode 100644
index 0000000000..0f6bd53063
--- /dev/null
+++ b/mods/cnc/chrome/color-picker.yaml
@@ -0,0 +1,45 @@
+Background@COLOR_CHOOSER:
+	Logic:ColorPickerLogic
+	Background:panel-black
+	Width:234
+	Height:105
+	Children:
+		Background@HUEBG:
+			Background:panel-black
+			X:5
+			Y:5
+			Width:148
+			Height:13
+			Children:
+				HueSlider@HUE:
+					X:2
+					Y:2
+					Width:144
+					Height:9
+					Ticks:5
+		Background@MIXERBG:
+			Background:panel-black
+			X:5
+			Y:23
+			Width:148
+			Height:76
+			Children:
+				ColorMixer@MIXER:
+					X:2
+					Y:2
+					Width:144
+					Height:72
+		ShpImage@FACT:
+			X:153
+			Y:1
+			Width:80
+			Height:73
+			Image:fact
+			Palette:colorpicker
+		Button@RANDOM_BUTTON:
+			Key:tab
+			X:158
+			Y:74
+			Width:70
+			Height:25
+			Text:Random
\ No newline at end of file
diff --git a/mods/cnc/chrome/dialogs.yaml b/mods/cnc/chrome/dialogs.yaml
index 1ac590a989..322b8d44af 100644
--- a/mods/cnc/chrome/dialogs.yaml
+++ b/mods/cnc/chrome/dialogs.yaml
@@ -1,49 +1,3 @@
-Background@COLOR_CHOOSER:
-	Logic:ColorPickerLogic
-	Background:panel-black
-	Width:234
-	Height:105
-	Children:
-		Background@HUEBG:
-			Background:panel-black
-			X:5
-			Y:5
-			Width:148
-			Height:13
-			Children:
-				HueSlider@HUE:
-					X:2
-					Y:2
-					Width:144
-					Height:9
-					Ticks:5
-		Background@MIXERBG:
-			Background:panel-black
-			X:5
-			Y:23
-			Width:148
-			Height:76
-			Children:
-				ColorMixer@MIXER:
-					X:2
-					Y:2
-					Width:144
-					Height:72
-		ShpImage@FACT:
-			X:153
-			Y:1
-			Width:80
-			Height:73
-			Image:fact
-			Palette:colorpicker
-		Button@RANDOM_BUTTON:
-			Key:tab
-			X:158
-			Y:74
-			Width:70
-			Height:25
-			Text:Random
-
 ScrollPanel@LABEL_DROPDOWN_TEMPLATE:
 	Width:DROPDOWN_WIDTH
 	Background:panel-black
@@ -146,187 +100,3 @@ Container@CONFIRM_PROMPT:
 			Width:140
 			Height:35
 			Text:Confirm
-
-Background@KICK_CLIENT_DIALOG:
-	X:15
-	Y:30
-	Width:501
-	Height:219
-	Logic:KickClientLogic
-	Background:scrollpanel-bg
-	Children:
-		Label@TITLE:
-			X:0
-			Y:40
-			Width:PARENT_RIGHT
-			Height:25
-			Font:Bold
-			Align:Center
-		Label@TEXTA:
-			X:0
-			Y:67
-			Width:PARENT_RIGHT
-			Height:25
-			Font:Regular
-			Align:Center
-			Text:You may also apply a temporary ban, preventing
-		Label@TEXTB:
-			X:0
-			Y:85
-			Width:PARENT_RIGHT
-			Height:25
-			Font:Regular
-			Align:Center
-			Text:them from joining for the remainder of this game.
-		Checkbox@PREVENT_REJOINING_CHECKBOX:
-			X:(PARENT_RIGHT - WIDTH)/2
-			Y:120
-			Width:150
-			Height:20
-			Font:Regular
-			Text:Temporarily Ban
-		Button@OK_BUTTON:
-			X:(PARENT_RIGHT - WIDTH)/2 + 75
-			Y:155
-			Width:120
-			Height:25
-			Text:Kick
-			Font:Bold
-		Button@CANCEL_BUTTON:
-			X:(PARENT_RIGHT - WIDTH)/2 - 75
-			Y:155
-			Width:120
-			Height:25
-			Text:Cancel
-			Font:Bold
-			
-Background@KICK_SPECTATORS_DIALOG:
-	X:15
-	Y:30
-	Width:501
-	Height:219
-	Logic:KickSpectatorsLogic
-	Background:scrollpanel-bg
-	Children:
-		Label@TITLE:
-			X:0
-			Y:40
-			Width:PARENT_RIGHT
-			Height:25
-			Font:Bold
-			Align:Center
-			Text:Kick Spectators
-		Label@TEXT:
-			X:0
-			Y:85
-			Width:PARENT_RIGHT
-			Height:25
-			Font:Regular
-			Align:Center
-		Button@OK_BUTTON:
-			X:(PARENT_RIGHT - WIDTH)/2 + 75
-			Y:155
-			Width:120
-			Height:25
-			Text:Ok
-			Font:Bold
-		Button@CANCEL_BUTTON:
-			X:(PARENT_RIGHT - WIDTH)/2 - 75
-			Y:155
-			Width:120
-			Height:25
-			Text:Cancel
-			Font:Bold
-
-Background@LOBBY_OPTIONS_BIN:
-	X:15
-	Y:30
-	Width:501
-	Height:219
-	Background:scrollpanel-bg
-	Children:
-		Label@TITLE:
-			X:0
-			Y:30
-			Width:PARENT_RIGHT
-			Height:25
-			Font:Bold
-			Align:Center
-			Text: Map Options
-		Container:
-			X:30
-			Y:65
-			Width: PARENT_RIGHT-60
-			Height: PARENT_BOTTOM-75
-			Children:
-				Checkbox@SHROUD_CHECKBOX:
-					Width:230
-					Height:20
-					Font:Regular
-					Text:Shroud
-				Checkbox@FOG_CHECKBOX:
-					Y:35
-					Width:230
-					Height:20
-					Font:Regular
-					Text:Fog of War
-				Checkbox@CRATES_CHECKBOX:
-					X:160
-					Width:230
-					Height:20
-					Font:Regular
-					Text:Crates Appear
-				Checkbox@ALLYBUILDRADIUS_CHECKBOX:
-					X:160
-					Y:35
-					Width:230
-					Height:20
-					Font:Regular
-					Text:Build off Ally ConYards
-				Checkbox@ALLOWCHEATS_CHECKBOX:
-					X:325
-					Width:230
-					Height:20
-					Font:Regular
-					Text:Debug Menu
-				Label@STARTINGCASH_DESC:
-					X:10
-					Y:72
-					Width:70
-					Height:25
-					Font:Regular
-					Text:Starting Cash:
-					Align:Right
-				DropDownButton@STARTINGCASH_DROPDOWNBUTTON:
-					X:85
-					Y:72
-					Width:120
-					Height:25
-					Font:Regular
-					Text:$5000
-				Label@STARTINGUNITS_DESC:
-					X:PARENT_RIGHT - WIDTH - 135
-					Y:72
-					Width:120
-					Height:25
-					Text:Starting Units:
-					Align:Right
-				DropDownButton@STARTINGUNITS_DROPDOWNBUTTON:
-					X:PARENT_RIGHT - WIDTH + 10
-					Y:72
-					Width:140
-					Height:25
-					Font:Regular
-				Label@DIFFICULTY_DESC:
-					X:PARENT_RIGHT - WIDTH - 135
-					Y:107
-					Width:120
-					Height:25
-					Text:Mission Difficulty:
-					Align:Right
-				DropDownButton@DIFFICULTY_DROPDOWNBUTTON:
-					X:PARENT_RIGHT - WIDTH + 10
-					Y:107
-					Width:140
-					Height:25
-					Font:Regular
\ No newline at end of file
diff --git a/mods/cnc/chrome/lobby-dialogs.yaml b/mods/cnc/chrome/lobby-dialogs.yaml
new file mode 100644
index 0000000000..e1d0effc43
--- /dev/null
+++ b/mods/cnc/chrome/lobby-dialogs.yaml
@@ -0,0 +1,183 @@
+Background@KICK_CLIENT_DIALOG:
+	X:15
+	Y:30
+	Width:501
+	Height:219
+	Logic:KickClientLogic
+	Background:scrollpanel-bg
+	Children:
+		Label@TITLE:
+			X:0
+			Y:40
+			Width:PARENT_RIGHT
+			Height:25
+			Font:Bold
+			Align:Center
+		Label@TEXTA:
+			X:0
+			Y:67
+			Width:PARENT_RIGHT
+			Height:25
+			Font:Regular
+			Align:Center
+			Text:You may also apply a temporary ban, preventing
+		Label@TEXTB:
+			X:0
+			Y:85
+			Width:PARENT_RIGHT
+			Height:25
+			Font:Regular
+			Align:Center
+			Text:them from joining for the remainder of this game.
+		Checkbox@PREVENT_REJOINING_CHECKBOX:
+			X:(PARENT_RIGHT - WIDTH)/2
+			Y:120
+			Width:150
+			Height:20
+			Font:Regular
+			Text:Temporarily Ban
+		Button@OK_BUTTON:
+			X:(PARENT_RIGHT - WIDTH)/2 + 75
+			Y:155
+			Width:120
+			Height:25
+			Text:Kick
+			Font:Bold
+		Button@CANCEL_BUTTON:
+			X:(PARENT_RIGHT - WIDTH)/2 - 75
+			Y:155
+			Width:120
+			Height:25
+			Text:Cancel
+			Font:Bold
+
+Background@KICK_SPECTATORS_DIALOG:
+	X:15
+	Y:30
+	Width:501
+	Height:219
+	Logic:KickSpectatorsLogic
+	Background:scrollpanel-bg
+	Children:
+		Label@TITLE:
+			X:0
+			Y:40
+			Width:PARENT_RIGHT
+			Height:25
+			Font:Bold
+			Align:Center
+			Text:Kick Spectators
+		Label@TEXT:
+			X:0
+			Y:85
+			Width:PARENT_RIGHT
+			Height:25
+			Font:Regular
+			Align:Center
+		Button@OK_BUTTON:
+			X:(PARENT_RIGHT - WIDTH)/2 + 75
+			Y:155
+			Width:120
+			Height:25
+			Text:Ok
+			Font:Bold
+		Button@CANCEL_BUTTON:
+			X:(PARENT_RIGHT - WIDTH)/2 - 75
+			Y:155
+			Width:120
+			Height:25
+			Text:Cancel
+			Font:Bold
+
+Background@LOBBY_OPTIONS_BIN:
+	X:15
+	Y:30
+	Width:501
+	Height:219
+	Background:scrollpanel-bg
+	Children:
+		Label@TITLE:
+			X:0
+			Y:30
+			Width:PARENT_RIGHT
+			Height:25
+			Font:Bold
+			Align:Center
+			Text: Map Options
+		Container:
+			X:30
+			Y:65
+			Width: PARENT_RIGHT-60
+			Height: PARENT_BOTTOM-75
+			Children:
+				Checkbox@SHROUD_CHECKBOX:
+					Width:230
+					Height:20
+					Font:Regular
+					Text:Shroud
+				Checkbox@FOG_CHECKBOX:
+					Y:35
+					Width:230
+					Height:20
+					Font:Regular
+					Text:Fog of War
+				Checkbox@CRATES_CHECKBOX:
+					X:160
+					Width:230
+					Height:20
+					Font:Regular
+					Text:Crates Appear
+				Checkbox@ALLYBUILDRADIUS_CHECKBOX:
+					X:160
+					Y:35
+					Width:230
+					Height:20
+					Font:Regular
+					Text:Build off Ally ConYards
+				Checkbox@ALLOWCHEATS_CHECKBOX:
+					X:325
+					Width:230
+					Height:20
+					Font:Regular
+					Text:Debug Menu
+				Label@STARTINGCASH_DESC:
+					X:10
+					Y:72
+					Width:70
+					Height:25
+					Font:Regular
+					Text:Starting Cash:
+					Align:Right
+				DropDownButton@STARTINGCASH_DROPDOWNBUTTON:
+					X:85
+					Y:72
+					Width:120
+					Height:25
+					Font:Regular
+					Text:$5000
+				Label@STARTINGUNITS_DESC:
+					X:PARENT_RIGHT - WIDTH - 135
+					Y:72
+					Width:120
+					Height:25
+					Text:Starting Units:
+					Align:Right
+				DropDownButton@STARTINGUNITS_DROPDOWNBUTTON:
+					X:PARENT_RIGHT - WIDTH + 10
+					Y:72
+					Width:140
+					Height:25
+					Font:Regular
+				Label@DIFFICULTY_DESC:
+					X:PARENT_RIGHT - WIDTH - 135
+					Y:107
+					Width:120
+					Height:25
+					Text:Mission Difficulty:
+					Align:Right
+				DropDownButton@DIFFICULTY_DROPDOWNBUTTON:
+					X:PARENT_RIGHT - WIDTH + 10
+					Y:107
+					Width:140
+					Height:25
+					Font:Regular
\ No newline at end of file
diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml
index 878eda946f..e60f2074bc 100644
--- a/mods/cnc/mod.yaml
+++ b/mods/cnc/mod.yaml
@@ -81,7 +81,9 @@ ChromeLayout:
 	mods/cnc/chrome/lobby.yaml
 	mods/cnc/chrome/lobby-mappreview.yaml
 	mods/cnc/chrome/lobby-playerbin.yaml
+	mods/cnc/chrome/lobby-dialogs.yaml
 	mods/cnc/chrome/connection.yaml
+	mods/cnc/chrome/color-picker.yaml
 	mods/cnc/chrome/mapchooser.yaml
 	mods/cnc/chrome/replaybrowser.yaml
 	mods/cnc/chrome/ingame.yaml