Index: code/branches/ogre1.9/data/gui/layouts/AudioMenu.layout
===================================================================
--- code/branches/ogre1.9/data/gui/layouts/AudioMenu.layout	(revision 11125)
+++ 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 11125)
+++ 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 11125)
+++ 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 11125)
+++ 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 11125)
+++ 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 11125)
+++ 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 11125)
+++ 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 11125)
+++ 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 11125)
+++ 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 11125)
+++ 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 11125)
+++ 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 11125)
+++ 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 11125)
+++ 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 11125)
+++ 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 11125)
+++ 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 11125)
+++ 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 11125)
+++ 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 11125)
+++ 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 11125)
+++ 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 11125)
+++ 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 11125)
+++ 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 11125)
+++ 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 11125)
+++ 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 11125)
+++ 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 11125)
+++ 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 11125)
+++ 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 11125)
+++ 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 11125)
+++ 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 11125)
+++ 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 11125)
+++ 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 11125)
+++ 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>
