Index: binaries/data/mods/public/gui/common/settings.js
===================================================================
--- binaries/data/mods/public/gui/common/settings.js
+++ binaries/data/mods/public/gui/common/settings.js
@@ -2,7 +2,7 @@
  * The maximum number of players that the engine supports.
  * TODO: Maybe we can support more than 8 players sometime.
  */
-const g_MaxPlayers = 8;
+const g_MaxPlayers = 16;
 
 /**
  * The maximum number of teams allowed.
Index: binaries/data/mods/public/gui/gamesetup/gamesetup.js
===================================================================
--- binaries/data/mods/public/gui/gamesetup/gamesetup.js
+++ binaries/data/mods/public/gui/gamesetup/gamesetup.js
@@ -1079,7 +1079,7 @@
  */
 var g_PlayerMiscElements = {
 	"playerBox": {
-		"size": (playerIdx) => ["0", 32 * playerIdx, "100%", 32 * (playerIdx + 1)].join(" "),
+		"size": (playerIdx) => ["0", 21 * playerIdx, "100%", 21 * (playerIdx + 1)].join(" "),
 	},
 	"playerName": {
 		"caption": (playerIdx) => {
Index: binaries/data/mods/public/gui/gamesetup/gamesetup.xml
===================================================================
--- binaries/data/mods/public/gui/gamesetup/gamesetup.xml
+++ binaries/data/mods/public/gui/gamesetup/gamesetup.xml
@@ -51,7 +51,7 @@
 			</action>
 
 			<!-- Player assignments -->
-			<object size="24 40 100%-440 336" type="image" sprite="ModernDarkBoxGold" name="playerAssignmentsPanel">
+			<object size="24 40 100%-440 612" type="image" sprite="ModernDarkBoxGold" name="playerAssignmentsPanel">
 				<object size="0 6 100% 30">
 
 					<object name="playerNameHeading" type="text" style="ModernLabelText" size="0 0 20%+5 100%">
@@ -100,21 +100,21 @@
 				</object>
 
 				<object size="1 36 100%-1 100%">
-					<repeat count="8">
-						<object name="playerBox[n]" size="0 0 100% 32">
+					<repeat count="16">
+						<object name="playerBox[n]" size="0 0 100% 21">
 							<object name="playerColor[n]" type="image" size="0 0 100% 100%"/>
-							<object name="playerName[n]" type="text" style="ModernLabelText" size="0 2 22% 30"/>
-							<object name="playerColorPicker[n]" type="dropdown" style="ModernDropDown" size="22%+5 2 22%+33 30" sprite="" scrollbar="false" button_width="22" font="sans-stroke-14" tooltip_style="onscreenToolTip">
+							<object name="playerName[n]" type="text" style="ModernLabelText" size="0 2 22% 21"/>
+							<object name="playerColorPicker[n]" type="dropdown" style="ModernDropDown" size="22%+5 2 22%+33 21" sprite="" scrollbar="false" button_width="22" font="sans-stroke-14" tooltip_style="onscreenToolTip">
 								<translatableAttribute id="tooltip">Pick a color.</translatableAttribute>
 							</object>
-							<object name="playerAssignment[n]" type="dropdown" style="ModernDropDown" size="22%+37 2 50%+35 30" tooltip_style="onscreenToolTip">
+							<object name="playerAssignment[n]" type="dropdown" style="ModernDropDown" size="22%+37 2 50%+35 21" tooltip_style="onscreenToolTip">
 								<translatableAttribute id="tooltip">Select player.</translatableAttribute>
 							</object>
-							<object name="playerAssignmentText[n]" type="text" style="ModernLabelText" size="22%+5 0 50%+35 30"/>
+							<object name="playerAssignmentText[n]" type="text" style="ModernLabelText" size="22%+5 0 50%+35 21"/>
 							<object name="playerConfig[n]" type="button" style="StoneButton" size="50%+40 4 50%+64 28" tooltip_style="onscreenToolTip" font="sans-bold-stroke-12" sprite="ModernGear" sprite_over="ModernGearHover" sprite_pressed="ModernGearPressed"/>
-							<object name="playerCiv[n]" type="dropdown" style="ModernDropDown" size="50%+69 2 85% 30" tooltip_style="onscreenToolTip" dropdown_size="424"/>
-							<object name="playerCivText[n]" type="text" style="ModernLabelText" size="50%+65 0 85% 30"/>
-							<object name="playerTeam[n]" type="dropdown" style="ModernDropDown" size="85%+5 2 100%-5 30" tooltip_style="onscreenToolTip">
+							<object name="playerCiv[n]" type="dropdown" style="ModernDropDown" size="50%+69 2 85% 21" tooltip_style="onscreenToolTip" dropdown_size="424"/>
+							<object name="playerCivText[n]" type="text" style="ModernLabelText" size="50%+65 0 85% 21"/>
+							<object name="playerTeam[n]" type="dropdown" style="ModernDropDown" size="85%+5 2 100%-5 21" tooltip_style="onscreenToolTip">
 								<translatableAttribute id="tooltip">Select player's team.</translatableAttribute>
 							</object>
 							<object name="playerTeamText[n]" type="text" style="ModernLabelText" size="85%+5 0 100%-5 100%"/>
@@ -136,14 +136,14 @@
 			</object>
 
 			<!-- Map Preview -->
-			<object type="image" sprite="ModernDarkBoxGold" name="gamePreviewBox" size="100%-426 40 100%-24 336">
+			<object type="image" sprite="ModernDarkBoxGold" name="gamePreviewBox" size="100%-426 40 100%-24 612">
 				<object type="image" size="1 1 401 294" name="mapPreview"/>
 				<object name="mapInfoName" type="text" style="ModernLeftLabelText" size="5 100%-20 100% 100%-1"/>
 			</object>
 
 			<!-- Settings -->
-			<object name="settingsBackground" type="image" sprite="ModernDarkBoxGold" size="100%-715 346 100%-315 100%-60"/>
-			<object name="settingsPanel" type="image" sprite="ModernDarkBoxGold" size="100%-785 351 100%-315 100%-65" hidden="true" z="1">
+			<object name="settingsBackground" type="image" sprite="ModernDarkBoxGold" size="100%-715 612+10 100%-315 100%-60"/>
+			<object name="settingsPanel" type="image" sprite="ModernDarkBoxGold" size="100%-785 612+10 100%-315 100%-65" hidden="true" z="1">
 				<repeat count="60" var="n">
 					<object name="settingFrame[n]" size="0 2 320 32">
 						<object
@@ -181,11 +181,11 @@
 			</object>
 
 			<!-- Re-add background to hide settings panel -->
-			<object type="image" sprite="ModernWindowCornerBottomRight" size="100%-315 346 100% 100%" z="20"/>
+			<object type="image" sprite="ModernWindowCornerBottomRight" size="100%-315 612+10 100% 100%" z="20"/>
 
 			<!-- Category Tabs -->
-			<object name="settingTabButtonsBackground" type="image" sprite="ModernDarkBoxGold" size="100%-315 346 100%-25 556" z="21"/>
-			<object name="settingTabButtons" size="100%-315 346 100%-25 556" z="21">
+			<object name="settingTabButtonsBackground" type="image" sprite="ModernDarkBoxGold" size="100%-315 612+10 100%-25 556" z="21"/>
+			<object name="settingTabButtons" size="100%-315 612+10 100%-25 556" z="21">
 				<include file="gui/common/tab_buttons.xml"/>
 			</object>
 
@@ -195,7 +195,7 @@
 				style="IconButton"
 				sprite="iconBubbleGold"
 				sprite_over="iconBubbleWhite"
-				size="100%-41 346 100%-25 362"
+				size="100%-41 612+10 100%-25 362"
 				hotkey="lobby"
 				z="100"
 			>
@@ -208,7 +208,7 @@
 			</object>
 
 			<!-- Chat window -->
-			<object name="chatPanel" size="24 346 100%-640 100%-60" type="image" sprite="ModernDarkBoxGold">
+			<object name="chatPanel" size="24 612+10 100%-640 100%-60" type="image" sprite="ModernDarkBoxGold">
 				<object name="chatText" size="2 2 100%-2 100%-28" type="text" style="ChatPanel"/>
 
 				<object name="chatInput" size="4 100%-26 100%-96 100%-4" type="input" style="ModernInput">
Index: binaries/data/mods/public/gui/session/selection_panels_middle/multiple_details_area.xml
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels_middle/multiple_details_area.xml
+++ binaries/data/mods/public/gui/session/selection_panels_middle/multiple_details_area.xml
@@ -36,7 +36,7 @@
 	<!-- Capture bar -->
 	<object size="15 0 22 100%" type="image" name="captureMultiple" tooltip_style="sessionToolTip">
 		<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
-		<repeat count="9">
+		<repeat count="17">
 			<object type="image" sprite="playerColorBackground" ghost="true" name="captureBarMultiple[n]" hidden="true"/>
 		</repeat>
 		<object type="image" sprite="statsBarShaderVertical" ghost="true"/>
Index: binaries/data/mods/public/gui/session/selection_panels_middle/single_details_area.xml
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels_middle/single_details_area.xml
+++ binaries/data/mods/public/gui/session/selection_panels_middle/single_details_area.xml
@@ -34,7 +34,7 @@
 				<object size="0 0 100% 12" name="captureStats" type="text" style="StatsTextRight" ghost="true"/>
 				<object size="1 14 100% 21" name="capture" type="image" tooltip_style="sessionToolTip">
 					<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
-					<repeat count="9">
+					<repeat count="17">
 						<object type="image" sprite="playerColorBackground" ghost="true" name="captureBar[n]" hidden="true"/>
 					</repeat>
 					<object type="image" sprite="statsBarShaderHorizontal" ghost="true"/>
Index: binaries/data/mods/public/gui/summary/summary.xml
===================================================================
--- binaries/data/mods/public/gui/summary/summary.xml
+++ binaries/data/mods/public/gui/summary/summary.xml
@@ -134,7 +134,7 @@
 				<object type="image" name="teamBoxt[i]" size="0 65 100% 100%-50" hidden="true">
 					<object type="text" name="teamNameHeadingt[i]" size="15 5 100% 100%" style="ModernLeftTopLabelText"/>
 					<object size="0 30 100% 100%">
-						<repeat count="8" var="n">
+						<repeat count="16" var="n">
 							<object type="image" name="playerBoxt[i][n]" size="10 0 10 30" hidden="true">
 								<object name="playerOutcomet[i][n]" type="image" size="4 5 36 37"/>
 								<object name="playerNamet[i][n]" type="text" size="46 2 214 100%" style="ModernLeftLabelText"/>
@@ -153,7 +153,7 @@
 			</repeat>
 
 			<object type="image" name="noTeamsBox" size="0 65 100% 100%-50" hidden="true">
-				<repeat count="8">
+				<repeat count="16">
 					<object type="image" name="playerBox[n]" size="10 0 10 30" hidden="true">
 						<object name="playerOutcome[n]" type="image" size="4 5 36 37"/>
 						<object name="playerName[n]" type="text" size="46 2 214 100%" style="ModernLeftLabelText"/>
Index: binaries/data/mods/public/simulation/data/settings/player_defaults.json
===================================================================
--- binaries/data/mods/public/simulation/data/settings/player_defaults.json
+++ binaries/data/mods/public/simulation/data/settings/player_defaults.json
@@ -72,6 +72,70 @@
 			"AI": "petra",
 			"AIDiff": 3,
 			"AIBehavior": "random"
+		},
+		{
+			"Name": "Player 9",
+			"Civ": "rome",
+			"Color": { "r": 54, "g": 64, "b": 64 },
+			"AI": "petra",
+			"AIDiff": 3,
+			"AIBehavior": "random"
+		},
+		{
+			"Name": "Player 10",
+			"Civ": "rome",
+			"Color": { "r": 44, "g": 64, "b": 64 },
+			"AI": "petra",
+			"AIDiff": 3,
+			"AIBehavior": "random"
+		},
+		{
+			"Name": "Player 11",
+			"Civ": "rome",
+			"Color": { "r": 34, "g": 64, "b": 64 },
+			"AI": "petra",
+			"AIDiff": 3,
+			"AIBehavior": "random"
+		},
+		{
+			"Name": "Player 12",
+			"Civ": "rome",
+			"Color": { "r": 24, "g": 64, "b": 64 },
+			"AI": "petra",
+			"AIDiff": 3,
+			"AIBehavior": "random"
+		},
+		{
+			"Name": "Player 13",
+			"Civ": "rome",
+			"Color": { "r": 14, "g": 64, "b": 64 },
+			"AI": "petra",
+			"AIDiff": 3,
+			"AIBehavior": "random"
+		},
+		{
+			"Name": "Player 14",
+			"Civ": "rome",
+			"Color": { "r": 4, "g": 64, "b": 64 },
+			"AI": "petra",
+			"AIDiff": 3,
+			"AIBehavior": "random"
+		},
+		{
+			"Name": "Player 15",
+			"Civ": "rome",
+			"Color": { "r": 34, "g": 54, "b": 64 },
+			"AI": "petra",
+			"AIDiff": 3,
+			"AIBehavior": "random"
+		},
+		{
+			"Name": "Player 16",
+			"Civ": "rome",
+			"Color": { "r": 34, "g": 44, "b": 64 },
+			"AI": "petra",
+			"AIDiff": 3,
+			"AIBehavior": "random"
 		}
 	]
 }
Index: source/simulation2/components/CCmpRangeManager.cpp
===================================================================
--- source/simulation2/components/CCmpRangeManager.cpp
+++ source/simulation2/components/CCmpRangeManager.cpp
@@ -44,6 +44,7 @@
 
 #define LOS_TILES_RATIO 8
 #define DEBUG_RANGE_MANAGER_BOUNDS 0
+#define MAX_NUMBER_OF_PLAYERS 16
 
 /**
  * Representation of a range query.
@@ -68,7 +69,7 @@
  */
 static inline u32 CalcOwnerMask(player_id_t owner)
 {
-	if (owner >= -1 && owner < 31)
+	if (owner >= -1 && owner < 2*MAX_NUMBER_OF_PLAYERS - 1)
 		return 1 << (1+owner);
 	else
 		return 0; // owner was invalid
@@ -79,7 +80,7 @@
  */
 static inline u32 CalcPlayerLosMask(player_id_t player)
 {
-	if (player > 0 && player <= 16)
+	if (player > 0 && player <= MAX_NUMBER_OF_PLAYERS)
 		return ICmpRangeManager::LOS_MASK << (2*(player-1));
 	return 0;
 }
@@ -102,7 +103,7 @@
  */
 static bool SetPlayerSharedDirtyVisibilityBit(u16& mask, player_id_t player, bool enable)
 {
-	if (player <= 0 || player > 16)
+	if (player <= 0 || player > MAX_NUMBER_OF_PLAYERS)
 		return false;
 
 	u16 oldMask = mask;
@@ -120,7 +121,7 @@
  */
 static inline u8 GetPlayerVisibility(u32 visibilities, player_id_t player)
 {
-	if (player > 0 && player <= 16)
+	if (player > 0 && player <= MAX_NUMBER_OF_PLAYERS)
 		return (visibilities >> (2 *(player-1))) & 0x3;
 	return 0;
 }
@@ -130,7 +131,7 @@
  */
 static inline bool IsVisibilityDirty(u16 dirty, player_id_t player)
 {
-	if (player > 0 && player <= 16)
+	if (player > 0 && player <= MAX_NUMBER_OF_PLAYERS)
 		return (dirty >> (player - 1)) & 0x1;
 	return false;
 }
@@ -371,7 +372,7 @@
 	std::vector<entity_id_t> m_SubdivisionResults;
 
 	// LOS state:
-	static const player_id_t MAX_LOS_PLAYER_ID = 16;
+	static const player_id_t MAX_LOS_PLAYER_ID = MAX_NUMBER_OF_PLAYERS;
 
 	std::vector<bool> m_LosRevealAll;
 	bool m_LosCircular;