Index: code/branches/ogre1.9/data/gui/configs/CEGUIConfig.xsd
===================================================================
--- code/branches/ogre1.9/data/gui/configs/CEGUIConfig.xsd	(revision 11128)
+++ code/branches/ogre1.9/data/gui/configs/CEGUIConfig.xsd	(revision 11211)
@@ -1,8 +1,88 @@
 <?xml version="1.0"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-
     <xsd:element name="CEGUIConfig" type="CEGUIConfigType"/>
 
-    <xsd:simpleType name="LogLevel">
+    <xsd:complexType name="CEGUIConfigType">
+        <xsd:sequence>
+            <xsd:choice minOccurs="0" maxOccurs="unbounded">
+                <xsd:element name="Logging" type="loggingType" />
+                <xsd:element name="AutoLoad" type="autoLoadType" />
+                <xsd:element name="ResourceDirectory" type="resourceDirectoryType" />
+                <xsd:element name="DefaultResourceGroup" type="defaultResourceGroupType" />
+                <xsd:element name="Scripting" type="scriptingType" />
+                <xsd:element name="DefaultXMLParser" type="defaultObjectType" />
+                <xsd:element name="DefaultImageCodec" type="defaultObjectType" />
+                <xsd:element name="DefaultFont" type="defaultObjectType" />
+                <xsd:element name="DefaultMouseCursor" type="defaultMouseCursorType" />
+                <xsd:element name="DefaultTooltip" type="defaultObjectType" />
+                <xsd:element name="DefaultGUISheet" type="defaultObjectType" />
+            </xsd:choice>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="loggingType">
+        <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+                <xsd:attribute name="filename" type="xsd:string" use="optional" default="CEGUI.log" />
+                <xsd:attribute name="level" type="logLevel" use="optional" default="Standard" />
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="autoLoadType">
+        <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+                <xsd:attribute name="type" type="resourceType" use="required" />
+                <xsd:attribute name="group" type="xsd:string" use="optional" default="" />
+                <xsd:attribute name="pattern" type="xsd:string" use="optional" default="*" />
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="resourceDirectoryType">
+        <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+                <xsd:attribute name="group" type="xsd:string" use="required" />
+                <xsd:attribute name="directory" type="xsd:string" use="required" />
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="defaultResourceGroupType">
+        <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+                <xsd:attribute name="type" type="resourceType" use="optional" default="Default" />
+                <xsd:attribute name="group" type="xsd:string" use="required" />
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="scriptingType">
+        <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+                <xsd:attribute name="initScript" type="xsd:string" use="optional" default="" />
+                <xsd:attribute name="terminateScript" type="xsd:string" use="optional" default="" />
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="defaultObjectType">
+        <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+                <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="defaultMouseCursorType">
+        <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+                <xsd:attribute name="imageset" type="xsd:string" use="required" />
+                <xsd:attribute name="image" type="xsd:string" use="required" />
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+
+    <xsd:simpleType name="logLevel">
         <xsd:restriction base="xsd:string">
             <xsd:enumeration value="Errors"/>
@@ -13,16 +93,16 @@
     </xsd:simpleType>
 
-    <xsd:complexType name="CEGUIConfigType">
-        <xsd:attribute name="Logfile" type="xsd:string" use="optional" default=""/>
-        <xsd:attribute name="Scheme" type="xsd:string" use="optional" default=""/>
-        <xsd:attribute name="DefaultFont" type="xsd:string" use="optional" default=""/>
-        <xsd:attribute name="Layout" type="xsd:string" use="optional" default=""/>
-        <xsd:attribute name="InitScript" type="xsd:string" use="optional" default=""/>
-        <xsd:attribute name="TerminateScript" type="xsd:string" use="optional" default=""/>
-        <xsd:attribute name="DefaultResourceGroup" type="xsd:string" use="optional"  default="" />
-        <xsd:attribute name="LoggingLevel" type="LogLevel" use="optional"  default="Standard" />
-    </xsd:complexType>
+    <xsd:simpleType name="resourceType">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="Imageset"/>
+            <xsd:enumeration value="Font"/>
+            <xsd:enumeration value="Scheme"/>
+            <xsd:enumeration value="LookNFeel"/>
+            <xsd:enumeration value="Layout"/>
+            <xsd:enumeration value="Script"/>
+            <xsd:enumeration value="XMLSchema"/>
+            <xsd:enumeration value="Default"/>
+        </xsd:restriction>
+    </xsd:simpleType>
 
 </xsd:schema>
-
-
Index: code/branches/ogre1.9/data/gui/layouts/AudioMenu.layout
===================================================================
--- code/branches/ogre1.9/data/gui/layouts/AudioMenu.layout	(revision 11128)
+++ code/branches/ogre1.9/data/gui/layouts/AudioMenu.layout	(revision 11211)
@@ -1,129 +1,128 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <Window Type="MenuWidgets/StaticImage" Name="orxonox/AudioBackground" >
-        <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,0},{1,0}}" />
-        <Property Name="BackgroundEnabled" Value="False" />
-        <Window Type="MenuWidgets/StaticText" Name="orxonox/AudioWindow" >
-            <Property Name="Text" Value="Audio" />
-            <Property Name="Alpha" Value="0.8" />
-            <Property Name="InheritsAlpha" Value="False" />
-            <Property Name="HorzFormatting" Value="HorzCentred" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="VertFormatting" Value="TopAligned" />
-            <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.2875,0},{0.8,0},{0.6375,0}}" />
-            <Window Type="MenuWidgets/StaticText" Name="orxonox/MasterVolume" >
-                <Property Name="Text" Value="Master volume               " />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="HorzFormatting" Value="HorzCentred" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="VertFormatting" Value="TopAligned" />
-                <Property Name="UnifiedAreaRect" Value="{{0.041666,0},{0.15,0},{0.5625,0},{0.3525,0}}" />
-                <Window Type="MenuWidgets/HorizontalScrollbar" Name="orxonox/MasterScrollbar" >
-                    <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="StepSize" Value="0.1" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.04,0},{0.6,0},{0.71,0},{0.8,0}}" />
-                    <Event Name="ThumbTrackStarted" Function="AudioMenu.AudioMasterScrollbar_started" />
-                    <Event Name="ThumbTrackEnded" Function="AudioMenu.AudioMasterScrollbar_ended" />
-                    <Event Name="ScrollPosChanged" Function="AudioMenu.AudioMasterScrollbar_changed" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUILayout version="4">
+    <Window name="AudioBackground" type="MenuWidgets/StaticImage">
+        <Property name="FrameEnabled" value="False" />
+        <Property name="InheritsAlpha" value="False" />
+        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+        <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+        <Property name="BackgroundEnabled" value="False" />
+        <Window name="AudioWindow" type="MenuWidgets/StaticText">
+            <Property name="Text" value="Audio" />
+            <Property name="Alpha" value="0.8" />
+            <Property name="InheritsAlpha" value="False" />
+            <Property name="HorzFormatting" value="HorzCentred" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="VertFormatting" value="TopAligned" />
+            <Property name="Area" value="{{0.2,0},{0.2875,0},{0.8,0},{0.6375,0}}" />
+            <Window name="MasterVolume" type="MenuWidgets/StaticText">
+                <Property name="Text" value="Master volume               " />
+                <Property name="InheritsAlpha" value="False" />
+                <Property name="HorzFormatting" value="HorzCentred" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="VertFormatting" value="TopAligned" />
+                <Property name="Area" value="{{0.041666,0},{0.15,0},{0.5625,0},{0.3525,0}}" />
+                <Window name="MasterScrollbar" type="MenuWidgets/HorizontalScrollbar">
+                    <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="StepSize" value="0.1" />
+                    <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                    <Property name="Area" value="{{0.04,0},{0.6,0},{0.71,0},{0.8,0}}" />
+                    <Event function="AudioMenu.AudioMasterScrollbar_started" name="ThumbTrackStarted" />
+                    <Event function="AudioMenu.AudioMasterScrollbar_ended" name="ThumbTrackEnded" />
+                    <Event function="AudioMenu.AudioMasterScrollbar_changed" name="ScrollPosChanged" />
                 </Window>
-                <Window Type="MenuWidgets/Checkbox" Name="orxonox/MasterCheckbox" >
-                    <Property Name="Text" Value="Mute" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.775,0},{0.45,0},{0.96,0},{0.9,0}}" />
-                    <Event Name="CheckStateChanged" Function="AudioMenu.AudioMuteMasterCheckbox_clicked"/>
+                <Window name="MasterCheckbox" type="MenuWidgets/Checkbox">
+                    <Property name="Text" value="Mute" />
+                    <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                    <Property name="Area" value="{{0.775,0},{0.45,0},{0.96,0},{0.9,0}}" />
+                    <Event function="AudioMenu.AudioMuteMasterCheckbox_clicked" name="CheckStateChanged" />
                 </Window>
             </Window>
-            <Window Type="MenuWidgets/StaticText" Name="orxonox/MusicVolume" >
-                <Property Name="Text" Value="Music volume               " />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="HorzFormatting" Value="HorzCentred" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="VertFormatting" Value="TopAligned" />
-                <Property Name="UnifiedAreaRect" Value="{{0.041666,0},{0.4335,0},{0.5625,0},{0.636,0}}" />
-                <Window Type="MenuWidgets/HorizontalScrollbar" Name="orxonox/MusicScrollbar" >
-                    <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="StepSize" Value="0.1" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.04,0},{0.6,0},{0.71,0},{0.8,0}}" />
-                    <Event Name="ThumbTrackStarted" Function="AudioMenu.AudioMusicScrollbar_started" />
-                    <Event Name="ThumbTrackEnded" Function="AudioMenu.AudioMusicScrollbar_ended" />
-                    <Event Name="ScrollPosChanged" Function="AudioMenu.AudioMusicScrollbar_changed" />
+            <Window name="MusicVolume" type="MenuWidgets/StaticText">
+                <Property name="Text" value="Music volume               " />
+                <Property name="InheritsAlpha" value="False" />
+                <Property name="HorzFormatting" value="HorzCentred" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="VertFormatting" value="TopAligned" />
+                <Property name="Area" value="{{0.041666,0},{0.4335,0},{0.5625,0},{0.636,0}}" />
+                <Window name="MusicScrollbar" type="MenuWidgets/HorizontalScrollbar">
+                    <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="StepSize" value="0.1" />
+                    <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                    <Property name="Area" value="{{0.04,0},{0.6,0},{0.71,0},{0.8,0}}" />
+                    <Event function="AudioMenu.AudioMusicScrollbar_started" name="ThumbTrackStarted" />
+                    <Event function="AudioMenu.AudioMusicScrollbar_ended" name="ThumbTrackEnded" />
+                    <Event function="AudioMenu.AudioMusicScrollbar_changed" name="ScrollPosChanged" />
                 </Window>
-                <Window Type="MenuWidgets/Checkbox" Name="orxonox/MusicCheckbox" >
-                    <Property Name="Text" Value="Mute" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.775,0},{0.45,0},{0.96,0},{0.9,0}}" />
-                    <Event Name="CheckStateChanged" Function="AudioMenu.AudioMuteMusicCheckbox_clicked"/>
+                <Window name="MusicCheckbox" type="MenuWidgets/Checkbox">
+                    <Property name="Text" value="Mute" />
+                    <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                    <Property name="Area" value="{{0.775,0},{0.45,0},{0.96,0},{0.9,0}}" />
+                    <Event function="AudioMenu.AudioMuteMusicCheckbox_clicked" name="CheckStateChanged" />
                 </Window>
             </Window>
-            <Window Type="MenuWidgets/StaticText" Name="orxonox/EffectsVolume" >
-                <Property Name="Text" Value="Effects volume               " />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="HorzFormatting" Value="HorzCentred" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="VertFormatting" Value="TopAligned" />
-                <Property Name="UnifiedAreaRect" Value="{{0.041666,0},{0.717,0},{0.5625,0},{0.9195,0}}" />
-                <Window Type="MenuWidgets/HorizontalScrollbar" Name="orxonox/EffectsScrollbar" >
-                    <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="StepSize" Value="0.1" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.04,0},{0.6,0},{0.71,0},{0.8,0}}" />
-                    <Event Name="ThumbTrackStarted" Function="AudioMenu.AudioEffectsScrollbar_started" />
-                    <Event Name="ThumbTrackEnded" Function="AudioMenu.AudioEffectsScrollbar_ended" />
-                    <Event Name="ScrollPosChanged" Function="AudioMenu.AudioEffectsScrollbar_changed" />
+            <Window name="EffectsVolume" type="MenuWidgets/StaticText">
+                <Property name="Text" value="Effects volume               " />
+                <Property name="InheritsAlpha" value="False" />
+                <Property name="HorzFormatting" value="HorzCentred" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="VertFormatting" value="TopAligned" />
+                <Property name="Area" value="{{0.041666,0},{0.717,0},{0.5625,0},{0.9195,0}}" />
+                <Window name="EffectsScrollbar" type="MenuWidgets/HorizontalScrollbar">
+                    <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="StepSize" value="0.1" />
+                    <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                    <Property name="Area" value="{{0.04,0},{0.6,0},{0.71,0},{0.8,0}}" />
+                    <Event function="AudioMenu.AudioEffectsScrollbar_started" name="ThumbTrackStarted" />
+                    <Event function="AudioMenu.AudioEffectsScrollbar_ended" name="ThumbTrackEnded" />
+                    <Event function="AudioMenu.AudioEffectsScrollbar_changed" name="ScrollPosChanged" />
                 </Window>
-                <Window Type="MenuWidgets/Checkbox" Name="orxonox/EffectsCheckbox" >
-                    <Property Name="Text" Value="Mute" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.775,0},{0.45,0},{0.96,0},{0.9,0}}" />
-                    <Event Name="CheckStateChanged" Function="AudioMenu.AudioMuteEffectsCheckbox_clicked"/>
+                <Window name="EffectsCheckbox" type="MenuWidgets/Checkbox">
+                    <Property name="Text" value="Mute" />
+                    <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                    <Property name="Area" value="{{0.775,0},{0.45,0},{0.96,0},{0.9,0}}" />
+                    <Event function="AudioMenu.AudioMuteEffectsCheckbox_clicked" name="CheckStateChanged" />
                 </Window>
             </Window>
-            <Window Type="MenuWidgets/StaticText" Name="orxonox/AudioTheme" >
-                <Property Name="Text" Value="Theme" />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="HorzFormatting" Value="HorzCentred" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="VertFormatting" Value="TopAligned" />
-                <Property Name="UnifiedAreaRect" Value="{{0.604166,0},{0.15,0},{0.958333,0},{0.636,0}}" />
-                <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}}" />
-                    <Event Name="ItemSelectionChanged" Function="AudioMenu.AudioThemeListbox_changed" />
+            <Window name="AudioTheme" type="MenuWidgets/StaticText">
+                <Property name="Text" value="Theme" />
+                <Property name="InheritsAlpha" value="False" />
+                <Property name="HorzFormatting" value="HorzCentred" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="VertFormatting" value="TopAligned" />
+                <Property name="Area" value="{{0.604166,0},{0.15,0},{0.958333,0},{0.636,0}}" />
+                <Window name="AudioThemeListbox" type="MenuWidgets/Listbox">
+                    <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                    <Property name="Area" value="{{0.05,0},{0.225,0},{0.95,0},{0.92,0}}" />
+                    <Event function="AudioMenu.AudioThemeListbox_changed" name="ItemSelectionChanged" />
                 </Window>
             </Window>
-            <Window Type="MenuWidgets/StaticText" Name="orxonox/AudioInfo" >
-                <Property Name="Text" >Theme changes might take
+            <Window name="AudioInfo" type="MenuWidgets/StaticText">
+                <Property name="Text">Theme changes might take
 up to a minute.</Property>
-                <Property Name="TextColours" Value="FFFFFFFF" />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="HorzFormatting" Value="HorzCentred" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="VertFormatting" Value="TopAligned" />
-                <Property Name="UnifiedAreaRect" Value="{{0.604166,0},{0.717,0},{0.958333,0},{0.9195,0}}" />
+                <Property name="TextColours" value="FFFFFFFF" />
+                <Property name="InheritsAlpha" value="False" />
+                <Property name="HorzFormatting" value="HorzCentred" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="VertFormatting" value="TopAligned" />
+                <Property name="Area" value="{{0.604166,0},{0.717,0},{0.958333,0},{0.9195,0}}" />
             </Window>
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/AudioBackButton" >
-            <Property Name="Text" Value="Back" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
-            <Event Name="Clicked" Function="AudioMenu.AudioBackButton_clicked" />
+        <Window name="AudioBackButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Back" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
+            <Event function="AudioMenu.AudioBackButton_clicked" name="Clicked" />
         </Window>
     </Window>
Index: code/branches/ogre1.9/data/gui/layouts/CampaignMenu.layout
===================================================================
--- code/branches/ogre1.9/data/gui/layouts/CampaignMenu.layout	(revision 11128)
+++ code/branches/ogre1.9/data/gui/layouts/CampaignMenu.layout	(revision 11211)
@@ -1,98 +1,95 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <Window Type="MenuWidgets/StaticImage" Name="orxonox/CampaignBackground" >
-        <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.0,0},{1.0,0}}" />
-        <Property Name="BackgroundEnabled" Value="False" />
-        <Window Type="MenuWidgets/Button" Name="orxonox/Mission1Button" >
-            <Property Name="Text" Value="Mission One" />
-            <Property Name="Visible" Value="False"/>
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.1,0},{0.65,0},{0.15,0}}" />
-            <Event Name="Clicked" Function="CampaignMenu.Mission1Button_clicked"/>
+<?xml version='1.0' encoding='utf-8'?>
+<GUILayout version="4">
+    <Window name="CampaignBackground" type="MenuWidgets/StaticImage">
+        <Property name="FrameEnabled" value="False" />
+        <Property name="InheritsAlpha" value="False" />
+        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+        <Property name="Area" value="{{0,0},{0,0},{1.0,0},{1.0,0}}" />
+        <Property name="BackgroundEnabled" value="False" />
+        <Window name="Mission1Button" type="MenuWidgets/Button">
+            <Property name="Text" value="Mission One" />
+            <Property name="Visible" value="False" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.35,0},{0.1,0},{0.65,0},{0.15,0}}" />
+            <Event function="CampaignMenu.Mission1Button_clicked" name="Clicked" />
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/Mission2Button" >
-            <Property Name="Text" Value="Fight in our Back" />
-            <Property Name="Visible" Value="False"/>
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.18,0},{0.65,0},{0.23,0}}" />
-            <Property Name="Disabled" Value="True" />
-            <Event Name="Clicked" Function="CampaignMenu.Mission2Button_clicked"/>
+        <Window name="Mission2Button" type="MenuWidgets/Button">
+            <Property name="Text" value="Fight in our Back" />
+            <Property name="Visible" value="False" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.35,0},{0.18,0},{0.65,0},{0.23,0}}" />
+            <Property name="Disabled" value="True" />
+            <Event function="CampaignMenu.Mission2Button_clicked" name="Clicked" />
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/Mission3Button" >
-            <Property Name="Text" Value="Pirate Attack" />
-            <Property Name="Visible" Value="False"/>
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.26,0},{0.65,0},{0.31,0}}" />
-            <Property Name="Disabled" Value="True" />
-            <Event Name="Clicked" Function="CampaignMenu.Mission3Button_clicked"/>
+        <Window name="Mission3Button" type="MenuWidgets/Button">
+            <Property name="Text" value="Pirate Attack" />
+            <Property name="Visible" value="False" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.35,0},{0.26,0},{0.65,0},{0.31,0}}" />
+            <Property name="Disabled" value="True" />
+            <Event function="CampaignMenu.Mission3Button_clicked" name="Clicked" />
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/Mission4Button" >
-            <Property Name="Text" Value="Trip to Area 51" />
-            <Property Name="Visible" Value="False"/>
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.34,0},{0.65,0},{0.39,0}}" />
-            <Property Name="Disabled" Value="True" />
-            <Event Name="Clicked" Function="CampaignMenu.Mission4Button_clicked"/>
+        <Window name="Mission4Button" type="MenuWidgets/Button">
+            <Property name="Text" value="Trip to Area 51" />
+            <Property name="Visible" value="False" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.35,0},{0.34,0},{0.65,0},{0.39,0}}" />
+            <Property name="Disabled" value="True" />
+            <Event function="CampaignMenu.Mission4Button_clicked" name="Clicked" />
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/Mission5Button" >
-            <Property Name="Text" Value="Area 51 under Fire" />
-            <Property Name="Visible" Value="False"/>
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.42,0},{0.65,0},{0.47,0}}" />
-            <Property Name="Disabled" Value="True" />
-            <Event Name="Clicked" Function="CampaignMenu.Mission5Button_clicked"/>
+        <Window name="Mission5Button" type="MenuWidgets/Button">
+            <Property name="Text" value="Area 51 under Fire" />
+            <Property name="Visible" value="False" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.35,0},{0.42,0},{0.65,0},{0.47,0}}" />
+            <Property name="Disabled" value="True" />
+            <Event function="CampaignMenu.Mission5Button_clicked" name="Clicked" />
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/Mission6Button" >
-            <Property Name="Text" Value="Escape the Bastards" />
-            <Property Name="Visible" Value="False"/>
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.50,0},{0.65,0},{0.55,0}}" />
-            <Property Name="Disabled" Value="True" />
-            <Event Name="Clicked" Function="CampaignMenu.Mission6Button_clicked"/>
+        <Window name="Mission6Button" type="MenuWidgets/Button">
+            <Property name="Text" value="Escape the Bastards" />
+            <Property name="Visible" value="False" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.35,0},{0.50,0},{0.65,0},{0.55,0}}" />
+            <Property name="Disabled" value="True" />
+            <Event function="CampaignMenu.Mission6Button_clicked" name="Clicked" />
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/Mission7Button" >
-            <Property Name="Text" Value="Expedition to Sector 5C" />
-            <Property Name="Visible" Value="False"/>
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.58,0},{0.65,0},{0.63,0}}" />
-            <Property Name="Disabled" Value="True" />
-            <Event Name="Clicked" Function="CampaignMenu.Mission7Button_clicked"/>
+        <Window name="Mission7Button" type="MenuWidgets/Button">
+            <Property name="Text" value="Expedition to Sector 5C" />
+            <Property name="Visible" value="False" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.35,0},{0.58,0},{0.65,0},{0.63,0}}" />
+            <Property name="Disabled" value="True" />
+            <Event function="CampaignMenu.Mission7Button_clicked" name="Clicked" />
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/Mission8Button" >
-            <Property Name="Text" Value="Shuttle under Attack" />
-            <Property Name="Visible" Value="False"/>
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.66,0},{0.65,0},{0.71,0}}" />
-            <Property Name="Disabled" Value="True" />
-            <Event Name="Clicked" Function="CampaignMenu.Mission8Button_clicked"/>
+        <Window name="Mission8Button" type="MenuWidgets/Button">
+            <Property name="Text" value="Shuttle under Attack" />
+            <Property name="Visible" value="False" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.35,0},{0.66,0},{0.65,0},{0.71,0}}" />
+            <Property name="Disabled" value="True" />
+            <Event function="CampaignMenu.Mission8Button_clicked" name="Clicked" />
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/Mission9Button" >
-            <Property Name="Text" Value="Retaliation" />
-            <Property Name="Visible" Value="False"/>
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.74,0},{0.65,0},{0.79,0}}" />
-            <Property Name="Disabled" Value="True" />
-            <Event Name="Clicked" Function="CampaignMenu.Mission9Button_clicked"/>
+        <Window name="Mission9Button" type="MenuWidgets/Button">
+            <Property name="Text" value="Retaliation" />
+            <Property name="Visible" value="False" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.35,0},{0.74,0},{0.65,0},{0.79,0}}" />
+            <Property name="Disabled" value="True" />
+            <Event function="CampaignMenu.Mission9Button_clicked" name="Clicked" />
         </Window>
-
-
-        <Window Type="MenuWidgets/Button" Name="orxonox/CampaignMenuBackButton" >
-            <Property Name="Text" Value="Back" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.85,0},{0.65,0},{0.9,0}}" />
-            <Event Name="Clicked" Function="CampaignMenu.CampaignMenuBackButton_clicked"/> 
+        <Window name="CampaignMenuBackButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Back" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.35,0},{0.85,0},{0.65,0},{0.9,0}}" />
+            <Event function="CampaignMenu.CampaignMenuBackButton_clicked" name="Clicked" />
         </Window>
-        <Window Type="MenuWidgets/StaticText" Name="orxonox/CampaignMenuCongratulation" >
-            <Property Name="Text" Value="Campaign Completed!!!" />
-            <Property Name="Visible" Value="False"/>
-            <Property Name="InheritsAlpha" Value="False" />
-            <Property Name="HorzFormatting" Value="HorzCentred" />
-            <Property Name="VertFormatting" Value="TopAligned" />
-            <Property Name="UnifiedMaxSize" Value="{{2,1},{2,1}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.15,0},{0.6,0},{0.2,0}}" />
+        <Window name="CampaignMenuCongratulation" type="MenuWidgets/StaticText">
+            <Property name="Text" value="Campaign Completed!!!" />
+            <Property name="Visible" value="False" />
+            <Property name="InheritsAlpha" value="False" />
+            <Property name="HorzFormatting" value="HorzCentred" />
+            <Property name="VertFormatting" value="TopAligned" />
+            <Property name="MaxSize" value="{{2,1},{2,1}}" />
+            <Property name="Area" value="{{0.4,0},{0.15,0},{0.6,0},{0.2,0}}" />
         </Window>
     </Window>
Index: code/branches/ogre1.9/data/gui/layouts/ChatBox-inputonly.layout
===================================================================
--- code/branches/ogre1.9/data/gui/layouts/ChatBox-inputonly.layout	(revision 11128)
+++ code/branches/ogre1.9/data/gui/layouts/ChatBox-inputonly.layout	(revision 11211)
@@ -1,16 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <Window Type="DefaultWindow" Name="orxonox/ChatBox-inputonly/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="MenuWidgets/Editbox" Name="orxonox/ChatBox-inputonly/input" >
-            <Property Name="Text" Value="" />
-            <Property Name="Font" Value="Monofur-10" />
-            <Property Name="AlwaysOnTop" Value="True" />
-            <Property Name="MaxTextLength" Value="12981298" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.02,0},{0,5},{0.98,0},{0,30}}" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUILayout version="4">
+    <Window name="ChatBox-inputonly" type="DefaultWindow">
+        <Property name="InheritsAlpha" value="False" />
+        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+        <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+        <Window name="input" type="MenuWidgets/Editbox">
+            <Property name="Text" value="" />
+            <Property name="Font" value="Monofur-10" />
+            <Property name="AlwaysOnTop" value="True" />
+            <Property name="MaxTextLength" value="12981298" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.02,0},{0,5},{0.98,0},{0,30}}" />
         </Window>
     </Window>
Index: code/branches/ogre1.9/data/gui/layouts/ChatBox.layout
===================================================================
--- code/branches/ogre1.9/data/gui/layouts/ChatBox.layout	(revision 11128)
+++ code/branches/ogre1.9/data/gui/layouts/ChatBox.layout	(revision 11211)
@@ -1,28 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <Window Type="DefaultWindow" Name="orxonox/ChatBox/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="MenuWidgets/FrameWindow" Name="orxonox/ChatBox" >
-            <Property Name="Text" Value="Chat" />
-            <Property Name="InheritsAlpha" Value="False" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="TitlebarEnabled" Value="True" />
-            <!--<Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.03,0},{0.6,0},{0.69375,0}}" />-->
-            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.10,0},{0.98,0},{0.65,0}}" />
-            <Event Name="CloseClicked" Function="ChatBox.ChatBoxCloseButton_clicked"/>
-            <Window Type="MenuWidgets/Listbox" Name="orxonox/ChatBox/history" >
-                <Property Name="Font" Value="Monofur-10" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.02,0},{0.078,0},{0.98,0},{1,-30}}" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUILayout version="4">
+    <Window name="ChatBox" type="DefaultWindow">
+        <Property name="InheritsAlpha" value="False" />
+        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+        <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+        <Window name="frame" type="MenuWidgets/FrameWindow">
+            <Property name="Text" value="Chat" />
+            <Property name="InheritsAlpha" value="False" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="TitlebarEnabled" value="True" />
+            <Property name="Area" value="{{0.35,0},{0.10,0},{0.98,0},{0.65,0}}" />
+            <Event function="ChatBox.ChatBoxCloseButton_clicked" name="CloseClicked" />
+            <Window name="history" type="MenuWidgets/Listbox">
+                <Property name="Font" value="Monofur-10" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="Area" value="{{0.02,0},{0.078,0},{0.98,0},{1,-30}}" />
             </Window>
-            <Window Type="MenuWidgets/Editbox" Name="orxonox/ChatBox/input" >
-                <Property Name="Text" Value="" />
-                <Property Name="Font" Value="Monofur-10" />
-                <Property Name="MaxTextLength" Value="1073741823" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.02,0},{1,-30},{0.98,0},{1,-5}}" />
+            <Window name="input" type="MenuWidgets/Editbox">
+                <Property name="Text" value="" />
+                <Property name="Font" value="Monofur-10" />
+                <Property name="MaxTextLength" value="1073741823" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="Area" value="{{0.02,0},{1,-30},{0.98,0},{1,-5}}" />
             </Window>
         </Window>
Index: code/branches/ogre1.9/data/gui/layouts/ControlsMenu.layout
===================================================================
--- code/branches/ogre1.9/data/gui/layouts/ControlsMenu.layout	(revision 11128)
+++ code/branches/ogre1.9/data/gui/layouts/ControlsMenu.layout	(revision 11211)
@@ -1,37 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <Window Type="MenuWidgets/StaticImage" Name="orxonox/ControlsBackground" >
-        <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,0},{1,0}}" />
-        <Property Name="BackgroundEnabled" Value="False" />
-        <Window Type="MenuWidgets/StaticText" Name="orxonox/ControlsWindow" >
-            <Property Name="Text" Value="Controls" />
-            <Property Name="Alpha" Value="0.8" />
-            <Property Name="InheritsAlpha" Value="False" />
-            <Property Name="HorzFormatting" Value="HorzCentred" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="VertFormatting" Value="TopAligned" />
-            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
-            <Window Type="MenuWidgets/Button" Name="orxonox/MouseControlsButton" >
-                <Property Name="Text" Value="Mouse controls" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.318181,0},{0.7,0},{0.5,0}}" />
-                <Event Name="Clicked" Function="ControlsMenu.ControlsMouseControlsButton_clicked"/>
+<?xml version='1.0' encoding='utf-8'?>
+<GUILayout version="4">
+    <Window name="ControlsBackground" type="MenuWidgets/StaticImage">
+        <Property name="FrameEnabled" value="False" />
+        <Property name="InheritsAlpha" value="False" />
+        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+        <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+        <Property name="BackgroundEnabled" value="False" />
+        <Window name="ControlsWindow" type="MenuWidgets/StaticText">
+            <Property name="Text" value="Controls" />
+            <Property name="Alpha" value="0.8" />
+            <Property name="InheritsAlpha" value="False" />
+            <Property name="HorzFormatting" value="HorzCentred" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="VertFormatting" value="TopAligned" />
+            <Property name="Area" value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
+            <Window name="MouseControlsButton" type="MenuWidgets/Button">
+                <Property name="Text" value="Mouse controls" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="Area" value="{{0.3,0},{0.318181,0},{0.7,0},{0.5,0}}" />
+                <Event function="ControlsMenu.ControlsMouseControlsButton_clicked" name="Clicked" />
             </Window>
-            <Window Type="MenuWidgets/Button" Name="orxonox/KeybindingsButton" >
-                <Property Name="Text" Value="Keybindings" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.590909,0},{0.7,0},{0.772727,0}}" />
-                <Event Name="Clicked" Function="ControlsMenu.ControlsKeyboardControlsButton_clicked"/>
+            <Window name="KeybindingsButton" type="MenuWidgets/Button">
+                <Property name="Text" value="Keybindings" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="Area" value="{{0.3,0},{0.590909,0},{0.7,0},{0.772727,0}}" />
+                <Event function="ControlsMenu.ControlsKeyboardControlsButton_clicked" name="Clicked" />
             </Window>
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/ControlsBackButton" >
-            <Property Name="Text" Value="Back" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
-            <Event Name="Clicked" Function="ControlsMenu.ControlsBackButton_clicked"/>
+        <Window name="ControlsBackButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Back" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
+            <Event function="ControlsMenu.ControlsBackButton_clicked" name="Clicked" />
         </Window>
     </Window>
Index: code/branches/ogre1.9/data/gui/layouts/CreditsMenu.layout
===================================================================
--- code/branches/ogre1.9/data/gui/layouts/CreditsMenu.layout	(revision 11128)
+++ code/branches/ogre1.9/data/gui/layouts/CreditsMenu.layout	(revision 11211)
@@ -1,41 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <Window Type="DefaultWindow" Name="orxonox/CreditsMenu/Background" >
-        <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="MenuWidgets/StaticText" Name="orxonox/CreditsWindow" >
-            <Property Name="Text" Value="Credits" />
-            <Property Name="Alpha" Value="0.8" />
-            <Property Name="InheritsAlpha" Value="False" />
-            <Property Name="HorzFormatting" Value="HorzCentred" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="VertFormatting" Value="TopAligned" />
-            <Property Name="UnifiedAreaRect" Value="{{0.15,0},{0.2125,0},{0.85,0},{0.6375,0}}" />
-            <Window Type="MenuWidgets/StaticText" Name="orxonox/CreditsMenuWrapper" >
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="HorzFormatting" Value="HorzCentred" />
-                <Property Name="VertFormatting" Value="TopAligned" />
-                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.92,0}}" />
-                <Window Type="MenuWidgets/ScrollablePane" Name="orxonox/CreditsMenuPane" >
-                    <Property Name="ContentArea" Value="l:0 t:0 r:0 b:0" />
-                    <Property Name="HorzStepSize" Value="0.005" />
-                    <Property Name="VertStepSize" Value="0.005" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="HorzOverlapSize" Value="0.01" />
-                    <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{0.997,0},{0.997,0}}" />
-                    <Property Name="VertOverlapSize" Value="0.01" />
-                    <Property Name="HorzScrollPosition" Value="0" />
-                    <Property Name="VertScrollPosition" Value="0" />
-                    <Window Type="MenuWidgets/StaticText" Name="orxonox/CreditsText" >
-                        <Property Name="TextColours" Value="FFFFFFFF" />
-                        <Property Name="InheritsAlpha" Value="False" />
-                        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                        <Property Name="HorzFormatting" Value="HorzCentred" />
-                        <Property Name="VertFormatting" Value="TopAligned" />
-                        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-                        <Property Name="Text">Orxonox version 0.0.3
+<?xml version='1.0' encoding='utf-8'?>
+<GUILayout version="4">
+    <Window name="Background" type="DefaultWindow">
+        <Property name="InheritsAlpha" value="False" />
+        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+        <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+        <Window name="CreditsWindow" type="MenuWidgets/StaticText">
+            <Property name="Text" value="Credits" />
+            <Property name="Alpha" value="0.8" />
+            <Property name="InheritsAlpha" value="False" />
+            <Property name="HorzFormatting" value="HorzCentred" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="VertFormatting" value="TopAligned" />
+            <Property name="Area" value="{{0.15,0},{0.2125,0},{0.85,0},{0.6375,0}}" />
+            <Window name="CreditsMenuWrapper" type="MenuWidgets/StaticText">
+                <Property name="InheritsAlpha" value="False" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="HorzFormatting" value="HorzCentred" />
+                <Property name="VertFormatting" value="TopAligned" />
+                <Property name="Area" value="{{0.05,0},{0.15,0},{0.95,0},{0.92,0}}" />
+                <Window name="CreditsMenuPane" type="MenuWidgets/ScrollablePane">
+                    <Property name="ContentArea" value="l:0 t:0 r:0 b:0" />
+                    <Property name="HorzStepSize" value="0.005" />
+                    <Property name="VertStepSize" value="0.005" />
+                    <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                    <Property name="HorzOverlapSize" value="0.01" />
+                    <Property name="Area" value="{{0,0},{0,0},{0.997,0},{0.997,0}}" />
+                    <Property name="VertOverlapSize" value="0.01" />
+                    <Property name="HorzScrollPosition" value="0" />
+                    <Property name="VertScrollPosition" value="0" />
+                    <Window name="CreditsText" type="MenuWidgets/StaticText">
+                        <Property name="TextColours" value="FFFFFFFF" />
+                        <Property name="InheritsAlpha" value="False" />
+                        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                        <Property name="HorzFormatting" value="HorzCentred" />
+                        <Property name="VertFormatting" value="TopAligned" />
+                        <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+                        <Property name="Text">Orxonox version 0.0.3
     
     Programming Language:  C++ - lua - tcl
@@ -55,9 +54,9 @@
             </Window>
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/CreditsBackButton" >
-            <Property Name="Text" Value="Back" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
-            <Event Name="Clicked" Function="CreditsMenu.CreditsBackButton_clicked"/>
+        <Window name="CreditsBackButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Back" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
+            <Event function="CreditsMenu.CreditsBackButton_clicked" name="Clicked" />
         </Window>
     </Window>
Index: code/branches/ogre1.9/data/gui/layouts/DecisionPopup.layout
===================================================================
--- code/branches/ogre1.9/data/gui/layouts/DecisionPopup.layout	(revision 11128)
+++ code/branches/ogre1.9/data/gui/layouts/DecisionPopup.layout	(revision 11211)
@@ -1,36 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <Window Type="DefaultWindow" Name="orxonox/DecisionPopup_RootWindow" >
-        <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="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="MenuWidgets/Button" Name="orxonox/DecisionPopup_button_yes" >
-                <Property Name="Text" Value="Yes" />
-                <Property Name="Alpha" Value="0.7" />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.2875,0},{0.5625,0},{0.4875,0},{0.6125,0}}" />
-                <Event Name="Clicked" Function="DecisionPopup.button_yes"/>
+<?xml version='1.0' encoding='utf-8'?>
+<GUILayout version="4">
+    <Window name="DecisionPopup_RootWindow" type="DefaultWindow">
+        <Property name="InheritsAlpha" value="False" />
+        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+        <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+        <Window name="DecisionPopup_Background" type="MenuWidgets/StaticImage">
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+            <Property name="Alpha" value="0.6" />
+            <Window name="DecisionPopup_button_yes" type="MenuWidgets/Button">
+                <Property name="Text" value="Yes" />
+                <Property name="Alpha" value="0.7" />
+                <Property name="InheritsAlpha" value="False" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="Area" value="{{0.2875,0},{0.5625,0},{0.4875,0},{0.6125,0}}" />
+                <Event function="DecisionPopup.button_yes" name="Clicked" />
             </Window>
-            <Window Type="MenuWidgets/Button" Name="orxonox/DecisionPopup_button_no" >
-                <Property Name="Text" Value="No" />
-                <Property Name="Alpha" Value="0.8" />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.5125,0},{0.5625,0},{0.7125,0},{0.6125,0}}" />
-                <Event Name="Clicked" Function="DecisionPopup.button_no"/>
+            <Window name="DecisionPopup_button_no" type="MenuWidgets/Button">
+                <Property name="Text" value="No" />
+                <Property name="Alpha" value="0.8" />
+                <Property name="InheritsAlpha" value="False" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="Area" value="{{0.5125,0},{0.5625,0},{0.7125,0},{0.6125,0}}" />
+                <Event function="DecisionPopup.button_no" name="Clicked" />
             </Window>
-            <Window Type="MenuWidgets/StaticText" Name="orxonox/DecisionPopup_text" >
-                <Property Name="Text" Value="Template text" />
-                <Property Name="HorzFormatting" Value="WordWrapCentred" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.4375,0},{0.75,0},{0.5375,0}}" />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="Alpha" Value="0.8" />
+            <Window name="DecisionPopup_text" type="MenuWidgets/StaticText">
+                <Property name="Text" value="Template text" />
+                <Property name="HorzFormatting" value="WordWrapCentred" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="Area" value="{{0.25,0},{0.4375,0},{0.75,0},{0.5375,0}}" />
+                <Property name="InheritsAlpha" value="False" />
+                <Property name="Alpha" value="0.8" />
             </Window>
         </Window>
Index: code/branches/ogre1.9/data/gui/layouts/DockingDialog.layout
===================================================================
--- code/branches/ogre1.9/data/gui/layouts/DockingDialog.layout	(revision 11128)
+++ code/branches/ogre1.9/data/gui/layouts/DockingDialog.layout	(revision 11211)
@@ -1,35 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <Window Type="MenuWidgets/StaticImage" Name="orxonox/Docking/Background" >
-        <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,0},{1,0}}" />
-        <Property Name="BackgroundEnabled" Value="False" />
-        <Window Type="MenuWidgets/StaticText" Name="orxonox/Docking/Title" >
-            <Property Name="Text" Value="Docking" />
-            <Property Name="Alpha" Value="0.8" />
-            <Property Name="InheritsAlpha" Value="False" />
-            <Property Name="HorzFormatting" Value="HorzCentred" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="VertFormatting" Value="TopAligned" />
-            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.2875,0},{0.75,0},{0.7,0}}" />
-            <Window Type="MenuWidgets/Listbox" Name="orxonox/Docking/Docks" >
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.85,0}}" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUILayout version="4">
+    <Window name="Background" type="MenuWidgets/StaticImage">
+        <Property name="FrameEnabled" value="False" />
+        <Property name="InheritsAlpha" value="False" />
+        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+        <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+        <Property name="BackgroundEnabled" value="False" />
+        <Window name="Title" type="MenuWidgets/StaticText">
+            <Property name="Text" value="Docking" />
+            <Property name="Alpha" value="0.8" />
+            <Property name="InheritsAlpha" value="False" />
+            <Property name="HorzFormatting" value="HorzCentred" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="VertFormatting" value="TopAligned" />
+            <Property name="Area" value="{{0.25,0},{0.2875,0},{0.75,0},{0.7,0}}" />
+            <Window name="Docks" type="MenuWidgets/Listbox">
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="Area" value="{{0.05,0},{0.15,0},{0.95,0},{0.85,0}}" />
             </Window>
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/Docking/DockButton" >
-            <Property Name="Text" Value="Dock" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.2875,0},{0.725,0},{0.4875,0},{0.775,0}}" />
-            <Event Name="Clicked" Function="DockingDialog.dockButton_clicked"/>
+        <Window name="DockButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Dock" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.2875,0},{0.725,0},{0.4875,0},{0.775,0}}" />
+            <Event function="DockingDialog.dockButton_clicked" name="Clicked" />
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/Docking/CancelButton" >
-            <Property Name="Text" Value="Cancel" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.5125,0},{0.725,0},{0.7125,0},{0.775,0}}" />
-            <Event Name="Clicked" Function="DockingDialog.cancelButton_clicked"/>
+        <Window name="CancelButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Cancel" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.5125,0},{0.725,0},{0.7125,0},{0.775,0}}" />
+            <Event function="DockingDialog.cancelButton_clicked" name="Clicked" />
         </Window>
     </Window>
Index: code/branches/ogre1.9/data/gui/layouts/GUILayout.xsd
===================================================================
--- code/branches/ogre1.9/data/gui/layouts/GUILayout.xsd	(revision 11128)
+++ code/branches/ogre1.9/data/gui/layouts/GUILayout.xsd	(revision 11211)
@@ -2,61 +2,70 @@
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
 
-    <xsd:element name="GUILayout" type="GUILayoutType"/>
+	<xsd:element name="GUILayout" type="GUILayoutType"/>
+	
+	<xsd:complexType name="GUILayoutType">
+		<xsd:sequence>
+			<xsd:element name="Window" type="WindowType" />
+		</xsd:sequence>
+		<xsd:attribute name="version" type="xsd:nonNegativeInteger" use="optional" default="0" />
+	</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:element name="UserString" type="UserStringType"  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="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="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="namePath" type="xsd:string" use="required"/>
+	</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="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="UserStringType">
+		<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="resourceGroup" 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: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: code/branches/ogre1.9/data/gui/layouts/GameplayMenu.layout
===================================================================
--- code/branches/ogre1.9/data/gui/layouts/GameplayMenu.layout	(revision 11128)
+++ code/branches/ogre1.9/data/gui/layouts/GameplayMenu.layout	(revision 11211)
@@ -1,67 +1,66 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <Window Type="MenuWidgets/StaticImage" Name="orxonox/GameplayBackground" >
-        <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,0},{1,0}}" />
-        <Property Name="BackgroundEnabled" Value="False" />
-        <Window Type="MenuWidgets/StaticText" Name="orxonox/GameplayWindow" >
-            <Property Name="Text" Value="Gameplay" />
-            <Property Name="Alpha" Value="0.8" />
-            <Property Name="InheritsAlpha" Value="False" />
-            <Property Name="HorzFormatting" Value="HorzCentred" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="VertFormatting" Value="TopAligned" />
-            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
-            <Window Type="MenuWidgets/StaticText" Name="orxonox/Difficulty" >
-                <Property Name="Text" Value="Difficulty" />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="HorzFormatting" Value="HorzCentred" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="VertFormatting" Value="TopAligned" />
-                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.2,0},{0.475,0},{0.9,0}}" />
-                <Window Type="MenuWidgets/RadioButton" Name="orxonox/DifficultyEasyButton" >
-                    <Property Name="Text" Value="Easy" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.325,0},{0.325,0},{0.675,0},{0.45,0}}" />
-                    <Event Name="SelectStateChanged" Function="GameplayMenu.GameplayDifficultyEasyButton_clicked"/>
+<?xml version='1.0' encoding='utf-8'?>
+<GUILayout version="4">
+    <Window name="GameplayBackground" type="MenuWidgets/StaticImage">
+        <Property name="FrameEnabled" value="False" />
+        <Property name="InheritsAlpha" value="False" />
+        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+        <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+        <Property name="BackgroundEnabled" value="False" />
+        <Window name="GameplayWindow" type="MenuWidgets/StaticText">
+            <Property name="Text" value="Gameplay" />
+            <Property name="Alpha" value="0.8" />
+            <Property name="InheritsAlpha" value="False" />
+            <Property name="HorzFormatting" value="HorzCentred" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="VertFormatting" value="TopAligned" />
+            <Property name="Area" value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
+            <Window name="Difficulty" type="MenuWidgets/StaticText">
+                <Property name="Text" value="Difficulty" />
+                <Property name="InheritsAlpha" value="False" />
+                <Property name="HorzFormatting" value="HorzCentred" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="VertFormatting" value="TopAligned" />
+                <Property name="Area" value="{{0.05,0},{0.2,0},{0.475,0},{0.9,0}}" />
+                <Window name="DifficultyEasyButton" type="MenuWidgets/RadioButton">
+                    <Property name="Text" value="Easy" />
+                    <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                    <Property name="Area" value="{{0.325,0},{0.325,0},{0.675,0},{0.45,0}}" />
+                    <Event function="GameplayMenu.GameplayDifficultyEasyButton_clicked" name="SelectStateChanged" />
                 </Window>
-                <Window Type="MenuWidgets/RadioButton" Name="orxonox/DifficultyNormalButton" >
-                    <Property Name="Text" Value="Normal" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.325,0},{0.525,0},{0.675,0},{0.65,0}}" />
-                    <Event Name="SelectStateChanged" Function="GameplayMenu.GameplayDifficultyNormalButton_clicked"/>
+                <Window name="DifficultyNormalButton" type="MenuWidgets/RadioButton">
+                    <Property name="Text" value="Normal" />
+                    <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                    <Property name="Area" value="{{0.325,0},{0.525,0},{0.675,0},{0.65,0}}" />
+                    <Event function="GameplayMenu.GameplayDifficultyNormalButton_clicked" name="SelectStateChanged" />
                 </Window>
-                <Window Type="MenuWidgets/RadioButton" Name="orxonox/DifficultyHardButton" >
-                    <Property Name="Text" Value="Hard" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.325,0},{0.725,0},{0.675,0},{0.85,0}}" />
-                    <Event Name="SelectStateChanged" Function="GameplayMenu.GameplayDifficultyHardButton_clicked"/>
+                <Window name="DifficultyHardButton" type="MenuWidgets/RadioButton">
+                    <Property name="Text" value="Hard" />
+                    <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                    <Property name="Area" value="{{0.325,0},{0.725,0},{0.675,0},{0.85,0}}" />
+                    <Event function="GameplayMenu.GameplayDifficultyHardButton_clicked" name="SelectStateChanged" />
                 </Window>
             </Window>
-            <Window Type="MenuWidgets/StaticText" Name="orxonox/Theme" >
-                <Property Name="Text" Value="Theme" />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="HorzFormatting" Value="HorzCentred" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="VertFormatting" Value="TopAligned" />
-                <Property Name="UnifiedAreaRect" Value="{{0.525,0},{0.2,0},{0.95,0},{0.9,0}}" />
-                <Window Type="MenuWidgets/Combobox" Name="orxonox/ThemeCombobox" >
-                    <Property Name="AlwaysOnTop" Value="True" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.21,0},{0.95,0},{0.9,0}}" />
-                    <Property Name="MaxEditTextLength" Value="1073741823" />
-                    <Property Name="ReadOnly" Value="True" />
-                    <Event Name="ListSelectionAccepted" Function="GameplayMenu.GameplayThemeCombobox_changed" />
+            <Window name="Theme" type="MenuWidgets/StaticText">
+                <Property name="Text" value="Theme" />
+                <Property name="InheritsAlpha" value="False" />
+                <Property name="HorzFormatting" value="HorzCentred" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="VertFormatting" value="TopAligned" />
+                <Property name="Area" value="{{0.525,0},{0.2,0},{0.95,0},{0.9,0}}" />
+                <Window name="ThemeCombobox" type="MenuWidgets/Combobox">
+                    <Property name="AlwaysOnTop" value="True" />
+                    <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                    <Property name="Area" value="{{0.05,0},{0.21,0},{0.95,0},{0.9,0}}" />
+                    <Property name="MaxEditTextLength" value="1073741823" />
+                    <Property name="ReadOnly" value="True" />
+                    <Event function="GameplayMenu.GameplayThemeCombobox_changed" name="ListSelectionAccepted" />
                 </Window>
             </Window>
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/GameplayBackButton" >
-            <Property Name="Text" Value="Back" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
-            <Event Name="Clicked" Function="GameplayMenu.GameplayBackButton_clicked"/>
+        <Window name="GameplayBackButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Back" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
+            <Event function="GameplayMenu.GameplayBackButton_clicked" name="Clicked" />
         </Window>
     </Window>
Index: code/branches/ogre1.9/data/gui/layouts/GraphicsMenu.layout
===================================================================
--- code/branches/ogre1.9/data/gui/layouts/GraphicsMenu.layout	(revision 11128)
+++ code/branches/ogre1.9/data/gui/layouts/GraphicsMenu.layout	(revision 11211)
@@ -1,208 +1,207 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <Window Type="MenuWidgets/StaticImage" Name="orxonox/GraphicsBackground" >
-        <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,0},{1,0}}" />
-        <Property Name="BackgroundEnabled" Value="False" />
-        <Window Type="MenuWidgets/StaticText" Name="orxonox/GraphicsWindow" >
-            <Property Name="Text" Value="Graphics" />
-            <Property Name="Alpha" Value="0.8" />
-            <Property Name="InheritsAlpha" Value="False" />
-            <Property Name="HorzFormatting" Value="HorzCentred" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="VertFormatting" Value="TopAligned" />
-            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.15,0},{0.75,0},{0.6375,0}}" />
-            <Window Type="MenuWidgets/TabControl" Name="orxonox/GraphicsTabControl" >
-                <Property Name="TabHeight" Value="{0,26.4388}" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="TabPanePosition" Value="Top" />
-                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.1,0},{0.95,0},{0.925,0}}" />
-                <Window Type="DefaultWindow" Name="orxonox/Display" >
-                    <Property Name="Text" Value="Display" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-                    <Window Type="MenuWidgets/StaticText" Name="orxonox/Display/Resolution" >
-                        <Property Name="Text" Value="Resolution" />
-                        <Property Name="HorzFormatting" Value="HorzCentred" />
-                        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                        <Property Name="VertFormatting" Value="TopAligned" />
-                        <Property Name="UnifiedAreaRect" Value="{{0.025,0},{0.035,0},{0.4875,0},{0.96,0}}" />
-                        <Window Type="MenuWidgets/Checkbox" Name="orxonox/Display/Resolution/Fullscreen" >
-                            <Property Name="Text" Value="Fullscreen" />
-                            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                            <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.27,0}}" />
-                            <Event Name="CheckStateChanged" Function="GraphicsMenu.callback_FullscreenCheckbox_CheckStateChanged" />
-                        </Window>
-                        <Window Type="MenuWidgets/Combobox" Name="orxonox/Display/Resolution/Combobox" >
-                            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                            <Property Name="ClippedByParent" Value="False" />
-                            <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.3,0},{0.95,0},{1.2,0}}" />
-                            <Property Name="MaxEditTextLength" Value="1073741823" />
-                            <Event Name="ListSelectionAccepted" Function="GraphicsMenu.callback_ResolutionCombobox_ListSelectionAccepted" />
-                        </Window>
-                        <Window Type="MenuWidgets/Editbox" Name="orxonox/Display/Resolution/EditboxWidth" >
-                            <Property Name="MaxTextLength" Value="1073741823" />
-                            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                            <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.45,0},{0.45,0},{0.57,0}}" />
-                            <Event Name="TextChanged" Function="GraphicsMenu.callback_ResolutionEditboxWidth_TextChanged" />
-                        </Window>
-                        <Window Type="MenuWidgets/Editbox" Name="orxonox/Display/Resolution/EditboxHeight" >
-                            <Property Name="MaxTextLength" Value="1073741823" />
-                            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                            <Property Name="UnifiedAreaRect" Value="{{0.55,0},{0.45,0},{0.95,0},{0.57,0}}" />
-                            <Event Name="TextChanged" Function="GraphicsMenu.callback_ResolutionEditboxHeight_TextChanged" />
-                        </Window>
-                        <Window Type="MenuWidgets/StaticText" Name="orxonox/Display/Resolution/x" >
-                            <Property Name="Text" Value="x" />
-                            <Property Name="FrameEnabled" Value="False" />
-                            <Property Name="HorzFormatting" Value="HorzCentred" />
-                            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                            <Property Name="UnifiedAreaRect" Value="{{0.45,0},{0.45,0},{0.55,0},{0.57,0}}" />
-                            <Property Name="BackgroundEnabled" Value="False" />
-                        </Window>
-                        <Window Type="MenuWidgets/Button" Name="orxonox/Display/Resolution/Apply" >
-                            <Property Name="Text" Value="Apply" />
-                            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.61,0},{0.75,0},{0.73,0}}" />
-                            <Event Name="Clicked" Function="GraphicsMenu.callback_Apply_Clicked" />
-                        </Window>
-                        <Window Type="MenuWidgets/StaticText" Name="orxonox/Display/Resolution/AspectRatioLabel" >
-                            <Property Name="Text" Value="Aspect Ratio" />
-                            <Property Name="FrameEnabled" Value="False" />
-                            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                            <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.825,0},{0.6,0},{0.95,0}}" />
-                            <Property Name="BackgroundEnabled" Value="False" />
-                        </Window>
-                        <Window Type="MenuWidgets/Editbox" Name="orxonox/Display/Resolution/AspectRatio" >
-                            <Property Name="Text" Value="1" />
-                            <Property Name="MaxTextLength" Value="1073741823" />
-                            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                            <Property Name="UnifiedAreaRect" Value="{{0.65,0},{0.825,0},{0.95,0},{0.95,0}}" />
-                        </Window>
-                    </Window>
-                    <Window Type="MenuWidgets/StaticText" Name="orxonox/Display/Theme" >
-                        <Property Name="Text" Value="Theme" />
-                        <Property Name="HorzFormatting" Value="HorzCentred" />
-                        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                        <Property Name="VertFormatting" Value="TopAligned" />
-                        <Property Name="UnifiedAreaRect" Value="{{0.5125,0},{0.035,0},{0.975,0},{0.32,0}}" />
-                        <Window Type="MenuWidgets/Combobox" Name="orxonox/Display/Theme/Combobox" >
-                            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                            <Property Name="ClippedByParent" Value="False" />
-                            <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.5,0},{0.95,0},{1.6,0}}" />
-                            <Property Name="MaxEditTextLength" Value="1073741823" />
-                            <Event Name="ListSelectionAccepted" Function="GraphicsMenu.callback_ThemeCombobox_ListSelectionAccepted" />
-                        </Window>
-                    </Window>
-                    <Window Type="MenuWidgets/StaticText" Name="orxonox/Display/More" >
-                        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                        <Property Name="UnifiedAreaRect" Value="{{0.5125,0},{0.37,0},{0.975,0},{0.7,0}}" />
-                        <Window Type="MenuWidgets/Checkbox" Name="orxonox/Display/More/VSync" >
-                            <Property Name="Text" Value="VSync" />
-                            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                            <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.1,0},{0.95,0},{0.45,0}}" />
-                            <Event Name="CheckStateChanged" Function="GraphicsMenu.callback_VSyncCheckbox_CheckStateChanged" />
-                        </Window>
-                        <Window Type="MenuWidgets/StaticText" Name="orxonox/Display/More/FSAALabel" >
-                            <Property Name="Text" Value="FSAA" />
-                            <Property Name="FrameEnabled" Value="False" />
-                            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                            <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.55,0},{0.3,0},{0.9,0}}" />
-                            <Property Name="BackgroundEnabled" Value="False" />
-                        </Window>
-                        <Window Type="MenuWidgets/Combobox" Name="orxonox/Display/More/FSAA" >
-                            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                            <Property Name="ClippedByParent" Value="False" />
-                            <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.55,0},{0.95,0},{2.1,0}}" />
-                            <Property Name="MaxEditTextLength" Value="1073741823" />
-                            <Event Name="ListSelectionAccepted" Function="GraphicsMenu.callback_FSAACombobox_ListSelectionAccepted" />
-                        </Window>
-                    </Window>
-                    <Window Type="MenuWidgets/StaticText" Name="orxonox/Display/Notice" >
-                        <Property Name="Font" Value="BlueHighway-12" />
-                        <Property Name="Text" >Changing the theme, FSAA,
+<?xml version='1.0' encoding='utf-8'?>
+<GUILayout version="4">
+    <Window name="GraphicsBackground" type="MenuWidgets/StaticImage">
+        <Property name="FrameEnabled" value="False" />
+        <Property name="InheritsAlpha" value="False" />
+        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+        <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+        <Property name="BackgroundEnabled" value="False" />
+        <Window name="GraphicsWindow" type="MenuWidgets/StaticText">
+            <Property name="Text" value="Graphics" />
+            <Property name="Alpha" value="0.8" />
+            <Property name="InheritsAlpha" value="False" />
+            <Property name="HorzFormatting" value="HorzCentred" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="VertFormatting" value="TopAligned" />
+            <Property name="Area" value="{{0.25,0},{0.15,0},{0.75,0},{0.6375,0}}" />
+            <Window name="GraphicsTabControl" type="MenuWidgets/TabControl">
+                <Property name="TabHeight" value="{0,26.4388}" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="TabPanePosition" value="Top" />
+                <Property name="Area" value="{{0.05,0},{0.1,0},{0.95,0},{0.925,0}}" />
+                <Window name="Display" type="DefaultWindow">
+                    <Property name="Text" value="Display" />
+                    <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                    <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+                    <Window name="Resolution" type="MenuWidgets/StaticText">
+                        <Property name="Text" value="Resolution" />
+                        <Property name="HorzFormatting" value="HorzCentred" />
+                        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                        <Property name="VertFormatting" value="TopAligned" />
+                        <Property name="Area" value="{{0.025,0},{0.035,0},{0.4875,0},{0.96,0}}" />
+                        <Window name="Fullscreen" type="MenuWidgets/Checkbox">
+                            <Property name="Text" value="Fullscreen" />
+                            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                            <Property name="Area" value="{{0.05,0},{0.15,0},{0.95,0},{0.27,0}}" />
+                            <Event function="GraphicsMenu.callback_FullscreenCheckbox_CheckStateChanged" name="CheckStateChanged" />
+                        </Window>
+                        <Window name="Combobox" type="MenuWidgets/Combobox">
+                            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                            <Property name="ClippedByParent" value="False" />
+                            <Property name="Area" value="{{0.05,0},{0.3,0},{0.95,0},{1.2,0}}" />
+                            <Property name="MaxEditTextLength" value="1073741823" />
+                            <Event function="GraphicsMenu.callback_ResolutionCombobox_ListSelectionAccepted" name="ListSelectionAccepted" />
+                        </Window>
+                        <Window name="EditboxWidth" type="MenuWidgets/Editbox">
+                            <Property name="MaxTextLength" value="1073741823" />
+                            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                            <Property name="Area" value="{{0.05,0},{0.45,0},{0.45,0},{0.57,0}}" />
+                            <Event function="GraphicsMenu.callback_ResolutionEditboxWidth_TextChanged" name="TextChanged" />
+                        </Window>
+                        <Window name="EditboxHeight" type="MenuWidgets/Editbox">
+                            <Property name="MaxTextLength" value="1073741823" />
+                            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                            <Property name="Area" value="{{0.55,0},{0.45,0},{0.95,0},{0.57,0}}" />
+                            <Event function="GraphicsMenu.callback_ResolutionEditboxHeight_TextChanged" name="TextChanged" />
+                        </Window>
+                        <Window name="x" type="MenuWidgets/StaticText">
+                            <Property name="Text" value="x" />
+                            <Property name="FrameEnabled" value="False" />
+                            <Property name="HorzFormatting" value="HorzCentred" />
+                            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                            <Property name="Area" value="{{0.45,0},{0.45,0},{0.55,0},{0.57,0}}" />
+                            <Property name="BackgroundEnabled" value="False" />
+                        </Window>
+                        <Window name="Apply" type="MenuWidgets/Button">
+                            <Property name="Text" value="Apply" />
+                            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                            <Property name="Area" value="{{0.25,0},{0.61,0},{0.75,0},{0.73,0}}" />
+                            <Event function="GraphicsMenu.callback_Apply_Clicked" name="Clicked" />
+                        </Window>
+                        <Window name="AspectRatioLabel" type="MenuWidgets/StaticText">
+                            <Property name="Text" value="Aspect Ratio" />
+                            <Property name="FrameEnabled" value="False" />
+                            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                            <Property name="Area" value="{{0.05,0},{0.825,0},{0.6,0},{0.95,0}}" />
+                            <Property name="BackgroundEnabled" value="False" />
+                        </Window>
+                        <Window name="AspectRatio" type="MenuWidgets/Editbox">
+                            <Property name="Text" value="1" />
+                            <Property name="MaxTextLength" value="1073741823" />
+                            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                            <Property name="Area" value="{{0.65,0},{0.825,0},{0.95,0},{0.95,0}}" />
+                        </Window>
+                    </Window>
+                    <Window name="Theme" type="MenuWidgets/StaticText">
+                        <Property name="Text" value="Theme" />
+                        <Property name="HorzFormatting" value="HorzCentred" />
+                        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                        <Property name="VertFormatting" value="TopAligned" />
+                        <Property name="Area" value="{{0.5125,0},{0.035,0},{0.975,0},{0.32,0}}" />
+                        <Window name="Combobox" type="MenuWidgets/Combobox">
+                            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                            <Property name="ClippedByParent" value="False" />
+                            <Property name="Area" value="{{0.05,0},{0.5,0},{0.95,0},{1.6,0}}" />
+                            <Property name="MaxEditTextLength" value="1073741823" />
+                            <Event function="GraphicsMenu.callback_ThemeCombobox_ListSelectionAccepted" name="ListSelectionAccepted" />
+                        </Window>
+                    </Window>
+                    <Window name="More" type="MenuWidgets/StaticText">
+                        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                        <Property name="Area" value="{{0.5125,0},{0.37,0},{0.975,0},{0.7,0}}" />
+                        <Window name="VSync" type="MenuWidgets/Checkbox">
+                            <Property name="Text" value="VSync" />
+                            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                            <Property name="Area" value="{{0.05,0},{0.1,0},{0.95,0},{0.45,0}}" />
+                            <Event function="GraphicsMenu.callback_VSyncCheckbox_CheckStateChanged" name="CheckStateChanged" />
+                        </Window>
+                        <Window name="FSAALabel" type="MenuWidgets/StaticText">
+                            <Property name="Text" value="FSAA" />
+                            <Property name="FrameEnabled" value="False" />
+                            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                            <Property name="Area" value="{{0.05,0},{0.55,0},{0.3,0},{0.9,0}}" />
+                            <Property name="BackgroundEnabled" value="False" />
+                        </Window>
+                        <Window name="FSAA" type="MenuWidgets/Combobox">
+                            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                            <Property name="ClippedByParent" value="False" />
+                            <Property name="Area" value="{{0.3,0},{0.55,0},{0.95,0},{2.1,0}}" />
+                            <Property name="MaxEditTextLength" value="1073741823" />
+                            <Event function="GraphicsMenu.callback_FSAACombobox_ListSelectionAccepted" name="ListSelectionAccepted" />
+                        </Window>
+                    </Window>
+                    <Window name="Notice" type="MenuWidgets/StaticText">
+                        <Property name="Font" value="BlueHighway-12" />
+                        <Property name="Text">Changing the theme, FSAA,
 or VSync requires a restart</Property>
-                        <Property Name="HorzFormatting" Value="HorzCentred" />
-                        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                        <Property Name="UnifiedAreaRect" Value="{{0.5125,0},{0.75,0},{0.975,0},{0.96,0}}" />
-                    </Window>
-                    <Window Type="MenuWidgets/StaticText" Name="orxonox/Display/NoticeRed" >
-                        <Property Name="Font" Value="BlueHighway-12" />
-                        <Property Name="Text" >Restart required</Property>
-                        <Property Name="TextColours" Value="tl:FFFF0000 tr:FFFF8888 bl:FFFF8888 br:FFFFFFFF" />
-                        <Property Name="HorzFormatting" Value="HorzCentred" />
-                        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                        <Property Name="UnifiedAreaRect" Value="{{0.5125,0},{0.75,0},{0.975,0},{0.96,0}}" />
+                        <Property name="HorzFormatting" value="HorzCentred" />
+                        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                        <Property name="Area" value="{{0.5125,0},{0.75,0},{0.975,0},{0.96,0}}" />
+                    </Window>
+                    <Window name="NoticeRed" type="MenuWidgets/StaticText">
+                        <Property name="Font" value="BlueHighway-12" />
+                        <Property name="Text">Restart required</Property>
+                        <Property name="TextColours" value="tl:FFFF0000 tr:FFFF8888 bl:FFFF8888 br:FFFFFFFF" />
+                        <Property name="HorzFormatting" value="HorzCentred" />
+                        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                        <Property name="Area" value="{{0.5125,0},{0.75,0},{0.975,0},{0.96,0}}" />
                     </Window>
                 </Window>
-                <Window Type="DefaultWindow" Name="orxonox/Settings" >
-                    <Property Name="Text" Value="Settings" />
-                    <Property Name="Visible" Value="False" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-                    <Window Type="MenuWidgets/StaticText" Name="orxonox/Settings/FovLabel" >
-                        <Property Name="Text" Value="Vertical field of view (FOV)" />
-                        <Property Name="FrameEnabled" Value="False" />
-                        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                        <Property Name="UnifiedAreaRect" Value="{{0.035,0},{0.05,0},{0.5,0},{0.12,0}}" />
-                        <Property Name="BackgroundEnabled" Value="False" />
-                    </Window>
-                    <Window Type="MenuWidgets/StaticText" Name="orxonox/Settings/FpsLimitLabel" >
-                        <Property Name="Text" Value="Maximal frame rate" />
-                        <Property Name="FrameEnabled" Value="False" />
-                        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                        <Property Name="UnifiedAreaRect" Value="{{0.035,0},{0.18,0},{0.5,0},{0.25,0}}" />
-                        <Property Name="BackgroundEnabled" Value="False" />
-                    </Window>
-                    <Window Type="MenuWidgets/StaticText" Name="orxonox/Settings/ParticleLodLabel" >
-                        <Property Name="Text" Value="Particle detail level" />
-                        <Property Name="FrameEnabled" Value="False" />
-                        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                        <Property Name="UnifiedAreaRect" Value="{{0.035,0},{0.31,0},{0.5,0},{0.38,0}}" />
-                        <Property Name="BackgroundEnabled" Value="False" />
-                    </Window>
-                    <Window Type="MenuWidgets/Editbox" Name="orxonox/Settings/Fov" >
-                        <Property Name="MaxTextLength" Value="1073741823" />
-                        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                        <Property Name="UnifiedAreaRect" Value="{{0.5,0},{0.03,0},{0.65,0},{0.14,0}}" />
-                    </Window>
-                    <Window Type="MenuWidgets/Editbox" Name="orxonox/Settings/FpsLimit" >
-                        <Property Name="MaxTextLength" Value="1073741823" />
-                        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                        <Property Name="UnifiedAreaRect" Value="{{0.5,0},{0.16,0},{0.65,0},{0.27,0}}" />
-                    </Window>
-                    <Window Type="MenuWidgets/Combobox" Name="orxonox/Settings/ParticleLodCombobox" >
-                        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                        <Property Name="ClippedByParent" Value="False" />
-                        <Property Name="UnifiedAreaRect" Value="{{0.5,0},{0.29,0},{0.7,0},{0.725,0}}" />
-                        <Property Name="MaxEditTextLength" Value="1073741823" />
-                    </Window>
-                    <Window Type="MenuWidgets/Checkbox" Name="orxonox/Settings/MeshLodCheckbox" >
-                        <Property Name="Text" Value="Enable mesh LOD" />
-                        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                        <Property Name="UnifiedAreaRect" Value="{{0.035,0},{0.44,0},{0.5,0},{0.51,0}}" />
-                    </Window>
-                    <Window Type="MenuWidgets/Checkbox" Name="orxonox/Settings/MotionBlurCheckbox" >
-                        <Property Name="Text" Value="Enable motion blur" />
-                        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                        <Property Name="UnifiedAreaRect" Value="{{0.035,0},{0.57,0},{0.5,0},{0.64,0}}" />
+                <Window name="Settings" type="DefaultWindow">
+                    <Property name="Text" value="Settings" />
+                    <Property name="Visible" value="False" />
+                    <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                    <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+                    <Window name="FovLabel" type="MenuWidgets/StaticText">
+                        <Property name="Text" value="Vertical field of view (FOV)" />
+                        <Property name="FrameEnabled" value="False" />
+                        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                        <Property name="Area" value="{{0.035,0},{0.05,0},{0.5,0},{0.12,0}}" />
+                        <Property name="BackgroundEnabled" value="False" />
+                    </Window>
+                    <Window name="FpsLimitLabel" type="MenuWidgets/StaticText">
+                        <Property name="Text" value="Maximal frame rate" />
+                        <Property name="FrameEnabled" value="False" />
+                        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                        <Property name="Area" value="{{0.035,0},{0.18,0},{0.5,0},{0.25,0}}" />
+                        <Property name="BackgroundEnabled" value="False" />
+                    </Window>
+                    <Window name="ParticleLodLabel" type="MenuWidgets/StaticText">
+                        <Property name="Text" value="Particle detail level" />
+                        <Property name="FrameEnabled" value="False" />
+                        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                        <Property name="Area" value="{{0.035,0},{0.31,0},{0.5,0},{0.38,0}}" />
+                        <Property name="BackgroundEnabled" value="False" />
+                    </Window>
+                    <Window name="Fov" type="MenuWidgets/Editbox">
+                        <Property name="MaxTextLength" value="1073741823" />
+                        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                        <Property name="Area" value="{{0.5,0},{0.03,0},{0.65,0},{0.14,0}}" />
+                    </Window>
+                    <Window name="FpsLimit" type="MenuWidgets/Editbox">
+                        <Property name="MaxTextLength" value="1073741823" />
+                        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                        <Property name="Area" value="{{0.5,0},{0.16,0},{0.65,0},{0.27,0}}" />
+                    </Window>
+                    <Window name="ParticleLodCombobox" type="MenuWidgets/Combobox">
+                        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                        <Property name="ClippedByParent" value="False" />
+                        <Property name="Area" value="{{0.5,0},{0.29,0},{0.7,0},{0.725,0}}" />
+                        <Property name="MaxEditTextLength" value="1073741823" />
+                    </Window>
+                    <Window name="MeshLodCheckbox" type="MenuWidgets/Checkbox">
+                        <Property name="Text" value="Enable mesh LOD" />
+                        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                        <Property name="Area" value="{{0.035,0},{0.44,0},{0.5,0},{0.51,0}}" />
+                    </Window>
+                    <Window name="MotionBlurCheckbox" type="MenuWidgets/Checkbox">
+                        <Property name="Text" value="Enable motion blur" />
+                        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                        <Property name="Area" value="{{0.035,0},{0.57,0},{0.5,0},{0.64,0}}" />
                     </Window>
                 </Window>
             </Window>
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/GraphicsOkButton" >
-            <Property Name="Text" Value="OK" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.2875,0},{0.6625,0},{0.4875,0},{0.7125,0}}" />
-            <Event Name="Clicked" Function="GraphicsMenu.callback_Ok_Clicked" />
+        <Window name="GraphicsOkButton" type="MenuWidgets/Button">
+            <Property name="Text" value="OK" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.2875,0},{0.6625,0},{0.4875,0},{0.7125,0}}" />
+            <Event function="GraphicsMenu.callback_Ok_Clicked" name="Clicked" />
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/GraphicsCancelButton" >
-            <Property Name="Text" Value="Cancel" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.5125,0},{0.6625,0},{0.7125,0},{0.7125,0}}" />
-            <Event Name="Clicked" Function="GraphicsMenu.callback_Cancel_Clicked" />
+        <Window name="GraphicsCancelButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Cancel" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.5125,0},{0.6625,0},{0.7125,0},{0.7125,0}}" />
+            <Event function="GraphicsMenu.callback_Cancel_Clicked" name="Clicked" />
         </Window>
     </Window>
Index: code/branches/ogre1.9/data/gui/layouts/HostMenu.layout
===================================================================
--- code/branches/ogre1.9/data/gui/layouts/HostMenu.layout	(revision 11128)
+++ code/branches/ogre1.9/data/gui/layouts/HostMenu.layout	(revision 11211)
@@ -1,55 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <Window Type="MenuWidgets/StaticImage" Name="orxonox/HostMenuBackground" >
-        <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,0},{1,0}}" />
-        <Property Name="BackgroundEnabled" Value="False" />
-        <Window Type="MenuWidgets/StaticText" Name="orxonox/HostMenuWindow" >
-            <Property Name="Text" Value="Multiplayer" />
-            <Property Name="Alpha" Value="0.8" />
-            <Property Name="InheritsAlpha" Value="False" />
-            <Property Name="HorzFormatting" Value="HorzCentred" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="VertFormatting" Value="TopAligned" />
-            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.2875,0},{0.75,0},{0.7,0}}" />
-            <Window Type="MenuWidgets/Listbox" Name="orxonox/HostMenuListbox" >
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.85,0}}" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUILayout version="4">
+    <Window name="HostMenuBackground" type="MenuWidgets/StaticImage">
+        <Property name="FrameEnabled" value="False" />
+        <Property name="InheritsAlpha" value="False" />
+        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+        <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+        <Property name="BackgroundEnabled" value="False" />
+        <Window name="HostMenuWindow" type="MenuWidgets/StaticText">
+            <Property name="Text" value="Multiplayer" />
+            <Property name="Alpha" value="0.8" />
+            <Property name="InheritsAlpha" value="False" />
+            <Property name="HorzFormatting" value="HorzCentred" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="VertFormatting" value="TopAligned" />
+            <Property name="Area" value="{{0.25,0},{0.2875,0},{0.75,0},{0.7,0}}" />
+            <Window name="HostMenuListbox" type="MenuWidgets/Listbox">
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="Area" value="{{0.05,0},{0.15,0},{0.95,0},{0.85,0}}" />
             </Window>
-            <Window Type="MenuWidgets/RadioButton" Name="orxonox/HostMenuHostButton" >
-                <Property Name="Text" Value="Build Server"/>
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.87,0},{0.3,0},{0.97,0}}" />
-                <Event Name="SelectStateChanged" Function="HostMenu.HostMenuBuildServerButton_clicked"/>
+            <Window name="HostMenuHostButton" type="MenuWidgets/RadioButton">
+                <Property name="Text" value="Build Server" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="Area" value="{{0.1,0},{0.87,0},{0.3,0},{0.97,0}}" />
+                <Event function="HostMenu.HostMenuBuildServerButton_clicked" name="SelectStateChanged" />
             </Window>
-            <Window Type="MenuWidgets/RadioButton" Name="orxonox/HostMenuDedicatedButton" >
-                <Property Name="Text" Value="Dedicated" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.5,0},{0.87,0},{0.7,0},{0.97,0}}" />
-                <Event Name="SelectStateChanged" Function="HostMenu.HostMenuDedicatedButton_clicked"/>
+            <Window name="HostMenuDedicatedButton" type="MenuWidgets/RadioButton">
+                <Property name="Text" value="Dedicated" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="Area" value="{{0.5,0},{0.87,0},{0.7,0},{0.97,0}}" />
+                <Event function="HostMenu.HostMenuDedicatedButton_clicked" name="SelectStateChanged" />
             </Window>
-            <Window Type="MenuWidgets/Checkbox" Name="orxonox/MultiplayerShowAllCheckbox" >
-                <Property Name="Text" Value="show all" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.87,0},{1,0},{.97,0}}" />
-                <Event Name="CheckStateChanged" Function="HostMenu.MultiplayerShowAll_clicked"/>
+            <Window name="MultiplayerShowAllCheckbox" type="MenuWidgets/Checkbox">
+                <Property name="Text" value="show all" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="Area" value="{{0.8,0},{0.87,0},{1,0},{.97,0}}" />
+                <Event function="HostMenu.MultiplayerShowAll_clicked" name="CheckStateChanged" />
             </Window>
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/HostMenuStartButton" >
-            <Property Name="Text" Value="Start" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.2875,0},{0.725,0},{0.4875,0},{0.775,0}}" />
-            <Event Name="Clicked" Function="HostMenu.HostMenuStartButton_clicked"/>
+        <Window name="HostMenuStartButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Start" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.2875,0},{0.725,0},{0.4875,0},{0.775,0}}" />
+            <Event function="HostMenu.HostMenuStartButton_clicked" name="Clicked" />
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/HostMenuBackButton" >
-            <Property Name="Text" Value="Back" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.5125,0},{0.725,0},{0.7125,0},{0.775,0}}" />
-            <Event Name="Clicked" Function="HostMenu.HostMenuBackButton_clicked"/>
+        <Window name="HostMenuBackButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Back" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.5125,0},{0.725,0},{0.7125,0},{0.775,0}}" />
+            <Event function="HostMenu.HostMenuBackButton_clicked" name="Clicked" />
         </Window>
     </Window>
 </GUILayout>
-
Index: code/branches/ogre1.9/data/gui/layouts/InGameMenu.layout
===================================================================
--- code/branches/ogre1.9/data/gui/layouts/InGameMenu.layout	(revision 11128)
+++ code/branches/ogre1.9/data/gui/layouts/InGameMenu.layout	(revision 11211)
@@ -1,43 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <Window Type="DefaultWindow" Name="orxonox/InGameMenu_RootWindow" >
-        <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="MenuWidgets/Button" Name="orxonox/InGameMenu_ReturnButton" >
-            <Property Name="Text" Value="Return to Game" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.2875,0},{0.6,0},{0.3375,0}}" />
-            <Property Name="Alpha" Value="0.9" />
-            <Event Name="Clicked" Function="InGameMenu.button_return_clicked"/>
+<?xml version='1.0' encoding='utf-8'?>
+<GUILayout version="4">
+    <Window name="InGameMenu_RootWindow" type="DefaultWindow">
+        <Property name="InheritsAlpha" value="False" />
+        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+        <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+        <Window name="InGameMenu_ReturnButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Return to Game" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.4,0},{0.2875,0},{0.6,0},{0.3375,0}}" />
+            <Property name="Alpha" value="0.9" />
+            <Event function="InGameMenu.button_return_clicked" name="Clicked" />
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/InGameMenu_ReloadLevelButton" >
-            <Property Name="Text" Value="Reload level" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.3625,0},{0.6,0},{0.4125,0}}" />
-            <Property Name="Alpha" Value="0.9" />
-            <Event Name="Clicked" Function="InGameMenu.button_reloadLevel_clicked"/>
+        <Window name="InGameMenu_ReloadLevelButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Reload level" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.4,0},{0.3625,0},{0.6,0},{0.4125,0}}" />
+            <Property name="Alpha" value="0.9" />
+            <Event function="InGameMenu.button_reloadLevel_clicked" name="Clicked" />
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/InGameMenu_MainMenuButton" >
-            <Property Name="Text" Value="Main Menu" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.4375,0},{0.6,0},{0.4875,0}}" />
-            <Property Name="Alpha" Value="0.9" />
-            <Event Name="Clicked" Function="InGameMenu.button_mainmenu_clicked"/>
+        <Window name="InGameMenu_MainMenuButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Main Menu" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.4,0},{0.4375,0},{0.6,0},{0.4875,0}}" />
+            <Property name="Alpha" value="0.9" />
+            <Event function="InGameMenu.button_mainmenu_clicked" name="Clicked" />
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/InGameMenu_SettingsButton" >
-            <Property Name="Text" Value="Settings" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.5125,0},{0.6,0},{0.5625,0}}" />
-            <Property Name="Alpha" Value="0.9" />
-            <Event Name="Clicked" Function="InGameMenu.button_settings_clicked"/>
+        <Window name="InGameMenu_SettingsButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Settings" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.4,0},{0.5125,0},{0.6,0},{0.5625,0}}" />
+            <Property name="Alpha" value="0.9" />
+            <Event function="InGameMenu.button_settings_clicked" name="Clicked" />
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/InGameMenu_QuitButton" >
-            <Property Name="Text" Value="Quit" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.5875,0},{0.6,0},{0.6375,0}}" />
-            <Property Name="Alpha" Value="0.9" />
-            <Event Name="Clicked" Function="InGameMenu.button_quit_clicked"/>
+        <Window name="InGameMenu_QuitButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Quit" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.4,0},{0.5875,0},{0.6,0},{0.6375,0}}" />
+            <Property name="Alpha" value="0.9" />
+            <Event function="InGameMenu.button_quit_clicked" name="Clicked" />
         </Window>
     </Window>
Index: code/branches/ogre1.9/data/gui/layouts/InGamePickupHUD.layout
===================================================================
--- code/branches/ogre1.9/data/gui/layouts/InGamePickupHUD.layout	(revision 11128)
+++ code/branches/ogre1.9/data/gui/layouts/InGamePickupHUD.layout	(revision 11211)
@@ -1,47 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout>
-    <Window Type="DefaultWindow" Name="orxonox/InGamePickupHUD_RootWindow" >
-        <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/StaticImage" Name="orxonox/InGamePickupHUD_Overview" >
-            <Property Name="Font" Value="BlueHighway-12" />
-            <Property Name="Text" Value="Pickup List" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0,5},{0.15,0},{0.2,0},{0.45,0}}" />
-            <Property Name="Alpha" Value="0.3" />
-            <!--Event Name="Clicked" Function="InGameMenu.button_return_clicked"/-->
-            <Window Type="TaharezLook/StaticText" Name="orxonox/InGamePickupHUD_PickupTitle" >
-                <Property Name="Alpha" Value="0.8"/>
-                <Property Name="Text" Value="Pickup List" />
-                <Property Name="Font" Value="BlueHighway-10" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,-20},{0,20}}" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUILayout version="4">
+    <Window name="InGamePickupHUD_RootWindow" type="DefaultWindow">
+        <Property name="InheritsAlpha" value="False" />
+        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+        <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+        <Window name="InGamePickupHUD_Overview" type="TaharezLook/StaticImage">
+            <Property name="Font" value="BlueHighway-12" />
+            <Property name="Text" value="Pickup List" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0,5},{0.15,0},{0.2,0},{0.45,0}}" />
+            <Property name="Alpha" value="0.3" />
+            <Window name="InGamePickupHUD_PickupTitle" type="TaharezLook/StaticText">
+                <Property name="Alpha" value="0.8" />
+                <Property name="Text" value="Pickup List" />
+                <Property name="Font" value="BlueHighway-10" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="Area" value="{{0,0},{0,0},{1,-20},{0,20}}" />
             </Window>
-            <Window Type="TaharezLook/Button" Name="orxonox/InGamePickupHUD_closeButton" >
-                <Property Name="Alpha" Value="0.8" />
-                <Property Name="Font" Value="BlueHighway-12" />
-                <Property Name="Text" Value="X" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{1,-20},{0,0},{1,0},{0,20}}" />
-                <!-- alle Grössen / anordnungen angepasst - da überschneidungen von absoluten
-                und relativen Positionsangaben (problematisch bei kleinen auflösungen) -->
-                <Event Name="Clicked" Function="InGamePickupHUD.close_button_clicked"/>
+            <Window name="InGamePickupHUD_closeButton" type="TaharezLook/Button">
+                <Property name="Alpha" value="0.8" />
+                <Property name="Font" value="BlueHighway-12" />
+                <Property name="Text" value="X" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="Area" value="{{1,-20},{0,0},{1,0},{0,20}}" />
+                <Event function="InGamePickupHUD.close_button_clicked" name="Clicked" />
             </Window>
-            <Window Type="TaharezLook/Listbox" Name="orxonox/InGamePickupHUD_PickupListBox">
-                <Property Name="Alpha" Value="0.8" />
-                <Property Name="Font" Value="BlueHighway-12" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0,5},{0,25},{1,-5},{1,-5}}" />
-                <!--
-                <Window Type="TaharezLook/ListboxItem" Name="orxonox/InGamePickupHUD_TestPickupOne">
-                    <Property Name="Alpha" Value="0.8" />
-                    <Property Name="Font" Value="BlueHighway-12" />
-                    <Property Name="Text" Value="First Pickup" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{0,30},{1,0}}" />
-                </Window>
-                -->
+            <Window name="InGamePickupHUD_PickupListBox" type="TaharezLook/Listbox">
+                <Property name="Alpha" value="0.8" />
+                <Property name="Font" value="BlueHighway-12" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="Area" value="{{0,5},{0,25},{1,-5},{1,-5}}" />
             </Window>
         </Window>
Index: code/branches/ogre1.9/data/gui/layouts/InGameTest.layout
===================================================================
--- code/branches/ogre1.9/data/gui/layouts/InGameTest.layout	(revision 11128)
+++ code/branches/ogre1.9/data/gui/layouts/InGameTest.layout	(revision 11211)
@@ -1,13 +1,11 @@
-<?xml version="1.0" ?>
-<GUILayout>
-    <Window Type="DefaultGUISheet" Name="orxonox/TestWindow">
-    <Property Name="UnifiedSize" Value="{{1.0,0},{1.0,0}}"/>
-
-        <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}}"/>
-            <Property Name="Text" Value="NoFunction"/>
+<?xml version='1.0' encoding='utf-8'?>
+<GUILayout version="4">
+    <Window name="TestWindow" type="DefaultGUISheet">
+        <Property name="Size" value="{{1.0,0},{1.0,0}}" />
+        <Window name="TestButton" type="MenuWidgets/Button">
+            <Property name="Position" value="{{0.11,0},{0.528,0}}" />
+            <Property name="Size" value="{{0.15,0},{0.05,0}}" />
+            <Property name="Text" value="NoFunction" />
         </Window>
-
     </Window>
 </GUILayout>
Index: code/branches/ogre1.9/data/gui/layouts/InfoPopup.layout
===================================================================
--- code/branches/ogre1.9/data/gui/layouts/InfoPopup.layout	(revision 11128)
+++ code/branches/ogre1.9/data/gui/layouts/InfoPopup.layout	(revision 11211)
@@ -1,29 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <Window Type="DefaultWindow" Name="orxonox/InfoPopup_RootWindow" >
-        <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="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="MenuWidgets/Button" Name="orxonox/InfoPopup_close" >
-                <Property Name="Text" Value="Close" />
-                <Property Name="Alpha" Value="0.7" />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.5,0},{0.6,0},{0.55,0}}" />
-                <Event Name="Clicked" Function="InfoPopup.close"/>
+<?xml version='1.0' encoding='utf-8'?>
+<GUILayout version="4">
+    <Window name="InfoPopup_RootWindow" type="DefaultWindow">
+        <Property name="InheritsAlpha" value="False" />
+        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+        <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+        <Window name="InfoPopup_Background" type="MenuWidgets/StaticImage">
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+            <Property name="Alpha" value="0.7" />
+            <Window name="InfoPopup_close" type="MenuWidgets/Button">
+                <Property name="Text" value="Close" />
+                <Property name="Alpha" value="0.7" />
+                <Property name="InheritsAlpha" value="False" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="Area" value="{{0.4,0},{0.5,0},{0.6,0},{0.55,0}}" />
+                <Event function="InfoPopup.close" name="Clicked" />
             </Window>
-            <Window Type="MenuWidgets/StaticText" Name="orxonox/InfoPopup_text" >
-                <Property Name="Text" Value="Template text" />
-                <Property Name="TextColours" Value="FF4444FF" />
-                <Property Name="HorzFormatting" Value="WordWrapCentred" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.375,0},{0.75,0},{0.475,0}}" />
-                <Property Name="InheritsAlpha" Value="False" />
-               <Property Name="Alpha" Value="0.8" />
+            <Window name="InfoPopup_text" type="MenuWidgets/StaticText">
+                <Property name="Text" value="Template text" />
+                <Property name="TextColours" value="FF4444FF" />
+                <Property name="HorzFormatting" value="WordWrapCentred" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="Area" value="{{0.25,0},{0.375,0},{0.75,0},{0.475,0}}" />
+                <Property name="InheritsAlpha" value="False" />
+                <Property name="Alpha" value="0.8" />
             </Window>
         </Window>
Index: code/branches/ogre1.9/data/gui/layouts/KeyBindMenu.layout
===================================================================
--- code/branches/ogre1.9/data/gui/layouts/KeyBindMenu.layout	(revision 11128)
+++ code/branches/ogre1.9/data/gui/layouts/KeyBindMenu.layout	(revision 11211)
@@ -1,42 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <Window Type="DefaultWindow" Name="orxonox/KeyBindMenu/Background" >
-        <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="MenuWidgets/StaticText" Name="orxonox/KeyBindWindow" >
-            <Property Name="Text" Value="Keybindings" />
-            <Property Name="Alpha" Value="0.8" />
-            <Property Name="InheritsAlpha" Value="False" />
-            <Property Name="HorzFormatting" Value="HorzCentred" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="VertFormatting" Value="TopAligned" />
-            <Property Name="UnifiedAreaRect" Value="{{0.15,0},{0.2125,0},{0.85,0},{0.6375,0}}" />
-            <Window Type="MenuWidgets/StaticText" Name="orxonox/KeyBindWrapper" >
-                <Property Name="TextColours" Value="FF4444FF" />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="HorzFormatting" Value="HorzCentred" />
-                <Property Name="VertFormatting" Value="TopAligned" />
-                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.92,0}}" />
-                <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" />
-                    <Property Name="VertStepSize" Value="0.005" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="HorzOverlapSize" Value="0.01" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.005,0},{0.01,0},{0.995,0},{0.99,0}}" />
-                    <Property Name="VertOverlapSize" Value="0.01" />
-                    <Property Name="HorzScrollPosition" Value="0" />
-                    <Property Name="VertScrollPosition" Value="0" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUILayout version="4">
+    <Window name="Background" type="DefaultWindow">
+        <Property name="InheritsAlpha" value="False" />
+        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+        <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+        <Window name="KeyBindWindow" type="MenuWidgets/StaticText">
+            <Property name="Text" value="Keybindings" />
+            <Property name="Alpha" value="0.8" />
+            <Property name="InheritsAlpha" value="False" />
+            <Property name="HorzFormatting" value="HorzCentred" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="VertFormatting" value="TopAligned" />
+            <Property name="Area" value="{{0.15,0},{0.2125,0},{0.85,0},{0.6375,0}}" />
+            <Window name="KeyBindWrapper" type="MenuWidgets/StaticText">
+                <Property name="TextColours" value="FF4444FF" />
+                <Property name="InheritsAlpha" value="False" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="HorzFormatting" value="HorzCentred" />
+                <Property name="VertFormatting" value="TopAligned" />
+                <Property name="Area" value="{{0.05,0},{0.15,0},{0.95,0},{0.92,0}}" />
+                <Window name="KeyBindPane" type="MenuWidgets/ScrollablePane">
+                    <Property name="ContentArea" value="l:0 t:0 r:0 b:0" />
+                    <Property name="HorzStepSize" value="0.005" />
+                    <Property name="VertStepSize" value="0.005" />
+                    <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                    <Property name="HorzOverlapSize" value="0.01" />
+                    <Property name="Area" value="{{0.005,0},{0.01,0},{0.995,0},{0.99,0}}" />
+                    <Property name="VertOverlapSize" value="0.01" />
+                    <Property name="HorzScrollPosition" value="0" />
+                    <Property name="VertScrollPosition" value="0" />
                 </Window>
             </Window>
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/KeyBindBackButton" >
-            <Property Name="Text" Value="Back" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
-            <Event Name="Clicked" Function="KeyBindMenu.KeyBindBackButton_clicked"/>
+        <Window name="KeyBindBackButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Back" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
+            <Event function="KeyBindMenu.KeyBindBackButton_clicked" name="Clicked" />
         </Window>
     </Window>
Index: code/branches/ogre1.9/data/gui/layouts/MainMenu.layout
===================================================================
--- code/branches/ogre1.9/data/gui/layouts/MainMenu.layout	(revision 11128)
+++ code/branches/ogre1.9/data/gui/layouts/MainMenu.layout	(revision 11211)
@@ -1,46 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <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.0,0},{1.0,0}}" />
-        <Property Name="BackgroundEnabled" Value="False" />
-        <Window Type="MenuWidgets/Button" Name="orxonox/QuickGameTestButton" >
-            <Property Name="Text" Value="Quickstart" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.2875,0},{0.6,0},{0.3375,0}}" />
-            <Event Name="Clicked" Function="MainMenu.QuickGameTestButton_clicked"/>
+<?xml version='1.0' encoding='utf-8'?>
+<GUILayout version="4">
+    <Window name="MainMenuBackground" type="MenuWidgets/StaticImage">
+        <Property name="FrameEnabled" value="False" />
+        <Property name="InheritsAlpha" value="False" />
+        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+        <Property name="Area" value="{{0,0},{0,0},{1.0,0},{1.0,0}}" />
+        <Property name="BackgroundEnabled" value="False" />
+        <Window name="QuickGameTestButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Quickstart" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.4,0},{0.2875,0},{0.6,0},{0.3375,0}}" />
+            <Event function="MainMenu.QuickGameTestButton_clicked" name="Clicked" />
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/SingleplayerButton" >
-            <Property Name="Text" Value="Singleplayer" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.3625,0},{0.6,0},{0.4125,0}}" />
-            <Event Name="Clicked" Function="MainMenu.SingleplayerButton_clicked"/>
+        <Window name="SingleplayerButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Singleplayer" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.4,0},{0.3625,0},{0.6,0},{0.4125,0}}" />
+            <Event function="MainMenu.SingleplayerButton_clicked" name="Clicked" />
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/MultiplayerButton" >
-            <Property Name="Text" Value="Multiplayer" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.4375,0},{0.6,0},{0.4875,0}}" />
-            <Event Name="Clicked" Function="MainMenu.MultiplayerButton_clicked"/>
+        <Window name="MultiplayerButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Multiplayer" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.4,0},{0.4375,0},{0.6,0},{0.4875,0}}" />
+            <Event function="MainMenu.MultiplayerButton_clicked" name="Clicked" />
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/SettingsButton" >
-            <Property Name="Text" Value="Settings" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.5125,0},{0.6,0},{0.5625,0}}" />
-            <Event Name="Clicked" Function="MainMenu.SettingsButton_clicked"/>
+        <Window name="SettingsButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Settings" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.4,0},{0.5125,0},{0.6,0},{0.5625,0}}" />
+            <Event function="MainMenu.SettingsButton_clicked" name="Clicked" />
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/CreditsButton" >
-            <Property Name="Text" Value="Credits" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.5875,0},{0.6,0},{0.6375,0}}" />
-            <Event Name="Clicked" Function="MainMenu.CreditsButton_clicked"/>
+        <Window name="CreditsButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Credits" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.4,0},{0.5875,0},{0.6,0},{0.6375,0}}" />
+            <Event function="MainMenu.CreditsButton_clicked" name="Clicked" />
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/ExitButton" >
-            <Property Name="Text" Value="Exit" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
-            <Event Name="Clicked" Function="MainMenu.ExitButton_clicked"/>
+        <Window name="ExitButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Exit" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
+            <Event function="MainMenu.ExitButton_clicked" name="Clicked" />
         </Window>
     </Window>
Index: code/branches/ogre1.9/data/gui/layouts/MainMenuBackground.layout
===================================================================
--- code/branches/ogre1.9/data/gui/layouts/MainMenuBackground.layout	(revision 11128)
+++ code/branches/ogre1.9/data/gui/layouts/MainMenuBackground.layout	(revision 11211)
@@ -1,10 +1,10 @@
-<?xml version="1.0" ?>
-<GUILayout>
-    <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"/>
-        <Property Name="FrameEnabled" Value="set:true"/>
-        <Property Name="BackgroundEnabled" Value="set:false"/>
-        <Property Name="InheritsAlpha" Value="False" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUILayout version="4">
+    <Window name="Background" type="MenuWidgets/StaticImage">
+        <Property name="Size" value="{{1.0,0},{1.0,0}}" />
+        <Property name="Image" value="MainMenuBackground/Background" />
+        <Property name="FrameEnabled" value="set:true" />
+        <Property name="BackgroundEnabled" value="set:false" />
+        <Property name="InheritsAlpha" value="False" />
     </Window>
 </GUILayout>
Index: code/branches/ogre1.9/data/gui/layouts/MiscConfigMenu.layout
===================================================================
--- code/branches/ogre1.9/data/gui/layouts/MiscConfigMenu.layout	(revision 11128)
+++ code/branches/ogre1.9/data/gui/layouts/MiscConfigMenu.layout	(revision 11211)
@@ -1,50 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <Window Type="MenuWidgets/StaticImage" Name="orxonox/MiscConfigMenu/Background" >
-        <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,0},{1,0}}" />
-        <Property Name="BackgroundEnabled" Value="False" />
-        <Window Type="MenuWidgets/StaticText" Name="orxonox/MicsConfigMenu/ConfigWindow" >
-            <Property Name="Text" Value="Miscellaneous" />
-            <Property Name="Alpha" Value="0.8" />
-            <Property Name="InheritsAlpha" Value="False" />
-            <Property Name="HorzFormatting" Value="HorzCentred" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="VertFormatting" Value="TopAligned" />
-            <Property Name="UnifiedAreaRect" Value="{{0.15,0},{0.2125,0},{0.85,0},{0.6375,0}}" />
-            <Window Type="MenuWidgets/StaticText" Name="orxonox/MiscConfigMenu/Wrapper" >
-                <Property Name="TextColours" Value="FF4444FF" />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="HorzFormatting" Value="HorzCentred" />
-                <Property Name="VertFormatting" Value="TopAligned" />
-                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.92,0}}" />
-                <Window Type="MenuWidgets/ScrollablePane" Name="orxonox/MiscConfigMenu/MiscConfigPane" >
-                    <Property Name="ContentArea" Value="l:0 t:0 r:0 b:0" />
-                    <Property Name="HorzStepSize" Value="0.005" />
-                    <Property Name="VertStepSize" Value="0.005" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="HorzOverlapSize" Value="0.01" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.005,0},{0.01,0},{0.995,0},{0.99,0}}" />
-                    <Property Name="VertOverlapSize" Value="0.01" />
-                    <Property Name="HorzScrollPosition" Value="0" />
-                    <Property Name="VertScrollPosition" Value="0" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUILayout version="4">
+    <Window name="Background" type="MenuWidgets/StaticImage">
+        <Property name="FrameEnabled" value="False" />
+        <Property name="InheritsAlpha" value="False" />
+        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+        <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+        <Property name="BackgroundEnabled" value="False" />
+        <Window name="ConfigWindow" type="MenuWidgets/StaticText">
+            <Property name="Text" value="Miscellaneous" />
+            <Property name="Alpha" value="0.8" />
+            <Property name="InheritsAlpha" value="False" />
+            <Property name="HorzFormatting" value="HorzCentred" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="VertFormatting" value="TopAligned" />
+            <Property name="Area" value="{{0.15,0},{0.2125,0},{0.85,0},{0.6375,0}}" />
+            <Window name="Wrapper" type="MenuWidgets/StaticText">
+                <Property name="TextColours" value="FF4444FF" />
+                <Property name="InheritsAlpha" value="False" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="HorzFormatting" value="HorzCentred" />
+                <Property name="VertFormatting" value="TopAligned" />
+                <Property name="Area" value="{{0.05,0},{0.15,0},{0.95,0},{0.92,0}}" />
+                <Window name="MiscConfigPane" type="MenuWidgets/ScrollablePane">
+                    <Property name="ContentArea" value="l:0 t:0 r:0 b:0" />
+                    <Property name="HorzStepSize" value="0.005" />
+                    <Property name="VertStepSize" value="0.005" />
+                    <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                    <Property name="HorzOverlapSize" value="0.01" />
+                    <Property name="Area" value="{{0.005,0},{0.01,0},{0.995,0},{0.99,0}}" />
+                    <Property name="VertOverlapSize" value="0.01" />
+                    <Property name="HorzScrollPosition" value="0" />
+                    <Property name="VertScrollPosition" value="0" />
                 </Window>
             </Window>
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/MiscConfigMenu/CancelButton" >
-            <Property Name="Text" Value="Cancel" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.725,0},{0.4,0},{0.775,0}}" />
-            <Event Name="Clicked" Function="MiscConfigMenu.MiscConfigCancelButton_clicked"/>
+        <Window name="CancelButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Cancel" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.25,0},{0.725,0},{0.4,0},{0.775,0}}" />
+            <Event function="MiscConfigMenu.MiscConfigCancelButton_clicked" name="Clicked" />
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/MiscConfigMenu/OKButton" >
-            <Property Name="Text" Value="OK" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.6,0},{0.725,0},{0.75,0},{0.775,0}}" />
-            <Event Name="Clicked" Function="MiscConfigMenu.MiscConfigOKButton_clicked"/>
+        <Window name="OKButton" type="MenuWidgets/Button">
+            <Property name="Text" value="OK" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.6,0},{0.725,0},{0.75,0},{0.775,0}}" />
+            <Event function="MiscConfigMenu.MiscConfigOKButton_clicked" name="Clicked" />
         </Window>
     </Window>
Index: code/branches/ogre1.9/data/gui/layouts/MouseControlsMenu.layout
===================================================================
--- code/branches/ogre1.9/data/gui/layouts/MouseControlsMenu.layout	(revision 11128)
+++ code/branches/ogre1.9/data/gui/layouts/MouseControlsMenu.layout	(revision 11211)
@@ -1,86 +1,85 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <Window Type="MenuWidgets/StaticImage" Name="orxonox/MouseControlsBackground" >
-        <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,0},{1,0}}" />
-        <Property Name="BackgroundEnabled" Value="False" />
-        <Window Type="MenuWidgets/StaticText" Name="orxonox/MouseControlsWindow" >
-            <Property Name="Text" Value="Mouse controls" />
-            <Property Name="Alpha" Value="0.8" />
-            <Property Name="InheritsAlpha" Value="False" />
-            <Property Name="HorzFormatting" Value="HorzCentred" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="VertFormatting" Value="TopAligned" />
-            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
-            <Window Type="MenuWidgets/StaticText" Name="orxonox/MouseNormalSensitivity" >
-                <Property Name="Text" Value="Sensitivity (normal mode)                                      " />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="HorzFormatting" Value="HorzCentred" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="VertFormatting" Value="TopAligned" />
-                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.2,0},{0.95,0},{0.45,0}}" />
-                <Window Type="MenuWidgets/HorizontalScrollbar" Name="orxonox/MouseNormalScrollbar" >
-                    <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="StepSize" Value="0.1" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.02,0},{0.6,0},{0.565,0},{0.8,0}}" />
-                    <Event Name="ThumbTrackStarted" Function="MouseControlsMenu.MouseControlsMouseNormalScrollbar_started" />
-                    <Event Name="ThumbTrackEnded" Function="MouseControlsMenu.MouseControlsMouseNormalScrollbar_ended" />
-                    <Event Name="ScrollPosChanged" Function="MouseControlsMenu.MouseControlsMouseNormalScrollbar_changed" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUILayout version="4">
+    <Window name="MouseControlsBackground" type="MenuWidgets/StaticImage">
+        <Property name="FrameEnabled" value="False" />
+        <Property name="InheritsAlpha" value="False" />
+        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+        <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+        <Property name="BackgroundEnabled" value="False" />
+        <Window name="MouseControlsWindow" type="MenuWidgets/StaticText">
+            <Property name="Text" value="Mouse controls" />
+            <Property name="Alpha" value="0.8" />
+            <Property name="InheritsAlpha" value="False" />
+            <Property name="HorzFormatting" value="HorzCentred" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="VertFormatting" value="TopAligned" />
+            <Property name="Area" value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
+            <Window name="MouseNormalSensitivity" type="MenuWidgets/StaticText">
+                <Property name="Text" value="Sensitivity (normal mode)                                      " />
+                <Property name="InheritsAlpha" value="False" />
+                <Property name="HorzFormatting" value="HorzCentred" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="VertFormatting" value="TopAligned" />
+                <Property name="Area" value="{{0.05,0},{0.2,0},{0.95,0},{0.45,0}}" />
+                <Window name="MouseNormalScrollbar" type="MenuWidgets/HorizontalScrollbar">
+                    <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="StepSize" value="0.1" />
+                    <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                    <Property name="Area" value="{{0.02,0},{0.6,0},{0.565,0},{0.8,0}}" />
+                    <Event function="MouseControlsMenu.MouseControlsMouseNormalScrollbar_started" name="ThumbTrackStarted" />
+                    <Event function="MouseControlsMenu.MouseControlsMouseNormalScrollbar_ended" name="ThumbTrackEnded" />
+                    <Event function="MouseControlsMenu.MouseControlsMouseNormalScrollbar_changed" name="ScrollPosChanged" />
                 </Window>
-                <Window Type="MenuWidgets/RadioButton" Name="orxonox/MouseNormalButton" >
-                    <Property Name="Text" Value="Normal mouse input" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.61,0},{0.5,0},{0.975,0},{0.85,0}}" />
-                    <Event Name="SelectStateChanged" Function="MouseControlsMenu.MouseNormalButton_clicked" />
+                <Window name="MouseNormalButton" type="MenuWidgets/RadioButton">
+                    <Property name="Text" value="Normal mouse input" />
+                    <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                    <Property name="Area" value="{{0.61,0},{0.5,0},{0.975,0},{0.85,0}}" />
+                    <Event function="MouseControlsMenu.MouseNormalButton_clicked" name="SelectStateChanged" />
                 </Window>
             </Window>
-            <Window Type="MenuWidgets/StaticText" Name="orxonox/MouseDeriveSensitivity" >
-                <Property Name="Text" Value="Sensitivity (derive mode)                                      " />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="HorzFormatting" Value="HorzCentred" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="VertFormatting" Value="TopAligned" />
-                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.55,0},{0.95,0},{0.8,0}}" />
-                <Window Type="MenuWidgets/HorizontalScrollbar" Name="orxonox/MouseDeriveScrollbar" >
-                    <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="StepSize" Value="0.1" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.02,0},{0.6,0},{0.565,0},{0.8,0}}" />
-                    <Event Name="ThumbTrackStarted" Function="MouseControlsMenu.MouseControlsMouseDeriveScrollbar_started" />
-                    <Event Name="ThumbTrackEnded" Function="MouseControlsMenu.MouseControlsMouseDeriveScrollbar_ended" />
-                    <Event Name="ScrollPosChanged" Function="MouseControlsMenu.MouseControlsMouseDeriveScrollbar_changed" />
+            <Window name="MouseDeriveSensitivity" type="MenuWidgets/StaticText">
+                <Property name="Text" value="Sensitivity (derive mode)                                      " />
+                <Property name="InheritsAlpha" value="False" />
+                <Property name="HorzFormatting" value="HorzCentred" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="VertFormatting" value="TopAligned" />
+                <Property name="Area" value="{{0.05,0},{0.55,0},{0.95,0},{0.8,0}}" />
+                <Window name="MouseDeriveScrollbar" type="MenuWidgets/HorizontalScrollbar">
+                    <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="StepSize" value="0.1" />
+                    <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                    <Property name="Area" value="{{0.02,0},{0.6,0},{0.565,0},{0.8,0}}" />
+                    <Event function="MouseControlsMenu.MouseControlsMouseDeriveScrollbar_started" name="ThumbTrackStarted" />
+                    <Event function="MouseControlsMenu.MouseControlsMouseDeriveScrollbar_ended" name="ThumbTrackEnded" />
+                    <Event function="MouseControlsMenu.MouseControlsMouseDeriveScrollbar_changed" name="ScrollPosChanged" />
                 </Window>
-                <Window Type="MenuWidgets/RadioButton" Name="orxonox/MouseDeriveButton" >
-                    <Property Name="Text" Value="Derive mouse input" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.61,0},{0.5,0},{0.975,0},{0.85,0}}" />
-                    <Event Name="SelectStateChanged" Function="MouseControlsMenu.MouseDeriveButton_clicked" />
+                <Window name="MouseDeriveButton" type="MenuWidgets/RadioButton">
+                    <Property name="Text" value="Derive mouse input" />
+                    <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                    <Property name="Area" value="{{0.61,0},{0.5,0},{0.975,0},{0.85,0}}" />
+                    <Event function="MouseControlsMenu.MouseDeriveButton_clicked" name="SelectStateChanged" />
                 </Window>
             </Window>
-            <Window Type="MenuWidgets/Checkbox" Name="orxonox/MouseInvertCheckbox" >
-                <Property Name="Text" Value="Invert mouse" />
-                <Property Name="Disabled" Value="true" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.39,0},{0.85,0},{0.61,0},{0.95,0}}" />
-                <Event Name="CheckStateChanged" Function="MouseControlsMenu.MouseInvertCheckbox_clicked" />
+            <Window name="MouseInvertCheckbox" type="MenuWidgets/Checkbox">
+                <Property name="Text" value="Invert mouse" />
+                <Property name="Disabled" value="true" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="Area" value="{{0.39,0},{0.85,0},{0.61,0},{0.95,0}}" />
+                <Event function="MouseControlsMenu.MouseInvertCheckbox_clicked" name="CheckStateChanged" />
             </Window>
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/MouseControlsBackButton" >
-            <Property Name="Text" Value="Back" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
-            <Event Name="Clicked" Function="MouseControlsMenu.MouseControlsBackButton_clicked"/>
+        <Window name="MouseControlsBackButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Back" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
+            <Event function="MouseControlsMenu.MouseControlsBackButton_clicked" name="Clicked" />
         </Window>
     </Window>
Index: code/branches/ogre1.9/data/gui/layouts/MultiplayerMenu.layout
===================================================================
--- code/branches/ogre1.9/data/gui/layouts/MultiplayerMenu.layout	(revision 11128)
+++ code/branches/ogre1.9/data/gui/layouts/MultiplayerMenu.layout	(revision 11211)
@@ -1,55 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <Window Type="MenuWidgets/StaticImage" Name="orxonox/MultiplayerBackground" >
-        <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,0},{1,0}}" />
-        <Property Name="BackgroundEnabled" Value="False" />
-        <Window Type="MenuWidgets/StaticText" Name="orxonox/MultiplayerWindow" >
-            <Property Name="Text" Value="Multiplayer" />
-            <Property Name="Alpha" Value="0.8" />
-            <Property Name="InheritsAlpha" Value="False" />
-            <Property Name="HorzFormatting" Value="HorzCentred" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="VertFormatting" Value="TopAligned" />
-            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.2875,0},{0.75,0},{0.6375,0}}" />
-            <Window Type="MenuWidgets/Listbox" Name="orxonox/MultiplayerListbox" >
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.8,0}}" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUILayout version="4">
+    <Window name="MultiplayerBackground" type="MenuWidgets/StaticImage">
+        <Property name="FrameEnabled" value="False" />
+        <Property name="InheritsAlpha" value="False" />
+        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+        <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+        <Property name="BackgroundEnabled" value="False" />
+        <Window name="MultiplayerWindow" type="MenuWidgets/StaticText">
+            <Property name="Text" value="Multiplayer" />
+            <Property name="Alpha" value="0.8" />
+            <Property name="InheritsAlpha" value="False" />
+            <Property name="HorzFormatting" value="HorzCentred" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="VertFormatting" value="TopAligned" />
+            <Property name="Area" value="{{0.25,0},{0.2875,0},{0.75,0},{0.6375,0}}" />
+            <Window name="MultiplayerListbox" type="MenuWidgets/Listbox">
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="Area" value="{{0.05,0},{0.15,0},{0.95,0},{0.8,0}}" />
             </Window>
-            <Window Type="MenuWidgets/RadioButton" Name="orxonox/MultiplayerLanButton" >
-                <Property Name="Text" Value="LAN"/>
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.87,0},{0.4,0},{0.97,0}}" />
-                <Event Name="SelectStateChanged" Function="MultiplayerMenu.LanButton_clicked"/>
+            <Window name="MultiplayerLanButton" type="MenuWidgets/RadioButton">
+                <Property name="Text" value="LAN" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="Area" value="{{0.2,0},{0.87,0},{0.4,0},{0.97,0}}" />
+                <Event function="MultiplayerMenu.LanButton_clicked" name="SelectStateChanged" />
             </Window>
-            <Window Type="MenuWidgets/RadioButton" Name="orxonox/MultiplayerInternetButton" >
-                <Property Name="Text" Value="Internet" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.6,0},{0.87,0},{0.8,0},{0.97,0}}" />
-                <Event Name="SelectStateChanged" Function="MultiplayerMenu.InternetButton_clicked"/>
+            <Window name="MultiplayerInternetButton" type="MenuWidgets/RadioButton">
+                <Property name="Text" value="Internet" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="Area" value="{{0.6,0},{0.87,0},{0.8,0},{0.97,0}}" />
+                <Event function="MultiplayerMenu.InternetButton_clicked" name="SelectStateChanged" />
             </Window>
         </Window>
-         <Window Type="MenuWidgets/Button" Name="orxonox/MultiplayerBackButton" >
-            <Property Name="Text" Value="Back" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.7125,0},{0.8625,0},{0.9125,0},{0.9125,0}}" />
-            <Event Name="Clicked" Function="MultiplayerMenu.MultiplayerBackButton_clicked"/>
+        <Window name="MultiplayerBackButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Back" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.7125,0},{0.8625,0},{0.9125,0},{0.9125,0}}" />
+            <Event function="MultiplayerMenu.MultiplayerBackButton_clicked" name="Clicked" />
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/MultiplayerJoinButton" >
-            <Property Name="Text" Value="Join" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.2875,0},{0.6625,0},{0.4875,0},{0.7125,0}}" />
-            <Event Name="Clicked" Function="MultiplayerMenu.MultiplayerJoinButton_clicked"/>
+        <Window name="MultiplayerJoinButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Join" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.2875,0},{0.6625,0},{0.4875,0},{0.7125,0}}" />
+            <Event function="MultiplayerMenu.MultiplayerJoinButton_clicked" name="Clicked" />
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/MultiplayerHostButton" >
-            <Property Name="Text" Value="Host" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.5125,0},{0.6625,0},{0.7125,0},{0.7125,0}}" />
-            <Event Name="Clicked" Function="MultiplayerMenu.MultiplayerHostButton_clicked"/>
+        <Window name="MultiplayerHostButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Host" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.5125,0},{0.6625,0},{0.7125,0},{0.7125,0}}" />
+            <Event function="MultiplayerMenu.MultiplayerHostButton_clicked" name="Clicked" />
         </Window>
     </Window>
 </GUILayout>
-
Index: code/branches/ogre1.9/data/gui/layouts/MultiplayerOptionsMenu.layout
===================================================================
--- code/branches/ogre1.9/data/gui/layouts/MultiplayerOptionsMenu.layout	(revision 11128)
+++ code/branches/ogre1.9/data/gui/layouts/MultiplayerOptionsMenu.layout	(revision 11211)
@@ -1,25 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <Window Type="MenuWidgets/StaticImage" Name="orxonox/MultiplayerOptionsBackground" >
-        <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,0},{1,0}}" />
-        <Property Name="BackgroundEnabled" Value="False" />
-        <Window Type="MenuWidgets/StaticText" Name="orxonox/MultiplayerOptionsWindow" >
-            <Property Name="Text" Value="Multiplayer options" />
-            <Property Name="Alpha" Value="0.8" />
-            <Property Name="InheritsAlpha" Value="False" />
-            <Property Name="HorzFormatting" Value="HorzCentred" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="VertFormatting" Value="TopAligned" />
-            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUILayout version="4">
+    <Window name="MultiplayerOptionsBackground" type="MenuWidgets/StaticImage">
+        <Property name="FrameEnabled" value="False" />
+        <Property name="InheritsAlpha" value="False" />
+        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+        <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+        <Property name="BackgroundEnabled" value="False" />
+        <Window name="MultiplayerOptionsWindow" type="MenuWidgets/StaticText">
+            <Property name="Text" value="Multiplayer options" />
+            <Property name="Alpha" value="0.8" />
+            <Property name="InheritsAlpha" value="False" />
+            <Property name="HorzFormatting" value="HorzCentred" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="VertFormatting" value="TopAligned" />
+            <Property name="Area" value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/MultiplayerOptionsBackButton" >
-            <Property Name="Text" Value="Back" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.625,0},{0.6,0},{0.675,0}}" />
-            <Event Name="Clicked" Function="MultiplayerOptionsMenu.MultiplayerOptionsBackButton_clicked"/>
+        <Window name="MultiplayerOptionsBackButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Back" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.4,0},{0.625,0},{0.6,0},{0.675,0}}" />
+            <Event function="MultiplayerOptionsMenu.MultiplayerOptionsBackButton_clicked" name="Clicked" />
         </Window>
     </Window>
Index: code/branches/ogre1.9/data/gui/layouts/NotificationLayer.layout
===================================================================
--- code/branches/ogre1.9/data/gui/layouts/NotificationLayer.layout	(revision 11128)
+++ code/branches/ogre1.9/data/gui/layouts/NotificationLayer.layout	(revision 11211)
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <Window Type="DefaultWindow" Name="orxonox/NotificationLayer/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}}" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUILayout version="4">
+    <Window name="Root" type="DefaultWindow">
+        <Property name="InheritsAlpha" value="False" />
+        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+        <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
     </Window>
 </GUILayout>
Index: code/branches/ogre1.9/data/gui/layouts/PickupInventory.layout
===================================================================
--- code/branches/ogre1.9/data/gui/layouts/PickupInventory.layout	(revision 11128)
+++ code/branches/ogre1.9/data/gui/layouts/PickupInventory.layout	(revision 11211)
@@ -1,42 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <Window Type="DefaultWindow" Name="orxonox/PickupInventory/Background" >
-        <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="MenuWidgets/StaticText" Name="orxonox/PickupInventory/PickupInventory" >
-            <Property Name="Text" Value="Pickup Inventory" />
-            <Property Name="Alpha" Value="0.8" />
-            <Property Name="InheritsAlpha" Value="False" />
-            <Property Name="HorzFormatting" Value="HorzCentred" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="VertFormatting" Value="TopAligned" />
-            <Property Name="UnifiedAreaRect" Value="{{0.15,0},{0.15,0},{0.85,0},{0.8,0}}" />
-            <Window Type="MenuWidgets/StaticText" Name="orxonox/PickupInventory/Wrapper" >
-                <Property Name="TextColours" Value="FF4444FF" />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="HorzFormatting" Value="HorzCentred" />
-                <Property Name="VertFormatting" Value="TopAligned" />
-                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.92,0}}" />
-                <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" />
-                    <Property Name="VertStepSize" Value="0.005" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="HorzOverlapSize" Value="0.01" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.005,0},{0.01,0},{0.995,0},{0.99,0}}" />
-                    <Property Name="VertOverlapSize" Value="0.01" />
-                    <Property Name="HorzScrollPosition" Value="0" />
-                    <Property Name="VertScrollPosition" Value="0" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUILayout version="4">
+    <Window name="Background" type="DefaultWindow">
+        <Property name="InheritsAlpha" value="False" />
+        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+        <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+        <Window name="PickupInventory" type="MenuWidgets/StaticText">
+            <Property name="Text" value="Pickup Inventory" />
+            <Property name="Alpha" value="0.8" />
+            <Property name="InheritsAlpha" value="False" />
+            <Property name="HorzFormatting" value="HorzCentred" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="VertFormatting" value="TopAligned" />
+            <Property name="Area" value="{{0.15,0},{0.15,0},{0.85,0},{0.8,0}}" />
+            <Window name="Wrapper" type="MenuWidgets/StaticText">
+                <Property name="TextColours" value="FF4444FF" />
+                <Property name="InheritsAlpha" value="False" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="HorzFormatting" value="HorzCentred" />
+                <Property name="VertFormatting" value="TopAligned" />
+                <Property name="Area" value="{{0.05,0},{0.15,0},{0.95,0},{0.92,0}}" />
+                <Window name="Inventory" type="MenuWidgets/ScrollablePane">
+                    <Property name="ContentArea" value="l:0 t:0 r:0 b:0" />
+                    <Property name="HorzStepSize" value="0.005" />
+                    <Property name="VertStepSize" value="0.005" />
+                    <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                    <Property name="HorzOverlapSize" value="0.01" />
+                    <Property name="Area" value="{{0.005,0},{0.01,0},{0.995,0},{0.99,0}}" />
+                    <Property name="VertOverlapSize" value="0.01" />
+                    <Property name="HorzScrollPosition" value="0" />
+                    <Property name="VertScrollPosition" value="0" />
                 </Window>
             </Window>
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/PickupInventory/InventoryBackButton" >
-            <Property Name="Text" Value="Back" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.8350,0},{0.6,0},{0.8800,0}}" />
-            <Event Name="Clicked" Function="PickupInventory.InventoryBackButton_clicked"/>
+        <Window name="InventoryBackButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Back" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.4,0},{0.8350,0},{0.6,0},{0.8800,0}}" />
+            <Event function="PickupInventory.InventoryBackButton_clicked" name="Clicked" />
         </Window>
     </Window>
Index: code/branches/ogre1.9/data/gui/layouts/QuestGUI.layout
===================================================================
--- code/branches/ogre1.9/data/gui/layouts/QuestGUI.layout	(revision 11128)
+++ code/branches/ogre1.9/data/gui/layouts/QuestGUI.layout	(revision 11211)
@@ -1,73 +1,61 @@
-<?xml version="1.0" ?>
-<GUILayout>
-    <Window Type="DefaultWindow" Name="orxonox/QuestGUI/Background">
-        <Property Name="InheritsAlpha" Value="False" />
-        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-
-        <Window Type="DefaultWindow" Name="orxonox/QuestGUI/MainWindow">
-            <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.1,0},{0.9,0},{0.9,0}}" />
-
-            <Window Type="MenuWidgets/Titlebar" Name="orxonox/QuestGUI/Title">
-                <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{0,30}}" />
-                <Property Name="Text" Value="Your Quests"/>
+<?xml version='1.0' encoding='utf-8'?>
+<GUILayout version="4">
+    <Window name="Background" type="DefaultWindow">
+        <Property name="InheritsAlpha" value="False" />
+        <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+        <Window name="MainWindow" type="DefaultWindow">
+            <Property name="Area" value="{{0.1,0},{0.1,0},{0.9,0},{0.9,0}}" />
+            <Window name="Title" type="MenuWidgets/Titlebar">
+                <Property name="Area" value="{{0,0},{0,0},{1,0},{0,30}}" />
+                <Property name="Text" value="Your Quests" />
             </Window>
-
-            <Window Type="MenuWidgets/StaticText" Name="orxonox/QuestGUI/MainWindow/LeftPanel">
-                <Property Name="UnifiedAreaRect" Value="{{0,0},{0,30},{0.5,0},{1,0}}" />
-
-                <Window Type="MenuWidgets/TabButton" Name="orxonox/QuestGUI/ActiveQuestsButton">
-                    <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{0.5,0},{0,30}}" />
-                    <Property Name="Text" Value="active quests"/>
-                    <Event Name="Clicked" Function="QuestGUI.showActiveQuestsButton_clicked"/>
+            <Window name="LeftPanel" type="MenuWidgets/StaticText">
+                <Property name="Area" value="{{0,0},{0,30},{0.5,0},{1,0}}" />
+                <Window name="ActiveQuestsButton" type="MenuWidgets/TabButton">
+                    <Property name="Area" value="{{0,0},{0,0},{0.5,0},{0,30}}" />
+                    <Property name="Text" value="active quests" />
+                    <Event function="QuestGUI.showActiveQuestsButton_clicked" name="Clicked" />
                 </Window>
-                <Window Type="MenuWidgets/TabButton" Name="orxonox/QuestGUI/FinishedQuestsButton">
-                    <Property Name="UnifiedAreaRect" Value="{{0.5,0},{0,0},{1,0},{0,30}}" />
-                    <Property Name="Text" Value="finished quests"/>
-                    <Event Name="Clicked" Function="QuestGUI.showFinishedQuestsButton_clicked"/>
+                <Window name="FinishedQuestsButton" type="MenuWidgets/TabButton">
+                    <Property name="Area" value="{{0.5,0},{0,0},{1,0},{0,30}}" />
+                    <Property name="Text" value="finished quests" />
+                    <Event function="QuestGUI.showFinishedQuestsButton_clicked" name="Clicked" />
                 </Window>
-
-                <Window Type="MenuWidgets/Listbox" Name="orxonox/QuestGUI/QuestsList">
-                    <Property Name="UnifiedAreaRect" Value="{{0,0},{0,30},{1,0},{1,0}}" />
-                    <Event Name="ItemSelectionChanged" Function="QuestGUI.changeQuest_clicked"/>
+                <Window name="QuestsList" type="MenuWidgets/Listbox">
+                    <Property name="Area" value="{{0,0},{0,30},{1,0},{1,0}}" />
+                    <Event function="QuestGUI.changeQuest_clicked" name="ItemSelectionChanged" />
                 </Window>
             </Window>
-
-            <Window Type="MenuWidgets/StaticText" Name="orxonox/QuestGUI/MainWindow/RightPanel">
-                <Property Name="UnifiedAreaRect" Value="{{0.5,0},{0,30},{1,0},{1,0}}" />
-
-                <Window Type="MenuWidgets/StaticText" Name="orxonox/QuestGUI/Quest/Title">
-                    <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{0,30}}" />
-                    <Property Name="Text" Value="Quest Title"/>
+            <Window name="RightPanel" type="MenuWidgets/StaticText">
+                <Property name="Area" value="{{0.5,0},{0,30},{1,0},{1,0}}" />
+                <Window name="Title" type="MenuWidgets/StaticText">
+                    <Property name="Area" value="{{0,0},{0,0},{1,0},{0,30}}" />
+                    <Property name="Text" value="Quest Title" />
                 </Window>
-
-                <Window Type="MenuWidgets/ScrollablePane" Name="orxonox/QuestGUI/Quest/ScrollWrapper">
-                    <Property Name="UnifiedAreaRect" Value="{{0,0},{0,30},{1,-4},{1,-4}}" />
-
-                    <Window Type="MenuWidgets/StaticText" Name="orxonox/QuestGUI/Quest/Wrapper">
-                        <Property Name="UnifiedAreaRect" Value="{{0,5},{0,5},{1,-5},{0,0}}" />
-                        <Property Name="FrameEnabled" Value="false" />
-                        <Property Name="Alpha" Value="0" />
-
-                        <Window Type="MenuWidgets/StaticText" Name="orxonox/QuestGUI/Quest/Description">
-                            <Property Name="UnifiedAreaRect" Value="{{0,5},{0,0},{1,-5},{0,0}}" />
-                            <Property Name="InheritsAlpha" Value="False" />
-                            <Property Name="HorzFormatting" Value="WordWrapLeftAligned" />
-                            <Property Name="VertFormatting" Value="TopAligned" />
-                            <Property Name="FrameEnabled" Value="false" />
-                            <Property Name="Text" Value="Quest Description"/>
+                <Window name="ScrollWrapper" type="MenuWidgets/ScrollablePane">
+                    <Property name="Area" value="{{0,0},{0,30},{1,-4},{1,-4}}" />
+                    <Window name="Wrapper" type="MenuWidgets/StaticText">
+                        <Property name="Area" value="{{0,5},{0,5},{1,-5},{0,0}}" />
+                        <Property name="FrameEnabled" value="false" />
+                        <Property name="Alpha" value="0" />
+                        <Window name="Description" type="MenuWidgets/StaticText">
+                            <Property name="Area" value="{{0,5},{0,0},{1,-5},{0,0}}" />
+                            <Property name="InheritsAlpha" value="False" />
+                            <Property name="HorzFormatting" value="WordWrapLeftAligned" />
+                            <Property name="VertFormatting" value="TopAligned" />
+                            <Property name="FrameEnabled" value="false" />
+                            <Property name="Text" value="Quest Description" />
                         </Window>
-
-                        <Window Type="MenuWidgets/Listbox" Name="orxonox/QuestGUI/Quest/SubquestsList">
-                            <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-                            <Property Name="InheritsAlpha" Value="False" />
-                            <Event Name="ItemSelectionChanged" Function="QuestGUI.changeToSubquest_clicked"/>
+                        <Window name="SubquestsList" type="MenuWidgets/Listbox">
+                            <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+                            <Property name="InheritsAlpha" value="False" />
+                            <Event function="QuestGUI.changeToSubquest_clicked" name="ItemSelectionChanged" />
                         </Window>
-
-                        <Window Type="MenuWidgets/StaticText" Name="orxonox/QuestGUI/Quest/Hints">
-                            <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{0,0}}" />
-                            <Property Name="InheritsAlpha" Value="False" />
-                            <Property Name="VertFormatting" Value="TopAligned" />
-                            <Property Name="FrameEnabled" Value="false" />
-                            <Property Name="Text" Value="Hints:" />
+                        <Window name="Hints" type="MenuWidgets/StaticText">
+                            <Property name="Area" value="{{0,0},{0,0},{1,0},{0,0}}" />
+                            <Property name="InheritsAlpha" value="False" />
+                            <Property name="VertFormatting" value="TopAligned" />
+                            <Property name="FrameEnabled" value="false" />
+                            <Property name="Text" value="Hints:" />
                         </Window>
                     </Window>
Index: code/branches/ogre1.9/data/gui/layouts/SettingsMenu.layout
===================================================================
--- code/branches/ogre1.9/data/gui/layouts/SettingsMenu.layout	(revision 11128)
+++ code/branches/ogre1.9/data/gui/layouts/SettingsMenu.layout	(revision 11211)
@@ -1,63 +1,62 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <Window Type="MenuWidgets/StaticImage" Name="orxonox/SettingsMenu/Background" >
-        <Property Name="InheritsAlpha" Value="False" />
-        <Property Name="FrameEnabled" Value="False" />
-        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-        <Property Name="BackgroundEnabled" Value="False" />
-        <Window Type="MenuWidgets/StaticText" Name="orxonox/SettingsMenu/SettingsWindow" >
-            <Property Name="Text" Value="Settings" />
-            <Property Name="Alpha" Value="0.8" />
-            <Property Name="InheritsAlpha" Value="False" />
-            <Property Name="HorzFormatting" Value="HorzCentred" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="VertFormatting" Value="TopAligned" />
-            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
-            <Window Type="MenuWidgets/Button" Name="orxonox/SettingsMenu/GameplayButton" >
-                <Property Name="Text" Value="Gameplay" />
-                <Property Name="Disabled" Value="True" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.181818,0},{0.45,0},{0.363636,0}}" />
-                <Event Name="Clicked" Function="SettingsMenu.SettingsGameplayButton_clicked"/>
+<?xml version='1.0' encoding='utf-8'?>
+<GUILayout version="4">
+    <Window name="Background" type="MenuWidgets/StaticImage">
+        <Property name="InheritsAlpha" value="False" />
+        <Property name="FrameEnabled" value="False" />
+        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+        <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+        <Property name="BackgroundEnabled" value="False" />
+        <Window name="SettingsWindow" type="MenuWidgets/StaticText">
+            <Property name="Text" value="Settings" />
+            <Property name="Alpha" value="0.8" />
+            <Property name="InheritsAlpha" value="False" />
+            <Property name="HorzFormatting" value="HorzCentred" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="VertFormatting" value="TopAligned" />
+            <Property name="Area" value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
+            <Window name="GameplayButton" type="MenuWidgets/Button">
+                <Property name="Text" value="Gameplay" />
+                <Property name="Disabled" value="True" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="Area" value="{{0.05,0},{0.181818,0},{0.45,0},{0.363636,0}}" />
+                <Event function="SettingsMenu.SettingsGameplayButton_clicked" name="Clicked" />
             </Window>
-            <Window Type="MenuWidgets/Button" Name="orxonox/SettingsMenu/MultiplayerOptionsButton" >
-                <Property Name="Text" Value="Multiplayer options" />
-                <Property Name="Disabled" Value="True" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.454545,0},{0.45,0},{0.636363,0}}" />
-                <Event Name="Clicked" Function="SettingsMenu.SettingsMultiplayerOptionsButton_clicked"/>
+            <Window name="MultiplayerOptionsButton" type="MenuWidgets/Button">
+                <Property name="Text" value="Multiplayer options" />
+                <Property name="Disabled" value="True" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="Area" value="{{0.05,0},{0.454545,0},{0.45,0},{0.636363,0}}" />
+                <Event function="SettingsMenu.SettingsMultiplayerOptionsButton_clicked" name="Clicked" />
             </Window>
-            <Window Type="MenuWidgets/Button" Name="orxonox/SettingsMenu/ControlsButton" >
-                <Property Name="Text" Value="Controls" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.727272,0},{0.45,0},{0.909090,0}}" />
-                <Event Name="Clicked" Function="SettingsMenu.SettingsControlsButton_clicked"/>
+            <Window name="ControlsButton" type="MenuWidgets/Button">
+                <Property name="Text" value="Controls" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="Area" value="{{0.05,0},{0.727272,0},{0.45,0},{0.909090,0}}" />
+                <Event function="SettingsMenu.SettingsControlsButton_clicked" name="Clicked" />
             </Window>
-            <Window Type="MenuWidgets/Button" Name="orxonox/SettingsMenu/GraphicsButton" >
-                <Property Name="Text" Value="Graphics" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.55,0},{0.181818,0},{0.95,0},{0.363636,0}}" />
-                <Event Name="Clicked" Function="SettingsMenu.SettingsGraphicsButton_clicked"/>
+            <Window name="GraphicsButton" type="MenuWidgets/Button">
+                <Property name="Text" value="Graphics" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="Area" value="{{0.55,0},{0.181818,0},{0.95,0},{0.363636,0}}" />
+                <Event function="SettingsMenu.SettingsGraphicsButton_clicked" name="Clicked" />
             </Window>
-            <Window Type="MenuWidgets/Button" Name="orxonox/SettingsMenu/AudioButton" >
-                <Property Name="Text" Value="Audio" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.55,0},{0.454545,0},{0.95,0},{0.636363,0}}" />
-                <Event Name="Clicked" Function="SettingsMenu.SettingsAudioButton_clicked"/>
+            <Window name="AudioButton" type="MenuWidgets/Button">
+                <Property name="Text" value="Audio" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="Area" value="{{0.55,0},{0.454545,0},{0.95,0},{0.636363,0}}" />
+                <Event function="SettingsMenu.SettingsAudioButton_clicked" name="Clicked" />
             </Window>
-            <Window Type="MenuWidgets/Button" Name="orxonox/SettingsMenu/MiscellaneousButton" >
-                <Property Name="Text" Value="Miscellaneous" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.55,0},{0.727272,0},{0.95,0},{0.909090,0}}" />
-                <Event Name="Clicked" Function="SettingsMenu.SettingsMiscellaneousButton_clicked"/>
+            <Window name="MiscellaneousButton" type="MenuWidgets/Button">
+                <Property name="Text" value="Miscellaneous" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="Area" value="{{0.55,0},{0.727272,0},{0.95,0},{0.909090,0}}" />
+                <Event function="SettingsMenu.SettingsMiscellaneousButton_clicked" name="Clicked" />
             </Window>
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/SettingsMenu/SettingsBackButton" >
-            <Property Name="Text" Value="Back" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
-            <Event Name="Clicked" Function="SettingsMenu.SettingsBackButton_clicked"/>
+        <Window name="SettingsBackButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Back" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
+            <Event function="SettingsMenu.SettingsBackButton_clicked" name="Clicked" />
         </Window>
     </Window>
Index: code/branches/ogre1.9/data/gui/layouts/ShipSelectionMenu.layout
===================================================================
--- code/branches/ogre1.9/data/gui/layouts/ShipSelectionMenu.layout	(revision 11128)
+++ code/branches/ogre1.9/data/gui/layouts/ShipSelectionMenu.layout	(revision 11211)
@@ -1,63 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-
-    <Window Type="MenuWidgets/StaticImage" Name="orxonox/ShipSelectionBackground" >
-        <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,0},{1,0}}" />
-        <Property Name="BackgroundEnabled" Value="False" />
-        <!-- -->
-        <Window Type="MenuWidgets/StaticText" Name="orxonox/ShipSelectionWindow" >
-            <Property Name="Text" Value="ShipSelection" />
-            <Property Name="Alpha" Value="0.8" />
-            <Property Name="InheritsAlpha" Value="False" />
-            <Property Name="HorzFormatting" Value="HorzCentred" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="VertFormatting" Value="TopAligned" />
-            <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.15,0},{0.8,0},{0.7,0}}" />
-            <Window Type="MenuWidgets/TabControl" Name="orxonox/ShipSelectionTabControl" >
-                <Property Name="TabHeight" Value="{0,26.4388}" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="TabPanePosition" Value="Top" />
-                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.1,0},{0.95,0},{0.925,0}}" />
-
+<?xml version='1.0' encoding='utf-8'?>
+<GUILayout version="4">
+    <Window name="ShipSelectionBackground" type="MenuWidgets/StaticImage">
+        <Property name="FrameEnabled" value="False" />
+        <Property name="InheritsAlpha" value="False" />
+        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+        <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+        <Property name="BackgroundEnabled" value="False" />
+        <Window name="ShipSelectionWindow" type="MenuWidgets/StaticText">
+            <Property name="Text" value="ShipSelection" />
+            <Property name="Alpha" value="0.8" />
+            <Property name="InheritsAlpha" value="False" />
+            <Property name="HorzFormatting" value="HorzCentred" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="VertFormatting" value="TopAligned" />
+            <Property name="Area" value="{{0.2,0},{0.15,0},{0.8,0},{0.7,0}}" />
+            <Window name="ShipSelectionTabControl" type="MenuWidgets/TabControl">
+                <Property name="TabHeight" value="{0,26.4388}" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="TabPanePosition" value="Top" />
+                <Property name="Area" value="{{0.05,0},{0.1,0},{0.95,0},{0.925,0}}" />
             </Window>
-
-            <!-- TODO: Ship Description and Image
-            <Window Type="MenuWidgets/StaticImage" Name="orxonox/ShipSelectionShipImage" >
-                <Property Name="AlwaysOnTop" Value="True" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.55,0},{0.25,0},{0.9,0},{0.675,0}}" />
-            </Window>
-            <Window Type="MenuWidgets/StaticText" Name="orxonox/ShipSelectionLevelDescription" >
-                <Property Name="AlwaysOnTop" Value="True" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="VertScrollbar" Value="True" />
-                <Property Name="HorzScrollbar" Value="True" />
-                <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.725,0},{0.9,0},{0.875,0}}" />
-            </Window>-->
-
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/ShipSelectionStartButton" >
-            <Property Name="Text" Value="Start" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.725,0},{0.4,0},{0.775,0}}" />
-            <Event Name="Clicked" Function="ShipSelectionMenu.ShipSelectionStartButton_clicked"/>
+        <Window name="ShipSelectionStartButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Start" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.25,0},{0.725,0},{0.4,0},{0.775,0}}" />
+            <Event function="ShipSelectionMenu.ShipSelectionStartButton_clicked" name="Clicked" />
         </Window>
-        <!-- TODO: set ship properties
-        <Window Type="MenuWidgets/Button" Name="orxonox/ShipSelectionConfigButton" >
-            <Property Name="Text" Value="Configure" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.425,0},{0.725,0},{0.575,0},{0.775,0}}" />
-            <Property Name="Disabled" Value="True" />
-            <Event Name="Clicked" Function="ShipSelectionMenu.ShipSelectionConfigButton_clicked"/>
-        </Window> -->
-        <Window Type="MenuWidgets/Button" Name="orxonox/ShipSelectionBackButton" >
-            <Property Name="Text" Value="Back" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.6,0},{0.725,0},{0.75,0},{0.775,0}}" />
-            <Event Name="Clicked" Function="ShipSelectionMenu.ShipSelectionBackButton_clicked"/>
+        <Window name="ShipSelectionBackButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Back" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.6,0},{0.725,0},{0.75,0},{0.775,0}}" />
+            <Event function="ShipSelectionMenu.ShipSelectionBackButton_clicked" name="Clicked" />
         </Window>
     </Window>
Index: code/branches/ogre1.9/data/gui/layouts/SingleplayerConfigMenu.layout
===================================================================
--- code/branches/ogre1.9/data/gui/layouts/SingleplayerConfigMenu.layout	(revision 11128)
+++ code/branches/ogre1.9/data/gui/layouts/SingleplayerConfigMenu.layout	(revision 11211)
@@ -1,50 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <Window Type="MenuWidgets/StaticImage" Name="orxonox/SingleplayerConfigMenu/Background" >
-        <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,0},{1,0}}" />
-        <Property Name="BackgroundEnabled" Value="False" />
-        <Window Type="MenuWidgets/StaticText" Name="orxonox/SingleplayerConfigMenu/ConfigWindow" >
-            <Property Name="Text" Value="Config" />
-            <Property Name="Alpha" Value="0.8" />
-            <Property Name="InheritsAlpha" Value="False" />
-            <Property Name="HorzFormatting" Value="HorzCentred" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="VertFormatting" Value="TopAligned" />
-            <Property Name="UnifiedAreaRect" Value="{{0.15,0},{0.2125,0},{0.85,0},{0.6375,0}}" />
-            <Window Type="MenuWidgets/StaticText" Name="orxonox/SingleplayerConfigMenu/Wrapper" >
-                <Property Name="TextColours" Value="FF4444FF" />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="HorzFormatting" Value="HorzCentred" />
-                <Property Name="VertFormatting" Value="TopAligned" />
-                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.92,0}}" />
-                <Window Type="MenuWidgets/ScrollablePane" Name="orxonox/SingleplayerConfigMenu/MiscConfigPane" >
-                    <Property Name="ContentArea" Value="l:0 t:0 r:0 b:0" />
-                    <Property Name="HorzStepSize" Value="0.005" />
-                    <Property Name="VertStepSize" Value="0.005" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="HorzOverlapSize" Value="0.01" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.005,0},{0.01,0},{0.995,0},{0.99,0}}" />
-                    <Property Name="VertOverlapSize" Value="0.01" />
-                    <Property Name="HorzScrollPosition" Value="0" />
-                    <Property Name="VertScrollPosition" Value="0" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUILayout version="4">
+    <Window name="Background" type="MenuWidgets/StaticImage">
+        <Property name="FrameEnabled" value="False" />
+        <Property name="InheritsAlpha" value="False" />
+        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+        <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+        <Property name="BackgroundEnabled" value="False" />
+        <Window name="ConfigWindow" type="MenuWidgets/StaticText">
+            <Property name="Text" value="Config" />
+            <Property name="Alpha" value="0.8" />
+            <Property name="InheritsAlpha" value="False" />
+            <Property name="HorzFormatting" value="HorzCentred" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="VertFormatting" value="TopAligned" />
+            <Property name="Area" value="{{0.15,0},{0.2125,0},{0.85,0},{0.6375,0}}" />
+            <Window name="Wrapper" type="MenuWidgets/StaticText">
+                <Property name="TextColours" value="FF4444FF" />
+                <Property name="InheritsAlpha" value="False" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="HorzFormatting" value="HorzCentred" />
+                <Property name="VertFormatting" value="TopAligned" />
+                <Property name="Area" value="{{0.05,0},{0.15,0},{0.95,0},{0.92,0}}" />
+                <Window name="MiscConfigPane" type="MenuWidgets/ScrollablePane">
+                    <Property name="ContentArea" value="l:0 t:0 r:0 b:0" />
+                    <Property name="HorzStepSize" value="0.005" />
+                    <Property name="VertStepSize" value="0.005" />
+                    <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                    <Property name="HorzOverlapSize" value="0.01" />
+                    <Property name="Area" value="{{0.005,0},{0.01,0},{0.995,0},{0.99,0}}" />
+                    <Property name="VertOverlapSize" value="0.01" />
+                    <Property name="HorzScrollPosition" value="0" />
+                    <Property name="VertScrollPosition" value="0" />
                 </Window>
             </Window>
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/SingleplayerConfigMenu/CancelButton" >
-            <Property Name="Text" Value="Cancel" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.725,0},{0.4,0},{0.775,0}}" />
-            <Event Name="Clicked" Function="SingleplayerConfigMenu.SingleplayerConfigCancelButton_clicked"/>
+        <Window name="CancelButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Cancel" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.25,0},{0.725,0},{0.4,0},{0.775,0}}" />
+            <Event function="SingleplayerConfigMenu.SingleplayerConfigCancelButton_clicked" name="Clicked" />
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/SingleplayerConfigMenu/OKButton" >
-            <Property Name="Text" Value="OK" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.6,0},{0.725,0},{0.75,0},{0.775,0}}" />
-            <Event Name="Clicked" Function="SingleplayerConfigMenu.SingleplayerConfigOKButton_clicked"/>
+        <Window name="OKButton" type="MenuWidgets/Button">
+            <Property name="Text" value="OK" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.6,0},{0.725,0},{0.75,0},{0.775,0}}" />
+            <Event function="SingleplayerConfigMenu.SingleplayerConfigOKButton_clicked" name="Clicked" />
         </Window>
     </Window>
Index: code/branches/ogre1.9/data/gui/layouts/SingleplayerMenu.layout
===================================================================
--- code/branches/ogre1.9/data/gui/layouts/SingleplayerMenu.layout	(revision 11128)
+++ code/branches/ogre1.9/data/gui/layouts/SingleplayerMenu.layout	(revision 11211)
@@ -1,63 +1,62 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <Window Type="MenuWidgets/StaticImage" Name="orxonox/SingleplayerBackground" >
-        <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,0},{1,0}}" />
-        <Property Name="BackgroundEnabled" Value="False" />
-        <Window Type="MenuWidgets/StaticText" Name="orxonox/SingleplayerWindow" >
-            <Property Name="Text" Value="Singleplayer" />
-            <Property Name="Alpha" Value="0.8" />
-            <Property Name="InheritsAlpha" Value="False" />
-            <Property Name="HorzFormatting" Value="HorzCentred" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="VertFormatting" Value="TopAligned" />
-            <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.15,0},{0.8,0},{0.7,0}}" />
-            <Window Type="MenuWidgets/TabControl" Name="orxonox/SingleplayerTabControl" >
-                <Property Name="TabHeight" Value="{0,26.4388}" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="TabPanePosition" Value="Top" />
-                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.1,0},{0.95,0},{0.925,0}}" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUILayout version="4">
+    <Window name="SingleplayerBackground" type="MenuWidgets/StaticImage">
+        <Property name="FrameEnabled" value="False" />
+        <Property name="InheritsAlpha" value="False" />
+        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+        <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+        <Property name="BackgroundEnabled" value="False" />
+        <Window name="SingleplayerWindow" type="MenuWidgets/StaticText">
+            <Property name="Text" value="Singleplayer" />
+            <Property name="Alpha" value="0.8" />
+            <Property name="InheritsAlpha" value="False" />
+            <Property name="HorzFormatting" value="HorzCentred" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="VertFormatting" value="TopAligned" />
+            <Property name="Area" value="{{0.2,0},{0.15,0},{0.8,0},{0.7,0}}" />
+            <Window name="SingleplayerTabControl" type="MenuWidgets/TabControl">
+                <Property name="TabHeight" value="{0,26.4388}" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="TabPanePosition" value="Top" />
+                <Property name="Area" value="{{0.05,0},{0.1,0},{0.95,0},{0.925,0}}" />
             </Window>
-            <Window Type="MenuWidgets/StaticImage" Name="orxonox/SingleplayerLevelImage" >
-                <Property Name="AlwaysOnTop" Value="True" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.55,0},{0.25,0},{0.9,0},{0.675,0}}" />
+            <Window name="SingleplayerLevelImage" type="MenuWidgets/StaticImage">
+                <Property name="AlwaysOnTop" value="True" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="Area" value="{{0.55,0},{0.25,0},{0.9,0},{0.675,0}}" />
             </Window>
-            <Window Type="MenuWidgets/StaticText" Name="orxonox/SingleplayerLevelDescription" >
-                <Property Name="AlwaysOnTop" Value="True" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="VertScrollbar" Value="True" />
-                <Property Name="HorzScrollbar" Value="False" />
-                <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.725,0},{0.9,0},{0.875,0}}" />
-		<Property Name="HorzFormatting" Value="WordWrapLeftAligned" />
+            <Window name="SingleplayerLevelDescription" type="MenuWidgets/StaticText">
+                <Property name="AlwaysOnTop" value="True" />
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="VertScrollbar" value="True" />
+                <Property name="HorzScrollbar" value="False" />
+                <Property name="Area" value="{{0.1,0},{0.725,0},{0.9,0},{0.875,0}}" />
+                <Property name="HorzFormatting" value="WordWrapLeftAligned" />
             </Window>
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/SingleplayerStartButton" >
-            <Property Name="Text" Value="Start" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.725,0},{0.4,0},{0.775,0}}" />
-            <Event Name="Clicked" Function="SingleplayerMenu.SingleplayerStartButton_clicked"/>
+        <Window name="SingleplayerStartButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Start" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.25,0},{0.725,0},{0.4,0},{0.775,0}}" />
+            <Event function="SingleplayerMenu.SingleplayerStartButton_clicked" name="Clicked" />
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/SingleplayerConfigButton" >
-            <Property Name="Text" Value="Configure" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.425,0},{0.725,0},{0.575,0},{0.775,0}}" />
-            <Property Name="Disabled" Value="True" />
-            <Event Name="Clicked" Function="SingleplayerMenu.SingleplayerConfigButton_clicked"/>
+        <Window name="SingleplayerConfigButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Configure" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.425,0},{0.725,0},{0.575,0},{0.775,0}}" />
+            <Property name="Disabled" value="True" />
+            <Event function="SingleplayerMenu.SingleplayerConfigButton_clicked" name="Clicked" />
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/SingleplayerBackButton" >
-            <Property Name="Text" Value="Back" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.6,0},{0.725,0},{0.75,0},{0.775,0}}" />
-            <Event Name="Clicked" Function="SingleplayerMenu.SingleplayerBackButton_clicked"/>
+        <Window name="SingleplayerBackButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Back" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.6,0},{0.725,0},{0.75,0},{0.775,0}}" />
+            <Event function="SingleplayerMenu.SingleplayerBackButton_clicked" name="Clicked" />
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/CampaignButton" >
-            <Property Name="Text" Value="Campaign" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.8,0},{0.6,0},{0.85,0}}" />
-            <Event Name="Clicked" Function="SingleplayerMenu.CampaignButton_clicked"/>
+        <Window name="CampaignButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Campaign" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.4,0},{0.8,0},{0.6,0},{0.85,0}}" />
+            <Event function="SingleplayerMenu.CampaignButton_clicked" name="Clicked" />
         </Window>
     </Window>
Index: code/branches/ogre1.9/data/gui/layouts/UndockingDialog.layout
===================================================================
--- code/branches/ogre1.9/data/gui/layouts/UndockingDialog.layout	(revision 11128)
+++ code/branches/ogre1.9/data/gui/layouts/UndockingDialog.layout	(revision 11211)
@@ -1,35 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <Window Type="MenuWidgets/StaticImage" Name="orxonox/Undocking/Background" >
-        <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,0},{1,0}}" />
-        <Property Name="BackgroundEnabled" Value="False" />
-        <Window Type="MenuWidgets/StaticText" Name="orxonox/Undocking/Title" >
-            <Property Name="Text" Value="Undocking" />
-            <Property Name="Alpha" Value="0.8" />
-            <Property Name="InheritsAlpha" Value="False" />
-            <Property Name="HorzFormatting" Value="HorzCentred" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="VertFormatting" Value="TopAligned" />
-            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.2875,0},{0.75,0},{0.7,0}}" />
-            <Window Type="MenuWidgets/Listbox" Name="orxonox/Undocking/Docks" >
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.85,0}}" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUILayout version="4">
+    <Window name="Background" type="MenuWidgets/StaticImage">
+        <Property name="FrameEnabled" value="False" />
+        <Property name="InheritsAlpha" value="False" />
+        <Property name="MaxSize" value="{{1,0},{1,0}}" />
+        <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+        <Property name="BackgroundEnabled" value="False" />
+        <Window name="Title" type="MenuWidgets/StaticText">
+            <Property name="Text" value="Undocking" />
+            <Property name="Alpha" value="0.8" />
+            <Property name="InheritsAlpha" value="False" />
+            <Property name="HorzFormatting" value="HorzCentred" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="VertFormatting" value="TopAligned" />
+            <Property name="Area" value="{{0.25,0},{0.2875,0},{0.75,0},{0.7,0}}" />
+            <Window name="Docks" type="MenuWidgets/Listbox">
+                <Property name="MaxSize" value="{{1,0},{1,0}}" />
+                <Property name="Area" value="{{0.05,0},{0.15,0},{0.95,0},{0.85,0}}" />
             </Window>
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/Undocking/DockButton" >
-            <Property Name="Text" Value="Undock" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.2875,0},{0.725,0},{0.4875,0},{0.775,0}}" />
-            <Event Name="Clicked" Function="UndockingDialog.undockButton_clicked"/>
+        <Window name="DockButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Undock" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.2875,0},{0.725,0},{0.4875,0},{0.775,0}}" />
+            <Event function="UndockingDialog.undockButton_clicked" name="Clicked" />
         </Window>
-        <Window Type="MenuWidgets/Button" Name="orxonox/Undocking/CancelButton" >
-            <Property Name="Text" Value="Cancel" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.5125,0},{0.725,0},{0.7125,0},{0.775,0}}" />
-            <Event Name="Clicked" Function="UndockingDialog.cancelButton_clicked"/>
+        <Window name="CancelButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Cancel" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.5125,0},{0.725,0},{0.7125,0},{0.775,0}}" />
+            <Event function="UndockingDialog.cancelButton_clicked" name="Clicked" />
         </Window>
     </Window>
Index: code/branches/ogre1.9/data/gui/schemes/GUIScheme.xsd
===================================================================
--- code/branches/ogre1.9/data/gui/schemes/GUIScheme.xsd	(revision 11128)
+++ code/branches/ogre1.9/data/gui/schemes/GUIScheme.xsd	(revision 11211)
@@ -1,54 +1,56 @@
 <?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:element name="GUIScheme" type="SchemeType" />
+	<xsd:complexType name="SchemeType">
         <xsd:choice minOccurs="0" maxOccurs="unbounded">
-            <xsd:element name="Imageset" type="NamedDataType" />
+			<xsd:element name="Imageset" type="NamedDataType" />
             <xsd:element name="ImagesetFromImage" type="NamedDataType" />
-            <xsd:element name="Font" 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="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:choice>
+		<xsd:attribute name="name" type="xsd:string" use="required" />
+		<xsd:attribute name="version" type="xsd:nonNegativeInteger" use="optional" default="0" />
+	</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="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="NamedDataType">
+		<xsd:attribute name="name" type="xsd:string" use="optional" default="" />
+		<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: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:attribute name="renderEffect" type="xsd:string" use="optional" default="" />
     </xsd:complexType>
 </xsd:schema>
Index: code/branches/ogre1.9/data/gui/schemes/OrxonoxGUIScheme.scheme
===================================================================
--- code/branches/ogre1.9/data/gui/schemes/OrxonoxGUIScheme.scheme	(revision 11128)
+++ code/branches/ogre1.9/data/gui/schemes/OrxonoxGUIScheme.scheme	(revision 11211)
@@ -1,9 +1,9 @@
-<?xml version="1.0" ?>
-<GUIScheme Name="OrxonoxGUI">
-    <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"  />
-    <Font Name="Monofur-10"     Filename="Monofur-10.font" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUIScheme name="OrxonoxGUI" version="5">
+    <Imageset filename="MainMenuBackground.imageset" name="MainMenuBackground" />
+    <Imageset filename="PickupInventory.imageset" name="PickupInventory" />
+    <Font filename="bluehighway-12.font" name="BlueHighway-12" />
+    <Font filename="bluehighway-10.font" name="BlueHighway-10" />
+    <Font filename="bluehighway-8.font" name="BlueHighway-8" />
+    <Font filename="Monofur-10.font" name="Monofur-10" />
 </GUIScheme>
Index: code/branches/ogre1.9/data/gui/schemes/OrxonoxHUDWidgets.scheme
===================================================================
--- code/branches/ogre1.9/data/gui/schemes/OrxonoxHUDWidgets.scheme	(revision 11128)
+++ code/branches/ogre1.9/data/gui/schemes/OrxonoxHUDWidgets.scheme	(revision 11211)
@@ -1,42 +1,42 @@
-<?xml version="1.0" ?>
-<GUIScheme Name="OrxonoxHUDWidgets">
-    <WindowAlias Alias="HUDWidgets/StaticImage"              Target="OrxonoxLook/StaticImage" />
-    <WindowAlias Alias="HUDWidgets/StaticText"               Target="OrxonoxLook/StaticText" />
-    <WindowAlias Alias="HUDWidgets/TabButtonPane"            Target="OrxonoxLook/TabButtonPane" />
-    <WindowAlias Alias="HUDWidgets/TabContentPane"           Target="OrxonoxLook/TabContentPane" />
-    <WindowAlias Alias="HUDWidgets/Checkbox"                 Target="OrxonoxLook/Checkbox" />
-    <WindowAlias Alias="HUDWidgets/Combobox"                 Target="OrxonoxLook/Combobox" />
-    <WindowAlias Alias="HUDWidgets/ComboDropList"            Target="OrxonoxLook/ComboDropList" />
-    <WindowAlias Alias="HUDWidgets/ComboEditbox"             Target="OrxonoxLook/ComboEditbox" />
-    <WindowAlias Alias="HUDWidgets/Editbox"                  Target="OrxonoxLook/Editbox" />
-    <WindowAlias Alias="HUDWidgets/FrameWindow"              Target="OrxonoxLook/FrameWindow" />
-    <WindowAlias Alias="HUDWidgets/GroupBox"                 Target="OrxonoxLook/GroupBox" />
-    <WindowAlias Alias="HUDWidgets/ItemListbox"              Target="OrxonoxLook/ItemListbox" />
-    <WindowAlias Alias="HUDWidgets/ListboxItem"              Target="OrxonoxLook/ListboxItem" />
-    <WindowAlias Alias="HUDWidgets/Listbox"                  Target="OrxonoxLook/Listbox" />
-    <WindowAlias Alias="HUDWidgets/ListHeader"               Target="OrxonoxLook/ListHeader" />
-    <WindowAlias Alias="HUDWidgets/ListHeaderSegment"        Target="OrxonoxLook/ListHeaderSegment" />
-    <WindowAlias Alias="HUDWidgets/MultiLineEditbox"         Target="OrxonoxLook/MultiLineEditbox" />
-    <WindowAlias Alias="HUDWidgets/Menubar"                  Target="OrxonoxLook/Menubar" />
-    <WindowAlias Alias="HUDWidgets/MenuItem"                 Target="OrxonoxLook/MenuItem" />
-    <WindowAlias Alias="HUDWidgets/MultiColumnList"          Target="OrxonoxLook/MultiColumnList" />
-    <WindowAlias Alias="HUDWidgets/PopupMenu"                Target="OrxonoxLook/PopupMenu" />
-    <WindowAlias Alias="HUDWidgets/ProgressBar"              Target="OrxonoxLook/ProgressBar" />
-    <WindowAlias Alias="HUDWidgets/Button"                   Target="OrxonoxLook/Button" />
-    <WindowAlias Alias="HUDWidgets/ImageButton"              Target="OrxonoxLook/ImageButton" />
-    <WindowAlias Alias="HUDWidgets/RadioButton"              Target="OrxonoxLook/RadioButton" />
-    <WindowAlias Alias="HUDWidgets/SystemButton"             Target="OrxonoxLook/SystemButton" />
-    <WindowAlias Alias="HUDWidgets/ScrollablePane"           Target="OrxonoxLook/ScrollablePane" />
-    <WindowAlias Alias="HUDWidgets/HorizontalScrollbar"      Target="OrxonoxLook/HorizontalScrollbar" />
-    <WindowAlias Alias="HUDWidgets/VerticalScrollbar"        Target="OrxonoxLook/VerticalScrollbar" />
-    <WindowAlias Alias="HUDWidgets/Slider"                   Target="OrxonoxLook/Slider" />
-    <WindowAlias Alias="HUDWidgets/Spinner"                  Target="OrxonoxLook/Spinner" />
-    <WindowAlias Alias="HUDWidgets/TabButton"                Target="OrxonoxLook/TabButton" />
-    <WindowAlias Alias="HUDWidgets/TabControl"               Target="OrxonoxLook/TabControl" />
-    <WindowAlias Alias="HUDWidgets/HorizontalScrollbarThumb" Target="OrxonoxLook/HorizontalScrollbarThumb" />
-    <WindowAlias Alias="HUDWidgets/SliderThumb"              Target="OrxonoxLook/SliderThumb" />
-    <WindowAlias Alias="HUDWidgets/VerticalScrollbarThumb"   Target="OrxonoxLook/VerticalScrollbarThumb" />
-    <WindowAlias Alias="HUDWidgets/Titlebar"                 Target="OrxonoxLook/Titlebar" />
-    <WindowAlias Alias="HUDWidgets/Tooltip"                  Target="OrxonoxLook/Tooltip" />
-    <WindowAlias Alias="HUDWidgets/Tree"                     Target="OrxonoxLook/Tree" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUIScheme name="OrxonoxHUDWidgets" version="5">
+    <WindowAlias alias="HUDWidgets/StaticImage" target="OrxonoxLook/StaticImage" />
+    <WindowAlias alias="HUDWidgets/StaticText" target="OrxonoxLook/StaticText" />
+    <WindowAlias alias="HUDWidgets/TabButtonPane" target="OrxonoxLook/TabButtonPane" />
+    <WindowAlias alias="HUDWidgets/TabContentPane" target="OrxonoxLook/TabContentPane" />
+    <WindowAlias alias="HUDWidgets/Checkbox" target="OrxonoxLook/Checkbox" />
+    <WindowAlias alias="HUDWidgets/Combobox" target="OrxonoxLook/Combobox" />
+    <WindowAlias alias="HUDWidgets/ComboDropList" target="OrxonoxLook/ComboDropList" />
+    <WindowAlias alias="HUDWidgets/ComboEditbox" target="OrxonoxLook/ComboEditbox" />
+    <WindowAlias alias="HUDWidgets/Editbox" target="OrxonoxLook/Editbox" />
+    <WindowAlias alias="HUDWidgets/FrameWindow" target="OrxonoxLook/FrameWindow" />
+    <WindowAlias alias="HUDWidgets/GroupBox" target="OrxonoxLook/GroupBox" />
+    <WindowAlias alias="HUDWidgets/ItemListbox" target="OrxonoxLook/ItemListbox" />
+    <WindowAlias alias="HUDWidgets/ListboxItem" target="OrxonoxLook/ListboxItem" />
+    <WindowAlias alias="HUDWidgets/Listbox" target="OrxonoxLook/Listbox" />
+    <WindowAlias alias="HUDWidgets/ListHeader" target="OrxonoxLook/ListHeader" />
+    <WindowAlias alias="HUDWidgets/ListHeaderSegment" target="OrxonoxLook/ListHeaderSegment" />
+    <WindowAlias alias="HUDWidgets/MultiLineEditbox" target="OrxonoxLook/MultiLineEditbox" />
+    <WindowAlias alias="HUDWidgets/Menubar" target="OrxonoxLook/Menubar" />
+    <WindowAlias alias="HUDWidgets/MenuItem" target="OrxonoxLook/MenuItem" />
+    <WindowAlias alias="HUDWidgets/MultiColumnList" target="OrxonoxLook/MultiColumnList" />
+    <WindowAlias alias="HUDWidgets/PopupMenu" target="OrxonoxLook/PopupMenu" />
+    <WindowAlias alias="HUDWidgets/ProgressBar" target="OrxonoxLook/ProgressBar" />
+    <WindowAlias alias="HUDWidgets/Button" target="OrxonoxLook/Button" />
+    <WindowAlias alias="HUDWidgets/ImageButton" target="OrxonoxLook/ImageButton" />
+    <WindowAlias alias="HUDWidgets/RadioButton" target="OrxonoxLook/RadioButton" />
+    <WindowAlias alias="HUDWidgets/SystemButton" target="OrxonoxLook/SystemButton" />
+    <WindowAlias alias="HUDWidgets/ScrollablePane" target="OrxonoxLook/ScrollablePane" />
+    <WindowAlias alias="HUDWidgets/HorizontalScrollbar" target="OrxonoxLook/HorizontalScrollbar" />
+    <WindowAlias alias="HUDWidgets/VerticalScrollbar" target="OrxonoxLook/VerticalScrollbar" />
+    <WindowAlias alias="HUDWidgets/Slider" target="OrxonoxLook/Slider" />
+    <WindowAlias alias="HUDWidgets/Spinner" target="OrxonoxLook/Spinner" />
+    <WindowAlias alias="HUDWidgets/TabButton" target="OrxonoxLook/TabButton" />
+    <WindowAlias alias="HUDWidgets/TabControl" target="OrxonoxLook/TabControl" />
+    <WindowAlias alias="HUDWidgets/HorizontalScrollbarThumb" target="OrxonoxLook/HorizontalScrollbarThumb" />
+    <WindowAlias alias="HUDWidgets/SliderThumb" target="OrxonoxLook/SliderThumb" />
+    <WindowAlias alias="HUDWidgets/VerticalScrollbarThumb" target="OrxonoxLook/VerticalScrollbarThumb" />
+    <WindowAlias alias="HUDWidgets/Titlebar" target="OrxonoxLook/Titlebar" />
+    <WindowAlias alias="HUDWidgets/Tooltip" target="OrxonoxLook/Tooltip" />
+    <WindowAlias alias="HUDWidgets/Tree" target="OrxonoxLook/Tree" />
 </GUIScheme>
Index: code/branches/ogre1.9/data/gui/schemes/OrxonoxLook.scheme
===================================================================
--- code/branches/ogre1.9/data/gui/schemes/OrxonoxLook.scheme	(revision 11128)
+++ code/branches/ogre1.9/data/gui/schemes/OrxonoxLook.scheme	(revision 11211)
@@ -1,53 +1,49 @@
-<?xml version="1.0" ?>
-<GUIScheme Name="OrxonoxLook">
-    <Imageset Name="OrxonoxLook" Filename="OrxonoxLook.imageset" />
-    <LookNFeel Filename="OrxonoxLook.looknfeel" />
-    <WindowRendererSet Filename="CEGUIFalagardWRBase" />
-
-    <!-- Standard widgets -->
-    <FalagardMapping WindowType="OrxonoxLook/StaticImage"              TargetType="DefaultWindow"           Renderer="Falagard/StaticImage"       LookNFeel="OrxonoxLook/StaticImage" />
-    <FalagardMapping WindowType="OrxonoxLook/StaticText"               TargetType="DefaultWindow"           Renderer="Falagard/StaticText"        LookNFeel="OrxonoxLook/StaticText" />
-    <FalagardMapping WindowType="OrxonoxLook/TabButtonPane"            TargetType="DefaultWindow"           Renderer="Falagard/Default"           LookNFeel="OrxonoxLook/TabButtonPane" />
-    <FalagardMapping WindowType="OrxonoxLook/TabContentPane"           TargetType="DefaultWindow"           Renderer="Falagard/Default"           LookNFeel="OrxonoxLook/TabContentPane" />
-    <FalagardMapping WindowType="OrxonoxLook/Checkbox"                 TargetType="CEGUI/Checkbox"          Renderer="Falagard/ToggleButton"      LookNFeel="OrxonoxLook/Checkbox" />
-    <FalagardMapping WindowType="OrxonoxLook/Combobox"                 TargetType="CEGUI/Combobox"          Renderer="Falagard/Default"           LookNFeel="OrxonoxLook/Combobox" />
-    <FalagardMapping WindowType="OrxonoxLook/ComboDropList"            TargetType="CEGUI/ComboDropList"     Renderer="Falagard/Listbox"           LookNFeel="OrxonoxLook/ComboDropList" />
-    <FalagardMapping WindowType="OrxonoxLook/ComboEditbox"             TargetType="CEGUI/Editbox"           Renderer="Falagard/Editbox"           LookNFeel="OrxonoxLook/ComboEditbox" />
-    <FalagardMapping WindowType="OrxonoxLook/Editbox"                  TargetType="CEGUI/Editbox"           Renderer="Falagard/Editbox"           LookNFeel="OrxonoxLook/Editbox" />
-    <FalagardMapping WindowType="OrxonoxLook/FrameWindow"              TargetType="CEGUI/FrameWindow"       Renderer="Falagard/FrameWindow"       LookNFeel="OrxonoxLook/FrameWindow" />
-    <FalagardMapping WindowType="OrxonoxLook/GroupBox"                 TargetType="CEGUI/GroupBox"          Renderer="Falagard/Default"           LookNFeel="OrxonoxLook/GroupBox" />
-    <FalagardMapping WindowType="OrxonoxLook/ItemListbox"              TargetType="CEGUI/ItemListbox"       Renderer="Falagard/ItemListbox"       LookNFeel="OrxonoxLook/ItemListbox" />
-    <FalagardMapping WindowType="OrxonoxLook/ListboxItem"              TargetType="CEGUI/ItemEntry"         Renderer="Falagard/ItemEntry"         LookNFeel="OrxonoxLook/ListboxItem" />
-    <FalagardMapping WindowType="OrxonoxLook/Listbox"                  TargetType="CEGUI/Listbox"           Renderer="Falagard/Listbox"           LookNFeel="OrxonoxLook/Listbox" />
-    <FalagardMapping WindowType="OrxonoxLook/ListHeader"               TargetType="CEGUI/ListHeader"        Renderer="Falagard/ListHeader"        LookNFeel="OrxonoxLook/ListHeader" />
-    <FalagardMapping WindowType="OrxonoxLook/ListHeaderSegment"        TargetType="CEGUI/ListHeaderSegment" Renderer="Falagard/ListHeaderSegment" LookNFeel="OrxonoxLook/ListHeaderSegment" />
-    <FalagardMapping WindowType="OrxonoxLook/MultiLineEditbox"         TargetType="CEGUI/MultiLineEditbox"  Renderer="Falagard/MultiLineEditbox"  LookNFeel="OrxonoxLook/MultiLineEditbox" />
-    <FalagardMapping WindowType="OrxonoxLook/Menubar"                  TargetType="CEGUI/Menubar"           Renderer="Falagard/Menubar"           LookNFeel="OrxonoxLook/Menubar" />
-    <FalagardMapping WindowType="OrxonoxLook/MenuItem"                 TargetType="CEGUI/MenuItem"          Renderer="Falagard/MenuItem"          LookNFeel="OrxonoxLook/MenuItem" />
-    <FalagardMapping WindowType="OrxonoxLook/MultiColumnList"          TargetType="CEGUI/MultiColumnList"   Renderer="Falagard/MultiColumnList"   LookNFeel="OrxonoxLook/MultiColumnList" />
-    <FalagardMapping WindowType="OrxonoxLook/PopupMenu"                TargetType="CEGUI/PopupMenu"         Renderer="Falagard/PopupMenu"         LookNFeel="OrxonoxLook/PopupMenu" />
-    <FalagardMapping WindowType="OrxonoxLook/ProgressBar"              TargetType="CEGUI/ProgressBar"       Renderer="Falagard/ProgressBar"       LookNFeel="OrxonoxLook/ProgressBar" />
-    <FalagardMapping WindowType="OrxonoxLook/Button"                   TargetType="CEGUI/PushButton"        Renderer="Falagard/Button"            LookNFeel="OrxonoxLook/Button" />
-    <FalagardMapping WindowType="OrxonoxLook/ImageButton"              TargetType="CEGUI/PushButton"        Renderer="Falagard/Button"            LookNFeel="OrxonoxLook/ImageButton" />
-    <FalagardMapping WindowType="OrxonoxLook/RadioButton"              TargetType="CEGUI/RadioButton"       Renderer="Falagard/ToggleButton"      LookNFeel="OrxonoxLook/RadioButton" />
-    <FalagardMapping WindowType="OrxonoxLook/SystemButton"             TargetType="CEGUI/PushButton"        Renderer="Falagard/SystemButton"      LookNFeel="OrxonoxLook/Button" />
-    <FalagardMapping WindowType="OrxonoxLook/ScrollablePane"           TargetType="CEGUI/ScrollablePane"    Renderer="Falagard/ScrollablePane"    LookNFeel="OrxonoxLook/ScrollablePane" />
-    <FalagardMapping WindowType="OrxonoxLook/HorizontalScrollbar"      TargetType="CEGUI/Scrollbar"         Renderer="Falagard/Scrollbar"         LookNFeel="OrxonoxLook/HorizontalScrollbar" />
-    <FalagardMapping WindowType="OrxonoxLook/VerticalScrollbar"        TargetType="CEGUI/Scrollbar"         Renderer="Falagard/Scrollbar"         LookNFeel="OrxonoxLook/VerticalScrollbar" />
-    <FalagardMapping WindowType="OrxonoxLook/Slider"                   TargetType="CEGUI/Slider"            Renderer="Falagard/Slider"            LookNFeel="OrxonoxLook/Slider" />
-    <FalagardMapping WindowType="OrxonoxLook/Spinner"                  TargetType="CEGUI/Spinner"           Renderer="Falagard/Default"           LookNFeel="OrxonoxLook/Spinner" />
-    <FalagardMapping WindowType="OrxonoxLook/TabButton"                TargetType="CEGUI/TabButton"         Renderer="Falagard/TabButton"         LookNFeel="OrxonoxLook/TabButton" />
-    <FalagardMapping WindowType="OrxonoxLook/TabControl"               TargetType="CEGUI/TabControl"        Renderer="Falagard/TabControl"        LookNFeel="OrxonoxLook/TabControl" />
-    <FalagardMapping WindowType="OrxonoxLook/HorizontalScrollbarThumb" TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="OrxonoxLook/HorizontalScrollbarThumb" />
-    <FalagardMapping WindowType="OrxonoxLook/SliderThumb"              TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="OrxonoxLook/SliderThumb" />
-    <FalagardMapping WindowType="OrxonoxLook/VerticalScrollbarThumb"   TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="OrxonoxLook/VerticalScrollbarThumb" />
-    <FalagardMapping WindowType="OrxonoxLook/Titlebar"                 TargetType="CEGUI/Titlebar"          Renderer="Falagard/Titlebar"          LookNFeel="OrxonoxLook/Titlebar" />
-    <FalagardMapping WindowType="OrxonoxLook/Tooltip"                  TargetType="CEGUI/Tooltip"           Renderer="Falagard/Tooltip"           LookNFeel="OrxonoxLook/Tooltip" />
-    <FalagardMapping WindowType="OrxonoxLook/Tree"                     TargetType="CEGUI/Tree"              Renderer="Falagard/Tree"              LookNFeel="OrxonoxLook/Tree" />
-
-    <!-- Additional widgets -->
-    <FalagardMapping WindowType="OrxonoxLook/AlternateProgressBar"        TargetType="CEGUI/ProgressBar"       Renderer="Falagard/ProgressBar"       LookNFeel="OrxonoxLook/AltProgressBar" />
-    <FalagardMapping WindowType="OrxonoxLook/VUMeter"                     TargetType="CEGUI/ProgressBar"       Renderer="Falagard/ProgressBar"       LookNFeel="OrxonoxLook/VUMeter" />
-    <FalagardMapping WindowType="OrxonoxLook/LargeVerticalScrollbar"      TargetType="CEGUI/Scrollbar"         Renderer="Falagard/Scrollbar"         LookNFeel="OrxonoxLook/LargeVerticalScrollbar" />
-    <FalagardMapping WindowType="OrxonoxLook/LargeVerticalScrollbarThumb" TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="OrxonoxLook/LargeVerticalScrollbarThumb" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUIScheme name="OrxonoxLook" version="5">
+    <Imageset filename="OrxonoxLook.imageset" name="OrxonoxLook" />
+    <LookNFeel filename="OrxonoxLook.looknfeel" />
+    <WindowRendererSet filename="CEGUICoreWindowRendererSet" />
+    <FalagardMapping lookNFeel="OrxonoxLook/StaticImage" renderer="Core/StaticImage" targetType="DefaultWindow" windowType="OrxonoxLook/StaticImage" />
+    <FalagardMapping lookNFeel="OrxonoxLook/StaticText" renderer="Core/StaticText" targetType="DefaultWindow" windowType="OrxonoxLook/StaticText" />
+    <FalagardMapping lookNFeel="OrxonoxLook/TabButtonPane" renderer="Core/Default" targetType="DefaultWindow" windowType="OrxonoxLook/TabButtonPane" />
+    <FalagardMapping lookNFeel="OrxonoxLook/TabContentPane" renderer="Core/Default" targetType="DefaultWindow" windowType="OrxonoxLook/TabContentPane" />
+    <FalagardMapping lookNFeel="OrxonoxLook/Checkbox" renderer="Core/ToggleButton" targetType="CEGUI/ToggleButton" windowType="OrxonoxLook/Checkbox" />
+    <FalagardMapping lookNFeel="OrxonoxLook/Combobox" renderer="Core/Default" targetType="CEGUI/Combobox" windowType="OrxonoxLook/Combobox" />
+    <FalagardMapping lookNFeel="OrxonoxLook/ComboDropList" renderer="Core/Listbox" targetType="CEGUI/ComboDropList" windowType="OrxonoxLook/ComboDropList" />
+    <FalagardMapping lookNFeel="OrxonoxLook/ComboEditbox" renderer="Core/Editbox" targetType="CEGUI/Editbox" windowType="OrxonoxLook/ComboEditbox" />
+    <FalagardMapping lookNFeel="OrxonoxLook/Editbox" renderer="Core/Editbox" targetType="CEGUI/Editbox" windowType="OrxonoxLook/Editbox" />
+    <FalagardMapping lookNFeel="OrxonoxLook/FrameWindow" renderer="Core/FrameWindow" targetType="CEGUI/FrameWindow" windowType="OrxonoxLook/FrameWindow" />
+    <FalagardMapping lookNFeel="OrxonoxLook/GroupBox" renderer="Core/Default" targetType="CEGUI/GroupBox" windowType="OrxonoxLook/GroupBox" />
+    <FalagardMapping lookNFeel="OrxonoxLook/ItemListbox" renderer="Core/ItemListbox" targetType="CEGUI/ItemListbox" windowType="OrxonoxLook/ItemListbox" />
+    <FalagardMapping lookNFeel="OrxonoxLook/ListboxItem" renderer="Core/ItemEntry" targetType="CEGUI/ItemEntry" windowType="OrxonoxLook/ListboxItem" />
+    <FalagardMapping lookNFeel="OrxonoxLook/Listbox" renderer="Core/Listbox" targetType="CEGUI/Listbox" windowType="OrxonoxLook/Listbox" />
+    <FalagardMapping lookNFeel="OrxonoxLook/ListHeader" renderer="Core/ListHeader" targetType="CEGUI/ListHeader" windowType="OrxonoxLook/ListHeader" />
+    <FalagardMapping lookNFeel="OrxonoxLook/ListHeaderSegment" renderer="Core/ListHeaderSegment" targetType="CEGUI/ListHeaderSegment" windowType="OrxonoxLook/ListHeaderSegment" />
+    <FalagardMapping lookNFeel="OrxonoxLook/MultiLineEditbox" renderer="Core/MultiLineEditbox" targetType="CEGUI/MultiLineEditbox" windowType="OrxonoxLook/MultiLineEditbox" />
+    <FalagardMapping lookNFeel="OrxonoxLook/Menubar" renderer="Core/Menubar" targetType="CEGUI/Menubar" windowType="OrxonoxLook/Menubar" />
+    <FalagardMapping lookNFeel="OrxonoxLook/MenuItem" renderer="Core/MenuItem" targetType="CEGUI/MenuItem" windowType="OrxonoxLook/MenuItem" />
+    <FalagardMapping lookNFeel="OrxonoxLook/MultiColumnList" renderer="Core/MultiColumnList" targetType="CEGUI/MultiColumnList" windowType="OrxonoxLook/MultiColumnList" />
+    <FalagardMapping lookNFeel="OrxonoxLook/PopupMenu" renderer="Core/PopupMenu" targetType="CEGUI/PopupMenu" windowType="OrxonoxLook/PopupMenu" />
+    <FalagardMapping lookNFeel="OrxonoxLook/ProgressBar" renderer="Core/ProgressBar" targetType="CEGUI/ProgressBar" windowType="OrxonoxLook/ProgressBar" />
+    <FalagardMapping lookNFeel="OrxonoxLook/Button" renderer="Core/Button" targetType="CEGUI/PushButton" windowType="OrxonoxLook/Button" />
+    <FalagardMapping lookNFeel="OrxonoxLook/ImageButton" renderer="Core/Button" targetType="CEGUI/PushButton" windowType="OrxonoxLook/ImageButton" />
+    <FalagardMapping lookNFeel="OrxonoxLook/RadioButton" renderer="Core/ToggleButton" targetType="CEGUI/RadioButton" windowType="OrxonoxLook/RadioButton" />
+    <FalagardMapping lookNFeel="OrxonoxLook/Button" renderer="Core/Button" targetType="CEGUI/PushButton" windowType="OrxonoxLook/SystemButton" />
+    <FalagardMapping lookNFeel="OrxonoxLook/ScrollablePane" renderer="Core/ScrollablePane" targetType="CEGUI/ScrollablePane" windowType="OrxonoxLook/ScrollablePane" />
+    <FalagardMapping lookNFeel="OrxonoxLook/HorizontalScrollbar" renderer="Core/Scrollbar" targetType="CEGUI/Scrollbar" windowType="OrxonoxLook/HorizontalScrollbar" />
+    <FalagardMapping lookNFeel="OrxonoxLook/VerticalScrollbar" renderer="Core/Scrollbar" targetType="CEGUI/Scrollbar" windowType="OrxonoxLook/VerticalScrollbar" />
+    <FalagardMapping lookNFeel="OrxonoxLook/Slider" renderer="Core/Slider" targetType="CEGUI/Slider" windowType="OrxonoxLook/Slider" />
+    <FalagardMapping lookNFeel="OrxonoxLook/Spinner" renderer="Core/Default" targetType="CEGUI/Spinner" windowType="OrxonoxLook/Spinner" />
+    <FalagardMapping lookNFeel="OrxonoxLook/TabButton" renderer="Core/TabButton" targetType="CEGUI/TabButton" windowType="OrxonoxLook/TabButton" />
+    <FalagardMapping lookNFeel="OrxonoxLook/TabControl" renderer="Core/TabControl" targetType="CEGUI/TabControl" windowType="OrxonoxLook/TabControl" />
+    <FalagardMapping lookNFeel="OrxonoxLook/HorizontalScrollbarThumb" renderer="Core/Button" targetType="CEGUI/Thumb" windowType="OrxonoxLook/HorizontalScrollbarThumb" />
+    <FalagardMapping lookNFeel="OrxonoxLook/SliderThumb" renderer="Core/Button" targetType="CEGUI/Thumb" windowType="OrxonoxLook/SliderThumb" />
+    <FalagardMapping lookNFeel="OrxonoxLook/VerticalScrollbarThumb" renderer="Core/Button" targetType="CEGUI/Thumb" windowType="OrxonoxLook/VerticalScrollbarThumb" />
+    <FalagardMapping lookNFeel="OrxonoxLook/Titlebar" renderer="Core/Titlebar" targetType="CEGUI/Titlebar" windowType="OrxonoxLook/Titlebar" />
+    <FalagardMapping lookNFeel="OrxonoxLook/Tooltip" renderer="Core/Tooltip" targetType="CEGUI/Tooltip" windowType="OrxonoxLook/Tooltip" />
+    <FalagardMapping lookNFeel="OrxonoxLook/Tree" renderer="Core/Tree" targetType="CEGUI/Tree" windowType="OrxonoxLook/Tree" />
+    <FalagardMapping lookNFeel="OrxonoxLook/AltProgressBar" renderer="Core/ProgressBar" targetType="CEGUI/ProgressBar" windowType="OrxonoxLook/AlternateProgressBar" />
+    <FalagardMapping lookNFeel="OrxonoxLook/VUMeter" renderer="Core/ProgressBar" targetType="CEGUI/ProgressBar" windowType="OrxonoxLook/VUMeter" />
+    <FalagardMapping lookNFeel="OrxonoxLook/LargeVerticalScrollbar" renderer="Core/Scrollbar" targetType="CEGUI/Scrollbar" windowType="OrxonoxLook/LargeVerticalScrollbar" />
+    <FalagardMapping lookNFeel="OrxonoxLook/LargeVerticalScrollbarThumb" renderer="Core/Button" targetType="CEGUI/Thumb" windowType="OrxonoxLook/LargeVerticalScrollbarThumb" />
 </GUIScheme>
Index: code/branches/ogre1.9/data/gui/schemes/OrxonoxMenuWidgets.scheme
===================================================================
--- code/branches/ogre1.9/data/gui/schemes/OrxonoxMenuWidgets.scheme	(revision 11128)
+++ code/branches/ogre1.9/data/gui/schemes/OrxonoxMenuWidgets.scheme	(revision 11211)
@@ -1,42 +1,42 @@
-<?xml version="1.0" ?>
-<GUIScheme Name="OrxonoxMenuWidgets">
-    <WindowAlias Alias="MenuWidgets/StaticImage"              Target="OrxonoxLook/StaticImage" />
-    <WindowAlias Alias="MenuWidgets/StaticText"               Target="OrxonoxLook/StaticText" />
-    <WindowAlias Alias="MenuWidgets/TabButtonPane"            Target="OrxonoxLook/TabButtonPane" />
-    <WindowAlias Alias="MenuWidgets/TabContentPane"           Target="OrxonoxLook/TabContentPane" />
-    <WindowAlias Alias="MenuWidgets/Checkbox"                 Target="OrxonoxLook/Checkbox" />
-    <WindowAlias Alias="MenuWidgets/Combobox"                 Target="OrxonoxLook/Combobox" />
-    <WindowAlias Alias="MenuWidgets/ComboDropList"            Target="OrxonoxLook/ComboDropList" />
-    <WindowAlias Alias="MenuWidgets/ComboEditbox"             Target="OrxonoxLook/ComboEditbox" />
-    <WindowAlias Alias="MenuWidgets/Editbox"                  Target="OrxonoxLook/Editbox" />
-    <WindowAlias Alias="MenuWidgets/FrameWindow"              Target="OrxonoxLook/FrameWindow" />
-    <WindowAlias Alias="MenuWidgets/GroupBox"                 Target="OrxonoxLook/GroupBox" />
-    <WindowAlias Alias="MenuWidgets/ItemListbox"              Target="OrxonoxLook/ItemListbox" />
-    <WindowAlias Alias="MenuWidgets/ListboxItem"              Target="OrxonoxLook/ListboxItem" />
-    <WindowAlias Alias="MenuWidgets/Listbox"                  Target="OrxonoxLook/Listbox" />
-    <WindowAlias Alias="MenuWidgets/ListHeader"               Target="OrxonoxLook/ListHeader" />
-    <WindowAlias Alias="MenuWidgets/ListHeaderSegment"        Target="OrxonoxLook/ListHeaderSegment" />
-    <WindowAlias Alias="MenuWidgets/MultiLineEditbox"         Target="OrxonoxLook/MultiLineEditbox" />
-    <WindowAlias Alias="MenuWidgets/Menubar"                  Target="OrxonoxLook/Menubar" />
-    <WindowAlias Alias="MenuWidgets/MenuItem"                 Target="OrxonoxLook/MenuItem" />
-    <WindowAlias Alias="MenuWidgets/MultiColumnList"          Target="OrxonoxLook/MultiColumnList" />
-    <WindowAlias Alias="MenuWidgets/PopupMenu"                Target="OrxonoxLook/PopupMenu" />
-    <WindowAlias Alias="MenuWidgets/ProgressBar"              Target="OrxonoxLook/ProgressBar" />
-    <WindowAlias Alias="MenuWidgets/Button"                   Target="OrxonoxLook/Button" />
-    <WindowAlias Alias="MenuWidgets/ImageButton"              Target="OrxonoxLook/ImageButton" />
-    <WindowAlias Alias="MenuWidgets/RadioButton"              Target="OrxonoxLook/RadioButton" />
-    <WindowAlias Alias="MenuWidgets/SystemButton"             Target="OrxonoxLook/SystemButton" />
-    <WindowAlias Alias="MenuWidgets/ScrollablePane"           Target="OrxonoxLook/ScrollablePane" />
-    <WindowAlias Alias="MenuWidgets/HorizontalScrollbar"      Target="OrxonoxLook/HorizontalScrollbar" />
-    <WindowAlias Alias="MenuWidgets/VerticalScrollbar"        Target="OrxonoxLook/VerticalScrollbar" />
-    <WindowAlias Alias="MenuWidgets/Slider"                   Target="OrxonoxLook/Slider" />
-    <WindowAlias Alias="MenuWidgets/Spinner"                  Target="OrxonoxLook/Spinner" />
-    <WindowAlias Alias="MenuWidgets/TabButton"                Target="OrxonoxLook/TabButton" />
-    <WindowAlias Alias="MenuWidgets/TabControl"               Target="OrxonoxLook/TabControl" />
-    <WindowAlias Alias="MenuWidgets/HorizontalScrollbarThumb" Target="OrxonoxLook/HorizontalScrollbarThumb" />
-    <WindowAlias Alias="MenuWidgets/SliderThumb"              Target="OrxonoxLook/SliderThumb" />
-    <WindowAlias Alias="MenuWidgets/VerticalScrollbarThumb"   Target="OrxonoxLook/VerticalScrollbarThumb" />
-    <WindowAlias Alias="MenuWidgets/Titlebar"                 Target="OrxonoxLook/Titlebar" />
-    <WindowAlias Alias="MenuWidgets/Tooltip"                  Target="OrxonoxLook/Tooltip" />
-    <WindowAlias Alias="MenuWidgets/Tree"                     Target="OrxonoxLook/Tree" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUIScheme name="OrxonoxMenuWidgets" version="5">
+    <WindowAlias alias="MenuWidgets/StaticImage" target="OrxonoxLook/StaticImage" />
+    <WindowAlias alias="MenuWidgets/StaticText" target="OrxonoxLook/StaticText" />
+    <WindowAlias alias="MenuWidgets/TabButtonPane" target="OrxonoxLook/TabButtonPane" />
+    <WindowAlias alias="MenuWidgets/TabContentPane" target="OrxonoxLook/TabContentPane" />
+    <WindowAlias alias="MenuWidgets/Checkbox" target="OrxonoxLook/Checkbox" />
+    <WindowAlias alias="MenuWidgets/Combobox" target="OrxonoxLook/Combobox" />
+    <WindowAlias alias="MenuWidgets/ComboDropList" target="OrxonoxLook/ComboDropList" />
+    <WindowAlias alias="MenuWidgets/ComboEditbox" target="OrxonoxLook/ComboEditbox" />
+    <WindowAlias alias="MenuWidgets/Editbox" target="OrxonoxLook/Editbox" />
+    <WindowAlias alias="MenuWidgets/FrameWindow" target="OrxonoxLook/FrameWindow" />
+    <WindowAlias alias="MenuWidgets/GroupBox" target="OrxonoxLook/GroupBox" />
+    <WindowAlias alias="MenuWidgets/ItemListbox" target="OrxonoxLook/ItemListbox" />
+    <WindowAlias alias="MenuWidgets/ListboxItem" target="OrxonoxLook/ListboxItem" />
+    <WindowAlias alias="MenuWidgets/Listbox" target="OrxonoxLook/Listbox" />
+    <WindowAlias alias="MenuWidgets/ListHeader" target="OrxonoxLook/ListHeader" />
+    <WindowAlias alias="MenuWidgets/ListHeaderSegment" target="OrxonoxLook/ListHeaderSegment" />
+    <WindowAlias alias="MenuWidgets/MultiLineEditbox" target="OrxonoxLook/MultiLineEditbox" />
+    <WindowAlias alias="MenuWidgets/Menubar" target="OrxonoxLook/Menubar" />
+    <WindowAlias alias="MenuWidgets/MenuItem" target="OrxonoxLook/MenuItem" />
+    <WindowAlias alias="MenuWidgets/MultiColumnList" target="OrxonoxLook/MultiColumnList" />
+    <WindowAlias alias="MenuWidgets/PopupMenu" target="OrxonoxLook/PopupMenu" />
+    <WindowAlias alias="MenuWidgets/ProgressBar" target="OrxonoxLook/ProgressBar" />
+    <WindowAlias alias="MenuWidgets/Button" target="OrxonoxLook/Button" />
+    <WindowAlias alias="MenuWidgets/ImageButton" target="OrxonoxLook/ImageButton" />
+    <WindowAlias alias="MenuWidgets/RadioButton" target="OrxonoxLook/RadioButton" />
+    <WindowAlias alias="MenuWidgets/SystemButton" target="OrxonoxLook/SystemButton" />
+    <WindowAlias alias="MenuWidgets/ScrollablePane" target="OrxonoxLook/ScrollablePane" />
+    <WindowAlias alias="MenuWidgets/HorizontalScrollbar" target="OrxonoxLook/HorizontalScrollbar" />
+    <WindowAlias alias="MenuWidgets/VerticalScrollbar" target="OrxonoxLook/VerticalScrollbar" />
+    <WindowAlias alias="MenuWidgets/Slider" target="OrxonoxLook/Slider" />
+    <WindowAlias alias="MenuWidgets/Spinner" target="OrxonoxLook/Spinner" />
+    <WindowAlias alias="MenuWidgets/TabButton" target="OrxonoxLook/TabButton" />
+    <WindowAlias alias="MenuWidgets/TabControl" target="OrxonoxLook/TabControl" />
+    <WindowAlias alias="MenuWidgets/HorizontalScrollbarThumb" target="OrxonoxLook/HorizontalScrollbarThumb" />
+    <WindowAlias alias="MenuWidgets/SliderThumb" target="OrxonoxLook/SliderThumb" />
+    <WindowAlias alias="MenuWidgets/VerticalScrollbarThumb" target="OrxonoxLook/VerticalScrollbarThumb" />
+    <WindowAlias alias="MenuWidgets/Titlebar" target="OrxonoxLook/Titlebar" />
+    <WindowAlias alias="MenuWidgets/Tooltip" target="OrxonoxLook/Tooltip" />
+    <WindowAlias alias="MenuWidgets/Tree" target="OrxonoxLook/Tree" />
 </GUIScheme>
Index: code/branches/ogre1.9/data/gui/schemes/SleekSpaceHUDWidgets.scheme
===================================================================
--- code/branches/ogre1.9/data/gui/schemes/SleekSpaceHUDWidgets.scheme	(revision 11128)
+++ code/branches/ogre1.9/data/gui/schemes/SleekSpaceHUDWidgets.scheme	(revision 11211)
@@ -1,42 +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" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUIScheme name="SleekSpaceHUDWidgets" version="5">
+    <WindowAlias alias="HUDWidgets/StaticImage" target="SleekSpace/StaticImage" />
+    <WindowAlias alias="HUDWidgets/StaticText" target="SleekSpace/StaticText" />
+    <WindowAlias alias="HUDWidgets/TabButtonPane" target="SleekSpace/TabButtonPane" />
+    <WindowAlias alias="HUDWidgets/TabContentPane" target="SleekSpace/TabContentPane" />
+    <WindowAlias alias="HUDWidgets/Checkbox" target="SleekSpace/Checkbox" />
+    <WindowAlias alias="HUDWidgets/Combobox" target="SleekSpace/Combobox" />
+    <WindowAlias alias="HUDWidgets/ComboDropList" target="SleekSpace/ComboDropList" />
+    <WindowAlias alias="HUDWidgets/ComboEditbox" target="SleekSpace/ComboEditbox" />
+    <WindowAlias alias="HUDWidgets/Editbox" target="SleekSpace/Editbox" />
+    <WindowAlias alias="HUDWidgets/FrameWindow" target="SleekSpace/FrameWindow" />
+    <WindowAlias alias="HUDWidgets/GroupBox" target="SleekSpace/GroupBox" />
+    <WindowAlias alias="HUDWidgets/ItemListbox" target="SleekSpace/ItemListbox" />
+    <WindowAlias alias="HUDWidgets/ListboxItem" target="SleekSpace/ListboxItem" />
+    <WindowAlias alias="HUDWidgets/Listbox" target="SleekSpace/Listbox" />
+    <WindowAlias alias="HUDWidgets/ListHeader" target="SleekSpace/ListHeader" />
+    <WindowAlias alias="HUDWidgets/ListHeaderSegment" target="SleekSpace/ListHeaderSegment" />
+    <WindowAlias alias="HUDWidgets/MultiLineEditbox" target="SleekSpace/MultiLineEditbox" />
+    <WindowAlias alias="HUDWidgets/Menubar" target="SleekSpace/Menubar" />
+    <WindowAlias alias="HUDWidgets/MenuItem" target="SleekSpace/MenuItem" />
+    <WindowAlias alias="HUDWidgets/MultiColumnList" target="SleekSpace/MultiColumnList" />
+    <WindowAlias alias="HUDWidgets/PopupMenu" target="SleekSpace/PopupMenu" />
+    <WindowAlias alias="HUDWidgets/ProgressBar" target="SleekSpace/ProgressBar" />
+    <WindowAlias alias="HUDWidgets/Button" target="SleekSpace/Button" />
+    <WindowAlias alias="HUDWidgets/ImageButton" target="SleekSpace/ImageButton" />
+    <WindowAlias alias="HUDWidgets/RadioButton" target="SleekSpace/RadioButton" />
+    <WindowAlias alias="HUDWidgets/SystemButton" target="SleekSpace/SystemButton" />
+    <WindowAlias alias="HUDWidgets/ScrollablePane" target="SleekSpace/ScrollablePane" />
+    <WindowAlias alias="HUDWidgets/HorizontalScrollbar" target="SleekSpace/HorizontalScrollbar" />
+    <WindowAlias alias="HUDWidgets/VerticalScrollbar" target="SleekSpace/VerticalScrollbar" />
+    <WindowAlias alias="HUDWidgets/Slider" target="SleekSpace/Slider" />
+    <WindowAlias alias="HUDWidgets/Spinner" target="SleekSpace/Spinner" />
+    <WindowAlias alias="HUDWidgets/TabButton" target="SleekSpace/TabButton" />
+    <WindowAlias alias="HUDWidgets/TabControl" target="SleekSpace/TabControl" />
+    <WindowAlias alias="HUDWidgets/HorizontalScrollbarThumb" target="SleekSpace/HorizontalScrollbarThumb" />
+    <WindowAlias alias="HUDWidgets/SliderThumb" target="SleekSpace/SliderThumb" />
+    <WindowAlias alias="HUDWidgets/VerticalScrollbarThumb" target="SleekSpace/VerticalScrollbarThumb" />
+    <WindowAlias alias="HUDWidgets/Titlebar" target="SleekSpace/Titlebar" />
+    <WindowAlias alias="HUDWidgets/Tooltip" target="SleekSpace/Tooltip" />
+    <WindowAlias alias="HUDWidgets/Tree" target="SleekSpace/Tree" />
 </GUIScheme>
Index: code/branches/ogre1.9/data/gui/schemes/SleekSpaceLook.scheme
===================================================================
--- code/branches/ogre1.9/data/gui/schemes/SleekSpaceLook.scheme	(revision 11128)
+++ code/branches/ogre1.9/data/gui/schemes/SleekSpaceLook.scheme	(revision 11211)
@@ -1,61 +1,55 @@
-<?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" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUIScheme name="SleekSpaceLook" version="5">
+    <Imageset filename="SleekSpace.imageset" name="SleekSpace" />
+    <Imageset filename="TaharezLook.imageset" name="TaharezLook" />
+    <LookNFeel filename="SleekSpace.looknfeel" />
+    <LookNFeel filename="TaharezLook.looknfeel" />
+    <WindowRendererSet filename="CEGUICoreWindowRendererSet" />
+    <FalagardMapping lookNFeel="SleekSpace/StaticImage" renderer="Core/StaticImage" targetType="DefaultWindow" windowType="SleekSpace/StaticImage" />
+    <FalagardMapping lookNFeel="SleekSpace/StaticText" renderer="Core/StaticText" targetType="DefaultWindow" windowType="SleekSpace/StaticText" />
+    <FalagardMapping lookNFeel="SleekSpace/Checkbox" renderer="Core/ToggleButton" targetType="CEGUI/ToggleButton" windowType="SleekSpace/Checkbox" />
+    <FalagardMapping lookNFeel="SleekSpace/Combobox" renderer="Core/Default" targetType="CEGUI/Combobox" windowType="SleekSpace/Combobox" />
+    <FalagardMapping lookNFeel="SleekSpace/ComboDropList" renderer="Core/Listbox" targetType="CEGUI/ComboDropList" windowType="SleekSpace/ComboDropList" />
+    <FalagardMapping lookNFeel="SleekSpace/ComboEditbox" renderer="Core/Editbox" targetType="CEGUI/Editbox" windowType="SleekSpace/ComboEditbox" />
+    <FalagardMapping lookNFeel="SleekSpace/Editbox" renderer="Core/Editbox" targetType="CEGUI/Editbox" windowType="SleekSpace/Editbox" />
+    <FalagardMapping lookNFeel="SleekSpace/FrameWindow" renderer="Core/FrameWindow" targetType="CEGUI/FrameWindow" windowType="SleekSpace/FrameWindow" />
+    <FalagardMapping lookNFeel="SleekSpace/Listbox" renderer="Core/Listbox" targetType="CEGUI/Listbox" windowType="SleekSpace/Listbox" />
+    <FalagardMapping lookNFeel="SleekSpace/ListHeader" renderer="Core/ListHeader" targetType="CEGUI/ListHeader" windowType="SleekSpace/ListHeader" />
+    <FalagardMapping lookNFeel="SleekSpace/ListHeaderSegment" renderer="Core/ListHeaderSegment" targetType="CEGUI/ListHeaderSegment" windowType="SleekSpace/ListHeaderSegment" />
+    <FalagardMapping lookNFeel="SleekSpace/MultiLineEditbox" renderer="Core/MultiLineEditbox" targetType="CEGUI/MultiLineEditbox" windowType="SleekSpace/MultiLineEditbox" />
+    <FalagardMapping lookNFeel="SleekSpace/Menubar" renderer="Core/Menubar" targetType="CEGUI/Menubar" windowType="SleekSpace/Menubar" />
+    <FalagardMapping lookNFeel="SleekSpace/MenuItem" renderer="Core/MenuItem" targetType="CEGUI/MenuItem" windowType="SleekSpace/MenuItem" />
+    <FalagardMapping lookNFeel="SleekSpace/MultiColumnList" renderer="Core/MultiColumnList" targetType="CEGUI/MultiColumnList" windowType="SleekSpace/MultiColumnList" />
+    <FalagardMapping lookNFeel="SleekSpace/PopupMenu" renderer="Core/PopupMenu" targetType="CEGUI/PopupMenu" windowType="SleekSpace/PopupMenu" />
+    <FalagardMapping lookNFeel="SleekSpace/ProgressBar" renderer="Core/ProgressBar" targetType="CEGUI/ProgressBar" windowType="SleekSpace/ProgressBar" />
+    <FalagardMapping lookNFeel="SleekSpace/Button" renderer="Core/Button" targetType="CEGUI/PushButton" windowType="SleekSpace/Button" />
+    <FalagardMapping lookNFeel="SleekSpace/RadioButton" renderer="Core/ToggleButton" targetType="CEGUI/RadioButton" windowType="SleekSpace/RadioButton" />
+    <FalagardMapping lookNFeel="SleekSpace/Button" renderer="Core/Button" targetType="CEGUI/PushButton" windowType="SleekSpace/SystemButton" />
+    <FalagardMapping lookNFeel="SleekSpace/ScrollablePane" renderer="Core/ScrollablePane" targetType="CEGUI/ScrollablePane" windowType="SleekSpace/ScrollablePane" />
+    <FalagardMapping lookNFeel="SleekSpace/HorizontalScrollbar" renderer="Core/Scrollbar" targetType="CEGUI/Scrollbar" windowType="SleekSpace/HorizontalScrollbar" />
+    <FalagardMapping lookNFeel="SleekSpace/VerticalScrollbar" renderer="Core/Scrollbar" targetType="CEGUI/Scrollbar" windowType="SleekSpace/VerticalScrollbar" />
+    <FalagardMapping lookNFeel="SleekSpace/Slider" renderer="Core/Slider" targetType="CEGUI/Slider" windowType="SleekSpace/Slider" />
+    <FalagardMapping lookNFeel="SleekSpace/Spinner" renderer="Core/Default" targetType="CEGUI/Spinner" windowType="SleekSpace/Spinner" />
+    <FalagardMapping lookNFeel="SleekSpace/TabButton" renderer="Core/TabButton" targetType="CEGUI/TabButton" windowType="SleekSpace/TabButton" />
+    <FalagardMapping lookNFeel="SleekSpace/TabControl" renderer="Core/TabControl" targetType="CEGUI/TabControl" windowType="SleekSpace/TabControl" />
+    <FalagardMapping lookNFeel="SleekSpace/HorizontalScrollbarThumb" renderer="Core/Button" targetType="CEGUI/Thumb" windowType="SleekSpace/HorizontalScrollbarThumb" />
+    <FalagardMapping lookNFeel="SleekSpace/SliderThumb" renderer="Core/Button" targetType="CEGUI/Thumb" windowType="SleekSpace/SliderThumb" />
+    <FalagardMapping lookNFeel="SleekSpace/VerticalScrollbarThumb" renderer="Core/Button" targetType="CEGUI/Thumb" windowType="SleekSpace/VerticalScrollbarThumb" />
+    <FalagardMapping lookNFeel="SleekSpace/Titlebar" renderer="Core/Titlebar" targetType="CEGUI/Titlebar" windowType="SleekSpace/Titlebar" />
+    <FalagardMapping lookNFeel="SleekSpace/Tooltip" renderer="Core/Tooltip" targetType="CEGUI/Tooltip" windowType="SleekSpace/Tooltip" />
+    <FalagardMapping lookNFeel="TaharezLook/TabButtonPane" renderer="Core/Default" targetType="DefaultWindow" windowType="SleekSpace/TabButtonPane" />
+    <FalagardMapping lookNFeel="TaharezLook/TabContentPane" renderer="Core/Default" targetType="DefaultWindow" windowType="SleekSpace/TabContentPane" />
+    <FalagardMapping lookNFeel="TaharezLook/GroupBox" renderer="Core/Default" targetType="CEGUI/GroupBox" windowType="SleekSpace/GroupBox" />
+    <FalagardMapping lookNFeel="TaharezLook/ListboxItem" renderer="Core/ItemEntry" targetType="CEGUI/ItemEntry" windowType="SleekSpace/ListboxItem" />
+    <FalagardMapping lookNFeel="TaharezLook/ItemListbox" renderer="Core/ItemListbox" targetType="CEGUI/ItemListbox" windowType="SleekSpace/ItemListbox" />
+    <FalagardMapping lookNFeel="TaharezLook/ImageButton" renderer="Core/Button" targetType="CEGUI/PushButton" windowType="SleekSpace/ImageButton" />
+    <FalagardMapping lookNFeel="TaharezLook/Tree" renderer="Core/Tree" targetType="CEGUI/Tree" windowType="SleekSpace/Tree" />
+    <FalagardMapping lookNFeel="SleekSpace/TabPane" renderer="Core/TabPane" targetType="DefaultWindow" windowType="SleekSpace/TabPane" />
+    <FalagardMapping lookNFeel="SleekSpace/ReticleWindow" renderer="Core/FrameWindow" targetType="CEGUI/FrameWindow" windowType="SleekSpace/ReticleWindow" />
+    <FalagardMapping lookNFeel="SleekSpace/AltProgressBar" renderer="Core/ProgressBar" targetType="CEGUI/ProgressBar" windowType="SleekSpace/AlternateProgressBar" />
+    <FalagardMapping lookNFeel="SleekSpace/VUMeter" renderer="Core/ProgressBar" targetType="CEGUI/ProgressBar" windowType="SleekSpace/VUMeter" />
+    <FalagardMapping lookNFeel="SleekSpace/LargeVerticalScrollbar" renderer="Core/Scrollbar" targetType="CEGUI/Scrollbar" windowType="SleekSpace/LargeVerticalScrollbar" />
+    <FalagardMapping lookNFeel="SleekSpace/VSlider" renderer="Core/Slider" targetType="CEGUI/Slider" windowType="SleekSpace/VSlider" />
+    <FalagardMapping lookNFeel="SleekSpace/LargeVerticalScrollbarThumb" renderer="Core/Button" targetType="CEGUI/Thumb" windowType="SleekSpace/LargeVerticalScrollbarThumb" />
+    <FalagardMapping lookNFeel="SleekSpace/VSliderThumb" renderer="Core/Button" targetType="CEGUI/Thumb" windowType="SleekSpace/VSliderThumb" />
 </GUIScheme>
Index: code/branches/ogre1.9/data/gui/schemes/SleekSpaceMenuWidgets.scheme
===================================================================
--- code/branches/ogre1.9/data/gui/schemes/SleekSpaceMenuWidgets.scheme	(revision 11128)
+++ code/branches/ogre1.9/data/gui/schemes/SleekSpaceMenuWidgets.scheme	(revision 11211)
@@ -1,42 +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" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUIScheme name="SleekSpaceMenuWidgets" version="5">
+    <WindowAlias alias="MenuWidgets/StaticImage" target="SleekSpace/StaticImage" />
+    <WindowAlias alias="MenuWidgets/StaticText" target="SleekSpace/StaticText" />
+    <WindowAlias alias="MenuWidgets/TabButtonPane" target="SleekSpace/TabButtonPane" />
+    <WindowAlias alias="MenuWidgets/TabContentPane" target="SleekSpace/TabContentPane" />
+    <WindowAlias alias="MenuWidgets/Checkbox" target="SleekSpace/Checkbox" />
+    <WindowAlias alias="MenuWidgets/Combobox" target="SleekSpace/Combobox" />
+    <WindowAlias alias="MenuWidgets/ComboDropList" target="SleekSpace/ComboDropList" />
+    <WindowAlias alias="MenuWidgets/ComboEditbox" target="SleekSpace/ComboEditbox" />
+    <WindowAlias alias="MenuWidgets/Editbox" target="SleekSpace/Editbox" />
+    <WindowAlias alias="MenuWidgets/FrameWindow" target="SleekSpace/FrameWindow" />
+    <WindowAlias alias="MenuWidgets/GroupBox" target="SleekSpace/GroupBox" />
+    <WindowAlias alias="MenuWidgets/ItemListbox" target="SleekSpace/ItemListbox" />
+    <WindowAlias alias="MenuWidgets/ListboxItem" target="SleekSpace/ListboxItem" />
+    <WindowAlias alias="MenuWidgets/Listbox" target="SleekSpace/Listbox" />
+    <WindowAlias alias="MenuWidgets/ListHeader" target="SleekSpace/ListHeader" />
+    <WindowAlias alias="MenuWidgets/ListHeaderSegment" target="SleekSpace/ListHeaderSegment" />
+    <WindowAlias alias="MenuWidgets/MultiLineEditbox" target="SleekSpace/MultiLineEditbox" />
+    <WindowAlias alias="MenuWidgets/Menubar" target="SleekSpace/Menubar" />
+    <WindowAlias alias="MenuWidgets/MenuItem" target="SleekSpace/MenuItem" />
+    <WindowAlias alias="MenuWidgets/MultiColumnList" target="SleekSpace/MultiColumnList" />
+    <WindowAlias alias="MenuWidgets/PopupMenu" target="SleekSpace/PopupMenu" />
+    <WindowAlias alias="MenuWidgets/ProgressBar" target="SleekSpace/ProgressBar" />
+    <WindowAlias alias="MenuWidgets/Button" target="SleekSpace/Button" />
+    <WindowAlias alias="MenuWidgets/ImageButton" target="SleekSpace/ImageButton" />
+    <WindowAlias alias="MenuWidgets/RadioButton" target="SleekSpace/RadioButton" />
+    <WindowAlias alias="MenuWidgets/SystemButton" target="SleekSpace/SystemButton" />
+    <WindowAlias alias="MenuWidgets/ScrollablePane" target="SleekSpace/ScrollablePane" />
+    <WindowAlias alias="MenuWidgets/HorizontalScrollbar" target="SleekSpace/HorizontalScrollbar" />
+    <WindowAlias alias="MenuWidgets/VerticalScrollbar" target="SleekSpace/VerticalScrollbar" />
+    <WindowAlias alias="MenuWidgets/Slider" target="SleekSpace/Slider" />
+    <WindowAlias alias="MenuWidgets/Spinner" target="SleekSpace/Spinner" />
+    <WindowAlias alias="MenuWidgets/TabButton" target="SleekSpace/TabButton" />
+    <WindowAlias alias="MenuWidgets/TabControl" target="SleekSpace/TabControl" />
+    <WindowAlias alias="MenuWidgets/HorizontalScrollbarThumb" target="SleekSpace/HorizontalScrollbarThumb" />
+    <WindowAlias alias="MenuWidgets/SliderThumb" target="SleekSpace/SliderThumb" />
+    <WindowAlias alias="MenuWidgets/VerticalScrollbarThumb" target="SleekSpace/VerticalScrollbarThumb" />
+    <WindowAlias alias="MenuWidgets/Titlebar" target="SleekSpace/Titlebar" />
+    <WindowAlias alias="MenuWidgets/Tooltip" target="SleekSpace/Tooltip" />
+    <WindowAlias alias="MenuWidgets/Tree" target="SleekSpace/Tree" />
 </GUIScheme>
Index: code/branches/ogre1.9/data/gui/schemes/TaharezGreenHUDWidgets.scheme
===================================================================
--- code/branches/ogre1.9/data/gui/schemes/TaharezGreenHUDWidgets.scheme	(revision 11128)
+++ code/branches/ogre1.9/data/gui/schemes/TaharezGreenHUDWidgets.scheme	(revision 11211)
@@ -1,42 +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" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUIScheme name="TaharezGreenHUDWidgets" version="5">
+    <WindowAlias alias="HUDWidgets/StaticImage" target="TaharezGreenLook/StaticImage" />
+    <WindowAlias alias="HUDWidgets/StaticText" target="TaharezGreenLook/StaticText" />
+    <WindowAlias alias="HUDWidgets/TabButtonPane" target="TaharezGreenLook/TabButtonPane" />
+    <WindowAlias alias="HUDWidgets/TabContentPane" target="TaharezGreenLook/TabContentPane" />
+    <WindowAlias alias="HUDWidgets/Checkbox" target="TaharezGreenLook/Checkbox" />
+    <WindowAlias alias="HUDWidgets/Combobox" target="TaharezGreenLook/Combobox" />
+    <WindowAlias alias="HUDWidgets/ComboDropList" target="TaharezGreenLook/ComboDropList" />
+    <WindowAlias alias="HUDWidgets/ComboEditbox" target="TaharezGreenLook/ComboEditbox" />
+    <WindowAlias alias="HUDWidgets/Editbox" target="TaharezGreenLook/Editbox" />
+    <WindowAlias alias="HUDWidgets/FrameWindow" target="TaharezGreenLook/FrameWindow" />
+    <WindowAlias alias="HUDWidgets/GroupBox" target="TaharezGreenLook/GroupBox" />
+    <WindowAlias alias="HUDWidgets/ItemListbox" target="TaharezGreenLook/ItemListbox" />
+    <WindowAlias alias="HUDWidgets/ListboxItem" target="TaharezGreenLook/ListboxItem" />
+    <WindowAlias alias="HUDWidgets/Listbox" target="TaharezGreenLook/Listbox" />
+    <WindowAlias alias="HUDWidgets/ListHeader" target="TaharezGreenLook/ListHeader" />
+    <WindowAlias alias="HUDWidgets/ListHeaderSegment" target="TaharezGreenLook/ListHeaderSegment" />
+    <WindowAlias alias="HUDWidgets/MultiLineEditbox" target="TaharezGreenLook/MultiLineEditbox" />
+    <WindowAlias alias="HUDWidgets/Menubar" target="TaharezGreenLook/Menubar" />
+    <WindowAlias alias="HUDWidgets/MenuItem" target="TaharezGreenLook/MenuItem" />
+    <WindowAlias alias="HUDWidgets/MultiColumnList" target="TaharezGreenLook/MultiColumnList" />
+    <WindowAlias alias="HUDWidgets/PopupMenu" target="TaharezGreenLook/PopupMenu" />
+    <WindowAlias alias="HUDWidgets/ProgressBar" target="TaharezGreenLook/ProgressBar" />
+    <WindowAlias alias="HUDWidgets/Button" target="TaharezGreenLook/Button" />
+    <WindowAlias alias="HUDWidgets/ImageButton" target="TaharezGreenLook/ImageButton" />
+    <WindowAlias alias="HUDWidgets/RadioButton" target="TaharezGreenLook/RadioButton" />
+    <WindowAlias alias="HUDWidgets/SystemButton" target="TaharezGreenLook/SystemButton" />
+    <WindowAlias alias="HUDWidgets/ScrollablePane" target="TaharezGreenLook/ScrollablePane" />
+    <WindowAlias alias="HUDWidgets/HorizontalScrollbar" target="TaharezGreenLook/HorizontalScrollbar" />
+    <WindowAlias alias="HUDWidgets/VerticalScrollbar" target="TaharezGreenLook/VerticalScrollbar" />
+    <WindowAlias alias="HUDWidgets/Slider" target="TaharezGreenLook/Slider" />
+    <WindowAlias alias="HUDWidgets/Spinner" target="TaharezGreenLook/Spinner" />
+    <WindowAlias alias="HUDWidgets/TabButton" target="TaharezGreenLook/TabButton" />
+    <WindowAlias alias="HUDWidgets/TabControl" target="TaharezGreenLook/TabControl" />
+    <WindowAlias alias="HUDWidgets/HorizontalScrollbarThumb" target="TaharezGreenLook/HorizontalScrollbarThumb" />
+    <WindowAlias alias="HUDWidgets/SliderThumb" target="TaharezGreenLook/SliderThumb" />
+    <WindowAlias alias="HUDWidgets/VerticalScrollbarThumb" target="TaharezGreenLook/VerticalScrollbarThumb" />
+    <WindowAlias alias="HUDWidgets/Titlebar" target="TaharezGreenLook/Titlebar" />
+    <WindowAlias alias="HUDWidgets/Tooltip" target="TaharezGreenLook/Tooltip" />
+    <WindowAlias alias="HUDWidgets/Tree" target="TaharezGreenLook/Tree" />
 </GUIScheme>
Index: code/branches/ogre1.9/data/gui/schemes/TaharezGreenLook.scheme
===================================================================
--- code/branches/ogre1.9/data/gui/schemes/TaharezGreenLook.scheme	(revision 11128)
+++ code/branches/ogre1.9/data/gui/schemes/TaharezGreenLook.scheme	(revision 11211)
@@ -1,53 +1,49 @@
-<?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" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUIScheme name="TaharezGreenLook" version="5">
+    <Imageset filename="TaharezGreenLook.imageset" name="TaharezGreenLook" />
+    <LookNFeel filename="TaharezGreenLook.looknfeel" />
+    <WindowRendererSet filename="CEGUICoreWindowRendererSet" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/StaticImage" renderer="Core/StaticImage" targetType="DefaultWindow" windowType="TaharezGreenLook/StaticImage" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/StaticText" renderer="Core/StaticText" targetType="DefaultWindow" windowType="TaharezGreenLook/StaticText" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/TabButtonPane" renderer="Core/Default" targetType="DefaultWindow" windowType="TaharezGreenLook/TabButtonPane" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/TabContentPane" renderer="Core/Default" targetType="DefaultWindow" windowType="TaharezGreenLook/TabContentPane" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/Checkbox" renderer="Core/ToggleButton" targetType="CEGUI/ToggleButton" windowType="TaharezGreenLook/Checkbox" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/Combobox" renderer="Core/Default" targetType="CEGUI/Combobox" windowType="TaharezGreenLook/Combobox" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/ComboDropList" renderer="Core/Listbox" targetType="CEGUI/ComboDropList" windowType="TaharezGreenLook/ComboDropList" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/ComboEditbox" renderer="Core/Editbox" targetType="CEGUI/Editbox" windowType="TaharezGreenLook/ComboEditbox" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/Editbox" renderer="Core/Editbox" targetType="CEGUI/Editbox" windowType="TaharezGreenLook/Editbox" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/FrameWindow" renderer="Core/FrameWindow" targetType="CEGUI/FrameWindow" windowType="TaharezGreenLook/FrameWindow" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/GroupBox" renderer="Core/Default" targetType="CEGUI/GroupBox" windowType="TaharezGreenLook/GroupBox" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/ItemListbox" renderer="Core/ItemListbox" targetType="CEGUI/ItemListbox" windowType="TaharezGreenLook/ItemListbox" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/ListboxItem" renderer="Core/ItemEntry" targetType="CEGUI/ItemEntry" windowType="TaharezGreenLook/ListboxItem" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/Listbox" renderer="Core/Listbox" targetType="CEGUI/Listbox" windowType="TaharezGreenLook/Listbox" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/ListHeader" renderer="Core/ListHeader" targetType="CEGUI/ListHeader" windowType="TaharezGreenLook/ListHeader" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/ListHeaderSegment" renderer="Core/ListHeaderSegment" targetType="CEGUI/ListHeaderSegment" windowType="TaharezGreenLook/ListHeaderSegment" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/MultiLineEditbox" renderer="Core/MultiLineEditbox" targetType="CEGUI/MultiLineEditbox" windowType="TaharezGreenLook/MultiLineEditbox" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/Menubar" renderer="Core/Menubar" targetType="CEGUI/Menubar" windowType="TaharezGreenLook/Menubar" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/MenuItem" renderer="Core/MenuItem" targetType="CEGUI/MenuItem" windowType="TaharezGreenLook/MenuItem" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/MultiColumnList" renderer="Core/MultiColumnList" targetType="CEGUI/MultiColumnList" windowType="TaharezGreenLook/MultiColumnList" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/PopupMenu" renderer="Core/PopupMenu" targetType="CEGUI/PopupMenu" windowType="TaharezGreenLook/PopupMenu" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/ProgressBar" renderer="Core/ProgressBar" targetType="CEGUI/ProgressBar" windowType="TaharezGreenLook/ProgressBar" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/Button" renderer="Core/Button" targetType="CEGUI/PushButton" windowType="TaharezGreenLook/Button" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/ImageButton" renderer="Core/Button" targetType="CEGUI/PushButton" windowType="TaharezGreenLook/ImageButton" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/RadioButton" renderer="Core/ToggleButton" targetType="CEGUI/RadioButton" windowType="TaharezGreenLook/RadioButton" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/Button" renderer="Core/Button" targetType="CEGUI/PushButton" windowType="TaharezGreenLook/SystemButton" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/ScrollablePane" renderer="Core/ScrollablePane" targetType="CEGUI/ScrollablePane" windowType="TaharezGreenLook/ScrollablePane" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/HorizontalScrollbar" renderer="Core/Scrollbar" targetType="CEGUI/Scrollbar" windowType="TaharezGreenLook/HorizontalScrollbar" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/VerticalScrollbar" renderer="Core/Scrollbar" targetType="CEGUI/Scrollbar" windowType="TaharezGreenLook/VerticalScrollbar" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/Slider" renderer="Core/Slider" targetType="CEGUI/Slider" windowType="TaharezGreenLook/Slider" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/Spinner" renderer="Core/Default" targetType="CEGUI/Spinner" windowType="TaharezGreenLook/Spinner" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/TabButton" renderer="Core/TabButton" targetType="CEGUI/TabButton" windowType="TaharezGreenLook/TabButton" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/TabControl" renderer="Core/TabControl" targetType="CEGUI/TabControl" windowType="TaharezGreenLook/TabControl" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/HorizontalScrollbarThumb" renderer="Core/Button" targetType="CEGUI/Thumb" windowType="TaharezGreenLook/HorizontalScrollbarThumb" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/SliderThumb" renderer="Core/Button" targetType="CEGUI/Thumb" windowType="TaharezGreenLook/SliderThumb" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/VerticalScrollbarThumb" renderer="Core/Button" targetType="CEGUI/Thumb" windowType="TaharezGreenLook/VerticalScrollbarThumb" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/Titlebar" renderer="Core/Titlebar" targetType="CEGUI/Titlebar" windowType="TaharezGreenLook/Titlebar" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/Tooltip" renderer="Core/Tooltip" targetType="CEGUI/Tooltip" windowType="TaharezGreenLook/Tooltip" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/Tree" renderer="Core/Tree" targetType="CEGUI/Tree" windowType="TaharezGreenLook/Tree" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/AltProgressBar" renderer="Core/ProgressBar" targetType="CEGUI/ProgressBar" windowType="TaharezGreenLook/AlternateProgressBar" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/VUMeter" renderer="Core/ProgressBar" targetType="CEGUI/ProgressBar" windowType="TaharezGreenLook/VUMeter" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/LargeVerticalScrollbar" renderer="Core/Scrollbar" targetType="CEGUI/Scrollbar" windowType="TaharezGreenLook/LargeVerticalScrollbar" />
+    <FalagardMapping lookNFeel="TaharezGreenLook/LargeVerticalScrollbarThumb" renderer="Core/Button" targetType="CEGUI/Thumb" windowType="TaharezGreenLook/LargeVerticalScrollbarThumb" />
 </GUIScheme>
Index: code/branches/ogre1.9/data/gui/schemes/TaharezGreenMenuWidgets.scheme
===================================================================
--- code/branches/ogre1.9/data/gui/schemes/TaharezGreenMenuWidgets.scheme	(revision 11128)
+++ code/branches/ogre1.9/data/gui/schemes/TaharezGreenMenuWidgets.scheme	(revision 11211)
@@ -1,42 +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" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUIScheme name="TaharezGreenMenuWidgets" version="5">
+    <WindowAlias alias="MenuWidgets/StaticImage" target="TaharezGreenLook/StaticImage" />
+    <WindowAlias alias="MenuWidgets/StaticText" target="TaharezGreenLook/StaticText" />
+    <WindowAlias alias="MenuWidgets/TabButtonPane" target="TaharezGreenLook/TabButtonPane" />
+    <WindowAlias alias="MenuWidgets/TabContentPane" target="TaharezGreenLook/TabContentPane" />
+    <WindowAlias alias="MenuWidgets/Checkbox" target="TaharezGreenLook/Checkbox" />
+    <WindowAlias alias="MenuWidgets/Combobox" target="TaharezGreenLook/Combobox" />
+    <WindowAlias alias="MenuWidgets/ComboDropList" target="TaharezGreenLook/ComboDropList" />
+    <WindowAlias alias="MenuWidgets/ComboEditbox" target="TaharezGreenLook/ComboEditbox" />
+    <WindowAlias alias="MenuWidgets/Editbox" target="TaharezGreenLook/Editbox" />
+    <WindowAlias alias="MenuWidgets/FrameWindow" target="TaharezGreenLook/FrameWindow" />
+    <WindowAlias alias="MenuWidgets/GroupBox" target="TaharezGreenLook/GroupBox" />
+    <WindowAlias alias="MenuWidgets/ItemListbox" target="TaharezGreenLook/ItemListbox" />
+    <WindowAlias alias="MenuWidgets/ListboxItem" target="TaharezGreenLook/ListboxItem" />
+    <WindowAlias alias="MenuWidgets/Listbox" target="TaharezGreenLook/Listbox" />
+    <WindowAlias alias="MenuWidgets/ListHeader" target="TaharezGreenLook/ListHeader" />
+    <WindowAlias alias="MenuWidgets/ListHeaderSegment" target="TaharezGreenLook/ListHeaderSegment" />
+    <WindowAlias alias="MenuWidgets/MultiLineEditbox" target="TaharezGreenLook/MultiLineEditbox" />
+    <WindowAlias alias="MenuWidgets/Menubar" target="TaharezGreenLook/Menubar" />
+    <WindowAlias alias="MenuWidgets/MenuItem" target="TaharezGreenLook/MenuItem" />
+    <WindowAlias alias="MenuWidgets/MultiColumnList" target="TaharezGreenLook/MultiColumnList" />
+    <WindowAlias alias="MenuWidgets/PopupMenu" target="TaharezGreenLook/PopupMenu" />
+    <WindowAlias alias="MenuWidgets/ProgressBar" target="TaharezGreenLook/ProgressBar" />
+    <WindowAlias alias="MenuWidgets/Button" target="TaharezGreenLook/Button" />
+    <WindowAlias alias="MenuWidgets/ImageButton" target="TaharezGreenLook/ImageButton" />
+    <WindowAlias alias="MenuWidgets/RadioButton" target="TaharezGreenLook/RadioButton" />
+    <WindowAlias alias="MenuWidgets/SystemButton" target="TaharezGreenLook/SystemButton" />
+    <WindowAlias alias="MenuWidgets/ScrollablePane" target="TaharezGreenLook/ScrollablePane" />
+    <WindowAlias alias="MenuWidgets/HorizontalScrollbar" target="TaharezGreenLook/HorizontalScrollbar" />
+    <WindowAlias alias="MenuWidgets/VerticalScrollbar" target="TaharezGreenLook/VerticalScrollbar" />
+    <WindowAlias alias="MenuWidgets/Slider" target="TaharezGreenLook/Slider" />
+    <WindowAlias alias="MenuWidgets/Spinner" target="TaharezGreenLook/Spinner" />
+    <WindowAlias alias="MenuWidgets/TabButton" target="TaharezGreenLook/TabButton" />
+    <WindowAlias alias="MenuWidgets/TabControl" target="TaharezGreenLook/TabControl" />
+    <WindowAlias alias="MenuWidgets/HorizontalScrollbarThumb" target="TaharezGreenLook/HorizontalScrollbarThumb" />
+    <WindowAlias alias="MenuWidgets/SliderThumb" target="TaharezGreenLook/SliderThumb" />
+    <WindowAlias alias="MenuWidgets/VerticalScrollbarThumb" target="TaharezGreenLook/VerticalScrollbarThumb" />
+    <WindowAlias alias="MenuWidgets/Titlebar" target="TaharezGreenLook/Titlebar" />
+    <WindowAlias alias="MenuWidgets/Tooltip" target="TaharezGreenLook/Tooltip" />
+    <WindowAlias alias="MenuWidgets/Tree" target="TaharezGreenLook/Tree" />
 </GUIScheme>
Index: code/branches/ogre1.9/data/gui/schemes/TaharezHUDWidgets.scheme
===================================================================
--- code/branches/ogre1.9/data/gui/schemes/TaharezHUDWidgets.scheme	(revision 11128)
+++ code/branches/ogre1.9/data/gui/schemes/TaharezHUDWidgets.scheme	(revision 11211)
@@ -1,42 +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" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUIScheme name="TaharezHUDWidgets" version="5">
+    <WindowAlias alias="HUDWidgets/StaticImage" target="TaharezLook/StaticImage" />
+    <WindowAlias alias="HUDWidgets/StaticText" target="TaharezLook/StaticText" />
+    <WindowAlias alias="HUDWidgets/TabButtonPane" target="TaharezLook/TabButtonPane" />
+    <WindowAlias alias="HUDWidgets/TabContentPane" target="TaharezLook/TabContentPane" />
+    <WindowAlias alias="HUDWidgets/Checkbox" target="TaharezLook/Checkbox" />
+    <WindowAlias alias="HUDWidgets/Combobox" target="TaharezLook/Combobox" />
+    <WindowAlias alias="HUDWidgets/ComboDropList" target="TaharezLook/ComboDropList" />
+    <WindowAlias alias="HUDWidgets/ComboEditbox" target="TaharezLook/ComboEditbox" />
+    <WindowAlias alias="HUDWidgets/Editbox" target="TaharezLook/Editbox" />
+    <WindowAlias alias="HUDWidgets/FrameWindow" target="TaharezLook/FrameWindow" />
+    <WindowAlias alias="HUDWidgets/GroupBox" target="TaharezLook/GroupBox" />
+    <WindowAlias alias="HUDWidgets/ItemListbox" target="TaharezLook/ItemListbox" />
+    <WindowAlias alias="HUDWidgets/ListboxItem" target="TaharezLook/ListboxItem" />
+    <WindowAlias alias="HUDWidgets/Listbox" target="TaharezLook/Listbox" />
+    <WindowAlias alias="HUDWidgets/ListHeader" target="TaharezLook/ListHeader" />
+    <WindowAlias alias="HUDWidgets/ListHeaderSegment" target="TaharezLook/ListHeaderSegment" />
+    <WindowAlias alias="HUDWidgets/MultiLineEditbox" target="TaharezLook/MultiLineEditbox" />
+    <WindowAlias alias="HUDWidgets/Menubar" target="TaharezLook/Menubar" />
+    <WindowAlias alias="HUDWidgets/MenuItem" target="TaharezLook/MenuItem" />
+    <WindowAlias alias="HUDWidgets/MultiColumnList" target="TaharezLook/MultiColumnList" />
+    <WindowAlias alias="HUDWidgets/PopupMenu" target="TaharezLook/PopupMenu" />
+    <WindowAlias alias="HUDWidgets/ProgressBar" target="TaharezLook/ProgressBar" />
+    <WindowAlias alias="HUDWidgets/Button" target="TaharezLook/Button" />
+    <WindowAlias alias="HUDWidgets/ImageButton" target="TaharezLook/ImageButton" />
+    <WindowAlias alias="HUDWidgets/RadioButton" target="TaharezLook/RadioButton" />
+    <WindowAlias alias="HUDWidgets/SystemButton" target="TaharezLook/SystemButton" />
+    <WindowAlias alias="HUDWidgets/ScrollablePane" target="TaharezLook/ScrollablePane" />
+    <WindowAlias alias="HUDWidgets/HorizontalScrollbar" target="TaharezLook/HorizontalScrollbar" />
+    <WindowAlias alias="HUDWidgets/VerticalScrollbar" target="TaharezLook/VerticalScrollbar" />
+    <WindowAlias alias="HUDWidgets/Slider" target="TaharezLook/Slider" />
+    <WindowAlias alias="HUDWidgets/Spinner" target="TaharezLook/Spinner" />
+    <WindowAlias alias="HUDWidgets/TabButton" target="TaharezLook/TabButton" />
+    <WindowAlias alias="HUDWidgets/TabControl" target="TaharezLook/TabControl" />
+    <WindowAlias alias="HUDWidgets/HorizontalScrollbarThumb" target="TaharezLook/HorizontalScrollbarThumb" />
+    <WindowAlias alias="HUDWidgets/SliderThumb" target="TaharezLook/SliderThumb" />
+    <WindowAlias alias="HUDWidgets/VerticalScrollbarThumb" target="TaharezLook/VerticalScrollbarThumb" />
+    <WindowAlias alias="HUDWidgets/Titlebar" target="TaharezLook/Titlebar" />
+    <WindowAlias alias="HUDWidgets/Tooltip" target="TaharezLook/Tooltip" />
+    <WindowAlias alias="HUDWidgets/Tree" target="TaharezLook/Tree" />
 </GUIScheme>
Index: code/branches/ogre1.9/data/gui/schemes/TaharezLook.scheme
===================================================================
--- code/branches/ogre1.9/data/gui/schemes/TaharezLook.scheme	(revision 11128)
+++ code/branches/ogre1.9/data/gui/schemes/TaharezLook.scheme	(revision 11211)
@@ -1,53 +1,49 @@
-<?xml version="1.0" ?>
-<GUIScheme Name="TaharezLook">
-    <Imageset Name="TaharezLook" Filename="TaharezLook.imageset" />
-    <LookNFeel Filename="TaharezLook.looknfeel" />
-    <WindowRendererSet Filename="CEGUIFalagardWRBase" />
-
-    <!-- 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" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUIScheme name="TaharezLook" version="5">
+    <Imageset filename="TaharezLook.imageset" name="TaharezLook" />
+    <LookNFeel filename="TaharezLook.looknfeel" />
+    <WindowRendererSet filename="CEGUICoreWindowRendererSet" />
+    <FalagardMapping lookNFeel="TaharezLook/StaticImage" renderer="Core/StaticImage" targetType="DefaultWindow" windowType="TaharezLook/StaticImage" />
+    <FalagardMapping lookNFeel="TaharezLook/StaticText" renderer="Core/StaticText" targetType="DefaultWindow" windowType="TaharezLook/StaticText" />
+    <FalagardMapping lookNFeel="TaharezLook/TabButtonPane" renderer="Core/Default" targetType="DefaultWindow" windowType="TaharezLook/TabButtonPane" />
+    <FalagardMapping lookNFeel="TaharezLook/TabContentPane" renderer="Core/Default" targetType="DefaultWindow" windowType="TaharezLook/TabContentPane" />
+    <FalagardMapping lookNFeel="TaharezLook/Checkbox" renderer="Core/ToggleButton" targetType="CEGUI/ToggleButton" windowType="TaharezLook/Checkbox" />
+    <FalagardMapping lookNFeel="TaharezLook/Combobox" renderer="Core/Default" targetType="CEGUI/Combobox" windowType="TaharezLook/Combobox" />
+    <FalagardMapping lookNFeel="TaharezLook/ComboDropList" renderer="Core/Listbox" targetType="CEGUI/ComboDropList" windowType="TaharezLook/ComboDropList" />
+    <FalagardMapping lookNFeel="TaharezLook/ComboEditbox" renderer="Core/Editbox" targetType="CEGUI/Editbox" windowType="TaharezLook/ComboEditbox" />
+    <FalagardMapping lookNFeel="TaharezLook/Editbox" renderer="Core/Editbox" targetType="CEGUI/Editbox" windowType="TaharezLook/Editbox" />
+    <FalagardMapping lookNFeel="TaharezLook/FrameWindow" renderer="Core/FrameWindow" targetType="CEGUI/FrameWindow" windowType="TaharezLook/FrameWindow" />
+    <FalagardMapping lookNFeel="TaharezLook/GroupBox" renderer="Core/Default" targetType="CEGUI/GroupBox" windowType="TaharezLook/GroupBox" />
+    <FalagardMapping lookNFeel="TaharezLook/ItemListbox" renderer="Core/ItemListbox" targetType="CEGUI/ItemListbox" windowType="TaharezLook/ItemListbox" />
+    <FalagardMapping lookNFeel="TaharezLook/ListboxItem" renderer="Core/ItemEntry" targetType="CEGUI/ItemEntry" windowType="TaharezLook/ListboxItem" />
+    <FalagardMapping lookNFeel="TaharezLook/Listbox" renderer="Core/Listbox" targetType="CEGUI/Listbox" windowType="TaharezLook/Listbox" />
+    <FalagardMapping lookNFeel="TaharezLook/ListHeader" renderer="Core/ListHeader" targetType="CEGUI/ListHeader" windowType="TaharezLook/ListHeader" />
+    <FalagardMapping lookNFeel="TaharezLook/ListHeaderSegment" renderer="Core/ListHeaderSegment" targetType="CEGUI/ListHeaderSegment" windowType="TaharezLook/ListHeaderSegment" />
+    <FalagardMapping lookNFeel="TaharezLook/MultiLineEditbox" renderer="Core/MultiLineEditbox" targetType="CEGUI/MultiLineEditbox" windowType="TaharezLook/MultiLineEditbox" />
+    <FalagardMapping lookNFeel="TaharezLook/Menubar" renderer="Core/Menubar" targetType="CEGUI/Menubar" windowType="TaharezLook/Menubar" />
+    <FalagardMapping lookNFeel="TaharezLook/MenuItem" renderer="Core/MenuItem" targetType="CEGUI/MenuItem" windowType="TaharezLook/MenuItem" />
+    <FalagardMapping lookNFeel="TaharezLook/MultiColumnList" renderer="Core/MultiColumnList" targetType="CEGUI/MultiColumnList" windowType="TaharezLook/MultiColumnList" />
+    <FalagardMapping lookNFeel="TaharezLook/PopupMenu" renderer="Core/PopupMenu" targetType="CEGUI/PopupMenu" windowType="TaharezLook/PopupMenu" />
+    <FalagardMapping lookNFeel="TaharezLook/ProgressBar" renderer="Core/ProgressBar" targetType="CEGUI/ProgressBar" windowType="TaharezLook/ProgressBar" />
+    <FalagardMapping lookNFeel="TaharezLook/Button" renderer="Core/Button" targetType="CEGUI/PushButton" windowType="TaharezLook/Button" />
+    <FalagardMapping lookNFeel="TaharezLook/ImageButton" renderer="Core/Button" targetType="CEGUI/PushButton" windowType="TaharezLook/ImageButton" />
+    <FalagardMapping lookNFeel="TaharezLook/RadioButton" renderer="Core/ToggleButton" targetType="CEGUI/RadioButton" windowType="TaharezLook/RadioButton" />
+    <FalagardMapping lookNFeel="TaharezLook/Button" renderer="Core/Button" targetType="CEGUI/PushButton" windowType="TaharezLook/SystemButton" />
+    <FalagardMapping lookNFeel="TaharezLook/ScrollablePane" renderer="Core/ScrollablePane" targetType="CEGUI/ScrollablePane" windowType="TaharezLook/ScrollablePane" />
+    <FalagardMapping lookNFeel="TaharezLook/HorizontalScrollbar" renderer="Core/Scrollbar" targetType="CEGUI/Scrollbar" windowType="TaharezLook/HorizontalScrollbar" />
+    <FalagardMapping lookNFeel="TaharezLook/VerticalScrollbar" renderer="Core/Scrollbar" targetType="CEGUI/Scrollbar" windowType="TaharezLook/VerticalScrollbar" />
+    <FalagardMapping lookNFeel="TaharezLook/Slider" renderer="Core/Slider" targetType="CEGUI/Slider" windowType="TaharezLook/Slider" />
+    <FalagardMapping lookNFeel="TaharezLook/Spinner" renderer="Core/Default" targetType="CEGUI/Spinner" windowType="TaharezLook/Spinner" />
+    <FalagardMapping lookNFeel="TaharezLook/TabButton" renderer="Core/TabButton" targetType="CEGUI/TabButton" windowType="TaharezLook/TabButton" />
+    <FalagardMapping lookNFeel="TaharezLook/TabControl" renderer="Core/TabControl" targetType="CEGUI/TabControl" windowType="TaharezLook/TabControl" />
+    <FalagardMapping lookNFeel="TaharezLook/HorizontalScrollbarThumb" renderer="Core/Button" targetType="CEGUI/Thumb" windowType="TaharezLook/HorizontalScrollbarThumb" />
+    <FalagardMapping lookNFeel="TaharezLook/SliderThumb" renderer="Core/Button" targetType="CEGUI/Thumb" windowType="TaharezLook/SliderThumb" />
+    <FalagardMapping lookNFeel="TaharezLook/VerticalScrollbarThumb" renderer="Core/Button" targetType="CEGUI/Thumb" windowType="TaharezLook/VerticalScrollbarThumb" />
+    <FalagardMapping lookNFeel="TaharezLook/Titlebar" renderer="Core/Titlebar" targetType="CEGUI/Titlebar" windowType="TaharezLook/Titlebar" />
+    <FalagardMapping lookNFeel="TaharezLook/Tooltip" renderer="Core/Tooltip" targetType="CEGUI/Tooltip" windowType="TaharezLook/Tooltip" />
+    <FalagardMapping lookNFeel="TaharezLook/Tree" renderer="Core/Tree" targetType="CEGUI/Tree" windowType="TaharezLook/Tree" />
+    <FalagardMapping lookNFeel="TaharezLook/AltProgressBar" renderer="Core/ProgressBar" targetType="CEGUI/ProgressBar" windowType="TaharezLook/AlternateProgressBar" />
+    <FalagardMapping lookNFeel="TaharezLook/VUMeter" renderer="Core/ProgressBar" targetType="CEGUI/ProgressBar" windowType="TaharezLook/VUMeter" />
+    <FalagardMapping lookNFeel="TaharezLook/LargeVerticalScrollbar" renderer="Core/Scrollbar" targetType="CEGUI/Scrollbar" windowType="TaharezLook/LargeVerticalScrollbar" />
+    <FalagardMapping lookNFeel="TaharezLook/LargeVerticalScrollbarThumb" renderer="Core/Button" targetType="CEGUI/Thumb" windowType="TaharezLook/LargeVerticalScrollbarThumb" />
 </GUIScheme>
Index: code/branches/ogre1.9/data/gui/schemes/TaharezMenuWidgets.scheme
===================================================================
--- code/branches/ogre1.9/data/gui/schemes/TaharezMenuWidgets.scheme	(revision 11128)
+++ code/branches/ogre1.9/data/gui/schemes/TaharezMenuWidgets.scheme	(revision 11211)
@@ -1,42 +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" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUIScheme name="TaharezMenuWidgets" version="5">
+    <WindowAlias alias="MenuWidgets/StaticImage" target="TaharezLook/StaticImage" />
+    <WindowAlias alias="MenuWidgets/StaticText" target="TaharezLook/StaticText" />
+    <WindowAlias alias="MenuWidgets/TabButtonPane" target="TaharezLook/TabButtonPane" />
+    <WindowAlias alias="MenuWidgets/TabContentPane" target="TaharezLook/TabContentPane" />
+    <WindowAlias alias="MenuWidgets/Checkbox" target="TaharezLook/Checkbox" />
+    <WindowAlias alias="MenuWidgets/Combobox" target="TaharezLook/Combobox" />
+    <WindowAlias alias="MenuWidgets/ComboDropList" target="TaharezLook/ComboDropList" />
+    <WindowAlias alias="MenuWidgets/ComboEditbox" target="TaharezLook/ComboEditbox" />
+    <WindowAlias alias="MenuWidgets/Editbox" target="TaharezLook/Editbox" />
+    <WindowAlias alias="MenuWidgets/FrameWindow" target="TaharezLook/FrameWindow" />
+    <WindowAlias alias="MenuWidgets/GroupBox" target="TaharezLook/GroupBox" />
+    <WindowAlias alias="MenuWidgets/ItemListbox" target="TaharezLook/ItemListbox" />
+    <WindowAlias alias="MenuWidgets/ListboxItem" target="TaharezLook/ListboxItem" />
+    <WindowAlias alias="MenuWidgets/Listbox" target="TaharezLook/Listbox" />
+    <WindowAlias alias="MenuWidgets/ListHeader" target="TaharezLook/ListHeader" />
+    <WindowAlias alias="MenuWidgets/ListHeaderSegment" target="TaharezLook/ListHeaderSegment" />
+    <WindowAlias alias="MenuWidgets/MultiLineEditbox" target="TaharezLook/MultiLineEditbox" />
+    <WindowAlias alias="MenuWidgets/Menubar" target="TaharezLook/Menubar" />
+    <WindowAlias alias="MenuWidgets/MenuItem" target="TaharezLook/MenuItem" />
+    <WindowAlias alias="MenuWidgets/MultiColumnList" target="TaharezLook/MultiColumnList" />
+    <WindowAlias alias="MenuWidgets/PopupMenu" target="TaharezLook/PopupMenu" />
+    <WindowAlias alias="MenuWidgets/ProgressBar" target="TaharezLook/ProgressBar" />
+    <WindowAlias alias="MenuWidgets/Button" target="TaharezLook/Button" />
+    <WindowAlias alias="MenuWidgets/ImageButton" target="TaharezLook/ImageButton" />
+    <WindowAlias alias="MenuWidgets/RadioButton" target="TaharezLook/RadioButton" />
+    <WindowAlias alias="MenuWidgets/SystemButton" target="TaharezLook/SystemButton" />
+    <WindowAlias alias="MenuWidgets/ScrollablePane" target="TaharezLook/ScrollablePane" />
+    <WindowAlias alias="MenuWidgets/HorizontalScrollbar" target="TaharezLook/HorizontalScrollbar" />
+    <WindowAlias alias="MenuWidgets/VerticalScrollbar" target="TaharezLook/VerticalScrollbar" />
+    <WindowAlias alias="MenuWidgets/Slider" target="TaharezLook/Slider" />
+    <WindowAlias alias="MenuWidgets/Spinner" target="TaharezLook/Spinner" />
+    <WindowAlias alias="MenuWidgets/TabButton" target="TaharezLook/TabButton" />
+    <WindowAlias alias="MenuWidgets/TabControl" target="TaharezLook/TabControl" />
+    <WindowAlias alias="MenuWidgets/HorizontalScrollbarThumb" target="TaharezLook/HorizontalScrollbarThumb" />
+    <WindowAlias alias="MenuWidgets/SliderThumb" target="TaharezLook/SliderThumb" />
+    <WindowAlias alias="MenuWidgets/VerticalScrollbarThumb" target="TaharezLook/VerticalScrollbarThumb" />
+    <WindowAlias alias="MenuWidgets/Titlebar" target="TaharezLook/Titlebar" />
+    <WindowAlias alias="MenuWidgets/Tooltip" target="TaharezLook/Tooltip" />
+    <WindowAlias alias="MenuWidgets/Tree" target="TaharezLook/Tree" />
 </GUIScheme>
Index: code/branches/ogre1.9/data/gui/schemes/VanillaHUDWidgets.scheme
===================================================================
--- code/branches/ogre1.9/data/gui/schemes/VanillaHUDWidgets.scheme	(revision 11128)
+++ code/branches/ogre1.9/data/gui/schemes/VanillaHUDWidgets.scheme	(revision 11211)
@@ -1,42 +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" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUIScheme name="VanillaHUDWidgets" version="5">
+    <WindowAlias alias="HUDWidgets/StaticImage" target="Vanilla/StaticImage" />
+    <WindowAlias alias="HUDWidgets/StaticText" target="Vanilla/StaticText" />
+    <WindowAlias alias="HUDWidgets/TabButtonPane" target="Vanilla/TabButtonPane" />
+    <WindowAlias alias="HUDWidgets/TabContentPane" target="Vanilla/TabContentPane" />
+    <WindowAlias alias="HUDWidgets/Checkbox" target="Vanilla/Checkbox" />
+    <WindowAlias alias="HUDWidgets/Combobox" target="Vanilla/Combobox" />
+    <WindowAlias alias="HUDWidgets/ComboDropList" target="Vanilla/ComboDropList" />
+    <WindowAlias alias="HUDWidgets/ComboEditbox" target="Vanilla/ComboEditbox" />
+    <WindowAlias alias="HUDWidgets/Editbox" target="Vanilla/Editbox" />
+    <WindowAlias alias="HUDWidgets/FrameWindow" target="Vanilla/FrameWindow" />
+    <WindowAlias alias="HUDWidgets/GroupBox" target="Vanilla/GroupBox" />
+    <WindowAlias alias="HUDWidgets/ItemListbox" target="Vanilla/ItemListbox" />
+    <WindowAlias alias="HUDWidgets/ListboxItem" target="Vanilla/ListboxItem" />
+    <WindowAlias alias="HUDWidgets/Listbox" target="Vanilla/Listbox" />
+    <WindowAlias alias="HUDWidgets/ListHeader" target="Vanilla/ListHeader" />
+    <WindowAlias alias="HUDWidgets/ListHeaderSegment" target="Vanilla/ListHeaderSegment" />
+    <WindowAlias alias="HUDWidgets/MultiLineEditbox" target="Vanilla/MultiLineEditbox" />
+    <WindowAlias alias="HUDWidgets/Menubar" target="Vanilla/Menubar" />
+    <WindowAlias alias="HUDWidgets/MenuItem" target="Vanilla/MenuItem" />
+    <WindowAlias alias="HUDWidgets/MultiColumnList" target="Vanilla/MultiColumnList" />
+    <WindowAlias alias="HUDWidgets/PopupMenu" target="Vanilla/PopupMenu" />
+    <WindowAlias alias="HUDWidgets/ProgressBar" target="Vanilla/ProgressBar" />
+    <WindowAlias alias="HUDWidgets/Button" target="Vanilla/Button" />
+    <WindowAlias alias="HUDWidgets/ImageButton" target="Vanilla/ImageButton" />
+    <WindowAlias alias="HUDWidgets/RadioButton" target="Vanilla/RadioButton" />
+    <WindowAlias alias="HUDWidgets/SystemButton" target="Vanilla/SystemButton" />
+    <WindowAlias alias="HUDWidgets/ScrollablePane" target="Vanilla/ScrollablePane" />
+    <WindowAlias alias="HUDWidgets/HorizontalScrollbar" target="Vanilla/HorizontalScrollbar" />
+    <WindowAlias alias="HUDWidgets/VerticalScrollbar" target="Vanilla/VerticalScrollbar" />
+    <WindowAlias alias="HUDWidgets/Slider" target="Vanilla/Slider" />
+    <WindowAlias alias="HUDWidgets/Spinner" target="Vanilla/Spinner" />
+    <WindowAlias alias="HUDWidgets/TabButton" target="Vanilla/TabButton" />
+    <WindowAlias alias="HUDWidgets/TabControl" target="Vanilla/TabControl" />
+    <WindowAlias alias="HUDWidgets/HorizontalScrollbarThumb" target="Vanilla/HorizontalScrollbarThumb" />
+    <WindowAlias alias="HUDWidgets/SliderThumb" target="Vanilla/SliderThumb" />
+    <WindowAlias alias="HUDWidgets/VerticalScrollbarThumb" target="Vanilla/VerticalScrollbarThumb" />
+    <WindowAlias alias="HUDWidgets/Titlebar" target="Vanilla/Titlebar" />
+    <WindowAlias alias="HUDWidgets/Tooltip" target="Vanilla/Tooltip" />
+    <WindowAlias alias="HUDWidgets/Tree" target="Vanilla/Tree" />
 </GUIScheme>
Index: code/branches/ogre1.9/data/gui/schemes/VanillaLook.scheme
===================================================================
--- code/branches/ogre1.9/data/gui/schemes/VanillaLook.scheme	(revision 11128)
+++ code/branches/ogre1.9/data/gui/schemes/VanillaLook.scheme	(revision 11211)
@@ -1,53 +1,47 @@
-<?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 -->
+<?xml version='1.0' encoding='utf-8'?>
+<GUIScheme name="VanillaLook" version="5">
+    <Imageset filename="Vanilla.imageset" name="Vanilla-Images" />
+    <Imageset filename="TaharezLook.imageset" name="TaharezLook" />
+    <LookNFeel filename="Vanilla.looknfeel" />
+    <LookNFeel filename="TaharezLook.looknfeel" />
+    <WindowRendererSet filename="CEGUICoreWindowRendererSet" />
+    <FalagardMapping lookNFeel="Vanilla/StaticImage" renderer="Core/StaticImage" targetType="DefaultWindow" windowType="Vanilla/StaticImage" />
+    <FalagardMapping lookNFeel="Vanilla/StaticText" renderer="Core/StaticText" targetType="DefaultWindow" windowType="Vanilla/StaticText" />
+    <FalagardMapping lookNFeel="Vanilla/Editbox" renderer="Core/Editbox" targetType="CEGUI/Editbox" windowType="Vanilla/Editbox" />
+    <FalagardMapping lookNFeel="Vanilla/FrameWindow" renderer="Core/FrameWindow" targetType="CEGUI/FrameWindow" windowType="Vanilla/FrameWindow" />
+    <FalagardMapping lookNFeel="Vanilla/Listbox" renderer="Core/Listbox" targetType="CEGUI/Listbox" windowType="Vanilla/Listbox" />
+    <FalagardMapping lookNFeel="Vanilla/MultiLineEditbox" renderer="Core/MultiLineEditbox" targetType="CEGUI/MultiLineEditbox" windowType="Vanilla/MultiLineEditbox" />
+    <FalagardMapping lookNFeel="Vanilla/Button" renderer="Core/Button" targetType="CEGUI/PushButton" windowType="Vanilla/Button" />
+    <FalagardMapping lookNFeel="Vanilla/HorizontalScrollbar" renderer="Core/Scrollbar" targetType="CEGUI/Scrollbar" windowType="Vanilla/HorizontalScrollbar" />
+    <FalagardMapping lookNFeel="Vanilla/VerticalScrollbar" renderer="Core/Scrollbar" targetType="CEGUI/Scrollbar" windowType="Vanilla/VerticalScrollbar" />
+    <FalagardMapping lookNFeel="Vanilla/HorizontalScrollbarThumb" renderer="Core/Button" targetType="CEGUI/Thumb" windowType="Vanilla/HorizontalScrollbarThumb" />
+    <FalagardMapping lookNFeel="Vanilla/VerticalScrollbarThumb" renderer="Core/Button" targetType="CEGUI/Thumb" windowType="Vanilla/VerticalScrollbarThumb" />
+    <FalagardMapping lookNFeel="Vanilla/Titlebar" renderer="Core/Titlebar" targetType="CEGUI/Titlebar" windowType="Vanilla/Titlebar" />
+    <FalagardMapping lookNFeel="TaharezLook/TabButtonPane" renderer="Core/Default" targetType="DefaultWindow" windowType="Vanilla/TabButtonPane" />
+    <FalagardMapping lookNFeel="TaharezLook/TabContentPane" renderer="Core/Default" targetType="DefaultWindow" windowType="Vanilla/TabContentPane" />
+    <FalagardMapping lookNFeel="TaharezLook/Checkbox" renderer="Core/ToggleButton" targetType="CEGUI/ToggleButton" windowType="Vanilla/Checkbox" />
+    <FalagardMapping lookNFeel="TaharezLook/Combobox" renderer="Core/Default" targetType="CEGUI/Combobox" windowType="Vanilla/Combobox" />
+    <FalagardMapping lookNFeel="TaharezLook/ComboDropList" renderer="Core/Listbox" targetType="CEGUI/ComboDropList" windowType="Vanilla/ComboDropList" />
+    <FalagardMapping lookNFeel="TaharezLook/ComboEditbox" renderer="Core/Editbox" targetType="CEGUI/Editbox" windowType="Vanilla/ComboEditbox" />
+    <FalagardMapping lookNFeel="TaharezLook/GroupBox" renderer="Core/Default" targetType="CEGUI/GroupBox" windowType="Vanilla/GroupBox" />
+    <FalagardMapping lookNFeel="TaharezLook/ItemListbox" renderer="Core/ItemListbox" targetType="CEGUI/ItemListbox" windowType="Vanilla/ItemListbox" />
+    <FalagardMapping lookNFeel="TaharezLook/ListboxItem" renderer="Core/ItemEntry" targetType="CEGUI/ItemEntry" windowType="Vanilla/ListboxItem" />
+    <FalagardMapping lookNFeel="TaharezLook/ListHeader" renderer="Core/ListHeader" targetType="CEGUI/ListHeader" windowType="Vanilla/ListHeader" />
+    <FalagardMapping lookNFeel="TaharezLook/ListHeaderSegment" renderer="Core/ListHeaderSegment" targetType="CEGUI/ListHeaderSegment" windowType="Vanilla/ListHeaderSegment" />
+    <FalagardMapping lookNFeel="TaharezLook/Menubar" renderer="Core/Menubar" targetType="CEGUI/Menubar" windowType="Vanilla/Menubar" />
+    <FalagardMapping lookNFeel="TaharezLook/MenuItem" renderer="Core/MenuItem" targetType="CEGUI/MenuItem" windowType="Vanilla/MenuItem" />
+    <FalagardMapping lookNFeel="TaharezLook/MultiColumnList" renderer="Core/MultiColumnList" targetType="CEGUI/MultiColumnList" windowType="Vanilla/MultiColumnList" />
+    <FalagardMapping lookNFeel="TaharezLook/PopupMenu" renderer="Core/PopupMenu" targetType="CEGUI/PopupMenu" windowType="Vanilla/PopupMenu" />
+    <FalagardMapping lookNFeel="TaharezLook/ProgressBar" renderer="Core/ProgressBar" targetType="CEGUI/ProgressBar" windowType="Vanilla/ProgressBar" />
+    <FalagardMapping lookNFeel="TaharezLook/ImageButton" renderer="Core/Button" targetType="CEGUI/PushButton" windowType="Vanilla/ImageButton" />
+    <FalagardMapping lookNFeel="TaharezLook/RadioButton" renderer="Core/ToggleButton" targetType="CEGUI/RadioButton" windowType="Vanilla/RadioButton" />
+    <FalagardMapping lookNFeel="TaharezLook/Button" renderer="Core/Button" targetType="CEGUI/PushButton" windowType="Vanilla/SystemButton" />
+    <FalagardMapping lookNFeel="TaharezLook/ScrollablePane" renderer="Core/ScrollablePane" targetType="CEGUI/ScrollablePane" windowType="Vanilla/ScrollablePane" />
+    <FalagardMapping lookNFeel="TaharezLook/Slider" renderer="Core/Slider" targetType="CEGUI/Slider" windowType="Vanilla/Slider" />
+    <FalagardMapping lookNFeel="TaharezLook/Spinner" renderer="Core/Default" targetType="CEGUI/Spinner" windowType="Vanilla/Spinner" />
+    <FalagardMapping lookNFeel="TaharezLook/TabButton" renderer="Core/TabButton" targetType="CEGUI/TabButton" windowType="Vanilla/TabButton" />
+    <FalagardMapping lookNFeel="TaharezLook/TabControl" renderer="Core/TabControl" targetType="CEGUI/TabControl" windowType="Vanilla/TabControl" />
+    <FalagardMapping lookNFeel="TaharezLook/SliderThumb" renderer="Core/Button" targetType="CEGUI/Thumb" windowType="Vanilla/SliderThumb" />
+    <FalagardMapping lookNFeel="TaharezLook/Tooltip" renderer="Core/Tooltip" targetType="CEGUI/Tooltip" windowType="Vanilla/Tooltip" />
+    <FalagardMapping lookNFeel="TaharezLook/Tree" renderer="Core/Tree" targetType="CEGUI/Tree" windowType="Vanilla/Tree" />
 </GUIScheme>
Index: code/branches/ogre1.9/data/gui/schemes/VanillaMenuWidgets.scheme
===================================================================
--- code/branches/ogre1.9/data/gui/schemes/VanillaMenuWidgets.scheme	(revision 11128)
+++ code/branches/ogre1.9/data/gui/schemes/VanillaMenuWidgets.scheme	(revision 11211)
@@ -1,42 +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" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUIScheme name="VanillaMenuWidgets" version="5">
+    <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: code/branches/ogre1.9/data/gui/schemes/WindowsHUDWidgets.scheme
===================================================================
--- code/branches/ogre1.9/data/gui/schemes/WindowsHUDWidgets.scheme	(revision 11128)
+++ code/branches/ogre1.9/data/gui/schemes/WindowsHUDWidgets.scheme	(revision 11211)
@@ -1,42 +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" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUIScheme name="WindowsHUDWidgets" version="5">
+    <WindowAlias alias="HUDWidgets/StaticImage" target="WindowsLook/StaticImage" />
+    <WindowAlias alias="HUDWidgets/StaticText" target="WindowsLook/StaticText" />
+    <WindowAlias alias="HUDWidgets/TabButtonPane" target="WindowsLook/TabButtonPane" />
+    <WindowAlias alias="HUDWidgets/TabContentPane" target="WindowsLook/TabContentPane" />
+    <WindowAlias alias="HUDWidgets/Checkbox" target="WindowsLook/Checkbox" />
+    <WindowAlias alias="HUDWidgets/Combobox" target="WindowsLook/Combobox" />
+    <WindowAlias alias="HUDWidgets/ComboDropList" target="WindowsLook/ComboDropList" />
+    <WindowAlias alias="HUDWidgets/ComboEditbox" target="WindowsLook/ComboEditbox" />
+    <WindowAlias alias="HUDWidgets/Editbox" target="WindowsLook/Editbox" />
+    <WindowAlias alias="HUDWidgets/FrameWindow" target="WindowsLook/FrameWindow" />
+    <WindowAlias alias="HUDWidgets/GroupBox" target="WindowsLook/GroupBox" />
+    <WindowAlias alias="HUDWidgets/ItemListbox" target="WindowsLook/ItemListbox" />
+    <WindowAlias alias="HUDWidgets/ListboxItem" target="WindowsLook/ListboxItem" />
+    <WindowAlias alias="HUDWidgets/Listbox" target="WindowsLook/Listbox" />
+    <WindowAlias alias="HUDWidgets/ListHeader" target="WindowsLook/ListHeader" />
+    <WindowAlias alias="HUDWidgets/ListHeaderSegment" target="WindowsLook/ListHeaderSegment" />
+    <WindowAlias alias="HUDWidgets/MultiLineEditbox" target="WindowsLook/MultiLineEditbox" />
+    <WindowAlias alias="HUDWidgets/Menubar" target="WindowsLook/Menubar" />
+    <WindowAlias alias="HUDWidgets/MenuItem" target="WindowsLook/MenuItem" />
+    <WindowAlias alias="HUDWidgets/MultiColumnList" target="WindowsLook/MultiColumnList" />
+    <WindowAlias alias="HUDWidgets/PopupMenu" target="WindowsLook/PopupMenu" />
+    <WindowAlias alias="HUDWidgets/ProgressBar" target="WindowsLook/ProgressBar" />
+    <WindowAlias alias="HUDWidgets/Button" target="WindowsLook/Button" />
+    <WindowAlias alias="HUDWidgets/ImageButton" target="WindowsLook/ImageButton" />
+    <WindowAlias alias="HUDWidgets/RadioButton" target="WindowsLook/RadioButton" />
+    <WindowAlias alias="HUDWidgets/SystemButton" target="WindowsLook/SystemButton" />
+    <WindowAlias alias="HUDWidgets/ScrollablePane" target="WindowsLook/ScrollablePane" />
+    <WindowAlias alias="HUDWidgets/HorizontalScrollbar" target="WindowsLook/HorizontalScrollbar" />
+    <WindowAlias alias="HUDWidgets/VerticalScrollbar" target="WindowsLook/VerticalScrollbar" />
+    <WindowAlias alias="HUDWidgets/Slider" target="WindowsLook/Slider" />
+    <WindowAlias alias="HUDWidgets/Spinner" target="WindowsLook/Spinner" />
+    <WindowAlias alias="HUDWidgets/TabButton" target="WindowsLook/TabButton" />
+    <WindowAlias alias="HUDWidgets/TabControl" target="WindowsLook/TabControl" />
+    <WindowAlias alias="HUDWidgets/HorizontalScrollbarThumb" target="WindowsLook/HorizontalScrollbarThumb" />
+    <WindowAlias alias="HUDWidgets/SliderThumb" target="WindowsLook/SliderThumb" />
+    <WindowAlias alias="HUDWidgets/VerticalScrollbarThumb" target="WindowsLook/VerticalScrollbarThumb" />
+    <WindowAlias alias="HUDWidgets/Titlebar" target="WindowsLook/Titlebar" />
+    <WindowAlias alias="HUDWidgets/Tooltip" target="WindowsLook/Tooltip" />
+    <WindowAlias alias="HUDWidgets/Tree" target="WindowsLook/Tree" />
 </GUIScheme>
Index: code/branches/ogre1.9/data/gui/schemes/WindowsLook.scheme
===================================================================
--- code/branches/ogre1.9/data/gui/schemes/WindowsLook.scheme	(revision 11128)
+++ code/branches/ogre1.9/data/gui/schemes/WindowsLook.scheme	(revision 11211)
@@ -1,55 +1,49 @@
-<?xml version="1.0" ?>
-<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" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUIScheme name="WindowsLook" version="5">
+    <Imageset filename="WindowsLook.imageset" name="WindowsLook" />
+    <Imageset filename="TaharezLook.imageset" name="TaharezLook" />
+    <LookNFeel filename="WindowsLook.looknfeel" />
+    <LookNFeel filename="TaharezLook.looknfeel" />
+    <WindowRendererSet filename="CEGUICoreWindowRendererSet" />
+    <FalagardMapping lookNFeel="WindowsLook/StaticImage" renderer="Core/StaticImage" targetType="DefaultWindow" windowType="WindowsLook/StaticImage" />
+    <FalagardMapping lookNFeel="WindowsLook/StaticText" renderer="Core/StaticText" targetType="DefaultWindow" windowType="WindowsLook/StaticText" />
+    <FalagardMapping lookNFeel="WindowsLook/TabButtonPane" renderer="Core/Default" targetType="DefaultWindow" windowType="WindowsLook/TabButtonPane" />
+    <FalagardMapping lookNFeel="WindowsLook/TabContentPane" renderer="Core/Default" targetType="DefaultWindow" windowType="WindowsLook/TabContentPane" />
+    <FalagardMapping lookNFeel="WindowsLook/Checkbox" renderer="Core/ToggleButton" targetType="CEGUI/ToggleButton" windowType="WindowsLook/Checkbox" />
+    <FalagardMapping lookNFeel="WindowsLook/Combobox" renderer="Core/Default" targetType="CEGUI/Combobox" windowType="WindowsLook/Combobox" />
+    <FalagardMapping lookNFeel="WindowsLook/ComboDropList" renderer="Core/Listbox" targetType="CEGUI/ComboDropList" windowType="WindowsLook/ComboDropList" />
+    <FalagardMapping lookNFeel="WindowsLook/Editbox" renderer="Core/Editbox" targetType="CEGUI/Editbox" windowType="WindowsLook/Editbox" />
+    <FalagardMapping lookNFeel="WindowsLook/FrameWindow" renderer="Core/FrameWindow" targetType="CEGUI/FrameWindow" windowType="WindowsLook/FrameWindow" />
+    <FalagardMapping lookNFeel="WindowsLook/GroupBox" renderer="Core/Default" targetType="CEGUI/GroupBox" windowType="WindowsLook/GroupBox" />
+    <FalagardMapping lookNFeel="WindowsLook/ItemListbox" renderer="Core/ItemListbox" targetType="CEGUI/ItemListbox" windowType="WindowsLook/ItemListbox" />
+    <FalagardMapping lookNFeel="WindowsLook/ListboxItem" renderer="Core/ItemEntry" targetType="CEGUI/ItemEntry" windowType="WindowsLook/ListboxItem" />
+    <FalagardMapping lookNFeel="WindowsLook/Listbox" renderer="Core/Listbox" targetType="CEGUI/Listbox" windowType="WindowsLook/Listbox" />
+    <FalagardMapping lookNFeel="WindowsLook/ListHeader" renderer="Core/ListHeader" targetType="CEGUI/ListHeader" windowType="WindowsLook/ListHeader" />
+    <FalagardMapping lookNFeel="WindowsLook/ListHeaderSegment" renderer="Core/ListHeaderSegment" targetType="CEGUI/ListHeaderSegment" windowType="WindowsLook/ListHeaderSegment" />
+    <FalagardMapping lookNFeel="WindowsLook/MultiLineEditbox" renderer="Core/MultiLineEditbox" targetType="CEGUI/MultiLineEditbox" windowType="WindowsLook/MultiLineEditbox" />
+    <FalagardMapping lookNFeel="WindowsLook/Menubar" renderer="Core/Menubar" targetType="CEGUI/Menubar" windowType="WindowsLook/Menubar" />
+    <FalagardMapping lookNFeel="WindowsLook/MenuItem" renderer="Core/MenuItem" targetType="CEGUI/MenuItem" windowType="WindowsLook/MenuItem" />
+    <FalagardMapping lookNFeel="WindowsLook/MultiColumnList" renderer="Core/MultiColumnList" targetType="CEGUI/MultiColumnList" windowType="WindowsLook/MultiColumnList" />
+    <FalagardMapping lookNFeel="WindowsLook/PopupMenu" renderer="Core/PopupMenu" targetType="CEGUI/PopupMenu" windowType="WindowsLook/PopupMenu" />
+    <FalagardMapping lookNFeel="WindowsLook/ProgressBar" renderer="Core/ProgressBar" targetType="CEGUI/ProgressBar" windowType="WindowsLook/ProgressBar" />
+    <FalagardMapping lookNFeel="WindowsLook/Button" renderer="Core/Button" targetType="CEGUI/PushButton" windowType="WindowsLook/Button" />
+    <FalagardMapping lookNFeel="WindowsLook/RadioButton" renderer="Core/ToggleButton" targetType="CEGUI/RadioButton" windowType="WindowsLook/RadioButton" />
+    <FalagardMapping lookNFeel="WindowsLook/Button" renderer="Core/Button" targetType="CEGUI/PushButton" windowType="WindowsLook/SystemButton" />
+    <FalagardMapping lookNFeel="WindowsLook/ScrollablePane" renderer="Core/ScrollablePane" targetType="CEGUI/ScrollablePane" windowType="WindowsLook/ScrollablePane" />
+    <FalagardMapping lookNFeel="WindowsLook/HorizontalScrollbar" renderer="Core/Scrollbar" targetType="CEGUI/Scrollbar" windowType="WindowsLook/HorizontalScrollbar" />
+    <FalagardMapping lookNFeel="WindowsLook/VerticalScrollbar" renderer="Core/Scrollbar" targetType="CEGUI/Scrollbar" windowType="WindowsLook/VerticalScrollbar" />
+    <FalagardMapping lookNFeel="WindowsLook/Slider" renderer="Core/Slider" targetType="CEGUI/Slider" windowType="WindowsLook/Slider" />
+    <FalagardMapping lookNFeel="WindowsLook/Spinner" renderer="Core/Default" targetType="CEGUI/Spinner" windowType="WindowsLook/Spinner" />
+    <FalagardMapping lookNFeel="WindowsLook/TabButton" renderer="Core/TabButton" targetType="CEGUI/TabButton" windowType="WindowsLook/TabButton" />
+    <FalagardMapping lookNFeel="WindowsLook/TabControl" renderer="Core/TabControl" targetType="CEGUI/TabControl" windowType="WindowsLook/TabControl" />
+    <FalagardMapping lookNFeel="WindowsLook/HorizontalScrollbarThumb" renderer="Core/Button" targetType="CEGUI/Thumb" windowType="WindowsLook/HorizontalScrollbarThumb" />
+    <FalagardMapping lookNFeel="WindowsLook/SliderThumb" renderer="Core/Button" targetType="CEGUI/Thumb" windowType="WindowsLook/SliderThumb" />
+    <FalagardMapping lookNFeel="WindowsLook/VerticalScrollbarThumb" renderer="Core/Button" targetType="CEGUI/Thumb" windowType="WindowsLook/VerticalScrollbarThumb" />
+    <FalagardMapping lookNFeel="WindowsLook/Titlebar" renderer="Core/Titlebar" targetType="CEGUI/Titlebar" windowType="WindowsLook/Titlebar" />
+    <FalagardMapping lookNFeel="WindowsLook/Tooltip" renderer="Core/Tooltip" targetType="CEGUI/Tooltip" windowType="WindowsLook/Tooltip" />
+    <FalagardMapping lookNFeel="TaharezLook/ComboEditbox" renderer="Core/Editbox" targetType="CEGUI/Editbox" windowType="WindowsLook/ComboEditbox" />
+    <FalagardMapping lookNFeel="TaharezLook/ImageButton" renderer="Core/Button" targetType="CEGUI/PushButton" windowType="WindowsLook/ImageButton" />
+    <FalagardMapping lookNFeel="TaharezLook/Tree" renderer="Core/Tree" targetType="CEGUI/Tree" windowType="WindowsLook/Tree" />
+    <FalagardMapping lookNFeel="WindowsLook/IconButton" renderer="Core/Button" targetType="CEGUI/PushButton" windowType="WindowsLook/IconButton" />
+    <FalagardMapping lookNFeel="WindowsLook/Static" renderer="Core/Static" targetType="DefaultWindow" windowType="WindowsLook/Static" />
 </GUIScheme>
Index: code/branches/ogre1.9/data/gui/schemes/WindowsMenuWidgets.scheme
===================================================================
--- code/branches/ogre1.9/data/gui/schemes/WindowsMenuWidgets.scheme	(revision 11128)
+++ code/branches/ogre1.9/data/gui/schemes/WindowsMenuWidgets.scheme	(revision 11211)
@@ -1,42 +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" />
+<?xml version='1.0' encoding='utf-8'?>
+<GUIScheme name="WindowsMenuWidgets" version="5">
+    <WindowAlias alias="MenuWidgets/StaticImage" target="WindowsLook/StaticImage" />
+    <WindowAlias alias="MenuWidgets/StaticText" target="WindowsLook/StaticText" />
+    <WindowAlias alias="MenuWidgets/TabButtonPane" target="WindowsLook/TabButtonPane" />
+    <WindowAlias alias="MenuWidgets/TabContentPane" target="WindowsLook/TabContentPane" />
+    <WindowAlias alias="MenuWidgets/Checkbox" target="WindowsLook/Checkbox" />
+    <WindowAlias alias="MenuWidgets/Combobox" target="WindowsLook/Combobox" />
+    <WindowAlias alias="MenuWidgets/ComboDropList" target="WindowsLook/ComboDropList" />
+    <WindowAlias alias="MenuWidgets/ComboEditbox" target="WindowsLook/ComboEditbox" />
+    <WindowAlias alias="MenuWidgets/Editbox" target="WindowsLook/Editbox" />
+    <WindowAlias alias="MenuWidgets/FrameWindow" target="WindowsLook/FrameWindow" />
+    <WindowAlias alias="MenuWidgets/GroupBox" target="WindowsLook/GroupBox" />
+    <WindowAlias alias="MenuWidgets/ItemListbox" target="WindowsLook/ItemListbox" />
+    <WindowAlias alias="MenuWidgets/ListboxItem" target="WindowsLook/ListboxItem" />
+    <WindowAlias alias="MenuWidgets/Listbox" target="WindowsLook/Listbox" />
+    <WindowAlias alias="MenuWidgets/ListHeader" target="WindowsLook/ListHeader" />
+    <WindowAlias alias="MenuWidgets/ListHeaderSegment" target="WindowsLook/ListHeaderSegment" />
+    <WindowAlias alias="MenuWidgets/MultiLineEditbox" target="WindowsLook/MultiLineEditbox" />
+    <WindowAlias alias="MenuWidgets/Menubar" target="WindowsLook/Menubar" />
+    <WindowAlias alias="MenuWidgets/MenuItem" target="WindowsLook/MenuItem" />
+    <WindowAlias alias="MenuWidgets/MultiColumnList" target="WindowsLook/MultiColumnList" />
+    <WindowAlias alias="MenuWidgets/PopupMenu" target="WindowsLook/PopupMenu" />
+    <WindowAlias alias="MenuWidgets/ProgressBar" target="WindowsLook/ProgressBar" />
+    <WindowAlias alias="MenuWidgets/Button" target="WindowsLook/Button" />
+    <WindowAlias alias="MenuWidgets/ImageButton" target="WindowsLook/ImageButton" />
+    <WindowAlias alias="MenuWidgets/RadioButton" target="WindowsLook/RadioButton" />
+    <WindowAlias alias="MenuWidgets/SystemButton" target="WindowsLook/SystemButton" />
+    <WindowAlias alias="MenuWidgets/ScrollablePane" target="WindowsLook/ScrollablePane" />
+    <WindowAlias alias="MenuWidgets/HorizontalScrollbar" target="WindowsLook/HorizontalScrollbar" />
+    <WindowAlias alias="MenuWidgets/VerticalScrollbar" target="WindowsLook/VerticalScrollbar" />
+    <WindowAlias alias="MenuWidgets/Slider" target="WindowsLook/Slider" />
+    <WindowAlias alias="MenuWidgets/Spinner" target="WindowsLook/Spinner" />
+    <WindowAlias alias="MenuWidgets/TabButton" target="WindowsLook/TabButton" />
+    <WindowAlias alias="MenuWidgets/TabControl" target="WindowsLook/TabControl" />
+    <WindowAlias alias="MenuWidgets/HorizontalScrollbarThumb" target="WindowsLook/HorizontalScrollbarThumb" />
+    <WindowAlias alias="MenuWidgets/SliderThumb" target="WindowsLook/SliderThumb" />
+    <WindowAlias alias="MenuWidgets/VerticalScrollbarThumb" target="WindowsLook/VerticalScrollbarThumb" />
+    <WindowAlias alias="MenuWidgets/Titlebar" target="WindowsLook/Titlebar" />
+    <WindowAlias alias="MenuWidgets/Tooltip" target="WindowsLook/Tooltip" />
+    <WindowAlias alias="MenuWidgets/Tree" target="WindowsLook/Tree" />
 </GUIScheme>
Index: code/branches/ogre1.9/data/gui/scripts/AudioMenu.lua
===================================================================
--- code/branches/ogre1.9/data/gui/scripts/AudioMenu.lua	(revision 11128)
+++ code/branches/ogre1.9/data/gui/scripts/AudioMenu.lua	(revision 11211)
@@ -37,5 +37,5 @@
     for k,v in pairs(themeList) do
         item = CEGUI.createListboxTextItem(v)
-        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
         CEGUI.toListbox(listboxwindow):addItem(item)
     end
Index: code/branches/ogre1.9/data/gui/scripts/DockingDialog.lua
===================================================================
--- code/branches/ogre1.9/data/gui/scripts/DockingDialog.lua	(revision 11128)
+++ code/branches/ogre1.9/data/gui/scripts/DockingDialog.lua	(revision 11211)
@@ -42,5 +42,5 @@
     for k in pairs(P.docks) do
         local item = CEGUI.createListboxTextItem("Dock " .. k)
-        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
         listbox:addItem(item)
         if k == 1 then
Index: code/branches/ogre1.9/data/gui/scripts/GUISheet.lua
===================================================================
--- code/branches/ogre1.9/data/gui/scripts/GUISheet.lua	(revision 11128)
+++ code/branches/ogre1.9/data/gui/scripts/GUISheet.lua	(revision 11211)
@@ -66,5 +66,5 @@
 function P:load()
     -- Load the layout that describes the sheet
-    self.window = winMgr:loadWindowLayout(self.name .. ".layout")
+    self.window = winMgr:loadLayoutFromFile(self.name .. ".layout")
     if self.window == nil then
         error("Could not load layout file for GUI sheet '"..self.name.."'")
Index: code/branches/ogre1.9/data/gui/scripts/GameplayMenu.lua
===================================================================
--- code/branches/ogre1.9/data/gui/scripts/GameplayMenu.lua	(revision 11128)
+++ code/branches/ogre1.9/data/gui/scripts/GameplayMenu.lua	(revision 11211)
@@ -11,5 +11,5 @@
     for k,v in pairs(themeList) do
         item = CEGUI.createListboxTextItem(v)
-        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
         CEGUI.toCombobox(dropdown):addItem(item)
     end
Index: code/branches/ogre1.9/data/gui/scripts/GraphicsMenu.lua
===================================================================
--- code/branches/ogre1.9/data/gui/scripts/GraphicsMenu.lua	(revision 11128)
+++ code/branches/ogre1.9/data/gui/scripts/GraphicsMenu.lua	(revision 11211)
@@ -39,5 +39,5 @@
     for k,v in pairs(P.resolutionList) do
         local item = CEGUI.createListboxTextItem(v)
-        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
         resolutionCombobox:addItem(item)
     end
@@ -49,5 +49,5 @@
     for k,v in pairs(P.schemeList) do
         local item = CEGUI.createListboxTextItem(v)
-        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
         themeCombobox:addItem(item)
     end
@@ -59,5 +59,5 @@
     for k,v in pairs(P.fsaaList) do
         local item = CEGUI.createListboxTextItem(v)
-        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
         fsaaCombobox:addItem(item)
     end
@@ -69,5 +69,5 @@
     for k,v in pairs(P.particleLodList) do
         local item = CEGUI.createListboxTextItem(v)
-        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
         particleLodCombobox:addItem(item)
     end
Index: code/branches/ogre1.9/data/gui/scripts/HostMenu.lua
===================================================================
--- code/branches/ogre1.9/data/gui/scripts/HostMenu.lua	(revision 11128)
+++ code/branches/ogre1.9/data/gui/scripts/HostMenu.lua	(revision 11211)
@@ -73,5 +73,5 @@
     for k,v in pairs(P.levelList) do
         local item = CEGUI.createListboxTextItem(v:getName())
-        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
         listbox:addItem(item)
         if v:getXMLFilename() == preselect then
Index: code/branches/ogre1.9/data/gui/scripts/InitialiseGUI.lua
===================================================================
--- code/branches/ogre1.9/data/gui/scripts/InitialiseGUI.lua	(revision 11128)
+++ code/branches/ogre1.9/data/gui/scripts/InitialiseGUI.lua	(revision 11211)
@@ -8,5 +8,5 @@
 -- Load all required skins
 --schemeMgr:create("TaharezGreenLook.scheme")
-schemeMgr:create(scheme .. "Look.scheme")
+schemeMgr:createFromFile(scheme .. "Look.scheme")
 --schemeMgr:create("TaharezLook.scheme")
 --schemeMgr:create("WindowsLook.scheme")
@@ -21,16 +21,16 @@
 --schemeMgr:create("TaharezGreenHUDWidgets.scheme")
 --hudImageSet = "TaharezGreenLook"
-schemeMgr:create(scheme .. "MenuWidgets.scheme")
+schemeMgr:createFromFile(scheme .. "MenuWidgets.scheme")
 menuImageSet = scheme .. "Look"
-schemeMgr:create(scheme .. "HUDWidgets.scheme")
+schemeMgr:createFromFile(scheme .. "HUDWidgets.scheme")
 hudImageSet = scheme .. "Look"
 
 -- Just a remaining test hack
-schemeMgr:create("OrxonoxGUIScheme.scheme")
+schemeMgr:createFromFile("OrxonoxGUIScheme.scheme")
 
-local system = CEGUI.System:getSingleton()
-system:setDefaultMouseCursor(menuImageSet, "MouseArrow")
+local system = CEGUI.System:getSingleton():getDefaultGUIContext()
+system:getMouseCursor():setDefaultImage(menuImageSet .. "/MouseArrow")
 system:setDefaultFont("BlueHighway-12")
-system:setDefaultTooltip("MenuWidgets/Tooltip")
+system:setDefaultTooltipType("MenuWidgets/Tooltip")
 
 -- Convenience function and additional tools
Index: code/branches/ogre1.9/data/gui/scripts/MainMenu.lua
===================================================================
--- code/branches/ogre1.9/data/gui/scripts/MainMenu.lua	(revision 11128)
+++ code/branches/ogre1.9/data/gui/scripts/MainMenu.lua	(revision 11211)
@@ -7,30 +7,30 @@
     --buttons are arranged in a 6x1 Matrix (list)
     P:setButton(1, 1, {
-            ["button"] = winMgr:getWindow("orxonox/QuickGameTestButton"),
+            ["button"] = P.window:getChild("QuickGameTestButton"),
             ["callback"]  = P.QuickGameTestButton_clicked
     })
 
     P:setButton(2, 1, {
-            ["button"] = winMgr:getWindow("orxonox/SingleplayerButton"),
+            ["button"] = P.window:getChild("SingleplayerButton"),
             ["callback"]  = P.SingleplayerButton_clicked
     })
 
     P:setButton(3, 1, {
-            ["button"] = winMgr:getWindow("orxonox/MultiplayerButton"),
+            ["button"] = P.window:getChild("MultiplayerButton"),
             ["callback"]  = P.MultiplayerButton_clicked
     })
 
     P:setButton(4, 1, {
-            ["button"] = winMgr:getWindow("orxonox/SettingsButton"),
+            ["button"] = P.window:getChild("SettingsButton"),
             ["callback"]  = P.SettingsButton_clicked
     })
 
     P:setButton(5, 1, {
-            ["button"] = winMgr:getWindow("orxonox/CreditsButton"),
+            ["button"] = P.window:getChild("CreditsButton"),
             ["callback"]  = P.CreditsButton_clicked
     })
 
     P:setButton(6, 1, {
-            ["button"] = winMgr:getWindow("orxonox/ExitButton"),
+            ["button"] = P.window:getChild("ExitButton"),
             ["callback"]  = P.ExitButton_clicked
     })
Index: code/branches/ogre1.9/data/gui/scripts/MultiplayerMenu.lua
===================================================================
--- code/branches/ogre1.9/data/gui/scripts/MultiplayerMenu.lua	(revision 11128)
+++ code/branches/ogre1.9/data/gui/scripts/MultiplayerMenu.lua	(revision 11211)
@@ -115,5 +115,5 @@
             item:setID(index)
             index = index + 1
-            item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+            item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
             CEGUI.toListbox(listbox):addItem(item)
         end
@@ -152,5 +152,5 @@
             item:setID(index)
             index = index + 1
-            item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+            item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
             CEGUI.toListbox(listbox):addItem(item)
         end
Index: code/branches/ogre1.9/data/gui/scripts/PickupInventory.lua
===================================================================
--- code/branches/ogre1.9/data/gui/scripts/PickupInventory.lua	(revision 11128)
+++ code/branches/ogre1.9/data/gui/scripts/PickupInventory.lua	(revision 11211)
@@ -117,5 +117,5 @@
 
     local image = winMgr:createWindow("MenuWidgets/StaticImage", name .. "/Image")
-    image:setProperty("Image", "set:PickupInventory image:" .. representation:getInventoryRepresentation())
+    image:setProperty("Image", "PickupInventory/" .. representation:getInventoryRepresentation())
     image:setProperty("BackgroundEnabled", "set:False")
     image:setProperty("FrameEnabled", "set:True")
@@ -218,5 +218,5 @@
     
     local image = winMgr:createWindow("MenuWidgets/StaticImage", name .. "/Image")
-    image:setProperty("Image", "set:PickupInventory image:" .. representation:getInventoryRepresentation())
+    image:setProperty("Image", "PickupInventory/" .. representation:getInventoryRepresentation())
     image:setProperty("BackgroundEnabled", "set:False")
     image:setProperty("FrameEnabled", "set:True")
Index: code/branches/ogre1.9/data/gui/scripts/QuestGUI.lua
===================================================================
--- code/branches/ogre1.9/data/gui/scripts/QuestGUI.lua	(revision 11128)
+++ code/branches/ogre1.9/data/gui/scripts/QuestGUI.lua	(revision 11211)
@@ -104,5 +104,5 @@
     if P.showActive == quest:isActive(P.player) then
         local item = CEGUI.createListboxTextItem(P.questManager:getDescription(quest):getTitle())
-        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
         list:addItem(item)
         table.insert(P.quests, quest)
@@ -141,5 +141,5 @@
             local quest = P.questManager:getSubQuest(quest, P.player, i)
             local item = CEGUI.createListboxTextItem(P.questManager:getDescription(quest):getTitle())
-            item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+            item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
             list:addItem(item)
             table.insert(P.subquests, quest)
Index: code/branches/ogre1.9/data/gui/scripts/SheetManager.lua
===================================================================
--- code/branches/ogre1.9/data/gui/scripts/SheetManager.lua	(revision 11128)
+++ code/branches/ogre1.9/data/gui/scripts/SheetManager.lua	(revision 11211)
@@ -1,5 +1,6 @@
 -- SheetManager.lua
 
-local cursor = CEGUI.MouseCursor:getSingleton()
+local cursor = CEGUI.System:getSingleton():getDefaultGUIContext():getMouseCursor()
+--local cursor = CEGUI.MouseCursor:getSingleton()
 local loadedSheets = {}
 local activeMenuSheets = {size = 0, topSheetTuple = nil}
@@ -107,5 +108,5 @@
 
     -- Add sheet to the root window
-    menuSheetsRoot:addChildWindow(menuSheet.window)
+    menuSheetsRoot:addChild(menuSheet.window)
 
     -- If sheet is the MainMenu
@@ -177,5 +178,5 @@
 
     -- Remove sheet with its tuple from the table
-    menuSheetsRoot:removeChildWindow(sheetTuple.sheet.window)
+    menuSheetsRoot:removeChild(sheetTuple.sheet.window)
     table.remove(activeMenuSheets, table.findIndex(activeMenuSheets, sheetTuple))
     activeMenuSheets[name] = nil
Index: code/branches/ogre1.9/data/gui/scripts/ShipSelectionMenu.lua
===================================================================
--- code/branches/ogre1.9/data/gui/scripts/ShipSelectionMenu.lua	(revision 11128)
+++ code/branches/ogre1.9/data/gui/scripts/ShipSelectionMenu.lua	(revision 11211)
@@ -34,5 +34,5 @@
         --if tag == nil or v:hasStartingShip(tag) then
             local item = CEGUI.createListboxTextItem(v)
-            item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+            item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
             listbox:addItem(item)
             table.insert(tabIndexes, k)
@@ -88,5 +88,5 @@
         --local imageName = selectedlevel:getScreenshot()
         -- set the screenshot and the description for the selected level
-        --levelImage:setProperty("Image", "set:"..levelXMLFilename..imageName.." image:full_image")
+        --levelImage:setProperty("Image", levelXMLFilename..imageName.."/full_image")
         --levelDescription:setText(level:getDescription())
         -- only enable config button for "gametype" levels
Index: code/branches/ogre1.9/data/gui/scripts/SingleplayerMenu.lua
===================================================================
--- code/branches/ogre1.9/data/gui/scripts/SingleplayerMenu.lua	(revision 11128)
+++ code/branches/ogre1.9/data/gui/scripts/SingleplayerMenu.lua	(revision 11211)
@@ -87,5 +87,5 @@
         if tag == nil or v:hasTag(tag) then
             local item = CEGUI.createListboxTextItem(v:getName())
-            item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+            item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
             listbox:addItem(item)
             table.insert(tabIndexes, k)
@@ -130,5 +130,5 @@
         local imageName = level:getScreenshot()
         -- set the screenshot and the description for the selected level
-        levelImage:setProperty("Image", "set:"..levelXMLFilename..imageName.." image:full_image")
+        levelImage:setProperty("Image", levelXMLFilename..imageName.."/full_image")
         levelDescription:setText(level:getDescription())
         -- only enable config button for "gametype" levels
Index: code/branches/ogre1.9/data/gui/scripts/UndockingDialog.lua
===================================================================
--- code/branches/ogre1.9/data/gui/scripts/UndockingDialog.lua	(revision 11128)
+++ code/branches/ogre1.9/data/gui/scripts/UndockingDialog.lua	(revision 11211)
@@ -42,5 +42,5 @@
     for k in pairs(P.docks) do
         local item = CEGUI.createListboxTextItem("Dock " .. k)
-        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
         listbox:addItem(item)
         if k == 1 then
