diff --git a/binaries/data/mods/official/gui/gui.dtd b/binaries/data/mods/official/gui/gui.dtd
index b02c48b573..2d927c6439 100755
--- a/binaries/data/mods/official/gui/gui.dtd
+++ b/binaries/data/mods/official/gui/gui.dtd
@@ -139,15 +139,16 @@
 -->
 <!ATTLIST tooltip
   name					CDATA #REQUIRED
-  sprite				CDATA #REQUIRED
-
+  sprite				CDATA #IMPLIED
   anchor				CDATA #IMPLIED
   buffer-zone				CDATA #IMPLIED
   font					CDATA #IMPLIED
   maxwidth				CDATA #IMPLIED
-  pos					CDATA #IMPLIED
+  offset				CDATA #IMPLIED
   textcolor				CDATA #IMPLIED
-  time					CDATA #IMPLIED
+  delay					CDATA #IMPLIED
+  use-object				CDATA #IMPLIED
+  hide-object				CDATA #IMPLIED
 >
 
 
diff --git a/binaries/data/mods/official/gui/test/2_mainmenu.xml b/binaries/data/mods/official/gui/test/2_mainmenu.xml
index 258be448aa..52f9990579 100755
--- a/binaries/data/mods/official/gui/test/2_mainmenu.xml
+++ b/binaries/data/mods/official/gui/test/2_mainmenu.xml
@@ -11,55 +11,34 @@
   -->
 
 	<object type="empty" name="pregame_gui" size="0 0 100% 100%" z="1" hidden="false">
-        	<action on="Load"><![CDATA[
-	                // Play main 0 A.D. theme when the main menu starts.
+		<action on="Load"><![CDATA[
+			// Play main 0 A.D. theme when the main menu starts.
 			curr_music = newRandomSound("music", "theme");
 			curr_music.loop();
-	        ]]></action>
+		]]></action>
 
 		<object type="image" name="pregame-mainmenu-background-image" sprite="pregame-mainmenu-background" size="0 0 100% 100%" z="100" hidden="false" ghost="true"/>
 
-		<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">
+		<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"
+			tooltip-style="pregame-mainmenu-tooltip" tooltip="Want to move some Dudes around or test something ? Click here to start a new game on the default map.">
 			<action on="Press"><![CDATA[
 				startLoadingScreen();
 			]]></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>
 
-		<object type="button" name="pregame-mainmenu-mp-button" sprite-over="pregame-mainmenu-mpbt" size="60.80% 48.50% 74.40% 66.55%" z="101" hidden="false">
+		<object type="button" name="pregame-mainmenu-mp-button" sprite-over="pregame-mainmenu-mpbt" size="60.80% 48.50% 74.40% 66.55%" z="101" hidden="false"
+			tooltip-style="pregame-mainmenu-tooltip" tooltip="Tired of playing with yourself? Fight against one or more human players in a multiplayer game.">
 			<action on="Press"><![CDATA[
 				getGUIObjectByName("pregame_subwindow_bkg").hidden = false;
 				getGUIObjectByName("pregame_ip_host").hidden = false;
 			]]></action>
-			<action on="MouseEnter"><![CDATA[
-				tooltipObject = getGUIObjectByName("pregame-mainmenu-tooltip");
-				tooltipObject.caption = "Tired of playing with yourself? Fight against one or more human players in a multiplayer game.";
-				GUIObjectUnhide("pregame-mainmenu-tooltip");
-			]]></action>
-			<action on="MouseLeave"><![CDATA[
-				GUIObjectHide("pregame-mainmenu-tooltip");
-			]]></action>
 		</object>
 
 
-		<object type="button" name="pregame-mainmenu-ed-button" sprite-over="pregame-mainmenu-edbt" size="44.00% 61.50% 62.45% 83.55%" z="101" hidden="false">
+		<object type="button" name="pregame-mainmenu-ed-button" sprite-over="pregame-mainmenu-edbt" size="44.00% 61.50% 62.45% 83.55%" z="101" hidden="false"
+			tooltip-style="pregame-mainmenu-tooltip" tooltip="Come forth and witness a totally non-functioning Editor, a mere shadow of its potential self!">
 			<action on="Press"><![CDATA[
 			]]></action>
-			<action on="MouseEnter"><![CDATA[
-				tooltipObject = getGUIObjectByName("pregame-mainmenu-tooltip");
-				tooltipObject.caption = "Come forth and witness a totally non-functioning Editor, a mere shadow of its potential self!";
-				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"/>
@@ -71,43 +50,25 @@
 			]]></action>
 		</object>
 
-		<object type="button" name="pregame-mainmenu-wfg-logo" sprite="pregame-mainmenu-wfg-logo-256x64" size="10 91.666666%-30 25.9765% 100%-30" z="102" hidden="false">
+		<object type="button" name="pregame-mainmenu-wfg-logo" sprite="pregame-mainmenu-wfg-logo-256x64" size="10 91.666666%-30 25.9765% 100%-30" z="102" hidden="false"
+			tooltip-style="pregame-mainmenu-tooltip" tooltip="These are the guys who made this game. Visit them at http://www.wildfiregames.com/0ad/">
 			<action on="Press"><![CDATA[
 				btCode = new Array("GUIObjectHide('mb_main');");
 				messageBox(420, 420, "[icon=0ad_icon] A.D. - History Is Yours For The Taking\nby Wildfire Games, 2002-2005\n\nVersion 0.1.2 (PASAP II)\n\n" +
 				"This is a confidental pre-release version of the game!\n\nVisit http://www.wildfiregames.com/0ad/ " +
 				"to learn more about [icon=0ad_icon] A.D., participate in the community and meet the developers.\n\n", "About [icon=0ad_icon] A.D.", 2, new Array(), btCode);
 			]]></action>
-			<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 type="text" name="pregame-mainmenu-tooltip" sprite="pregame-mainmenu-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="button" name="exit_button" sprite="exit_sprite" sprite-over="exit_sprite-over" size="100%-18 2 100%-2 18" z="104" hidden="false">
+		<object type="button" name="exit_button" sprite="exit_sprite" sprite-over="exit_sprite-over" size="100%-18 2 100%-2 18" z="104" hidden="false"
+			tooltip-style="pregame-mainmenu-tooltip" tooltip="Tired of 0 A.D. ? Click here to leave and reenter the real world.">
 			<action on="Press"><![CDATA[
 				btCaptions = new Array("Yes, let me out!", "Nooooo!");
 				btCode = new Array("exit();", "");
 				messageBox(400, 200, "Do you really want to quit [icon=0ad_icon] A.D.? This will cause a sudden return to reality.", "Confirmation", 0, btCaptions, btCode);
 			]]></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>
 
@@ -131,7 +92,7 @@
 				]]></action>
 			</object>
 
-                        <object type="button" name="pregame_ip_host_titlebar" sprite="0ad_window_title" font="prospero18" z="165" text-align="center" text-valign="center">
+			<object type="button" name="pregame_ip_host_titlebar" sprite="0ad_window_title" font="prospero18" z="165" text-align="center" text-valign="center">
 				<action on="Load"><![CDATA[
 					getGUIObjectByName("pregame_ip_host_titlebar").caption = "Direct IP Connect";
 					setSizeCoord("pregame_ip_host_titlebar", crd_pregame_iphost_titlebar_x, crd_pregame_iphost_titlebar_y, crd_pregame_iphost_titlebar_x+crd_pregame_iphost_titlebar_width, crd_pregame_iphost_titlebar_y+crd_pregame_iphost_titlebar_height, mid_screen, mid_screen, mid_screen, mid_screen);
diff --git a/binaries/data/mods/official/gui/test/4_session.xml b/binaries/data/mods/official/gui/test/4_session.xml
index da48f996fd..637471145b 100644
--- a/binaries/data/mods/official/gui/test/4_session.xml
+++ b/binaries/data/mods/official/gui/test/4_session.xml
@@ -10,15 +10,15 @@
 
 <objects>
 
-        <object type="empty" name="session_gui" hotkey="flipgui.toggle" size="0 0 100% 100%" z="1" hidden="true">
+	<object type="empty" name="session_gui" hotkey="flipgui.toggle" size="0 0 100% 100%" z="1" hidden="true">
 		<action on="Load"><![CDATA[
-		        setInterval( getObjectInfo, 1, 1000 );
+			setInterval( getObjectInfo, 1, 1000 );
 		]]></action>
 		<action on="Press"><![CDATA[
 			FlipGUI();
 		]]></action>
 
-                <!-- GROUP: GROUP PANE -->
+		<!-- 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");
@@ -556,13 +556,13 @@
 
 		</object>
 
-                <!-- GROUP: RESOURCE BAR -->
-                <object type="empty" name="session_top_bar" hotkey="resourcepool.toggle" size="0 0 100% 100%" z="1" hidden="false">
+		<!-- GROUP: RESOURCE 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>
 
-                        <object type="button" name="resource_food_counter" sprite="resource_food_counter" style="resource_counter" z="70" hidden="false">
+			<object type="button" name="resource_food_counter" sprite="resource_food_counter" style="resource_counter" z="70" tooltip="Food, plus some word-wrapping: Material, usually of plant or animal origin, that contains or consists of essential body nutrients, such as carbohydrates, fats, proteins, vitamins, or minerals, and is ingested and assimilated by an organism to produce energy, stimulate growth, and maintain life.">
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_resource_food_x, -crd_resource_food_y-crd_resource_counter_height, crd_resource_food_x+crd_resource_counter_width, -crd_resource_food_y, mid_screen, bottom_screen, mid_screen, bottom_screen,
@@ -570,7 +570,7 @@
 				]]></action>
 			</object>
 
-                        <object type="button" name="resource_wood_counter" sprite="resource_wood_counter" style="resource_counter" z="70" hidden="false">
+			<object type="button" name="resource_wood_counter" sprite="resource_wood_counter" style="resource_counter" z="70" tooltip="Wood">
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_resource_wood_x, -crd_resource_wood_y-crd_resource_counter_height, crd_resource_wood_x+crd_resource_counter_width, -crd_resource_wood_y, mid_screen, bottom_screen, mid_screen, bottom_screen,
@@ -578,7 +578,7 @@
 				]]></action>
 			</object>
 
-                        <object type="button" name="resource_stone_counter" sprite="resource_stone_counter" style="resource_counter" z="70" hidden="false">
+			<object type="button" name="resource_stone_counter" sprite="resource_stone_counter" style="resource_counter" z="70" tooltip="Stone">
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_resource_stone_x, -crd_resource_stone_y-crd_resource_counter_height, crd_resource_stone_x+crd_resource_counter_width, -crd_resource_stone_y, mid_screen, bottom_screen, mid_screen, bottom_screen,
@@ -586,7 +586,7 @@
 				]]></action>
 			</object>
 
-                        <object type="button" name="resource_ore_counter" sprite="resource_ore_counter" style="resource_counter" z="70" hidden="false">
+			<object type="button" name="resource_ore_counter" sprite="resource_ore_counter" style="resource_counter" z="70" tooltip="Ore">
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_resource_ore_x, -crd_resource_ore_y-crd_resource_counter_height, crd_resource_ore_x+crd_resource_counter_width, -crd_resource_ore_y, mid_screen, bottom_screen, mid_screen, bottom_screen,
@@ -594,7 +594,7 @@
 				]]></action>
 			</object>
 
-                        <object type="button" name="resource_population_counter" sprite="resource_population_counter" style="resource_counter" z="70" hidden="false">
+			<object type="button" name="resource_population_counter" sprite="resource_population_counter" style="resource_counter" z="70" tooltip="Population">
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_resource_population_x, -crd_resource_population_y-crd_resource_counter_height, crd_resource_population_x+crd_resource_counter_long_width, -crd_resource_population_y, mid_screen, bottom_screen, mid_screen, bottom_screen,
@@ -602,18 +602,18 @@
 				]]></action>
 			</object>
 
-                <!-- / GROUP: RESOURCE BAR -->
-                </object>
+		<!-- / GROUP: RESOURCE BAR -->
+		</object>
 
-                <!-- GROUP: STATUS ORB -->
-                <object type="empty" name="session_status_orb" hotkey="statusorb.toggle" size="0 0 100% 100%" z="1" hidden="false">
+		<!-- GROUP: STATUS ORB -->
+		<object type="empty" name="session_status_orb" hotkey="statusorb.toggle" size="0 0 100% 100%" z="1" hidden="false">
 			<action on="Press"><![CDATA[
 				GUIObjectToggle("session_status_orb");
 			]]></action>
 
 			<!-- STATUS ORB BACKGROUND -->
-                        <object type="button" name="session_panel_status_bg" z="69" ghost="true" hidden="false">
-			        <action on="Load"><![CDATA[
+			<object type="button" name="session_panel_status_bg" z="69" ghost="true" hidden="false">
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_bkg_x, crd_status_orb_bkg_y, crd_status_orb_bkg_x+crd_status_orb_bkg_width, crd_status_orb_bkg_y+crd_status_orb_bkg_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_bkg_x, -crd_status_orb_bkg_y-crd_status_orb_bkg_height, crd_status_orb_bkg_x+crd_status_orb_bkg_width, -crd_status_orb_bkg_y, left_screen, bottom_screen, left_screen, bottom_screen);
@@ -622,7 +622,7 @@
 
 			<!-- PLAYER / CIV NAME HEADING -->
 			<object type="button" name="session_panel_status_heading" font="verdana10" textcolor="200 200 200" text-align="center" ghost="true" z="70" hidden="false">
-			        <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_heading_x, crd_status_orb_heading_y, crd_status_orb_heading_x+crd_status_orb_heading_width, crd_status_orb_heading_y+crd_status_orb_heading_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_heading_x, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_heading_y, crd_status_orb_heading_x+crd_status_orb_heading_width, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_heading_y+crd_status_orb_heading_height, left_screen, bottom_screen, left_screen, bottom_screen);
@@ -631,7 +631,7 @@
 
 			<!-- SELECTED UNIT LARGE PORTRAIT -->
 			<object type="button" name="session_panel_status_portrait" style="portrait" z="70" hidden="false">
-			        <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_portrait_x, crd_status_orb_portrait_y, crd_status_orb_portrait_x+crd_status_orb_portrait_width, crd_status_orb_portrait_y+crd_status_orb_portrait_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_portrait_x, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_portrait_y, crd_status_orb_portrait_x+crd_status_orb_portrait_width, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_portrait_y+crd_status_orb_portrait_height, left_screen, bottom_screen, left_screen, bottom_screen);
@@ -639,53 +639,53 @@
 			</object>
 
 			<!-- RANK ICON -->
-                        <object type="button" name="session_panel_status_icon_rank" ghost="true" z="70" hidden="false">
-                                <action on="Load"><![CDATA[
+			<object type="button" name="session_panel_status_icon_rank" ghost="true" z="70" hidden="false">
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_rank_x, crd_status_orb_rank_y, crd_status_orb_rank_x+crd_status_orb_rank_width, crd_status_orb_rank_y+crd_status_orb_rank_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_rank_x, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_rank_y, crd_status_orb_rank_x+crd_status_orb_rank_width, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_rank_y+crd_status_orb_rank_height, left_screen, bottom_screen, left_screen, bottom_screen);
-                                ]]></action>
-                        </object>
+				]]></action>
+			</object>
 
 			<!-- HITPOINTS BAR -->
 			<object type="progressbar" name="session_panel_status_icon_hp_bar" style="group_portrait_bar" sprite-background="back-bar" ghost="true" z="70" hidden="false">
-                                <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_hpbar_x, crd_status_orb_hpbar_y, crd_status_orb_hpbar_x+crd_status_orb_hpbar_width, crd_status_orb_hpbar_y+crd_status_orb_hpbar_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_hpbar_x, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_hpbar_y, crd_status_orb_portrait_x+crd_status_orb_hpbar_width, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_hpbar_y+crd_status_orb_hpbar_height, left_screen, bottom_screen, left_screen, bottom_screen);
-                                ]]></action>
+				]]></action>
 			</object>
 
 			<!-- HITPOINTS TEXT -->
-                        <object type="button" name="session_panel_status_icon_hp_text" font="verdana10" textcolor="0 255 0" text-align="left" text-valign="center" ghost="true" z="70" hidden="false">
-                                <action on="Load"><![CDATA[
+			<object type="button" name="session_panel_status_icon_hp_text" font="verdana10" textcolor="0 255 0" text-align="left" text-valign="center" ghost="true" z="70" hidden="false">
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_hpbar_text_x, crd_status_orb_hpbar_text_y, crd_status_orb_hpbar_text_x+crd_status_orb_hpbar_text_width, crd_status_orb_hpbar_text_y+crd_status_orb_hpbar_text_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_hpbar_text_x, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_hpbar_text_y, crd_status_orb_hpbar_text_x+crd_status_orb_hpbar_text_width, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_hpbar_text_y+crd_status_orb_hpbar_text_height, left_screen, bottom_screen, left_screen, bottom_screen);
-                                ]]></action>
-                        </object>
+				]]></action>
+			</object>
 
 			<!-- EXPERIENCE BAR -->
 			<object type="progressbar" name="session_panel_status_icon_xp_bar" style="up_bar" sprite-background="back-bar" ghost="true" z="70" hidden="false">
-                                <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_xpbar_x, crd_status_orb_xpbar_y, crd_status_orb_xpbar_x+crd_status_orb_xpbar_width, crd_status_orb_xpbar_y+crd_status_orb_xpbar_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_xpbar_x, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_xpbar_y, crd_status_orb_portrait_x+crd_status_orb_xpbar_width, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_xpbar_y+crd_status_orb_xpbar_height, left_screen, bottom_screen, left_screen, bottom_screen);
-                                ]]></action>
+				]]></action>
 			</object>
 
 			<!-- EXPERIENCE TEXT -->
-                        <object type="button" name="session_panel_status_icon_xp_text" font="verdana10" textcolor="255 255 0" text-align="left" text-valign="center" ghost="true" z="70" hidden="false">
-                                <action on="Load"><![CDATA[
+			<object type="button" name="session_panel_status_icon_xp_text" font="verdana10" textcolor="255 255 0" text-align="left" text-valign="center" ghost="true" z="70" hidden="false">
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_xpbar_text_x, crd_status_orb_xpbar_text_y, crd_status_orb_xpbar_text_x+crd_status_orb_xpbar_text_width, crd_status_orb_xpbar_text_y+crd_status_orb_xpbar_text_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_xpbar_text_x, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_xpbar_text_y, crd_status_orb_xpbar_text_x+crd_status_orb_xpbar_text_width, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_xpbar_text_y+crd_status_orb_xpbar_text_height, left_screen, bottom_screen, left_screen, bottom_screen);
-                                ]]></action>
-                        </object>
+				]]></action>
+			</object>
 
 			<!-- NAME TEXT -->
 			<object type="button" name="session_panel_status_name1" font="verdana12" textcolor="200 200 200" ghost="true" z="70" hidden="false">
-			        <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_name1_x, crd_status_orb_name1_y, crd_status_orb_name1_x+crd_status_orb_name1_width, crd_status_orb_name1_y+crd_status_orb_name1_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_name1_x, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_name1_y, crd_status_orb_name1_x+crd_status_orb_name1_width, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_name1_y+crd_status_orb_name1_height, left_screen, bottom_screen, left_screen, bottom_screen);
@@ -693,96 +693,96 @@
 			</object>
 
 			<!-- GARRISON/SUPPLY COUNTER -->
-                        <object type="button" name="session_panel_status_stat1" font="verdana11" textcolor="255 255 255" text-align="center" text-valign="bottom" ghost="true" z="70" hidden="false">
-                                <action on="Load"><![CDATA[
+			<object type="button" name="session_panel_status_stat1" font="verdana11" textcolor="255 255 255" text-align="center" text-valign="bottom" ghost="true" z="70" hidden="false">
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_stat1_x, crd_status_orb_stat1_y, crd_status_orb_stat1_x+crd_status_orb_stat1_width, crd_status_orb_stat1_y+crd_status_orb_stat1_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_stat1_x, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_stat1_y, crd_status_orb_stat1_x+crd_status_orb_stat1_width, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_stat1_y+crd_status_orb_stat1_height, left_screen, bottom_screen, left_screen, bottom_screen);
 
-                                        getGUIObjectByName("session_panel_status_stat1").caption = "[icon=icon_statistic_garrison] 23/30 [icon=icon_resource_wood] 1575";
-                                ]]></action>
-                        </object>
+					getGUIObjectByName("session_panel_status_stat1").caption = "[icon=icon_statistic_garrison] 23/30 [icon=icon_resource_wood] 1575";
+				]]></action>
+			</object>
 
 			<!-- STATS -->
 			<object type="text" name="session_panel_status_stat1_1" font="verdana10" textcolor="200 200 200" ghost="true" z="70" hidden="false">
-			        <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_stat1_1_x, crd_status_orb_stat1_1_y, crd_status_orb_stat1_1_x+crd_status_orb_stat1_1_width, crd_status_orb_stat1_1_y+crd_status_orb_stat1_1_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_stat1_1_x, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_stat1_1_y, crd_status_orb_stat1_1_x+crd_status_orb_stat1_1_width, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_stat1_1_y+crd_status_orb_stat1_1_height, left_screen, bottom_screen, left_screen, bottom_screen);
 				]]></action>
 			</object>
 			<object type="text" name="session_panel_status_stat2_1" font="verdana8" textcolor="200 200 200" ghost="true" z="70" hidden="false">
-			        <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_stat2_1_x, crd_status_orb_stat2_1_y, crd_status_orb_stat2_1_x+crd_status_orb_stat2_1_width, crd_status_orb_stat2_1_y+crd_status_orb_stat2_1_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_stat2_1_x, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_stat2_1_y, crd_status_orb_stat2_1_x+crd_status_orb_stat2_1_width, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_stat2_1_y+crd_status_orb_stat2_1_height, left_screen, bottom_screen, left_screen, bottom_screen);
 				]]></action>
 			</object>
 			<object type="text" name="session_panel_status_stat3_1" font="verdana8" textcolor="200 200 200" ghost="true" z="70" hidden="false">
-			        <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_stat3_1_x, crd_status_orb_stat3_1_y, crd_status_orb_stat3_1_x+crd_status_orb_stat3_1_width, crd_status_orb_stat3_1_y+crd_status_orb_stat3_1_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_stat3_1_x, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_stat3_1_y, crd_status_orb_stat3_1_x+crd_status_orb_stat3_1_width, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_stat3_1_y+crd_status_orb_stat3_1_height, left_screen, bottom_screen, left_screen, bottom_screen);
 				]]></action>
 			</object>
 			<object type="text" name="session_panel_status_stat4_1" font="verdana8" textcolor="200 200 200" ghost="true" z="70" hidden="false">
-			        <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_stat4_1_x, crd_status_orb_stat4_1_y, crd_status_orb_stat4_1_x+crd_status_orb_stat4_1_width, crd_status_orb_stat4_1_y+crd_status_orb_stat4_1_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_stat4_1_x, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_stat4_1_y, crd_status_orb_stat4_1_x+crd_status_orb_stat4_1_width, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_stat4_1_y+crd_status_orb_stat4_1_height, left_screen, bottom_screen, left_screen, bottom_screen);
 				]]></action>
 			</object>
 			<object type="text" name="session_panel_status_stat5_1" font="verdana10" textcolor="200 200 200" ghost="true" z="70" hidden="false">
-			        <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_stat5_1_x, crd_status_orb_stat5_1_y, crd_status_orb_stat5_1_x+crd_status_orb_stat5_1_width, crd_status_orb_stat5_1_y+crd_status_orb_stat5_1_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_stat5_1_x, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_stat5_1_y, crd_status_orb_stat5_1_x+crd_status_orb_stat5_1_width, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_stat5_1_y+crd_status_orb_stat5_1_height, left_screen, bottom_screen, left_screen, bottom_screen);
 				]]></action>
 			</object>
 			<object type="text" name="session_panel_status_stat6_1" font="verdana10" textcolor="200 200 200" ghost="true" z="70" hidden="false">
-			        <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_stat6_1_x, crd_status_orb_stat6_1_y, crd_status_orb_stat6_1_x+crd_status_orb_stat6_1_width, crd_status_orb_stat6_1_y+crd_status_orb_stat6_1_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_stat6_1_x, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_stat6_1_y, crd_status_orb_stat6_1_x+crd_status_orb_stat6_1_width, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_stat6_1_y+crd_status_orb_stat6_1_height, left_screen, bottom_screen, left_screen, bottom_screen);
 				]]></action>
 			</object>
 			<object type="text" name="session_panel_status_stat1_2" font="verdana10" textcolor="200 200 200" ghost="true" z="70" hidden="false">
-			        <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_stat1_2_x, crd_status_orb_stat1_2_y, crd_status_orb_stat1_2_x+crd_status_orb_stat1_2_width, crd_status_orb_stat1_2_y+crd_status_orb_stat1_2_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_stat1_2_x, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_stat1_2_y, crd_status_orb_stat1_2_x+crd_status_orb_stat1_2_width, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_stat1_2_y+crd_status_orb_stat1_2_height, left_screen, bottom_screen, left_screen, bottom_screen);
 				]]></action>
 			</object>
 			<object type="text" name="session_panel_status_stat2_2" font="verdana8" textcolor="200 200 200" ghost="true" z="70" hidden="false">
-			        <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_stat2_2_x, crd_status_orb_stat2_2_y, crd_status_orb_stat2_2_x+crd_status_orb_stat2_2_width, crd_status_orb_stat2_2_y+crd_status_orb_stat2_2_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_stat2_2_x, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_stat2_2_y, crd_status_orb_stat2_2_x+crd_status_orb_stat2_2_width, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_stat2_2_y+crd_status_orb_stat2_2_height, left_screen, bottom_screen, left_screen, bottom_screen);
 				]]></action>
 			</object>
 			<object type="text" name="session_panel_status_stat3_2" font="verdana8" textcolor="200 200 200" ghost="true" z="70" hidden="false">
-			        <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_stat3_2_x, crd_status_orb_stat3_2_y, crd_status_orb_stat3_2_x+crd_status_orb_stat3_2_width, crd_status_orb_stat3_2_y+crd_status_orb_stat3_2_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_stat3_2_x, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_stat3_2_y, crd_status_orb_stat3_2_x+crd_status_orb_stat3_2_width, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_stat3_2_y+crd_status_orb_stat3_2_height, left_screen, bottom_screen, left_screen, bottom_screen);
 				]]></action>
 			</object>
 			<object type="text" name="session_panel_status_stat4_2" font="verdana8" textcolor="200 200 200" ghost="true" z="70" hidden="false">
-			        <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_stat4_2_x, crd_status_orb_stat4_2_y, crd_status_orb_stat4_2_x+crd_status_orb_stat4_2_width, crd_status_orb_stat4_2_y+crd_status_orb_stat4_2_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_stat4_2_x, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_stat4_2_y, crd_status_orb_stat4_2_x+crd_status_orb_stat4_2_width, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_stat4_2_y+crd_status_orb_stat4_2_height, left_screen, bottom_screen, left_screen, bottom_screen);
 				]]></action>
 			</object>
 			<object type="text" name="session_panel_status_stat5_2" font="verdana10" textcolor="200 200 200" ghost="true" z="70" hidden="false">
-			        <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_stat5_2_x, crd_status_orb_stat5_2_y, crd_status_orb_stat5_2_x+crd_status_orb_stat5_2_width, crd_status_orb_stat5_2_y+crd_status_orb_stat5_2_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_stat5_2_x, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_stat5_2_y, crd_status_orb_stat5_2_x+crd_status_orb_stat5_2_width, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_stat5_2_y+crd_status_orb_stat5_2_height, left_screen, bottom_screen, left_screen, bottom_screen);
 				]]></action>
 			</object>
 			<object type="text" name="session_panel_status_stat6_2" font="verdana10" textcolor="200 200 200" ghost="true" z="70" hidden="false">
-			        <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_stat6_2_x, crd_status_orb_stat6_2_y, crd_status_orb_stat6_2_x+crd_status_orb_stat6_2_width, crd_status_orb_stat6_2_y+crd_status_orb_stat6_2_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_stat6_2_x, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_stat6_2_y, crd_status_orb_stat6_2_x+crd_status_orb_stat6_2_width, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_stat6_2_y+crd_status_orb_stat6_2_height, left_screen, bottom_screen, left_screen, bottom_screen);
@@ -791,621 +791,621 @@
 
 			<!-- PRIMARY COMMAND BUTTONS (arcs the Status Orb) -->
 			<object type="button" name="session_panel_status_command_pri_1" style="action" textcolor="255 255 255" z="70" hidden="false">
-                                <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_command_1_x, crd_status_orb_command_1_y, crd_status_orb_command_1_x+crd_status_orb_command_1_width, crd_status_orb_command_1_y+crd_status_orb_command_1_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_command_1_x, -crd_status_orb_command_1_y-crd_status_orb_command_1_height, crd_status_orb_command_1_x+crd_status_orb_command_1_width, -crd_status_orb_command_1_y, left_screen, bottom_screen, left_screen, bottom_screen);
-                                ]]></action>
-                                <action on="Press"><![CDATA[
+				]]></action>
+				<action on="Press"><![CDATA[
 					GUIObjectToggle("session_panel_status_command_pri_1_group");
-                                ]]></action>
+				]]></action>
 			</object>
 
 			<object type="empty" name="session_panel_status_command_pri_1_group" size="0 0 100% 100%" z="1" hidden="false">
 
 				<object type="button" name="session_panel_status_command_pri_1_1" style="action" textcolor="255 255 255" z="70" hidden="false">1
-        	                        <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_1_1_x, crd_status_orb_command_1_1_y, crd_status_orb_command_1_1_x+crd_status_orb_command_1_1_width, crd_status_orb_command_1_1_y+crd_status_orb_command_1_1_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_1_1_x, -crd_status_orb_command_1_1_y-crd_status_orb_command_1_1_height, crd_status_orb_command_1_1_x+crd_status_orb_command_1_1_width, -crd_status_orb_command_1_1_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_1_2" style="action" textcolor="255 255 255" z="70" hidden="false">2
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_1_2_x, crd_status_orb_command_1_2_y, crd_status_orb_command_1_2_x+crd_status_orb_command_1_2_width, crd_status_orb_command_1_2_y+crd_status_orb_command_1_2_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_1_2_x, -crd_status_orb_command_1_2_y-crd_status_orb_command_1_2_height, crd_status_orb_command_1_2_x+crd_status_orb_command_1_2_width, -crd_status_orb_command_1_2_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_1_3" style="action" textcolor="255 255 255" z="70" hidden="false">3
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_1_3_x, crd_status_orb_command_1_3_y, crd_status_orb_command_1_3_x+crd_status_orb_command_1_3_width, crd_status_orb_command_1_3_y+crd_status_orb_command_1_3_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_1_3_x, -crd_status_orb_command_1_3_y-crd_status_orb_command_1_3_height, crd_status_orb_command_1_3_x+crd_status_orb_command_1_3_width, -crd_status_orb_command_1_3_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_1_4" style="action" textcolor="255 255 255" z="70" hidden="false">4
-        	                        <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_1_4_x, crd_status_orb_command_1_4_y, crd_status_orb_command_1_4_x+crd_status_orb_command_1_4_width, crd_status_orb_command_1_4_y+crd_status_orb_command_1_4_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_1_4_x, -crd_status_orb_command_1_4_y-crd_status_orb_command_1_4_height, crd_status_orb_command_1_4_x+crd_status_orb_command_1_4_width, -crd_status_orb_command_1_4_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_1_5" style="action" textcolor="255 255 255" z="70" hidden="false">5
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_1_5_x, crd_status_orb_command_1_5_y, crd_status_orb_command_1_5_x+crd_status_orb_command_1_5_width, crd_status_orb_command_1_5_y+crd_status_orb_command_1_5_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_1_5_x, -crd_status_orb_command_1_5_y-crd_status_orb_command_1_5_height, crd_status_orb_command_1_5_x+crd_status_orb_command_1_5_width, -crd_status_orb_command_1_5_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_1_6" style="action" textcolor="255 255 255" z="70" hidden="false">6
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_1_6_x, crd_status_orb_command_1_6_y, crd_status_orb_command_1_6_x+crd_status_orb_command_1_6_width, crd_status_orb_command_1_6_y+crd_status_orb_command_1_6_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_1_6_x, -crd_status_orb_command_1_6_y-crd_status_orb_command_1_6_height, crd_status_orb_command_1_6_x+crd_status_orb_command_1_6_width, -crd_status_orb_command_1_6_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_1_7" style="action" textcolor="255 255 255" z="70" hidden="false">7
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_1_7_x, crd_status_orb_command_1_7_y, crd_status_orb_command_1_7_x+crd_status_orb_command_1_7_width, crd_status_orb_command_1_7_y+crd_status_orb_command_1_7_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_1_7_x, -crd_status_orb_command_1_7_y-crd_status_orb_command_1_7_height, crd_status_orb_command_1_7_x+crd_status_orb_command_1_7_width, -crd_status_orb_command_1_7_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_1_8" style="action" textcolor="255 255 255" z="70" hidden="false">8
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_1_8_x, crd_status_orb_command_1_8_y, crd_status_orb_command_1_8_x+crd_status_orb_command_1_8_width, crd_status_orb_command_1_8_y+crd_status_orb_command_1_8_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_1_8_x, -crd_status_orb_command_1_8_y-crd_status_orb_command_1_8_height, crd_status_orb_command_1_8_x+crd_status_orb_command_1_8_width, -crd_status_orb_command_1_8_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_1_9" style="action" textcolor="255 255 255" z="70" hidden="false">9
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_1_9_x, crd_status_orb_command_1_9_y, crd_status_orb_command_1_9_x+crd_status_orb_command_1_9_width, crd_status_orb_command_1_9_y+crd_status_orb_command_1_9_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_1_9_x, -crd_status_orb_command_1_9_y-crd_status_orb_command_1_9_height, crd_status_orb_command_1_9_x+crd_status_orb_command_1_9_width, -crd_status_orb_command_1_9_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_1_10" style="action" textcolor="255 255 255" z="70" hidden="false">10
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_1_10_x, crd_status_orb_command_1_10_y, crd_status_orb_command_1_10_x+crd_status_orb_command_1_10_width, crd_status_orb_command_1_10_y+crd_status_orb_command_1_10_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_1_10_x, -crd_status_orb_command_1_10_y-crd_status_orb_command_1_10_height, crd_status_orb_command_1_10_x+crd_status_orb_command_1_10_width, -crd_status_orb_command_1_10_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_1_11" style="action" textcolor="255 255 255" z="70" hidden="false">11
-        	                        <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_1_11_x, crd_status_orb_command_1_11_y, crd_status_orb_command_1_11_x+crd_status_orb_command_1_11_width, crd_status_orb_command_1_11_y+crd_status_orb_command_1_11_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_1_11_x, -crd_status_orb_command_1_11_y-crd_status_orb_command_1_11_height, crd_status_orb_command_1_11_x+crd_status_orb_command_1_11_width, -crd_status_orb_command_1_11_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_1_12" style="action" textcolor="255 255 255" z="70" hidden="false">12
-        	                        <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_1_12_x, crd_status_orb_command_1_12_y, crd_status_orb_command_1_12_x+crd_status_orb_command_1_12_width, crd_status_orb_command_1_12_y+crd_status_orb_command_1_12_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_1_12_x, -crd_status_orb_command_1_12_y-crd_status_orb_command_1_12_height, crd_status_orb_command_1_12_x+crd_status_orb_command_1_12_width, -crd_status_orb_command_1_12_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 			</object>
 
 			<object type="button" name="session_panel_status_command_pri_2" style="action" textcolor="255 255 255" z="70" hidden="false">
-                                <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_command_2_x, crd_status_orb_command_2_y, crd_status_orb_command_2_x+crd_status_orb_command_2_width, crd_status_orb_command_2_y+crd_status_orb_command_2_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_command_2_x, -crd_status_orb_command_2_y-crd_status_orb_command_2_height, crd_status_orb_command_2_x+crd_status_orb_command_2_width, -crd_status_orb_command_2_y, left_screen, bottom_screen, left_screen, bottom_screen);
-                                ]]></action>
-                                <action on="Press"><![CDATA[
+				]]></action>
+				<action on="Press"><![CDATA[
 					GUIObjectToggle("session_panel_status_command_pri_2_group");
-                                ]]></action>
+				]]></action>
 			</object>
 
 			<object type="empty" name="session_panel_status_command_pri_2_group" size="0 0 100% 100%" z="1" hidden="false">
 
 				<object type="button" name="session_panel_status_command_pri_2_1" style="action" textcolor="255 255 255" z="70" hidden="false">1
-        	                        <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_2_1_x, crd_status_orb_command_2_1_y, crd_status_orb_command_2_1_x+crd_status_orb_command_2_1_width, crd_status_orb_command_2_1_y+crd_status_orb_command_2_1_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_2_1_x, -crd_status_orb_command_2_1_y-crd_status_orb_command_2_1_height, crd_status_orb_command_2_1_x+crd_status_orb_command_2_1_width, -crd_status_orb_command_2_1_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_2_2" style="action" textcolor="255 255 255" z="70" hidden="false">2
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_2_2_x, crd_status_orb_command_2_2_y, crd_status_orb_command_2_2_x+crd_status_orb_command_2_2_width, crd_status_orb_command_2_2_y+crd_status_orb_command_2_2_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_2_2_x, -crd_status_orb_command_2_2_y-crd_status_orb_command_2_2_height, crd_status_orb_command_2_2_x+crd_status_orb_command_2_2_width, -crd_status_orb_command_2_2_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_2_3" style="action" textcolor="255 255 255" z="70" hidden="false">3
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_2_3_x, crd_status_orb_command_2_3_y, crd_status_orb_command_2_3_x+crd_status_orb_command_2_3_width, crd_status_orb_command_2_3_y+crd_status_orb_command_2_3_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_2_3_x, -crd_status_orb_command_2_3_y-crd_status_orb_command_2_3_height, crd_status_orb_command_2_3_x+crd_status_orb_command_2_3_width, -crd_status_orb_command_2_3_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_2_4" style="action" textcolor="255 255 255" z="70" hidden="false">4
-        	                        <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_2_4_x, crd_status_orb_command_2_4_y, crd_status_orb_command_2_4_x+crd_status_orb_command_2_4_width, crd_status_orb_command_2_4_y+crd_status_orb_command_2_4_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_2_4_x, -crd_status_orb_command_2_4_y-crd_status_orb_command_2_4_height, crd_status_orb_command_2_4_x+crd_status_orb_command_2_4_width, -crd_status_orb_command_2_4_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_2_5" style="action" textcolor="255 255 255" z="70" hidden="false">5
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_2_5_x, crd_status_orb_command_2_5_y, crd_status_orb_command_2_5_x+crd_status_orb_command_2_5_width, crd_status_orb_command_2_5_y+crd_status_orb_command_2_5_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_2_5_x, -crd_status_orb_command_2_5_y-crd_status_orb_command_2_5_height, crd_status_orb_command_2_5_x+crd_status_orb_command_2_5_width, -crd_status_orb_command_2_5_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_2_6" style="action" textcolor="255 255 255" z="70" hidden="false">6
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_2_6_x, crd_status_orb_command_2_6_y, crd_status_orb_command_2_6_x+crd_status_orb_command_2_6_width, crd_status_orb_command_2_6_y+crd_status_orb_command_2_6_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_2_6_x, -crd_status_orb_command_2_6_y-crd_status_orb_command_2_6_height, crd_status_orb_command_2_6_x+crd_status_orb_command_2_6_width, -crd_status_orb_command_2_6_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_2_7" style="action" textcolor="255 255 255" z="70" hidden="false">7
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_2_7_x, crd_status_orb_command_2_7_y, crd_status_orb_command_2_7_x+crd_status_orb_command_2_7_width, crd_status_orb_command_2_7_y+crd_status_orb_command_2_7_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_2_7_x, -crd_status_orb_command_2_7_y-crd_status_orb_command_2_7_height, crd_status_orb_command_2_7_x+crd_status_orb_command_2_7_width, -crd_status_orb_command_2_7_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_2_8" style="action" textcolor="255 255 255" z="70" hidden="false">8
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_2_8_x, crd_status_orb_command_2_8_y, crd_status_orb_command_2_8_x+crd_status_orb_command_2_8_width, crd_status_orb_command_2_8_y+crd_status_orb_command_2_8_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_2_8_x, -crd_status_orb_command_2_8_y-crd_status_orb_command_2_8_height, crd_status_orb_command_2_8_x+crd_status_orb_command_2_8_width, -crd_status_orb_command_2_8_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_2_9" style="action" textcolor="255 255 255" z="70" hidden="false">9
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_2_9_x, crd_status_orb_command_2_9_y, crd_status_orb_command_2_9_x+crd_status_orb_command_2_9_width, crd_status_orb_command_2_9_y+crd_status_orb_command_2_9_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_2_9_x, -crd_status_orb_command_2_9_y-crd_status_orb_command_2_9_height, crd_status_orb_command_2_9_x+crd_status_orb_command_2_9_width, -crd_status_orb_command_2_9_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_2_10" style="action" textcolor="255 255 255" z="70" hidden="false">10
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_2_10_x, crd_status_orb_command_2_10_y, crd_status_orb_command_2_10_x+crd_status_orb_command_2_10_width, crd_status_orb_command_2_10_y+crd_status_orb_command_2_10_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_2_10_x, -crd_status_orb_command_2_10_y-crd_status_orb_command_2_10_height, crd_status_orb_command_2_10_x+crd_status_orb_command_2_10_width, -crd_status_orb_command_2_10_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_2_11" style="action" textcolor="255 255 255" z="70" hidden="false">11
-        	                        <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_2_11_x, crd_status_orb_command_2_11_y, crd_status_orb_command_2_11_x+crd_status_orb_command_2_11_width, crd_status_orb_command_2_11_y+crd_status_orb_command_2_11_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_2_11_x, -crd_status_orb_command_2_11_y-crd_status_orb_command_2_11_height, crd_status_orb_command_2_11_x+crd_status_orb_command_2_11_width, -crd_status_orb_command_2_11_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_2_12" style="action" textcolor="255 255 255" z="70" hidden="false">12
-        	                        <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_2_12_x, crd_status_orb_command_2_12_y, crd_status_orb_command_2_12_x+crd_status_orb_command_2_12_width, crd_status_orb_command_2_12_y+crd_status_orb_command_2_12_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_2_12_x, -crd_status_orb_command_2_12_y-crd_status_orb_command_2_12_height, crd_status_orb_command_2_12_x+crd_status_orb_command_2_12_width, -crd_status_orb_command_2_12_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 			</object>
 
 			<object type="button" name="session_panel_status_command_pri_3" style="action" textcolor="255 255 255" z="70" hidden="false">
-                                <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_command_3_x, crd_status_orb_command_3_y, crd_status_orb_command_3_x+crd_status_orb_command_3_width, crd_status_orb_command_3_y+crd_status_orb_command_3_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_command_3_x, -crd_status_orb_command_3_y-crd_status_orb_command_3_height, crd_status_orb_command_3_x+crd_status_orb_command_3_width, -crd_status_orb_command_3_y, left_screen, bottom_screen, left_screen, bottom_screen);
-                                ]]></action>
-                                <action on="Press"><![CDATA[
+				]]></action>
+				<action on="Press"><![CDATA[
 					GUIObjectToggle("session_panel_status_command_pri_3_group");
-                                ]]></action>
+				]]></action>
 			</object>
 
 			<object type="empty" name="session_panel_status_command_pri_3_group" size="0 0 100% 100%" z="1" hidden="false">
 
 				<object type="button" name="session_panel_status_command_pri_3_1" style="action" textcolor="255 255 255" z="70" hidden="false">1
-        	                        <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_3_1_x, crd_status_orb_command_3_1_y, crd_status_orb_command_3_1_x+crd_status_orb_command_3_1_width, crd_status_orb_command_3_1_y+crd_status_orb_command_3_1_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_3_1_x, -crd_status_orb_command_3_1_y-crd_status_orb_command_3_1_height, crd_status_orb_command_3_1_x+crd_status_orb_command_3_1_width, -crd_status_orb_command_3_1_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_3_2" style="action" textcolor="255 255 255" z="70" hidden="false">2
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_3_2_x, crd_status_orb_command_3_2_y, crd_status_orb_command_3_2_x+crd_status_orb_command_3_2_width, crd_status_orb_command_3_2_y+crd_status_orb_command_3_2_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_3_2_x, -crd_status_orb_command_3_2_y-crd_status_orb_command_3_2_height, crd_status_orb_command_3_2_x+crd_status_orb_command_3_2_width, -crd_status_orb_command_3_2_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_3_3" style="action" textcolor="255 255 255" z="70" hidden="false">3
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_3_3_x, crd_status_orb_command_3_3_y, crd_status_orb_command_3_3_x+crd_status_orb_command_3_3_width, crd_status_orb_command_3_3_y+crd_status_orb_command_3_3_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_3_3_x, -crd_status_orb_command_3_3_y-crd_status_orb_command_3_3_height, crd_status_orb_command_3_3_x+crd_status_orb_command_3_3_width, -crd_status_orb_command_3_3_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_3_4" style="action" textcolor="255 255 255" z="70" hidden="false">4
-        	                        <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_3_4_x, crd_status_orb_command_3_4_y, crd_status_orb_command_3_4_x+crd_status_orb_command_3_4_width, crd_status_orb_command_3_4_y+crd_status_orb_command_3_4_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_3_4_x, -crd_status_orb_command_3_4_y-crd_status_orb_command_3_4_height, crd_status_orb_command_3_4_x+crd_status_orb_command_3_4_width, -crd_status_orb_command_3_4_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_3_5" style="action" textcolor="255 255 255" z="70" hidden="false">5
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_3_5_x, crd_status_orb_command_3_5_y, crd_status_orb_command_3_5_x+crd_status_orb_command_3_5_width, crd_status_orb_command_3_5_y+crd_status_orb_command_3_5_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_3_5_x, -crd_status_orb_command_3_5_y-crd_status_orb_command_3_5_height, crd_status_orb_command_3_5_x+crd_status_orb_command_3_5_width, -crd_status_orb_command_3_5_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_3_6" style="action" textcolor="255 255 255" z="70" hidden="false">6
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_3_6_x, crd_status_orb_command_3_6_y, crd_status_orb_command_3_6_x+crd_status_orb_command_3_6_width, crd_status_orb_command_3_6_y+crd_status_orb_command_3_6_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_3_6_x, -crd_status_orb_command_3_6_y-crd_status_orb_command_3_6_height, crd_status_orb_command_3_6_x+crd_status_orb_command_3_6_width, -crd_status_orb_command_3_6_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_3_7" style="action" textcolor="255 255 255" z="70" hidden="false">7
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_3_7_x, crd_status_orb_command_3_7_y, crd_status_orb_command_3_7_x+crd_status_orb_command_3_7_width, crd_status_orb_command_3_7_y+crd_status_orb_command_3_7_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_3_7_x, -crd_status_orb_command_3_7_y-crd_status_orb_command_3_7_height, crd_status_orb_command_3_7_x+crd_status_orb_command_3_7_width, -crd_status_orb_command_3_7_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_3_8" style="action" textcolor="255 255 255" z="70" hidden="false">8
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_3_8_x, crd_status_orb_command_3_8_y, crd_status_orb_command_3_8_x+crd_status_orb_command_3_8_width, crd_status_orb_command_3_8_y+crd_status_orb_command_3_8_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_3_8_x, -crd_status_orb_command_3_8_y-crd_status_orb_command_3_8_height, crd_status_orb_command_3_8_x+crd_status_orb_command_3_8_width, -crd_status_orb_command_3_8_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_3_9" style="action" textcolor="255 255 255" z="70" hidden="false">9
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_3_9_x, crd_status_orb_command_3_9_y, crd_status_orb_command_3_9_x+crd_status_orb_command_3_9_width, crd_status_orb_command_3_9_y+crd_status_orb_command_3_9_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_3_9_x, -crd_status_orb_command_3_9_y-crd_status_orb_command_3_9_height, crd_status_orb_command_3_9_x+crd_status_orb_command_3_9_width, -crd_status_orb_command_3_9_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_3_10" style="action" textcolor="255 255 255" z="70" hidden="false">10
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_3_10_x, crd_status_orb_command_3_10_y, crd_status_orb_command_3_10_x+crd_status_orb_command_3_10_width, crd_status_orb_command_3_10_y+crd_status_orb_command_3_10_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_3_10_x, -crd_status_orb_command_3_10_y-crd_status_orb_command_3_10_height, crd_status_orb_command_3_10_x+crd_status_orb_command_3_10_width, -crd_status_orb_command_3_10_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_3_11" style="action" textcolor="255 255 255" z="70" hidden="false">11
-        	                        <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_3_11_x, crd_status_orb_command_3_11_y, crd_status_orb_command_3_11_x+crd_status_orb_command_3_11_width, crd_status_orb_command_3_11_y+crd_status_orb_command_3_11_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_3_11_x, -crd_status_orb_command_3_11_y-crd_status_orb_command_3_11_height, crd_status_orb_command_3_11_x+crd_status_orb_command_3_11_width, -crd_status_orb_command_3_11_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_3_12" style="action" textcolor="255 255 255" z="70" hidden="false">12
-        	                        <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_3_12_x, crd_status_orb_command_3_12_y, crd_status_orb_command_3_12_x+crd_status_orb_command_3_12_width, crd_status_orb_command_3_12_y+crd_status_orb_command_3_12_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_3_12_x, -crd_status_orb_command_3_12_y-crd_status_orb_command_3_12_height, crd_status_orb_command_3_12_x+crd_status_orb_command_3_12_width, -crd_status_orb_command_3_12_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 			</object>
 
 			<object type="button" name="session_panel_status_command_pri_4" style="action" textcolor="255 255 255" z="70" hidden="false">
-                                <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_command_4_x, crd_status_orb_command_4_y, crd_status_orb_command_4_x+crd_status_orb_command_4_width, crd_status_orb_command_4_y+crd_status_orb_command_4_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_command_4_x, -crd_status_orb_command_4_y-crd_status_orb_command_4_height, crd_status_orb_command_4_x+crd_status_orb_command_4_width, -crd_status_orb_command_4_y, left_screen, bottom_screen, left_screen, bottom_screen);
-                                ]]></action>
-                                <action on="Press"><![CDATA[
+				]]></action>
+				<action on="Press"><![CDATA[
 					GUIObjectToggle("session_panel_status_command_pri_4_group");
-                                ]]></action>
+				]]></action>
 			</object>
 
 			<object type="empty" name="session_panel_status_command_pri_4_group" size="0 0 100% 100%" z="1" hidden="false">
 
 				<object type="button" name="session_panel_status_command_pri_4_1" style="action" textcolor="255 255 255" z="70" hidden="false">1
-        	                        <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_4_1_x, crd_status_orb_command_4_1_y, crd_status_orb_command_4_1_x+crd_status_orb_command_4_1_width, crd_status_orb_command_4_1_y+crd_status_orb_command_4_1_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_4_1_x, -crd_status_orb_command_4_1_y-crd_status_orb_command_4_1_height, crd_status_orb_command_4_1_x+crd_status_orb_command_4_1_width, -crd_status_orb_command_4_1_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_4_2" style="action" textcolor="255 255 255" z="70" hidden="false">2
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_4_2_x, crd_status_orb_command_4_2_y, crd_status_orb_command_4_2_x+crd_status_orb_command_4_2_width, crd_status_orb_command_4_2_y+crd_status_orb_command_4_2_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_4_2_x, -crd_status_orb_command_4_2_y-crd_status_orb_command_4_2_height, crd_status_orb_command_4_2_x+crd_status_orb_command_4_2_width, -crd_status_orb_command_4_2_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_4_3" style="action" textcolor="255 255 255" z="70" hidden="false">3
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_4_3_x, crd_status_orb_command_4_3_y, crd_status_orb_command_4_3_x+crd_status_orb_command_4_3_width, crd_status_orb_command_4_3_y+crd_status_orb_command_4_3_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_4_3_x, -crd_status_orb_command_4_3_y-crd_status_orb_command_4_3_height, crd_status_orb_command_4_3_x+crd_status_orb_command_4_3_width, -crd_status_orb_command_4_3_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_4_4" style="action" textcolor="255 255 255" z="70" hidden="false">4
-        	                        <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_4_4_x, crd_status_orb_command_4_4_y, crd_status_orb_command_4_4_x+crd_status_orb_command_4_4_width, crd_status_orb_command_4_4_y+crd_status_orb_command_4_4_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_4_4_x, -crd_status_orb_command_4_4_y-crd_status_orb_command_4_4_height, crd_status_orb_command_4_4_x+crd_status_orb_command_4_4_width, -crd_status_orb_command_4_4_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_4_5" style="action" textcolor="255 255 255" z="70" hidden="false">5
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_4_5_x, crd_status_orb_command_4_5_y, crd_status_orb_command_4_5_x+crd_status_orb_command_4_5_width, crd_status_orb_command_4_5_y+crd_status_orb_command_4_5_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_4_5_x, -crd_status_orb_command_4_5_y-crd_status_orb_command_4_5_height, crd_status_orb_command_4_5_x+crd_status_orb_command_4_5_width, -crd_status_orb_command_4_5_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_4_6" style="action" textcolor="255 255 255" z="70" hidden="false">6
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_4_6_x, crd_status_orb_command_4_6_y, crd_status_orb_command_4_6_x+crd_status_orb_command_4_6_width, crd_status_orb_command_4_6_y+crd_status_orb_command_4_6_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_4_6_x, -crd_status_orb_command_4_6_y-crd_status_orb_command_4_6_height, crd_status_orb_command_4_6_x+crd_status_orb_command_4_6_width, -crd_status_orb_command_4_6_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_4_7" style="action" textcolor="255 255 255" z="70" hidden="false">7
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_4_7_x, crd_status_orb_command_4_7_y, crd_status_orb_command_4_7_x+crd_status_orb_command_4_7_width, crd_status_orb_command_4_7_y+crd_status_orb_command_4_7_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_4_7_x, -crd_status_orb_command_4_7_y-crd_status_orb_command_4_7_height, crd_status_orb_command_4_7_x+crd_status_orb_command_4_7_width, -crd_status_orb_command_4_7_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_4_8" style="action" textcolor="255 255 255" z="70" hidden="false">8
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_4_8_x, crd_status_orb_command_4_8_y, crd_status_orb_command_4_8_x+crd_status_orb_command_4_8_width, crd_status_orb_command_4_8_y+crd_status_orb_command_4_8_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_4_8_x, -crd_status_orb_command_4_8_y-crd_status_orb_command_4_8_height, crd_status_orb_command_4_8_x+crd_status_orb_command_4_8_width, -crd_status_orb_command_4_8_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_4_9" style="action" textcolor="255 255 255" z="70" hidden="false">9
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_4_9_x, crd_status_orb_command_4_9_y, crd_status_orb_command_4_9_x+crd_status_orb_command_4_9_width, crd_status_orb_command_4_9_y+crd_status_orb_command_4_9_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_4_9_x, -crd_status_orb_command_4_9_y-crd_status_orb_command_4_9_height, crd_status_orb_command_4_9_x+crd_status_orb_command_4_9_width, -crd_status_orb_command_4_9_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_4_10" style="action" textcolor="255 255 255" z="70" hidden="false">10
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_4_10_x, crd_status_orb_command_4_10_y, crd_status_orb_command_4_10_x+crd_status_orb_command_4_10_width, crd_status_orb_command_4_10_y+crd_status_orb_command_4_10_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_4_10_x, -crd_status_orb_command_4_10_y-crd_status_orb_command_4_10_height, crd_status_orb_command_4_10_x+crd_status_orb_command_4_10_width, -crd_status_orb_command_4_10_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_4_11" style="action" textcolor="255 255 255" z="70" hidden="false">11
-        	                        <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_4_11_x, crd_status_orb_command_4_11_y, crd_status_orb_command_4_11_x+crd_status_orb_command_4_11_width, crd_status_orb_command_4_11_y+crd_status_orb_command_4_11_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_4_11_x, -crd_status_orb_command_4_11_y-crd_status_orb_command_4_11_height, crd_status_orb_command_4_11_x+crd_status_orb_command_4_11_width, -crd_status_orb_command_4_11_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_4_12" style="action" textcolor="255 255 255" z="70" hidden="false">12
-        	                        <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_4_12_x, crd_status_orb_command_4_12_y, crd_status_orb_command_4_12_x+crd_status_orb_command_4_12_width, crd_status_orb_command_4_12_y+crd_status_orb_command_4_12_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_4_12_x, -crd_status_orb_command_4_12_y-crd_status_orb_command_4_12_height, crd_status_orb_command_4_12_x+crd_status_orb_command_4_12_width, -crd_status_orb_command_4_12_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 			</object>
 
 			<object type="button" name="session_panel_status_command_pri_5" style="action" textcolor="255 255 255" z="70" hidden="false">
-                                <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_command_5_x, crd_status_orb_command_5_y, crd_status_orb_command_5_x+crd_status_orb_command_5_width, crd_status_orb_command_5_y+crd_status_orb_command_5_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_command_5_x, -crd_status_orb_command_5_y-crd_status_orb_command_5_height, crd_status_orb_command_5_x+crd_status_orb_command_5_width, -crd_status_orb_command_5_y, left_screen, bottom_screen, left_screen, bottom_screen);
-                                ]]></action>
+				]]></action>
 			</object>
 
 			<object type="empty" name="session_panel_status_command_pri_5_group" size="0 0 100% 100%" z="1" hidden="false">
 
 				<object type="button" name="session_panel_status_command_pri_5_1" style="action" textcolor="255 255 255" z="70" hidden="false">1
-        	                        <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_5_1_x, crd_status_orb_command_5_1_y, crd_status_orb_command_5_1_x+crd_status_orb_command_5_1_width, crd_status_orb_command_5_1_y+crd_status_orb_command_5_1_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_5_1_x, -crd_status_orb_command_5_1_y-crd_status_orb_command_5_1_height, crd_status_orb_command_5_1_x+crd_status_orb_command_5_1_width, -crd_status_orb_command_5_1_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_5_2" style="action" textcolor="255 255 255" z="70" hidden="false">2
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_5_2_x, crd_status_orb_command_5_2_y, crd_status_orb_command_5_2_x+crd_status_orb_command_5_2_width, crd_status_orb_command_5_2_y+crd_status_orb_command_5_2_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_5_2_x, -crd_status_orb_command_5_2_y-crd_status_orb_command_5_2_height, crd_status_orb_command_5_2_x+crd_status_orb_command_5_2_width, -crd_status_orb_command_5_2_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_5_3" style="action" textcolor="255 255 255" z="70" hidden="false">3
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_5_3_x, crd_status_orb_command_5_3_y, crd_status_orb_command_5_3_x+crd_status_orb_command_5_3_width, crd_status_orb_command_5_3_y+crd_status_orb_command_5_3_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_5_3_x, -crd_status_orb_command_5_3_y-crd_status_orb_command_5_3_height, crd_status_orb_command_5_3_x+crd_status_orb_command_5_3_width, -crd_status_orb_command_5_3_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_5_4" style="action" textcolor="255 255 255" z="70" hidden="false">4
-        	                        <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_5_4_x, crd_status_orb_command_5_4_y, crd_status_orb_command_5_4_x+crd_status_orb_command_5_4_width, crd_status_orb_command_5_4_y+crd_status_orb_command_5_4_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_5_4_x, -crd_status_orb_command_5_4_y-crd_status_orb_command_5_4_height, crd_status_orb_command_5_4_x+crd_status_orb_command_5_4_width, -crd_status_orb_command_5_4_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_5_5" style="action" textcolor="255 255 255" z="70" hidden="false">5
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_5_5_x, crd_status_orb_command_5_5_y, crd_status_orb_command_5_5_x+crd_status_orb_command_5_5_width, crd_status_orb_command_5_5_y+crd_status_orb_command_5_5_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_5_5_x, -crd_status_orb_command_5_5_y-crd_status_orb_command_5_5_height, crd_status_orb_command_5_5_x+crd_status_orb_command_5_5_width, -crd_status_orb_command_5_5_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_5_6" style="action" textcolor="255 255 255" z="70" hidden="false">6
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_5_6_x, crd_status_orb_command_5_6_y, crd_status_orb_command_5_6_x+crd_status_orb_command_5_6_width, crd_status_orb_command_5_6_y+crd_status_orb_command_5_6_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_5_6_x, -crd_status_orb_command_5_6_y-crd_status_orb_command_5_6_height, crd_status_orb_command_5_6_x+crd_status_orb_command_5_6_width, -crd_status_orb_command_5_6_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_5_7" style="action" textcolor="255 255 255" z="70" hidden="false">7
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_5_7_x, crd_status_orb_command_5_7_y, crd_status_orb_command_5_7_x+crd_status_orb_command_5_7_width, crd_status_orb_command_5_7_y+crd_status_orb_command_5_7_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_5_7_x, -crd_status_orb_command_5_7_y-crd_status_orb_command_5_7_height, crd_status_orb_command_5_7_x+crd_status_orb_command_5_7_width, -crd_status_orb_command_5_7_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_5_8" style="action" textcolor="255 255 255" z="70" hidden="false">8
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_5_8_x, crd_status_orb_command_5_8_y, crd_status_orb_command_5_8_x+crd_status_orb_command_5_8_width, crd_status_orb_command_5_8_y+crd_status_orb_command_5_8_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_5_8_x, -crd_status_orb_command_5_8_y-crd_status_orb_command_5_8_height, crd_status_orb_command_5_8_x+crd_status_orb_command_5_8_width, -crd_status_orb_command_5_8_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_5_9" style="action" textcolor="255 255 255" z="70" hidden="false">9
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_5_9_x, crd_status_orb_command_5_9_y, crd_status_orb_command_5_9_x+crd_status_orb_command_5_9_width, crd_status_orb_command_5_9_y+crd_status_orb_command_5_9_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_5_9_x, -crd_status_orb_command_5_9_y-crd_status_orb_command_5_9_height, crd_status_orb_command_5_9_x+crd_status_orb_command_5_9_width, -crd_status_orb_command_5_9_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_5_10" style="action" textcolor="255 255 255" z="70" hidden="false">10
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_5_10_x, crd_status_orb_command_5_10_y, crd_status_orb_command_5_10_x+crd_status_orb_command_5_10_width, crd_status_orb_command_5_10_y+crd_status_orb_command_5_10_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_5_10_x, -crd_status_orb_command_5_10_y-crd_status_orb_command_5_10_height, crd_status_orb_command_5_10_x+crd_status_orb_command_5_10_width, -crd_status_orb_command_5_10_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_5_11" style="action" textcolor="255 255 255" z="70" hidden="false">11
-        	                        <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_5_11_x, crd_status_orb_command_5_11_y, crd_status_orb_command_5_11_x+crd_status_orb_command_5_11_width, crd_status_orb_command_5_11_y+crd_status_orb_command_5_11_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_5_11_x, -crd_status_orb_command_5_11_y-crd_status_orb_command_5_11_height, crd_status_orb_command_5_11_x+crd_status_orb_command_5_11_width, -crd_status_orb_command_5_11_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<object type="button" name="session_panel_status_command_pri_5_12" style="action" textcolor="255 255 255" z="70" hidden="false">12
-        	                        <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_status_orb_command_5_12_x, crd_status_orb_command_5_12_y, crd_status_orb_command_5_12_x+crd_status_orb_command_5_12_width, crd_status_orb_command_5_12_y+crd_status_orb_command_5_12_height, left_screen, top_screen, left_screen, top_screen,
 						crd_status_orb_command_5_12_x, -crd_status_orb_command_5_12_y-crd_status_orb_command_5_12_height, crd_status_orb_command_5_12_x+crd_status_orb_command_5_12_width, -crd_status_orb_command_5_12_y, left_screen, bottom_screen, left_screen, bottom_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 			</object>
 
 			<object type="button" name="session_panel_status_command_pri_6" style="action" textcolor="255 255 255" z="70" hidden="false">
-                                <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_command_6_x, crd_status_orb_command_6_y, crd_status_orb_command_6_x+crd_status_orb_command_6_width, crd_status_orb_command_6_y+crd_status_orb_command_6_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_command_6_x, -crd_status_orb_command_6_y-crd_status_orb_command_6_height, crd_status_orb_command_6_x+crd_status_orb_command_6_width, -crd_status_orb_command_6_y, left_screen, bottom_screen, left_screen, bottom_screen);
-                                ]]></action>
+				]]></action>
 			</object>
 
 			<object type="button" name="session_panel_status_command_pri_7" style="action" textcolor="255 255 255" z="70" hidden="false">
-                                <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_command_7_x, crd_status_orb_command_7_y, crd_status_orb_command_7_x+crd_status_orb_command_7_width, crd_status_orb_command_7_y+crd_status_orb_command_7_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_command_7_x, -crd_status_orb_command_7_y-crd_status_orb_command_7_height, crd_status_orb_command_7_x+crd_status_orb_command_7_width, -crd_status_orb_command_7_y, left_screen, bottom_screen, left_screen, bottom_screen);
-                                ]]></action>
+				]]></action>
 			</object>
 
 			<object type="button" name="session_panel_status_command_pri_8" style="action" textcolor="255 255 255" z="70" hidden="false">
-                                <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_command_8_x, crd_status_orb_command_8_y, crd_status_orb_command_8_x+crd_status_orb_command_8_width, crd_status_orb_command_8_y+crd_status_orb_command_8_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_command_8_x, -crd_status_orb_command_8_y-crd_status_orb_command_8_height, crd_status_orb_command_8_x+crd_status_orb_command_8_width, -crd_status_orb_command_8_y, left_screen, bottom_screen, left_screen, bottom_screen);
-                                ]]></action>
+				]]></action>
 			</object>
 
 			<object type="button" name="session_panel_status_command_pri_9" style="action" textcolor="255 255 255" z="70" hidden="false">
-                                <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_command_9_x, crd_status_orb_command_9_y, crd_status_orb_command_9_x+crd_status_orb_command_9_width, crd_status_orb_command_9_y+crd_status_orb_command_9_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_command_9_x, -crd_status_orb_command_9_y-crd_status_orb_command_9_height, crd_status_orb_command_9_x+crd_status_orb_command_9_width, -crd_status_orb_command_9_y, left_screen, bottom_screen, left_screen, bottom_screen);
-                                ]]></action>
+				]]></action>
 			</object>
 
 			<object type="button" name="session_panel_status_command_pri_10" style="action" textcolor="255 255 255" z="70" hidden="false">
-                                <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_command_10_x, crd_status_orb_command_10_y, crd_status_orb_command_10_x+crd_status_orb_command_10_width, crd_status_orb_command_10_y+crd_status_orb_command_10_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_command_10_x, -crd_status_orb_command_10_y-crd_status_orb_command_10_height, crd_status_orb_command_10_x+crd_status_orb_command_10_width, -crd_status_orb_command_10_y, left_screen, bottom_screen, left_screen, bottom_screen);
-                                ]]></action>
+				]]></action>
 			</object>
 
 			<object type="button" name="session_panel_status_command_pri_11" style="action" textcolor="255 255 255" z="70" hidden="false">
-                                <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_command_11_x, crd_status_orb_command_11_y, crd_status_orb_command_11_x+crd_status_orb_command_11_width, crd_status_orb_command_11_y+crd_status_orb_command_11_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_command_11_x, -crd_status_orb_command_11_y-crd_status_orb_command_11_height, crd_status_orb_command_11_x+crd_status_orb_command_11_width, -crd_status_orb_command_11_y, left_screen, bottom_screen, left_screen, bottom_screen);
-                                ]]></action>
+				]]></action>
 			</object>
 
 			<object type="button" name="session_panel_status_command_pri_12" style="action" textcolor="255 255 255" z="70" hidden="false">
-                                <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_command_12_x, crd_status_orb_command_12_y, crd_status_orb_command_12_x+crd_status_orb_command_12_width, crd_status_orb_command_12_y+crd_status_orb_command_12_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_command_12_x, -crd_status_orb_command_12_y-crd_status_orb_command_12_height, crd_status_orb_command_12_x+crd_status_orb_command_12_width, -crd_status_orb_command_12_y, left_screen, bottom_screen, left_screen, bottom_screen);
-                                ]]></action>
+				]]></action>
 			</object>
 
 			<object type="button" name="session_panel_status_command_pri_13" style="action" textcolor="255 255 255" z="70" hidden="false">
-                                <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_command_13_x, crd_status_orb_command_13_y, crd_status_orb_command_13_x+crd_status_orb_command_13_width, crd_status_orb_command_13_y+crd_status_orb_command_13_height, left_screen, top_screen, left_screen, top_screen,
 					crd_status_orb_command_13_x, -crd_status_orb_command_13_y-crd_status_orb_command_13_height, crd_status_orb_command_13_x+crd_status_orb_command_13_width, -crd_status_orb_command_13_y, left_screen, bottom_screen, left_screen, bottom_screen);
-                                ]]></action>
+				]]></action>
 			</object>
 
-                <!-- / GROUP: STATUS ORB -->
-                </object>
+		<!-- / GROUP: STATUS ORB -->
+		</object>
 
-                <!-- GROUP: MAP ORB -->
-                <object type="empty" name="session_map_orb" hotkey="maporb.toggle" size="0 0 100% 100%" z="1" hidden="false">
+		<!-- 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>
@@ -1418,28 +1418,28 @@
 				]]></action>
 			</object>
 
-                        <object type="button" name="session_panel_minimap_segleft1" sprite="session_panel_minimap_segleft1" sprite-over="session_panel_minimap_segleft1-lit" z="60" hidden="false">
+			<object type="button" name="session_panel_minimap_segleft1" sprite="session_panel_minimap_segleft1" sprite-over="session_panel_minimap_segleft1-lit" z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_map_orb_segleft1_x, crd_map_orb_segleft1_y, crd_map_orb_segleft1_x+crd_map_orb_segleft1_width, crd_map_orb_segleft1_y+crd_map_orb_segleft1_height, right_screen, top_screen, right_screen, top_screen,
 					crd_map_orb_segleft1_x, -crd_map_orb_minimap_y-crd_map_orb_minimap_height+crd_map_orb_segleft1_y, crd_map_orb_segleft1_x+crd_map_orb_segleft1_width, -crd_map_orb_minimap_y-crd_map_orb_minimap_height+crd_map_orb_segleft1_y+crd_map_orb_segleft1_height, right_screen, bottom_screen, right_screen, bottom_screen);
 				]]></action>
 			</object>
-                        <object type="button" name="session_panel_minimap_segleft2" sprite="session_panel_minimap_segleft2" sprite-over="session_panel_minimap_segleft2-lit" z="60" hidden="false">
+			<object type="button" name="session_panel_minimap_segleft2" sprite="session_panel_minimap_segleft2" sprite-over="session_panel_minimap_segleft2-lit" z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_map_orb_segleft2_x, crd_map_orb_segleft2_y, crd_map_orb_segleft2_x+crd_map_orb_segleft2_width, crd_map_orb_segleft2_y+crd_map_orb_segleft2_height, right_screen, top_screen, right_screen, top_screen,
 					crd_map_orb_segleft2_x, -crd_map_orb_minimap_y-crd_map_orb_minimap_height+crd_map_orb_segleft2_y, crd_map_orb_segleft2_x+crd_map_orb_segleft2_width, -crd_map_orb_minimap_y-crd_map_orb_minimap_height+crd_map_orb_segleft2_y+crd_map_orb_segleft2_height, right_screen, bottom_screen, right_screen, bottom_screen);
 				]]></action>
 			</object>
-                        <object type="button" name="session_panel_minimap_segleft3" sprite="session_panel_minimap_segleft3" sprite-over="session_panel_minimap_segleft3-lit" z="60" hidden="false">
+			<object type="button" name="session_panel_minimap_segleft3" sprite="session_panel_minimap_segleft3" sprite-over="session_panel_minimap_segleft3-lit" z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_map_orb_segleft3_x, crd_map_orb_segleft3_y, crd_map_orb_segleft3_x+crd_map_orb_segleft3_width, crd_map_orb_segleft3_y+crd_map_orb_segleft3_height, right_screen, top_screen, right_screen, top_screen,
 					crd_map_orb_segleft3_x, -crd_map_orb_minimap_y-crd_map_orb_minimap_height+crd_map_orb_segleft3_y, crd_map_orb_segleft3_x+crd_map_orb_segleft3_width, -crd_map_orb_minimap_y-crd_map_orb_minimap_height+crd_map_orb_segleft3_y+crd_map_orb_segleft3_height, right_screen, bottom_screen, right_screen, bottom_screen);
 				]]></action>
 			</object>
-                        <object type="button" name="session_panel_minimap_segleft4" hotkey="menu.game" sprite="session_panel_minimap_segleft4" sprite-over="session_panel_minimap_segleft4-lit" z="60" hidden="false">
+			<object type="button" name="session_panel_minimap_segleft4" hotkey="menu.game" sprite="session_panel_minimap_segleft4" sprite-over="session_panel_minimap_segleft4-lit" z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_map_orb_segleft4_x, crd_map_orb_segleft4_y, crd_map_orb_segleft4_x+crd_map_orb_segleft4_width, crd_map_orb_segleft4_y+crd_map_orb_segleft4_height, right_screen, top_screen, right_screen, top_screen,
@@ -1447,31 +1447,31 @@
 				]]></action>
 				<action on="Press"><![CDATA[
 					GUIObjectToggle("session_gui_subwindow_ingame_menu");
-	       	                ]]></action>
+				]]></action>
 			</object>
 
-                        <object type="button" name="session_panel_minimap_segbottom1" sprite="session_panel_minimap_segbottom1" sprite-over="session_panel_minimap_segbottom1-lit" z="60" hidden="false">
+			<object type="button" name="session_panel_minimap_segbottom1" sprite="session_panel_minimap_segbottom1" sprite-over="session_panel_minimap_segbottom1-lit" z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_map_orb_segbottom1_x, crd_map_orb_segbottom1_y, crd_map_orb_segbottom1_x+crd_map_orb_segbottom1_width, crd_map_orb_segbottom1_y+crd_map_orb_segbottom1_height, right_screen, top_screen, right_screen, top_screen,
 					crd_map_orb_segbottom1_x, -crd_map_orb_minimap_y-crd_map_orb_segbottom1_y-crd_map_orb_segbottom1_height, crd_map_orb_segbottom1_x+crd_map_orb_segbottom1_width, -crd_map_orb_minimap_y-crd_map_orb_segbottom1_y, right_screen, bottom_screen, right_screen, bottom_screen);
 				]]></action>
 			</object>
-                        <object type="button" name="session_panel_minimap_segbottom2" sprite="session_panel_minimap_segbottom2" sprite-over="session_panel_minimap_segbottom2-lit" z="60" hidden="false">
+			<object type="button" name="session_panel_minimap_segbottom2" sprite="session_panel_minimap_segbottom2" sprite-over="session_panel_minimap_segbottom2-lit" z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_map_orb_segbottom2_x, crd_map_orb_segbottom2_y, crd_map_orb_segbottom2_x+crd_map_orb_segbottom2_width, crd_map_orb_segbottom2_y+crd_map_orb_segbottom2_height, right_screen, top_screen, right_screen, top_screen,
 					crd_map_orb_segbottom2_x, -crd_map_orb_minimap_y-crd_map_orb_segbottom2_y-crd_map_orb_segbottom2_height, crd_map_orb_segbottom2_x+crd_map_orb_segbottom2_width, -crd_map_orb_minimap_y-crd_map_orb_segbottom2_y, right_screen, bottom_screen, right_screen, bottom_screen);
 				]]></action>
 			</object>
-                        <object type="button" name="session_panel_minimap_segbottom3" sprite="session_panel_minimap_segbottom3" sprite-over="session_panel_minimap_segbottom3-lit" z="60" hidden="false">
+			<object type="button" name="session_panel_minimap_segbottom3" sprite="session_panel_minimap_segbottom3" sprite-over="session_panel_minimap_segbottom3-lit" z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_map_orb_segbottom3_x, crd_map_orb_segbottom3_y, crd_map_orb_segbottom3_x+crd_map_orb_segbottom3_width, crd_map_orb_segbottom3_y+crd_map_orb_segbottom3_height, right_screen, top_screen, right_screen, top_screen,
 					crd_map_orb_segbottom3_x, -crd_map_orb_minimap_y-crd_map_orb_segbottom3_y-crd_map_orb_segbottom3_height, crd_map_orb_segbottom3_x+crd_map_orb_segbottom3_width, -crd_map_orb_minimap_y-crd_map_orb_segbottom3_y, right_screen, bottom_screen, right_screen, bottom_screen);
 				]]></action>
 			</object>
-                        <object type="button" name="session_panel_minimap_segbottom4" sprite="session_panel_minimap_segbottom4" sprite-over="session_panel_minimap_segbottom4-lit" hotkey="menu.game" z="60" hidden="false">
+			<object type="button" name="session_panel_minimap_segbottom4" sprite="session_panel_minimap_segbottom4" sprite-over="session_panel_minimap_segbottom4-lit" hotkey="menu.game" z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_map_orb_segbottom4_x, crd_map_orb_segbottom4_y, crd_map_orb_segbottom4_x+crd_map_orb_segbottom4_width, crd_map_orb_segbottom4_y+crd_map_orb_segbottom4_height, right_screen, top_screen, right_screen, top_screen,
@@ -1479,119 +1479,119 @@
 				]]></action>
 			</object>
 
-                <!-- / GROUP: MAP ORB -->
-                </object>
+		<!-- / GROUP: MAP ORB -->
+		</object>
 
-                <!-- GROUP: TEAM TRAY -->
-                <object type="empty" name="session_team_tray" hotkey="teamtray.toggle" size="0 0 100% 100%" z="60">
+		<!-- GROUP: TEAM TRAY -->
+		<object type="empty" name="session_team_tray" hotkey="teamtray.toggle" size="0 0 100% 100%" z="60">
 			<action on="Press"><![CDATA[
 				GUIObjectToggle("session_team_tray");
 			]]></action>
 
 			<object type="button" name="session_team_tray_1" style="action" text-align="left" z="70">1
-                                <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_team_tray_1_x, crd_team_tray_1_y, crd_team_tray_1_x+crd_team_tray_1_width, crd_team_tray_1_y+crd_team_tray_1_height, right_screen, top_screen, right_screen, top_screen,
 					crd_team_tray_1_x, -crd_team_tray_1_y-crd_team_tray_1_height, crd_team_tray_1_x+crd_team_tray_1_width, -crd_team_tray_1_y, right_screen, bottom_screen, right_screen, bottom_screen);
-                                ]]></action>
+				]]></action>
 			</object>
 			<object type="button" name="session_team_tray_2" style="action" text-align="left" z="70">2
-                                <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_team_tray_2_x, crd_team_tray_2_y, crd_team_tray_2_x+crd_team_tray_2_width, crd_team_tray_2_y+crd_team_tray_2_height, right_screen, top_screen, right_screen, top_screen,
 					crd_team_tray_2_x, -crd_team_tray_2_y-crd_team_tray_2_height, crd_team_tray_2_x+crd_team_tray_2_width, -crd_team_tray_2_y, right_screen, bottom_screen, right_screen, bottom_screen);
-                                ]]></action>
+				]]></action>
 			</object>
 			<object type="button" name="session_team_tray_3" style="action" text-align="left" z="70">3
-                                <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_team_tray_3_x, crd_team_tray_3_y, crd_team_tray_3_x+crd_team_tray_3_width, crd_team_tray_3_y+crd_team_tray_3_height, right_screen, top_screen, right_screen, top_screen,
 					crd_team_tray_3_x, -crd_team_tray_3_y-crd_team_tray_3_height, crd_team_tray_3_x+crd_team_tray_3_width, -crd_team_tray_3_y, right_screen, bottom_screen, right_screen, bottom_screen);
-                                ]]></action>
+				]]></action>
 			</object>
 			<object type="button" name="session_team_tray_4" style="action" text-align="left" z="70">4
-                                <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_team_tray_4_x, crd_team_tray_4_y, crd_team_tray_4_x+crd_team_tray_4_width, crd_team_tray_4_y+crd_team_tray_4_height, right_screen, top_screen, right_screen, top_screen,
 					crd_team_tray_4_x, -crd_team_tray_4_y-crd_team_tray_4_height, crd_team_tray_4_x+crd_team_tray_4_width, -crd_team_tray_4_y, right_screen, bottom_screen, right_screen, bottom_screen);
-                                ]]></action>
+				]]></action>
 			</object>
 			<object type="button" name="session_team_tray_5" style="action" text-align="left" z="70">5
-                                <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_team_tray_5_x, crd_team_tray_5_y, crd_team_tray_5_x+crd_team_tray_5_width, crd_team_tray_5_y+crd_team_tray_5_height, right_screen, top_screen, right_screen, top_screen,
 					crd_team_tray_5_x, -crd_team_tray_5_y-crd_team_tray_5_height, crd_team_tray_5_x+crd_team_tray_5_width, -crd_team_tray_5_y, right_screen, bottom_screen, right_screen, bottom_screen);
-                                ]]></action>
+				]]></action>
 			</object>
 			<object type="button" name="session_team_tray_6" style="action" text-align="left" z="70">6
-                                <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_team_tray_6_x, crd_team_tray_6_y, crd_team_tray_6_x+crd_team_tray_6_width, crd_team_tray_6_y+crd_team_tray_6_height, right_screen, top_screen, right_screen, top_screen,
 					crd_team_tray_6_x, -crd_team_tray_6_y-crd_team_tray_6_height, crd_team_tray_6_x+crd_team_tray_6_width, -crd_team_tray_6_y, right_screen, bottom_screen, right_screen, bottom_screen);
-                                ]]></action>
+				]]></action>
 			</object>
 			<object type="button" name="session_team_tray_7" style="action" text-align="left" z="70">7
-                                <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_team_tray_7_x, crd_team_tray_7_y, crd_team_tray_7_x+crd_team_tray_7_width, crd_team_tray_7_y+crd_team_tray_7_height, right_screen, top_screen, right_screen, top_screen,
 					crd_team_tray_7_x, -crd_team_tray_7_y-crd_team_tray_7_height, crd_team_tray_7_x+crd_team_tray_7_width, -crd_team_tray_7_y, right_screen, bottom_screen, right_screen, bottom_screen);
-                                ]]></action>
+				]]></action>
 			</object>
 			<object type="button" name="session_team_tray_8" style="action" text-align="left" z="70">8
-                                <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_team_tray_8_x, crd_team_tray_8_y, crd_team_tray_8_x+crd_team_tray_8_width, crd_team_tray_8_y+crd_team_tray_8_height, right_screen, top_screen, right_screen, top_screen,
 					crd_team_tray_8_x, -crd_team_tray_8_y-crd_team_tray_8_height, crd_team_tray_8_x+crd_team_tray_8_width, -crd_team_tray_8_y, right_screen, bottom_screen, right_screen, bottom_screen);
-                                ]]></action>
+				]]></action>
 			</object>
 			<object type="button" name="session_team_tray_9" style="action" text-align="left" z="70">9
-                                <action on="Load"><![CDATA[
+				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_team_tray_9_x, crd_team_tray_9_y, crd_team_tray_9_x+crd_team_tray_9_width, crd_team_tray_9_y+crd_team_tray_9_height, right_screen, top_screen, right_screen, top_screen,
 					crd_team_tray_9_x, -crd_team_tray_9_y-crd_team_tray_9_height, crd_team_tray_9_x+crd_team_tray_9_width, -crd_team_tray_9_y, right_screen, bottom_screen, right_screen, bottom_screen);
-                                ]]></action>
+				]]></action>
 			</object>
-                <!-- / GROUP: TRAY -->
-                </object>
+		<!-- / GROUP: TRAY -->
+		</object>
 
-                <!--
-                ==========================================
-                - HIDDEN (HOTKEY ONLY) -
-                ==========================================
-                -->
+		<!--
+		==========================================
+		- HIDDEN (HOTKEY ONLY) -
+		==========================================
+		-->
 
-                <!--
-                ==========================================
-                - SUB-WINDOW MENUS -
-                ==========================================
-                -->
+		<!--
+		==========================================
+		- SUB-WINDOW MENUS -
+		==========================================
+		-->
 
-	        <object type="empty" name="session_gui_subwindows" size="0 0 100% 100%" z="1" hidden="false">
+		<object type="empty" name="session_gui_subwindows" size="0 0 100% 100%" z="1" hidden="false">
 
 			<!--
 			==========================================
 			- IN-GAME MENU
 			==========================================
 			-->
-		        <object type="empty" name="session_gui_subwindow_ingame_menu" size="0 0 100% 100%" z="1" hidden="true">
+			<object type="empty" name="session_gui_subwindow_ingame_menu" size="0 0 100% 100%" z="1" hidden="true">
 	
 				<!-- Background -->
-		        	<object type="image" name="subwindow_ingame_menu_bkg" sprite="0ad_window" z="100" hidden="false" ghost="true">
-	                                <action on="Load"><![CDATA[
+				<object type="image" name="subwindow_ingame_menu_bkg" sprite="0ad_window" z="100" hidden="false" ghost="true">
+					<action on="Load"><![CDATA[
 						AddSizeCoord(this.name,
 						crd_ingame_menu_bkg_x, crd_ingame_menu_bkg_y, crd_ingame_menu_bkg_x+crd_ingame_menu_bkg_width, crd_ingame_menu_bkg_y+crd_ingame_menu_bkg_height, mid_screen, mid_screen, mid_screen, mid_screen,
 						crd_ingame_menu_bkg_x, crd_ingame_menu_bkg_y, crd_ingame_menu_bkg_x+crd_ingame_menu_bkg_width, crd_ingame_menu_bkg_y+crd_ingame_menu_bkg_height, mid_screen, mid_screen, mid_screen, mid_screen);
-	                                ]]></action>
+					]]></action>
 				</object>
 
 				<!-- End Game button -->
 				<object type="button" name="subwindow_ingame_menu_End_Game_Button" sprite="message_box-button-normal" sprite-over="message_box-button-over" hotkey="endgame" text-align="center" text-valign="center" z="170" hidden="false">
-	                                <action on="Load"><![CDATA[
+					<action on="Load"><![CDATA[
 						this.caption = "Resign Game";
 						AddSizeCoord(this.name,
 						crd_ingame_menu_end_button_x, crd_ingame_menu_end_button_y, crd_ingame_menu_end_button_x+crd_ingame_menu_end_button_width, crd_ingame_menu_end_button_y+crd_ingame_menu_end_button_height, mid_screen, mid_screen, mid_screen, mid_screen,
 						crd_ingame_menu_end_button_x, crd_ingame_menu_end_button_y, crd_ingame_menu_end_button_x+crd_ingame_menu_end_button_width, crd_ingame_menu_end_button_y+crd_ingame_menu_end_button_height, mid_screen, mid_screen, mid_screen, mid_screen);
-	                                ]]></action>
+					]]></action>
 					<action on="Press"><![CDATA[
 						btCaptions = new Array("Yep, work's done!", "No, more slaughter!");
 						btCode = new Array("endGame();\ncurr_music = newRandomSound('music', 'theme');\nCrossFade(curr_session_playlist_1, curr_music, 0.0001);\nGUIObjectHide('session_gui');\nGUIObjectUnhide('pregame_gui');", "");
@@ -1601,65 +1601,65 @@
 				</object>
 
 				<!-- Exit button -->
-		                <object type="button" name="subwindow_ingame_menu_Exit_Button" sprite="message_box-button-normal" sprite-over="message_box-button-over" text-align="center" text-valign="center" z="170" hidden="false">
-	                                <action on="Load"><![CDATA[
+				<object type="button" name="subwindow_ingame_menu_Exit_Button" sprite="message_box-button-normal" sprite-over="message_box-button-over" text-align="center" text-valign="center" z="170" hidden="false">
+					<action on="Load"><![CDATA[
 						this.caption = "Exit Game";
 						AddSizeCoord(this.name,
 						crd_ingame_menu_exit_button_x, crd_ingame_menu_exit_button_y, crd_ingame_menu_exit_button_x+crd_ingame_menu_exit_button_width, crd_ingame_menu_exit_button_y+crd_ingame_menu_exit_button_height, mid_screen, mid_screen, mid_screen, mid_screen,
 						crd_ingame_menu_exit_button_x, crd_ingame_menu_exit_button_y, crd_ingame_menu_exit_button_x+crd_ingame_menu_exit_button_width, crd_ingame_menu_exit_button_y+crd_ingame_menu_exit_button_height, mid_screen, mid_screen, mid_screen, mid_screen);
-	                                ]]></action>
-	        	                <action on="Press"><![CDATA[
-	                	                btCaptions = new Array("Yes, let me out!", "Nooooo!");
-	                        	        btCode = new Array("exit();", "");
-		                               	messageBox(400, 200, "Do you really want to quit [icon=0ad_icon] A.D.? This will cause a sudden return to reality.", "Confirmation", 0, btCaptions, btCode);
-	        	                ]]></action>
-		                </object>
+					]]></action>
+					<action on="Press"><![CDATA[
+						btCaptions = new Array("Yes, let me out!", "Nooooo!");
+						btCode = new Array("exit();", "");
+						messageBox(400, 200, "Do you really want to quit [icon=0ad_icon] A.D.? This will cause a sudden return to reality.", "Confirmation", 0, btCaptions, btCode);
+					]]></action>
+				</object>
 
 				<!-- Return button -->
-		                <object type="button" name="subwindow_ingame_menu_Return_Button" sprite="message_box-button-normal" sprite-over="message_box-button-over" text-align="center" text-valign="center" z="170" hidden="false">
-	                                <action on="Load"><![CDATA[
+				<object type="button" name="subwindow_ingame_menu_Return_Button" sprite="message_box-button-normal" sprite-over="message_box-button-over" text-align="center" text-valign="center" z="170" hidden="false">
+					<action on="Load"><![CDATA[
 						this.caption = "Return to Game";
 						AddSizeCoord(this.name,
 						crd_ingame_menu_return_button_x, crd_ingame_menu_return_button_y, crd_ingame_menu_return_button_x+crd_ingame_menu_return_button_width, crd_ingame_menu_return_button_y+crd_ingame_menu_return_button_height, mid_screen, mid_screen, mid_screen, mid_screen,
 						crd_ingame_menu_return_button_x, crd_ingame_menu_return_button_y, crd_ingame_menu_return_button_x+crd_ingame_menu_return_button_width, crd_ingame_menu_return_button_y+crd_ingame_menu_return_button_height, mid_screen, mid_screen, mid_screen, mid_screen);
-	                                ]]></action>
-	        	                <action on="Press"><![CDATA[
+					]]></action>
+					<action on="Press"><![CDATA[
 						GUIObjectToggle("session_gui_subwindow_ingame_menu");
-	        	                ]]></action>
-		                </object>
+					]]></action>
+				</object>
 
 			</object>
 		</object>
 
-                <!--
-                ==========================================
-                - DEBUG -
-                ==========================================
-                -->
+		<!--
+		==========================================
+		- DEBUG -
+		==========================================
+		-->
 
-                <!-- FPS COUNTER -->
-                <object type="text" name="FPS_Counter" z="100" hotkey="fps.toggle" textcolor="200 200 0" font="verdana16" ghost="true" hidden="false">
-                        <action on="Load"><![CDATA[
+		<!-- FPS COUNTER -->
+		<object type="text" name="FPS_Counter" z="100" hotkey="fps.toggle" textcolor="200 200 0" font="verdana16" ghost="true" hidden="false">
+			<action on="Load"><![CDATA[
 				AddSizeString("FPS_Counter",
 				"18 100%-35 200 100%", 
 				"18 0%      200 0%+35");
-                        ]]></action>
+			]]></action>
 			<action on="Press"><![CDATA[
 				GUIObjectToggle("FPS_Counter");
 			]]></action>
 			<action on="Tick"><![CDATA[
 				UpdateFPSCounter(mouse);
 			]]></action>
-                </object>
+		</object>
 
-                <!--
-                ==========================================
-                - TEST -
-                ==========================================
-                -->
+		<!--
+		==========================================
+		- TEST -
+		==========================================
+		-->
 
 	<!-- / SESSION GUI -->
-        </object>
+	</object>
 
 </objects>
 
diff --git a/binaries/data/mods/official/gui/test/setup.xml b/binaries/data/mods/official/gui/test/setup.xml
index 2b75bc646f..c7833e0db9 100755
--- a/binaries/data/mods/official/gui/test/setup.xml
+++ b/binaries/data/mods/official/gui/test/setup.xml
@@ -67,18 +67,24 @@
         
         <!-- Generic Icons / malte, 15th nov -->
         <icon name="0ad_icon" texture="0ad_icon" size="16 16" />
-	<icon name="bullet_icon" texture="bullet_icon" size="8 8" />
-	<icon name="infinity_icon" texture="infinity_icon" size="16 16" />
+        <icon name="bullet_icon" texture="bullet_icon" size="8 8" />
+        <icon name="infinity_icon" texture="infinity_icon" 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"
+        <tooltip name="pregame-mainmenu-tooltip"
+                use-object="pregame-mainmenu-tooltip"
+                hide-object="true"
+                delay="0"
+        />
+
+        <tooltip name="session-tooltip"
+                maxwidth="300"
+                offset="16 32"
+                anchor="top"
+                delay="500"
+                sprite="session-tooltip-background"
+                font="tahoma12"
+                buffer-zone="4"
+                textcolor="0 0 0"
         />
--->
 
 </setup>
diff --git a/binaries/data/mods/official/gui/test/sprite1.xml b/binaries/data/mods/official/gui/test/sprite1.xml
index 90341ea317..21d5d4f6b8 100644
--- a/binaries/data/mods/official/gui/test/sprite1.xml
+++ b/binaries/data/mods/official/gui/test/sprite1.xml
@@ -211,8 +211,12 @@
                 <image texture="pregame/ui_pregame_mainmenu_edbt_over.png" real-texture-placement="1 1 203 161" 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 name="pregame-mainmenu-tooltip-background">
+                <image backcolor="0 0 0 85" size="0 0 100% 100%"/>
+        </sprite>
+
+        <sprite name="session-tooltip-background">
+                <image backcolor="255 255 255" size="0 0 100% 100%" border="true" bordercolor="0 0 0"/>
         </sprite>
 
         <!--
diff --git a/binaries/data/mods/official/gui/test/styles.xml b/binaries/data/mods/official/gui/test/styles.xml
index d41c8e84f3..c7ffbca28a 100755
--- a/binaries/data/mods/official/gui/test/styles.xml
+++ b/binaries/data/mods/official/gui/test/styles.xml
@@ -14,12 +14,12 @@
 	/>
 
 	<style name="button"
-		sprite="sprite1" 
- 		sprite-pressed="sprite1-pressed"
+		sprite="sprite1"
+		sprite-pressed="sprite1-pressed"
 		sprite-disabled="sprite1-disabled"
 		sprite-over="sprite1-over"
-		sprite2="sprite1-ch" 
- 		sprite2-pressed="sprite2-pressed"
+		sprite2="sprite1-ch"
+		sprite2-pressed="sprite2-pressed"
 		sprite2-disabled="sprite2-disabled"
 	/>
 
@@ -28,7 +28,8 @@
 		text-align="right"
 		font="prospero16"
 		textcolor="255 255 255"
-		ghost="true" 
+		tooltip-style="session-tooltip"
+		ghost="false"
 	/>
 
 	<!-- Empty entity portrait. -->
@@ -36,7 +37,7 @@
 		sprite="ui_portrait_default_square"
 		sprite-over="ui_portrait_default_square-lit"
 		sprite-disabled="ui_portrait_default_square-grey"
-		tooltip-style="session-tooltip" 
+		tooltip-style="session-tooltip"
 		text-align="right"
 		textcolor="255 255 255"
 	/>
@@ -45,7 +46,7 @@
 		sprite="ui_portrait_default_circle"
 		sprite-over="ui_portrait_default_circle-lit"
 		sprite-disabled="ui_portrait_default_circle-grey"
-		tooltip-style="session-tooltip" 
+		tooltip-style="session-tooltip"
 		text-align="right"
 		textcolor="255 255 255"
 	/>
diff --git a/source/gui/CGUI.cpp b/source/gui/CGUI.cpp
index ec32ab13c3..a031280777 100755
--- a/source/gui/CGUI.cpp
+++ b/source/gui/CGUI.cpp
@@ -1738,10 +1738,9 @@ void CGUI::Xeromyces_ReadIcon(XMBElement Element, CXeromyces* pFile)
 
 void CGUI::Xeromyces_ReadTooltip(XMBElement Element, CXeromyces* pFile)
 {
-	IGUIObject* object = new CTooltip;
+	// Read the tooltip, and store it as a specially-named object
 
-	object->SetName(CStr("__internal(") + CStr(m_InternalNameNumber) + CStr(")"));
-	++m_InternalNameNumber;
+	IGUIObject* object = new CTooltip;
 
 	XMBAttributeList attributes = Element.getAttributes();
 	for (int i=0; i<attributes.Count; ++i)
@@ -1752,7 +1751,7 @@ void CGUI::Xeromyces_ReadTooltip(XMBElement Element, CXeromyces* pFile)
 
 		if (attr_name == "name")
 		{
-			object->SetName(attr_value);
+			object->SetName("__tooltip_" + attr_value);
 		}
 		else
 		{
diff --git a/source/gui/CTooltip.cpp b/source/gui/CTooltip.cpp
index 1c673f40f6..5b5ffd9b5e 100644
--- a/source/gui/CTooltip.cpp
+++ b/source/gui/CTooltip.cpp
@@ -1,23 +1,34 @@
+// CTooltip: GUI object used for tooltips
+
 #include "precompiled.h"
 
 #include "CTooltip.h"
 #include "CGUI.h"
 
+#include <algorithm>
+
 CTooltip::CTooltip()
 {
+	// If the tooltip is an object by itself:
 	AddSetting(GUIST_float,					"buffer-zone");
 	AddSetting(GUIST_CGUIString,			"caption");
 	AddSetting(GUIST_CStr,					"font");
 	AddSetting(GUIST_CGUISpriteInstance,	"sprite");
-	AddSetting(GUIST_int,					"time");
+	AddSetting(GUIST_int,					"delay");
 	AddSetting(GUIST_CColor,				"textcolor");
 	AddSetting(GUIST_int,					"maxwidth");
-	AddSetting(GUIST_CPos,					"pos");
+	AddSetting(GUIST_CPos,					"offset");
 	AddSetting(GUIST_EVAlign,				"anchor");
 
+	// If the tooltip is just a reference to another object:
+	AddSetting(GUIST_CStr,					"use-object");
+	AddSetting(GUIST_bool,					"hide-object");
+
+	// Private settings:
 	AddSetting(GUIST_CPos,					"_mousepos");
 
-	GUI<int>::SetSetting(this, "time", 500);
+	// Defaults
+	GUI<int>::SetSetting(this, "delay", 500);
 	GUI<EVAlign>::SetSetting(this, "anchor", EVAlign_Bottom);
 
 	// Set up a blank piece of text, to be replaced with a more
@@ -40,46 +51,54 @@ void CTooltip::SetupText()
 	if (GUI<CStr>::GetSetting(this, "font", font) != PS_OK || font.Length()==0)
 		font = "default";
 
-    float buffer_zone=0.f;
+	float buffer_zone = 0.f;
 	GUI<float>::GetSetting(this, "buffer-zone", buffer_zone);
 
 	CGUIString caption;
 	GUI<CGUIString>::GetSetting(this, "caption", caption);
 
-	float max_width = 500.f; // TODO: max-width setting
+	int max_width = 0;
+	GUI<int>::GetSetting(this, "maxwidth", max_width);
 
-	*m_GeneratedTexts[0] = GetGUI()->GenerateText(caption, font, max_width, buffer_zone, this);
+	*m_GeneratedTexts[0] = GetGUI()->GenerateText(caption, font, (float)max_width, buffer_zone, this);
 
-	CPos mousepos, pos;
+
+	// Position the tooltip relative to the mouse:
+
+	CPos mousepos, offset;
 	EVAlign anchor;
 	GUI<CPos>::GetSetting(this, "_mousepos", mousepos);
-	GUI<CPos>::GetSetting(this, "pos", pos);
+	GUI<CPos>::GetSetting(this, "offset", offset);
 	GUI<EVAlign>::GetSetting(this, "anchor", anchor);
 
-	// Position the tooltip relative to the mouse
+	// TODO: Calculate the actual width of the wrapped text and use that.
+	// (m_Size.cx is >max_width if the text wraps, which is not helpful)
+	float textwidth = std::min(m_GeneratedTexts[0]->m_Size.cx, (float)max_width);
+	float textheight = m_GeneratedTexts[0]->m_Size.cy;
 
 	CClientArea size;
-	size.pixel.left = mousepos.x + pos.x;
-	size.pixel.right = size.pixel.left + m_GeneratedTexts[0]->m_Size.cx;
+	size.pixel.left = mousepos.x + offset.x;
+	size.pixel.right = size.pixel.left + textwidth;
 	switch (anchor)
 	{
 	case EVAlign_Top:
-		size.pixel.top = mousepos.y + pos.y;
-		size.pixel.bottom = size.pixel.top + m_GeneratedTexts[0]->m_Size.cy;
+		size.pixel.top = mousepos.y + offset.y;
+		size.pixel.bottom = size.pixel.top + textheight;
 		break;
 	case EVAlign_Bottom:
-		size.pixel.bottom = mousepos.y + pos.y;
-		size.pixel.top = size.pixel.bottom - m_GeneratedTexts[0]->m_Size.cy;
+		size.pixel.bottom = mousepos.y + offset.y;
+		size.pixel.top = size.pixel.bottom - textheight;
 		break;
 	case EVAlign_Center:
-		size.pixel.top = mousepos.y + pos.y - m_GeneratedTexts[0]->m_Size.cy/2.f;
-		size.pixel.bottom = size.pixel.top + m_GeneratedTexts[0]->m_Size.cy;
+		size.pixel.top = mousepos.y + offset.y - textheight/2.f;
+		size.pixel.bottom = size.pixel.top + textwidth;
 		break;
 	default:
 		debug_warn("Invalid EVAlign!");
 	}
 
-	// Adjust it if it's falling off the screen
+
+	// Reposition the tooltip if it's falling off the screen:
 
 	extern int g_xres, g_yres;
 	float screenw = (float)g_xres, screenh = (float)g_yres;
diff --git a/source/gui/GUIRenderer.cpp b/source/gui/GUIRenderer.cpp
index 1b5a2ff206..1d0658cc29 100644
--- a/source/gui/GUIRenderer.cpp
+++ b/source/gui/GUIRenderer.cpp
@@ -578,10 +578,10 @@ void GUIRenderer::Draw(DrawCalls &Calls)
 			{
 				glColor4fv(cit->m_BorderColor.FloatArray());
 				glBegin(GL_LINE_LOOP);
-					glVertex3f(cit->m_Vertices.left,		cit->m_Vertices.top+1.f,	cit->m_DeltaZ);
-					glVertex3f(cit->m_Vertices.right-1.f,	cit->m_Vertices.top+1.f,	cit->m_DeltaZ);
-					glVertex3f(cit->m_Vertices.right-1.f,	cit->m_Vertices.bottom,		cit->m_DeltaZ);
-					glVertex3f(cit->m_Vertices.left,		cit->m_Vertices.bottom,		cit->m_DeltaZ);
+					glVertex3f(cit->m_Vertices.left,	cit->m_Vertices.top,	cit->m_DeltaZ);
+					glVertex3f(cit->m_Vertices.right,	cit->m_Vertices.top,	cit->m_DeltaZ);
+					glVertex3f(cit->m_Vertices.right,	cit->m_Vertices.bottom,	cit->m_DeltaZ);
+					glVertex3f(cit->m_Vertices.left,	cit->m_Vertices.bottom,	cit->m_DeltaZ);
 				glEnd();
 			}
 		}
diff --git a/source/gui/GUITooltip.cpp b/source/gui/GUITooltip.cpp
index fe24f37199..30819e8870 100644
--- a/source/gui/GUITooltip.cpp
+++ b/source/gui/GUITooltip.cpp
@@ -26,6 +26,7 @@
 	IN MOTION
 	* If the mouse stops, check whether it should have a tooltip and move to
 	  'STATIONARY, NO TOOLTIP' or 'STATIONARY, TOOLIP'
+	* If the mouse enters an object with a tooltip delay of 0, switch to 'SHOWING'
 
 	STATIONARY, NO TOOLTIP
 	* If the mouse moves, switch to 'IN MOTION'
@@ -63,85 +64,131 @@ GUITooltip::GUITooltip()
 
 const double CooldownTime = 0.25; // TODO: Don't hard-code this value
 
-static bool GetTooltip(IGUIObject* obj, CStr* &style)
+static bool GetTooltip(IGUIObject* obj, CStr &style)
 {
-	if (obj && obj->SettingExists("tooltip-style"))
+	if (obj && obj->SettingExists("tooltip-style")
+		&& GUI<CStr>::GetSetting(obj, "tooltip-style", style) == PS_OK)
 	{
-		// Use GetSettingPointer to avoid unnecessary string-copying.
-		// (The tooltip code is only run once per frame, but efficiency
-		// would be nice anyway.)
-		if (GUI<CStr>::GetSettingPointer(obj, "tooltip-style", style) == PS_OK
-			&& style->Length())
-
-			return true;
+		if (style.Length() == 0)
+			style = "default";
+		return true;
 	}
 	return false;
 }
 
-// Urgh - this is only a method because it needs to access HandleMessage (which
-// is 'protected'), so it needs to be friendable (and so not a static function)
-void GUITooltip::ShowTooltip(IGUIObject* obj, CPos pos, CStr& style, CGUI* gui)
+static void ShowTooltip(IGUIObject* obj, CPos pos, CStr& style, CGUI* gui)
 {
-	IGUIObject* tooltipobj = gui->FindObjectByName(style);
-	if (! tooltipobj)
-	{
-		LOG_ONCE(ERROR, "gui", "Cannot find tooltip object named '%s'", (const char*)style);
-		return;
-	}
-	// Unhide the object
-	GUI<bool>::SetSetting(tooltipobj, "hidden", false);
-
 	assert(obj);
 
-	// These shouldn't fail:
+	// Get the object referenced by 'tooltip-style'
+	IGUIObject* tooltipobj = gui->FindObjectByName("__tooltip_"+style);
+	if (! tooltipobj)
+	{
+		LOG_ONCE(ERROR, "gui", "Cannot find tooltip named '%s'", (const char*)style);
+		return;
+	}
+
+	IGUIObject* usedobj = tooltipobj; // object actually used to display the tooltip in
+
+	CStr usedObjectName;
+	if (GUI<CStr>::GetSetting(tooltipobj, "use-object", usedObjectName) == PS_OK
+		&& usedObjectName.Length())
+	{
+		usedobj = gui->FindObjectByName(usedObjectName);
+		if (! usedobj)
+		{
+			LOG_ONCE(ERROR, "gui", "Cannot find object named '%s' used by tooltip '%s'", (const char*)usedObjectName, (const char*)style);
+			return;
+		}
+
+		// Unhide the object. (If it had use-object and hide-object="true",
+		// still unhide it, because the used object might be hidden by default)
+		GUI<bool>::SetSetting(usedobj, "hidden", false);
+	}
+	else
+	{
+		// Unhide the object
+		GUI<bool>::SetSetting(usedobj, "hidden", false);
+
+		// Store mouse position inside the CTooltip
+		if (GUI<CPos>::SetSetting(usedobj, "_mousepos", pos) != PS_OK)
+			debug_warn("Failed to set tooltip mouse position");
+	}
 
 	// Retrieve object's 'tooltip' setting
 	CStr text;
 	if (GUI<CStr>::GetSetting(obj, "tooltip", text) != PS_OK)
-		debug_warn("Failed to retrieve tooltip text");
+		debug_warn("Failed to retrieve tooltip text"); // shouldn't fail
 
 	// Set tooltip's caption
-	if (tooltipobj->SetSetting("caption", text) != PS_OK)
-		debug_warn("Failed to set tooltip caption");
-
-	// Store mouse position inside the tooltip
-	if (GUI<CPos>::SetSetting(tooltipobj, "_mousepos", pos) != PS_OK)
-		debug_warn("Failed to set tooltip mouse position");
+	if (usedobj->SetSetting("caption", text) != PS_OK)
+		debug_warn("Failed to set tooltip caption"); // shouldn't fail
 
 	// Make the tooltip object regenerate its text
-	tooltipobj->HandleMessage(SGUIMessage(GUIM_SETTINGS_UPDATED, "caption"));
+	usedobj->HandleMessage(SGUIMessage(GUIM_SETTINGS_UPDATED, "caption"));
 }
 
 static void HideTooltip(CStr& style, CGUI* gui)
 {
-	IGUIObject* tooltipobj = gui->FindObjectByName(style);
+	IGUIObject* tooltipobj = gui->FindObjectByName("__tooltip_"+style);
 	if (! tooltipobj)
 	{
-		LOG_ONCE(ERROR, "gui", "Cannot find tooltip object named '%s'", (const char*)style);
+		LOG_ONCE(ERROR, "gui", "Cannot find tooltip named '%s'", (const char*)style);
 		return;
 	}
-	GUI<bool>::SetSetting(tooltipobj, "hidden", true);
+
+	CStr usedObjectName;
+	if (GUI<CStr>::GetSetting(tooltipobj, "use-object", usedObjectName) == PS_OK
+		&& usedObjectName.Length())
+	{
+		IGUIObject* usedobj = gui->FindObjectByName(usedObjectName);
+		if (! usedobj)
+		{
+			LOG_ONCE(ERROR, "gui", "Cannot find object named '%s' used by tooltip '%s'", (const char*)usedObjectName, (const char*)style);
+			return;
+		}
+
+		// Clear the caption
+		usedobj->SetSetting("caption", "");
+		usedobj->HandleMessage(SGUIMessage(GUIM_SETTINGS_UPDATED, "caption"));
+
+
+		bool hideobject = true;
+		GUI<bool>::GetSetting(tooltipobj, "hide-object", hideobject);
+
+		// If hide-object was enabled, hide it
+		if (hideobject)
+			GUI<bool>::SetSetting(usedobj, "hidden", true);
+	}
+	else
+	{
+		GUI<bool>::SetSetting(tooltipobj, "hidden", true);
+	}
+
 }
 
-static int GetTooltipTime(CStr& style, CGUI* gui)
+static int GetTooltipDelay(CStr& style, CGUI* gui)
 {
-	int time = 500; // default value (in msec)
+	int delay = 500; // default value (in msec)
 
-	IGUIObject* tooltipobj = gui->FindObjectByName(style);
+	IGUIObject* tooltipobj = gui->FindObjectByName("__tooltip_"+style);
 	if (! tooltipobj)
 	{
 		LOG_ONCE(ERROR, "gui", "Cannot find tooltip object named '%s'", (const char*)style);
-		return time;
+		return delay;
 	}
-	GUI<int>::GetSetting(tooltipobj, "time", time);
-	return time;
+	GUI<int>::GetSetting(tooltipobj, "delay", delay);
+	return delay;
 }
 
 void GUITooltip::Update(IGUIObject* Nearest, CPos MousePos, CGUI* GUI)
 {
+	// Called once per frame, so efficiency isn't vital
+
+
 	double now = get_time();
 
-	CStr* style = NULL;
+	CStr style;
 
 	int nextstate = -1;
 
@@ -155,6 +202,13 @@ void GUITooltip::Update(IGUIObject* Nearest, CPos MousePos, CGUI* GUI)
 			else
 				nextstate = ST_STATIONARY_NO_TOOLTIP;
 		}
+		else
+		{
+			// Check for movement onto a zero-delayed tooltip
+			if (GetTooltip(Nearest, style) && GetTooltipDelay(style, GUI)==0)
+
+				nextstate = ST_SHOWING;
+		}
 		break;
 
 	case ST_STATIONARY_NO_TOOLTIP:
@@ -190,31 +244,29 @@ void GUITooltip::Update(IGUIObject* Nearest, CPos MousePos, CGUI* GUI)
 		break;
 
 	case ST_COOLING:
-		if (now >= m_Time)
-			nextstate = ST_IN_MOTION;
-		else if (Nearest != m_PreviousObject && GetTooltip(Nearest, style))
+		if (GetTooltip(Nearest, style))
 			nextstate = ST_SHOWING;
+		else if (now >= m_Time)
+			nextstate = ST_IN_MOTION;
 		break;
 	}
 
-	// Handle state-entry code
+	// Handle state-entry code:
 
 	if (nextstate != -1)
 	{
 		switch (nextstate)
 		{
 		case ST_STATIONARY_TOOLTIP:
-			m_Time = now + (double)GetTooltipTime(*style, GUI) / 1000.;
+			m_Time = now + (double)GetTooltipDelay(style, GUI) / 1000.;
 			break;
 
 		case ST_SHOWING:
-			// show tooltip
-			ShowTooltip(Nearest, MousePos, *style, GUI);
-			m_PreviousTooltipName = *style;
+			ShowTooltip(Nearest, MousePos, style, GUI);
+			m_PreviousTooltipName = style;
 			break;
 
 		case ST_COOLING:
-			// hide the tooltip
 			HideTooltip(m_PreviousTooltipName, GUI);
 			m_Time = now + CooldownTime;
 			break;
diff --git a/source/gui/GUITooltip.h b/source/gui/GUITooltip.h
index 07d8c20533..2accf74390 100644
--- a/source/gui/GUITooltip.h
+++ b/source/gui/GUITooltip.h
@@ -14,7 +14,6 @@ public:
 	void Update(IGUIObject* Nearest, CPos MousePos, CGUI* GUI);
 
 private:
-	void ShowTooltip(IGUIObject* obj, CPos pos, CStr& style, CGUI* gui);
 
 	int m_State;
 
diff --git a/source/gui/GUItext.h b/source/gui/GUItext.h
index aab1b253ef..6fb34f4945 100755
--- a/source/gui/GUItext.h
+++ b/source/gui/GUItext.h
@@ -118,7 +118,7 @@ struct SGUIText
 		bool m_Bold, m_Italic, m_Underlined;
 
 		/**
-		 * *IF* an icon, than this is not NULL.
+		 * *IF* an icon, then this is not NULL.
 		 */
 		std::list<SSpriteCall>::pointer m_pSpriteCall;
 	};
diff --git a/source/gui/IGUIObject.cpp b/source/gui/IGUIObject.cpp
index fd6274a3e8..bed093e186 100755
--- a/source/gui/IGUIObject.cpp
+++ b/source/gui/IGUIObject.cpp
@@ -471,7 +471,7 @@ CStr IGUIObject::GetPresentableName() const
 	if (m_Name.Length() <= 12)
 		return m_Name;
 
-	if (m_Name.GetSubstring(0, 10) == CStr("__internal"))
+	if (m_Name.GetSubstring(0, 10) == "__internal")
 		return CStr("[unnamed object]");
 	else
 		return m_Name;
diff --git a/source/gui/IGUIObject.h b/source/gui/IGUIObject.h
index c0be5e4fcb..252ec58cd1 100755
--- a/source/gui/IGUIObject.h
+++ b/source/gui/IGUIObject.h
@@ -128,7 +128,10 @@ class IGUIObject
 	friend class CGUI;
 	friend class CInternalCGUIAccessorBase;
 	friend class IGUIScrollBar;
-	friend class GUITooltip;
+
+	// Allow ShowTooltip/HideTooltip (GUITooltip.cpp) to access HandleMessage
+	friend void ShowTooltip(IGUIObject*, CPos, CStr&, CGUI*);
+	friend void HideTooltip(CStr&, CGUI*);
 
 	// Allow getProperty to access things like GetParent()
 	friend JSBool JSI_IGUIObject::getProperty(JSContext* cx, JSObject* obj, jsval id, jsval* vp);