From c8cb07fb590004dfebc7080dd277a51d0b3f0b5b Mon Sep 17 00:00:00 2001
From: Acumen <stuart@wildfiregames.com>
Date: Fri, 15 Oct 2004 22:15:31 +0000
Subject: [PATCH] Updated GUI.

This was SVN commit r1247.
---
 .../data/mods/official/gui/test/1_global.xml  |   80 +-
 .../mods/official/gui/test/2_mainmenu.xml     |   46 +
 .../data/mods/official/gui/test/3_session.xml | 1125 +++++++++++++++++
 .../mods/official/gui/test/basefunctions.js   |  115 --
 .../official/gui/test/functions_pregame.js    |    0
 .../official/gui/test/functions_session.js    |  288 +++++
 .../mods/official/gui/test/functions_test.js  |   40 +
 ...tion.js => functions_utility_animation.js} |    0
 .../gui/test/functions_utility_debug.js       |    5 +
 .../gui/test/functions_utility_object.js      |   29 +
 .../data/mods/official/gui/test/hello.xml     |  434 +------
 .../data/mods/official/gui/test/setup.xml     |   17 +-
 .../data/mods/official/gui/test/sprite1.xml   |  590 ++++-----
 .../data/mods/official/gui/test/styles.xml    |    9 +
 binaries/data/mods/official/gui/test/test.js  |    1 -
 15 files changed, 1899 insertions(+), 880 deletions(-)
 delete mode 100755 binaries/data/mods/official/gui/test/basefunctions.js
 create mode 100755 binaries/data/mods/official/gui/test/functions_pregame.js
 create mode 100755 binaries/data/mods/official/gui/test/functions_session.js
 create mode 100755 binaries/data/mods/official/gui/test/functions_test.js
 rename binaries/data/mods/official/gui/test/{animation.js => functions_utility_animation.js} (100%)
 create mode 100755 binaries/data/mods/official/gui/test/functions_utility_debug.js
 create mode 100755 binaries/data/mods/official/gui/test/functions_utility_object.js
 delete mode 100755 binaries/data/mods/official/gui/test/test.js

diff --git a/binaries/data/mods/official/gui/test/1_global.xml b/binaries/data/mods/official/gui/test/1_global.xml
index 96dc0d03d6..9c88527235 100755
--- a/binaries/data/mods/official/gui/test/1_global.xml
+++ b/binaries/data/mods/official/gui/test/1_global.xml
@@ -4,17 +4,77 @@
 
 <objects>
 
-<!--
-==========================================
- - GLOBAL SCRIPTS -
-==========================================
--->
+	<!--
+	==========================================
+	 - SCRIPT DECLARATIONS -
+	==========================================
+	-->
 
+	<script file="gui/test/functions_utility_object.js"><![CDATA[
+	]]></script>
 
-<!--
-==========================================
- - GLOBAL OBJECTS -
-==========================================
--->
+	<script file="gui/test/functions_utility_animation.js"><![CDATA[
+	]]></script>
+
+	<script file="gui/test/functions_utility_debug.js"><![CDATA[
+	]]></script>
+
+	<script file="gui/test/functions_test.js"><![CDATA[
+	]]></script>
+
+	<script file="gui/test/functions_pregame.js"><![CDATA[
+	]]></script>
+
+	<script file="gui/test/functions_session.js"><![CDATA[
+		initSession();
+		writeConsole("Loaded GUI functions.");
+	]]></script>
+
+	<!--
+	==========================================
+	 - GLOBAL OBJECTS -
+	==========================================
+	-->
+
+	<object type="empty" name="always_on" hotkey="alwayson.toggle" size="0 0 100% 100%" z="1" hidden="false">
+		<action on="Press"><![CDATA[
+			GUIObjectToggle("always_on");
+		]]></action>
+
+		<object type="button" name="exit_button" sprite="exit_sprite" sprite-over="exit_sprite-over" size="100%-18 2 100%-2 18" z="1000" hidden="false">
+			<action on="Press"><![CDATA[
+				exit();
+			]]></action>
+
+			<!--  START temporary code
+			This code only applies to the main menu, I don't know how it'll behave ingame. It is temporary and should be removed as soon as we got proper tooltip support implemented. -->
+			<action on="MouseEnter"><![CDATA[
+				tooltipObject = getGUIObjectByName("pregame-mainmenu-tooltip");
+				tooltipObject.caption = "Tired of 0 A.D. ? Click here to leave and reenter the real world.";
+				GUIObjectUnhide("pregame-mainmenu-tooltip");
+			]]></action>
+			<action on="MouseLeave"><![CDATA[
+				GUIObjectHide("pregame-mainmenu-tooltip");
+			]]></action>
+			<!-- END temporary code -->
+		</object>
+
+		<!-- TEMPORARY END GAME BUTTON; REMOVE WHEN GAME MENU IMPLEMENTED; BUTTON IS OUTSIDE OF pregame_gui IN ORDER TO BE VISIBLE DURING GAME -->
+
+		<object type="button" name="End_Game_Button" sprite="sprite1" sprite-over="sprite1-over" sprite-pressed="sprite1-pressed" z="105" textcolor="0 0 0" text-align="center" text-valign="center" hidden="true">End Game
+			<action on="Load"><![CDATA[
+				AddSize(this.name,
+				"100%-150 100%-53 100%-30 100%-32", 
+				"100%-150 0%+32 100%-30 0%+53");
+			]]></action>
+			<action on="Press"><![CDATA[
+				endGame();
+				GUIObjectHide("session_gui");
+				GUIObjectHide("End_Game_Button");
+				GUIObjectUnhide("pregame_gui");
+			]]></action>
+		</object> 
+
+	</object>
 
 </objects>
diff --git a/binaries/data/mods/official/gui/test/2_mainmenu.xml b/binaries/data/mods/official/gui/test/2_mainmenu.xml
index 62612645e1..6ecc126523 100755
--- a/binaries/data/mods/official/gui/test/2_mainmenu.xml
+++ b/binaries/data/mods/official/gui/test/2_mainmenu.xml
@@ -10,4 +10,50 @@
   ==========================================
   -->
 
+    <object type="empty" name="pregame_gui" size="0 0 100% 100%" z="1" hidden="false">
+
+        <object type="image" name="pregame-mainmenu-background-image" sprite="pregame-mainmenu-background" size="0 0 100% 100%" z="100" hidden="false" />
+
+        <object type="button" name="pregame-mainmenu-sp-button" sprite-over="pregame-mainmenu-spbt" size="52.9296875% 23.95833333% 67.578125% 42.317708333%" z="101" hidden="false">
+            <action on="Press"><![CDATA[
+                startGame();
+                GUIObjectUnhide("session_gui");
+                GUIObjectHide("pregame_gui");
+                GUIObjectUnhide("End_Game_Button");
+		FlipGUI("top");
+            ]]></action>
+            <action on="MouseEnter"><![CDATA[
+                tooltipObject = getGUIObjectByName("pregame-mainmenu-tooltip");
+                tooltipObject.caption = "Want to move some Dudes around or test something ? Click here to start a new game on the default map.";
+                GUIObjectUnhide("pregame-mainmenu-tooltip");
+            ]]></action>
+            <action on="MouseLeave"><![CDATA[
+                GUIObjectHide("pregame-mainmenu-tooltip");
+            ]]></action>
+        </object>
+
+        <object type="image" name="pregame-mainmenu-0ad-logo" sprite="pregame-mainmenu-0ad-logo-480x218" size="21.1914062% 3.125% 68.0664062% 31.5104166%" z="102" hidden="false" ghost="true"/>
+
+        <object type="text" name="pregame-mainmenu-versionnumber" size="43% 24% 43%+282 24%+25" z="103" textcolor="237 227 167" font="prospero16" hidden="false" ghost="true">
+            {buildTime}
+            <action on="Load"><![CDATA[
+	            this.caption = "Build: " + buildTime(0) + " " + getLanguageID();
+            ]]></action>
+        </object>
+
+        <object type="image" name="pregame-mainmenu-wfg-logo" sprite="pregame-mainmenu-wfg-logo-256x64" size="10 91.666666%-30 25.9765% 100%-30" z="102" hidden="false">
+            <action on="MouseEnter"><![CDATA[
+                tooltipObject = getGUIObjectByName("pregame-mainmenu-tooltip");
+                tooltipObject.caption = "These are the guys who made this game. Visit them at http://www.wildfiregames.com/0ad/";
+                GUIObjectUnhide("pregame-mainmenu-tooltip");
+            ]]></action>
+            <action on="MouseLeave"><![CDATA[
+                GUIObjectHide("pregame-mainmenu-tooltip");
+            ]]></action>
+        </object>
+
+        <object type="text" name="pregame-mainmenu-tooltip" sprite="tooltip-background" size="69% 6.3802% 97.0703125% 28.125%" font="prospero16" textcolor="255 255 255" z="104" hidden="true" ghost="true">tooltipText</object>
+
+  </object>
+
 </objects>
diff --git a/binaries/data/mods/official/gui/test/3_session.xml b/binaries/data/mods/official/gui/test/3_session.xml
index 0a3579bfd1..28a357191f 100755
--- a/binaries/data/mods/official/gui/test/3_session.xml
+++ b/binaries/data/mods/official/gui/test/3_session.xml
@@ -10,4 +10,1129 @@
 
 <objects>
 
+        <object type="empty" name="session_gui" hotkey="flipgui.toggle" size="0 0 100% 100%" z="1" hidden="true">
+		<action on="Press"><![CDATA[
+			FlipGUI();
+		]]></action>
+		<action on="Tick"><![CDATA[
+			getObjectInfo();
+		]]></action>
+
+                <!-- GROUP: GROUP PANE -->
+		<object type="empty" name="session_group_pane" hotkey="grouppane.toggle" size="0 0 100% 100%" z="1" hidden="true">
+			<action on="Press"><![CDATA[
+				GUIObjectToggle("session_group_pane");
+			]]></action>
+
+			<object type="text" name="session_group_pane_bg" sprite="tooltip-background" z="60" ghost="true" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"0%+20 0% 100%-20 0%+127",
+					"0%+20 100%-127 100%-20 100%");
+				]]></action>
+			</object>
+			<!-- First row. -->
+			<object type="button" name="session_group_pane_portrait_1" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-16      32 50%+16      64", 
+					"50%-16 100%-64 50%+16 100%-32");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_1_bar" sprite="sprite1" z="60" hidden="false" >
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-16 66 50%+16 70",
+					"50%-16 100%-70 50%+16 100%-66");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_2" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-52 32 50%-20 64",
+					"50%-52 100%-64 50%-20 100%-32");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_2_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-52 66 50%-20 70",
+					"50%-52 100%-70 50%-20 100%-66");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_3" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+20 32 50%+52 64",
+					"50%+20 100%-64 50%+52 100%-32");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_3_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+20 66 50%+52 70",
+					"50%+20 100%-70 50%+52 100%-66");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_4" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-88 32 50%-56 64",
+					"50%-88 100%-64 50%-56 100%-32");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_4_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-88 66 50%-56 70",
+					"50%-88 100%-70 50%-56 100%-66");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_5" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+56 32 50%+88 64",
+					"50%+56 100%-64 50%+88 100%-32");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_5_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+56 66 50%+88 70",
+					"50%+56 100%-70 50%+88 100%-66");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_6" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-124 32 50%-92 64",
+					"50%-124 100%-64 50%-92 100%-32");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_6_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-124 66 50%-92 70",
+					"50%-124 100%-70 50%-92 100%-66");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_7" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+92 32 50%+124 64",
+					"50%+92 100%-64 50%+124 100%-32");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_7_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+92 66 50%+124 70",
+					"50%+92 100%-70 50%+124 100%-66");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_8" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-160 32 50%-128 64",
+					"50%-160 100%-64 50%-128 100%-32");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_8_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-160 66 50%-128 70",
+					"50%-160 100%-70 50%-128 100%-66");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_9" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+128 32 50%+160 64",
+					"50%+128 100%-64 50%+160 100%-32");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_9_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+128 66 50%+160 70",
+					"50%+128 100%-70 50%+160 100%-66");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_10" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-196 32 50%-164 64",
+					"50%-196 100%-64 50%-164 100%-32");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_10_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-196 66 50%-164 70",
+					"50%-196 100%-70 50%-164 100%-66");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_11" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+164 32 50%+192 64",
+					"50%+164 100%-64 50%+192 100%-32");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_11_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+164 66 50%+192 70",
+					"50%+164 100%-70 50%+192 100%-66");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_12" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-232 32 50%-200 64",
+					"50%-232 100%-64 50%-200 100%-32");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_12_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-232 66 50%-200 70",
+					"50%-232 100%-70 50%-200 100%-66");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_13" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+200 32 50%+232 64",
+					"50%+200 100%-64 50%+232 100%-32");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_13_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+200 66 50%+232 70",
+					"50%+200 100%-70 50%+232 100%-66");
+				]]></action>
+			</object>
+
+			<!-- Second row. -->
+			<object type="button" name="session_group_pane_portrait_14" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-16 78 50%+16 110",
+					"50%-16 100%-110 50%+16 100%-78");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_14_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-16 112 50%+16 116",
+					"50%-16 100%-116 50%+16 100%-112");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_15" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-52 78 50%-20 110",
+					"50%-52 100%-110 50%-20 100%-78");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_15_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-52 112 50%-20 116",
+					"50%-52 100%-116 50%-20 100%-112");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_16" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+20 78 50%+52 110",
+					"50%+20 100%-110 50%+52 100%-78");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_16_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+20 112 50%+52 116",
+					"50%+20 100%-116 50%+52 100%-112");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_17" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-88 78 50%-56 110",
+					"50%-88 100%-110 50%-56 100%-78");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_17_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-88 112 50%-56 116",
+					"50%-88 100%-116 50%-56 100%-112");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_18" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+56 78 50%+88 110",
+					"50%+56 100%-110 50%+88 100%-78");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_18_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+56 112 50%+88 116",
+					"50%+56 100%-116 50%+88 100%-112");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_19" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-124 78 50%-92 110",
+					"50%-124 100%-110 50%-92 100%-78");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_19_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-124 112 50%-92 116",
+					"50%-124 100%-116 50%-92 100%-112");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_20" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+92 78 50%+124 110",
+					"50%+92 100%-110 50%+124 100%-78");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_20_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+92 112 50%+124 116",
+					"50%+92 100%-116 50%+124 100%-112");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_21" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-160 78 50%-128 110",
+					"50%-160 100%-110 50%-128 100%-78");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_21_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-160 112 50%-128 116",
+					"50%-160 100%-116 50%-128 100%-112");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_22" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+128 78 50%+160 110",
+					"50%+128 100%-110 50%+160 100%-78");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_22_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+128 112 50%+160 116",
+					"50%+128 100%-116 50%+160 100%-112");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_23" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-196 78 50%-164 110",
+					"50%-196 100%-110 50%-164 100%-78");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_23_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-196 112 50%-164 116",
+					"50%-196 100%-116 50%-164 100%-112");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_24" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+164 78 50%+192 110",
+					"50%+164 100%-110 50%+192 100%-78");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_24_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+164 112 50%+192 116",
+					"50%+164 100%-116 50%+192 100%-112");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_25" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-232 78 50%-200 110",
+					"50%-232 100%-110 50%-200 100%-78");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_25_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-232 112 50%-200 116",
+					"50%-232 100%-116 50%-200 100%-112");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_26" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+200 78 50%+232 110",
+					"50%+200 100%-110 50%+232 100%-78");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_26_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+200 112 50%+232 116",
+					"50%+200 100%-116 50%+232 100%-112");
+				]]></action>
+			</object>
+
+			<!-- Third row. -->
+			<object type="button" name="session_group_pane_portrait_27" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-16 124 50%+16 156",
+					"50%-16 100%-156 50%+16 100%-124");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_27_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-16 158 50%+16 162",
+					"50%-16 100%-162 50%+16 100%-158");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_28" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-52 124 50%-20 156",
+					"50%-52 100%-156 50%-20 100%-124");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_28_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-52 158 50%-20 162",
+					"50%-52 100%-162 50%-20 100%-158");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_29" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+20 124 50%+52 156",
+					"50%+20 100%-156 50%+52 100%-124");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_29_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+20 158 50%+52 162",
+					"50%+20 100%-162 50%+52 100%-158");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_30" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-88 124 50%-56 156",
+					"50%-88 100%-156 50%-56 100%-124");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_30_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-88 158 50%-56 162",
+					"50%-88 100%-162 50%-56 100%-158");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_31" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+56 124 50%+88 156",
+					"50%+56 100%-156 50%+88 100%-124");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_31_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+56 158 50%+88 162",
+					"50%+56 100%-162 50%+88 100%-158");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_32" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-124 124 50%-92 156",
+					"50%-124 100%-156 50%-92 100%-124");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_32_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-124 158 50%-92 162",
+					"50%-124 100%-162 50%-92 100%-158");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_33" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+92 124 50%+124 156",
+					"50%+92 100%-156 50%+124 100%-124");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_33_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+92 158 50%+124 162",
+					"50%+92 100%-162 50%+124 100%-158");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_34" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-160 124 50%-128 156",
+					"50%-160 100%-156 50%-128 100%-124");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_34_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-160 158 50%-128 162",
+					"50%-160 100%-162 50%-128 100%-158");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_35" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+128 124 50%+160 156",
+					"50%+128 100%-156 50%+160 100%-124");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_35_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+128 158 50%+160 162",
+					"50%+128 100%-162 50%+160 100%-158");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_36" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-196 124 50%-164 156",
+					"50%-196 100%-156 50%-164 100%-124");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_36_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-196 158 50%-164 162",
+					"50%-196 100%-162 50%-164 100%-158");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_37" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+164 124 50%+192 156",
+					"50%+164 100%-156 50%+192 100%-124");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_37_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+164 158 50%+192 162",
+					"50%+164 100%-162 50%+192 100%-158");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_38" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-232 124 50%-200 156",
+					"50%-232 100%-156 50%-200 100%-124");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_38_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-232 158 50%-200 162",
+					"50%-232 100%-162 50%-200 100%-158");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_39" style="portrait" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+200 124 50%+232 156",
+					"50%+200 100%-156 50%+232 100%-124");
+				]]></action>
+			</object>
+			<object type="button" name="session_group_pane_portrait_39_bar" sprite="sprite1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+200 158 50%+232 162",
+					"50%+200 100%-162 50%+232 100%-158");
+				]]></action>
+			</object>
+		</object>
+
+                <!-- GROUP: TOP BAR -->
+                <object type="empty" name="session_top_bar" hotkey="resourcepool.toggle" size="0 0 100% 100%" z="1" hidden="false">
+			<action on="Press"><![CDATA[
+				GUIObjectToggle("session_top_bar");
+			]]></action>
+
+                        <!-- FOOD icon/background/text-->
+                        <object type="text" name="resource_food" sprite="resource_food" z="70" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-191 4       100% 100%", 
+					"50%-191 100%-24 100% 100%");
+				]]></action>
+			</object>
+                        <object type="text" name="resource_food_counter" sprite="resource_counter" z="70" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-171 5 100% 100%", 
+					"50%-171 100%-25 100% 100%");
+				]]></action>
+			</object>
+                        <object type="text" name="resource_food_text" font="prospero16" textcolor="255 255 255" z="70" hidden="false">
+                                <action on="Load"><![CDATA[
+                                        this.caption = "123,456";
+					AddSize(this.name,
+					"50%-173 0%-3 100% 0%+20", 
+					"50%-173 100%-30 100% 100%");
+                                ]]></action>
+                        </object>
+
+                        <!-- WOOD -->
+                        <!-- icon/background/text -->
+                        <object type="text" name="resource_wood" sprite="resource_wood" z="70" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-111 4       100% 100%", 
+					"50%-111 100%-24 100% 100%");
+				]]></action>
+			</object>
+                        <object type="text" name="resource_wood_counter" sprite="resource_counter" z="70" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-91 5 100% 100%", 
+					"50%-91 100%-25 100% 100%");
+				]]></action>
+			</object>
+                        <object type="text" name="resource_wood_text" font="prospero16" textcolor="255 255 255" z="70" hidden="false">
+                                <action on="Load"><![CDATA[
+                                        this.caption = "789,012";
+					AddSize(this.name,
+					"50%-93 0%-3 100% 0%+20", 
+					"50%-93 100%-30 100% 100%");
+                                ]]></action>
+                        </object>
+
+                        <!-- STONE -->
+                        <!-- icon/background/text -->
+                        <object type="text" name="resource_stone" sprite="resource_stone" z="70" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-31 4       100% 100%", 
+					"50%-31 100%-24 100% 100%");
+				]]></action>
+			</object>
+                        <object type="text" name="resource_stone_counter" sprite="resource_counter" z="70" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%-11 5 100% 100%", 
+					"50%-11 100%-25 100% 100%");
+				]]></action>
+			</object>
+                        <object type="text" name="resource_stone_text" font="prospero16" textcolor="255 255 255" z="70" hidden="false">
+                                <action on="Load"><![CDATA[
+                                        this.caption = "345,678";
+					AddSize(this.name,
+					"50%-13 0%-3 100% 0%+20", 
+					"50%-13 100%-30 100% 100%");
+                                ]]></action>
+                        </object>
+
+                        <!-- ORE -->
+                        <!-- icon/background/text -->
+                        <object type="text" name="resource_ore" sprite="resource_ore" z="70" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+49 4       100% 100%", 
+					"50%+49 100%-24 100% 100%");
+				]]></action>
+			</object>
+                        <object type="text" name="resource_ore_counter" sprite="resource_counter" z="70" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+69 5 100% 100%", 
+					"50%+69 100%-25 100% 100%");
+				]]></action>
+			</object>
+                        <object type="text" name="resource_ore_text" font="prospero16" textcolor="255 255 255" z="70" hidden="false">
+                                <action on="Load"><![CDATA[
+                                        this.caption = "910,123";
+					AddSize(this.name,
+					"50%+67 0%-3 100% 0%+20", 
+					"50%+67 100%-30 100% 100%");
+                                ]]></action>
+                        </object>
+
+                        <!-- POPULATION -->
+                        <!-- icon/background/text -->
+                        <object type="text" name="resource_population" sprite="resource_population" z="70" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+129 4       100% 100%", 
+					"50%+129 100%-24 100% 100%");
+				]]></action>
+			</object>
+                        <object type="text" name="resource_population_counter" sprite="resource_counter_long" z="70" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"50%+149 5 100% 100%", 
+					"50%+149 100%-25 100% 100%");
+				]]></action>
+			</object>
+                        <object type="text" name="resource_population_text" font="prospero16" textcolor="255 255 255" z="70" hidden="false">
+                                <action on="Load"><![CDATA[
+                                        this.caption = "100/150";
+					AddSize(this.name,
+					"50%+147 0%-3 100% 0%+20", 
+					"50%+147 100%-30 100% 100%");
+                                ]]></action>
+                        </object>
+
+                <!-- / GROUP: TOP BAR -->
+                </object>
+
+                <!-- GROUP: MAP ORB -->
+                <object type="empty" name="session_map_orb" hotkey="maporb.toggle" size="0 0 100% 100%" z="1" hidden="false">
+			<action on="Press"><![CDATA[
+				GUIObjectToggle("session_map_orb");
+			]]></action>
+
+			<object type="text" name="session_panel_minimap_bg" sprite="session_panel_minimap_bg" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"100%-174 2 100% 100%", 
+					"100%-174 100%-174 100% 100%");
+				]]></action>
+			</object>
+
+			<object type="minimap" name="session_panel_minimap" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"100%-176 0 100% 176", 
+					"100%-176 100%-176 100% 100%");
+				]]></action>
+			</object>
+
+                        <object type="button" name="session_panel_minimap_segleft1" sprite="session_panel_minimap_segleft1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"100%-206 2 100% 100%", 
+					"100%-206 100%-175 100% 100%");
+				]]></action>
+			</object>
+                        <object type="button" name="session_panel_minimap_segleft2" sprite="session_panel_minimap_segleft2" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"100%-214 45 100% 100%", 
+					"100%-214 100%-131 100% 100%");
+				]]></action>
+			</object>
+                        <object type="button" name="session_panel_minimap_segleft3" sprite="session_panel_minimap_segleft3" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"100%-214 86 100% 100%", 
+					"100%-214 100%-90 100% 100%");
+				]]></action>
+			</object>
+                        <object type="button" name="session_panel_minimap_segleft4" sprite="session_panel_minimap_segleft4" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"100%-206 127 100% 100%", 
+					"100%-206 100%-48 100% 100%");
+				]]></action>
+			</object>
+
+                        <object type="button" name="session_panel_minimap_segbottom4" sprite="session_panel_minimap_segbottom4" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"100%-46 173 100% 100%", 
+					"100%-46 100%-205 100% 100%");
+				]]></action>
+			</object>
+                        <object type="button" name="session_panel_minimap_segbottom3" sprite="session_panel_minimap_segbottom3" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"100%-88 173 100% 100%", 
+					"100%-88 100%-213 100% 100%");
+				]]></action>
+			</object>
+                        <object type="button" name="session_panel_minimap_segbottom2" sprite="session_panel_minimap_segbottom2" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"100%-130 173 100% 100%", 
+					"100%-130 100%-213 100% 100%");
+				]]></action>
+			</object>
+                        <object type="button" name="session_panel_minimap_segbottom1" sprite="session_panel_minimap_segbottom1" z="60" hidden="false">
+				<action on="Load"><![CDATA[
+					AddSize(this.name,
+					"100%-174 173 100% 100%", 
+					"100%-174 100%-205 100% 100%");
+				]]></action>
+			</object>
+
+                <!-- / GROUP: MAP ORB -->
+                </object>
+
+                <!-- GROUP: STATUS ORB -->
+                <object type="empty" name="session_status_orb" hotkey="statusorb.toggle" size="0 0 100% 100%" z="1" hidden="true">
+			<action on="Press"><![CDATA[
+				GUIObjectToggle("session_status_orb");
+			]]></action>
+
+			<!-- STATUS ORB BACKGROUND -->
+                        <object type="text" name="session_panel_status_bg" sprite="session_panel_status_bg-top" z="60" hidden="false">
+			        <action on="Load"><![CDATA[
+					AddSize(this.name,
+					"0% 0% 0%+184 0%+184", 
+					"0% 100%-184 0%+184 100%");
+				]]></action>
+			</object>
+			<!-- SELECTED UNIT LARGE PORTRAIT -->
+			<object type="button" name="session_panel_status_portrait" style="portrait" z="70" hidden="false">
+			        <action on="Load"><![CDATA[
+					AddSize(this.name,
+					"0%+55 0%+55 119 119", 
+					"0%+55 100%-129 119 100%-65");
+					setPortrait(this.name, "unit_dude");
+				]]></action>
+			</object>
+
+			<!-- STATUS ORB STATISTICS AND ICONS (Experience, Hitpoints, Supply, Garrison) -->
+                        <object type="button" name="session_panel_status_icon_exp" sprite="statistic_rank3" textcolor="255 255 0" text-align="center" text-valign="bottom" z="60" hidden="false">
+                                <action on="Load"><![CDATA[
+					AddSize("session_panel_status_icon_exp",
+					"0%+75 0%+10 0%+90 0%+47", 
+					"0%+75 100%-172 0%+90 100%-135");
+                                        getGUIObjectByName("session_panel_status_icon_exp").caption = "200/200";
+                                ]]></action>
+                        </object>
+                        <object type="button" name="session_panel_status_icon_hp" sprite="statistic_hp" textcolor="0 255 0" text-align="center" text-valign="bottom" z="60" hidden="false">
+                                <action on="Load"><![CDATA[
+					AddSize("session_panel_status_icon_hp",
+					"0%+75 0%+125 0%+90 0%+162", 
+					"0%+75 100%-57 0%+90 100%-20");
+                                        getGUIObjectByName("session_panel_status_icon_hp").caption = "325/1000";
+                                ]]></action>
+                        </object>
+                        <object type="button" name="session_panel_status_icon_supply" sprite="resource_food" textcolor="252 148 78" text-align="center" text-valign="center" z="60" hidden="false">
+                                <action on="Load"><![CDATA[
+					AddSize("session_panel_status_icon_supply",
+					"0%+135 0%+65 0%+150 0%+130", 
+					"0%+135 100%-110 0%+150 100%-45");
+                                        getGUIObjectByName("session_panel_status_icon_supply").caption = "1576";
+                                ]]></action>
+                        </object>
+                        <object type="button" name="session_panel_status_icon_garrison" sprite="statistic_garrison" textcolor="100 100 255" text-align="center" text-valign="center" z="60" hidden="false">
+                                <action on="Load"><![CDATA[
+					AddSize("session_panel_status_icon_garrison",
+					"0%+20 0%+65 0%+35 0%+130", 
+					"0%+20 100%-110 0%+35 100%-45");
+                                        getGUIObjectByName("session_panel_status_icon_garrison").caption = "23/30";
+                                ]]></action>
+                        </object>
+
+			<!-- PRIMARY COMMAND BUTTONS (arcs the Status Orb) -->
+			<object type="button" name="session_panel_status_command_pri_1" style="portrait" z="60" hidden="false">
+                                <action on="Load"><![CDATA[
+					AddSize("session_panel_status_command_pri_1",
+					"0 160 32 193", 
+					"0 100%-193 32 100%-160");
+                                ]]></action>
+			</object>
+			<object type="button" name="session_panel_status_command_pri_2" style="portrait" z="60" hidden="false">
+                                <action on="Load"><![CDATA[
+					AddSize("session_panel_status_command_pri_2",
+					"30 175 62 207", 
+					"30 100%-207 62 100%-175");
+                                ]]></action>
+			</object>
+
+			<object type="button" name="session_panel_status_command_pri_3" style="portrait" z="60" hidden="false">
+                                <action on="Load"><![CDATA[
+					AddSize("session_panel_status_command_pri_3",
+					"63 184 95 216", 
+					"63 100%-216 95 100%-184");
+                                ]]></action>
+			</object>
+
+			<object type="button" name="session_panel_status_command_pri_4" style="portrait" z="60" hidden="false">
+                                <action on="Load"><![CDATA[
+					AddSize("session_panel_status_command_pri_4",
+					"97 180 129 212", 
+					"97 100%-212 129 100%-180");
+                                ]]></action>
+			</object>
+
+			<object type="button" name="session_panel_status_command_pri_5" style="portrait" z="60" hidden="false">
+                                <action on="Load"><![CDATA[
+					AddSize("session_panel_status_command_pri_5",
+					"128 168 160 200", 
+					"128 100%-200 160 100%-168");
+                                ]]></action>
+			</object>
+
+			<object type="button" name="session_panel_status_command_pri_6" style="portrait" z="60" hidden="false">
+                                <action on="Load"><![CDATA[
+					AddSize("session_panel_status_command_pri_6",
+					"154 148 186 180", 
+					"154 100%-180 186 100%-148");
+                                ]]></action>
+			</object>
+
+			<object type="button" name="session_panel_status_command_pri_7" style="portrait" z="60" hidden="false">
+                                <action on="Load"><![CDATA[
+					AddSize("session_panel_status_command_pri_7",
+					"172 121 204 153", 
+					"172 100%-153 204 100%-121");
+                                ]]></action>
+			</object>
+
+			<object type="button" name="session_panel_status_command_pri_8" style="portrait" z="60" hidden="false">
+                                <action on="Load"><![CDATA[
+					AddSize("session_panel_status_command_pri_8",
+					"184 90 216 122", 
+					"184 100%-122 216 100%-90");
+                                ]]></action>
+			</object>
+
+			<object type="button" name="session_panel_status_command_pri_9" style="portrait" z="60" hidden="false">
+                                <action on="Load"><![CDATA[
+					AddSize("session_panel_status_command_pri_9",
+					"183 57 215 89", 
+					"183 100%-89 215 100%-57");
+                                ]]></action>
+			</object>
+
+			<object type="button" name="session_panel_status_command_pri_10" style="portrait" z="60" hidden="false">
+                                <action on="Load"><![CDATA[
+					AddSize("session_panel_status_command_pri_10",
+					"171 26 203 58", 
+					"171 100%-58 203 100%-26");
+                                ]]></action>
+			</object>
+
+			<object type="button" name="session_panel_status_command_pri_11" style="portrait" z="60" hidden="false">
+                                <action on="Load"><![CDATA[
+					AddSize("session_panel_status_command_pri_11",
+					"150 0 182 32", 
+					"150 100%-32 182 100%");
+                                ]]></action>
+			</object>
+
+			<!-- SECONDARY COMMAND BUTTONS (arcs the Primary Command Buttons) -->
+
+                <!-- / GROUP: STATUS ORB -->
+                </object>
+
+                <!-- GROUP: TEAM TRAY -->
+                <object type="empty" name="session_team_tray" hotkey="teamtray.toggle" size="0 0 100% 100%" z="60" hidden="false">
+			<action on="Press"><![CDATA[
+				GUIObjectToggle("session_team_tray");
+			]]></action>
+
+			<object type="button" name="session_team_tray_1" style="portrait" textcolor="255 255 255" hidden="false">
+                                <action on="Load"><![CDATA[
+					AddSize("session_team_tray_1",
+					"100%-32 200 100% 232", 
+					"100%-32 100%-488 100% 100%-456");
+                                ]]></action>
+			</object>
+			<object type="text" name="session_team_tray_1_num" textcolor="255 255 255" ghost="true" hidden="false">1
+                                <action on="Load"><![CDATA[
+					AddSize("session_team_tray_1_num",
+					"100%-20 200 100% 220", 
+					"100%-20 100%-488 100% 100%-468");
+                                ]]></action>
+			</object>
+
+			<object type="button" name="session_team_tray_2" style="portrait" textcolor="255 255 255" hidden="false">
+                                <action on="Load"><![CDATA[
+					AddSize("session_team_tray_2",
+					"100%-32 232 100% 264", 
+					"100%-32 100%-456 100% 100%-424");
+                                ]]></action>
+			</object>
+			<object type="text" name="session_team_tray_2_num" textcolor="255 255 255" ghost="true" hidden="false">2
+                                <action on="Load"><![CDATA[
+					AddSize("session_team_tray_2_num",
+					"100%-20 232 100% 252", 
+					"100%-20 100%-456 100% 100%-436");
+                                ]]></action>
+			</object>
+
+			<object type="button" name="session_team_tray_3" style="portrait" textcolor="255 255 255" hidden="false">
+                                <action on="Load"><![CDATA[
+					AddSize("session_team_tray_3",
+					"100%-32 264 100% 296", 
+					"100%-32 100%-424 100% 100%-392");
+                                ]]></action>
+			</object>
+			<object type="text" name="session_team_tray_3_num" textcolor="255 255 255" ghost="true" hidden="false">3
+                                <action on="Load"><![CDATA[
+					AddSize("session_team_tray_3_num",
+					"100%-20 264 100% 284", 
+					"100%-20 100%-424 100% 100%-304");
+                                ]]></action>
+			</object>
+
+			<object type="button" name="session_team_tray_4" style="portrait" textcolor="255 255 255" hidden="false">
+                                <action on="Load"><![CDATA[
+					AddSize("session_team_tray_4",
+					"100%-32 296 100% 328", 
+					"100%-32 100%-392 100% 100%-360");
+                                ]]></action>
+			</object>
+			<object type="text" name="session_team_tray_4_num" textcolor="255 255 255" ghost="true" hidden="false">4
+                                <action on="Load"><![CDATA[
+					AddSize("session_team_tray_4_num",
+					"100%-20 296 100% 316", 
+					"100%-20 100%-392 100% 100%-372");
+                                ]]></action>
+			</object>
+
+			<object type="button" name="session_team_tray_5" style="portrait" textcolor="255 255 255" hidden="false">
+                                <action on="Load"><![CDATA[
+					AddSize("session_team_tray_5",
+					"100%-32 328 100% 360", 
+					"100%-32 100%-360 100% 100%-328");
+                                ]]></action>
+			</object>
+			<object type="text" name="session_team_tray_5_num" textcolor="255 255 255" ghost="true" hidden="false">5
+                                <action on="Load"><![CDATA[
+					AddSize("session_team_tray_5_num",
+					"100%-20 328 100% 348", 
+					"100%-20 100%-360 100% 100%-340");
+                                ]]></action>
+			</object>
+
+			<object type="button" name="session_team_tray_6" style="portrait" textcolor="255 255 255" hidden="false">
+                                <action on="Load"><![CDATA[
+					AddSize("session_team_tray_6",
+					"100%-32 360 100% 392", 
+					"100%-32 100%-328 100% 100%-296");
+                                ]]></action>
+			</object>
+			<object type="text" name="session_team_tray_6_num" textcolor="255 255 255" ghost="true" hidden="false">6
+                                <action on="Load"><![CDATA[
+					AddSize("session_team_tray_6_num",
+					"100%-20 360 100% 380", 
+					"100%-20 100%-328 100% 100%-308");
+                                ]]></action>
+			</object>
+
+			<object type="button" name="session_team_tray_7" style="portrait" textcolor="255 255 255" hidden="false">
+                                <action on="Load"><![CDATA[
+					AddSize("session_team_tray_7",
+					"100%-32 392 100% 424", 
+					"100%-32 100%-296 100% 100%-264");
+                                ]]></action>
+			</object>
+			<object type="text" name="session_team_tray_7_num" textcolor="255 255 255" ghost="true" hidden="false">7
+                                <action on="Load"><![CDATA[
+					AddSize("session_team_tray_7_num",
+					"100%-20 392 100% 412", 
+					"100%-20 100%-296 100% 100%-276");
+                                ]]></action>
+			</object>
+
+			<object type="button" name="session_team_tray_8" style="portrait" textcolor="255 255 255" hidden="false">
+                                <action on="Load"><![CDATA[
+					AddSize("session_team_tray_8",
+					"100%-32 424 100% 456", 
+					"100%-32 100%-264 100% 100%-232");
+                                ]]></action>
+			</object>
+			<object type="text" name="session_team_tray_8_num" textcolor="255 255 255" ghost="true" hidden="false">8
+                                <action on="Load"><![CDATA[
+					AddSize("session_team_tray_8_num",
+					"100%-20 424 100% 444", 
+					"100%-20 100%-264 100% 100%-244");
+                                ]]></action>
+			</object>
+
+			<object type="button" name="session_team_tray_9" style="portrait" textcolor="255 255 255" hidden="false">
+                                <action on="Load"><![CDATA[
+					AddSize("session_team_tray_9",
+					"100%-32 456 100% 488", 
+					"100%-32 100%-232 100% 100%-200");
+                                ]]></action>
+			</object>
+			<object type="text" name="session_team_tray_9_num" textcolor="255 255 255" ghost="true" hidden="false">9
+                                <action on="Load"><![CDATA[
+					AddSize("session_team_tray_9_num",
+					"100%-20 456 100% 476", 
+					"100%-20 100%-232 100% 100%-212");
+                                ]]></action>
+			</object>
+
+                <!-- / GROUP: TRAY -->
+                </object>
+
+                <!--
+                ==========================================
+                - HIDDEN (HOTKEY ONLY) -
+                ==========================================
+                -->
+
+
+
+                <!--
+                ==========================================
+                - DEBUG -
+                ==========================================
+                -->
+
+                <!-- FPS COUNTER -->
+                <object type="text" name="FPS_Counter" z="100" hotkey="fps.toggle" textcolor="200 200 0" font="verdana16" hidden="false">
+                        <action on="Load"><![CDATA[
+				AddSize("FPS_Counter",
+				"18 100%-35 200 100%", 
+				"18 0%      200 0%+35");
+                                setInterval(UpdateFPSCounter, 50);
+                        ]]></action>
+			<action on="Press"><![CDATA[
+				GUIObjectToggle("FPS_Counter");
+			]]></action>
+                </object>
+
+                <!--
+                ==========================================
+                - TEST -
+                ==========================================
+                -->
+
+	<!-- / SESSION GUI -->
+        </object>
+
 </objects>
+
+
+
+
diff --git a/binaries/data/mods/official/gui/test/basefunctions.js b/binaries/data/mods/official/gui/test/basefunctions.js
deleted file mode 100755
index b079102b20..0000000000
--- a/binaries/data/mods/official/gui/test/basefunctions.js
+++ /dev/null
@@ -1,115 +0,0 @@
-function GUIObjectHide(objectName) {
-
-        // Hide our GUI object
-        GUIObject = getGUIObjectByName(objectName);
-        GUIObject.hidden = true;
-
-}
-
-function GUIObjectUnhide(objectName) {
-
-        // Unhide our GUI object
-        GUIObject = getGUIObjectByName(objectName);
-        GUIObject.hidden = false;
-
-}
-
-function GUIObjectToggle(objectName) {
-
-        // Get our GUI object
-        GUIObject = getGUIObjectByName(objectName);
-
-        // Toggle it
-        GUIObject.hidden = !GUIObject.hidden;
-
-}
-
-function GUIUpdateObjectInfo() {
-
-        // Get GUI Objects needed
-        ObjectNameText = getGUIObjectByName("selection_name_test");
-        ObjectPositionText = getGUIObjectByName("selection_pos_test");
-        ObjectSpeedText = getGUIObjectByName("selection_speed_test");
-		ObjectPortrait = getGUIObjectByName("selection_portrait_test");
-		ObjectStatAttack = getGUIObjectByName("statistic_attack");
-		ObjectStatHack = getGUIObjectByName("statistic_hack");
-		ObjectStatPierce = getGUIObjectByName("statistic_pierce");
-		ObjectStatAccuracy = getGUIObjectByName("statistic_accuracy");
-		ObjectStatLOS = getGUIObjectByName("statistic_los");
-		ObjectStatSpeed = getGUIObjectByName("statistic_speed");
-
-        // Check number of selected entities
-        if (selection.length > 1) {
-
-                var MultipleEntitiesSelected = true;
-                ObjectNameText.caption = "Selected " + selection.length + " entities.";
-                ObjectNameText.hidden = false;
-                ObjectPositionText.hidden = true;
-                ObjectSpeedText.hidden = true;
-
-        } else {
-
-                if ( !selection.length ) {
-
-					// Reset portrait
-					ObjectPortrait.hidden = true;
-
-					// Reset statistic icons.
-					ObjectStatAttack.hidden = true;
-					ObjectStatHack.hidden = true;
-					ObjectStatPierce.hidden = true;
-					ObjectStatAccuracy.hidden = true;
-					ObjectStatLOS.hidden = true;
-					ObjectStatSpeed.hidden = true;
-
-					 // Reset object name
-                    ObjectNameText.caption = "";
-                    ObjectNameText.hidden = true;
-
-					// Reset position
-                    ObjectPositionText.caption = "";
-                    ObjectPositionText.hidden = true;
-
-                    // Reset Speed
-                    ObjectSpeedText.caption = "";
-					ObjectSpeedText.hidden = true;
-
-                } else {
-
-					// Update portrait
-					ObjectPortrait.sprite = selection[0].traits.id.icon;
-			
-					ObjectPortrait.hidden = false;
-
-					// Turn on statistic icons.
-					ObjectStatAttack.hidden = false;
-					ObjectStatHack.hidden = false;
-					ObjectStatPierce.hidden = false;
-					ObjectStatAccuracy.hidden = false;
-					ObjectStatLOS.hidden = false;
-					ObjectStatSpeed.hidden = false;
-
-					// Update object name
-					ObjectNameText.caption = selection[0].traits.id.generic;
-					ObjectNameText.hidden = false;
-
-					// Update position
-					var strString = "" + selection[0].position;
-					ObjectPositionText.caption = "Position: " + strString.substring(20,strString.length-3);
-					
-					//ObjectPositionText.caption = strString;
-					ObjectPositionText.hidden = false;
-
-					// Update speed
-					ObjectSpeedText.caption = selection[0].actions.move.speed;
-					ObjectSpeedText.hidden = false;
-                }
-        
-        }
-        
-}
-
-function UpdateFPSCounter()
-{
-	getGUIObjectByName('FPS_Counter').caption = "FPS: " + getFPS();
-}
diff --git a/binaries/data/mods/official/gui/test/functions_pregame.js b/binaries/data/mods/official/gui/test/functions_pregame.js
new file mode 100755
index 0000000000..e69de29bb2
diff --git a/binaries/data/mods/official/gui/test/functions_session.js b/binaries/data/mods/official/gui/test/functions_session.js
new file mode 100755
index 0000000000..b6dd1273b8
--- /dev/null
+++ b/binaries/data/mods/official/gui/test/functions_session.js
@@ -0,0 +1,288 @@
+function initSession()
+{
+	GUIType="top";
+	GUIStyleName = new Array();
+	GUIStyleSize1 = new Array();
+	GUIStyleSize2 = new Array();
+	GUIStyle_Last = 0;
+}
+
+// ====================================================================
+
+function setPortrait(objectName, portraitString) 
+{
+	// Use this function as a shortcut to change a portrait object to a different portrait image. 
+
+	// Accepts an object and specifies its default, rollover (lit) and disabled (grey) sprites.
+	// Sprite Format: "ui_portrait_"portraitString"_64"
+	// Sprite Format: "ui_portrait_"portraitString"_64""-lit"
+	// Sprite Format: "ui_portrait_"portraitString"_64""-grey"
+	// Note: Make sure the file follows this naming convention or bad things could happen.
+
+        // Get GUI object
+        GUIObject = getGUIObjectByName(objectName);
+
+	// Set the three portraits.
+	GUIObject.sprite = "ui_portrait_" + portraitString + "_64";
+	// Note we need to use a special syntax here (object["param"] instead of object.param) because dashes aren't actually in JS's variable-naming conventions.
+	GUIObject["sprite-over"] = GUIObject.sprite + "-lit";
+	GUIObject["sprite-disabled"] = GUIObject.sprite + "-grey";
+}
+
+// ====================================================================
+
+function setSize(objectName, sizeString)
+{
+	// Use this function as a shortcut to change the size of a GUI control. 
+
+        // Get GUI object
+        GUIObject = getGUIObjectByName(objectName);
+
+	// Set size
+	GUIObject.size = sizeString;
+}
+
+// ====================================================================
+
+function getObjectInfo() 
+{
+	// Updated each tick to extract entity information from selected unit(s).
+
+	if (!selection.length) 	// If no entity selected,
+	{
+		// Hide Status Orb
+		getGUIObjectByName("session_status_orb").hidden = true;
+
+		// Hide Group Pane.
+		getGUIObjectByName("session_group_pane").hidden = true;
+	}
+	else			// If at least one entity selected,
+	{
+		// Store globals for entity information.
+//		EntityName = selection[0].traits.id.generic;
+//		strString = "" + selection[0].position;
+//		EntityPos = strString.substring(20,strString.length-3);
+
+		// Update portrait
+		setPortrait("session_panel_status_portrait", selection[0].traits.id.icon);
+
+		// Reveal Status Orb
+		getGUIObjectByName("session_status_orb").hidden = false;
+
+	        // Check if a group of entities selected
+	        if (selection.length > 1) 
+		{
+			// If a group pane isn't already open, and we don't have the same set as last time,
+			// NOTE: This "if" is an optimisation because the game crawls if this set of processing occurs every frame.
+			// It's quite possible for the player to select another group of the same size and for it to not be recognised.
+			// Best solution would be to base this off a "new entities selected" instead of an on-tick.
+			if (getGUIObjectByName("session_group_pane").hidden == true || selection.length != MultipleEntitiesSelected)
+			{
+
+				// Reveal Group Pane.
+				getGUIObjectByName("session_group_pane").hidden = false;
+
+				// Set size of Group Pane background.
+				if (selection.length <= 13)
+				{
+					switch (GUIType)
+					{
+						case "top":
+							setSize("session_group_pane_bg", "0%+20 0% 100%-20 0%+86");
+						break;
+						case "bottom":
+							setSize("session_group_pane_bg", "0%+20 100%-86 100%-20 100%");
+						break;
+					}
+				}
+				else
+				if (selection.length > 13 && selection.length < 26)
+				{
+					switch (GUIType)
+					{
+						case "top":
+							setSize("session_group_pane_bg", GUIStyleSize1[FlipGUILoop]);
+						break;
+						case "bottom":
+							setSize("session_group_pane_bg", GUIStyleSize2[FlipGUILoop]);
+						break;
+					}
+				}
+				else
+				{
+					switch (GUIType)
+					{
+						case "top":
+							setSize("session_group_pane_bg", "0%+20 0% 100%-20 0%+168");
+						break;
+						case "bottom":
+							setSize("session_group_pane_bg", "0%+20 100%-168 100%-20 100%");
+						break;
+					}
+				}
+
+				// Display appropriate portraits.						
+				for (groupPaneLoop = 1; groupPaneLoop <= 39; groupPaneLoop++)
+				{
+					groupPanePortrait = getGUIObjectByName("session_group_pane_portrait_" + groupPaneLoop);
+					groupPaneBar = getGUIObjectByName("session_group_pane_portrait_" + groupPaneLoop + "_bar");
+
+					// If it's a valid entity,
+					if (groupPaneLoop <= selection.length){
+						// Reveal and set to display this entity's portrait in the group pane.
+						groupPanePortrait.hidden = false;
+						groupPaneBar.hidden = false;
+						setPortrait("session_group_pane_portrait_" + groupPaneLoop, selection[groupPaneLoop-1].traits.id.icon);
+					}
+					// If it's empty, hide its group portrait.
+					else
+					{
+						groupPanePortrait.hidden = true;
+						groupPaneBar.hidden = true;
+					}
+
+				}
+
+		                MultipleEntitiesSelected = selection.length;
+			}
+	        } 
+		else
+		{
+	                MultipleEntitiesSelected = 0;
+
+			// Hide Group Pane.
+			getGUIObjectByName("session_group_pane").hidden = true;
+		}
+        }
+}
+
+// ====================================================================
+
+function AddSize(objectName, objectSize1, objectSize2)
+{
+	// Used to store the two GUI style sizes for an object on creation.
+	// Used later by FlipGUI() to switch the objects to a new set of positions.
+
+	GUIStyleName[GUIStyle_Last] = objectName;
+	GUIStyleSize1[GUIStyle_Last] = objectSize1;
+	GUIStyleSize2[GUIStyle_Last] = objectSize2;
+
+//	writeConsole("Added " + GUIStyle_Last + ": " + GUIStyleName[GUIStyle_Last] + " (" + GUIStyleSize1[GUIStyle_Last] + ", " + GUIStyleSize2[GUIStyle_Last] + ").");
+
+	GUIStyle_Last++; // Increment counter for next entry.
+}
+
+// ====================================================================
+
+function FlipGUI(NewGUIType)
+{
+	// Sets the GUI coordinates and graphics so that the panel is either at the top or bottom of the screen.
+
+	switch (NewGUIType)
+	{
+		// Set which GUI to use.
+		case "top":
+		case "bottom":
+		case "none":
+			GUIType=NewGUIType;
+		break;
+		default:
+			// If no type specified, toggle.
+			if (GUIType == "top")
+				GUIType = "bottom";
+			else
+			if (GUIType == "bottom")
+				GUIType = "none";
+			else
+				GUIType = "top";
+		break;
+	}
+
+	if (GUIType != "none")
+	{
+		GUIObjectUnhide("session_gui");
+		GUIObjectUnhide("always_on");
+
+		// Seek through all sizes created.
+		for (FlipGUILoop = 0; FlipGUILoop < GUIStyle_Last; FlipGUILoop++)
+		{
+			// Set each object to the other size.
+			switch (GUIType)
+			{
+				case "top":
+					setSize(GUIStyleName[FlipGUILoop], GUIStyleSize1[FlipGUILoop]);
+					switch (GUIStyleName[FlipGUILoop]){
+						case "session_panel_minimap_segbottom1":
+							getGUIObjectByName(GUIStyleName[FlipGUILoop]).sprite = GUIStyleName[FlipGUILoop];
+						break;
+						case "session_panel_minimap_segbottom2":
+							getGUIObjectByName(GUIStyleName[FlipGUILoop]).sprite = GUIStyleName[FlipGUILoop];
+						break;
+						case "session_panel_minimap_segbottom3":
+							getGUIObjectByName(GUIStyleName[FlipGUILoop]).sprite = GUIStyleName[FlipGUILoop];
+						break;
+						case "session_panel_minimap_segbottom4":
+							getGUIObjectByName(GUIStyleName[FlipGUILoop]).sprite = GUIStyleName[FlipGUILoop];
+						break;
+						case "session_panel_status_bg":
+							getGUIObjectByName(GUIStyleName[FlipGUILoop]).sprite = "session_panel_status_bg-top";
+						break;
+						default:
+						break;
+					}
+				break;
+				case "bottom":
+					setSize(GUIStyleName[FlipGUILoop], GUIStyleSize2[FlipGUILoop]);
+					switch (GUIStyleName[FlipGUILoop]){
+						case "session_panel_minimap_segbottom1":
+							getGUIObjectByName(GUIStyleName[FlipGUILoop]).sprite = "session_panel_minimap_segtop1";
+						break;
+						case "session_panel_minimap_segbottom2":
+							getGUIObjectByName(GUIStyleName[FlipGUILoop]).sprite = "session_panel_minimap_segtop2";
+						break;
+						case "session_panel_minimap_segbottom3":
+							getGUIObjectByName(GUIStyleName[FlipGUILoop]).sprite = "session_panel_minimap_segtop3";
+						break;
+						case "session_panel_minimap_segbottom4":
+							getGUIObjectByName(GUIStyleName[FlipGUILoop]).sprite = "session_panel_minimap_segtop4";
+						break;
+						case "session_panel_status_bg":
+							getGUIObjectByName(GUIStyleName[FlipGUILoop]).sprite = "session_panel_status_bg-bottom";
+						break;
+						default:
+						break;
+					}
+				break;
+			}			
+		}
+	}
+	else
+	{
+		GUIObjectHide("session_gui");
+		GUIObjectHide("always_on");
+	}
+
+	writeConsole("GUI flipped to " + GUIType + ".");
+}
+
+// ====================================================================
+
+function MakeUnit(x, y, z, MakeUnitName)
+{
+	// Spawn an entity at the given coordinates.
+
+	DudeSpawnPoint = new Vector3D(x, y, z);
+	new Entity(getEntityTemplate(MakeUnitName), DudeSpawnPoint, 1.0);
+	// writeConsole(MakeUnitName + " created at " + DudeSpawnPoint);
+}
+
+// ====================================================================
+
+function selected()
+{
+	// Returns how many units selected.
+
+	if( selection.length > 0 )
+		return( selection[0] );
+	return( null );
+}
diff --git a/binaries/data/mods/official/gui/test/functions_test.js b/binaries/data/mods/official/gui/test/functions_test.js
new file mode 100755
index 0000000000..53ab70cb30
--- /dev/null
+++ b/binaries/data/mods/official/gui/test/functions_test.js
@@ -0,0 +1,40 @@
+    function updateOrbital()
+    {
+      if( !getGUIObjectByName( 'arena' ).hidden )
+      {
+        g_ballx += g_balldx;
+        g_bally += g_balldy;
+        if (g_ballx > 600) {
+          g_balldx *= -0.9;
+          g_ballx = 600-(g_ballx-600);
+        }
+        else if (g_ballx < 0) {
+          g_balldx *= -0.9;
+          g_ballx = -g_ballx;
+        }
+        if (g_bally > 400) {
+          g_balldy *= -0.9;
+          g_bally = 400-(g_bally-400);
+        }
+        else if (g_bally < 0) {
+          g_balldy *= -0.9;
+          g_bally = -g_bally;
+        }
+
+        // Gravitate towards the mouse
+        var vect_x = g_ballx-g_mousex;
+        var vect_y = g_bally-g_mousey;
+        var dsquared = vect_x*vect_x + vect_y*vect_y;
+        if (dsquared < 1000) dsquared = 1000;
+        var force = 10000.0 / dsquared;
+        var mag = Math.sqrt(dsquared);
+        vect_x /= mag; vect_y /= mag;
+        g_balldx -= force * vect_x;
+        g_balldy -= force * vect_y;
+  
+        var ball = getGUIObjectByName('ball');
+        var r=5;
+        ball.size = new GUISize(g_ballx-r, g_bally-r, g_ballx+r, g_bally+r);
+      }
+    }
+
diff --git a/binaries/data/mods/official/gui/test/animation.js b/binaries/data/mods/official/gui/test/functions_utility_animation.js
similarity index 100%
rename from binaries/data/mods/official/gui/test/animation.js
rename to binaries/data/mods/official/gui/test/functions_utility_animation.js
diff --git a/binaries/data/mods/official/gui/test/functions_utility_debug.js b/binaries/data/mods/official/gui/test/functions_utility_debug.js
new file mode 100755
index 0000000000..09f2b8eb18
--- /dev/null
+++ b/binaries/data/mods/official/gui/test/functions_utility_debug.js
@@ -0,0 +1,5 @@
+function UpdateFPSCounter()
+{
+	getGUIObjectByName('FPS_Counter').caption = "FPS: " + getFPS();
+}
+
diff --git a/binaries/data/mods/official/gui/test/functions_utility_object.js b/binaries/data/mods/official/gui/test/functions_utility_object.js
new file mode 100755
index 0000000000..115e860a6b
--- /dev/null
+++ b/binaries/data/mods/official/gui/test/functions_utility_object.js
@@ -0,0 +1,29 @@
+function GUIObjectHide(objectName) 
+{
+        // Hide our GUI object
+        GUIObject = getGUIObjectByName(objectName);
+        GUIObject.hidden = true;
+
+}
+
+// ====================================================================
+
+function GUIObjectUnhide(objectName)
+{
+        // Unhide our GUI object
+        GUIObject = getGUIObjectByName(objectName);
+        GUIObject.hidden = false;
+
+}
+
+// ====================================================================
+
+function GUIObjectToggle(objectName)
+{
+        // Get our GUI object
+        GUIObject = getGUIObjectByName(objectName);
+
+        // Toggle it
+        GUIObject.hidden = !GUIObject.hidden;
+}
+
diff --git a/binaries/data/mods/official/gui/test/hello.xml b/binaries/data/mods/official/gui/test/hello.xml
index 202eeac906..6e70027b19 100755
--- a/binaries/data/mods/official/gui/test/hello.xml
+++ b/binaries/data/mods/official/gui/test/hello.xml
@@ -2,421 +2,15 @@
 
 <!DOCTYPE objects SYSTEM "../gui.dtd">
 
+<!--
+==========================================
+- TEST STUFF, MISCELLANEOUS, ARCHIVE -
+==========================================
+-->
+
 <objects>
 
-<!--
-==========================================
- - GLOBAL SCRIPTS -
-==========================================
--->
-
-  <script file="gui/test/basefunctions.js"><![CDATA[
-    writeConsole("GUI file loading");
-
-    function MakeUnit(x, y, z, MakeUnitName) {
-      DudeSpawnPoint = new Vector3D(x, y, z);
-      new Entity(getEntityTemplate(MakeUnitName), DudeSpawnPoint, 1.0);
-      writeConsole(MakeUnitName + " created at " + DudeSpawnPoint);
-    }
-
-    function selected()
-    {
-      if( selection.length > 0 )
-        return( selection[0] );
-      return( null );
-    }
-
-    function updateOrbital()
-    {
-      if( !getGUIObjectByName( 'arena' ).hidden )
-      {
-        g_ballx += g_balldx;
-        g_bally += g_balldy;
-        if (g_ballx > 600) {
-          g_balldx *= -0.9;
-          g_ballx = 600-(g_ballx-600);
-        }
-        else if (g_ballx < 0) {
-          g_balldx *= -0.9;
-          g_ballx = -g_ballx;
-        }
-        if (g_bally > 400) {
-          g_balldy *= -0.9;
-          g_bally = 400-(g_bally-400);
-        }
-        else if (g_bally < 0) {
-          g_balldy *= -0.9;
-          g_bally = -g_bally;
-        }
-
-        // Gravitate towards the mouse
-        var vect_x = g_ballx-g_mousex;
-        var vect_y = g_bally-g_mousey;
-        var dsquared = vect_x*vect_x + vect_y*vect_y;
-        if (dsquared < 1000) dsquared = 1000;
-        var force = 10000.0 / dsquared;
-        var mag = Math.sqrt(dsquared);
-        vect_x /= mag; vect_y /= mag;
-        g_balldx -= force * vect_x;
-        g_balldy -= force * vect_y;
-  
-        var ball = getGUIObjectByName('ball');
-        var r=5;
-        ball.size = new GUISize(g_ballx-r, g_bally-r, g_ballx+r, g_bally+r);
-      }
-    }
-
-    function StartGame()
-    {
-      var gameAttribs=new Object();
-      gameAttribs.mapFile="test_01.pmp";
-      startGame(gameAttribs);
-    }
-    
-  ]]></script>
-
-<!--
-==========================================
- - GLOBAL OBJECTS -
-==========================================
--->
-
-<object type="empty" name="all_gui" size="0 0 100% 100%" z="1" hidden="false">
-
-  <object type="empty" name="always_on" size="0 0 100% 100%" z="1" hidden="false">
-
-    <!--
-    ==========================================
-    - EXIT BUTTON -
-    ==========================================
-    -->
-
-    <object type="button" name="exit_button" sprite="exit_sprite" sprite-over="exit_sprite-over" size="100%-18 2 100%-2 18" z="1000" hidden="false">
-      <action on="Load"><![CDATA[
-        writeConsole("(GUI) Exit button successfully loaded.");
-      ]]></action>
-      <action on="Press"><![CDATA[
-        exit();
-      ]]></action>
-      <!--  START temporary code
-            This code only applies to the main menu, I don't know how it'll behave ingame. It is temporary and should be removed as soon as we got proper
-            tooltip support implemented. -->
-      <action on="MouseEnter"><![CDATA[
-        tooltipObject = getGUIObjectByName("pregame-mainmenu-tooltip");
-        tooltipObject.caption = "Tired of 0 A.D. ? Click here to leave and reenter the real world.";
-        GUIObjectUnhide("pregame-mainmenu-tooltip");
-      ]]></action>
-      <action on="MouseLeave"><![CDATA[
-        GUIObjectHide("pregame-mainmenu-tooltip");
-      ]]></action>
-      <!-- END temporary code -->
-    </object>
-
-  </object>
-
-  <!--
-  ==========================================
-  - MAIN MENU -
-  ==========================================
-  -->
-
-  <object type="empty" name="pregame_gui" size="0 0 100% 100%" z="1" hidden="false">
-
-    <object type="image" name="pregame-mainmenu-background-image" sprite="pregame-mainmenu-background" size="0 0 100% 100%" z="100" hidden="false" />
-
-    <object type="button" name="pregame-mainmenu-sp-button" sprite-over="pregame-mainmenu-spbt" size="52.9296875% 23.95833333% 67.578125% 42.317708333%" z="101" hidden="false">
-      <action on="Press"><![CDATA[
-        startGame();
-        GUIObjectUnhide("session_gui");
-        GUIObjectHide("pregame_gui")
-        GUIObjectUnhide("End_Game_Button")
-      ]]></action>
-      <action on="MouseEnter"><![CDATA[
-        tooltipObject = getGUIObjectByName("pregame-mainmenu-tooltip");
-        tooltipObject.caption = "Want to move some Dudes around or test something ? Click here to start a new game on the default map.";
-        GUIObjectUnhide("pregame-mainmenu-tooltip");
-      ]]></action>
-      <action on="MouseLeave"><![CDATA[
-        GUIObjectHide("pregame-mainmenu-tooltip");
-      ]]></action>
-    </object>
-
-    <object type="image" name="pregame-mainmenu-0ad-logo" sprite="pregame-mainmenu-0ad-logo-480x218" size="21.1914062% 3.125% 68.0664062% 31.5104166%" z="102" hidden="false" ghost="true">
-    </object>
- 
-    <object type="text" name="pregame-mainmenu-versionnumber" size="43% 24% 43%+282 24%+25" z="103" textcolor="237 227 167" font="prospero16" hidden="false" ghost="true">
-      {buildTime}
-      <action on="Load"><![CDATA[
-        this.caption = "Build: " + buildTime(0) + " " + getLanguageID();
-      ]]></action>
-    </object>
- 
-    <object type="text" name="pregame-mainmenu-tooltip" sprite="tooltip-background" size="69% 6.3802% 97.0703125% 28.125%" font="prospero16" textcolor="255 255 255" z="104" hidden="true" ghost="true">
-      tooltipText
-    </object>
-
-    <object type="image" name="pregame-mainmenu-wfg-logo" sprite="pregame-mainmenu-wfg-logo-256x64" size="10 91.666666%-30 25.9765% 100%-30" z="102" hidden="false">
-      <action on="MouseEnter"><![CDATA[
-        tooltipObject = getGUIObjectByName("pregame-mainmenu-tooltip");
-        tooltipObject.caption = "These are the guys who made this game. Visit them at http://www.wildfiregames.com/0ad/";
-        GUIObjectUnhide("pregame-mainmenu-tooltip");
-      ]]></action>
-      <action on="MouseLeave"><![CDATA[
-        GUIObjectHide("pregame-mainmenu-tooltip");
-      ]]></action>
-    </object>
-
-  </object>
-
-  <!-- TEMPORARY END GAME BUTTON; REMOVE WHEN GAME MENU IMPLEMENTED; BUTTON IS OUTSIDE OF pregame_gui IN ORDER TO BE VISIBLE DURING GAME -->
-
-  <object type="button" name="End_Game_Button" sprite="sprite1" sprite-over="sprite1-over" sprite-pressed="sprite1-pressed" size="100%-150 32 100%-30 53" z="105" textcolor="0 0 0" hidden="true">
-    End Game
-
-    <action on="Press"><![CDATA[
-      endGame();
-      GUIObjectHide("session_gui");
-      GUIObjectHide("End_Game_Button");
-      GUIObjectUnhide("pregame_gui");
-    ]]></action>
-  </object>
-
-  <object type="empty" name="session_gui" size="0 0 100% 100%" z="1" hidden="true">
-
-    <!--
-    ==========================================
-    - DUDE PRODUCTION BUTTONS -
-    ==========================================
-    -->
-
-    <object type="button" name="Dude_Production_Button_random" hotkey="dudemachine.random" sprite="sprite1" sprite-over="sprite1-over" sprite-pressed="sprite1-pressed" size="100%-288 32 100%-160 53" z="100" textcolor="0 0 0" text-align="center" text-valign="center">
-      Make random dude
-      <action on="Press"><![CDATA[
-        // Generate random numbers
-        rand_x = Math.round(Math.random()*100);
-        rand_y = Math.round(Math.random()*100);
-        rand_z = Math.round(Math.random()*100);
-
-        MakeUnit(rand_x, rand_y, rand_z, "Prometheus Dude");
-      ]]></action>
-    </object>
-
-    <object type="empty" name="top_bar" size="0 0 100% 100%" z="1" hidden="false">
-
-      <!--
-      ==========================================
-      - RESOURCE ICONS -
-      ==========================================
-      -->
-
-      <!-- FOOD -->
-      <!-- icon/background/text -->
-      <object type="text" name="resource_food" sprite="resource_food" size="100%-456 4 20 20" z="100" hidden="false"></object>
-      <object type="text" name="resource_food_counter" sprite="resource_counter" size="100%-436 5 1 1" z="90" hidden="false"></object>
-      <object type="text" name="resource_food_text" size="100%-438 -3 1 1" font="prospero16" textcolor="255 255 255" z="100" hidden="false"> 123,456</object>
-
-      <!-- WOOD -->
-      <!-- icon/background/text -->
-      <object type="text" name="resource_wood" sprite="resource_wood" size="100%-376 4 20 20" z="100" hidden="false"></object>
-      <object type="text" name="resource_wood_counter" sprite="resource_counter" size="100%-356 5 1 1" z="90" hidden="false"></object>
-      <object type="text" name="resource_wood_text" size="100%-358 -3 1 1" font="prospero16" textcolor="255 255 255" z="100" hidden="false"> 789,012</object>
-
-      <!-- STONE -->
-      <!-- icon/background/text -->
-      <object type="text" name="resource_stone" sprite="resource_stone" size="100%-296 4 20 20" z="100" hidden="false"></object>
-      <object type="text" name="resource_stone_counter" sprite="resource_counter" size="100%-276 5 1 1" z="90" hidden="false"></object>
-      <object type="text" name="resource_stone_text" size="100%-278 -3 1 1" font="prospero16" textcolor="255 255 255" z="100" hidden="false"> 345,678</object>
-
-      <!-- ORE -->
-      <!-- icon/background/text -->
-      <object type="text" name="resource_ore" sprite="resource_ore" size="100%-216 4 20 20" z="100" hidden="false"></object>
-      <object type="text" name="resource_ore_counter" sprite="resource_counter" size="100%-196 5 1 1" z="90" hidden="false"></object>
-      <object type="text" name="resource_ore_text" size="100%-198 -3 1 1" font="prospero16" textcolor="255 255 255" z="100" hidden="false"> 910,123</object>
-
-      <!-- POPULATION -->
-      <!-- icon/background/text -->
-      <object type="text" name="resource_population" sprite="resource_population" size="100%-136 4 20 20" z="100" hidden="false"></object>
-      <object type="text" name="resource_population_counter" sprite="resource_counter_long" size="100%-116 5 1 1" z="90" hidden="false"></object>
-      <object type="text" name="resource_population_text" size="100%-118 -3 1 1" font="prospero16" textcolor="255 255 255" z="100" hidden="false"> 100/150</object>
-
-      <!--
-      ==========================================
-      - PHASE BANNER -
-      ==========================================
-      ATTENTION: This is temporary code. We will have a nice-looking graphical banner here later.
-      -->
-
-      <object type="button" name="phase_banner" sprite="white-border" size="50%-50 2 50%+50 23" z="50" textcolor="255 255 255" text-align="center" text-valign="center">Village
-        <action on="Press"><![CDATA[
-          ObjectPhaseBanner = getGUIObjectByName("phase_banner");
-          switch (ObjectPhaseBanner.caption)
-          {
-            case ("Village"):
-              ObjectPhaseBanner.caption = "Town";
-              break;
-            case ("Town"):
-              ObjectPhaseBanner.caption = "City";
-              break;
-            case ("City"):
-              ObjectPhaseBanner.caption = "Village";
-              break;
-            default:
-              break;
-          }
-        ]]></action>
-      </object>
-
-    </object>
-
-    <!--
-    ==========================================
-    - MISCELLANEOUS -
-    ==========================================
-    There's always MISC :) This is mainly temporary fun-stuff.
-    -->
-
-    <object type="text" name="wfg_logo" sprite="wfg_logo_128" size="20 20 148 148" z="100" hidden="false" />
-
-    <!--
-    ==========================================
-    - BOTTOM PANEL IN SESSION UI -
-    ==========================================
-    -->
-
-    <object type="text" name="session_panel" hidden="false">
-  
-      <!-- PANEL BACKGROUND -->
-      <object type="text" name="session_panel_bg_left" sprite="session_panel_bg_left" size="0 100%-161 258 100%" z="50" hidden="false" />
-      <object type="text" name="session_panel_minimap_bg" sprite="session_panel_minimap_bg" size="0 100%-179 100% 100%" z="60" hidden="false" />
-      <object type="text" name="session_panel_bg_middle" sprite="session_panel_bg_middle" size="50%-257 100%-161 50%+274 100%" z="50" hidden="false"> 
-        <action on="Tick"><![CDATA[
-          getGUIGlobal().GUIUpdateObjectInfo();
-        ]]></action>
-      </object>
-      <object type="text" name="session_panel_bg_right" sprite="session_panel_bg_right" size="100%-241 100%-161 100% 100%" z="50" hidden="false" />
-
-      <!-- MINIMAP - TEMP: Insert real minimap here later. -->
-      <!--<object type="text" name="session_panel_minimap_dummy" sprite="session_panel_minimap_dummy" size="9 100%-169 100% 100%" z="60" hidden="false" />-->
-      <object type="minimap" name="session_panel_minimap_dummy" sprite="session_panel_minimap_dummy" size="0%+9 100%-169 0%+169 100%-9" z="60" hidden="false" />
-
-      <!--
-      ==========================================
-      - INFO PANEL -
-      ==========================================
-      -->
-
-      <!-- Entity info objects -->
-      <object type="text" name="selection_portrait_test" sprite="portrait_unit_dude_lrg" size="50%-250 100%-130 64 64" z="60" hidden="true" />
-      <object type="text" name="selection_name_test" size="50%-180 100%-140 50%+200 100%-120" font="prospero24b" textcolor="255 255 255" z="60" hidden="false" />
-      <object type="text" name="selection_pos_test" size="50%-250 100%-60 50%+200 100%-95" textcolor="255 255 255" z="60" hidden="false" />
-      <object type="text" name="selection_speed_test" size="50%+200 100%-43 100%-241 0" textcolor="255 255 255" z="60" hidden="false" />
-      <!-- / Entity info objects -->
-
-      <!-- Entity Statistics -->
-      <object type="text" name="statistic_attack" sprite="statistic_attack" size="50%+75 100%-110 20 20" z="100" hidden="false"></object>
-      <object type="text" name="statistic_hack" sprite="statistic_hack" size="50%+75 100%-75 20 20" z="100" hidden="false"></object>
-      <object type="text" name="statistic_pierce" sprite="statistic_pierce" size="50%+75 100%-40 20 20" z="100" hidden="false"></object>
-      <object type="text" name="statistic_accuracy" sprite="statistic_accuracy" size="50%+175 100%-110 20 20" z="100" hidden="false"></object>
-      <object type="text" name="statistic_los" sprite="statistic_los" size="50%+175 100%-75 20 20" z="100" hidden="false"></object>
-      <object type="text" name="statistic_speed" sprite="statistic_speed" size="50%+175 100%-40 20 20" z="100" hidden="false"></object>
-      <!-- / Entity Statistics -->
-
-      <!-- TABS - Background -->
-      <object type="text" name="session_panel_tabs_bg_left" sprite="session_panel_tabs_bg1" size="100%-235 100%-152 100%-176 100%-7" z="60" hidden="false" />
-      <object type="text" name="session_panel_tabs_bg_right" sprite="session_panel_tabs_bg2" size="100%-197 100%-152 100%-7 100%-7" z="61" hidden="false" />
-
-      <!-- TABS MAIN -->
-      <!-- TAB: [1] COMMAND -->
-      <object type="button" name="session_panel_tabs_command_activebg" sprite="session_panel_tabs_activetabbg"
-        size="100%-235 100%-152 100%-195 100%-112" z="62" hidden="false">
-
-        <!-- DUDEMAKER BUTTONS -->
-        <object type="button" name="normal_mode_button_dude" sprite="portrait_unit_dude_sml" sprite-over="portrait_unit_dude_sml_over" size="100%-190 100%-143 100%-158 100%-111" z="64" hidden="false">
-          <action on="Press"><![CDATA[
-            MakeUnit(15,0,15,"Prometheus Dude");
-          ]]></action>
-        </object>
-        <object type="button" name="normal_mode_button_dudette" sprite="portrait_unit_dudette_sml" sprite-over="portrait_unit_dudette_sml_over" size="100%-150 100%-143 100%-117 100%-111" z="64" hidden="false">
-          <action on="Press"><![CDATA[
-            MakeUnit(15,0,15,"Prometheus Dudette");
-          ]]></action>
-        </object>
-        <object type="button" name="normal_mode_button_cavalrydude" sprite="portrait_unit_cavalrydude_sml" sprite-over="portrait_unit_cavalrydude_sml_over" size="100%-110 100%-143 100%-77 100%-111" z="64" hidden="false">
-          <action on="Press"><![CDATA[
-            MakeUnit(15,0,15,"Cavalry Dude");
-          ]]></action>
-        </object>
-      </object>
-        
-      <!-- TAB: [2] BUILD CIVIL -->
-      <object type="button" name="session_panel_tabs_buildcivil_activebg" sprite="session_panel_tabs_activetabbg"
-        size="100%-235 100%-117 100%-195 100%-77" z="62" hidden="true">
-      </object>
-
-      <!-- TAB: [3] BUILD MILITARY -->
-      <object type="button" name="session_panel_tabs_buildmil_activebg" sprite="session_panel_tabs_activetabbg"
-        size="100%-235 100%-82 100%-195 100%-42" z="62" hidden="true">
-      </object>
-
-      <!-- TAB: [4] FORMATIONS -->
-      <object type="button" name="session_panel_tabs_formations_activebg" sprite="session_panel_tabs_activetabbg"
-        size="100%-235 100%-47 100%-195 100%-7" z="62" hidden="true">
-      </object>
-      <!-- / TABS MAIN -->
-
-      <!-- TABS - Tab Buttons -->
-      <!-- BUTTON: [1] Command -->
-      <object type="button" name="session_panel_tabs_command_bt" sprite="icon_command" size="100%-230 100%-147 100%-198 100%-115" z="63" hidden="false">
-        <action on="Press"><![CDATA[
-          GUIObjectUnhide("session_panel_tabs_command_activebg");
-          GUIObjectHide("session_panel_tabs_buildcivil_activebg");
-          GUIObjectHide("session_panel_tabs_buildmil_activebg");
-          GUIObjectHide("session_panel_tabs_formations_activebg");
-        ]]></action>
-      </object>
-
-      <!-- BUTTON: [2] Build Civil -->
-      <object type="button" name="session_panel_tabs_buildcivil_bt" sprite="icon_buildcivil" size="100%-230 100%-112 100%-198 100%-80" z="63" hidden="false">
-        <action on="Press"><![CDATA[
-          GUIObjectUnhide("session_panel_tabs_buildcivil_activebg");
-          GUIObjectHide("session_panel_tabs_command_activebg");
-          GUIObjectHide("session_panel_tabs_buildmil_activebg");
-          GUIObjectHide("session_panel_tabs_formations_activebg");
-        ]]></action>
-      </object>
-        
-      <!-- BUTTON: [3] Build Military -->
-      <object type="button" name="session_panel_tabs_buildmil_bt" sprite="icon_buildmil" size="100%-230 100%-77 100%-198 100%-45" z="63" hidden="false">
-        <action on="Press"><![CDATA[
-          GUIObjectUnhide("session_panel_tabs_buildmil_activebg");
-          GUIObjectHide("session_panel_tabs_command_activebg");
-          GUIObjectHide("session_panel_tabs_buildcivil_activebg");
-          GUIObjectHide("session_panel_tabs_formations_activebg");
-        ]]></action>
-      </object>
-
-      <!-- BUTTON: [4] Formations -->
-      <object type="button" name="session_panel_tabs_formations_bt" sprite="icon_formations" size="100%-230 100%-42 100%-198 100%-10" z="63" hidden="false">
-        <action on="Press"><![CDATA[
-          GUIObjectUnhide("session_panel_tabs_formations_activebg");
-          GUIObjectHide("session_panel_tabs_command_activebg");
-          GUIObjectHide("session_panel_tabs_buildcivil_activebg");
-          GUIObjectHide("session_panel_tabs_buildmil_activebg");
-        ]]></action>
-      </object>
-
-    </object>
-
-    <!--
-    ==========================================
-    - FPS COUNTER -
-    ==========================================
-    -->
-    <object type="text" name="FPS_Counter" size="18 100%-35 200 100%" z="100" hotkey="hotkey.fps.toggle" textcolor="200 200 0" font="verdana16" hidden="false">
-      <action on="Load"><![CDATA[
-        setInterval(UpdateFPSCounter, 50);
-      ]]></action>
-    </object>
+    <object type="text" name="wfg_logo" sprite="wfg_logo_128" size="20 20 148 148" z="100" hidden="true" />
 
     <!--
     ==========================================
@@ -446,7 +40,7 @@
       ]]></action>
     </object>
 
-    <object type="button" name="ball" sprite="sprite1" size="0 0 1 1" z="120" hotkey="orbital.cheat">
+    <object type="button" name="ball" sprite="sprite1" size="0 0 1 1" z="120" hotkey="orbital.cheat" hidden="true">
       <action on="Press"><![CDATA[
         writeConsole(mouse);
         g_balldx = 0;
@@ -454,7 +48,7 @@
       ]]></action>
     </object>
 
-    <object type="button" name="arena-button" sprite="sprite1" size="710 32 726 48" z="200" hotkey="orbital.toggle" font="prospero14" text-align="center" text-valign="center">v
+    <object type="button" name="arena-button" sprite="sprite1" size="710 32 726 48" z="200" hotkey="orbital.toggle" font="prospero14" text-align="center" text-valign="center" hidden="true">v
       <action on="Press"><![CDATA[
         var arena = getGUIObjectByName('arena');
         arena.hidden = !arena.hidden;
@@ -468,14 +62,4 @@
     ==========================================
     -->
 
-  <!-- / SESSION GUI -->
-  </object>
-
-<!-- TEST -->
-<object type="image" name="darkening_test" sprite="tooltip-background" size="0 0 100% 100%" z="1000" hidden="true">
-</object>
-
-<!-- / ALL GUI -->
-</object>
-
 </objects>
diff --git a/binaries/data/mods/official/gui/test/setup.xml b/binaries/data/mods/official/gui/test/setup.xml
index c3b7a90994..732d733784 100755
--- a/binaries/data/mods/official/gui/test/setup.xml
+++ b/binaries/data/mods/official/gui/test/setup.xml
@@ -14,7 +14,7 @@
 		sprite-bar-vertical-pressed="null"
 		sprite-button-bottom-pressed="sprite2-pressed"
 		sprite-button-top-pressed="sprite2-pressed"
-		/>
+	/>
 
 	<scrollbar name="sb2" width="37" minimum-bar-size="5"
 		sprite-button-top="scroll"
@@ -27,6 +27,19 @@
 		sprite-bar-vertical-pressed="null"
 		sprite-button-bottom-pressed="scroll"
 		sprite-button-top-pressed="scroll"
-		/>
+	/>
+
 	<icon name="smiley" texture="test2" size="16 16" />
+
+<!-- Commented out until tooltips are implemented as documented.
+	<tooltip name="session_tooltip"
+		maxwidth="300"
+		pos="10 10"
+		time="5"
+		sprite="tooltip-background"
+		font="prospero16"
+		textcolor="255 255 255"
+	/>
+-->
+
 </setup>
diff --git a/binaries/data/mods/official/gui/test/sprite1.xml b/binaries/data/mods/official/gui/test/sprite1.xml
index 0d093b31df..e63fa6c452 100755
--- a/binaries/data/mods/official/gui/test/sprite1.xml
+++ b/binaries/data/mods/official/gui/test/sprite1.xml
@@ -4,333 +4,6 @@
 
 <sprites>
 
-        <!--
-        ==========================================
-        TEMPORARY IMAGES
-        ==========================================
-        -->
-
-        <!-- Exit Button -->
-        <sprite name="exit_sprite">
-                <image texture="exit_button_16.png" texture-size="0 0 16 16" size="0 0 100% 100%" />
-        </sprite>
-        <sprite name="exit_sprite-over">
-                <image texture="exit_button_16-over.png" texture-size="0 0 16 16" size="0 0 100% 100%" />
-        </sprite>
-        
-        <!-- WFG logo -->
-        <sprite name="wfg_logo_128">
-                <image texture="wfg_logo_128.tga" texture-size="0 0 128 128" size="0 0 128 128" />
-        </sprite>
-
-        <!-- Some more temps /Gee -->
-        <sprite name="test">
-                <image size="0 0 100% 100%" backcolor="100 100 250" />
-        </sprite>
-
-        <sprite name="test2">
-                <image size="0 0 100% 100%" backcolor="200 100 050" />
-        </sprite>
-
-        <!--
-        ==========================================
-        PREGAME GUI
-        ==========================================
-        -->
-
-        <sprite name="pregame-mainmenu-background">
-                <image texture="ui_pregame_mainmenu_background.png" real-texture-placement="0 0 1024 768" size="0 0 100% 100%" />
-        </sprite>
-        
-        <sprite name="pregame-mainmenu-0ad-logo-480x218">
-                <image texture="ui_pregame_mainmenu_0ad_logo.png" real-texture-placement="0 0 480 218" size="0 0 100% 100%" />
-        </sprite>
-        
-        <sprite name="pregame-mainmenu-wfg-logo-256x64">
-                <image texture="ui_pregame_mainmenu_wfg_logo.png" real-texture-placement="0 0 256 64" size="0 0 100% 100%" />
-        </sprite>
-
-        <sprite name="pregame-mainmenu-spbt">
-                <image texture="ui_pregame_mainmenu_spbt_over.png" real-texture-placement="1 1 151 142" size="0 0 100% 100%" />
-        </sprite>
-        
-        <sprite name="tooltip-background">
-                <image texture="black_16x16.png" texture-size="0 0 16 16" size="0 0 100% 100%" />
-        </sprite>
-
-        <!--
-        ==========================================
-        BOTTOM PANEL IN SESSION UI
-        ==========================================
-        -->
-        
-        <sprite name="session_panel_bg_left">
-                <image texture="ui_session_panel_bg_left.png" texture-size="0 0 512 512" size="0 0 258 161" />
-        </sprite>
-        
-        <sprite name="session_panel_minimap_bg">
-                <image texture="ui_session_panel_minimap_bg.png" texture-size="0 0 256 256" size="0 0 183 180" />
-        </sprite>
-
-        <sprite name="session_panel_minimap_dummy">
-                <image texture="ui_session_panel_minimap_dummy.png" texture-size="0 0 256 256" size="0 0 163 161" />
-        </sprite>
-
-        <sprite name="session_panel_bg_middle">
-                <image texture="ui_session_panel_bg_middle.png" texture-size="0 0 1024 1024" size="0 0 531 161" />
-        </sprite>
-        
-        <sprite name="session_panel_bg_right">
-                <image texture="ui_session_panel_bg_right.png" texture-size="0 0 256 256" size="0 0 241 161" />
-        </sprite>
-        
-        <sprite name="session_panel_tabs_bg1">
-                <image texture="ui_session_panel_tabs_bg1.png" texture-size="0 0 256 256" size="0 0 59 145" />
-        </sprite>
-
-        <sprite name="session_panel_tabs_bg2">
-                <image texture="ui_session_panel_tabs_bg2.png" texture-size="0 0 256 256" size="0 0 190 145" />
-        </sprite>
-        
-        <sprite name="session_panel_tabs_activetabbg">
-                <image texture="ui_session_panel_tabs_activetabbg.png" texture-size="0 0 64 64" size="0 0 40 40" />
-        </sprite>
-        
-        <sprite name="icon_command">
-                <image texture="ui_session_panel_tabs_command_bt_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
-        </sprite>
-        
-        <sprite name="icon_buildcivil">
-                <image texture="ui_session_panel_tabs_buildcivil_bt_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
-        </sprite>
-
-        <sprite name="icon_buildmil">
-                <image texture="ui_session_panel_tabs_buildmil_bt_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
-        </sprite>
-        
-        <sprite name="icon_formations">
-                <image texture="ui_session_panel_tabs_formations_bt_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
-        </sprite>
-
-        <sprite name="icon_research">
-                <image texture="ui_session_panel_tabs_research_bt_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
-        </sprite>
-
-        <!--
-        ==========================================
-        RESOURCE ICONS
-        ==========================================
-        -->
-
-        <sprite name="resource_food">
-                <image texture="ui_icon_resource_food_20.png" texture-size="0 0 32 32" size="0 0 20 20" />
-        </sprite>
-
-        <sprite name="resource_wood">
-                <image texture="ui_icon_resource_wood_20.png" texture-size="0 0 32 32" size="0 0 20 20" />
-        </sprite>
-
-        <sprite name="resource_stone">
-                <image texture="ui_icon_resource_stone_20.png" texture-size="0 0 32 32" size="0 0 20 20" />
-        </sprite>
-
-        <sprite name="resource_ore">
-                <image texture="ui_icon_resource_ore_20.png" texture-size="0 0 32 32" size="0 0 20 20" />
-        </sprite>
-
-        <sprite name="resource_population">
-                <image texture="ui_icon_resource_population_20.png" texture-size="0 0 32 32" size="0 0 20 20" />
-        </sprite>
-
-        <sprite name="resource_counter">
-                <image texture="ui_icon_resource_counter.png" texture-size="0 0 64 64" size="0 0 53 19" />
-        </sprite>
-
-        <sprite name="resource_counter_long">
-                <image texture="ui_icon_resource_counter_long.png" texture-size="0 0 64 64" size="0 0 62 19" />
-        </sprite>
-
-        <!--
-        ==========================================
-        STATISTIC ICONS
-        ==========================================
-        -->
-
-        <sprite name="statistic_attack">
-                <image texture="ui_icon_statistic_attack_20.png" texture-size="0 0 32 32" size="0 0 20 20" />
-        </sprite>
-
-        <sprite name="statistic_accuracy">
-                <image texture="ui_icon_statistic_accuracy_20.png" texture-size="0 0 32 32" size="0 0 20 20" />
-        </sprite>
-
-        <sprite name="statistic_los">
-                <image texture="ui_icon_statistic_los_20.png" texture-size="0 0 32 32" size="0 0 20 20" />
-        </sprite>
-
-        <sprite name="statistic_pierce">
-                <image texture="ui_icon_statistic_pierce_20.png" texture-size="0 0 32 32" size="0 0 20 20" />
-        </sprite>
-
-        <sprite name="statistic_hack">
-                <image texture="ui_icon_statistic_hack_20.png" texture-size="0 0 32 32" size="0 0 20 20" />
-        </sprite>
-
-        <sprite name="statistic_speed">
-                <image texture="ui_icon_statistic_speed_20.png" texture-size="0 0 32 32" size="0 0 20 20" />
-        </sprite>
-
-        <!--
-        ==========================================
-        UNIT PORTRAIT ICONS
-        ==========================================
-        -->
-
-        <!-- The Dude -->
-        <sprite name="portrait_unit_dude_lrg">
-                <image texture="ui_portrait_unit_dude_64.png" texture-size="0 0 64 64" size="0 0 64 64" />
-        </sprite>
-        <sprite name="portrait_unit_dude_sml">
-                <image texture="ui_portrait_unit_dude_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
-        </sprite>
-        <sprite name="portrait_unit_dude_lrg_over">
-                <image texture="ui_portrait_unit_dude_64_over.png" texture-size="0 0 64 64" size="0 0 64 64" />
-        </sprite>
-        <sprite name="portrait_unit_dude_sml_over">
-                <image texture="ui_portrait_unit_dude_32_over.png" texture-size="0 0 32 32" size="0 0 32 32" />
-        </sprite>
-        
-        <!-- The Dudette -->
-        <sprite name="portrait_unit_dudette_lrg">
-                <image texture="ui_portrait_unit_dudette_64.png" texture-size="0 0 64 64" size="0 0 64 64" />
-        </sprite>
-        <sprite name="portrait_unit_dudette_sml">
-                <image texture="ui_portrait_unit_dudette_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
-        </sprite>
-        <sprite name="portrait_unit_dudette_lrg_over">
-                <image texture="ui_portrait_unit_dudette_64_over.png" texture-size="0 0 64 64" size="0 0 64 64" />
-        </sprite>
-        <sprite name="portrait_unit_dudette_sml_over">
-                <image texture="ui_portrait_unit_dudette_32_over.png" texture-size="0 0 32 32" size="0 0 32 32" />
-        </sprite>
-
-
-        <!-- The Cavalry Dude -->
-        <sprite name="portrait_unit_cavalrydude_lrg">
-                <image texture="ui_portrait_unit_cavalrydude_64.png" texture-size="0 0 64 64" size="0 0 64 64" />
-        </sprite>
-        <sprite name="portrait_unit_cavalrydude_sml">
-                <image texture="ui_portrait_unit_cavalrydude_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
-        </sprite>
-        <sprite name="portrait_unit_cavalrydude_lrg_over">
-                <image texture="ui_portrait_unit_cavalrydude_64_over.png" texture-size="0 0 64 64" size="0 0 64 64" />
-        </sprite>
-        <sprite name="portrait_unit_cavalrydude_sml_over">
-                <image texture="ui_portrait_unit_cavalrydude_32_over.png" texture-size="0 0 32 32" size="0 0 32 32" />
-        </sprite>
-
-        <!--
-        ==========================================
-        STRUCTURE PORTRAIT ICONS
-        ==========================================
-        -->
-
-        <!-- Hellenic Civic Centre -->
-        <sprite name="portrait_structure_helecc_lrg">
-                <image texture="ui_portrait_structure_helecc_64.png" texture-size="0 0 64 64" size="0 0 64 64" />
-        </sprite>
-        <sprite name="portrait_structure_helecc_sml">
-                <image texture="ui_portrait_structure_helecc_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
-        </sprite>
-
-        <!-- Hellenic House -->
-        <sprite name="portrait_structure_heleho_lrg">
-                <image texture="ui_portrait_structure_heleho_64.png" texture-size="0 0 64 64" size="0 0 64 64" />
-        </sprite>
-        <sprite name="portrait_structure_heleho_sml">
-                <image texture="ui_portrait_structure_heleho_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
-        </sprite>
-
-        <!--
-        ==========================================
-        TECH PORTRAIT ICONS
-        ==========================================
-        -->
-
-        <!-- Axe Tech -->
-        <sprite name="portrait_tech_axe_lrg">
-                <image texture="ui_portrait_tech_axe_64.png" texture-size="0 0 64 64" size="0 0 64 64" />
-        </sprite>
-        <sprite name="portrait_tech_axe_sml">
-                <image texture="ui_portrait_tech_axe_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
-        </sprite>
-
-        <!-- Tree Tech -->
-        <sprite name="portrait_tech_tree_lrg">
-                <image texture="ui_portrait_tech_tree_64.png" texture-size="0 0 64 64" size="0 0 64 64" />
-        </sprite>
-        <sprite name="portrait_tech_tree_sml">
-                <image texture="ui_portrait_tech_tree_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
-        </sprite>
-
-        <!-- Wood Tech -->
-        <sprite name="portrait_tech_wood_lrg">
-                <image texture="ui_portrait_tech_wood_64.png" texture-size="0 0 64 64" size="0 0 64 64" />
-        </sprite>
-        <sprite name="portrait_tech_wood_sml">
-                <image texture="ui_portrait_tech_wood_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
-        </sprite>
-
-        <!--
-        ==========================================
-        FLORA PORTRAIT ICONS
-        ==========================================
-        -->
-
-        <!-- Deciduous Tree -->
-        <sprite name="portrait_flora_deciduotree_lrg">
-                <image texture="ui_portrait_flora_deciduotree_64.png" texture-size="0 0 64 64" size="0 0 64 64" />
-        </sprite>
-        <sprite name="portrait_flora_deciduotree_sml">
-                <image texture="ui_portrait_flora_deciduotree_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
-        </sprite>
-
-        <!--
-        ==========================================
-        ACTION PORTRAIT ICONS
-        ==========================================
-        -->
-
-        <!-- Build Action -->
-        <sprite name="portrait_action_build_lrg">
-                <image texture="ui_portrait_action_build_64.png" texture-size="0 0 64 64" size="0 0 64 64" />
-        </sprite>
-        <sprite name="portrait_action_build_sml">
-                <image texture="ui_portrait_action_build_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
-        </sprite>
-
-        <!-- Chop Action -->
-        <sprite name="portrait_action_chop_lrg">
-                <image texture="ui_portrait_action_chop_64.png" texture-size="0 0 64 64" size="0 0 64 64" />
-        </sprite>
-        <sprite name="portrait_action_chop_sml">
-                <image texture="ui_portrait_action_chop_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
-        </sprite>
-
-        <!--
-        ==========================================
-        MISCELLANEOUS PORTRAIT ICONS
-        ==========================================
-        -->
-
-        <!-- Placeholder for Missing Portrait -->
-        <sprite name="portrait_unknown_lrg">
-                <image texture="ui_portrait_unknown_64.png" texture-size="0 0 64 64" size="0 0 64 64" />
-        </sprite>
-        <sprite name="portrait_unknown_sml">
-                <image texture="ui_portrait_unknown_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
-        </sprite>
-
         <!--
         ==========================================
         GENERIC BUTTONS
@@ -425,4 +98,267 @@
                 <image backcolor="150 105 180" size="2 0 100%-2 100%" z-level="1" />
         </sprite>
 
+        <!--
+        ==========================================
+        PREGAME GUI
+        ==========================================
+        -->
+
+        <sprite name="pregame-mainmenu-background">
+                <image texture="ui_pregame_mainmenu_background.png" real-texture-placement="0 0 1024 768" size="0 0 100% 100%" />
+        </sprite>
+        
+        <sprite name="pregame-mainmenu-0ad-logo-480x218">
+                <image texture="ui_pregame_mainmenu_0ad_logo.png" real-texture-placement="0 0 480 218" size="0 0 100% 100%" />
+        </sprite>
+        
+        <sprite name="pregame-mainmenu-wfg-logo-256x64">
+                <image texture="ui_pregame_mainmenu_wfg_logo.png" real-texture-placement="0 0 256 64" size="0 0 100% 100%" />
+        </sprite>
+
+        <sprite name="pregame-mainmenu-spbt">
+                <image texture="ui_pregame_mainmenu_spbt_over.png" real-texture-placement="1 1 151 142" size="0 0 100% 100%" />
+        </sprite>
+        
+        <sprite name="tooltip-background">
+                <image texture="black_16x16.png" texture-size="0 0 16 16" size="0 0 100% 100%" />
+        </sprite>
+
+		<!--
+		==========================================
+        	MAP ORB
+        	==========================================
+        	-->
+
+       		<sprite name="session_panel_minimap_bg">
+                	<image texture="ui_session_panel_minimap_bg.png" texture-size="0 0 256 256" size="0 0 176 176" />
+        	</sprite>
+
+        	<sprite name="session_panel_minimap_dummy">
+                	<image texture="ui_session_panel_minimap_dummy.png" texture-size="0 0 256 256" size="0 0 172 172" />
+        	</sprite>
+
+        	<sprite name="session_panel_minimap_segleft1">
+                	<image texture="ui_session_panel_minimap_segleft1.png" texture-size="0 0 64 64" size="0 0 32 46" />
+        	</sprite>
+
+        	<sprite name="session_panel_minimap_segleft2">
+                	<image texture="ui_session_panel_minimap_segleft2.png" texture-size="0 0 64 64" size="0 0 40 44" />
+        	</sprite>
+
+        	<sprite name="session_panel_minimap_segleft3">
+                	<image texture="ui_session_panel_minimap_segleft3.png" texture-size="0 0 64 64" size="0 0 40 44" />
+        	</sprite>
+
+        	<sprite name="session_panel_minimap_segleft4">
+                	<image texture="ui_session_panel_minimap_segleft4.png" texture-size="0 0 64 64" size="0 0 32 46" />
+        	</sprite>
+
+        	<sprite name="session_panel_minimap_segbottom1">
+                	<image texture="ui_session_panel_minimap_segbottom1.png" texture-size="0 0 64 64" size="0 0 44 40" />
+        	</sprite>
+
+        	<sprite name="session_panel_minimap_segbottom2">
+                	<image texture="ui_session_panel_minimap_segbottom2.png" texture-size="0 0 64 64" size="0 0 46 46" />
+        	</sprite>
+
+        	<sprite name="session_panel_minimap_segbottom3">
+                	<image texture="ui_session_panel_minimap_segbottom3.png" texture-size="0 0 64 64" size="0 0 46 46" />
+        	</sprite>
+
+        	<sprite name="session_panel_minimap_segbottom4">
+                	<image texture="ui_session_panel_minimap_segbottom4.png" texture-size="0 0 64 64" size="0 0 44 40" />
+        	</sprite>
+
+        	<sprite name="session_panel_minimap_segtop1">
+                	<image texture="ui_session_panel_minimap_segtop1.png" texture-size="0 0 64 64" size="0 0 44 40" />
+        	</sprite>
+
+        	<sprite name="session_panel_minimap_segtop2">
+                	<image texture="ui_session_panel_minimap_segtop2.png" texture-size="0 0 64 64" size="0 0 46 46" />
+        	</sprite>
+
+        	<sprite name="session_panel_minimap_segtop3">
+                	<image texture="ui_session_panel_minimap_segtop3.png" texture-size="0 0 64 64" size="0 0 46 46" />
+        	</sprite>
+
+        	<sprite name="session_panel_minimap_segtop4">
+                	<image texture="ui_session_panel_minimap_segtop4.png" texture-size="0 0 64 64" size="0 0 44 40" />
+        	</sprite>
+
+        	<!--
+        	==========================================
+        	STATUS ORB
+        	==========================================
+        	-->
+
+       		<sprite name="session_panel_status_bg-top">
+                	<image texture="ui_session_panel_status_bg-top.png" texture-size="0 0 256 256" size="0 0 184 184" />
+        	</sprite>
+
+       		<sprite name="session_panel_status_bg-bottom">
+                	<image texture="ui_session_panel_status_bg-bottom.png" texture-size="0 0 256 256" size="0 0 184 184" />
+        	</sprite>
+
+        	<!--
+        	==========================================
+        	TOP BAR
+        	==========================================
+        	-->
+
+        	<sprite name="resource_food">
+                	<image texture="ui_icon_resource_food_20.png" texture-size="0 0 32 32" size="0 0 20 20" />
+        	</sprite>
+
+        	<sprite name="resource_wood">
+                	<image texture="ui_icon_resource_wood_20.png" texture-size="0 0 32 32" size="0 0 20 20" />
+        	</sprite>
+
+        	<sprite name="resource_stone">
+                	<image texture="ui_icon_resource_stone_20.png" texture-size="0 0 32 32" size="0 0 20 20" />
+        	</sprite>
+
+        	<sprite name="resource_ore">
+                	<image texture="ui_icon_resource_ore_20.png" texture-size="0 0 32 32" size="0 0 20 20" />
+        	</sprite>
+
+        	<sprite name="resource_population">
+                	<image texture="ui_icon_resource_population_20.png" texture-size="0 0 32 32" size="0 0 20 20" />
+        	</sprite>
+
+        	<sprite name="resource_counter">
+                	<image texture="ui_icon_resource_counter.png" texture-size="0 0 64 64" size="0 0 53 19" />
+        	</sprite>
+
+        	<sprite name="resource_counter_long">
+                	<image texture="ui_icon_resource_counter_long.png" texture-size="0 0 64 64" size="0 0 62 19" />
+        	</sprite>
+
+        	<!--
+        	==========================================
+        	STATISTIC ICONS
+        	==========================================
+        	-->
+
+                <sprite name="statistic_hp">
+                        <image texture="ui_icon_statistic_hp_20.png" texture-size="0 0 32 32" size="0 0 20 20" />
+                </sprite>
+
+                <sprite name="statistic_rank1">
+                        <image texture="ui_icon_statistic_rank1_20.png" texture-size="0 0 32 32" size="0 0 20 20" />
+                </sprite>
+
+                <sprite name="statistic_rank2">
+                        <image texture="ui_icon_statistic_rank2_20.png" texture-size="0 0 32 32" size="0 0 20 20" />
+                </sprite>
+
+                <sprite name="statistic_rank3">
+                        <image texture="ui_icon_statistic_rank3_20.png" texture-size="0 0 32 32" size="0 0 20 20" />
+                </sprite>
+
+                <sprite name="statistic_garrison">
+                        <image texture="ui_icon_statistic_garrison_20.png" texture-size="0 0 32 32" size="0 0 20 20" />
+                </sprite>
+
+        	<!--
+        	==========================================
+        	ENTITY PORTRAITS
+        	==========================================
+        	-->
+
+		<!-- Default (empty) portrait. -->
+                <sprite name="ui_portrait_default_64">
+                        <image texture="ui_portrait_default_64.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                </sprite>
+                <sprite name="ui_portrait_default_64-lit">
+                        <image texture="ui_portrait_default_64-lit.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                </sprite>
+                <sprite name="ui_portrait_default_64-grey">
+                        <image texture="ui_portrait_default_64-grey.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                </sprite>
+
+		<!-- Prometheus Dude portrait. -->
+                <sprite name="ui_portrait_unit_dude_64">
+                        <image texture="ui_portrait_unit_dude_64.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                </sprite>
+                <sprite name="ui_portrait_unit_dude_64-lit">
+                        <image texture="ui_portrait_unit_dude_64-lit.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                </sprite>
+                <sprite name="ui_portrait_unit_dude_64-grey">
+                        <image texture="ui_portrait_unit_dude_64-grey.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                </sprite>
+
+		<!-- Prometheus Dudette portrait. -->
+                <sprite name="ui_portrait_unit_dudette_64">
+                        <image texture="ui_portrait_unit_dudette_64.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                </sprite>
+                <sprite name="ui_portrait_unit_dudette_64-lit">
+                        <image texture="ui_portrait_unit_dudette_64-lit.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                </sprite>
+                <sprite name="ui_portrait_unit_dudette_64-grey">
+                        <image texture="ui_portrait_unit_dudette_64-grey.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                </sprite>
+
+		<!-- Prometheus Cavalry Dude portrait. -->
+                <sprite name="ui_portrait_unit_cavalrydude_64">
+                        <image texture="ui_portrait_unit_cavalrydude_64.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                </sprite>
+                <sprite name="ui_portrait_unit_cavalrydude_64-lit">
+                        <image texture="ui_portrait_unit_cavalrydude_64-lit.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                </sprite>
+                <sprite name="ui_portrait_unit_cavalrydude_64-grey">
+                        <image texture="ui_portrait_unit_cavalrydude_64-grey.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                </sprite>
+
+		<!-- Deciduous Tree portrait. -->
+                <sprite name="ui_portrait_flora_deciduotree_64">
+                        <image texture="ui_portrait_flora_deciduotree_64.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                </sprite>
+                <sprite name="ui_portrait_flora_deciduotree_64-lit">
+                        <image texture="ui_portrait_flora_deciduotree_64-lit.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                </sprite>
+                <sprite name="ui_portrait_flora_deciduotree_64-grey">
+                        <image texture="ui_portrait_flora_deciduotree_64-grey.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                </sprite>
+
+		<!-- Structure: Hellenic House portrait. -->
+                <sprite name="ui_portrait_structure_heleho_64">
+                        <image texture="ui_portrait_structure_heleho_64.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                </sprite>
+                <sprite name="ui_portrait_structure_heleho_64-lit">
+                        <image texture="ui_portrait_structure_heleho_64-lit.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                </sprite>
+                <sprite name="ui_portrait_structure_heleho_64-grey">
+                        <image texture="ui_portrait_structure_heleho_64-grey.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                </sprite>
+
+        <!--
+        ==========================================
+        TEMPORARY IMAGES
+        ==========================================
+        -->
+
+       <!-- Exit Button -->
+        <sprite name="exit_sprite">
+                <image texture="exit_button_16.png" texture-size="0 0 16 16" size="0 0 100% 100%" />
+        </sprite>
+        <sprite name="exit_sprite-over">
+                <image texture="exit_button_16-over.png" texture-size="0 0 16 16" size="0 0 100% 100%" />
+        </sprite>
+
+        <!-- Some more temps /Gee -->
+        <sprite name="test">
+                <image size="0 0 100% 100%" backcolor="100 100 250" />
+        </sprite>
+
+        <sprite name="test2">
+                <image size="0 0 100% 100%" backcolor="200 100 050" />
+        </sprite>
+
+        <!--
+        ==========================================
+        TEST
+        ==========================================
+        -->
+
 </sprites>
diff --git a/binaries/data/mods/official/gui/test/styles.xml b/binaries/data/mods/official/gui/test/styles.xml
index a903036ffd..f38ac47758 100755
--- a/binaries/data/mods/official/gui/test/styles.xml
+++ b/binaries/data/mods/official/gui/test/styles.xml
@@ -22,4 +22,13 @@
  		sprite2-pressed="sprite2-pressed"
 		sprite2-disabled="sprite2-disabled"
 	/>
+
+	<!-- Empty entity portrait. -->
+	<style name="portrait"
+		sprite="ui_portrait_default_64"
+		sprite-over="ui_portrait_default_64-lit"
+		sprite-disabled="ui_portrait_default_64-grey"
+		tooltip-style="session-tooltip" 
+	/>
+
 </styles>
diff --git a/binaries/data/mods/official/gui/test/test.js b/binaries/data/mods/official/gui/test/test.js
deleted file mode 100755
index 9f907660ad..0000000000
--- a/binaries/data/mods/official/gui/test/test.js
+++ /dev/null
@@ -1 +0,0 @@
-writeConsole("External JS file loaded");
\ No newline at end of file