diff --git a/mods/cnc/chrome/gamelobby.yaml b/mods/cnc/chrome/gamelobby.yaml
index 42e3b7d9bf..f177a041d9 100644
--- a/mods/cnc/chrome/gamelobby.yaml
+++ b/mods/cnc/chrome/gamelobby.yaml
@@ -251,6 +251,91 @@ Container@ROOT:
 					Width: 80
 					Height: 20
 					Text: Lock Teams
+				Background@COLOR_CHOOSER:
+					Id:COLOR_CHOOSER
+					Width:500
+					Height:195
+					X:(WINDOW_RIGHT - WIDTH)/2 - PARENT_LEFT
+					Y:100	
+					Visible:false
+					Children:
+						Button@BUTTON_OK:
+							Id:BUTTON_OK
+							X:PARENT_RIGHT - 180
+							Y:PARENT_BOTTOM - 45
+							Width:160
+							Height:25
+							Text:Ok
+							Bold:True
+						ShpImage@MCV:
+							Id:MCV
+							X:PARENT_RIGHT - 90
+							Y:20
+							Image:mcv
+							Frame:8
+							Palette:colorpicker
+						ShpImage@FACT:
+							Id:FACT
+							X:PARENT_RIGHT - 100
+							Y:70
+							Image:fact
+							Palette:colorpicker
+						Label@HUE_LABEL:
+							X:0
+							Y:30
+							Width:110
+							Height:20
+							Align: Right
+							Text: Hue:
+						Slider@HUE:
+							Id:HUE_SLIDER
+							X:120
+							Y:30
+							Width:260
+							Height:20
+							Ticks:5
+						Label@SAT_LABEL:
+							X:0
+							Y:60
+							Width:110
+							Height:20
+							Align: Right
+							Text: Saturation:	
+						Slider@SAT:
+							Id:SAT_SLIDER
+							X:120
+							Y:60
+							Width:260
+							Height:20
+							Ticks:5
+						Label@LUM_LABEL:
+							X:0
+							Y:90
+							Width:110
+							Height:20
+							Align: Right
+							Text: Brightness:	
+						Slider@LUM:
+							Id:LUM_SLIDER
+							X:120
+							Y:90
+							Width:260
+							Height:20
+							Ticks:5
+						Label@RANGE_LABEL:
+							X:0
+							Y:120
+							Width:110
+							Height:20
+							Align: Right
+							Text: Range:	
+						Slider@RANGE:
+							Id:RANGE_SLIDER
+							X:120
+							Y:120
+							Width:260
+							Height:20
+							Ticks:5
 		Background@MAP_CHOOSER:
 			Id:MAP_CHOOSER
 			X:(WINDOW_RIGHT - WIDTH)/2
diff --git a/mods/cnc/system.yaml b/mods/cnc/system.yaml
index 016959c51a..a260fc993b 100644
--- a/mods/cnc/system.yaml
+++ b/mods/cnc/system.yaml
@@ -53,87 +53,9 @@ World:
 		Bridges: bridge1, bridge2, bridge3, bridge4
 	PaletteFromCurrentTheatre:
 		Name: terrain
-	PlayerColorPalette@player0:
-		Name: player0
-		DisplayName: Gold
+	PlayerColorPalette:
 		BasePalette: terrain
-		DisplayColor: 228, 200, 112
-		Color1: 246,214,121
-		Color2: 40,32,8
 		SplitRamp: yes
-	PlayerColorPalette@player1:
-		Name: player1
-		DisplayName: Blue
-		BasePalette: terrain
-		DisplayColor: 56, 72, 125
-		Color1: 85,130,204
-		Color2: 17,33,71
-		SplitRamp: yes
-	PlayerColorPalette@player2:
-		Name: player2
-		DisplayName: Red
-		BasePalette: terrain
-		DisplayColor: 238,0,0
-		Color1: 255,20,0
-		Color2: 56,0,0
-		SplitRamp: yes
-	PlayerColorPalette@player3:
-		Name: player3
-		DisplayName: Orange
-		BasePalette: terrain
-		DisplayColor: 198,97,0
-		Color1: 255,107,0
-		Color2: 56,0,0
-		SplitRamp: yes
-	PlayerColorPalette@player4:
-		Name: player4
-		DisplayName: Teal
-		BasePalette: terrain
-		DisplayColor: 28,109,97
-		Color1: 93,194,165
-		Color2: 0,32,32
-		SplitRamp: yes
-	PlayerColorPalette@player5:
-		Name: player5
-		DisplayName: Salmon
-		BasePalette: terrain
-		DisplayColor: 153,76,53
-		Color1: 210,153,125
-		Color2: 56,0,0
-		SplitRamp: yes
-	PlayerColorPalette@player6:
-		Name: player6
-		DisplayName: Green
-		BasePalette: terrain
-		DisplayColor: 76,101,60
-		Color1: 160,240,140
-		Color2: 20,20,20
-		SplitRamp: yes
-	PlayerColorPalette@player7:
-		Name: player7
-		DisplayName: White
-		BasePalette: terrain
-		DisplayColor: 255,255,255
-		Color1: 255,255,255
-		Color2: 75,75,75
-		SplitRamp: yes
-	PlayerColorPalette@player8:
-		Name: player8
-		DisplayName: Black
-		BasePalette: terrain
-		DisplayColor: 30,30,30
-		Color1: 80,80,80
-		Color2: 5,5,5
-		SplitRamp: yes
-	PlayerColorPalette@neutral:
-		Name: neutral
-		DisplayName: Neutral
-		BasePalette: terrain
-		DisplayColor: 133,113,101
-		Color1: 238,238,238
-		Color2: 44,28,24
-		SplitRamp: yes
-		Playable: no
 	PaletteFromFile@chrome:
 		Name: chrome
 		Filename: temperat.pal