diff --git a/binaries/data/mods/mod/gui/page_modmod.xml b/binaries/data/mods/mod/gui/page_modmod.xml
index 506df7c5b9..0d8f2526a8 100644
--- a/binaries/data/mods/mod/gui/page_modmod.xml
+++ b/binaries/data/mods/mod/gui/page_modmod.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
-    <include>common/modern/setup.xml</include>
-    <include>common/modern/styles.xml</include>
-    <include>common/modern/sprites.xml</include>
+	<include>common/modern/setup.xml</include>
+	<include>common/modern/styles.xml</include>
+	<include>common/modern/sprites.xml</include>
 
-    <include>modmod/styles.xml</include>
-    <include>modmod/modmod.xml</include>
+	<include>modmod/styles.xml</include>
+	<include>modmod/modmod.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/aiconfig/aiconfig.xml b/binaries/data/mods/public/gui/aiconfig/aiconfig.xml
index 9d0c194bce..27cc3243f6 100644
--- a/binaries/data/mods/public/gui/aiconfig/aiconfig.xml
+++ b/binaries/data/mods/public/gui/aiconfig/aiconfig.xml
@@ -29,7 +29,7 @@
 			<object type="text" style="ModernRightLabelText" size="-10 35 90 50%+35">
 				<translatableAttribute id="caption">AI Difficulty:</translatableAttribute>
 			</object>
-			
+
 			<object name="aiDifficulty" type="dropdown" style="ModernDropDown" size="50%-24 35 50%+136 63">
 			</object>
 			<object name="aiDifficultyText" type="text" style="ModernLeftLabelText" size="50%-24 35 50%+136 63"/>
diff --git a/binaries/data/mods/public/gui/civinfo/civinfo.xml b/binaries/data/mods/public/gui/civinfo/civinfo.xml
index 1e65970c27..af71eaded3 100644
--- a/binaries/data/mods/public/gui/civinfo/civinfo.xml
+++ b/binaries/data/mods/public/gui/civinfo/civinfo.xml
@@ -22,7 +22,7 @@
 				name="civSelectionHeading"
 				type="text"
 				font="sans-bold-20"
-                textcolor="white"
+				textcolor="white"
 				text_align="left"
 				size="50%-420 10 50%-96 48">
 				<translatableAttribute id="caption">Civilization Selection</translatableAttribute>
@@ -52,7 +52,7 @@
 					name="civBonuses"
 					type="text"
 					font="sans-14"
-                                        textcolor="white"
+					textcolor="white"
 					text_align="left"
 					size="10 0 100%-10 100%-10"
 				/>
@@ -63,7 +63,7 @@
 					name="civTechs"
 					type="text"
 					font="sans-14"
-                                        textcolor="white"
+					textcolor="white"
 					text_align="left"
 					size="10 0 100%-10 100%-10"
 				/>
@@ -74,7 +74,7 @@
 					name="civHeroes"
 					type="text"
 					font="sans-14"
-                                        textcolor="white"
+					textcolor="white"
 					text_align="left"
 					size="10 0 100%-10 100%-10"
 				/>
@@ -102,7 +102,7 @@
 					name="civHistoryText"
 					type="text"
 					font="sans-14"
-                                        textcolor="white"
+					textcolor="white"
 					text_align="left"
 					size="10 0 100% 100%"
 				/>
diff --git a/binaries/data/mods/public/gui/civinfo/sprites.xml b/binaries/data/mods/public/gui/civinfo/sprites.xml
index a2088b555c..ed683bfa09 100644
--- a/binaries/data/mods/public/gui/civinfo/sprites.xml
+++ b/binaries/data/mods/public/gui/civinfo/sprites.xml
@@ -3,24 +3,23 @@
 <sprites>
 
 	<sprite name="bgInfoHeading">
-                <image 	backcolor="0 0 0 150"
+		<image backcolor="0 0 0 150"
 			size="0 0 100% 100%"
 		/>
 	</sprite>
-	
-        <sprite name="bgInfoBox">
-                <image 	backcolor="50 35 0 100"
+
+	<sprite name="bgInfoBox">
+		<image backcolor="50 35 0 100"
 			size="0 0 100% 100%"
 		/>
 	</sprite>
-	
+
 	<sprite name="bgTooltipBox">
-                <image 	backcolor="0 0 0 200"
+		<image backcolor="0 0 0 200"
 			size="0 0 100% 100%"
 			border="true"
 			bordercolor="white"
 		/>
 	</sprite>
-	
 
 </sprites>
diff --git a/binaries/data/mods/public/gui/common/functions_utility.js b/binaries/data/mods/public/gui/common/functions_utility.js
index 8214487b9c..6c14908e36 100644
--- a/binaries/data/mods/public/gui/common/functions_utility.js
+++ b/binaries/data/mods/public/gui/common/functions_utility.js
@@ -225,7 +225,7 @@ function tryAutoComplete(text, autoCompleteList)
 	{
 		if (word.toLowerCase().indexOf(lastWord.toLowerCase()) != 0)
 			continue;
-		
+
 		text = wordSplit.join(" ");
 		if (text.length > 0)
 			text += " ";
diff --git a/binaries/data/mods/public/gui/common/functions_utility_error.js b/binaries/data/mods/public/gui/common/functions_utility_error.js
index 4b757dae8f..19f8a3e894 100644
--- a/binaries/data/mods/public/gui/common/functions_utility_error.js
+++ b/binaries/data/mods/public/gui/common/functions_utility_error.js
@@ -1,6 +1,6 @@
 /*
 	DESCRIPTION	: Error-handling utility functions.
-	NOTES	: 
+	NOTES	:
 */
 
 // ====================================================================
@@ -8,10 +8,10 @@ function cancelOnError(msg)
 {
 	// Delete game objects
 	Engine.EndGame();
-	
+
 	// Return to pregame
 	Engine.SwitchGuiPage("page_pregame.xml");
-	
+
 	// Display error dialog if message given
 	if (msg)
 	{
@@ -23,7 +23,7 @@ function cancelOnError(msg)
 			mode: 2
 		});
 	}
-	
+
 	// Reset cursor
 	Engine.SetCursor("arrow-default");
 }
diff --git a/binaries/data/mods/public/gui/common/global.xml b/binaries/data/mods/public/gui/common/global.xml
index 61632b4748..b964b95018 100644
--- a/binaries/data/mods/public/gui/common/global.xml
+++ b/binaries/data/mods/public/gui/common/global.xml
@@ -49,9 +49,9 @@
 			>
 			<action on="Tick">
 				updateCounters();
-			</action>            
+			</action>
 		</object>
-		
+
 		<object name="fpsCounter"
 			type="text"
 			ghost="true"
@@ -62,7 +62,7 @@
 				Engine.ConfigDB_CreateValue("user", "overlay.fps", ""+(Engine.ConfigDB_GetValue("user", "overlay.fps")!== "true"));
 			</action>
 		</object>
-		
+
 		<!--
 		==========================================
 		- TIME COUNTER
diff --git a/binaries/data/mods/public/gui/common/init.xml b/binaries/data/mods/public/gui/common/init.xml
index 93dec7adbc..23773edeb7 100644
--- a/binaries/data/mods/public/gui/common/init.xml
+++ b/binaries/data/mods/public/gui/common/init.xml
@@ -10,14 +10,14 @@
 		==========================================
 		-->
 
-        <script file="gui/common/functions_utility.js" />
+	<script file="gui/common/functions_utility.js" />
 
-        <!--
-        ==========================================
-         - INCLUDE SCRIPT - GLOBAL OBJECT FUNCTIONS
-        ==========================================
-        -->
+	<!--
+	==========================================
+	- INCLUDE SCRIPT - GLOBAL OBJECT FUNCTIONS
+	==========================================
+	-->
 
-        <script file="gui/common/functions_global_object.js" />
+	<script file="gui/common/functions_global_object.js" />
 
 </objects>
diff --git a/binaries/data/mods/public/gui/common/setup.xml b/binaries/data/mods/public/gui/common/setup.xml
index 465c1b94d0..459a2ca871 100644
--- a/binaries/data/mods/public/gui/common/setup.xml
+++ b/binaries/data/mods/public/gui/common/setup.xml
@@ -10,7 +10,7 @@
 	==========================================
 	-->
 
-		<icon	name="iconInfo"
+		<icon name="iconInfo"
 			sprite="iconInfoWhite"
 			size="16 16"
 		/>
@@ -21,76 +21,76 @@
 		==========================================
 		-->
 
-		<tooltip	name="pgToolTip"
-				use_object="pgToolTip"
-				delay="0"
-				hide_object="true"
+		<tooltip name="pgToolTip"
+			use_object="pgToolTip"
+			delay="0"
+			hide_object="true"
 		/>
 
-		<tooltip 	name="snToolTip"
-				anchor="top"
-				buffer_zone="4"
-				delay="500"
-				font="sans-14"
-				maxwidth="300"
-				offset="16 32"
-				sprite="BackgroundWhiteBorderBlack"
-				textcolor="0 0 0"
+		<tooltip name="snToolTip"
+			anchor="top"
+			buffer_zone="4"
+			delay="500"
+			font="sans-14"
+			maxwidth="300"
+			offset="16 32"
+			sprite="BackgroundWhiteBorderBlack"
+			textcolor="0 0 0"
 		/>
 
-		<tooltip 	name="snToolTipBottom"
-				anchor="bottom"
-				buffer_zone="4"
-				delay="500"
-				font="sans-14"
-				maxwidth="300"
-				offset="-4 -4"
-				sprite="BackgroundWhiteBorderBlack"
-				textcolor="0 0 0"
+		<tooltip name="snToolTipBottom"
+			anchor="bottom"
+			buffer_zone="4"
+			delay="500"
+			font="sans-14"
+			maxwidth="300"
+			offset="-4 -4"
+			sprite="BackgroundWhiteBorderBlack"
+			textcolor="0 0 0"
 		/>
 
-		<tooltip 	name="sessionToolTip"
-				anchor="top"
-				buffer_zone="4"
-				delay="100"
-				font="sans-14"
-				maxwidth="300"
-				offset="16 32"
-				sprite="BackgroundSessionTooltip"
-				textcolor="255 255 255"
+		<tooltip name="sessionToolTip"
+			anchor="top"
+			buffer_zone="4"
+			delay="100"
+			font="sans-14"
+			maxwidth="300"
+			offset="16 32"
+			sprite="BackgroundSessionTooltip"
+			textcolor="255 255 255"
 		/>
 
-		<tooltip 	name="sessionToolTipBottom"
-				anchor="bottom"
-				buffer_zone="4"
-				delay="100"
-				font="sans-14"
-				maxwidth="400"
-				offset="-4 -4"
-				sprite="BackgroundSessionTooltip"
-				textcolor="255 255 255"
+		<tooltip name="sessionToolTipBottom"
+			anchor="bottom"
+			buffer_zone="4"
+			delay="100"
+			font="sans-14"
+			maxwidth="400"
+			offset="-4 -4"
+			sprite="BackgroundSessionTooltip"
+			textcolor="255 255 255"
 		/>
 
-		<tooltip 	name="sessionToolTipBold"
-				anchor="top"
-				buffer_zone="4"
-				delay="100"
-				font="sans-bold-14"
-				maxwidth="300"
-				offset="16 32"
-				sprite="BackgroundSessionTooltip"
-				textcolor="255 255 255"
+		<tooltip name="sessionToolTipBold"
+			anchor="top"
+			buffer_zone="4"
+			delay="100"
+			font="sans-bold-14"
+			maxwidth="300"
+			offset="16 32"
+			sprite="BackgroundSessionTooltip"
+			textcolor="255 255 255"
 		/>
 
-		<tooltip 	name="sessionToolTipBottomBold"
-				anchor="bottom"
-				buffer_zone="4"
-				delay="100"
-				font="sans-bold-14"
-				maxwidth="400"
-				offset="-4 -4"
-				sprite="BackgroundSessionTooltip"
-				textcolor="255 255 255"
+		<tooltip name="sessionToolTipBottomBold"
+			anchor="bottom"
+			buffer_zone="4"
+			delay="100"
+			font="sans-bold-14"
+			maxwidth="400"
+			offset="-4 -4"
+			sprite="BackgroundSessionTooltip"
+			textcolor="255 255 255"
 		/>
 
 		<!--
diff --git a/binaries/data/mods/public/gui/common/setup_resources.xml b/binaries/data/mods/public/gui/common/setup_resources.xml
index acaee8c4b1..986fc04375 100644
--- a/binaries/data/mods/public/gui/common/setup_resources.xml
+++ b/binaries/data/mods/public/gui/common/setup_resources.xml
@@ -2,27 +2,27 @@
 
 <setup>
 	<icon name="icon_food"
-	      sprite="stretched:session/icons/resources/food_small.png"
-	      size="16 16"
+		sprite="stretched:session/icons/resources/food_small.png"
+		size="16 16"
 	/>
 	<icon name="icon_metal"
-	      sprite="stretched:session/icons/resources/metal_small.png"
-	      size="16 16"
+		sprite="stretched:session/icons/resources/metal_small.png"
+		size="16 16"
 	/>
 	<icon name="icon_population"
-	      sprite="stretched:session/icons/resources/population_small.png"
-	      size="16 16"
+		sprite="stretched:session/icons/resources/population_small.png"
+		size="16 16"
 	/>
 	<icon name="icon_stone"
-	      sprite="stretched:session/icons/resources/stone_small.png"
-	      size="16 16"
+		sprite="stretched:session/icons/resources/stone_small.png"
+		size="16 16"
 	/>
 	<icon name="icon_wood"
-	      sprite="stretched:session/icons/resources/wood_small.png"
-	      size="16 16"
+		sprite="stretched:session/icons/resources/wood_small.png"
+		size="16 16"
 	/>
 	<icon name="icon_time"
-	      sprite="stretched:session/icons/resources/time_small.png"
-	      size="16 16"
+		sprite="stretched:session/icons/resources/time_small.png"
+		size="16 16"
 	/>
 </setup>
diff --git a/binaries/data/mods/public/gui/common/sprites.xml b/binaries/data/mods/public/gui/common/sprites.xml
index 4c58cab9b6..3909484e25 100644
--- a/binaries/data/mods/public/gui/common/sprites.xml
+++ b/binaries/data/mods/public/gui/common/sprites.xml
@@ -9,14 +9,14 @@
 	-->
 
 	<sprite name="productLogo">
-		<image 	texture="pregame/shell/logo/0ad_logo.png"
+		<image texture="pregame/shell/logo/0ad_logo.png"
 			real_texture_placement="0 0 256 128"
 			size="0 -5% 100% 105%"
 		/>
 	</sprite>
 
 	<sprite name="companyLogo">
-		<image 	texture="pregame/shell/logo/wfg_logo_white.png"
+		<image texture="pregame/shell/logo/wfg_logo_white.png"
 			real_texture_placement="0 0 32 32"
 		/>
 	</sprite>
@@ -28,7 +28,7 @@
 	-->
 
 	<sprite name="BackgroundTranslucent">
-		<image 	backcolor="0 0 0 85"
+		<image backcolor="0 0 0 85"
 			size="0 0 100% 100%"
 		/>
 	</sprite>
@@ -53,24 +53,24 @@
 	-->
 
 	<sprite name="TranslucentPanelThinBorder">
-		<image 	backcolor="0 0 0 85"
+		<image backcolor="0 0 0 85"
 			size="0 0 100% 100%"
 		/>
 
 		<!-- sides -->
-		<image	texture="global/border/line_horiz.png"
+		<image texture="global/border/line_horiz.png"
 			texture_size="0 0 64 4"
 			size="4 0 100%-4 4"
 		/>
-		<image	texture="global/border/line_vert.png"
+		<image texture="global/border/line_vert.png"
 			texture_size="0 0 4 64"
 			size="100%-4 4 100% 100%-4"
 		/>
-		<image	texture="global/border/line_horiz.png"
+		<image texture="global/border/line_horiz.png"
 			texture_size="0 0 64 4"
 			size="4 100%-4 100%-4 100%"
 		/>
-		<image	texture="global/border/line_vert.png"
+		<image texture="global/border/line_vert.png"
 			texture_size="0 0 4 64"
 			size="0 4 4 100%-4"
 		/>
@@ -81,40 +81,40 @@
 			texture_size="0 0 4 4"
 			size="100%-4 0 100% 4"
 		/>
-		<image	texture="global/border/line_corner_bottom_right.png"
+		<image texture="global/border/line_corner_bottom_right.png"
 			texture_size="0 0 4 4"
 			size="100%-4 100%-4 100% 100%"
 		/>
-		<image	texture="global/border/line_corner_bottom_left.png"
+		<image texture="global/border/line_corner_bottom_left.png"
 			texture_size="0 0 4 4"
 			size="0 100%-4 4 100%"
 		/>
-		<image	texture="global/border/line_corner_top_left.png"
+		<image texture="global/border/line_corner_top_left.png"
 			texture_size="0 0 4 4"
 			size="0 0 4 4"
 		/>
 	</sprite>
 
 	<sprite name="StonePanelThinBorder">
-		<image	texture="global/tile/stone_background.png"
+		<image texture="global/tile/stone_background.png"
 			texture_size="0 0 512 512"
 			size="4 4 100%-4 100%-4"
 		/>
 
 		<!-- sides -->
-		<image	texture="global/border/line_horiz.png"
+		<image texture="global/border/line_horiz.png"
 			texture_size="0 0 64 4"
 			size="4 0 100%-4 4"
 		/>
-		<image	texture="global/border/line_vert.png"
+		<image texture="global/border/line_vert.png"
 			texture_size="0 0 4 64"
 			size="100%-4 4 100% 100%-4"
 		/>
-		<image	texture="global/border/line_horiz.png"
+		<image texture="global/border/line_horiz.png"
 			texture_size="0 0 64 4"
 			size="4 100%-4 100%-4 100%"
 		/>
-		<image	texture="global/border/line_vert.png"
+		<image texture="global/border/line_vert.png"
 			texture_size="0 0 4 64"
 			size="0 4 4 100%-4"
 		/>
@@ -125,15 +125,15 @@
 			texture_size="0 0 4 4"
 			size="100%-4 0 100% 4"
 		/>
-		<image	texture="global/border/line_corner_bottom_right.png"
+		<image texture="global/border/line_corner_bottom_right.png"
 			texture_size="0 0 4 4"
 			size="100%-4 100%-4 100% 100%"
 		/>
-		<image	texture="global/border/line_corner_bottom_left.png"
+		<image texture="global/border/line_corner_bottom_left.png"
 			texture_size="0 0 4 4"
 			size="0 100%-4 4 100%"
 		/>
-		<image	texture="global/border/line_corner_top_left.png"
+		<image texture="global/border/line_corner_top_left.png"
 			texture_size="0 0 4 4"
 			size="0 0 4 4"
 		/>
@@ -183,7 +183,7 @@
 	==========================================
 	-->
 
-	<sprite	name="watermarkProduct">
+	<sprite name="watermarkProduct">
 		<image
 			texture="global/watermark/product.dds"
 			real_texture_placement="0 0 200 98"
@@ -191,7 +191,7 @@
 		/>
 	</sprite>
 
-	<sprite	name="watermarkCompany">
+	<sprite name="watermarkCompany">
 		<image
 			texture="global/watermark/company.dds"
 			real_texture_placement="0 0 207 28"
@@ -206,88 +206,88 @@
 	-->
 
 	<sprite name="StoneButton">
-		<image	texture="global/button/button_stone_unselected.png"
+		<image texture="global/button/button_stone_unselected.png"
 			real_texture_placement="0 0 256 28"
 			size="0 0 100% 100%"
 		/>
 	</sprite>
 
 	<sprite name="StoneButtonOver">
-		<image 	texture="global/button/button_stone_selected.png"
+		<image texture="global/button/button_stone_selected.png"
 			real_texture_placement="0 0 256 28"
 			size="0 0 100% 100%"
 		/>
-        </sprite>
+	</sprite>
 
 	<sprite name="StoneButtonGlow">
 		<effect	add_color="60 42 42 0" />
-		<image 	texture="global/button/button_stone_selected.png"
+		<image texture="global/button/button_stone_selected.png"
 			real_texture_placement="0 0 256 28"
 			size="0 0 100% 100%"
 		/>
-        </sprite>
+	</sprite>
 
 	<sprite name="StoneButtonFancyOver">
-		<image 	texture="global/button/button_stone_selected.png"
+		<image texture="global/button/button_stone_selected.png"
 			real_texture_placement="0 0 256 28"
 			size="0 0 100% 100%"
 		/>
-		<image 	texture="global/button/button_stone_selected_left_trim.png"
+		<image texture="global/button/button_stone_selected_left_trim.png"
 			real_texture_placement="0 0 32 28"
 			size="0 0 32 28"
 		/>
-		<image 	texture="global/button/button_stone_selected_right_trim.png"
+		<image texture="global/button/button_stone_selected_right_trim.png"
 			real_texture_placement="0 0 32 28"
 			size="100%-32 0 100% 28"
 		/>
-        </sprite>
+	</sprite>
 
 	<sprite name="StoneButtonFancyGlow">
 		<effect	add_color="60 42 42 0" />
-		<image 	texture="global/button/button_stone_selected.png"
+		<image texture="global/button/button_stone_selected.png"
 			real_texture_placement="0 0 256 28"
 			size="0 0 100% 100%"
 		/>
-		<image 	texture="global/button/button_stone_selected_left_trim.png"
+		<image texture="global/button/button_stone_selected_left_trim.png"
 			real_texture_placement="0 0 32 28"
 			size="0 0 32 28"
 		/>
-		<image 	texture="global/button/button_stone_selected_right_trim.png"
+		<image texture="global/button/button_stone_selected_right_trim.png"
 			real_texture_placement="0 0 32 28"
 			size="100%-32 0 100% 28"
 		/>
-        </sprite>
+	</sprite>
 
 	<sprite name="StoneButtonDisabled">
 		<effect add_color="42 42 42 0"/>
-		<image 	texture="global/button/button_stone_unselected.png"
+		<image texture="global/button/button_stone_unselected.png"
 			real_texture_placement="0 0 256 28"
 			size="0 0 100% 100%"
 		/>
-        </sprite>
+	</sprite>
 
 	<sprite name="StoneArrowUp">
-		<image	texture="global/button/arrowbox_up.dds"
+		<image texture="global/button/arrowbox_up.dds"
 			size="0 0 100% 100%"
 		/>
-        </sprite>
+	</sprite>
 
 	<sprite name="StoneArrowUpOver">
-		<image	texture="global/button/arrowbox_up_over.dds"
+		<image texture="global/button/arrowbox_up_over.dds"
 			size="0 0 100% 100%"
 		/>
-        </sprite>
+	</sprite>
 
 	<sprite name="StoneArrowDn">
-		<image	texture="global/button/arrowbox_dn.dds"
+		<image texture="global/button/arrowbox_dn.dds"
 			size="0 0 100% 100%"
 		/>
-        </sprite>
+	</sprite>
 
 	<sprite name="StoneArrowDnOver">
-		<image	texture="global/button/arrowbox_dn_over.dds"
+		<image texture="global/button/arrowbox_dn_over.dds"
 			size="0 0 100% 100%"
 		/>
-        </sprite>
+	</sprite>
 
 </sprites>
diff --git a/binaries/data/mods/public/gui/common/styles.xml b/binaries/data/mods/public/gui/common/styles.xml
index 1a76b90f4b..5b8d7a6e13 100644
--- a/binaries/data/mods/public/gui/common/styles.xml
+++ b/binaries/data/mods/public/gui/common/styles.xml
@@ -9,7 +9,7 @@
 	==========================================
 	-->
 
-	<style 	name="default"
+	<style name="default"
 		absolute="false"
 		enabled="true"
 		ghost="false"
@@ -125,7 +125,7 @@
 	==========================================
 	-->
 
-        <style 	name="TranslucentPanel"
+	<style name="TranslucentPanel"
 		sprite="BackgroundTranslucent"
 		buffer_zone="10"
 		font="sans-bold-stroke-14"
@@ -134,7 +134,7 @@
 		text_valign="top"
 	/>
 
-        <style 	name="TranslucentPanelThinBorder"
+	<style name="TranslucentPanelThinBorder"
 		sprite="TranslucentPanelThinBorder"
 		buffer_zone="10"
 		font="sans-bold-stroke-14"
@@ -143,7 +143,7 @@
 		text_valign="top"
 	/>
 
-	<style 	name="StonePanelThinBorder"
+	<style name="StonePanelThinBorder"
 		sprite="StonePanelThinBorder"
 		buffer_zone="10"
 		text_align="left"
@@ -156,7 +156,7 @@
 	==========================================
 	-->
 
-	<style 	name="StoneButtonFancy"
+	<style name="StoneButtonFancy"
 		sprite="StoneButton"
 		sprite_disabled="StoneButtonDisabled"
 		sprite_over="StoneButtonFancyOver"
@@ -168,7 +168,7 @@
 		sound_pressed="audio/interface/ui/ui_button_click.ogg"
 	/>
 
-	<style 	name="StoneButton"
+	<style name="StoneButton"
 		sprite="StoneButton"
 		sprite_disabled="StoneButtonDisabled"
 		sprite_over="StoneButtonOver"
diff --git a/binaries/data/mods/public/gui/common/tooltips.js b/binaries/data/mods/public/gui/common/tooltips.js
index 74075b052d..6cebc6d1e8 100644
--- a/binaries/data/mods/public/gui/common/tooltips.js
+++ b/binaries/data/mods/public/gui/common/tooltips.js
@@ -482,7 +482,7 @@ function getSpeedTooltip(template)
 	return sprintf(translate("%(label)s %(speeds)s"), {
 		"label": headerFont(translate("Speed:")),
 		"speeds":
-	   		sprintf(translate("%(speed)s %(movementType)s"), {
+			sprintf(translate("%(speed)s %(movementType)s"), {
 				"speed": walk,
 				"movementType": unitFont(translate("Walk"))
 			}) +
diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
index b9ed47008b..6d1b619e74 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
@@ -154,9 +154,9 @@
 
 
 			<object size="100%-275 355 100%-25 470" name="mapFilterTooltip">
-				<object name="mapTypeText" type="text" style="ModernLeftLabelText" size="0 0 100% 30"  hidden="true"/>
-				<object name="mapFilterText" type="text" style="ModernLeftLabelText" size="0 32 100% 62"  hidden="true"/>
-				<object name="mapSelectionText" type="text" style="ModernLeftLabelText" size="0 64 100% 94"  hidden="true"/>
+				<object name="mapTypeText" type="text" style="ModernLeftLabelText" size="0 0 100% 30" hidden="true"/>
+				<object name="mapFilterText" type="text" style="ModernLeftLabelText" size="0 32 100% 62" hidden="true"/>
+				<object name="mapSelectionText" type="text" style="ModernLeftLabelText" size="0 64 100% 94" hidden="true"/>
 				<object name="mapSizeText" type="text" style="ModernLeftLabelText" size="0 128 100% 158" hidden="true"/>
 			</object>
 
@@ -200,13 +200,13 @@
 			</object>
 
 			<!-- Map Preview -->
-			<object  type="image" sprite="ModernDarkBoxGold" name="gamePreviewBox" size="100%-426 49 100%-24 345">
+			<object type="image" sprite="ModernDarkBoxGold" name="gamePreviewBox" size="100%-426 49 100%-24 345">
 				<object type="image" sprite="snMapPreview" size="1 1 401 294" name="mapPreview"/>
 			</object>
 
 			<!-- Map Description -->
 			<object size="100%-425 529 100%-25 100%-60">
-				<object name="mapInfoName" type="text" style="ModernLeftLabelText" size="0 0 100%-120 30"/> 
+				<object name="mapInfoName" type="text" style="ModernLeftLabelText" size="0 0 100%-120 30"/>
 				<object type="image" sprite="ModernDarkBoxGold" size="0 30 100% 100%">
 					<object name="mapInfoDescription" type="text" style="MapDescription" size="0 0 100% 100%"/>
 				</object>
diff --git a/binaries/data/mods/public/gui/gamesetup/sprites.xml b/binaries/data/mods/public/gui/gamesetup/sprites.xml
index 62ab361ab7..256c2bc7f5 100644
--- a/binaries/data/mods/public/gui/gamesetup/sprites.xml
+++ b/binaries/data/mods/public/gui/gamesetup/sprites.xml
@@ -2,10 +2,10 @@
 
 <sprites>
 
-	<sprite	name="snMapPreview">
+	<sprite name="snMapPreview">
 		<image	texture="session/icons/mappreview/nopreview.png"
-			size="0 0 100% 100%" 
+			size="0 0 100% 100%"
 		/>
 	</sprite>
-	
+
 </sprites>
diff --git a/binaries/data/mods/public/gui/loading/sprites.xml b/binaries/data/mods/public/gui/loading/sprites.xml
index 60479b46f3..89aacd6bef 100644
--- a/binaries/data/mods/public/gui/loading/sprites.xml
+++ b/binaries/data/mods/public/gui/loading/sprites.xml
@@ -7,11 +7,11 @@
 			texture="loading/progressbar/progressbar_background_left.png"
 			size="0%+0 32 64 0"
 		/>
-        <image
+		<image
 			texture="loading/progressbar/progressbar_background_middle.png"
 			size="64 32 100%-64 0"
 		/>
-        <image
+		<image
 			texture="loading/progressbar/progressbar_background_right.png"
 			size="100%-64 32 100%+0 0"
 		/>
diff --git a/binaries/data/mods/public/gui/lobby/lobby.js b/binaries/data/mods/public/gui/lobby/lobby.js
index a06e696492..d61dc50781 100644
--- a/binaries/data/mods/public/gui/lobby/lobby.js
+++ b/binaries/data/mods/public/gui/lobby/lobby.js
@@ -394,7 +394,7 @@ function updatePlayerList()
 /**
  * Display the profile of the selected player.
  * Displays N/A for all stats until updateProfile is called when the stats
- * 	are actually received from the bot.
+ * are actually received from the bot.
  *
  * @param {string} caller - From which screen is the user requesting data from?
  */
@@ -619,7 +619,7 @@ function updateGameSelection()
 	let sgGameStartTime = Engine.GetGUIObjectByName("sgGameStartTime");
 	let sgNbPlayers = Engine.GetGUIObjectByName("sgNbPlayers");
 	let sgPlayersNames = Engine.GetGUIObjectByName("sgPlayersNames");
-	
+
 	let playersNamesSize = sgPlayersNames.size;
 	playersNamesSize.top = game.startTime ? sgGameStartTime.size.bottom : sgNbPlayers.size.bottom;
 	playersNamesSize.rtop = game.startTime ? sgGameStartTime.size.rbottom : sgNbPlayers.size.rbottom;
diff --git a/binaries/data/mods/public/gui/lobby/lobby.xml b/binaries/data/mods/public/gui/lobby/lobby.xml
index 0e18f1857d..c5ccce9ff1 100644
--- a/binaries/data/mods/public/gui/lobby/lobby.xml
+++ b/binaries/data/mods/public/gui/lobby/lobby.xml
@@ -108,7 +108,7 @@
 				<object name="sgMapName" size="0 5 100% 20" type="text" style="ModernLabelText"/>
 
 				<!-- Map Preview -->
-				<object name="sgMapPreview" size="5 25 100%-5 190"  type="image" sprite=""/>
+				<object name="sgMapPreview" size="5 25 100%-5 190" type="image" sprite=""/>
 
 				<object size="5 194 100%-5 195" type="image" sprite="ModernWhiteLine" z="25"/>
 
@@ -327,7 +327,7 @@
 				<object name="profileErrorText" size="25% 25% 75% 75%" type="text" style="ModernLabelText" text_align="center" font="sans-bold-stroke-13" hidden="true">
 					<translatableAttribute id="caption">Player not found.</translatableAttribute>
 				</object>
-			</object>			
+			</object>
 			</object>
 			<object type="button" style="ModernButtonRed" size="50%-64 100%-50 50%+64 100%-25" hotkey="cancel">
 				<translatableAttribute id="caption">Back</translatableAttribute>
diff --git a/binaries/data/mods/public/gui/locale/locale.js b/binaries/data/mods/public/gui/locale/locale.js
index a4361e1f2e..02f0a6ddfa 100644
--- a/binaries/data/mods/public/gui/locale/locale.js
+++ b/binaries/data/mods/public/gui/locale/locale.js
@@ -15,7 +15,7 @@ function init()
 
 	if (index != -1)
 		languageList.selected = index;
-	
+
 	var localeText = Engine.GetGUIObjectByName("localeText");
 	if (useLongStrings)
 		localeText.caption = "long";
@@ -61,14 +61,14 @@ function openAdvancedMenu()
 function applyFromAdvancedMenu(locale)
 {
 	var languageList = Engine.GetGUIObjectByName("languageList");
-	
+
 	var currentLocaleDictName = Engine.GetFallbackToAvailableDictLocale(locale);
 	var index = -1;
 	index = languageList.list_data.indexOf(currentLocaleDictName);
-	
+
 	if (index != -1)
 		languageList.selected = index;
-	
+
 	var localeText = Engine.GetGUIObjectByName("localeText");
 	localeText.caption = locale;
 }
diff --git a/binaries/data/mods/public/gui/locale/locale.xml b/binaries/data/mods/public/gui/locale/locale.xml
index 46dffbc86f..34b3df2ad1 100644
--- a/binaries/data/mods/public/gui/locale/locale.xml
+++ b/binaries/data/mods/public/gui/locale/locale.xml
@@ -31,12 +31,12 @@
 					>Locale:</translatableAttribute>
 			</object>
 			<object name="localeText" type="text" size="40%+10 80 100% 105" textcolor="white" />
-		
+
 			<object type="button" size="0 100%-60 33% 100%-32" style="ModernButtonRed" hotkey="cancel">
 				<translatableAttribute id="caption">Cancel</translatableAttribute>
 				<action on="Press">cancelSetup();</action>
 			</object>
-			
+
 			<object type="button" size="33%+5 100%-60 66% 100%-32" style="ModernButtonRed">
 				<translatableAttribute id="caption">Advanced</translatableAttribute>
 				<action on="Press">openAdvancedMenu();</action>
diff --git a/binaries/data/mods/public/gui/locale/locale_advanced.js b/binaries/data/mods/public/gui/locale/locale_advanced.js
index ebe7b67f2c..bb81e7a14e 100644
--- a/binaries/data/mods/public/gui/locale/locale_advanced.js
+++ b/binaries/data/mods/public/gui/locale/locale_advanced.js
@@ -4,7 +4,7 @@ function init(initData)
 	var countryList = Engine.GetGUIObjectByName("countryList");
 	var resultingLocaleText = Engine.GetGUIObjectByName("resultingLocale");
 	var scriptInput = Engine.GetGUIObjectByName("scriptInput");
-	
+
 	// get languageList data. Only list languages for which we have a dictionary.
 	var languageListData = [];
 	var languageListTmp = Engine.GetSupportedLocaleBaseNames();
@@ -16,7 +16,7 @@ function init(initData)
 			languageListData.push(lang);
 	}
 
-	
+
 	// get countryList data (we get all countries and not only the ones we have dictionaries for)
 	var countryListData = [];
 	countryListData.push(translateWithContext("localeCountry", "None"));
@@ -28,13 +28,13 @@ function init(initData)
 		if (country != "" && countryListData.indexOf(country) == -1)
 			countryListData.push(country);
 	}
-	
+
 	// fill the languageList
 	languageList.list = languageListData;
 	languageList.list_data = languageListData;
 	if (languageList.list_data.indexOf(currentLocaleLanguage) != -1)
 		languageList.selected = languageList.list_data.indexOf(currentLocaleLanguage);
-	
+
 	// fill the country list
 	countryList.list = countryListData;
 	countryList.list_data = countryListData;
@@ -42,7 +42,7 @@ function init(initData)
 		countryList.selected = countryList.list_data.indexOf(currentLocaleCountry);
 	else
 		countryList.selected = 0;
-	
+
 	// fill the script
 	scriptInput.caption = Engine.GetLocaleScript(initData.locale);
 }
@@ -69,10 +69,10 @@ function updateResultingLocale()
 	var resultingLocaleTmp = "";
 
 	var resultingLocaleTmp = languageList.list_data[languageList.selected];
-	
+
 	if (scriptInput.caption != "")
 		resultingLocaleTmp = resultingLocaleTmp + "_" + scriptInput.caption;
-	
+
 	if (countryList.selected != -1 && countryList.list_data[countryList.selected] != translateWithContext("localeCountry", "None"))
 		resultingLocaleTmp = resultingLocaleTmp + "_" + countryList.list_data[countryList.selected];
 
@@ -102,11 +102,11 @@ function autoDetectLocale()
 	var scriptInput = Engine.GetGUIObjectByName("scriptInput");
 	var variantInput = Engine.GetGUIObjectByName("variantInput");
 	var dictionaryFile = Engine.GetGUIObjectByName("dictionaryFile");
-	
+
 	variantInput.caption = "";
 	dictionaryFile.caption = "";
 	var locale = Engine.GetDictionaryLocale("");
-	
+
 	languageList.selected = languageList.list_data.indexOf(Engine.GetLocaleLanguage(locale));
 	countryList.selected = countryList.selected = countryList.list_data.indexOf(Engine.GetLocaleCountry(locale));
 	scriptInput.caption = Engine.GetLocaleScript(locale);
diff --git a/binaries/data/mods/public/gui/locale/locale_advanced.xml b/binaries/data/mods/public/gui/locale/locale_advanced.xml
index a8a65a7246..25bb8de16f 100644
--- a/binaries/data/mods/public/gui/locale/locale_advanced.xml
+++ b/binaries/data/mods/public/gui/locale/locale_advanced.xml
@@ -29,43 +29,43 @@
 					style="ModernDropDown"
 					size="50%+10 80 100% 105">
 			</object>
-			
+
 			<object type="text" size="5 110 50% 135" style="ModernLabelText" text_align="left">
 				<translatableAttribute id="caption">Script:</translatableAttribute>
 			</object>
 			<object name="scriptInput" size="50%+10 110 100% 135" type="input" style="ModernInput">
 				<translatableAttribute id="tooltip">Optional four-letter script code part following the language code (as listed in ISO 15924)</translatableAttribute>
 			</object>
-			
+
 			<object type="text" size="5 140 50% 165" style="ModernLeftLabelText">
 				<translatableAttribute id="caption">Variant (unused):</translatableAttribute>
 			</object>
 			<object name="variantInput" size="50%+10 140 100% 165" type="input" style="ModernInput">
 				<translatableAttribute id="tooltip">Not implemented yet.</translatableAttribute>
 			</object>
-			
+
 			<object type="text" size="5 170 50% 195" style="ModernLabelText" text_align="left">
 				<translatableAttribute id="caption">Keywords (unused):</translatableAttribute>
 			</object>
 			<object name="keywordsInput" size="50%+10 170 100% 195" type="input" style="ModernInput">
 				<translatableAttribute id="tooltip">Not implemented yet.</translatableAttribute>
 			</object>
-			
+
 			<object type="text" size="5 230 50% 255" style="ModernLabelText" text_align="left">
 				<translatableAttribute id="caption">Resulting locale:</translatableAttribute>
 			</object>
 			<object name="resultingLocale" type="text" size="50%+10 230 100% 255" textcolor="white" />
-			
+
 			<object type="text" size="5 260 50% 285" style="ModernLabelText" text_align="left">
 				<translatableAttribute id="caption">Dictionary files used:</translatableAttribute>
 			</object>
 			<object name="dictionaryFile" type="text" size="50%+10 260 100% 345" textcolor="white" />
-		
+
 			<object type="button" size="0 100%-60 33% 100%-32" style="ModernButtonRed" hotkey="cancel">
 				<translatableAttribute id="caption">Cancel</translatableAttribute>
 				<action on="Press">cancelSetup();</action>
 			</object>
-			
+
 			<object type="button" size="33%+5 100%-60 66% 100%-32" style="ModernButtonRed">
 				<translatableAttribute id="caption">Auto detect</translatableAttribute>
 				<action on="Press">autoDetectLocale();</action>
diff --git a/binaries/data/mods/public/gui/page_aiconfig.xml b/binaries/data/mods/public/gui/page_aiconfig.xml
index 2377731c5f..f5c39b1da0 100644
--- a/binaries/data/mods/public/gui/page_aiconfig.xml
+++ b/binaries/data/mods/public/gui/page_aiconfig.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
-    <include>common/modern/setup.xml</include>
-    <include>common/modern/styles.xml</include>
-    <include>common/modern/sprites.xml</include>
+	<include>common/modern/setup.xml</include>
+	<include>common/modern/styles.xml</include>
+	<include>common/modern/sprites.xml</include>
 
-    <include>aiconfig/aiconfig.xml</include>
+	<include>aiconfig/aiconfig.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/page_atlas.xml b/binaries/data/mods/public/gui/page_atlas.xml
index 3f26846759..00aa397040 100644
--- a/binaries/data/mods/public/gui/page_atlas.xml
+++ b/binaries/data/mods/public/gui/page_atlas.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
-    <include>common/emptyinit.xml</include>
+	<include>common/emptyinit.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/page_civinfo.xml b/binaries/data/mods/public/gui/page_civinfo.xml
index 299e197aa3..52d632248b 100644
--- a/binaries/data/mods/public/gui/page_civinfo.xml
+++ b/binaries/data/mods/public/gui/page_civinfo.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
-    <include>common/modern/setup.xml</include>
-    <include>common/modern/styles.xml</include>
-    <include>common/modern/sprites.xml</include>
+	<include>common/modern/setup.xml</include>
+	<include>common/modern/styles.xml</include>
+	<include>common/modern/sprites.xml</include>
 
-    <include>common/setup.xml</include>
-    <include>common/sprites.xml</include>
-    <include>common/styles.xml</include>
+	<include>common/setup.xml</include>
+	<include>common/sprites.xml</include>
+	<include>common/styles.xml</include>
 
-    <include>civinfo/civinfo.xml</include>
-    <include>civinfo/setup.xml</include>
-    <include>civinfo/sprites.xml</include>
+	<include>civinfo/civinfo.xml</include>
+	<include>civinfo/setup.xml</include>
+	<include>civinfo/sprites.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/page_credits.xml b/binaries/data/mods/public/gui/page_credits.xml
index 83628e780e..ba7b97dc98 100644
--- a/binaries/data/mods/public/gui/page_credits.xml
+++ b/binaries/data/mods/public/gui/page_credits.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
-    <include>common/modern/setup.xml</include>
-    <include>common/modern/styles.xml</include>
-    <include>common/modern/sprites.xml</include>
+	<include>common/modern/setup.xml</include>
+	<include>common/modern/styles.xml</include>
+	<include>common/modern/sprites.xml</include>
 
-    <include>common/global.xml</include>
+	<include>common/global.xml</include>
 
-    <include>credits/styles.xml</include>
-    <include>credits/sprites.xml</include>
-    <include>credits/credits.xml</include>
+	<include>credits/styles.xml</include>
+	<include>credits/sprites.xml</include>
+	<include>credits/credits.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/page_gamesetup.xml b/binaries/data/mods/public/gui/page_gamesetup.xml
index 0a86a6ee89..ce5b315358 100644
--- a/binaries/data/mods/public/gui/page_gamesetup.xml
+++ b/binaries/data/mods/public/gui/page_gamesetup.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
-    <include>common/modern/setup.xml</include>
-    <include>common/modern/styles.xml</include>
-    <include>common/modern/sprites.xml</include>
+	<include>common/modern/setup.xml</include>
+	<include>common/modern/styles.xml</include>
+	<include>common/modern/sprites.xml</include>
 
-    <include>common/setup.xml</include>
-    <include>common/sprites.xml</include>
-    <include>common/styles.xml</include>
+	<include>common/setup.xml</include>
+	<include>common/sprites.xml</include>
+	<include>common/styles.xml</include>
 
-    <include>gamesetup/setup.xml</include>
-    <include>gamesetup/sprites.xml</include>
-    <include>gamesetup/styles.xml</include>
-    <include>gamesetup/gamesetup.xml</include>
-    <include>common/global.xml</include>
+	<include>gamesetup/setup.xml</include>
+	<include>gamesetup/sprites.xml</include>
+	<include>gamesetup/styles.xml</include>
+	<include>gamesetup/gamesetup.xml</include>
+	<include>common/global.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/page_gamesetup_mp.xml b/binaries/data/mods/public/gui/page_gamesetup_mp.xml
index 8742cfd3c4..30719fd89f 100644
--- a/binaries/data/mods/public/gui/page_gamesetup_mp.xml
+++ b/binaries/data/mods/public/gui/page_gamesetup_mp.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
-    <include>common/modern/setup.xml</include>
-    <include>common/modern/styles.xml</include>
-    <include>common/modern/sprites.xml</include>
+	<include>common/modern/setup.xml</include>
+	<include>common/modern/styles.xml</include>
+	<include>common/modern/sprites.xml</include>
 
-    <include>common/setup.xml</include>
-    <include>common/global.xml</include>
+	<include>common/setup.xml</include>
+	<include>common/global.xml</include>
 
-    <include>gamesetup/gamesetup_mp.xml</include>
+	<include>gamesetup/gamesetup_mp.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/page_loadgame.xml b/binaries/data/mods/public/gui/page_loadgame.xml
index 1f657c4f75..dd83049d46 100644
--- a/binaries/data/mods/public/gui/page_loadgame.xml
+++ b/binaries/data/mods/public/gui/page_loadgame.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
-    <include>common/modern/setup.xml</include>
-    <include>common/modern/styles.xml</include>
-    <include>common/modern/sprites.xml</include>
+	<include>common/modern/setup.xml</include>
+	<include>common/modern/styles.xml</include>
+	<include>common/modern/sprites.xml</include>
 
-    <include>common/setup.xml</include>
-    <include>common/sprites.xml</include>
-    <include>common/styles.xml</include>
+	<include>common/setup.xml</include>
+	<include>common/sprites.xml</include>
+	<include>common/styles.xml</include>
 
-    <include>savedgames/load.xml</include>
+	<include>savedgames/load.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/page_loading.xml b/binaries/data/mods/public/gui/page_loading.xml
index b6f4837654..1b2c9bf768 100644
--- a/binaries/data/mods/public/gui/page_loading.xml
+++ b/binaries/data/mods/public/gui/page_loading.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
-    <include>common/modern/setup.xml</include>
-    <include>common/modern/styles.xml</include>
-    <include>common/modern/sprites.xml</include>
+	<include>common/modern/setup.xml</include>
+	<include>common/modern/styles.xml</include>
+	<include>common/modern/sprites.xml</include>
 
-    <include>common/setup.xml</include>
-    <include>common/sprites.xml</include>
-    <include>common/styles.xml</include>
-    <include>common/init.xml</include>
+	<include>common/setup.xml</include>
+	<include>common/sprites.xml</include>
+	<include>common/styles.xml</include>
+	<include>common/init.xml</include>
 
-    <include>loading/styles.xml</include>
-    <include>loading/sprites.xml</include>
-    <include>loading/loading.xml</include>
-    <include>common/global.xml</include>
+	<include>loading/styles.xml</include>
+	<include>loading/sprites.xml</include>
+	<include>loading/loading.xml</include>
+	<include>common/global.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/page_lobby.xml b/binaries/data/mods/public/gui/page_lobby.xml
index 1606f59a57..ac604cb402 100644
--- a/binaries/data/mods/public/gui/page_lobby.xml
+++ b/binaries/data/mods/public/gui/page_lobby.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
-    <include>common/modern/setup.xml</include>
-    <include>common/modern/styles.xml</include>
-    <include>common/modern/sprites.xml</include>
+	<include>common/modern/setup.xml</include>
+	<include>common/modern/styles.xml</include>
+	<include>common/modern/sprites.xml</include>
 
-    <include>common/global.xml</include>
+	<include>common/global.xml</include>
 
-    <include>lobby/styles.xml</include>
-    <include>lobby/lobby.xml</include>
+	<include>lobby/styles.xml</include>
+	<include>lobby/lobby.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/page_manual.xml b/binaries/data/mods/public/gui/page_manual.xml
index 86bdcbe49f..fa02bb5e85 100644
--- a/binaries/data/mods/public/gui/page_manual.xml
+++ b/binaries/data/mods/public/gui/page_manual.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
-    <include>common/modern/setup.xml</include>
-    <include>common/modern/styles.xml</include>
-    <include>common/modern/sprites.xml</include>
+	<include>common/modern/setup.xml</include>
+	<include>common/modern/styles.xml</include>
+	<include>common/modern/sprites.xml</include>
 
-    <include>common/global.xml</include>
+	<include>common/global.xml</include>
 
-    <include>manual/styles.xml</include>
-    <include>manual/manual.xml</include>
+	<include>manual/styles.xml</include>
+	<include>manual/manual.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/page_options.xml b/binaries/data/mods/public/gui/page_options.xml
index cf0ff19e71..fb59c66d56 100644
--- a/binaries/data/mods/public/gui/page_options.xml
+++ b/binaries/data/mods/public/gui/page_options.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
-    <include>common/modern/setup.xml</include>
-    <include>common/modern/styles.xml</include>
-    <include>common/modern/sprites.xml</include>
+	<include>common/modern/setup.xml</include>
+	<include>common/modern/styles.xml</include>
+	<include>common/modern/sprites.xml</include>
 
-    <include>common/init.xml</include>
-    <include>common/global.xml</include>
+	<include>common/init.xml</include>
+	<include>common/global.xml</include>
 
-    <include>options/options.xml</include>
+	<include>options/options.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/page_pregame.xml b/binaries/data/mods/public/gui/page_pregame.xml
index be89ddb1cd..d9095c4a1d 100644
--- a/binaries/data/mods/public/gui/page_pregame.xml
+++ b/binaries/data/mods/public/gui/page_pregame.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
-    <include>common/modern/setup.xml</include>
-    <include>common/modern/styles.xml</include>
-    <include>common/modern/sprites.xml</include>
+	<include>common/modern/setup.xml</include>
+	<include>common/modern/styles.xml</include>
+	<include>common/modern/sprites.xml</include>
 
-    <include>common/setup.xml</include>
-    <include>common/sprites.xml</include>
-    <include>common/styles.xml</include>
-    <include>common/init.xml</include>
+	<include>common/setup.xml</include>
+	<include>common/sprites.xml</include>
+	<include>common/styles.xml</include>
+	<include>common/init.xml</include>
 
-    <include>pregame/backgrounds/</include>
-    <include>pregame/sprites.xml</include>
-    <include>pregame/styles.xml</include>
-    <include>pregame/mainmenu.xml</include>
-    <include>common/global.xml</include>
+	<include>pregame/backgrounds/</include>
+	<include>pregame/sprites.xml</include>
+	<include>pregame/styles.xml</include>
+	<include>pregame/mainmenu.xml</include>
+	<include>common/global.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/page_prelobby.xml b/binaries/data/mods/public/gui/page_prelobby.xml
index 1a75b5284e..aa9355d44d 100644
--- a/binaries/data/mods/public/gui/page_prelobby.xml
+++ b/binaries/data/mods/public/gui/page_prelobby.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
-    <include>common/modern/setup.xml</include>
-    <include>common/modern/styles.xml</include>
-    <include>common/modern/sprites.xml</include>
+	<include>common/modern/setup.xml</include>
+	<include>common/modern/styles.xml</include>
+	<include>common/modern/sprites.xml</include>
 
-    <include>common/global.xml</include>
+	<include>common/global.xml</include>
 
-    <include>lobby/prelobby.xml</include>
+	<include>lobby/prelobby.xml</include>
 </page>
 
diff --git a/binaries/data/mods/public/gui/page_replaymenu.xml b/binaries/data/mods/public/gui/page_replaymenu.xml
index 98d36df792..0510474ffb 100644
--- a/binaries/data/mods/public/gui/page_replaymenu.xml
+++ b/binaries/data/mods/public/gui/page_replaymenu.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
-    <include>common/modern/setup.xml</include>
-    <include>common/modern/styles.xml</include>
-    <include>common/modern/sprites.xml</include>
+	<include>common/modern/setup.xml</include>
+	<include>common/modern/styles.xml</include>
+	<include>common/modern/sprites.xml</include>
 
-    <include>common/setup.xml</include>
-    <include>common/sprites.xml</include>
-    <include>common/styles.xml</include>
+	<include>common/setup.xml</include>
+	<include>common/sprites.xml</include>
+	<include>common/styles.xml</include>
 
-    <include>replaymenu/replay_menu.xml</include>
+	<include>replaymenu/replay_menu.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/page_savegame.xml b/binaries/data/mods/public/gui/page_savegame.xml
index 5038533c65..c931d11842 100644
--- a/binaries/data/mods/public/gui/page_savegame.xml
+++ b/binaries/data/mods/public/gui/page_savegame.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
-    <include>common/modern/setup.xml</include>
-    <include>common/modern/styles.xml</include>
-    <include>common/modern/sprites.xml</include>
+	<include>common/modern/setup.xml</include>
+	<include>common/modern/styles.xml</include>
+	<include>common/modern/sprites.xml</include>
 
-    <include>common/setup.xml</include>
-    <include>common/sprites.xml</include>
-    <include>common/styles.xml</include>
+	<include>common/setup.xml</include>
+	<include>common/sprites.xml</include>
+	<include>common/styles.xml</include>
 
-    <include>savedgames/save.xml</include>
+	<include>savedgames/save.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/page_session.xml b/binaries/data/mods/public/gui/page_session.xml
index 9c92db15e0..328611abb2 100644
--- a/binaries/data/mods/public/gui/page_session.xml
+++ b/binaries/data/mods/public/gui/page_session.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
-    <include>common/modern/setup.xml</include>
-    <include>common/modern/styles.xml</include>
-    <include>common/modern/sprites.xml</include>
+	<include>common/modern/setup.xml</include>
+	<include>common/modern/styles.xml</include>
+	<include>common/modern/sprites.xml</include>
 
-    <include>common/setup.xml</include>
-    <include>common/setup_resources.xml</include>
-    <include>common/sprites.xml</include>
-    <include>common/styles.xml</include>
-    
-    <include>session/sprites.xml</include>
-    <include>session/styles.xml</include>
-    <include>session/session.xml</include>
-    <include>common/global.xml</include>
+	<include>common/setup.xml</include>
+	<include>common/setup_resources.xml</include>
+	<include>common/sprites.xml</include>
+	<include>common/styles.xml</include>
+
+	<include>session/sprites.xml</include>
+	<include>session/styles.xml</include>
+	<include>session/session.xml</include>
+	<include>common/global.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/page_splashscreen.xml b/binaries/data/mods/public/gui/page_splashscreen.xml
index 739a77fd86..7cb28ed06d 100644
--- a/binaries/data/mods/public/gui/page_splashscreen.xml
+++ b/binaries/data/mods/public/gui/page_splashscreen.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
-    <include>common/modern/setup.xml</include>
-    <include>common/modern/styles.xml</include>
-    <include>common/modern/sprites.xml</include>
+	<include>common/modern/setup.xml</include>
+	<include>common/modern/styles.xml</include>
+	<include>common/modern/sprites.xml</include>
 
-    <include>splashscreen/styles.xml</include>
-    <include>splashscreen/setup.xml</include>
-    <include>splashscreen/splashscreen.xml</include>
-    <include>common/global.xml</include>
+	<include>splashscreen/styles.xml</include>
+	<include>splashscreen/setup.xml</include>
+	<include>splashscreen/splashscreen.xml</include>
+	<include>common/global.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/page_structree.xml b/binaries/data/mods/public/gui/page_structree.xml
index 49c88f16f3..1d194049ad 100644
--- a/binaries/data/mods/public/gui/page_structree.xml
+++ b/binaries/data/mods/public/gui/page_structree.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
-    <include>common/modern/setup.xml</include>
-    <include>common/modern/styles.xml</include>
-    <include>common/modern/sprites.xml</include>
+	<include>common/modern/setup.xml</include>
+	<include>common/modern/styles.xml</include>
+	<include>common/modern/sprites.xml</include>
 
-    <include>common/setup_resources.xml</include>
-    <include>common/sprites.xml</include>
-    <include>common/styles.xml</include>
+	<include>common/setup_resources.xml</include>
+	<include>common/sprites.xml</include>
+	<include>common/styles.xml</include>
 
-    <include>structree/styles.xml</include>
-    <include>structree/sprites.xml</include>
-    <include>structree/structree.xml</include>
-    <include>structree/setup.xml</include>
+	<include>structree/styles.xml</include>
+	<include>structree/sprites.xml</include>
+	<include>structree/structree.xml</include>
+	<include>structree/setup.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/page_summary.xml b/binaries/data/mods/public/gui/page_summary.xml
index c5cb8384a5..84e092b3c7 100644
--- a/binaries/data/mods/public/gui/page_summary.xml
+++ b/binaries/data/mods/public/gui/page_summary.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
-    <include>common/modern/setup.xml</include>
-    <include>common/modern/styles.xml</include>
-    <include>common/modern/sprites.xml</include>
+	<include>common/modern/setup.xml</include>
+	<include>common/modern/styles.xml</include>
+	<include>common/modern/sprites.xml</include>
 
-    <include>common/global.xml</include>
+	<include>common/global.xml</include>
 
-    <include>summary/summary.xml</include>
-    <include>summary/sprites.xml</include>
+	<include>summary/summary.xml</include>
+	<include>summary/sprites.xml</include>
 </page>
diff --git a/binaries/data/mods/public/gui/pregame/mainmenu.xml b/binaries/data/mods/public/gui/pregame/mainmenu.xml
index aeead0c565..f4393d7711 100644
--- a/binaries/data/mods/public/gui/pregame/mainmenu.xml
+++ b/binaries/data/mods/public/gui/pregame/mainmenu.xml
@@ -13,27 +13,27 @@
 	- MAIN MENU
 	==========================================
 	-->
-	<object	name="mainMenuPage">
+	<object name="mainMenuPage">
 
 		<action on="Tick">
 			onTick();
 		</action>
 
 		<repeat count="5">
-			<object	name="background[n]"
+			<object name="background[n]"
 				type="image"
 				hidden="true"
 				ghost="true"
 			/>
 		</repeat>
-		
+
 		<!--
 		==========================================
 		- MAIN MENU - STATIC TOOLTIP WINDOW
 		==========================================
 		-->
 
-		<object	name="pgToolTip"
+		<object name="pgToolTip"
 			style="TranslucentPanel"
 			type="text"
 			hidden="true"
@@ -117,9 +117,9 @@
 				closeMenu();
 			</action>
 		</object>
-		
+
 		<!-- hide submenu when user clicks on the background -->
-		<object	name="subMenuScreen" type="button">
+		<object name="subMenuScreen" type="button">
 			<action on="Press">
 				closeMenu();
 			</action>
@@ -191,7 +191,7 @@
 				</object>
 
 			</object>
-			
+
 			<!-- submenuSinglePlayer -->
 			<object name="submenuSinglePlayer"
 				type="image"
@@ -416,20 +416,20 @@
 			z="50"
 		>
 			<!-- These are used to make the right side blend in with the submenu -->
-			<object	name="MainMenuPanelRightBorderTop"
+			<object name="MainMenuPanelRightBorderTop"
 				type="image"
 				sprite="MainMenuPanelRightBorder"
 				ghost="true"
 				size="100%-2 0 100% 100%"
 			/>
-			<object	name="MainMenuPanelRightBorderBottom"
+			<object name="MainMenuPanelRightBorderBottom"
 				type="image"
 				sprite="MainMenuPanelRightBorder"
 				ghost="true"
 				size="100%-2 0 100% 100%"
 			/>
 
-			<object	name="productLogo"
+			<object name="productLogo"
 				type="image"
 				sprite="productLogo"
 				ghost="true"
@@ -473,7 +473,7 @@
 				</object>
 
 				<!-- MULTIPLAYER BUTTON -->
-				<object	name="menuMultiplayerButton"
+				<object name="menuMultiplayerButton"
 					style="StoneButtonFancy"
 					type="button"
 					size="4 68 100%-4 96"
@@ -527,7 +527,7 @@
 					type="text"
 					textcolor="white"
 					size="8 8 100%-8 100%-36"
-                                        ghost="true"
+					ghost="true"
 				>
 					<!-- IMPORTANT: remember to update session/top_panel/label.xml in sync with this: -->
 					<attribute id="caption">
diff --git a/binaries/data/mods/public/gui/savedgames/load.xml b/binaries/data/mods/public/gui/savedgames/load.xml
index feef2ce9b2..b82657b65b 100644
--- a/binaries/data/mods/public/gui/savedgames/load.xml
+++ b/binaries/data/mods/public/gui/savedgames/load.xml
@@ -43,7 +43,7 @@
 
 		<object name="validGame" type="image" size="550 20 100%-20 100%">
 			<object name="savedMapName" size="0 0 100% 20" type="text" style="ModernLabelText" />
-			<object name="savedInfoPreview" size="20 20 240 240"  type="image" sprite="" />
+			<object name="savedInfoPreview" size="20 20 240 240" type="image" sprite="" />
 
 			<object size="0 250 50% 270" type="text" style="ModernLabelText" text_align="left">
 				<translatableAttribute id="caption">Players:</translatableAttribute>
diff --git a/binaries/data/mods/public/gui/savedgames/save.xml b/binaries/data/mods/public/gui/savedgames/save.xml
index 71cd404015..61e3fea54a 100644
--- a/binaries/data/mods/public/gui/savedgames/save.xml
+++ b/binaries/data/mods/public/gui/savedgames/save.xml
@@ -18,7 +18,7 @@
 		<object name="gameSelection"
 			style="ModernList"
 			type="list"
-			
+
 			size="24 24 100%-24 100%-124">
 			<action on="selectionchange">
 				selectDescription();
diff --git a/binaries/data/mods/public/gui/session/diplomacy_window.xml b/binaries/data/mods/public/gui/session/diplomacy_window.xml
index 1708159bfb..1890513bdf 100644
--- a/binaries/data/mods/public/gui/session/diplomacy_window.xml
+++ b/binaries/data/mods/public/gui/session/diplomacy_window.xml
@@ -72,9 +72,9 @@
 			</object>
 		</repeat>
 	</object>
-	
+
 	<object name="diplomacyCeasefireCounter" size="32 100%-90 100%-32 100%-62" type="text" style="chatPanel" ghost="true"></object>
-	
+
 	<object size="50%-64 100%-50 50%+64 100%-22" type="button" style="StoneButton">
 		<translatableAttribute id="caption">Close</translatableAttribute>
 		<action on="Press">closeDiplomacy();</action>
diff --git a/binaries/data/mods/public/gui/session/hotkeys/misc.xml b/binaries/data/mods/public/gui/session/hotkeys/misc.xml
index 128721e085..4849dab151 100644
--- a/binaries/data/mods/public/gui/session/hotkeys/misc.xml
+++ b/binaries/data/mods/public/gui/session/hotkeys/misc.xml
@@ -9,7 +9,7 @@
 	</object>
 
 	<object hotkey="teamchat">
-	    <action on="Press">openChat(true);</action>
+		<action on="Press">openChat(true);</action>
 	</object>
 
 	<object hotkey="menu.toggle">
diff --git a/binaries/data/mods/public/gui/session/menu.xml b/binaries/data/mods/public/gui/session/menu.xml
index 5f50bb21fc..883fab9356 100644
--- a/binaries/data/mods/public/gui/session/menu.xml
+++ b/binaries/data/mods/public/gui/session/menu.xml
@@ -6,7 +6,7 @@
 	z="40"
 >
 	<object size="4 36 100%-4 50%+20">
-	
+
 		<!-- Manual button -->
 		<object type="button"
 			name="manualButton"
@@ -17,7 +17,7 @@
 			<translatableAttribute id="caption">Manual</translatableAttribute>
 			<action on="Press">openManual();</action>
 		</object>
-		
+
 		<!-- Chat button -->
 		<object type="button"
 			name="chatButton"
@@ -41,7 +41,7 @@
 			openSave();
 			</action>
 		</object>
-		
+
 		<!-- Summary button -->
 		<object type="button"
 			name="summaryButton"
@@ -76,7 +76,7 @@
 			</object>
 			<action on="Press">togglePause();</action>
 		</object>
-		
+
 		<!-- Resign button -->
 		<object type="button"
 			name="menuResignButton"
@@ -87,7 +87,7 @@
 			<translatableAttribute id="caption">Resign</translatableAttribute>
 			<action on="Press">resignMenuButton();</action>
 		</object>
-		
+
 		<!-- Exit button -->
 		<object type="button"
 			name="menuExitButton"
diff --git a/binaries/data/mods/public/gui/session/placement.js b/binaries/data/mods/public/gui/session/placement.js
index acccb68464..3ebc3965c5 100644
--- a/binaries/data/mods/public/gui/session/placement.js
+++ b/binaries/data/mods/public/gui/session/placement.js
@@ -19,12 +19,12 @@ PlacementSupport.prototype.Reset = function()
 	this.wallSnapEntities = null;    // list of candidate entities to snap the starting and (!) ending positions to when building walls
 	this.wallEndPosition = null;
 	this.wallSnapEntitiesIncludeOffscreen = false; // should the next update of the snap candidate list include offscreen towers?
-	
+
 	this.SetDefaultAngle();
 	this.RandomizeActorSeed();
 
 	this.attack = null;
-	
+
 	Engine.GuiInterfaceCall("SetBuildingPlacementPreview", {"template": ""});
 	Engine.GuiInterfaceCall("SetWallPlacementPreview", {"wallSet": null});
 };
diff --git a/binaries/data/mods/public/gui/session/selection_details.js b/binaries/data/mods/public/gui/session/selection_details.js
index 8d44723a95..a288fe6cbd 100644
--- a/binaries/data/mods/public/gui/session/selection_details.js
+++ b/binaries/data/mods/public/gui/session/selection_details.js
@@ -158,7 +158,7 @@ function displaySingle(entState)
 		let experienceSize = experienceBar.size;
 		experienceSize.rtop = 100 - (100 * Math.max(0, Math.min(1, 1.0 * +entState.promotion.curr / +entState.promotion.req)));
 		experienceBar.size = experienceSize;
- 
+
 		if (entState.promotion.curr < entState.promotion.req)
 			Engine.GetGUIObjectByName("experience").tooltip = sprintf(translate("%(experience)s %(current)s / %(required)s"), {
 				"experience": "[font=\"sans-bold-13\"]" + translate("Experience:") + "[/font]",
diff --git a/binaries/data/mods/public/gui/session/selection_panels.js b/binaries/data/mods/public/gui/session/selection_panels.js
index c21fc4f340..fb12b000f7 100644
--- a/binaries/data/mods/public/gui/session/selection_panels.js
+++ b/binaries/data/mods/public/gui/session/selection_panels.js
@@ -128,7 +128,7 @@ g_SelectionPanels.Barter = {
 			updateSelectionDetails();
 		};
 
-		button.Buy.onPress = function() { 
+		button.Buy.onPress = function() {
 			Engine.PostNetworkCommand({
 				"type": "barter",
 				"sell": g_BarterSell,
@@ -1037,7 +1037,7 @@ g_SelectionPanels.Upgrade = {
 		// TODO: if the units are all the same, this should probably still be possible.
 		if (selection.length > 1)
 			return false;
- 
+
 		return unitEntState.upgrade && unitEntState.upgrade.upgrades;
 	},
 	"setupButton" : function(data)
@@ -1118,15 +1118,15 @@ g_SelectionPanels.Upgrade = {
 			}
 		}
 
-		data.icon.sprite = modifier + "stretched:session/" + 
+		data.icon.sprite = modifier + "stretched:session/" +
 			(data.item.icon || "portraits/" + template.icon);
 
 		let progressOverlay = Engine.GetGUIObjectByName("unitUpgradeProgressSlider[" + data.i + "]");
 		if (isUpgrading)
 		{
-			let size = progressOverlay.size; 
- 			size.top = size.left + Math.round(progress * (size.right - size.left)); 
- 			progressOverlay.size = size;
+			let size = progressOverlay.size;
+			size.top = size.left + Math.round(progress * (size.right - size.left));
+			progressOverlay.size = size;
 		}
 		progressOverlay.hidden = !isUpgrading;
 
diff --git a/binaries/data/mods/public/gui/session/selection_panels_left/barter_panel.xml b/binaries/data/mods/public/gui/session/selection_panels_left/barter_panel.xml
index f32e11775f..46b8b7bf69 100644
--- a/binaries/data/mods/public/gui/session/selection_panels_left/barter_panel.xml
+++ b/binaries/data/mods/public/gui/session/selection_panels_left/barter_panel.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<object name="unitBarterPanel" 
+<object name="unitBarterPanel"
 	size="6 36 100% 100%"
 	hidden="true"
 >
diff --git a/binaries/data/mods/public/gui/session/selection_panels_middle/single_details_area.xml b/binaries/data/mods/public/gui/session/selection_panels_middle/single_details_area.xml
index 6d7a9a09c6..ff2313f50a 100644
--- a/binaries/data/mods/public/gui/session/selection_panels_middle/single_details_area.xml
+++ b/binaries/data/mods/public/gui/session/selection_panels_middle/single_details_area.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Unit details for Single Unit -->
 <object size="50%-112 0 50%+112 100%" name="detailsAreaSingle">
-	
+
 	<!-- Stats Bars -->
 	<object size= "2 0 100%-2 98" type="image" tooltip_style="sessionToolTip">
-	
+
 	<object size="0 8 100% 60" type="image" sprite="edgedPanelShader">
 		<!-- Health bar -->
 		<object size="88 0 100% 24" name="healthSection">
@@ -47,7 +47,7 @@
 		</object>
 		</object>
 	</object>
-	
+
 	<object size="0 60 100% 96" type="image" sprite="edgedPanelShader">
 		<!-- Attack and Armor -->
 		<object size="90 -2 126 34" name="attackAndArmorStats" type="image" sprite="stretched:session/icons/stances/defensive.png" tooltip_style="sessionToolTip">
@@ -59,11 +59,11 @@
 		<object size="100%-98 -2 100%-28 34" type="text" name="resourceCarryingText" style="CarryingTextRight"/>
 		<object size="100%-36 -2 100% 34" type="image" name="resourceCarryingIcon" tooltip_style="sessionToolTip"/>
 	</object>
-	
+
 	<!-- Big unit icon -->
 	<object size="-8 -8 88 88" type="image" name="iconBorder" sprite="iconBorder" tooltip_style="sessionToolTip">
 		<object size="1 1 100%-1 100%-1" type="image" name="icon" ghost="true"/>
-	
+
 		<!-- Experience bar -->
 		<object size="2 2 6 100%-2" type="image" name="experience" tooltip_style="sessionToolTip">
 			<translatableAttribute id="tooltip">Experience</translatableAttribute>
@@ -72,20 +72,20 @@
 			<object type="image" sprite="experienceForeground" ghost="true" name="experienceBar"/>
 			<object type="image" sprite="statsBarShaderVertical" ghost="true"/>
 		</object>
-	
+
 		<object z="20" size="4 4 20 20" name="rankIcon" type="image" tooltip_style="sessionToolTip">
 			<translatableAttribute id="tooltip">Rank</translatableAttribute>
 		</object>
 	</object>
 	</object>
-	
+
 	<!-- Names (this must come before the attack and armor icon to avoid clipping issues) -->
 	<object size="2 96 100%-2 100%-36" name="statsArea" type="image" sprite="edgedPanelShader">
-	
+
 	<!-- These images are used to clip off the top and bottom of the civ icon -->
 	<object z="30" size="0 -5 100% 40" ghost="true" type="image" sprite="remove"/>
 	<object z="30" size="0 100%-5 100% 100%+40" ghost="true" type="image" sprite="remove"/>
-	
+
 	<object z="30" size="0 2 100% 45" ghost="true">
 		<!-- Specific Name -->
 		<object size="0 0 100% 20" name="specific" ghost="true" type="text" style="SpecificNameCentered"/>
@@ -93,13 +93,13 @@
 		<!-- Generic Name -->
 		<object size="0 15 100% 36" name="generic" ghost="true" type="text" style="GenericNameCentered"/>
 	</object>
-	
+
 	<!-- Player Name and Civ -->
 	<object size="0 40 100% 100%">
 		<object size="50%-64 50%-64 50%+64 50%+64" name="playerCivIcon" type="image" ghost="true"/>
 		<object size="0 0 100% 100%" name="playerColorBackground" type="image" sprite="playerColorBackground" ghost="true"/>
 		<object size="0 0 100% 100%" type="image" sprite="bottomEdgedPanelShader" ghost="true"/>
-		
+
 		<!-- Why is this being automatically ghosted? In the mean time, set ghost to false -->
 		<object ghost="false" size="0 0 100% 100%-5" name="player" type="text" style="largeCenteredOutlinedText" tooltip_style="sessionToolTip"/>
 	</object>
diff --git a/binaries/data/mods/public/gui/session/selection_panels_right/upgrade_panel.xml b/binaries/data/mods/public/gui/session/selection_panels_right/upgrade_panel.xml
index fc0ae780dd..e1bbea2712 100644
--- a/binaries/data/mods/public/gui/session/selection_panels_right/upgrade_panel.xml
+++ b/binaries/data/mods/public/gui/session/selection_panels_right/upgrade_panel.xml
@@ -6,7 +6,7 @@
 	<repeat count="8">
 		<object name="unitUpgradeButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
 		<object name="unitUpgradeIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
-        <object name="unitUpgradeUpgradeIcon[n]" type="image" ghost="true" size="3 3 43 43" sprite="stretched:session/icons/upgrade.png"/> 
+		<object name="unitUpgradeUpgradeIcon[n]" type="image" ghost="true" size="3 3 43 43" sprite="stretched:session/icons/upgrade.png"/>
 		<object name="unitUpgradeProgressSlider[n]" type="image" sprite="queueProgressSlider" ghost="true" size="3 3 43 43" z="20"/>
 		<object name="unitUpgradeSelection[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="stretched:session/icons/corners.png"/>
 		</object>
diff --git a/binaries/data/mods/public/gui/session/session.xml b/binaries/data/mods/public/gui/session/session.xml
index b38b1a8075..695a24f9da 100644
--- a/binaries/data/mods/public/gui/session/session.xml
+++ b/binaries/data/mods/public/gui/session/session.xml
@@ -52,25 +52,25 @@
 
 	<!-- Pause Overlay -->
 	<object type="button" name="pauseOverlay" size="0 0 100% 100%" tooltip_style="sessionToolTip" hidden="true" z="0">
-	    <object size="0 0 100% 100%" type="image" sprite="devCommandsBackground" ghost="true" z="0"/>
-	    <object size="50%-128 40%-20 50%+128 40%+20" type="text" style="PauseText" ghost="true" z="0">
+		<object size="0 0 100% 100%" type="image" sprite="devCommandsBackground" ghost="true" z="0"/>
+		<object size="50%-128 40%-20 50%+128 40%+20" type="text" style="PauseText" ghost="true" z="0">
 			<translatableAttribute id="caption">Game Paused</translatableAttribute>
 		</object>
 		<object name="resumeMessage" size="50%-128 40%+20 50%+128 40%+40" type="text" style="ResumeMessageText" ghost="true" z="0">
 			<translatableAttribute id="caption">Click to Resume Game</translatableAttribute>
 		</object>
-	    <object name="pausedByText" size="30% 40%+50 70% 100%" type="text" style="PausedByText" ghost="true" hidden="true" z="0"/>
-	    <action on="Press">togglePause();</action>
+		<object name="pausedByText" size="30% 40%+50 70% 100%" type="text" style="PausedByText" ghost="true" hidden="true" z="0"/>
+		<action on="Press">togglePause();</action>
 	</object>
 
 	<!-- Notification Area -->
 	<object name="notificationPanel" type="image" size="50%-300 60 50%+300 120" ghost="true">
-	    <object name="notificationText" size="0 0 100% 100%" type="text" style="notificationPanel" ghost="true"/>
+		<object name="notificationText" size="0 0 100% 100%" type="text" style="notificationPanel" ghost="true"/>
 	</object>
 
 	<!-- Chat messages -->
 	<object name="chatPanel" size="0 130 100% 100%-240" type="image" ghost="true" z="0" absolute="true">
-	    <object name="chatText" size="3 1 100%-1 100%-1" type="text" style="chatPanel" ghost="true"/>
+		<object name="chatText" size="3 1 100%-1 100%-1" type="text" style="chatPanel" ghost="true"/>
 	</object>
 
 	<!-- Entity selection state text -->
@@ -118,24 +118,24 @@
 			<include directory="gui/session/selection_panels_left/"/>
 		</object>
 
-	    <!-- Selection Details Panel (Middle) -->
-	    <object name="selectionDetails"
-		    type="image"
-		    sprite="selectionDetailsPanel"
-		    size="50%-114 100%-205 50%+114 100%"
-		    hidden="false"
-	    >
+		<!-- Selection Details Panel (Middle) -->
+		<object name="selectionDetails"
+			type="image"
+			sprite="selectionDetailsPanel"
+			size="50%-114 100%-205 50%+114 100%"
+			hidden="false"
+		>
 			<include directory="gui/session/selection_panels_middle/"/>
-	    </object>
+		</object>
 
-	    <!-- Commands Panel (Right of Selection Details) -->
-	    <object name="unitCommands"
-		    type="image"
-		    sprite="unitCommandsPanel"
-		    size="50%+110 100%-170 50%+512 100%"
-		    hidden="false"
-		    z="20"
-	    >
+		<!-- Commands Panel (Right of Selection Details) -->
+		<object name="unitCommands"
+			type="image"
+			sprite="unitCommandsPanel"
+			size="50%+110 100%-170 50%+512 100%"
+			hidden="false"
+			z="20"
+		>
 			<include directory="gui/session/selection_panels_right/"/>
 		</object>
 	</object><!-- END OF BOTTOM PANEL -->
diff --git a/binaries/data/mods/public/gui/session/sprites.xml b/binaries/data/mods/public/gui/session/sprites.xml
index d401873c18..f96f3e5569 100644
--- a/binaries/data/mods/public/gui/session/sprites.xml
+++ b/binaries/data/mods/public/gui/session/sprites.xml
@@ -158,43 +158,43 @@
 	<sprite name="supplementalDetailsPanel">
 
 		<!-- sides -->
-		<image  texture="global/border/line_horiz.png"
+		<image texture="global/border/line_horiz.png"
 			texture_size="0 0 64 4"
 			size="4 0 100%-4 4"
 		/>
-		<image  texture="global/border/line_vert.png"
+		<image texture="global/border/line_vert.png"
 			texture_size="0 0 4 64"
 			size="100%-4 4 100% 100%-4"
 		/>
-		<image  texture="global/border/line_horiz.png"
+		<image texture="global/border/line_horiz.png"
 			texture_size="0 0 64 4"
 			size="4 100%-4 100%-4 100%"
 		/>
-		<image  texture="global/border/line_vert.png"
+		<image texture="global/border/line_vert.png"
 			texture_size="0 0 4 64"
 			size="0 4 4 100%-4"
 		/>
 
 		<!-- corners -->
-		<image  texture="global/border/line_corner_middle_left.png"
+		<image texture="global/border/line_corner_middle_left.png"
 			texture_size="0 0 4 4"
 			size="100%-4 0 100% 4"
 		/>
-		<image  texture="global/border/line_corner_bottom_middle.png"
+		<image texture="global/border/line_corner_bottom_middle.png"
 			texture_size="0 0 4 4"
 			size="100%-4 100%-4 100% 100%"
 		/>
-		<image  texture="global/border/line_corner_bottom_middle.png"
+		<image texture="global/border/line_corner_bottom_middle.png"
 			texture_size="0 0 4 4"
 			size="0 100%-4 4 100%"
 		/>
-		<image  texture="global/border/line_corner_middle_right.png"
+		<image texture="global/border/line_corner_middle_right.png"
 			texture_size="0 0 4 4"
 			size="0 0 4 4"
 		/>
 
-                <!-- background -->
-                <image  texture="session/panel_left.png"
+		<!-- background -->
+		<image texture="session/panel_left.png"
 			real_texture_placement="0 0 189 170"
 			texture_size="0 0 100% 100%"
 			size="4 4 100%-4 100%-4"
@@ -204,45 +204,45 @@
 	<!-- Bottom Middle Panel -->
 	<sprite name="selectionDetailsPanel">
 
-                <!-- background -->
-		<image  texture="session/panel_middle.png"
+		<!-- background -->
+		<image texture="session/panel_middle.png"
 			real_texture_placement="0 0 228 205"
 			texture_size="0 0 100% 100%"
 			size="0 0 100% 100%"
 		/>
 
 		<!-- sides -->
-		<image  texture="global/border/line_horiz.png"
-                        texture_size="0 0 64 4"
+		<image texture="global/border/line_horiz.png"
+			texture_size="0 0 64 4"
 			size="4 0 100%-4 4"
 		/>
-		<image  texture="global/border/line_vert.png"
+		<image texture="global/border/line_vert.png"
 			texture_size="0 0 4 64"
 			size="100%-4 4 100% 100%-4"
 		/>
-		<image  texture="global/border/line_horiz.png"
+		<image texture="global/border/line_horiz.png"
 			texture_size="0 0 64 4"
 			size="4 100%-4 100%-4 100%"
 		/>
-		<image  texture="global/border/line_vert.png"
+		<image texture="global/border/line_vert.png"
 			texture_size="0 0 4 64"
 			size="0 4 4 100%-4"
 		/>
 
 		<!-- corners -->
-		<image  texture="global/border/line_corner_top_right.png"
+		<image texture="global/border/line_corner_top_right.png"
 			texture_size="0 0 4 4"
 			size="100%-4 0 100% 4"
 		/>
-		<image  texture="global/border/line_corner_bottom_right.png"
+		<image texture="global/border/line_corner_bottom_right.png"
 			texture_size="0 0 4 4"
 			size="100%-4 100%-4 100% 100%"
 		/>
-		<image  texture="global/border/line_corner_bottom_left.png"
+		<image texture="global/border/line_corner_bottom_left.png"
 			texture_size="0 0 4 4"
 			size="0 100%-4 4 100%"
 		/>
-		<image  texture="global/border/line_corner_top_left.png"
+		<image texture="global/border/line_corner_top_left.png"
 			texture_size="0 0 4 4"
 			size="0 0 4 4"
 		/>
@@ -252,43 +252,43 @@
 	<sprite name="unitCommandsPanel">
 
 		<!-- sides -->
-		<image  texture="global/border/line_horiz.png"
+		<image texture="global/border/line_horiz.png"
 			texture_size="0 0 64 4"
 			size="4 0 100%-4 4"
 		/>
-		<image  texture="global/border/line_vert.png"
+		<image texture="global/border/line_vert.png"
 			texture_size="0 0 4 64"
 			size="100%-4 4 100% 100%-4"
 		/>
-		<image  texture="global/border/line_horiz.png"
+		<image texture="global/border/line_horiz.png"
 			texture_size="0 0 64 4"
 			size="4 100%-4 100%-4 100%"
 		/>
-		<image  texture="global/border/line_vert.png"
+		<image texture="global/border/line_vert.png"
 			texture_size="0 0 4 64"
 			size="0 4 4 100%-4"
 		/>
 
 		<!-- corners -->
-		<image  texture="global/border/line_corner_top_right.png"
+		<image texture="global/border/line_corner_top_right.png"
 			texture_size="0 0 4 4"
 			size="100%-4 0 100% 4"
 		/>
-		<image  texture="global/border/line_corner_bottom_right.png"
+		<image texture="global/border/line_corner_bottom_right.png"
 			texture_size="0 0 4 4"
 			size="100%-4 100%-4 100% 100%"
 		/>
-		<image  texture="global/border/line_corner_bottom_middle.png"
+		<image texture="global/border/line_corner_bottom_middle.png"
 			texture_size="0 0 4 4"
 			size="0 100%-4 4 100%"
 		/>
-		<image  texture="global/border/line_corner_middle_right.png"
+		<image texture="global/border/line_corner_middle_right.png"
 			texture_size="0 0 4 4"
 			size="0 0 4 4"
 		/>
 
-                <!-- background -->
-                <image  texture="session/panel_right.png"
+		<!-- background -->
+		<image texture="session/panel_right.png"
 			real_texture_placement="0 0 398 170"
 			texture_size="0 0 100% 100%"
 			size="4 4 100%-4 100%-4"
@@ -298,49 +298,48 @@
 	<!-- ================================  ================================ -->
 	<!-- Shading -->
 	<!-- ================================  ================================ -->
-		
+
 	<sprite name="remove">
-		<image  backcolor="0 0 0 0" size="0 0 100% 100%"/>
+		<image backcolor="0 0 0 0" size="0 0 100% 100%"/>
 	</sprite>
-		
+
 	<sprite name="panelShader">
-		<image	texture="session/panel_shader.png"
+		<image texture="session/panel_shader.png"
 			size="0 0 100% 100%"
 		/>
 	</sprite>
-	
+
 	<sprite name="edgedPanelShader">
-	    	<image  texture="session/panel_shader_top_edge.png"
+		<image texture="session/panel_shader_top_edge.png"
 			real_texture_placement="0 0 256 1"
 			size="0 0 100% 1"
 		/>
-		
-		<image	texture="session/panel_shader.png"
+
+		<image texture="session/panel_shader.png"
 			size="0 0 100% 100%-5"
 		/>
-		
-    		<image	texture="session/panel_shader_bottom_edge.png"
+		<image texture="session/panel_shader_bottom_edge.png"
 			real_texture_placement="0 0 256 5"
 			size="0 100%-5 100% 100%"
 		/>
 	</sprite>
-	
+
 	<sprite name="bottomEdgedPanelShader">
-	    	<image  texture="session/panel_shader_top_edge.png"
+		<image texture="session/panel_shader_top_edge.png"
 			real_texture_placement="0 0 256 1"
 			size="0 0 100% 1"
 		/>
-		
-		<image	texture="session/panel_shader.png"
+
+		<image texture="session/panel_shader.png"
 			size="0 0 100% 100%"
 		/>
 	</sprite>
-	
+
 	<sprite name="queuePanelShader">
-	    	<image	texture="session/panel_shader.png"
+		<image texture="session/panel_shader.png"
 			size="4 4 100%-4 100%-4"
 		/>
-		
+
 		<!-- sides -->
 		<image
 			texture="global/border/line_horiz.png"
@@ -385,7 +384,7 @@
 			size="0 0 4 4"
 		/>
 	</sprite>
-		
+
 	<sprite name="glassSquareMap">
 		<image backcolor="255 255 255 56" size="0 0 100% 1"/>
 		<image backcolor="255 255 255 56" size="100%-1 1 100% 100%"/>
@@ -411,31 +410,31 @@
 	</sprite>
 
 	<sprite name="statsBarShaderHorizontal">
-	    	<image	texture="session/bar_lighting_horizontal.png"
+		<image texture="session/bar_lighting_horizontal.png"
 			real_texture_placement="0 0 150 7"
 			size="0 0 100% 100%"
 		/>
 	</sprite>
-	
+
 	<sprite name="statsBarShaderVertical">
-	    	<image	texture="session/bar_lighting_vertical.png"
+		<image texture="session/bar_lighting_vertical.png"
 			real_texture_placement="0 0 7 150"
 			size="0 0 100% 100%"
 		/>
 	</sprite>
-	
+
 	<!-- ================================  ================================ -->
 	<!-- Colored Stats Bars -->
 	<!-- ================================  ================================ -->
-	
+
 	<sprite name="playerColorBackground">
 		<image backcolor="255 255 255 128"/>
 	</sprite>
-	
+
 	<sprite name="barBorder">
 		<image backcolor="0 0 0 128"/>
 	</sprite>
-	
+
 	<sprite name="queueProgressSlider">
 		<image backcolor="0 255 0 128"/>
 	</sprite>
diff --git a/binaries/data/mods/public/gui/session/styles.xml b/binaries/data/mods/public/gui/session/styles.xml
index a0cf4155fe..c10e98d089 100644
--- a/binaries/data/mods/public/gui/session/styles.xml
+++ b/binaries/data/mods/public/gui/session/styles.xml
@@ -2,264 +2,264 @@
 
 <styles>
 
-    <!-- ================================  ================================ -->
-    <!-- Text Styles -->
-    <!-- ================================  ================================ -->
-    <style name="PauseText"
-	   font="sans-bold-24"
-	   textcolor="white"
-	   text_align="center"
-	   text_valign="center"
-    />
+	<!-- ================================  ================================ -->
+	<!-- Text Styles -->
+	<!-- ================================  ================================ -->
+	<style name="PauseText"
+		font="sans-bold-24"
+		textcolor="white"
+		text_align="center"
+		text_valign="center"
+	/>
 
-    <style name="ResumeMessageText"
-	   font="sans-bold-12"
-	   textcolor="white"
-	   text_align="center"
-	   text_valign="center"
-    />
+	<style name="ResumeMessageText"
+		font="sans-bold-12"
+		textcolor="white"
+		text_align="center"
+		text_valign="center"
+	/>
 
-    <style name="PausedByText"
-	   font="sans-bold-16"
-	   textcolor="white"
-	   text_align="center"
-	   text_valign="top"
-    />
+	<style name="PausedByText"
+		font="sans-bold-16"
+		textcolor="white"
+		text_align="center"
+		text_valign="top"
+	/>
 
-    <style name="BuildNameText"
-	   font="sans-stroke-12"
-	   textcolor="white"
-	   text_align="center"
-	   text_valign="bottom"
-	   ghost="true"
-    />
+	<style name="BuildNameText"
+		font="sans-stroke-12"
+		textcolor="white"
+		text_align="center"
+		text_valign="bottom"
+		ghost="true"
+	/>
 
-    <style name="leftAlignedText"
-	   textcolor="white"
-	   text_align="left"
-	   text_valign="center"
-    />
+	<style name="leftAlignedText"
+		textcolor="white"
+		text_align="left"
+		text_valign="center"
+	/>
 
-    <style name="rightAlignedText"
-	   textcolor="white"
-	   text_align="right"
-	   text_valign="top"
-    />
+	<style name="rightAlignedText"
+		textcolor="white"
+		text_align="right"
+		text_valign="top"
+	/>
 
-    <style name="centeredText"
-	   textcolor="black"
-	   text_align="center"
-	   text_valign="center"
-    />
+	<style name="centeredText"
+		textcolor="black"
+		text_align="center"
+		text_valign="center"
+	/>
 
-    <style name="largeBoldCenteredText"
-	   font="sans-bold-18"
-	   textcolor="white"
-	   text_align="center"
-	   text_valign="center"
-    />
+	<style name="largeBoldCenteredText"
+		font="sans-bold-18"
+		textcolor="white"
+		text_align="center"
+		text_valign="center"
+	/>
 
-    <style name="largeCenteredOutlinedText"
-	   font="sans-bold-stroke-14"
-	   textcolor="white"
-	   text_align="center"
-	   text_valign="center"
-    />
+	<style name="largeCenteredOutlinedText"
+		font="sans-bold-stroke-14"
+		textcolor="white"
+		text_align="center"
+		text_valign="center"
+	/>
 
-    <style name="largeLeftOutlinedText"
-	   font="sans-bold-stroke-14"
-	   textcolor="white"
-	   text_align="left"
-	   text_valign="center"
-    />
+	<style name="largeLeftOutlinedText"
+		font="sans-bold-stroke-14"
+		textcolor="white"
+		text_align="left"
+		text_valign="center"
+	/>
 
-    <style name="iconButtonCount"
-	   textcolor="255 255 255"
-	   font="sans-9"
-	   text_align="right"
-	   text_valign="top"
-	   buffer_zone="4"
-    />
+	<style name="iconButtonCount"
+		textcolor="255 255 255"
+		font="sans-9"
+		text_align="right"
+		text_valign="top"
+		buffer_zone="4"
+	/>
 
-    <style name="iconButtonProgress"
-	   textcolor="255 255 255"
-	   font="sans-stroke-14"
-	   text_align="center"
-	   text_valign="center"
-    />
+	<style name="iconButtonProgress"
+		textcolor="255 255 255"
+		font="sans-stroke-14"
+		text_align="center"
+		text_valign="center"
+	/>
 
-    <style name="groupIconsText"
-	   font="sans-bold-stroke-14"
-	   textcolor="white"
-	   text_align="center"
-	   text_valign="center"
-    />
+	<style name="groupIconsText"
+		font="sans-bold-stroke-14"
+		textcolor="white"
+		text_align="center"
+		text_valign="center"
+	/>
 
-    <style name="groupIconsCenteredText"
-	   font="mono-stroke-10"
-	   textcolor="255 255 255"
-	   text_align="center"
-	   text_valign="center"
-    />
+	<style name="groupIconsCenteredText"
+		font="mono-stroke-10"
+		textcolor="255 255 255"
+		text_align="center"
+		text_valign="center"
+	/>
 
-    <style name="devCommandsText"
-	   font="sans-10"
-	   textcolor="255 255 255"
-	   text_align="right"
-    />
+	<style name="devCommandsText"
+		font="sans-10"
+		textcolor="255 255 255"
+		text_align="right"
+	/>
 
-    <style name="resourceText"
-	   textcolor="white"
-	   font="sans-bold-stroke-14"
-	   ghost="true"
-	   text_align="left"
-	   text_valign="center"
-    />
+	<style name="resourceText"
+		textcolor="white"
+		font="sans-bold-stroke-14"
+		ghost="true"
+		text_align="left"
+		text_valign="center"
+	/>
 
-    <style name="StatsTextLeft"
-	   font="sans-stroke-12"
-	   textcolor="white"
-	   text_align="left"
-	   text_valign="center"
-	   ghost="true"
-    />
+	<style name="StatsTextLeft"
+		font="sans-stroke-12"
+		textcolor="white"
+		text_align="left"
+		text_valign="center"
+		ghost="true"
+	/>
 
-    <style name="StatsTextCentered"
-	   font="sans-stroke-12"
-	   textcolor="white"
-	   text_align="center"
-	   text_valign="center"
-	   ghost="true"
-    />
+	<style name="StatsTextCentered"
+		font="sans-stroke-12"
+		textcolor="white"
+		text_align="center"
+		text_valign="center"
+		ghost="true"
+	/>
 
-    <style name="StatsTextRight"
-	   font="sans-stroke-12"
-	   textcolor="white"
-	   text_align="right"
-	   text_valign="center"
-	   ghost="true"
-    />
+	<style name="StatsTextRight"
+		font="sans-stroke-12"
+		textcolor="white"
+		text_align="right"
+		text_valign="center"
+		ghost="true"
+	/>
 
-    <style name="CarryingTextRight"
-	   font="sans-bold-stroke-13"
-	   textcolor="white"
-	   text_align="right"
-	   text_valign="center"
-	   ghost="true"
-    />
+	<style name="CarryingTextRight"
+		font="sans-bold-stroke-13"
+		textcolor="white"
+		text_align="right"
+		text_valign="center"
+		ghost="true"
+	/>
 
-    <style name="SpecificNameCentered"
-	   font="sans-bold-stroke-13"
-	   textcolor="gold"
-	   text_align="center"
-	   text_valign="center"
-	   ghost="true"
-    />
+	<style name="SpecificNameCentered"
+		font="sans-bold-stroke-13"
+		textcolor="gold"
+		text_align="center"
+		text_valign="center"
+		ghost="true"
+	/>
 
-    <style name="GenericNameCentered"
-	   font="sans-stroke-12"
-	   textcolor="white"
-	   text_align="center"
-	   text_valign="center"
-	   ghost="true"
-    />
+	<style name="GenericNameCentered"
+		font="sans-stroke-12"
+		textcolor="white"
+		text_align="center"
+		text_valign="center"
+		ghost="true"
+	/>
 
-    <style name="SettingsText"
-	   font="sans-stroke-16"
-	   textcolor="white"
-	   text_align="right"
-	   text_valign="center"
-    />
+	<style name="SettingsText"
+		font="sans-stroke-16"
+		textcolor="white"
+		text_align="right"
+		text_valign="center"
+	/>
 
-    <style name="dialogTitleText"
-	   font="sans-bold-18"
-	   textcolor="white"
-	   text_align="center"
-	   text_valign="center"
-    />
+	<style name="dialogTitleText"
+		font="sans-bold-18"
+		textcolor="white"
+		text_align="center"
+		text_valign="center"
+	/>
 
-    <style name="dialogText"
-	   font="sans-16"
-	   textcolor="white"
-	   text_align="center"
-	   text_valign="center"
-    />
+	<style name="dialogText"
+		font="sans-16"
+		textcolor="white"
+		text_align="center"
+		text_valign="center"
+	/>
 
-    <!-- ================================  ================================ -->
-    <!-- Icon Styles -->
-    <!-- ================================  ================================ -->
+	<!-- ================================  ================================ -->
+	<!-- Icon Styles -->
+	<!-- ================================  ================================ -->
 	<style name="CivIconOverlay"
 		sprite=""
 		sprite_over="CivIconOver"
 		sound_pressed="audio/interface/ui/ui_button_click.ogg"
 	/>
 
-    <style name="commandIcon"
-	   sprite="command"
-	   ghost="true"
-    />
+	<style name="commandIcon"
+		sprite="command"
+		ghost="true"
+	/>
 
-    <style name="iconButton"
-	   sprite="snIconPortrait"
-	   sprite_over="snIconPortraitOver"
-	   sprite_disabled="snIconPortraitDisabled"
-	   tooltip_style="snToolTipBottom"
-	   sound_pressed="audio/interface/ui/ui_button_click.ogg"
-    />
+	<style name="iconButton"
+		sprite="snIconPortrait"
+		sprite_over="snIconPortraitOver"
+		sprite_disabled="snIconPortraitDisabled"
+		tooltip_style="snToolTipBottom"
+		sound_pressed="audio/interface/ui/ui_button_click.ogg"
+	/>
 
-    <!-- ================================  ================================ -->
-    <!-- Tooltip Styles -->
-    <!-- ================================  ================================ -->
-    <style name="resourceCounter"
-	   tooltip_style="snToolTip"
-    />
+	<!-- ================================  ================================ -->
+	<!-- Tooltip Styles -->
+	<!-- ================================  ================================ -->
+	<style name="resourceCounter"
+		tooltip_style="snToolTip"
+	/>
 
-    <style name="resourceCounter"
-	   tooltip_style="snToolTip"
-    />
+	<style name="resourceCounter"
+		tooltip_style="snToolTip"
+	/>
 
-    <style name="informationTooltip"
-	   anchor="top"
-	   buffer_zone="6"
-	   font="sans-bold-14"
-	   maxwidth="300"
-	   offset="16 32"
-	   sprite="BackgroundInformationTooltip"
-	   textcolor="255 255 255"
-    />
+	<style name="informationTooltip"
+		anchor="top"
+		buffer_zone="6"
+		font="sans-bold-14"
+		maxwidth="300"
+		offset="16 32"
+		sprite="BackgroundInformationTooltip"
+		textcolor="255 255 255"
+	/>
 
-    <!-- ================================  ================================ -->
-    <!-- Misc Styles -->
-    <!-- ================================  ================================ -->
-    <style name="chatPanel"
-	   buffer_zone="5"
-	   font="sans-bold-stroke-14"
-	   textcolor="white"
-	   textcolor_selected="white"
-	   text_align="left"
-	   text_valign="top"
-    />
+	<!-- ================================  ================================ -->
+	<!-- Misc Styles -->
+	<!-- ================================  ================================ -->
+	<style name="chatPanel"
+		buffer_zone="5"
+		font="sans-bold-stroke-14"
+		textcolor="white"
+		textcolor_selected="white"
+		text_align="left"
+		text_valign="top"
+	/>
 
-    <style  name="chatInput"
-	    sprite="chatInput"
-	    sprite_selectarea="chatInputHighlight"
-	    textcolor="white"
-	    textcolor_selected="darkgray"
-    />
+	<style  name="chatInput"
+		sprite="chatInput"
+		sprite_selectarea="chatInputHighlight"
+		textcolor="white"
+		textcolor_selected="darkgray"
+	/>
 
-    <style name="notificationPanel"
-	   buffer_zone="5"
-	   font="sans-bold-stroke-14"
-	   textcolor="white"
-	   text_align="center"
-	   text_valign="bottom"
-    />
+	<style name="notificationPanel"
+		buffer_zone="5"
+		font="sans-bold-stroke-14"
+		textcolor="white"
+		text_align="center"
+		text_valign="bottom"
+	/>
 
-    <style name="netStatus"
-	   font="sans-bold-18"
-	   textcolor="255 255 255"
-	   text_align="center"
-	   text_valign="center"
-	   sprite="netStatusBackground"
-    />
+	<style name="netStatus"
+		font="sans-bold-18"
+		textcolor="255 255 255"
+		text_align="center"
+		text_valign="center"
+		sprite="netStatusBackground"
+	/>
 </styles>
diff --git a/binaries/data/mods/public/gui/session/unit_commands.js b/binaries/data/mods/public/gui/session/unit_commands.js
index b50bc980ab..b75459a5a2 100644
--- a/binaries/data/mods/public/gui/session/unit_commands.js
+++ b/binaries/data/mods/public/gui/session/unit_commands.js
@@ -6,7 +6,7 @@ var g_unitPanelButtons = {
 	"Garrison": 0,
 	"Training": 0,
 	"Research": 0,
-	"Alert": 0, 
+	"Alert": 0,
 	"Barter": 0,
 	"Construction": 0,
 	"Command": 0,
diff --git a/binaries/data/mods/public/gui/structree/draw.js b/binaries/data/mods/public/gui/structree/draw.js
index 92c60ce433..06f1e39209 100644
--- a/binaries/data/mods/public/gui/structree/draw.js
+++ b/binaries/data/mods/public/gui/structree/draw.js
@@ -138,7 +138,7 @@ function draw()
 		hideRemaining("phase["+i+"]_struct[", s, "]");
 		++i;
 	}
-	
+
 	let t = 0;
 	for (let trainer of g_CivData[g_SelectedCiv].trainList)
 	{
@@ -154,7 +154,7 @@ function draw()
 		Engine.GetGUIObjectByName("trainer["+t+"]_icon").tooltip = assembleTooltip(trainer);
 		Engine.GetGUIObjectByName("trainer["+t+"]_name").caption = translate(trainer.name.specific);
 		thisEle.hidden = false;
-		
+
 		let p = 0;
 		for (let prodType in trainer.production)
 		{
@@ -250,7 +250,7 @@ function hideRemaining(prefix, idx, suffix)
 /**
  * Positions certain elements that only need to be positioned once
  * (as <repeat> does not reposition automatically).
- * 
+ *
  * Also detects limits on what the GUI can display by iterating through the set
  * elements of the GUI. These limits are then used by draw().
  */
@@ -336,14 +336,14 @@ function predraw()
 	}
 	hideRemaining("phase[", i, "]");
 	hideRemaining("phase[", i, "]_bar");
-	
+
 	let t = 0;
 	let ele = Engine.GetGUIObjectByName("trainer["+t+"]");
 	g_DrawLimits.trainer = {
 		"trainerQuant": 0,
 		"prodQuant": 0
 	};
-	
+
 	let x = 4;
 	do
 	{
@@ -361,18 +361,18 @@ function predraw()
 		} while (prodEle !== undefined);
 		Engine.GetGUIObjectByName("trainer["+t+"]_row").size = "4 100%-24"+" 100%-4 100%";
 		g_DrawLimits.trainer.prodQuant = p;
-		
+
 		let size = ele.size;
 		size.top += x;
 		size.bottom += x + 24;
 		x += size.bottom - size.top + 8;
 		ele.size = size;
-		
+
 		t++;
 		ele = Engine.GetGUIObjectByName("trainer["+t+"]");
-		
+
 	} while (ele !== undefined);
-	
+
 	g_DrawLimits.trainer.trainerQuant = t;
 }
 
diff --git a/binaries/data/mods/public/gui/structree/helper.js b/binaries/data/mods/public/gui/structree/helper.js
index eef5c6c150..e5f76b684f 100644
--- a/binaries/data/mods/public/gui/structree/helper.js
+++ b/binaries/data/mods/public/gui/structree/helper.js
@@ -27,7 +27,7 @@ function loadTechData(templateName)
 		var filename = "simulation/data/technologies/" + templateName + ".json";
 		var data = Engine.ReadJSONFile(filename);
 		translateObjectKeys(data, ["genericName", "tooltip"]);
-		
+
 		g_TechnologyData[templateName] = data;
 	}
 
diff --git a/binaries/data/mods/public/gui/structree/load.js b/binaries/data/mods/public/gui/structree/load.js
index 534747b7be..1dfd3325eb 100644
--- a/binaries/data/mods/public/gui/structree/load.js
+++ b/binaries/data/mods/public/gui/structree/load.js
@@ -190,7 +190,7 @@ function loadTechnology(techName)
 	{
 		for (let op in template.requirements)
 		{
-			let val = template.requirements[op];	
+			let val = template.requirements[op];
 			let req = calcReqs(op, val);
 
 			switch (op)
diff --git a/binaries/data/mods/public/gui/structree/rows.xml b/binaries/data/mods/public/gui/structree/rows.xml
index f6d700fb80..4e53293f65 100644
--- a/binaries/data/mods/public/gui/structree/rows.xml
+++ b/binaries/data/mods/public/gui/structree/rows.xml
@@ -16,7 +16,7 @@
 							</repeat>
 						</object>
 					</repeat>
-				</object>	
+				</object>
 			</repeat>
 		</object>
 	</repeat>
diff --git a/binaries/data/mods/public/gui/structree/structree.xml b/binaries/data/mods/public/gui/structree/structree.xml
index 78b51b65cc..b53bd93f24 100644
--- a/binaries/data/mods/public/gui/structree/structree.xml
+++ b/binaries/data/mods/public/gui/structree/structree.xml
@@ -92,7 +92,7 @@
 			>
 				<translatableAttribute id="caption">Trainer Units</translatableAttribute>
 			</object>
-			
+
 			<object type="image" style="TreeDisplay" size="0 24 100% 100%">
 				<repeat count="3" var="t">
 					<object type="image" style="StructBox" name="trainer[t]">
diff --git a/binaries/data/mods/public/gui/summary/summary.xml b/binaries/data/mods/public/gui/summary/summary.xml
index 2c47f160e5..7d27a47072 100644
--- a/binaries/data/mods/public/gui/summary/summary.xml
+++ b/binaries/data/mods/public/gui/summary/summary.xml
@@ -145,7 +145,7 @@
 						<object type="image" sprite="ForegroundBox" size="10 9 34 33">
 							<object name="playerColorBox[n]" type="image" size="2 2 22 22"/>
 						</object>
-						<object name="playerName[n]" type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
+						<object name="playerName[n]" type="text" size="40 2 208 100%" style="ModernLeftLabelText"/>
 						<object name="civIcon[n]" type="image" size="208 5 240 37"/>
 						<repeat var="x" count="8">
 							<object name="valueData[n][x]" type="text" style="ModernTabLabelText">
diff --git a/binaries/data/mods/public/maps/random/rmgen/map.js b/binaries/data/mods/public/maps/random/rmgen/map.js
index 90a4d627a7..07de2f505f 100644
--- a/binaries/data/mods/public/maps/random/rmgen/map.js
+++ b/binaries/data/mods/public/maps/random/rmgen/map.js
@@ -130,7 +130,7 @@ Map.prototype.setTexture = function(x, z, texture)
 	if (!this.validT(x, z))
 		throw "setTexture: invalid tile position (" + x + ", " + z + ")";
 	
-	 this.texture[x][z] = this.getTextureID(texture);
+	this.texture[x][z] = this.getTextureID(texture);
 };
 
 Map.prototype.getHeight = function(x, z)
diff --git a/binaries/data/mods/public/maps/random/rmgen2/gaia.js b/binaries/data/mods/public/maps/random/rmgen2/gaia.js
index 8802457f36..b22a4d47f1 100644
--- a/binaries/data/mods/public/maps/random/rmgen2/gaia.js
+++ b/binaries/data/mods/public/maps/random/rmgen2/gaia.js
@@ -255,7 +255,7 @@ function addBluffs(constraint, size, deviation, fill)
 				g_TileClasses.player, 12,
 				g_TileClasses.rock, 5,
 				g_TileClasses.water, 5
-			 ],
+			],
 			"stay": [g_TileClasses.bluff, 6],
 			"sizes": savanna ? ["big"] : g_AllSizes,
 			"mixes": savanna ? ["varied"] : g_AllMixes,
@@ -271,7 +271,7 @@ function addBluffs(constraint, size, deviation, fill)
 				g_TileClasses.rock, 5,
 				g_TileClasses.metal, 5,
 				g_TileClasses.water, 3
-			 ],
+			],
 			"stay": [g_TileClasses.bluff, 6],
 			"sizes": g_AllSizes,
 			"mixes": g_AllMixes,