Index: ps/trunk/binaries/data/mods/mod/gui/common/modern/styles.xml
===================================================================
--- ps/trunk/binaries/data/mods/mod/gui/common/modern/styles.xml
+++ ps/trunk/binaries/data/mods/mod/gui/common/modern/styles.xml
@@ -70,7 +70,7 @@
 		sprite2_disabled="ModernDropDownArrowDisabled"
 		sprite2_pressed="ModernDropDownArrowHighlight"
 		buffer_zone="8"
-		dropdown_size="225"
+		dropdown_size="440"
 		minimum_visible_items="3"
 		sprite_list="GrayBackground"
 		sprite_list_overlay="BlackBorder"
Index: ps/trunk/binaries/data/mods/public/gamesettings/attributes/PlayerColor.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gamesettings/attributes/PlayerColor.js
+++ ps/trunk/binaries/data/mods/public/gamesettings/attributes/PlayerColor.js
@@ -126,10 +126,11 @@
 	_updateAvailable()
 	{
 		// Pick colors that the map specifies, add most unsimilar default colors
-		// Provide the access to g_MaxPlayers different colors, regardless of current playercount.
+		// Provide the access to all the colors defined in simulation/data/settings/player_defaults.json,
+		// regardless of current playercount.
 		let values = [];
 		let mapColors = false;
-		for (let i = 0; i < g_MaxPlayers; ++i)
+		for (let i = 0; i < this.defaultColors.length; ++i)
 		{
 			let col = this._getMapData(i);
 			if (col)