Index: de/branches/gamestates2/data/gui/configs/Falagard.xsd
===================================================================
--- /code/branches/gamestates2/data/gui/configs/Falagard.xsd	(revision 6594)
+++ 	(revision )
@@ -1,391 +1,0 @@
-<?xml version="1.0" ?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-	<xsd:element name="Falagard" type="falagardSpecificationType" />
-	<xsd:complexType name="falagardSpecificationType">
-		<xsd:sequence>
-			<xsd:element name="WidgetLook" type="widgetLookType" minOccurs="0" maxOccurs="unbounded" />
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:complexType name="widgetLookType">
-		<xsd:sequence>
-            <xsd:element name="PropertyDefinition" type="propertyDefinitionType" minOccurs="0" maxOccurs="unbounded" />
-            <xsd:element name="PropertyLinkDefinition" type="propertyLinkDefinitionType" minOccurs="0" maxOccurs="unbounded" />
-            <xsd:element name="Property" type="propertyType" minOccurs="0" maxOccurs="unbounded" />
-            <xsd:element name="NamedArea" type="namedAreaType" minOccurs="0" maxOccurs="unbounded" />
-			<xsd:element name="Child" type="widgetComponentType" minOccurs="0" maxOccurs="unbounded" />
-			<xsd:element name="ImagerySection" type="imagerySectionType" minOccurs="0" maxOccurs="unbounded" />
-			<xsd:element name="StateImagery" type="stateType" minOccurs="0" maxOccurs="unbounded" />
-		</xsd:sequence>
-		<xsd:attribute name="name" type="xsd:string" use="required" />
-	</xsd:complexType>
-    <xsd:complexType name="propertyDefinitionType">
-        <xsd:attribute name="type" type="propertyTypeEnum" use="optional" default="Generic" />
-        <xsd:attribute name="name" type="xsd:string" use="required" />
-        <xsd:attribute name="initialValue" type="xsd:string" use="optional" default="" />
-        <xsd:attribute name="layoutOnWrite" type="xsd:boolean" use="optional" default="false" />
-        <xsd:attribute name="redrawOnWrite" type="xsd:boolean" use="optional" default="false" />
-    </xsd:complexType>
-    <xsd:complexType name="propertyLinkDefinitionType">
-        <xsd:attribute name="type" type="propertyTypeEnum" use="optional" default="Generic" />
-        <xsd:attribute name="name" type="xsd:string" use="required" />
-        <xsd:attribute name="widget" type="xsd:string" use="required" />
-        <xsd:attribute name="targetProperty" type="xsd:string" use="optional" default="" />
-        <xsd:attribute name="initialValue" type="xsd:string" use="optional" default="" />
-        <xsd:attribute name="layoutOnWrite" type="xsd:boolean" use="optional" default="false" />
-        <xsd:attribute name="redrawOnWrite" type="xsd:boolean" use="optional" default="false" />
-    </xsd:complexType>
-    <xsd:complexType name="namedAreaType">
-        <xsd:sequence>
-            <xsd:element name="Area" type="componentAreaType" />
-        </xsd:sequence>
-        <xsd:attribute name="name" type="xsd:string" use="required" />
-    </xsd:complexType>
-	<xsd:complexType name="stateType">
-		<xsd:sequence>
-			<xsd:element name="Layer" type="layerType" minOccurs="0" maxOccurs="unbounded" />
-		</xsd:sequence>
-		<xsd:attribute name="name" type="xsd:string" use="required" />
-        <xsd:attribute name="clipped" type="xsd:boolean" use="optional" default="true" />
-	</xsd:complexType>
-	<xsd:complexType name="layerType">
-		<xsd:sequence>
-			<xsd:element name="Section" type="sectionSpecType" minOccurs="0" maxOccurs="unbounded" />
-		</xsd:sequence>
-		<xsd:attribute name="priority" type="xsd:integer" use="optional" default="0" />
-	</xsd:complexType>
-    <xsd:complexType name="sectionSpecType">
-        <xsd:choice  minOccurs="0" maxOccurs="1">
-            <xsd:element name="Colour" type="colourType" />
-            <xsd:element name="Colours" type="colourRectType" />
-            <xsd:element name="ColourProperty" type="settingByPropertyType" />
-            <xsd:element name="ColourRectProperty" type="settingByPropertyType" />
-        </xsd:choice>
-        <xsd:attribute name="look" type="xsd:string" use="optional" default="" />
-        <xsd:attribute name="section" type="xsd:string" use="required" />
-        <xsd:attribute name="controlProperty" type="xsd:string" use="optional" default="" />
-    </xsd:complexType>
-	<xsd:complexType name="imagerySectionType">
-		<xsd:sequence>
-            <xsd:choice  minOccurs="0" maxOccurs="1">
-                <xsd:element name="Colour" type="colourType" />
-                <xsd:element name="Colours" type="colourRectType" />
-                <xsd:element name="ColourProperty" type="settingByPropertyType" />
-                <xsd:element name="ColourRectProperty" type="settingByPropertyType" />
-            </xsd:choice>
-            <xsd:element name="FrameComponent" type="frameComponentType" minOccurs="0" maxOccurs="unbounded" />
-			<xsd:element name="ImageryComponent" type="imageryComponentType" minOccurs="0" maxOccurs="unbounded" />
-            <xsd:element name="TextComponent" type="textComponentType" minOccurs="0" maxOccurs="unbounded" />
-		</xsd:sequence>
-		<xsd:attribute name="name" type="xsd:string" use="required" />
-	</xsd:complexType>
-    <xsd:complexType name="frameComponentType">
-        <xsd:sequence>
-            <xsd:element name="Area" type="componentAreaType" />
-            <xsd:element name="Image" type="frameImageType" minOccurs="0" maxOccurs="9" />
-            <xsd:choice  minOccurs="0" maxOccurs="1">
-                <xsd:element name="Colour" type="colourType" />
-                <xsd:element name="Colours" type="colourRectType" />
-                <xsd:element name="ColourProperty" type="settingByPropertyType" />
-                <xsd:element name="ColourRectProperty" type="settingByPropertyType" />
-            </xsd:choice>
-            <xsd:choice  minOccurs="0" maxOccurs="1">
-                <xsd:element name="VertFormat" type="vertFormatType" />
-                <xsd:element name="VertFormatProperty" type="settingByPropertyType" />
-            </xsd:choice>
-            <xsd:choice  minOccurs="0" maxOccurs="1">
-                <xsd:element name="HorzFormat" type="horzFormatType" />
-                <xsd:element name="HorzFormatProperty" type="settingByPropertyType" />
-            </xsd:choice>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="textComponentType">
-        <xsd:sequence>
-            <xsd:element name="Area" type="componentAreaType" />
-            <xsd:element name="Text" type="textStringType" minOccurs="0" maxOccurs="1" />
-            <xsd:element name="TextProperty" type="textPropertyType" minOccurs="0" maxOccurs="1" />
-            <xsd:element name="FontProperty" type="fontPropertyType" minOccurs="0" maxOccurs="1" />
-            <xsd:choice  minOccurs="0" maxOccurs="1">
-                <xsd:element name="Colour" type="colourType" />
-                <xsd:element name="Colours" type="colourRectType" />
-                <xsd:element name="ColourProperty" type="settingByPropertyType" />
-                <xsd:element name="ColourRectProperty" type="settingByPropertyType" />
-            </xsd:choice>
-            <xsd:choice  minOccurs="0" maxOccurs="1">
-                <xsd:element name="VertFormat" type="vertTextFormatType" />
-                <xsd:element name="VertFormatProperty" type="settingByPropertyType" />
-            </xsd:choice>
-            <xsd:choice  minOccurs="0" maxOccurs="1">
-                <xsd:element name="HorzFormat" type="horzTextFormatType" />
-                <xsd:element name="HorzFormatProperty" type="settingByPropertyType" />
-            </xsd:choice>
-        </xsd:sequence>
-    </xsd:complexType>
-	<xsd:complexType name="imageryComponentType">
-		<xsd:sequence>
-			<xsd:element name="Area" type="componentAreaType" />
-            <xsd:choice>
-                <xsd:element name="Image" type="imageType" />
-                <xsd:element name="ImageProperty" type="settingByPropertyType" />
-            </xsd:choice>
-            <xsd:choice  minOccurs="0" maxOccurs="1">
-                <xsd:element name="Colour" type="colourType" />
-                <xsd:element name="Colours" type="colourRectType" />
-                <xsd:element name="ColourProperty" type="settingByPropertyType" />
-                <xsd:element name="ColourRectProperty" type="settingByPropertyType" />
-            </xsd:choice>
-            <xsd:choice  minOccurs="0" maxOccurs="1">
-                <xsd:element name="VertFormat" type="vertFormatType" />
-                <xsd:element name="VertFormatProperty" type="settingByPropertyType" />
-            </xsd:choice>
-            <xsd:choice  minOccurs="0" maxOccurs="1">
-                <xsd:element name="HorzFormat" type="horzFormatType" />
-                <xsd:element name="HorzFormatProperty" type="settingByPropertyType" />
-            </xsd:choice>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:complexType name="widgetComponentType">
-		<xsd:sequence>
-			<xsd:element name="Area" type="componentAreaType" />
-			<xsd:element name="VertAlignment" type="vertAlignmentType" minOccurs="0" maxOccurs="1" />
-			<xsd:element name="HorzAlignment" type="horzAlignmentType" minOccurs="0" maxOccurs="1" />
-			<xsd:element name="Property" type="propertyType" minOccurs="0" maxOccurs="unbounded" />
-		</xsd:sequence>
-		<xsd:attribute name="type" type="xsd:string" use="required" />
-		<xsd:attribute name="nameSuffix" type="xsd:string" use="required" />
-		<xsd:attribute name="renderer" type="xsd:string" use="optional" default="" />
-		<xsd:attribute name="look" type="xsd:string" use="optional" default="" />
-	</xsd:complexType>
-	<xsd:complexType name="horzFormatType">
-		<xsd:attribute name="type" type="horzFormatEnum" use="required" />
-	</xsd:complexType>
-	<xsd:complexType name="vertFormatType">
-		<xsd:attribute name="type" type="vertFormatEnum" use="required" />
-	</xsd:complexType>
-        <xsd:complexType name="horzTextFormatType">
-		<xsd:attribute name="type" type="horzTextFormatEnum" use="required" />
-	</xsd:complexType>
-	<xsd:complexType name="vertTextFormatType">
-		<xsd:attribute name="type" type="vertTextFormatEnum" use="required" />
-	</xsd:complexType>
-	<xsd:complexType name="horzAlignmentType">
-		<xsd:attribute name="type" type="horzAlignmentEnum" use="required" />
-	</xsd:complexType>
-	<xsd:complexType name="vertAlignmentType">
-		<xsd:attribute name="type" type="vertAlignmentEnum" use="required" />
-	</xsd:complexType>
-	<xsd:complexType name="propertyType">
-		<xsd:attribute name="name" type="xsd:string" use="required" />
-		<xsd:attribute name="value" type="xsd:string" use="required" />
-	</xsd:complexType>
-	<xsd:complexType name="imageType">
-		<xsd:attribute name="imageset" type="xsd:string" use="required" />
-		<xsd:attribute name="image" type="xsd:string" use="required" />
-	</xsd:complexType>
-    <xsd:complexType name="frameImageType">
-        <xsd:attribute name="type" type="frameImageComponentEnum" use="required" />
-        <xsd:attribute name="imageset" type="xsd:string" use="required" />
-        <xsd:attribute name="image" type="xsd:string" use="required" />
-    </xsd:complexType>
-	<xsd:complexType name="componentAreaType">
-        <xsd:choice>
-            <xsd:sequence>
-                <xsd:element name="Dim" type="dimensionType" minOccurs="4" maxOccurs="4" />
-            </xsd:sequence>
-            <xsd:element name="AreaProperty" type="settingByPropertyType" />
-        </xsd:choice>
-	</xsd:complexType>
-	<xsd:complexType name="dimensionType">
-		<xsd:choice>
-			<xsd:element name="UnifiedDim" type="unifiedDimType" />
-			<xsd:element name="AbsoluteDim" type="absoluteDimType" />
-			<xsd:element name="ImageDim" type="imageDimType" />
-            <xsd:element name="WidgetDim" type="widgetDimType" />
-            <xsd:element name="FontDim" type="fontDimType" />
-            <xsd:element name="PropertyDim" type="propertyDimType" />
-		</xsd:choice>
-		<xsd:attribute name="type" type="dimensionTypeEnum" use="required" />
-	</xsd:complexType>
-    <xsd:complexType name="fontDimType">
-        <xsd:sequence>
-            <xsd:element name="DimOperator" type="dimensionOperatorType" minOccurs="0" maxOccurs="1" />
-        </xsd:sequence>
-        <xsd:attribute name="widget" type="xsd:string" use="optional" default="" />
-        <xsd:attribute name="font" type="xsd:string" use="optional" default="" />
-        <xsd:attribute name="string" type="xsd:string" use="optional" default="" />
-        <xsd:attribute name="type" type="fontMetricTypeEnum" use="required" />
-        <xsd:attribute name="padding" type="xsd:decimal" use="optional" default="0" />
-    </xsd:complexType>
-    <xsd:complexType name="propertyDimType">
-        <xsd:sequence>
-            <xsd:element name="DimOperator" type="dimensionOperatorType" minOccurs="0" maxOccurs="1" />
-        </xsd:sequence>
-        <xsd:attribute name="widget" type="xsd:string" use="optional" default="" />
-        <xsd:attribute name="name" type="xsd:string" use="required" />
-    </xsd:complexType>
-	<xsd:complexType name="unifiedDimType">
-        <xsd:sequence>
-            <xsd:element name="DimOperator" type="dimensionOperatorType" minOccurs="0" maxOccurs="1" />
-        </xsd:sequence>
-		<xsd:attribute name="scale" type="xsd:decimal" use="optional" default="0" />
-		<xsd:attribute name="offset" type="xsd:integer" use="optional" default="0" />
-		<xsd:attribute name="type" type="dimensionTypeEnum" use="required" />
-	</xsd:complexType>
-	<xsd:complexType name="absoluteDimType">
-        <xsd:sequence>
-            <xsd:element name="DimOperator" type="dimensionOperatorType" minOccurs="0" maxOccurs="1" />
-        </xsd:sequence>
-		<xsd:attribute name="value" type="xsd:decimal" use="optional" default="0" />
-	</xsd:complexType>
-	<xsd:complexType name="imageDimType">
-        <xsd:sequence>
-            <xsd:element name="DimOperator" type="dimensionOperatorType" minOccurs="0" maxOccurs="1" />
-        </xsd:sequence>
-		<xsd:attribute name="imageset" type="xsd:string" use="required" />
-		<xsd:attribute name="image" type="xsd:string" use="required" />
-		<xsd:attribute name="dimension" type="dimensionTypeEnum" use="required" />
-	</xsd:complexType>
-	<xsd:complexType name="widgetDimType">
-        <xsd:sequence>
-            <xsd:element name="DimOperator" type="dimensionOperatorType" minOccurs="0" maxOccurs="1" />
-        </xsd:sequence>
-		<xsd:attribute name="widget" type="xsd:string" use="optional" default="" />
-		<xsd:attribute name="dimension" type="dimensionTypeEnum" use="required" />
-	</xsd:complexType>
-    <xsd:complexType name="settingByPropertyType">
-        <xsd:attribute name="name" type="xsd:string" use="required" />
-    </xsd:complexType>
-	<xsd:complexType name="colourRectType">
-		<xsd:attribute name="topLeft" type="colourValType" use="required" />
-		<xsd:attribute name="topRight" type="colourValType" use="required" />
-		<xsd:attribute name="bottomLeft" type="colourValType" use="required" />
-		<xsd:attribute name="bottomRight" type="colourValType" use="required" />
-	</xsd:complexType>
-	<xsd:complexType name="colourType">
-		<xsd:attribute name="colour" type="colourValType" use="required" />
-	</xsd:complexType>
-	<xsd:simpleType name="colourValType">
-		<xsd:restriction base="xsd:string">
-			<xsd:pattern value="[a-fA-F0-9]{8}" />
-		</xsd:restriction>
-	</xsd:simpleType>
-    <xsd:complexType name="textStringType">
-        <xsd:attribute name="string" type="xsd:string" use="optional" default="" />
-        <xsd:attribute name="font" type="xsd:string" use="optional" default="" />
-    </xsd:complexType>
-    <xsd:complexType name="textPropertyType">
-        <xsd:attribute name="name" type="xsd:string" use="required" />
-    </xsd:complexType>
-    <xsd:complexType name="fontPropertyType">
-        <xsd:attribute name="name" type="xsd:string" use="required" />
-    </xsd:complexType>
-    <xsd:complexType name="dimensionOperatorType">
-        <xsd:choice>
-            <xsd:element name="UnifiedDim" type="unifiedDimType" />
-            <xsd:element name="AbsoluteDim" type="absoluteDimType" />
-            <xsd:element name="ImageDim" type="imageDimType" />
-            <xsd:element name="WidgetDim" type="widgetDimType" />
-            <xsd:element name="FontDim" type="fontDimType" />
-            <xsd:element name="PropertyDim" type="propertyDimType" />
-        </xsd:choice>
-        <xsd:attribute name="op" type="dimensionOperatorEnum" use="required" />
-    </xsd:complexType>
-	<xsd:simpleType name="dimensionTypeEnum">
-		<xsd:restriction base="xsd:string">
-			<xsd:enumeration value="LeftEdge" />
-			<xsd:enumeration value="TopEdge" />
-			<xsd:enumeration value="RightEdge" />
-			<xsd:enumeration value="BottomEdge" />
-			<xsd:enumeration value="XPosition" />
-			<xsd:enumeration value="YPosition" />
-			<xsd:enumeration value="Width" />
-			<xsd:enumeration value="Height" />
-			<xsd:enumeration value="XOffset" />
-			<xsd:enumeration value="YOffset" />
-		</xsd:restriction>
-	</xsd:simpleType>
-	<xsd:simpleType name="vertFormatEnum">
-		<xsd:restriction base="xsd:string">
-			<xsd:enumeration value="TopAligned" />
-			<xsd:enumeration value="CentreAligned" />
-			<xsd:enumeration value="BottomAligned" />
-			<xsd:enumeration value="Stretched" />
-			<xsd:enumeration value="Tiled" />
-		</xsd:restriction>
-	</xsd:simpleType>
-	<xsd:simpleType name="horzFormatEnum">
-		<xsd:restriction base="xsd:string">
-			<xsd:enumeration value="LeftAligned" />
-			<xsd:enumeration value="CentreAligned" />
-			<xsd:enumeration value="RightAligned" />
-			<xsd:enumeration value="Stretched" />
-			<xsd:enumeration value="Tiled" />
-		</xsd:restriction>
-	</xsd:simpleType>
-	<xsd:simpleType name="vertAlignmentEnum">
-		<xsd:restriction base="xsd:string">
-			<xsd:enumeration value="TopAligned" />
-			<xsd:enumeration value="CentreAligned" />
-			<xsd:enumeration value="BottomAligned" />
-		</xsd:restriction>
-	</xsd:simpleType>
-	<xsd:simpleType name="horzAlignmentEnum">
-		<xsd:restriction base="xsd:string">
-			<xsd:enumeration value="LeftAligned" />
-			<xsd:enumeration value="CentreAligned" />
-			<xsd:enumeration value="RightAligned" />
-		</xsd:restriction>
-	</xsd:simpleType>
-    <xsd:simpleType name="horzTextFormatEnum">
-        <xsd:restriction base="xsd:string">
-            <xsd:enumeration value="LeftAligned" />
-            <xsd:enumeration value="RightAligned" />
-            <xsd:enumeration value="CentreAligned" />
-            <xsd:enumeration value="Justified" />
-            <xsd:enumeration value="WordWrapLeftAligned" />
-            <xsd:enumeration value="WordWrapRightAligned" />
-            <xsd:enumeration value="WordWrapCentreAligned" />
-            <xsd:enumeration value="WordWrapJustified" />
-        </xsd:restriction>
-    </xsd:simpleType>
-    <xsd:simpleType name="vertTextFormatEnum">
-        <xsd:restriction base="xsd:string">
-            <xsd:enumeration value="TopAligned" />
-            <xsd:enumeration value="BottomAligned" />
-            <xsd:enumeration value="CentreAligned" />
-        </xsd:restriction>
-    </xsd:simpleType>
-    <xsd:simpleType name="propertyTypeEnum">
-        <xsd:restriction base="xsd:string">
-            <xsd:enumeration value="Generic" />
-        </xsd:restriction>
-    </xsd:simpleType>
-    <xsd:simpleType name="fontMetricTypeEnum">
-        <xsd:restriction base="xsd:string">
-            <xsd:enumeration value="LineSpacing" />
-            <xsd:enumeration value="Baseline" />
-            <xsd:enumeration value="HorzExtent" />
-        </xsd:restriction>
-    </xsd:simpleType>
-    <xsd:simpleType name="dimensionOperatorEnum">
-        <xsd:restriction base="xsd:string">
-            <xsd:enumeration value="Noop" />
-            <xsd:enumeration value="Add" />
-            <xsd:enumeration value="Subtract" />
-            <xsd:enumeration value="Multiply" />
-            <xsd:enumeration value="Divide" />
-        </xsd:restriction>
-    </xsd:simpleType>
-    <xsd:simpleType name="frameImageComponentEnum">
-        <xsd:restriction base="xsd:string">
-            <xsd:enumeration value="Background" />
-            <xsd:enumeration value="TopLeftCorner" />
-            <xsd:enumeration value="TopRightCorner" />
-            <xsd:enumeration value="BottomLeftCorner" />
-            <xsd:enumeration value="BottomRightCorner" />
-            <xsd:enumeration value="LeftEdge" />
-            <xsd:enumeration value="RightEdge" />
-            <xsd:enumeration value="TopEdge" />
-            <xsd:enumeration value="BottomEdge" />
-        </xsd:restriction>
-    </xsd:simpleType>
-</xsd:schema>
Index: de/branches/gamestates2/data/gui/configs/Font.xsd
===================================================================
--- /code/branches/gamestates2/data/gui/configs/Font.xsd	(revision 6594)
+++ 	(revision )
@@ -1,34 +1,0 @@
-<?xml version="1.0" ?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-	<xsd:element name="Font" type="FontType" />
-
-	<xsd:complexType name="FontType">
-		<xsd:sequence>
-			<xsd:element name="Mapping" type="MapType" maxOccurs="unbounded" minOccurs="0" />
-		</xsd:sequence>
-		<xsd:attributeGroup ref="FontAttrs" />
-	</xsd:complexType>
-	<xsd:complexType name="MapType">
-		<xsd:attribute name="Codepoint" type="xsd:nonNegativeInteger" use="required" />
-		<xsd:attribute name="Image" type="xsd:string" use="required" />
-		<xsd:attribute name="HorzAdvance" type="xsd:integer" use="optional" default="-1" />
-	</xsd:complexType>
-	<xsd:attributeGroup name="FontAttrs">
-		<xsd:attribute name="Name" type="xsd:string" use="required" />
-		<xsd:attribute name="Filename" type="xsd:string" use="required" />
-		<xsd:attribute name="ResourceGroup" type="xsd:string" use="optional"  default="" />
-		<xsd:attribute name="Type" use="required">
-			<xsd:simpleType>
-				<xsd:restriction base="xsd:string">
-					<xsd:enumeration value="FreeType" />
-					<xsd:enumeration value="Pixmap" />
-				</xsd:restriction>
-			</xsd:simpleType>
-		</xsd:attribute>
-		<xsd:attribute name="Size" type="xsd:nonNegativeInteger" use="optional" default="12" />
-		<xsd:attribute name="NativeHorzRes" type="xsd:nonNegativeInteger" use="optional" default="640" />
-		<xsd:attribute name="NativeVertRes" type="xsd:nonNegativeInteger" use="optional" default="480" />
-		<xsd:attribute name="AutoScaled" type="xsd:boolean" use="optional" default="false" />
-		<xsd:attribute name="AntiAlias" type="xsd:boolean" use="optional" default="true" />
-	</xsd:attributeGroup>
-</xsd:schema>
Index: de/branches/gamestates2/data/gui/configs/GUILayout.xsd
===================================================================
--- /code/branches/gamestates2/data/gui/configs/GUILayout.xsd	(revision 6594)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-
-	<xsd:element name="GUILayout" type="GUILayoutType"/>
-	
-	<xsd:complexType name="GUILayoutType">
-		<xsd:sequence>
-			<xsd:element name="Window" type="WindowType" />
-		</xsd:sequence>
-		<xsd:attribute name="Parent" type="xsd:string" use="optional" default=""/>
-	</xsd:complexType>
-	
-	<xsd:complexType name="WindowType">
-		<xsd:sequence>
-			<xsd:element name="LayoutImport" type="LayoutImportType"  minOccurs="0" maxOccurs="unbounded" />
-			<xsd:element name="Property" type="PropertyType"  minOccurs="0" maxOccurs="unbounded" />
-			<xsd:element name="Event" type="EventType"  minOccurs="0" maxOccurs="unbounded" />
-			<xsd:choice minOccurs="0" maxOccurs="unbounded">
-				<xsd:element name="Window" type="WindowType" />
-				<xsd:element name="AutoWindow" type="AutoWindowType" />
-			</xsd:choice>
-			<xsd:element name="Property" type="PropertyType"  minOccurs="0" maxOccurs="unbounded" />
-		</xsd:sequence>
-		<xsd:attribute name="Type" type="xsd:string" use="required"/>
-		<xsd:attribute name="Name" type="xsd:string" use="optional" default="" />
-	</xsd:complexType>
-
-	<xsd:complexType name="AutoWindowType">
-		<xsd:sequence>
-			<xsd:element name="LayoutImport" type="LayoutImportType"  minOccurs="0" maxOccurs="unbounded" />
-			<xsd:element name="Property" type="PropertyType"  minOccurs="0" maxOccurs="unbounded" />
-			<xsd:element name="Event" type="EventType"  minOccurs="0" maxOccurs="unbounded" />
-			<xsd:choice minOccurs="0" maxOccurs="unbounded">
-				<xsd:element name="Window" type="WindowType" />
-				<xsd:element name="AutoWindow" type="AutoWindowType" />
-			</xsd:choice>
-			<xsd:element name="Property" type="PropertyType"  minOccurs="0" maxOccurs="unbounded" />
-		</xsd:sequence>
-		<xsd:attribute name="NameSuffix" type="xsd:string" use="required"/>
-	</xsd:complexType>
-
-	<xsd:complexType name="PropertyType">
-		<xsd:simpleContent>
-			<xsd:extension base="xsd:string">
-				<xsd:attribute name="Name" type="xsd:string" use="required"/>
-				<xsd:attribute name="Value" type="xsd:string" use="optional"/>
-			</xsd:extension>
-		</xsd:simpleContent> 
-	</xsd:complexType>
-
-	<xsd:complexType name="LayoutImportType">
-		<xsd:attribute name="Filename" type="xsd:string" use="required"/>
-		<xsd:attribute name="Prefix" type="xsd:string" use="optional" default="" />
-		<xsd:attribute name="ResourceGroup" type="xsd:string" use="optional"  default="" />
-	</xsd:complexType>
-
-	<xsd:complexType name="EventType">
-		<xsd:attribute name="Name" type="xsd:string" use="required"/>
-		<xsd:attribute name="Function" type="xsd:string" use="required"/>
-	</xsd:complexType>
-
-</xsd:schema>
-
Index: de/branches/gamestates2/data/gui/configs/GUIScheme.xsd
===================================================================
--- /code/branches/gamestates2/data/gui/configs/GUIScheme.xsd	(revision 6594)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" ?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-	<xsd:element name="GUIScheme" type="SchemeType" />
-	<xsd:complexType name="SchemeType">
-        <xsd:choice minOccurs="0" maxOccurs="unbounded">
-			<xsd:element name="Imageset" type="NamedDataType" />
-            <xsd:element name="ImagesetFromImage" type="NamedDataType" />
-			<xsd:element name="Font" type="NamedDataType" />
-            <xsd:element name="LookNFeel" type="FileDataType" />
-			<xsd:element name="WindowSet" type="WindowSetType" />
-			<xsd:element name="WindowRendererSet" type="WindowRendererSetType" />
-			<xsd:element name="WindowAlias" type="WindowAliasType" />
-            <xsd:element name="FalagardMapping" type="FalagardMapType" />
-		</xsd:choice>
-		<xsd:attribute name="Name" type="xsd:string" use="required" />
-	</xsd:complexType>
-	<xsd:complexType name="WindowSetType">
-		<xsd:sequence>
-            <xsd:element name="WindowFactory" type="WindowFactoryType" minOccurs="0" maxOccurs="unbounded" />
-		</xsd:sequence>
-		<xsd:attribute name="Filename" type="xsd:string" use="required" />
-	</xsd:complexType>
-	<xsd:complexType name="WindowRendererSetType">
-		<xsd:sequence>
-            <xsd:element name="WindowRendererFactory" type="WindowRendererFactoryType" minOccurs="0" maxOccurs="unbounded" />
-		</xsd:sequence>
-		<xsd:attribute name="Filename" type="xsd:string" use="required" />
-	</xsd:complexType>
-    <xsd:complexType name="FileDataType">
-        <xsd:attribute name="Filename" type="xsd:string" use="required" />
-        <xsd:attribute name="ResourceGroup" type="xsd:string" use="optional"  default="" />
-    </xsd:complexType>
-	<xsd:complexType name="NamedDataType">
-		<xsd:attribute name="Name" type="xsd:string" use="required" />
-		<xsd:attribute name="Filename" type="xsd:string" use="required" />
-		<xsd:attribute name="ResourceGroup" type="xsd:string" use="optional"  default="" />
-	</xsd:complexType>
-	<xsd:complexType name="WindowFactoryType">
-		<xsd:attribute name="Name" type="xsd:string" use="required" />
-	</xsd:complexType>
-	<xsd:complexType name="WindowRendererFactoryType">
-		<xsd:attribute name="Name" type="xsd:string" use="required" />
-	</xsd:complexType>
-	<xsd:complexType name="WindowAliasType">
-		<xsd:attribute name="Alias" type="xsd:string" use="required" />
-		<xsd:attribute name="Target" type="xsd:string" use="required" />
-	</xsd:complexType>
-    <xsd:complexType name="FalagardMapType">
-        <xsd:attribute name="WindowType" type="xsd:string" use="required" />
-        <xsd:attribute name="TargetType" type="xsd:string" use="required" />
-		<xsd:attribute name="Renderer" type="xsd:string" use="required" />
-        <xsd:attribute name="LookNFeel" type="xsd:string" use="required" />
-    </xsd:complexType>
-</xsd:schema>
Index: de/branches/gamestates2/data/gui/configs/Imageset.xsd
===================================================================
--- /code/branches/gamestates2/data/gui/configs/Imageset.xsd	(revision 6594)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-
-	<xsd:element name="Imageset" type="ImagesetType"/>
-	
-	<xsd:complexType name="ImagesetType">
-		<xsd:sequence>
-			<xsd:element name="Image" type="ImageType" maxOccurs="unbounded"/>
-		</xsd:sequence>
-		<xsd:attribute name="Imagefile" type="xsd:string" use="required"/>
-		<xsd:attribute name="ResourceGroup" type="xsd:string" use="optional"  default="" />
-		<xsd:attribute name="Name" type="xsd:string" use="required"/>
-		<xsd:attribute name="NativeHorzRes" type="xsd:nonNegativeInteger" use="optional" default="640" />
-		<xsd:attribute name="NativeVertRes" type="xsd:nonNegativeInteger" use="optional" default="480" />
-		<xsd:attribute name="AutoScaled" type="xsd:boolean" use="optional" default="false" />
-	</xsd:complexType>
-	
-	<xsd:complexType name="ImageType">
-		<xsd:attribute name="Name" type="xsd:string" use="required"/>
-		<xsd:attribute name="XPos" type="xsd:nonNegativeInteger" use="required"/>
-		<xsd:attribute name="YPos" type="xsd:nonNegativeInteger" use="required"/>
-		<xsd:attribute name="Width" type="xsd:nonNegativeInteger" use="required"/>
-		<xsd:attribute name="Height" type="xsd:nonNegativeInteger" use="required"/>
-		<xsd:attribute name="XOffset" type="xsd:integer" use="optional" default="0"/>
-		<xsd:attribute name="YOffset" type="xsd:integer" use="optional" default="0"/>						
-	</xsd:complexType>
-
-</xsd:schema>
Index: /code/branches/gamestates2/data/gui/layouts/AudioMenu.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/AudioMenu.layout	(revision 6594)
+++ /code/branches/gamestates2/data/gui/layouts/AudioMenu.layout	(revision 6595)
@@ -2,5 +2,5 @@
 
 <GUILayout >
-    <Window Type="TaharezLook/StaticImage" Name="orxonox/AudioBackground" >
+    <Window Type="MenuWidgets/StaticImage" Name="orxonox/AudioBackground" >
         <Property Name="FrameEnabled" Value="False" />
         <Property Name="InheritsAlpha" Value="False" />
@@ -8,5 +8,5 @@
         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
         <Property Name="BackgroundEnabled" Value="False" />
-        <Window Type="TaharezLook/StaticText" Name="orxonox/AudioWindow" >
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/AudioWindow" >
             <Property Name="Text" Value="Audio" />
             <Property Name="Alpha" Value="0.8" />
@@ -16,5 +16,5 @@
             <Property Name="VertFormatting" Value="TopAligned" />
             <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.2875,0},{0.8,0},{0.6375,0}}" />
-            <Window Type="TaharezLook/StaticText" Name="orxonox/MasterVolume" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/MasterVolume" >
                 <Property Name="Text" Value="Master volume               " />
                 <Property Name="InheritsAlpha" Value="False" />
@@ -23,5 +23,5 @@
                 <Property Name="VertFormatting" Value="TopAligned" />
                 <Property Name="UnifiedAreaRect" Value="{{0.041666,0},{0.15,0},{0.5625,0},{0.3525,0}}" />
-                <Window Type="TaharezLook/HorizontalScrollbar" Name="orxonox/MasterScrollbar" >
+                <Window Type="MenuWidgets/HorizontalScrollbar" Name="orxonox/MasterScrollbar" >
                     <Property Name="PageSize" Value="0" />
                     <Property Name="StepSize" Value="1" />
@@ -36,5 +36,5 @@
                     <Event Name="ScrollPosChanged" Function="AudioMenu.AudioMasterScrollbar_changed" />
                 </Window>
-                <Window Type="TaharezLook/Checkbox" Name="orxonox/MasterCheckbox" >
+                <Window Type="MenuWidgets/Checkbox" Name="orxonox/MasterCheckbox" >
                     <Property Name="Text" Value="Mute" />
                     <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -43,5 +43,5 @@
                 </Window>
             </Window>
-            <Window Type="TaharezLook/StaticText" Name="orxonox/MusicVolume" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/MusicVolume" >
                 <Property Name="Text" Value="Music volume               " />
                 <Property Name="InheritsAlpha" Value="False" />
@@ -50,5 +50,5 @@
                 <Property Name="VertFormatting" Value="TopAligned" />
                 <Property Name="UnifiedAreaRect" Value="{{0.041666,0},{0.4335,0},{0.5625,0},{0.636,0}}" />
-                <Window Type="TaharezLook/HorizontalScrollbar" Name="orxonox/MusicScrollbar" >
+                <Window Type="MenuWidgets/HorizontalScrollbar" Name="orxonox/MusicScrollbar" >
                     <Property Name="PageSize" Value="0" />
                     <Property Name="StepSize" Value="1" />
@@ -63,5 +63,5 @@
                     <Event Name="ScrollPosChanged" Function="AudioMenu.AudioMusicScrollbar_changed" />
                 </Window>
-                <Window Type="TaharezLook/Checkbox" Name="orxonox/MusicCheckbox" >
+                <Window Type="MenuWidgets/Checkbox" Name="orxonox/MusicCheckbox" >
                     <Property Name="Text" Value="Mute" />
                     <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -70,5 +70,5 @@
                 </Window>
             </Window>
-            <Window Type="TaharezLook/StaticText" Name="orxonox/EffectsVolume" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/EffectsVolume" >
                 <Property Name="Text" Value="Effects volume               " />
                 <Property Name="InheritsAlpha" Value="False" />
@@ -77,5 +77,5 @@
                 <Property Name="VertFormatting" Value="TopAligned" />
                 <Property Name="UnifiedAreaRect" Value="{{0.041666,0},{0.717,0},{0.5625,0},{0.9195,0}}" />
-                <Window Type="TaharezLook/HorizontalScrollbar" Name="orxonox/EffectsScrollbar" >
+                <Window Type="MenuWidgets/HorizontalScrollbar" Name="orxonox/EffectsScrollbar" >
                     <Property Name="PageSize" Value="0" />
                     <Property Name="StepSize" Value="1" />
@@ -90,5 +90,5 @@
                     <Event Name="ScrollPosChanged" Function="AudioMenu.AudioEffectsScrollbar_changed" />
                 </Window>
-                <Window Type="TaharezLook/Checkbox" Name="orxonox/EffectsCheckbox" >
+                <Window Type="MenuWidgets/Checkbox" Name="orxonox/EffectsCheckbox" >
                     <Property Name="Text" Value="Mute" />
                     <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -97,5 +97,5 @@
                 </Window>
             </Window>
-            <Window Type="TaharezLook/StaticText" Name="orxonox/AudioTheme" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/AudioTheme" >
                 <Property Name="Text" Value="Theme" />
                 <Property Name="InheritsAlpha" Value="False" />
@@ -104,5 +104,5 @@
                 <Property Name="VertFormatting" Value="TopAligned" />
                 <Property Name="UnifiedAreaRect" Value="{{0.604166,0},{0.15,0},{0.958333,0},{0.636,0}}" />
-                <Window Type="TaharezLook/Listbox" Name="orxonox/AudioThemeListbox" >
+                <Window Type="MenuWidgets/Listbox" Name="orxonox/AudioThemeListbox" >
                     <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
                     <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.225,0},{0.95,0},{0.92,0}}" />
@@ -110,5 +110,5 @@
                 </Window>
             </Window>
-            <Window Type="TaharezLook/StaticText" Name="orxonox/AudioInfo" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/AudioInfo" >
                 <Property Name="Text" >Theme changes might take
 up to a minute.</Property>
@@ -121,5 +121,5 @@
             </Window>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/AudioBackButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/AudioBackButton" >
             <Property Name="Text" Value="Back" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
Index: de/branches/gamestates2/data/gui/layouts/CompositorDemo.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/CompositorDemo.layout	(revision 6594)
+++ 	(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: de/branches/gamestates2/data/gui/layouts/Console.wnd
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/Console.wnd	(revision 6594)
+++ 	(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/gamestates2/data/gui/layouts/ControlsMenu.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/ControlsMenu.layout	(revision 6594)
+++ /code/branches/gamestates2/data/gui/layouts/ControlsMenu.layout	(revision 6595)
@@ -2,5 +2,5 @@
 
 <GUILayout >
-    <Window Type="TaharezLook/StaticImage" Name="orxonox/ControlsBackground" >
+    <Window Type="MenuWidgets/StaticImage" Name="orxonox/ControlsBackground" >
         <Property Name="FrameEnabled" Value="False" />
         <Property Name="InheritsAlpha" Value="False" />
@@ -8,5 +8,5 @@
         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
         <Property Name="BackgroundEnabled" Value="False" />
-        <Window Type="TaharezLook/StaticText" Name="orxonox/ControlsWindow" >
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/ControlsWindow" >
             <Property Name="Text" Value="Controls" />
             <Property Name="Alpha" Value="0.8" />
@@ -16,5 +16,5 @@
             <Property Name="VertFormatting" Value="TopAligned" />
             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
-            <Window Type="TaharezLook/Button" Name="orxonox/MouseControlsButton" >
+            <Window Type="MenuWidgets/Button" Name="orxonox/MouseControlsButton" >
                 <Property Name="Text" Value="Mouse controls" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -22,5 +22,5 @@
                 <Event Name="Clicked" Function="ControlsMenu.ControlsMouseControlsButton_clicked"/>
             </Window>
-            <Window Type="TaharezLook/Button" Name="orxonox/KeybindingsButton" >
+            <Window Type="MenuWidgets/Button" Name="orxonox/KeybindingsButton" >
                 <Property Name="Text" Value="Keybindings" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -29,5 +29,5 @@
             </Window>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/ControlsBackButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/ControlsBackButton" >
             <Property Name="Text" Value="Back" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
Index: /code/branches/gamestates2/data/gui/layouts/CreditsMenu.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/CreditsMenu.layout	(revision 6594)
+++ /code/branches/gamestates2/data/gui/layouts/CreditsMenu.layout	(revision 6595)
@@ -2,5 +2,5 @@
 
 <GUILayout >
-    <Window Type="TaharezLook/StaticImage" Name="orxonox/CreditsBackground" >
+    <Window Type="MenuWidgets/StaticImage" Name="orxonox/CreditsBackground" >
         <Property Name="FrameEnabled" Value="False" />
         <Property Name="InheritsAlpha" Value="False" />
@@ -8,5 +8,5 @@
         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
         <Property Name="BackgroundEnabled" Value="False" />
-        <Window Type="TaharezLook/StaticText" Name="orxonox/CreditsWindow" >
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/CreditsWindow" >
             <Property Name="Text" Value="Credits" />
             <Property Name="Alpha" Value="0.8" />
@@ -16,5 +16,5 @@
             <Property Name="VertFormatting" Value="TopAligned" />
             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
-            <Window Type="TaharezLook/StaticText" Name="orxonox/CreditsText" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/CreditsText" >
                 <Property Name="Text">Orxonox version 0.0.3
 
@@ -32,5 +32,5 @@
             </Window>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/CreditsBackButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/CreditsBackButton" >
             <Property Name="Text" Value="Back" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
Index: de/branches/gamestates2/data/gui/layouts/CrowdDemo.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/CrowdDemo.layout	(revision 6594)
+++ 	(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/gamestates2/data/gui/layouts/DecisionPopup.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/DecisionPopup.layout	(revision 6594)
+++ /code/branches/gamestates2/data/gui/layouts/DecisionPopup.layout	(revision 6595)
@@ -6,10 +6,9 @@
         <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-        <Window Type="TaharezLook/StaticImage" Name="orxonox/DecisionPopup_Background" >
+        <Window Type="MenuWidgets/StaticImage" Name="orxonox/DecisionPopup_Background" >
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
             <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
             <Property Name="Alpha" Value="0.6" />
-            <Window Type="TaharezLook/Button" Name="orxonox/DecisionPopup_button_yes" >
-                <Property Name="Font" Value="BlueHighway-12" />
+            <Window Type="MenuWidgets/Button" Name="orxonox/DecisionPopup_button_yes" >
                 <Property Name="Text" Value="Yes" />
                 <Property Name="Alpha" Value="0.7" />
@@ -19,6 +18,5 @@
                 <Event Name="Clicked" Function="DecisionPopup.button_yes"/>
             </Window>
-            <Window Type="TaharezLook/Button" Name="orxonox/DecisionPopup_button_no" >
-                <Property Name="Font" Value="BlueHighway-12" />
+            <Window Type="MenuWidgets/Button" Name="orxonox/DecisionPopup_button_no" >
                 <Property Name="Text" Value="No" />
                 <Property Name="Alpha" Value="0.8" />
@@ -28,5 +26,5 @@
                 <Event Name="Clicked" Function="DecisionPopup.button_no"/>
             </Window>
-            <Window Type="TaharezLook/StaticText" Name="orxonox/DecisionPopup_text" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/DecisionPopup_text" >
                 <Property Name="Text" Value="Template text" />
                 <Property Name="HorzFormatting" Value="WordWrapCentred" />
Index: de/branches/gamestates2/data/gui/layouts/Demo7Windows.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/Demo7Windows.layout	(revision 6594)
+++ 	(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: de/branches/gamestates2/data/gui/layouts/Demo8.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/Demo8.layout	(revision 6594)
+++ 	(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: de/branches/gamestates2/data/gui/layouts/DragDropDemo.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/DragDropDemo.layout	(revision 6594)
+++ 	(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: de/branches/gamestates2/data/gui/layouts/FontDemo.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/FontDemo.layout	(revision 6594)
+++ 	(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/gamestates2/data/gui/layouts/GameplayMenu.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/GameplayMenu.layout	(revision 6594)
+++ /code/branches/gamestates2/data/gui/layouts/GameplayMenu.layout	(revision 6595)
@@ -2,5 +2,5 @@
 
 <GUILayout >
-    <Window Type="TaharezLook/StaticImage" Name="orxonox/GameplayBackground" >
+    <Window Type="MenuWidgets/StaticImage" Name="orxonox/GameplayBackground" >
         <Property Name="FrameEnabled" Value="False" />
         <Property Name="InheritsAlpha" Value="False" />
@@ -8,5 +8,5 @@
         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
         <Property Name="BackgroundEnabled" Value="False" />
-        <Window Type="TaharezLook/StaticText" Name="orxonox/GameplayWindow" >
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/GameplayWindow" >
             <Property Name="Text" Value="Gameplay" />
             <Property Name="Alpha" Value="0.8" />
@@ -16,5 +16,5 @@
             <Property Name="VertFormatting" Value="TopAligned" />
             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
-            <Window Type="TaharezLook/StaticText" Name="orxonox/Difficulty" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/Difficulty" >
                 <Property Name="Text" Value="Difficulty" />
                 <Property Name="InheritsAlpha" Value="False" />
@@ -23,5 +23,5 @@
                 <Property Name="VertFormatting" Value="TopAligned" />
                 <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.2,0},{0.475,0},{0.9,0}}" />
-                <Window Type="TaharezLook/RadioButton" Name="orxonox/DifficultyEasyButton" >
+                <Window Type="MenuWidgets/RadioButton" Name="orxonox/DifficultyEasyButton" >
                     <Property Name="Text" Value="Easy" />
                     <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -29,5 +29,5 @@
                     <Event Name="SelectStateChanged" Function="GameplayMenu.GameplayDifficultyEasyButton_clicked"/>
                 </Window>
-                <Window Type="TaharezLook/RadioButton" Name="orxonox/DifficultyNormalButton" >
+                <Window Type="MenuWidgets/RadioButton" Name="orxonox/DifficultyNormalButton" >
                     <Property Name="Text" Value="Normal" />
                     <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -35,5 +35,5 @@
                     <Event Name="SelectStateChanged" Function="GameplayMenu.GameplayDifficultyNormalButton_clicked"/>
                 </Window>
-                <Window Type="TaharezLook/RadioButton" Name="orxonox/DifficultyHardButton" >
+                <Window Type="MenuWidgets/RadioButton" Name="orxonox/DifficultyHardButton" >
                     <Property Name="Text" Value="Hard" />
                     <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -42,5 +42,5 @@
                 </Window>
             </Window>
-            <Window Type="TaharezLook/StaticText" Name="orxonox/Theme" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/Theme" >
                 <Property Name="Text" Value="Theme" />
                 <Property Name="InheritsAlpha" Value="False" />
@@ -49,5 +49,5 @@
                 <Property Name="VertFormatting" Value="TopAligned" />
                 <Property Name="UnifiedAreaRect" Value="{{0.525,0},{0.2,0},{0.95,0},{0.9,0}}" />
-                <Window Type="TaharezLook/Combobox" Name="orxonox/ThemeCombobox" >
+                <Window Type="MenuWidgets/Combobox" Name="orxonox/ThemeCombobox" >
                     <Property Name="AlwaysOnTop" Value="True" />
                     <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -59,5 +59,5 @@
             </Window>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/GameplayBackButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/GameplayBackButton" >
             <Property Name="Text" Value="Back" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
Index: /code/branches/gamestates2/data/gui/layouts/GraphicsMenu.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/GraphicsMenu.layout	(revision 6594)
+++ /code/branches/gamestates2/data/gui/layouts/GraphicsMenu.layout	(revision 6595)
@@ -2,5 +2,5 @@
 
 <GUILayout >
-    <Window Type="TaharezLook/StaticImage" Name="orxonox/GraphicsBackground" >
+    <Window Type="MenuWidgets/StaticImage" Name="orxonox/GraphicsBackground" >
         <Property Name="FrameEnabled" Value="False" />
         <Property Name="InheritsAlpha" Value="False" />
@@ -8,5 +8,5 @@
         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
         <Property Name="BackgroundEnabled" Value="False" />
-        <Window Type="TaharezLook/StaticText" Name="orxonox/GraphicsWindow" >
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/GraphicsWindow" >
             <Property Name="Text" Value="Graphics" />
             <Property Name="Alpha" Value="0.8" />
@@ -16,5 +16,5 @@
             <Property Name="VertFormatting" Value="TopAligned" />
             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.2875,0},{0.75,0},{0.6375,0}}" />
-            <Window Type="TaharezLook/StaticText" Name="orxonox/Resolution" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/Resolution" >
                 <Property Name="Text" Value="Resolution" />
                 <Property Name="InheritsAlpha" Value="False" />
@@ -23,5 +23,5 @@
                 <Property Name="VertFormatting" Value="TopAligned" />
                 <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.475,0},{0.92,0}}" />
-                <Window Type="TaharezLook/Listbox" Name="orxonox/ResolutionListbox" >
+                <Window Type="MenuWidgets/Listbox" Name="orxonox/ResolutionListbox" >
                     <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
                     <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.95,0}}" />
@@ -29,5 +29,5 @@
                 </Window>
             </Window>
-            <Window Type="TaharezLook/StaticText" Name="orxonox/Brightness" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/Brightness" >
                 <Property Name="Text" Value="Brightness" />
                 <Property Name="InheritsAlpha" Value="False" />
@@ -36,5 +36,5 @@
                 <Property Name="VertFormatting" Value="TopAligned" />
                 <Property Name="UnifiedAreaRect" Value="{{0.525,0},{0.15,0},{0.95,0},{0.35,0}}" />
-                <Window Type="TaharezLook/HorizontalScrollbar" Name="orxonox/BrightnessScrollbar" >
+                <Window Type="MenuWidgets/HorizontalScrollbar" Name="orxonox/BrightnessScrollbar" >
                     <Property Name="Disabled" Value="true" />
                     <Property Name="PageSize" Value="0" />
@@ -50,5 +50,5 @@
                 </Window>
             </Window>
-            <Window Type="TaharezLook/Checkbox" Name="orxonox/FullscreenCheckbox" >
+            <Window Type="MenuWidgets/Checkbox" Name="orxonox/FullscreenCheckbox" >
                 <Property Name="Text" Value="Fullscreen" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -56,5 +56,5 @@
                 <Event Name="CheckStateChanged" Function="GraphicsMenu.GraphicsFullscreenCheckbox_clicked"/>
             </Window>
-            <Window Type="TaharezLook/StaticText" Name="orxonox/GraphicsInfo" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/GraphicsInfo" >
                 <Property Name="Text" >
 Changes in graphics
@@ -69,5 +69,5 @@
             </Window>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/GraphicsBackButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/GraphicsBackButton" >
             <Property Name="Text" Value="Back" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
Index: /code/branches/gamestates2/data/gui/layouts/InGameMenu.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/InGameMenu.layout	(revision 6594)
+++ /code/branches/gamestates2/data/gui/layouts/InGameMenu.layout	(revision 6595)
@@ -6,6 +6,5 @@
         <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-        <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_ReturnButton" >
-            <Property Name="Font" Value="BlueHighway-12" />
+        <Window Type="MenuWidgets/Button" Name="orxonox/InGameMenu_ReturnButton" >
             <Property Name="Text" Value="Return to Game" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -14,6 +13,5 @@
             <Event Name="Clicked" Function="InGameMenu.button_return_clicked"/>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_MainMenuButton" >
-            <Property Name="Font" Value="BlueHighway-12" />
+        <Window Type="MenuWidgets/Button" Name="orxonox/InGameMenu_MainMenuButton" >
             <Property Name="Text" Value="Main Menu" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -22,6 +20,5 @@
             <Event Name="Clicked" Function="InGameMenu.button_mainmenu_clicked"/>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_SettingsButton" >
-            <Property Name="Font" Value="BlueHighway-12" />
+        <Window Type="MenuWidgets/Button" Name="orxonox/InGameMenu_SettingsButton" >
             <Property Name="Text" Value="Settings" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -30,6 +27,5 @@
             <Event Name="Clicked" Function="InGameMenu.button_settings_clicked"/>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_QuitButton" >
-            <Property Name="Font" Value="BlueHighway-12" />
+        <Window Type="MenuWidgets/Button" Name="orxonox/InGameMenu_QuitButton" >
             <Property Name="Text" Value="Quit" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
Index: /code/branches/gamestates2/data/gui/layouts/InGameTest.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/InGameTest.layout	(revision 6594)
+++ /code/branches/gamestates2/data/gui/layouts/InGameTest.layout	(revision 6595)
@@ -4,5 +4,5 @@
     <Property Name="UnifiedSize" Value="{{1.0,0},{1.0,0}}"/>
 
-        <Window Type="TaharezLook/Button" Name="orxonox/TestButton">
+        <Window Type="MenuWidgets/Button" Name="orxonox/TestButton">
             <Property Name="UnifiedPosition" Value="{{0.11,0},{0.528,0}}"/>
             <Property Name="UnifiedSize" Value="{{0.15,0},{0.05,0}}"/>
Index: /code/branches/gamestates2/data/gui/layouts/InfoPopup.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/InfoPopup.layout	(revision 6594)
+++ /code/branches/gamestates2/data/gui/layouts/InfoPopup.layout	(revision 6595)
@@ -6,10 +6,9 @@
         <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-        <Window Type="TaharezLook/StaticImage" Name="orxonox/InfoPopup_Background" >
+        <Window Type="MenuWidgets/StaticImage" Name="orxonox/InfoPopup_Background" >
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
             <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
             <Property Name="Alpha" Value="0.7" />
-            <Window Type="TaharezLook/Button" Name="orxonox/InfoPopup_close" >
-                <Property Name="Font" Value="BlueHighway-12" />
+            <Window Type="MenuWidgets/Button" Name="orxonox/InfoPopup_close" >
                 <Property Name="Text" Value="Close" />
                 <Property Name="Alpha" Value="0.7" />
@@ -19,5 +18,5 @@
                 <Event Name="Clicked" Function="InfoPopup.close"/>
             </Window>
-            <Window Type="TaharezLook/StaticText" Name="orxonox/InfoPopup_text" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/InfoPopup_text" >
                 <Property Name="Text" Value="Template text" />
                 <Property Name="TextColours" Value="FF4444FF" />
Index: de/branches/gamestates2/data/gui/layouts/InstancingDemo.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/InstancingDemo.layout	(revision 6594)
+++ 	(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/gamestates2/data/gui/layouts/KeyBindMenu.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/KeyBindMenu.layout	(revision 6594)
+++ /code/branches/gamestates2/data/gui/layouts/KeyBindMenu.layout	(revision 6595)
@@ -6,5 +6,5 @@
         <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="orxonox/KeyBindWindow" >
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/KeyBindWindow" >
             <Property Name="Text" Value="Keybindings" />
             <Property Name="Alpha" Value="0.8" />
@@ -14,5 +14,5 @@
             <Property Name="VertFormatting" Value="TopAligned" />
             <Property Name="UnifiedAreaRect" Value="{{0.15,0},{0.2125,0},{0.85,0},{0.6375,0}}" />
-            <Window Type="TaharezLook/StaticText" Name="orxonox/KeyBindWrapper" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/KeyBindWrapper" >
                 <Property Name="TextColours" Value="FF4444FF" />
                 <Property Name="InheritsAlpha" Value="False" />
@@ -21,5 +21,5 @@
                 <Property Name="VertFormatting" Value="TopAligned" />
                 <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.92,0}}" />
-                <Window Type="TaharezLook/ScrollablePane" Name="orxonox/KeyBindPane" >
+                <Window Type="MenuWidgets/ScrollablePane" Name="orxonox/KeyBindPane" >
                     <Property Name="ContentArea" Value="l:0 t:0 r:0 b:0" />
                     <Property Name="HorzStepSize" Value="0.005" />
@@ -34,5 +34,5 @@
             </Window>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/KeyBindBackButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/KeyBindBackButton" >
             <Property Name="Text" Value="Back" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
Index: /code/branches/gamestates2/data/gui/layouts/MainMenu.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/MainMenu.layout	(revision 6594)
+++ /code/branches/gamestates2/data/gui/layouts/MainMenu.layout	(revision 6595)
@@ -2,11 +2,11 @@
 
 <GUILayout >
-    <Window Type="TaharezLook/StaticImage" Name="orxonox/MainMenuBackground" >
+    <Window Type="MenuWidgets/StaticImage" Name="orxonox/MainMenuBackground" >
         <Property Name="FrameEnabled" Value="False" />
         <Property Name="InheritsAlpha" Value="False" />
         <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1.02125,0},{1.02167,0}}" />
+        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1.0,0},{1.0,0}}" />
         <Property Name="BackgroundEnabled" Value="False" />
-        <Window Type="TaharezLook/Button" Name="orxonox/QuickGameTestButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/QuickGameTestButton" >
             <Property Name="Text" Value="Quickstart" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -14,5 +14,5 @@
             <Event Name="Clicked" Function="MainMenu.QuickGameTestButton_clicked"/>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/SingleplayerButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/SingleplayerButton" >
             <Property Name="Text" Value="Singleplayer" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -20,5 +20,5 @@
             <Event Name="Clicked" Function="MainMenu.SingleplayerButton_clicked"/>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/MultiplayerButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/MultiplayerButton" >
             <Property Name="Text" Value="Multiplayer" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -26,5 +26,5 @@
             <Event Name="Clicked" Function="MainMenu.MultiplayerButton_clicked"/>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/SettingsButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/SettingsButton" >
             <Property Name="Text" Value="Settings" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -32,5 +32,5 @@
             <Event Name="Clicked" Function="MainMenu.SettingsButton_clicked"/>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/CreditsButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/CreditsButton" >
             <Property Name="Text" Value="Credits" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -38,5 +38,5 @@
             <Event Name="Clicked" Function="MainMenu.CreditsButton_clicked"/>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/ExitButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/ExitButton" >
             <Property Name="Text" Value="Exit" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
Index: /code/branches/gamestates2/data/gui/layouts/MainMenuBackground.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/MainMenuBackground.layout	(revision 6594)
+++ /code/branches/gamestates2/data/gui/layouts/MainMenuBackground.layout	(revision 6595)
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
 <GUILayout>
-    <Window Type="TaharezLook/StaticImage" Name="orxonox/Background">
+    <Window Type="MenuWidgets/StaticImage" Name="orxonox/Background">
     <Property Name="UnifiedSize" Value="{{1.0,0},{1.0,0}}"/>
     <Property Name="Image" Value="set:MainMenuBackground image:Background"/>
Index: /code/branches/gamestates2/data/gui/layouts/MouseControlsMenu.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/MouseControlsMenu.layout	(revision 6594)
+++ /code/branches/gamestates2/data/gui/layouts/MouseControlsMenu.layout	(revision 6595)
@@ -2,5 +2,5 @@
 
 <GUILayout >
-    <Window Type="TaharezLook/StaticImage" Name="orxonox/MouseControlsBackground" >
+    <Window Type="MenuWidgets/StaticImage" Name="orxonox/MouseControlsBackground" >
         <Property Name="FrameEnabled" Value="False" />
         <Property Name="InheritsAlpha" Value="False" />
@@ -8,5 +8,5 @@
         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
         <Property Name="BackgroundEnabled" Value="False" />
-        <Window Type="TaharezLook/StaticText" Name="orxonox/MouseControlsWindow" >
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/MouseControlsWindow" >
             <Property Name="Text" Value="Mouse controls" />
             <Property Name="Alpha" Value="0.8" />
@@ -16,5 +16,5 @@
             <Property Name="VertFormatting" Value="TopAligned" />
             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
-            <Window Type="TaharezLook/StaticText" Name="orxonox/MouseNormalSensitivity" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/MouseNormalSensitivity" >
                 <Property Name="Text" Value="Sensitivity (normal mode)                                      " />
                 <Property Name="InheritsAlpha" Value="False" />
@@ -23,5 +23,5 @@
                 <Property Name="VertFormatting" Value="TopAligned" />
                 <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.2,0},{0.95,0},{0.45,0}}" />
-                <Window Type="TaharezLook/HorizontalScrollbar" Name="orxonox/MouseNormalScrollbar" >
+                <Window Type="MenuWidgets/HorizontalScrollbar" Name="orxonox/MouseNormalScrollbar" >
                     <Property Name="PageSize" Value="0" />
                     <Property Name="StepSize" Value="1" />
@@ -36,5 +36,5 @@
                     <Event Name="ScrollPosChanged" Function="MouseControlsMenu.MouseControlsMouseNormalScrollbar_changed" />
                 </Window>
-                <Window Type="TaharezLook/RadioButton" Name="orxonox/MouseNormalButton" >
+                <Window Type="MenuWidgets/RadioButton" Name="orxonox/MouseNormalButton" >
                     <Property Name="Text" Value="Normal mouse input" />
                     <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -43,5 +43,5 @@
                 </Window>
             </Window>
-            <Window Type="TaharezLook/StaticText" Name="orxonox/MouseDeriveSensitivity" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/MouseDeriveSensitivity" >
                 <Property Name="Text" Value="Sensitivity (derive mode)                                      " />
                 <Property Name="InheritsAlpha" Value="False" />
@@ -50,5 +50,5 @@
                 <Property Name="VertFormatting" Value="TopAligned" />
                 <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.55,0},{0.95,0},{0.8,0}}" />
-                <Window Type="TaharezLook/HorizontalScrollbar" Name="orxonox/MouseDeriveScrollbar" >
+                <Window Type="MenuWidgets/HorizontalScrollbar" Name="orxonox/MouseDeriveScrollbar" >
                     <Property Name="PageSize" Value="0" />
                     <Property Name="StepSize" Value="1" />
@@ -63,5 +63,5 @@
                     <Event Name="ScrollPosChanged" Function="MouseControlsMenu.MouseControlsMouseDeriveScrollbar_changed" />
                 </Window>
-                <Window Type="TaharezLook/RadioButton" Name="orxonox/MouseDeriveButton" >
+                <Window Type="MenuWidgets/RadioButton" Name="orxonox/MouseDeriveButton" >
                     <Property Name="Text" Value="Derive mouse input" />
                     <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -70,5 +70,5 @@
                 </Window>
             </Window>
-            <Window Type="TaharezLook/Checkbox" Name="orxonox/MouseInvertCheckbox" >
+            <Window Type="MenuWidgets/Checkbox" Name="orxonox/MouseInvertCheckbox" >
                 <Property Name="Text" Value="Invert mouse" />
                 <Property Name="Disabled" Value="true" />
@@ -78,5 +78,5 @@
             </Window>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/MouseControlsBackButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/MouseControlsBackButton" >
             <Property Name="Text" Value="Back" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
Index: /code/branches/gamestates2/data/gui/layouts/MultiplayerMenu.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/MultiplayerMenu.layout	(revision 6594)
+++ /code/branches/gamestates2/data/gui/layouts/MultiplayerMenu.layout	(revision 6595)
@@ -2,5 +2,5 @@
 
 <GUILayout >
-    <Window Type="TaharezLook/StaticImage" Name="orxonox/MultiplayerBackground" >
+    <Window Type="MenuWidgets/StaticImage" Name="orxonox/MultiplayerBackground" >
         <Property Name="FrameEnabled" Value="False" />
         <Property Name="InheritsAlpha" Value="False" />
@@ -8,5 +8,5 @@
         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
         <Property Name="BackgroundEnabled" Value="False" />
-        <Window Type="TaharezLook/StaticText" Name="orxonox/MultiplayerWindow" >
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/MultiplayerWindow" >
             <Property Name="Text" Value="Multiplayer" />
             <Property Name="Alpha" Value="0.8" />
@@ -16,9 +16,9 @@
             <Property Name="VertFormatting" Value="TopAligned" />
             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.2875,0},{0.75,0},{0.6375,0}}" />
-            <Window Type="TaharezLook/Listbox" Name="orxonox/MultiplayerLevelListbox" >
+            <Window Type="MenuWidgets/Listbox" Name="orxonox/MultiplayerLevelListbox" >
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
                 <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.8,0}}" />
             </Window>
-            <Window Type="TaharezLook/RadioButton" Name="orxonox/MultiplayerJoinButton" >
+            <Window Type="MenuWidgets/RadioButton" Name="orxonox/MultiplayerJoinButton" >
                 <Property Name="Text" Value="Join" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -26,5 +26,5 @@
                 <Event Name="SelectStateChanged" Function="MultiplayerMenu.MultiplayerJoinButton_clicked"/>
             </Window>
-            <Window Type="TaharezLook/RadioButton" Name="orxonox/MultiplayerHostButton" >
+            <Window Type="MenuWidgets/RadioButton" Name="orxonox/MultiplayerHostButton" >
                 <Property Name="Text" Value="Host" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -32,5 +32,5 @@
                 <Event Name="SelectStateChanged" Function="MultiplayerMenu.MultiplayerHostButton_clicked"/>
             </Window>
-            <Window Type="TaharezLook/RadioButton" Name="orxonox/MultiplayerDedicatedButton" >
+            <Window Type="MenuWidgets/RadioButton" Name="orxonox/MultiplayerDedicatedButton" >
                 <Property Name="Text" Value="Dedicated" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -39,5 +39,5 @@
             </Window>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/MultiplayerStartButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/MultiplayerStartButton" >
             <Property Name="Text" Value="Start" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -45,5 +45,5 @@
             <Event Name="Clicked" Function="MultiplayerMenu.MultiplayerStartButton_clicked"/>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/MultiplayerBackButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/MultiplayerBackButton" >
             <Property Name="Text" Value="Back" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
Index: /code/branches/gamestates2/data/gui/layouts/MultiplayerOptionsMenu.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/MultiplayerOptionsMenu.layout	(revision 6594)
+++ /code/branches/gamestates2/data/gui/layouts/MultiplayerOptionsMenu.layout	(revision 6595)
@@ -2,5 +2,5 @@
 
 <GUILayout >
-    <Window Type="TaharezLook/StaticImage" Name="orxonox/MultiplayerOptionsBackground" >
+    <Window Type="MenuWidgets/StaticImage" Name="orxonox/MultiplayerOptionsBackground" >
         <Property Name="FrameEnabled" Value="False" />
         <Property Name="InheritsAlpha" Value="False" />
@@ -8,5 +8,5 @@
         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
         <Property Name="BackgroundEnabled" Value="False" />
-        <Window Type="TaharezLook/StaticText" Name="orxonox/MultiplayerOptionsWindow" >
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/MultiplayerOptionsWindow" >
             <Property Name="Text" Value="Multiplayer options" />
             <Property Name="Alpha" Value="0.8" />
@@ -17,5 +17,5 @@
             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/MultiplayerOptionsBackButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/MultiplayerOptionsBackButton" >
             <Property Name="Text" Value="Back" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
Index: /code/branches/gamestates2/data/gui/layouts/PickupInventory.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/PickupInventory.layout	(revision 6594)
+++ /code/branches/gamestates2/data/gui/layouts/PickupInventory.layout	(revision 6595)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <GUILayout>
-    <Window Type="TaharezLook/FrameWindow" Name="orxonox/Inventory">
+    <Window Type="MenuWidgets/FrameWindow" Name="orxonox/Inventory">
         <Property Name="UnifiedMinSize" Value="{{0.0,385},{0.0,200}}" />
         <Property Name="UnifiedMaxSize" Value="{{0.0,385},{0.0,200}}" />
@@ -9,5 +9,5 @@
         <Property Name="CloseButtonEnabled" Value="False" />
 
-        <Window Type="TaharezLook/TabControl" Name="orxonox/Inventory/TabControl" >
+        <Window Type="MenuWidgets/TabControl" Name="orxonox/Inventory/TabControl" >
             <Property Name="Tooltip" Value="Inventory" />
             <Property Name="TabHeight" Value="{0,-1}" />
@@ -16,10 +16,10 @@
             <Property Name="UnifiedAreaRect" Value="{{0,10},{0,30},{1,-10},{1,-10}}" />
 
-            <Window Type="TaharezLook/ScrollablePane" Name="orxonox/Inventory/TabControl/TabEquipment">
+            <Window Type="MenuWidgets/ScrollablePane" Name="orxonox/Inventory/TabControl/TabEquipment">
                 <Property Name="Text" Value="Equipment" />
                 <Property Name="UnifiedPosition" Value="{{0.0,3},{0.0,3}}"/>
                 <Property Name="UnifiedSize" Value="{{1.0,-6},{1.0,-6}}"/>
             </Window>
-            <Window Type="TaharezLook/ScrollablePane" Name="orxonox/Inventory/TabControl/TabUsable">
+            <Window Type="MenuWidgets/ScrollablePane" Name="orxonox/Inventory/TabControl/TabUsable">
                 <Property Name="Text" Value="Usable" />
                 <Property Name="UnifiedPosition" Value="{{0.0,3},{0.0,3}}"/>
Index: /code/branches/gamestates2/data/gui/layouts/QuestGUI.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/QuestGUI.layout	(revision 6594)
+++ /code/branches/gamestates2/data/gui/layouts/QuestGUI.layout	(revision 6595)
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
 <GUILayout>
-    <Window Type="TaharezLook/StaticImage" Name="orxonox/QuestGUI/Background">
+    <Window Type="MenuWidgets/StaticImage" Name="orxonox/QuestGUI/Background">
     <Property Name="UnifiedSize" Value="{{1.0,0},{1.0,0}}"/>
     <Property Name="Image" Value="set:MainMenuBackground image:Background"/>
@@ -8,5 +8,5 @@
     <Property Name="InheritsAlpha" Value="False" />
 
-        <Window Type="TaharezLook/Titlebar" Name="orxonox/QuestGUI/Title">
+        <Window Type="MenuWidgets/Titlebar" Name="orxonox/QuestGUI/Title">
             <Property Name="UnifiedPosition" Value="{{0.05,0},{0.05,0}}"/>
             <Property Name="UnifiedSize" Value="{{0.9,0},{0.05,0}}"/>
@@ -14,5 +14,5 @@
         </Window>
 
-        <Window Type="TaharezLook/Listbox" Name="orxonox/QuestGUI/QuestsList">
+        <Window Type="MenuWidgets/Listbox" Name="orxonox/QuestGUI/QuestsList">
             <Property Name="UnifiedPosition" Value="{{0.07,0},{0.18,0}}" />
             <Property Name="UnifiedSize" Value="{{0.86,0},{0.8,0}}" />
Index: /code/branches/gamestates2/data/gui/layouts/SettingsMenu.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/SettingsMenu.layout	(revision 6594)
+++ /code/branches/gamestates2/data/gui/layouts/SettingsMenu.layout	(revision 6595)
@@ -2,5 +2,5 @@
 
 <GUILayout >
-    <Window Type="TaharezLook/StaticImage" Name="orxonox/SettingsBackground" >
+    <Window Type="MenuWidgets/StaticImage" Name="orxonox/SettingsBackground" >
         <Property Name="InheritsAlpha" Value="False" />
         <Property Name="FrameEnabled" Value="False" />
@@ -8,5 +8,5 @@
         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
         <Property Name="BackgroundEnabled" Value="False" />
-        <Window Type="TaharezLook/StaticText" Name="orxonox/SettingsWindow" >
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/SettingsWindow" >
             <Property Name="Text" Value="Settings" />
             <Property Name="Alpha" Value="0.8" />
@@ -16,5 +16,5 @@
             <Property Name="VertFormatting" Value="TopAligned" />
             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
-            <Window Type="TaharezLook/Button" Name="orxonox/GameplayButton" >
+            <Window Type="MenuWidgets/Button" Name="orxonox/GameplayButton" >
                 <Property Name="Text" Value="Gameplay" />
                 <Property Name="Disabled" Value="True" />
@@ -23,5 +23,5 @@
                 <Event Name="Clicked" Function="SettingsMenu.SettingsGameplayButton_clicked"/>
             </Window>
-            <Window Type="TaharezLook/Button" Name="orxonox/MultiplayerOptionsButton" >
+            <Window Type="MenuWidgets/Button" Name="orxonox/MultiplayerOptionsButton" >
                 <Property Name="Text" Value="Multiplayer options" />
                 <Property Name="Disabled" Value="True" />
@@ -30,5 +30,5 @@
                 <Event Name="Clicked" Function="SettingsMenu.SettingsMultiplayerOptionsButton_clicked"/>
             </Window>
-            <Window Type="TaharezLook/Button" Name="orxonox/ControlsButton" >
+            <Window Type="MenuWidgets/Button" Name="orxonox/ControlsButton" >
                 <Property Name="Text" Value="Controls" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -36,5 +36,5 @@
                 <Event Name="Clicked" Function="SettingsMenu.SettingsControlsButton_clicked"/>
             </Window>
-            <Window Type="TaharezLook/Button" Name="orxonox/GraphicsButton" >
+            <Window Type="MenuWidgets/Button" Name="orxonox/GraphicsButton" >
                 <Property Name="Text" Value="Graphics" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -42,5 +42,5 @@
                 <Event Name="Clicked" Function="SettingsMenu.SettingsGraphicsButton_clicked"/>
             </Window>
-            <Window Type="TaharezLook/Button" Name="orxonox/AudioButton" >
+            <Window Type="MenuWidgets/Button" Name="orxonox/AudioButton" >
                 <Property Name="Text" Value="Audio" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -48,5 +48,5 @@
                 <Event Name="Clicked" Function="SettingsMenu.SettingsAudioButton_clicked"/>
             </Window>
-            <Window Type="TaharezLook/Button" Name="orxonox/ResetSettingsButton" >
+            <Window Type="MenuWidgets/Button" Name="orxonox/ResetSettingsButton" >
                 <Property Name="Text" Value="Reset settings" />
                 <Property Name="Disabled" Value="True" />
@@ -56,5 +56,5 @@
             </Window>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/SettingsBackButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/SettingsBackButton" >
             <Property Name="Text" Value="Back" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
Index: /code/branches/gamestates2/data/gui/layouts/SingleplayerMenu.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/SingleplayerMenu.layout	(revision 6594)
+++ /code/branches/gamestates2/data/gui/layouts/SingleplayerMenu.layout	(revision 6595)
@@ -2,5 +2,5 @@
 
 <GUILayout >
-    <Window Type="TaharezLook/StaticImage" Name="orxonox/SingleplayerBackground" >
+    <Window Type="MenuWidgets/StaticImage" Name="orxonox/SingleplayerBackground" >
         <Property Name="FrameEnabled" Value="False" />
         <Property Name="InheritsAlpha" Value="False" />
@@ -8,5 +8,5 @@
         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
         <Property Name="BackgroundEnabled" Value="False" />
-        <Window Type="TaharezLook/StaticText" Name="orxonox/SingleplayerWindow" >
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/SingleplayerWindow" >
             <Property Name="Text" Value="Singleplayer" />
             <Property Name="Alpha" Value="0.8" />
@@ -16,10 +16,10 @@
             <Property Name="VertFormatting" Value="TopAligned" />
             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.2875,0},{0.75,0},{0.6375,0}}" />
-            <Window Type="TaharezLook/Listbox" Name="orxonox/SingleplayerLevelListbox" >
+            <Window Type="MenuWidgets/Listbox" Name="orxonox/SingleplayerLevelListbox" >
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
                 <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.92,0}}" />
             </Window>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/SingleplayerStartButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/SingleplayerStartButton" >
             <Property Name="Text" Value="Start" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -27,5 +27,5 @@
             <Event Name="Clicked" Function="SingleplayerMenu.SingleplayerStartButton_clicked"/>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/SingleplayerBackButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/SingleplayerBackButton" >
             <Property Name="Text" Value="Back" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
Index: de/branches/gamestates2/data/gui/layouts/TabControlDemo.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/TabControlDemo.layout	(revision 6594)
+++ 	(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: de/branches/gamestates2/data/gui/layouts/TabPage.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/TabPage.layout	(revision 6594)
+++ 	(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: de/branches/gamestates2/data/gui/layouts/TabPage1.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/TabPage1.layout	(revision 6594)
+++ 	(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: de/branches/gamestates2/data/gui/layouts/TabPage2.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/TabPage2.layout	(revision 6594)
+++ 	(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: de/branches/gamestates2/data/gui/layouts/TextDemo.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/TextDemo.layout	(revision 6594)
+++ 	(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: de/branches/gamestates2/data/gui/layouts/TreeDemoTaharez.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/TreeDemoTaharez.layout	(revision 6594)
+++ 	(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: de/branches/gamestates2/data/gui/layouts/VanillaConsole.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/VanillaConsole.layout	(revision 6594)
+++ 	(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: de/branches/gamestates2/data/gui/layouts/VanillaWindows.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/VanillaWindows.layout	(revision 6594)
+++ 	(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: de/branches/gamestates2/data/gui/layouts/cegui8.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/cegui8.layout	(revision 6594)
+++ 	(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: de/branches/gamestates2/data/gui/layouts/facial.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/facial.layout	(revision 6594)
+++ 	(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: de/branches/gamestates2/data/gui/layouts/ogregui.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/ogregui.layout	(revision 6594)
+++ 	(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: de/branches/gamestates2/data/gui/layouts/shadows.layout
===================================================================
--- /code/branches/gamestates2/data/gui/layouts/shadows.layout	(revision 6594)
+++ 	(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>
Index: de/branches/gamestates2/data/gui/schemes/Demo8.scheme
===================================================================
--- /code/branches/gamestates2/data/gui/schemes/Demo8.scheme	(revision 6594)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" ?>
-<GUIScheme Name="TaharezLook">
-	<Imageset Name="TaharezLook" Filename="TaharezLook.imageset" />
-	<Font Name="Commonwealth-10" Filename="Commonwealth-10.font" />
-	<LookNFeel Filename="TaharezLook.looknfeel" />
-	<WindowRendererSet Filename="CEGUIFalagardWRBase" />
-	
-	<FalagardMapping WindowType="TaharezLook/Button"      TargetType="CEGUI/PushButton"  Renderer="Falagard/Button"       LookNFeel="TaharezLook/Button" />
-	<FalagardMapping WindowType="TaharezLook/Checkbox"    TargetType="CEGUI/Checkbox"    Renderer="Falagard/ToggleButton" LookNFeel="TaharezLook/Checkbox" />
-	<FalagardMapping WindowType="TaharezLook/ImageButton" TargetType="CEGUI/PushButton"  Renderer="Falagard/Button"       LookNFeel="TaharezLook/ImageButton" />
-	<FalagardMapping WindowType="TaharezLook/RadioButton" TargetType="CEGUI/RadioButton" Renderer="Falagard/ToggleButton" LookNFeel="TaharezLook/RadioButton" />
-
-	<FalagardMapping WindowType="TaharezLook/FrameWindow"  TargetType="CEGUI/FrameWindow" Renderer="Falagard/FrameWindow"  LookNFeel="TaharezLook/FrameWindow" />
-	<FalagardMapping WindowType="TaharezLook/Titlebar"     TargetType="CEGUI/Titlebar"    Renderer="Falagard/Titlebar"     LookNFeel="TaharezLook/Titlebar" />
-	<FalagardMapping WindowType="TaharezLook/SystemButton" TargetType="CEGUI/PushButton"  Renderer="Falagard/SystemButton" LookNFeel="TaharezLook/Button" />
-
-	<FalagardMapping WindowType="TaharezLook/Editbox"          TargetType="CEGUI/Editbox"          Renderer="Falagard/Editbox"          LookNFeel="TaharezLook/Editbox" />
-	<FalagardMapping WindowType="TaharezLook/MultiLineEditbox" TargetType="CEGUI/MultiLineEditbox" Renderer="Falagard/MultiLineEditbox" LookNFeel="TaharezLook/MultiLineEditbox" />
-
-	<FalagardMapping WindowType="TaharezLook/Menubar"   TargetType="CEGUI/Menubar"   Renderer="Falagard/Menubar"   LookNFeel="TaharezLook/Menubar" />
-	<FalagardMapping WindowType="TaharezLook/PopupMenu" TargetType="CEGUI/PopupMenu" Renderer="Falagard/PopupMenu" LookNFeel="TaharezLook/PopupMenu" />
-	<FalagardMapping WindowType="TaharezLook/MenuItem"  TargetType="CEGUI/MenuItem"  Renderer="Falagard/MenuItem"  LookNFeel="TaharezLook/MenuItem" />
-
-	<FalagardMapping WindowType="TaharezLook/AlternateProgressBar" TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="TaharezLook/AltProgressBar" />
-	<FalagardMapping WindowType="TaharezLook/ProgressBar"          TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="TaharezLook/ProgressBar" />
-	<FalagardMapping WindowType="TaharezLook/VUMeter"              TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="TaharezLook/VUMeter" />
-
-	<FalagardMapping WindowType="TaharezLook/VerticalScrollbar"   TargetType="CEGUI/Scrollbar" Renderer="Falagard/Scrollbar" LookNFeel="TaharezLook/VerticalScrollbar" />
-	<FalagardMapping WindowType="TaharezLook/HorizontalScrollbar" TargetType="CEGUI/Scrollbar" Renderer="Falagard/Scrollbar" LookNFeel="TaharezLook/HorizontalScrollbar" />
-
-	<FalagardMapping WindowType="TaharezLook/VerticalScrollbarThumb"   TargetType="CEGUI/Thumb" Renderer="Falagard/Button" LookNFeel="TaharezLook/VerticalScrollbarThumb" />
-    <FalagardMapping WindowType="TaharezLook/HorizontalScrollbarThumb" TargetType="CEGUI/Thumb" Renderer="Falagard/Button" LookNFeel="TaharezLook/HorizontalScrollbarThumb" />
-	
-	<FalagardMapping WindowType="TaharezLook/LargeVerticalScrollbar"      TargetType="CEGUI/Scrollbar" Renderer="Falagard/Scrollbar" LookNFeel="TaharezLook/LargeVerticalScrollbar" />
-    <FalagardMapping WindowType="TaharezLook/LargeVerticalScrollbarThumb" TargetType="CEGUI/Thumb"     Renderer="Falagard/Button"    LookNFeel="TaharezLook/LargeVerticalScrollbarThumb" />
-
-	<FalagardMapping WindowType="TaharezLook/TabButtonPane"  TargetType="CEGUI/TabButton"  Renderer="Falagard/Default"  LookNFeel="TaharezLook/TabButtonPane" />
-	<FalagardMapping WindowType="TaharezLook/TabButton"  TargetType="CEGUI/TabButton"  Renderer="Falagard/TabButton"  LookNFeel="TaharezLook/TabButton" />
-    <FalagardMapping WindowType="TaharezLook/TabControl" TargetType="CEGUI/TabControl" Renderer="Falagard/TabControl" LookNFeel="TaharezLook/TabControl" />
-    <FalagardMapping WindowType="TaharezLook/TabContentPane"    TargetType="DefaultWindow"    Renderer="Falagard/Default"    LookNFeel="TaharezLook/TabContentPane" />
-
-	<FalagardMapping WindowType="TaharezLook/ComboDropList" TargetType="CEGUI/ComboDropList" Renderer="Falagard/Listbox" LookNFeel="TaharezLook/ComboDropList" />
-    <FalagardMapping WindowType="TaharezLook/ComboEditbox"  TargetType="CEGUI/Editbox"       Renderer="Falagard/Editbox" LookNFeel="TaharezLook/ComboEditbox" />
-    <FalagardMapping WindowType="TaharezLook/Combobox"      TargetType="CEGUI/Combobox"      Renderer="Falagard/Default" LookNFeel="TaharezLook/Combobox" />
-
-	<FalagardMapping WindowType="TaharezLook/Listbox"           TargetType="CEGUI/Listbox"           Renderer="Falagard/Listbox"           LookNFeel="TaharezLook/Listbox" />
-	<FalagardMapping WindowType="TaharezLook/ListHeader"        TargetType="CEGUI/ListHeader"        Renderer="Falagard/ListHeader"        LookNFeel="TaharezLook/ListHeader" />
-    <FalagardMapping WindowType="TaharezLook/ListHeaderSegment" TargetType="CEGUI/ListHeaderSegment" Renderer="Falagard/ListHeaderSegment" LookNFeel="TaharezLook/ListHeaderSegment" />
-    <FalagardMapping WindowType="TaharezLook/MultiColumnList"   TargetType="CEGUI/MultiColumnList"   Renderer="Falagard/MultiColumnList"   LookNFeel="TaharezLook/MultiColumnList" />
-
-	<FalagardMapping WindowType="TaharezLook/Slider"      TargetType="CEGUI/Slider"      Renderer="Falagard/Slider"  LookNFeel="TaharezLook/Slider" />
-    <FalagardMapping WindowType="TaharezLook/SliderThumb" TargetType="CEGUI/SliderThumb" Renderer="Falagard/Button"  LookNFeel="TaharezLook/SliderThumb" />
-
-	<FalagardMapping WindowType="TaharezLook/ScrollablePane" TargetType="CEGUI/ScrollablePane" Renderer="Falagard/ScrollablePane" LookNFeel="TaharezLook/ScrollablePane" />
-	
-	<FalagardMapping WindowType="TaharezLook/Spinner" TargetType="CEGUI/Spinner" Renderer="Falagard/Default" LookNFeel="TaharezLook/Spinner" />
-	
-	<FalagardMapping WindowType="TaharezLook/Tooltip" TargetType="CEGUI/Tooltip" Renderer="Falagard/Tooltip" LookNFeel="TaharezLook/Tooltip" />
-
-	<FalagardMapping WindowType="TaharezLook/StaticImage" TargetType="DefaultWindow" Renderer="Falagard/StaticImage" LookNFeel="TaharezLook/StaticImage" />
-    <FalagardMapping WindowType="TaharezLook/StaticText"  TargetType="DefaultWindow" Renderer="Falagard/StaticText"  LookNFeel="TaharezLook/StaticText" />
-</GUIScheme>
Index: /code/branches/gamestates2/data/gui/schemes/Looks.txt
===================================================================
--- /code/branches/gamestates2/data/gui/schemes/Looks.txt	(revision 6595)
+++ /code/branches/gamestates2/data/gui/schemes/Looks.txt	(revision 6595)
@@ -0,0 +1,28 @@
+We use TaharezLook as default and reference. That means each new look ideally
+has to implement all widgets from TaharezLook except 4 (see below).
+If not, please use the Taharez version in the look files.
+
+
+*******
+*LOOKS*
+*******
+
+Taharez
+'''''''
+Missing   :
+Additional: AlternateProgressBar, LargeVerticalScrollbar,
+            LargeVerticalScrollbarThumb
+
+Windows
+'''''''
+Missing   : ComboEditbox, ImageButton, Tree
+Additional: IconButton, Static
+
+SleekSpace
+''''''''''
+LookNFeel file does not yet work with CEGUI > 0.4 because of missing property
+definitions.
+
+Vanilla
+'''''''
+LookNFeel file also misses some property definitions.
Index: /code/branches/gamestates2/data/gui/schemes/OrxonoxGUIScheme.scheme
===================================================================
--- /code/branches/gamestates2/data/gui/schemes/OrxonoxGUIScheme.scheme	(revision 6594)
+++ /code/branches/gamestates2/data/gui/schemes/OrxonoxGUIScheme.scheme	(revision 6595)
@@ -2,3 +2,6 @@
 <GUIScheme Name="OrxonoxGUI">
     <Imageset Name="MainMenuBackground" Filename="MainMenuBackground.imageset"/>
+    <Font Name="BlueHighway-12" Filename="bluehighway-12.font" />
+    <Font Name="BlueHighway-10" Filename="bluehighway-10.font" />
+    <Font Name="BlueHighway-8"  Filename="bluehighway-8.font"  />
 </GUIScheme>
Index: /code/branches/gamestates2/data/gui/schemes/SleekSpaceHUDWidgets.scheme
===================================================================
--- /code/branches/gamestates2/data/gui/schemes/SleekSpaceHUDWidgets.scheme	(revision 6595)
+++ /code/branches/gamestates2/data/gui/schemes/SleekSpaceHUDWidgets.scheme	(revision 6595)
@@ -0,0 +1,42 @@
+<?xml version="1.0" ?>
+<GUIScheme Name="SleekSpaceHUDWidgets">
+    <WindowAlias Alias="HUDWidgets/StaticImage"              Target="SleekSpace/StaticImage" />
+    <WindowAlias Alias="HUDWidgets/StaticText"               Target="SleekSpace/StaticText" />
+    <WindowAlias Alias="HUDWidgets/TabButtonPane"            Target="SleekSpace/TabButtonPane" />
+    <WindowAlias Alias="HUDWidgets/TabContentPane"           Target="SleekSpace/TabContentPane" />
+    <WindowAlias Alias="HUDWidgets/Checkbox"                 Target="SleekSpace/Checkbox" />
+    <WindowAlias Alias="HUDWidgets/Combobox"                 Target="SleekSpace/Combobox" />
+    <WindowAlias Alias="HUDWidgets/ComboDropList"            Target="SleekSpace/ComboDropList" />
+    <WindowAlias Alias="HUDWidgets/ComboEditbox"             Target="SleekSpace/ComboEditbox" />
+    <WindowAlias Alias="HUDWidgets/Editbox"                  Target="SleekSpace/Editbox" />
+    <WindowAlias Alias="HUDWidgets/FrameWindow"              Target="SleekSpace/FrameWindow" />
+    <WindowAlias Alias="HUDWidgets/GroupBox"                 Target="SleekSpace/GroupBox" />
+    <WindowAlias Alias="HUDWidgets/ItemListbox"              Target="SleekSpace/ItemListbox" />
+    <WindowAlias Alias="HUDWidgets/ListboxItem"              Target="SleekSpace/ListboxItem" />
+    <WindowAlias Alias="HUDWidgets/Listbox"                  Target="SleekSpace/Listbox" />
+    <WindowAlias Alias="HUDWidgets/ListHeader"               Target="SleekSpace/ListHeader" />
+    <WindowAlias Alias="HUDWidgets/ListHeaderSegment"        Target="SleekSpace/ListHeaderSegment" />
+    <WindowAlias Alias="HUDWidgets/MultiLineEditbox"         Target="SleekSpace/MultiLineEditbox" />
+    <WindowAlias Alias="HUDWidgets/Menubar"                  Target="SleekSpace/Menubar" />
+    <WindowAlias Alias="HUDWidgets/MenuItem"                 Target="SleekSpace/MenuItem" />
+    <WindowAlias Alias="HUDWidgets/MultiColumnList"          Target="SleekSpace/MultiColumnList" />
+    <WindowAlias Alias="HUDWidgets/PopupMenu"                Target="SleekSpace/PopupMenu" />
+    <WindowAlias Alias="HUDWidgets/ProgressBar"              Target="SleekSpace/ProgressBar" />
+    <WindowAlias Alias="HUDWidgets/Button"                   Target="SleekSpace/Button" />
+    <WindowAlias Alias="HUDWidgets/ImageButton"              Target="SleekSpace/ImageButton" />
+    <WindowAlias Alias="HUDWidgets/RadioButton"              Target="SleekSpace/RadioButton" />
+    <WindowAlias Alias="HUDWidgets/SystemButton"             Target="SleekSpace/SystemButton" />
+    <WindowAlias Alias="HUDWidgets/ScrollablePane"           Target="SleekSpace/ScrollablePane" />
+    <WindowAlias Alias="HUDWidgets/HorizontalScrollbar"      Target="SleekSpace/HorizontalScrollbar" />
+    <WindowAlias Alias="HUDWidgets/VerticalScrollbar"        Target="SleekSpace/VerticalScrollbar" />
+    <WindowAlias Alias="HUDWidgets/Slider"                   Target="SleekSpace/Slider" />
+    <WindowAlias Alias="HUDWidgets/Spinner"                  Target="SleekSpace/Spinner" />
+    <WindowAlias Alias="HUDWidgets/TabButton"                Target="SleekSpace/TabButton" />
+    <WindowAlias Alias="HUDWidgets/TabControl"               Target="SleekSpace/TabControl" />
+    <WindowAlias Alias="HUDWidgets/HorizontalScrollbarThumb" Target="SleekSpace/HorizontalScrollbarThumb" />
+    <WindowAlias Alias="HUDWidgets/SliderThumb"              Target="SleekSpace/SliderThumb" />
+    <WindowAlias Alias="HUDWidgets/VerticalScrollbarThumb"   Target="SleekSpace/VerticalScrollbarThumb" />
+    <WindowAlias Alias="HUDWidgets/Titlebar"                 Target="SleekSpace/Titlebar" />
+    <WindowAlias Alias="HUDWidgets/Tooltip"                  Target="SleekSpace/Tooltip" />
+    <WindowAlias Alias="HUDWidgets/Tree"                     Target="SleekSpace/Tree" />
+</GUIScheme>
Index: /code/branches/gamestates2/data/gui/schemes/SleekSpaceLook.scheme
===================================================================
--- /code/branches/gamestates2/data/gui/schemes/SleekSpaceLook.scheme	(revision 6595)
+++ /code/branches/gamestates2/data/gui/schemes/SleekSpaceLook.scheme	(revision 6595)
@@ -0,0 +1,61 @@
+<?xml version="1.0" ?>
+<GUIScheme Name="SleekSpaceLook">
+    <Imageset Name="SleekSpace" Filename="SleekSpace.imageset" />
+    <Imageset Name="TaharezLook" Filename="TaharezLook.imageset" />
+    <LookNFeel Filename="SleekSpace.looknfeel" />
+    <LookNFeel Filename="TaharezLook.looknfeel" />
+    <WindowRendererSet Filename="CEGUIFalagardWRBase" />
+
+    <!-- Standard widgets -->
+    <FalagardMapping WindowType="SleekSpace/StaticImage"                 TargetType="DefaultWindow"           Renderer="Falagard/StaticImage"       LookNFeel="SleekSpace/StaticImage" />
+    <FalagardMapping WindowType="SleekSpace/StaticText"                  TargetType="DefaultWindow"           Renderer="Falagard/StaticText"        LookNFeel="SleekSpace/StaticText" />
+    <FalagardMapping WindowType="SleekSpace/Checkbox"                    TargetType="CEGUI/Checkbox"          Renderer="Falagard/ToggleButton"      LookNFeel="SleekSpace/Checkbox" />
+    <FalagardMapping WindowType="SleekSpace/Combobox"                    TargetType="CEGUI/Combobox"          Renderer="Falagard/Default"           LookNFeel="SleekSpace/Combobox" />
+    <FalagardMapping WindowType="SleekSpace/ComboDropList"               TargetType="CEGUI/ComboDropList"     Renderer="Falagard/Listbox"           LookNFeel="SleekSpace/ComboDropList" />
+    <FalagardMapping WindowType="SleekSpace/ComboEditbox"                TargetType="CEGUI/Editbox"           Renderer="Falagard/Editbox"           LookNFeel="SleekSpace/ComboEditbox" />
+    <FalagardMapping WindowType="SleekSpace/Editbox"                     TargetType="CEGUI/Editbox"           Renderer="Falagard/Editbox"           LookNFeel="SleekSpace/Editbox" />
+    <FalagardMapping WindowType="SleekSpace/FrameWindow"                 TargetType="CEGUI/FrameWindow"       Renderer="Falagard/FrameWindow"       LookNFeel="SleekSpace/FrameWindow" />
+    <FalagardMapping WindowType="SleekSpace/Listbox"                     TargetType="CEGUI/Listbox"           Renderer="Falagard/Listbox"           LookNFeel="SleekSpace/Listbox" />
+    <FalagardMapping WindowType="SleekSpace/ListHeader"                  TargetType="CEGUI/ListHeader"        Renderer="Falagard/ListHeader"        LookNFeel="SleekSpace/ListHeader" />
+    <FalagardMapping WindowType="SleekSpace/ListHeaderSegment"           TargetType="CEGUI/ListHeaderSegment" Renderer="Falagard/ListHeaderSegment" LookNFeel="SleekSpace/ListHeaderSegment" />
+    <FalagardMapping WindowType="SleekSpace/MultiLineEditbox"            TargetType="CEGUI/MultiLineEditbox"  Renderer="Falagard/MultiLineEditbox"  LookNFeel="SleekSpace/MultiLineEditbox" />
+    <FalagardMapping WindowType="SleekSpace/Menubar"                     TargetType="CEGUI/Menubar"           Renderer="Falagard/Menubar"           LookNFeel="SleekSpace/Menubar" />
+    <FalagardMapping WindowType="SleekSpace/MenuItem"                    TargetType="CEGUI/MenuItem"          Renderer="Falagard/MenuItem"          LookNFeel="SleekSpace/MenuItem" />
+    <FalagardMapping WindowType="SleekSpace/MultiColumnList"             TargetType="CEGUI/MultiColumnList"   Renderer="Falagard/MultiColumnList"   LookNFeel="SleekSpace/MultiColumnList" />
+    <FalagardMapping WindowType="SleekSpace/PopupMenu"                   TargetType="CEGUI/PopupMenu"         Renderer="Falagard/PopupMenu"         LookNFeel="SleekSpace/PopupMenu" />
+    <FalagardMapping WindowType="SleekSpace/ProgressBar"                 TargetType="CEGUI/ProgressBar"       Renderer="Falagard/ProgressBar"       LookNFeel="SleekSpace/ProgressBar" />
+    <FalagardMapping WindowType="SleekSpace/Button"                      TargetType="CEGUI/PushButton"        Renderer="Falagard/Button"            LookNFeel="SleekSpace/Button" />
+    <FalagardMapping WindowType="SleekSpace/RadioButton"                 TargetType="CEGUI/RadioButton"       Renderer="Falagard/ToggleButton"      LookNFeel="SleekSpace/RadioButton" />
+    <FalagardMapping WindowType="SleekSpace/SystemButton"                TargetType="CEGUI/PushButton"        Renderer="Falagard/SystemButton"      LookNFeel="SleekSpace/Button" />
+    <FalagardMapping WindowType="SleekSpace/ScrollablePane"              TargetType="CEGUI/ScrollablePane"    Renderer="Falagard/ScrollablePane"    LookNFeel="SleekSpace/ScrollablePane" />
+    <FalagardMapping WindowType="SleekSpace/HorizontalScrollbar"         TargetType="CEGUI/Scrollbar"         Renderer="Falagard/Scrollbar"         LookNFeel="SleekSpace/HorizontalScrollbar" />
+    <FalagardMapping WindowType="SleekSpace/VerticalScrollbar"           TargetType="CEGUI/Scrollbar"         Renderer="Falagard/Scrollbar"         LookNFeel="SleekSpace/VerticalScrollbar" />
+    <FalagardMapping WindowType="SleekSpace/Slider"                      TargetType="CEGUI/Slider"            Renderer="Falagard/Slider"            LookNFeel="SleekSpace/Slider" />
+    <FalagardMapping WindowType="SleekSpace/Spinner"                     TargetType="CEGUI/Spinner"           Renderer="Falagard/Default"           LookNFeel="SleekSpace/Spinner" />
+    <FalagardMapping WindowType="SleekSpace/TabButton"                   TargetType="CEGUI/TabButton"         Renderer="Falagard/TabButton"         LookNFeel="SleekSpace/TabButton" />
+    <FalagardMapping WindowType="SleekSpace/TabControl"                  TargetType="CEGUI/TabControl"        Renderer="Falagard/TabControl"        LookNFeel="SleekSpace/TabControl" />
+    <FalagardMapping WindowType="SleekSpace/HorizontalScrollbarThumb"    TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="SleekSpace/HorizontalScrollbarThumb" />
+    <FalagardMapping WindowType="SleekSpace/SliderThumb"                 TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="SleekSpace/SliderThumb" />
+    <FalagardMapping WindowType="SleekSpace/VerticalScrollbarThumb"      TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="SleekSpace/VerticalScrollbarThumb" />
+    <FalagardMapping WindowType="SleekSpace/Titlebar"                    TargetType="CEGUI/Titlebar"          Renderer="Falagard/Titlebar"          LookNFeel="SleekSpace/Titlebar" />
+    <FalagardMapping WindowType="SleekSpace/Tooltip"                     TargetType="CEGUI/Tooltip"           Renderer="Falagard/Tooltip"           LookNFeel="SleekSpace/Tooltip" />
+    
+    <!-- Missing widgets (using Taharez LookNFeel) -->
+    <FalagardMapping WindowType="SleekSpace/TabButtonPane"               TargetType="DefaultWindow"           Renderer="Falagard/Default"           LookNFeel="TaharezLook/TabButtonPane" />
+    <FalagardMapping WindowType="SleekSpace/TabContentPane"              TargetType="DefaultWindow"           Renderer="Falagard/Default"           LookNFeel="TaharezLook/TabContentPane" />
+    <FalagardMapping WindowType="SleekSpace/GroupBox"                    TargetType="CEGUI/GroupBox"          Renderer="Falagard/Default"           LookNFeel="TaharezLook/GroupBox" />
+    <FalagardMapping WindowType="SleekSpace/ListboxItem"                 TargetType="CEGUI/ItemEntry"         Renderer="Falagard/ItemEntry"         LookNFeel="TaharezLook/ListboxItem" />
+    <FalagardMapping WindowType="SleekSpace/ItemListbox"                 TargetType="CEGUI/ItemListbox"       Renderer="Falagard/ItemListbox"       LookNFeel="TaharezLook/ItemListbox" />
+    <FalagardMapping WindowType="SleekSpace/ImageButton"                 TargetType="CEGUI/PushButton"        Renderer="Falagard/Button"            LookNFeel="TaharezLook/ImageButton" />
+    <FalagardMapping WindowType="SleekSpace/Tree"                        TargetType="CEGUI/Tree"              Renderer="Falagard/Tree"              LookNFeel="TaharezLook/Tree" />
+
+    <!-- Additional widgets -->
+    <FalagardMapping WindowType="SleekSpace/TabPane"                     TargetType="DefaultWindow"           Renderer="Falagard/TabPane"           LookNFeel="SleekSpace/TabPane" />
+    <FalagardMapping WindowType="SleekSpace/ReticleWindow"               TargetType="CEGUI/FrameWindow"       Renderer="Falagard/FrameWindow"       LookNFeel="SleekSpace/ReticleWindow" />
+    <FalagardMapping WindowType="SleekSpace/AlternateProgressBar"        TargetType="CEGUI/ProgressBar"       Renderer="Falagard/ProgressBar"       LookNFeel="SleekSpace/AltProgressBar" />
+    <FalagardMapping WindowType="SleekSpace/VUMeter"                     TargetType="CEGUI/ProgressBar"       Renderer="Falagard/ProgressBar"       LookNFeel="SleekSpace/VUMeter" />
+    <FalagardMapping WindowType="SleekSpace/LargeVerticalScrollbar"      TargetType="CEGUI/Scrollbar"         Renderer="Falagard/Scrollbar"         LookNFeel="SleekSpace/LargeVerticalScrollbar" />
+    <FalagardMapping WindowType="SleekSpace/VSlider"                     TargetType="CEGUI/Slider"            Renderer="Falagard/Slider"            LookNFeel="SleekSpace/VSlider" />
+    <FalagardMapping WindowType="SleekSpace/LargeVerticalScrollbarThumb" TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="SleekSpace/LargeVerticalScrollbarThumb" />
+    <FalagardMapping WindowType="SleekSpace/VSliderThumb"                TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="SleekSpace/VSliderThumb" />
+</GUIScheme>
Index: /code/branches/gamestates2/data/gui/schemes/SleekSpaceMenuWidgets.scheme
===================================================================
--- /code/branches/gamestates2/data/gui/schemes/SleekSpaceMenuWidgets.scheme	(revision 6595)
+++ /code/branches/gamestates2/data/gui/schemes/SleekSpaceMenuWidgets.scheme	(revision 6595)
@@ -0,0 +1,42 @@
+<?xml version="1.0" ?>
+<GUIScheme Name="SleekSpaceMenuWidgets">
+    <WindowAlias Alias="MenuWidgets/StaticImage"              Target="SleekSpace/StaticImage" />
+    <WindowAlias Alias="MenuWidgets/StaticText"               Target="SleekSpace/StaticText" />
+    <WindowAlias Alias="MenuWidgets/TabButtonPane"            Target="SleekSpace/TabButtonPane" />
+    <WindowAlias Alias="MenuWidgets/TabContentPane"           Target="SleekSpace/TabContentPane" />
+    <WindowAlias Alias="MenuWidgets/Checkbox"                 Target="SleekSpace/Checkbox" />
+    <WindowAlias Alias="MenuWidgets/Combobox"                 Target="SleekSpace/Combobox" />
+    <WindowAlias Alias="MenuWidgets/ComboDropList"            Target="SleekSpace/ComboDropList" />
+    <WindowAlias Alias="MenuWidgets/ComboEditbox"             Target="SleekSpace/ComboEditbox" />
+    <WindowAlias Alias="MenuWidgets/Editbox"                  Target="SleekSpace/Editbox" />
+    <WindowAlias Alias="MenuWidgets/FrameWindow"              Target="SleekSpace/FrameWindow" />
+    <WindowAlias Alias="MenuWidgets/GroupBox"                 Target="SleekSpace/GroupBox" />
+    <WindowAlias Alias="MenuWidgets/ItemListbox"              Target="SleekSpace/ItemListbox" />
+    <WindowAlias Alias="MenuWidgets/ListboxItem"              Target="SleekSpace/ListboxItem" />
+    <WindowAlias Alias="MenuWidgets/Listbox"                  Target="SleekSpace/Listbox" />
+    <WindowAlias Alias="MenuWidgets/ListHeader"               Target="SleekSpace/ListHeader" />
+    <WindowAlias Alias="MenuWidgets/ListHeaderSegment"        Target="SleekSpace/ListHeaderSegment" />
+    <WindowAlias Alias="MenuWidgets/MultiLineEditbox"         Target="SleekSpace/MultiLineEditbox" />
+    <WindowAlias Alias="MenuWidgets/Menubar"                  Target="SleekSpace/Menubar" />
+    <WindowAlias Alias="MenuWidgets/MenuItem"                 Target="SleekSpace/MenuItem" />
+    <WindowAlias Alias="MenuWidgets/MultiColumnList"          Target="SleekSpace/MultiColumnList" />
+    <WindowAlias Alias="MenuWidgets/PopupMenu"                Target="SleekSpace/PopupMenu" />
+    <WindowAlias Alias="MenuWidgets/ProgressBar"              Target="SleekSpace/ProgressBar" />
+    <WindowAlias Alias="MenuWidgets/Button"                   Target="SleekSpace/Button" />
+    <WindowAlias Alias="MenuWidgets/ImageButton"              Target="SleekSpace/ImageButton" />
+    <WindowAlias Alias="MenuWidgets/RadioButton"              Target="SleekSpace/RadioButton" />
+    <WindowAlias Alias="MenuWidgets/SystemButton"             Target="SleekSpace/SystemButton" />
+    <WindowAlias Alias="MenuWidgets/ScrollablePane"           Target="SleekSpace/ScrollablePane" />
+    <WindowAlias Alias="MenuWidgets/HorizontalScrollbar"      Target="SleekSpace/HorizontalScrollbar" />
+    <WindowAlias Alias="MenuWidgets/VerticalScrollbar"        Target="SleekSpace/VerticalScrollbar" />
+    <WindowAlias Alias="MenuWidgets/Slider"                   Target="SleekSpace/Slider" />
+    <WindowAlias Alias="MenuWidgets/Spinner"                  Target="SleekSpace/Spinner" />
+    <WindowAlias Alias="MenuWidgets/TabButton"                Target="SleekSpace/TabButton" />
+    <WindowAlias Alias="MenuWidgets/TabControl"               Target="SleekSpace/TabControl" />
+    <WindowAlias Alias="MenuWidgets/HorizontalScrollbarThumb" Target="SleekSpace/HorizontalScrollbarThumb" />
+    <WindowAlias Alias="MenuWidgets/SliderThumb"              Target="SleekSpace/SliderThumb" />
+    <WindowAlias Alias="MenuWidgets/VerticalScrollbarThumb"   Target="SleekSpace/VerticalScrollbarThumb" />
+    <WindowAlias Alias="MenuWidgets/Titlebar"                 Target="SleekSpace/Titlebar" />
+    <WindowAlias Alias="MenuWidgets/Tooltip"                  Target="SleekSpace/Tooltip" />
+    <WindowAlias Alias="MenuWidgets/Tree"                     Target="SleekSpace/Tree" />
+</GUIScheme>
Index: /code/branches/gamestates2/data/gui/schemes/TaharezGreenHUDWidgets.scheme
===================================================================
--- /code/branches/gamestates2/data/gui/schemes/TaharezGreenHUDWidgets.scheme	(revision 6595)
+++ /code/branches/gamestates2/data/gui/schemes/TaharezGreenHUDWidgets.scheme	(revision 6595)
@@ -0,0 +1,42 @@
+<?xml version="1.0" ?>
+<GUIScheme Name="TaharezGreenHUDWidgets">
+    <WindowAlias Alias="HUDWidgets/StaticImage"              Target="TaharezGreenLook/StaticImage" />
+    <WindowAlias Alias="HUDWidgets/StaticText"               Target="TaharezGreenLook/StaticText" />
+    <WindowAlias Alias="HUDWidgets/TabButtonPane"            Target="TaharezGreenLook/TabButtonPane" />
+    <WindowAlias Alias="HUDWidgets/TabContentPane"           Target="TaharezGreenLook/TabContentPane" />
+    <WindowAlias Alias="HUDWidgets/Checkbox"                 Target="TaharezGreenLook/Checkbox" />
+    <WindowAlias Alias="HUDWidgets/Combobox"                 Target="TaharezGreenLook/Combobox" />
+    <WindowAlias Alias="HUDWidgets/ComboDropList"            Target="TaharezGreenLook/ComboDropList" />
+    <WindowAlias Alias="HUDWidgets/ComboEditbox"             Target="TaharezGreenLook/ComboEditbox" />
+    <WindowAlias Alias="HUDWidgets/Editbox"                  Target="TaharezGreenLook/Editbox" />
+    <WindowAlias Alias="HUDWidgets/FrameWindow"              Target="TaharezGreenLook/FrameWindow" />
+    <WindowAlias Alias="HUDWidgets/GroupBox"                 Target="TaharezGreenLook/GroupBox" />
+    <WindowAlias Alias="HUDWidgets/ItemListbox"              Target="TaharezGreenLook/ItemListbox" />
+    <WindowAlias Alias="HUDWidgets/ListboxItem"              Target="TaharezGreenLook/ListboxItem" />
+    <WindowAlias Alias="HUDWidgets/Listbox"                  Target="TaharezGreenLook/Listbox" />
+    <WindowAlias Alias="HUDWidgets/ListHeader"               Target="TaharezGreenLook/ListHeader" />
+    <WindowAlias Alias="HUDWidgets/ListHeaderSegment"        Target="TaharezGreenLook/ListHeaderSegment" />
+    <WindowAlias Alias="HUDWidgets/MultiLineEditbox"         Target="TaharezGreenLook/MultiLineEditbox" />
+    <WindowAlias Alias="HUDWidgets/Menubar"                  Target="TaharezGreenLook/Menubar" />
+    <WindowAlias Alias="HUDWidgets/MenuItem"                 Target="TaharezGreenLook/MenuItem" />
+    <WindowAlias Alias="HUDWidgets/MultiColumnList"          Target="TaharezGreenLook/MultiColumnList" />
+    <WindowAlias Alias="HUDWidgets/PopupMenu"                Target="TaharezGreenLook/PopupMenu" />
+    <WindowAlias Alias="HUDWidgets/ProgressBar"              Target="TaharezGreenLook/ProgressBar" />
+    <WindowAlias Alias="HUDWidgets/Button"                   Target="TaharezGreenLook/Button" />
+    <WindowAlias Alias="HUDWidgets/ImageButton"              Target="TaharezGreenLook/ImageButton" />
+    <WindowAlias Alias="HUDWidgets/RadioButton"              Target="TaharezGreenLook/RadioButton" />
+    <WindowAlias Alias="HUDWidgets/SystemButton"             Target="TaharezGreenLook/SystemButton" />
+    <WindowAlias Alias="HUDWidgets/ScrollablePane"           Target="TaharezGreenLook/ScrollablePane" />
+    <WindowAlias Alias="HUDWidgets/HorizontalScrollbar"      Target="TaharezGreenLook/HorizontalScrollbar" />
+    <WindowAlias Alias="HUDWidgets/VerticalScrollbar"        Target="TaharezGreenLook/VerticalScrollbar" />
+    <WindowAlias Alias="HUDWidgets/Slider"                   Target="TaharezGreenLook/Slider" />
+    <WindowAlias Alias="HUDWidgets/Spinner"                  Target="TaharezGreenLook/Spinner" />
+    <WindowAlias Alias="HUDWidgets/TabButton"                Target="TaharezGreenLook/TabButton" />
+    <WindowAlias Alias="HUDWidgets/TabControl"               Target="TaharezGreenLook/TabControl" />
+    <WindowAlias Alias="HUDWidgets/HorizontalScrollbarThumb" Target="TaharezGreenLook/HorizontalScrollbarThumb" />
+    <WindowAlias Alias="HUDWidgets/SliderThumb"              Target="TaharezGreenLook/SliderThumb" />
+    <WindowAlias Alias="HUDWidgets/VerticalScrollbarThumb"   Target="TaharezGreenLook/VerticalScrollbarThumb" />
+    <WindowAlias Alias="HUDWidgets/Titlebar"                 Target="TaharezGreenLook/Titlebar" />
+    <WindowAlias Alias="HUDWidgets/Tooltip"                  Target="TaharezGreenLook/Tooltip" />
+    <WindowAlias Alias="HUDWidgets/Tree"                     Target="TaharezGreenLook/Tree" />
+</GUIScheme>
Index: /code/branches/gamestates2/data/gui/schemes/TaharezGreenLook.scheme
===================================================================
--- /code/branches/gamestates2/data/gui/schemes/TaharezGreenLook.scheme	(revision 6595)
+++ /code/branches/gamestates2/data/gui/schemes/TaharezGreenLook.scheme	(revision 6595)
@@ -0,0 +1,53 @@
+<?xml version="1.0" ?>
+<GUIScheme Name="TaharezGreenLook">
+	<Imageset Name="TaharezGreenLook" Filename="TaharezGreenLook.imageset" />
+	<LookNFeel Filename="TaharezGreenLook.looknfeel" />
+	<WindowRendererSet Filename="CEGUIFalagardWRBase" />
+
+    <!-- Standard widgets -->
+    <FalagardMapping WindowType="TaharezGreenLook/StaticImage"              TargetType="DefaultWindow"           Renderer="Falagard/StaticImage"       LookNFeel="TaharezGreenLook/StaticImage" />
+    <FalagardMapping WindowType="TaharezGreenLook/StaticText"               TargetType="DefaultWindow"           Renderer="Falagard/StaticText"        LookNFeel="TaharezGreenLook/StaticText" />
+    <FalagardMapping WindowType="TaharezGreenLook/TabButtonPane"            TargetType="DefaultWindow"           Renderer="Falagard/Default"           LookNFeel="TaharezGreenLook/TabButtonPane" />
+    <FalagardMapping WindowType="TaharezGreenLook/TabContentPane"           TargetType="DefaultWindow"           Renderer="Falagard/Default"           LookNFeel="TaharezGreenLook/TabContentPane" />
+    <FalagardMapping WindowType="TaharezGreenLook/Checkbox"                 TargetType="CEGUI/Checkbox"          Renderer="Falagard/ToggleButton"      LookNFeel="TaharezGreenLook/Checkbox" />
+    <FalagardMapping WindowType="TaharezGreenLook/Combobox"                 TargetType="CEGUI/Combobox"          Renderer="Falagard/Default"           LookNFeel="TaharezGreenLook/Combobox" />
+    <FalagardMapping WindowType="TaharezGreenLook/ComboDropList"            TargetType="CEGUI/ComboDropList"     Renderer="Falagard/Listbox"           LookNFeel="TaharezGreenLook/ComboDropList" />
+    <FalagardMapping WindowType="TaharezGreenLook/ComboEditbox"             TargetType="CEGUI/Editbox"           Renderer="Falagard/Editbox"           LookNFeel="TaharezGreenLook/ComboEditbox" />
+    <FalagardMapping WindowType="TaharezGreenLook/Editbox"                  TargetType="CEGUI/Editbox"           Renderer="Falagard/Editbox"           LookNFeel="TaharezGreenLook/Editbox" />
+    <FalagardMapping WindowType="TaharezGreenLook/FrameWindow"              TargetType="CEGUI/FrameWindow"       Renderer="Falagard/FrameWindow"       LookNFeel="TaharezGreenLook/FrameWindow" />
+    <FalagardMapping WindowType="TaharezGreenLook/GroupBox"                 TargetType="CEGUI/GroupBox"          Renderer="Falagard/Default"           LookNFeel="TaharezGreenLook/GroupBox" />
+    <FalagardMapping WindowType="TaharezGreenLook/ItemListbox"              TargetType="CEGUI/ItemListbox"       Renderer="Falagard/ItemListbox"       LookNFeel="TaharezGreenLook/ItemListbox" />
+    <FalagardMapping WindowType="TaharezGreenLook/ListboxItem"              TargetType="CEGUI/ItemEntry"         Renderer="Falagard/ItemEntry"         LookNFeel="TaharezGreenLook/ListboxItem" />
+    <FalagardMapping WindowType="TaharezGreenLook/Listbox"                  TargetType="CEGUI/Listbox"           Renderer="Falagard/Listbox"           LookNFeel="TaharezGreenLook/Listbox" />
+    <FalagardMapping WindowType="TaharezGreenLook/ListHeader"               TargetType="CEGUI/ListHeader"        Renderer="Falagard/ListHeader"        LookNFeel="TaharezGreenLook/ListHeader" />
+    <FalagardMapping WindowType="TaharezGreenLook/ListHeaderSegment"        TargetType="CEGUI/ListHeaderSegment" Renderer="Falagard/ListHeaderSegment" LookNFeel="TaharezGreenLook/ListHeaderSegment" />
+    <FalagardMapping WindowType="TaharezGreenLook/MultiLineEditbox"         TargetType="CEGUI/MultiLineEditbox"  Renderer="Falagard/MultiLineEditbox"  LookNFeel="TaharezGreenLook/MultiLineEditbox" />
+    <FalagardMapping WindowType="TaharezGreenLook/Menubar"                  TargetType="CEGUI/Menubar"           Renderer="Falagard/Menubar"           LookNFeel="TaharezGreenLook/Menubar" />
+    <FalagardMapping WindowType="TaharezGreenLook/MenuItem"                 TargetType="CEGUI/MenuItem"          Renderer="Falagard/MenuItem"          LookNFeel="TaharezGreenLook/MenuItem" />
+    <FalagardMapping WindowType="TaharezGreenLook/MultiColumnList"          TargetType="CEGUI/MultiColumnList"   Renderer="Falagard/MultiColumnList"   LookNFeel="TaharezGreenLook/MultiColumnList" />
+    <FalagardMapping WindowType="TaharezGreenLook/PopupMenu"                TargetType="CEGUI/PopupMenu"         Renderer="Falagard/PopupMenu"         LookNFeel="TaharezGreenLook/PopupMenu" />
+    <FalagardMapping WindowType="TaharezGreenLook/ProgressBar"              TargetType="CEGUI/ProgressBar"       Renderer="Falagard/ProgressBar"       LookNFeel="TaharezGreenLook/ProgressBar" />
+    <FalagardMapping WindowType="TaharezGreenLook/Button"                   TargetType="CEGUI/PushButton"        Renderer="Falagard/Button"            LookNFeel="TaharezGreenLook/Button" />
+    <FalagardMapping WindowType="TaharezGreenLook/ImageButton"              TargetType="CEGUI/PushButton"        Renderer="Falagard/Button"            LookNFeel="TaharezGreenLook/ImageButton" />
+    <FalagardMapping WindowType="TaharezGreenLook/RadioButton"              TargetType="CEGUI/RadioButton"       Renderer="Falagard/ToggleButton"      LookNFeel="TaharezGreenLook/RadioButton" />
+    <FalagardMapping WindowType="TaharezGreenLook/SystemButton"             TargetType="CEGUI/PushButton"        Renderer="Falagard/SystemButton"      LookNFeel="TaharezGreenLook/Button" />
+    <FalagardMapping WindowType="TaharezGreenLook/ScrollablePane"           TargetType="CEGUI/ScrollablePane"    Renderer="Falagard/ScrollablePane"    LookNFeel="TaharezGreenLook/ScrollablePane" />
+    <FalagardMapping WindowType="TaharezGreenLook/HorizontalScrollbar"      TargetType="CEGUI/Scrollbar"         Renderer="Falagard/Scrollbar"         LookNFeel="TaharezGreenLook/HorizontalScrollbar" />
+    <FalagardMapping WindowType="TaharezGreenLook/VerticalScrollbar"        TargetType="CEGUI/Scrollbar"         Renderer="Falagard/Scrollbar"         LookNFeel="TaharezGreenLook/VerticalScrollbar" />
+    <FalagardMapping WindowType="TaharezGreenLook/Slider"                   TargetType="CEGUI/Slider"            Renderer="Falagard/Slider"            LookNFeel="TaharezGreenLook/Slider" />
+    <FalagardMapping WindowType="TaharezGreenLook/Spinner"                  TargetType="CEGUI/Spinner"           Renderer="Falagard/Default"           LookNFeel="TaharezGreenLook/Spinner" />
+    <FalagardMapping WindowType="TaharezGreenLook/TabButton"                TargetType="CEGUI/TabButton"         Renderer="Falagard/TabButton"         LookNFeel="TaharezGreenLook/TabButton" />
+    <FalagardMapping WindowType="TaharezGreenLook/TabControl"               TargetType="CEGUI/TabControl"        Renderer="Falagard/TabControl"        LookNFeel="TaharezGreenLook/TabControl" />
+    <FalagardMapping WindowType="TaharezGreenLook/HorizontalScrollbarThumb" TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="TaharezGreenLook/HorizontalScrollbarThumb" />
+    <FalagardMapping WindowType="TaharezGreenLook/SliderThumb"              TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="TaharezGreenLook/SliderThumb" />
+    <FalagardMapping WindowType="TaharezGreenLook/VerticalScrollbarThumb"   TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="TaharezGreenLook/VerticalScrollbarThumb" />
+    <FalagardMapping WindowType="TaharezGreenLook/Titlebar"                 TargetType="CEGUI/Titlebar"          Renderer="Falagard/Titlebar"          LookNFeel="TaharezGreenLook/Titlebar" />
+    <FalagardMapping WindowType="TaharezGreenLook/Tooltip"                  TargetType="CEGUI/Tooltip"           Renderer="Falagard/Tooltip"           LookNFeel="TaharezGreenLook/Tooltip" />
+    <FalagardMapping WindowType="TaharezGreenLook/Tree"                     TargetType="CEGUI/Tree"              Renderer="Falagard/Tree"              LookNFeel="TaharezGreenLook/Tree" />
+    
+    <!-- Additional widgets -->
+    <FalagardMapping WindowType="TaharezGreenLook/AlternateProgressBar"        TargetType="CEGUI/ProgressBar"       Renderer="Falagard/ProgressBar"       LookNFeel="TaharezGreenLook/AltProgressBar" />
+    <FalagardMapping WindowType="TaharezGreenLook/VUMeter"                     TargetType="CEGUI/ProgressBar"       Renderer="Falagard/ProgressBar"       LookNFeel="TaharezGreenLook/VUMeter" />
+    <FalagardMapping WindowType="TaharezGreenLook/LargeVerticalScrollbar"      TargetType="CEGUI/Scrollbar"         Renderer="Falagard/Scrollbar"         LookNFeel="TaharezGreenLook/LargeVerticalScrollbar" />
+    <FalagardMapping WindowType="TaharezGreenLook/LargeVerticalScrollbarThumb" TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="TaharezGreenLook/LargeVerticalScrollbarThumb" />
+</GUIScheme>
Index: /code/branches/gamestates2/data/gui/schemes/TaharezGreenMenuWidgets.scheme
===================================================================
--- /code/branches/gamestates2/data/gui/schemes/TaharezGreenMenuWidgets.scheme	(revision 6595)
+++ /code/branches/gamestates2/data/gui/schemes/TaharezGreenMenuWidgets.scheme	(revision 6595)
@@ -0,0 +1,42 @@
+<?xml version="1.0" ?>
+<GUIScheme Name="TaharezGreenMenuWidgets">
+    <WindowAlias Alias="MenuWidgets/StaticImage"              Target="TaharezGreenLook/StaticImage" />
+    <WindowAlias Alias="MenuWidgets/StaticText"               Target="TaharezGreenLook/StaticText" />
+    <WindowAlias Alias="MenuWidgets/TabButtonPane"            Target="TaharezGreenLook/TabButtonPane" />
+    <WindowAlias Alias="MenuWidgets/TabContentPane"           Target="TaharezGreenLook/TabContentPane" />
+    <WindowAlias Alias="MenuWidgets/Checkbox"                 Target="TaharezGreenLook/Checkbox" />
+    <WindowAlias Alias="MenuWidgets/Combobox"                 Target="TaharezGreenLook/Combobox" />
+    <WindowAlias Alias="MenuWidgets/ComboDropList"            Target="TaharezGreenLook/ComboDropList" />
+    <WindowAlias Alias="MenuWidgets/ComboEditbox"             Target="TaharezGreenLook/ComboEditbox" />
+    <WindowAlias Alias="MenuWidgets/Editbox"                  Target="TaharezGreenLook/Editbox" />
+    <WindowAlias Alias="MenuWidgets/FrameWindow"              Target="TaharezGreenLook/FrameWindow" />
+    <WindowAlias Alias="MenuWidgets/GroupBox"                 Target="TaharezGreenLook/GroupBox" />
+    <WindowAlias Alias="MenuWidgets/ItemListbox"              Target="TaharezGreenLook/ItemListbox" />
+    <WindowAlias Alias="MenuWidgets/ListboxItem"              Target="TaharezGreenLook/ListboxItem" />
+    <WindowAlias Alias="MenuWidgets/Listbox"                  Target="TaharezGreenLook/Listbox" />
+    <WindowAlias Alias="MenuWidgets/ListHeader"               Target="TaharezGreenLook/ListHeader" />
+    <WindowAlias Alias="MenuWidgets/ListHeaderSegment"        Target="TaharezGreenLook/ListHeaderSegment" />
+    <WindowAlias Alias="MenuWidgets/MultiLineEditbox"         Target="TaharezGreenLook/MultiLineEditbox" />
+    <WindowAlias Alias="MenuWidgets/Menubar"                  Target="TaharezGreenLook/Menubar" />
+    <WindowAlias Alias="MenuWidgets/MenuItem"                 Target="TaharezGreenLook/MenuItem" />
+    <WindowAlias Alias="MenuWidgets/MultiColumnList"          Target="TaharezGreenLook/MultiColumnList" />
+    <WindowAlias Alias="MenuWidgets/PopupMenu"                Target="TaharezGreenLook/PopupMenu" />
+    <WindowAlias Alias="MenuWidgets/ProgressBar"              Target="TaharezGreenLook/ProgressBar" />
+    <WindowAlias Alias="MenuWidgets/Button"                   Target="TaharezGreenLook/Button" />
+    <WindowAlias Alias="MenuWidgets/ImageButton"              Target="TaharezGreenLook/ImageButton" />
+    <WindowAlias Alias="MenuWidgets/RadioButton"              Target="TaharezGreenLook/RadioButton" />
+    <WindowAlias Alias="MenuWidgets/SystemButton"             Target="TaharezGreenLook/SystemButton" />
+    <WindowAlias Alias="MenuWidgets/ScrollablePane"           Target="TaharezGreenLook/ScrollablePane" />
+    <WindowAlias Alias="MenuWidgets/HorizontalScrollbar"      Target="TaharezGreenLook/HorizontalScrollbar" />
+    <WindowAlias Alias="MenuWidgets/VerticalScrollbar"        Target="TaharezGreenLook/VerticalScrollbar" />
+    <WindowAlias Alias="MenuWidgets/Slider"                   Target="TaharezGreenLook/Slider" />
+    <WindowAlias Alias="MenuWidgets/Spinner"                  Target="TaharezGreenLook/Spinner" />
+    <WindowAlias Alias="MenuWidgets/TabButton"                Target="TaharezGreenLook/TabButton" />
+    <WindowAlias Alias="MenuWidgets/TabControl"               Target="TaharezGreenLook/TabControl" />
+    <WindowAlias Alias="MenuWidgets/HorizontalScrollbarThumb" Target="TaharezGreenLook/HorizontalScrollbarThumb" />
+    <WindowAlias Alias="MenuWidgets/SliderThumb"              Target="TaharezGreenLook/SliderThumb" />
+    <WindowAlias Alias="MenuWidgets/VerticalScrollbarThumb"   Target="TaharezGreenLook/VerticalScrollbarThumb" />
+    <WindowAlias Alias="MenuWidgets/Titlebar"                 Target="TaharezGreenLook/Titlebar" />
+    <WindowAlias Alias="MenuWidgets/Tooltip"                  Target="TaharezGreenLook/Tooltip" />
+    <WindowAlias Alias="MenuWidgets/Tree"                     Target="TaharezGreenLook/Tree" />
+</GUIScheme>
Index: /code/branches/gamestates2/data/gui/schemes/TaharezHUDWidgets.scheme
===================================================================
--- /code/branches/gamestates2/data/gui/schemes/TaharezHUDWidgets.scheme	(revision 6595)
+++ /code/branches/gamestates2/data/gui/schemes/TaharezHUDWidgets.scheme	(revision 6595)
@@ -0,0 +1,42 @@
+<?xml version="1.0" ?>
+<GUIScheme Name="TaharezHUDWidgets">
+    <WindowAlias Alias="HUDWidgets/StaticImage"              Target="TaharezLook/StaticImage" />
+    <WindowAlias Alias="HUDWidgets/StaticText"               Target="TaharezLook/StaticText" />
+    <WindowAlias Alias="HUDWidgets/TabButtonPane"            Target="TaharezLook/TabButtonPane" />
+    <WindowAlias Alias="HUDWidgets/TabContentPane"           Target="TaharezLook/TabContentPane" />
+    <WindowAlias Alias="HUDWidgets/Checkbox"                 Target="TaharezLook/Checkbox" />
+    <WindowAlias Alias="HUDWidgets/Combobox"                 Target="TaharezLook/Combobox" />
+    <WindowAlias Alias="HUDWidgets/ComboDropList"            Target="TaharezLook/ComboDropList" />
+    <WindowAlias Alias="HUDWidgets/ComboEditbox"             Target="TaharezLook/ComboEditbox" />
+    <WindowAlias Alias="HUDWidgets/Editbox"                  Target="TaharezLook/Editbox" />
+    <WindowAlias Alias="HUDWidgets/FrameWindow"              Target="TaharezLook/FrameWindow" />
+    <WindowAlias Alias="HUDWidgets/GroupBox"                 Target="TaharezLook/GroupBox" />
+    <WindowAlias Alias="HUDWidgets/ItemListbox"              Target="TaharezLook/ItemListbox" />
+    <WindowAlias Alias="HUDWidgets/ListboxItem"              Target="TaharezLook/ListboxItem" />
+    <WindowAlias Alias="HUDWidgets/Listbox"                  Target="TaharezLook/Listbox" />
+    <WindowAlias Alias="HUDWidgets/ListHeader"               Target="TaharezLook/ListHeader" />
+    <WindowAlias Alias="HUDWidgets/ListHeaderSegment"        Target="TaharezLook/ListHeaderSegment" />
+    <WindowAlias Alias="HUDWidgets/MultiLineEditbox"         Target="TaharezLook/MultiLineEditbox" />
+    <WindowAlias Alias="HUDWidgets/Menubar"                  Target="TaharezLook/Menubar" />
+    <WindowAlias Alias="HUDWidgets/MenuItem"                 Target="TaharezLook/MenuItem" />
+    <WindowAlias Alias="HUDWidgets/MultiColumnList"          Target="TaharezLook/MultiColumnList" />
+    <WindowAlias Alias="HUDWidgets/PopupMenu"                Target="TaharezLook/PopupMenu" />
+    <WindowAlias Alias="HUDWidgets/ProgressBar"              Target="TaharezLook/ProgressBar" />
+    <WindowAlias Alias="HUDWidgets/Button"                   Target="TaharezLook/Button" />
+    <WindowAlias Alias="HUDWidgets/ImageButton"              Target="TaharezLook/ImageButton" />
+    <WindowAlias Alias="HUDWidgets/RadioButton"              Target="TaharezLook/RadioButton" />
+    <WindowAlias Alias="HUDWidgets/SystemButton"             Target="TaharezLook/SystemButton" />
+    <WindowAlias Alias="HUDWidgets/ScrollablePane"           Target="TaharezLook/ScrollablePane" />
+    <WindowAlias Alias="HUDWidgets/HorizontalScrollbar"      Target="TaharezLook/HorizontalScrollbar" />
+    <WindowAlias Alias="HUDWidgets/VerticalScrollbar"        Target="TaharezLook/VerticalScrollbar" />
+    <WindowAlias Alias="HUDWidgets/Slider"                   Target="TaharezLook/Slider" />
+    <WindowAlias Alias="HUDWidgets/Spinner"                  Target="TaharezLook/Spinner" />
+    <WindowAlias Alias="HUDWidgets/TabButton"                Target="TaharezLook/TabButton" />
+    <WindowAlias Alias="HUDWidgets/TabControl"               Target="TaharezLook/TabControl" />
+    <WindowAlias Alias="HUDWidgets/HorizontalScrollbarThumb" Target="TaharezLook/HorizontalScrollbarThumb" />
+    <WindowAlias Alias="HUDWidgets/SliderThumb"              Target="TaharezLook/SliderThumb" />
+    <WindowAlias Alias="HUDWidgets/VerticalScrollbarThumb"   Target="TaharezLook/VerticalScrollbarThumb" />
+    <WindowAlias Alias="HUDWidgets/Titlebar"                 Target="TaharezLook/Titlebar" />
+    <WindowAlias Alias="HUDWidgets/Tooltip"                  Target="TaharezLook/Tooltip" />
+    <WindowAlias Alias="HUDWidgets/Tree"                     Target="TaharezLook/Tree" />
+</GUIScheme>
Index: /code/branches/gamestates2/data/gui/schemes/TaharezLook.scheme
===================================================================
--- /code/branches/gamestates2/data/gui/schemes/TaharezLook.scheme	(revision 6594)
+++ /code/branches/gamestates2/data/gui/schemes/TaharezLook.scheme	(revision 6595)
@@ -2,49 +2,52 @@
 <GUIScheme Name="TaharezLook">
 	<Imageset Name="TaharezLook" Filename="TaharezLook.imageset" />
-	<Font Name="Commonwealth-10" Filename="Commonwealth-10.font" />
 	<LookNFeel Filename="TaharezLook.looknfeel" />
 	<WindowRendererSet Filename="CEGUIFalagardWRBase" />
-	<FalagardMapping WindowType="TaharezLook/Button"      TargetType="CEGUI/PushButton"  Renderer="Falagard/Button"       LookNFeel="TaharezLook/Button" />
-	<FalagardMapping WindowType="TaharezLook/Checkbox"    TargetType="CEGUI/Checkbox"    Renderer="Falagard/ToggleButton" LookNFeel="TaharezLook/Checkbox" />
-	<FalagardMapping WindowType="TaharezLook/ImageButton" TargetType="CEGUI/PushButton"  Renderer="Falagard/Button"       LookNFeel="TaharezLook/ImageButton" />
-	<FalagardMapping WindowType="TaharezLook/RadioButton" TargetType="CEGUI/RadioButton" Renderer="Falagard/ToggleButton" LookNFeel="TaharezLook/RadioButton" />
-	<FalagardMapping WindowType="TaharezLook/FrameWindow"  TargetType="CEGUI/FrameWindow" Renderer="Falagard/FrameWindow"  LookNFeel="TaharezLook/FrameWindow" />
-	<FalagardMapping WindowType="TaharezLook/Titlebar"     TargetType="CEGUI/Titlebar"    Renderer="Falagard/Titlebar"     LookNFeel="TaharezLook/Titlebar" />
-	<FalagardMapping WindowType="TaharezLook/SystemButton" TargetType="CEGUI/PushButton"  Renderer="Falagard/SystemButton" LookNFeel="TaharezLook/Button" />
-	<FalagardMapping WindowType="TaharezLook/Editbox"          TargetType="CEGUI/Editbox"          Renderer="Falagard/Editbox"          LookNFeel="TaharezLook/Editbox" />
-	<FalagardMapping WindowType="TaharezLook/MultiLineEditbox" TargetType="CEGUI/MultiLineEditbox" Renderer="Falagard/MultiLineEditbox" LookNFeel="TaharezLook/MultiLineEditbox" />
-	<FalagardMapping WindowType="TaharezLook/Menubar"   TargetType="CEGUI/Menubar"   Renderer="Falagard/Menubar"   LookNFeel="TaharezLook/Menubar" />
-	<FalagardMapping WindowType="TaharezLook/PopupMenu" TargetType="CEGUI/PopupMenu" Renderer="Falagard/PopupMenu" LookNFeel="TaharezLook/PopupMenu" />
-	<FalagardMapping WindowType="TaharezLook/MenuItem"  TargetType="CEGUI/MenuItem"  Renderer="Falagard/MenuItem"  LookNFeel="TaharezLook/MenuItem" />
-	<FalagardMapping WindowType="TaharezLook/AlternateProgressBar" TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="TaharezLook/AltProgressBar" />
-	<FalagardMapping WindowType="TaharezLook/ProgressBar"          TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="TaharezLook/ProgressBar" />
-	<FalagardMapping WindowType="TaharezLook/VUMeter"              TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="TaharezLook/VUMeter" />
-	<FalagardMapping WindowType="TaharezLook/VerticalScrollbar"   TargetType="CEGUI/Scrollbar" Renderer="Falagard/Scrollbar" LookNFeel="TaharezLook/VerticalScrollbar" />
-	<FalagardMapping WindowType="TaharezLook/HorizontalScrollbar" TargetType="CEGUI/Scrollbar" Renderer="Falagard/Scrollbar" LookNFeel="TaharezLook/HorizontalScrollbar" />
-	<FalagardMapping WindowType="TaharezLook/VerticalScrollbarThumb"   TargetType="CEGUI/Thumb" Renderer="Falagard/Button" LookNFeel="TaharezLook/VerticalScrollbarThumb" />
-	<FalagardMapping WindowType="TaharezLook/HorizontalScrollbarThumb" TargetType="CEGUI/Thumb" Renderer="Falagard/Button" LookNFeel="TaharezLook/HorizontalScrollbarThumb" />
-	<FalagardMapping WindowType="TaharezLook/LargeVerticalScrollbar"      TargetType="CEGUI/Scrollbar" Renderer="Falagard/Scrollbar" LookNFeel="TaharezLook/LargeVerticalScrollbar" />
-	<FalagardMapping WindowType="TaharezLook/LargeVerticalScrollbarThumb" TargetType="CEGUI/Thumb"     Renderer="Falagard/Button"    LookNFeel="TaharezLook/LargeVerticalScrollbarThumb" />
-	<FalagardMapping WindowType="TaharezLook/TabButton"  TargetType="CEGUI/TabButton"  Renderer="Falagard/TabButton"  LookNFeel="TaharezLook/TabButton" />
-	<FalagardMapping WindowType="TaharezLook/TabControl" TargetType="CEGUI/TabControl" Renderer="Falagard/TabControl" LookNFeel="TaharezLook/TabControl" />
-	<FalagardMapping WindowType="TaharezLook/TabContentPane"    TargetType="DefaultWindow"    Renderer="Falagard/Default"    LookNFeel="TaharezLook/TabContentPane" />
-	<FalagardMapping WindowType="TaharezLook/TabButtonPane"    TargetType="DefaultWindow"    Renderer="Falagard/Default"    LookNFeel="TaharezLook/TabButtonPane" />
-	<FalagardMapping WindowType="TaharezLook/ComboDropList" TargetType="CEGUI/ComboDropList" Renderer="Falagard/Listbox" LookNFeel="TaharezLook/ComboDropList" />
-	<FalagardMapping WindowType="TaharezLook/ComboEditbox"  TargetType="CEGUI/Editbox"	 Renderer="Falagard/Editbox" LookNFeel="TaharezLook/ComboEditbox" />
-	<FalagardMapping WindowType="TaharezLook/Combobox"	TargetType="CEGUI/Combobox"	 Renderer="Falagard/Default" LookNFeel="TaharezLook/Combobox" />
-	<FalagardMapping WindowType="TaharezLook/Listbox"           TargetType="CEGUI/Listbox"           Renderer="Falagard/Listbox"           LookNFeel="TaharezLook/Listbox" />
-	<FalagardMapping WindowType="TaharezLook/ListHeader"        TargetType="CEGUI/ListHeader"        Renderer="Falagard/ListHeader"        LookNFeel="TaharezLook/ListHeader" />
-	<FalagardMapping WindowType="TaharezLook/ListHeaderSegment" TargetType="CEGUI/ListHeaderSegment" Renderer="Falagard/ListHeaderSegment" LookNFeel="TaharezLook/ListHeaderSegment" />
-	<FalagardMapping WindowType="TaharezLook/MultiColumnList"   TargetType="CEGUI/MultiColumnList"   Renderer="Falagard/MultiColumnList"   LookNFeel="TaharezLook/MultiColumnList" />
-	<FalagardMapping WindowType="TaharezLook/Slider"      TargetType="CEGUI/Slider"      Renderer="Falagard/Slider"  LookNFeel="TaharezLook/Slider" />
-	<FalagardMapping WindowType="TaharezLook/SliderThumb" TargetType="CEGUI/Thumb" Renderer="Falagard/Button"  LookNFeel="TaharezLook/SliderThumb" />
-	<FalagardMapping WindowType="TaharezLook/ScrollablePane" TargetType="CEGUI/ScrollablePane" Renderer="Falagard/ScrollablePane" LookNFeel="TaharezLook/ScrollablePane" />
-	<FalagardMapping WindowType="TaharezLook/Spinner" TargetType="CEGUI/Spinner" Renderer="Falagard/Default" LookNFeel="TaharezLook/Spinner" />
-	<FalagardMapping WindowType="TaharezLook/Tooltip" TargetType="CEGUI/Tooltip" Renderer="Falagard/Tooltip" LookNFeel="TaharezLook/Tooltip" />
-	<FalagardMapping WindowType="TaharezLook/StaticImage" TargetType="DefaultWindow" Renderer="Falagard/StaticImage" LookNFeel="TaharezLook/StaticImage" />
-	<FalagardMapping WindowType="TaharezLook/StaticText"  TargetType="DefaultWindow" Renderer="Falagard/StaticText"  LookNFeel="TaharezLook/StaticText" />
-	<FalagardMapping WindowType="TaharezLook/ItemListbox" TargetType="CEGUI/ItemListbox" Renderer="Falagard/ItemListbox" LookNFeel="TaharezLook/ItemListbox" />
-	<FalagardMapping WindowType="TaharezLook/ListboxItem" TargetType="CEGUI/ItemEntry"   Renderer="Falagard/ItemEntry"   LookNFeel="TaharezLook/ListboxItem" />
-	<FalagardMapping WindowType="TaharezLook/GroupBox" TargetType="CEGUI/GroupBox"   Renderer="Falagard/Default"   LookNFeel="TaharezLook/GroupBox" />
-      <FalagardMapping WindowType="TaharezLook/Tree" TargetType="CEGUI/Tree"   Renderer="Falagard/Tree"   LookNFeel="TaharezLook/Tree" />
+
+    <!-- Standard widgets -->
+    <FalagardMapping WindowType="TaharezLook/StaticImage"              TargetType="DefaultWindow"           Renderer="Falagard/StaticImage"       LookNFeel="TaharezLook/StaticImage" />
+    <FalagardMapping WindowType="TaharezLook/StaticText"               TargetType="DefaultWindow"           Renderer="Falagard/StaticText"        LookNFeel="TaharezLook/StaticText" />
+    <FalagardMapping WindowType="TaharezLook/TabButtonPane"            TargetType="DefaultWindow"           Renderer="Falagard/Default"           LookNFeel="TaharezLook/TabButtonPane" />
+    <FalagardMapping WindowType="TaharezLook/TabContentPane"           TargetType="DefaultWindow"           Renderer="Falagard/Default"           LookNFeel="TaharezLook/TabContentPane" />
+    <FalagardMapping WindowType="TaharezLook/Checkbox"                 TargetType="CEGUI/Checkbox"          Renderer="Falagard/ToggleButton"      LookNFeel="TaharezLook/Checkbox" />
+    <FalagardMapping WindowType="TaharezLook/Combobox"                 TargetType="CEGUI/Combobox"          Renderer="Falagard/Default"           LookNFeel="TaharezLook/Combobox" />
+    <FalagardMapping WindowType="TaharezLook/ComboDropList"            TargetType="CEGUI/ComboDropList"     Renderer="Falagard/Listbox"           LookNFeel="TaharezLook/ComboDropList" />
+    <FalagardMapping WindowType="TaharezLook/ComboEditbox"             TargetType="CEGUI/Editbox"           Renderer="Falagard/Editbox"           LookNFeel="TaharezLook/ComboEditbox" />
+    <FalagardMapping WindowType="TaharezLook/Editbox"                  TargetType="CEGUI/Editbox"           Renderer="Falagard/Editbox"           LookNFeel="TaharezLook/Editbox" />
+    <FalagardMapping WindowType="TaharezLook/FrameWindow"              TargetType="CEGUI/FrameWindow"       Renderer="Falagard/FrameWindow"       LookNFeel="TaharezLook/FrameWindow" />
+    <FalagardMapping WindowType="TaharezLook/GroupBox"                 TargetType="CEGUI/GroupBox"          Renderer="Falagard/Default"           LookNFeel="TaharezLook/GroupBox" />
+    <FalagardMapping WindowType="TaharezLook/ItemListbox"              TargetType="CEGUI/ItemListbox"       Renderer="Falagard/ItemListbox"       LookNFeel="TaharezLook/ItemListbox" />
+    <FalagardMapping WindowType="TaharezLook/ListboxItem"              TargetType="CEGUI/ItemEntry"         Renderer="Falagard/ItemEntry"         LookNFeel="TaharezLook/ListboxItem" />
+    <FalagardMapping WindowType="TaharezLook/Listbox"                  TargetType="CEGUI/Listbox"           Renderer="Falagard/Listbox"           LookNFeel="TaharezLook/Listbox" />
+    <FalagardMapping WindowType="TaharezLook/ListHeader"               TargetType="CEGUI/ListHeader"        Renderer="Falagard/ListHeader"        LookNFeel="TaharezLook/ListHeader" />
+    <FalagardMapping WindowType="TaharezLook/ListHeaderSegment"        TargetType="CEGUI/ListHeaderSegment" Renderer="Falagard/ListHeaderSegment" LookNFeel="TaharezLook/ListHeaderSegment" />
+    <FalagardMapping WindowType="TaharezLook/MultiLineEditbox"         TargetType="CEGUI/MultiLineEditbox"  Renderer="Falagard/MultiLineEditbox"  LookNFeel="TaharezLook/MultiLineEditbox" />
+    <FalagardMapping WindowType="TaharezLook/Menubar"                  TargetType="CEGUI/Menubar"           Renderer="Falagard/Menubar"           LookNFeel="TaharezLook/Menubar" />
+    <FalagardMapping WindowType="TaharezLook/MenuItem"                 TargetType="CEGUI/MenuItem"          Renderer="Falagard/MenuItem"          LookNFeel="TaharezLook/MenuItem" />
+    <FalagardMapping WindowType="TaharezLook/MultiColumnList"          TargetType="CEGUI/MultiColumnList"   Renderer="Falagard/MultiColumnList"   LookNFeel="TaharezLook/MultiColumnList" />
+    <FalagardMapping WindowType="TaharezLook/PopupMenu"                TargetType="CEGUI/PopupMenu"         Renderer="Falagard/PopupMenu"         LookNFeel="TaharezLook/PopupMenu" />
+    <FalagardMapping WindowType="TaharezLook/ProgressBar"              TargetType="CEGUI/ProgressBar"       Renderer="Falagard/ProgressBar"       LookNFeel="TaharezLook/ProgressBar" />
+    <FalagardMapping WindowType="TaharezLook/Button"                   TargetType="CEGUI/PushButton"        Renderer="Falagard/Button"            LookNFeel="TaharezLook/Button" />
+    <FalagardMapping WindowType="TaharezLook/ImageButton"              TargetType="CEGUI/PushButton"        Renderer="Falagard/Button"            LookNFeel="TaharezLook/ImageButton" />
+    <FalagardMapping WindowType="TaharezLook/RadioButton"              TargetType="CEGUI/RadioButton"       Renderer="Falagard/ToggleButton"      LookNFeel="TaharezLook/RadioButton" />
+    <FalagardMapping WindowType="TaharezLook/SystemButton"             TargetType="CEGUI/PushButton"        Renderer="Falagard/SystemButton"      LookNFeel="TaharezLook/Button" />
+    <FalagardMapping WindowType="TaharezLook/ScrollablePane"           TargetType="CEGUI/ScrollablePane"    Renderer="Falagard/ScrollablePane"    LookNFeel="TaharezLook/ScrollablePane" />
+    <FalagardMapping WindowType="TaharezLook/HorizontalScrollbar"      TargetType="CEGUI/Scrollbar"         Renderer="Falagard/Scrollbar"         LookNFeel="TaharezLook/HorizontalScrollbar" />
+    <FalagardMapping WindowType="TaharezLook/VerticalScrollbar"        TargetType="CEGUI/Scrollbar"         Renderer="Falagard/Scrollbar"         LookNFeel="TaharezLook/VerticalScrollbar" />
+    <FalagardMapping WindowType="TaharezLook/Slider"                   TargetType="CEGUI/Slider"            Renderer="Falagard/Slider"            LookNFeel="TaharezLook/Slider" />
+    <FalagardMapping WindowType="TaharezLook/Spinner"                  TargetType="CEGUI/Spinner"           Renderer="Falagard/Default"           LookNFeel="TaharezLook/Spinner" />
+    <FalagardMapping WindowType="TaharezLook/TabButton"                TargetType="CEGUI/TabButton"         Renderer="Falagard/TabButton"         LookNFeel="TaharezLook/TabButton" />
+    <FalagardMapping WindowType="TaharezLook/TabControl"               TargetType="CEGUI/TabControl"        Renderer="Falagard/TabControl"        LookNFeel="TaharezLook/TabControl" />
+    <FalagardMapping WindowType="TaharezLook/HorizontalScrollbarThumb" TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="TaharezLook/HorizontalScrollbarThumb" />
+    <FalagardMapping WindowType="TaharezLook/SliderThumb"              TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="TaharezLook/SliderThumb" />
+    <FalagardMapping WindowType="TaharezLook/VerticalScrollbarThumb"   TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="TaharezLook/VerticalScrollbarThumb" />
+    <FalagardMapping WindowType="TaharezLook/Titlebar"                 TargetType="CEGUI/Titlebar"          Renderer="Falagard/Titlebar"          LookNFeel="TaharezLook/Titlebar" />
+    <FalagardMapping WindowType="TaharezLook/Tooltip"                  TargetType="CEGUI/Tooltip"           Renderer="Falagard/Tooltip"           LookNFeel="TaharezLook/Tooltip" />
+    <FalagardMapping WindowType="TaharezLook/Tree"                     TargetType="CEGUI/Tree"              Renderer="Falagard/Tree"              LookNFeel="TaharezLook/Tree" />
+    
+    <!-- Additional widgets -->
+    <FalagardMapping WindowType="TaharezLook/AlternateProgressBar"        TargetType="CEGUI/ProgressBar"       Renderer="Falagard/ProgressBar"       LookNFeel="TaharezLook/AltProgressBar" />
+    <FalagardMapping WindowType="TaharezLook/VUMeter"                     TargetType="CEGUI/ProgressBar"       Renderer="Falagard/ProgressBar"       LookNFeel="TaharezLook/VUMeter" />
+    <FalagardMapping WindowType="TaharezLook/LargeVerticalScrollbar"      TargetType="CEGUI/Scrollbar"         Renderer="Falagard/Scrollbar"         LookNFeel="TaharezLook/LargeVerticalScrollbar" />
+    <FalagardMapping WindowType="TaharezLook/LargeVerticalScrollbarThumb" TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="TaharezLook/LargeVerticalScrollbarThumb" />
 </GUIScheme>
Index: de/branches/gamestates2/data/gui/schemes/TaharezLookSkin.scheme
===================================================================
--- /code/branches/gamestates2/data/gui/schemes/TaharezLookSkin.scheme	(revision 6594)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?xml version="1.0" ?>
-<GUIScheme Name="TaharezLook">
-	<Imageset Name="TaharezLook" Filename="TaharezLook.imageset" />
-    <Font Name="BlueHighway-12" Filename="bluehighway-12.font" />
-    <Font Name="BlueHighway-10" Filename="bluehighway-10.font" />
-    <Font Name="BlueHighway-8" Filename="bluehighway-8.font" />
-	<LookNFeel Filename="TaharezLook.looknfeel" />
-	<WindowRendererSet Filename="CEGUIFalagardWRBase" />
-	<FalagardMapping WindowType="TaharezLook/Button"      TargetType="CEGUI/PushButton"  Renderer="Falagard/Button"       LookNFeel="TaharezLook/Button" />
-	<FalagardMapping WindowType="TaharezLook/Checkbox"    TargetType="CEGUI/Checkbox"    Renderer="Falagard/ToggleButton" LookNFeel="TaharezLook/Checkbox" />
-	<FalagardMapping WindowType="TaharezLook/ImageButton" TargetType="CEGUI/PushButton"  Renderer="Falagard/Button"       LookNFeel="TaharezLook/ImageButton" />
-	<FalagardMapping WindowType="TaharezLook/RadioButton" TargetType="CEGUI/RadioButton" Renderer="Falagard/ToggleButton" LookNFeel="TaharezLook/RadioButton" />
-	<FalagardMapping WindowType="TaharezLook/FrameWindow"  TargetType="CEGUI/FrameWindow" Renderer="Falagard/FrameWindow"  LookNFeel="TaharezLook/FrameWindow" />
-	<FalagardMapping WindowType="TaharezLook/Titlebar"     TargetType="CEGUI/Titlebar"    Renderer="Falagard/Titlebar"     LookNFeel="TaharezLook/Titlebar" />
-	<FalagardMapping WindowType="TaharezLook/SystemButton" TargetType="CEGUI/PushButton"  Renderer="Falagard/SystemButton" LookNFeel="TaharezLook/Button" />
-	<FalagardMapping WindowType="TaharezLook/Editbox"          TargetType="CEGUI/Editbox"          Renderer="Falagard/Editbox"          LookNFeel="TaharezLook/Editbox" />
-	<FalagardMapping WindowType="TaharezLook/MultiLineEditbox" TargetType="CEGUI/MultiLineEditbox" Renderer="Falagard/MultiLineEditbox" LookNFeel="TaharezLook/MultiLineEditbox" />
-	<FalagardMapping WindowType="TaharezLook/Menubar"   TargetType="CEGUI/Menubar"   Renderer="Falagard/Menubar"   LookNFeel="TaharezLook/Menubar" />
-	<FalagardMapping WindowType="TaharezLook/PopupMenu" TargetType="CEGUI/PopupMenu" Renderer="Falagard/PopupMenu" LookNFeel="TaharezLook/PopupMenu" />
-	<FalagardMapping WindowType="TaharezLook/MenuItem"  TargetType="CEGUI/MenuItem"  Renderer="Falagard/MenuItem"  LookNFeel="TaharezLook/MenuItem" />
-	<FalagardMapping WindowType="TaharezLook/AlternateProgressBar" TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="TaharezLook/AltProgressBar" />
-	<FalagardMapping WindowType="TaharezLook/ProgressBar"          TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="TaharezLook/ProgressBar" />
-	<FalagardMapping WindowType="TaharezLook/VUMeter"              TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="TaharezLook/VUMeter" />
-	<FalagardMapping WindowType="TaharezLook/VerticalScrollbar"   TargetType="CEGUI/Scrollbar" Renderer="Falagard/Scrollbar" LookNFeel="TaharezLook/VerticalScrollbar" />
-	<FalagardMapping WindowType="TaharezLook/HorizontalScrollbar" TargetType="CEGUI/Scrollbar" Renderer="Falagard/Scrollbar" LookNFeel="TaharezLook/HorizontalScrollbar" />
-	<FalagardMapping WindowType="TaharezLook/VerticalScrollbarThumb"   TargetType="CEGUI/Thumb" Renderer="Falagard/Button" LookNFeel="TaharezLook/VerticalScrollbarThumb" />
-	<FalagardMapping WindowType="TaharezLook/HorizontalScrollbarThumb" TargetType="CEGUI/Thumb" Renderer="Falagard/Button" LookNFeel="TaharezLook/HorizontalScrollbarThumb" />
-	<FalagardMapping WindowType="TaharezLook/LargeVerticalScrollbar"      TargetType="CEGUI/Scrollbar" Renderer="Falagard/Scrollbar" LookNFeel="TaharezLook/LargeVerticalScrollbar" />
-	<FalagardMapping WindowType="TaharezLook/LargeVerticalScrollbarThumb" TargetType="CEGUI/Thumb"     Renderer="Falagard/Button"    LookNFeel="TaharezLook/LargeVerticalScrollbarThumb" />
-	<FalagardMapping WindowType="TaharezLook/TabButton"  TargetType="CEGUI/TabButton"  Renderer="Falagard/TabButton"  LookNFeel="TaharezLook/TabButton" />
-	<FalagardMapping WindowType="TaharezLook/TabControl" TargetType="CEGUI/TabControl" Renderer="Falagard/TabControl" LookNFeel="TaharezLook/TabControl" />
-	<FalagardMapping WindowType="TaharezLook/TabContentPane"    TargetType="DefaultWindow"    Renderer="Falagard/Default"    LookNFeel="TaharezLook/TabContentPane" />
-	<FalagardMapping WindowType="TaharezLook/TabButtonPane"    TargetType="DefaultWindow"    Renderer="Falagard/Default"    LookNFeel="TaharezLook/TabButtonPane" />
-	<FalagardMapping WindowType="TaharezLook/ComboDropList" TargetType="CEGUI/ComboDropList" Renderer="Falagard/Listbox" LookNFeel="TaharezLook/ComboDropList" />
-	<FalagardMapping WindowType="TaharezLook/ComboEditbox"  TargetType="CEGUI/Editbox"	 Renderer="Falagard/Editbox" LookNFeel="TaharezLook/ComboEditbox" />
-	<FalagardMapping WindowType="TaharezLook/Combobox"	TargetType="CEGUI/Combobox"	 Renderer="Falagard/Default" LookNFeel="TaharezLook/Combobox" />
-	<FalagardMapping WindowType="TaharezLook/Listbox"           TargetType="CEGUI/Listbox"           Renderer="Falagard/Listbox"           LookNFeel="TaharezLook/Listbox" />
-	<FalagardMapping WindowType="TaharezLook/ListHeader"        TargetType="CEGUI/ListHeader"        Renderer="Falagard/ListHeader"        LookNFeel="TaharezLook/ListHeader" />
-	<FalagardMapping WindowType="TaharezLook/ListHeaderSegment" TargetType="CEGUI/ListHeaderSegment" Renderer="Falagard/ListHeaderSegment" LookNFeel="TaharezLook/ListHeaderSegment" />
-	<FalagardMapping WindowType="TaharezLook/MultiColumnList"   TargetType="CEGUI/MultiColumnList"   Renderer="Falagard/MultiColumnList"   LookNFeel="TaharezLook/MultiColumnList" />
-	<FalagardMapping WindowType="TaharezLook/Slider"      TargetType="CEGUI/Slider"      Renderer="Falagard/Slider"  LookNFeel="TaharezLook/Slider" />
-	<FalagardMapping WindowType="TaharezLook/SliderThumb" TargetType="CEGUI/Thumb" Renderer="Falagard/Button"  LookNFeel="TaharezLook/SliderThumb" />
-	<FalagardMapping WindowType="TaharezLook/ScrollablePane" TargetType="CEGUI/ScrollablePane" Renderer="Falagard/ScrollablePane" LookNFeel="TaharezLook/ScrollablePane" />
-	<FalagardMapping WindowType="TaharezLook/Spinner" TargetType="CEGUI/Spinner" Renderer="Falagard/Default" LookNFeel="TaharezLook/Spinner" />
-	<FalagardMapping WindowType="TaharezLook/Tooltip" TargetType="CEGUI/Tooltip" Renderer="Falagard/Tooltip" LookNFeel="TaharezLook/Tooltip" />
-	<FalagardMapping WindowType="TaharezLook/StaticImage" TargetType="DefaultWindow" Renderer="Falagard/StaticImage" LookNFeel="TaharezLook/StaticImage" />
-	<FalagardMapping WindowType="TaharezLook/StaticText"  TargetType="DefaultWindow" Renderer="Falagard/StaticText"  LookNFeel="TaharezLook/StaticText" />
-</GUIScheme>
Index: de/branches/gamestates2/data/gui/schemes/TaharezLookWidgetAliases.scheme
===================================================================
--- /code/branches/gamestates2/data/gui/schemes/TaharezLookWidgetAliases.scheme	(revision 6594)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version="1.0" ?>
-<GUIScheme Name="TaharezLookWidgetAliases">
-	<WindowAlias Alias="Taharez AltProgressBar" Target="TaharezLook/AlternateProgressBar" />
-	<WindowAlias Alias="Taharez Button" Target="TaharezLook/Button" />
-	<WindowAlias Alias="Taharez Checkbox" Target="TaharezLook/Checkbox" />
-	<WindowAlias Alias="Taharez System Button" Target="TaharezLook/SystemButton" />
-	<WindowAlias Alias="Taharez Combobox" Target="TaharezLook/Combobox" />
-	<WindowAlias Alias="Taharez ComboDropList" Target="TaharezLook/ComboDropList" />
-	<WindowAlias Alias="Taharez ComboEditbox" Target="TaharezLook/ComboEditbox" />
-	<WindowAlias Alias="Taharez Editbox" Target="TaharezLook/Editbox" />
-	<WindowAlias Alias="Taharez Frame Window" Target="TaharezLook/FrameWindow" />
-	<WindowAlias Alias="Taharez Listbox" Target="TaharezLook/Listbox" />
-	<WindowAlias Alias="Taharez ListHeader" Target="TaharezLook/ListHeader" />
-	<WindowAlias Alias="Taharez ListHeaderSegment" Target="TaharezLook/ListHeaderSegment" />
-	<WindowAlias Alias="Taharez MiniHorzScrollbar" Target="TaharezLook/HorizontalScrollbar" />
-	<WindowAlias Alias="Taharez MiniHorzScrollbarThumb" Target="TaharezLook/HorizontalScrollbarThumb" />
-	<WindowAlias Alias="Taharez MiniVertScrollbar" Target="TaharezLook/VerticalScrollbar" />
-	<WindowAlias Alias="Taharez MiniVertScrollbarThumb" Target="TaharezLook/VerticalScrollbarThumb" />
-	<WindowAlias Alias="Taharez MultiColumnList" Target="TaharezLook/MultiColumnList" />
-	<WindowAlias Alias="Taharez MultiLineEditbox" Target="TaharezLook/MultiLineEditbox" />
-	<WindowAlias Alias="Taharez ProgressBar" Target="TaharezLook/ProgressBar" />
-	<WindowAlias Alias="Taharez RadioButton" Target="TaharezLook/RadioButton" />
-	<WindowAlias Alias="Taharez Slider" Target="TaharezLook/Slider" />
-	<WindowAlias Alias="Taharez Slider Thumb" Target="TaharezLook/SliderThumb" />
-	<WindowAlias Alias="Taharez StaticImage" Target="TaharezLook/StaticImage" />
-	<WindowAlias Alias="Taharez StaticText" Target="TaharezLook/StaticText" />
-	<WindowAlias Alias="Taharez Tab Button" Target="TaharezLook/TabButton" />
-	<WindowAlias Alias="Taharez Tab Pane" Target="TaharezLook/TabContentPane" />
-	<WindowAlias Alias="Taharez Tab Control" Target="TaharezLook/TabControl" />
-	<WindowAlias Alias="Taharez Titlebar" Target="TaharezLook/Titlebar" />
-	<WindowAlias Alias="Taharez VertScrollbar" Target="TaharezLook/LargeVerticalScrollbar" />
-	<WindowAlias Alias="Taharez VertScrollbarThumb" Target="TaharezLook/LargeVerticalScrollbarThumb" />
-	<WindowAlias Alias="Taharez GroupBox" Target="TaharezLook/GroupBox" />
-</GUIScheme>
-
-
Index: de/branches/gamestates2/data/gui/schemes/TaharezLookWidgets.scheme
===================================================================
--- /code/branches/gamestates2/data/gui/schemes/TaharezLookWidgets.scheme	(revision 6594)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?xml version="1.0" ?>
-<GUIScheme Name="TaharezLookWidgets">
-	<WindowRendererSet Filename="CEGUIFalagardWRBase" />
-	<FalagardMapping WindowType="TaharezLook/Button"      TargetType="CEGUI/PushButton"  Renderer="Falagard/Button"       LookNFeel="TaharezLook/Button" />
-	<FalagardMapping WindowType="TaharezLook/Checkbox"    TargetType="CEGUI/Checkbox"    Renderer="Falagard/ToggleButton" LookNFeel="TaharezLook/Checkbox" />
-	<FalagardMapping WindowType="TaharezLook/ImageButton" TargetType="CEGUI/PushButton"  Renderer="Falagard/Button"       LookNFeel="TaharezLook/ImageButton" />
-	<FalagardMapping WindowType="TaharezLook/RadioButton" TargetType="CEGUI/RadioButton" Renderer="Falagard/ToggleButton" LookNFeel="TaharezLook/RadioButton" />
-	<FalagardMapping WindowType="TaharezLook/FrameWindow"  TargetType="CEGUI/FrameWindow" Renderer="Falagard/FrameWindow"  LookNFeel="TaharezLook/FrameWindow" />
-	<FalagardMapping WindowType="TaharezLook/Titlebar"     TargetType="CEGUI/Titlebar"    Renderer="Falagard/Titlebar"     LookNFeel="TaharezLook/Titlebar" />
-	<FalagardMapping WindowType="TaharezLook/SystemButton" TargetType="CEGUI/PushButton"  Renderer="Falagard/SystemButton" LookNFeel="TaharezLook/Button" />
-	<FalagardMapping WindowType="TaharezLook/Editbox"          TargetType="CEGUI/Editbox"          Renderer="Falagard/Editbox"          LookNFeel="TaharezLook/Editbox" />
-	<FalagardMapping WindowType="TaharezLook/MultiLineEditbox" TargetType="CEGUI/MultiLineEditbox" Renderer="Falagard/MultiLineEditbox" LookNFeel="TaharezLook/MultiLineEditbox" />
-	<FalagardMapping WindowType="TaharezLook/Menubar"   TargetType="CEGUI/Menubar"   Renderer="Falagard/Menubar"   LookNFeel="TaharezLook/Menubar" />
-	<FalagardMapping WindowType="TaharezLook/PopupMenu" TargetType="CEGUI/PopupMenu" Renderer="Falagard/PopupMenu" LookNFeel="TaharezLook/PopupMenu" />
-	<FalagardMapping WindowType="TaharezLook/MenuItem"  TargetType="CEGUI/MenuItem"  Renderer="Falagard/MenuItem"  LookNFeel="TaharezLook/MenuItem" />
-	<FalagardMapping WindowType="TaharezLook/AlternateProgressBar" TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="TaharezLook/AltProgressBar" />
-	<FalagardMapping WindowType="TaharezLook/ProgressBar"          TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="TaharezLook/ProgressBar" />
-	<FalagardMapping WindowType="TaharezLook/VUMeter"              TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="TaharezLook/VUMeter" />
-	<FalagardMapping WindowType="TaharezLook/VerticalScrollbar"   TargetType="CEGUI/Scrollbar" Renderer="Falagard/Scrollbar" LookNFeel="TaharezLook/VerticalScrollbar" />
-	<FalagardMapping WindowType="TaharezLook/HorizontalScrollbar" TargetType="CEGUI/Scrollbar" Renderer="Falagard/Scrollbar" LookNFeel="TaharezLook/HorizontalScrollbar" />
-	<FalagardMapping WindowType="TaharezLook/VerticalScrollbarThumb"   TargetType="CEGUI/Thumb" Renderer="Falagard/Button" LookNFeel="TaharezLook/VerticalScrollbarThumb" />
-	<FalagardMapping WindowType="TaharezLook/HorizontalScrollbarThumb" TargetType="CEGUI/Thumb" Renderer="Falagard/Button" LookNFeel="TaharezLook/HorizontalScrollbarThumb" />
-	<FalagardMapping WindowType="TaharezLook/LargeVerticalScrollbar"      TargetType="CEGUI/Scrollbar" Renderer="Falagard/Scrollbar" LookNFeel="TaharezLook/LargeVerticalScrollbar" />
-	<FalagardMapping WindowType="TaharezLook/LargeVerticalScrollbarThumb" TargetType="CEGUI/Thumb"     Renderer="Falagard/Button"    LookNFeel="TaharezLook/LargeVerticalScrollbarThumb" />
-	<FalagardMapping WindowType="TaharezLook/TabButton"  TargetType="CEGUI/TabButton"  Renderer="Falagard/TabButton"  LookNFeel="TaharezLook/TabButton" />
-	<FalagardMapping WindowType="TaharezLook/TabControl" TargetType="CEGUI/TabControl" Renderer="Falagard/TabControl" LookNFeel="TaharezLook/TabControl" />
-	<FalagardMapping WindowType="TaharezLook/TabContentPane"    TargetType="DefaultWindow"    Renderer="Falagard/Default"    LookNFeel="TaharezLook/TabContentPane" />
-	<FalagardMapping WindowType="TaharezLook/ComboDropList" TargetType="CEGUI/ComboDropList" Renderer="Falagard/Listbox" LookNFeel="TaharezLook/ComboDropList" />
-	<FalagardMapping WindowType="TaharezLook/ComboEditbox"  TargetType="CEGUI/Editbox"	 Renderer="Falagard/Editbox" LookNFeel="TaharezLook/ComboEditbox" />
-	<FalagardMapping WindowType="TaharezLook/Combobox"	TargetType="CEGUI/Combobox"	 Renderer="Falagard/Default" LookNFeel="TaharezLook/Combobox" />
-	<FalagardMapping WindowType="TaharezLook/Listbox"           TargetType="CEGUI/Listbox"           Renderer="Falagard/Listbox"           LookNFeel="TaharezLook/Listbox" />
-	<FalagardMapping WindowType="TaharezLook/ListHeader"        TargetType="CEGUI/ListHeader"        Renderer="Falagard/ListHeader"        LookNFeel="TaharezLook/ListHeader" />
-	<FalagardMapping WindowType="TaharezLook/ListHeaderSegment" TargetType="CEGUI/ListHeaderSegment" Renderer="Falagard/ListHeaderSegment" LookNFeel="TaharezLook/ListHeaderSegment" />
-	<FalagardMapping WindowType="TaharezLook/MultiColumnList"   TargetType="CEGUI/MultiColumnList"   Renderer="Falagard/MultiColumnList"   LookNFeel="TaharezLook/MultiColumnList" />
-	<FalagardMapping WindowType="TaharezLook/Slider"      TargetType="CEGUI/Slider" Renderer="Falagard/Slider"  LookNFeel="TaharezLook/Slider" />
-	<FalagardMapping WindowType="TaharezLook/SliderThumb" TargetType="CEGUI/Thumb"  Renderer="Falagard/Button"  LookNFeel="TaharezLook/SliderThumb" />
-	<FalagardMapping WindowType="TaharezLook/ScrollablePane" TargetType="CEGUI/ScrollablePane" Renderer="Falagard/ScrollablePane" LookNFeel="TaharezLook/ScrollablePane" />
-	<FalagardMapping WindowType="TaharezLook/Spinner" TargetType="CEGUI/Spinner" Renderer="Falagard/Default" LookNFeel="TaharezLook/Spinner" />
-	<FalagardMapping WindowType="TaharezLook/Tooltip" TargetType="CEGUI/Tooltip" Renderer="Falagard/Tooltip" LookNFeel="TaharezLook/Tooltip" />
-	<FalagardMapping WindowType="TaharezLook/StaticImage" TargetType="DefaultWindow" Renderer="Falagard/StaticImage" LookNFeel="TaharezLook/StaticImage" />
-	<FalagardMapping WindowType="TaharezLook/StaticText"  TargetType="DefaultWindow" Renderer="Falagard/StaticText"  LookNFeel="TaharezLook/StaticText" />
-	<FalagardMapping WindowType="TaharezLook/ItemListbox" TargetType="CEGUI/ItemListbox" Renderer="Falagard/ItemListbox" LookNFeel="TaharezLook/ItemListbox" />
-	<FalagardMapping WindowType="TaharezLook/ListboxItem" TargetType="CEGUI/ItemEntry"   Renderer="Falagard/ItemEntry"   LookNFeel="TaharezLook/ListboxItem" />
-    	<FalagardMapping WindowType="TaharezLook/GroupBox" TargetType="CEGUI/GroupBox"   Renderer="Falagard/Default"   LookNFeel="TaharezLook/GroupBox" />
-</GUIScheme>
Index: /code/branches/gamestates2/data/gui/schemes/TaharezMenuWidgets.scheme
===================================================================
--- /code/branches/gamestates2/data/gui/schemes/TaharezMenuWidgets.scheme	(revision 6595)
+++ /code/branches/gamestates2/data/gui/schemes/TaharezMenuWidgets.scheme	(revision 6595)
@@ -0,0 +1,42 @@
+<?xml version="1.0" ?>
+<GUIScheme Name="TaharezMenuWidgets">
+    <WindowAlias Alias="MenuWidgets/StaticImage"              Target="TaharezLook/StaticImage" />
+    <WindowAlias Alias="MenuWidgets/StaticText"               Target="TaharezLook/StaticText" />
+    <WindowAlias Alias="MenuWidgets/TabButtonPane"            Target="TaharezLook/TabButtonPane" />
+    <WindowAlias Alias="MenuWidgets/TabContentPane"           Target="TaharezLook/TabContentPane" />
+    <WindowAlias Alias="MenuWidgets/Checkbox"                 Target="TaharezLook/Checkbox" />
+    <WindowAlias Alias="MenuWidgets/Combobox"                 Target="TaharezLook/Combobox" />
+    <WindowAlias Alias="MenuWidgets/ComboDropList"            Target="TaharezLook/ComboDropList" />
+    <WindowAlias Alias="MenuWidgets/ComboEditbox"             Target="TaharezLook/ComboEditbox" />
+    <WindowAlias Alias="MenuWidgets/Editbox"                  Target="TaharezLook/Editbox" />
+    <WindowAlias Alias="MenuWidgets/FrameWindow"              Target="TaharezLook/FrameWindow" />
+    <WindowAlias Alias="MenuWidgets/GroupBox"                 Target="TaharezLook/GroupBox" />
+    <WindowAlias Alias="MenuWidgets/ItemListbox"              Target="TaharezLook/ItemListbox" />
+    <WindowAlias Alias="MenuWidgets/ListboxItem"              Target="TaharezLook/ListboxItem" />
+    <WindowAlias Alias="MenuWidgets/Listbox"                  Target="TaharezLook/Listbox" />
+    <WindowAlias Alias="MenuWidgets/ListHeader"               Target="TaharezLook/ListHeader" />
+    <WindowAlias Alias="MenuWidgets/ListHeaderSegment"        Target="TaharezLook/ListHeaderSegment" />
+    <WindowAlias Alias="MenuWidgets/MultiLineEditbox"         Target="TaharezLook/MultiLineEditbox" />
+    <WindowAlias Alias="MenuWidgets/Menubar"                  Target="TaharezLook/Menubar" />
+    <WindowAlias Alias="MenuWidgets/MenuItem"                 Target="TaharezLook/MenuItem" />
+    <WindowAlias Alias="MenuWidgets/MultiColumnList"          Target="TaharezLook/MultiColumnList" />
+    <WindowAlias Alias="MenuWidgets/PopupMenu"                Target="TaharezLook/PopupMenu" />
+    <WindowAlias Alias="MenuWidgets/ProgressBar"              Target="TaharezLook/ProgressBar" />
+    <WindowAlias Alias="MenuWidgets/Button"                   Target="TaharezLook/Button" />
+    <WindowAlias Alias="MenuWidgets/ImageButton"              Target="TaharezLook/ImageButton" />
+    <WindowAlias Alias="MenuWidgets/RadioButton"              Target="TaharezLook/RadioButton" />
+    <WindowAlias Alias="MenuWidgets/SystemButton"             Target="TaharezLook/SystemButton" />
+    <WindowAlias Alias="MenuWidgets/ScrollablePane"           Target="TaharezLook/ScrollablePane" />
+    <WindowAlias Alias="MenuWidgets/HorizontalScrollbar"      Target="TaharezLook/HorizontalScrollbar" />
+    <WindowAlias Alias="MenuWidgets/VerticalScrollbar"        Target="TaharezLook/VerticalScrollbar" />
+    <WindowAlias Alias="MenuWidgets/Slider"                   Target="TaharezLook/Slider" />
+    <WindowAlias Alias="MenuWidgets/Spinner"                  Target="TaharezLook/Spinner" />
+    <WindowAlias Alias="MenuWidgets/TabButton"                Target="TaharezLook/TabButton" />
+    <WindowAlias Alias="MenuWidgets/TabControl"               Target="TaharezLook/TabControl" />
+    <WindowAlias Alias="MenuWidgets/HorizontalScrollbarThumb" Target="TaharezLook/HorizontalScrollbarThumb" />
+    <WindowAlias Alias="MenuWidgets/SliderThumb"              Target="TaharezLook/SliderThumb" />
+    <WindowAlias Alias="MenuWidgets/VerticalScrollbarThumb"   Target="TaharezLook/VerticalScrollbarThumb" />
+    <WindowAlias Alias="MenuWidgets/Titlebar"                 Target="TaharezLook/Titlebar" />
+    <WindowAlias Alias="MenuWidgets/Tooltip"                  Target="TaharezLook/Tooltip" />
+    <WindowAlias Alias="MenuWidgets/Tree"                     Target="TaharezLook/Tree" />
+</GUIScheme>
Index: /code/branches/gamestates2/data/gui/schemes/VanillaHUDWidgets.scheme
===================================================================
--- /code/branches/gamestates2/data/gui/schemes/VanillaHUDWidgets.scheme	(revision 6595)
+++ /code/branches/gamestates2/data/gui/schemes/VanillaHUDWidgets.scheme	(revision 6595)
@@ -0,0 +1,42 @@
+<?xml version="1.0" ?>
+<GUIScheme Name="VanillaHUDWidgets">
+    <WindowAlias Alias="HUDWidgets/StaticImage"              Target="Vanilla/StaticImage" />
+    <WindowAlias Alias="HUDWidgets/StaticText"               Target="Vanilla/StaticText" />
+    <WindowAlias Alias="HUDWidgets/TabButtonPane"            Target="Vanilla/TabButtonPane" />
+    <WindowAlias Alias="HUDWidgets/TabContentPane"           Target="Vanilla/TabContentPane" />
+    <WindowAlias Alias="HUDWidgets/Checkbox"                 Target="Vanilla/Checkbox" />
+    <WindowAlias Alias="HUDWidgets/Combobox"                 Target="Vanilla/Combobox" />
+    <WindowAlias Alias="HUDWidgets/ComboDropList"            Target="Vanilla/ComboDropList" />
+    <WindowAlias Alias="HUDWidgets/ComboEditbox"             Target="Vanilla/ComboEditbox" />
+    <WindowAlias Alias="HUDWidgets/Editbox"                  Target="Vanilla/Editbox" />
+    <WindowAlias Alias="HUDWidgets/FrameWindow"              Target="Vanilla/FrameWindow" />
+    <WindowAlias Alias="HUDWidgets/GroupBox"                 Target="Vanilla/GroupBox" />
+    <WindowAlias Alias="HUDWidgets/ItemListbox"              Target="Vanilla/ItemListbox" />
+    <WindowAlias Alias="HUDWidgets/ListboxItem"              Target="Vanilla/ListboxItem" />
+    <WindowAlias Alias="HUDWidgets/Listbox"                  Target="Vanilla/Listbox" />
+    <WindowAlias Alias="HUDWidgets/ListHeader"               Target="Vanilla/ListHeader" />
+    <WindowAlias Alias="HUDWidgets/ListHeaderSegment"        Target="Vanilla/ListHeaderSegment" />
+    <WindowAlias Alias="HUDWidgets/MultiLineEditbox"         Target="Vanilla/MultiLineEditbox" />
+    <WindowAlias Alias="HUDWidgets/Menubar"                  Target="Vanilla/Menubar" />
+    <WindowAlias Alias="HUDWidgets/MenuItem"                 Target="Vanilla/MenuItem" />
+    <WindowAlias Alias="HUDWidgets/MultiColumnList"          Target="Vanilla/MultiColumnList" />
+    <WindowAlias Alias="HUDWidgets/PopupMenu"                Target="Vanilla/PopupMenu" />
+    <WindowAlias Alias="HUDWidgets/ProgressBar"              Target="Vanilla/ProgressBar" />
+    <WindowAlias Alias="HUDWidgets/Button"                   Target="Vanilla/Button" />
+    <WindowAlias Alias="HUDWidgets/ImageButton"              Target="Vanilla/ImageButton" />
+    <WindowAlias Alias="HUDWidgets/RadioButton"              Target="Vanilla/RadioButton" />
+    <WindowAlias Alias="HUDWidgets/SystemButton"             Target="Vanilla/SystemButton" />
+    <WindowAlias Alias="HUDWidgets/ScrollablePane"           Target="Vanilla/ScrollablePane" />
+    <WindowAlias Alias="HUDWidgets/HorizontalScrollbar"      Target="Vanilla/HorizontalScrollbar" />
+    <WindowAlias Alias="HUDWidgets/VerticalScrollbar"        Target="Vanilla/VerticalScrollbar" />
+    <WindowAlias Alias="HUDWidgets/Slider"                   Target="Vanilla/Slider" />
+    <WindowAlias Alias="HUDWidgets/Spinner"                  Target="Vanilla/Spinner" />
+    <WindowAlias Alias="HUDWidgets/TabButton"                Target="Vanilla/TabButton" />
+    <WindowAlias Alias="HUDWidgets/TabControl"               Target="Vanilla/TabControl" />
+    <WindowAlias Alias="HUDWidgets/HorizontalScrollbarThumb" Target="Vanilla/HorizontalScrollbarThumb" />
+    <WindowAlias Alias="HUDWidgets/SliderThumb"              Target="Vanilla/SliderThumb" />
+    <WindowAlias Alias="HUDWidgets/VerticalScrollbarThumb"   Target="Vanilla/VerticalScrollbarThumb" />
+    <WindowAlias Alias="HUDWidgets/Titlebar"                 Target="Vanilla/Titlebar" />
+    <WindowAlias Alias="HUDWidgets/Tooltip"                  Target="Vanilla/Tooltip" />
+    <WindowAlias Alias="HUDWidgets/Tree"                     Target="Vanilla/Tree" />
+</GUIScheme>
Index: /code/branches/gamestates2/data/gui/schemes/VanillaLook.scheme
===================================================================
--- /code/branches/gamestates2/data/gui/schemes/VanillaLook.scheme	(revision 6595)
+++ /code/branches/gamestates2/data/gui/schemes/VanillaLook.scheme	(revision 6595)
@@ -0,0 +1,53 @@
+<?xml version="1.0" ?>
+<GUIScheme Name="VanillaLook">
+    <Imageset Name="Vanilla-Images" Filename="Vanilla.imageset" />
+    <Imageset Name="TaharezLook"    Filename="TaharezLook.imageset" />
+    <LookNFeel Filename="Vanilla.looknfeel" />
+    <LookNFeel Filename="TaharezLook.looknfeel" />
+    <WindowRendererSet Filename="CEGUIFalagardWRBase" />
+
+    <!-- Standard widgets -->
+    <FalagardMapping WindowType="Vanilla/StaticImage"              TargetType="DefaultWindow"           Renderer="Falagard/StaticImage"       LookNFeel="Vanilla/StaticImage" />
+    <FalagardMapping WindowType="Vanilla/StaticText"               TargetType="DefaultWindow"           Renderer="Falagard/StaticText"        LookNFeel="Vanilla/StaticText" />
+    <FalagardMapping WindowType="Vanilla/Editbox"                  TargetType="CEGUI/Editbox"           Renderer="Falagard/Editbox"           LookNFeel="Vanilla/Editbox" />
+    <FalagardMapping WindowType="Vanilla/FrameWindow"              TargetType="CEGUI/FrameWindow"       Renderer="Falagard/FrameWindow"       LookNFeel="Vanilla/FrameWindow" />
+    <FalagardMapping WindowType="Vanilla/Listbox"                  TargetType="CEGUI/Listbox"           Renderer="Falagard/Listbox"           LookNFeel="Vanilla/Listbox" />
+    <FalagardMapping WindowType="Vanilla/MultiLineEditbox"         TargetType="CEGUI/MultiLineEditbox"  Renderer="Falagard/MultiLineEditbox"  LookNFeel="Vanilla/MultiLineEditbox" />
+    <FalagardMapping WindowType="Vanilla/Button"                   TargetType="CEGUI/PushButton"        Renderer="Falagard/Button"            LookNFeel="Vanilla/Button" />
+    <FalagardMapping WindowType="Vanilla/HorizontalScrollbar"      TargetType="CEGUI/Scrollbar"         Renderer="Falagard/Scrollbar"         LookNFeel="Vanilla/HorizontalScrollbar" />
+    <FalagardMapping WindowType="Vanilla/VerticalScrollbar"        TargetType="CEGUI/Scrollbar"         Renderer="Falagard/Scrollbar"         LookNFeel="Vanilla/VerticalScrollbar" />
+    <FalagardMapping WindowType="Vanilla/HorizontalScrollbarThumb" TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="Vanilla/HorizontalScrollbarThumb" />
+    <FalagardMapping WindowType="Vanilla/VerticalScrollbarThumb"   TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="Vanilla/VerticalScrollbarThumb" />
+    <FalagardMapping WindowType="Vanilla/Titlebar"                 TargetType="CEGUI/Titlebar"          Renderer="Falagard/Titlebar"          LookNFeel="Vanilla/Titlebar" />
+
+    <!-- Missing widgets (using Taharez LookNFeel) -->
+    <FalagardMapping WindowType="Vanilla/TabButtonPane"            TargetType="DefaultWindow"           Renderer="Falagard/Default"           LookNFeel="TaharezLook/TabButtonPane" />
+    <FalagardMapping WindowType="Vanilla/TabContentPane"           TargetType="DefaultWindow"           Renderer="Falagard/Default"           LookNFeel="TaharezLook/TabContentPane" />
+    <FalagardMapping WindowType="Vanilla/Checkbox"                 TargetType="CEGUI/Checkbox"          Renderer="Falagard/ToggleButton"      LookNFeel="TaharezLook/Checkbox" />
+    <FalagardMapping WindowType="Vanilla/Combobox"                 TargetType="CEGUI/Combobox"          Renderer="Falagard/Default"           LookNFeel="TaharezLook/Combobox" />
+    <FalagardMapping WindowType="Vanilla/ComboDropList"            TargetType="CEGUI/ComboDropList"     Renderer="Falagard/Listbox"           LookNFeel="TaharezLook/ComboDropList" />
+    <FalagardMapping WindowType="Vanilla/ComboEditbox"             TargetType="CEGUI/Editbox"           Renderer="Falagard/Editbox"           LookNFeel="TaharezLook/ComboEditbox" />
+    <FalagardMapping WindowType="Vanilla/GroupBox"                 TargetType="CEGUI/GroupBox"          Renderer="Falagard/Default"           LookNFeel="TaharezLook/GroupBox" />
+    <FalagardMapping WindowType="Vanilla/ItemListbox"              TargetType="CEGUI/ItemListbox"       Renderer="Falagard/ItemListbox"       LookNFeel="TaharezLook/ItemListbox" />
+    <FalagardMapping WindowType="Vanilla/ListboxItem"              TargetType="CEGUI/ItemEntry"         Renderer="Falagard/ItemEntry"         LookNFeel="TaharezLook/ListboxItem" />
+    <FalagardMapping WindowType="Vanilla/ListHeader"               TargetType="CEGUI/ListHeader"        Renderer="Falagard/ListHeader"        LookNFeel="TaharezLook/ListHeader" />
+    <FalagardMapping WindowType="Vanilla/ListHeaderSegment"        TargetType="CEGUI/ListHeaderSegment" Renderer="Falagard/ListHeaderSegment" LookNFeel="TaharezLook/ListHeaderSegment" />
+    <FalagardMapping WindowType="Vanilla/Menubar"                  TargetType="CEGUI/Menubar"           Renderer="Falagard/Menubar"           LookNFeel="TaharezLook/Menubar" />
+    <FalagardMapping WindowType="Vanilla/MenuItem"                 TargetType="CEGUI/MenuItem"          Renderer="Falagard/MenuItem"          LookNFeel="TaharezLook/MenuItem" />
+    <FalagardMapping WindowType="Vanilla/MultiColumnList"          TargetType="CEGUI/MultiColumnList"   Renderer="Falagard/MultiColumnList"   LookNFeel="TaharezLook/MultiColumnList" />
+    <FalagardMapping WindowType="Vanilla/PopupMenu"                TargetType="CEGUI/PopupMenu"         Renderer="Falagard/PopupMenu"         LookNFeel="TaharezLook/PopupMenu" />
+    <FalagardMapping WindowType="Vanilla/ProgressBar"              TargetType="CEGUI/ProgressBar"       Renderer="Falagard/ProgressBar"       LookNFeel="TaharezLook/ProgressBar" />
+    <FalagardMapping WindowType="Vanilla/ImageButton"              TargetType="CEGUI/PushButton"        Renderer="Falagard/Button"            LookNFeel="TaharezLook/ImageButton" />
+    <FalagardMapping WindowType="Vanilla/RadioButton"              TargetType="CEGUI/RadioButton"       Renderer="Falagard/ToggleButton"      LookNFeel="TaharezLook/RadioButton" />
+    <FalagardMapping WindowType="Vanilla/SystemButton"             TargetType="CEGUI/PushButton"        Renderer="Falagard/SystemButton"      LookNFeel="TaharezLook/Button" />
+    <FalagardMapping WindowType="Vanilla/ScrollablePane"           TargetType="CEGUI/ScrollablePane"    Renderer="Falagard/ScrollablePane"    LookNFeel="TaharezLook/ScrollablePane" />
+    <FalagardMapping WindowType="Vanilla/Slider"                   TargetType="CEGUI/Slider"            Renderer="Falagard/Slider"            LookNFeel="TaharezLook/Slider" />
+    <FalagardMapping WindowType="Vanilla/Spinner"                  TargetType="CEGUI/Spinner"           Renderer="Falagard/Default"           LookNFeel="TaharezLook/Spinner" />
+    <FalagardMapping WindowType="Vanilla/TabButton"                TargetType="CEGUI/TabButton"         Renderer="Falagard/TabButton"         LookNFeel="TaharezLook/TabButton" />
+    <FalagardMapping WindowType="Vanilla/TabControl"               TargetType="CEGUI/TabControl"        Renderer="Falagard/TabControl"        LookNFeel="TaharezLook/TabControl" />
+    <FalagardMapping WindowType="Vanilla/SliderThumb"              TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="TaharezLook/SliderThumb" />
+    <FalagardMapping WindowType="Vanilla/Tooltip"                  TargetType="CEGUI/Tooltip"           Renderer="Falagard/Tooltip"           LookNFeel="TaharezLook/Tooltip" />
+    <FalagardMapping WindowType="Vanilla/Tree"                     TargetType="CEGUI/Tree"              Renderer="Falagard/Tree"              LookNFeel="TaharezLook/Tree" />
+    
+    <!-- Additional widgets -->
+</GUIScheme>
Index: /code/branches/gamestates2/data/gui/schemes/VanillaMenuWidgets.scheme
===================================================================
--- /code/branches/gamestates2/data/gui/schemes/VanillaMenuWidgets.scheme	(revision 6595)
+++ /code/branches/gamestates2/data/gui/schemes/VanillaMenuWidgets.scheme	(revision 6595)
@@ -0,0 +1,42 @@
+<?xml version="1.0" ?>
+<GUIScheme Name="VanillaMenuWidgets">
+    <WindowAlias Alias="MenuWidgets/StaticImage"              Target="Vanilla/StaticImage" />
+    <WindowAlias Alias="MenuWidgets/StaticText"               Target="Vanilla/StaticText" />
+    <WindowAlias Alias="MenuWidgets/TabButtonPane"            Target="Vanilla/TabButtonPane" />
+    <WindowAlias Alias="MenuWidgets/TabContentPane"           Target="Vanilla/TabContentPane" />
+    <WindowAlias Alias="MenuWidgets/Checkbox"                 Target="Vanilla/Checkbox" />
+    <WindowAlias Alias="MenuWidgets/Combobox"                 Target="Vanilla/Combobox" />
+    <WindowAlias Alias="MenuWidgets/ComboDropList"            Target="Vanilla/ComboDropList" />
+    <WindowAlias Alias="MenuWidgets/ComboEditbox"             Target="Vanilla/ComboEditbox" />
+    <WindowAlias Alias="MenuWidgets/Editbox"                  Target="Vanilla/Editbox" />
+    <WindowAlias Alias="MenuWidgets/FrameWindow"              Target="Vanilla/FrameWindow" />
+    <WindowAlias Alias="MenuWidgets/GroupBox"                 Target="Vanilla/GroupBox" />
+    <WindowAlias Alias="MenuWidgets/ItemListbox"              Target="Vanilla/ItemListbox" />
+    <WindowAlias Alias="MenuWidgets/ListboxItem"              Target="Vanilla/ListboxItem" />
+    <WindowAlias Alias="MenuWidgets/Listbox"                  Target="Vanilla/Listbox" />
+    <WindowAlias Alias="MenuWidgets/ListHeader"               Target="Vanilla/ListHeader" />
+    <WindowAlias Alias="MenuWidgets/ListHeaderSegment"        Target="Vanilla/ListHeaderSegment" />
+    <WindowAlias Alias="MenuWidgets/MultiLineEditbox"         Target="Vanilla/MultiLineEditbox" />
+    <WindowAlias Alias="MenuWidgets/Menubar"                  Target="Vanilla/Menubar" />
+    <WindowAlias Alias="MenuWidgets/MenuItem"                 Target="Vanilla/MenuItem" />
+    <WindowAlias Alias="MenuWidgets/MultiColumnList"          Target="Vanilla/MultiColumnList" />
+    <WindowAlias Alias="MenuWidgets/PopupMenu"                Target="Vanilla/PopupMenu" />
+    <WindowAlias Alias="MenuWidgets/ProgressBar"              Target="Vanilla/ProgressBar" />
+    <WindowAlias Alias="MenuWidgets/Button"                   Target="Vanilla/Button" />
+    <WindowAlias Alias="MenuWidgets/ImageButton"              Target="Vanilla/ImageButton" />
+    <WindowAlias Alias="MenuWidgets/RadioButton"              Target="Vanilla/RadioButton" />
+    <WindowAlias Alias="MenuWidgets/SystemButton"             Target="Vanilla/SystemButton" />
+    <WindowAlias Alias="MenuWidgets/ScrollablePane"           Target="Vanilla/ScrollablePane" />
+    <WindowAlias Alias="MenuWidgets/HorizontalScrollbar"      Target="Vanilla/HorizontalScrollbar" />
+    <WindowAlias Alias="MenuWidgets/VerticalScrollbar"        Target="Vanilla/VerticalScrollbar" />
+    <WindowAlias Alias="MenuWidgets/Slider"                   Target="Vanilla/Slider" />
+    <WindowAlias Alias="MenuWidgets/Spinner"                  Target="Vanilla/Spinner" />
+    <WindowAlias Alias="MenuWidgets/TabButton"                Target="Vanilla/TabButton" />
+    <WindowAlias Alias="MenuWidgets/TabControl"               Target="Vanilla/TabControl" />
+    <WindowAlias Alias="MenuWidgets/HorizontalScrollbarThumb" Target="Vanilla/HorizontalScrollbarThumb" />
+    <WindowAlias Alias="MenuWidgets/SliderThumb"              Target="Vanilla/SliderThumb" />
+    <WindowAlias Alias="MenuWidgets/VerticalScrollbarThumb"   Target="Vanilla/VerticalScrollbarThumb" />
+    <WindowAlias Alias="MenuWidgets/Titlebar"                 Target="Vanilla/Titlebar" />
+    <WindowAlias Alias="MenuWidgets/Tooltip"                  Target="Vanilla/Tooltip" />
+    <WindowAlias Alias="MenuWidgets/Tree"                     Target="Vanilla/Tree" />
+</GUIScheme>
Index: de/branches/gamestates2/data/gui/schemes/VanillaSkin.scheme
===================================================================
--- /code/branches/gamestates2/data/gui/schemes/VanillaSkin.scheme	(revision 6594)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" ?>
-<GUIScheme Name="VanillaSkin">
-	<Imageset Name="Vanilla-Images" Filename="Vanilla.imageset" />
-	<LookNFeel Filename="Vanilla.looknfeel" />
-	<WindowRendererSet Filename="CEGUIFalagardWRBase" />
-	<FalagardMapping WindowType="Vanilla/Titlebar" TargetType="CEGUI/Titlebar" Renderer="Falagard/Titlebar" LookNFeel="Vanilla/Titlebar" />
-	<FalagardMapping WindowType="Vanilla/Button" TargetType="CEGUI/PushButton" Renderer="Falagard/Button" LookNFeel="Vanilla/Button" />
-	<FalagardMapping WindowType="Vanilla/FrameWindow" TargetType="CEGUI/FrameWindow" Renderer="Falagard/FrameWindow" LookNFeel="Vanilla/FrameWindow" />
-	<FalagardMapping WindowType="Vanilla/Editbox" TargetType="CEGUI/Editbox" Renderer="Falagard/Editbox" LookNFeel="Vanilla/Editbox" />
-	<FalagardMapping WindowType="Vanilla/VerticalScrollbarThumb" TargetType="CEGUI/Thumb" Renderer="Falagard/Button" LookNFeel="Vanilla/VerticalScrollbarThumb" />
-	<FalagardMapping WindowType="Vanilla/VerticalScrollbar" TargetType="CEGUI/Scrollbar" Renderer="Falagard/Scrollbar" LookNFeel="Vanilla/VerticalScrollbar" />
-	<FalagardMapping WindowType="Vanilla/HorizontalScrollbarThumb" TargetType="CEGUI/Thumb" Renderer="Falagard/Button" LookNFeel="Vanilla/HorizontalScrollbarThumb" />
-	<FalagardMapping WindowType="Vanilla/HorizontalScrollbar" TargetType="CEGUI/Scrollbar" Renderer="Falagard/Scrollbar" LookNFeel="Vanilla/HorizontalScrollbar" />
-	<FalagardMapping WindowType="Vanilla/StaticImage" TargetType="DefaultWindow" Renderer="Falagard/StaticImage" LookNFeel="Vanilla/StaticImage" />
-	<FalagardMapping WindowType="Vanilla/StaticText" TargetType="DefaultWindow" Renderer="Falagard/StaticText" LookNFeel="Vanilla/StaticText" />
-	<FalagardMapping WindowType="Vanilla/Listbox" TargetType="CEGUI/Listbox" Renderer="Falagard/Listbox" LookNFeel="Vanilla/Listbox" />
-	<FalagardMapping WindowType="Vanilla/MultiLineEditbox" TargetType="CEGUI/MultiLineEditbox" Renderer="Falagard/MultiLineEditbox" LookNFeel="Vanilla/MultiLineEditbox" />
-<!--	
-	<FalagardMapping WindowType="Vanilla/ComboDropList" TargetType="Falagard/ComboDropList" LookNFeel="Vanilla/ComboDropList" />
-	<FalagardMapping WindowType="Vanilla/ComboboxButton" TargetType="Falagard/Button" LookNFeel="Vanilla/ComboboxButton" />
-	<FalagardMapping WindowType="Vanilla/Combobox" TargetType="Falagard/Combobox" LookNFeel="Vanilla/Combobox" />
-	<FalagardMapping WindowType="Vanilla/ProgressBar" TargetType="Falagard/ProgressBar" LookNFeel="Vanilla/ProgressBar" />
-	<FalagardMapping WindowType="Vanilla/ScrollablePane" TargetType="Falagard/ScrollablePane" LookNFeel="Vanilla/ScrollablePane" />
-	<FalagardMapping WindowType="Vanilla/Checkbox" TargetType="Falagard/Checkbox" LookNFeel="Vanilla/Checkbox" />
-	<FalagardMapping WindowType="Vanilla/RadioButton" TargetType="Falagard/RadioButton" LookNFeel="Vanilla/RadioButton" />
-	<FalagardMapping WindowType="Vanilla/ScrollablePane" TargetType="Falagard/ScrollablePane" LookNFeel="Vanilla/ScrollablePane" />
--->
-</GUIScheme>
Index: /code/branches/gamestates2/data/gui/schemes/WindowsHUDWidgets.scheme
===================================================================
--- /code/branches/gamestates2/data/gui/schemes/WindowsHUDWidgets.scheme	(revision 6595)
+++ /code/branches/gamestates2/data/gui/schemes/WindowsHUDWidgets.scheme	(revision 6595)
@@ -0,0 +1,42 @@
+<?xml version="1.0" ?>
+<GUIScheme Name="WindowsHUDWidgets">
+    <WindowAlias Alias="HUDWidgets/StaticImage"              Target="WindowsLook/StaticImage" />
+    <WindowAlias Alias="HUDWidgets/StaticText"               Target="WindowsLook/StaticText" />
+    <WindowAlias Alias="HUDWidgets/TabButtonPane"            Target="WindowsLook/TabButtonPane" />
+    <WindowAlias Alias="HUDWidgets/TabContentPane"           Target="WindowsLook/TabContentPane" />
+    <WindowAlias Alias="HUDWidgets/Checkbox"                 Target="WindowsLook/Checkbox" />
+    <WindowAlias Alias="HUDWidgets/Combobox"                 Target="WindowsLook/Combobox" />
+    <WindowAlias Alias="HUDWidgets/ComboDropList"            Target="WindowsLook/ComboDropList" />
+    <WindowAlias Alias="HUDWidgets/ComboEditbox"             Target="WindowsLook/ComboEditbox" />
+    <WindowAlias Alias="HUDWidgets/Editbox"                  Target="WindowsLook/Editbox" />
+    <WindowAlias Alias="HUDWidgets/FrameWindow"              Target="WindowsLook/FrameWindow" />
+    <WindowAlias Alias="HUDWidgets/GroupBox"                 Target="WindowsLook/GroupBox" />
+    <WindowAlias Alias="HUDWidgets/ItemListbox"              Target="WindowsLook/ItemListbox" />
+    <WindowAlias Alias="HUDWidgets/ListboxItem"              Target="WindowsLook/ListboxItem" />
+    <WindowAlias Alias="HUDWidgets/Listbox"                  Target="WindowsLook/Listbox" />
+    <WindowAlias Alias="HUDWidgets/ListHeader"               Target="WindowsLook/ListHeader" />
+    <WindowAlias Alias="HUDWidgets/ListHeaderSegment"        Target="WindowsLook/ListHeaderSegment" />
+    <WindowAlias Alias="HUDWidgets/MultiLineEditbox"         Target="WindowsLook/MultiLineEditbox" />
+    <WindowAlias Alias="HUDWidgets/Menubar"                  Target="WindowsLook/Menubar" />
+    <WindowAlias Alias="HUDWidgets/MenuItem"                 Target="WindowsLook/MenuItem" />
+    <WindowAlias Alias="HUDWidgets/MultiColumnList"          Target="WindowsLook/MultiColumnList" />
+    <WindowAlias Alias="HUDWidgets/PopupMenu"                Target="WindowsLook/PopupMenu" />
+    <WindowAlias Alias="HUDWidgets/ProgressBar"              Target="WindowsLook/ProgressBar" />
+    <WindowAlias Alias="HUDWidgets/Button"                   Target="WindowsLook/Button" />
+    <WindowAlias Alias="HUDWidgets/ImageButton"              Target="WindowsLook/ImageButton" />
+    <WindowAlias Alias="HUDWidgets/RadioButton"              Target="WindowsLook/RadioButton" />
+    <WindowAlias Alias="HUDWidgets/SystemButton"             Target="WindowsLook/SystemButton" />
+    <WindowAlias Alias="HUDWidgets/ScrollablePane"           Target="WindowsLook/ScrollablePane" />
+    <WindowAlias Alias="HUDWidgets/HorizontalScrollbar"      Target="WindowsLook/HorizontalScrollbar" />
+    <WindowAlias Alias="HUDWidgets/VerticalScrollbar"        Target="WindowsLook/VerticalScrollbar" />
+    <WindowAlias Alias="HUDWidgets/Slider"                   Target="WindowsLook/Slider" />
+    <WindowAlias Alias="HUDWidgets/Spinner"                  Target="WindowsLook/Spinner" />
+    <WindowAlias Alias="HUDWidgets/TabButton"                Target="WindowsLook/TabButton" />
+    <WindowAlias Alias="HUDWidgets/TabControl"               Target="WindowsLook/TabControl" />
+    <WindowAlias Alias="HUDWidgets/HorizontalScrollbarThumb" Target="WindowsLook/HorizontalScrollbarThumb" />
+    <WindowAlias Alias="HUDWidgets/SliderThumb"              Target="WindowsLook/SliderThumb" />
+    <WindowAlias Alias="HUDWidgets/VerticalScrollbarThumb"   Target="WindowsLook/VerticalScrollbarThumb" />
+    <WindowAlias Alias="HUDWidgets/Titlebar"                 Target="WindowsLook/Titlebar" />
+    <WindowAlias Alias="HUDWidgets/Tooltip"                  Target="WindowsLook/Tooltip" />
+    <WindowAlias Alias="HUDWidgets/Tree"                     Target="WindowsLook/Tree" />
+</GUIScheme>
Index: /code/branches/gamestates2/data/gui/schemes/WindowsLook.scheme
===================================================================
--- /code/branches/gamestates2/data/gui/schemes/WindowsLook.scheme	(revision 6594)
+++ /code/branches/gamestates2/data/gui/schemes/WindowsLook.scheme	(revision 6595)
@@ -1,44 +1,55 @@
 <?xml version="1.0" ?>
-<GUIScheme Name="WindowsLookSkin">
-	<Imageset Name="WindowsLook" Filename="WindowsLook.imageset" />
-	<LookNFeel Filename="WindowsLook.looknfeel" />
-	<WindowSet Filename="CEGUIFalagardWRBase" />
-	<FalagardMapping WindowType="WindowsLook/Button"      TargetType="CEGUI/PushButton"  Renderer="Falagard/Button"       LookNFeel="WindowsLook/Button" />
-	<FalagardMapping WindowType="WindowsLook/Checkbox"    TargetType="CEGUI/Checkbox"    Renderer="Falagard/ToggleButton" LookNFeel="WindowsLook/Checkbox" />
-	<FalagardMapping WindowType="WindowsLook/IconButton"  TargetType="CEGUI/PushButton"  Renderer="Falagard/Button"       LookNFeel="WindowsLook/IconButton" />
-	<FalagardMapping WindowType="WindowsLook/RadioButton" TargetType="CEGUI/RadioButton" Renderer="Falagard/ToggleButton" LookNFeel="WindowsLook/RadioButton" />
-	<FalagardMapping WindowType="WindowsLook/FrameWindow"  TargetType="CEGUI/FrameWindow" Renderer="Falagard/FrameWindow"  LookNFeel="WindowsLook/FrameWindow" />
-	<FalagardMapping WindowType="WindowsLook/Titlebar"     TargetType="CEGUI/Titlebar"    Renderer="Falagard/Titlebar"     LookNFeel="WindowsLook/Titlebar" />
-	<FalagardMapping WindowType="WindowsLook/SystemButton" TargetType="CEGUI/PushButton"  Renderer="Falagard/SystemButton" LookNFeel="WindowsLook/SystemButton" />
-	<FalagardMapping WindowType="WindowsLook/Editbox"          TargetType="CEGUI/Editbox"          Renderer="Falagard/Editbox"          LookNFeel="WindowsLook/Editbox" />
-	<FalagardMapping WindowType="WindowsLook/MultiLineEditbox" TargetType="CEGUI/MultiLineEditbox" Renderer="Falagard/MultiLineEditbox" LookNFeel="WindowsLook/MultiLineEditbox" />
-	<FalagardMapping WindowType="WindowsLook/Menubar"   TargetType="CEGUI/Menubar"   Renderer="Falagard/Menubar"   LookNFeel="WindowsLook/Menubar" />
-	<FalagardMapping WindowType="WindowsLook/PopupMenu" TargetType="CEGUI/PopupMenu" Renderer="Falagard/PopupMenu" LookNFeel="WindowsLook/PopupMenu" />
-	<FalagardMapping WindowType="WindowsLook/MenuItem"  TargetType="CEGUI/MenuItem"  Renderer="Falagard/MenuItem"  LookNFeel="WindowsLook/MenuItem" />
-	<FalagardMapping WindowType="WindowsLook/ProgressBar"          TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="WindowsLook/ProgressBar" />
-	<FalagardMapping WindowType="WindowsLook/VerticalScrollbar"   TargetType="CEGUI/Scrollbar" Renderer="Falagard/Scrollbar" LookNFeel="WindowsLook/VerticalScrollbar" />
-	<FalagardMapping WindowType="WindowsLook/HorizontalScrollbar" TargetType="CEGUI/Scrollbar" Renderer="Falagard/Scrollbar" LookNFeel="WindowsLook/HorizontalScrollbar" />
-	<FalagardMapping WindowType="WindowsLook/VerticalScrollbarThumb"   TargetType="CEGUI/Thumb" Renderer="Falagard/Button" LookNFeel="WindowsLook/VerticalScrollbarThumb" />
-	<FalagardMapping WindowType="WindowsLook/HorizontalScrollbarThumb" TargetType="CEGUI/Thumb" Renderer="Falagard/Button" LookNFeel="WindowsLook/HorizontalScrollbarThumb" />
-	<FalagardMapping WindowType="WindowsLook/TabButton"  TargetType="CEGUI/TabButton"  Renderer="Falagard/TabButton"  LookNFeel="WindowsLook/TabButton" />
-	<FalagardMapping WindowType="WindowsLook/TabControl" TargetType="CEGUI/TabControl" Renderer="Falagard/TabControl" LookNFeel="WindowsLook/TabControl" />
-	<FalagardMapping WindowType="WindowsLook/TabContentPane"    TargetType="DefaultWindow"    Renderer="Falagard/Default"    LookNFeel="WindowsLook/TabContentPane" />
-	<FalagardMapping WindowType="WindowsLook/TabButtonPane"    TargetType="DefaultWindow"    Renderer="Falagard/Default"    LookNFeel="WindowsLook/TabButtonPane" />
-	<FalagardMapping WindowType="WindowsLook/ComboDropList" TargetType="CEGUI/ComboDropList" Renderer="Falagard/Listbox" LookNFeel="WindowsLook/ComboDropList" />
-	<FalagardMapping WindowType="WindowsLook/Combobox"	TargetType="CEGUI/Combobox"	 Renderer="Falagard/Default" LookNFeel="WindowsLook/Combobox" />
-	<FalagardMapping WindowType="WindowsLook/Listbox"           TargetType="CEGUI/Listbox"           Renderer="Falagard/Listbox"           LookNFeel="WindowsLook/Listbox" />
-	<FalagardMapping WindowType="WindowsLook/ListHeader"        TargetType="CEGUI/ListHeader"        Renderer="Falagard/ListHeader"        LookNFeel="WindowsLook/ListHeader" />
-	<FalagardMapping WindowType="WindowsLook/ListHeaderSegment" TargetType="CEGUI/ListHeaderSegment" Renderer="Falagard/ListHeaderSegment" LookNFeel="WindowsLook/ListHeaderSegment" />
-	<FalagardMapping WindowType="WindowsLook/MultiColumnList"   TargetType="CEGUI/MultiColumnList"   Renderer="Falagard/MultiColumnList"   LookNFeel="WindowsLook/MultiColumnList" />
-	<FalagardMapping WindowType="WindowsLook/Slider"      TargetType="CEGUI/Slider" Renderer="Falagard/Slider"  LookNFeel="WindowsLook/Slider" />
-	<FalagardMapping WindowType="WindowsLook/SliderThumb" TargetType="CEGUI/Thumb"  Renderer="Falagard/Button"  LookNFeel="WindowsLook/SliderThumb" />
-	<FalagardMapping WindowType="WindowsLook/ScrollablePane" TargetType="CEGUI/ScrollablePane" Renderer="Falagard/ScrollablePane" LookNFeel="WindowsLook/ScrollablePane" />
-	<FalagardMapping WindowType="WindowsLook/Spinner" TargetType="CEGUI/Spinner" Renderer="Falagard/Default" LookNFeel="WindowsLook/Spinner" />
-	<FalagardMapping WindowType="WindowsLook/Tooltip" TargetType="CEGUI/Tooltip" Renderer="Falagard/Tooltip" LookNFeel="WindowsLook/Tooltip" />
-	<FalagardMapping WindowType="WindowsLook/Static"      TargetType="DefaultWindow" Renderer="Falagard/Static"      LookNFeel="WindowsLook/Static" />
-	<FalagardMapping WindowType="WindowsLook/StaticImage" TargetType="DefaultWindow" Renderer="Falagard/StaticImage" LookNFeel="WindowsLook/StaticImage" />
-	<FalagardMapping WindowType="WindowsLook/StaticText"  TargetType="DefaultWindow" Renderer="Falagard/StaticText"  LookNFeel="WindowsLook/StaticText" />
-	<FalagardMapping WindowType="WindowsLook/ItemListbox" TargetType="CEGUI/ItemListbox" Renderer="Falagard/ItemListbox" LookNFeel="WindowsLook/ItemListbox" />
-	<FalagardMapping WindowType="WindowsLook/ListboxItem" TargetType="CEGUI/ItemEntry"   Renderer="Falagard/ItemEntry"   LookNFeel="WindowsLook/ListboxItem" />
-	<FalagardMapping WindowType="WindowsLook/GroupBox" TargetType="CEGUI/GroupBox"   Renderer="Falagard/Default"   LookNFeel="WindowsLook/GroupBox" />
+<GUIScheme Name="WindowsLook">
+    <Imageset Name="WindowsLook" Filename="WindowsLook.imageset" />
+    <Imageset Name="TaharezLook" Filename="TaharezLook.imageset" />
+    <LookNFeel Filename="WindowsLook.looknfeel" />
+    <LookNFeel Filename="TaharezLook.looknfeel" />
+    <WindowRendererSet Filename="CEGUIFalagardWRBase" />
+
+    <!-- Standard widgets -->
+    <FalagardMapping WindowType="WindowsLook/StaticImage"                 TargetType="DefaultWindow"           Renderer="Falagard/StaticImage"       LookNFeel="WindowsLook/StaticImage" />
+    <FalagardMapping WindowType="WindowsLook/StaticText"                  TargetType="DefaultWindow"           Renderer="Falagard/StaticText"        LookNFeel="WindowsLook/StaticText" />
+    <FalagardMapping WindowType="WindowsLook/TabButtonPane"               TargetType="DefaultWindow"           Renderer="Falagard/Default"           LookNFeel="WindowsLook/TabButtonPane" />
+    <FalagardMapping WindowType="WindowsLook/TabContentPane"              TargetType="DefaultWindow"           Renderer="Falagard/Default"           LookNFeel="WindowsLook/TabContentPane" />
+    <FalagardMapping WindowType="WindowsLook/Checkbox"                    TargetType="CEGUI/Checkbox"          Renderer="Falagard/ToggleButton"      LookNFeel="WindowsLook/Checkbox" />
+    <FalagardMapping WindowType="WindowsLook/Combobox"                    TargetType="CEGUI/Combobox"          Renderer="Falagard/Default"           LookNFeel="WindowsLook/Combobox" />
+    <FalagardMapping WindowType="WindowsLook/ComboDropList"               TargetType="CEGUI/ComboDropList"     Renderer="Falagard/Listbox"           LookNFeel="WindowsLook/ComboDropList" />
+    <FalagardMapping WindowType="WindowsLook/Editbox"                     TargetType="CEGUI/Editbox"           Renderer="Falagard/Editbox"           LookNFeel="WindowsLook/Editbox" />
+    <FalagardMapping WindowType="WindowsLook/FrameWindow"                 TargetType="CEGUI/FrameWindow"       Renderer="Falagard/FrameWindow"       LookNFeel="WindowsLook/FrameWindow" />
+    <FalagardMapping WindowType="WindowsLook/GroupBox"                    TargetType="CEGUI/GroupBox"          Renderer="Falagard/Default"           LookNFeel="WindowsLook/GroupBox" />
+    <FalagardMapping WindowType="WindowsLook/ItemListbox"                 TargetType="CEGUI/ItemListbox"       Renderer="Falagard/ItemListbox"       LookNFeel="WindowsLook/ItemListbox" />
+    <FalagardMapping WindowType="WindowsLook/ListboxItem"                 TargetType="CEGUI/ItemEntry"         Renderer="Falagard/ItemEntry"         LookNFeel="WindowsLook/ListboxItem" />
+    <FalagardMapping WindowType="WindowsLook/Listbox"                     TargetType="CEGUI/Listbox"           Renderer="Falagard/Listbox"           LookNFeel="WindowsLook/Listbox" />
+    <FalagardMapping WindowType="WindowsLook/ListHeader"                  TargetType="CEGUI/ListHeader"        Renderer="Falagard/ListHeader"        LookNFeel="WindowsLook/ListHeader" />
+    <FalagardMapping WindowType="WindowsLook/ListHeaderSegment"           TargetType="CEGUI/ListHeaderSegment" Renderer="Falagard/ListHeaderSegment" LookNFeel="WindowsLook/ListHeaderSegment" />
+    <FalagardMapping WindowType="WindowsLook/MultiLineEditbox"            TargetType="CEGUI/MultiLineEditbox"  Renderer="Falagard/MultiLineEditbox"  LookNFeel="WindowsLook/MultiLineEditbox" />
+    <FalagardMapping WindowType="WindowsLook/Menubar"                     TargetType="CEGUI/Menubar"           Renderer="Falagard/Menubar"           LookNFeel="WindowsLook/Menubar" />
+    <FalagardMapping WindowType="WindowsLook/MenuItem"                    TargetType="CEGUI/MenuItem"          Renderer="Falagard/MenuItem"          LookNFeel="WindowsLook/MenuItem" />
+    <FalagardMapping WindowType="WindowsLook/MultiColumnList"             TargetType="CEGUI/MultiColumnList"   Renderer="Falagard/MultiColumnList"   LookNFeel="WindowsLook/MultiColumnList" />
+    <FalagardMapping WindowType="WindowsLook/PopupMenu"                   TargetType="CEGUI/PopupMenu"         Renderer="Falagard/PopupMenu"         LookNFeel="WindowsLook/PopupMenu" />
+    <FalagardMapping WindowType="WindowsLook/ProgressBar"                 TargetType="CEGUI/ProgressBar"       Renderer="Falagard/ProgressBar"       LookNFeel="WindowsLook/ProgressBar" />
+    <FalagardMapping WindowType="WindowsLook/Button"                      TargetType="CEGUI/PushButton"        Renderer="Falagard/Button"            LookNFeel="WindowsLook/Button" />
+    <FalagardMapping WindowType="WindowsLook/RadioButton"                 TargetType="CEGUI/RadioButton"       Renderer="Falagard/ToggleButton"      LookNFeel="WindowsLook/RadioButton" />
+    <FalagardMapping WindowType="WindowsLook/SystemButton"                TargetType="CEGUI/PushButton"        Renderer="Falagard/SystemButton"      LookNFeel="WindowsLook/Button" />
+    <FalagardMapping WindowType="WindowsLook/ScrollablePane"              TargetType="CEGUI/ScrollablePane"    Renderer="Falagard/ScrollablePane"    LookNFeel="WindowsLook/ScrollablePane" />
+    <FalagardMapping WindowType="WindowsLook/HorizontalScrollbar"         TargetType="CEGUI/Scrollbar"         Renderer="Falagard/Scrollbar"         LookNFeel="WindowsLook/HorizontalScrollbar" />
+    <FalagardMapping WindowType="WindowsLook/VerticalScrollbar"           TargetType="CEGUI/Scrollbar"         Renderer="Falagard/Scrollbar"         LookNFeel="WindowsLook/VerticalScrollbar" />
+    <FalagardMapping WindowType="WindowsLook/Slider"                      TargetType="CEGUI/Slider"            Renderer="Falagard/Slider"            LookNFeel="WindowsLook/Slider" />
+    <FalagardMapping WindowType="WindowsLook/Spinner"                     TargetType="CEGUI/Spinner"           Renderer="Falagard/Default"           LookNFeel="WindowsLook/Spinner" />
+    <FalagardMapping WindowType="WindowsLook/TabButton"                   TargetType="CEGUI/TabButton"         Renderer="Falagard/TabButton"         LookNFeel="WindowsLook/TabButton" />
+    <FalagardMapping WindowType="WindowsLook/TabControl"                  TargetType="CEGUI/TabControl"        Renderer="Falagard/TabControl"        LookNFeel="WindowsLook/TabControl" />
+    <FalagardMapping WindowType="WindowsLook/HorizontalScrollbarThumb"    TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="WindowsLook/HorizontalScrollbarThumb" />
+    <FalagardMapping WindowType="WindowsLook/SliderThumb"                 TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="WindowsLook/SliderThumb" />
+    <FalagardMapping WindowType="WindowsLook/VerticalScrollbarThumb"      TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="WindowsLook/VerticalScrollbarThumb" />
+    <FalagardMapping WindowType="WindowsLook/Titlebar"                    TargetType="CEGUI/Titlebar"          Renderer="Falagard/Titlebar"          LookNFeel="WindowsLook/Titlebar" />
+    <FalagardMapping WindowType="WindowsLook/Tooltip"                     TargetType="CEGUI/Tooltip"           Renderer="Falagard/Tooltip"           LookNFeel="WindowsLook/Tooltip" />
+    
+    <!-- Missing widgets (using Taharez LookNFeel) -->
+    <FalagardMapping WindowType="WindowsLook/ComboEditbox"                TargetType="CEGUI/Editbox"           Renderer="Falagard/Editbox"           LookNFeel="TaharezLook/ComboEditbox" />
+    <FalagardMapping WindowType="WindowsLook/ImageButton"                 TargetType="CEGUI/PushButton"        Renderer="Falagard/Button"            LookNFeel="TaharezLook/ImageButton" />
+    <FalagardMapping WindowType="WindowsLook/Tree"                        TargetType="CEGUI/Tree"              Renderer="Falagard/Tree"              LookNFeel="TaharezLook/Tree" />
+
+    <!-- Additional widgets -->
+    <FalagardMapping WindowType="WindowsLook/IconButton"                  TargetType="CEGUI/PushButton"        Renderer="Falagard/Button"            LookNFeel="WindowsLook/IconButton" />
+    <FalagardMapping WindowType="WindowsLook/Static"                      TargetType="DefaultWindow"           Renderer="Falagard/Static"            LookNFeel="WindowsLook/Static" />
 </GUIScheme>
Index: de/branches/gamestates2/data/gui/schemes/WindowsLookWidgets.scheme
===================================================================
--- /code/branches/gamestates2/data/gui/schemes/WindowsLookWidgets.scheme	(revision 6594)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" ?>
-<GUIScheme Name="WindowsLookWidgets">
-	<WindowSet Filename="CEGUIFalagardWRBase" />
-    <FalagardMapping WindowType="WindowsLook/Button"      TargetType="CEGUI/PushButton"  Renderer="Falagard/Button"       LookNFeel="WindowsLook/Button" />
-	<FalagardMapping WindowType="WindowsLook/Checkbox"    TargetType="CEGUI/Checkbox"    Renderer="Falagard/ToggleButton" LookNFeel="WindowsLook/Checkbox" />
-	<FalagardMapping WindowType="WindowsLook/IconButton"  TargetType="CEGUI/PushButton"  Renderer="Falagard/Button"       LookNFeel="WindowsLook/IconButton" />
-	<FalagardMapping WindowType="WindowsLook/RadioButton" TargetType="CEGUI/RadioButton" Renderer="Falagard/ToggleButton" LookNFeel="WindowsLook/RadioButton" />
-	<FalagardMapping WindowType="WindowsLook/FrameWindow"  TargetType="CEGUI/FrameWindow" Renderer="Falagard/FrameWindow"  LookNFeel="WindowsLook/FrameWindow" />
-	<FalagardMapping WindowType="WindowsLook/Titlebar"     TargetType="CEGUI/Titlebar"    Renderer="Falagard/Titlebar"     LookNFeel="WindowsLook/Titlebar" />
-	<FalagardMapping WindowType="WindowsLook/CloseButton" TargetType="CEGUI/PushButton"  Renderer="Falagard/SystemButton" LookNFeel="WindowsLook/CloseButton" />
-	<FalagardMapping WindowType="WindowsLook/Editbox"          TargetType="CEGUI/Editbox"          Renderer="Falagard/Editbox"          LookNFeel="WindowsLook/Editbox" />
-	<FalagardMapping WindowType="WindowsLook/MultiLineEditbox" TargetType="CEGUI/MultiLineEditbox" Renderer="Falagard/MultiLineEditbox" LookNFeel="WindowsLook/MultiLineEditbox" />
-	<FalagardMapping WindowType="WindowsLook/Menubar"   TargetType="CEGUI/Menubar"   Renderer="Falagard/Menubar"   LookNFeel="WindowsLook/Menubar" />
-	<FalagardMapping WindowType="WindowsLook/PopupMenu" TargetType="CEGUI/PopupMenu" Renderer="Falagard/PopupMenu" LookNFeel="WindowsLook/PopupMenu" />
-	<FalagardMapping WindowType="WindowsLook/MenuItem"  TargetType="CEGUI/MenuItem"  Renderer="Falagard/MenuItem"  LookNFeel="WindowsLook/MenuItem" />
-	<FalagardMapping WindowType="WindowsLook/ProgressBar"          TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="WindowsLook/ProgressBar" />
-	<FalagardMapping WindowType="WindowsLook/VerticalScrollbar"   TargetType="CEGUI/Scrollbar" Renderer="Falagard/Scrollbar" LookNFeel="WindowsLook/VerticalScrollbar" />
-	<FalagardMapping WindowType="WindowsLook/HorizontalScrollbar" TargetType="CEGUI/Scrollbar" Renderer="Falagard/Scrollbar" LookNFeel="WindowsLook/HorizontalScrollbar" />
-	<FalagardMapping WindowType="WindowsLook/VerticalScrollbarThumb"   TargetType="CEGUI/Thumb" Renderer="Falagard/Button" LookNFeel="WindowsLook/VerticalScrollbarThumb" />
-	<FalagardMapping WindowType="WindowsLook/HorizontalScrollbarThumb" TargetType="CEGUI/Thumb" Renderer="Falagard/Button" LookNFeel="WindowsLook/HorizontalScrollbarThumb" />
-	<FalagardMapping WindowType="WindowsLook/TabButton"  TargetType="CEGUI/TabButton"  Renderer="Falagard/TabButton"  LookNFeel="WindowsLook/TabButton" />
-	<FalagardMapping WindowType="WindowsLook/TabControl" TargetType="CEGUI/TabControl" Renderer="Falagard/TabControl" LookNFeel="WindowsLook/TabControl" />
-	<FalagardMapping WindowType="WindowsLook/TabContentPane"    TargetType="DefaultWindow"    Renderer="Falagard/Default"    LookNFeel="WindowsLook/TabContentPane" />
-	<FalagardMapping WindowType="WindowsLook/ComboDropList" TargetType="CEGUI/ComboDropList" Renderer="Falagard/Listbox" LookNFeel="WindowsLook/ComboDropList" />
-	<FalagardMapping WindowType="WindowsLook/Combobox"	TargetType="CEGUI/Combobox"	 Renderer="Falagard/Default" LookNFeel="WindowsLook/Combobox" />
-	<FalagardMapping WindowType="WindowsLook/Listbox"           TargetType="CEGUI/Listbox"           Renderer="Falagard/Listbox"           LookNFeel="WindowsLook/Listbox" />
-	<FalagardMapping WindowType="WindowsLook/ListHeader"        TargetType="CEGUI/ListHeader"        Renderer="Falagard/ListHeader"        LookNFeel="WindowsLook/ListHeader" />
-	<FalagardMapping WindowType="WindowsLook/ListHeaderSegment" TargetType="CEGUI/ListHeaderSegment" Renderer="Falagard/ListHeaderSegment" LookNFeel="WindowsLook/ListHeaderSegment" />
-	<FalagardMapping WindowType="WindowsLook/MultiColumnList"   TargetType="CEGUI/MultiColumnList"   Renderer="Falagard/MultiColumnList"   LookNFeel="WindowsLook/MultiColumnList" />
-	<FalagardMapping WindowType="WindowsLook/Slider"      TargetType="CEGUI/Slider" Renderer="Falagard/Slider"  LookNFeel="WindowsLook/Slider" />
-	<FalagardMapping WindowType="WindowsLook/SliderThumb" TargetType="CEGUI/Thumb"  Renderer="Falagard/Button"  LookNFeel="WindowsLook/SliderThumb" />
-	<FalagardMapping WindowType="WindowsLook/ScrollablePane" TargetType="CEGUI/ScrollablePane" Renderer="Falagard/ScrollablePane" LookNFeel="WindowsLook/ScrollablePane" />
-	<FalagardMapping WindowType="WindowsLook/Spinner" TargetType="CEGUI/Spinner" Renderer="Falagard/Default" LookNFeel="WindowsLook/Spinner" />
-	<FalagardMapping WindowType="WindowsLook/Tooltip" TargetType="CEGUI/Tooltip" Renderer="Falagard/Tooltip" LookNFeel="WindowsLook/Tooltip" />
-	<FalagardMapping WindowType="WindowsLook/Static"      TargetType="DefaultWindow" Renderer="Falagard/Static"      LookNFeel="WindowsLook/Static" />
-	<FalagardMapping WindowType="WindowsLook/StaticImage" TargetType="DefaultWindow" Renderer="Falagard/StaticImage" LookNFeel="WindowsLook/StaticImage" />
-	<FalagardMapping WindowType="WindowsLook/StaticText"  TargetType="DefaultWindow" Renderer="Falagard/StaticText"  LookNFeel="WindowsLook/StaticText" />
-	<FalagardMapping WindowType="WindowsLook/ItemListbox" TargetType="CEGUI/ItemListbox" Renderer="Falagard/ItemListbox" LookNFeel="WindowsLook/ItemListbox" />
-	<FalagardMapping WindowType="WindowsLook/ListboxItem" TargetType="CEGUI/ItemEntry"   Renderer="Falagard/ItemEntry"   LookNFeel="WindowsLook/ListboxItem" />
-	<FalagardMapping WindowType="WindowsLook/GroupBox" TargetType="CEGUI/GroupBox"   Renderer="Falagard/Default"   LookNFeel="WindowsLook/GroupBox" />
-</GUIScheme>
Index: /code/branches/gamestates2/data/gui/schemes/WindowsMenuWidgets.scheme
===================================================================
--- /code/branches/gamestates2/data/gui/schemes/WindowsMenuWidgets.scheme	(revision 6595)
+++ /code/branches/gamestates2/data/gui/schemes/WindowsMenuWidgets.scheme	(revision 6595)
@@ -0,0 +1,42 @@
+<?xml version="1.0" ?>
+<GUIScheme Name="WindowsMenuWidgets">
+    <WindowAlias Alias="MenuWidgets/StaticImage"              Target="WindowsLook/StaticImage" />
+    <WindowAlias Alias="MenuWidgets/StaticText"               Target="WindowsLook/StaticText" />
+    <WindowAlias Alias="MenuWidgets/TabButtonPane"            Target="WindowsLook/TabButtonPane" />
+    <WindowAlias Alias="MenuWidgets/TabContentPane"           Target="WindowsLook/TabContentPane" />
+    <WindowAlias Alias="MenuWidgets/Checkbox"                 Target="WindowsLook/Checkbox" />
+    <WindowAlias Alias="MenuWidgets/Combobox"                 Target="WindowsLook/Combobox" />
+    <WindowAlias Alias="MenuWidgets/ComboDropList"            Target="WindowsLook/ComboDropList" />
+    <WindowAlias Alias="MenuWidgets/ComboEditbox"             Target="WindowsLook/ComboEditbox" />
+    <WindowAlias Alias="MenuWidgets/Editbox"                  Target="WindowsLook/Editbox" />
+    <WindowAlias Alias="MenuWidgets/FrameWindow"              Target="WindowsLook/FrameWindow" />
+    <WindowAlias Alias="MenuWidgets/GroupBox"                 Target="WindowsLook/GroupBox" />
+    <WindowAlias Alias="MenuWidgets/ItemListbox"              Target="WindowsLook/ItemListbox" />
+    <WindowAlias Alias="MenuWidgets/ListboxItem"              Target="WindowsLook/ListboxItem" />
+    <WindowAlias Alias="MenuWidgets/Listbox"                  Target="WindowsLook/Listbox" />
+    <WindowAlias Alias="MenuWidgets/ListHeader"               Target="WindowsLook/ListHeader" />
+    <WindowAlias Alias="MenuWidgets/ListHeaderSegment"        Target="WindowsLook/ListHeaderSegment" />
+    <WindowAlias Alias="MenuWidgets/MultiLineEditbox"         Target="WindowsLook/MultiLineEditbox" />
+    <WindowAlias Alias="MenuWidgets/Menubar"                  Target="WindowsLook/Menubar" />
+    <WindowAlias Alias="MenuWidgets/MenuItem"                 Target="WindowsLook/MenuItem" />
+    <WindowAlias Alias="MenuWidgets/MultiColumnList"          Target="WindowsLook/MultiColumnList" />
+    <WindowAlias Alias="MenuWidgets/PopupMenu"                Target="WindowsLook/PopupMenu" />
+    <WindowAlias Alias="MenuWidgets/ProgressBar"              Target="WindowsLook/ProgressBar" />
+    <WindowAlias Alias="MenuWidgets/Button"                   Target="WindowsLook/Button" />
+    <WindowAlias Alias="MenuWidgets/ImageButton"              Target="WindowsLook/ImageButton" />
+    <WindowAlias Alias="MenuWidgets/RadioButton"              Target="WindowsLook/RadioButton" />
+    <WindowAlias Alias="MenuWidgets/SystemButton"             Target="WindowsLook/SystemButton" />
+    <WindowAlias Alias="MenuWidgets/ScrollablePane"           Target="WindowsLook/ScrollablePane" />
+    <WindowAlias Alias="MenuWidgets/HorizontalScrollbar"      Target="WindowsLook/HorizontalScrollbar" />
+    <WindowAlias Alias="MenuWidgets/VerticalScrollbar"        Target="WindowsLook/VerticalScrollbar" />
+    <WindowAlias Alias="MenuWidgets/Slider"                   Target="WindowsLook/Slider" />
+    <WindowAlias Alias="MenuWidgets/Spinner"                  Target="WindowsLook/Spinner" />
+    <WindowAlias Alias="MenuWidgets/TabButton"                Target="WindowsLook/TabButton" />
+    <WindowAlias Alias="MenuWidgets/TabControl"               Target="WindowsLook/TabControl" />
+    <WindowAlias Alias="MenuWidgets/HorizontalScrollbarThumb" Target="WindowsLook/HorizontalScrollbarThumb" />
+    <WindowAlias Alias="MenuWidgets/SliderThumb"              Target="WindowsLook/SliderThumb" />
+    <WindowAlias Alias="MenuWidgets/VerticalScrollbarThumb"   Target="WindowsLook/VerticalScrollbarThumb" />
+    <WindowAlias Alias="MenuWidgets/Titlebar"                 Target="WindowsLook/Titlebar" />
+    <WindowAlias Alias="MenuWidgets/Tooltip"                  Target="WindowsLook/Tooltip" />
+    <WindowAlias Alias="MenuWidgets/Tree"                     Target="WindowsLook/Tree" />
+</GUIScheme>
Index: /code/branches/gamestates2/data/gui/scripts/AudioMenu.lua
===================================================================
--- /code/branches/gamestates2/data/gui/scripts/AudioMenu.lua	(revision 6594)
+++ /code/branches/gamestates2/data/gui/scripts/AudioMenu.lua	(revision 6595)
@@ -2,5 +2,5 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("AudioMenu")
 if _REQUIREDNAME == nil then
     AudioMenu = P
@@ -8,7 +8,4 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "AudioMenu"
-P.layoutString = "AudioMenu.layout"
 
 function P:init()
@@ -43,5 +40,5 @@
     for k,v in pairs(themeList) do
         item = CEGUI.createListboxTextItem(v)
-        item:setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
         CEGUI.toListbox(listboxwindow):addItem(item)
     end
Index: /code/branches/gamestates2/data/gui/scripts/BasicGUI.lua
===================================================================
--- /code/branches/gamestates2/data/gui/scripts/BasicGUI.lua	(revision 6594)
+++ /code/branches/gamestates2/data/gui/scripts/BasicGUI.lua	(revision 6595)
@@ -8,9 +8,14 @@
 end
 
+-- useless, even wrong? P is the class, not the object..
 P.overlay = nil
 
 -- constructor of the GUI
-function P:new (gui, fname)
-    local newElement = { window = gui, filename = fname, visible = false } or {}
+function P:new(_filename, _gui, _visible)
+    local newElement = {
+        filename = _filename,
+        gui = _gui,
+        visible = _visible or false
+    } or {}
     setmetatable(newElement, self) -- connects new element with class
     self.__index = self
@@ -18,10 +23,16 @@
 end
 
+-- Override this function if you need to
 function P:init()
--- this function is empty and intended for inheriting GUIs to use
+end
+
+-- Override this function if you need to
+-- But don't forget to stick to the naming convention ("GUI_" .. self.filename)
+function P:createInputState()
+    self.inputState = guiMgr:createInputState("GUI_" .. self.filename)
 end
 
 -- hide function for the GUI
-function P:hide ()
+function P:hide()
     self.window:hide()
     self.visible = false
@@ -29,11 +40,12 @@
 
 -- show function for the GUI
-function P:show ()
+function P:show()
     self.window:show()
     self.visible = true
 end
 
-function P:load ()
-    self.window = winMgr:loadWindowLayout(self.layoutString)
+function P:load()
+    self.window = winMgr:loadWindowLayout(self.filename .. ".layout")
+    self:createInputState()
     self:init()
     return self
Index: /code/branches/gamestates2/data/gui/scripts/ControlsMenu.lua
===================================================================
--- /code/branches/gamestates2/data/gui/scripts/ControlsMenu.lua	(revision 6594)
+++ /code/branches/gamestates2/data/gui/scripts/ControlsMenu.lua	(revision 6595)
@@ -2,5 +2,5 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("ControlsMenu")
 if _REQUIREDNAME == nil then
     ControlsMenu = P
@@ -8,7 +8,4 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "ControlsMenu"
-P.layoutString = "ControlsMenu.layout"
 
 function P.ControlsMouseControlsButton_clicked(e)
Index: /code/branches/gamestates2/data/gui/scripts/CreditsMenu.lua
===================================================================
--- /code/branches/gamestates2/data/gui/scripts/CreditsMenu.lua	(revision 6594)
+++ /code/branches/gamestates2/data/gui/scripts/CreditsMenu.lua	(revision 6595)
@@ -2,5 +2,5 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("CreditsMenu")
 if _REQUIREDNAME == nil then
     CreditsMenu = P
@@ -8,7 +8,4 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "CreditsMenu"
-P.layoutString = "CreditsMenu.layout"
 
 function P.CreditsBackButton_clicked(e)
Index: /code/branches/gamestates2/data/gui/scripts/DecisionPopup.lua
===================================================================
--- /code/branches/gamestates2/data/gui/scripts/DecisionPopup.lua	(revision 6594)
+++ /code/branches/gamestates2/data/gui/scripts/DecisionPopup.lua	(revision 6595)
@@ -2,15 +2,9 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("DecisionPopup")
 if _REQUIREDNAME == nil then
     DecisionPopup = P
 else
     _G[_REQUIREDNAME] = P
-end
-
-P.filename = "DecisionPopup"
-P.layoutString = "DecisionPopup.layout"
-
-function P:init()
 end
 
Index: /code/branches/gamestates2/data/gui/scripts/GameplayMenu.lua
===================================================================
--- /code/branches/gamestates2/data/gui/scripts/GameplayMenu.lua	(revision 6594)
+++ /code/branches/gamestates2/data/gui/scripts/GameplayMenu.lua	(revision 6595)
@@ -2,5 +2,5 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("GameplayMenu")
 if _REQUIREDNAME == nil then
     GameplayMenu = P
@@ -8,7 +8,4 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "GameplayMenu"
-P.layoutString = "GameplayMenu.layout"
 
 function P:init()
@@ -20,5 +17,5 @@
     for k,v in pairs(themeList) do
         item = CEGUI.createListboxTextItem(v)
-        item:setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
         CEGUI.toCombobox(dropdown):addItem(item)
     end
Index: /code/branches/gamestates2/data/gui/scripts/GraphicsMenu.lua
===================================================================
--- /code/branches/gamestates2/data/gui/scripts/GraphicsMenu.lua	(revision 6594)
+++ /code/branches/gamestates2/data/gui/scripts/GraphicsMenu.lua	(revision 6595)
@@ -2,5 +2,5 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("GraphicsMenu")
 if _REQUIREDNAME == nil then
     GraphicsMenu = P
@@ -8,7 +8,4 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "GraphicsMenu"
-P.layoutString = "GraphicsMenu.layout"
 
 function P:init()
@@ -62,5 +59,5 @@
     for k,v in pairs(resolutionList) do
         item = CEGUI.createListboxTextItem(v)
-        item:setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
         CEGUI.toListbox(listboxwindow):addItem(item)
     end
Index: /code/branches/gamestates2/data/gui/scripts/InGameMenu.lua
===================================================================
--- /code/branches/gamestates2/data/gui/scripts/InGameMenu.lua	(revision 6594)
+++ /code/branches/gamestates2/data/gui/scripts/InGameMenu.lua	(revision 6595)
@@ -2,5 +2,5 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("InGameMenu")
 if _REQUIREDNAME == nil then
     InGameMenu = P
@@ -8,11 +8,4 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "InGameMenu"
-P.layoutString = "InGameMenu.layout"
-
-function P:init()
-end
-
 
 -- events for ingamemenu
Index: /code/branches/gamestates2/data/gui/scripts/InfoPopup.lua
===================================================================
--- /code/branches/gamestates2/data/gui/scripts/InfoPopup.lua	(revision 6594)
+++ /code/branches/gamestates2/data/gui/scripts/InfoPopup.lua	(revision 6595)
@@ -2,5 +2,5 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("InfoPopup")
 
 if _REQUIREDNAME == nil then
@@ -8,10 +8,4 @@
 else
     _G[_REQUIREDNAME] = P
-end
-
-P.filename = "InfoPopup"
-P.layoutString = "InfoPopup.layout"
-
-function P:init()
 end
 
@@ -26,5 +20,5 @@
 end
 
-function P.setText( text )
+function P.setText(text)
     winMgr:getWindow("orxonox/InfoPopup_text"):setText( text )
 end
@@ -42,5 +36,5 @@
 -- events for ingamemenu
 function P.close(e)
-    hideGUI("InfoPopup")
+    hideGUI(P.filename)
 end
 
Index: /code/branches/gamestates2/data/gui/scripts/InitialiseGUI.lua
===================================================================
--- /code/branches/gamestates2/data/gui/scripts/InitialiseGUI.lua	(revision 6594)
+++ /code/branches/gamestates2/data/gui/scripts/InitialiseGUI.lua	(revision 6595)
@@ -1,15 +1,31 @@
+winMgr   = CEGUI.WindowManager:getSingleton()
+guiMgr   = orxonox.GUIManager:getInstance()
+inputMgr = orxonox.InputManager:getInstance()
+
 local schemeMgr = CEGUI.SchemeManager:getSingleton()
-winMgr = CEGUI.WindowManager:getSingleton()
-local logger = CEGUI.Logger:getSingleton()
-local system = CEGUI.System:getSingleton()
-local cursor = CEGUI.MouseCursor:getSingleton()
-
-schemeMgr:loadScheme("TaharezLookSkin.scheme")
--- load scheme with our own images
+local system    = CEGUI.System:getSingleton()
+local cursor    = CEGUI.MouseCursor:getSingleton()
+
+-- Load all required skins
+schemeMgr:loadScheme("TaharezGreenLook.scheme")
+--schemeMgr:loadScheme("TaharezLook.scheme")
+--schemeMgr:loadScheme("WindowsLook.scheme")
+--schemeMgr:loadScheme("VanillaLook.scheme")
+--schemeMgr:loadScheme("SleekSpaceLook.scheme")
+
+-- Connect skin specific window types with our own window types
+-- By loading a different file (if there is) you can change the skin
+-- of the menus or the HUD independently
+schemeMgr:loadScheme("TaharezGreenMenuWidgets.scheme")
+menuImageSet = "TaharezGreenLook"
+schemeMgr:loadScheme("TaharezGreenHUDWidgets.scheme")
+hudImageSet = "TaharezGreenLook"
+
+-- Just a remaining test hack
 schemeMgr:loadScheme("OrxonoxGUIScheme.scheme")
 
-system:setDefaultMouseCursor("TaharezLook", "MouseArrow")
+system:setDefaultMouseCursor(menuImageSet, "MouseArrow")
 system:setDefaultFont("BlueHighway-12")
-system:setDefaultTooltip("TaharezLook/Tooltip")
+system:setDefaultTooltip("MenuWidgets/Tooltip")
 
 loadedGUIs = {}
@@ -51,6 +67,5 @@
 end
 
--- shows the specified and loads it if not loaded already
--- be sure to set the global variable "filename" before calling this function
+-- shows the specified GUI sheet and loads it if not loaded already
 function showGUI(filename, hidePrevious, bCursorVisible)
     if bCursorVisible == nil then
@@ -87,8 +102,10 @@
     else
         if nrOfActiveSheets == 0 then
-            orxonox.InputManager:getInstance():enterState("guiMouseOnly")
+            --orxonox.InputManager:getInstance():enterState("guiMouseOnly")
             orxonox.HumanController:pauseControl()
         end
     end
+    orxonox.InputManager:getInstance():enterState(currentGUI.inputState)
+
     nrOfActiveSheets = nrOfActiveSheets + 1
     table.insert(activeSheets, filename)
@@ -161,8 +178,9 @@
     bHidePrevious[filename] = nil
     if nrOfActiveSheets == 0 then
-        orxonox.InputManager:getInstance():leaveState("guiMouseOnly")
+        --orxonox.InputManager:getInstance():leaveState("guiMouseOnly")
         orxonox.HumanController:resumeControl()
         hideCursor()
     end
+    orxonox.InputManager:getInstance():leaveState(currentGUI.inputState)
 end
 
Index: /code/branches/gamestates2/data/gui/scripts/KeyBindMenu.lua
===================================================================
--- /code/branches/gamestates2/data/gui/scripts/KeyBindMenu.lua	(revision 6594)
+++ /code/branches/gamestates2/data/gui/scripts/KeyBindMenu.lua	(revision 6595)
@@ -2,5 +2,5 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("KeyBindMenu")
 
 if _REQUIREDNAME == nil then
@@ -9,7 +9,4 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "KeyBindMenu"
-P.layoutString = "KeyBindMenu.layout"
 
 function P:init()
@@ -68,5 +65,5 @@
 
     --Calculate design parameters:
-    sampleWindow = winMgr:createWindow("TaharezLook/StaticText", "orxonox/KeyBindPane/SampleWindow")
+    sampleWindow = winMgr:createWindow("MenuWidgets/StaticText", "orxonox/KeyBindPane/SampleWindow")
     sampleWindow:setText("SampleText")
 
@@ -125,5 +122,5 @@
     line:setPosition(CEGUI.UVector2(CEGUI.UDim(0, 0), CEGUI.UDim(0, lineHeight*(k-1))))
 
-    local command = winMgr:createWindow("TaharezLook/StaticText", "orxonox/KeyBindPane/Binding" .. k .. "/Command")
+    local command = winMgr:createWindow("MenuWidgets/StaticText", "orxonox/KeyBindPane/Binding" .. k .. "/Command")
     command:setText(nameList[k])
     command:setSize(CEGUI.UVector2(CEGUI.UDim(0, commandWidth), CEGUI.UDim(1, 0)))
@@ -132,5 +129,5 @@
     offset = offset + commandWidth + spaceWidth
 
-    local plus = winMgr:createWindow("TaharezLook/TabButton", "orxonox/KeyBindPane/Binding" .. k .. "/Plus")
+    local plus = winMgr:createWindow("MenuWidgets/TabButton", "orxonox/KeyBindPane/Binding" .. k .. "/Plus")
     plus:setSize(CEGUI.UVector2(CEGUI.UDim(0, addWidth), CEGUI.UDim(0.7, 0)))
     plus:setPosition(CEGUI.UVector2(CEGUI.UDim(0, offset), CEGUI.UDim(0.15, 0)))
@@ -142,5 +139,5 @@
     local numButtons = orxonox.KeyBinderManager:getInstance():getCurrent():getNumberOfBindings(commandList[k]);
     for i=0,(numButtons-1) do
-        local button = winMgr:createWindow("TaharezLook/TabButton", "orxonox/KeyBindPane/Binding" .. k .. "/Button" .. i)
+        local button = winMgr:createWindow("MenuWidgets/TabButton", "orxonox/KeyBindPane/Binding" .. k .. "/Button" .. i)
         local name = orxonox.KeyBinderManager:getInstance():getCurrent():getBinding(commandList[k],i)
         name = P.KeyNameNiceifier(name)
@@ -156,5 +153,5 @@
         offset = offset + buttonWidth
 
-        local clear = winMgr:createWindow("TaharezLook/TabButton", "orxonox/KeyBindPane/Binding" .. k .. "/Clear" .. i)
+        local clear = winMgr:createWindow("MenuWidgets/TabButton", "orxonox/KeyBindPane/Binding" .. k .. "/Clear" .. i)
         clear:setSize(CEGUI.UVector2(CEGUI.UDim(0, clearWidth), CEGUI.UDim(0.7, 0)))
         clear:setPosition(CEGUI.UVector2(CEGUI.UDim(0, offset), CEGUI.UDim(0.15, 0)))
Index: /code/branches/gamestates2/data/gui/scripts/MainMenu.lua
===================================================================
--- /code/branches/gamestates2/data/gui/scripts/MainMenu.lua	(revision 6594)
+++ /code/branches/gamestates2/data/gui/scripts/MainMenu.lua	(revision 6595)
@@ -2,5 +2,5 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("MainMenu")
 if _REQUIREDNAME == nil then
     MainMenu = P
@@ -8,7 +8,4 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "MainMenu"
-P.layoutString = "MainMenu.layout"
 
 -- events for MainMenu
Index: /code/branches/gamestates2/data/gui/scripts/MouseControlsMenu.lua
===================================================================
--- /code/branches/gamestates2/data/gui/scripts/MouseControlsMenu.lua	(revision 6594)
+++ /code/branches/gamestates2/data/gui/scripts/MouseControlsMenu.lua	(revision 6595)
@@ -2,5 +2,5 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("MouseControlsMenu")
 if _REQUIREDNAME == nil then
     MouseControlsMenu = P
@@ -8,7 +8,4 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "MouseControlsMenu"
-P.layoutString = "MouseControlsMenu.layout"
 
 function P:init()
Index: /code/branches/gamestates2/data/gui/scripts/MultiplayerMenu.lua
===================================================================
--- /code/branches/gamestates2/data/gui/scripts/MultiplayerMenu.lua	(revision 6594)
+++ /code/branches/gamestates2/data/gui/scripts/MultiplayerMenu.lua	(revision 6595)
@@ -2,5 +2,5 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("MultiplayerMenu")
 if _REQUIREDNAME == nil then
     MultiplayerMenu = P
@@ -8,7 +8,4 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "MultiplayerMenu"
-P.layoutString = "MultiplayerMenu.layout"
 
 function P:init()
@@ -30,5 +27,5 @@
     for k,v in pairs(levelList) do
         item = CEGUI.createListboxTextItem(v)
-        item:setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
         CEGUI.toListbox(listbox):addItem(item)
         if v .. ".oxw" == preselect then
Index: /code/branches/gamestates2/data/gui/scripts/MultiplayerOptionsMenu.lua
===================================================================
--- /code/branches/gamestates2/data/gui/scripts/MultiplayerOptionsMenu.lua	(revision 6594)
+++ /code/branches/gamestates2/data/gui/scripts/MultiplayerOptionsMenu.lua	(revision 6595)
@@ -2,5 +2,5 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("MultiplayerOptionsMenu")
 if _REQUIREDNAME == nil then
     MultiplayerOptionsMenu = P
@@ -9,7 +9,4 @@
 end
 
-P.filename = "MultiplayerOptionsMenu"
-P.layoutString = "MultiplayerOptionsMenu.layout"
-
 function P.MultiplayerOptionsBackButton_clicked(e)
     hideGUI(P.filename)
Index: /code/branches/gamestates2/data/gui/scripts/PickupInventory.lua
===================================================================
--- /code/branches/gamestates2/data/gui/scripts/PickupInventory.lua	(revision 6594)
+++ /code/branches/gamestates2/data/gui/scripts/PickupInventory.lua	(revision 6595)
@@ -2,5 +2,5 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("PickupInventory")
 if _REQUIREDNAME == nil then
     PickupInventory = P
@@ -8,7 +8,4 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "PickupInventory"
-P.layoutString = "PickupInventory.layout"
 
 P.lastEquipmentCount_ = 0
Index: /code/branches/gamestates2/data/gui/scripts/QuestGUI.lua
===================================================================
--- /code/branches/gamestates2/data/gui/scripts/QuestGUI.lua	(revision 6594)
+++ /code/branches/gamestates2/data/gui/scripts/QuestGUI.lua	(revision 6595)
@@ -1,4 +1,4 @@
 gui = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("QuestGUI")
 if _REQUIREDNAME == nil then
     QuestGUI = P
@@ -6,7 +6,4 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "QuestGUI"
-P.layoutString = "QuestGUI.layout"
 
 function P:show()
Index: /code/branches/gamestates2/data/gui/scripts/SettingsMenu.lua
===================================================================
--- /code/branches/gamestates2/data/gui/scripts/SettingsMenu.lua	(revision 6594)
+++ /code/branches/gamestates2/data/gui/scripts/SettingsMenu.lua	(revision 6595)
@@ -2,5 +2,5 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("SettingsMenu")
 if _REQUIREDNAME == nil then
     SettingsMenu = P
@@ -8,7 +8,4 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "SettingsMenu"
-P.layoutString = "SettingsMenu.layout"
 
 function P.SettingsGameplayButton_clicked(e)
Index: /code/branches/gamestates2/data/gui/scripts/SingleplayerMenu.lua
===================================================================
--- /code/branches/gamestates2/data/gui/scripts/SingleplayerMenu.lua	(revision 6594)
+++ /code/branches/gamestates2/data/gui/scripts/SingleplayerMenu.lua	(revision 6595)
@@ -2,5 +2,5 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("SingleplayerMenu")
 if _REQUIREDNAME == nil then
     SingleplayerMenu = P
@@ -8,7 +8,4 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "SingleplayerMenu"
-P.layoutString = "SingleplayerMenu.layout"
 
 function P:init()
@@ -30,5 +27,5 @@
     for k,v in pairs(levelList) do
         item = CEGUI.createListboxTextItem(v)
-        item:setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
         CEGUI.toListbox(listbox):addItem(item)
         if v .. ".oxw" == preselect then
Index: /code/branches/gamestates2/src/libraries/core/Core.cc
===================================================================
--- /code/branches/gamestates2/src/libraries/core/Core.cc	(revision 6594)
+++ /code/branches/gamestates2/src/libraries/core/Core.cc	(revision 6595)
@@ -225,6 +225,5 @@
 
         // Load the CEGUI interface
-        guiManager_.reset(new GUIManager(graphicsManager_->getRenderWindow(),
-            inputManager_->getMousePosition(), graphicsManager_->isFullScreen()));
+        guiManager_.reset(new GUIManager(inputManager_->getMousePosition()));
 
         bGraphicsLoaded_ = true;
Index: /code/branches/gamestates2/src/libraries/core/Core.h
===================================================================
--- /code/branches/gamestates2/src/libraries/core/Core.h	(revision 6594)
+++ /code/branches/gamestates2/src/libraries/core/Core.h	(revision 6595)
@@ -38,5 +38,5 @@
 #include "util/ScopeGuard.h"
 #include "util/Singleton.h"
-#include "core/OrxonoxClass.h"
+#include "OrxonoxClass.h"
 
 namespace orxonox
Index: /code/branches/gamestates2/src/libraries/core/GUIManager.cc
===================================================================
--- /code/branches/gamestates2/src/libraries/core/GUIManager.cc	(revision 6594)
+++ /code/branches/gamestates2/src/libraries/core/GUIManager.cc	(revision 6595)
@@ -57,7 +57,11 @@
 #include "ConsoleCommand.h"
 #include "Core.h"
+#include "GraphicsManager.h"
 #include "LuaState.h"
 #include "PathConfig.h"
 #include "Resource.h"
+#include "input/InputManager.h"
+#include "input/InputState.h"
+#include "input/KeyBinderManager.h"
 
 namespace orxonox
@@ -108,9 +112,7 @@
     @return true if success, otherwise false
     */
-    GUIManager::GUIManager(Ogre::RenderWindow* renderWindow, const std::pair<int, int>& mousePosition, bool bFullScreen)
-        : renderWindow_(renderWindow)
-        , resourceProvider_(0)
+    GUIManager::GUIManager(const std::pair<int, int>& mousePosition)
+        : resourceProvider_(NULL)
         , camera_(NULL)
-        , bShowIngameGUI_(false)
     {
         using namespace CEGUI;
@@ -119,5 +121,5 @@
 
         // Note: No SceneManager specified yet
-        guiRenderer_.reset(new OgreCEGUIRenderer(renderWindow_, Ogre::RENDER_QUEUE_OVERLAY, false, 3000));
+        guiRenderer_.reset(new OgreCEGUIRenderer(GraphicsManager::getInstance().getRenderWindow(), Ogre::RENDER_QUEUE_OVERLAY, false, 3000));
         resourceProvider_ = guiRenderer_->createResourceProvider();
         resourceProvider_->setDefaultResourceGroup("GUI");
@@ -141,13 +143,13 @@
         guiSystem_.reset(new System(guiRenderer_.get(), resourceProvider_, 0, scriptModule_.get()));
 
+        // Align CEGUI mouse with OIS mouse
+        guiSystem_->injectMousePosition((float)mousePosition.first, (float)mousePosition.second);
+
+        // Hide the mouse cursor unless playing in full screen mode
+        if (!GraphicsManager::getInstance().isFullScreen())
+            CEGUI::MouseCursor::getSingleton().hide();
+
         // Initialise the basic Lua code
         this->luaState_->doFile("InitialiseGUI.lua");
-
-        // Align CEGUI mouse with OIS mouse
-        guiSystem_->injectMousePosition((float)mousePosition.first, (float)mousePosition.second);
-
-        // Hide the mouse cursor unless playing in full screen mode
-        if (!bFullScreen)
-            CEGUI::MouseCursor::getSingleton().hide();
     }
 
@@ -208,4 +210,13 @@
     }
 
+    /** Loads a GUI sheet by Lua script
+    @param name
+        The name of the GUI (like the script name, but without the extension)
+    */
+    void GUIManager::loadGUI(const std::string& name)
+    {
+        this->executeCode("loadGUI(\"" + name + "\")");
+    }
+
     /**
     @brief
@@ -240,4 +251,30 @@
     {
         GUIManager::getInstance().executeCode("hideGUI(\"" + name + "\")");
+    }
+
+    const std::string& GUIManager::createInputState(const std::string& name, TriBool::Value showMouse, TriBool::Value useKeyboard, bool bBlockJoyStick)
+    {
+        InputState* state = InputManager::getInstance().createInputState(name);
+
+        if (GraphicsManager::getInstance().isFullScreen() && showMouse == TriBool::True ||
+           !GraphicsManager::getInstance().isFullScreen() && showMouse == TriBool::False)
+            state->setMouseExclusive(TriBool::True);
+        else
+            state->setMouseExclusive(TriBool::Dontcare);
+
+        if (showMouse == TriBool::True)
+            state->setMouseHandler(this);
+        else if (showMouse == TriBool::False)
+            state->setMouseHandler(&InputHandler::EMPTY);
+
+        if (useKeyboard == TriBool::True)
+            state->setKeyHandler(this);
+        else if (useKeyboard == TriBool::False)
+            state->setKeyHandler(&InputHandler::EMPTY);
+
+        if (bBlockJoyStick)
+            state->setJoyStickHandler(&InputHandler::EMPTY);
+
+        return state->getName();
     }
 
Index: /code/branches/gamestates2/src/libraries/core/GUIManager.h
===================================================================
--- /code/branches/gamestates2/src/libraries/core/GUIManager.h	(revision 6594)
+++ /code/branches/gamestates2/src/libraries/core/GUIManager.h	(revision 6595)
@@ -41,6 +41,12 @@
 
 #include "util/OgreForwardRefs.h"
+#include "util/TriBool.h"
 #include "util/Singleton.h"
 #include "input/InputHandler.h"
+
+// Tolua includes (have to be relative to the current directory)
+/*
+$cfile "../util/TriBool.h" // tolua_export
+*/
 
 namespace orxonox // tolua_export
@@ -54,5 +60,4 @@
 
         The GUIManager is a singleton and can be called anywhere when access on the GUI is needed.
-        Creation of the GUIManager is therefore not possible and the cunstructor is private.
 
         Since the GUI needs user input, the GUIManager implements the functions needed to act as a key and/or mouse handler.
@@ -64,9 +69,10 @@
         friend class Singleton<GUIManager>;
     public:
-        GUIManager(Ogre::RenderWindow* renderWindow, const std::pair<int, int>& mousePosition, bool bFullScreen);
+        GUIManager(const std::pair<int, int>& mousePosition);
         ~GUIManager();
 
         void preUpdate(const Clock& time);
 
+        void loadGUI(const std::string& name);
         static void showGUI(const std::string& name, bool hidePrevious=false, bool showCursor=true);
         void showGUIExtra(const std::string& name, const std::string& ptr, bool hidePrevious=false, bool showCursor=true);
@@ -75,8 +81,8 @@
         void setBackground(const std::string& name);
 
+        const std::string& createInputState(const std::string& name, TriBool::Value showMouse = TriBool::True, TriBool::Value useKeyboard = TriBool::True, bool bBlockJoyStick = false); // tolua_export
+
         void setCamera(Ogre::Camera* camera);
         Ogre::Camera* getCamera() { return this->camera_; }
-
-        static GUIManager* getInstancePtr() { return singletonPtr_s; }
 
         inline void setPlayer(const std::string& guiname, PlayerInfo* player)
@@ -87,4 +93,6 @@
         // TODO: Temporary hack because the tolua exported CEGUI method does not seem to work
         static void subscribeEventHelper(CEGUI::Window* window, const std::string& event, const std::string& function); //tolua_export
+
+        static GUIManager& getInstance() { return Singleton<GUIManager>::getInstance(); } // tolua_export
 
     private:
@@ -102,5 +110,4 @@
         void mouseMoved    (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize);
         void mouseScrolled (int abs, int rel);
-
         scoped_ptr<CEGUI::OgreCEGUIRenderer> guiRenderer_;      //!< CEGUI's interface to the Ogre Engine
         scoped_ptr<LuaState>                 luaState_;         //!< LuaState, access point to the Lua engine
@@ -108,12 +115,10 @@
         scoped_ptr<CEGUI::System>            guiSystem_;        //!< CEGUI's main system
         shared_ptr<ResourceInfo>             rootFileInfo_;     //!< Resource information about the root script
-        Ogre::RenderWindow*                  renderWindow_;     //!< Ogre's render window to give CEGUI access to it
         CEGUI::ResourceProvider*             resourceProvider_; //!< CEGUI's resource provider
         CEGUI::Logger*                       ceguiLogger_;      //!< CEGUI's logger to be able to log CEGUI errors in our log
-        std::map<std::string, PlayerInfo*>   players_;          //!< Stores the player (owner) for each gui
+        std::map<std::string, PlayerInfo*>   players_;          //!< Stores the player (owner) for each GUI
         Ogre::Camera*                        camera_;           //!< Camera used to render the scene with the GUI
 
         static GUIManager*                   singletonPtr_s;    //!< Singleton reference to GUIManager
-        bool                                 bShowIngameGUI_;
 
     }; // tolua_export
Index: /code/branches/gamestates2/src/libraries/core/Game.h
===================================================================
--- /code/branches/gamestates2/src/libraries/core/Game.h	(revision 6594)
+++ /code/branches/gamestates2/src/libraries/core/Game.h	(revision 6595)
@@ -50,5 +50,5 @@
 #include "util/ScopeGuard.h"
 #include "util/Singleton.h"
-#include "core/OrxonoxClass.h"
+#include "OrxonoxClass.h"
 
 /**
Index: /code/branches/gamestates2/src/libraries/core/IOConsole.cc
===================================================================
--- /code/branches/gamestates2/src/libraries/core/IOConsole.cc	(revision 6594)
+++ /code/branches/gamestates2/src/libraries/core/IOConsole.cc	(revision 6595)
@@ -35,6 +35,6 @@
 #include "util/Clock.h"
 #include "util/Math.h"
-#include "core/Game.h"
-#include "core/input/InputBuffer.h"
+#include "Game.h"
+#include "input/InputBuffer.h"
 
 // ##########################
Index: /code/branches/gamestates2/src/libraries/core/IOConsole.h
===================================================================
--- /code/branches/gamestates2/src/libraries/core/IOConsole.h	(revision 6594)
+++ /code/branches/gamestates2/src/libraries/core/IOConsole.h	(revision 6595)
@@ -37,5 +37,5 @@
 #include <vector>
 #include "util/Singleton.h"
-#include "core/Shell.h"
+#include "Shell.h"
 
 #ifdef ORXONOX_PLATFORM_UNIX
Index: /code/branches/gamestates2/src/libraries/core/LuaState.h
===================================================================
--- /code/branches/gamestates2/src/libraries/core/LuaState.h	(revision 6594)
+++ /code/branches/gamestates2/src/libraries/core/LuaState.h	(revision 6595)
@@ -40,5 +40,5 @@
 
 #include "util/ScopeGuard.h"
-#include "core/Functor.h"
+#include "Functor.h"
 #include "ToluaInterface.h"
 
Index: /code/branches/gamestates2/src/libraries/core/Template.cc
===================================================================
--- /code/branches/gamestates2/src/libraries/core/Template.cc	(revision 6594)
+++ /code/branches/gamestates2/src/libraries/core/Template.cc	(revision 6595)
@@ -33,6 +33,6 @@
 
 #include "util/Debug.h"
-#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
+#include "CoreIncludes.h"
+#include "XMLPort.h"
 
 namespace orxonox
Index: /code/branches/gamestates2/src/libraries/core/input/InputManager.cc
===================================================================
--- /code/branches/gamestates2/src/libraries/core/input/InputManager.cc	(revision 6594)
+++ /code/branches/gamestates2/src/libraries/core/input/InputManager.cc	(revision 6595)
@@ -87,5 +87,5 @@
         , oisInputManager_(0)
         , devices_(2)
-        , mouseMode_(MouseMode::Nonexclusive)
+        , exclusiveMouse_(TriBool::False)
         , emptyState_(0)
         , calibratorCallbackHandler_(0)
@@ -98,5 +98,5 @@
 
         if (GraphicsManager::getInstance().isFullScreen())
-            mouseMode_ = MouseMode::Exclusive;
+            exclusiveMouse_ = TriBool::True;
         this->loadDevices();
 
@@ -155,5 +155,5 @@
         paramList.insert(std::make_pair("w32_keyboard", "DISCL_FOREGROUND"));
         paramList.insert(std::make_pair("w32_mouse", "DISCL_FOREGROUND"));
-        if (mouseMode_ == MouseMode::Exclusive || GraphicsManager::getInstance().isFullScreen())
+        if (exclusiveMouse_ == TriBool::True || GraphicsManager::getInstance().isFullScreen())
         {
             // Disable Windows key plus special keys (like play, stop, next, etc.)
@@ -168,5 +168,5 @@
         paramList.insert(std::make_pair("XAutoRepeatOn", "true"));
 
-        if (mouseMode_ == MouseMode::Exclusive || GraphicsManager::getInstance().isFullScreen())
+        if (exclusiveMouse_ == TriBool::True || GraphicsManager::getInstance().isFullScreen())
         {
             if (CommandLineParser::getValue("keyboard_no_grab").getBool())
@@ -504,13 +504,13 @@
 
         // Check whether we have to change the mouse mode
-        MouseMode::Value requestedMode = MouseMode::Dontcare;
+        TriBool::Value requestedMode = TriBool::Dontcare;
         std::vector<InputState*>& mouseStates = devices_[InputDeviceEnumerator::Mouse]->getStateListRef();
         if (mouseStates.empty())
-            requestedMode = MouseMode::Nonexclusive;
+            requestedMode = TriBool::False;
         else
-            requestedMode = mouseStates.front()->getMouseMode();
-        if (requestedMode != MouseMode::Dontcare && mouseMode_ != requestedMode)
-        {
-            mouseMode_ = requestedMode;
+            requestedMode = mouseStates.front()->getMouseExclusive();
+        if (requestedMode != TriBool::Dontcare && exclusiveMouse_ != requestedMode)
+        {
+            exclusiveMouse_ = requestedMode;
             if (!GraphicsManager::getInstance().isFullScreen())
                 this->reloadInternal();
Index: /code/branches/gamestates2/src/libraries/core/input/InputManager.h
===================================================================
--- /code/branches/gamestates2/src/libraries/core/input/InputManager.h	(revision 6594)
+++ /code/branches/gamestates2/src/libraries/core/input/InputManager.h	(revision 6595)
@@ -38,4 +38,5 @@
 
 #include "util/Singleton.h"
+#include "util/TriBool.h"
 #include "core/WindowEventListener.h"
 #include "InputState.h"
@@ -159,5 +160,5 @@
             - The removal process is being postponed if InputManager::preUpdate() is currently running.
         */
-        bool destroyState(const std::string& name);
+        bool destroyState(const std::string& name); // tolua_export
 
         //-------------------------------
@@ -196,5 +197,5 @@
         OIS::InputManager*                  oisInputManager_;      //!< OIS input manager
         std::vector<InputDevice*>           devices_;              //!< List of all input devices (keyboard, mouse, joy sticks)
-        MouseMode::Value                    mouseMode_;            //!< Currently applied mouse mode
+        TriBool::Value                      exclusiveMouse_;       //!< Currently applied mouse mode
 
         // some internally handled states and handlers
Index: /code/branches/gamestates2/src/libraries/core/input/InputState.cc
===================================================================
--- /code/branches/gamestates2/src/libraries/core/input/InputState.cc	(revision 6594)
+++ /code/branches/gamestates2/src/libraries/core/input/InputState.cc	(revision 6595)
@@ -37,5 +37,5 @@
         , bAlwaysGetsInput_(bAlwaysGetsInput)
         , bTransparent_(bTransparent)
-        , mouseMode_(MouseMode::Dontcare)
+        , exclusiveMouse_(TriBool::Dontcare)
         , bExpired_(true)
         , handlers_(2)
Index: /code/branches/gamestates2/src/libraries/core/input/InputState.h
===================================================================
--- /code/branches/gamestates2/src/libraries/core/input/InputState.h	(revision 6594)
+++ /code/branches/gamestates2/src/libraries/core/input/InputState.h	(revision 6595)
@@ -37,4 +37,5 @@
 
 #include "util/OrxEnum.h"
+#include "util/TriBool.h"
 #include "InputHandler.h"
 #include "JoyStickQuantityListener.h"
@@ -56,13 +57,4 @@
     };
 
-    namespace MouseMode
-    {
-        enum Value
-        {
-            Exclusive,
-            Nonexclusive,
-            Dontcare
-        };
-    }
 
     /**
@@ -73,5 +65,5 @@
         that stack and only the top one gets the input events. This is done for
         every device (keyboard, mouse, all joy sticks) separately to allow
-        for intance keyboard input capturing for the console while you can still
+        for instance keyboard input capturing for the console while you can still
         steer a ship with the mouse.
         There are two exceptions to this behaviour though:
@@ -83,5 +75,5 @@
           the state will always receive input as long as it is activated.
         - Note: If you mark an InputState with both parameters on, then it will
-          not influence ony other InputState at all.
+          not influence only other InputState at all.
 
     @par Priorities
@@ -95,5 +87,5 @@
     @par Exclusive/Non-Exclusive mouse Mode
         You can select a specific mouse mode that tells whether the application
-        should have exclusive accessto it or not.
+        should have exclusive access to it or not.
         When in non-exclusive mode, you can move the mouse out of the window
         like with any other normal window (only for windowed mode!).
@@ -130,6 +122,6 @@
         void setHandler        (InputHandler* handler);
 
-        void setMouseMode(MouseMode::Value value) { mouseMode_ = value; this->bExpired_ = true; }
-        MouseMode::Value getMouseMode() const { return mouseMode_; }
+        void setMouseExclusive(TriBool::Value value) { exclusiveMouse_ = value; this->bExpired_ = true; }
+        TriBool::Value getMouseExclusive() const { return exclusiveMouse_; }
 
         //! Returns the name of the state (which is unique!)
@@ -184,5 +176,5 @@
         const bool                  bAlwaysGetsInput_;      //!< See class declaration for explanation
         const bool                  bTransparent_;          //!< See class declaration for explanation
-        MouseMode::Value            mouseMode_;             //!< See class declaration for explanation
+        TriBool::Value              exclusiveMouse_;        //!< See class declaration for explanation
         int                         priority_;              //!< Current priority (might change)
         bool                        bExpired_;              //!< See hasExpired()
Index: /code/branches/gamestates2/src/libraries/network/TrafficControl.h
===================================================================
--- /code/branches/gamestates2/src/libraries/network/TrafficControl.h	(revision 6594)
+++ /code/branches/gamestates2/src/libraries/network/TrafficControl.h	(revision 6595)
@@ -34,5 +34,5 @@
 #include <list>
 #include <map>
-#include "network/ClientConnectionListener.h"
+#include "ClientConnectionListener.h"
 
 namespace orxonox {
Index: /code/branches/gamestates2/src/libraries/util/Serialise.h
===================================================================
--- /code/branches/gamestates2/src/libraries/util/Serialise.h	(revision 6594)
+++ /code/branches/gamestates2/src/libraries/util/Serialise.h	(revision 6595)
@@ -35,7 +35,9 @@
 #define _Serialise_H__
 
+#include "UtilPrereqs.h"
+
 #include <cstring>
-#include "util/Math.h"
-#include "util/mbool.h"
+#include "Math.h"
+#include "mbool.h"
 
 namespace orxonox{
Index: /code/branches/gamestates2/src/libraries/util/TriBool.h
===================================================================
--- /code/branches/gamestates2/src/libraries/util/TriBool.h	(revision 6595)
+++ /code/branches/gamestates2/src/libraries/util/TriBool.h	(revision 6595)
@@ -0,0 +1,49 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *                    > www.orxonox.net <
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Reto Grieder
+ *   Co-authors:
+ *      ...
+ *
+ */
+
+#ifndef _TriBool_H__
+#define _TriBool_H__
+
+#include "UtilPrereqs.h"
+
+// tolua_begin
+namespace orxonox
+{
+    namespace TriBool
+    {
+        enum Value
+        {
+            False    =  0,
+            True     =  1,
+            Dontcare =  2
+        };
+    }
+}
+// tolua_end
+
+#endif /* _TriBool_H__ */
Index: /code/branches/gamestates2/src/modules/questsystem/QuestGUI.cc
===================================================================
--- /code/branches/gamestates2/src/modules/questsystem/QuestGUI.cc	(revision 6594)
+++ /code/branches/gamestates2/src/modules/questsystem/QuestGUI.cc	(revision 6595)
@@ -109,5 +109,5 @@
 
         //! Create root window.
-        this->rootWindow_ = this->windowManager_->createWindow("TaharezLook/ScrollablePane", "QuestGUI/Quests");
+        this->rootWindow_ = this->windowManager_->createWindow("MenuWidgets/ScrollablePane", "QuestGUI/Quests");
         this->rootWindow_->setSize(CEGUI::UVector2(CEGUI::UDim(1, 0),CEGUI::UDim(1, 0)));
 
@@ -161,7 +161,7 @@
         Get a CEGUI Window to use.
         Windows that are no longer used are collected with giveWindow, and are given out again with getWindow, so save some time recreating new windows everytime.
-        The retreived window is of type "TaharezLook/TabButton".
-    @return
-        Returns a CEGUI Window of type "TaharezLook/TabButton".
+        The retreived window is of type "MenuWidgets/TabButton".
+    @return
+        Returns a CEGUI Window of type "MenuWidgets/TabButton".
     */
     CEGUI::Window* QuestGUI::getWindow(void)
@@ -177,5 +177,5 @@
         std::ostringstream stream;
         stream << "QuestGUI/Quests/EmptyWindows/" << this->windows_.size()+1;
-        return this->windowManager_->createWindow("TaharezLook/TabButton", stream.str());
+        return this->windowManager_->createWindow("MenuWidgets/TabButton", stream.str());
     }
 
Index: /code/branches/gamestates2/src/modules/questsystem/QuestGUINode.cc
===================================================================
--- /code/branches/gamestates2/src/modules/questsystem/QuestGUINode.cc	(revision 6594)
+++ /code/branches/gamestates2/src/modules/questsystem/QuestGUINode.cc	(revision 6595)
@@ -160,5 +160,5 @@
             stream << this->window_->getName() << "/Details";
             const QuestDescription* description = this->item_->getDescription();
-            this->details_ = this->gui_->getWindowManager()->createWindow("TaharezLook/FrameWindow", stream.str());
+            this->details_ = this->gui_->getWindowManager()->createWindow("MenuWidgets/FrameWindow", stream.str());
             this->details_->setSize(CEGUI::UVector2(CEGUI::UDim(0.7f, 0),CEGUI::UDim(0.7f, 0)));
             this->details_->setPosition(CEGUI::UVector2(CEGUI::UDim(0.1f, 0),CEGUI::UDim(0.1f, 0)));
@@ -171,5 +171,5 @@
             //! Create a ScrollablePane.
             stream << "/Scrollable";
-            CEGUI::Window* window = this->gui_->getWindowManager()->createWindow("TaharezLook/ScrollablePane", stream.str());
+            CEGUI::Window* window = this->gui_->getWindowManager()->createWindow("MenuWidgets/ScrollablePane", stream.str());
             window->setSize(CEGUI::UVector2(CEGUI::UDim(1.0, -2*QuestGUINode::BORDER_WIDTH),CEGUI::UDim(1.0, -QuestGUINode::TITLE_HEIGHT)));
             window->setPosition(CEGUI::UVector2(CEGUI::UDim(0, (float)QuestGUINode::BORDER_WIDTH),CEGUI::UDim(0, (float)QuestGUINode::TITLE_HEIGHT)));
@@ -185,5 +185,5 @@
                 stream.str("");
                 stream << this->details_->getName() << "/Status";
-                CEGUI::Window* statusWindow = this->gui_->getWindowManager()->createWindow("TaharezLook/StaticText", stream.str());
+                CEGUI::Window* statusWindow = this->gui_->getWindowManager()->createWindow("MenuWidgets/StaticText", stream.str());
                 window->addChildWindow(statusWindow);
                 std::string status;
@@ -214,5 +214,5 @@
             stream << this->details_->getName() << "/Description";
             stream << "/Title";
-            CEGUI::Window* descriptionWindowTitle = this->gui_->getWindowManager()->createWindow("TaharezLook/StaticText", stream.str());
+            CEGUI::Window* descriptionWindowTitle = this->gui_->getWindowManager()->createWindow("MenuWidgets/StaticText", stream.str());
             window->addChildWindow(descriptionWindowTitle);
             descriptionWindowTitle->setProperty("HorzFormatting", "HorzCentred");
@@ -227,5 +227,5 @@
             stream.str("");
             stream << this->details_->getName() << "/Description";
-            CEGUI::Window* descriptionWindow = this->gui_->getWindowManager()->createWindow("TaharezLook/StaticText", stream.str());
+            CEGUI::Window* descriptionWindow = this->gui_->getWindowManager()->createWindow("MenuWidgets/StaticText", stream.str());
             window->addChildWindow(descriptionWindow);
             descriptionWindow->setProperty("HorzFormatting", "WordWrapLeftAligned");
@@ -250,5 +250,5 @@
                             stream.str("");
                             stream << this->details_->getName() << "/Hints/Title";
-                            CEGUI::Window* hintsTitle = this->gui_->getWindowManager()->createWindow("TaharezLook/StaticText", stream.str());
+                            CEGUI::Window* hintsTitle = this->gui_->getWindowManager()->createWindow("MenuWidgets/StaticText", stream.str());
                             window->addChildWindow(hintsTitle);
                             hintsTitle->setProperty("HorzFormatting", "HorzCentred");
Index: /code/branches/gamestates2/src/orxonox/gamestates/GSLevel.cc
===================================================================
--- /code/branches/gamestates2/src/orxonox/gamestates/GSLevel.cc	(revision 6594)
+++ /code/branches/gamestates2/src/orxonox/gamestates/GSLevel.cc	(revision 6595)
@@ -69,14 +69,14 @@
         {
             gameInputState_ = InputManager::getInstance().createInputState("game");
-            gameInputState_->setMouseMode(MouseMode::Exclusive);
+            gameInputState_->setMouseExclusive(TriBool::True);
             gameInputState_->setHandler(KeyBinderManager::getInstance().getDefaultAsHandler());
             KeyBinderManager::getInstance().setToDefault();
 
             guiMouseOnlyInputState_ = InputManager::getInstance().createInputState("guiMouseOnly");
-            guiMouseOnlyInputState_->setMouseMode(MouseMode::Exclusive);
-            guiMouseOnlyInputState_->setMouseHandler(GUIManager::getInstancePtr());
+            guiMouseOnlyInputState_->setMouseExclusive(TriBool::True);
+            guiMouseOnlyInputState_->setMouseHandler(&GUIManager::getInstance());
 
             guiKeysOnlyInputState_ = InputManager::getInstance().createInputState("guiKeysOnly");
-            guiKeysOnlyInputState_->setKeyHandler(GUIManager::getInstancePtr());
+            guiKeysOnlyInputState_->setKeyHandler(&GUIManager::getInstance());
         }
 
Index: /code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.cc
===================================================================
--- /code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.cc	(revision 6594)
+++ /code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.cc	(revision 6595)
@@ -53,6 +53,6 @@
         RegisterRootObject(GSMainMenu);
         inputState_ = InputManager::getInstance().createInputState("mainMenu");
-        inputState_->setMouseMode(MouseMode::Nonexclusive);
-        inputState_->setHandler(GUIManager::getInstancePtr());
+        inputState_->setMouseExclusive(TriBool::False);
+        inputState_->setHandler(&GUIManager::getInstance());
         inputState_->setKeyHandler(KeyBinderManager::getInstance().getDefaultAsHandler());
         inputState_->setJoyStickHandler(&InputHandler::EMPTY);
@@ -101,5 +101,5 @@
 
         KeyBinderManager::getInstance().setToDefault();
-        InputManager::getInstance().enterState("mainMenu");
+        //InputManager::getInstance().enterState("mainMenu");
 
         this->setConfigValues();
@@ -119,5 +119,5 @@
         }
 
-        InputManager::getInstance().leaveState("mainMenu");
+        //InputManager::getInstance().leaveState("mainMenu");
 
         GUIManager::getInstance().setCamera(0);
Index: /code/branches/gamestates2/src/orxonox/overlays/CMakeLists.txt
===================================================================
--- /code/branches/gamestates2/src/orxonox/overlays/CMakeLists.txt	(revision 6594)
+++ /code/branches/gamestates2/src/orxonox/overlays/CMakeLists.txt	(revision 6595)
@@ -1,3 +1,4 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
+  GUISheet.cc
   OrxonoxOverlay.cc
   OverlayGroup.cc
Index: /code/branches/gamestates2/src/orxonox/overlays/GUISheet.cc
===================================================================
--- /code/branches/gamestates2/src/orxonox/overlays/GUISheet.cc	(revision 6595)
+++ /code/branches/gamestates2/src/orxonox/overlays/GUISheet.cc	(revision 6595)
@@ -0,0 +1,94 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *                    > www.orxonox.net <
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Reto Grieder
+ *   Co-authors:
+ *      ...
+ *
+ */
+
+#include "GUISheet.h"
+
+#include "core/CoreIncludes.h"
+#include "core/GUIManager.h"
+#include "core/XMLPort.h"
+
+namespace orxonox
+{
+    CreateFactory(GUISheet);
+
+    GUISheet::GUISheet(BaseObject* creator)
+        : BaseObject(creator)
+        , bShowOnLoad_(false)
+        , bShowCursor_(true)
+        , bHidePrevious_(false)
+    {
+        RegisterObject(GUISheet);
+
+        if (!GameMode::showsGraphics())
+            ThrowException(NoGraphics, "GUISheet construction failed: no graphics");
+    }
+
+    GUISheet::~GUISheet()
+    {
+    }
+
+    void GUISheet::XMLPort(Element& xmlElement, XMLPort::Mode mode)
+    {
+        SUPER(GUISheet, XMLPort, xmlElement, mode);
+
+        XMLPortParam(GUISheet, "showOnLoad",   setShowOnLoad,       getShowOnLoad,       xmlElement, mode);
+        XMLPortParam(GUISheet, "showCursor",   setCursorVisibility, getCursorVisibility, xmlElement, mode);
+        XMLPortParam(GUISheet, "hidePrevious", setPreviousHiding,   getPreviousHiding,   xmlElement, mode);
+        XMLPortParam(GUISheet, "script",       setScript,           getScript,           xmlElement, mode);
+    }
+
+    void GUISheet::show()
+    {
+        GUIManager::showGUI(this->script_, this->bHidePrevious_, this->bShowCursor_);
+    }
+
+    void GUISheet::hide()
+    {
+        GUIManager::hideGUI(this->script_);
+    }
+
+    void GUISheet::setScript(const std::string& filename)
+    {
+        this->script_ = filename;
+        GUIManager::getInstance().loadGUI(this->script_);
+        if (this->bShowOnLoad_)
+            this->show();
+    }
+
+    void GUISheet::setCursorVisibility(bool bShow)
+    {
+        this->bShowCursor_ = bShow;
+        // TODO: This call has no effect when already showing!
+    }
+
+    void GUISheet::setPreviousHiding(bool bHide)
+    {
+        this->bHidePrevious_ = bHide;
+        // TODO: This call has no effect when already showing!
+    }
+}
Index: /code/branches/gamestates2/src/orxonox/overlays/GUISheet.h
===================================================================
--- /code/branches/gamestates2/src/orxonox/overlays/GUISheet.h	(revision 6595)
+++ /code/branches/gamestates2/src/orxonox/overlays/GUISheet.h	(revision 6595)
@@ -0,0 +1,76 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *                    > www.orxonox.net <
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Reto Grieder
+ *   Co-authors:
+ *      ...
+ *
+ */
+
+#ifndef _GUISheet_H__
+#define _GUISheet_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include <string>
+#include "core/BaseObject.h"
+
+namespace orxonox
+{
+    //! Simple XML loadable interface to the otherwise Lua coded GUI framework.
+    class _OrxonoxExport GUISheet : public BaseObject
+    {
+    public:
+        GUISheet(BaseObject* creator);
+        ~GUISheet();
+
+        void XMLPort(Element& xmlElement, XMLPort::Mode mode);
+
+        void show();
+        void hide();
+
+        void setScript(const std::string& filename);
+        inline const std::string& getScript() const
+            { return this->script_; }
+
+        inline void setShowOnLoad(bool bShow)
+            { this->bShowOnLoad_ = bShow; }
+        inline bool getShowOnLoad() const
+            { return this->bShowOnLoad_; }
+
+        void setCursorVisibility(bool bShow);
+        inline bool getCursorVisibility() const
+            { return this->bShowCursor_; }
+
+        void setPreviousHiding(bool bHide);
+        inline bool getPreviousHiding() const
+            { return this->bHidePrevious_; }
+
+    private:
+        std::string script_;
+        bool bShowOnLoad_;
+        bool bShowCursor_;
+        bool bHidePrevious_;
+  };
+}
+
+#endif /* _GUISheet_H__ */
