Index: binaries/data/mods/mod/gui/common/modern/setup.xml
===================================================================
--- binaries/data/mods/mod/gui/common/modern/setup.xml
+++ binaries/data/mods/mod/gui/common/modern/setup.xml
@@ -54,6 +54,7 @@
 	<color name="blue">0 0 255</color>
 	<color name="yellow">255 255 0</color>
 
+	<color name="persiangreen">0 160 160</color>
 	<color name="gold">237 227 167</color>
 	<color name="lightgray">243 242 240</color>
 	<color name="gray">143 142 140</color>
Index: binaries/data/mods/public/gui/common/gamedescription.js
===================================================================
--- binaries/data/mods/public/gui/common/gamedescription.js
+++ binaries/data/mods/public/gui/common/gamedescription.js
@@ -1,459 +1,482 @@
 /**
  * Highlights the victory condition in the game-description.
  */
-var g_DescriptionHighlight = "orange";
+ var g_DescriptionHighlight = "orange";
 
-/**
- * The rating assigned to lobby players who didn't complete a ranked 1v1 yet.
- */
-var g_DefaultLobbyRating = 1200;
+ /**
+  * The rating assigned to lobby players who didn't complete a ranked 1v1 yet.
+  */
+ var g_DefaultLobbyRating = 1200;
 
-/**
- * XEP-0172 doesn't restrict nicknames, but our lobby policy does.
- * So use this human readable delimiter to separate buddy names in the config file.
- */
-var g_BuddyListDelimiter = ",";
+ /**
+  * XEP-0172 doesn't restrict nicknames, but our lobby policy does.
+  * So use this human readable delimiter to separate buddy names in the config file.
+  */
+ var g_BuddyListDelimiter = ",";
 
 
-/**
- * Returns the nickname without the lobby rating.
- */
-function splitRatingFromNick(playerName)
-{
-	let result = /^(\S+)\ \((\d+)\)$/g.exec(playerName);
-	return { "nick": result ? result[1] : playerName, "rating": result ? +result[2] : "" };
-}
+ /**
+  * @Returns {object} containing the name and rating seperately.
+  */
+ function splitRatingFromNick(playerName)
+ {
+	 let result = /^(\S+)\ \((\d+)\)$/g.exec(playerName);
+	 return { "nick": result ? result[1] : playerName, "rating": result ? +result[2] : "" };
+ }
 
-/**
- * Array of playernames that the current user has marked as buddies.
- */
-var g_Buddies = Engine.ConfigDB_GetValue("user", "lobby.buddies").split(g_BuddyListDelimiter);
+ /**
+  * Array of playernames that the current user has marked as buddies.
+  */
+ var g_Buddies = Engine.ConfigDB_GetValue("user", "lobby.buddies").split(g_BuddyListDelimiter);
 
-/**
- * Denotes which players are a lobby buddy of the current user.
- */
-var g_BuddySymbol = '•';
+ /**
+  * Denotes which players are a lobby buddy of the current user.
+  */
+ var g_BuddySymbol = '★';
 
-/**
- * Returns a formatted string describing the player assignments.
- * Needs g_CivData to translate!
- *
- * @param {Object} playerDataArray - As known from game setup and sim state.
- * @param {(string[]|false)} playerStates - One of "won", "defeated", "active" for each player.
- * @returns {string}
- */
-function formatPlayerInfo(playerDataArray, playerStates)
-{
-	let playerDescriptions = {};
-	let playerIdx = 0;
+ /**
+  * Returns a formatted string describing the player assignments.
+  * Needs g_CivData to translate!
+  *
+  * @param {Object} playerDataArray - As known from game setup and sim state.
+  * @param {(string[]|false)} playerStates - One of "won", "defeated", "active" for each player.
+  * @returns {string}
+  */
+ function formatPlayerInfo(playerDataArray, playerStates)
+ {
+	 let playerDescriptions = {};
+	 let playerIdx = 0;
 
-	for (let playerData of playerDataArray)
-	{
-		if (playerData == null || playerData.Civ && playerData.Civ == "gaia")
-			continue;
+	 for (let playerData of playerDataArray)
+	 {
+		 if (playerData == null || playerData.Civ && playerData.Civ == "gaia")
+			 continue;
 
-		++playerIdx;
-		let teamIdx = playerData.Team;
-		let isAI = playerData.AI && playerData.AI != "";
-		let playerState = playerStates && playerStates[playerIdx] || playerData.State;
-		let isActive = !playerState || playerState == "active";
+		 ++playerIdx;
+		 let teamIdx = playerData.Team;
+		 let isAI = playerData.AI && playerData.AI != "";
+		 let playerState = playerStates && playerStates[playerIdx] || playerData.State;
+		 let isActive = !playerState || playerState == "active";
 
-		let playerDescription;
-		if (isAI)
-		{
-			if (playerData.Civ)
-			{
-				if (isActive)
-					// Translation: Describe a player in a selected game, f.e. in the replay- or savegame menu
-					playerDescription = translate("%(playerName)s (%(civ)s, %(AIdescription)s)");
-				else
-					// Translation: Describe a player in a selected game, f.e. in the replay- or savegame menu
-					playerDescription = translate("%(playerName)s (%(civ)s, %(AIdescription)s, %(state)s)");
-			}
-			else
-			{
-				if (isActive)
-					// Translation: Describe a player in a selected game, f.e. in the replay- or savegame menu
-					playerDescription = translate("%(playerName)s (%(AIdescription)s)");
-				else
-					// Translation: Describe a player in a selected game, f.e. in the replay- or savegame menu
-					playerDescription = translate("%(playerName)s (%(AIdescription)s, %(state)s)");
-			}
-		}
-		else
-		{
-			if (playerData.Offline)
-			{
-				// Can only occur in the lobby for now, so no strings with civ needed
-				if (isActive)
-					// Translation: Describe a player in a selected game, f.e. in the replay- or savegame menu
-					playerDescription = translate("%(playerName)s (OFFLINE)");
-				else
-					// Translation: Describe a player in a selected game, f.e. in the replay- or savegame menu
-					playerDescription = translate("%(playerName)s (OFFLINE, %(state)s)");
-			}
-			else
-			{
-				if (playerData.Civ)
-					if (isActive)
-						// Translation: Describe a player in a selected game, f.e. in the replay- or savegame menu
-						playerDescription = translate("%(playerName)s (%(civ)s)");
-					else
-						// Translation: Describe a player in a selected game, f.e. in the replay- or savegame menu
-						playerDescription = translate("%(playerName)s (%(civ)s, %(state)s)");
-				else
-					if (isActive)
-						// Translation: Describe a player in a selected game, f.e. in the replay- or savegame menu
-						playerDescription = translate("%(playerName)s");
-					else
-						// Translation: Describe a player in a selected game, f.e. in the replay- or savegame menu
-						playerDescription = translate("%(playerName)s (%(state)s)");
-			}
-		}
+		 let playerDescription;
+		 if (isAI)
+		 {
+			 if (playerData.Civ)
+			 {
+				 if (isActive)
+					 // Translation: Describe a player in a selected game, f.e. in the replay- or savegame menu
+					 playerDescription = translate("%(status)s %(civ)s %(playerName)s (%(AIdescription)s)");
+				 else
+					 // Translation: Describe a player in a selected game, f.e. in the replay- or savegame menu
+					 playerDescription = translate("%(status)s %(civ)s %(state)s %(playerName)s (%(AIdescription)s)");
+			 }
+			 else
+			 {
+				 if (isActive)
+					 // Translation: Describe a player in a selected game, f.e. in the replay- or savegame menu
+					 playerDescription = translate("%(status)s %(playerName)s (%(AIdescription)s)");
+				 else
+					 // Translation: Describe a player in a selected game, f.e. in the replay- or savegame menu
+					 playerDescription = translate("%(status)s %(state)s %(playerName)s (%(AIdescription)s)");
+			 }
+		 }
+		 else
+		 {
+			 if (playerData.Offline)
+			 {
+				 // Can only occur in the lobby for now.
+				 if (isActive)
+					 // Translation: Describe a player in a selected game, f.e. in the replay- or savegame menu
+					 playerDescription = "%(status)s %(civ)s %(playerName)s";
+				 else
+					 // Translation: Describe a player in a selected game, f.e. in the replay- or savegame menu
+					 playerDescription = "%(status)s %(civ)s %(state)s %(playerName)s";
+			 }
+			 else
+			 {
+				 if (playerData.Civ)
+					 if (isActive)
+						 // Translation: Describe a player in a selected game, f.e. in the replay- or savegame menu
+						 playerDescription = "%(civ)s %(playerName)s";
+					 else
+						 // Translation: Describe a player in a selected game, f.e. in the replay- or savegame menu
+						 playerDescription = "%(civ)s %(state)s %(playerName)s";
+				 else
+					 if (isActive)
+						 // Translation: Describe a player in a selected game, f.e. in the replay- or savegame menu
+						 playerDescription = "%(playerName)s";
+					 else
+						 // Translation: Describe a player in a selected game, f.e. in the replay- or savegame menu
+						 playerDescription = "%(state)s %(playerName)s";
+			 }
+		 }
 
-		// Sort player descriptions by team
-		if (!playerDescriptions[teamIdx])
-			playerDescriptions[teamIdx] = [];
+		 // Sort player descriptions by team
+		 if (!playerDescriptions[teamIdx])
+			 playerDescriptions[teamIdx] = [];
 
-		let playerNick = splitRatingFromNick(playerData.Name).nick;
-		playerDescriptions[teamIdx].push(sprintf(playerDescription, {
-			"playerName":
-			coloredText(
-				(g_Buddies.indexOf(playerNick) != -1 ? g_BuddySymbol + " " : "") +
-				escapeText(playerData.Name),
-				(typeof getPlayerColor == 'function' ?
-					(isAI ? "white" : getPlayerColor(playerNick)) :
-					rgbToGuiColor(playerData.Color || g_Settings.PlayerDefaults[playerIdx].Color))),
+		 let playerNick = splitRatingFromNick(playerData.Name).nick;
 
-			"civ":
-				!playerData.Civ ?
-					translate("Unknown Civilization") :
-					g_CivData && g_CivData[playerData.Civ] && g_CivData[playerData.Civ].Name ?
-						translate(g_CivData[playerData.Civ].Name) :
-						playerData.Civ,
+		 let playerRating = splitRatingFromNick(playerData.Name).rating;
+		 playerRating ? playerRating = ' (' + coloredText(playerRating, PlayerColor.GetColorByRating(playerRating)) + ')' : playerRating = "";
 
-			"state":
-				playerState == "defeated" ?
-					translateWithContext("playerstate", "defeated") :
-					translateWithContext("playerstate", "won"),
+		 playerDescriptions[teamIdx].push(setStringTags(sprintf(playerDescription, {
+			 "playerName":
+				 (g_Buddies.indexOf(playerNick) != -1 ? coloredText(g_BuddySymbol, "persiangreen") + " " : "") +
+				 coloredText(escapeText(playerNick), PlayerColor.ColorPlayerNameByRole(Engine.LobbyGetPlayerRole(playerNick))) +	playerRating,
 
-			"AIdescription": translateAISettings(playerData)
-		}));
-	}
+			 "civ":
+				 !playerData.Civ ?
+					 translate("Unknown Civilization") :
+					 g_CivData && g_CivData[playerData.Civ] && g_CivData[playerData.Civ].Name ?
+						 '[icon="icon_' + playerData.Civ + '"]' :
+						 playerData.Civ,
 
-	let teams = Object.keys(playerDescriptions);
-	if (teams.indexOf("observer") > -1)
-		teams.splice(teams.indexOf("observer"), 1);
+			 "status":
+				 isAI ? '[icon="icon_bot"]' : '[icon="icon_offline"]',
 
-	let teamDescription = [];
+			 "state":
+				 playerState == "defeated" ?	'[icon="icon_defeated"]' : '[icon="icon_victorious"]',
 
-	// If there are no teams, merge all playersDescriptions
-	if (teams.length == 1)
-		teamDescription.push(playerDescriptions[teams[0]].join("\n"));
+			 "AIdescription": coloredText(translateAISettings(playerData), "persiangreen")
+		 }), { "tooltip": PlayerTooltip() }));
 
-	// If there are teams, merge "Team N:" + playerDescriptions
-	else
-		teamDescription = teams.map(team => {
+		 function PlayerTooltip() {
+			 let txt = "";
 
-			let teamCaption = team == -1 ?
-				translate("No Team") :
-				sprintf(translate("Team %(team)s"), { "team": +team + 1 });
+			 if (playerData.Offline || isAI)
+			 {
+				 txt += translate("Status") + ": ";
+				 txt += isAI ? translateAIName(playerData.AI) + "\n" : translate("Offline") + "\n";
+			 }
 
-			// Translation: Describe players of one team in a selected game, f.e. in the replay- or savegame menu or lobby
-			return sprintf(translate("%(team)s:\n%(playerDescriptions)s"), {
-				"team": '[font="sans-bold-14"]' + teamCaption + "[/font]",
-				"playerDescriptions": playerDescriptions[team].join("\n")
-			});
-		});
+			 if (playerData.Civ)
+				 txt += translate("Civilization") + ": " + g_CivData[playerData.Civ].Name + "\n";
 
-	if (playerDescriptions.observer)
-		teamDescription.push(sprintf(translate("%(team)s:\n%(playerDescriptions)s"), {
-			"team": '[font="sans-bold-14"]' + translatePlural("Observer", "Observers", playerDescriptions.observer.length) + "[/font]",
-			"playerDescriptions": playerDescriptions.observer.join("\n")
-		}));
+			 if (playerState)
+			 {
+				 txt +=  translate("State") + ": ";
+				 txt += (playerState == "defeated") ? translate("Defeated") + "\n" : translate("Victorious") + "\n";
+			 }
+			 return txt;
+		 };
 
-	return teamDescription.join("\n\n");
-}
+	 }
 
-/**
- * Sets an additional map label, map preview image and describes the chosen game settings more closely.
- *
- * Requires g_VictoryConditions.
- */
-function getGameDescription(initAttributes, mapCache)
-{
-	let titles = [];
-	if (!initAttributes.settings.VictoryConditions.length)
-		titles.push({
-			"label": translateWithContext("victory condition", "Endless Game"),
-			"value": translate("No winner will be determined, even if everyone is defeated.")
-		});
+	 let teams = Object.keys(playerDescriptions);
+	 if (teams.indexOf("observer") > -1)
+		 teams.splice(teams.indexOf("observer"), 1);
 
-	for (let victoryCondition of g_VictoryConditions)
-	{
-		if (initAttributes.settings.VictoryConditions.indexOf(victoryCondition.Name) == -1)
-			continue;
+	 let teamDescription = [];
 
-		let title = translateVictoryCondition(victoryCondition.Name);
-		if (victoryCondition.Name == "wonder")
-		{
-			let wonderDuration = Math.round(initAttributes.settings.WonderDuration);
-			title = sprintf(
-				translatePluralWithContext(
-					"victory condition",
-					"Wonder (%(min)s minute)",
-					"Wonder (%(min)s minutes)",
-					wonderDuration
-				),
-				{ "min": wonderDuration });
-		}
+	 // If there are no teams, merge all playersDescriptions
+	 if (teams.length == 1)
+		 teamDescription.push(playerDescriptions[teams[0]].join("\n"));
 
-		let isCaptureTheRelic = victoryCondition.Name == "capture_the_relic";
-		if (isCaptureTheRelic)
-		{
-			let relicDuration = Math.round(initAttributes.settings.RelicDuration);
-			title = sprintf(
-				translatePluralWithContext(
-					"victory condition",
-					"Capture the Relic (%(min)s minute)",
-					"Capture the Relic (%(min)s minutes)",
-					relicDuration
-				),
-				{ "min": relicDuration });
-		}
+	 // If there are teams, merge "Team N:" + playerDescriptions
+	 else
+		 teamDescription = teams.map(team => {
 
-		titles.push({
-			"label": title,
-			"value": victoryCondition.Description
-		});
+			 let teamCaption = team == -1 ?
+				 translate("No Team") :
+				 sprintf(translate("Team %(team)s"), { "team": +team + 1 });
 
-		if (isCaptureTheRelic)
-			titles.push({
-				"label": translate("Relic Count"),
-				"value": Math.round(initAttributes.settings.RelicCount)
-			});
+			 // Translation: Describe players of one team in a selected game, f.e. in the replay- or savegame menu or lobby
+			 return sprintf(translate("%(team)s:\n%(playerDescriptions)s"), {
+				 "team": setStringTags(teamCaption, GameDetails.prototype.CaptionTags),
+				 "playerDescriptions": playerDescriptions[team].join("\n")
+			 });
+		 });
 
-		if (victoryCondition.Name == "regicide")
-			if (initAttributes.settings.RegicideGarrison)
-				titles.push({
-					"label": translate("Hero Garrison"),
-					"value": translate("Heroes can be garrisoned.")
-				});
-			else
-				titles.push({
-					"label": translate("Exposed Heroes"),
-					"value": translate("Heroes cannot be garrisoned and they are vulnerable to raids.")
-				});
-	}
+	 if (playerDescriptions.observer)
+		 teamDescription.push(sprintf(translate("%(team)s:\n%(playerDescriptions)s"), {
+			 "team": setStringTags(translatePlural("Observer", "Observers", playerDescriptions.observer.length), GameDetails.prototype.CaptionTags),
+			 "playerDescriptions": playerDescriptions.observer.join("\n")
+		 }));
 
-	if (initAttributes.settings.LockTeams)
-		titles.push({
-			"label": translate("Locked Teams"),
-			"value": translate("Players can't change the initial teams.")
-		});
-	else
-		titles.push({
-			"label": translate("Diplomacy"),
-			"value": translate("Players can make alliances and declare war on allies.")
-		});
+	 return teamDescription.join("\n\n");
+ }
 
-	if (initAttributes.settings.LastManStanding)
-		titles.push({
-			"label": translate("Last Man Standing"),
-			"value": translate("Only one player can win the game. If the remaining players are allies, the game continues until only one remains.")
-		});
-	else
-		titles.push({
-			"label": translate("Allied Victory"),
-			"value": translate("If one player wins, his or her allies win too. If one group of allies remains, they win.")
-		});
+ /**
+  * Sets an additional map label, map preview image and describes the chosen game settings more closely.
+  *
+  * Requires g_VictoryConditions.
+  */
+ function getGameDescription(initAttributes, mapCache)
+ {
+	 let titles = [];
+	 if (!initAttributes.settings.VictoryConditions.length)
+		 titles.push({
+			 "label": translateWithContext("victory condition", "Endless Game"),
+			 "value": translate("No winner will be determined, even if everyone is defeated.")
+		 });
 
-	let ceasefire = Math.round(initAttributes.settings.Ceasefire);
-	titles.push({
-		"label": translate("Ceasefire"),
-		"value":
-			!ceasefire ?
-				translate("disabled") :
-				ceasefire == 1 ?
-					translate("For the first minute, other players will stay neutral.") :
-					sprintf(translatePlural(
-						"For the first %(min)s minute, other players will stay neutral.",
-						"For the first %(min)s minutes, other players will stay neutral.",
-						ceasefire),
-					{ "min": ceasefire })
-	});
+	 for (let victoryCondition of g_VictoryConditions)
+	 {
+		 if (initAttributes.settings.VictoryConditions.indexOf(victoryCondition.Name) == -1)
+			 continue;
 
-	if (initAttributes.map == "random")
-		titles.push({
-			"label": translateWithContext("Map Selection", "Random Map"),
-			"value": translate("Randomly select a map from the list.")
-		});
-	else
-	{
-		titles.push({
-			"label": translate("Map Name"),
-			"value": mapCache.translateMapName(
-				mapCache.getTranslatableMapName(initAttributes.mapType, initAttributes.map, initAttributes))
-		});
+		 let title = translateVictoryCondition(victoryCondition.Name);
+		 if (victoryCondition.Name == "wonder")
+		 {
+			 let wonderDuration = Math.round(initAttributes.settings.WonderDuration);
+			 title = sprintf(
+				 translatePluralWithContext(
+					 "victory condition",
+					 "Wonder (%(min)s minute)",
+					 "Wonder (%(min)s minutes)",
+					 wonderDuration
+				 ),
+				 { "min": wonderDuration });
+		 }
 
-		titles.push({
-			"label": translate("Map Description"),
-			"value": mapCache.getTranslatedMapDescription(initAttributes.mapType, initAttributes.map)
-		});
-	}
+		 let isCaptureTheRelic = victoryCondition.Name == "capture_the_relic";
+		 if (isCaptureTheRelic)
+		 {
+			 let relicDuration = Math.round(initAttributes.settings.RelicDuration);
+			 title = sprintf(
+				 translatePluralWithContext(
+					 "victory condition",
+					 "Capture the Relic (%(min)s minute)",
+					 "Capture the Relic (%(min)s minutes)",
+					 relicDuration
+				 ),
+				 { "min": relicDuration });
+		 }
 
-	titles.push({
-		"label": translate("Map Type"),
-		"value": g_MapTypes.Title[g_MapTypes.Name.indexOf(initAttributes.mapType)]
-	});
+		 titles.push({
+			 "label": title,
+			 "value": victoryCondition.Description
+		 });
 
-	if (initAttributes.mapType == "random")
-	{
-		let mapSize = g_MapSizes.Name[g_MapSizes.Tiles.indexOf(initAttributes.settings.Size)];
-		if (mapSize)
-			titles.push({
-				"label": translate("Map Size"),
-				"value": mapSize
-			});
-	}
+		 if (isCaptureTheRelic)
+			 titles.push({
+				 "label": translate("Relic Count"),
+				 "value": Math.round(initAttributes.settings.RelicCount)
+			 });
 
-	if (initAttributes.settings.Biome)
-	{
-		let biome = g_Settings.Biomes.find(b => b.Id == initAttributes.settings.Biome);
-		titles.push({
-			"label": biome ? biome.Title : translateWithContext("biome", "Random Biome"),
-			"value": biome ? biome.Description : translate("Randomly select a biome from the list.")
-		});
-	}
+		 if (victoryCondition.Name == "regicide")
+			 if (initAttributes.settings.RegicideGarrison)
+				 titles.push({
+					 "label": translate("Hero Garrison"),
+					 "value": translate("Heroes can be garrisoned.")
+				 });
+			 else
+				 titles.push({
+					 "label": translate("Exposed Heroes"),
+					 "value": translate("Heroes cannot be garrisoned and they are vulnerable to raids.")
+				 });
+	 }
 
-	if (initAttributes.settings.TriggerDifficulty !== undefined)
-	{
-		let triggerDifficulty = g_Settings.TriggerDifficulties.find(difficulty => difficulty.Difficulty == initAttributes.settings.TriggerDifficulty);
-		titles.push({
-			"label": triggerDifficulty.Title,
-			"value": triggerDifficulty.Tooltip
-		});
-	}
+	 if (initAttributes.settings.LockTeams)
+		 titles.push({
+			 "label": translate("Locked Teams"),
+			 "value": translate("Players can't change the initial teams.")
+		 });
+	 else
+		 titles.push({
+			 "label": translate("Diplomacy"),
+			 "value": translate("Players can make alliances and declare war on allies.")
+		 });
 
-	if (initAttributes.settings.Nomad !== undefined)
-		titles.push({
-			"label": initAttributes.settings.Nomad ? translate("Nomad Mode") : translate("Civic Centers"),
-			"value":
-				initAttributes.settings.Nomad ?
-					translate("Players start with only few units and have to find a suitable place to build their city.") :
-					translate("Players start with a Civic Center.")
-		});
+	 if (initAttributes.settings.LastManStanding)
+		 titles.push({
+			 "label": translate("Last Man Standing"),
+			 "value": translate("Only one player can win the game. If the remaining players are allies, the game continues until only one remains.")
+		 });
+	 else
+		 titles.push({
+			 "label": translate("Allied Victory"),
+			 "value": translate("If one player wins, his or her allies win too. If one group of allies remains, they win.")
+		 });
 
-	if (initAttributes.settings.StartingResources !== undefined)
-		titles.push({
-			"label": translate("Starting Resources"),
-			"value":
-				initAttributes.settings.PlayerData &&
-				initAttributes.settings.PlayerData.some(pData => pData && pData.Resources !== undefined) ?
-					translateWithContext("starting resources", "Per Player") :
-					sprintf(translate("%(startingResourcesTitle)s (%(amount)s)"), {
-						"startingResourcesTitle":
-							g_StartingResources.Title[
-								g_StartingResources.Resources.indexOf(
-									initAttributes.settings.StartingResources)],
-						"amount": initAttributes.settings.StartingResources
-					})
-		});
+	 let ceasefire = Math.round(initAttributes.settings.Ceasefire);
+	 titles.push({
+		 "label": translate("Ceasefire"),
+		 "value":
+			 !ceasefire ?
+				 translate("disabled") :
+				 ceasefire == 1 ?
+					 translate("For the first minute, other players will stay neutral.") :
+					 sprintf(translatePlural(
+						 "For the first %(min)s minute, other players will stay neutral.",
+						 "For the first %(min)s minutes, other players will stay neutral.",
+						 ceasefire),
+					 { "min": ceasefire })
+	 });
 
-	if (initAttributes.settings.PopulationCap !== undefined)
-		titles.push({
-			"label": translate("Population Limit"),
-			"value":
-				initAttributes.settings.PlayerData &&
-				initAttributes.settings.PlayerData.some(pData => pData && pData.PopulationLimit !== undefined) ?
-					translateWithContext("population limit", "Per Player") :
-					g_PopulationCapacities.Title[
-						g_PopulationCapacities.Population.indexOf(
-							initAttributes.settings.PopulationCap)]
-		});
+	 if (initAttributes.map == "random")
+		 titles.push({
+			 "label": translateWithContext("Map Selection", "Random Map"),
+			 "value": translate("Randomly select a map from the list.")
+		 });
+	 else
+	 {
+		 titles.push({
+			 "label": translate("Map Name"),
+			 "value": mapCache.translateMapName(
+				 mapCache.getTranslatableMapName(initAttributes.mapType, initAttributes.map, initAttributes))
+		 });
 
-	if (initAttributes.settings.WorldPopulationCap !== undefined)
-		titles.push({
-			"label": translate("World Population Cap"),
-			"value":
-				g_WorldPopulationCapacities.Title[
-					g_WorldPopulationCapacities.Population.indexOf(
-						initAttributes.settings.WorldPopulationCap)]
-		});
+		 titles.push({
+			 "label": translate("Map Description"),
+			 "value": mapCache.getTranslatedMapDescription(initAttributes.mapType, initAttributes.map)
+		 });
+	 }
 
-	titles.push({
-		"label": translate("Treasures"),
-		"value": initAttributes.settings.DisableTreasures ?
-			translateWithContext("treasures", "Disabled") :
-			translateWithContext("treasures", "As defined by the map.")
-	});
+	 titles.push({
+		 "label": translate("Map Type"),
+		 "value": g_MapTypes.Title[g_MapTypes.Name.indexOf(initAttributes.mapType)]
+	 });
 
-	titles.push({
-		"label": translate("Explored Map"),
-		"value": initAttributes.settings.ExploreMap
-	});
+	 if (initAttributes.mapType == "random")
+	 {
+		 let mapSize = g_MapSizes.Name[g_MapSizes.Tiles.indexOf(initAttributes.settings.Size)];
+		 if (mapSize)
+			 titles.push({
+				 "label": translate("Map Size"),
+				 "value": mapSize
+			 });
+	 }
 
-	titles.push({
-		"label": translate("Revealed Map"),
-		"value": initAttributes.settings.RevealMap
-	});
+	 if (initAttributes.settings.Biome)
+	 {
+		 let biome = g_Settings.Biomes.find(b => b.Id == initAttributes.settings.Biome);
+		 titles.push({
+			 "label": biome ? biome.Title : translateWithContext("biome", "Random Biome"),
+			 "value": biome ? biome.Description : translate("Randomly select a biome from the list.")
+		 });
+	 }
 
-	titles.push({
-		"label": translate("Allied View"),
-		"value": initAttributes.settings.AllyView
-	});
+	 if (initAttributes.settings.TriggerDifficulty !== undefined)
+	 {
+		 let triggerDifficulty = g_Settings.TriggerDifficulties.find(difficulty => difficulty.Difficulty == initAttributes.settings.TriggerDifficulty);
+		 titles.push({
+			 "label": triggerDifficulty.Title,
+			 "value": triggerDifficulty.Tooltip
+		 });
+	 }
 
-	titles.push({
-		"label": translate("Cheats"),
-		"value": initAttributes.settings.CheatsEnabled
-	});
-	const ratingDescription = translate("When the winner of this match is determined, the lobby score will be adapted.");
+	 if (initAttributes.settings.Nomad !== undefined)
+		 titles.push({
+			 "label": initAttributes.settings.Nomad ? translate("Nomad Mode") : translate("Civic Centers"),
+			 "value":
+				 initAttributes.settings.Nomad ?
+					 translate("Players start with only few units and have to find a suitable place to build their city.") :
+					 translate("Players start with a Civic Center.")
+		 });
 
-	if (initAttributes.settings.RatingEnabled &&
-	    initAttributes.settings.PlayerData.length == 2)
-		titles.push({
-			"label": translate("Rated game"),
-			"value": ratingDescription
-	});
-	else if (g_IsNetworked && Engine.HasXmppClient())
-		titles.push({
-			"label": translate("Rated game"),
-			"value": initAttributes.settings.RatingEnabled === true ?  ratingDescription : translateWithContext("game setup option", "disabled")
-	});
+	 if (initAttributes.settings.StartingResources !== undefined)
+		 titles.push({
+			 "label": translate("Starting Resources"),
+			 "value":
+				 initAttributes.settings.PlayerData &&
+				 initAttributes.settings.PlayerData.some(pData => pData && pData.Resources !== undefined) ?
+					 translateWithContext("starting resources", "Per Player") :
+					 sprintf(translate("%(startingResourcesTitle)s (%(amount)s)"), {
+						 "startingResourcesTitle":
+							 g_StartingResources.Title[
+								 g_StartingResources.Resources.indexOf(
+									 initAttributes.settings.StartingResources)],
+						 "amount": initAttributes.settings.StartingResources
+					 })
+		 });
 
-	return titles.map(title => sprintf(translate("%(label)s %(details)s"), {
-		"label": coloredText(title.label, g_DescriptionHighlight),
-		"details":
-			title.value === true ? translateWithContext("game setup option", "enabled") :
-				title.value || translateWithContext("game setup option", "disabled")
-	})).join("\n");
-}
+	 if (initAttributes.settings.PopulationCap !== undefined)
+		 titles.push({
+			 "label": translate("Population Limit"),
+			 "value":
+				 initAttributes.settings.PlayerData &&
+				 initAttributes.settings.PlayerData.some(pData => pData && pData.PopulationLimit !== undefined) ?
+					 translateWithContext("population limit", "Per Player") :
+					 g_PopulationCapacities.Title[
+						 g_PopulationCapacities.Population.indexOf(
+							 initAttributes.settings.PopulationCap)]
+		 });
 
-/**
- * Sets the win/defeat icon to indicate current player's state.
- */
-function setOutcomeIcon(state, image)
-{
-	if (state == "won")
-	{
-		image.sprite = "stretched:session/icons/victory.png";
-		image.tooltip = translate("Victorious");
-	}
-	else if (state == "defeated")
-	{
-		image.sprite = "stretched:session/icons/defeat.png";
-		image.tooltip = translate("Defeated");
-	}
-}
+	 if (initAttributes.settings.WorldPopulationCap !== undefined)
+		 titles.push({
+			 "label": translate("World Population Cap"),
+			 "value":
+				 g_WorldPopulationCapacities.Title[
+					 g_WorldPopulationCapacities.Population.indexOf(
+						 initAttributes.settings.WorldPopulationCap)]
+		 });
 
-function translateAISettings(playerData)
-{
-	if (!playerData.AI)
-		return "";
+	 titles.push({
+		 "label": translate("Treasures"),
+		 "value": initAttributes.settings.DisableTreasures ?
+			 translateWithContext("treasures", "Disabled") :
+			 translateWithContext("treasures", "As defined by the map.")
+	 });
 
-	return sprintf(translate("%(AIdifficulty)s %(AIbehavior)s %(AIname)s"), {
-		"AIname": translateAIName(playerData.AI),
-		"AIdifficulty": translateAIDifficulty(playerData.AIDiff),
-		"AIbehavior": translateAIBehavior(playerData.AIBehavior),
-	});
-}
+	 titles.push({
+		 "label": translate("Explored Map"),
+		 "value": initAttributes.settings.ExploreMap
+	 });
+
+	 titles.push({
+		 "label": translate("Revealed Map"),
+		 "value": initAttributes.settings.RevealMap
+	 });
+
+	 titles.push({
+		 "label": translate("Allied View"),
+		 "value": initAttributes.settings.AllyView
+	 });
+
+	 titles.push({
+		 "label": translate("Cheats"),
+		 "value": initAttributes.settings.CheatsEnabled
+	 });
+	 const ratingDescription = translate("When the winner of this match is determined, the lobby score will be adapted.");
+
+	 if (initAttributes.settings.RatingEnabled &&
+		 initAttributes.settings.PlayerData.length == 2)
+		 titles.push({
+			 "label": translate("Rated game"),
+			 "value": ratingDescription
+	 });
+	 else if (g_IsNetworked && Engine.HasXmppClient())
+		 titles.push({
+			 "label": translate("Rated game"),
+			 "value": initAttributes.settings.RatingEnabled === true ?  ratingDescription : translateWithContext("game setup option", "disabled")
+	 });
+
+	 return titles.map(title => sprintf(translate("%(label)s %(details)s"), {
+		 "label": coloredText(title.label, g_DescriptionHighlight),
+		 "details":
+			 title.value === true ? translateWithContext("game setup option", "enabled") :
+				 title.value || translateWithContext("game setup option", "disabled")
+	 })).join("\n");
+ }
+
+ /**
+  * Sets the win/defeat icon to indicate current player's state.
+  */
+ function setOutcomeIcon(state, image)
+ {
+	 if (state == "won")
+	 {
+		 image.sprite = "stretched:session/icons/victory.png";
+		 image.tooltip = translate("Victorious");
+	 }
+	 else if (state == "defeated")
+	 {
+		 image.sprite = "stretched:session/icons/defeat.png";
+		 image.tooltip = translate("Defeated");
+	 }
+ }
+
+ function translateAISettings(playerData)
+ {
+	 if (!playerData.AI)
+		 return "";
+
+	 return sprintf(translate("%(AIdifficulty)s"), {
+		 "AIplayername": playerData.Name,
+		 "AIname": translateAIName(playerData.AI),
+		 "AIdifficulty": translateAIDifficulty(playerData.AIDiff),
+		 "AIbehavior": translateAIBehavior(playerData.AIBehavior),
+	 });
+ }
Index: binaries/data/mods/public/gui/common/setup.xml
===================================================================
--- binaries/data/mods/public/gui/common/setup.xml
+++ binaries/data/mods/public/gui/common/setup.xml
@@ -116,6 +116,7 @@
 		<color name="blue">0 0 255</color>
 		<color name="yellow">255 255 0</color>
 
+		<color name="persiangreen">0 160 160</color>
 		<color name="gold">237 227 167</color>
 		<color name="lightgray">243 242 240</color>
 		<color name="gray">143 142 140</color>
Index: binaries/data/mods/public/gui/common/styles.xml
===================================================================
--- binaries/data/mods/public/gui/common/styles.xml
+++ binaries/data/mods/public/gui/common/styles.xml
@@ -85,7 +85,7 @@
 
 	<style name="MapPlayerList"
 		buffer_zone="8"
-		font="sans-14"
+		font="sans-stroke-14"
 		scrollbar="true"
 		scrollbar_style="ModernScrollBar"
 		scroll_bottom="false"
Index: binaries/data/mods/public/gui/lobby/LobbyPage/Chat/ChatMessages/ChatMessageFormat.js
===================================================================
--- binaries/data/mods/public/gui/lobby/LobbyPage/Chat/ChatMessages/ChatMessageFormat.js
+++ binaries/data/mods/public/gui/lobby/LobbyPage/Chat/ChatMessages/ChatMessageFormat.js
@@ -22,15 +22,14 @@
 		if (g_Nickname != message.from)
 		{
 			// Highlight nicknames, assume they do not contain escapaped characters
-			text = text.replace(g_Nickname, PlayerColor.ColorPlayerName(g_Nickname));
+			text = text.replace(g_Nickname, coloredText(g_Nickname, "persiangreen"));
 
 			// Notify local player
 			if (!message.historic && text.toLowerCase().indexOf(g_Nickname.toLowerCase()) != -1)
 				soundNotification("nick");
 		}
+		let sender = coloredText((message.from), PlayerColor.ColorPlayerNameByRole(Engine.LobbyGetPlayerRole(message.from)));
 
-		let sender = PlayerColor.ColorPlayerName(message.from, undefined, Engine.LobbyGetPlayerRole(message.from));
-
 		// Handle chat format commands
 		let formattedMessage;
 		let index = text.indexOf(" ");
Index: binaries/data/mods/public/gui/lobby/LobbyPage/Chat/StatusMessages/StatusMessageFormat.js
===================================================================
--- binaries/data/mods/public/gui/lobby/LobbyPage/Chat/StatusMessages/StatusMessageFormat.js
+++ binaries/data/mods/public/gui/lobby/LobbyPage/Chat/StatusMessages/StatusMessageFormat.js
@@ -22,7 +22,7 @@
 
 StatusMessageFormat.prototype.MessageFormat =
 	// Translation: Chat status message
-	translate("== %(message)s");
+	translate(coloredText("== %(message)s", "gold"));
 
 StatusMessageFormat.prototype.MessageTags = {
 	"font": "sans-bold-13"
Index: binaries/data/mods/public/gui/lobby/LobbyPage/Game.js
===================================================================
--- binaries/data/mods/public/gui/lobby/LobbyPage/Game.js
+++ binaries/data/mods/public/gui/lobby/LobbyPage/Game.js
@@ -196,7 +196,7 @@
 
 			let displayData = this.displayData;
 			let sortValues = this.sortValues;
-			displayData.buddy = this.hasBuddies ? setStringTags(g_BuddySymbol, displayData.tags) : "";
+			displayData.buddy = this.hasBuddies ? coloredText(g_BuddySymbol, "gold") : "";
 			sortValues.hasBuddyString = String(hasBuddies);
 			sortValues.buddy = sortValues.hasBuddyString + sortValues.gameName;
 
@@ -243,7 +243,7 @@
 	{
 		let displayData = this.displayData;
 		displayData.tags = this.isCompatible ? this.StateTags[newStanza.state] : this.IncompatibleTags;
-		displayData.buddy = this.hasBuddies ? setStringTags(g_BuddySymbol, displayData.tags) : "";
+		displayData.buddy = this.hasBuddies ? coloredText(g_BuddySymbol, "gold") : "";
 		this.updateGameName(newStanza);
 	}
 
@@ -317,13 +317,13 @@
  */
 Game.prototype.StateTags = {
 	"init": {
-		"color": "0 219 0"
+		"color": "white"
 	},
 	"waiting": {
-		"color": "255 127 0"
+		"color": "orange"
 	},
 	"running": {
-		"color": "219 0 0"
+		"color": "red"
 	}
 };
 
@@ -339,12 +339,12 @@
  */
 Game.prototype.PlayerCountTags = {
 	"CurrentPlayers": {
-		"color": "0 160 160"
+		"color": "persiangreen"
 	},
 	"MaxPlayers": {
-		"color": "0 160 160"
+		"color": "persiangreen"
 	},
 	"Observers": {
-		"color": "0 128 128"
+		"color": "persiangreen"
 	}
 };
Index: binaries/data/mods/public/gui/lobby/LobbyPage/GameDetails.xml
===================================================================
--- binaries/data/mods/public/gui/lobby/LobbyPage/GameDetails.xml
+++ binaries/data/mods/public/gui/lobby/LobbyPage/GameDetails.xml
@@ -18,7 +18,7 @@
 		<object name="sgGame" size="5 5 100%-5 5" type="text" style="ModernLabelText"/>
 
 		<!-- Player names & mod details -->
-		<object name="sgPlayersAndMods" type="text" style="MapPlayerList"/>
+		<object name="sgPlayersAndMods" type="text" style="MapPlayerList" />
 
 	</object>
 
Index: binaries/data/mods/public/gui/lobby/LobbyPage/GameList.js
===================================================================
--- binaries/data/mods/public/gui/lobby/LobbyPage/GameList.js
+++ binaries/data/mods/public/gui/lobby/LobbyPage/GameList.js
@@ -26,19 +26,13 @@
 		this.gamesBox = Engine.GetGUIObjectByName("gamesBox");
 		this.gamesBox.onSelectionChange = this.onSelectionChange.bind(this);
 		this.gamesBox.onSelectionColumnChange = this.onFilterChange.bind(this);
-		let ratingColumn = Engine.ConfigDB_GetValue("user", "lobby.columns.gamerating") == "true";
-		this.gamesBox.hidden_mapType = ratingColumn;
-		this.gamesBox.hidden_gameRating = !ratingColumn;
 
 		// Avoid repeated array construction
-		this.list_buddy = [];
 		this.list_private = [];
 		this.list_gameName = [];
 		this.list_mapName = [];
-		this.list_mapSize = [];
 		this.list_mapType = [];
 		this.list_maxnbp = [];
-		this.list_gameRating = [];
 		this.list = [];
 
 		this.filters = [];
@@ -136,29 +130,32 @@
 		let selectedGameIndex = -1;
 
 		{
+			const ratingSetting = Engine.ConfigDB_GetValue("user", "lobby.columns.gamerating") == "true";
+			this.gamesBox.heading_maxnbp = ratingSetting ? translate("Players (rating)") : translate("Players");
+
 			Engine.ProfileStart("setupGameList");
 			let length = this.gameList.length;
-			this.list_buddy.length = length;
 			this.list_private.length = length;
 			this.list_gameName.length = length;
 			this.list_mapName.length = length;
-			this.list_mapSize.length = length;
 			this.list_mapType.length = length;
 			this.list_maxnbp.length = length;
-			this.list_gameRating.length = length;
 			this.list.length = length;
 
 			this.gameList.forEach((game, i) => {
+				let displayData = game.displayData;
+				let mapName = displayData.mapName;
 
-				let displayData = game.displayData;
-				this.list_buddy[i] = displayData.buddy || "";
+				// Highlight numbers in mapName
+				if (mapName)
+					for (let i = 2; i <= 8; i++)
+						mapName = mapName.replaceAll(i, coloredText(i, "white"));
+
 				this.list_private[i] = displayData.private || "";
 				this.list_gameName[i] = displayData.gameName || "";
-				this.list_mapName[i] = displayData.mapName || "";
-				this.list_mapSize[i] = displayData.mapSize || "";
-				this.list_mapType[i] = displayData.mapType || "";
-				this.list_maxnbp[i] = displayData.playerCount || "";
-				this.list_gameRating[i] = game.gameRating || "";
+				this.list_mapName[i] = mapName || "";
+				this.list_mapType[i] = displayData.mapType + ` (${coloredText(displayData.mapSize, "white")})` || "";
+				this.list_maxnbp[i] = ratingSetting ? `${displayData.playerCount} ${displayData.buddy} (${coloredText(game.gameRating, PlayerColor.GetColorByRating(game.gameRating))})` || "" : `${displayData.playerCount} ${displayData.buddy}`|| "";
 				this.list[i] = "";
 				if (selectedGame && game.stanza.hostJID == selectedGame.stanza.hostJID && game.stanza.name == selectedGame.stanza.name)
 					selectedGameIndex = i;
@@ -170,13 +167,10 @@
 			Engine.ProfileStart("copyToGUI");
 			let gamesBox = this.gamesBox;
 			gamesBox.list_private = this.list_private;
-			gamesBox.list_buddy = this.list_buddy;
 			gamesBox.list_gameName = this.list_gameName;
 			gamesBox.list_mapName = this.list_mapName;
-			gamesBox.list_mapSize = this.list_mapSize;
 			gamesBox.list_mapType = this.list_mapType;
 			gamesBox.list_maxnbp = this.list_maxnbp;
-			gamesBox.list_gameRating = this.list_gameRating;
 
 			// Change these last, otherwise crash
 			gamesBox.list = this.list;
Index: binaries/data/mods/public/gui/lobby/LobbyPage/GameList.xml
===================================================================
--- binaries/data/mods/public/gui/lobby/LobbyPage/GameList.xml
+++ binaries/data/mods/public/gui/lobby/LobbyPage/GameList.xml
@@ -7,24 +7,17 @@
 	sortable="true"
 	font="sans-stroke-13"
 >
-	<column id="buddy" width="12"/>
-	<column id="private" width="20"/>
-	<column id="gameName" color="128 128 128" width="33%-12">
+	<column id="private" width="21"/>
+	<column id="gameName" color="persiangreen" width="40%">
 		<translatableAttribute id="heading">Name</translatableAttribute>
 	</column>
-	<column id="mapName" color="128 128 128" width="25%">
+	<column id="mapName" color="persiangreen" width="20%">
 		<translatableAttribute id="heading">Map Name</translatableAttribute>
 	</column>
-	<column id="mapSize" color="128 128 128" width="16%">
-		<translatableAttribute id="heading" context="map">Size</translatableAttribute>
+	<column id="mapType" color="persiangreen" width="18%">
+		<translatableAttribute id="heading" context="map">Type (size)</translatableAttribute>
 	</column>
-	<column id="mapType" color="0 160 160" width="16%">
-		<translatableAttribute id="heading" context="map">Type</translatableAttribute>
+	<column id="maxnbp" color="persiangreen" width="20%">
+		<translatableAttribute id="heading">Players (Rating)</translatableAttribute>
 	</column>
-	<column id="maxnbp" color="0 128 128" width="10%">
-		<translatableAttribute id="heading">Players</translatableAttribute>
-	</column>
-	<column id="gameRating" color="0 160 160" width="16%">
-		<translatableAttribute id="heading">Rating</translatableAttribute>
-	</column>
 </object>
Index: binaries/data/mods/public/gui/lobby/LobbyPage/GameListFilters.xml
===================================================================
--- binaries/data/mods/public/gui/lobby/LobbyPage/GameListFilters.xml
+++ binaries/data/mods/public/gui/lobby/LobbyPage/GameListFilters.xml
@@ -3,11 +3,16 @@
 
 	<script directory="gui/lobby/LobbyPage/GameListFilters/"/>
 
-	<object type="text" size="22 0 52%-10 100%" text_align="left" textcolor="white">
-		<translatableAttribute id="caption">Show only open games</translatableAttribute>
+	<object type="text" size="22 -16 300 100%" text_align="left" textcolor="white">
+		<translatableAttribute id="caption">Open games only</translatableAttribute>
 	</object>
-	<object name="filterOpenGames" type="checkbox" checked="false" style="ModernTickBox" size="0 0 20 20"/>
+	<object name="filterOpenGames" type="checkbox" checked="false" style="ModernTickBox" size="0 -16 20 0"/>
 
+	<object type="text" size="22 3 120 100%" text_align="left" textcolor="white">
+		<translatableAttribute id="caption">Buddies only</translatableAttribute>
+	</object>
+	<object name="filterBuddies" type="checkbox" checked="false" style="ModernTickBox" size="0 3 20 20"/>
+
 	<object name="mapSizeFilter"
 		type="dropdown"
 		style="ModernDropDown"
Index: binaries/data/mods/public/gui/lobby/LobbyPage/GameListFilters/Buddies.js
===================================================================
--- binaries/data/mods/public/gui/lobby/LobbyPage/GameListFilters/Buddies.js
+++ binaries/data/mods/public/gui/lobby/LobbyPage/GameListFilters/Buddies.js
@@ -0,0 +1,23 @@
+GameListFilters.Buddies = class
+{
+	constructor(onFilterChange)
+	{
+		this.checked = false;
+		this.onFilterChange = onFilterChange;
+
+		this.filterBuddies = Engine.GetGUIObjectByName("filterBuddies");
+		this.filterBuddies.checked = false;
+		this.filterBuddies.onPress = this.onPress.bind(this);
+	}
+
+	onPress()
+	{
+		this.checked = this.filterBuddies.checked;
+		this.onFilterChange();
+	}
+
+	filter(game)
+	{
+		return !this.checked || game.stanza.state && game.hasBuddies;
+	}
+};
Index: binaries/data/mods/public/gui/lobby/LobbyPage/LobbyPage.xml
===================================================================
--- binaries/data/mods/public/gui/lobby/LobbyPage/LobbyPage.xml
+++ binaries/data/mods/public/gui/lobby/LobbyPage/LobbyPage.xml
@@ -13,9 +13,9 @@
 			<translatableAttribute id="caption">Multiplayer Lobby</translatableAttribute>
 		</object>
 
-		<object name="lobbyPanels" size="0 40 100% 100%-20">
+		<object name="lobbyPanels" size="0 50 100% 100%-20">
 
-			<object name="leftPanel" size="20 0 20% 100%+20">
+			<object name="leftPanel" size="20 0 240 100%+20">
 				<object size="0 0 100% 100%-315">
 					<include file="gui/lobby/LobbyPage/PlayerList.xml"/>
 				</object>
@@ -29,7 +29,7 @@
 				</object>
 			</object>
 
-			<object name="middlePanel" size="20%+5 0 100%-255 100%">
+			<object name="middlePanel" size="247 0 100%-246 100%">
 				<object size="0 0 100% 24">
 					<include file="gui/lobby/LobbyPage/GameListFilters.xml"/>
 				</object>
@@ -41,7 +41,7 @@
 				</object>
 			</object>
 
-			<object name="rightPanel" size="100%-250 0 100%-20 100%">
+			<object name="rightPanel" size="100%-240 0 100%-20 100%">
 				<object name="gameDetails" hidden="true">
 					<include file="gui/lobby/LobbyPage/GameDetails.xml"/>
 				</object>
Index: binaries/data/mods/public/gui/lobby/LobbyPage/PlayerColor.js
===================================================================
--- binaries/data/mods/public/gui/lobby/LobbyPage/PlayerColor.js
+++ binaries/data/mods/public/gui/lobby/LobbyPage/PlayerColor.js
@@ -1,53 +1,52 @@
 /**
- * The purpose of this class is to determine a color per playername and to apply that color,
- * escape reserved characters and add a moderator prefix when displaying playernames.
+ * The purpose of this class is to determine and apply a rating color per player based on how high/low it is,
+ * and to color playernames based on their role.
  */
 class PlayerColor
 {
 }
 
 /**
- * Generate a (mostly) unique color for this player based on their name.
- * @see https://stackoverflow.com/questions/3426404/create-a-hexadecimal-colour-based-on-a-string-with-jquery-javascript
+ *  Make a color based on role. Purple if moderator, white otherwise (because in some cases black is default).
+ *
+ * @param {string} role.
+ * @Returns {string} containing a RGB color value converted from HSL.
  */
-PlayerColor.GetPlayerColor = function(playername)
+ PlayerColor.ColorPlayerNameByRole = function(role)
 {
-	// Generate a probably-unique hash for the player name and use that to create a color.
-	let hash = 0;
-	for (let i in playername)
-		hash = playername.charCodeAt(i) + ((hash << 5) - hash);
+	return (role == "moderator") ? hslToRgb(0.78, 1, 0.65).join(" ") : hslToRgb(1, 1, 1).join(" ");
+}
 
-	// First create the color in RGB then HSL, clamp the lightness so it's not too dark to read, and then convert back to RGB to display.
-	// The reason for this roundabout method is this algorithm can generate values from 0 to 255 for RGB but only 0 to 100 for HSL; this gives
-	// us much more variety if we generate in RGB. Unfortunately, enforcing that RGB values are a certain lightness is very difficult, so
-	// we convert to HSL to do the computation. Since our GUI code only displays RGB colors, we have to convert back.
-	let [h, s, l] = rgbToHsl(hash >> 24 & 0xFF, hash >> 16 & 0xFF, hash >> 8 & 0xFF);
-	return hslToRgb(h, s, Math.max(0.7, l)).join(" ");
-};
-
 /**
- * Colorizes the given nickname with a color unique and deterministic for that player.
+ * Use rating value to calculate a HSL color.
+ *
+ * @param {string || number} rating - Use rating to calculate a color based on its value.
+ * @Returns {string} containing a RGB color value converted from HSL.
+ * @handy functions for conversion rgbToHsl(255, 255, 255) || hslToRgb(1, 1, 1).
  */
-PlayerColor.ColorPlayerName = function(playername, rating, role)
+PlayerColor.GetColorByRating = function(rating)
 {
-	let name = rating ?
-		sprintf(translate("%(nick)s (%(rating)s)"), {
-			"nick": playername,
-			"rating": rating
-		}) :
-		playername;
+	// quick return if the player is unrated.
+	if(isNaN(rating))
+		return hslToRgb(1, 1, 1).join(" ");
 
-	if (role == "moderator")
-		name = PlayerColor.ModeratorPrefix + name;
+	let hslHue = 0.13;
+	let hslSaturation = 0.82;
+	let hslLightness = Math.max(0.5, Math.min(1200 / rating, 1)).toFixed(2);
 
-	return coloredText(escapeText(name), PlayerColor.GetPlayerColor(playername));
-};
+	// players below 1200 slowly become green.
+	if (rating < 1200)
+	{
+		hslHue = 0.30;
+		hslLightness = Math.max(0.5, Math.min(rating / 1200, 1)).toFixed(2);
+	}
 
-/**
- * A symbol which is prepended to the nickname of moderators.
- */
-PlayerColor.ModeratorPrefix = "@";
+	// Players above 2000 slowly become red.
+	else if (rating >= 2000)
+	{
+		hslHue = Math.max(0.01, Math.min(0.13 - (String(rating).substring(1,3) / 350), 0.13)).toFixed(2);
+	}
 
-
-// TODO: Remove global required by formatPlayerInfo
-var getPlayerColor = PlayerColor.GetPlayerColor;
+	// Players inbetween (1200-1999) go from white to gold/yellow.
+	return hslToRgb(hslHue, hslSaturation, hslLightness).join(" ");
+};
\ No newline at end of file
Index: binaries/data/mods/public/gui/lobby/LobbyPage/PlayerList.js
===================================================================
--- binaries/data/mods/public/gui/lobby/LobbyPage/PlayerList.js
+++ binaries/data/mods/public/gui/lobby/LobbyPage/PlayerList.js
@@ -11,7 +11,6 @@
 		this.statusOrder = Object.keys(this.PlayerStatuses);
 
 		// Avoid repeated array construction for performance
-		this.buddyStatusList = [];
 		this.playerList = [];
 		this.presenceList = [];
 		this.nickList = [];
@@ -31,6 +30,9 @@
 		this.playersBox.onMouseLeftClickItem = this.onMouseLeftClickItem.bind(this);
 		this.playersBox.onMouseLeftDoubleClickItem = this.onMouseLeftDoubleClickItem.bind(this);
 
+		for (let key in this.PlayerStatuses)
+			this.playersBox.tooltip += setStringTags("[color=\"" + this.PlayerStatuses[key].tags.color + "\"]" + this.PlayerStatuses[key].symbol + "[/color] " + this.PlayerStatuses[key].status + "\n", { "font": "sans-bold-14" });
+
 		buddyButton.registerBuddyChangeHandler(this.onBuddyChange.bind(this));
 		xmppMessages.registerPlayerListUpdateHandler(this.rebuildPlayerList.bind(this));
 		this.registerSelectionChangeHandler(buddyButton.onPlayerSelectionChange.bind(buddyButton));
@@ -100,18 +102,15 @@
 
 		switch (sortKey)
 		{
-		case 'buddy':
-			player.sortValue = (player.isBuddy ? 1 : 2) + this.statusOrder.indexOf(player.presence) + player.name.toLowerCase();
-			break;
 		case 'rating':
-			player.sortValue = +player.rating;
+			player.sortValue = + player.rating;
 			break;
 		case 'status':
-			player.sortValue = this.statusOrder.indexOf(player.presence) + player.name.toLowerCase();
+			player.sortValue = (player.isBuddy ? 1 : 2) + this.statusOrder.indexOf(player.presence) + player.name.toLowerCase();
 			break;
 		case 'name':
 		default:
-			player.sortValue = player.name.toLowerCase();
+			player.sortValue = (player.isBuddy ? 1 : 2) + player.name.toLowerCase();
 			break;
 		}
 	}
@@ -123,7 +122,7 @@
 	 */
 	rebuildPlayerList()
 	{
-		Engine.ProfileStart("rebuildPlaersList");
+		Engine.ProfileStart("rebuildPlayersList");
 
 		Engine.ProfileStart("getPlayerList");
 		let playerList = Engine.GetPlayerList();
@@ -139,7 +138,6 @@
 
 		Engine.ProfileStart("prepareList");
 		let length = playerList.length;
-		this.buddyStatusList.length = length;
 		this.playerList.length = length;
 		this.presenceList.length = length;
 		this.nickList.length = length;
@@ -154,16 +152,14 @@
 				warn("Unknown presence:" + player.presence);
 
 			let statusTags = this.PlayerStatuses[presence].tags;
-			this.buddyStatusList[i] = player.isBuddy ? setStringTags(g_BuddySymbol, statusTags) : "";
-			this.playerList[i] = PlayerColor.ColorPlayerName(player.name, "", player.role);
-			this.presenceList[i] = setStringTags(this.PlayerStatuses[presence].status, statusTags);
-			this.ratingList[i] = setStringTags(rating, statusTags);
+			this.playerList[i] = coloredText(this.ApplyTagByRole(player.name, player.role), PlayerColor.ColorPlayerNameByRole(player.role));
+			this.presenceList[i] = player.isBuddy ? setStringTags(g_BuddySymbol, statusTags) : setStringTags(this.PlayerStatuses[presence].symbol, statusTags);
+			this.ratingList[i] = coloredText(rating, PlayerColor.GetColorByRating(rating));
 			this.nickList[i] = escapeText(player.name);
 		});
 		Engine.ProfileStop();
 
 		Engine.ProfileStart("copyToGUI");
-		this.playersBox.list_buddy = this.buddyStatusList;
 		this.playersBox.list_name = this.playerList;
 		this.playersBox.list_status = this.presenceList;
 		this.playersBox.list_rating = this.ratingList;
@@ -189,38 +185,50 @@
 	}
 }
 
+// Prepends the moderator tag if true
+PlayerList.prototype.ApplyTagByRole = function(name, role)
+{
+	return (role == "moderator") ? escapeText("@" + name) : escapeText(name);
+};
+
+const g_PlayerStateSymbol = "●";
 /**
  * The playerlist will be assembled using these values.
  */
 PlayerList.prototype.PlayerStatuses = {
 	"available": {
 		"status": translate("Online"),
+		"symbol": g_PlayerStateSymbol,
 		"tags": {
-			"color": "0 219 0"
+			"color": "green"
 		}
 	},
 	"away": {
 		"status": translate("Away"),
+		"symbol": g_PlayerStateSymbol,
 		"tags": {
-			"color": "255 127 0"
+			"color": "orange"
 		}
 	},
 	"playing": {
 		"status": translate("Busy"),
+		"symbol": g_PlayerStateSymbol,
 		"tags": {
-			"color": "200 0 0"
+			"color": "red"
 		}
 	},
 	"offline": {
 		"status": translate("Offline"),
+		"symbol": g_PlayerStateSymbol,
 		"tags": {
-			"color": "0 0 0"
+			"color": "black"
 		}
 	},
 	"unknown": {
 		"status": translateWithContext("lobby presence", "Unknown"),
+		"symbol": g_PlayerStateSymbol,
 		"tags": {
-			"color": "178 178 178"
+			"color": "gray"
 		}
 	}
 };
Index: binaries/data/mods/public/gui/lobby/LobbyPage/PlayerList.xml
===================================================================
--- binaries/data/mods/public/gui/lobby/LobbyPage/PlayerList.xml
+++ binaries/data/mods/public/gui/lobby/LobbyPage/PlayerList.xml
@@ -13,14 +13,11 @@
 		sortable="true"
 		font="sans-bold-stroke-13"
 	>
-		<column id="buddy" width="12"/>
-		<column id="status" width="26%">
-			<translatableAttribute id="heading">Status</translatableAttribute>
-		</column>
-		<column id="name" width="48%-12">
+		<column id="status" width="17"/>
+		<column id="name" width="68%">
 			<translatableAttribute id="heading">Name</translatableAttribute>
 		</column>
-		<column id="rating" width="26%">
+		<column id="rating" width="62">
 			<translatableAttribute id="heading">Rating</translatableAttribute>
 		</column>
 	</object>
Index: binaries/data/mods/public/gui/lobby/LobbyPage/ProfilePanel.js
===================================================================
--- binaries/data/mods/public/gui/lobby/LobbyPage/ProfilePanel.js
+++ binaries/data/mods/public/gui/lobby/LobbyPage/ProfilePanel.js
@@ -72,7 +72,7 @@
 		if (!playerName)
 			return;
 
-		this.playernameText.caption = PlayerColor.ColorPlayerName(escapeText(playerName));
+		this.playernameText.caption = coloredText(escapeText(playerName), PlayerColor.ColorPlayerNameByRole(Engine.LobbyGetPlayerRole(playerName)));
 		this.updatePlayerRoleText(playerName);
 
 		this.rankText.caption = this.NotAvailable;
@@ -91,11 +91,11 @@
 		if (attributes.rating == "-2" || attributes.player != this.requestedPlayer)
 			return;
 
-		this.playernameText.caption = PlayerColor.ColorPlayerName(escapeText(attributes.player), attributes.rating);
+		this.playernameText.caption = coloredText(escapeText(attributes.player), PlayerColor.ColorPlayerNameByRole(Engine.LobbyGetPlayerRole(attributes.player)));
 		this.updatePlayerRoleText(attributes.player);
 
 		this.rankText.caption = attributes.rank;
-		this.highestRatingText.caption = attributes.highestRating;
+		this.highestRatingText.caption = coloredText(attributes.highestRating, PlayerColor.GetColorByRating(attributes.highestRating));
 		this.totalGamesText.caption = attributes.totalGamesPlayed;
 		this.winsText.caption = attributes.wins;
 		this.lossesText.caption = attributes.losses;
Index: binaries/data/mods/public/gui/lobby/LobbyPage/ProfilePanel.xml
===================================================================
--- binaries/data/mods/public/gui/lobby/LobbyPage/ProfilePanel.xml
+++ binaries/data/mods/public/gui/lobby/LobbyPage/ProfilePanel.xml
@@ -5,7 +5,7 @@
 		<object name="playernameText" size="0 0 100% 45" type="text" style="ModernLabelText" font="sans-bold-16" />
 		<object name="roleText" size="0 45 100% 70" type="text" style="ModernLabelText" font="sans-bold-stroke-12" />
 		<object size="0 70 40%+40 90" type="text" style="ModernRightLabelText" font="sans-bold-stroke-13">
-			<translatableAttribute id="caption">Current Rank:</translatableAttribute>
+			<translatableAttribute id="caption">Placement:</translatableAttribute>
 		</object>
 		<object name="rankText" size="40%+45 70 100% 90" type="text" style="ModernLeftLabelText" font="sans-bold-stroke-12" />
 		<object size="0 90 40%+40 110" type="text" style="ModernRightLabelText" font="sans-bold-stroke-13">
Index: binaries/data/mods/public/gui/lobby/ProfilePage/ProfilePage.js
===================================================================
--- binaries/data/mods/public/gui/lobby/ProfilePage/ProfilePage.js
+++ binaries/data/mods/public/gui/lobby/ProfilePage/ProfilePage.js
@@ -1,100 +1,99 @@
 /**
  * The profile page enables the player to lookup statistics of an arbitrary player.
  */
-class ProfilePage
-{
-	constructor(xmppMessages)
-	{
-		this.requestedPlayer = undefined;
-		this.closePageHandlers = new Set();
+ class ProfilePage
+ {
+	 constructor(xmppMessages)
+	 {
+		 this.requestedPlayer = undefined;
+		 this.closePageHandlers = new Set();
 
-		this.profilePage = Engine.GetGUIObjectByName("profilePage");
+		 this.profilePage = Engine.GetGUIObjectByName("profilePage");
 
-		this.fetchInput = Engine.GetGUIObjectByName("fetchInput");
-		this.fetchInput.onPress = this.onPressLookup.bind(this);
-		this.fetchInput.onTab = this.autocomplete.bind(this);
-		this.fetchInput.tooltip = colorizeAutocompleteHotkey();
+		 this.fetchInput = Engine.GetGUIObjectByName("fetchInput");
+		 this.fetchInput.onPress = this.onPressLookup.bind(this);
+		 this.fetchInput.onTab = this.autocomplete.bind(this);
+		 this.fetchInput.tooltip = colorizeAutocompleteHotkey();
 
-		Engine.GetGUIObjectByName("viewProfileButton").onPress = this.onPressLookup.bind(this);
-		Engine.GetGUIObjectByName("profileBackButton").onPress = this.onPressClose.bind(this, true);
+		 Engine.GetGUIObjectByName("viewProfileButton").onPress = this.onPressLookup.bind(this);
+		 Engine.GetGUIObjectByName("profileBackButton").onPress = this.onPressClose.bind(this, true);
 
-		this.profilePlayernameText = Engine.GetGUIObjectByName("profilePlayernameText");
-		this.profileRankText = Engine.GetGUIObjectByName("profileRankText");
-		this.profileHighestRatingText = Engine.GetGUIObjectByName("profileHighestRatingText");
-		this.profileTotalGamesText = Engine.GetGUIObjectByName("profileTotalGamesText");
-		this.profileWinsText = Engine.GetGUIObjectByName("profileWinsText");
-		this.profileLossesText = Engine.GetGUIObjectByName("profileLossesText");
-		this.profileRatioText = Engine.GetGUIObjectByName("profileRatioText");
-		this.profileErrorText = Engine.GetGUIObjectByName("profileErrorText");
-		this.profileWindowArea = Engine.GetGUIObjectByName("profileWindowArea");
+		 this.profilePlayernameText = Engine.GetGUIObjectByName("profilePlayernameText");
+		 this.profileRankText = Engine.GetGUIObjectByName("profileRankText");
+		 this.profileHighestRatingText = Engine.GetGUIObjectByName("profileHighestRatingText");
+		 this.profileTotalGamesText = Engine.GetGUIObjectByName("profileTotalGamesText");
+		 this.profileWinsText = Engine.GetGUIObjectByName("profileWinsText");
+		 this.profileLossesText = Engine.GetGUIObjectByName("profileLossesText");
+		 this.profileRatioText = Engine.GetGUIObjectByName("profileRatioText");
+		 this.profileErrorText = Engine.GetGUIObjectByName("profileErrorText");
+		 this.profileWindowArea = Engine.GetGUIObjectByName("profileWindowArea");
 
-		xmppMessages.registerXmppMessageHandler("game", "profile", this.onProfile.bind(this));
-	}
+		 xmppMessages.registerXmppMessageHandler("game", "profile", this.onProfile.bind(this));
+	 }
 
-	registerClosePageHandler(handler)
-	{
-		this.closePageHandlers.add(handler);
-	}
+	 registerClosePageHandler(handler)
+	 {
+		 this.closePageHandlers.add(handler);
+	 }
 
-	openPage()
-	{
-		this.profilePage.hidden = false;
-		Engine.SetGlobalHotkey("cancel", "Press", this.onPressClose.bind(this));
-	}
+	 openPage()
+	 {
+		 this.profilePage.hidden = false;
+		 Engine.SetGlobalHotkey("cancel", "Press", this.onPressClose.bind(this));
+	 }
 
-	onPressLookup()
-	{
-		this.requestedPlayer = this.fetchInput.caption;
-		Engine.SendGetProfile(this.requestedPlayer);
-	}
+	 onPressLookup()
+	 {
+		 this.requestedPlayer = this.fetchInput.caption;
+		 Engine.SendGetProfile(this.requestedPlayer);
+	 }
 
-	autocomplete()
-	{
-		const listPlayerNames = Engine.GetPlayerList().map(player => escapeText(player.name));
-		// Remove duplicates with the board list. The board list has lower case names.
-		const listPlayerNamesLower = listPlayerNames.map(playerName => playerName.toLowerCase());
-		for (const entry of Engine.GetBoardList())
-		{
-			const escapedName = escapeText(entry.name);
-			if (!listPlayerNamesLower.includes(escapedName))
-				listPlayerNames.push(escapedName);
-		}
-		autoCompleteText(this.fetchInput, listPlayerNames);
-	}
+	 autocomplete()
+	 {
+		 const listPlayerNames = Engine.GetPlayerList().map(player => escapeText(player.name));
+		 // Remove duplicates with the board list. The board list has lower case names.
+		 const listPlayerNamesLower = listPlayerNames.map(playerName => playerName.toLowerCase());
+		 for (const entry of Engine.GetBoardList())
+		 {
+			 const escapedName = escapeText(entry.name);
+			 if (!listPlayerNamesLower.includes(escapedName))
+				 listPlayerNames.push(escapedName);
+		 }
+		 autoCompleteText(this.fetchInput, listPlayerNames);
+	 }
 
-	onPressClose()
-	{
-		this.profilePage.hidden = true;
+	 onPressClose()
+	 {
+		 this.profilePage.hidden = true;
 
-		for (let handler of this.closePageHandlers)
-			handler();
-	}
+		 for (let handler of this.closePageHandlers)
+			 handler();
+	 }
 
-	onProfile()
-	{
-		let attributes = Engine.GetProfile()[0];
-		if (this.profilePage.hidden || this.requestedPlayer != attributes.player)
-			return;
+	 onProfile()
+	 {
+		 let attributes = Engine.GetProfile()[0];
+		 if (this.profilePage.hidden || this.requestedPlayer != attributes.player)
+			 return;
 
-		let profileFound = attributes.rating != "-2";
-		this.profileWindowArea.hidden = !profileFound;
-		this.profileErrorText.hidden = profileFound;
+		 let profileFound = attributes.rating != "-2";
+		 this.profileWindowArea.hidden = !profileFound;
+		 this.profileErrorText.hidden = profileFound;
 
-		if (!profileFound)
-		{
-			this.profileErrorText.caption =
-				sprintf(translate("Player \"%(nick)s\" not found."), {
-					"nick": escapeText(attributes.player)
-				});
-			return;
-		}
-
-		this.profilePlayernameText.caption = PlayerColor.ColorPlayerName(escapeText(attributes.player), attributes.rating);
-		this.profileRankText.caption = attributes.rank;
-		this.profileHighestRatingText.caption = attributes.highestRating;
-		this.profileTotalGamesText.caption = attributes.totalGamesPlayed;
-		this.profileWinsText.caption = attributes.wins;
-		this.profileLossesText.caption = attributes.losses;
-		this.profileRatioText.caption = ProfilePanel.FormatWinRate(attributes);
-	}
-}
+		 if (!profileFound)
+		 {
+			 this.profileErrorText.caption =
+				 sprintf(translate("Player \"%(nick)s\" not found."), {
+					 "nick": escapeText(attributes.player)
+				 });
+			 return;
+		 }
+		 this.profilePlayernameText.caption = coloredText(escapeText(attributes.player), PlayerColor.ColorPlayerNameByRole(Engine.LobbyGetPlayerRole(attributes.player))) + ' (' + coloredText(attributes.rating, PlayerColor.GetColorByRating(attributes.rating)) + ')';
+		 this.profileRankText.caption = attributes.rank;
+		 this.profileHighestRatingText.caption = coloredText(attributes.highestRating, PlayerColor.GetColorByRating(attributes.highestRating));
+		 this.profileTotalGamesText.caption = attributes.totalGamesPlayed;
+		 this.profileWinsText.caption = attributes.wins;
+		 this.profileLossesText.caption = attributes.losses;
+		 this.profileRatioText.caption = ProfilePanel.FormatWinRate(attributes);
+	 }
+ }
Index: binaries/data/mods/public/gui/lobby/ProfilePage/ProfilePage.xml
===================================================================
--- binaries/data/mods/public/gui/lobby/ProfilePage/ProfilePage.xml
+++ binaries/data/mods/public/gui/lobby/ProfilePage/ProfilePage.xml
@@ -27,7 +27,7 @@
 				<object name="profileWindowArea" hidden="true">
 					<object name="profilePlayernameText" size="0 0 100% 25" type="text" style="ModernLabelText" font="sans-bold-16" />
 					<object size="0 30 40%+40 50" type="text" style="ModernRightLabelText" font="sans-bold-stroke-13">
-						<translatableAttribute id="caption">Current Rank:</translatableAttribute>
+						<translatableAttribute id="caption">Placement:</translatableAttribute>
 					</object>
 					<object name="profileRankText" size="40%+45 30 100% 50" type="text" style="ModernLeftLabelText" font="sans-bold-stroke-12" />
 					<object size="0 50 40%+40 70" type="text" style="ModernRightLabelText" font="sans-bold-stroke-13">
Index: binaries/data/mods/public/gui/lobby/icons/bot.xml
===================================================================
--- binaries/data/mods/public/gui/lobby/icons/bot.xml
+++ binaries/data/mods/public/gui/lobby/icons/bot.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<setup>
+	<icon name="icon_bot"
+		sprite="stretched:lobby/bot.png"
+		size="14 14"
+
+	/>
+</setup>
Index: binaries/data/mods/public/gui/lobby/icons/civ_icons.xml
===================================================================
--- binaries/data/mods/public/gui/lobby/icons/civ_icons.xml
+++ binaries/data/mods/public/gui/lobby/icons/civ_icons.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<setup>
+	<icon name="icon_athen"
+		sprite="stretched:lobby/civs/athen.png"
+		size="16 16"
+	/>
+	<icon name="icon_brit"
+		sprite="stretched:lobby/civs/brit.png"
+		size="16 16"
+	/>
+	<icon name="icon_cart"
+		sprite="stretched:lobby/civs/cart.png"
+		size="16 16"
+	/>
+	<icon name="icon_gaul"
+		sprite="stretched:lobby/civs/gaul.png"
+		size="16 16"
+	/>
+	<icon name="icon_hele"
+		sprite="stretched:lobby/civs/hele.png"
+		size="16 16"
+	/>
+	<icon name="icon_iber"
+		sprite="stretched:lobby/civs/iber.png"
+		size="16 16"
+	/>
+	<icon name="icon_kush"
+		sprite="stretched:lobby/civs/kush.png"
+		size="16 16"
+	/>
+	<icon name="icon_mace"
+		sprite="stretched:lobby/civs/mace.png"
+		size="16 16"
+	/>
+	<icon name="icon_maur"
+		sprite="stretched:lobby/civs/maur.png"
+		size="16 16"
+	/>
+	<icon name="icon_pers"
+		sprite="stretched:lobby/civs/pers.png"
+		size="16 16"
+	/>
+	<icon name="icon_pole"
+		sprite="stretched:lobby/civs/pole.png"
+		size="16 16"
+	/>
+	<icon name="icon_ptol"
+		sprite="stretched:lobby/civs/ptol.png"
+		size="16 16"
+	/>
+	<icon name="icon_rome"
+		sprite="stretched:lobby/civs/rome.png"
+		size="16 16"
+	/>
+	<icon name="icon_sele"
+		sprite="stretched:lobby/civs/sele.png"
+		size="16 16"
+	/>
+	<icon name="icon_spart"
+		sprite="stretched:lobby/civs/spart.png"
+		size="16 16"
+	/>
+	<icon name="icon_theb"
+		sprite="stretched:lobby/civs/theb.png"
+		size="16 16"
+	/>
+</setup>
+
Index: binaries/data/mods/public/gui/lobby/icons/defeated.xml
===================================================================
--- binaries/data/mods/public/gui/lobby/icons/defeated.xml
+++ binaries/data/mods/public/gui/lobby/icons/defeated.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<setup>
+	<icon name="icon_defeated"
+		sprite="stretched:lobby/defeated.png"
+		size="16 16"
+	/>
+</setup>
Index: binaries/data/mods/public/gui/lobby/icons/offline.xml
===================================================================
--- binaries/data/mods/public/gui/lobby/icons/offline.xml
+++ binaries/data/mods/public/gui/lobby/icons/offline.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<setup>
+	<icon name="icon_offline"
+		sprite="stretched:lobby/offline.png"
+		size="14 14"
+	/>
+</setup>
Index: binaries/data/mods/public/gui/lobby/icons/victorious.xml
===================================================================
--- binaries/data/mods/public/gui/lobby/icons/victorious.xml
+++ binaries/data/mods/public/gui/lobby/icons/victorious.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<setup>
+	<icon name="icon_victorious"
+		sprite="stretched:lobby/victorious.png"
+		size="16 16"
+	/>
+</setup>
Index: source/gui/ObjectTypes/COList.h
===================================================================
--- source/gui/ObjectTypes/COList.h
+++ source/gui/ObjectTypes/COList.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 Wildfire Games.
+/* Copyright (C) 2022 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -22,14 +22,14 @@
 
 #include <vector>
 
-/**
- * Represents a column.
- */
+ /**
+  * Represents a column.
+  */
 class COListColumn
 {
 public:
 	COListColumn(IGUIObject* owner, const CStr& cid)
-		: m_Width(0), m_Id(cid), m_List(owner, "list_" + cid), m_Hidden(owner, "hidden_" + cid, false)
+		: m_Width(0), m_Id(cid), m_List(owner, "list_" + cid), m_Heading(owner, "heading_" + cid), m_Hidden(owner, "hidden_" + cid, false)
 	{}
 	// Avoid copying the strings.
 	NONCOPYABLE(COListColumn);
@@ -37,7 +37,7 @@
 	CGUIColor m_TextColor;
 	CStr m_Id;
 	float m_Width;
-	CStrW m_Heading; // CGUIString??
+	CGUISimpleSetting<CStrW> m_Heading; // CGUIString??
 	CGUISimpleSetting<CGUIList> m_List;
 	CGUISimpleSetting<bool> m_Hidden;
 };
@@ -94,4 +94,4 @@
 	float m_HeadingHeight;
 };
 
-#endif // INCLUDED_COLIST
+#endif // INCLUDED_COLIST
\ No newline at end of file
Index: source/gui/ObjectTypes/COList.cpp
===================================================================
--- source/gui/ObjectTypes/COList.cpp
+++ source/gui/ObjectTypes/COList.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 Wildfire Games.
+/* Copyright (C) 2022 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -33,13 +33,13 @@
 
 COList::COList(CGUI& pGUI)
 	: CList(pGUI),
-	  m_SpriteHeading(this, "sprite_heading"),
-	  m_Sortable(this, "sortable"), // The actual sorting is done in JS for more versatility
-	  m_SelectedColumn(this, "selected_column"),
-	  m_SelectedColumnOrder(this, "selected_column_order"),
-	  m_SpriteAsc(this, "sprite_asc"), // Show the order of sorting
-	  m_SpriteDesc(this, "sprite_desc"),
-	  m_SpriteNotSorted(this, "sprite_not_sorted")
+	m_SpriteHeading(this, "sprite_heading"),
+	m_Sortable(this, "sortable"), // The actual sorting is done in JS for more versatility
+	m_SelectedColumn(this, "selected_column"),
+	m_SelectedColumnOrder(this, "selected_column_order"),
+	m_SpriteAsc(this, "sprite_asc"), // Show the order of sorting
+	m_SpriteDesc(this, "sprite_desc"),
+	m_SpriteNotSorted(this, "sprite_not_sorted")
 {
 }
 
@@ -126,6 +126,13 @@
 
 	switch (Message.type)
 	{
+	case GUIM_SETTINGS_UPDATED:
+	{
+		if (Message.value.find("heading_") == 0)
+			SetupText();
+		break;
+	}
+
 	// If somebody clicks on the column heading
 	case GUIM_MOUSE_PRESS_LEFT:
 	{
@@ -153,7 +160,7 @@
 			{
 				if (column.m_Id != static_cast<CStr>(m_SelectedColumn))
 				{
-					m_SelectedColumnOrder.Set(-1, true);
+					(column.m_Id == "rating") ? m_SelectedColumnOrder.Set(-1, true) : m_SelectedColumnOrder.Set(1, true);
 					CStr selected_column = column.m_Id;
 					m_SelectedColumn.Set(selected_column, true);
 				}
@@ -175,8 +182,8 @@
 
 bool COList::HandleAdditionalChildren(const XMBData& xmb, const XMBElement& child)
 {
-	#define ELMT(x) int elmt_##x = xmb.GetElementID(#x)
-	#define ATTR(x) int attr_##x = xmb.GetAttributeID(#x)
+#define ELMT(x) int elmt_##x = xmb.GetElementID(#x)
+#define ATTR(x) int attr_##x = xmb.GetAttributeID(#x)
 	ELMT(item);
 	ELMT(column);
 	ELMT(translatableAttribute);
@@ -234,7 +241,7 @@
 			}
 			else if (attr_name == "heading")
 			{
-				column.m_Heading = attr_value.FromUTF8();
+				column.m_Heading.Set(attr_value.FromUTF8(), false);
 			}
 		}
 
@@ -259,12 +266,12 @@
 			if (!context.empty())
 			{
 				CStr translatedValue(g_L10n.TranslateWithContext(context, value));
-				column.m_Heading = translatedValue.FromUTF8();
+				column.m_Heading.Set(translatedValue.FromUTF8(), false);
 			}
 			else
 			{
 				CStr translatedValue(g_L10n.Translate(value));
-				column.m_Heading = translatedValue.FromUTF8();
+				column.m_Heading.Set(translatedValue.FromUTF8(), false);
 			}
 		}
 
@@ -281,7 +288,7 @@
 }
 
 void COList::DrawList(CCanvas2D& canvas, const int& selected, const CGUISpriteInstance& sprite, const CGUISpriteInstance& spriteOverlay,
-                      const CGUISpriteInstance& spriteSelectArea, const CGUISpriteInstance& spriteSelectAreaOverlay, const CGUIColor& textColor)
+	const CGUISpriteInstance& spriteSelectArea, const CGUISpriteInstance& spriteSelectAreaOverlay, const CGUIColor& textColor)
 {
 	CRect rect = GetListRect();
 
@@ -296,12 +303,12 @@
 	// Draw item selection
 	if (selected != -1)
 	{
-		ENSURE(selected >= 0 && selected+1 < (int)m_ItemsYPositions.size());
+		ENSURE(selected >= 0 && selected + 1 < (int)m_ItemsYPositions.size());
 
 		// Get rectangle of selection:
 		rectSel = CRect(
 			rect.left, rect.top + m_ItemsYPositions[selected] - scroll,
-			rect.right, rect.top + m_ItemsYPositions[selected+1] - scroll);
+			rect.right, rect.top + m_ItemsYPositions[selected + 1] - scroll);
 
 		if (rectSel.top <= rect.bottom &&
 			rectSel.bottom >= rect.top)
@@ -331,7 +338,7 @@
 
 	// Draw line above column header
 	CRect rect_head(m_CachedActualSize.left, m_CachedActualSize.top, m_CachedActualSize.right,
-									m_CachedActualSize.top + m_HeadingHeight);
+		m_CachedActualSize.top + m_HeadingHeight);
 	m_pGUI.DrawSprite(m_SpriteHeading, canvas, rect_head);
 
 	// Draw column headers
@@ -382,11 +389,11 @@
 	const size_t objectsCount = m_Columns.size();
 	for (size_t i = 0; i < m_List->m_Items.size(); ++i)
 	{
-		if (m_ItemsYPositions[i+1] - scroll < 0 ||
+		if (m_ItemsYPositions[i + 1] - scroll < 0 ||
 			m_ItemsYPositions[i] - scroll > rect.GetHeight())
 			continue;
 
-		const float rowHeight = m_ItemsYPositions[i+1] - m_ItemsYPositions[i];
+		const float rowHeight = m_ItemsYPositions[i + 1] - m_ItemsYPositions[i];
 
 		// Clipping area (we'll have to substract the scrollbar)
 		CRect cliparea = GetListRect();
@@ -437,4 +444,4 @@
 	m_pGUI.DrawSprite(spriteOverlay, canvas, rect);
 	if (drawSelected)
 		m_pGUI.DrawSprite(spriteSelectAreaOverlay, canvas, rectSel);
-}
+}
\ No newline at end of file