Index: code/branches/gamestate/data/gui/layouts/CompositorDemo.layout
===================================================================
--- code/branches/gamestate/data/gui/layouts/CompositorDemo.layout	(revision 6430)
+++ 	(revision )
@@ -1,182 +1,0 @@
-<?xml version="1.0" ?>
-<GUILayout>
-<Window Type="DefaultGUISheet" Name="root">
-
-	<Window Type="DefaultGUISheet" Name="debug_overlay">
-		<Property Name="AlwaysOnTop" Value="True" />
-		<Property Name="Disabled" Value="True" />
-		
-		<Window Type="TaharezLook/StaticText" Name="Panel 1">
-			<Property Name="UnifiedPosition" Value="{{0,0},{0.83,0}}" />
-			<Property Name="UnifiedSize" Value="{{0.23,0},{0.17,0}}" />
-			<Property Name="TopLeftFrameImage" Value="set:OgreGuiImagery image:BoxTopLeft" />
-			<Property Name="TopRightFrameImage" Value="set:OgreGuiImagery image:BoxTopRight" />
-			<Property Name="BottomLeftFrameImage" Value="set:OgreGuiImagery image:BoxBottomLeft" />
-			<Property Name="BottomRightFrameImage" Value="set:OgreGuiImagery image:BoxBottomRight" />
-			<Property Name="LeftFrameImage" Value="set:OgreGuiImagery image:BoxLeft" />
-			<Property Name="TopFrameImage" Value="set:OgreGuiImagery image:BoxTop" />
-			<Property Name="RightFrameImage" Value="set:OgreGuiImagery image:BoxRight" />
-			<Property Name="BottomFrameImage" Value="set:OgreGuiImagery image:BoxBottom" />
-			<Property Name="BackgroundImage" Value="set:OgreGuiImagery image:BoxBack" />
-			<Property Name="Alpha" Value="0.9" />
-			<Property Name="InheritsAlpha" Value="False" />
-	
-			<Window Type="TaharezLook/StaticText" Name="OPCurrentFPS">
-				<Property Name="FrameEnabled" Value="False" />
-				<Property Name="BackgroundEnabled" Value="False" />
-				<Property Name="Font" Value="BlueHighway-10" />
-				<Property Name="UnifiedPosition" Value="{{0.075,0},{0.12,0}}" />
-				<Property Name="UnifiedSize" Value="{{0.85,0},{0.25,0}}" />
-				<Property Name="TextColours" Value="tl:FF4FF06F tr:FF4FF06F bl:FF4FF06F br:FF4FF06F" />
-				<Property Name="HorzFormatting" Value="HorzCentred" />
-				<Property Name="Text" Value="Current FPS: " />
-			</Window>
-
-			<Window Type="TaharezLook/StaticImage" Name="OPBar1">
-				<Property Name="FrameEnabled" Value="False" />
-				<Property Name="BackgroundEnabled" Value="False" />
-				<Property Name="UnifiedPosition" Value="{{0.2,0},{0.27,0}}" />
-				<Property Name="UnifiedSize" Value="{{0.6,0},{0.025,0}}" />
-				<Property Name="Image" Value="set:OgreGuiImagery image:Bar" />
-			</Window>
-
-			<Window Type="TaharezLook/StaticText" Name="OPAverageFPS">
-				<Property Name="FrameEnabled" Value="False" />
-				<Property Name="BackgroundEnabled" Value="False" />
-				<Property Name="Font" Value="BlueHighway-10" />
-				<Property Name="UnifiedPosition" Value="{{0.075,0},{0.32,0}}" />
-				<Property Name="UnifiedSize" Value="{{1.0,0},{0.25,0}}" />
-				<Property Name="TextColours" Value="tl:FFFFF5F0 tr:FFFFF5F0 bl:FFFFF510 br:FFFFF5F0" />
-				<Property Name="Text" Value="Average FPS: " />
-			</Window>
-
-			<Window Type="TaharezLook/StaticText" Name="OPWorstFPS">
-				<Property Name="FrameEnabled" Value="False" />
-				<Property Name="BackgroundEnabled" Value="False" />
-				<Property Name="Font" Value="BlueHighway-10" />
-				<Property Name="UnifiedPosition" Value="{{0.075,0},{0.45,0}}" />
-				<Property Name="UnifiedSize" Value="{{1.0,0},{0.25,0}}" />
-				<Property Name="TextColours" Value="tl:FFFFF5F0 tr:FFFFF5F0 bl:FFFFF510 br:FFFFF5F0" />
-				<Property Name="Text" Value="Worst FPS: " />
-			</Window>
-
-			<Window Type="TaharezLook/StaticText" Name="OPBestFPS">
-				<Property Name="FrameEnabled" Value="False" />
-				<Property Name="BackgroundEnabled" Value="False" />
-				<Property Name="Font" Value="BlueHighway-10" />
-				<Property Name="UnifiedPosition" Value="{{0.075,0},{0.58,0}}" />
-				<Property Name="UnifiedSize" Value="{{1.0,0},{0.25,0}}" />
-				<Property Name="TextColours" Value="tl:FFFFF5F0 tr:FFFFF5F0 bl:FFFFF510 br:FFFFF5F0" />
-				<Property Name="Text" Value="Best FPS: " />
-			</Window>
-
-			<Window Type="TaharezLook/StaticText" Name="OPTriCount">
-				<Property Name="FrameEnabled" Value="False" />
-				<Property Name="BackgroundEnabled" Value="False" />
-				<Property Name="Font" Value="BlueHighway-10" />
-				<Property Name="UnifiedPosition" Value="{{0.075,0},{0.71,0}}" />
-				<Property Name="UnifiedSize" Value="{{1.0,0},{0.25,0}}" />
-				<Property Name="TextColours" Value="tl:FFFFF5F0 tr:FFFFF5F0 bl:FFFFF510 br:FFFFF5F0" />
-				<Property Name="Text" Value="Triangle Count: " />
-			</Window>
-
-		</Window>
-
-		<Window Type="TaharezLook/StaticText" Name="OPDebugMsg">
-			<Property Name="FrameEnabled" Value="False" />
-			<Property Name="BackgroundEnabled" Value="False" />
-			<Property Name="Font" Value="BlueHighway-10" />
-			<Property Name="UnifiedPosition" Value="{{0.25,0},{0.93,0}}" />
-			<Property Name="UnifiedSize" Value="{{0.65,0},{0.07,0}}" />
-			<Property Name="TextColours" Value="tl:A0FFFFFF tr:A0FFFFFF bl:A0FFFFFF br:A0FFFFFF" />
-			<Property Name="InheritsAlpha" Value="False" />
-			<Property Name="VertFormatting" Value="VertCentred" />
-			<Property Name="HorzFormatting" Value="WordWrapCentred" />
-		</Window>
-
-		<Window Type="TaharezLook/StaticImage" Name="OgreLogo">
-			<Property Name="FrameEnabled" Value="False" />
-			<Property Name="BackgroundEnabled" Value="False" />
-			<Property Name="UnifiedPosition" Value="{{0.9,0},{0.95,0}}" />
-			<Property Name="UnifiedSize" Value="{{0.1,0},{0.05,0}}" />
-			<Property Name="Image" Value="set:OgreGuiImagery image:OgreLogo" />
-			<Property Name="Alpha" Value="0.75" />
-			<Property Name="InheritsAlpha" Value="False" />
-		</Window>
-
-		<Window Type="TaharezLook/StaticImage" Name="CeguiLogo">
-			<Property Name="FrameEnabled" Value="False" />
-			<Property Name="BackgroundEnabled" Value="False" />
-			<Property Name="UnifiedPosition" Value="{{0.9125,0},{0.9115,0}}" />
-			<Property Name="UnifiedSize" Value="{{0.075,0},{0.0385,0}}" />
-			<Property Name="Image" Value="set:OgreGuiImagery image:CeguiLogo" />
-			<Property Name="Alpha" Value="0.75" />
-			<Property Name="InheritsAlpha" Value="False" />
-		</Window>
-
-	</Window>
-
-	<Window Type="DefaultGUISheet" Name="CompositorDemo">
-
-		<Property Name="UnifiedMaxSize" Value="{{1,0},{2,0}}" />
-		<Property Name="UnifiedSize" Value="{{1,0},{2,0}}" />
-
-
-		<Window Type="TaharezLook/StaticText" Name="HelpTxt">
-			<Property Name="UnifiedPosition" Value="{{0.6,0},{0.8,0}}" />
-			<Property Name="UnifiedMinSize" Value="{{0.5,0},{0.3,0}}" />
-			<Property Name="UnifiedSize" Value="{{0.5,0},{0.3,0}}" />
-			<Property Name="Text" Value="Use the Combo boxes to select a shader and a model" />
-			<Property Name="InheritsAlpha" Value="False" />
-		</Window>
-		
-		<Window Type="TaharezLook/FrameWindow" Name="CompositorSelectorWin">
-			<Property Name="UnifiedPosition" Value="{{0,0},{0,0}}" />
-			<Property Name="UnifiedMinSize" Value="{{0.16,0},{0.22,0}}" />
-			<Property Name="UnifiedMaxSize" Value="{{0.16,0},{0.75,0}}" />
-			<Property Name="UnifiedSize" Value="{{0.16,0},{0.3,0}}" />
-			<Property Name="Text" Value="Compositors" />
-			<Property Name="Alpha" Value="0.75" />
-			<Property Name="CloseButtonEnabled" Value="False" />
-
-			<Window Type="TaharezLook/Button" Name="ExitDemoBtn">
-				<Property Name="VerticalAlignment" Value="Bottom" />
-				<Property Name="HorizontalAlignment" Value="Centre" />
-				<Property Name="UnifiedPosition" Value="{{0,0},{0,0}}" />
-				<Property Name="UnifiedMaxSize" Value="{{0.12,0},{0.03,0}}" />
-				<Property Name="UnifiedMinSize" Value="{{0.12,0},{0.03,0}}" />
-				<Property Name="UnifiedSize" Value="{{0.33,0},{0.03,0}}" />
-				<Property Name="Text" Value="Exit Demo" />
-				<Property Name="InheritsAlpha" Value="False" />
-			</Window>
-
-		</Window>
-		<Window Type="TaharezLook/FrameWindow" Name="DebugRTTs">
-			<Property Name="RollUpState" Value="True" />
-			<Property Name="UnifiedPosition" Value="{{0.70,0},{0,0}}" />
-			<Property Name="UnifiedMinSize" Value="{{0.3,0},{0.3,0}}" />
-			<Property Name="UnifiedMaxSize" Value="{{0.3,0},{0.3,0}}" />
-			<Property Name="UnifiedSize" Value="{{0.3,0},{0.3,0}}" />
-			<Property Name="Text" Value="Debug RTTs" />
-			<Property Name="Alpha" Value="0.75" />
-			<Property Name="CloseButtonEnabled" Value="False" />
-
-			<Window Type="TaharezLook/Listbox" Name="DebugRTTListbox">
-				<Property Name="UnifiedPosition" Value="{{0.02,0},{0.1,0}}" />
-				<Property Name="UnifiedMinSize" Value="{{0.1,0},{0.25,0}}" />
-				<Property Name="UnifiedMaxSize" Value="{{0.1,0},{0.25,0}}" />
-				<Property Name="UnifiedSize" Value="{{0.1,0},{0.25,0}}" />
-			</Window>
-			<Window Type="TaharezLook/StaticImage" Name="DebugRTTImage">
-				<Property Name="UnifiedPosition" Value="{{0.36,0},{0.1,0}}" />
-				<Property Name="UnifiedMinSize" Value="{{0.2,0},{0.25,0}}" />
-				<Property Name="UnifiedMaxSize" Value="{{0.2,0},{0.25,0}}" />
-				<Property Name="UnifiedSize" Value="{{0.2,0},{0.25,0}}" />
-			</Window>
-		</Window>
-	</Window>
-
-
-</Window>
-
-</GUILayout>
Index: code/branches/gamestate/data/gui/layouts/Console.wnd
===================================================================
--- code/branches/gamestate/data/gui/layouts/Console.wnd	(revision 6430)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-        <Window Type="TaharezLook/FrameWindow" Name="Console/Frame" >
-            <Property Name="Text" Value="Console" />
-            <Property Name="TitlebarFont" Value="DejaVuSans-10" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="TitlebarEnabled" Value="True" />
-            <Property Name="UnifiedAreaRect" Value="{{0.208832,0},{0.650387,0},{0.80736,0},{0.998062,0}}" />
-            <Window Type="TaharezLook/MultiLineEditbox" Name="Console/Frame/ConsoleText" >
-                <Property Name="Text" Value=""/>
-                <Property Name="ReadOnly" Value="True" />
-                <Property Name="MaxTextLength" Value="1073741823" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.019238,0},{0.156633,0},{0.973721,0},{0.839186,0}}" />
-            </Window>
-            <Window Type="TaharezLook/Editbox" Name="Console/Frame/Input" >
-                <Property Name="MaxTextLength" Value="1073741823" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.019119,0},{0.842141,0},{0.972016,0},{0.980658,0}}" />
-            </Window>
-        </Window>
-</GUILayout>
Index: code/branches/gamestate/data/gui/layouts/CrowdDemo.layout
===================================================================
--- code/branches/gamestate/data/gui/layouts/CrowdDemo.layout	(revision 6430)
+++ 	(revision )
@@ -1,201 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <Window Type="DefaultWindow" Name="root" >
-        <Property Name="InheritsAlpha" Value="False" />
-        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-        <Window Type="DefaultWindow" Name="debug_overlay" >
-            <Property Name="Disabled" Value="True" />
-            <Property Name="AlwaysOnTop" Value="True" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-            <Window Type="TaharezLook/StaticText" Name="Panel 1" >
-                <Property Name="Alpha" Value="0.9" />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0,0},{0.83,0},{0.23,0},{1,0}}" />
-                <Window Type="TaharezLook/StaticText" Name="OPCurrentFPS" >
-                    <Property Name="Font" Value="BlueHighway-10" />
-                    <Property Name="Text" Value="Current FPS: " />
-                    <Property Name="TextColours" Value="tl:FF4FF06F tr:FF4FF06F bl:FF4FF06F br:FF4FF06F" />
-                    <Property Name="FrameEnabled" Value="False" />
-                    <Property Name="HorzFormatting" Value="HorzCentred" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.075,0},{0.12,0},{0.925,0},{0.37,0}}" />
-                    <Property Name="BackgroundEnabled" Value="False" />
-                </Window>
-                <Window Type="TaharezLook/StaticImage" Name="OPBar1" >
-                    <Property Name="FrameEnabled" Value="False" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.27,0},{0.8,0},{0.295,0}}" />
-                    <Property Name="BackgroundEnabled" Value="False" />
-                </Window>
-                <Window Type="TaharezLook/StaticText" Name="OPAverageFPS" >
-                    <Property Name="Font" Value="BlueHighway-10" />
-                    <Property Name="Text" Value="Average FPS: " />
-                    <Property Name="TextColours" Value="tl:FFFFF5F0 tr:FFFFF5F0 bl:FFFFF510 br:FFFFF5F0" />
-                    <Property Name="FrameEnabled" Value="False" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.075,0},{0.32,0},{1.075,0},{0.57,0}}" />
-                    <Property Name="BackgroundEnabled" Value="False" />
-                </Window>
-                <Window Type="TaharezLook/StaticText" Name="OPWorstFPS" >
-                    <Property Name="Font" Value="BlueHighway-10" />
-                    <Property Name="Text" Value="Worst FPS: " />
-                    <Property Name="TextColours" Value="tl:FFFFF5F0 tr:FFFFF5F0 bl:FFFFF510 br:FFFFF5F0" />
-                    <Property Name="FrameEnabled" Value="False" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.075,0},{0.45,0},{1.075,0},{0.7,0}}" />
-                    <Property Name="BackgroundEnabled" Value="False" />
-                </Window>
-                <Window Type="TaharezLook/StaticText" Name="OPBestFPS" >
-                    <Property Name="Font" Value="BlueHighway-10" />
-                    <Property Name="Text" Value="Best FPS: " />
-                    <Property Name="TextColours" Value="tl:FFFFF5F0 tr:FFFFF5F0 bl:FFFFF510 br:FFFFF5F0" />
-                    <Property Name="FrameEnabled" Value="False" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.075,0},{0.58,0},{1.075,0},{0.83,0}}" />
-                    <Property Name="BackgroundEnabled" Value="False" />
-                </Window>
-                <Window Type="TaharezLook/StaticText" Name="OPTriCount" >
-                    <Property Name="Font" Value="BlueHighway-10" />
-                    <Property Name="Text" Value="Triangle Count: " />
-                    <Property Name="TextColours" Value="tl:FFFFF5F0 tr:FFFFF5F0 bl:FFFFF510 br:FFFFF5F0" />
-                    <Property Name="FrameEnabled" Value="False" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.075,0},{0.71,0},{1.075,0},{0.96,0}}" />
-                    <Property Name="BackgroundEnabled" Value="False" />
-                </Window>
-            </Window>
-            <Window Type="TaharezLook/StaticText" Name="OPDebugMsg" >
-                <Property Name="Font" Value="BlueHighway-10" />
-                <Property Name="TextColours" Value="tl:A0FFFFFF tr:A0FFFFFF bl:A0FFFFFF br:A0FFFFFF" />
-                <Property Name="FrameEnabled" Value="False" />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="HorzFormatting" Value="WordWrapCentred" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.93,0},{0.9,0},{1,0}}" />
-                <Property Name="BackgroundEnabled" Value="False" />
-            </Window>
-            <Window Type="TaharezLook/StaticImage" Name="OgreLogo" >
-                <Property Name="Alpha" Value="0.75" />
-                <Property Name="FrameEnabled" Value="False" />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.9,0},{0.95,0},{1,0},{1,0}}" />
-                <Property Name="BackgroundEnabled" Value="False" />
-            </Window>
-            <Window Type="TaharezLook/StaticImage" Name="CeguiLogo" >
-                <Property Name="Alpha" Value="0.75" />
-                <Property Name="FrameEnabled" Value="False" />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.9125,0},{0.9115,0},{0.9875,0},{0.95,0}}" />
-                <Property Name="BackgroundEnabled" Value="False" />
-            </Window>
-        </Window>
-        <Window Type="DefaultWindow" Name="InstancingDemo" >
-            <Property Name="Font" Value="BlueHighway-8" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-            <Window Type="TaharezLook/FrameWindow" Name="CompositorSelectorWin" >
-                <Property Name="Text" Value="Techniques" />
-                <Property Name="Alpha" Value="0.75" />
-                <Property Name="TitlebarFont" Value="BlueHighway-12" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="TitlebarEnabled" Value="True" />
-                <Property Name="UnifiedAreaRect" Value="{{-0.00292969,0},{0.00381679,1.25081e-037},{0.331094,0},{0.464121,1.25081e-037}}" />
-                <Property Name="CloseButtonEnabled" Value="False" />
-                <Window Type="TaharezLook/RadioButton" Name="tInstancing" >
-                    <Property Name="Font" Value="BlueHighway-12" />
-                    <Property Name="Text" Value="Instancing" />
-                    <Property Name="Selected" Value="True" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.055847,0},{0.10764,0},{0.973986,0},{0.187074,0}}" />
-                </Window>
-                <Window Type="TaharezLook/RadioButton" Name="tIndependantEntities" >
-                    <Property Name="ID" Value="1" />
-                    <Property Name="Font" Value="BlueHighway-12" />
-					<Property Name="Text" Value="Independent Entities" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.055847,0},{0.172136,0},{0.962291,0},{0.265333,0}}" />
-                </Window>
-                <Window Type="TaharezLook/Checkbox" Name="Shadows" >
-                    <Property Name="Font" Value="BlueHighway-12" />
-                    <Property Name="Text" Value="Shadows on/off" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.475788,0},{1.05,0},{0.579744,0}}" />
-                </Window>
-                <Window Type="TaharezLook/StaticText" Name="Object Count Text" >
-                    <Property Name="Font" Value="BlueHighway-12" />
-                    <Property Name="Text" Value="Object Count:" />
-                    <Property Name="FrameEnabled" Value="False" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.0880073,0},{0.263737,0},{0.382815,0},{0.369793,0}}" />
-                    <Property Name="BackgroundEnabled" Value="False" />
-                </Window>
-                <Window Type="TaharezLook/StaticText" Name="Object Count Number" >
-                    <Property Name="Font" Value="BlueHighway-12" />
-                    <Property Name="Text" Value="160" />
-                    <Property Name="FrameEnabled" Value="False" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.388902,0},{0.277557,0},{0.631087,0},{0.364265,0}}" />
-                    <Property Name="BackgroundEnabled" Value="False" />
-                </Window>
-                <Window Type="TaharezLook/HorizontalScrollbar" Name="Object Count" >
-                    <Property Name="PageSize" Value="0" />
-                    <Property Name="StepSize" Value="1" />
-                    <Property Name="OverlapSize" Value="0" />
-                    <Property Name="DocumentSize" Value="1" />
-                    <Property Name="InheritsAlpha" Value="False" />
-                    <Property Name="ScrollPosition" Value="0" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.39,0},{0.95,0},{0.441213,0}}" />
-                </Window>
-                <Window Type="TaharezLook/StaticText" Name="Time Burner Text" >
-                    <Property Name="Font" Value="BlueHighway-12" />
-                    <Property Name="Text" Value="CPU occupation:" />
-                    <Property Name="FrameEnabled" Value="False" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.59802,0},{0.427339,0},{0.680451,0}}" />
-                    <Property Name="BackgroundEnabled" Value="False" />
-                </Window>
-                <Window Type="TaharezLook/StaticText" Name="Time Burner Value" >
-                    <Property Name="Font" Value="BlueHighway-12" />
-                    <Property Name="Text" Value="0 ms" />
-                    <Property Name="FrameEnabled" Value="False" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.415811,0},{0.599679,0},{0.640395,0},{0.686178,0}}" />
-                    <Property Name="BackgroundEnabled" Value="False" />
-                </Window>
-                <Window Type="TaharezLook/HorizontalScrollbar" Name="Time Burner" >
-                    <Property Name="Font" Value="BlueHighway-12" />
-                    <Property Name="PageSize" Value="0" />
-                    <Property Name="StepSize" Value="1" />
-                    <Property Name="OverlapSize" Value="0" />
-                    <Property Name="DocumentSize" Value="1" />
-                    <Property Name="InheritsAlpha" Value="False" />
-                    <Property Name="ScrollPosition" Value="0" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.687236,0},{0.95,0},{0.74726,0}}" />
-                </Window>
-                <Window Type="TaharezLook/Checkbox" Name="PostEffect" >
-                    <Property Name="Font" Value="BlueHighway-12" />
-                    <Property Name="Text" Value="Post Effect On/Off" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.0470764,0},{0.765568,0},{0.892124,0},{0.82884,0}}" />
-                </Window>
-                <Window Type="TaharezLook/Button" Name="ExitDemoBtn" >
-                    <Property Name="Font" Value="BlueHighway-12" />
-                    <Property Name="Text" Value="Exit Demo" />
-                    <Property Name="InheritsAlpha" Value="False" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{-0.0526254,0},{-0.063219,0},{0.277375,0},{-4.06504e-005,0}}" />
-                    <Property Name="VerticalAlignment" Value="Bottom" />
-                    <Property Name="HorizontalAlignment" Value="Centre" />
-                </Window>
-            </Window>
-        </Window>
-    </Window>
-</GUILayout>
Index: code/branches/gamestate/data/gui/layouts/Demo7Windows.layout
===================================================================
--- code/branches/gamestate/data/gui/layouts/Demo7Windows.layout	(revision 6430)
+++ 	(revision )
@@ -1,152 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GUILayout>
-    <Window Type="DefaultWindow" Name="root">
-        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-        <Window Type="TaharezLook/FrameWindow" Name="Demo7/Window1" >
-            <Property Name="Text" Value="Demo 7 - Window 1" />
-            <Property Name="UnifiedMaxSize" Value="{{0.8,0},{0.8,0}}" />
-            <Property Name="UnifiedMinSize" Value="{{0.2,0},{0.2,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.2,0},{0.7,0},{0.7,0}}" />
-            <Property Name="CloseButtonEnabled" Value="False" />
-            <Window Type="TaharezLook/Button" Name="Demo7/Window1/Quit" >
-                <Property Name="Text" Value="Exit Demo" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.02,0},{0.1,0},{0.27,0},{0.2,0}}" />
-            </Window>
-            <Window Type="TaharezLook/RadioButton" Name="Demo7/Window1/Radio1" >
-                <Property Name="Text" Value="Option 1" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.02,0},{0.23,0},{0.27,0},{0.305,0}}" />
-            </Window>
-            <Window Type="TaharezLook/RadioButton" Name="Demo7/Window1/Radio2" >
-                <Property Name="ID" Value="1" />
-                <Property Name="Text" Value="Option 2" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.02,0},{0.306,0},{0.27,0},{0.381,0}}" />
-            </Window>
-            <Window Type="TaharezLook/RadioButton" Name="Demo7/Window1/Radio3" >
-                <Property Name="ID" Value="2" />
-                <Property Name="Text" Value="Option 3" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.02,0},{0.382,0},{0.27,0},{0.457,0}}" />
-            </Window>
-            <Window Type="TaharezLook/Checkbox" Name="Demo7/Window1/Checkbox" >
-                <Property Name="Text" Value="Enable some option" />
-                <Property Name="Selected" Value="True" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.02,0},{0.48,0},{0.47,0},{0.555,0}}" />
-            </Window>
-            <Window Type="TaharezLook/StaticText" Name="Demo7/Window1/Text1" >
-                <Property Name="Text" Value="This is a re-creation of the original 'Demo7' preview application, it shows many of the CEGUI widgets." />
-                <Property Name="FrameEnabled" Value="False" />
-                <Property Name="HorzFormatting" Value="WordWrapCentred" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.5,0},{0.1,0},{0.95,0},{0.6,0}}" />
-                <Property Name="BackgroundEnabled" Value="False" />
-            </Window>
-            <Window Type="TaharezLook/Editbox" Name="Demo7/Window1/Editbox" >
-                <Property Name="Text" Value="Single-line editbox" />
-                <Property Name="MaxTextLength" Value="1073741823" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.6,0},{0.8,0},{0.7,0}}" />
-            </Window>
-            <Window Type="TaharezLook/LargeVerticalScrollbar" Name="Demo7/Window1/Scrollbar1" >
-                <Property Name="PageSize" Value="0" />
-                <Property Name="StepSize" Value="1" />
-                <Property Name="OverlapSize" Value="0" />
-                <Property Name="DocumentSize" Value="1" />
-                <Property Name="ScrollPosition" Value="0" />
-                <Property Name="UnifiedMaxSize" Value="{{0.03,0},{1,0}}" />
-                <Property Name="UnifiedMinSize" Value="{{0.01,0},{0.1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.06,0},{0.6,0},{0.12,0},{0.98,0}}" />
-            </Window>
-            <Window Type="TaharezLook/Slider" Name="Demo7/Window1/Slider1" >
-                <Property Name="CurrentValue" Value="1" />
-                <Property Name="MaximumValue" Value="1" />
-                <Property Name="ClickStepSize" Value="0.01" />
-                <Property Name="UnifiedMaxSize" Value="{{0.03,0},{1,0}}" />
-                <Property Name="UnifiedMinSize" Value="{{0.01,0},{0.1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.9,0},{0.625,0},{0.93,0},{0.905,0}}" />
-            </Window>
-        </Window>
-        <Window Type="TaharezLook/FrameWindow" Name="Demo7/Window2" >
-            <Property Name="Text" Value="Demo 7 - Window 2" />
-            <Property Name="UnifiedMaxSize" Value="{{0.8,0},{0.8,0}}" />
-            <Property Name="UnifiedMinSize" Value="{{0.2,0},{0.2,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.1,0},{0.9,0},{0.7,0}}" />
-            <Property Name="CloseButtonEnabled" Value="False" />
-            <Window Type="TaharezLook/ProgressBar" Name="Demo7/Window2/Progbar1" >
-                <Property Name="StepSize" Value="0.01" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="CurrentProgress" Value="0.33" />
-                <Property Name="UnifiedAreaRect" Value="{{0.04,0},{0.1,0},{0.98,0},{0.15,0}}" />
-            </Window>
-            <Window Type="TaharezLook/AlternateProgressBar" Name="Demo7/Window2/Progbar2" >
-                <Property Name="StepSize" Value="0.01" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="CurrentProgress" Value="0.7" />
-                <Property Name="UnifiedAreaRect" Value="{{0.04,0},{0.16,0},{0.98,0},{0.21,0}}" />
-            </Window>
-            <Window Type="TaharezLook/ItemListbox" Name="Demo7/Window2/Listbox" >
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.04,0},{0.25,0},{0.46,0},{0.55,0}}" />
-                <Window Type="TaharezLook/ListboxItem" >
-                    <Property Name="Text" Value="Listbox Item 1" />
-                </Window>
-                <Window Type="TaharezLook/ListboxItem" >
-                    <Property Name="Text" Value="Listbox Item 2" />
-                </Window>
-                <Window Type="TaharezLook/ListboxItem" >
-                    <Property Name="Text" Value="Listbox Item 3" />
-                </Window>
-                <Window Type="TaharezLook/ListboxItem" >
-                    <Property Name="Text" Value="Listbox Item 4" />
-                </Window>
-                <Window Type="TaharezLook/ListboxItem" >
-                    <Property Name="Text" Value="Listbox Item 5" />
-                </Window>
-                <Window Type="TaharezLook/ListboxItem" >
-                    <Property Name="Text" Value="Listbox Item 6" />
-                </Window>
-                <Window Type="TaharezLook/ListboxItem" >
-                    <Property Name="Text" Value="Listbox Item 7" />
-                </Window>
-            </Window>
-            <Window Type="TaharezLook/Combobox" Name="Demo7/Window2/Combobox" >
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.5,0},{0.25,0},{0.92,0},{0.7,0}}" />
-                <Property Name="MaxEditTextLength" Value="1073741823" />
-            </Window>
-            <Window Type="TaharezLook/MultiColumnList" Name="Demo7/Window2/MultiColumnList" >
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.6,0},{0.95,0},{0.98,0}}" />
-                <Property Name="ColumnHeader" Value="text:Server Name width:{0.33,0} id:0" />
-                <Property Name="ColumnHeader" Value="text:Address width:{0.5,0} id:1" />
-                <Property Name="ColumnHeader" Value="text:Ping width:{0.2,0} id:2" />
-            </Window>
-            <Window Type="TaharezLook/StaticImage" Name="Demo7/Window2/Image1" >
-                <Property Name="Image" Value="set:BackgroundImage image:full_image" />
-                <Property Name="FrameEnabled" Value="False" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.56,0},{0.35,0},{0.86,0},{0.55,0}}" />
-                <Property Name="BackgroundEnabled" Value="False" />
-            </Window>
-        </Window>
-        <Window Type="TaharezLook/FrameWindow" Name="Demo7/Window3" >
-            <Property Name="Text" Value="Demo 7 - Window 3" />
-            <Property Name="UnifiedMaxSize" Value="{{0.8,0},{0.8,0}}" />
-            <Property Name="UnifiedMinSize" Value="{{0.2,0},{0.2,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.4,0},{0.75,0},{0.9,0}}" />
-            <Property Name="CloseButtonEnabled" Value="False" />
-            <Window Type="TaharezLook/MultiLineEditbox" Name="Demo7/Window3/MLEditbox" >
-                <Property Name="Text">This text is a multiline text:
-Line 1
-Line 2 
-Line 3</Property>
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.02,0},{0.1,0},{0.98,0},{0.95,0}}" />
-            </Window>
-        </Window>
-    </Window>
-</GUILayout>
Index: code/branches/gamestate/data/gui/layouts/Demo8.layout
===================================================================
--- code/branches/gamestate/data/gui/layouts/Demo8.layout	(revision 6430)
+++ 	(revision )
@@ -1,132 +1,0 @@
-<?xml version="1.0" ?>
-<GUILayout>
-<Window Type="DefaultGUISheet" Name="root">
-    <Window Type="DefaultGUISheet" Name="Demo8">
-        <Property Name="UnifiedMaxSize" Value="{{1,0},{2,0}}" />
-        <Property Name="UnifiedSize" Value="{{1,0},{2,0}}" />
-
-        <Window Type="TaharezLook/LargeVerticalScrollbar" Name="Demo8/ViewScroll">
-            <Property Name="UnifiedPosition" Value="{{0,0},{0,0}}" />
-            <Property Name="UnifiedSize" Value="{{0.03,0},{0.75,0}}" />
-            <Property Name="DocumentSize" Value="2" />
-            <Property Name="PageSize" Value="1" />
-            <Property Name="StepSize" Value="0.01" />
-            <Property Name="OverlapSize" Value="0.5" />
-            <Property Name="Tooltip" Value="This scrollbar will scroll the window layout." />
-        </Window>
-
-        <Window Type="TaharezLook/FrameWindow" Name="Demo8/Window1">
-            <Property Name="UnifiedPosition" Value="{{0.05,0},{0.1,0}}" />
-            <Property Name="UnifiedMaxSize" Value="{{0.5,0},{1,0}}" />
-            <Property Name="UnifiedMinSize" Value="{{0,128},{0,128}}" />
-            <Property Name="UnifiedSize" Value="{{0.4,0},{0.3,0}}" />
-            <Property Name="Text" Value="Demo 8 - Listbox Demo" />
-            <Property Name="Tooltip" Value="Window shows a simple Listbox demo." />
-
-            <Window Type="TaharezLook/Listbox" Name="Demo8/Window1/Listbox">
-                <Property Name="UnifiedPosition" Value="{{0.05,0},{0.1,0}}" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedSize" Value="{{0.9,0},{0.33,0}}" />
-                <Property Name="Tooltip" Value="Listbox containing the items you have added." />
-            </Window>
-
-            <Window Type="TaharezLook/StaticText" Name="Demo8/Window1/Controls">
-                <Property Name="UnifiedPosition" Value="{{0.05,0},{0.45,0}}" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedSize" Value="{{0.9,0},{0.5,0}}" />
-
-                <Window Type="TaharezLook/HorizontalScrollbar" Name="Demo8/Window1/Controls/Red">
-                    <Property Name="UnifiedPosition" Value="{{0.05,0},{0.05,0}}" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedSize" Value="{{0.9,0},{0.06,0}}" />
-                    <Property Name="DocumentSize" Value="1" />
-                    <Property Name="PageSize" Value="0.0625" />
-                    <Property Name="StepSize" Value="0.00392" />
-                    <Property Name="OverlapSize" Value="0.00392" />
-                    <Property Name="Tooltip" Value="Slider to adjust the red colour component." />
-                </Window>
-
-                <Window Type="TaharezLook/HorizontalScrollbar" Name="Demo8/Window1/Controls/Green">
-                    <Property Name="UnifiedPosition" Value="{{0.05,0},{0.12,0}}" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedSize" Value="{{0.9,0},{0.06,0}}" />
-                    <Property Name="DocumentSize" Value="1" />
-                    <Property Name="PageSize" Value="0.0625" />
-                    <Property Name="StepSize" Value="0.00392" />
-                    <Property Name="OverlapSize" Value="0.00392" />
-                    <Property Name="Tooltip" Value="Slider to adjust the green colour component." />
-                </Window>
-
-                <Window Type="TaharezLook/HorizontalScrollbar" Name="Demo8/Window1/Controls/Blue">
-                    <Property Name="UnifiedPosition" Value="{{0.05,0},{0.19,0}}" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedSize" Value="{{0.9,0},{0.06,0}}" />
-                    <Property Name="DocumentSize" Value="1" />
-                    <Property Name="PageSize" Value="0.0625" />
-                    <Property Name="StepSize" Value="0.00392" />
-                    <Property Name="OverlapSize" Value="0.00392" />
-                    <Property Name="Tooltip" Value="Slider to adjust the blue colour component." />
-                </Window>
-
-                <Window Type="TaharezLook/StaticImage" Name="Demo8/Window1/Controls/ColourSample">
-                    <Property Name="UnifiedPosition" Value="{{0.05,0},{0.26,0}}" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedSize" Value="{{0.9,0},{0.1,0}}" />
-                    <Property Name="Image" Value="set:TaharezLook image:MultiListSelectionBrush" />
-                    <Property Name="ImageColours" Value="tl:0 tr:0 bl:0 br:0" />
-                    <Property Name="Tooltip" Value="Shows a sample of the selected colour." />
-                </Window>
-
-                <Window Type="TaharezLook/Editbox" Name="Demo8/Window1/Controls/Editbox">
-                    <Property Name="UnifiedPosition" Value="{{0.05,0},{0.38,0}}" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedSize" Value="{{0.6,0},{0.15,0}}" />
-                    <Property Name="Tooltip" Value="Enter the text for a new Listbox item here." />
-                </Window>
-
-                <Window Type="TaharezLook/Button" Name="Demo8/Window1/Controls/Add">
-                    <Property Name="UnifiedPosition" Value="{{0.68,0},{0.38,0}}" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedSize" Value="{{0.3,0},{0.15,0}}" />
-                    <Property Name="Text" Value="Add" />
-                    <Property Name="Tooltip" Value="Adds a new item to the Listbox." />
-                </Window>
-
-                <Window Type="TaharezLook/StaticText" Name="Demo8/Window1/Controls/ins1">
-                    <Property Name="UnifiedPosition" Value="{{0.05,0},{0.55,0}}" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedSize" Value="{{0.9,0},{0.4,0}}" />
-                    <Property Name="HorzFormatting" Value="WordWrapCentred" />
-                    <Property Name="Text" Value="Use this panel to add items.  The scrollbars change the selection colour." />
-                    <Property Name="Tooltip" Value="Information panel." />
-                </Window>
-            </Window>
-        </Window>
-
-        <Window Type="TaharezLook/FrameWindow" Name="Demo8/Window2">
-            <Property Name="UnifiedPosition" Value="{{0.55,0},{0.1,0}}" />
-            <Property Name="UnifiedMaxSize" Value="{{0.5,0},{1,0}}" />
-            <Property Name="UnifiedMinSize" Value="{{0,128},{0,128}}" />
-            <Property Name="UnifiedSize" Value="{{0.4,0},{0.3,0}}" />
-            <Property Name="Text" Value="Demo 8 - Information Window" />
-            <Property Name="Tooltip" Value="Contains some StaticText information panels" />
-
-            <Window Type="TaharezLook/StaticText" Name="Demo8/Window2/Info">
-                <Property Name="UnifiedPosition" Value="{{0.05,0},{0.1,0}}" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedSize" Value="{{0.9,0},{0.3,0}}" />
-                <Property Name="HorzFormatting" Value="WordWrapCentred" />
-                <Property Name="Text" Value="The panel below gives some information about the item under the mouse." />
-            </Window>
-    
-            <Window Type="TaharezLook/StaticText" Name="Demo8/Window2/Tips">
-                <Property Name="UnifiedPosition" Value="{{0.05,0},{0.5,0}}" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedSize" Value="{{0.9,0},{0.4,0}}" />
-                <Property Name="HorzFormatting" Value="WordWrapCentred" />
-                <Property Name="Text" Value="We removed this, and now use proper Tooltips instead!" />
-            </Window>
-        </Window>
-    </Window>
-</Window>
-</GUILayout>
Index: code/branches/gamestate/data/gui/layouts/DragDropDemo.layout
===================================================================
--- code/branches/gamestate/data/gui/layouts/DragDropDemo.layout	(revision 6430)
+++ 	(revision )
@@ -1,100 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <Window Type="DefaultWindow" Name="Root" >
-
-        <Window Type="WindowsLook/FrameWindow" Name="Root/MainWindow" >
-            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.25,0},{0.75,0},{0.75,0}" />
-            <Property Name="Text" Value="Drag and Drop Demo" />
-            <Property Name="RollUpEnabled" Value="False" />
-            <Property Name="SizingEnabled" Value="False" />
-
-            <Window Type="WindowsLook/Static" Name="Root/MainWindow/Slot1" >
-                <Property Name="UnifiedPosition" Value="{{0.05,0},{0.13,0}}" />
-                <Property Name="UnifiedSize" Value="{{0.2,0},{0.2,0}}" />
-
-                <Window Type="DragContainer" Name="DragContainer1" >
-                    <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.05,0},{0.95,0},{0.95,0}" />
-
-                    <Window Type="WindowsLook/StaticImage" Name="DragContainer1/Image" >
-                        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}" />
-                        <Property Name="Image" Value="set:DriveIcons image:Lime" />
-                        <Property Name="MousePassThroughEnabled" Value="True" />
-                    </Window>
-
-                </Window>
-
-            </Window>
-
-            <Window Type="WindowsLook/Static" Name="Root/MainWindow/Slot2" >
-                <Property Name="UnifiedPosition" Value="{{0.28,0},{0.13,0}}" />
-                <Property Name="UnifiedSize" Value="{{0.2,0},{0.2,0}}" />
-            </Window>
-
-            <Window Type="WindowsLook/Static" Name="Root/MainWindow/Slot3" >
-                <Property Name="UnifiedPosition" Value="{{0.51,0},{0.13,0}}" />
-                <Property Name="UnifiedSize" Value="{{0.2,0},{0.2,0}}" />
-            </Window>
-
-            <Window Type="WindowsLook/Static" Name="Root/MainWindow/Slot4" >
-                <Property Name="UnifiedPosition" Value="{{0.74,0},{0.13,0}}" />
-                <Property Name="UnifiedSize" Value="{{0.2,0},{0.2,0}}" />
-            </Window>
-
-            <Window Type="WindowsLook/Static" Name="Root/MainWindow/Slot5" >
-                <Property Name="UnifiedPosition" Value="{{0.05,0},{0.36,0}}" />
-                <Property Name="UnifiedSize" Value="{{0.2,0},{0.2,0}}" />
-            </Window>
-
-            <Window Type="WindowsLook/Static" Name="Root/MainWindow/Slot6" >
-                <Property Name="UnifiedPosition" Value="{{0.28,0},{0.36,0}}" />
-                <Property Name="UnifiedSize" Value="{{0.2,0},{0.2,0}}" />
-
-                <Window Type="DragContainer" Name="DragContainer2" >
-                    <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.05,0},{0.95,0},{0.95,0}" />
-
-                    <Window Type="WindowsLook/StaticImage" Name="DragContainer2/Image" >
-                        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}" />
-                        <Property Name="Image" Value="set:DriveIcons image:GlobalDrive" />
-                        <Property Name="MousePassThroughEnabled" Value="True" />
-                    </Window>
-
-                </Window>
-
-            </Window>
-
-            <Window Type="WindowsLook/Static" Name="Root/MainWindow/Slot7" >
-                <Property Name="UnifiedPosition" Value="{{0.51,0},{0.36,0}}" />
-                <Property Name="UnifiedSize" Value="{{0.2,0},{0.2,0}}" />
-            </Window>
-
-            <Window Type="WindowsLook/Static" Name="Root/MainWindow/Slot8" >
-                <Property Name="UnifiedPosition" Value="{{0.74,0},{0.36,0}}" />
-                <Property Name="UnifiedSize" Value="{{0.2,0},{0.2,0}}" />
-            </Window>
-
-            <Window Type="WindowsLook/Static" Name="Root/MainWindow/Slot9" >
-                <Property Name="UnifiedPosition" Value="{{0.05,0},{0.59,0}}" />
-                <Property Name="UnifiedSize" Value="{{0.2,0},{0.2,0}}" />
-            </Window>
-
-            <Window Type="WindowsLook/Static" Name="Root/MainWindow/Slot10" >
-                <Property Name="UnifiedPosition" Value="{{0.28,0},{0.59,0}}" />
-                <Property Name="UnifiedSize" Value="{{0.2,0},{0.2,0}}" />
-            </Window>
-
-            <Window Type="WindowsLook/Static" Name="Root/MainWindow/Slot11" >
-                <Property Name="UnifiedPosition" Value="{{0.51,0},{0.59,0}}" />
-                <Property Name="UnifiedSize" Value="{{0.2,0},{0.2,0}}" />
-            </Window>
-
-            <Window Type="WindowsLook/Static" Name="Root/MainWindow/Slot12" >
-                <Property Name="UnifiedPosition" Value="{{0.74,0},{0.59,0}}" />
-                <Property Name="UnifiedSize" Value="{{0.2,0},{0.2,0}}" />
-            </Window>
-
-        </Window>
-
-    </Window>
-</GUILayout>
-
Index: code/branches/gamestate/data/gui/layouts/FontDemo.layout
===================================================================
--- code/branches/gamestate/data/gui/layouts/FontDemo.layout	(revision 6430)
+++ 	(revision )
@@ -1,58 +1,0 @@
-<?xml version="1.0" ?>
-<GUILayout>
-<Window Type="DefaultGUISheet" Name="root">
-    <Window Type="TaharezLook/FrameWindow" Name="FontDemo/Window">
-        <Property Name="UnifiedPosition" Value="{{0.1,0},{0.1,0}}" />
-        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-        <Property Name="UnifiedMinSize" Value="{{0,128},{0,128}}" />
-        <Property Name="UnifiedSize" Value="{{0.8,0},{0.8,0}}" />
-        <Property Name="Text" Value="Font Demo" />
-        <Property Name="Tooltip" Value="This is a simple demonstration of what the font subsystem can do." />
-
-        <Window Type="TaharezLook/MultiLineEditbox" Name="FontDemo/FontSample">
-            <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.1,0},{0.75,0},{0.5,0}}" />
-            <Property Name="Tooltip" Value="This window shows a sample of the selected font" />
-			<Property Name="WordWrap" Value="True" />
-        </Window>
-
-        <Window Type="TaharezLook/Listbox" Name="FontDemo/LangList">
-            <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.1,0},{0.95,0},{0.5,0}}" />
-            <Property Name="Tooltip" Value="Contains a list of languages to select sample text from" />
-        </Window>
-
-        <Window Type="TaharezLook/Listbox" Name="FontDemo/FontList">
-            <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.55,0},{0.45,0},{0.95,0}}" />
-            <Property Name="Tooltip" Value="This listbox shows a list of available fonts to experiment with" />
-        </Window>
-
-        <Window Type="TaharezLook/StaticText" Name="FontDemo/FontDesc" >
-            <Property Name="FrameEnabled" Value="False" />
-            <Property Name="HorzFormatting" Value="WordWrapCentred" />
-            <Property Name="VertFormatting" Value="CentreAligned" />
-            <Property Name="UnifiedAreaRect" Value="{{0.5,0},{0.55,0},{0.95,0},{0.65,0}}" />
-            <Property Name="BackgroundEnabled" Value="False" />
-        </Window>
-
-        <Window Type="TaharezLook/Checkbox" Name="FontDemo/AutoScaled" >
-            <Property Name="Text" Value="Auto scale font to current resolution" />
-            <Property Name="UnifiedAreaRect" Value="{{0.5,0},{0.7,0},{0.95,0},{0.75,0}}" />
-            <Property Name="Tooltip" Value="Choose between autoscaled/non-autoscaled font versions" />
-        </Window>
-
-        <Window Type="TaharezLook/Checkbox" Name="FontDemo/Antialiased" >
-            <Property Name="Text" Value="Antialias the font for smoother look" />
-            <Property Name="UnifiedAreaRect" Value="{{0.5,0},{0.8,0},{0.95,0},{0.85,0}}" />
-            <Property Name="Tooltip" Value="Choose between antialiased/non-antialiased font versions" />
-        </Window>
-
-        <Window Type="TaharezLook/HorizontalScrollbar" Name="FontDemo/PointSize" >
-            <Property Name="DocumentSize" Value="72" />
-            <Property Name="PageSize" Value="1" />
-            <Property Name="StepSize" Value="1" />
-            <Property Name="OverlapSize" Value="0" />
-            <Property Name="UnifiedAreaRect" Value="{{0.5,0},{0.9,0},{0.95,0},{0.9,12}}" />
-            <Property Name="Tooltip" Value="Changes font point size" />
-        </Window>
-    </Window>
-</Window>
-</GUILayout>
Index: code/branches/gamestate/data/gui/layouts/InstancingDemo.layout
===================================================================
--- code/branches/gamestate/data/gui/layouts/InstancingDemo.layout	(revision 6430)
+++ 	(revision )
@@ -1,214 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <Window Type="DefaultWindow" Name="root" >
-        <Property Name="InheritsAlpha" Value="False" />
-        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-        <Window Type="DefaultWindow" Name="debug_overlay" >
-            <Property Name="Disabled" Value="True" />
-            <Property Name="AlwaysOnTop" Value="True" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-            <Window Type="TaharezLook/StaticText" Name="Panel 1" >
-                <Property Name="Alpha" Value="0.9" />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0,0},{0.83,0},{0.23,0},{1,0}}" />
-                <Window Type="TaharezLook/StaticText" Name="OPCurrentFPS" >
-                    <Property Name="Font" Value="BlueHighway-10" />
-                    <Property Name="Text" Value="Current FPS: " />
-                    <Property Name="TextColours" Value="tl:FF4FF06F tr:FF4FF06F bl:FF4FF06F br:FF4FF06F" />
-                    <Property Name="FrameEnabled" Value="False" />
-                    <Property Name="HorzFormatting" Value="HorzCentred" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.075,0},{0.12,0},{0.925,0},{0.37,0}}" />
-                    <Property Name="BackgroundEnabled" Value="False" />
-                </Window>
-                <Window Type="TaharezLook/StaticImage" Name="OPBar1" >
-                    <Property Name="FrameEnabled" Value="False" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.27,0},{0.8,0},{0.295,0}}" />
-                    <Property Name="BackgroundEnabled" Value="False" />
-                </Window>
-                <Window Type="TaharezLook/StaticText" Name="OPAverageFPS" >
-                    <Property Name="Font" Value="BlueHighway-10" />
-                    <Property Name="Text" Value="Average FPS: " />
-                    <Property Name="TextColours" Value="tl:FFFFF5F0 tr:FFFFF5F0 bl:FFFFF510 br:FFFFF5F0" />
-                    <Property Name="FrameEnabled" Value="False" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.075,0},{0.32,0},{1.075,0},{0.57,0}}" />
-                    <Property Name="BackgroundEnabled" Value="False" />
-                </Window>
-                <Window Type="TaharezLook/StaticText" Name="OPWorstFPS" >
-                    <Property Name="Font" Value="BlueHighway-10" />
-                    <Property Name="Text" Value="Worst FPS: " />
-                    <Property Name="TextColours" Value="tl:FFFFF5F0 tr:FFFFF5F0 bl:FFFFF510 br:FFFFF5F0" />
-                    <Property Name="FrameEnabled" Value="False" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.075,0},{0.45,0},{1.075,0},{0.7,0}}" />
-                    <Property Name="BackgroundEnabled" Value="False" />
-                </Window>
-                <Window Type="TaharezLook/StaticText" Name="OPBestFPS" >
-                    <Property Name="Font" Value="BlueHighway-10" />
-                    <Property Name="Text" Value="Best FPS: " />
-                    <Property Name="TextColours" Value="tl:FFFFF5F0 tr:FFFFF5F0 bl:FFFFF510 br:FFFFF5F0" />
-                    <Property Name="FrameEnabled" Value="False" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.075,0},{0.58,0},{1.075,0},{0.83,0}}" />
-                    <Property Name="BackgroundEnabled" Value="False" />
-                </Window>
-                <Window Type="TaharezLook/StaticText" Name="OPTriCount" >
-                    <Property Name="Font" Value="BlueHighway-10" />
-                    <Property Name="Text" Value="Triangle Count: " />
-                    <Property Name="TextColours" Value="tl:FFFFF5F0 tr:FFFFF5F0 bl:FFFFF510 br:FFFFF5F0" />
-                    <Property Name="FrameEnabled" Value="False" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.075,0},{0.71,0},{1.075,0},{0.96,0}}" />
-                    <Property Name="BackgroundEnabled" Value="False" />
-                </Window>
-            </Window>
-            <Window Type="TaharezLook/StaticText" Name="OPDebugMsg" >
-                <Property Name="Font" Value="BlueHighway-10" />
-                <Property Name="TextColours" Value="tl:A0FFFFFF tr:A0FFFFFF bl:A0FFFFFF br:A0FFFFFF" />
-                <Property Name="FrameEnabled" Value="False" />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="HorzFormatting" Value="WordWrapCentred" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.93,0},{0.9,0},{1,0}}" />
-                <Property Name="BackgroundEnabled" Value="False" />
-            </Window>
-            <Window Type="TaharezLook/StaticImage" Name="OgreLogo" >
-                <Property Name="Alpha" Value="0.75" />
-                <Property Name="FrameEnabled" Value="False" />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.9,0},{0.95,0},{1,0},{1,0}}" />
-                <Property Name="BackgroundEnabled" Value="False" />
-            </Window>
-            <Window Type="TaharezLook/StaticImage" Name="CeguiLogo" >
-                <Property Name="Alpha" Value="0.75" />
-                <Property Name="FrameEnabled" Value="False" />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.9125,0},{0.9115,0},{0.9875,0},{0.95,0}}" />
-                <Property Name="BackgroundEnabled" Value="False" />
-            </Window>
-        </Window>
-        <Window Type="DefaultWindow" Name="InstancingDemo" >
-            <Property Name="Font" Value="BlueHighway-12" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{2,0}}" />
-            <Window Type="TaharezLook/FrameWindow" Name="CompositorSelectorWin" >
-                <Property Name="Font" Value="BlueHighway-12" />
-                <Property Name="Text" Value="Techniques" />
-                <Property Name="Alpha" Value="0.75" />
-                <Property Name="TitlebarFont" Value="BlueHighway-12" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="TitlebarEnabled" Value="True" />
-                <Property Name="UnifiedAreaRect" Value="{{0,0},{0.00508906,0},{0.237344,0},{0.487022,0}}" />
-                <Property Name="CloseButtonEnabled" Value="False" />
-                <Window Type="TaharezLook/RadioButton" Name="tInstancing" >
-                    <Property Name="Font" Value="BlueHighway-12" />
-                    <Property Name="Text" Value="Instancing" />
-                    <Property Name="Selected" Value="True" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.0592397,0},{1.05,0},{0.140919,0}}" />
-                </Window>
-                <Window Type="TaharezLook/RadioButton" Name="tStaticGeometry" >
-                    <Property Name="ID" Value="1" />
-                    <Property Name="Font" Value="BlueHighway-12" />
-                    <Property Name="Text" Value="Static Geometry" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.118479,0},{1.05,0},{0.198839,0}}" />
-                </Window>
-                <Window Type="TaharezLook/RadioButton" Name="tIndependantEntities" >
-                    <Property Name="ID" Value="2" />
-                    <Property Name="Font" Value="BlueHighway-12" />
-                    <Property Name="Text" Value="Independant Entities" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.180359,0},{1.05,0},{0.260718,0}}" />
-                </Window>
-                <Window Type="TaharezLook/Checkbox" Name="Shadows" >
-                    <Property Name="Font" Value="BlueHighway-12" />
-                    <Property Name="Text" Value="Shadows on/off" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-					<Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.458078,0},{1.05,0},{0.545613,0}}" />
-                </Window>
-                <Window Type="TaharezLook/StaticText" Name="Object Count Text" >
-                    <Property Name="Font" Value="BlueHighway-12" />
-                    <Property Name="Text" Value="Object Count:" />
-                    <Property Name="FrameEnabled" Value="False" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.0458855,0},{0.242239,0},{0.480053,0},{0.324677,0}}" />
-                    <Property Name="BackgroundEnabled" Value="False" />
-                </Window>
-                <Window Type="TaharezLook/StaticText" Name="Object Count Number" >
-                    <Property Name="Font" Value="BlueHighway-12" />
-                    <Property Name="Text" Value="160" />
-                    <Property Name="FrameEnabled" Value="False" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.475313,0},{0.245588,0},{0.679954,0},{0.327894,0}}" />
-                    <Property Name="BackgroundEnabled" Value="False" />
-                </Window>
-                <Window Type="TaharezLook/Combobox" Name="Objects" >
-                    <Property Name="Font" Value="BlueHighway-12" />
-                    <Property Name="Text" Value="Choose an object" />
-                    <Property Name="ReadOnly" Value="True" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.0541145,0},{0.561555,0},{0.954114,0},{0.821555,0}}" />
-                    <Property Name="MaxEditTextLength" Value="1073741823" />
-                </Window>
-                <Window Type="TaharezLook/HorizontalScrollbar" Name="Object Count" >
-                    <Property Name="PageSize" Value="0" />
-                    <Property Name="StepSize" Value="1" />
-                    <Property Name="OverlapSize" Value="0" />
-                    <Property Name="DocumentSize" Value="1" />
-                    <Property Name="ScrollPosition" Value="0" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.06,0},{0.33,0},{0.96,0},{0.382246,0}}" />
-                </Window>
-                <Window Type="TaharezLook/StaticText" Name="Time Burner Text" >
-                    <Property Name="Font" Value="BlueHighway-12" />
-                    <Property Name="Text" Value="CPU occupation:" />
-                    <Property Name="FrameEnabled" Value="False" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.0664582,0},{0.650819,0},{0.571251,0},{0.750819,0}}" />
-                    <Property Name="BackgroundEnabled" Value="False" />
-                </Window>
-                <Window Type="TaharezLook/StaticText" Name="Time Burner Value" >
-                    <Property Name="Font" Value="BlueHighway-12" />
-                    <Property Name="Text" Value="0 ms" />
-                    <Property Name="FrameEnabled" Value="False" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.616458,0},{0.650819,0},{0.905365,0},{0.750819,0}}" />
-                    <Property Name="BackgroundEnabled" Value="False" />
-                </Window>
-                <Window Type="TaharezLook/HorizontalScrollbar" Name="Time Burner" >
-                    <Property Name="PageSize" Value="0" />
-                    <Property Name="StepSize" Value="1" />
-                    <Property Name="OverlapSize" Value="0" />
-                    <Property Name="DocumentSize" Value="1" />
-                    <Property Name="ScrollPosition" Value="0" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.75,0},{0.962344,0},{0.804855,0}}" />
-                </Window>
-                <Window Type="TaharezLook/Checkbox" Name="PostEffect" >
-                    <Property Name="Font" Value="BlueHighway-12" />
-                    <Property Name="Text" Value="Post Effect On/Off" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.813539,0},{0.918334,0},{0.895712,0}}" />
-                </Window>
-                <Window Type="TaharezLook/Button" Name="ExitDemoBtn" >
-                    <Property Name="Font" Value="BlueHighway-12" />
-                    <Property Name="Text" Value="Exit Demo" />
-                    <Property Name="InheritsAlpha" Value="False" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{-0.0325521,0},{-0.0135575,0},{0.48346,0},{0.0739895,0}}" />
-                    <Property Name="VerticalAlignment" Value="Bottom" />
-                    <Property Name="HorizontalAlignment" Value="Centre" />
-                </Window>
-            </Window>
-        </Window>
-    </Window>
-</GUILayout>
Index: code/branches/gamestate/data/gui/layouts/TabControlDemo.layout
===================================================================
--- code/branches/gamestate/data/gui/layouts/TabControlDemo.layout	(revision 6430)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <Window Type="TaharezLook/FrameWindow" Name="Frame" >
-        <Property Name="Text" Value="Tab Control Demo" />
-        <Property Name="Tooltip" Value="This is a demonstration of TabControl abilities." />
-        <Property Name="TitlebarFont" Value="Commonwealth-10" />
-        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-        <Property Name="UnifiedMinSize" Value="{{0,128},{0,128}}" />
-        <Property Name="TitlebarEnabled" Value="True" />
-        <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.1,0},{0.9,0},{0.9,0}}" />
-        <Window Type="TaharezLook/TabControl" Name="Frame/TabControl" >
-            <Property Name="Tooltip" Value="This is the tab control" />
-            <Property Name="TabHeight" Value="{0,-1}" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="TabPanePosition" Value="Bottom" />
-            <Property Name="UnifiedAreaRect" Value="{{0,10},{0,30},{1,-10},{1,-10}}" />
-        </Window>
-    </Window>
-</GUILayout>
Index: code/branches/gamestate/data/gui/layouts/TabPage.layout
===================================================================
--- code/branches/gamestate/data/gui/layouts/TabPage.layout	(revision 6430)
+++ 	(revision )
@@ -1,34 +1,0 @@
-<?xml version="1.0" ?>
-<GUILayout>
-
-<Window Type="DefaultGUISheet" Name="">
-    <Window Type="TaharezLook/StaticText" Name="Text">
-        <Property Name="FrameEnabled" Value="False" />
-        <Property Name="HorzFormatting" Value="WordWrapCentred" />
-        <Property Name="VertFormatting" Value="CentreAligned" />
-        <Property Name="UnifiedAreaRect" Value="{{0.5,0},{0.1,0},{0.9,0},{0.4,0}}" />
-        <Property Name="BackgroundEnabled" Value="False" />
-    </Window>
-
-    <Window Type="TaharezLook/Button" Name="Button1">
-        <Property Name="Text" Value="- One -" />
-        <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.1,0},{0.3,0},{0.2,0}}" />
-    </Window>
-
-    <Window Type="TaharezLook/Button" Name="Button2">
-        <Property Name="Text" Value="- Two -" />
-        <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.3,0},{0.5,0},{0.4,0}}" />
-    </Window>
-
-    <Window Type="TaharezLook/Button" Name="Button3">
-        <Property Name="Text" Value="- Three -" />
-        <Property Name="UnifiedAreaRect" Value="{{0.5,0},{0.5,0},{0.7,0},{0.6,0}}" />
-    </Window>
-
-    <Window Type="TaharezLook/Button" Name="Button4">
-        <Property Name="Text" Value="- Four -" />
-        <Property Name="UnifiedAreaRect" Value="{{0.7,0},{0.7,0},{0.9,0},{0.8,0}}" />
-    </Window>
-</Window>
-
-</GUILayout>
Index: code/branches/gamestate/data/gui/layouts/TabPage1.layout
===================================================================
--- code/branches/gamestate/data/gui/layouts/TabPage1.layout	(revision 6430)
+++ 	(revision )
@@ -1,75 +1,0 @@
-<?xml version="1.0" ?>
-<GUILayout>
-    <Window Type="DefaultGUISheet" Name="Page1">
-        <Property Name="Text" Value="Page one" />
-
-        <Window Type="TaharezLook/RadioButton" Name="Page1/TabPaneTop" >
-            <Property Name="ID" Value="0" />
-            <Property Name="Text" Value="Tab pane at top" />
-            <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.1,0},{0.45,0},{0.2,0}}" />
-        </Window>
-
-        <Window Type="TaharezLook/RadioButton" Name="Page1/TabPaneBottom" >
-            <Property Name="ID" Value="1" />
-            <Property Name="Text" Value="Tab pane at bottom" />
-            <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.2,0},{0.45,0},{0.3,0}}" />
-        </Window>
-
-        <Window Type="TaharezLook/Button" Name="Page1/AddTab">
-            <Property Name="Text" Value="Add a new tab" />
-            <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.35,0},{0.45,0},{0.45,0}}" />
-            <Property Name="Tooltip" Value="Switch active page to selected" />
-        </Window>
-
-        <Window Type="TaharezLook/Listbox" Name="Page1/PageList">
-            <Property Name="UnifiedAreaRect" Value="{{0.55,0},{0.1,0},{0.95,0},{0.48,0}}" />
-            <Property Name="Tooltip" Value="A list of available tabs to experiment with" />
-        </Window>
-
-        <Window Type="TaharezLook/Button" Name="Page1/Go">
-            <Property Name="Text" Value="Goto" />
-            <Property Name="UnifiedAreaRect" Value="{{0.55,0},{0.5,0},{0.67,0},{0.57,0}}" />
-            <Property Name="Tooltip" Value="Switch active page to selected" />
-        </Window>
-
-        <Window Type="TaharezLook/Button" Name="Page1/Show">
-            <Property Name="Text" Value="Show" />
-            <Property Name="UnifiedAreaRect" Value="{{0.69,0},{0.5,0},{0.81,0},{0.57,0}}" />
-            <Property Name="Tooltip" Value="Make the selected tab visible in the tab pane" />
-        </Window>
-
-        <Window Type="TaharezLook/Button" Name="Page1/Del">
-            <Property Name="Text" Value="Del" />
-            <Property Name="UnifiedAreaRect" Value="{{0.83,0},{0.5,0},{0.95,0},{0.57,0}}" />
-            <Property Name="Tooltip" Value="Delete the selected pane" />
-        </Window>
-
-        <Window Type="TaharezLook/StaticText" Name="Page1/TabHeightDesc" >
-            <Property Name="FrameEnabled" Value="False" />
-            <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.6,0},{0.95,0},{0.7,0}}" />
-            <Property Name="BackgroundEnabled" Value="False" />
-            <Property Name="Text" Value="Change the height of tab buttons in pixels" />
-        </Window>
-        <Window Type="TaharezLook/HorizontalScrollbar" Name="Page1/TabHeight">
-            <Property Name="DocumentSize" Value="64" />
-            <Property Name="PageSize" Value="4" />
-            <Property Name="StepSize" Value="1" />
-            <Property Name="OverlapSize" Value="0" />
-            <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.7,0},{0.95,0},{0.7,12}}" />
-        </Window>
-
-        <Window Type="TaharezLook/StaticText" Name="Page1/TabPaddingDesc" >
-            <Property Name="FrameEnabled" Value="False" />
-            <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.8,0},{0.95,0},{0.9,0}}" />
-            <Property Name="BackgroundEnabled" Value="False" />
-            <Property Name="Text" Value="Change the padding of the text on buttons in pixels" />
-        </Window>
-        <Window Type="TaharezLook/HorizontalScrollbar" Name="Page1/TabPadding">
-            <Property Name="DocumentSize" Value="100" />
-            <Property Name="PageSize" Value="5" />
-            <Property Name="StepSize" Value="1" />
-            <Property Name="OverlapSize" Value="0" />
-            <Property Name="UnifiedAreaRect" Value="{{0.06,0},{0.9,0},{0.95,0},{0.9,12}}" />
-        </Window>
-    </Window>
-</GUILayout>
Index: code/branches/gamestate/data/gui/layouts/TabPage2.layout
===================================================================
--- code/branches/gamestate/data/gui/layouts/TabPage2.layout	(revision 6430)
+++ 	(revision )
@@ -1,38 +1,0 @@
-<?xml version="1.0" ?>
-<GUILayout>
-    <Window Type="DefaultGUISheet" Name="Page2">
-        <Property Name="Text" Value="Page two" />
-        <Window Type="TaharezLook/Button" Name="Page2/Button1">
-            <Property Name="Text" Value="Push me" />
-            <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.1,0},{0.8,0},{0.2,0}}" />
-        </Window>
-        <Window Type="TaharezLook/Button" Name="Page2/Button2">
-            <Property Name="Text" Value="Press me" />
-            <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.2,0},{0.8,0},{0.3,0}}" />
-        </Window>
-        <Window Type="TaharezLook/Button" Name="Page2/Button3">
-            <Property Name="Text" Value="Kick me" />
-            <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.3,0},{0.8,0},{0.4,0}}" />
-        </Window>
-        <Window Type="TaharezLook/Button" Name="Page2/Button4">
-            <Property Name="Text" Value="Break me" />
-            <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.4,0},{0.8,0},{0.5,0}}" />
-        </Window>
-        <Window Type="TaharezLook/Button" Name="Page2/Button5">
-            <Property Name="Text" Value="Catch me" />
-            <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.5,0},{0.8,0},{0.6,0}}" />
-        </Window>
-        <Window Type="TaharezLook/Button" Name="Page2/Button6">
-            <Property Name="Text" Value="Kiss me" />
-            <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.6,0},{0.8,0},{0.7,0}}" />
-        </Window>
-        <Window Type="TaharezLook/Button" Name="Page2/Button7">
-            <Property Name="Text" Value="Lick me" />
-            <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.7,0},{0.8,0},{0.8,0}}" />
-        </Window>
-        <Window Type="TaharezLook/Button" Name="Page2/Button8">
-            <Property Name="Text" Value="Spit me" />
-            <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.8,0},{0.8,0},{0.9,0}}" />
-        </Window>
-    </Window>
-</GUILayout>
Index: code/branches/gamestate/data/gui/layouts/TextDemo.layout
===================================================================
--- code/branches/gamestate/data/gui/layouts/TextDemo.layout	(revision 6430)
+++ 	(revision )
@@ -1,146 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <Window Type="DefaultWindow" Name="Root" >
-        <Property Name="InheritsAlpha" Value="False" />
-        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-        <Window Type="TaharezLook/FrameWindow" Name="TextDemo" >
-            <Property Name="Text" Value="Text sample" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="TitlebarEnabled" Value="True" />
-            <Property Name="UnifiedAreaRect" Value="{{0.0160194,0},{0.0159533,0},{0.869175,0},{0.880739,0}}" />
-            <Window Type="TaharezLook/GroupBox" Name="TextDemo/StaticGroup" >
-                <Property Name="Text" Value="Static text" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.0173979,0},{0.078319,0},{0.986007,0},{0.404881,0}}" />
-            </Window>
-            <Window Type="TaharezLook/GroupBox" Name="TextDemo/SingleLineGroup" >
-                <Property Name="Text" Value="Single line editing" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.0184568,0},{0.415308,0},{0.984039,0},{0.570098,0}}" />
-            </Window>
-            <Window Type="TaharezLook/StaticText" Name="TextDemo/StaticText" >
-                <Property Name="Text" Value="Demonstrates static (non editable) text. Use the controls on your right for formatting options." />
-                <Property Name="HorzFormatting" Value="WordWrapLeftAligned" />
-		    <Property Name="VertFormatting" Value="TopAligned" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.032217,0},{0.126344,0},{0.42415,0},{0.384995,0}}" />
-            </Window>
-            <Window Type="TaharezLook/StaticText" Name="TextDemo/lblHorzFormatting" >
-                <Property Name="Text" Value="Horz. formatting" />
-                <Property Name="FrameEnabled" Value="False" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.436163,0},{0.124473,0},{0.634902,0},{0.173498,0}}" />
-                <Property Name="BackgroundEnabled" Value="False" />
-            </Window>
-            <Window Type="TaharezLook/RadioButton" Name="TextDemo/HorzLeft" >
-                <Property Name="Text" Value="Left aligned" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.434561,0},{0.179757,0},{0.602889,0},{0.228783,0}}" />
-            </Window>
-            <Window Type="TaharezLook/RadioButton" Name="TextDemo/HorzRight" >
-                <Property Name="Text" Value="Right aligned" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.434561,0},{0.223715,0},{0.602889,0},{0.27274,0}}" />
-            </Window>
-            <Window Type="TaharezLook/RadioButton" Name="TextDemo/HorzCentered" >
-                <Property Name="Text" Value="Center aligned" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.434561,0},{0.267673,0},{0.602889,0},{0.316698,0}}" />
-            </Window>
-            <Window Type="TaharezLook/StaticText" Name="TextDemo/lblVertFormatting" >
-                <Property Name="Text" Value="Vert. formatting" />
-                <Property Name="FrameEnabled" Value="False" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.612759,0},{0.124473,0},{0.787369,0},{0.173498,0}}" />
-                <Property Name="BackgroundEnabled" Value="False" />
-            </Window>
-            <Window Type="TaharezLook/RadioButton" Name="TextDemo/VertTop" >
-                <Property Name="Text" Value="Top aligned" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.609555,0},{0.190256,0},{0.792699,0},{0.227283,0}}" />
-            </Window>
-            <Window Type="TaharezLook/RadioButton" Name="TextDemo/VertBottom" >
-                <Property Name="Text" Value="Bottom aligned" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.609555,0},{0.234214,0},{0.792699,0},{0.27124,0}}" />
-            </Window>
-            <Window Type="TaharezLook/RadioButton" Name="TextDemo/VertCentered" >
-                <Property Name="Text" Value="Center aligned" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.609555,0},{0.276102,0},{0.792699,0},{0.313129,0}}" />
-            </Window>
-            <Window Type="TaharezLook/Checkbox" Name="TextDemo/Wrap" >
-                <Property Name="Text" Value="Word wrap" />
-                <Property Name="Selected" Value="True" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.780252,0},{0.127429,0},{0.931853,0},{0.180953,0}}" />
-            </Window>
-            <Window Type="TaharezLook/Editbox" Name="TextDemo/editName" >
-                <Property Name="Text" Value="Your name" />
-                <Property Name="MaxTextLength" Value="1073741823" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.032217,0},{0.497488,0},{0.282217,0},{0.548012,0}}" />
-            </Window>
-            <Window Type="TaharezLook/Editbox" Name="TextDemo/editAge" >
-                <Property Name="Text" Value="18" />
-                <Property Name="MaxTextLength" Value="1073741823" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.309388,0},{0.497488,0},{0.361665,0},{0.548012,0}}" />
-            </Window>
-            <Window Type="TaharezLook/Editbox" Name="TextDemo/editPasswd" >
-                <Property Name="Text" Value="Secret" />
-                <Property Name="MaxTextLength" Value="1073741823" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.386344,0},{0.497488,0},{0.576599,0},{0.548012,0}}" />
-            </Window>
-            <Window Type="TaharezLook/StaticText" Name="TextDemo/lblName" >
-                <Property Name="Text" Value="Name:" />
-                <Property Name="AlwaysOnTop" Value="True" />
-                <Property Name="FrameEnabled" Value="False" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.0334283,0},{0.453505,0},{0.283428,0},{0.492031,0}}" />
-                <Property Name="BackgroundEnabled" Value="False" />
-            </Window>
-            <Window Type="TaharezLook/StaticText" Name="TextDemo/lblAge" >
-                <Property Name="Text" Value="Age:" />
-                <Property Name="AlwaysOnTop" Value="True" />
-                <Property Name="FrameEnabled" Value="False" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.312375,0},{0.453505,0},{0.562375,0},{0.492031,0}}" />
-                <Property Name="BackgroundEnabled" Value="False" />
-            </Window>
-            <Window Type="TaharezLook/StaticText" Name="TextDemo/lblPassword" >
-                <Property Name="Text" Value="Password:" />
-                <Property Name="AlwaysOnTop" Value="True" />
-                <Property Name="FrameEnabled" Value="False" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.389616,0},{0.452006,0},{0.639615,0},{0.490531,0}}" />
-                <Property Name="BackgroundEnabled" Value="False" />
-            </Window>
-            <Window Type="TaharezLook/GroupBox" Name="TextDemo/MultiLineGroup" >
-                <Property Name="Text" Value="Multi line editing" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.018457,0},{0.583793,0},{0.984039,0},{0.932058,0}}" />
-            </Window>
-            <Window Type="TaharezLook/MultiLineEditbox" Name="TextDemo/editMulti" >
-                <Property Name="Text" >
-</Property>
-                <Property Name="MaxTextLength" Value="1073741823" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.032217,0},{0.651968,0},{0.579514,0},{0.910619,0}}" />
-            </Window>
-            <Window Type="TaharezLook/Checkbox" Name="TextDemo/forceScroll" >
-                <Property Name="Text" Value="Force vertical scrollbar" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.585348,0},{0.651481,0},{0.832503,0},{0.688507,0}}" />
-            </Window>
-            <Window Type="TaharezLook/Button" Name="TextDemo/Quit" >
-                <Property Name="Text" Value="Quit" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.421905,0},{0.937908,0},{0.612162,0},{0.991433,0}}" />
-            </Window>
-        </Window>
-    </Window>
-</GUILayout>
Index: code/branches/gamestate/data/gui/layouts/TreeDemoTaharez.layout
===================================================================
--- code/branches/gamestate/data/gui/layouts/TreeDemoTaharez.layout	(revision 6430)
+++ 	(revision )
@@ -1,35 +1,0 @@
-<?xml version="1.0" ?>
-<GUILayout>
-	<Window Type="TaharezLook/FrameWindow" Name="DemoWindow">
-		<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-		<Property Name="UnifiedMinSize" Value="{{0,128},{0,128}}" />
-		<Property Name="UnifiedSize" Value="{{0.5,0},{0.8,0}}" />
-
-            <Property Name="Text" Value="Tree Demo" />
-            <Property Name="CloseButtonEnabled" Value="False" />
-		<Property Name="SizingEnabled" Value="True" />
-		<Property Name="FrameEnabled" Value="True" />
-		<Property Name="RollUpEnabled" Value="True" />
-		<Property Name="SizingBorderThickness" Value="8.0" />
-
-    <Window Type="TaharezLook/Tree" Name="DemoWindow/Tree">
-			<Property Name="ID" Value="1" />
-			<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-		
-			<Property Name="UnifiedSize" Value="{{0.96,0},{0.75,0}}" />
-			<Property Name="UnifiedPosition" Value="{{0.02,0},{0.1,0}}" />
-		</Window>
-
-		<Window Type="TaharezLook/Editbox" Name="DemoWindow/Editbox">
-			<Property Name="ID" Value="2" />
-			<Property Name="VerticalAlignment" Value="Bottom" />
-			<Property Name="UnifiedMaxSize" Value="{{0.7,0},{0.05,0}}" />
-			<Property Name="UnifiedMinSize" Value="{{0.7,0},{0.05,0}}" />
-			<Property Name="UnifiedSize" Value="{{0.7,0},{0.05,0}}" />
-			<Property Name="UnifiedPosition" Value="{{0,7},{0,-7}}" />
-			<Property Name="ReadOnly" Value="True" />
-			<Property Name="Text" Value="" />
-			<Property Name="Tooltip" Value="World Location X" />
-		</Window>
-	</Window>
-</GUILayout>
Index: code/branches/gamestate/data/gui/layouts/VanillaConsole.layout
===================================================================
--- code/branches/gamestate/data/gui/layouts/VanillaConsole.layout	(revision 6430)
+++ 	(revision )
@@ -1,51 +1,0 @@
-<?xml version="1.0" ?>
-<GUILayout>
-    <Window Type="Vanilla/FrameWindow" Name="Vanilla/Console">
-        <Property Name="AlwaysOnTop" Value="True" />
-        <Property Name="UnifiedMinSize" Value="{{0.2,0},{0.2,0}}" />
-        <Property Name="UnifiedMaxSize" Value="{{0.8,0},{0.8,0}}" />
-        <Property Name="UnifiedPosition" Value="{{0.5,0},{0.5,0}}" />
-        <Property Name="UnifiedSize" Value="{{0.5,0},{0.45,0}}" />
-        <Property Name="Text" Value="Console" />
-        <Property Name="CloseButtonEnabled" Value="False" />
-
-        <Window Type="Vanilla/Button" Name="Vanilla/Console/Submit">
-            <Property Name="ID" Value="1" />
-            <Property Name="VerticalAlignment" Value="Bottom" />
-            <Property Name="HorizontalAlignment" Value="Right" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedPosition" Value="{{0,-7},{0,-7}}" />
-            <Property Name="UnifiedSize" Value="{{0.25,0},{0,30}}" />
-            <Property Name="Text" Value="Submit" />
-        </Window>
-
-        <Window Type="Vanilla/Editbox" Name="Vanilla/Console/Editbox">
-            <Property Name="ID" Value="2" />
-            <Property Name="VerticalAlignment" Value="Bottom" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedPosition" Value="{{0,7},{0,-7}}" />
-            <Property Name="UnifiedSize" Value="{{0.75,-21},{0,30}}" />
-            <Property Name="Text" Value="" />
-        </Window>
-
-        <Window Type="Vanilla/MultiLineEditbox" Name="Vanilla/Console/History">
-            <Property Name="ID" Value="3" />
-            <Property Name="ReadOnly" Value="True" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedPosition" Value="{{0,7},{0,35}}" />
-            <Property Name="UnifiedSize" Value="{{1,-14},{1,-75}}" />
-            <Property Name="Text">
-CEGUI Demo Console - F12 toggles this window
-          
-It's now easy to add multiline text property.
-Line 1
-<![CDATA[
-You can now put <xml>stuff</xml> in your property easly " " " 
-]]>
-Line 2
-Line 3 
-</Property>
-              
-        </Window>
-    </Window>
-</GUILayout>
Index: code/branches/gamestate/data/gui/layouts/VanillaWindows.layout
===================================================================
--- code/branches/gamestate/data/gui/layouts/VanillaWindows.layout	(revision 6430)
+++ 	(revision )
@@ -1,85 +1,0 @@
-<?xml version="1.0" ?>
-<GUILayout>
-    <Window Type="Vanilla/StaticImage" Name="root">
-        <Property Name="UnifiedPosition" Value="{{0,0},{0,0}}" />
-        <Property Name="UnifiedSize" Value="{{1,0},{1,0}}" />
-        <Property Name="FrameEnabled" Value="False" />
-        <Property Name="BackgroundEnabled" Value="False" />
-        <Property Name="Image" Value="set:Backdrop-Images image:Magic" />
-
-        <Window Type="Vanilla/FrameWindow" Name="Demo/NewNode">
-            <Property Name="UnifiedMinSize" Value="{{0.2,0},{0.2,0}}" />
-            <Property Name="UnifiedMaxSize" Value="{{0.8,0},{0.8,0}}" />
-            <Property Name="UnifiedPosition" Value="{{0.6,0},{0.1,0}}" />
-            <Property Name="UnifiedSize" Value="{{0.3,0},{0.5,0}}" />
-            <Property Name="Text" Value="New Node" />
-            <Property Name="CloseButtonEnabled" Value="False" />
-
-            <Window Type="Vanilla/Listbox" Name="Demo7/Window2/Listbox">
-                <Property Name="UnifiedMaxSize" Value="{{1.0,0},{1.0,0}}" />
-                <Property Name="UnifiedPosition" Value="{{0,7},{0,35}}" />
-                <Property Name="UnifiedSize" Value="{{1,-14},{1,-108}}" />
-            </Window>
-
-            <Window Type="Vanilla/StaticText" Name="Demo/NewNode/label1">
-                <Property Name="BackgroundEnabled" Value="False" />
-                <Property Name="FrameEnabled" Value="False" />
-                <Property Name="VerticalAlignment" Value="Bottom" />
-                <Property Name="UnifiedMaxSize" Value="{{1.0,0},{1.0,0}}" />
-                <Property Name="UnifiedPosition" Value="{{0,7},{0,-45}}" />
-                <Property Name="UnifiedSize" Value="{{0,60},{0,30}}" />
-                <Property Name="Text" Value="Name:" />
-            </Window>
-
-            <Window Type="Vanilla/Editbox" Name="Demo/NewNode/Editbox">
-                <Property Name="VerticalAlignment" Value="Bottom" />
-                <Property Name="HorizontalAlignment" Value="Right" />
-                <Property Name="UnifiedMaxSize" Value="{{1.0,0},{1.0,0}}" />
-                <Property Name="UnifiedPosition" Value="{{0,-7},{0,-40}}" />
-                <Property Name="UnifiedSize" Value="{{1,-74},{0,30}}" />
-                <Property Name="Text" Value="" />
-            </Window>
-
-            <Window Type="Vanilla/Button" Name="Demo/NewNode/Okay">
-                <Property Name="VerticalAlignment" Value="Bottom" />
-                <Property Name="UnifiedMaxSize" Value="{{1.0,0},{1.0,0}}" />
-                <Property Name="UnifiedPosition" Value="{{0,7},{0,-7}}" />
-                <Property Name="UnifiedSize" Value="{{0,60},{0,30}}" />
-                <Property Name="Text" Value="Okay" />
-            </Window>
-
-            <Window Type="Vanilla/Button" Name="Demo/NewNode/Cancel">
-                <Property Name="VerticalAlignment" Value="Bottom" />
-                <Property Name="HorizontalAlignment" Value="Right" />
-                <Property Name="UnifiedMaxSize" Value="{{1.0,0},{1.0,0}}" />
-                <Property Name="UnifiedPosition" Value="{{0,-7},{0,-7}}" />
-                <Property Name="UnifiedSize" Value="{{0,60},{0,30}}" />
-                <Property Name="Text" Value="Cancel" />
-            </Window>
-
-        </Window>
-
-        <Window Type="Vanilla/FrameWindow" Name="Demo/NamespaceViewer">
-            <Property Name="UnifiedMinSize" Value="{{0.2,0},{0.2,0}}" />
-            <Property Name="UnifiedMaxSize" Value="{{0.8,0},{0.8,0}}" />
-            <Property Name="WindowPosition" Value="{{0.25,0},{0.48,0}}" />
-            <Property Name="UnifiedSize" Value="{{0.5,0},{0.5,0}}" />
-            <Property Name="Text" Value="Namespace Viewer" />
-            <Property Name="CloseButtonEnabled" Value="False" />
-
-            <Window Type="Vanilla/StaticText" Name="Demo/NamespaceViewer/area1">
-                <Property Name="UnifiedMaxSize" Value="{{1.0,0},{1.0,0}}" />
-                <Property Name="UnifiedPosition" Value="{{0,7},{0,35}}" />
-                <Property Name="UnifiedSize" Value="{{1,-14},{0,65}}" />
-            </Window>
-
-            <Window Type="Vanilla/Listbox" Name="Demo/NamespaceViewer/area2">
-                <Property Name="VerticalAlignment" Value="Bottom" />
-                <Property Name="UnifiedMaxSize" Value="{{1.0,0},{1.0,0}}" />
-                <Property Name="UnifiedPosition" Value="{{0,7},{0,-7}}" />
-                <Property Name="UnifiedSize" Value="{{1,-14},{1,-110}}" />
-            </Window>
-        </Window>
-
-    </Window>
-</GUILayout>
Index: code/branches/gamestate/data/gui/layouts/cegui8.layout
===================================================================
--- code/branches/gamestate/data/gui/layouts/cegui8.layout	(revision 6430)
+++ 	(revision )
@@ -1,130 +1,0 @@
-<?xml version="1.0" ?>
-<!-- Layout file from CEGUI Demo8 -->
-<GUILayout>
-<Window Type="DefaultGUISheet" Name="demo_root">
-
-	<Window Type="DefaultGUISheet" Name="Demo8">
-
-		<Property Name="UnifiedMaxSize" Value="{{1,0},{2,0}}" />
-		<Property Name="UnifiedSize" Value="{{1,0},{2,0}}"  />
-
-		<Window Type="TaharezLook/VerticalScrollbar" Name="Demo8/ViewScroll">
-			<Property Name="UnifiedPosition" Value="{{0.0,0},{0.0,0}}"  />
-			<Property Name="UnifiedSize" Value="{{0.03,0},{0.75,0}}"  />
-			<Property Name="DocumentSize" Value="2" />
-			<Property Name="PageSize" Value="1" />
-			<Property Name="StepSize" Value="0.01" />
-			<Property Name="OverlapSize" Value="0.5" />
-		</Window>
-
-        <Window Type="TaharezLook/FrameWindow" Name="Demo8/Window1">
-			<Property Name="UnifiedPosition" Value="{{0.05,0},{0.1,0}}"  />
-			<Property Name="UnifiedMaxSize" Value="{{0.5,0},{1,0}}" />
-			<Property Name="UnifiedMinSize" Value="{{0,128},{0,128}}" />
-			<Property Name="UnifiedSize" Value="{{0.4,0},{0.35,0}}"  />
-			<Property Name="Text" Value="Demo 8 - Listbox Demo" />
-
-			<Window Type="TaharezLook/Listbox" Name="Demo8/Window1/Listbox">
-				<Property Name="UnifiedPosition" Value="{{0.05,0},{0.1,0}}"  />
-				<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-				<Property Name="UnifiedSize" Value="{{0.9,0},{0.33,0}}"  />
-			</Window>
-
-			<Window Type="TaharezLook/StaticText" Name="Demo8/Window1/Controls">
-				<Property Name="UnifiedPosition" Value="{{0.05,0},{0.45,0}}"  />
-				<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-				<Property Name="UnifiedSize" Value="{{0.9,0},{0.5,0}}"  />
-
-                <Window Type="TaharezLook/HorizontalScrollbar" Name="Demo8/Window1/Controls/Red">
-					<Property Name="UnifiedPosition" Value="{{0.05,0},{0.05,0}}"  />
-					<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-					<Property Name="UnifiedSize" Value="{{0.9,0},{0.06,0}}"  />
-					<Property Name="DocumentSize" Value="255" />
-					<Property Name="PageSize" Value="16" />
-					<Property Name="StepSize" Value="1" />
-					<Property Name="OverlapSize" Value="1" />
-				</Window>
-
-                <Window Type="TaharezLook/HorizontalScrollbar" Name="Demo8/Window1/Controls/Green">
-					<Property Name="UnifiedPosition" Value="{{0.05,0},{0.12,0}}"  />
-					<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-					<Property Name="UnifiedSize" Value="{{0.9,0},{0.06,0}}"  />
-					<Property Name="DocumentSize" Value="256" />
-					<Property Name="PageSize" Value="16" />
-					<Property Name="StepSize" Value="1" />
-					<Property Name="OverlapSize" Value="1" />
-				</Window>
-
-                <Window Type="TaharezLook/HorizontalScrollbar" Name="Demo8/Window1/Controls/Blue">
-					<Property Name="UnifiedPosition" Value="{{0.05,0},{0.19,0}}"  />
-					<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-					<Property Name="UnifiedSize" Value="{{0.9,0},{0.06,0}}"  />
-					<Property Name="DocumentSize" Value="255" />
-					<Property Name="PageSize" Value="16" />
-					<Property Name="StepSize" Value="1" />
-					<Property Name="OverlapSize" Value="1" />
-				</Window>
-
-				<Window Type="TaharezLook/StaticImage" Name="Demo8/Window1/Controls/ColourSample">
-					<Property Name="UnifiedPosition" Value="{{0.05,0},{0.26,0}}"  />
-					<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-					<Property Name="UnifiedSize" Value="{{0.9,0},{0.1,0}}"  />
-					<Property Name="Image" Value="set:TaharezLook image:ListboxSelectionBrush" />
-					<Property Name="ImageColours" Value="tl:0 tr:0 bl:0 br:0" />
-				</Window>
-
-				<Window Type="TaharezLook/Editbox" Name="Demo8/Window1/Controls/Editbox">
-					<Property Name="UnifiedPosition" Value="{{0.05,0},{0.38,0}}"  />
-					<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-					<Property Name="UnifiedSize" Value="{{0.6,0},{0.15,0}}"  />
-				</Window>
-
-                <Window Type="TaharezLook/Button" Name="Demo8/Window1/Controls/Add">
-					<Property Name="UnifiedPosition" Value="{{0.68,0},{0.38,0}}"  />
-					<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-					<Property Name="UnifiedSize" Value="{{0.3,0},{0.15,0}}"  />
-					<Property Name="Text" Value="Add" />
-				</Window>
-
-                <Window Type="TaharezLook/StaticText" Name="Demo8/Window1/Controls/ins1">
-					<Property Name="UnifiedPosition" Value="{{0.05,0},{0.55,0}}"  />
-					<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-					<Property Name="UnifiedSize" Value="{{0.9,0},{0.4,0}}"  />
-					<Property Name="HorzFormatting" Value="WordWrapCentred" />
-					<Property Name="Text" Value="Use this panel to add items.  The scrollbars change the selection colour." />
-				</Window>
-
-			</Window>
-			
-		</Window>
-
-        <Window Type="TaharezLook/FrameWindow" Name="Demo8/Window2">
-			<Property Name="UnifiedPosition" Value="{{0.55,0},{0.1,0}}"  />
-			<Property Name="UnifiedMaxSize" Value="{{0.5,0},{1,0}}" />
-			<Property Name="UnifiedMinSize" Value="{{0,128},{0,128}}" />
-			<Property Name="UnifiedSize" Value="{{0.4,0},{0.3,0}}"  />
-			<Property Name="Text" Value="Demo 8 - Information Window" />
-
-            <Window Type="TaharezLook/StaticText" Name="Demo8/Window2/Info">
-				<Property Name="UnifiedPosition" Value="{{0.05,0},{0.1,0}}"  />
-				<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-				<Property Name="UnifiedSize" Value="{{0.9,0},{0.3,0}}"  />
-				<Property Name="HorzFormatting" Value="WordWrapCentred" />
-				<Property Name="Text" Value="The panel below gives some information about the item under the mouse." />
-			</Window>
-	
-            <Window Type="TaharezLook/StaticText" Name="Demo8/Window2/Tips">
-				<Property Name="UnifiedPosition" Value="{{0.05,0},{0.5,0}}"  />
-				<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-				<Property Name="UnifiedSize" Value="{{0.9,0},{0.4,0}}"  />
-				<Property Name="HorzFormatting" Value="WordWrapCentred" />
-			</Window>
-
-		</Window>
-
-
-	</Window>
-
-</Window>
-
-</GUILayout>
Index: code/branches/gamestate/data/gui/layouts/facial.layout
===================================================================
--- code/branches/gamestate/data/gui/layouts/facial.layout	(revision 6430)
+++ 	(revision )
@@ -1,379 +1,0 @@
-<?xml version="1.0" ?>
-<GUILayout>
-<Window Type="DefaultGUISheet" Name="root">
-    <Window Type="DefaultGUISheet" Name="FacialDemo">
-		<Property Name="UnifiedSize" Value="{{0.25,0},{1,0}}" />
-
-		<Window Type="TaharezLook/FrameWindow" Name="OgreGuiDemo/WindowPropertiesWindow">
-
-			<Property Name="UnifiedSize" Value="{{0,200},{0,400}}" />
-            <Property Name="UnifiedPosition" Value="{{0,0},{0,0.52}}" />
-            <Property Name="TitlebarEnabled" Value="false" />
-            <Property Name="CloseButtonEnabled" Value="false" />
-			<Property Name="Text" Value="Editor Window" />
-			<Window Type="TaharezLook/RadioButton" Name="Facial/Radio/Play">
-				<Property Name="Font" Value="BlueHighway-12"/>
-
-				<Property Name="UnifiedPosition" Value="{{0,15},{0,5}}" />
-				<Property Name="UnifiedSize" Value="{{0,90},{0,40}}" />
-                <Property Name="Text" Value="Animation" />
-            </Window>
-			<Window Type="TaharezLook/RadioButton" Name="Facial/Radio/Manual">
-				<Property Name="Font" Value="BlueHighway-12"/>
-
-                <Property Name="UnifiedPosition" Value="{{0,110},{0,5}}" />
-				<Property Name="UnifiedSize" Value="{{0,90},{0,40}}" />
-                <Property Name="Text" Value="Manual" />
-			</Window>				
-			<Window Type="TaharezLook/StaticText" Name="Facial/Expressions">
-				<Property Name="FrameEnabled" Value="False"/>
-				<Property Name="BackgroundEnabled" Value="False"/>
-				<Property Name="Font" Value="BlueHighway-12"/>
-
-				<Property Name="UnifiedPosition" Value="{{0,5},{0,35}}" />
-				<Property Name="UnifiedSize" Value="{{0,190},{0,40}}" />
-                <Property Name="Text" Value="Expressions" />
-            </Window>
-			<Window Type="TaharezLook/StaticText" Name="Facial/Happy_Label">
-				<Property Name="FrameEnabled" Value="False"/>
-				<Property Name="BackgroundEnabled" Value="False"/>
-				<Property Name="Font" Value="BlueHighway-12"/>
-
-				<Property Name="UnifiedPosition" Value="{{0,5},{0,55}}" />
-				<Property Name="UnifiedSize" Value="{{0,60},{0,40}}" />
-                <Property Name="Text" Value="Happy" />
-            </Window>
-			<Window Type="TaharezLook/HorizontalScrollbar" Name="Facial/Happy_Scroll">
-
-                <Property Name="UnifiedPosition" Value="{{0,60},{0,75}}" />
-				<Property Name="UnifiedSize" Value="{{0,120},{0,10}}" />
-				<Property Name="DocumentSize" Value="1.1" />
-				<Property Name="PageSize" Value="0.1" />
-				<Property Name="StepSize" Value="0.05" />
-				<Property Name="OverlapSize" Value="0.05" />
-            </Window>
-			<Window Type="TaharezLook/StaticText" Name="Facial/Sad_Label">
-				<Property Name="FrameEnabled" Value="False"/>
-				<Property Name="BackgroundEnabled" Value="False"/>
-				<Property Name="Font" Value="BlueHighway-12"/>
-
-				<Property Name="UnifiedPosition" Value="{{0,5},{0,70}}" />
-				<Property Name="UnifiedSize" Value="{{0,60},{0,40}}" />
-                <Property Name="Text" Value="Sad" />
-            </Window>
-			<Window Type="TaharezLook/HorizontalScrollbar" Name="Facial/Sad_Scroll">
-
-				<Property Name="UnifiedPosition" Value="{{0,60},{0,90}}" />
-				<Property Name="UnifiedSize" Value="{{0,120},{0,10}}" />
-				<Property Name="DocumentSize" Value="1.1" />
-				<Property Name="PageSize" Value="0.1" />
-				<Property Name="StepSize" Value="0.05" />
-				<Property Name="OverlapSize" Value="0.05" />
-            </Window>
-			<Window Type="TaharezLook/StaticText" Name="Facial/Angry_Label">
-				<Property Name="FrameEnabled" Value="False"/>
-				<Property Name="BackgroundEnabled" Value="False"/>
-				<Property Name="Font" Value="BlueHighway-12"/>
-
-                <Property Name="UnifiedPosition" Value="{{0,5},{0,85}}" />
-				<Property Name="UnifiedSize" Value="{{0,60},{0,40}}" />
-                <Property Name="Text" Value="Angry" />
-            </Window>
-			<Window Type="TaharezLook/HorizontalScrollbar" Name="Facial/Angry_Scroll">
-
-                <Property Name="UnifiedPosition" Value="{{0,60},{0,105}}" />
-				<Property Name="UnifiedSize" Value="{{0,120},{0,10}}" />
-				<Property Name="DocumentSize" Value="1.1" />
-				<Property Name="PageSize" Value="0.1" />
-				<Property Name="StepSize" Value="0.05" />
-				<Property Name="OverlapSize" Value="0.05" />
-			</Window>
-
-			<Window Type="TaharezLook/StaticText" Name="Facial/MouthShapes">
-				<Property Name="FrameEnabled" Value="False"/>
-				<Property Name="BackgroundEnabled" Value="False"/>
-				<Property Name="Font" Value="BlueHighway-12"/>
-
-				<Property Name="UnifiedPosition" Value="{{0,5},{0,110}}" />
-				<Property Name="UnifiedSize" Value="{{0,150},{0,40}}" />
-                <Property Name="Text" Value="Mouth Shapes" />
-            </Window>
-
-			<Window Type="TaharezLook/StaticText" Name="Facial/A_Label">
-				<Property Name="FrameEnabled" Value="False"/>
-				<Property Name="BackgroundEnabled" Value="False"/>
-				<Property Name="Font" Value="BlueHighway-12"/>
-
-                <Property Name="UnifiedPosition" Value="{{0,25},{0,135}}" />
-				<Property Name="UnifiedSize" Value="{{0,30},{0,40}}" />
-                <Property Name="Text" Value="A" />
-            </Window>
-			<Window Type="TaharezLook/HorizontalScrollbar" Name="Facial/A_Scroll">
-
-				<Property Name="UnifiedPosition" Value="{{0,60},{0,150}}" />
-				<Property Name="UnifiedSize" Value="{{0,120},{0,10}}" />
-				<Property Name="DocumentSize" Value="1.1" />
-				<Property Name="PageSize" Value="0.1" />
-				<Property Name="StepSize" Value="0.05" />
-				<Property Name="OverlapSize" Value="0.05" />
-            </Window>
-			<Window Type="TaharezLook/StaticText" Name="Facial/E_Label">
-				<Property Name="FrameEnabled" Value="False"/>
-				<Property Name="BackgroundEnabled" Value="False"/>
-				<Property Name="Font" Value="BlueHighway-12"/>
-
-				<Property Name="UnifiedPosition" Value="{{0,25},{0,150}}" />
-				<Property Name="UnifiedSize" Value="{{0,30},{0,40}}" />
-                <Property Name="Text" Value="E" />
-            </Window>
-			<Window Type="TaharezLook/HorizontalScrollbar" Name="Facial/E_Scroll">
-
-				<Property Name="UnifiedPosition" Value="{{0,60},{0,165}}" />
-				<Property Name="UnifiedSize" Value="{{0,120},{0,10}}" />
-				<Property Name="DocumentSize" Value="1.1" />
-				<Property Name="PageSize" Value="0.1" />
-				<Property Name="StepSize" Value="0.05" />
-				<Property Name="OverlapSize" Value="0.05" />
-            </Window>
-			<Window Type="TaharezLook/StaticText" Name="Facial/I_Label">
-				<Property Name="FrameEnabled" Value="False"/>
-				<Property Name="BackgroundEnabled" Value="False"/>
-				<Property Name="Font" Value="BlueHighway-12"/>
-
-                <Property Name="UnifiedPosition" Value="{{0,25},{0,165}}" />
-				<Property Name="UnifiedSize" Value="{{0,30},{0,40}}" />
-                <Property Name="Text" Value="I" />
-            </Window>
-			<Window Type="TaharezLook/HorizontalScrollbar" Name="Facial/I_Scroll">
-
-                <Property Name="UnifiedPosition" Value="{{0,60},{0,180}}" />
-				<Property Name="UnifiedSize" Value="{{0,120},{0,10}}" />
-				<Property Name="DocumentSize" Value="1.1" />
-				<Property Name="PageSize" Value="0.1" />
-				<Property Name="StepSize" Value="0.05" />
-				<Property Name="OverlapSize" Value="0.05" />
-            </Window>
-			<Window Type="TaharezLook/StaticText" Name="Facial/O_Label">
-				<Property Name="FrameEnabled" Value="False"/>
-				<Property Name="BackgroundEnabled" Value="False"/>
-				<Property Name="Font" Value="BlueHighway-12"/>
-
-				<Property Name="UnifiedPosition" Value="{{0,25},{0,180}}" />
-				<Property Name="UnifiedSize" Value="{{0,30},{0,40}}" />
-                <Property Name="Text" Value="O" />
-            </Window>
-			<Window Type="TaharezLook/HorizontalScrollbar" Name="Facial/O_Scroll">
-
-                <Property Name="UnifiedPosition" Value="{{0,60},{0,195}}" />
-				<Property Name="UnifiedSize" Value="{{0,120},{0,10}}" />
-				<Property Name="DocumentSize" Value="1.1" />
-				<Property Name="PageSize" Value="0.1" />
-				<Property Name="StepSize" Value="0.05" />
-				<Property Name="OverlapSize" Value="0.05" />
-            </Window>
-			<Window Type="TaharezLook/StaticText" Name="Facial/U_Label">
-				<Property Name="FrameEnabled" Value="False"/>
-				<Property Name="BackgroundEnabled" Value="False"/>
-				<Property Name="Font" Value="BlueHighway-12"/>
-
-                <Property Name="UnifiedPosition" Value="{{0,25},{0,195}}" />
-				<Property Name="UnifiedSize" Value="{{0,30},{0,40}}" />
-                <Property Name="Text" Value="U" />
-            </Window>
-			<Window Type="TaharezLook/HorizontalScrollbar" Name="Facial/U_Scroll">
-
-                <Property Name="UnifiedPosition" Value="{{0,60},{0,210}}" />
-				<Property Name="UnifiedSize" Value="{{0,120},{0,10}}" />
-				<Property Name="DocumentSize" Value="1.1" />
-				<Property Name="PageSize" Value="0.1" />
-				<Property Name="StepSize" Value="0.05" />
-				<Property Name="OverlapSize" Value="0.05" />
-            </Window>
-			<Window Type="TaharezLook/StaticText" Name="Facial/C_Label">
-				<Property Name="FrameEnabled" Value="False"/>
-				<Property Name="BackgroundEnabled" Value="False"/>
-				<Property Name="Font" Value="BlueHighway-12"/>
-
-                <Property Name="UnifiedPosition" Value="{{0,25},{0,210}}" />
-				<Property Name="UnifiedSize" Value="{{0,30},{0,40}}" />
-                <Property Name="Text" Value="C" />
-            </Window>
-			<Window Type="TaharezLook/HorizontalScrollbar" Name="Facial/C_Scroll">
-
-                <Property Name="UnifiedPosition" Value="{{0,60},{0,225}}" />
-				<Property Name="UnifiedSize" Value="{{0,120},{0,10}}" />
-				<Property Name="DocumentSize" Value="1.1" />
-				<Property Name="PageSize" Value="0.1" />
-				<Property Name="StepSize" Value="0.05" />
-				<Property Name="OverlapSize" Value="0.05" />
-			</Window>
-			<Window Type="TaharezLook/StaticText" Name="Facial/W_Label">
-				<Property Name="FrameEnabled" Value="False"/>
-				<Property Name="BackgroundEnabled" Value="False"/>
-				<Property Name="Font" Value="BlueHighway-12"/>
-
-				<Property Name="UnifiedPosition" Value="{{0,25},{0,225}}" />
-				<Property Name="UnifiedSize" Value="{{0,30},{0,40}}" />
-                <Property Name="Text" Value="W" />
-            </Window>
-			<Window Type="TaharezLook/HorizontalScrollbar" Name="Facial/W_Scroll">
-
-                <Property Name="UnifiedPosition" Value="{{0,60},{0,240}}" />
-				<Property Name="UnifiedSize" Value="{{0,120},{0,10}}" />
-				<Property Name="DocumentSize" Value="1.1" />
-				<Property Name="PageSize" Value="0.1" />
-				<Property Name="StepSize" Value="0.05" />
-				<Property Name="OverlapSize" Value="0.05" />
-            </Window>
-			<Window Type="TaharezLook/StaticText" Name="Facial/M_Label">
-				<Property Name="FrameEnabled" Value="False"/>
-				<Property Name="BackgroundEnabled" Value="False"/>
-				<Property Name="Font" Value="BlueHighway-12"/>
-
-                <Property Name="UnifiedPosition" Value="{{0,25},{0,240}}" />
-				<Property Name="UnifiedSize" Value="{{0,30},{0,40}}" />
-                <Property Name="Text" Value="M" />
-            </Window>
-			<Window Type="TaharezLook/HorizontalScrollbar" Name="Facial/M_Scroll">
-
-				<Property Name="UnifiedPosition" Value="{{0,60},{0,255}}" />
-				<Property Name="UnifiedSize" Value="{{0,120},{0,10}}" />
-				<Property Name="DocumentSize" Value="1.1" />
-				<Property Name="PageSize" Value="0.1" />
-				<Property Name="StepSize" Value="0.05" />
-				<Property Name="OverlapSize" Value="0.05" />
-            </Window>
-			<Window Type="TaharezLook/StaticText" Name="Facial/L_Label">
-				<Property Name="FrameEnabled" Value="False"/>
-				<Property Name="BackgroundEnabled" Value="False"/>
-				<Property Name="Font" Value="BlueHighway-12"/>
-
-                <Property Name="UnifiedPosition" Value="{{0,25},{0,255}}" />
-				<Property Name="UnifiedSize" Value="{{0,30},{0,40}}" />
-                <Property Name="Text" Value="L" />
-            </Window>
-			<Window Type="TaharezLook/HorizontalScrollbar" Name="Facial/L_Scroll">
-
-				<Property Name="UnifiedPosition" Value="{{0,60},{0,270}}" />
-				<Property Name="UnifiedSize" Value="{{0,120},{0,10}}" />
-				<Property Name="DocumentSize" Value="1.1" />
-				<Property Name="PageSize" Value="0.1" />
-				<Property Name="StepSize" Value="0.05" />
-				<Property Name="OverlapSize" Value="0.05" />
-            </Window>
-			<Window Type="TaharezLook/StaticText" Name="Facial/F_Label">
-				<Property Name="FrameEnabled" Value="False"/>
-				<Property Name="BackgroundEnabled" Value="False"/>
-				<Property Name="Font" Value="BlueHighway-12"/>
-
-                <Property Name="UnifiedPosition" Value="{{0,25},{0,270}}" />
-				<Property Name="UnifiedSize" Value="{{0,30},{0,40}}" />
-                <Property Name="Text" Value="F" />
-            </Window>
-			<Window Type="TaharezLook/HorizontalScrollbar" Name="Facial/F_Scroll">
-
-                <Property Name="UnifiedPosition" Value="{{0,60},{0,285}}" />
-				<Property Name="UnifiedSize" Value="{{0,120},{0,10}}" />
-				<Property Name="DocumentSize" Value="1.1" />
-				<Property Name="PageSize" Value="0.1" />
-				<Property Name="StepSize" Value="0.05" />
-				<Property Name="OverlapSize" Value="0.05" />
-            </Window>
-			<Window Type="TaharezLook/StaticText" Name="Facial/T_Label">
-				<Property Name="FrameEnabled" Value="False"/>
-				<Property Name="BackgroundEnabled" Value="False"/>
-				<Property Name="Font" Value="BlueHighway-12"/>
-
-                <Property Name="UnifiedPosition" Value="{{0,25},{0,285}}" />
-				<Property Name="UnifiedSize" Value="{{0,30},{0,40}}" />
-                <Property Name="Text" Value="T" />
-            </Window>
-			<Window Type="TaharezLook/HorizontalScrollbar" Name="Facial/T_Scroll">
-
-				<Property Name="UnifiedPosition" Value="{{0,60},{0,300}}" />
-				<Property Name="UnifiedSize" Value="{{0,120},{0,10}}" />
-				<Property Name="DocumentSize" Value="1.1" />
-				<Property Name="PageSize" Value="0.1" />
-				<Property Name="StepSize" Value="0.05" />
-				<Property Name="OverlapSize" Value="0.05" />
-            </Window>
-			<Window Type="TaharezLook/StaticText" Name="Facial/P_Label">
-				<Property Name="FrameEnabled" Value="False"/>
-				<Property Name="BackgroundEnabled" Value="False"/>
-				<Property Name="Font" Value="BlueHighway-12"/>
-
-                <Property Name="UnifiedPosition" Value="{{0,25},{0,300}}" />
-				<Property Name="UnifiedSize" Value="{{0,30},{0,40}}" />
-                <Property Name="Text" Value="P" />
-            </Window>
-			<Window Type="TaharezLook/HorizontalScrollbar" Name="Facial/P_Scroll">
-
-                <Property Name="UnifiedPosition" Value="{{0,60},{0,315}}" />
-				<Property Name="UnifiedSize" Value="{{0,120},{0,10}}" />
-				<Property Name="DocumentSize" Value="1.1" />
-				<Property Name="PageSize" Value="0.1" />
-				<Property Name="StepSize" Value="0.05" />
-				<Property Name="OverlapSize" Value="0.05" />
-            </Window>
-			<Window Type="TaharezLook/StaticText" Name="Facial/R_Label">
-				<Property Name="FrameEnabled" Value="False"/>
-				<Property Name="BackgroundEnabled" Value="False"/>
-				<Property Name="Font" Value="BlueHighway-12"/>
-
-                <Property Name="UnifiedPosition" Value="{{0,25},{0,315}}" />
-				<Property Name="UnifiedSize" Value="{{0,30},{0,40}}" />
-                <Property Name="Text" Value="R" />
-            </Window>
-			<Window Type="TaharezLook/HorizontalScrollbar" Name="Facial/R_Scroll">
-
-                <Property Name="UnifiedPosition" Value="{{0,60},{0,330}}" />
-				<Property Name="UnifiedSize" Value="{{0,120},{0,10}}" />
-				<Property Name="DocumentSize" Value="1.1" />
-				<Property Name="PageSize" Value="0.1" />
-				<Property Name="StepSize" Value="0.05" />
-				<Property Name="OverlapSize" Value="0.05" />
-            </Window>
-			<Window Type="TaharezLook/StaticText" Name="Facial/S_Label">
-				<Property Name="FrameEnabled" Value="False"/>
-				<Property Name="BackgroundEnabled" Value="False"/>
-				<Property Name="Font" Value="BlueHighway-12"/>
-
-                <Property Name="UnifiedPosition" Value="{{0,25},{0,330}}" />
-				<Property Name="UnifiedSize" Value="{{0,30},{0,40}}" />
-                <Property Name="Text" Value="S" />
-            </Window>
-			<Window Type="TaharezLook/HorizontalScrollbar" Name="Facial/S_Scroll">
-
-                <Property Name="UnifiedPosition" Value="{{0,60},{0,345}}" />
-				<Property Name="UnifiedSize" Value="{{0,120},{0,10}}" />
-				<Property Name="DocumentSize" Value="1.1" />
-				<Property Name="PageSize" Value="0.1" />
-				<Property Name="StepSize" Value="0.05" />
-				<Property Name="OverlapSize" Value="0.05" />
-            </Window>
-			<Window Type="TaharezLook/StaticText" Name="Facial/TH_Label">
-				<Property Name="FrameEnabled" Value="False"/>
-				<Property Name="BackgroundEnabled" Value="False"/>
-				<Property Name="Font" Value="BlueHighway-12"/>
-
-                <Property Name="UnifiedPosition" Value="{{0,25},{0,345}}" />
-				<Property Name="UnifiedSize" Value="{{0,35},{0,40}}" />
-                <Property Name="Text" Value="TH" />
-            </Window>
-			<Window Type="TaharezLook/HorizontalScrollbar" Name="Facial/TH_Scroll">
-
-                <Property Name="UnifiedPosition" Value="{{0,60},{0,360}}" />
-				<Property Name="UnifiedSize" Value="{{0,120},{0,10}}" />
-				<Property Name="DocumentSize" Value="1.1" />
-				<Property Name="PageSize" Value="0.1" />
-				<Property Name="StepSize" Value="0.05" />
-				<Property Name="OverlapSize" Value="0.05" />
-            </Window>
-			
-			<!-- A, U, O, E, I, C, W, M, L, F, T, P, R, S, TH -->
-
-        </Window>
-	</Window>
-</Window>
-
-</GUILayout>
Index: code/branches/gamestate/data/gui/layouts/ogregui.layout
===================================================================
--- code/branches/gamestate/data/gui/layouts/ogregui.layout	(revision 6430)
+++ 	(revision )
@@ -1,79 +1,0 @@
-<?xml version="1.0" ?>
-<GUILayout>
-<Window Type="DefaultGUISheet" Name="root">
-    <Window Type="DefaultGUISheet" Name="OgreGuiDemo">
-		<Property Name="UnifiedSize" Value="{{0.25,0},{1,0}}" />
-
-        <Window Type="TaharezLook/TabControl" Name="OgreGuiDemo/TabCtrl">
-            <Property Name="UnifiedPosition" Value="{{0.0,0},{0.0,0}}" />
-            <Property Name="UnifiedSize" Value="{{1,0},{0.5,0}}" />
-
-            <Window Type="DefaultGUISheet" Name="OgreGuiDemo/TabCtrl/Page1">
-                <Property Name="Text" Value="File" />
-                <Window Type="TaharezLook/Button" Name="OgreGuiDemo/TabCtrl/Page1/NewButton">
-                    <Property Name="UnifiedPosition" Value="{{0.1,0},{0.1,0}}" />
-                    <Property Name="UnifiedSize" Value="{{0.8,0},{0.07,0}}" />
-                    <Property Name="Text" Value="New" />
-                </Window>
-                <Window Type="TaharezLook/Button" Name="OgreGuiDemo/TabCtrl/Page1/LoadButton">
-                    <Property Name="UnifiedPosition" Value="{{0.1,0},{0.2,0}}" />
-                    <Property Name="UnifiedSize" Value="{{0.8,0},{0.07,0}}" />
-                    <Property Name="Text" Value="Load Test Layout" />
-                </Window>
-                <Window Type="TaharezLook/Button" Name="OgreGuiDemo/TabCtrl/Page1/QuitButton">
-                    <Property Name="UnifiedPosition" Value="{{0.1,0},{0.3,0}}" />
-                    <Property Name="UnifiedSize" Value="{{0.8,0},{0.07,0}}" />
-                    <Property Name="Text" Value="Quit" />
-                </Window>
-            </Window>
-            <Window Type="DefaultGUISheet" Name="OgreGuiDemo/TabCtrl/Page2">
-                <Property Name="Text" Value="Objects" />
-                <Window Type="TaharezLook/Combobox" Name="OgreGuiDemo/TabCtrl/Page2/ObjectTypeList">
-                    <Property Name="UnifiedPosition" Value="{{0.1,0},{0.1,0}}" />
-                    <Property Name="UnifiedSize" Value="{{0.8,0},{0.5,0}}" />
-                    <Property Name="Text" Value="Select Type" />
-                    <Property Name="ClippedByParent" Value="false" />
-                    <Property Name="ReadOnly" Value="true" />
-                </Window>
-            </Window>
-        </Window>
-        <!--<Window Type="TaharezLook/FrameWindow" Name="OgreGuiDemo/WindowPropertiesWindow">
-            <Property Name="UnifiedSize" Value="{{1,0},{0.3,0}}" />
-            <Property Name="UnifiedPosition" Value="{{0,0},{0.52,0}}" />
-            <Property Name="TitlebarEnabled" Value="false" />
-            <Property Name="CloseButtonEnabled" Value="false" />
-            <Property Name="Visible" Value="false" />
-            <Property Name="Text" Value="Editor Window" />
-            <Window Type="TaharezLook/StaticText" Name="OgreGuiDemo/WindowProperties/NameText">
-                <Property Name="UnifiedPosition" Value="{{0.05,0},{0.2,0}}" />
-                <Property Name="UnifiedSize" Value="{{0.9,0},{0.4,0}}" />
-                <Property Name="Text" Value="Name:" />
-            </Window>
-
-            <Window Type="TaharezLook/Button" Name="OgreGuiDemo/WindowPropertiesWindow/OKButton">
-                <Property Name="UnifiedPosition" Value="{{0.15,0},{0.8,0}}" />
-                <Property Name="UnifiedSize" Value="{{0.3,0},{0.1,0}}" />
-                <Property Name="Text" Value="OK" />
-            </Window>
-            <Window Type="TaharezLook/Button" Name="OgreGuiDemo/WindowPropertiesWindow/CancelButton">
-                <Property Name="UnifiedPosition" Value="{{0.55,0},{0.8,0}}" />
-                <Property Name="UnifiedSize" Value="{{0.3,0},{0.1,0}}" />
-                <Property Name="Text" Value="Cancel" />
-            </Window>
-        </Window>-->
-	</Window>
-    <Window Type="DefaultGUISheet" Name="OgreGuiDemo2">
-		<Property Name="UnifiedSize" Value="{{0.75,0},{1,0}}" />
-		<Property Name="UnifiedPosition" Value="{{0.25,0},{0,0}}" />
-        <Window Type="TaharezLook/FrameWindow" Name="OgreGuiDemo2/MainWindow">
-            <Property Name="UnifiedSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedPosition" Value="{{0,0},{0,0}}" />
-            <Property Name="DragMovingEnabled" Value="false" />
-            <Property Name="RollUpEnabled" Value="false" />
-            <Property Name="CloseButtonEnabled" Value="false" />
-            <Property Name="Text" Value="Editor Window" />
-        </Window>
-    </Window>
-</Window>
-
-</GUILayout>
Index: code/branches/gamestate/data/gui/layouts/shadows.layout
===================================================================
--- code/branches/gamestate/data/gui/layouts/shadows.layout	(revision 6430)
+++ 	(revision )
@@ -1,247 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <Window Type="DefaultWindow" Name="Shadows" >
-        <Property Name="InheritsAlpha" Value="False" />
-        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-        <Window Type="TaharezLook/FrameWindow" Name="Shadows/Main" >
-            <Property Name="Font" Value="BlueHighway-12" />
-            <Property Name="Alpha" Value="0.5" />
-            <Property Name="FrameEnabled" Value="False" />
-            <Property Name="TitlebarFont" Value="BlueHighway-12" />
-            <Property Name="SizingEnabled" Value="False" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="TitlebarEnabled" Value="False" />
-            <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{0.797107,0},{0.148408,0}}" />
-            <Property Name="DragMovingEnabled" Value="False" />
-            <Property Name="CloseButtonEnabled" Value="False" />
-            <Window Type="TaharezLook/RadioButton" Name="Shadows/Stencil" >
-                <Property Name="ID" Value="1" />
-                <Property Name="Font" Value="BlueHighway-12" />
-                <Property Name="Text" Value="Stencil shadows" />
-                <Property Name="GroupID" Value="1" />
-                <Property Name="Tooltip" Value="Stencil Shadows: Geometric shadow volumes are generated from mesh silhouettes and extruded, shadowed areas calculated in the stencil buffer. Good on lower end hardware but cannot handle alpha or vertex programs that deform shape, and is too expensive at high poly counts. Sharp edged shadows." />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.00465426,0},{0.167892,0},{0.192628,0},{0.344774,0}}" />
-            </Window>
-            <Window Type="TaharezLook/RadioButton" Name="Shadows/Texture" >
-                <Property Name="ID" Value="2" />
-                <Property Name="Font" Value="BlueHighway-12" />
-                <Property Name="Text" Value="Texture shadows" />
-                <Property Name="GroupID" Value="1" />
-                <Property Name="Tooltip" Value="Texture Shadows: Shadow casters are rendered to a texture and this is later projected onto shadow receivers. More flexible,  handles alpha and deforming vertex programs, and texture shadow can be used in shaders for more advanced effects. Uses more GPU memory and fixed size can cause aliasing (but see projection options)" />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.00531136,0},{0.362541,0},{0.194019,0},{0.529099,0}}" />
-            </Window>
-            <Window Type="TaharezLook/StaticText" Name="Shadows/Label2" >
-                <Property Name="Font" Value="BlueHighway-12" />
-                <Property Name="Text" Value="Lighting:" />
-                <Property Name="TextColours" Value="tl:FFFFFF00 tr:FFFFFF00 bl:FFFFFF00 br:FFFFFF00" />
-                <Property Name="FrameEnabled" Value="False" />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.19234,0},{-0.0189824,0},{0.303863,0},{0.18662,0}}" />
-                <Property Name="BackgroundEnabled" Value="False" />
-            </Window>
-            <Window Type="TaharezLook/StaticText" Name="Shadows/Label1" >
-                <Property Name="Font" Value="BlueHighway-12" />
-                <Property Name="Text" Value="Technique:" />
-                <Property Name="TextColours" Value="tl:FFFFFF00 tr:FFFFFF00 bl:FFFFFF00 br:FFFFFF00" />
-                <Property Name="FrameEnabled" Value="False" />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.00658522,0},{-0.00904641,0},{0.160622,0},{0.186908,0}}" />
-                <Property Name="BackgroundEnabled" Value="False" />
-            </Window>
-            <Window Type="TaharezLook/RadioButton" Name="Shadows/Additive" >
-                <Property Name="ID" Value="3" />
-                <Property Name="Font" Value="BlueHighway-12" />
-                <Property Name="Text" Value="Additive" />
-                <Property Name="GroupID" Value="2" />
-                <Property Name="Tooltip" Value="Additive Lighting: Light is built up incrementally in the scene, and areas of shadow are masked out per light during the process. Much more realistic lighting model, taking into account multiple coloured lights and ambient contribution well, but more expensive since it can take more passes to render." />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.196723,0},{0.174711,0},{0.327724,0},{0.348675,0}}" />
-            </Window>
-            <Window Type="TaharezLook/RadioButton" Name="Shadows/Modulative" >
-                <Property Name="ID" Value="4" />
-                <Property Name="Font" Value="BlueHighway-12" />
-                <Property Name="Text" Value="Modulative" />
-                <Property Name="GroupID" Value="2" />
-                <Property Name="Tooltip" Value="Modulative shadows: Shadowed areas are uniformly darkened by a shadow colour after rendering the scene normally. A simple but inaccurate model, it works best when there is one dominant light source (e.g. outdoor daylight). Multiple lights exhibit overdarkening artefacts." />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.195901,0},{0.36936,0},{0.334983,0},{0.532604,0}}" />
-            </Window>
-            <Window Type="TaharezLook/StaticText" Name="Shadows/Desc" >
-                <Property Name="Font" Value="BlueHighway-10" />
-                <Property Name="Text" >
-</Property>
-                <Property Name="FrameEnabled" Value="False" />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="HorzFormatting" Value="WordWrapLeftAligned" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="VertFormatting" Value="TopAligned" />
-                <Property Name="UnifiedAreaRect" Value="{{-0.00124776,0},{0.534509,0},{0.998327,0},{1.00537,0}}" />
-            </Window>
-            <Window Type="TaharezLook/StaticImage" Name="Shadows/ProjectionGroup" >
-                <Property Name="Font" Value="BlueHighway-12" />
-                <Property Name="FrameEnabled" Value="False" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.318294,0},{0.0269328,0},{0.547929,0},{0.488323,0}}" />
-                <Property Name="BackgroundEnabled" Value="False" />
-                <Window Type="TaharezLook/StaticText" Name="Shadows/Label21" >
-                    <Property Name="Font" Value="BlueHighway-12" />
-                    <Property Name="Text" Value="Projection:" />
-                    <Property Name="TextColours" Value="tl:FFFFFF00 tr:FFFFFF00 bl:FFFFFF00 br:FFFFFF00" />
-                    <Property Name="FrameEnabled" Value="False" />
-                    <Property Name="InheritsAlpha" Value="False" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.0242767,0},{-0.00538364,0},{0.514109,0},{0.300338,0}}" />
-                    <Property Name="BackgroundEnabled" Value="False" />
-                </Window>
-                <Window Type="TaharezLook/Combobox" Name="Shadows/Projection" >
-                    <Property Name="Font" Value="BlueHighway-12" />
-                    <Property Name="Tooltip" Value="Projection: This is the basis for the shadow projection. A uniform projection is the simplest but can also cause aliasing close to the camera due to the finite resolution of the shadow texture. You can plug new ShadowCameraSetup classes to change the projection basis and distribute the shadow texture differently to compensate for this." />
-                    <Property Name="ReadOnly" Value="True" />
-                    <Property Name="InheritsAlpha" Value="False" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="ClippedByParent" Value="False" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.0215161,0},{0.406132,0},{1.00682,0},{4,0}}" />
-                    <Property Name="MaxEditTextLength" Value="1073741823" />
-                </Window>
-            </Window>
-            <Window Type="TaharezLook/StaticImage" Name="Shadows/MaterialGroup" >
-                <Property Name="Font" Value="BlueHighway-12" />
-                <Property Name="FrameEnabled" Value="False" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.554514,0},{0.0286934,0},{0.927227,0},{0.490084,0}}" />
-                <Property Name="BackgroundEnabled" Value="False" />
-                <Window Type="TaharezLook/StaticText" Name="Shadows/Label211" >
-                    <Property Name="Font" Value="BlueHighway-12" />
-                    <Property Name="Text" Value="Material Setup:" />
-                    <Property Name="TextColours" Value="tl:FFFFFF00 tr:FFFFFF00 bl:FFFFFF00 br:FFFFFF00" />
-                    <Property Name="FrameEnabled" Value="False" />
-                    <Property Name="InheritsAlpha" Value="False" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="ClippedByParent" Value="False" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.021516,0},{-0.158454,0},{0.862772,0},{0.387132,0}}" />
-                    <Property Name="BackgroundEnabled" Value="False" />
-                </Window>
-                <Window Type="TaharezLook/Combobox" Name="Shadows/Material" >
-                    <Property Name="Font" Value="BlueHighway-12" />
-                    <Property Name="Tooltip" Value="Material setup: You can customise materials texture shadows with material; you can modify the standard shadow passes, which are separate from the normal render, or you can use &apos;custom sequence&apos; shadows which allow you to incorporate shadow textures directly in your own materials, thus gaining complete control. Both can use shaders for effects like PCF / depth shadowmapping." />
-                    <Property Name="ReadOnly" Value="True" />
-                    <Property Name="InheritsAlpha" Value="False" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="ClippedByParent" Value="False" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.021516,0},{0.406132,0},{0.731289,0},{4,0}}" />
-                    <Property Name="MaxEditTextLength" Value="1073741823" />
-                </Window>
-            </Window>
-            <Window Type="TaharezLook/StaticImage" Name="Shadows/DepthShadowTweakGroup" >
-                <Property Name="Font" Value="BlueHighway-12" />
-                <Property Name="FrameEnabled" Value="False" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.825038,0},{0.0186838,0},{0.999281,0},{0.548657,0}}" />
-                <Property Name="BackgroundEnabled" Value="False" />
-                <Window Type="TaharezLook/StaticText" Name="Shadows/DepthShadowTweakGroup/FixedBiasLabel" >
-                    <Property Name="Font" Value="BlueHighway-10" />
-                    <Property Name="Text" Value="FixedBias:" />
-                    <Property Name="TextColours" Value="tl:FFFFFF00 tr:FFFFFF00 bl:FFFFFF00 br:FFFFFF00" />
-                    <Property Name="FrameEnabled" Value="False" />
-                    <Property Name="InheritsAlpha" Value="False" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="ClippedByParent" Value="False" />
-					<Property Name="UnifiedAreaRect" Value="{{0.0316741,0},{0.0,0},{0.373716,0},{0.2,0}}" />
-                    <Property Name="BackgroundEnabled" Value="False" />
-                </Window>
-                <Window Type="TaharezLook/HorizontalScrollbar" Name="Shadows/DepthShadowTweakGroup/FixedBias" >
-                    <Property Name="PageSize" Value="0.001" />
-                    <Property Name="StepSize" Value="0.0005" />
-                    <Property Name="OverlapSize" Value="0.0005" />
-                    <Property Name="DocumentSize" Value="0.021" />
-                    <Property Name="InheritsAlpha" Value="False" />
-                    <Property Name="ScrollPosition" Value="0" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="ClippedByParent" Value="False" />
-					<Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.0,0},{1,0},{0.15,0}}" />
-                </Window>
-                <Window Type="TaharezLook/StaticText" Name="Shadows/DepthShadowTweakGroup/FixedBiasText" >
-                    <Property Name="Font" Value="BlueHighway-10" />
-					<Property Name="Text" Value="" />
-                    <Property Name="FrameEnabled" Value="False" />
-                    <Property Name="InheritsAlpha" Value="False" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-					<Property Name="UnifiedAreaRect" Value="{{0.70,0},{0.125,0},{0.943746,0},{0.3,0}}" />
-                    <Property Name="BackgroundEnabled" Value="False" />
-                </Window>
-                <Window Type="TaharezLook/StaticText" Name="Shadows/DepthShadowTweakGroup/SlopeBiasLabel" >
-                    <Property Name="Font" Value="BlueHighway-10" />
-                    <Property Name="Text" Value="SlopeBias:" />
-                    <Property Name="TextColours" Value="tl:FFFFFF00 tr:FFFFFF00 bl:FFFFFF00 br:FFFFFF00" />
-                    <Property Name="FrameEnabled" Value="False" />
-                    <Property Name="InheritsAlpha" Value="False" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="ClippedByParent" Value="False" />
-					<Property Name="UnifiedAreaRect" Value="{{0.0316741,0},{0.35,0},{0.373716,0},{0.55,0}}" />
-                    <Property Name="BackgroundEnabled" Value="False" />
-                </Window>
-                <Window Type="TaharezLook/HorizontalScrollbar" Name="Shadows/DepthShadowTweakGroup/SlopeBias" >
-                    <Property Name="PageSize" Value="0.1" />
-                    <Property Name="StepSize" Value="0.05" />
-                    <Property Name="OverlapSize" Value="0.05" />
-                    <Property Name="DocumentSize" Value="2.1" />
-                    <Property Name="InheritsAlpha" Value="False" />
-                    <Property Name="ScrollPosition" Value="0" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="ClippedByParent" Value="False" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.35,0},{1,0},{0.5,0}}" />
-                </Window>
-				<Window Type="TaharezLook/StaticText" Name="Shadows/DepthShadowTweakGroup/SlopeBiasText" >
-                    <Property Name="Font" Value="BlueHighway-10" />
-					<Property Name="Text" Value="" />
-                    <Property Name="FrameEnabled" Value="False" />
-                    <Property Name="InheritsAlpha" Value="False" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-					<Property Name="UnifiedAreaRect" Value="{{0.70,0},{0.475,0},{0.943746,0},{0.675,0}}" />
-                    <Property Name="BackgroundEnabled" Value="False" />
-                </Window>
-				<Window Type="TaharezLook/StaticText" Name="Shadows/DepthShadowTweakGroup/SlopeClampLabel" >
-                    <Property Name="Font" Value="BlueHighway-10" />
-					<Property Name="Text" Value="Clamp:" />
-                    <Property Name="TextColours" Value="tl:FFFFFF00 tr:FFFFFF00 bl:FFFFFF00 br:FFFFFF00" />
-                    <Property Name="FrameEnabled" Value="False" />
-                    <Property Name="InheritsAlpha" Value="False" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="ClippedByParent" Value="False" />
-					<Property Name="UnifiedAreaRect" Value="{{0.0316741,0},{0.675,0},{0.472153,0},{0.85,0}}" />
-                    <Property Name="BackgroundEnabled" Value="False" />
-                </Window>
-                <Window Type="TaharezLook/HorizontalScrollbar" Name="Shadows/DepthShadowTweakGroup/SlopeClamp" >
-                    <Property Name="PageSize" Value="0.01" />
-                    <Property Name="StepSize" Value="0.005" />
-                    <Property Name="OverlapSize" Value="0.005" />
-                    <Property Name="DocumentSize" Value="0.11" />
-                    <Property Name="InheritsAlpha" Value="False" />
-                    <Property Name="ScrollPosition" Value="0" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="ClippedByParent" Value="False" />
-					<Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.7,0},{1,0},{0.85,0}}" />
-                </Window>
-				<Window Type="TaharezLook/StaticText" Name="Shadows/DepthShadowTweakGroup/SlopeClampText" >
-                    <Property Name="Font" Value="BlueHighway-10" />
-					<Property Name="Text" Value="" />
-                    <Property Name="FrameEnabled" Value="False" />
-                    <Property Name="InheritsAlpha" Value="False" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-					<Property Name="UnifiedAreaRect" Value="{{0.70,0},{0.825,0},{0.943746,0},{0.99,0}}" />
-                    <Property Name="BackgroundEnabled" Value="False" />
-                </Window>
-            </Window>
-        </Window>
-    </Window>
-</GUILayout>
