Index: /code/trunk/cmake/LibraryConfigTardis.cmake
===================================================================
--- /code/trunk/cmake/LibraryConfigTardis.cmake	(revision 6745)
+++ /code/trunk/cmake/LibraryConfigTardis.cmake	(revision 6746)
@@ -44,4 +44,5 @@
   #SET(BOOST_INCLUDEDIR "/usr/pack/boost-1.42.0-bs/include")
   #SET(BOOST_LIBRARYDIR "/usr/pack/boost-1.42.0-bs/i686-debian-linux4.0/lib")
+  SET(Boost_VERSION 104200)
   SET(Boost_INCLUDE_DIRS "/usr/pack/boost-1.42.0-bs/include" CACHE PATH "")
   SET(Boost_SYSTEM_LIBRARY_RELEASE "/usr/pack/boost-1.42.0-bs/i686-debian-linux5.0/lib/libboost_system.so" CACHE PATH "")
Index: de/trunk/data/gui/configs/Falagard.xsd
===================================================================
--- /code/trunk/data/gui/configs/Falagard.xsd	(revision 6745)
+++ 	(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/trunk/data/gui/configs/Font.xsd
===================================================================
--- /code/trunk/data/gui/configs/Font.xsd	(revision 6745)
+++ 	(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/trunk/data/gui/configs/GUILayout.xsd
===================================================================
--- /code/trunk/data/gui/configs/GUILayout.xsd	(revision 6745)
+++ 	(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/trunk/data/gui/configs/GUIScheme.xsd
===================================================================
--- /code/trunk/data/gui/configs/GUIScheme.xsd	(revision 6745)
+++ 	(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/trunk/data/gui/configs/Imageset.xsd
===================================================================
--- /code/trunk/data/gui/configs/Imageset.xsd	(revision 6745)
+++ 	(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/trunk/data/gui/layouts/AudioMenu.layout
===================================================================
--- /code/trunk/data/gui/layouts/AudioMenu.layout	(revision 6745)
+++ /code/trunk/data/gui/layouts/AudioMenu.layout	(revision 6746)
@@ -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/trunk/data/gui/layouts/CompositorDemo.layout
===================================================================
--- /code/trunk/data/gui/layouts/CompositorDemo.layout	(revision 6745)
+++ 	(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/trunk/data/gui/layouts/Console.wnd
===================================================================
--- /code/trunk/data/gui/layouts/Console.wnd	(revision 6745)
+++ 	(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/trunk/data/gui/layouts/ControlsMenu.layout
===================================================================
--- /code/trunk/data/gui/layouts/ControlsMenu.layout	(revision 6745)
+++ /code/trunk/data/gui/layouts/ControlsMenu.layout	(revision 6746)
@@ -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/trunk/data/gui/layouts/CreditsMenu.layout
===================================================================
--- /code/trunk/data/gui/layouts/CreditsMenu.layout	(revision 6745)
+++ /code/trunk/data/gui/layouts/CreditsMenu.layout	(revision 6746)
@@ -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/trunk/data/gui/layouts/CrowdDemo.layout
===================================================================
--- /code/trunk/data/gui/layouts/CrowdDemo.layout	(revision 6745)
+++ 	(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/trunk/data/gui/layouts/DecisionPopup.layout
===================================================================
--- /code/trunk/data/gui/layouts/DecisionPopup.layout	(revision 6745)
+++ /code/trunk/data/gui/layouts/DecisionPopup.layout	(revision 6746)
@@ -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/trunk/data/gui/layouts/Demo7Windows.layout
===================================================================
--- /code/trunk/data/gui/layouts/Demo7Windows.layout	(revision 6745)
+++ 	(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/trunk/data/gui/layouts/Demo8.layout
===================================================================
--- /code/trunk/data/gui/layouts/Demo8.layout	(revision 6745)
+++ 	(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/trunk/data/gui/layouts/DragDropDemo.layout
===================================================================
--- /code/trunk/data/gui/layouts/DragDropDemo.layout	(revision 6745)
+++ 	(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/trunk/data/gui/layouts/FontDemo.layout
===================================================================
--- /code/trunk/data/gui/layouts/FontDemo.layout	(revision 6745)
+++ 	(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/trunk/data/gui/layouts/GameplayMenu.layout
===================================================================
--- /code/trunk/data/gui/layouts/GameplayMenu.layout	(revision 6745)
+++ /code/trunk/data/gui/layouts/GameplayMenu.layout	(revision 6746)
@@ -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/trunk/data/gui/layouts/GraphicsMenu.layout
===================================================================
--- /code/trunk/data/gui/layouts/GraphicsMenu.layout	(revision 6745)
+++ /code/trunk/data/gui/layouts/GraphicsMenu.layout	(revision 6746)
@@ -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/trunk/data/gui/layouts/InGameMenu.layout
===================================================================
--- /code/trunk/data/gui/layouts/InGameMenu.layout	(revision 6745)
+++ /code/trunk/data/gui/layouts/InGameMenu.layout	(revision 6746)
@@ -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/trunk/data/gui/layouts/InGameTest.layout
===================================================================
--- /code/trunk/data/gui/layouts/InGameTest.layout	(revision 6745)
+++ /code/trunk/data/gui/layouts/InGameTest.layout	(revision 6746)
@@ -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/trunk/data/gui/layouts/InfoPopup.layout
===================================================================
--- /code/trunk/data/gui/layouts/InfoPopup.layout	(revision 6745)
+++ /code/trunk/data/gui/layouts/InfoPopup.layout	(revision 6746)
@@ -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/trunk/data/gui/layouts/InstancingDemo.layout
===================================================================
--- /code/trunk/data/gui/layouts/InstancingDemo.layout	(revision 6745)
+++ 	(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/trunk/data/gui/layouts/KeyBindMenu.layout
===================================================================
--- /code/trunk/data/gui/layouts/KeyBindMenu.layout	(revision 6745)
+++ /code/trunk/data/gui/layouts/KeyBindMenu.layout	(revision 6746)
@@ -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/trunk/data/gui/layouts/MainMenu.layout
===================================================================
--- /code/trunk/data/gui/layouts/MainMenu.layout	(revision 6745)
+++ /code/trunk/data/gui/layouts/MainMenu.layout	(revision 6746)
@@ -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/trunk/data/gui/layouts/MainMenuBackground.layout
===================================================================
--- /code/trunk/data/gui/layouts/MainMenuBackground.layout	(revision 6745)
+++ /code/trunk/data/gui/layouts/MainMenuBackground.layout	(revision 6746)
@@ -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/trunk/data/gui/layouts/MouseControlsMenu.layout
===================================================================
--- /code/trunk/data/gui/layouts/MouseControlsMenu.layout	(revision 6745)
+++ /code/trunk/data/gui/layouts/MouseControlsMenu.layout	(revision 6746)
@@ -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/trunk/data/gui/layouts/MultiplayerMenu.layout
===================================================================
--- /code/trunk/data/gui/layouts/MultiplayerMenu.layout	(revision 6745)
+++ /code/trunk/data/gui/layouts/MultiplayerMenu.layout	(revision 6746)
@@ -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/trunk/data/gui/layouts/MultiplayerOptionsMenu.layout
===================================================================
--- /code/trunk/data/gui/layouts/MultiplayerOptionsMenu.layout	(revision 6745)
+++ /code/trunk/data/gui/layouts/MultiplayerOptionsMenu.layout	(revision 6746)
@@ -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/trunk/data/gui/layouts/PickupInventory.layout
===================================================================
--- /code/trunk/data/gui/layouts/PickupInventory.layout	(revision 6745)
+++ /code/trunk/data/gui/layouts/PickupInventory.layout	(revision 6746)
@@ -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/PickupInventory/PickupInventory" >
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/PickupInventory/PickupInventory" >
             <Property Name="Text" Value="Pickup Inventory" />
             <Property Name="Alpha" Value="0.8" />
@@ -14,5 +14,5 @@
             <Property Name="VertFormatting" Value="TopAligned" />
             <Property Name="UnifiedAreaRect" Value="{{0.15,0},{0.15,0},{0.85,0},{0.8,0}}" />
-            <Window Type="TaharezLook/StaticText" Name="orxonox/PickupInventory/Wrapper" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/PickupInventory/Wrapper" >
                 <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/PickupInventory/Inventory" >
+                <Window Type="MenuWidgets/ScrollablePane" Name="orxonox/PickupInventory/Inventory" >
                     <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/PickupInventory/InventoryBackButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/PickupInventory/InventoryBackButton" >
             <Property Name="Text" Value="Back" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
Index: /code/trunk/data/gui/layouts/QuestGUI.layout
===================================================================
--- /code/trunk/data/gui/layouts/QuestGUI.layout	(revision 6745)
+++ /code/trunk/data/gui/layouts/QuestGUI.layout	(revision 6746)
@@ -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/trunk/data/gui/layouts/SettingsMenu.layout
===================================================================
--- /code/trunk/data/gui/layouts/SettingsMenu.layout	(revision 6745)
+++ /code/trunk/data/gui/layouts/SettingsMenu.layout	(revision 6746)
@@ -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/trunk/data/gui/layouts/SingleplayerMenu.layout
===================================================================
--- /code/trunk/data/gui/layouts/SingleplayerMenu.layout	(revision 6745)
+++ /code/trunk/data/gui/layouts/SingleplayerMenu.layout	(revision 6746)
@@ -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/trunk/data/gui/layouts/TabControlDemo.layout
===================================================================
--- /code/trunk/data/gui/layouts/TabControlDemo.layout	(revision 6745)
+++ 	(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/trunk/data/gui/layouts/TabPage.layout
===================================================================
--- /code/trunk/data/gui/layouts/TabPage.layout	(revision 6745)
+++ 	(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/trunk/data/gui/layouts/TabPage1.layout
===================================================================
--- /code/trunk/data/gui/layouts/TabPage1.layout	(revision 6745)
+++ 	(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/trunk/data/gui/layouts/TabPage2.layout
===================================================================
--- /code/trunk/data/gui/layouts/TabPage2.layout	(revision 6745)
+++ 	(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/trunk/data/gui/layouts/TextDemo.layout
===================================================================
--- /code/trunk/data/gui/layouts/TextDemo.layout	(revision 6745)
+++ 	(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/trunk/data/gui/layouts/TreeDemoTaharez.layout
===================================================================
--- /code/trunk/data/gui/layouts/TreeDemoTaharez.layout	(revision 6745)
+++ 	(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/trunk/data/gui/layouts/VanillaConsole.layout
===================================================================
--- /code/trunk/data/gui/layouts/VanillaConsole.layout	(revision 6745)
+++ 	(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/trunk/data/gui/layouts/VanillaWindows.layout
===================================================================
--- /code/trunk/data/gui/layouts/VanillaWindows.layout	(revision 6745)
+++ 	(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/trunk/data/gui/layouts/cegui8.layout
===================================================================
--- /code/trunk/data/gui/layouts/cegui8.layout	(revision 6745)
+++ 	(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/trunk/data/gui/layouts/facial.layout
===================================================================
--- /code/trunk/data/gui/layouts/facial.layout	(revision 6745)
+++ 	(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/trunk/data/gui/layouts/ogregui.layout
===================================================================
--- /code/trunk/data/gui/layouts/ogregui.layout	(revision 6745)
+++ 	(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/trunk/data/gui/layouts/shadows.layout
===================================================================
--- /code/trunk/data/gui/layouts/shadows.layout	(revision 6745)
+++ 	(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/trunk/data/gui/schemes/Demo8.scheme
===================================================================
--- /code/trunk/data/gui/schemes/Demo8.scheme	(revision 6745)
+++ 	(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/trunk/data/gui/schemes/Looks.txt
===================================================================
--- /code/trunk/data/gui/schemes/Looks.txt	(revision 6746)
+++ /code/trunk/data/gui/schemes/Looks.txt	(revision 6746)
@@ -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/trunk/data/gui/schemes/OrxonoxGUIScheme.scheme
===================================================================
--- /code/trunk/data/gui/schemes/OrxonoxGUIScheme.scheme	(revision 6745)
+++ /code/trunk/data/gui/schemes/OrxonoxGUIScheme.scheme	(revision 6746)
@@ -3,3 +3,6 @@
     <Imageset Name="MainMenuBackground" Filename="MainMenuBackground.imageset"/>
     <Imageset Name="PickupInventory" Filename="PickupInventory.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/trunk/data/gui/schemes/SleekSpaceHUDWidgets.scheme
===================================================================
--- /code/trunk/data/gui/schemes/SleekSpaceHUDWidgets.scheme	(revision 6746)
+++ /code/trunk/data/gui/schemes/SleekSpaceHUDWidgets.scheme	(revision 6746)
@@ -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/trunk/data/gui/schemes/SleekSpaceLook.scheme
===================================================================
--- /code/trunk/data/gui/schemes/SleekSpaceLook.scheme	(revision 6746)
+++ /code/trunk/data/gui/schemes/SleekSpaceLook.scheme	(revision 6746)
@@ -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/trunk/data/gui/schemes/SleekSpaceMenuWidgets.scheme
===================================================================
--- /code/trunk/data/gui/schemes/SleekSpaceMenuWidgets.scheme	(revision 6746)
+++ /code/trunk/data/gui/schemes/SleekSpaceMenuWidgets.scheme	(revision 6746)
@@ -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/trunk/data/gui/schemes/TaharezGreenHUDWidgets.scheme
===================================================================
--- /code/trunk/data/gui/schemes/TaharezGreenHUDWidgets.scheme	(revision 6746)
+++ /code/trunk/data/gui/schemes/TaharezGreenHUDWidgets.scheme	(revision 6746)
@@ -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/trunk/data/gui/schemes/TaharezGreenLook.scheme
===================================================================
--- /code/trunk/data/gui/schemes/TaharezGreenLook.scheme	(revision 6746)
+++ /code/trunk/data/gui/schemes/TaharezGreenLook.scheme	(revision 6746)
@@ -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/trunk/data/gui/schemes/TaharezGreenMenuWidgets.scheme
===================================================================
--- /code/trunk/data/gui/schemes/TaharezGreenMenuWidgets.scheme	(revision 6746)
+++ /code/trunk/data/gui/schemes/TaharezGreenMenuWidgets.scheme	(revision 6746)
@@ -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/trunk/data/gui/schemes/TaharezHUDWidgets.scheme
===================================================================
--- /code/trunk/data/gui/schemes/TaharezHUDWidgets.scheme	(revision 6746)
+++ /code/trunk/data/gui/schemes/TaharezHUDWidgets.scheme	(revision 6746)
@@ -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/trunk/data/gui/schemes/TaharezLook.scheme
===================================================================
--- /code/trunk/data/gui/schemes/TaharezLook.scheme	(revision 6745)
+++ /code/trunk/data/gui/schemes/TaharezLook.scheme	(revision 6746)
@@ -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/trunk/data/gui/schemes/TaharezLookSkin.scheme
===================================================================
--- /code/trunk/data/gui/schemes/TaharezLookSkin.scheme	(revision 6745)
+++ 	(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/trunk/data/gui/schemes/TaharezLookWidgetAliases.scheme
===================================================================
--- /code/trunk/data/gui/schemes/TaharezLookWidgetAliases.scheme	(revision 6745)
+++ 	(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/trunk/data/gui/schemes/TaharezLookWidgets.scheme
===================================================================
--- /code/trunk/data/gui/schemes/TaharezLookWidgets.scheme	(revision 6745)
+++ 	(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/trunk/data/gui/schemes/TaharezMenuWidgets.scheme
===================================================================
--- /code/trunk/data/gui/schemes/TaharezMenuWidgets.scheme	(revision 6746)
+++ /code/trunk/data/gui/schemes/TaharezMenuWidgets.scheme	(revision 6746)
@@ -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/trunk/data/gui/schemes/VanillaHUDWidgets.scheme
===================================================================
--- /code/trunk/data/gui/schemes/VanillaHUDWidgets.scheme	(revision 6746)
+++ /code/trunk/data/gui/schemes/VanillaHUDWidgets.scheme	(revision 6746)
@@ -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/trunk/data/gui/schemes/VanillaLook.scheme
===================================================================
--- /code/trunk/data/gui/schemes/VanillaLook.scheme	(revision 6746)
+++ /code/trunk/data/gui/schemes/VanillaLook.scheme	(revision 6746)
@@ -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/trunk/data/gui/schemes/VanillaMenuWidgets.scheme
===================================================================
--- /code/trunk/data/gui/schemes/VanillaMenuWidgets.scheme	(revision 6746)
+++ /code/trunk/data/gui/schemes/VanillaMenuWidgets.scheme	(revision 6746)
@@ -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/trunk/data/gui/schemes/VanillaSkin.scheme
===================================================================
--- /code/trunk/data/gui/schemes/VanillaSkin.scheme	(revision 6745)
+++ 	(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/trunk/data/gui/schemes/WindowsHUDWidgets.scheme
===================================================================
--- /code/trunk/data/gui/schemes/WindowsHUDWidgets.scheme	(revision 6746)
+++ /code/trunk/data/gui/schemes/WindowsHUDWidgets.scheme	(revision 6746)
@@ -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/trunk/data/gui/schemes/WindowsLook.scheme
===================================================================
--- /code/trunk/data/gui/schemes/WindowsLook.scheme	(revision 6745)
+++ /code/trunk/data/gui/schemes/WindowsLook.scheme	(revision 6746)
@@ -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/trunk/data/gui/schemes/WindowsLookWidgets.scheme
===================================================================
--- /code/trunk/data/gui/schemes/WindowsLookWidgets.scheme	(revision 6745)
+++ 	(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/trunk/data/gui/schemes/WindowsMenuWidgets.scheme
===================================================================
--- /code/trunk/data/gui/schemes/WindowsMenuWidgets.scheme	(revision 6746)
+++ /code/trunk/data/gui/schemes/WindowsMenuWidgets.scheme	(revision 6746)
@@ -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/trunk/data/gui/scripts/AudioMenu.lua
===================================================================
--- /code/trunk/data/gui/scripts/AudioMenu.lua	(revision 6745)
+++ /code/trunk/data/gui/scripts/AudioMenu.lua	(revision 6746)
@@ -1,16 +1,7 @@
 -- AudioMenu.lua
 
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
-if _REQUIREDNAME == nil then
-    AudioMenu = P
-else
-    _G[_REQUIREDNAME] = P
-end
+local P = createMenuSheet("AudioMenu")
 
-P.filename = "AudioMenu"
-P.layoutString = "AudioMenu.layout"
-
-function P:init()
+function P.onLoad()
     soundMgr = orxonox.SoundManager:getInstance()
     block = false
@@ -43,5 +34,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
@@ -178,5 +169,5 @@
 
 function P.AudioBackButton_clicked(e)
-    hideGUI(P.filename)
+    hideMenuSheet(P.name)
 end
 
Index: de/trunk/data/gui/scripts/BasicGUI.lua
===================================================================
--- /code/trunk/data/gui/scripts/BasicGUI.lua	(revision 6745)
+++ 	(revision )
@@ -1,42 +1,0 @@
--- gui.lua
-
-local P = {}
-if _REQUIREDNAME == nil then
-    BasicGUI = P
-else
-    _G[_REQUIREDNAME] = P
-end
-
-P.overlay = nil
-
--- constructor of the GUI
-function P:new (gui, fname)
-    local newElement = { window = gui, filename = fname, visible = false } or {}
-    setmetatable(newElement, self) -- connects new element with class
-    self.__index = self
-    return newElement
-end
-
-function P:init()
--- this function is empty and intended for inheriting GUIs to use
-end
-
--- hide function for the GUI
-function P:hide ()
-    self.window:hide()
-    self.visible = false
-end
-
--- show function for the GUI
-function P:show ()
-    self.window:show()
-    self.visible = true
-end
-
-function P:load ()
-    self.window = winMgr:loadWindowLayout(self.layoutString)
-    self:init()
-    return self
-end
-
-return P
Index: /code/trunk/data/gui/scripts/ControlsMenu.lua
===================================================================
--- /code/trunk/data/gui/scripts/ControlsMenu.lua	(revision 6745)
+++ /code/trunk/data/gui/scripts/ControlsMenu.lua	(revision 6746)
@@ -1,25 +1,16 @@
 -- ControlsMenu.lua
 
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
-if _REQUIREDNAME == nil then
-    ControlsMenu = P
-else
-    _G[_REQUIREDNAME] = P
-end
-
-P.filename = "ControlsMenu"
-P.layoutString = "ControlsMenu.layout"
+local P = createMenuSheet("ControlsMenu")
 
 function P.ControlsMouseControlsButton_clicked(e)
-    showGUI("MouseControlsMenu", true)
+    showMenuSheet("MouseControlsMenu", true)
 end
 
 function P.ControlsKeyboardControlsButton_clicked(e)
-    showGUI("KeyBindMenu", true)
+    showMenuSheet("KeyBindMenu", true)
 end
 
 function P.ControlsBackButton_clicked(e)
-    hideGUI(P.filename)
+    hideMenuSheet(P.name)
 end
 
Index: /code/trunk/data/gui/scripts/CreditsMenu.lua
===================================================================
--- /code/trunk/data/gui/scripts/CreditsMenu.lua	(revision 6745)
+++ /code/trunk/data/gui/scripts/CreditsMenu.lua	(revision 6746)
@@ -1,17 +1,8 @@
 -- CreditsMenu.lua
 
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
-if _REQUIREDNAME == nil then
-    CreditsMenu = P
-else
-    _G[_REQUIREDNAME] = P
-end
-
-P.filename = "CreditsMenu"
-P.layoutString = "CreditsMenu.layout"
+local P = createMenuSheet("CreditsMenu")
 
 function P.CreditsBackButton_clicked(e)
-    hideGUI(P.filename)
+    hideMenuSheet(P.name)
 end
 
Index: /code/trunk/data/gui/scripts/DecisionPopup.lua
===================================================================
--- /code/trunk/data/gui/scripts/DecisionPopup.lua	(revision 6745)
+++ /code/trunk/data/gui/scripts/DecisionPopup.lua	(revision 6746)
@@ -1,17 +1,5 @@
 -- DecisionPopup.lua
 
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
-if _REQUIREDNAME == nil then
-    DecisionPopup = P
-else
-    _G[_REQUIREDNAME] = P
-end
-
-P.filename = "DecisionPopup"
-P.layoutString = "DecisionPopup.layout"
-
-function P:init()
-end
+local P = createMenuSheet("DecisionPopup")
 
 function P.setCallback(functionPtr)
@@ -28,5 +16,5 @@
         P.functionPtr(true)
     end
-    hideGUI("DecisionPopup")
+    hideMenuSheet("DecisionPopup")
 end
 
@@ -35,5 +23,5 @@
         P.functionPtr(false)
     end
-    hideGUI("DecisionPopup")
+    hideMenuSheet("DecisionPopup")
 end
 
Index: /code/trunk/data/gui/scripts/GUISheet.lua
===================================================================
--- /code/trunk/data/gui/scripts/GUISheet.lua	(revision 6746)
+++ /code/trunk/data/gui/scripts/GUISheet.lua	(revision 6746)
@@ -0,0 +1,43 @@
+-- GUISheet.lua
+
+local P = {}
+_G[_REQUIREDNAME or "GUISheet"] = P
+P.__index = P
+
+-- Don't use directly --> use HUDSheet.new or MenuSheet.new
+function P.new(_name)
+    local newSheet = { name = _name }
+    setmetatable(newSheet, P)
+    return newSheet
+end
+
+-- Override this function if you need to do work on load
+function P:onLoad()
+end
+
+-- hide function for the GUI
+function P:hide()
+    self.window:hide()
+    self.bVisible = false
+end
+
+-- show function for the GUI
+function P:show()
+    self.window:show()
+    self.bVisible = true
+end
+
+function P:load()
+    -- Load the layout that describes the sheet
+    self.window = winMgr:loadWindowLayout(self.name .. ".layout")
+    if self.window == nil then
+        error("Could not load layout file for GUI sheet '"..self.name.."'")
+    end
+    -- Hide it at first
+    self:hide()
+    -- Allow sheets to do some work upon loading
+    self:onLoad()
+    return self
+end
+
+return P
Index: /code/trunk/data/gui/scripts/GUITools.lua
===================================================================
--- /code/trunk/data/gui/scripts/GUITools.lua	(revision 6745)
+++ /code/trunk/data/gui/scripts/GUITools.lua	(revision 6746)
@@ -1,4 +1,19 @@
+-- Returns a new menu sheet
+-- See MenuSheet.new for details about the parameters
+function createMenuSheet(name, bHidePrevious, tShowCursor, tUseKeyboard, bBlockJoyStick)
+    local sheet = require("MenuSheet").new(name, bHidePrevious, tShowCursor, tUseKeyboard, bBlockJoyStick)
+    _G[sheet.name] = sheet -- Global access required because of the event handlers
+    return sheet
+end
+
+-- Returns a new HUD sheet
+function createHUDSheet(name)
+    local sheet = require("HUDSheet").new(name)
+    _G[sheet.name] = sheet -- Global access required because of the event handlers
+    return sheet
+end
+
 function openDecisionPopup( text, callbackPtr )
-    showGUI("DecisionPopup", false, true)
+    showMenuSheet("DecisionPopup", false, true)
     DecisionPopup.setCallback(callbackPtr)
     DecisionPopup.setText(text)
@@ -6,5 +21,5 @@
 
 function openInfoPopup(text, functionPtr, closeButton, arguments)
-    showGUI("InfoPopup", false, true)
+    showMenuSheet("InfoPopup", false, true)
     InfoPopup.execute(functionPtr, arguments)
     InfoPopup.setText(text)
Index: /code/trunk/data/gui/scripts/GameplayMenu.lua
===================================================================
--- /code/trunk/data/gui/scripts/GameplayMenu.lua	(revision 6745)
+++ /code/trunk/data/gui/scripts/GameplayMenu.lua	(revision 6746)
@@ -1,16 +1,7 @@
 -- GameplayMenu.lua
 
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
-if _REQUIREDNAME == nil then
-    GameplayMenu = P
-else
-    _G[_REQUIREDNAME] = P
-end
+local P = createMenuSheet("GameplayMenu")
 
-P.filename = "GameplayMenu"
-P.layoutString = "GameplayMenu.layout"
-
-function P:init()
+function P.onLoad()
     dropdown = winMgr:getWindow("orxonox/ThemeCombobox")
     local themeList = {}
@@ -20,5 +11,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
@@ -27,24 +18,24 @@
 function P.GameplayThemeCombobox_changed(e)
     -- theme
-    debug("event: theme")
+    logMessage(0, "event: theme")
 end
 
 function P.GameplayDifficultyEasyButton_clicked(e)
     -- difficulty easy
-    debug("event: easy")
+    logMessage(0, "event: easy")
 end
 
 function P.GameplayDifficultyNormalButton_clicked(e)
     -- difficulty normal
-    debug("event: normal")
+    logMessage(0, "event: normal")
 end
 
 function P.GameplayDifficultyHardButton_clicked(e)
     -- difficulty hard
-    debug("event: hard")
+    logMessage(0, "event: hard")
 end
 
 function P.GameplayBackButton_clicked(e)
-    hideGUI(P.filename)
+    hideMenuSheet(P.name)
 end
 
Index: /code/trunk/data/gui/scripts/GraphicsMenu.lua
===================================================================
--- /code/trunk/data/gui/scripts/GraphicsMenu.lua	(revision 6745)
+++ /code/trunk/data/gui/scripts/GraphicsMenu.lua	(revision 6746)
@@ -1,16 +1,7 @@
 -- GraphicsMenu.lua
 
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
-if _REQUIREDNAME == nil then
-    GraphicsMenu = P
-else
-    _G[_REQUIREDNAME] = P
-end
+local P = createMenuSheet("GraphicsMenu")
 
-P.filename = "GraphicsMenu"
-P.layoutString = "GraphicsMenu.layout"
-
-function P:init()
+function P.onLoad()
     block = true
     file = orxonox.PathConfig:getConfigPathString() .. orxonox.getConfig("GraphicsManager", "ogreConfigFile_")
@@ -62,5 +53,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
@@ -152,5 +143,5 @@
     if scrollbar_active == false then
         -- brightness
-        debug("event: brightness")
+        logMessage(0, "event: brightness")
     end
 end
@@ -162,5 +153,5 @@
 function P.GraphicsBrightnessScrollbar_ended(e)
     -- brightness
-    debug("event: brightness")
+    logMessage(0, "event: brightness")
     scrollbar_active = false
 end
@@ -201,5 +192,5 @@
 
 function P.GraphicsBackButton_clicked(e)
-    hideGUI(P.filename)
+    hideMenuSheet(P.name)
 end
 
Index: /code/trunk/data/gui/scripts/HUDSheet.lua
===================================================================
--- /code/trunk/data/gui/scripts/HUDSheet.lua	(revision 6746)
+++ /code/trunk/data/gui/scripts/HUDSheet.lua	(revision 6746)
@@ -0,0 +1,15 @@
+-- HUDSheet.lua
+
+local P = {} -- Local alias, always use it in this file
+HUDSheet = P -- Global name
+setmetatable(P, require("GUISheet")) -- Inherit from GUISheet
+P.__index = P -- Provide class character
+
+-- Use this function to construct a new HUDSheet
+function P.new(name)
+    local newSheet = GUISheet.new(name)
+    setmetatable(newSheet, P)
+    return newSheet
+end
+
+return P
Index: /code/trunk/data/gui/scripts/InGameMenu.lua
===================================================================
--- /code/trunk/data/gui/scripts/InGameMenu.lua	(revision 6745)
+++ /code/trunk/data/gui/scripts/InGameMenu.lua	(revision 6746)
@@ -1,18 +1,5 @@
 -- InGameMenu.lua
 
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
-if _REQUIREDNAME == nil then
-    InGameMenu = P
-else
-    _G[_REQUIREDNAME] = P
-end
-
-P.filename = "InGameMenu"
-P.layoutString = "InGameMenu.layout"
-
-function P:init()
-end
-
+local P = createMenuSheet("InGameMenu")
 
 -- events for ingamemenu
@@ -25,18 +12,18 @@
     orxonox.Game:getInstance():popState()
     orxonox.Game:getInstance():requestState("mainmenu")
-    hideGUI("InGameMenu")
+    hideMenuSheet("InGameMenu")
 end
 
 function P.button_settings_clicked(e)
-    showGUI("SettingsMenu", true)
+    showMenuSheet("SettingsMenu", true)
 end
 
 function P.button_return_clicked(e)
-    hideGUI("InGameMenu")
+    hideMenuSheet("InGameMenu")
 end
 
 function P.callback(doExit)
     if doExit then
-        hideGUI("InGameMenu")
+        hideMenuSheet("InGameMenu")
         orxonox.execute("exit")
     end
Index: /code/trunk/data/gui/scripts/InfoPopup.lua
===================================================================
--- /code/trunk/data/gui/scripts/InfoPopup.lua	(revision 6745)
+++ /code/trunk/data/gui/scripts/InfoPopup.lua	(revision 6746)
@@ -1,18 +1,5 @@
 -- InfoPopup.lua
 
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
-
-if _REQUIREDNAME == nil then
-    InfoPopup = P
-else
-    _G[_REQUIREDNAME] = P
-end
-
-P.filename = "InfoPopup"
-P.layoutString = "InfoPopup.layout"
-
-function P:init()
-end
+local P = createMenuSheet("InfoPopup")
 
 function P.execute(functionPtr, arguments)
@@ -26,5 +13,5 @@
 end
 
-function P.setText( text )
+function P.setText(text)
     winMgr:getWindow("orxonox/InfoPopup_text"):setText( text )
 end
@@ -42,5 +29,5 @@
 -- events for ingamemenu
 function P.close(e)
-    hideGUI("InfoPopup")
+    hideMenuSheet(P.name)
 end
 
Index: /code/trunk/data/gui/scripts/InitialiseGUI.lua
===================================================================
--- /code/trunk/data/gui/scripts/InitialiseGUI.lua	(revision 6745)
+++ /code/trunk/data/gui/scripts/InitialiseGUI.lua	(revision 6746)
@@ -1,228 +1,31 @@
-local schemeMgr = CEGUI.SchemeManager:getSingleton()
-winMgr = CEGUI.WindowManager:getSingleton()
-local logger = CEGUI.Logger:getSingleton()
-local system = CEGUI.System:getSingleton()
-local cursor = CEGUI.MouseCursor:getSingleton()
+-- Define some global shortcuts for common Managers
+guiMgr    = orxonox.GUIManager:getInstance()
+inputMgr  = orxonox.InputManager:getInstance()
+schemeMgr = CEGUI.SchemeManager:getSingleton()
+winMgr    = CEGUI.WindowManager:getSingleton()
 
-schemeMgr:loadScheme("TaharezLookSkin.scheme")
--- load scheme with our own images
+-- 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")
+local system = CEGUI.System:getSingleton()
+system:setDefaultMouseCursor(menuImageSet, "MouseArrow")
 system:setDefaultFont("BlueHighway-12")
-system:setDefaultTooltip("TaharezLook/Tooltip")
+system:setDefaultTooltip("MenuWidgets/Tooltip")
 
-loadedGUIs = {}
-cursorVisibility = {}
-activeSheets = {}
-nrOfActiveSheets = 0
-root = nil
-bShowsCursor = false
-bHidePrevious = {}
-
--- Require all tools
+-- Convenience function and additional tools
 require("GUITools")
-
--- loads the GUI with the specified filename
--- be sure to set the global variable "filename" before calling this function
-function loadGUI(filename)
-    -- check if it already exists
-    loadedGui = loadedGUIs[filename]
-    if loadedGui == nil then
-        loadedGuiNS = require(filename)
-        if loadedGuiNS == nil then
-            return
-        end
-        loadedGui = loadedGuiNS:load()
-        loadedGUIs[filename] = loadedGui
-        -- if there has no GUI been loaded yet, set new GUI as current
-        if table.getn(loadedGUIs) == 1 then
-            current = loadedGUIs[1]
-        end
-        -- hide new GUI as we do not want to show it accidentially
-        loadedGui:hide()
-    end
-    return loadedGui
-end
-
-function showGUI(filename, hidePrevious, bCursorVisible, ptr)
-    gui = showGUI(filename, hidePrevious, bCursorVisible)
-    gui.overlay = ptr
-end
-
--- shows the specified and loads it if not loaded already
--- be sure to set the global variable "filename" before calling this function
-function showGUI(filename, hidePrevious, bCursorVisible)
-    if bCursorVisible == nil then
-        if nrOfActiveSheets > 0 then
-            bCursorVisible = cursorVisibility[activeSheets[nrOfActiveSheets]]
-        else
-            bCursorVisible = true
-        end
-    end
-
-    if root == nil then
-        setBackground("")
-    end
-
-    local currentGUI = loadedGUIs[filename]
-    if(currentGUI == nil) then
-        currentGUI = loadGUI(filename)
-    end
-
-    if(root:isChild(currentGUI.window)) then
-        root:removeChildWindow(currentGUI.window)
-    end
-    root:addChildWindow(currentGUI.window)
-
-    if bCursorVisible then
-        showCursor()
-    else
-        hideCursor()
-    end
-
-    if find( activeSheets, filename ) ~= nil then
-        table.remove( activeSheets, find( activeSheets, filename ) )
-        nrOfActiveSheets = nrOfActiveSheets - 1
-    else
-        if nrOfActiveSheets == 0 then
-            orxonox.InputManager:getInstance():enterState("guiMouseOnly")
-            orxonox.HumanController:pauseControl()
-        end
-    end
-    nrOfActiveSheets = nrOfActiveSheets + 1
-    table.insert(activeSheets, filename)
-    activeSheets[nrOfActiveSheets] = filename
-    bHidePrevious[filename]=hidePrevious
-    cursorVisibility[filename] = bCursorVisible
-
-    if hidePrevious == true then
-        for i=1,nrOfActiveSheets-1 do
-            loadedGUIs[ activeSheets[i] ]:hide()
-        end
-    end
-    currentGUI:show()
-    return currentGUI
-end
-
-function hideCursor()
-    if bShowsCursor==true then
-        bShowsCursor=false
-        cursor:hide()
-    end
-end
-
-function showCursor()
-    if bShowsCursor==false then
-        bShowsCursor=true
-        cursor:show()
-    end
-end
-
-function hideGUI(filename)
-    local currentGUI = loadedGUIs[filename]
-    if currentGUI == nil then
-        return
-    end
-    currentGUI:hide()
-    if bHidePrevious[filename] == true then
-        local i = nrOfActiveSheets-1
-        while i>0 do
-            loadedGUIs[ activeSheets[i] ]:show()
-            if bHidePrevious[filename]==true then
-                break
-            else
-                i=i-1
-            end
-        end
-    end
-    root:removeChildWindow(currentGUI.window)
-    local i=1
-    while activeSheets[i] do
-        if activeSheets[i+1] == nil then
-            if activeSheets[i-1] ~= nil then
-                if cursorVisibility[ activeSheets[i-1] ] == true then
-                    showCursor()
-                else
-                    hideCursor()
-                end
-            else
-                hideCursor()
-            end
-        end
-        if activeSheets[i] == filename then
-            table.remove( activeSheets, i )
-            nrOfActiveSheets = nrOfActiveSheets-1
-        else
-            i = i+1
-        end
-    end
-    cursorVisibility[filename] = nil -- remove the cursor visibility of the current gui from the table
-    bHidePrevious[filename] = nil
-    if nrOfActiveSheets == 0 then
-        orxonox.InputManager:getInstance():leaveState("guiMouseOnly")
-        orxonox.HumanController:resumeControl()
-        hideCursor()
-    end
-end
-
-function hideAllGUIs()
-    while nrOfActiveSheets ~= 0 do
-        hideGUI(activeSheets[nrOfActiveSheets])
-    end
-end
-
-function keyESC()
-    if nrOfActiveSheets == 1 and activeSheets[1] == "MainMenu" then
-        orxonox.execute("exit")
-    elseif nrOfActiveSheets > 0 then
-        orxonox.execute("hideGUI "..activeSheets[nrOfActiveSheets])
-    else
-        showGUI("InGameMenu")
-    end
-end
-
-function setBackground(filename)
-    local newroot
-    if root ~= nil then
-        root:rename("oldRootWindow")
-    end
-    if filename ~= "" then
-        newroot = winMgr:loadWindowLayout(filename .. ".layout")
-        newroot:rename("AbsoluteRootWindow")
-        system:setGUISheet(newroot)
-    else
-        newroot = winMgr:createWindow("DefaultWindow", "AbsoluteRootWindow")
-        newroot:setProperty("Alpha", "0.0")
-        newroot:setSize(CEGUI.UVector2(CEGUI.UDim(1.0,0),CEGUI.UDim(1.0,0)))
-        system:setGUISheet(newroot)
-    end
-    if root ~= nil then
-        local child
-        while root:getChildCount()~=0 do
-            child = root:getChildAtIdx(0)
-            root:removeChildWindow(child)
-            newroot:addChildWindow(child)
-        end
-        winMgr:destroyWindow(root)
-    end
-    newroot:show()
-    root = newroot
-end
-
-function find(table, value)
-    local i=0
-    while table[i] ~= nil do
-        if table[i]==value then
-            return i
-        else
-            i=i+1
-        end
-    end
-    return nil
-end
-
---TODO: Needed?
-function test(e)
-    debug(0, "Blubb")
-end
Index: /code/trunk/data/gui/scripts/KeyBindMenu.lua
===================================================================
--- /code/trunk/data/gui/scripts/KeyBindMenu.lua	(revision 6745)
+++ /code/trunk/data/gui/scripts/KeyBindMenu.lua	(revision 6746)
@@ -1,17 +1,7 @@
 -- KeyBindMenu.lua
 
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
-
-if _REQUIREDNAME == nil then
-    KeyBindMenu = P
-else
-    _G[_REQUIREDNAME] = P
-end
-
-P.filename = "KeyBindMenu"
-P.layoutString = "KeyBindMenu.layout"
-
-function P:init()
+local P = createMenuSheet("KeyBindMenu")
+
+function P.onLoad()
 
     commandList = {}
@@ -68,5 +58,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 +115,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,9 +122,9 @@
     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)))
     plus:setText("add")
-    orxonox.GUIManager:subscribeEventHelper(plus, "Clicked", P.filename .. ".KeyBindPlus_clicked")
+    orxonox.GUIManager:subscribeEventHelper(plus, "Clicked", P.name .. ".KeyBindPlus_clicked")
     line:addChildWindow(plus)
     offset = offset + addWidth + spaceWidth
@@ -142,5 +132,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)
@@ -151,14 +141,14 @@
         button:setSize(CEGUI.UVector2(CEGUI.UDim(0, buttonWidth), CEGUI.UDim(0.7, 0)))
         button:setPosition(CEGUI.UVector2(CEGUI.UDim(0, offset), CEGUI.UDim(0.15, 0)))
-        orxonox.GUIManager:subscribeEventHelper(button, "Clicked", P.filename .. ".KeyBindButton_clicked")
-        --button:subscribeScriptedEvent("EventClicked", P.filename .. ".KeyBindButton_clicked")
+        orxonox.GUIManager:subscribeEventHelper(button, "Clicked", P.name .. ".KeyBindButton_clicked")
+        --button:subscribeScriptedEvent("EventClicked", P.name .. ".KeyBindButton_clicked")
         line:addChildWindow(button)
         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)))
         clear:setText("X")
-        orxonox.GUIManager:subscribeEventHelper(clear, "Clicked", P.filename .. ".KeyBindClear_clicked")
+        orxonox.GUIManager:subscribeEventHelper(clear, "Clicked", P.name .. ".KeyBindClear_clicked")
         line:addChildWindow(clear)
         offset = offset + clearWidth + spaceWidth
@@ -254,5 +244,5 @@
 
 function P.KeyBindBackButton_clicked(e)
-    hideGUI("KeyBindMenu")
+    hideMenuSheet("KeyBindMenu")
 end
 
Index: /code/trunk/data/gui/scripts/MainMenu.lua
===================================================================
--- /code/trunk/data/gui/scripts/MainMenu.lua	(revision 6745)
+++ /code/trunk/data/gui/scripts/MainMenu.lua	(revision 6746)
@@ -1,14 +1,5 @@
 -- MainMenu.lua
 
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
-if _REQUIREDNAME == nil then
-    MainMenu = P
-else
-    _G[_REQUIREDNAME] = P
-end
-
-P.filename = "MainMenu"
-P.layoutString = "MainMenu.layout"
+local P = createMenuSheet("MainMenu")
 
 -- events for MainMenu
@@ -18,17 +9,17 @@
 
 function P.SingleplayerButton_clicked(e)
-    showGUI("SingleplayerMenu", true)
+    showMenuSheet("SingleplayerMenu", true)
 end
 
 function P.MultiplayerButton_clicked(e)
-    showGUI("MultiplayerMenu", true)
+    showMenuSheet("MultiplayerMenu", true)
 end
 
 function P.SettingsButton_clicked(e)
-    showGUI("SettingsMenu", true)
+    showMenuSheet("SettingsMenu", true)
 end
 
 function P.CreditsButton_clicked(e)
-    showGUI("CreditsMenu", true)
+    showMenuSheet("CreditsMenu", true)
 end
 
Index: /code/trunk/data/gui/scripts/MenuSheet.lua
===================================================================
--- /code/trunk/data/gui/scripts/MenuSheet.lua	(revision 6746)
+++ /code/trunk/data/gui/scripts/MenuSheet.lua	(revision 6746)
@@ -0,0 +1,36 @@
+-- MenuSheet.lua
+-- Base class for all GUI sheets that represent a menu.
+-- Inherits itself from GUISheet
+
+local P = {}  -- Local alias, always use it in this file
+MenuSheet = P -- Global name
+setmetatable(P, require("GUISheet")) -- Inherit from GUISheet
+P.__index = P -- Provide class character
+
+-- Use this function to construct a new MenuSheet.
+-- Parameters:
+-- Except for _name, you can provide nil. Then the default value will be used.
+-- For _tShowCusor and _tUseKeyboard you can specify TriBool.Dontcare if the value doesn't matter at all. Then the value of the underlaying sheet will be used.
+function P.new(_name, _bHidePrevious, _tShowCursor, _tUseKeyboard, _bBlockJoyStick)
+    local newSheet = GUISheet.new(_name)
+    newSheet.bHidePrevious  = handleDefArg(_bHidePrevious,  true)
+    newSheet.tShowCursor    = handleDefArg(_tShowCusor,     TriBool.True)
+    newSheet.tUseKeyboard   = handleDefArg(_tUseKeyboard,   TriBool.Dontcare)
+    newSheet.bBlockJoyStick = handleDefArg(_bBlockJoyStick, false)
+
+    setmetatable(newSheet, P)
+    return newSheet
+end
+
+function P:load()
+    -- Create the input state
+    self.inputState = guiMgr:createInputState("GUI_" .. self.name,
+        self.tShowCursor, self.tUseKeyboard, self.bBlockJoyStick)
+
+    -- load() of base 'class'
+    GUISheet.load(self)
+
+    return self
+end
+
+return P
Index: /code/trunk/data/gui/scripts/MouseControlsMenu.lua
===================================================================
--- /code/trunk/data/gui/scripts/MouseControlsMenu.lua	(revision 6745)
+++ /code/trunk/data/gui/scripts/MouseControlsMenu.lua	(revision 6746)
@@ -1,16 +1,7 @@
 -- MouseControlsMenu.lua
 
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
-if _REQUIREDNAME == nil then
-    MouseControlsMenu = P
-else
-    _G[_REQUIREDNAME] = P
-end
+local P = createMenuSheet("MouseControlsMenu")
 
-P.filename = "MouseControlsMenu"
-P.layoutString = "MouseControlsMenu.layout"
-
-function P:init()
+function P.onLoad()
     block = false
     mousenormalscrollbarwindow = tolua.cast(winMgr:getWindow("orxonox/MouseNormalScrollbar"),"CEGUI::Scrollbar")
@@ -104,5 +95,5 @@
 
 function P.MouseControlsBackButton_clicked(e)
-    hideGUI(P.filename)
+    hideMenuSheet(P.name)
 end
 
Index: /code/trunk/data/gui/scripts/MultiplayerMenu.lua
===================================================================
--- /code/trunk/data/gui/scripts/MultiplayerMenu.lua	(revision 6745)
+++ /code/trunk/data/gui/scripts/MultiplayerMenu.lua	(revision 6746)
@@ -1,16 +1,7 @@
 -- MultiplayerMenu.lua
 
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
-if _REQUIREDNAME == nil then
-    MultiplayerMenu = P
-else
-    _G[_REQUIREDNAME] = P
-end
+local P = createMenuSheet("MultiplayerMenu")
 
-P.filename = "MultiplayerMenu"
-P.layoutString = "MultiplayerMenu.layout"
-
-function P:init()
+function P.onLoad()
     listbox = winMgr:getWindow("orxonox/MultiplayerLevelListbox")
     preselect = orxonox.LevelManager:getInstance():getDefaultLevel()
@@ -30,5 +21,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
@@ -71,10 +62,10 @@
         orxonox.LevelManager:getInstance():setDefaultLevel(choice:getText() .. ".oxw")
         orxonox.execute(multiplayerMode)
-        hideAllGUIs()
+        hideAllMenuSheets()
     end
 end
 
 function P.MultiplayerBackButton_clicked(e)
-    hideGUI(P.filename)
+    hideMenuSheet(P.name)
 end
 
Index: /code/trunk/data/gui/scripts/MultiplayerOptionsMenu.lua
===================================================================
--- /code/trunk/data/gui/scripts/MultiplayerOptionsMenu.lua	(revision 6745)
+++ /code/trunk/data/gui/scripts/MultiplayerOptionsMenu.lua	(revision 6746)
@@ -1,17 +1,8 @@
 -- MultiplayerOptionsMenu.lua
 
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
-if _REQUIREDNAME == nil then
-    MultiplayerOptionsMenu = P
-else
-    _G[_REQUIREDNAME] = P
-end
-
-P.filename = "MultiplayerOptionsMenu"
-P.layoutString = "MultiplayerOptionsMenu.layout"
+local P = createMenuSheet("MultiplayerOptionsMenu")
 
 function P.MultiplayerOptionsBackButton_clicked(e)
-    hideGUI(P.filename)
+    hideMenuSheet(P.name)
 end
 
Index: /code/trunk/data/gui/scripts/PickupInventory.lua
===================================================================
--- /code/trunk/data/gui/scripts/PickupInventory.lua	(revision 6745)
+++ /code/trunk/data/gui/scripts/PickupInventory.lua	(revision 6746)
@@ -1,15 +1,5 @@
 -- PickupInventory.lua
 
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
-
-if _REQUIREDNAME == nil then
-    PickupInventory = P
-else
-    _G[_REQUIREDNAME] = P
-end
-
-P.filename = "PickupInventory"
-P.layoutString = "PickupInventory.layout"
+local P = createMenuSheet("PickupInventory")
 
 P.carrierList = {}
@@ -17,5 +7,5 @@
 P.detailsWindows = {}
 
-function P.init()
+function P.onLoad()
     carrierList = {}
 end
@@ -23,5 +13,5 @@
 function P.show()
     P.window:show() -- TODO: Do this through parent...
-    P.visible = true 
+    P.bVisible = true 
     
     P.createInventory()
@@ -137,5 +127,5 @@
         useButton:setSize(CEGUI.UVector2(CEGUI.UDim(0, buttonWidth), CEGUI.UDim(0, textHeight)))
         useButton:setText("use")
-        orxonox.GUIManager:subscribeEventHelper(useButton, "Clicked", P.filename .. ".InventoryUseButton_clicked")
+        orxonox.GUIManager:subscribeEventHelper(useButton, "Clicked", P.name .. ".InventoryUseButton_clicked")
         item:addChildWindow(useButton)
         
@@ -144,5 +134,5 @@
         dropButton:setSize(CEGUI.UVector2(CEGUI.UDim(0, buttonWidth), CEGUI.UDim(0, textHeight)))
         dropButton:setText("drop")
-        orxonox.GUIManager:subscribeEventHelper(dropButton, "Clicked", P.filename .. ".InventoryDropButton_clicked")
+        orxonox.GUIManager:subscribeEventHelper(dropButton, "Clicked", P.name .. ".InventoryDropButton_clicked")
         item:addChildWindow(dropButton)
         
@@ -151,5 +141,5 @@
         detailsButton:setSize(CEGUI.UVector2(CEGUI.UDim(0, buttonWidth), CEGUI.UDim(0, textHeight)))
         detailsButton:setText("details")
-        orxonox.GUIManager:subscribeEventHelper(detailsButton, "Clicked", P.filename .. ".InventoryDetailsButton_clicked")
+        orxonox.GUIManager:subscribeEventHelper(detailsButton, "Clicked", P.name .. ".InventoryDetailsButton_clicked")
         item:addChildWindow(detailsButton)
     end
@@ -201,5 +191,5 @@
     local window = winMgr:createWindow("TaharezLook/FrameWindow", name)
     window:setSize(CEGUI.UVector2(CEGUI.UDim(0.5,0),CEGUI.UDim(0.4,0)))
-    orxonox.GUIManager:subscribeEventHelper(window, "CloseClicked", P.filename .. ".closeDetailWindow")
+    orxonox.GUIManager:subscribeEventHelper(window, "CloseClicked", P.name .. ".closeDetailWindow")
     
     local root = winMgr:getWindow("orxonox/PickupInventory/Background")
@@ -240,5 +230,5 @@
     useButton:setSize(CEGUI.UVector2(CEGUI.UDim(0, buttonWidth), CEGUI.UDim(0, titleHeight)))
     useButton:setText("use")
-    orxonox.GUIManager:subscribeEventHelper(useButton, "Clicked", P.filename .. ".InventoryUseButton_clicked")
+    orxonox.GUIManager:subscribeEventHelper(useButton, "Clicked", P.name .. ".InventoryUseButton_clicked")
     wrapper:addChildWindow(useButton)
     
@@ -247,5 +237,5 @@
     dropButton:setSize(CEGUI.UVector2(CEGUI.UDim(0, buttonWidth), CEGUI.UDim(0, titleHeight)))
     dropButton:setText("drop")
-    orxonox.GUIManager:subscribeEventHelper(dropButton, "Clicked", P.filename .. ".InventoryDropButton_clicked")
+    orxonox.GUIManager:subscribeEventHelper(dropButton, "Clicked", P.name .. ".InventoryDropButton_clicked")
     wrapper:addChildWindow(dropButton)
     
Index: /code/trunk/data/gui/scripts/QuestGUI.lua
===================================================================
--- /code/trunk/data/gui/scripts/QuestGUI.lua	(revision 6745)
+++ /code/trunk/data/gui/scripts/QuestGUI.lua	(revision 6746)
@@ -1,16 +1,9 @@
-gui = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
-if _REQUIREDNAME == nil then
-    QuestGUI = P
-else
-    _G[_REQUIREDNAME] = P
-end
+-- QuestGUI.lua
 
-P.filename = "QuestGUI"
-P.layoutString = "QuestGUI.layout"
+local P = createMenuSheet("QuestGUI")
 
-function P:show()
-    self.window:show() -- TODO: Do this through parent...
-    self.visible = true
+function P.show()
+    P.window:show() -- TODO: Do this through parent...
+    P.visible = true
 
     local questManager = orxonox.QuestManager:getInstance()
@@ -18,5 +11,5 @@
     local questsList = winMgr:getWindow("orxonox/QuestGUI/QuestsList")
 
-    local window = questManager:getQuestGUI(P.filename)
+    local window = questManager:getQuestGUI(P.name)
 
     questsList:addChildWindow(window)
Index: /code/trunk/data/gui/scripts/SettingsMenu.lua
===================================================================
--- /code/trunk/data/gui/scripts/SettingsMenu.lua	(revision 6745)
+++ /code/trunk/data/gui/scripts/SettingsMenu.lua	(revision 6746)
@@ -1,42 +1,33 @@
 -- SettingsMenu.lua
 
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
-if _REQUIREDNAME == nil then
-    SettingsMenu = P
-else
-    _G[_REQUIREDNAME] = P
-end
-
-P.filename = "SettingsMenu"
-P.layoutString = "SettingsMenu.layout"
+local P = createMenuSheet("SettingsMenu")
 
 function P.SettingsGameplayButton_clicked(e)
-    showGUI("GameplayMenu", true)
+    showMenuSheet("GameplayMenu", true)
 end
 
 function P.SettingsMultiplayerOptionsButton_clicked(e)
-    showGUI("MultiplayerOptionsMenu", true)
+    showMenuSheet("MultiplayerOptionsMenu", true)
 end
 
 function P.SettingsControlsButton_clicked(e)
-    showGUI("ControlsMenu", true)
+    showMenuSheet("ControlsMenu", true)
 end
 
 function P.SettingsGraphicsButton_clicked(e)
-    showGUI("GraphicsMenu", true)
+    showMenuSheet("GraphicsMenu", true)
 end
 
 function P.SettingsAudioButton_clicked(e)
-    showGUI("AudioMenu", true)
+    showMenuSheet("AudioMenu", true)
 end
 
 function P.SettingsResetSettingsButton_clicked(e)
     -- reset settings
-    debug("event: reset settings")
+    logMessage(0, "event: reset settings")
 end
 
 function P.SettingsBackButton_clicked(e)
-    hideGUI(P.filename)
+    hideMenuSheet(P.name)
 end
 
Index: /code/trunk/data/gui/scripts/SheetManager.lua
===================================================================
--- /code/trunk/data/gui/scripts/SheetManager.lua	(revision 6746)
+++ /code/trunk/data/gui/scripts/SheetManager.lua	(revision 6746)
@@ -0,0 +1,197 @@
+-- SheetManager.lua
+
+local cursor = CEGUI.MouseCursor:getSingleton()
+local loadedSheets = {}
+local activeMenuSheets = {size = 0, topSheetTuple = nil}
+local menuSheetsRoot = guiMgr:getMenuRootWindow()
+
+-----------------------
+--- Local functions ---
+-----------------------
+
+local function hideCursor()
+    if cursor:isVisible() then
+        cursor:hide()
+    end
+end
+
+local function showCursor()
+    if not cursor:isVisible() and inputMgr:isMouseExclusive() then
+        cursor:show()
+    end
+end
+
+
+------------------------
+--- Global functions ---
+------------------------
+
+-- Loads the GUI with the specified name
+-- The name corresponds to the filename of the *.lua and *.layout files
+-- but without the extension
+function loadSheet(name)
+    -- Check if it has already been loaded
+    local sheet = loadedSheets[name]
+    if sheet == nil then
+        -- Load the sheet
+        sheet = require(name)
+        sheet:load()
+        loadedSheets[name] = sheet
+    end
+    return sheet
+end
+
+-- ?
+function showMenuSheet(name, bHidePrevious, ptr)
+    local sheet = showMenuSheet(name, bHidePrevious)
+    sheet.overlay = ptr
+    return sheet
+end
+
+-- Shows the specified menu sheet and loads it if neccessary
+function showMenuSheet(name, bHidePrevious)
+    if name == "" then
+        return nil
+    end
+    -- Get sheet (or load it)
+    local menuSheet = loadSheet(name)
+
+    -- Use sheet's value if nil was provided
+    if bHidePrevious == nil then
+        bHidePrevious = menuSheet.bHidePrevious
+        assert(bHidePrevious ~= nil)
+    end
+
+    -- Pause game control if this is the first menu to be displayed
+    -- HUGE HACK?
+    if activeMenuSheets.size == 0 then
+        orxonox.HumanController:pauseControl()
+    end
+
+    -- Hide if already displayed (to make sure it is up front in the end)
+    if activeMenuSheets[name] ~= nil then
+        hideMenuSheet(name)
+    end
+
+    -- Add the sheet in a tuple of additional information
+    local sheetTuple =
+    {
+        ["sheet"]          = menuSheet,
+        ["bHidePrevious"]  = bHidePrevious
+    }
+    table.insert(activeMenuSheets, sheetTuple) -- indexed array access
+    activeMenuSheets[name] = sheetTuple -- name access
+    activeMenuSheets.size = activeMenuSheets.size + 1
+    activeMenuSheets.topSheetTuple = sheetTuple
+
+    -- Add sheet to the root window
+    menuSheetsRoot:addChildWindow(menuSheet.window)
+
+    -- Handle input distribution
+    inputMgr:enterState(menuSheet.inputState)
+
+    -- Only change cursor situation if menuSheet.tShowCursor ~= TriBool.Dontcare
+    if menuSheet.tShowCursor == TriBool.True then
+        showCursor()
+    elseif menuSheet.tShowCursor == TriBool.False then
+        hideCursor()
+    end
+
+    -- Hide all previous sheets if necessary
+    if bHidePrevious then
+        for i = 1, activeMenuSheets.size - 1 do
+            activeMenuSheets[i].sheet:hide()
+        end
+    end
+
+    menuSheet:show()
+
+    return menuSheet
+end
+
+function hideMenuSheet(name)
+    local sheetTuple = activeMenuSheets[name]
+    if sheetTuple == nil then
+        return
+    end
+
+    -- Hide the sheet
+    sheetTuple.sheet:hide()
+
+    -- Show sheets that were hidden by the sheet to be removed
+    local i = activeMenuSheets.size
+    -- Only do something if all sheets on top of sheetTuple
+    -- have bHidePrevious == true and sheetTuple.bHidePrevious == true
+    while i > 0 do
+        if activeMenuSheets[i].bHidePrevious then
+            if activeMenuSheets[i] == sheetTuple then
+                i = i - 1
+                while i > 0 do
+                    activeMenuSheets[i].sheet:show()
+                    if activeMenuSheets[i].bHidePrevious then
+                        break
+                    end
+                    i = i - 1
+                end
+            end
+            break
+        end
+        i = i - 1
+    end
+
+    -- Remove sheet with its tuple from the table
+    menuSheetsRoot:removeChildWindow(sheetTuple.sheet.window)
+    table.remove(activeMenuSheets, table.findIndex(activeMenuSheets, sheetTuple))
+    activeMenuSheets[name] = nil
+    activeMenuSheets.size = activeMenuSheets.size - 1
+    activeMenuSheets.topSheetTuple = activeMenuSheets[activeMenuSheets.size]
+
+    -- Leave the input state
+    inputMgr:leaveState(sheetTuple.sheet.inputState)
+    
+    -- CURSOR SHOWING
+    local i = activeMenuSheets.size
+    -- Find top most sheet that doesn't have tShowCusor == TriBool.Dontcare
+    while i > 0 and activeMenuSheets[i].sheet.tShowCursor == TriBool.Dontcare do
+        i = i - 1
+    end
+    if i > 0 and activeMenuSheets[i].sheet.tShowCursor == TriBool.True then
+        showCursor()
+    else
+        hideCursor()
+    end
+
+    -- Resume control if the last menu is hidden
+    if activeMenuSheets.size == 0 then
+        orxonox.HumanController:resumeControl()
+        hideCursor()
+    end
+end
+
+-- Hides all menu GUI sheets
+function hideAllMenuSheets()
+    while activeMenuSheets.size ~= 0 do
+        hideMenuSheet(activeMenuSheets.topSheetTuple.sheet.name)
+    end
+end
+
+function keyESC()
+    -- HUGE, very HUGE hacks!
+    if activeMenuSheets.size == 1 and activeMenuSheets[1].sheet.name == "MainMenu" then
+        orxonox.execute("exit")
+    elseif activeMenuSheets.size > 0 then
+        orxonox.execute("hideGUI "..activeMenuSheets.topSheetTuple.sheet.name)
+    else
+        showMenuSheet("InGameMenu")
+    end
+end
+
+function setBackgroundImage(imageSet, imageName)
+    guiMgr:setBackgroundImage(imageSet, imageName)
+end
+
+----------------------
+--- Initialisation ---
+----------------------
+
+hideCursor()
Index: /code/trunk/data/gui/scripts/SingleplayerMenu.lua
===================================================================
--- /code/trunk/data/gui/scripts/SingleplayerMenu.lua	(revision 6745)
+++ /code/trunk/data/gui/scripts/SingleplayerMenu.lua	(revision 6746)
@@ -1,16 +1,7 @@
 -- SingleplayerMenu.lua
 
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
-if _REQUIREDNAME == nil then
-    SingleplayerMenu = P
-else
-    _G[_REQUIREDNAME] = P
-end
+local P = createMenuSheet("SingleplayerMenu")
 
-P.filename = "SingleplayerMenu"
-P.layoutString = "SingleplayerMenu.layout"
-
-function P:init()
+function P.onLoad()
     listbox = winMgr:getWindow("orxonox/SingleplayerLevelListbox")
     preselect = orxonox.LevelManager:getInstance():getDefaultLevel()
@@ -30,5 +21,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
@@ -43,10 +34,10 @@
         orxonox.LevelManager:getInstance():setDefaultLevel(choice:getText() .. ".oxw")
         orxonox.execute("startGame")
-        hideAllGUIs()
+        hideAllMenuSheets()
     end
 end
 
 function P.SingleplayerBackButton_clicked(e)
-    hideGUI(P.filename)
+    hideMenuSheet(P.name)
 end
 
Index: /code/trunk/data/lua/Debugger.lua
===================================================================
--- /code/trunk/data/lua/Debugger.lua	(revision 6746)
+++ /code/trunk/data/lua/Debugger.lua	(revision 6746)
@@ -0,0 +1,1358 @@
+
+--{{{  history
+
+--28/03/10 ORX Adjusted show() to work with the Orxonox resource system
+--15/03/06 DCN Created based on RemDebug
+--28/04/06 DCN Update for Lua 5.1
+--01/06/06 DCN Fix command argument parsing
+--             Add step/over N facility
+--             Add trace lines facility
+--05/06/06 DCN Add trace call/return facility
+--06/06/06 DCN Make it behave when stepping through the creation of a coroutine
+--06/06/06 DCN Integrate the simple debugger into the main one
+--07/06/06 DCN Provide facility to step into coroutines
+--13/06/06 DCN Fix bug that caused the function environment to get corrupted with the global one
+--14/06/06 DCN Allow 'sloppy' file names when setting breakpoints
+--04/08/06 DCN Allow for no space after command name
+--11/08/06 DCN Use io.write not print
+--30/08/06 DCN Allow access to array elements in 'dump'
+--10/10/06 DCN Default to breakfile for all commands that require a filename and give '-'
+--06/12/06 DCN Allow for punctuation characters in DUMP variable names
+--03/01/07 DCN Add pause on/off facility
+--19/06/07 DCN Allow for duff commands being typed in the debugger (thanks to Michael.Bringmann@lsi.com)
+--             Allow for case sensitive file systems               (thanks to Michael.Bringmann@lsi.com)
+
+--}}}
+--{{{  description
+
+--A simple command line debug system for Lua written by Dave Nichols of
+--Match-IT Limited. Its public domain software. Do with it as you wish.
+
+--This debugger was inspired by:
+-- RemDebug 1.0 Beta
+-- Copyright Kepler Project 2005 (http://www.keplerproject.org/remdebug)
+
+--Usage:
+--  require('debugger')        --load the debug library
+--  pause(message)             --start/resume a debug session
+
+--An assert() failure will also invoke the debugger.
+
+--}}}
+
+local IsWindows = string.find(string.lower(os.getenv('OS') or ''),'^windows')
+
+local coro_debugger
+local events = { BREAK = 1, WATCH = 2, STEP = 3, SET = 4 }
+local breakpoints = {}
+local watches = {}
+local step_into   = false
+local step_over   = false
+local step_lines  = 0
+local step_level  = {main=0}
+local stack_level = {main=0}
+local trace_level = {main=0}
+local trace_calls = false
+local trace_returns = false
+local trace_lines = false
+local ret_file, ret_line, ret_name
+local current_thread = 'main'
+local started = false
+local pause_off = false
+local _g      = _G
+local cocreate, cowrap = coroutine.create, coroutine.wrap
+local pausemsg = 'pause'
+
+--{{{  local hints -- command help
+--The format in here is name=summary|description
+local hints = {
+
+pause =   [[
+pause(msg)          -- start/resume a debugger session|
+
+This can only be used in your code or from the console as a means to
+start/resume a debug session.
+If msg is given that is shown when the session starts/resumes. Useful to
+give a context if you've instrumented your code with pause() statements.
+]],
+
+poff =    [[
+poff                -- turn off pause() command|
+
+This causes all pause() commands to be ignored. This is useful if you have
+instrumented your code in a busy loop and want to continue normal execution
+with no further interruption.
+]],
+
+pon =     [[
+pon                 -- turn on pause() command|
+
+This re-instates honouring the pause() commands you may have instrumented
+your code with.
+]],
+
+setb =    [[
+setb [line file]    -- set a breakpoint to line/file|
+
+If file is omitted or is "-" the breakpoint is set at the file for the
+currently set level (see "set"). Execution pauses when this line is about
+to be executed and the debugger session is re-activated.
+
+The file can be given as the fully qualified name, partially qualified or
+just the file name. E.g. if file is set as "myfile.lua", then whenever
+execution reaches any file that ends with "myfile.lua" it will pause.
+]],
+
+delb =    [[
+delb [line file]    -- removes a breakpoint|
+
+If file is omitted or is "-" the breakpoint is removed for the file of the
+currently set level (see "set").
+]],
+
+delallb = [[
+delallb             -- removes all breakpoints|
+]],
+
+setw =    [[
+setw <exp>          -- adds a new watch expression|
+
+The expression is evaluated before each line is executed. If the expression
+yields true then execution is paused and the debugger session re-activated.
+The expression is executed in the context of the line about to be executed.
+]],
+
+delw =    [[
+delw <index>        -- removes the watch expression at index|
+
+The index is that returned when the watch expression was set by setw.
+]],
+
+delallw = [[
+delallw             -- removes all watch expressions|
+]],
+
+run     = [[
+run                 -- run until next breakpoint or watch expression|
+]],
+
+step    = [[
+step [N]            -- run next N lines, stepping into function calls|
+
+If N is omitted, use 1.
+]],
+
+over    = [[
+over [N]            -- run next N lines, stepping over function calls|
+
+If N is omitted, use 1.
+]],
+
+out     = [[
+out [N]             -- run lines until stepped out of N functions|
+
+If N is omitted, use 1.
+If you are inside a function, using "out 1" will run until you return
+from that function to the caller.
+]],
+
+goto    = [[
+goto <line>         -- step to line number <line> in the current file|
+
+The line and current file are those in the currently set context level.
+]],
+
+listb   = [[
+listb               -- lists breakpoints|
+]],
+
+listw   = [[
+listw               -- lists watch expressions|
+]],
+
+set     = [[
+set [level]         -- set context to stack level, omitted=show|
+
+If level is omitted it just prints the current level set.
+This sets the current context to the level given. This affects the
+context used for several other functions (e.g. vars). The possible
+levels are those shown by trace.
+]],
+
+vars    = [[
+vars [depth]        -- list context locals to depth, omitted=1|
+
+If depth is omitted then uses 1.
+Use a depth of 0 for the maximum.
+Lists all non-nil local variables and all non-nil upvalues in the
+currently set context. For variables that are tables, lists all fields
+to the given depth.
+]],
+
+fenv    = [[
+fenv [depth]        -- list context function env to depth, omitted=1|
+
+If depth is omitted then uses 1.
+Use a depth of 0 for the maximum.
+Lists all function environment variables in the currently set context.
+For variables that are tables, lists all fields to the given depth.
+]],
+
+glob    = [[
+glob [depth]        -- list globals to depth, omitted=1|
+
+If depth is omitted then uses 1.
+Use a depth of 0 for the maximum.
+Lists all global variables.
+For variables that are tables, lists all fields to the given depth.
+]],
+
+ups     = [[
+ups                 -- list all the upvalue names|
+
+These names will also be in the "vars" list unless their value is nil.
+This provides a means to identify which vars are upvalues and which are
+locals. If a name is both an upvalue and a local, the local value takes
+precedance.
+]],
+
+locs    = [[
+locs                -- list all the locals names|
+
+These names will also be in the "vars" list unless their value is nil.
+This provides a means to identify which vars are upvalues and which are
+locals. If a name is both an upvalue and a local, the local value takes
+precedance.
+]],
+
+dump    = [[
+dump <var> [depth]  -- dump all fields of variable to depth|
+
+If depth is omitted then uses 1.
+Use a depth of 0 for the maximum.
+Prints the value of <var> in the currently set context level. If <var>
+is a table, lists all fields to the given depth. <var> can be just a
+name, or name.field or name.# to any depth, e.g. t.1.f accesses field
+'f' in array element 1 in table 't'.
+
+Can also be called from a script as dump(var,depth).
+]],
+
+tron    = [[
+tron [crl]          -- turn trace on for (c)alls, (r)etuns, (l)lines|
+
+If no parameter is given then tracing is turned off.
+When tracing is turned on a line is printed to the console for each
+debug 'event' selected. c=function calls, r=function returns, l=lines.
+]],
+
+trace   = [[
+trace               -- dumps a stack trace|
+
+Format is [level] = file,line,name
+The level is a candidate for use by the 'set' command.
+]],
+
+info    = [[
+info                -- dumps the complete debug info captured|
+
+Only useful as a diagnostic aid for the debugger itself. This information
+can be HUGE as it dumps all variables to the maximum depth, so be careful.
+]],
+
+show    = [[
+show line file X Y  -- show X lines before and Y after line in file|
+
+If line is omitted or is '-' then the current set context line is used.
+If file is omitted or is '-' then the current set context file is used.
+If file is not fully qualified and cannot be opened as specified, then
+a search for the file in the package[path] is performed using the usual
+"require" searching rules. If no file extension is given, .lua is used.
+Prints the lines from the source file around the given line.
+]],
+
+exit    = [[
+exit                -- exits debugger, re-start it using pause()|
+]],
+
+help    = [[
+help [command]      -- show this list or help for command|
+]],
+
+["<statement>"] = [[
+<statement>         -- execute a statement in the current context|
+
+The statement can be anything that is legal in the context, including
+assignments. Such assignments affect the context and will be in force
+immediately. Any results returned are printed. Use '=' as a short-hand
+for 'return', e.g. "=func(arg)" will call 'func' with 'arg' and print
+the results, and "=var" will just print the value of 'var'.
+]],
+
+what    = [[
+what <func>         -- show where <func> is defined (if known)|
+]],
+
+}
+--}}}
+
+--{{{  local function getinfo(level,field)
+
+--like debug.getinfo but copes with no activation record at the given level
+--and knows how to get 'field'. 'field' can be the name of any of the
+--activation record fields or any of the 'what' names or nil for everything.
+--only valid when using the stack level to get info, not a function name.
+
+local function getinfo(level,field)
+  level = level + 1  --to get to the same relative level as the caller
+  if not field then return debug.getinfo(level) end
+  local what
+  if field == 'name' or field == 'namewhat' then
+    what = 'n'
+  elseif field == 'what' or field == 'source' or field == 'linedefined' or field == 'lastlinedefined' or field == 'short_src' then
+    what = 'S'
+  elseif field == 'currentline' then
+    what = 'l'
+  elseif field == 'nups' then
+    what = 'u'
+  elseif field == 'func' then
+    what = 'f'
+  else
+    return debug.getinfo(level,field)
+  end
+  local ar = debug.getinfo(level,what)
+  if ar then return ar[field] else return nil end
+end
+
+--}}}
+--{{{  local function indented( level, ... )
+
+local function indented( level, ... )
+  io.write( string.rep('  ',level), table.concat({...}), '\n' )
+end
+
+--}}}
+--{{{  local function dumpval( level, name, value, limit )
+
+local dumpvisited
+
+local function dumpval( level, name, value, limit )
+  local index
+  if type(name) == 'number' then
+    index = string.format('[%d] = ',name)
+  elseif type(name) == 'string'
+     and (name == '__VARSLEVEL__' or name == '__ENVIRONMENT__' or name == '__GLOBALS__' or name == '__UPVALUES__' or name == '__LOCALS__') then
+    --ignore these, they are debugger generated
+    return
+  elseif type(name) == 'string' and string.find(name,'^[_%a][_.%w]*$') then
+    index = name ..' = '
+  else
+    index = string.format('[%q] = ',tostring(name))
+  end
+  if type(value) == 'table' then
+    if dumpvisited[value] then
+      indented( level, index, string.format('ref%q;',dumpvisited[value]) )
+    else
+      dumpvisited[value] = tostring(value)
+      if (limit or 0) > 0 and level+1 >= limit then
+        indented( level, index, dumpvisited[value] )
+      else
+        indented( level, index, '{  -- ', dumpvisited[value] )
+        for n,v in pairs(value) do
+          dumpval( level+1, n, v, limit )
+        end
+        indented( level, '};' )
+      end
+    end
+  else
+    if type(value) == 'string' then
+      if string.len(value) > 40 then
+        indented( level, index, '[[', value, ']];' )
+      else
+        indented( level, index, string.format('%q',value), ';' )
+      end
+    else
+      indented( level, index, tostring(value), ';' )
+    end
+  end
+end
+
+--}}}
+--{{{  local function dumpvar( value, limit, name )
+
+local function dumpvar( value, limit, name )
+  dumpvisited = {}
+  dumpval( 0, name or tostring(value), value, limit )
+end
+
+--}}}
+--{{{  local function show(file,line,before,after)
+
+--show +/-N lines of a file around line M
+
+local function show(file,line,before,after)
+
+  line   = tonumber(line   or 1)
+  before = tonumber(before or 10)
+  after  = tonumber(after  or before)
+
+  -- Try to find the file in the Orxonox resources
+  local text = luaState:getSourceCode(file)
+
+  if text == "" then
+    if not string.find(file,'%.') then file = file..'.lua' end
+
+    local f = io.open(file,'r')
+    if not f then
+      --{{{  try to find the file in the path
+    
+      --
+      -- looks for a file in the package path
+      --
+      local path = package.path or LUA_PATH or ''
+      for c in string.gmatch (path, "[^;]+") do
+        local c = string.gsub (c, "%?%.lua", file)
+        f = io.open (c,'r')
+        if f then
+          break
+        end
+      end
+    
+      --}}}
+
+      if f then
+        -- Read file into 'text'
+        text = f:read("*a")
+        f:close()
+      else
+        io.write('Cannot find '..file..'\n')
+        return
+      end
+    end
+  end
+
+  -- Transform line endings to \n
+  text:gsub("\r\n", "\n") -- Windows to Unix
+  text:gsub("\r", "\n")   -- Mac to Unix
+  if text[-1] ~= "\n" then
+      text = text.."\n"
+  end
+  -- Print requested lines
+  local i = 0
+  for l in text:gmatch("[^\n]*[\n]") do
+    i = i + 1
+    if i >= (line-before) then
+      if i > (line+after) then break end
+      if i == line then
+        io.write(i..'***\t'..l)
+      else
+        io.write(i..'\t'..l)
+      end
+    end
+  end
+end
+
+--}}}
+--{{{  local function tracestack(l)
+
+local function gi( i )
+  return function() i=i+1 return debug.getinfo(i),i end
+end
+
+local function gl( level, j )
+  return function() j=j+1 return debug.getlocal( level, j ) end
+end
+
+local function gu( func, k )
+  return function() k=k+1 return debug.getupvalue( func, k ) end
+end
+
+local  traceinfo
+
+local function tracestack(l)
+  local l = l + 1                        --NB: +1 to get level relative to caller
+  traceinfo = {}
+  traceinfo.pausemsg = pausemsg
+  for ar,i in gi(l) do
+    table.insert( traceinfo, ar )
+    local names  = {}
+    local values = {}
+    for n,v in gl(i,0) do
+      if string.sub(n,1,1) ~= '(' then   --ignore internal control variables
+        table.insert( names, n )
+        table.insert( values, v )
+      end
+    end
+    if #names > 0 then
+      ar.lnames  = names
+      ar.lvalues = values
+    end
+    if ar.func then
+      local names  = {}
+      local values = {}
+      for n,v in gu(ar.func,0) do
+        if string.sub(n,1,1) ~= '(' then   --ignore internal control variables
+          table.insert( names, n )
+          table.insert( values, v )
+        end
+      end
+      if #names > 0 then
+        ar.unames  = names
+        ar.uvalues = values
+      end
+    end
+  end
+end
+
+--}}}
+--{{{  local function trace()
+
+local function trace(set)
+  local mark
+  for level,ar in ipairs(traceinfo) do
+    if level == set then
+      mark = '***'
+    else
+      mark = ''
+    end
+    io.write('['..level..']'..mark..'\t'..(ar.name or ar.what)..' in '..ar.short_src..':'..ar.currentline..'\n')
+  end
+end
+
+--}}}
+--{{{  local function info()
+
+local function info() dumpvar( traceinfo, 0, 'traceinfo' ) end
+
+--}}}
+
+--{{{  local function set_breakpoint(file, line)
+
+local function set_breakpoint(file, line)
+  if not breakpoints[line] then
+    breakpoints[line] = {}
+  end
+  breakpoints[line][file] = true
+end
+
+--}}}
+--{{{  local function remove_breakpoint(file, line)
+
+local function remove_breakpoint(file, line)
+  if breakpoints[line] then
+    breakpoints[line][file] = nil
+  end
+end
+
+--}}}
+--{{{  local function has_breakpoint(file, line)
+
+--allow for 'sloppy' file names
+--search for file and all variations walking up its directory hierachy
+--ditto for the file with no extension
+
+local function has_breakpoint(file, line)
+  if not breakpoints[line] then return false end
+  local noext = string.gsub(file,"(%..-)$",'',1)
+  if noext == file then noext = nil end
+  while file do
+    if breakpoints[line][file] then return true end
+    file = string.match(file,"[:/\](.+)$")
+  end
+  while noext do
+    if breakpoints[line][noext] then return true end
+    noext = string.match(noext,"[:/\](.+)$")
+  end
+  return false
+end
+
+--}}}
+--{{{  local function capture_vars(ref,level,line)
+
+local function capture_vars(ref,level,line)
+  --get vars, file and line for the given level relative to debug_hook offset by ref
+
+  local lvl = ref + level                --NB: This includes an offset of +1 for the call to here
+
+  --{{{  capture variables
+  
+  local ar = debug.getinfo(lvl, "f")
+  if not ar then return {},'?',0 end
+  
+  local vars = {__UPVALUES__={}, __LOCALS__={}}
+  local i
+  
+  local func = ar.func
+  if func then
+    i = 1
+    while true do
+      local name, value = debug.getupvalue(func, i)
+      if not name then break end
+      if string.sub(name,1,1) ~= '(' then  --NB: ignoring internal control variables
+        vars[name] = value
+        vars.__UPVALUES__[i] = name
+      end
+      i = i + 1
+    end
+    vars.__ENVIRONMENT__ = getfenv(func)
+  end
+  
+  vars.__GLOBALS__ = getfenv(0)
+  
+  i = 1
+  while true do
+    local name, value = debug.getlocal(lvl, i)
+    if not name then break end
+    if string.sub(name,1,1) ~= '(' then    --NB: ignoring internal control variables
+      vars[name] = value
+      vars.__LOCALS__[i] = name
+    end
+    i = i + 1
+  end
+  
+  vars.__VARSLEVEL__ = level
+  
+  if func then
+    --NB: Do not do this until finished filling the vars table
+    setmetatable(vars, { __index = getfenv(func), __newindex = getfenv(func) })
+  end
+  
+  --NB: Do not read or write the vars table anymore else the metatable functions will get invoked!
+  
+  --}}}
+
+  local file = getinfo(lvl, "source")
+  if string.find(file, "@") == 1 then
+    file = string.sub(file, 2)
+  end
+  -- Orxonox changes: Our resource system is case sensisive, even on Windows
+  --if IsWindows then file = string.lower(file) end
+
+  if not line then
+    line = getinfo(lvl, "currentline")
+  end
+
+  return vars,file,line
+
+end
+
+--}}}
+--{{{  local function restore_vars(ref,vars)
+
+local function restore_vars(ref,vars)
+
+  if type(vars) ~= 'table' then return end
+
+  local level = vars.__VARSLEVEL__       --NB: This level is relative to debug_hook offset by ref
+  if not level then return end
+
+  level = level + ref                    --NB: This includes an offset of +1 for the call to here
+
+  local i
+  local written_vars = {}
+
+  i = 1
+  while true do
+    local name, value = debug.getlocal(level, i)
+    if not name then break end
+    if vars[name] and string.sub(name,1,1) ~= '(' then     --NB: ignoring internal control variables
+      debug.setlocal(level, i, vars[name])
+      written_vars[name] = true
+    end
+    i = i + 1
+  end
+
+  local ar = debug.getinfo(level, "f")
+  if not ar then return end
+
+  local func = ar.func
+  if func then
+
+    i = 1
+    while true do
+      local name, value = debug.getupvalue(func, i)
+      if not name then break end
+      if vars[name] and string.sub(name,1,1) ~= '(' then   --NB: ignoring internal control variables
+        if not written_vars[name] then
+          debug.setupvalue(func, i, vars[name])
+        end
+        written_vars[name] = true
+      end
+      i = i + 1
+    end
+
+  end
+
+end
+
+--}}}
+--{{{  local function trace_event(event, line, level)
+
+local function print_trace(level,depth,event,file,line,name)
+
+  --NB: level here is relative to the caller of trace_event, so offset by 2 to get to there
+  level = level + 2
+
+  local file = file or getinfo(level,'short_src')
+  local line = line or getinfo(level,'currentline')
+  local name = name or getinfo(level,'name')
+
+  local prefix = ''
+  if current_thread ~= 'main' then prefix = '['..tostring(current_thread)..'] ' end
+
+  io.write(prefix..
+           string.format('%08.2f:%02i.',os.clock(),depth)..
+           string.rep('.',depth%32)..
+           (file or '')..' ('..(line or '')..') '..
+           (name or '')..
+           ' ('..event..')\n')
+
+end
+
+local function trace_event(event, line, level)
+
+  if event == 'return' and trace_returns then
+    --note the line info for later
+    ret_file = getinfo(level+1,'short_src')
+    ret_line = getinfo(level+1,'currentline')
+    ret_name = getinfo(level+1,'name')
+  end
+
+  if event ~= 'line' then return end
+
+  local slevel = stack_level[current_thread]
+  local tlevel = trace_level[current_thread]
+
+  if trace_calls and slevel > tlevel then
+    --we are now in the function called, so look back 1 level further to find the calling file and line
+    print_trace(level+1,slevel-1,'c',nil,nil,getinfo(level+1,'name'))
+  end
+
+  if trace_returns and slevel < tlevel then
+    print_trace(level,slevel,'r',ret_file,ret_line,ret_name)
+  end
+
+  if trace_lines then
+    print_trace(level,slevel,'l')
+  end
+
+  trace_level[current_thread] = stack_level[current_thread]
+
+end
+
+--}}}
+--{{{  local function debug_hook(event, line, level, thread)
+
+local function debug_hook(event, line, level, thread)
+  if not started then debug.sethook() return end
+  current_thread = thread or 'main'
+  local level = level or 2
+  trace_event(event,line,level)
+  if event == "call" then
+    stack_level[current_thread] = stack_level[current_thread] + 1
+  elseif event == "return" then
+    stack_level[current_thread] = stack_level[current_thread] - 1
+    if stack_level[current_thread] < 0 then stack_level[current_thread] = 0 end
+  else
+    local vars,file,line = capture_vars(level,1,line)
+    local stop, ev, idx = false, events.STEP, 0
+    while true do
+      for index, value in pairs(watches) do
+        setfenv(value.func, vars)
+        local status, res = pcall(value.func)
+        if status and res then
+          ev, idx = events.WATCH, index
+          stop = true
+          break
+        end
+      end
+      if stop then break end
+      if (step_into)
+      or (step_over and (stack_level[current_thread] <= step_level[current_thread] or stack_level[current_thread] == 0)) then
+        step_lines = step_lines - 1
+        if step_lines < 1 then
+          ev, idx = events.STEP, 0
+          break
+        end
+      end
+      if has_breakpoint(file, line) then
+        ev, idx = events.BREAK, 0
+        break
+      end
+      return
+    end
+    tracestack(level)
+    local last_next = 1
+    local err, next = assert(coroutine.resume(coro_debugger, ev, vars, file, line, idx))
+    while true do
+      if next == 'cont' then
+        return
+      elseif next == 'stop' then
+        started = false
+        debug.sethook()
+        return
+      elseif tonumber(next) then --get vars for given level or last level
+        next = tonumber(next)
+        if next == 0 then next = last_next end
+        last_next = next
+        restore_vars(level,vars)
+        vars, file, line = capture_vars(level,next)
+        err, next = assert(coroutine.resume(coro_debugger, events.SET, vars, file, line, idx))
+      else
+        io.write('Unknown command from debugger_loop: '..tostring(next)..'\n')
+        io.write('Stopping debugger\n')
+        next = 'stop'
+      end
+    end
+  end
+end
+
+--}}}
+--{{{  local function report(ev, vars, file, line, idx_watch)
+
+local function report(ev, vars, file, line, idx_watch)
+  local vars = vars or {}
+  local file = file or '?'
+  local line = line or 0
+  local prefix = ''
+  if current_thread ~= 'main' then prefix = '['..tostring(current_thread)..'] ' end
+  if ev == events.STEP then
+    io.write(prefix.."Paused at file "..file.." line "..line..' ('..stack_level[current_thread]..')\n')
+  elseif ev == events.BREAK then
+    io.write(prefix.."Paused at file "..file.." line "..line..' ('..stack_level[current_thread]..') (breakpoint)\n')
+  elseif ev == events.WATCH then
+    io.write(prefix.."Paused at file "..file.." line "..line..' ('..stack_level[current_thread]..')'.." (watch expression "..idx_watch.. ": ["..watches[idx_watch].exp.."])\n")
+  elseif ev == events.SET then
+    --do nothing
+  else
+    io.write(prefix.."Error in application: "..file.." line "..line.."\n")
+  end
+  if ev ~= events.SET then
+    if pausemsg and pausemsg ~= '' then io.write('Message: '..pausemsg..'\n') end
+    pausemsg = ''
+  end
+  return vars, file, line
+end
+
+--}}}
+
+--{{{  local function debugger_loop(server)
+
+local function debugger_loop(ev, vars, file, line, idx_watch)
+
+  io.write("Lua Debugger\n")
+  local eval_env, breakfile, breakline = report(ev, vars, file, line, idx_watch)
+  io.write("Type 'help' for commands\n")
+
+  local command, args
+
+  --{{{  local function getargs(spec)
+  
+  --get command arguments according to the given spec from the args string
+  --the spec has a single character for each argument, arguments are separated
+  --by white space, the spec characters can be one of:
+  -- F for a filename    (defaults to breakfile if - given in args)
+  -- L for a line number (defaults to breakline if - given in args)
+  -- N for a number
+  -- V for a variable name
+  -- S for a string
+  
+  local function getargs(spec)
+    local res={}
+    local char,arg
+    local ptr=1
+    for i=1,string.len(spec) do
+      char = string.sub(spec,i,i)
+      if     char == 'F' then
+        _,ptr,arg = string.find(args..' ',"%s*([%w%p]*)%s*",ptr)
+        if not arg or arg == '' then arg = '-' end
+        if arg == '-' then arg = breakfile end
+      elseif char == 'L' then
+        _,ptr,arg = string.find(args..' ',"%s*([%w%p]*)%s*",ptr)
+        if not arg or arg == '' then arg = '-' end
+        if arg == '-' then arg = breakline end
+        arg = tonumber(arg) or 0
+      elseif char == 'N' then
+        _,ptr,arg = string.find(args..' ',"%s*([%w%p]*)%s*",ptr)
+        if not arg or arg == '' then arg = '0' end
+        arg = tonumber(arg) or 0
+      elseif char == 'V' then
+        _,ptr,arg = string.find(args..' ',"%s*([%w%p]*)%s*",ptr)
+        if not arg or arg == '' then arg = '' end
+      elseif char == 'S' then
+        _,ptr,arg = string.find(args..' ',"%s*([%w%p]*)%s*",ptr)
+        if not arg or arg == '' then arg = '' end
+      else
+        arg = ''
+      end
+      table.insert(res,arg or '')
+    end
+    return unpack(res)
+  end
+  
+  --}}}
+
+  while true do
+    io.write("[DEBUG]> ")
+    local line = io.read("*line")
+    if line == nil then io.write('\n'); line = 'exit' end
+
+    if string.find(line, "^[a-z]+") then
+      command = string.sub(line, string.find(line, "^[a-z]+"))
+      args    = string.gsub(line,"^[a-z]+%s*",'',1)            --strip command off line
+    else
+      command = ''
+    end
+
+    if command == "setb" then
+      --{{{  set breakpoint
+      
+      local line, filename  = getargs('LF')
+      if filename ~= '' and line ~= '' then
+        set_breakpoint(filename,line)
+        io.write("Breakpoint set in file "..filename..' line '..line..'\n')
+      else
+        io.write("Bad request\n")
+      end
+      
+      --}}}
+
+    elseif command == "delb" then
+      --{{{  delete breakpoint
+      
+      local line, filename = getargs('LF')
+      if filename ~= '' and line ~= '' then
+        remove_breakpoint(filename, line)
+        io.write("Breakpoint deleted from file "..filename..' line '..line.."\n")
+      else
+        io.write("Bad request\n")
+      end
+      
+      --}}}
+
+    elseif command == "delallb" then
+      --{{{  delete all breakpoints
+      breakpoints = {}
+      io.write('All breakpoints deleted\n')
+      --}}}
+
+    elseif command == "listb" then
+      --{{{  list breakpoints
+      for i, v in pairs(breakpoints) do
+        for ii, vv in pairs(v) do
+          io.write("Break at: "..i..' in '..ii..'\n')
+        end
+      end
+      --}}}
+
+    elseif command == "setw" then
+      --{{{  set watch expression
+      
+      if args and args ~= '' then
+        local func = loadstring("return(" .. args .. ")")
+        local newidx = #watches + 1
+        watches[newidx] = {func = func, exp = args}
+        io.write("Set watch exp no. " .. newidx..'\n')
+      else
+        io.write("Bad request\n")
+      end
+      
+      --}}}
+
+    elseif command == "delw" then
+      --{{{  delete watch expression
+      
+      local index = tonumber(args)
+      if index then
+        watches[index] = nil
+        io.write("Watch expression deleted\n")
+      else
+        io.write("Bad request\n")
+      end
+      
+      --}}}
+
+    elseif command == "delallw" then
+      --{{{  delete all watch expressions
+      watches = {}
+      io.write('All watch expressions deleted\n')
+      --}}}
+
+    elseif command == "listw" then
+      --{{{  list watch expressions
+      for i, v in pairs(watches) do
+        io.write("Watch exp. " .. i .. ": " .. v.exp..'\n')
+      end
+      --}}}
+
+    elseif command == "run" then
+      --{{{  run until breakpoint
+      step_into = false
+      step_over = false
+      eval_env, breakfile, breakline = report(coroutine.yield('cont'))
+      --}}}
+
+    elseif command == "step" then
+      --{{{  step N lines (into functions)
+      local N = tonumber(args) or 1
+      step_over  = false
+      step_into  = true
+      step_lines = tonumber(N or 1)
+      eval_env, breakfile, breakline = report(coroutine.yield('cont'))
+      --}}}
+
+    elseif command == "over" then
+      --{{{  step N lines (over functions)
+      local N = tonumber(args) or 1
+      step_into  = false
+      step_over  = true
+      step_lines = tonumber(N or 1)
+      step_level[current_thread] = stack_level[current_thread]
+      eval_env, breakfile, breakline = report(coroutine.yield('cont'))
+      --}}}
+
+    elseif command == "out" then
+      --{{{  step N lines (out of functions)
+      local N = tonumber(args) or 1
+      step_into  = false
+      step_over  = true
+      step_lines = 1
+      step_level[current_thread] = stack_level[current_thread] - tonumber(N or 1)
+      eval_env, breakfile, breakline = report(coroutine.yield('cont'))
+      --}}}
+
+    elseif command == "goto" then
+      --{{{  step until reach line
+      local N = tonumber(args)
+      if N then
+        step_over  = false
+        step_into  = false
+        if has_breakpoint(breakfile,N) then
+          eval_env, breakfile, breakline = report(coroutine.yield('cont'))
+        else
+          local bf = breakfile
+          set_breakpoint(breakfile,N)
+          eval_env, breakfile, breakline = report(coroutine.yield('cont'))
+          if breakfile == bf and breakline == N then remove_breakpoint(breakfile,N) end
+        end
+      else
+        io.write("Bad request\n")
+      end
+      --}}}
+
+    elseif command == "set" then
+      --{{{  set/show context level
+      local level = args
+      if level and level == '' then level = nil end
+      if level then
+        eval_env, breakfile, breakline = report(coroutine.yield(level))
+      end
+      if eval_env.__VARSLEVEL__ then
+        io.write('Level: '..eval_env.__VARSLEVEL__..'\n')
+      else
+        io.write('No level set\n')
+      end
+      --}}}
+
+    elseif command == "vars" then
+      --{{{  list context variables
+      local depth = args
+      if depth and depth == '' then depth = nil end
+      depth = tonumber(depth) or 1
+      dumpvar(eval_env, depth+1, 'variables')
+      --}}}
+
+    elseif command == "glob" then
+      --{{{  list global variables
+      local depth = args
+      if depth and depth == '' then depth = nil end
+      depth = tonumber(depth) or 1
+      dumpvar(eval_env.__GLOBALS__,depth+1,'globals')
+      --}}}
+
+    elseif command == "fenv" then
+      --{{{  list function environment variables
+      local depth = args
+      if depth and depth == '' then depth = nil end
+      depth = tonumber(depth) or 1
+      dumpvar(eval_env.__ENVIRONMENT__,depth+1,'environment')
+      --}}}
+
+    elseif command == "ups" then
+      --{{{  list upvalue names
+      dumpvar(eval_env.__UPVALUES__,2,'upvalues')
+      --}}}
+
+    elseif command == "locs" then
+      --{{{  list locals names
+      dumpvar(eval_env.__LOCALS__,2,'upvalues')
+      --}}}
+
+    elseif command == "what" then
+      --{{{  show where a function is defined
+      if args and args ~= '' then
+        local v = eval_env
+        local n = nil
+        for w in string.gmatch(args,"[%w_]+") do
+          v = v[w]
+          if n then n = n..'.'..w else n = w end
+          if not v then break end
+        end
+        if type(v) == 'function' then
+          local def = debug.getinfo(v,'S')
+          if def then
+            io.write(def.what..' in '..def.short_src..' '..def.linedefined..'..'..def.lastlinedefined..'\n')
+          else
+            io.write('Cannot get info for '..v..'\n')
+          end
+        else
+          io.write(v..' is not a function\n')
+        end
+      else
+        io.write("Bad request\n")
+      end
+      --}}}
+
+    elseif command == "dump" then
+      --{{{  dump a variable
+      local name, depth = getargs('VN')
+      if name ~= '' then
+        if depth == '' or depth == 0 then depth = nil end
+        depth = tonumber(depth or 1)
+        local v = eval_env
+        local n = nil
+        for w in string.gmatch(name,"[^%.]+") do     --get everything between dots
+          if tonumber(w) then
+            v = v[tonumber(w)]
+          else
+            v = v[w]
+          end
+          if n then n = n..'.'..w else n = w end
+          if not v then break end
+        end
+        dumpvar(v,depth+1,n)
+      else
+        io.write("Bad request\n")
+      end
+      --}}}
+
+    elseif command == "show" then
+      --{{{  show file around a line or the current breakpoint
+      
+      local line, file, before, after = getargs('LFNN')
+      if before == 0 then before = 10     end
+      if after  == 0 then after  = before end
+      
+      if file ~= '' and file ~= "=stdin" then
+        show(file,line,before,after)
+      else
+        io.write('Nothing to show\n')
+      end
+      
+      --}}}
+
+    elseif command == "poff" then
+      --{{{  turn pause command off
+      pause_off = true
+      --}}}
+
+    elseif command == "pon" then
+      --{{{  turn pause command on
+      pause_off = false
+      --}}}
+
+    elseif command == "tron" then
+      --{{{  turn tracing on/off
+      local option = getargs('S')
+      trace_calls   = false
+      trace_returns = false
+      trace_lines   = false
+      if string.find(option,'c') then trace_calls   = true end
+      if string.find(option,'r') then trace_returns = true end
+      if string.find(option,'l') then trace_lines   = true end
+      --}}}
+
+    elseif command == "trace" then
+      --{{{  dump a stack trace
+      trace(eval_env.__VARSLEVEL__)
+      --}}}
+
+    elseif command == "info" then
+      --{{{  dump all debug info captured
+      info()
+      --}}}
+
+    elseif command == "pause" then
+      --{{{  not allowed in here
+      io.write('pause() should only be used in the script you are debugging\n')
+      --}}}
+
+    elseif command == "help" then
+      --{{{  help
+      local command = getargs('S')
+      if command ~= '' and hints[command] then
+        io.write(hints[command]..'\n')
+      else
+        for _,v in pairs(hints) do
+          local _,_,h = string.find(v,"(.+)|")
+          io.write(h..'\n')
+        end
+      end
+      --}}}
+
+    elseif command == "exit" then
+      --{{{  exit debugger
+      return 'stop'
+      --}}}
+
+    elseif line ~= '' then
+      --{{{  just execute whatever it is in the current context
+      
+      --map line starting with "=..." to "return ..."
+      if string.sub(line,1,1) == '=' then line = string.gsub(line,'=','return ',1) end
+      
+      local ok, func = pcall(loadstring,line)
+      if func == nil then                             --Michael.Bringmann@lsi.com
+        io.write("Compile error: "..line..'\n')
+      elseif not ok then
+        io.write("Compile error: "..func..'\n')
+      else
+        setfenv(func, eval_env)
+        local res = {pcall(func)}
+        if res[1] then
+          if res[2] then
+            table.remove(res,1)
+            for _,v in ipairs(res) do
+              io.write(tostring(v))
+              io.write('\t')
+            end
+            io.write('\n')
+          end
+          --update in the context
+          eval_env, breakfile, breakline = report(coroutine.yield(0))
+        else
+          io.write("Run error: "..res[2]..'\n')
+        end
+      end
+      
+      --}}}
+    end
+  end
+
+end
+
+--}}}
+
+--{{{  coroutine.create
+
+--This function overrides the built-in for the purposes of propagating
+--the debug hook settings from the creator into the created coroutine.
+
+_G.coroutine.create = function(f)
+  local thread
+  local hook, mask, count = debug.gethook()
+  if hook then
+    local function thread_hook(event,line)
+      hook(event,line,3,thread)
+    end
+    thread = cocreate(function(...)
+                        stack_level[thread] = 0
+                        trace_level[thread] = 0
+                        step_level [thread] = 0
+                        debug.sethook(thread_hook,mask,count)
+                        return f(...)
+                      end)
+    return thread
+  else
+    return cocreate(f)
+  end
+end
+
+--}}}
+--{{{  coroutine.wrap
+
+--This function overrides the built-in for the purposes of propagating
+--the debug hook settings from the creator into the created coroutine.
+
+_G.coroutine.wrap = function(f)
+  local thread
+  local hook, mask, count = debug.gethook()
+  if hook then
+    local function thread_hook(event,line)
+      hook(event,line,3,thread)
+    end
+    thread = cowrap(function(...)
+                      stack_level[thread] = 0
+                      trace_level[thread] = 0
+                      step_level [thread] = 0
+                      debug.sethook(thread_hook,mask,count)
+                      return f(...)
+                    end)
+    return thread
+  else
+    return cowrap(f)
+  end
+end
+
+--}}}
+
+--{{{  function pause()
+
+--
+-- Starts/resumes a debug session
+--
+
+function pause(x)
+  if pause_off then return end               --being told to ignore pauses
+  pausemsg = x or 'pause'
+  local lines
+  local src = getinfo(2,'short_src')
+  if src == "stdin" then
+    lines = 1   --if in a console session, stop now
+  else
+    lines = 2   --if in a script, stop when get out of pause()
+  end
+  if started then
+    --we'll stop now 'cos the existing debug hook will grab us
+    step_lines = lines
+    step_into  = true
+  else
+    coro_debugger = cocreate(debugger_loop)  --NB: Use original coroutune.create
+    --set to stop when get out of pause()
+    trace_level[current_thread] = 0
+    step_level [current_thread] = 0
+    stack_level[current_thread] = 1
+    step_lines = lines
+    step_into  = true
+    started    = true
+    debug.sethook(debug_hook, "crl")         --NB: this will cause an immediate entry to the debugger_loop
+  end
+end
+
+--}}}
+--{{{  function dump()
+
+--shows the value of the given variable, only really useful
+--when the variable is a table
+--see dump debug command hints for full semantics
+
+function dump(v,depth)
+  dumpvar(v,(depth or 1)+1,tostring(v))
+end
+
+--}}}
+--{{{  function debug.traceback(x)
+
+local _traceback = debug.traceback       --note original function
+
+--override standard function
+debug.traceback = function(x)
+  local assertmsg = _traceback(x)        --do original function
+  pause(x)                               --let user have a look at stuff
+  return assertmsg                       --carry on
+end
+
+_TRACEBACK = debug.traceback             --Lua 5.0 function
+
+--}}}
+
Index: /code/trunk/data/lua/LuaStateInit.lua
===================================================================
--- /code/trunk/data/lua/LuaStateInit.lua	(revision 6745)
+++ /code/trunk/data/lua/LuaStateInit.lua	(revision 6746)
@@ -1,8 +1,6 @@
 -- Note: luaState is a pointer to the LuaState instance that created this lua state
 
--- Save original print function in debug
-debug = print
-
 -- Redirect print to the C++ print function
+original_print = print
 print = function(s)
   luaState:luaPrint(s)
@@ -13,19 +11,24 @@
   luaState:luaLog(level, message)
 end
+cout = logMessage
 
 -- Redirect dofile in order to load with the resource manager
-doFile = function(filename)
-  luaState:doFile(filename)
-  -- Required because the C++ function cannot return whatever might be on the stack
+original_dofile = dofile
+dofile = function(filename)
+  if not luaState:doFile(filename) then
+    error("Error propagation. Do not display")
+  end
+  -- Required because if the file returns a table, it cannot be passed through the C++ function
   return LuaStateReturnValue -- C-injected global variable
 end
-original_dofile = dofile
-dofile = doFile
+doFile = dofile
 
 -- Create includeFile function that preparses the file according
 -- to a function provided to the LuaState constructor (in C++)
 include = function(filename)
-  luaState:includeFile(filename)
-  -- Required because the C++ function cannot return whatever might be on the stack
+  if not luaState:includeFile(filename) then
+    error("Error propagation. Do not display")
+  end
+  -- Required because if the file returns a table, it cannot be passed through the C++ function
   return LuaStateReturnValue -- C-injected global variable
 end
@@ -34,23 +37,79 @@
 -- The loaded modules are then stored with their names (where name has no .lua extension)
 -- Furthermore the ".lua" extension is appended to the moduleName parameter when looking for the file
-old_require = require
+original_require = require
+_REQUIREDNAME = ""
+LuaStateReturnValue = true
 require = function(moduleName)
   if not luaState:fileExists(moduleName .. ".lua") then
+    logMessage(2, "Warning: Lua function require() could not find file '" .. moduleName .. ".lua' ")
     return nil
   end
+
   if not _LOADED then
     _LOADED = {}
   end
+  if not _LOADED_RETURN_VALUES then
+      _LOADED_RETURN_VALUES = {}
+  end
+
   if not _LOADED[moduleName] then
-    -- save old value
-    _REQUIREDNAME_OLD = _REQUIREDNAME
+    -- save old value for the required name
+    local _REQUIREDNAME_OLD = _REQUIREDNAME
     _REQUIREDNAME = moduleName
-    luaState:doFile(moduleName .. ".lua")
-    _LOADED[moduleName] = LuaStateReturnValue or true
+
+    if not luaState:doFile(moduleName .. ".lua") then
+      error("Error propagation. Do not display")
+    end
+    -- LuaStateReturnValue is required because if the file returns a table,
+    -- it cannot be passed through the C++ function
+    _LOADED_RETURN_VALUES[moduleName] = LuaStateReturnValue
+    _LOADED[moduleName] = true
+
     -- restore old value
     _REQUIREDNAME = _REQUIREDNAME_OLD
   end
-  return _LOADED[moduleName]
+  local asdf = _LOADED_RETURN_VALUES[moduleName]
+  return asdf
 end
+
+
+-- Load useful tool functions (like handleDefaultArgument)
+require("Tools")
+
+
+-- Include command line debugger for lua 5.1
+-- Note: It doesn't work if the IOConsole was started. Then we replace pause() with a warning
+if _VERSION ~= "Lua 5.0"  and not luaState:usingIOConsole() then
+  require("Debugger")
+else
+  -- Fallback pause function
+  pause = function()
+    logMessage(2, [["Warning: debug() called in Lua, but Debugger is not active.
+Do you have the IOConsole disabled and are you using Lua version 5.1?"]])
+  end
+end
+
+-- General error handler that gets called whenever an error happens at runtime
+errorHandler = function(err)
+  if type(err) == "string" then
+    -- Simply return if the error has already been handled
+    if string.find(err, "Error propagation. Do not display") ~= nil then
+      return err
+    end
+    -- Display the error message
+    logMessage(1, "Lua runtime error: "..err)
+  end
+
+  -- Start debugger if possible
+  if _LOADED and _LOADED["Debugger"] ~= nil then
+    pause()
+  else
+    -- Fallback: print stack trace
+    logMessage(3, debug.traceback(""))
+  end
+  return err -- Hello Lua debugger user! Please type 'set 2' to get to the
+             -- actual position in the stack where the error occurred
+end
+
 
 -- Convenience function for console commands
Index: /code/trunk/data/lua/Strict.lua
===================================================================
--- /code/trunk/data/lua/Strict.lua	(revision 6746)
+++ /code/trunk/data/lua/Strict.lua	(revision 6746)
@@ -0,0 +1,39 @@
+--
+-- strict.lua
+-- checks uses of undeclared global variables
+-- All global variables must be 'declared' through a regular assignment
+-- (even assigning nil will do) in a main chunk before being used
+-- anywhere or assigned to inside a function.
+--
+
+local mt = getmetatable(_G)
+if mt == nil then
+  mt = {}
+  setmetatable(_G, mt)
+end
+
+__STRICT = false
+mt.__declared = {}
+
+mt.__newindex = function (t, n, v)
+  if __STRICT and not mt.__declared[n] then
+    local d = debug.getinfo(2, "S")
+    local w = d and d.what or "C"
+    if w ~= "main" and w ~= "C" then
+      error("assign to undeclared variable '"..n.."'", 2)
+    end
+    mt.__declared[n] = true
+  end
+  rawset(t, n, v)
+end
+  
+mt.__index = function (t, n)
+  if not mt.__declared[n] and debug.getinfo(2, "S").what ~= "C" then
+    error("variable '"..n.."' is not declared", 2)
+  end
+  return rawget(t, n)
+end
+
+function global(...)
+   for _, v in ipairs{...} do mt.__declared[v] = true end
+end
Index: /code/trunk/data/lua/Tools.lua
===================================================================
--- /code/trunk/data/lua/Tools.lua	(revision 6746)
+++ /code/trunk/data/lua/Tools.lua	(revision 6746)
@@ -0,0 +1,24 @@
+function handleDefArg(argument, defaultValue)
+    if argument == nil then
+        return defaultValue
+    else
+        return argument
+    end
+end
+
+function table.findIndex(table, value)
+    for i, v in ipairs(table) do
+        if v == value then
+            return i
+        end
+    end
+    return 0
+end
+
+-- Short forms for TriBool
+TriBool =
+{
+    True     = orxonox.TriBool.True,
+    False    = orxonox.TriBool.False,
+    Dontcare = orxonox.TriBool.Dontcare
+}
Index: /code/trunk/src/libraries/core/Core.cc
===================================================================
--- /code/trunk/src/libraries/core/Core.cc	(revision 6745)
+++ /code/trunk/src/libraries/core/Core.cc	(revision 6746)
@@ -78,4 +78,5 @@
 
     SetCommandLineArgument(settingsFile, "orxonox.ini").information("THE configuration file");
+    SetCommandLineSwitch(noIOConsole).information("Use this if you don't want to use the IOConsole (for instance for Lua debugging)");
 #ifdef ORXONOX_PLATFORM_WINDOWS
     SetCommandLineArgument(limitToCPU, 1).information("Limits the program to one CPU/core (1, 2, 3, etc.). Default is the first core (faster than off)");
@@ -88,4 +89,5 @@
         , consoleCommandDestroyer_(CommandExecutor::destroyExternalCommands)
         , bGraphicsLoaded_(false)
+        , bStartIOConsole_(true)
     {
         // Set the hard coded fixed paths
@@ -149,5 +151,10 @@
 
         // create persistent io console
-        this->ioConsole_.reset(new IOConsole());
+        if (CommandLineParser::getValue("noIOConsole").getBool())
+        {
+            ModifyConfigValue(bStartIOConsole_, tset, false);
+        }
+        if (this->bStartIOConsole_)
+            this->ioConsole_.reset(new IOConsole());
 
         // creates the class hierarchy for all classes with factories
@@ -193,4 +200,6 @@
             .description("If true, all random actions are different each time you start the game")
             .callback(this, &Core::initRandomNumberGenerator);
+        SetConfigValue(bStartIOConsole_, true)
+            .description("Set to false if you don't want to use the IOConsole (for Lua debugging for instance)");
     }
 
@@ -225,6 +234,5 @@
 
         // Load the CEGUI interface
-        guiManager_.reset(new GUIManager(graphicsManager_->getRenderWindow(),
-            inputManager_->getMousePosition(), graphicsManager_->isFullScreen()));
+        guiManager_.reset(new GUIManager(inputManager_->getMousePosition()));
 
         bGraphicsLoaded_ = true;
@@ -328,5 +336,6 @@
         }
         // Process console events and status line
-        this->ioConsole_->preUpdate(time);
+        if (this->ioConsole_ != NULL)
+            this->ioConsole_->preUpdate(time);
         // Process thread commands
         this->tclThreadManager_->preUpdate(time);
Index: /code/trunk/src/libraries/core/Core.h
===================================================================
--- /code/trunk/src/libraries/core/Core.h	(revision 6745)
+++ /code/trunk/src/libraries/core/Core.h	(revision 6746)
@@ -38,5 +38,5 @@
 #include "util/ScopeGuard.h"
 #include "util/Singleton.h"
-#include "core/OrxonoxClass.h"
+#include "OrxonoxClass.h"
 
 namespace orxonox
@@ -97,5 +97,5 @@
             scoped_ptr<TclBind>           tclBind_;
             scoped_ptr<TclThreadManager>  tclThreadManager_;
-            scoped_ptr<Scope<ScopeID::Root> >     rootScope_;
+            scoped_ptr<Scope<ScopeID::Root> > rootScope_;
             // graphical
             scoped_ptr<GraphicsManager>   graphicsManager_;     //!< Interface to OGRE
@@ -108,4 +108,5 @@
             std::string                   language_;                   //!< The language
             bool                          bInitRandomNumberGenerator_; //!< If true, srand(time(0)) is called
+            bool                          bStartIOConsole_;            //!< Set to false if you don't want to use the IOConsole
 
             static Core*                  singletonPtr_s;
Index: /code/trunk/src/libraries/core/GUIManager.cc
===================================================================
--- /code/trunk/src/libraries/core/GUIManager.cc	(revision 6745)
+++ /code/trunk/src/libraries/core/GUIManager.cc	(revision 6746)
@@ -30,4 +30,5 @@
 #include "GUIManager.h"
 
+#include <boost/bind.hpp>
 #include <memory>
 extern "C" {
@@ -41,4 +42,5 @@
 #include <CEGUISystem.h>
 #include <CEGUIWindow.h>
+#include <CEGUIWindowManager.h>
 #include <ogreceguirenderer/OgreCEGUIRenderer.h>
 
@@ -57,7 +59,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 +114,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 +123,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 +145,22 @@
         guiSystem_.reset(new System(guiRenderer_.get(), resourceProvider_, 0, scriptModule_.get()));
 
-        // 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();
+        // Initialise the Lua framework and load the schemes
+        this->luaState_->doFile("InitialiseGUI.lua");
+
+        // Create the root nodes
+        this->rootWindow_ = CEGUI::WindowManager::getSingleton().createWindow("MenuWidgets/StaticImage", "AbsoluteRootWindow");
+        this->rootWindow_->setProperty("FrameEnabled", "False");
+        this->hudRootWindow_ = CEGUI::WindowManager::getSingleton().createWindow("DefaultWindow", "HUDRootWindow");
+        this->menuRootWindow_ = CEGUI::WindowManager::getSingleton().createWindow("DefaultWindow", "MenuRootWindow");
+        // And connect them
+        CEGUI::System::getSingleton().setGUISheet(this->rootWindow_);
+        this->rootWindow_->addChildWindow(this->hudRootWindow_);
+        this->rootWindow_->addChildWindow(this->menuRootWindow_);
+
+        // Set up the sheet manager in the Lua framework
+        this->luaState_->doFile("SheetManager.lua");
     }
 
@@ -173,5 +186,5 @@
     {
         assert(guiSystem_);
-        guiSystem_->injectTimePulse(time.getDeltaTime());
+        this->protectedCall(boost::bind(&CEGUI::System::injectTimePulse, _1, time.getDeltaTime()));
     }
 
@@ -200,10 +213,17 @@
     @param str
         reference to string object holding the Lua code which is to be executed
-
-        This function gives total access to the GUI. You can execute ANY Lua code here.
     */
     void GUIManager::executeCode(const std::string& str)
     {
         this->luaState_->doString(str, rootFileInfo_);
+    }
+
+    /** 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("loadSheet(\"" + name + "\")");
     }
 
@@ -215,9 +235,8 @@
 
         The function executes the Lua function with the same name in case the GUIManager is ready.
-        For more details check out loadGUI_2.lua where the function presides.
-    */
-    /*static*/ void GUIManager::showGUI(const std::string& name, bool hidePrevious, bool showCursor)
-    {
-        GUIManager::getInstance().executeCode("showGUI(\"" + name + "\", " + multi_cast<std::string>(hidePrevious) + ", " + multi_cast<std::string>(showCursor) + ")");
+    */
+    /*static*/ void GUIManager::showGUI(const std::string& name, bool bHidePrevious)
+    {
+        GUIManager::getInstance().executeCode("showMenuSheet(\"" + name + "\", " + multi_cast<std::string>(bHidePrevious) + ")");
     }
 
@@ -226,7 +245,7 @@
         Hack-ish. Needed for GUIOverlay.
     */
-    void GUIManager::showGUIExtra(const std::string& name, const std::string& ptr, bool hidePrevious, bool showCursor)
-    {
-        this->executeCode("showGUI(\"" + name + "\", " + multi_cast<std::string>(hidePrevious) + ", " + multi_cast<std::string>(showCursor) + ", " + ptr + ")");
+    void GUIManager::showGUIExtra(const std::string& name, const std::string& ptr, bool bHidePrevious)
+    {
+        this->executeCode("showMenuSheet(\"" + name + "\", " + multi_cast<std::string>(bHidePrevious) + ", " + ptr + ")");
     }
 
@@ -239,5 +258,39 @@
     /*static*/ void GUIManager::hideGUI(const std::string& name)
     {
-        GUIManager::getInstance().executeCode("hideGUI(\"" + name + "\")");
+        GUIManager::getInstance().executeCode("hideMenuSheet(\"" + name + "\")");
+    }
+
+    const std::string& GUIManager::createInputState(const std::string& name, TriBool::Value showCursor, TriBool::Value useKeyboard, bool bBlockJoyStick)
+    {
+        InputState* state = InputManager::getInstance().createInputState(name);
+
+        /* Table that maps isFullScreen() and showCursor to mouseExclusive
+        isFullscreen / showCursor | True  | False | Dontcare
+        ----------------------------------------------------
+        true                      | True  | True  | Dontcare
+        ----------------------------------------------------
+        false                     | False | True  | Dontcare
+        */
+        if (showCursor == TriBool::Dontcare)
+            state->setMouseExclusive(TriBool::Dontcare);
+        else if (GraphicsManager::getInstance().isFullScreen() || showCursor == TriBool::False)
+            state->setMouseExclusive(TriBool::True);
+        else
+            state->setMouseExclusive(TriBool::False);
+
+        if (showCursor == TriBool::True)
+            state->setMouseHandler(this);
+        else if (showCursor == 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();
     }
 
@@ -247,17 +300,30 @@
     }
 
-    void GUIManager::setBackground(const std::string& name)
-    {
-        this->executeCode("setBackground(\"" + name + "\")");
+    void GUIManager::setBackgroundImage(const std::string& imageSet, const std::string imageName)
+    {
+        if (imageSet.empty() || imageName.empty())
+            this->setBackgroundImage("");
+        else
+            this->setBackgroundImage("set: " + imageSet + " image: " + imageName);
+    }
+
+    void GUIManager::setBackgroundImage(const std::string& image)
+    {
+        if (image.empty())
+            this->rootWindow_->setProperty("Alpha", "0.0");
+        else
+            this->rootWindow_->setProperty("Alpha", "1.0");
+        this->rootWindow_->setProperty("Image", image);
     }
 
     void GUIManager::keyPressed(const KeyEvent& evt)
     {
-        guiSystem_->injectKeyDown(evt.getKeyCode());
-        guiSystem_->injectChar(evt.getText());
-    }
+        this->protectedCall(boost::bind(&CEGUI::System::injectKeyDown, _1, evt.getKeyCode()));
+        this->protectedCall(boost::bind(&CEGUI::System::injectChar, _1, evt.getText()));
+    }
+
     void GUIManager::keyReleased(const KeyEvent& evt)
     {
-        guiSystem_->injectKeyUp(evt.getKeyCode());
+        this->protectedCall(boost::bind(&CEGUI::System::injectKeyUp, _1, evt.getKeyCode()));
     }
 
@@ -273,13 +339,5 @@
     void GUIManager::buttonPressed(MouseButtonCode::ByEnum id)
     {
-        try
-        {
-            guiSystem_->injectMouseButtonDown(convertButton(id));
-        }
-        catch (CEGUI::ScriptException& ex)
-        {
-            // We simply ignore the exception and proceed
-            COUT(1) << ex.getMessage() << std::endl;
-        }
+        this->protectedCall(boost::bind(&CEGUI::System::injectMouseButtonDown, _1, convertButton(id)));
     }
 
@@ -295,22 +353,15 @@
     void GUIManager::buttonReleased(MouseButtonCode::ByEnum id)
     {
-        try
-        {
-            guiSystem_->injectMouseButtonUp(convertButton(id));
-        }
-        catch (CEGUI::ScriptException& ex)
-        {
-            // We simply ignore the exception and proceed
-            COUT(1) << ex.getMessage() << std::endl;
-        }
+        this->protectedCall(boost::bind(&CEGUI::System::injectMouseButtonUp, _1, convertButton(id)));
     }
 
     void GUIManager::mouseMoved(IntVector2 abs, IntVector2 rel, IntVector2 clippingSize)
     {
-        guiSystem_->injectMousePosition(static_cast<float>(abs.x), static_cast<float>(abs.y));
-    }
+        this->protectedCall(boost::bind(&CEGUI::System::injectMousePosition, _1, (float)abs.x, (float)abs.y));
+    }
+
     void GUIManager::mouseScrolled(int abs, int rel)
     {
-        guiSystem_->injectMouseWheelChange(static_cast<float>(rel));
+        this->protectedCall(boost::bind(&CEGUI::System::injectMouseWheelChange, _1, (float)rel));
     }
 
@@ -349,4 +400,34 @@
     }
 
+    /** Executes a CEGUI function normally, but catches CEGUI::ScriptException.
+        When a ScriptException occurs, the error message will be displayed and
+        the program carries on.
+    @remarks
+        The exception behaviour may pose problems if the code is not written
+        exception-safe (and you can forget about that in Lua). The program might
+        be left in an undefined state. But otherwise one script error would
+        terminate the whole program...
+    @note
+        Your life gets easier if you use boost::bind to create the object/function.
+    @param function
+        Any callable object/function that takes this->guiSystem_ as its only parameter.
+    @return
+        True if input was handled, false otherwise. A caught exception yields true.
+    */
+    template <typename FunctionType>
+    bool GUIManager::protectedCall(FunctionType function)
+    {
+        try
+        {
+            return function(this->guiSystem_);
+        }
+        catch (CEGUI::ScriptException& ex)
+        {
+            // Display the error and proceed. See @remarks why this can be dangerous.
+            COUT(1) << ex.getMessage() << std::endl;
+            return true;
+        }
+    }
+
     void GUIManager::subscribeEventHelper(CEGUI::Window* window, const std::string& event, const std::string& function)
     {
Index: /code/trunk/src/libraries/core/GUIManager.h
===================================================================
--- /code/trunk/src/libraries/core/GUIManager.h	(revision 6745)
+++ /code/trunk/src/libraries/core/GUIManager.h	(revision 6746)
@@ -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,19 +69,27 @@
         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);
 
-        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);
+        void loadGUI(const std::string& name);
+        static void showGUI(const std::string& name, bool bHidePrevious = false);
+        void showGUIExtra(const std::string& name, const std::string& ptr, bool bHidePrevious = false);
         static void hideGUI(const std::string& name);
         void keyESC();
-        void setBackground(const std::string& name);
+        void setBackgroundImage(const std::string& imageSet, const std::string imageName); // tolua_export
+        void setBackgroundImage(const std::string& image);
+
+        //! Creates a new InputState to be used with a GUI Sheet
+        const std::string& createInputState(const std::string& name, TriBool::Value showCursor = TriBool::True, TriBool::Value useKeyboard = TriBool::True, bool bBlockJoyStick = false); // tolua_export
+
+        //! Returns the root window for all menu sheets
+        CEGUI::Window* getMenuRootWindow() { return this->menuRootWindow_; } // tolua_export
+        //! Returns the root window for all HUD sheets
+        CEGUI::Window* getHUDRootWindow() { return this->hudRootWindow_; } // 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)
@@ -88,8 +101,13 @@
         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:
         GUIManager(const GUIManager& instance); //!< private and undefined copy c'tor (this is a singleton class)
 
         void executeCode(const std::string& str);
+
+        template <typename FunctionType>
+        bool protectedCall(FunctionType function);
 
         // keyHandler functions
@@ -102,5 +120,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 +125,13 @@
         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
+        CEGUI::Window*                       rootWindow_;       //!< Root node for all windows
+        CEGUI::Window*                       hudRootWindow_;    //!< Root node for the HUD sheets
+        CEGUI::Window*                       menuRootWindow_;   //!< Root node for the menu sheets (used by Lua)
+        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/trunk/src/libraries/core/Game.h
===================================================================
--- /code/trunk/src/libraries/core/Game.h	(revision 6745)
+++ /code/trunk/src/libraries/core/Game.h	(revision 6746)
@@ -50,5 +50,5 @@
 #include "util/ScopeGuard.h"
 #include "util/Singleton.h"
-#include "core/OrxonoxClass.h"
+#include "OrxonoxClass.h"
 
 /**
Index: /code/trunk/src/libraries/core/IOConsole.cc
===================================================================
--- /code/trunk/src/libraries/core/IOConsole.cc	(revision 6745)
+++ /code/trunk/src/libraries/core/IOConsole.cc	(revision 6746)
@@ -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/trunk/src/libraries/core/IOConsole.h
===================================================================
--- /code/trunk/src/libraries/core/IOConsole.h	(revision 6745)
+++ /code/trunk/src/libraries/core/IOConsole.h	(revision 6746)
@@ -37,5 +37,5 @@
 #include <vector>
 #include "util/Singleton.h"
-#include "core/Shell.h"
+#include "Shell.h"
 
 #ifdef ORXONOX_PLATFORM_UNIX
Index: /code/trunk/src/libraries/core/LuaState.cc
===================================================================
--- /code/trunk/src/libraries/core/LuaState.cc	(revision 6745)
+++ /code/trunk/src/libraries/core/LuaState.cc	(revision 6746)
@@ -37,4 +37,7 @@
 
 #include "util/Debug.h"
+#include "util/Exception.h"
+#include "util/ScopeGuard.h"
+#include "IOConsole.h"
 #include "Resource.h"
 #include "ToluaBindCore.h"
@@ -54,4 +57,5 @@
         // Create new lua state and configure it
         luaState_ = lua_open();
+        Loki::ScopeGuard luaStateGuard = Loki::MakeGuard(&lua_close, luaState_);
 #if LUA_VERSION_NUM == 501
         luaL_openlibs(luaState_);
@@ -78,5 +82,8 @@
 
         // Parse init script
-        this->doFile("LuaStateInit.lua");
+        if (!this->doFile("LuaStateInit.lua"))
+            ThrowException(InitialisationFailed, "Running LuaStateInit.lua failed");
+
+        luaStateGuard.Dismiss();
     }
 
@@ -96,14 +103,17 @@
     }
 
-    void LuaState::includeFile(const std::string& filename)
+    bool LuaState::includeFile(const std::string& filename)
     {
         shared_ptr<ResourceInfo> sourceInfo = this->getFileInfo(filename);
         if (sourceInfo != NULL)
-            this->includeString(Resource::open(sourceInfo)->getAsString(), sourceInfo);
-        else
-            COUT(2) << "LuaState: Cannot include file '" << filename << "'." << std::endl;
-    }
-
-    void LuaState::includeString(const std::string& code, const shared_ptr<ResourceInfo>& sourceFileInfo)
+            return this->includeString(Resource::open(sourceInfo)->getAsString(), sourceInfo);
+        else
+        {
+            COUT(2) << "LuaState: Cannot include file '" << filename << "' (not found)." << std::endl;
+            return false;
+        }
+    }
+
+    bool LuaState::includeString(const std::string& code, const shared_ptr<ResourceInfo>& sourceFileInfo)
     {
         // Parse string with provided include parser (otherwise don't preparse at all)
@@ -114,17 +124,36 @@
             luaInput = code;
 
-        this->doString(luaInput, sourceFileInfo);
-    }
-
-    void LuaState::doFile(const std::string& filename)
+        if (sourceFileInfo != NULL)
+        {
+            // Also fill a map with the actual source code. This is just for the include* commands
+            // where the content of sourceFileInfo->filename doesn't match 'code'
+            this->sourceCodeMap_[sourceFileInfo->filename] = code;
+        }
+
+        bool returnValue = this->doString(luaInput, sourceFileInfo);
+
+        if (sourceFileInfo != NULL)
+        {
+            // Delete source code entry
+            if (sourceFileInfo != NULL)
+                this->sourceCodeMap_.erase(sourceFileInfo->filename);
+        }
+
+        return returnValue;
+    }
+
+    bool LuaState::doFile(const std::string& filename)
     {
         shared_ptr<ResourceInfo> sourceInfo = this->getFileInfo(filename);
         if (sourceInfo != NULL)
-            this->doString(Resource::open(sourceInfo)->getAsString(), sourceInfo);
-        else
-            COUT(2) << "LuaState: Cannot do file '" << filename << "'." << std::endl;
-    }
-
-    void LuaState::doString(const std::string& code, const shared_ptr<ResourceInfo>& sourceFileInfo)
+            return this->doString(Resource::open(sourceInfo)->getAsString(), sourceInfo);
+        else
+        {
+            COUT(2) << "LuaState: Cannot do file '" << filename << "' (not found)." << std::endl;
+            return false;
+        }
+    }
+
+    bool LuaState::doString(const std::string& code, const shared_ptr<ResourceInfo>& sourceFileInfo)
     {
         // Save the old source file info
@@ -134,31 +163,91 @@
             sourceFileInfo_ = sourceFileInfo;
 
-        int error = 0;
+        std::string chunkname;
+        if (sourceFileInfo != NULL)
+        {
+            // Provide lua_load with the filename for debug purposes
+            // The '@' is a Lua convention to identify the chunk name as filename
+            chunkname = '@' + sourceFileInfo->filename;
+        }
+        else
+        {
+            // Use the code string to identify the chunk
+            chunkname = code;
+        }
+
+        // Push custom error handler that uses the debugger
+        lua_getglobal(this->luaState_, "errorHandler");
+        int errorHandler = lua_gettop(luaState_);
+        if (lua_isnil(this->luaState_, -1))
+        {
+            lua_pop(this->luaState_, 1);
+            errorHandler = 0;
+        }
+
 #if LUA_VERSION_NUM != 501
         LoadS ls;
         ls.s = code.c_str();
         ls.size = code.size();
-        error = lua_load(luaState_, &orxonox::LuaState::lua_Chunkreader, &ls, code.c_str());
+        int error = lua_load(luaState_, &orxonox::LuaState::lua_Chunkreader, &ls, chunkname.c_str());
 #else
-        error = luaL_loadstring(luaState_, code.c_str());
+        int error = luaL_loadbuffer(luaState_, code.c_str(), code.size(), chunkname.c_str());
 #endif
 
-        // execute the chunk
+        switch (error)
+        {
+        case LUA_ERRSYNTAX: // Syntax error
+            COUT(1) << "Lua syntax error: " << lua_tostring(luaState_, -1) << std::endl;
+            break;
+        case LUA_ERRMEM:    // Memory allocation error
+            COUT(1) << "Lua memory allocation error: Consult your dentist immediately!" << std::endl;
+            break;
+        }
+
         if (error == 0)
-            error = lua_pcall(luaState_, 0, 1, 0);
+        {
+            // Execute the chunk in protected mode with an error handler function (stack index)
+            error = lua_pcall(luaState_, 0, 1, errorHandler);
+
+            switch (error)
+            {
+            case LUA_ERRRUN: // Runtime error
+                if (errorHandler)
+                {
+                    // Do nothing (we already display the error in the
+                    // 'errorHandler' Lua function in LuaStateInit.lua)
+                }
+                else
+                {
+                    std::string errorString = lua_tostring(this->luaState_, -1);
+                    if (errorString.find("Error propagation") == std::string::npos)
+                        COUT(1) << "Lua runtime error: " << errorString << std::endl;
+                }
+                break;
+            case LUA_ERRERR: // Error in the error handler
+                COUT(1) << "Lua error in error handler. No message available." << std::endl;
+                break;
+            case LUA_ERRMEM: // Memory allocation error
+                COUT(1) << "Lua memory allocation error: Consult your dentist immediately!" << std::endl;
+                break;
+            }
+        }
+
         if (error != 0)
         {
-            std::string origin;
-            if (sourceFileInfo != NULL)
-                origin = " originating from " + sourceFileInfo_->filename;
-            COUT(1) << "Error in Lua-script" << origin << ": " << lua_tostring(luaState_, -1) << std::endl;
-            // return value is nil
-            lua_pushnil(luaState_);
-        }
-        // push return value because it will get lost since the return value of this function is void
+            lua_pop(luaState_, 1);  // Remove error message
+            lua_pushnil(luaState_); // Push a nil return value
+        }
+
+        if (errorHandler != 0)
+            lua_remove(luaState_, errorHandler); // Remove error handler from stack
+
+        // Set return value to a global variable because we cannot return a table in this function
+        // here. It would work for numbers, pointers and strings, but certainly not for Lua tables.
         lua_setglobal(luaState_, "LuaStateReturnValue");
 
         // Load the old info again
         sourceFileInfo_ = oldSourceFileInfo;
+
+        return (error == 0);
     }
 
@@ -180,4 +269,24 @@
         else
             return true;
+    }
+
+    //! Returns the content of a file
+    std::string LuaState::getSourceCode(const std::string& filename)
+    {
+        // Try the internal map first to get the actual Lua code
+        // and not just some pseudo Lua-XML code when using include* commands
+        std::map<std::string, std::string>::const_iterator it = this->sourceCodeMap_.find(filename);
+        if (it != this->sourceCodeMap_.end())
+            return it->second;
+        shared_ptr<ResourceInfo> info = Resource::getInfo(filename);
+        if (info == NULL)
+            return "";
+        else
+            return Resource::open(info)->getAsString();
+    }
+
+    bool LuaState::usingIOConsole() const
+    {
+        return IOConsole::exists();
     }
 
Index: /code/trunk/src/libraries/core/LuaState.h
===================================================================
--- /code/trunk/src/libraries/core/LuaState.h	(revision 6745)
+++ /code/trunk/src/libraries/core/LuaState.h	(revision 6746)
@@ -40,5 +40,5 @@
 
 #include "util/ScopeGuard.h"
-#include "core/Functor.h"
+#include "Functor.h"
 #include "ToluaInterface.h"
 
@@ -71,13 +71,14 @@
         ~LuaState();
 
-        void doFile(const std::string& filename); // tolua_export
-        void doString(const std::string& code, const shared_ptr<ResourceInfo>& sourceFileInfo = shared_ptr<ResourceInfo>());
+        bool doFile(const std::string& filename); // tolua_export
+        bool doString(const std::string& code, const shared_ptr<ResourceInfo>& sourceFileInfo = shared_ptr<ResourceInfo>());
 
-        void includeFile(const std::string& filename); // tolua_export
-        void includeString(const std::string& code, const shared_ptr<ResourceInfo>& sourceFileInfo = shared_ptr<ResourceInfo>());
+        bool includeFile(const std::string& filename); // tolua_export
+        bool includeString(const std::string& code, const shared_ptr<ResourceInfo>& sourceFileInfo = shared_ptr<ResourceInfo>());
 
         void luaPrint(const std::string& str); // tolua_export
         void luaLog(unsigned int level, const std::string& message); // tolua_export
         bool fileExists(const std::string& filename); // tolua_export
+        std::string getSourceCode(const std::string& filename); // tolua_export
 
         const std::stringstream& getOutput() const { return output_; }
@@ -91,4 +92,6 @@
 
         Functor* createLuaFunctor(const std::string& code) { return new LuaFunctor(code, this); } // tolua_export
+        //! Tells about whether IOConsole was activated. The Lua debugger only works with a normal console.
+        bool usingIOConsole() const; // tolua_export
 
         static bool addToluaInterface(int (*function)(lua_State*), const std::string& name);
@@ -114,4 +117,5 @@
         bool bIsRunning_;
         shared_ptr<ResourceInfo> sourceFileInfo_;
+        std::map<std::string, std::string> sourceCodeMap_;
         std::string (*includeParseFunction_)(const std::string&);
 
Index: /code/trunk/src/libraries/core/Resource.cc
===================================================================
--- /code/trunk/src/libraries/core/Resource.cc	(revision 6745)
+++ /code/trunk/src/libraries/core/Resource.cc	(revision 6746)
@@ -29,5 +29,7 @@
 #include "Resource.h"
 
+#include <boost/filesystem/path.hpp>
 #include <OgreException.h>
+#include <OgreFileSystem.h>
 #include <OgreResourceGroupManager.h>
 
@@ -89,4 +91,10 @@
                 ptr->group = group;
                 ptr->size = it->uncompressedSize;
+                if (dynamic_cast<Ogre::FileSystemArchive*>(it->archive) != NULL)
+                {
+                    boost::filesystem::path base(it->archive->getName());
+                    base /= it->filename;
+                    ptr->fileSystemPath = base.string();
+                }
                 return ptr;
             }
Index: /code/trunk/src/libraries/core/Resource.h
===================================================================
--- /code/trunk/src/libraries/core/Resource.h	(revision 6745)
+++ /code/trunk/src/libraries/core/Resource.h	(revision 6746)
@@ -57,4 +57,6 @@
         //! Uncompressed size
         size_t size;
+        //! Absolute file path ("" for files not on filesystem)
+        std::string fileSystemPath;
     };
 
Index: /code/trunk/src/libraries/core/Template.cc
===================================================================
--- /code/trunk/src/libraries/core/Template.cc	(revision 6745)
+++ /code/trunk/src/libraries/core/Template.cc	(revision 6746)
@@ -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/trunk/src/libraries/core/input/InputDevice.h
===================================================================
--- /code/trunk/src/libraries/core/input/InputDevice.h	(revision 6745)
+++ /code/trunk/src/libraries/core/input/InputDevice.h	(revision 6746)
@@ -159,5 +159,5 @@
             for (unsigned int iB = 0; iB < pressedButtons_.size(); ++iB)
                 for (unsigned int iS = 0; iS < inputStates_.size(); ++iS)
-                    inputStates_[iS]->buttonEvent<ButtonEvent::THold, Traits>(
+                    inputStates_[iS]->buttonEvent<ButtonEvent::THold, typename Traits::ButtonTypeParam>(
                         this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(pressedButtons_[iB]));
 
@@ -196,5 +196,5 @@
             // Call states
             for (unsigned int i = 0; i < inputStates_.size(); ++i)
-                inputStates_[i]->buttonEvent<ButtonEvent::TPress, Traits>(this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(button));
+                inputStates_[i]->buttonEvent<ButtonEvent::TPress, typename Traits::ButtonTypeParam>(this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(button));
         }
 
@@ -218,5 +218,5 @@
             // Call states
             for (unsigned int i = 0; i < inputStates_.size(); ++i)
-                inputStates_[i]->buttonEvent<ButtonEvent::TRelease, Traits>(this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(button));
+                inputStates_[i]->buttonEvent<ButtonEvent::TRelease, typename Traits::ButtonTypeParam>(this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(button));
         }
 
Index: /code/trunk/src/libraries/core/input/InputHandler.h
===================================================================
--- /code/trunk/src/libraries/core/input/InputHandler.h	(revision 6745)
+++ /code/trunk/src/libraries/core/input/InputHandler.h	(revision 6746)
@@ -112,16 +112,10 @@
         virtual ~InputHandler() { }
 
-        template<class T> void buttonEvent(unsigned int device, const T& button, ButtonEvent::TPress)
+        template<class T> void buttonEvent(unsigned int device, T button, ButtonEvent::TPress)
             { this->buttonPressed(button); }
-        template<class T> void buttonEvent(unsigned int device, const T& button, ButtonEvent::TRelease)
+        template<class T> void buttonEvent(unsigned int device, T button, ButtonEvent::TRelease)
             { this->buttonReleased(button); }
-        template<class T> void buttonEvent(unsigned int device, const T& button, ButtonEvent::THold)
+        template<class T> void buttonEvent(unsigned int device, T button, ButtonEvent::THold)
             { this->buttonHeld(button); }
-        void buttonEvent(unsigned int device, JoyStickButtonCode::ByEnum button, ButtonEvent::TPress)
-            { this->buttonPressed(device - InputDeviceEnumerator::FirstJoyStick, button); }
-        void buttonEvent(unsigned int device, JoyStickButtonCode::ByEnum button, ButtonEvent::TRelease)
-            { this->buttonReleased(device - InputDeviceEnumerator::FirstJoyStick, button); }
-        void buttonEvent(unsigned int device, JoyStickButtonCode::ByEnum button, ButtonEvent::THold)
-            { this->buttonHeld(device - InputDeviceEnumerator::FirstJoyStick, button); }
 
         virtual void buttonPressed (const KeyEvent& evt) { }
@@ -149,4 +143,11 @@
         static InputHandler EMPTY;
     };
+
+    template<> inline void InputHandler::buttonEvent<JoyStickButtonCode::ByEnum>(unsigned int device, JoyStickButtonCode::ByEnum button, ButtonEvent::TPress)
+        { this->buttonPressed(device - InputDeviceEnumerator::FirstJoyStick, button); }
+    template<> inline void InputHandler::buttonEvent<JoyStickButtonCode::ByEnum>(unsigned int device, JoyStickButtonCode::ByEnum button, ButtonEvent::TRelease)
+        { this->buttonReleased(device - InputDeviceEnumerator::FirstJoyStick, button); }
+    template<> inline void InputHandler::buttonEvent<JoyStickButtonCode::ByEnum>(unsigned int device, JoyStickButtonCode::ByEnum button, ButtonEvent::THold)
+        { this->buttonHeld(device - InputDeviceEnumerator::FirstJoyStick, button); }
 }
 
Index: /code/trunk/src/libraries/core/input/InputManager.cc
===================================================================
--- /code/trunk/src/libraries/core/input/InputManager.cc	(revision 6745)
+++ /code/trunk/src/libraries/core/input/InputManager.cc	(revision 6746)
@@ -87,5 +87,5 @@
         , oisInputManager_(0)
         , devices_(2)
-        , mouseMode_(MouseMode::Nonexclusive)
+        , exclusiveMouse_(TriBool::False)
         , emptyState_(0)
         , calibratorCallbackHandler_(0)
@@ -95,8 +95,11 @@
         CCOUT(4) << "Constructing..." << std::endl;
 
+        // Allocate space for the function call buffer
+        this->callBuffer_.reserve(16);
+
         this->setConfigValues();
 
         if (GraphicsManager::getInstance().isFullScreen())
-            mouseMode_ = MouseMode::Exclusive;
+            exclusiveMouse_ = TriBool::True;
         this->loadDevices();
 
@@ -155,5 +158,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 +171,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())
@@ -266,12 +269,17 @@
         CCOUT(3) << "Destroying..." << std::endl;
 
+        // Leave all active InputStates (except "empty")
+        while (this->activeStates_.size() > 1)
+            this->leaveState(this->activeStates_.rbegin()->second->getName());
+        this->activeStates_.clear();
+
         // Destroy calibrator helper handler and state
         this->destroyState("calibrator");
         // Destroy KeyDetector and state
         calibratorCallbackHandler_->destroy();
-        // destroy the empty InputState
+        // Destroy the empty InputState
         this->destroyStateInternal(this->emptyState_);
 
-        // destroy all user InputStates
+        // Destroy all user InputStates
         while (statesByName_.size() > 0)
             this->destroyStateInternal(statesByName_.rbegin()->second);
@@ -335,12 +343,5 @@
     void InputManager::reload()
     {
-        if (internalState_ & Ticking)
-        {
-            // We cannot destroy OIS right now, because reload was probably
-            // caused by a user clicking on a GUI item. The stack trace would then
-            // include an OIS method. So it would be a very bad thing to destroy it..
-            internalState_ |= ReloadRequest;
-        }
-        else if (internalState_ & Calibrating)
+        if (internalState_ & Calibrating)
             CCOUT(2) << "Warning: Cannot reload input system. Joy sticks are currently being calibrated." << std::endl;
         else
@@ -351,5 +352,5 @@
     void InputManager::reloadInternal()
     {
-        CCOUT(3) << "Reloading ..." << std::endl;
+        CCOUT(4) << "Reloading ..." << std::endl;
 
         this->destroyDevices();
@@ -357,5 +358,4 @@
 
         internalState_ &= ~Bad;
-        internalState_ &= ~ReloadRequest;
         CCOUT(4) << "Reloading complete." << std::endl;
     }
@@ -370,68 +370,4 @@
         if (internalState_ & Bad)
             ThrowException(General, "InputManager was not correctly reloaded.");
-
-        else if (internalState_ & ReloadRequest)
-            reloadInternal();
-
-        // check for states to leave
-        if (!stateLeaveRequests_.empty())
-        {
-            for (std::set<InputState*>::iterator it = stateLeaveRequests_.begin();
-                it != stateLeaveRequests_.end(); ++it)
-            {
-                (*it)->left();
-                // just to be sure that the state actually is registered
-                assert(statesByName_.find((*it)->getName()) != statesByName_.end());
-
-                activeStates_.erase((*it)->getPriority());
-                if ((*it)->getPriority() < InputStatePriority::HighPriority)
-                    (*it)->setPriority(0);
-                updateActiveStates();
-            }
-            stateLeaveRequests_.clear();
-        }
-
-        // check for states to enter
-        if (!stateEnterRequests_.empty())
-        {
-            for (std::set<InputState*>::const_iterator it = stateEnterRequests_.begin();
-                it != stateEnterRequests_.end(); ++it)
-            {
-                // just to be sure that the state actually is registered
-                assert(statesByName_.find((*it)->getName()) != statesByName_.end());
-
-                if ((*it)->getPriority() == 0)
-                {
-                    // Get smallest possible priority between 1 and maxStateStackSize_s
-                    for (std::map<int, InputState*>::reverse_iterator rit = activeStates_.rbegin();
-                        rit != activeStates_.rend(); ++rit)
-                    {
-                        if (rit->first < InputStatePriority::HighPriority)
-                        {
-                            (*it)->setPriority(rit->first + 1);
-                            break;
-                        }
-                    }
-                    // In case no normal handler was on the stack
-                    if ((*it)->getPriority() == 0)
-                        (*it)->setPriority(1);
-                }
-                activeStates_[(*it)->getPriority()] = (*it);
-                updateActiveStates();
-                (*it)->entered();
-            }
-            stateEnterRequests_.clear();
-        }
-
-        // check for states to destroy
-        if (!stateDestroyRequests_.empty())
-        {
-            for (std::set<InputState*>::iterator it = stateDestroyRequests_.begin();
-                it != stateDestroyRequests_.end(); ++it)
-            {
-                destroyStateInternal((*it));
-            }
-            stateDestroyRequests_.clear();
-        }
 
         // check whether a state has changed its EMPTY situation
@@ -448,17 +384,25 @@
             updateActiveStates();
 
-        // mark that we now start capturing and distributing input
-        internalState_ |= Ticking;
-
-        // Capture all the input and handle it
+        // Capture all the input and collect the function calls
+        // No event gets triggered here yet!
         BOOST_FOREACH(InputDevice* device, devices_)
             if (device != NULL)
                 device->update(time);
 
-        // Update the states
+        // Collect function calls for the update
         for (unsigned int i = 0; i < activeStatesTicked_.size(); ++i)
             activeStatesTicked_[i]->update(time.getDeltaTime());
 
-        internalState_ &= ~Ticking;
+        // Execute all cached function calls in order
+        // Why so complicated? The problem is that an InputHandler could trigger
+        // a reload that would destroy the OIS devices or it could even leave and
+        // then destroy its own InputState. That would of course lead to access
+        // violations.
+        // If we delay the calls, then OIS and and the InputStates are not anymore
+        // in the call stack and can therefore be edited.
+        for (size_t i = 0; i < this->callBuffer_.size(); ++i)
+            this->callBuffer_[i]();
+
+        this->callBuffer_.clear();
     }
 
@@ -470,6 +414,6 @@
     void InputManager::updateActiveStates()
     {
-        assert((internalState_ & InputManager::Ticking) == 0);
-        // temporary resize
+        // Calculate the stack of input states
+        // and assign it to the corresponding device
         for (unsigned int i = 0; i < devices_.size(); ++i)
         {
@@ -490,6 +434,6 @@
         }
 
-        // update tickables (every state will only appear once)
-        // Using a std::set to avoid duplicates
+        // See that we only update each InputState once for each device
+        // Using an std::set to avoid duplicates
         std::set<InputState*> tempSet;
         for (unsigned int i = 0; i < devices_.size(); ++i)
@@ -498,5 +442,5 @@
                     tempSet.insert(devices_[i]->getStateListRef()[iState]);
 
-        // copy the content of the std::set back to the actual vector
+        // Copy the content of the std::set back to the actual vector
         activeStatesTicked_.clear();
         for (std::set<InputState*>::const_iterator it = tempSet.begin();it != tempSet.end(); ++it)
@@ -504,13 +448,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;
-        else
-            requestedMode = mouseStates.front()->getMouseMode();
-        if (requestedMode != MouseMode::Dontcare && mouseMode_ != requestedMode)
-        {
-            mouseMode_ = requestedMode;
+            requestedMode = TriBool::False;
+        else
+            requestedMode = mouseStates.front()->getMouseExclusive();
+        if (requestedMode != TriBool::Dontcare && exclusiveMouse_ != requestedMode)
+        {
+            exclusiveMouse_ = requestedMode;
             if (!GraphicsManager::getInstance().isFullScreen())
                 this->reloadInternal();
@@ -622,23 +566,28 @@
         // get pointer from the map with all stored handlers
         std::map<std::string, InputState*>::const_iterator it = statesByName_.find(name);
-        if (it != statesByName_.end())
-        {
-            // exists
-            if (activeStates_.find(it->second->getPriority()) == activeStates_.end())
-            {
-                // not active
-                if (stateDestroyRequests_.find(it->second) == stateDestroyRequests_.end())
+        if (it != statesByName_.end() && activeStates_.find(it->second->getPriority()) == activeStates_.end())
+        {
+            // exists and not active
+            if (it->second->getPriority() == 0)
+            {
+                // Get smallest possible priority between 1 and maxStateStackSize_s
+                for (std::map<int, InputState*>::reverse_iterator rit = activeStates_.rbegin();
+                    rit != activeStates_.rend(); ++rit)
                 {
-                    // not scheduled for destruction
-                    // prevents a state from being added multiple times
-                    stateEnterRequests_.insert(it->second);
-                    return true;
+                    if (rit->first < InputStatePriority::HighPriority)
+                    {
+                        it->second->setPriority(rit->first + 1);
+                        break;
+                    }
                 }
-            }
-            else if (this->stateLeaveRequests_.find(it->second) != this->stateLeaveRequests_.end())
-            {
-                // State already scheduled for leaving --> cancel
-                this->stateLeaveRequests_.erase(this->stateLeaveRequests_.find(it->second));
-            }
+                // In case no normal handler was on the stack
+                if (it->second->getPriority() == 0)
+                    it->second->setPriority(1);
+            }
+            activeStates_[it->second->getPriority()] = it->second;
+            updateActiveStates();
+            it->second->entered();
+
+            return true;
         }
         return false;
@@ -654,18 +603,16 @@
         // get pointer from the map with all stored handlers
         std::map<std::string, InputState*>::const_iterator it = statesByName_.find(name);
-        if (it != statesByName_.end())
-        {
-            // exists
-            if (activeStates_.find(it->second->getPriority()) != activeStates_.end())
-            {
-                // active
-                stateLeaveRequests_.insert(it->second);
-                return true;
-            }
-            else if (this->stateEnterRequests_.find(it->second) != this->stateEnterRequests_.end())
-            {
-                // State already scheduled for entering --> cancel
-                this->stateEnterRequests_.erase(this->stateEnterRequests_.find(it->second));
-            }
+        if (it != statesByName_.end() && activeStates_.find(it->second->getPriority()) != activeStates_.end())
+        {
+            // exists and active
+
+            it->second->left();
+
+            activeStates_.erase(it->second->getPriority());
+            if (it->second->getPriority() < InputStatePriority::HighPriority)
+                it->second->setPriority(0);
+            updateActiveStates();
+
+            return true;
         }
         return false;
@@ -682,17 +629,6 @@
         if (it != statesByName_.end())
         {
-            if (activeStates_.find(it->second->getPriority()) != activeStates_.end())
-            {
-                // The state is still active. We have to postpone
-                stateLeaveRequests_.insert(it->second);
-                stateDestroyRequests_.insert(it->second);
-            }
-            else if (this->internalState_ & Ticking)
-            {
-                // cannot remove state while ticking
-                stateDestroyRequests_.insert(it->second);
-            }
-            else
-                destroyStateInternal(it->second);
+            this->leaveState(name);
+            destroyStateInternal(it->second);
 
             return true;
@@ -704,11 +640,5 @@
     void InputManager::destroyStateInternal(InputState* state)
     {
-        assert(state && !(this->internalState_ & Ticking));
-        std::map<int, InputState*>::iterator it = this->activeStates_.find(state->getPriority());
-        if (it != this->activeStates_.end())
-        {
-            this->activeStates_.erase(it);
-            updateActiveStates();
-        }
+        assert(state && this->activeStates_.find(state->getPriority()) == this->activeStates_.end());
         statesByName_.erase(state->getName());
         state->destroy();
Index: /code/trunk/src/libraries/core/input/InputManager.h
===================================================================
--- /code/trunk/src/libraries/core/input/InputManager.h	(revision 6745)
+++ /code/trunk/src/libraries/core/input/InputManager.h	(revision 6746)
@@ -36,8 +36,9 @@
 #include <string>
 #include <vector>
+#include <boost/function.hpp>
 
 #include "util/Singleton.h"
+#include "util/TriBool.h"
 #include "core/WindowEventListener.h"
-#include "InputState.h"
 
 // tolua_begin
@@ -75,7 +76,5 @@
             Nothing       = 0x00,
             Bad           = 0x02,
-            Ticking       = 0x04,
-            Calibrating   = 0x08,
-            ReloadRequest = 0x10,
+            Calibrating   = 0x04,
         };
 
@@ -159,5 +158,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
 
         //-------------------------------
@@ -169,5 +168,14 @@
         //! Returns a pointer to the OIS InputManager. Only you if you know what you're doing!
         OIS::InputManager* getOISInputManager() { return this->oisInputManager_; }
+        //! Returns the position of the cursor as std::pair of ints
         std::pair<int, int> getMousePosition() const;
+        //! Tells whether the mouse is used exclusively to the game
+        bool isMouseExclusive() const { return this->exclusiveMouse_; } // tolua_export
+
+        //-------------------------------
+        // Function call caching
+        //-------------------------------
+        void pushCall(const boost::function<void ()>& function)
+            { this->callBuffer_.push_back(function); }
 
         static InputManager& getInstance() { return Singleton<InputManager>::getInstance(); } // tolua_export
@@ -196,5 +204,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
@@ -207,7 +215,5 @@
         std::vector<InputState*>            activeStatesTicked_;   //!< Like activeStates_, but only contains the ones that currently receive events
 
-        std::set<InputState*>               stateEnterRequests_;   //!< Requests to enter a new state
-        std::set<InputState*>               stateLeaveRequests_;   //!< Requests to leave a running state
-        std::set<InputState*>               stateDestroyRequests_; //!< Requests to destroy a state
+        std::vector<boost::function<void ()> > callBuffer_;        //!< Caches all calls from InputStates to be executed afterwards (see preUpdate)
 
         static InputManager*                singletonPtr_s;        //!< Pointer reference to the singleton
Index: /code/trunk/src/libraries/core/input/InputPrereqs.h
===================================================================
--- /code/trunk/src/libraries/core/input/InputPrereqs.h	(revision 6745)
+++ /code/trunk/src/libraries/core/input/InputPrereqs.h	(revision 6746)
@@ -42,4 +42,5 @@
 #include <ois/OISMouse.h>
 #include <ois/OISJoyStick.h>
+#include "util/OrxEnum.h"
 
 namespace orxonox
@@ -448,4 +449,18 @@
         };
     }
+
+    //! Enumeration wrapper for input state priorities
+    struct InputStatePriority : OrxEnum<InputStatePriority>
+    {
+        OrxEnumConstructors(InputStatePriority);
+
+        static const int Empty        = -1;
+        static const int Dynamic      = 0;
+
+        static const int HighPriority = 1000;
+        static const int Console      = HighPriority + 0;
+        static const int Calibrator   = HighPriority + 1;
+        static const int Detector     = HighPriority + 2;
+    };
 }
 
Index: /code/trunk/src/libraries/core/input/InputState.cc
===================================================================
--- /code/trunk/src/libraries/core/input/InputState.cc	(revision 6745)
+++ /code/trunk/src/libraries/core/input/InputState.cc	(revision 6746)
@@ -37,5 +37,5 @@
         , bAlwaysGetsInput_(bAlwaysGetsInput)
         , bTransparent_(bTransparent)
-        , mouseMode_(MouseMode::Dontcare)
+        , exclusiveMouse_(TriBool::Dontcare)
         , bExpired_(true)
         , handlers_(2)
Index: /code/trunk/src/libraries/core/input/InputState.h
===================================================================
--- /code/trunk/src/libraries/core/input/InputState.h	(revision 6745)
+++ /code/trunk/src/libraries/core/input/InputState.h	(revision 6746)
@@ -35,35 +35,17 @@
 #include <string>
 #include <vector>
-
-#include "util/OrxEnum.h"
+#include <boost/function.hpp>
+#include <boost/bind.hpp>
+
+#include "util/TriBool.h"
 #include "InputHandler.h"
+#include "InputManager.h"
 #include "JoyStickQuantityListener.h"
+
+#define INPUT_STATE_PUSH_CALL(deviceIndex, functionName, ...) \
+    InputManager::getInstance().pushCall(boost::function<void ()>(boost::bind(&InputHandler::functionName, handlers_[deviceIndex], __VA_ARGS__)))
 
 namespace orxonox
 {
-    //! Enumeration wrapper for input state priorities
-    struct InputStatePriority : OrxEnum<InputStatePriority>
-    {
-        OrxEnumConstructors(InputStatePriority);
-
-        static const int Empty        = -1;
-        static const int Dynamic      = 0;
-
-        static const int HighPriority = 1000;
-        static const int Console      = HighPriority + 0;
-        static const int Calibrator   = HighPriority + 1;
-        static const int Detector     = HighPriority + 2;
-    };
-
-    namespace MouseMode
-    {
-        enum Value
-        {
-            Exclusive,
-            Nonexclusive,
-            Dontcare
-        };
-    }
-
     /**
     @brief
@@ -73,5 +55,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 +65,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 +77,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 +112,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!)
@@ -152,6 +134,6 @@
 
         //! Generic function that distributes all 9 button events
-        template <typename EventType, class Traits>
-        void buttonEvent(unsigned int device, const typename Traits::ButtonTypeParam button);
+        template <typename EventType, class ButtonTypeParam>
+        void buttonEvent(unsigned int device, ButtonTypeParam button);
 
         //! Event handler
@@ -184,5 +166,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()
@@ -198,5 +180,5 @@
         for (unsigned int i = 0; i < handlers_.size(); ++i)
             if (handlers_[i] != NULL)
-                handlers_[i]->allDevicesUpdated(dt);
+                INPUT_STATE_PUSH_CALL(i, allDevicesUpdated, dt);
     }
 
@@ -207,25 +189,29 @@
         case InputDeviceEnumerator::Keyboard:
             if (handlers_[keyboardIndex_s] != NULL)
-                handlers_[keyboardIndex_s]->keyboardUpdated(dt);
+                INPUT_STATE_PUSH_CALL(keyboardIndex_s, keyboardUpdated, dt);
             break;
 
         case InputDeviceEnumerator::Mouse:
             if (handlers_[mouseIndex_s] != NULL)
-                handlers_[mouseIndex_s]->mouseUpdated(dt);
+                INPUT_STATE_PUSH_CALL(mouseIndex_s, mouseUpdated, dt);
             break;
 
         default: // joy sticks
             if (handlers_[device] != NULL)
-                handlers_[device]->joyStickUpdated(device - firstJoyStickIndex_s, dt);
+                INPUT_STATE_PUSH_CALL(device, joyStickUpdated, device - firstJoyStickIndex_s, dt);
             break;
         }
     }
 
-    template <typename EventType, class Traits>
-    FORCEINLINE void InputState::buttonEvent(unsigned int device, const typename Traits::ButtonTypeParam button)
+    template <typename EventType, class ButtonTypeParam>
+    FORCEINLINE void InputState::buttonEvent(unsigned int device, ButtonTypeParam button)
     {
         assert(device < handlers_.size());
         if (handlers_[device] != NULL)
-            handlers_[device]->buttonEvent(device, button, EventType());
+        {
+            // We have to store the function pointer to tell the compiler about its actual type because of overloading
+            void (InputHandler::*function)(unsigned int, ButtonTypeParam, EventType) = &InputHandler::buttonEvent<ButtonTypeParam>;
+            InputManager::getInstance().pushCall(boost::function<void ()>(boost::bind(function, handlers_[device], device, button, EventType())));
+        }
     }
 
@@ -233,5 +219,5 @@
     {
         if (handlers_[mouseIndex_s] != NULL)
-            handlers_[mouseIndex_s]->mouseMoved(abs, rel, clippingSize);
+            INPUT_STATE_PUSH_CALL(mouseIndex_s, mouseMoved, abs, rel, clippingSize);
     }
 
@@ -239,5 +225,5 @@
     {
         if (handlers_[mouseIndex_s] != NULL)
-            handlers_[mouseIndex_s]->mouseScrolled(abs, rel);
+            INPUT_STATE_PUSH_CALL(mouseIndex_s, mouseScrolled, abs, rel);
     }
 
@@ -246,5 +232,5 @@
         assert(device < handlers_.size());
         if (handlers_[device] != NULL)
-            handlers_[device]->axisMoved(device - firstJoyStickIndex_s, axis, value);
+            INPUT_STATE_PUSH_CALL(device, axisMoved, device - firstJoyStickIndex_s, axis, value);
     }
 }
Index: /code/trunk/src/libraries/network/TrafficControl.h
===================================================================
--- /code/trunk/src/libraries/network/TrafficControl.h	(revision 6745)
+++ /code/trunk/src/libraries/network/TrafficControl.h	(revision 6746)
@@ -34,5 +34,5 @@
 #include <list>
 #include <map>
-#include "network/ClientConnectionListener.h"
+#include "ClientConnectionListener.h"
 
 namespace orxonox {
Index: /code/trunk/src/libraries/util/Serialise.h
===================================================================
--- /code/trunk/src/libraries/util/Serialise.h	(revision 6745)
+++ /code/trunk/src/libraries/util/Serialise.h	(revision 6746)
@@ -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/trunk/src/libraries/util/Singleton.h
===================================================================
--- /code/trunk/src/libraries/util/Singleton.h	(revision 6745)
+++ /code/trunk/src/libraries/util/Singleton.h	(revision 6746)
@@ -49,5 +49,5 @@
     public:
         //! Returns a reference to the singleton instance
-        static T& getInstance()
+        FORCEINLINE static T& getInstance()
         {
             assert(T::singletonPtr_s != NULL);
@@ -56,5 +56,5 @@
 
         //! Tells whether the singleton has been created
-        static bool exists()
+        FORCEINLINE static bool exists()
         {
             return (T::singletonPtr_s != NULL);
@@ -62,11 +62,11 @@
 
         //! Update method called by ClassSingletonManager (if used)
-        void preUpdateSingleton(const Clock& time) { static_cast<T*>(T::singletonPtr_s)->preUpdate(time); }
+        FORCEINLINE void preUpdateSingleton(const Clock& time) { static_cast<T*>(T::singletonPtr_s)->preUpdate(time); }
         //! Empty update method for the static polymorphism
-        void preUpdate(const Clock& time) { }
+        FORCEINLINE void preUpdate(const Clock& time) { }
         //! Update method called by ClassSingletonManager (if used)
-        void postUpdateSingleton(const Clock& time) { static_cast<T*>(T::singletonPtr_s)->postUpdate(time); }
+        FORCEINLINE void postUpdateSingleton(const Clock& time) { static_cast<T*>(T::singletonPtr_s)->postUpdate(time); }
         //! Empty update method for the static polymorphism
-        void postUpdate(const Clock& time) { }
+        FORCEINLINE void postUpdate(const Clock& time) { }
 
     protected:
Index: /code/trunk/src/libraries/util/TriBool.h
===================================================================
--- /code/trunk/src/libraries/util/TriBool.h	(revision 6746)
+++ /code/trunk/src/libraries/util/TriBool.h	(revision 6746)
@@ -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/trunk/src/modules/pickup/PickupManager.cc
===================================================================
--- /code/trunk/src/modules/pickup/PickupManager.cc	(revision 6745)
+++ /code/trunk/src/modules/pickup/PickupManager.cc	(revision 6746)
@@ -152,5 +152,5 @@
     PickupCarrier* PickupManager::getPawn(void)
     {
-        Pawn* pawn = dynamic_cast<Pawn*>(GUIManager::getInstancePtr()->getPlayer(PickupManager::guiName_s)->getControllableEntity());
+        Pawn* pawn = dynamic_cast<Pawn*>(GUIManager::getInstance().getPlayer(PickupManager::guiName_s)->getControllableEntity());
         if(pawn == NULL)
             return NULL;
Index: /code/trunk/src/modules/questsystem/QuestGUI.cc
===================================================================
--- /code/trunk/src/modules/questsystem/QuestGUI.cc	(revision 6745)
+++ /code/trunk/src/modules/questsystem/QuestGUI.cc	(revision 6746)
@@ -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/trunk/src/modules/questsystem/QuestGUINode.cc
===================================================================
--- /code/trunk/src/modules/questsystem/QuestGUINode.cc	(revision 6745)
+++ /code/trunk/src/modules/questsystem/QuestGUINode.cc	(revision 6746)
@@ -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/trunk/src/orxonox/CameraManager.h
===================================================================
--- /code/trunk/src/orxonox/CameraManager.h	(revision 6745)
+++ /code/trunk/src/orxonox/CameraManager.h	(revision 6746)
@@ -61,6 +61,4 @@
             void useCamera(Ogre::Camera* camera);
 
-            static CameraManager* getInstancePtr() { return singletonPtr_s; }
-
         private:
             CameraManager(const CameraManager&); // don't use
Index: /code/trunk/src/orxonox/Level.cc
===================================================================
--- /code/trunk/src/orxonox/Level.cc	(revision 6745)
+++ /code/trunk/src/orxonox/Level.cc	(revision 6746)
@@ -58,5 +58,5 @@
         if (this->isInitialized())
         {
-            if (LevelManager::getInstancePtr())
+            if (LevelManager::exists())
                 LevelManager::getInstance().releaseActivity(this);
 
@@ -116,5 +116,5 @@
             (*it)->setGametype(rootgametype);
 
-        if (LevelManager::getInstancePtr())
+        if (LevelManager::exists())
             LevelManager::getInstance().requestActivity(this);
     }
Index: /code/trunk/src/orxonox/LevelManager.h
===================================================================
--- /code/trunk/src/orxonox/LevelManager.h	(revision 6745)
+++ /code/trunk/src/orxonox/LevelManager.h	(revision 6746)
@@ -62,5 +62,4 @@
             const std::string& getAvailableLevelListItem(unsigned int index) const; //tolua_export
 
-            static LevelManager* getInstancePtr() { return singletonPtr_s; }
             static LevelManager& getInstance()    { return Singleton<LevelManager>::getInstance(); } // tolua_export
 
Index: /code/trunk/src/orxonox/PlayerManager.cc
===================================================================
--- /code/trunk/src/orxonox/PlayerManager.cc	(revision 6745)
+++ /code/trunk/src/orxonox/PlayerManager.cc	(revision 6746)
@@ -66,5 +66,5 @@
             this->clients_[clientID] = player;
 
-            if (LevelManager::getInstancePtr() && LevelManager::getInstance().getActiveLevel())
+            if (LevelManager::exists() && LevelManager::getInstance().getActiveLevel())
                 LevelManager::getInstance().getActiveLevel()->playerEntered(player);
         }
@@ -82,5 +82,5 @@
             this->clients_.erase(clientID);
 
-            if (LevelManager::getInstancePtr() && LevelManager::getInstance().getActiveLevel())
+            if (LevelManager::exists() && LevelManager::getInstance().getActiveLevel())
                 LevelManager::getInstance().getActiveLevel()->playerLeft(player);
 
Index: /code/trunk/src/orxonox/gamestates/GSLevel.cc
===================================================================
--- /code/trunk/src/orxonox/gamestates/GSLevel.cc	(revision 6745)
+++ /code/trunk/src/orxonox/gamestates/GSLevel.cc	(revision 6746)
@@ -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/trunk/src/orxonox/gamestates/GSMainMenu.cc
===================================================================
--- /code/trunk/src/orxonox/gamestates/GSMainMenu.cc	(revision 6745)
+++ /code/trunk/src/orxonox/gamestates/GSMainMenu.cc	(revision 6746)
@@ -31,6 +31,4 @@
 #include <OgreSceneManager.h>
 
-#include "core/input/InputManager.h"
-#include "core/input/InputState.h"
 #include "core/input/KeyBinderManager.h"
 #include "core/Game.h"
@@ -42,4 +40,7 @@
 #include "Scene.h"
 #include "sound/AmbientSound.h"
+// HACK
+#include "core/input/InputManager.h"
+#include "core/input/InputState.h"
 
 namespace orxonox
@@ -49,12 +50,8 @@
     GSMainMenu::GSMainMenu(const GameStateInfo& info)
         : GameState(info)
-        , inputState_(0)
     {
         RegisterRootObject(GSMainMenu);
-        inputState_ = InputManager::getInstance().createInputState("mainMenu");
-        inputState_->setMouseMode(MouseMode::Nonexclusive);
-        inputState_->setHandler(GUIManager::getInstancePtr());
-        inputState_->setKeyHandler(KeyBinderManager::getInstance().getDefaultAsHandler());
-        inputState_->setJoyStickHandler(&InputHandler::EMPTY);
+
+        InputManager::getInstance().createInputState("MainMenuHackery")->setKeyHandler(KeyBinderManager::getInstance().getDefaultAsHandler());
 
         // create an empty Scene
@@ -76,5 +73,5 @@
             this->ambient_->destroy();
 
-        InputManager::getInstance().destroyState("mainMenu");
+        InputManager::getInstance().destroyState("MainMenuHackery");
 
         this->scene_->getSceneManager()->destroyCamera(this->camera_);
@@ -85,9 +82,10 @@
     {
         // show main menu
-        GUIManager::getInstance().showGUI("MainMenu", true, GraphicsManager::getInstance().isFullScreen());
+        GUIManager::getInstance().showGUI("MainMenu", true);
         GUIManager::getInstance().setCamera(this->camera_);
-        GUIManager::getInstance().setBackground("MainMenuBackground");
-//         GUIManager::getInstance().setBackground("");
+        GUIManager::getInstance().setBackgroundImage("MainMenuBackground", "Background");
         GraphicsManager::getInstance().setCamera(this->camera_);
+
+        InputManager::getInstance().enterState("MainMenuHackery");
 
         CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSMainMenu::startStandalone), "startGame"));
@@ -101,5 +99,4 @@
 
         KeyBinderManager::getInstance().setToDefault();
-        InputManager::getInstance().enterState("mainMenu");
 
         this->setConfigValues();
@@ -119,8 +116,8 @@
         }
 
-        InputManager::getInstance().leaveState("mainMenu");
+        InputManager::getInstance().leaveState("MainMenuHackery");
 
         GUIManager::getInstance().setCamera(0);
-        GUIManager::getInstance().setBackground("");
+        GUIManager::getInstance().setBackgroundImage("");
         GUIManager::hideGUI("MainMenu");
         GraphicsManager::getInstance().setCamera(0);
Index: /code/trunk/src/orxonox/gamestates/GSMainMenu.h
===================================================================
--- /code/trunk/src/orxonox/gamestates/GSMainMenu.h	(revision 6745)
+++ /code/trunk/src/orxonox/gamestates/GSMainMenu.h	(revision 6746)
@@ -61,5 +61,4 @@
 
     private:
-        InputState*       inputState_;
         Scene*            scene_;
         Ogre::Camera*     camera_;
Index: /code/trunk/src/orxonox/overlays/CMakeLists.txt
===================================================================
--- /code/trunk/src/orxonox/overlays/CMakeLists.txt	(revision 6745)
+++ /code/trunk/src/orxonox/overlays/CMakeLists.txt	(revision 6746)
@@ -1,3 +1,4 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
+  GUISheet.cc
   OrxonoxOverlay.cc
   OverlayGroup.cc
Index: /code/trunk/src/orxonox/overlays/GUISheet.cc
===================================================================
--- /code/trunk/src/orxonox/overlays/GUISheet.cc	(revision 6746)
+++ /code/trunk/src/orxonox/overlays/GUISheet.cc	(revision 6746)
@@ -0,0 +1,96 @@
+/*
+ *   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)
+        , bHidePrevious_(false)
+        , bHidePreviousSet_(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, "hidePrevious", setPreviousHiding, getPreviousHiding, xmlElement, mode);
+        XMLPortParam(GUISheet, "sheetName",    setSheetName,      getSheetName,      xmlElement, mode);
+        XMLPortParam(GUISheet, "backgroundImage",  setBackgroundImage,  getBackgroundImage,  xmlElement, mode);
+
+        if (this->bShowOnLoad_)
+            this->show();
+    }
+
+    void GUISheet::show()
+    {
+        GUIManager::getInstance().setBackgroundImage(this->backgroundImage_);
+        if (this->bHidePreviousSet_)
+            GUIManager::getInstance().showGUI(this->sheetName_, this->bHidePrevious_);
+        else
+            GUIManager::getInstance().showGUI(this->sheetName_);
+    }
+
+    void GUISheet::hide()
+    {
+        GUIManager::getInstance().hideGUI(this->sheetName_);
+        if (!this->backgroundImage_.empty())
+            GUIManager::getInstance().setBackgroundImage("");
+    }
+
+    void GUISheet::setSheetName(const std::string& name)
+    {
+        this->sheetName_ = name;
+        GUIManager::getInstance().loadGUI(this->sheetName_);
+    }
+
+    void GUISheet::setPreviousHiding(bool bHide)
+    {
+        this->bHidePrevious_ = bHide;
+        this->bHidePreviousSet_ = true;
+        // Note: This call has no effect when already showing!
+    }
+}
Index: /code/trunk/src/orxonox/overlays/GUISheet.h
===================================================================
--- /code/trunk/src/orxonox/overlays/GUISheet.h	(revision 6746)
+++ /code/trunk/src/orxonox/overlays/GUISheet.h	(revision 6746)
@@ -0,0 +1,78 @@
+/*
+ *   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 setSheetName(const std::string& name);
+        inline const std::string& getSheetName() const
+            { return this->sheetName_; }
+
+        inline void setShowOnLoad(bool bShow)
+            { this->bShowOnLoad_ = bShow; }
+        inline bool getShowOnLoad() const
+            { return this->bShowOnLoad_; }
+
+        void setPreviousHiding(bool bHide);
+        inline bool getPreviousHiding() const
+            { return this->bHidePrevious_; }
+
+        void setBackgroundImage(const std::string& image)
+            { this->backgroundImage_ = image; }
+        inline const std::string& getBackgroundImage() const
+            { return this->backgroundImage_; }
+
+    private:
+        std::string sheetName_;
+        bool bShowOnLoad_;
+        bool bHidePrevious_;
+        bool bHidePreviousSet_;
+        std::string backgroundImage_;
+  };
+}
+
+#endif /* _GUISheet_H__ */
