Index: ps/trunk/binaries/data/mods/public/gui/session/hotkeys/camera.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/hotkeys/camera.xml	(revision 15387)
+++ ps/trunk/binaries/data/mods/public/gui/session/hotkeys/camera.xml	(revision 15388)

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/hotkeys/camera.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/hotkeys/misc.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/hotkeys/misc.xml	(revision 15387)
+++ ps/trunk/binaries/data/mods/public/gui/session/hotkeys/misc.xml	(revision 15388)

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/hotkeys/misc.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/hotkeys/training.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/hotkeys/training.xml	(revision 15387)
+++ ps/trunk/binaries/data/mods/public/gui/session/hotkeys/training.xml	(revision 15388)

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/hotkeys/training.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/sprites.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/sprites.xml	(revision 15387)
+++ ps/trunk/binaries/data/mods/public/gui/session/sprites.xml	(revision 15388)

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/sprites.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/styles.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/styles.xml	(revision 15387)
+++ ps/trunk/binaries/data/mods/public/gui/session/styles.xml	(revision 15388)

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/styles.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/top_panel/button_diplomacy.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/top_panel/button_diplomacy.xml	(revision 15387)
+++ ps/trunk/binaries/data/mods/public/gui/session/top_panel/button_diplomacy.xml	(revision 15388)

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/top_panel/button_diplomacy.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/top_panel/button_game_speed.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/top_panel/button_game_speed.xml	(revision 15387)
+++ ps/trunk/binaries/data/mods/public/gui/session/top_panel/button_game_speed.xml	(revision 15388)

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/top_panel/button_game_speed.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/top_panel/button_menu.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/top_panel/button_menu.xml	(revision 15387)
+++ ps/trunk/binaries/data/mods/public/gui/session/top_panel/button_menu.xml	(revision 15388)

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/top_panel/button_menu.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/top_panel/button_trade.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/top_panel/button_trade.xml	(revision 15387)
+++ ps/trunk/binaries/data/mods/public/gui/session/top_panel/button_trade.xml	(revision 15388)

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/top_panel/button_trade.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/top_panel/civ_icon.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/top_panel/civ_icon.xml	(revision 15387)
+++ ps/trunk/binaries/data/mods/public/gui/session/top_panel/civ_icon.xml	(revision 15388)

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/top_panel/civ_icon.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/top_panel/label.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/top_panel/label.xml	(revision 15387)
+++ ps/trunk/binaries/data/mods/public/gui/session/top_panel/label.xml	(revision 15388)

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/top_panel/label.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/top_panel/resource_food.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/top_panel/resource_food.xml	(revision 15387)
+++ ps/trunk/binaries/data/mods/public/gui/session/top_panel/resource_food.xml	(revision 15388)

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/top_panel/resource_food.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/top_panel/resource_metal.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/top_panel/resource_metal.xml	(revision 15387)
+++ ps/trunk/binaries/data/mods/public/gui/session/top_panel/resource_metal.xml	(revision 15388)

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/top_panel/resource_metal.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/top_panel/resource_population.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/top_panel/resource_population.xml	(revision 15387)
+++ ps/trunk/binaries/data/mods/public/gui/session/top_panel/resource_population.xml	(revision 15388)

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/top_panel/resource_population.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/top_panel/resource_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/top_panel/resource_stone.xml	(revision 15387)
+++ ps/trunk/binaries/data/mods/public/gui/session/top_panel/resource_stone.xml	(revision 15388)

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/top_panel/resource_stone.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/top_panel/resource_wood.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/top_panel/resource_wood.xml	(revision 15387)
+++ ps/trunk/binaries/data/mods/public/gui/session/top_panel/resource_wood.xml	(revision 15388)

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/top_panel/resource_wood.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/top_panel.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/top_panel.xml	(revision 15387)
+++ ps/trunk/binaries/data/mods/public/gui/session/top_panel.xml	(revision 15388)

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/top_panel.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/trade_window.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/trade_window.xml	(revision 15387)
+++ ps/trunk/binaries/data/mods/public/gui/session/trade_window.xml	(revision 15388)

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/trade_window.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/menu.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/menu.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/gui/session/menu.xml	(revision 15388)
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<object name="menu"
+	style="StonePanelThinBorder"
+	type="image"
+	hidden="false"
+	z="40"
+>
+	<object size="4 36 100%-4 50%+20">
+	
+		<!-- Manual button -->
+		<object type="button"
+			name="manualButton"
+			style="StoneButtonFancy"
+			size="0 0 100% 28"
+			tooltip_style="sessionToolTip"
+		>
+			<translatableAttribute id="caption">Manual</translatableAttribute>
+			<action on="Press">openManual();</action>
+		</object>
+		
+		<!-- Chat button -->
+		<object type="button"
+			name="chatButton"
+			style="StoneButtonFancy"
+			size="0 32 100% 60"
+			tooltip_style="sessionToolTip"
+		>
+			<translatableAttribute id="caption">Chat</translatableAttribute>
+			<action on="Press">chatMenuButton();</action>
+		</object>
+
+		<!-- Save game button -->
+		<object type="button"
+			name="saveGameButton"
+			style="StoneButtonFancy"
+			size="0 64 100% 92"
+			tooltip_style="sessionToolTip"
+		>
+			<translatableAttribute id="caption">Save</translatableAttribute>
+			<action on="Press">
+			openSave();
+			</action>
+		</object>
+		
+		<!-- Settings button -->
+		<object type="button"
+			name="settingsButton"
+			style="StoneButtonFancy"
+			size="0 96 100% 124"
+			tooltip_style="sessionToolTip"
+		>
+			<translatableAttribute id="caption">Settings</translatableAttribute>
+			<action on="Press">settingsMenuButton();</action>
+		</object>
+
+		<!-- Pause / Resume Button -->
+		<object type="button"
+			name="pauseButton"
+			style="StoneButtonFancy"
+			size="0 128 100% 156"
+			tooltip_style="sessionToolTip"
+		>
+			<object name="pauseButtonText" type="text" style="CenteredButtonText" ghost="true">
+				<translatableAttribute id="caption">Pause</translatableAttribute>
+			</object>
+			<action on="Press">togglePause();</action>
+		</object>
+		
+		<!-- Resign button -->
+		<object type="button"
+			name="menuResignButton"
+			style="StoneButtonFancy"
+			size="0 160 100% 188"
+			tooltip_style="sessionToolTip"
+		>
+			<translatableAttribute id="caption">Resign</translatableAttribute>
+			<action on="Press">resignMenuButton();</action>
+		</object>
+		
+		<!-- Exit button -->
+		<object type="button"
+			name="menuExitButton"
+			style="StoneButtonFancy"
+			size="0 192 100% 220"
+			tooltip_style="sessionToolTip"
+		>
+			<translatableAttribute id="caption">Exit</translatableAttribute>
+			<action on="Press">exitMenuButton();</action>
+		</object>
+	</object>
+</object>
+
+

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/menu.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/minimap_panel.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/minimap_panel.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/gui/session/minimap_panel.xml	(revision 15388)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<object
+	name="minimapPanel"
+	size="0 100%-212 212 100%"
+	type="image"
+	sprite="mapPanel"
+>
+	<!-- Idle Worker Button -->
+	<object size="100%-80 100%-80 100%-5 100%-5">
+		<!-- TODO: We should disable this button if there are no idle workers. -->
+		<object type="button"
+			tooltip_style="sessionToolTip"
+			hotkey="selection.idleworker"
+		>
+			<translatableAttribute id="tooltip">Find idle worker</translatableAttribute>
+			<action on="Press">findIdleUnit(["Female", "Trade", "FishingBoat", "CitizenSoldier", "Healer"]);</action>
+			<action on="MouseEnter">Engine.GetGUIObjectByName("idleOverlay").sprite = "stretched:session/minimap-idle-highlight.png";</action>
+			<action on="MouseLeave">Engine.GetGUIObjectByName("idleOverlay").sprite = "stretched:session/minimap-idle.png";</action>
+			<action on="MouseLeftPress">Engine.GetGUIObjectByName("idleOverlay").sprite = "stretched:session/minimap-idle.png";</action>
+			<action on="MouseLeftRelease">Engine.GetGUIObjectByName("idleOverlay").sprite = "stretched:session/minimap-idle-highlight.png";</action>
+		</object>
+	</object>
+	<!-- Minimap -->
+	<object name="minimap"
+		type="minimap" z="20"
+		size="8 8 100%-8 100%-8"
+	>
+		<action on="WorldClick">handleMinimapEvent(arguments[0]);</action>
+	</object>
+	<!-- Overlays -->
+	<object name="minimapOverlay" size="4 4 100%-4 100%-4" type="image" sprite="stretched:session/minimap_circle_modern.png" ghost="true"/>
+	<object name="idleOverlay" z="100" size="100%-125 100%-125 100%-5 100%-5" type="image" sprite="stretched:session/minimap-idle.png" ghost="true"/>
+</object>

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/minimap_panel.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/selection_panels_left/barter_panel.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/selection_panels_left/barter_panel.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/gui/session/selection_panels_left/barter_panel.xml	(revision 15388)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<object name="unitBarterPanel" 
+	size="6 36 100% 100%"
+	hidden="true"
+>
+	<object ghost="true" style="resourceText" type="text" size="0 0 100% 20">
+		<translatableAttribute id="tooltip">Exchange resources:</translatableAttribute>
+	</object>
+	<object size="0 32 100% 124">
+		<repeat count="4">
+			<!-- sell -->
+			<object name="unitBarterSellButton[n]" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottomBold">
+				<object name="unitBarterSellIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
+				<object name="unitBarterSellUnaffordable[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="colour: 255 0 0 60"/>
+				<object name="unitBarterSellAmount[n]" ghost="true" style="resourceText" type="text" size="0 0 100% 50%"/>
+				<object name="unitBarterSellSelection[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="stretched:session/icons/corners.png"/>
+			</object>
+			<!-- buy -->
+			<object name="unitBarterBuyButton[n]" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottomBold">
+				<object name="unitBarterBuyIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
+				<object name="unitBarterBuyAmount[n]" ghost="true" style="resourceText" type="text" size="0 0 100% 50%"/>
+			</object>
+		</repeat>
+	</object>
+</object>

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/selection_panels_left/barter_panel.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/selection_panels_left/formation_panel.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/selection_panels_left/formation_panel.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/gui/session/selection_panels_left/formation_panel.xml	(revision 15388)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<object name="unitFormationPanel" size="24 12 100% 100%">
+	<object size="0 0 100% 100%">
+		<repeat count="16">
+			<object name="unitFormationButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" tooltip_style="sessionToolTipBottomBold" z="100">
+				<object name="unitFormationIcon[n]" type="image" ghost="true" size="3 3 33 33"/>
+				<object name="unitFormationSelection[n]" hidden="true" type="image" ghost="true" size="3 3 33 33" sprite="stretched:session/icons/corners.png"/>
+			</object>
+		</repeat>
+	</object>
+</object>
+

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/selection_panels_left/formation_panel.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/selection_panels_left/garrison_panel.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/selection_panels_left/garrison_panel.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/gui/session/selection_panels_left/garrison_panel.xml	(revision 15388)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<object name="unitGarrisonPanel" size="24 12 100% 100%">
+	<object size="0 0 100% 100%">
+		<repeat count="12">
+			<object name="unitGarrisonButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" tooltip_style="sessionToolTipBottomBold" z="100">
+				<object name="unitGarrisonIcon[n]" type="image" ghost="true" size="3 3 33 33"/>
+				<object name="unitGarrisonCount[n]" ghost="true" style="groupIconsText" type="text" size="0 0 100% 100%"/>
+			</object>
+		</repeat>
+	</object>
+</object>

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/selection_panels_left/garrison_panel.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/selection_panels_left/stance_panel.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/selection_panels_left/stance_panel.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/gui/session/selection_panels_left/stance_panel.xml	(revision 15388)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Stance Selection -->
+<object name="unitStancePanel"
+	style="TranslucentPanel"
+	size="4 100%-43 100%-4 100%-4"
+	type="text"
+>
+	<object size="1 2 100% 100%">
+		<repeat count="5">
+			<object name="unitStanceButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" tooltip_style="sessionToolTipBottomBold" z="100">
+				<object name="unitStanceIcon[n]" type="image" ghost="true" size="3 3 33 33"/>
+				<object name="unitStanceSelection[n]" hidden="true" type="image" ghost="true" size="3 3 33 33" sprite="stretched:session/icons/corners.png"/>
+			</object>
+		</repeat>
+	</object>
+</object>

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/selection_panels_left/stance_panel.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/selection_panels_middle/multiple_details_area.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/selection_panels_middle/multiple_details_area.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/gui/session/selection_panels_middle/multiple_details_area.xml	(revision 15388)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Unit details for Multiple Units -->
+<object size="50%-112 0 50%+112 100%" name="detailsAreaMultiple">
+
+	<object name="unitSelectionPanel"
+		size="20 12 100%-20 100%"
+	>
+	<object size="0 0 100% 100%">
+		<repeat count="16">
+		<object name="unitSelectionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" tooltip_style="sessionToolTipBold" z="100">
+			<object name="unitSelectionIcon[n]" type="image" ghost="true" size="3 3 33 33"/>
+			<object name="unitSelectionCount[n]" ghost="true" style="groupIconsText" type="text" size="0 0 100% 100%"/>
+			<object size="0 100%-3 100% 100%" name="unitSelectionHealth[n]" ghost="true">
+			</object>
+		</object>
+		</repeat>
+	</object>
+	</object>
+
+	<!-- Total -->
+	<object size="100%-42 12 100%-8 46" type="image" sprite="groupsIcon">
+	<object size="0 0 100% 100%" type="text" style="largeCenteredOutlinedText" name="numberOfUnits"/>
+	</object>
+
+	<!-- Stats Bars -->
+	<object size= "100%-38 50 100%-18 100%-44" type="image" tooltip_style="sessionToolTip">
+	<!-- Health bar -->
+	<object size="4 0 11 100%" type="image" name="healthMultiple" tooltip_style="sessionToolTip">
+		<translatableAttribute id="tooltip">Hitpoints</translatableAttribute>
+		<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
+		<object type="image" sprite="healthBackground" ghost="true"/>
+		<object type="image" sprite="healthForeground" ghost="true" name="healthBarMultiple"/>
+		<object type="image" sprite="statsBarShaderVertical" ghost="true"/>
+	</object>
+
+	<!-- Stamina bar -->
+	<object size="15 0 22 100%" type="image" name="staminaMultiple" tooltip_style="sessionToolTipBold">
+		<translatableAttribute id="tooltip">Stamina</translatableAttribute>
+		<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
+		<object type="image" sprite="staminaBackground" ghost="true"/>
+		<object type="image" sprite="staminaForeground" ghost="true" name="staminaBarMultiple"/>
+		<object type="image" sprite="statsBarShaderVertical" ghost="true"/>
+	</object>
+	</object>
+</object>
+

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/selection_panels_middle/multiple_details_area.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/selection_panels_middle/single_details_area.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/selection_panels_middle/single_details_area.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/gui/session/selection_panels_middle/single_details_area.xml	(revision 15388)
@@ -0,0 +1,108 @@
+<?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">
+		<object size="0 0 100% 16" name="healthLabel" type="text" style="StatsTextLeft" ghost="true">
+			<translatableAttribute id="tooltip">Health:</translatableAttribute>
+		</object>
+		<object size="0 0 100% 16" name="healthStats" type="text" style="StatsTextRight" ghost="true"/>
+		<object size="1 16 100% 23" name="health" type="image">
+			<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
+			<object type="image" sprite="healthBackground" ghost="true"/>
+			<object type="image" sprite="healthForeground" ghost="true" name="healthBar"/>
+			<object type="image" sprite="statsBarShaderHorizontal" ghost="true"/>
+		</object>
+		</object>
+
+		<!-- Stamina bar -->
+		<object size="88 28 100% 52" name="staminaSection">
+		<object size="0 0 100% 16" name="staminaLabel" type="text" style="StatsTextLeft" ghost="true">
+			<translatableAttribute id="tooltip">Stamina:</translatableAttribute>
+		</object>
+		<object size="0 0 100% 16" name="staminaStats" type="text" style="StatsTextRight" ghost="true"/>
+		<object size="1 16 100% 23" name="stamina" type="image">
+			<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
+			<object type="image" sprite="staminaBackground" ghost="true"/>
+			<object type="image" sprite="staminaForeground" ghost="true" name="staminaBar"/>
+			<object type="image" sprite="statsBarShaderHorizontal" ghost="true"/>
+		</object>
+		</object>
+
+		<!-- Resource bar -->
+		<object size="88 28 100% 52" name="resourceSection">
+		<object size="0 0 100% 16" name="resourceLabel" type="text" style="StatsTextLeft" ghost="true"/>
+		<object size="0 0 100% 16" name="resourceStats" type="text" style="StatsTextRight" ghost="true"/>
+		<object size="1 16 100% 23" name="resources" type="image">
+			<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
+			<object type="image" sprite="resourceBackground" ghost="true"/>
+			<object type="image" sprite="resourceForeground" ghost="true" name="resourceBar"/>
+			<object type="image" sprite="statsBarShaderHorizontal" ghost="true"/>
+		</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">
+			<translatableAttribute id="tooltip">Attack and Armor</translatableAttribute>
+		</object>
+
+		<!-- Resource carrying icon/counter -->
+		<!-- Used also for number of gatherers/builders -->
+		<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>
+			<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
+			<object type="image" sprite="experienceBackground" ghost="true"/>
+			<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"/>
+
+		<!-- 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>
+	</object>
+
+</object>
+

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/selection_panels_middle/single_details_area.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/selection_panels_middle/unit_commands.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/selection_panels_middle/unit_commands.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/gui/session/selection_panels_middle/unit_commands.xml	(revision 15388)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Unit Commands -->
+<object name="unitCommandPanel"
+	size="0 100%-36 100% 100%-4"
+	type="image"
+	z="30"
+>
+	<object size="0 1 100% 100%">
+	<repeat count="6">
+		<object name="unitCommandButton[n]" hidden="true" style="iconButton" type="button" size="0 0 32 32" tooltip_style="sessionToolTipBottomBold">
+		<object name="unitCommandIcon[n]" ghost="true" type="image" size="0 0 100% 100%" style="commandIcon"/>
+		<object name="unitCommandCount[n]" ghost="true" style="groupIconsText" type="text" size="0 0 100% 100%"/>
+		</object>
+	</repeat>
+	</object>
+	<!-- shading for unit commands area -->
+	<object z="50" size="4 100% 100%-4 100%" ghost="true" type="image" sprite="bottomEdgedPanelShader"/>
+</object>
+

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/selection_panels_middle/unit_commands.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/selection_panels_right/construction_panel.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/selection_panels_right/construction_panel.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/gui/session/selection_panels_right/construction_panel.xml	(revision 15388)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<object name="unitConstructionPanel"
+	size="10 12 100% 100%"
+>
+	<object size="0 0 100% 100%">
+	<repeat count="24">
+		<object name="unitConstructionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
+		<object name="unitConstructionIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
+		<object name="unitConstructionUnaffordable[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="colour: 255 0 0 127"/>
+		</object>
+	</repeat>
+	</object>
+</object>

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/selection_panels_right/construction_panel.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/selection_panels_right/gate_panel.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/selection_panels_right/gate_panel.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/gui/session/selection_panels_right/gate_panel.xml	(revision 15388)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<object name="unitGatePanel"
+	size="10 12 100% 100%"
+>
+	<object size="0 0 100% 100%">
+	<repeat count="8">
+		<object name="unitGateButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
+		<object name="unitGateIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
+		<object name="unitGateSelection[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="stretched:session/icons/corners.png"/>
+		<object name="unitGateUnaffordable[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="colour: 255 0 0 127"/>
+		</object>
+	</repeat>
+	</object>
+</object>

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/selection_panels_right/gate_panel.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/selection_panels_right/pack_panel.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/selection_panels_right/pack_panel.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/gui/session/selection_panels_right/pack_panel.xml	(revision 15388)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<object name="unitPackPanel"
+	size="10 12 100% 100%"
+>
+	<object size="0 0 100% 100%">
+	<repeat count="8">
+		<object name="unitPackButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
+		<object name="unitPackIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
+		</object>
+	</repeat>
+	</object>
+</object>

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/selection_panels_right/pack_panel.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/selection_panels_right/queue_panel.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/selection_panels_right/queue_panel.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/gui/session/selection_panels_right/queue_panel.xml	(revision 15388)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<object name="unitQueuePanel"
+	size="4 -56 100% 0"
+	type="image"
+	sprite="queuePanelShader"
+>
+	<object size="-4 -2 52 54" type="image" sprite="stretched:session/icons/production.png" tooltip_style="sessionToolTipBottom">
+		<translatableAttribute id="tooltip">Production queue</translatableAttribute>
+		<object name="queueProgress" ghost="true" style="iconButtonProgress" type="text"/>
+	</object>
+
+	<object size="48 6 100% 100%">
+	<repeat count="16">
+		<object name="unitQueueButton[n]" hidden="true" style="iconButton" type="button" size="0 0 40 40" tooltip_style="sessionToolTipBottom">
+		<object name="unitQueueIcon[n]" ghost="true" type="image" size="3 3 37 37"/>
+		<object name="unitQueueProgressSlider[n]" type="image" sprite="queueProgressSlider" ghost="true" size="3 3 37 37" z="20"/>
+		<object name="unitQueueCount[n]" ghost="true" style="groupIconsText" type="text" z="20"/>
+		</object>
+	</repeat>
+	</object>
+</object>

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/selection_panels_right/queue_panel.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/selection_panels_right/research_panel.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/selection_panels_right/research_panel.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/gui/session/selection_panels_right/research_panel.xml	(revision 15388)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<object name="unitResearchPanel"
+	size="10 100%-102 100% 100%"
+>
+	<object size="0 0 100% 100%">
+	<repeat count="16">
+		<object name="unitResearchButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
+		<object name="unitResearchIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
+		<object name="unitResearchUnchosenIcon[n]" type="image" hidden="true" ghost="true" size="3 3 43 43" sprite="stretched:session/icons/tech_pair_would_be_unavailable.png"/>
+		<object name="unitResearchUnaffordable[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="colour: 255 0 0 60"/>
+		</object>
+	</repeat>
+	<repeat count="8">
+		<object name="unitResearchPair[n]" hidden="true" size="0 0 46 92">
+		<object name="unitResearchPairIcon[n]" type="image" ghost="true" size="8 38 38 54" sprite="stretched:session/icons/vertical_pair.png"/>
+		</object>
+	</repeat>
+	</object>
+</object>

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/selection_panels_right/research_panel.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/selection_panels_right/training_panel.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/selection_panels_right/training_panel.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/gui/session/selection_panels_right/training_panel.xml	(revision 15388)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<object name="unitTrainingPanel"
+	size="10 12 100% 100%"
+>
+	<object size="0 0 100% 100%">
+	<repeat count="24">
+		<object name="unitTrainingButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
+		<object name="unitTrainingIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
+		<object name="unitTrainingUnaffordable[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="colour: 255 0 0 127"/>
+		<object name="unitTrainingCount[n]" ghost="true" style="groupIconsText" type="text" z="20"/>
+		</object>
+	</repeat>
+	</object>
+</object>

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/selection_panels_right/training_panel.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/session.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/session.xml	(revision 15387)
+++ ps/trunk/binaries/data/mods/public/gui/session/session.xml	(revision 15388)
@@ -1,811 +1,332 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <objects>
 
 <script file="gui/common/functions_civinfo.js"/>
 <script file="gui/common/functions_utility.js"/>
 <script file="gui/common/functions_global_object.js"/>
 <script file="gui/common/music.js"/>
 <script file="gui/common/timer.js"/>
 <script file="gui/common/colorFades.js"/>
 <!-- load all scripts in this directory -->
 <script directory="gui/session/"/>
 
 <object name="sn" hotkey="session.gui.toggle">
 	<action on="Tick">
 		onTick();
 	</action>
 
 	<action on="SimulationUpdate">
 		onSimulationUpdate();
 	</action>
 
 	<action on="Press">
 		this.hidden = !this.hidden;
 	</action>
 
 	<!-- ================================  ================================ -->
 	<!-- HOTKEYS (For some reason, they won't work properly unless outside menu) -->
 	<!-- ================================  ================================ -->
 
 	<!-- hotkeys are in a separate directory -->
 	<include directory="gui/session/hotkeys/"/>
 
 	<!-- ================================  ================================ -->
 	<!-- Developer / Debug items -->
 	<!-- ================================  ================================ -->
 
 	<!-- Debug text -->
 	<object name="debug"
 		type="text"
 		size="0 70 80% 100%"
 		ghost="true"
 		textcolor="yellow"
 		font="mono-stroke-10"
 	/>
 
 	<!-- Dev/cheat commands -->
 	<object name="devCommands" size="100%-225 50%-88 100%-8 50%+104" type="image" sprite="devCommandsBackground" z="40"
 		hidden="true" hotkey="session.devcommands.toggle">
 		<action on="Press">toggleDeveloperOverlay();</action>
 
 		<object size="0 0 100%-18 16" type="text" style="devCommandsText">
 			<translatableAttribute id="caption">Control all units</translatableAttribute>
 		</object>
 		<object size="100%-16 0 100% 16" type="checkbox" name="devControlAll" style="ModernTickBox">
 			<action on="Press">
 				g_DevSettings.controlAll = this.checked;
 				Engine.PostNetworkCommand( {"type": "control-all", "flag": this.checked} );
 			</action>
 		</object>
 
 		<object size="0 16 100%-18 32" type="text" style="devCommandsText">
 			<translatableAttribute id="caption">Change perspective</translatableAttribute>
 		</object>
 		<object size="100%-16 16 100% 32" type="checkbox" style="ModernTickBox">
 			<action on="Press">Engine.GetGUIObjectByName("viewPlayer").hidden = !this.checked;</action>
 		</object>
 
 		<object size="0 32 100%-18 48" type="text" style="devCommandsText">
 			<translatableAttribute id="caption">Display selection state</translatableAttribute>
 		</object>
 		<object size="100%-16 32 100% 48" type="checkbox" name="devDisplayState" style="ModernTickBox"/>
 
 		<object size="0 48 100%-18 64" type="text" style="devCommandsText">
 			<translatableAttribute id="caption">Pathfinder overlay</translatableAttribute>
 		</object>
 		<object size="100%-16 48 100% 64" type="checkbox" style="ModernTickBox">
 			<action on="Press">Engine.GuiInterfaceCall("SetPathfinderDebugOverlay", this.checked);</action>
 		</object>
 
 		<object size="0 64 100%-18 80" type="text" style="devCommandsText">
 			<translatableAttribute id="caption">Obstruction overlay</translatableAttribute>
 		</object>
 		<object size="100%-16 64 100% 80" type="checkbox" style="ModernTickBox">
 			<action on="Press">Engine.GuiInterfaceCall("SetObstructionDebugOverlay", this.checked);</action>
 		</object>
 
 		<object size="0 80 100%-18 96" type="text" style="devCommandsText">
 			<translatableAttribute id="caption">Unit motion overlay</translatableAttribute>
 		</object>
 		<object size="100%-16 80 100% 96" type="checkbox" style="ModernTickBox">
 			<action on="Press">g_Selection.SetMotionDebugOverlay(this.checked);</action>
 		</object>
 
 		<object size="0 96 100%-18 112" type="text" style="devCommandsText">
 			<translatableAttribute id="caption">Range overlay</translatableAttribute>
 		</object>
 		<object size="100%-16 96 100% 112" type="checkbox" style="ModernTickBox">
 			<action on="Press">Engine.GuiInterfaceCall("SetRangeDebugOverlay", this.checked);</action>
 		</object>
 
 		<object size="0 112 100%-18 128" type="text" style="devCommandsText">
 			<translatableAttribute id="caption">Bounding box overlay</translatableAttribute>
 		</object>
 		<object size="100%-16 112 100% 128" type="checkbox" style="ModernTickBox">
 			<action on="Press">Engine.SetBoundingBoxDebugOverlay(this.checked);</action>
 		</object>
 
 		<object size="0 128 100%-18 144" type="text" style="devCommandsText">
 			<translatableAttribute id="caption">Restrict camera</translatableAttribute>
 		</object>
 		<object size="100%-16 128 100% 144" type="checkbox" style="ModernTickBox" checked="true">
 			<action on="Press">
 				Engine.GameView_SetConstrainCameraEnabled(this.checked);
 				// Make selection more durable at the expense of speed if unchecked.
 				if (this.checked)
 					SELECTION_SEARCH_RADIUS -= 200;
 				else
 					SELECTION_SEARCH_RADIUS += 200; 
 			</action>
 		</object>
 
 		<object size="0 144 100%-18 160" type="text" style="devCommandsText">
 			<translatableAttribute id="caption">Reveal map</translatableAttribute>
 		</object>
 		<object size="100%-16 144 100% 160" type="checkbox" name="devCommandsRevealMap" style="ModernTickBox">
 			<action on="Load">this.checked = Engine.GuiInterfaceCall("IsMapRevealed");</action>
 			<action on="Press">Engine.PostNetworkCommand({"type": "reveal-map", "enable": this.checked});</action>
 		</object>
 
 		<object size="0 160 100%-18 176" type="text" style="devCommandsText">
 			<translatableAttribute id="caption">Enable time warp</translatableAttribute>
 		</object>
 			<object size="100%-16 160 100% 176" type="checkbox" name="devTimeWarp" style="ModernTickBox">
 			<action on="Press">
 				if (this.checked)
 				showTimeWarpMessageBox();
 				Engine.EnableTimeWarpRecording(this.checked ? 10 : 0);</action>
 		</object>
 
 		<object size="0 176 100%-18 192" type="text" style="devCommandsText">
 			<translatableAttribute id="caption">Promote selected units</translatableAttribute>
 		</object>
 		<object size="100%-16 176 100% 192" type="button" style="ModernTickBox">
 			<action on="Press">Engine.PostNetworkCommand({"type": "promote", "entities": g_Selection.toList()});</action>
 		</object>
 	</object>
 
 	<!-- ================================  ================================ -->
 	<!-- Time elapsed counter -->
 	<!-- ================================  ================================ -->
 	
 	<object size="100%-120 45 100%-10 65" type="text" name="timeElapsedCounter" style="SettingsText" hotkey="timeelapsedcounter.toggle" hidden="true">
 	    <action on="Press">this.hidden = !this.hidden;</action>
 	</object>
 
 	<!-- ================================  ================================ -->
 	<!-- 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 50%-20 50%+128 50%+20" type="text" style="PauseText" ghost="true" z="0">
 			<translatableAttribute id="caption">Game Paused</translatableAttribute>
 		</object>
 		<object size="50%-128 50%+20 50%+128 50%+30" type="text" style="PauseMessageText" ghost="true" z="0">
 			<translatableAttribute id="caption">Click to Resume Game</translatableAttribute>
 		</object>
 	    <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>
 	<object name="timeNotificationPanel" type="image" size="100%-600 60 100%-20 120" ghost="true">
 	    <object name="timeNotificationText" size="0 0 100% 100%" type="text" style="notificationPanel" ghost="true"/>
 	</object>
 
 
 	<!-- ================================  ================================ -->
 	<!-- Chat -->
 	<!-- ================================  ================================ -->
 
 	<!-- Chat panel -->
 	<object name="chatPanel" size="0 130 100% 100%-240" type="image" ghost="true">
 	    <object name="chatText" size="3 1 100%-1 100%-1" type="text" style="chatPanel" ghost="true"/>
 	</object>
 
 	<!-- Chat window -->
 	<object name="chatDialogPanel" size="50%-180 50%-48 50%+180 50%+36" type="image" hidden="true" sprite="genericPanel">
 		<object name="chatInput" size="16 12 100%-16 36" type="input" style="ModernInput" max_length="80">
 			<action on="Press">submitChatInput();</action>
 		</object>
 
 		<object size="16 100%-40 30%+16 100%-12" type="button" style="StoneButton">
 			<translatableAttribute id="caption">Cancel</translatableAttribute>
 			<action on="Press">closeChat();</action>
 		</object>
 
 		<object name="toggleTeamChat" size="30%+22 100%-36 30%+40 100%-6" type="checkbox" style="ModernTickBox"/>
 		<object size="30%+40 100%-40 60%+16 100%-12" type="text"  style="ModernLeftLabelText">
 			<translatableAttribute id="caption">Team Only</translatableAttribute>
 		</object>
 
 		<object size="60%+16 100%-40 100%-16 100%-12" type="button" style="StoneButton">
 			<translatableAttribute id="caption">Send</translatableAttribute>
 			<action on="Press">submitChatInput();</action>
 		</object>
 	</object>
 
 	<!-- ================================  ================================ -->
 	<!-- Diplomacy Window -->
 	<!-- ================================  ================================ -->
 	<include file="gui/session/diplomacy_window.xml"/>
 
 	<!-- ================================  ================================ -->
 	<!-- Trade Window -->
 	<!-- ================================  ================================ -->
 	<include file="gui/session/trade_window.xml"/>
 	
 	<!-- ================================  ================================ -->
 	<!-- Top Panel  -->
 	<!-- ================================  ================================ -->
 	<include file="gui/session/top_panel.xml"/>
 
 	<!-- ================================  ================================ -->
 	<!-- Menu -->
 	<!-- ================================  ================================ -->
-	<object name="menu"
-		style="StonePanelThinBorder"
-		type="image"
-		hidden="false"
-		z="40"
-	>
-	    <object size="4 36 100%-4 50%+20">
-		
-			<!-- Manual button -->
-			<object type="button"
-				name="manualButton"
-				style="StoneButtonFancy"
-				size="0 0 100% 28"
-				tooltip_style="sessionToolTip"
-			>
-				<translatableAttribute id="caption">Manual</translatableAttribute>
-				<action on="Press">openManual();</action>
-			</object>
-			
-			<!-- Chat button -->
-			<object type="button"
-				name="chatButton"
-				style="StoneButtonFancy"
-				size="0 32 100% 60"
-				tooltip_style="sessionToolTip"
-			>
-				<translatableAttribute id="caption">Chat</translatableAttribute>
-				<action on="Press">chatMenuButton();</action>
-			</object>
-
-			<!-- Save game button -->
-			<object type="button"
-				name="saveGameButton"
-				style="StoneButtonFancy"
-				size="0 64 100% 92"
-				tooltip_style="sessionToolTip"
-			>
-				<translatableAttribute id="caption">Save</translatableAttribute>
-				<action on="Press">
-				openSave();
-				</action>
-			</object>
-			
-			<!-- Settings button -->
-			<object type="button"
-				name="settingsButton"
-				style="StoneButtonFancy"
-				size="0 96 100% 124"
-				tooltip_style="sessionToolTip"
-			>
-				<translatableAttribute id="caption">Settings</translatableAttribute>
-				<action on="Press">settingsMenuButton();</action>
-			</object>
-
-			<!-- Pause / Resume Button -->
-			<object type="button"
-				name="pauseButton"
-				style="StoneButtonFancy"
-				size="0 128 100% 156"
-				tooltip_style="sessionToolTip"
-			>
-				<object name="pauseButtonText" type="text" style="CenteredButtonText" ghost="true">
-					<translatableAttribute id="caption">Pause</translatableAttribute>
-				</object>
-				<action on="Press">togglePause();</action>
-			</object>
-			
-			<!-- Resign button -->
-			<object type="button"
-				name="menuResignButton"
-				style="StoneButtonFancy"
-				size="0 160 100% 188"
-				tooltip_style="sessionToolTip"
-			>
-				<translatableAttribute id="caption">Resign</translatableAttribute>
-				<action on="Press">resignMenuButton();</action>
-			</object>
-			
-			<!-- Exit button -->
-			<object type="button"
-				name="menuExitButton"
-				style="StoneButtonFancy"
-				size="0 192 100% 220"
-				tooltip_style="sessionToolTip"
-			>
-				<translatableAttribute id="caption">Exit</translatableAttribute>
-				<action on="Press">exitMenuButton();</action>
-			</object>
-		</object>
-	</object>
-
-	<!-- In-progress research -->
-	<object size="100%-50 85 100%-10 100%-200">
-		<repeat count="10">
-			<object name="researchStartedButton[n]" hidden="true" style="iconButton" type="button" size="0 0 40 40" tooltip_style="sessionToolTipBottom">
-				<object name="researchStartedIcon[n]" ghost="true" type="image" size="3 3 37 37"/>
-				<object name="researchStartedProgressSlider[n]" type="image" sprite="queueProgressSlider" ghost="true" size="3 3 37 37"/>
-			</object>
-		</repeat>
-	</object>
+	<include file="gui/session/menu.xml"/>
 
 	<!-- ================================  ================================ -->
-	<!-- Hero Selection -->
+	<!-- Session objects                                                    -->
+	<!-- Contains miscellanious objects s.a.: the technology research -->
+	<!-- progress, group selection icons, and the hero selection icon -->
 	<!-- ================================  ================================ -->
-	<object
-		name="unitHeroPanel"
-		size="0 36 50 93"
-		hidden="true"
-	>
-		<object name="unitHeroButton" size="0 0 50 50" type="button" style="iconButton" 
-			tooltip_style="sessionToolTip">
-			<translatableAttribute id="tooltip">Attack and Armor</translatableAttribute>
-			<object name="unitHeroImage" size="5 5 100%-5 100%-5" type="image" ghost="true"/>
-			<object name="heroHitOverlay" hidden="true" type="image" ghost="true" size="5 5 100%-5 100%-5"/> 
-		</object>
-		<!-- Hero Health bar -->
-		<object size="3 100%-7 100%-3 100%-2" name="heroHealthSection" ghost="true">
-			<object size="0 0 100% 5" name="heroHealth" type="image" ghost="true">
-				<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
-				<object type="image" sprite="healthBackground" ghost="true"/> 
-				<object type="image" sprite="healthForeground" ghost="true" name="heroHealthBar"/> 
-				<object type="image" sprite="statsBarShaderHorizontal" ghost="true"/>
-			</object>
-		</object>
-	</object>
-
-	<!-- ================================  ================================ -->
-	<!-- Unit Selection Groups -->
-	<!-- ================================  ================================ -->
-	<object
-		name="unitGroupPanel"
-		size="0% 50%-216 0%+36 50%+144"
-	>
-		<repeat count="10">
-			<object name="unitGroupButton[n]" size="0 0 36 36" type="button" hidden="false" style="iconButton" tooltip_style="sessionToolTipBottomBold">
-				<translatableAttribute id="tooltip">Click to select grouped units, double-click to focus the grouped units and right-click to disband the group.</translatableAttribute>
-				<object name="unitGroupIcon[n]" size="3 3 33 33" type="image" sprite="groupsIcon" ghost="true"/>
-				<object name="unitGroupLabel[n]" type="text" style="largeCenteredOutlinedText" ghost="true"/>
-			</object>
-		</repeat>
-	</object>
+	<include directory="gui/session/session_objects/"/>
 
 	<!-- ================================  ================================ -->
 	<!-- Information tooltip -->
 	<!-- Follows the mouse around if 'independent' is set to 'true'. -->
 	<!-- ================================  ================================ -->
 	<object name="informationTooltip" type="tooltip" independent="true" style="informationTooltip"/>
 
 	<!-- ================================  ================================ -->
 	<!-- Building placement info tooltip -->
 	<!-- ================================  ================================ -->
 	<object name="placementTooltip" type="tooltip" independent="true" style="informationTooltip"/>
 
 	<!-- ================================  ================================ -->
 	<!-- START of BOTTOM PANEL -->
+	<!-- limit to the minimal supported width of 1024px -->
 	<!-- ================================  ================================ -->
+	<object size="50%-512 0 50%+512 100%">
 
-	<object size="50%-512 100%-180 50%+512 100%">
-
-	<!-- ================================  ================================ -->
-	<!-- Minimap -->
-	<!-- ================================  ================================ -->
-	<object
-		name="minimapPanel"
-		size="0 100%-212 212 100%"
-		type="image"
-		sprite="mapPanel"
-	>
-		<!-- Idle Worker Button -->
-		<object size="100%-80 100%-80 100%-5 100%-5">
-			<!-- TODO: We should disable this button if there are no idle workers. -->
-			<object type="button"
-				tooltip_style="sessionToolTip"
-				hotkey="selection.idleworker"
-			>
-				<translatableAttribute id="tooltip">Find idle worker</translatableAttribute>
-				<action on="Press">findIdleUnit(["Female", "Trade", "FishingBoat", "CitizenSoldier", "Healer"]);</action>
-				<action on="MouseEnter">Engine.GetGUIObjectByName("idleOverlay").sprite = "stretched:session/minimap-idle-highlight.png";</action>
-				<action on="MouseLeave">Engine.GetGUIObjectByName("idleOverlay").sprite = "stretched:session/minimap-idle.png";</action>
-				<action on="MouseLeftPress">Engine.GetGUIObjectByName("idleOverlay").sprite = "stretched:session/minimap-idle.png";</action>
-				<action on="MouseLeftRelease">Engine.GetGUIObjectByName("idleOverlay").sprite = "stretched:session/minimap-idle-highlight.png";</action>
-			</object>
-		</object>
+		<!-- ================================  ================================ -->
 		<!-- Minimap -->
-		<object name="minimap"
-			type="minimap" z="20"
-			size="8 8 100%-8 100%-8"
-		>
-			<action on="WorldClick">handleMinimapEvent(arguments[0]);</action>
-		</object>
-		<!-- Overlays -->
-		<object name="minimapOverlay" size="4 4 100%-4 100%-4" type="image" sprite="stretched:session/minimap_circle_modern.png" ghost="true"/>
-		<object name="idleOverlay" z="100" size="100%-125 100%-125 100%-5 100%-5" type="image" sprite="stretched:session/minimap-idle.png" ghost="true"/>
-	</object>
+		<!-- ================================  ================================ -->
+		<include file="gui/session/minimap_panel.xml"/>
 
-	<!-- ================================  ================================ -->
-	<!-- Supplemental Details Panel (Left of Selection Details) -->
-	<!-- ================================  ================================ -->
-	<object size="50%-304 100%-170 50%-110 100%" name="supplementalSelectionDetails" type="image" sprite="supplementalDetailsPanel" z="20">
 
-		<object name="unitFormationPanel" size="24 12 100% 100%">
-			<object size="0 0 100% 100%">
-				<repeat count="16">
-					<object name="unitFormationButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" tooltip_style="sessionToolTipBottomBold" z="100">
-						<object name="unitFormationIcon[n]" type="image" ghost="true" size="3 3 33 33"/>
-						<object name="unitFormationSelection[n]" hidden="true" type="image" ghost="true" size="3 3 33 33" sprite="stretched:session/icons/corners.png"/>
-					</object>
-				</repeat>
-			</object>
-		</object>
-
-		<object name="unitGarrisonPanel" size="24 12 100% 100%">
-			<object size="0 0 100% 100%">
-				<repeat count="12">
-					<object name="unitGarrisonButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" tooltip_style="sessionToolTipBottomBold" z="100">
-						<object name="unitGarrisonIcon[n]" type="image" ghost="true" size="3 3 33 33"/>
-						<object name="unitGarrisonCount[n]" ghost="true" style="groupIconsText" type="text" size="0 0 100% 100%"/>
-					</object>
-				</repeat>
-			</object>
-		</object>
-
-		<object name="unitBarterPanel" 
-			size="6 36 100% 100%"
-			hidden="true"
-		>
-			<object ghost="true" style="resourceText" type="text" size="0 0 100% 20">
-				<translatableAttribute id="tooltip">Exchange resources:</translatableAttribute>
-			</object>
-		    <object size="0 32 100% 124">
-			<repeat count="4">
-				<!-- sell -->
-			    <object name="unitBarterSellButton[n]" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottomBold">
-				<object name="unitBarterSellIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
-				<object name="unitBarterSellUnaffordable[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="colour: 255 0 0 60"/>
-				<object name="unitBarterSellAmount[n]" ghost="true" style="resourceText" type="text" size="0 0 100% 50%"/>
-				<object name="unitBarterSellSelection[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="stretched:session/icons/corners.png"/>
-			    </object>
-				<!-- buy -->
-			    <object name="unitBarterBuyButton[n]" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottomBold">
-				<object name="unitBarterBuyIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
-				<object name="unitBarterBuyAmount[n]" ghost="true" style="resourceText" type="text" size="0 0 100% 50%"/>
-			    </object>
-			</repeat>
-		    </object>
-		</object>
-
-		<!-- Stance Selection -->
-		<object name="unitStancePanel"
-			style="TranslucentPanel"
-			size="4 100%-43 100%-4 100%-4"
-			type="text"
+		<!-- ================================  ================================ -->
+		<!-- Supplemental Details Panel (Left of Selection Details) -->
+		<!-- ================================  ================================ -->
+		<object 
+			size="50%-304 100%-170 50%-110 100%"
+			name="supplementalSelectionDetails"
+			type="image"
+			sprite="supplementalDetailsPanel"
+			z="20"
 		>
-		    <object size="1 2 100% 100%">
-			<repeat count="5">
-			    <object name="unitStanceButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" tooltip_style="sessionToolTipBottomBold" z="100">
-				<object name="unitStanceIcon[n]" type="image" ghost="true" size="3 3 33 33"/>
-				<object name="unitStanceSelection[n]" hidden="true" type="image" ghost="true" size="3 3 33 33" sprite="stretched:session/icons/corners.png"/>
-			    </object>
-			</repeat>
-		    </object>
+			<include directory="gui/session/selection_panels_left/"/>
 		</object>
-	    </object>
+
 
 	    <!-- ================================  ================================ -->
 	    <!-- Selection Details Panel (Middle) -->
 	    <!-- ================================  ================================ -->
 	    <object name="selectionDetails"
 		    type="image"
 		    sprite="selectionDetailsPanel"
 		    size="50%-114 100%-205 50%+114 100%"
 		    hidden="false"
 	    >
-		<!-- 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">
-				<object size="0 0 100% 16" name="healthLabel" type="text" style="StatsTextLeft" ghost="true">
-					<translatableAttribute id="tooltip">Health:</translatableAttribute>
-				</object>
-				<object size="0 0 100% 16" name="healthStats" type="text" style="StatsTextRight" ghost="true"/>
-				<object size="1 16 100% 23" name="health" type="image">
-				    <object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
-				    <object type="image" sprite="healthBackground" ghost="true"/>
-				    <object type="image" sprite="healthForeground" ghost="true" name="healthBar"/>
-				    <object type="image" sprite="statsBarShaderHorizontal" ghost="true"/>
-				</object>
-			    </object>
-
-			    <!-- Stamina bar -->
-			    <object size="88 28 100% 52" name="staminaSection">
-				<object size="0 0 100% 16" name="staminaLabel" type="text" style="StatsTextLeft" ghost="true">
-					<translatableAttribute id="tooltip">Stamina:</translatableAttribute>
-				</object>
-				<object size="0 0 100% 16" name="staminaStats" type="text" style="StatsTextRight" ghost="true"/>
-				<object size="1 16 100% 23" name="stamina" type="image">
-				    <object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
-				    <object type="image" sprite="staminaBackground" ghost="true"/>
-				    <object type="image" sprite="staminaForeground" ghost="true" name="staminaBar"/>
-				    <object type="image" sprite="statsBarShaderHorizontal" ghost="true"/>
-				</object>
-			    </object>
-
-			    <!-- Resource bar -->
-			    <object size="88 28 100% 52" name="resourceSection">
-				<object size="0 0 100% 16" name="resourceLabel" type="text" style="StatsTextLeft" ghost="true"/>
-				<object size="0 0 100% 16" name="resourceStats" type="text" style="StatsTextRight" ghost="true"/>
-				<object size="1 16 100% 23" name="resources" type="image">
-				    <object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
-				    <object type="image" sprite="resourceBackground" ghost="true"/>
-				    <object type="image" sprite="resourceForeground" ghost="true" name="resourceBar"/>
-				    <object type="image" sprite="statsBarShaderHorizontal" ghost="true"/>
-				</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">
-					<translatableAttribute id="tooltip">Attack and Armor</translatableAttribute>
-				</object>
-
-			    <!-- Resource carrying icon/counter -->
-			    <!-- Used also for number of gatherers/builders -->
-			    <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>
-					<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
-					<object type="image" sprite="experienceBackground" ghost="true"/>
-					<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"/>
-
-			    <!-- 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>
-		    </object>
-
-		</object>
-
-		<!-- Unit details for Multiple Units -->
-		<object size="50%-112 0 50%+112 100%" name="detailsAreaMultiple">
-
-		    <object name="unitSelectionPanel"
-			    size="20 12 100%-20 100%"
-		    >
-			<object size="0 0 100% 100%">
-			    <repeat count="16">
-				<object name="unitSelectionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" tooltip_style="sessionToolTipBold" z="100">
-				    <object name="unitSelectionIcon[n]" type="image" ghost="true" size="3 3 33 33"/>
-				    <object name="unitSelectionCount[n]" ghost="true" style="groupIconsText" type="text" size="0 0 100% 100%"/>
-				    <object size="0 100%-3 100% 100%" name="unitSelectionHealth[n]" ghost="true">
-				    </object>
-				</object>
-			    </repeat>
-			</object>
-		    </object>
-
-		    <!-- Total -->
-		    <object size="100%-42 12 100%-8 46" type="image" sprite="groupsIcon">
-			<object size="0 0 100% 100%" type="text" style="largeCenteredOutlinedText" name="numberOfUnits"/>
-		    </object>
-
-		    <!-- Stats Bars -->
-		    <object size= "100%-38 50 100%-18 100%-44" type="image" tooltip_style="sessionToolTip">
-			<!-- Health bar -->
-			<object size="4 0 11 100%" type="image" name="healthMultiple" tooltip_style="sessionToolTip">
-				<translatableAttribute id="tooltip">Hitpoints</translatableAttribute>
-			    <object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
-			    <object type="image" sprite="healthBackground" ghost="true"/>
-			    <object type="image" sprite="healthForeground" ghost="true" name="healthBarMultiple"/>
-			    <object type="image" sprite="statsBarShaderVertical" ghost="true"/>
-			</object>
-
-			<!-- Stamina bar -->
-			<object size="15 0 22 100%" type="image" name="staminaMultiple" tooltip_style="sessionToolTipBold">
-				<translatableAttribute id="tooltip">Stamina</translatableAttribute>
-			    <object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
-			    <object type="image" sprite="staminaBackground" ghost="true"/>
-			    <object type="image" sprite="staminaForeground" ghost="true" name="staminaBarMultiple"/>
-			    <object type="image" sprite="statsBarShaderVertical" ghost="true"/>
-			</object>
-		    </object>
-		</object>
-
-		<!-- Unit Commands -->
-		<object name="unitCommandPanel"
-			size="0 100%-36 100% 100%-4"
-			type="image"
-			z="30"
-		>
-		    <object size="0 1 100% 100%">
-			<repeat count="6">
-			    <object name="unitCommandButton[n]" hidden="true" style="iconButton" type="button" size="0 0 32 32" tooltip_style="sessionToolTipBottomBold">
-				<object name="unitCommandIcon[n]" ghost="true" type="image" size="0 0 100% 100%" style="commandIcon"/>
-				<object name="unitCommandCount[n]" ghost="true" style="groupIconsText" type="text" size="0 0 100% 100%"/>
-			    </object>
-			</repeat>
-		    </object>
-		</object>
-
-		<!-- shading for unit commands area -->
-		<object z="50" size="4 100%-36 100%-4 100%-4" ghost="true" type="image" sprite="bottomEdgedPanelShader"/>
-
-	    </object> <!-- END OF SELECTION DETAILS -->
+			<include directory="gui/session/selection_panels_middle/"/>
+	    </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"
 	    >
-		<object name="unitConstructionPanel"
-			size="10 12 100% 100%"
-		>
-		    <object size="0 0 100% 100%">
-			<repeat count="24">
-			    <object name="unitConstructionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
-				<object name="unitConstructionIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
-				<object name="unitConstructionUnaffordable[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="colour: 255 0 0 127"/>
-			    </object>
-			</repeat>
-		    </object>
-		</object>
-
-		<object name="unitResearchPanel"
-			size="10 100%-102 100% 100%"
-		>
-		    <object size="0 0 100% 100%">
-			<repeat count="16">
-			    <object name="unitResearchButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
-				<object name="unitResearchIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
-				<object name="unitResearchUnchosenIcon[n]" type="image" hidden="true" ghost="true" size="3 3 43 43" sprite="stretched:session/icons/tech_pair_would_be_unavailable.png"/>
-				<object name="unitResearchUnaffordable[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="colour: 255 0 0 60"/>
-			    </object>
-			</repeat>
-			<repeat count="8">
-			    <object name="unitResearchPair[n]" hidden="true" size="0 0 46 92">
-				<object name="unitResearchPairIcon[n]" type="image" ghost="true" size="8 38 38 54" sprite="stretched:session/icons/vertical_pair.png"/>
-			    </object>
-			</repeat>
-		    </object>
-		</object>
-
-		<object name="unitTrainingPanel"
-			size="10 12 100% 100%"
-		>
-		    <object size="0 0 100% 100%">
-			<repeat count="24">
-			    <object name="unitTrainingButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
-				<object name="unitTrainingIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
-				<object name="unitTrainingUnaffordable[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="colour: 255 0 0 127"/>
-				<object name="unitTrainingCount[n]" ghost="true" style="groupIconsText" type="text" z="20"/>
-			    </object>
-			</repeat>
-		    </object>
-		</object>
-
-		<object name="unitQueuePanel"
-			size="4 -56 100% 0"
-			type="image"
-			sprite="queuePanelShader"
-		>
-			<object size="-4 -2 52 54" type="image" sprite="stretched:session/icons/production.png" tooltip_style="sessionToolTipBottom">
-				<translatableAttribute id="tooltip">Production queue</translatableAttribute>
-				<object name="queueProgress" ghost="true" style="iconButtonProgress" type="text"/>
-			</object>
-
-		    <object size="48 6 100% 100%">
-			<repeat count="16">
-			    <object name="unitQueueButton[n]" hidden="true" style="iconButton" type="button" size="0 0 40 40" tooltip_style="sessionToolTipBottom">
-				<object name="unitQueueIcon[n]" ghost="true" type="image" size="3 3 37 37"/>
-				<object name="unitQueueProgressSlider[n]" type="image" sprite="queueProgressSlider" ghost="true" size="3 3 37 37" z="20"/>
-				<object name="unitQueueCount[n]" ghost="true" style="groupIconsText" type="text" z="20"/>
-			    </object>
-			</repeat>
-		    </object>
-		</object>
-
-		<object name="unitGatePanel"
-			size="10 12 100% 100%"
-		>
-		    <object size="0 0 100% 100%">
-			<repeat count="8">
-			    <object name="unitGateButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
-				<object name="unitGateIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
-				<object name="unitGateSelection[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="stretched:session/icons/corners.png"/>
-				<object name="unitGateUnaffordable[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="colour: 255 0 0 127"/>
-			    </object>
-			</repeat>
-		    </object>
-		</object>
-    
-    <object name="unitPackPanel"
-			size="10 12 100% 100%"
-		>
-		    <object size="0 0 100% 100%">
-			<repeat count="8">
-			    <object name="unitPackButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
-				<object name="unitPackIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
-			    </object>
-			</repeat>
-		    </object>
+			<include directory="gui/session/selection_panels_right/"/>
 		</object>
-	    </object> <!-- END OF UNIT COMMANDS -->
 	</object><!-- END OF BOTTOM PANEL -->
 </object> <!-- END OF SN OBJECT -->
 
 <!-- ================================  ================================ -->
 <!-- Selection bandbox -->
 <!-- ================================  ================================ -->
 <object name="bandbox" type="image" sprite="bandbox" ghost="true" hidden="true" z="200"/>
 
 <!-- ================================  ================================ -->
 <!-- Network status -->
 <!-- ================================  ================================ -->
 <object name="netStatus" type="text" style="netStatus" z="200" hidden="true">
 	<object type="button"
 		name="disconnectedExitButton"
 		style="StoneButton"
 		size="50%-84 50%+128 50%+84 50%+160"
 		tooltip_style="sessionToolTip"
 	>
 		<object size="0 0 100% 100%" type="text" style="CenteredButtonText" name="disconnectedExitButtonText" ghost="true">
 			<translatableAttribute id="caption">Exit</translatableAttribute>
 		</object>
 		<action on="Press">leaveGame()</action>
 	</object>
 </object>
 
 </objects>

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/session.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/session_objects/hero_icon.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/session_objects/hero_icon.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/gui/session/session_objects/hero_icon.xml	(revision 15388)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<object
+	name="unitHeroPanel"
+	size="0 36 50 93"
+	hidden="true"
+>
+	<object name="unitHeroButton" size="0 0 50 50" type="button" style="iconButton" 
+		tooltip_style="sessionToolTip">
+		<translatableAttribute id="tooltip">Attack and Armor</translatableAttribute>
+		<object name="unitHeroImage" size="5 5 100%-5 100%-5" type="image" ghost="true"/>
+		<object name="heroHitOverlay" hidden="true" type="image" ghost="true" size="5 5 100%-5 100%-5"/> 
+	</object>
+	<!-- Hero Health bar -->
+	<object size="3 100%-7 100%-3 100%-2" name="heroHealthSection" ghost="true">
+		<object size="0 0 100% 5" name="heroHealth" type="image" ghost="true">
+			<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
+			<object type="image" sprite="healthBackground" ghost="true"/> 
+			<object type="image" sprite="healthForeground" ghost="true" name="heroHealthBar"/> 
+			<object type="image" sprite="statsBarShaderHorizontal" ghost="true"/>
+		</object>
+	</object>
+</object>

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/session_objects/hero_icon.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/session_objects/research_progress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/session_objects/research_progress.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/gui/session/session_objects/research_progress.xml	(revision 15388)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<object size="100%-50 85 100%-10 100%-200">
+	<repeat count="10">
+		<object name="researchStartedButton[n]" hidden="true" style="iconButton" type="button" size="0 0 40 40" tooltip_style="sessionToolTipBottom">
+			<object name="researchStartedIcon[n]" ghost="true" type="image" size="3 3 37 37"/>
+			<object name="researchStartedProgressSlider[n]" type="image" sprite="queueProgressSlider" ghost="true" size="3 3 37 37"/>
+		</object>
+	</repeat>
+</object>

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/session_objects/research_progress.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/session_objects/selection_group_icons.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/session_objects/selection_group_icons.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/gui/session/session_objects/selection_group_icons.xml	(revision 15388)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<object
+	name="unitGroupPanel"
+	size="0% 50%-216 0%+36 50%+144"
+>
+	<repeat count="10">
+		<object name="unitGroupButton[n]" size="0 0 36 36" type="button" hidden="false" style="iconButton" tooltip_style="sessionToolTipBottomBold">
+			<translatableAttribute id="tooltip">Click to select grouped units, double-click to focus the grouped units and right-click to disband the group.</translatableAttribute>
+			<object name="unitGroupIcon[n]" size="3 3 33 33" type="image" sprite="groupsIcon" ghost="true"/>
+			<object name="unitGroupLabel[n]" type="text" style="largeCenteredOutlinedText" ghost="true"/>
+		</object>
+	</repeat>
+</object>

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/session_objects/selection_group_icons.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property