Index: /code/branches/cegui0.8_ogre1.9/cmake/tools/FindCEGUI.cmake
===================================================================
--- /code/branches/cegui0.8_ogre1.9/cmake/tools/FindCEGUI.cmake	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/cmake/tools/FindCEGUI.cmake	(revision 11795)
@@ -39,5 +39,5 @@
 
 # Find CEGUI headers
-COMPARE_VERSION_STRINGS("${CEGUI_VERSION}" "0.8" _version_0_8_compare TRUE)
+COMPARE_VERSION_STRINGS("${CEGUI_VERSION}" "0.8" _version_0_8_compare)
 # Version 0.8 introduced a new directory and file naming convention
 IF(_version_0_8_compare GREATER -1)
Index: /code/branches/cegui0.8_ogre1.9/cmake/tools/FindOGRE.cmake
===================================================================
--- /code/branches/cegui0.8_ogre1.9/cmake/tools/FindOGRE.cmake	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/cmake/tools/FindOGRE.cmake	(revision 11795)
@@ -38,4 +38,21 @@
 # Inspect OgrePrerquisites.h for the version number
 DETERMINE_VERSION(OGRE ${OGRE_INCLUDE_DIR}/OgrePrerequisites.h)
+COMPARE_VERSION_STRINGS("${OGRE_VERSION}" "1.9" _version_1_9_compare TRUE)
+# Version 1.9 moved overlays into a separate component (which means we must find and link to another library)
+IF(_version_1_9_compare GREATER -1)
+  FIND_LIBRARY(OGRE_OVERLAY_LIBRARY_OPTIMIZED
+    NAMES OgreOverlay
+    PATHS $ENV{OGRE_HOME}
+    PATH_SUFFIXES lib bin/Release bin/release Release release
+  )
+  FIND_LIBRARY(OGRE_OVERLAY_LIBRARY_DEBUG
+    NAMES OgreOverlayd OgreOverlay_d OgreOverlayD OgreOverlay_D
+    PATHS $ENV{OGRE_HOME}
+    PATH_SUFFIXES lib bin/Debug bin/debug Debug debug
+  )
+  SET(OGRE_REQUIRED_VARIABLES
+    OGRE_OVERLAY_LIBRARY_OPTIMIZED
+  )
+ENDIF()
 
 # Handle the REQUIRED argument and set OGRE_FOUND
@@ -44,8 +61,10 @@
   OGRE_LIBRARY_OPTIMIZED
   OGRE_INCLUDE_DIR
+  ${OGRE_REQUIRED_VARIABLES}
 )
 
 # Collect optimized and debug libraries
 HANDLE_LIBRARY_TYPES(OGRE)
+HANDLE_LIBRARY_TYPES(OGRE_OVERLAY)
 
 MARK_AS_ADVANCED(
@@ -53,3 +72,5 @@
   OGRE_LIBRARY_OPTIMIZED
   OGRE_LIBRARY_DEBUG
+  OGRE_OVERLAY_LIBRARY_OPTIMIZED
+  OGRE_OVERLAY_LIBRARY_DEBUG
 )
Index: /code/branches/cegui0.8_ogre1.9/data/gui/configs/CEGUIConfig.xsd
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/gui/configs/CEGUIConfig.xsd	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/gui/configs/CEGUIConfig.xsd	(revision 11795)
@@ -1,8 +1,88 @@
 <?xml version="1.0"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-
     <xsd:element name="CEGUIConfig" type="CEGUIConfigType"/>
 
-    <xsd:simpleType name="LogLevel">
+    <xsd:complexType name="CEGUIConfigType">
+        <xsd:sequence>
+            <xsd:choice minOccurs="0" maxOccurs="unbounded">
+                <xsd:element name="Logging" type="loggingType" />
+                <xsd:element name="AutoLoad" type="autoLoadType" />
+                <xsd:element name="ResourceDirectory" type="resourceDirectoryType" />
+                <xsd:element name="DefaultResourceGroup" type="defaultResourceGroupType" />
+                <xsd:element name="Scripting" type="scriptingType" />
+                <xsd:element name="DefaultXMLParser" type="defaultObjectType" />
+                <xsd:element name="DefaultImageCodec" type="defaultObjectType" />
+                <xsd:element name="DefaultFont" type="defaultObjectType" />
+                <xsd:element name="DefaultMouseCursor" type="defaultMouseCursorType" />
+                <xsd:element name="DefaultTooltip" type="defaultObjectType" />
+                <xsd:element name="DefaultGUISheet" type="defaultObjectType" />
+            </xsd:choice>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="loggingType">
+        <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+                <xsd:attribute name="filename" type="xsd:string" use="optional" default="CEGUI.log" />
+                <xsd:attribute name="level" type="logLevel" use="optional" default="Standard" />
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="autoLoadType">
+        <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+                <xsd:attribute name="type" type="resourceType" use="required" />
+                <xsd:attribute name="group" type="xsd:string" use="optional" default="" />
+                <xsd:attribute name="pattern" type="xsd:string" use="optional" default="*" />
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="resourceDirectoryType">
+        <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+                <xsd:attribute name="group" type="xsd:string" use="required" />
+                <xsd:attribute name="directory" type="xsd:string" use="required" />
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="defaultResourceGroupType">
+        <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+                <xsd:attribute name="type" type="resourceType" use="optional" default="Default" />
+                <xsd:attribute name="group" type="xsd:string" use="required" />
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="scriptingType">
+        <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+                <xsd:attribute name="initScript" type="xsd:string" use="optional" default="" />
+                <xsd:attribute name="terminateScript" type="xsd:string" use="optional" default="" />
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="defaultObjectType">
+        <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+                <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="defaultMouseCursorType">
+        <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+                <xsd:attribute name="imageset" type="xsd:string" use="required" />
+                <xsd:attribute name="image" type="xsd:string" use="required" />
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+
+    <xsd:simpleType name="logLevel">
         <xsd:restriction base="xsd:string">
             <xsd:enumeration value="Errors"/>
@@ -13,16 +93,16 @@
     </xsd:simpleType>
 
-    <xsd:complexType name="CEGUIConfigType">
-        <xsd:attribute name="Logfile" type="xsd:string" use="optional" default=""/>
-        <xsd:attribute name="Scheme" type="xsd:string" use="optional" default=""/>
-        <xsd:attribute name="DefaultFont" type="xsd:string" use="optional" default=""/>
-        <xsd:attribute name="Layout" type="xsd:string" use="optional" default=""/>
-        <xsd:attribute name="InitScript" type="xsd:string" use="optional" default=""/>
-        <xsd:attribute name="TerminateScript" type="xsd:string" use="optional" default=""/>
-        <xsd:attribute name="DefaultResourceGroup" type="xsd:string" use="optional"  default="" />
-        <xsd:attribute name="LoggingLevel" type="LogLevel" use="optional"  default="Standard" />
-    </xsd:complexType>
+    <xsd:simpleType name="resourceType">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="Imageset"/>
+            <xsd:enumeration value="Font"/>
+            <xsd:enumeration value="Scheme"/>
+            <xsd:enumeration value="LookNFeel"/>
+            <xsd:enumeration value="Layout"/>
+            <xsd:enumeration value="Script"/>
+            <xsd:enumeration value="XMLSchema"/>
+            <xsd:enumeration value="Default"/>
+        </xsd:restriction>
+    </xsd:simpleType>
 
 </xsd:schema>
-
-
Index: /code/branches/cegui0.8_ogre1.9/data/gui/layouts/ChatBox-inputonly.layout
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/gui/layouts/ChatBox-inputonly.layout	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/gui/layouts/ChatBox-inputonly.layout	(revision 11795)
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <GUILayout version="4">
-    <Window name="Root" type="DefaultWindow">
+    <Window name="ChatBox-inputonly" type="DefaultWindow">
         <Property name="InheritsAlpha" value="False" />
         <Property name="MaxSize" value="{{1,0},{1,0}}" />
Index: /code/branches/cegui0.8_ogre1.9/data/gui/layouts/ChatBox.layout
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/gui/layouts/ChatBox.layout	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/gui/layouts/ChatBox.layout	(revision 11795)
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='utf-8'?>
 <GUILayout version="4">
-    <Window name="Root" type="DefaultWindow">
+    <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="ChatBox" type="MenuWidgets/FrameWindow">
+        <Window name="frame" type="MenuWidgets/FrameWindow">
             <Property name="Text" value="Chat" />
             <Property name="InheritsAlpha" value="False" />
Index: /code/branches/cegui0.8_ogre1.9/data/gui/layouts/GUILayout.xsd
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/gui/layouts/GUILayout.xsd	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/gui/layouts/GUILayout.xsd	(revision 11795)
@@ -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/cegui0.8_ogre1.9/data/gui/schemes/GUIScheme.xsd
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/gui/schemes/GUIScheme.xsd	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/gui/schemes/GUIScheme.xsd	(revision 11795)
@@ -1,54 +1,56 @@
 <?xml version="1.0" ?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <xsd:element name="GUIScheme" type="SchemeType" />
-    <xsd:complexType name="SchemeType">
+	<xsd:element name="GUIScheme" type="SchemeType" />
+	<xsd:complexType name="SchemeType">
         <xsd:choice minOccurs="0" maxOccurs="unbounded">
-            <xsd:element name="Imageset" type="NamedDataType" />
+			<xsd:element name="Imageset" type="NamedDataType" />
             <xsd:element name="ImagesetFromImage" type="NamedDataType" />
-            <xsd:element name="Font" type="NamedDataType" />
+			<xsd:element name="Font" type="NamedDataType" />
             <xsd:element name="LookNFeel" type="FileDataType" />
-            <xsd:element name="WindowSet" type="WindowSetType" />
-            <xsd:element name="WindowRendererSet" type="WindowRendererSetType" />
-            <xsd:element name="WindowAlias" type="WindowAliasType" />
+			<xsd:element name="WindowSet" type="WindowSetType" />
+			<xsd:element name="WindowRendererSet" type="WindowRendererSetType" />
+			<xsd:element name="WindowAlias" type="WindowAliasType" />
             <xsd:element name="FalagardMapping" type="FalagardMapType" />
-        </xsd:choice>
-        <xsd:attribute name="Name" type="xsd:string" use="required" />
+		</xsd:choice>
+		<xsd:attribute name="name" type="xsd:string" use="required" />
+		<xsd:attribute name="version" type="xsd:nonNegativeInteger" use="optional" default="0" />
+	</xsd:complexType>
+	<xsd:complexType name="WindowSetType">
+		<xsd:sequence>
+            <xsd:element name="WindowFactory" type="WindowFactoryType" minOccurs="0" maxOccurs="unbounded" />
+		</xsd:sequence>
+		<xsd:attribute name="filename" type="xsd:string" use="required" />
+	</xsd:complexType>
+	<xsd:complexType name="WindowRendererSetType">
+		<xsd:sequence>
+            <xsd:element name="WindowRendererFactory" type="WindowRendererFactoryType" minOccurs="0" maxOccurs="unbounded" />
+		</xsd:sequence>
+		<xsd:attribute name="filename" type="xsd:string" use="required" />
+	</xsd:complexType>
+    <xsd:complexType name="FileDataType">
+        <xsd:attribute name="filename" type="xsd:string" use="required" />
+        <xsd:attribute name="resourceGroup" type="xsd:string" use="optional"  default="" />
     </xsd:complexType>
-    <xsd:complexType name="WindowSetType">
-        <xsd:sequence>
-            <xsd:element name="WindowFactory" type="WindowFactoryType" minOccurs="0" maxOccurs="unbounded" />
-        </xsd:sequence>
-        <xsd:attribute name="Filename" type="xsd:string" use="required" />
-    </xsd:complexType>
-    <xsd:complexType name="WindowRendererSetType">
-        <xsd:sequence>
-            <xsd:element name="WindowRendererFactory" type="WindowRendererFactoryType" minOccurs="0" maxOccurs="unbounded" />
-        </xsd:sequence>
-        <xsd:attribute name="Filename" type="xsd:string" use="required" />
-    </xsd:complexType>
-    <xsd:complexType name="FileDataType">
-        <xsd:attribute name="Filename" type="xsd:string" use="required" />
-        <xsd:attribute name="ResourceGroup" type="xsd:string" use="optional"  default="" />
-    </xsd:complexType>
-    <xsd:complexType name="NamedDataType">
-        <xsd:attribute name="Name" type="xsd:string" use="required" />
-        <xsd:attribute name="Filename" type="xsd:string" use="required" />
-        <xsd:attribute name="ResourceGroup" type="xsd:string" use="optional"  default="" />
-    </xsd:complexType>
-    <xsd:complexType name="WindowFactoryType">
-        <xsd:attribute name="Name" type="xsd:string" use="required" />
-    </xsd:complexType>
-    <xsd:complexType name="WindowRendererFactoryType">
-        <xsd:attribute name="Name" type="xsd:string" use="required" />
-    </xsd:complexType>
-    <xsd:complexType name="WindowAliasType">
-        <xsd:attribute name="Alias" type="xsd:string" use="required" />
-        <xsd:attribute name="Target" type="xsd:string" use="required" />
-    </xsd:complexType>
+	<xsd:complexType name="NamedDataType">
+		<xsd:attribute name="name" type="xsd:string" use="optional" default="" />
+		<xsd:attribute name="filename" type="xsd:string" use="required" />
+		<xsd:attribute name="resourceGroup" type="xsd:string" use="optional"  default="" />
+	</xsd:complexType>
+	<xsd:complexType name="WindowFactoryType">
+		<xsd:attribute name="name" type="xsd:string" use="required" />
+	</xsd:complexType>
+	<xsd:complexType name="WindowRendererFactoryType">
+		<xsd:attribute name="name" type="xsd:string" use="required" />
+	</xsd:complexType>
+	<xsd:complexType name="WindowAliasType">
+		<xsd:attribute name="alias" type="xsd:string" use="required" />
+		<xsd:attribute name="target" type="xsd:string" use="required" />
+	</xsd:complexType>
     <xsd:complexType name="FalagardMapType">
-        <xsd:attribute name="WindowType" type="xsd:string" use="required" />
-        <xsd:attribute name="TargetType" type="xsd:string" use="required" />
-        <xsd:attribute name="Renderer" type="xsd:string" use="required" />
-        <xsd:attribute name="LookNFeel" type="xsd:string" use="required" />
+        <xsd:attribute name="windowType" type="xsd:string" use="required" />
+        <xsd:attribute name="targetType" type="xsd:string" use="required" />
+		<xsd:attribute name="renderer" type="xsd:string" use="required" />
+        <xsd:attribute name="lookNFeel" type="xsd:string" use="required" />
+        <xsd:attribute name="renderEffect" type="xsd:string" use="optional" default="" />
     </xsd:complexType>
 </xsd:schema>
Index: /code/branches/cegui0.8_ogre1.9/data/gui/scripts/AudioMenu.lua
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/gui/scripts/AudioMenu.lua	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/gui/scripts/AudioMenu.lua	(revision 11795)
@@ -37,5 +37,5 @@
     for k,v in pairs(themeList) do
         item = CEGUI.createListboxTextItem(v)
-        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
         CEGUI.toListbox(listboxwindow):addItem(item)
     end
Index: /code/branches/cegui0.8_ogre1.9/data/gui/scripts/DockingDialog.lua
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/gui/scripts/DockingDialog.lua	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/gui/scripts/DockingDialog.lua	(revision 11795)
@@ -42,5 +42,5 @@
     for k in pairs(P.docks) do
         local item = CEGUI.createListboxTextItem("Dock " .. k)
-        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
         listbox:addItem(item)
         if k == 1 then
Index: /code/branches/cegui0.8_ogre1.9/data/gui/scripts/GUISheet.lua
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/gui/scripts/GUISheet.lua	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/gui/scripts/GUISheet.lua	(revision 11795)
@@ -66,5 +66,5 @@
 function P:load()
     -- Load the layout that describes the sheet
-    self.window = winMgr:loadWindowLayout(self.name .. ".layout")
+    self.window = winMgr:loadLayoutFromFile(self.name .. ".layout")
     if self.window == nil then
         error("Could not load layout file for GUI sheet '"..self.name.."'")
Index: /code/branches/cegui0.8_ogre1.9/data/gui/scripts/GameplayMenu.lua
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/gui/scripts/GameplayMenu.lua	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/gui/scripts/GameplayMenu.lua	(revision 11795)
@@ -11,5 +11,5 @@
     for k,v in pairs(themeList) do
         item = CEGUI.createListboxTextItem(v)
-        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
         CEGUI.toCombobox(dropdown):addItem(item)
     end
Index: /code/branches/cegui0.8_ogre1.9/data/gui/scripts/GraphicsMenu.lua
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/gui/scripts/GraphicsMenu.lua	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/gui/scripts/GraphicsMenu.lua	(revision 11795)
@@ -39,5 +39,5 @@
     for k,v in pairs(P.resolutionList) do
         local item = CEGUI.createListboxTextItem(v)
-        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
         resolutionCombobox:addItem(item)
     end
@@ -49,5 +49,5 @@
     for k,v in pairs(P.schemeList) do
         local item = CEGUI.createListboxTextItem(v)
-        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
         themeCombobox:addItem(item)
     end
@@ -59,5 +59,5 @@
     for k,v in pairs(P.fsaaList) do
         local item = CEGUI.createListboxTextItem(v)
-        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
         fsaaCombobox:addItem(item)
     end
@@ -69,5 +69,5 @@
     for k,v in pairs(P.particleLodList) do
         local item = CEGUI.createListboxTextItem(v)
-        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
         particleLodCombobox:addItem(item)
     end
Index: /code/branches/cegui0.8_ogre1.9/data/gui/scripts/HostMenu.lua
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/gui/scripts/HostMenu.lua	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/gui/scripts/HostMenu.lua	(revision 11795)
@@ -73,5 +73,5 @@
     for k,v in pairs(P.levelList) do
         local item = CEGUI.createListboxTextItem(v:getName())
-        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
         listbox:addItem(item)
         if v:getXMLFilename() == preselect then
Index: /code/branches/cegui0.8_ogre1.9/data/gui/scripts/InitialiseGUI.lua
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/gui/scripts/InitialiseGUI.lua	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/gui/scripts/InitialiseGUI.lua	(revision 11795)
@@ -8,5 +8,5 @@
 -- Load all required skins
 --schemeMgr:create("TaharezGreenLook.scheme")
-schemeMgr:create(scheme .. "Look.scheme")
+schemeMgr:createFromFile(scheme .. "Look.scheme")
 --schemeMgr:create("TaharezLook.scheme")
 --schemeMgr:create("WindowsLook.scheme")
@@ -21,16 +21,16 @@
 --schemeMgr:create("TaharezGreenHUDWidgets.scheme")
 --hudImageSet = "TaharezGreenLook"
-schemeMgr:create(scheme .. "MenuWidgets.scheme")
+schemeMgr:createFromFile(scheme .. "MenuWidgets.scheme")
 menuImageSet = scheme .. "Look"
-schemeMgr:create(scheme .. "HUDWidgets.scheme")
+schemeMgr:createFromFile(scheme .. "HUDWidgets.scheme")
 hudImageSet = scheme .. "Look"
 
 -- Just a remaining test hack
-schemeMgr:create("OrxonoxGUIScheme.scheme")
+schemeMgr:createFromFile("OrxonoxGUIScheme.scheme")
 
-local system = CEGUI.System:getSingleton()
-system:setDefaultMouseCursor(menuImageSet, "MouseArrow")
+local system = CEGUI.System:getSingleton():getDefaultGUIContext()
+system:getMouseCursor():setDefaultImage(menuImageSet .. "/MouseArrow")
 system:setDefaultFont("BlueHighway-12")
-system:setDefaultTooltip("MenuWidgets/Tooltip")
+system:setDefaultTooltipType("MenuWidgets/Tooltip")
 
 -- Convenience function and additional tools
Index: /code/branches/cegui0.8_ogre1.9/data/gui/scripts/MainMenu.lua
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/gui/scripts/MainMenu.lua	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/gui/scripts/MainMenu.lua	(revision 11795)
@@ -7,35 +7,35 @@
     --buttons are arranged in a 6x1 Matrix (list)
     P:setButton(1, 1, {
-            ["button"] = winMgr:getWindow("orxonox/QuickGameTestButton"),
+            ["button"] = P.window:getChild("QuickGameTestButton"),
             ["callback"]  = P.QuickGameTestButton_clicked
     })
 
     P:setButton(2, 1, {
-            ["button"] = winMgr:getWindow("orxonox/SingleplayerButton"),
+            ["button"] = P.window:getChild("SingleplayerButton"),
             ["callback"]  = P.SingleplayerButton_clicked
     })
 
     P:setButton(3, 1, {
-            ["button"] = winMgr:getWindow("orxonox/MultiplayerButton"),
+            ["button"] = P.window:getChild("MultiplayerButton"),
             ["callback"]  = P.MultiplayerButton_clicked
     })
 
     P:setButton(4, 1, {
-            ["button"] = winMgr:getWindow("orxonox/HighscoreButton"),
+            ["button"] = P.window:getChild("HighscoreButton"),
             ["callback"]  = P.MultiplayerButton_clicked
     })
 
     P:setButton(5, 1, {
-            ["button"] = winMgr:getWindow("orxonox/SettingsButton"),
+            ["button"] = P.window:getChild("SettingsButton"),
             ["callback"]  = P.SettingsButton_clicked
     })
 
     P:setButton(6, 1, {
-            ["button"] = winMgr:getWindow("orxonox/CreditsButton"),
+            ["button"] = P.window:getChild("CreditsButton"),
             ["callback"]  = P.CreditsButton_clicked
     })
 
     P:setButton(7, 1, {
-            ["button"] = winMgr:getWindow("orxonox/ExitButton"),
+            ["button"] = P.window:getChild("ExitButton"),
             ["callback"]  = P.ExitButton_clicked
     })
Index: /code/branches/cegui0.8_ogre1.9/data/gui/scripts/MultiplayerMenu.lua
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/gui/scripts/MultiplayerMenu.lua	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/gui/scripts/MultiplayerMenu.lua	(revision 11795)
@@ -115,5 +115,5 @@
             item:setID(index)
             index = index + 1
-            item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+            item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
             CEGUI.toListbox(listbox):addItem(item)
         end
@@ -152,5 +152,5 @@
             item:setID(index)
             index = index + 1
-            item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+            item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
             CEGUI.toListbox(listbox):addItem(item)
         end
Index: /code/branches/cegui0.8_ogre1.9/data/gui/scripts/PickupInventory.lua
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/gui/scripts/PickupInventory.lua	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/gui/scripts/PickupInventory.lua	(revision 11795)
@@ -115,5 +115,5 @@
 
     local image = winMgr:createWindow("MenuWidgets/StaticImage", name .. "/Image")
-    image:setProperty("Image", "set:PickupInventory image:" .. representation:getInventoryRepresentation())
+    image:setProperty("Image", "PickupInventory/" .. representation:getInventoryRepresentation())
     image:setProperty("BackgroundEnabled", "set:False")
     image:setProperty("FrameEnabled", "set:True")
@@ -215,5 +215,5 @@
     
     local image = winMgr:createWindow("MenuWidgets/StaticImage", name .. "/Image")
-    image:setProperty("Image", "set:PickupInventory image:" .. representation:getInventoryRepresentation())
+    image:setProperty("Image", "PickupInventory/" .. representation:getInventoryRepresentation())
     image:setProperty("BackgroundEnabled", "set:False")
     image:setProperty("FrameEnabled", "set:True")
Index: /code/branches/cegui0.8_ogre1.9/data/gui/scripts/QuestGUI.lua
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/gui/scripts/QuestGUI.lua	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/gui/scripts/QuestGUI.lua	(revision 11795)
@@ -104,5 +104,5 @@
     if P.showActive == quest:isActive(P.player) then
         local item = CEGUI.createListboxTextItem(P.questManager:getDescription(quest):getTitle())
-        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
         list:addItem(item)
         table.insert(P.quests, quest)
@@ -141,5 +141,5 @@
             local quest = P.questManager:getSubQuest(quest, P.player, i)
             local item = CEGUI.createListboxTextItem(P.questManager:getDescription(quest):getTitle())
-            item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+            item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
             list:addItem(item)
             table.insert(P.subquests, quest)
Index: /code/branches/cegui0.8_ogre1.9/data/gui/scripts/SheetManager.lua
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/gui/scripts/SheetManager.lua	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/gui/scripts/SheetManager.lua	(revision 11795)
@@ -1,5 +1,6 @@
 -- SheetManager.lua
 
-local cursor = CEGUI.MouseCursor:getSingleton()
+local cursor = CEGUI.System:getSingleton():getDefaultGUIContext():getMouseCursor()
+--local cursor = CEGUI.MouseCursor:getSingleton()
 local loadedSheets = {}
 local activeMenuSheets = {size = 0, topSheetTuple = nil}
@@ -107,5 +108,5 @@
 
     -- Add sheet to the root window
-    menuSheetsRoot:addChildWindow(menuSheet.window)
+    menuSheetsRoot:addChild(menuSheet.window)
 
     -- If sheet is the MainMenu
@@ -177,5 +178,5 @@
 
     -- Remove sheet with its tuple from the table
-    menuSheetsRoot:removeChildWindow(sheetTuple.sheet.window)
+    menuSheetsRoot:removeChild(sheetTuple.sheet.window)
     table.remove(activeMenuSheets, table.findIndex(activeMenuSheets, sheetTuple))
     activeMenuSheets[name] = nil
Index: /code/branches/cegui0.8_ogre1.9/data/gui/scripts/ShipSelectionMenu.lua
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/gui/scripts/ShipSelectionMenu.lua	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/gui/scripts/ShipSelectionMenu.lua	(revision 11795)
@@ -34,5 +34,5 @@
         --if tag == nil or v:hasStartingShip(tag) then
             local item = CEGUI.createListboxTextItem(v)
-            item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+            item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
             listbox:addItem(item)
             table.insert(tabIndexes, k)
@@ -88,5 +88,5 @@
         --local imageName = selectedlevel:getScreenshot()
         -- set the screenshot and the description for the selected level
-        --levelImage:setProperty("Image", "set:"..levelXMLFilename..imageName.." image:full_image")
+        --levelImage:setProperty("Image", levelXMLFilename..imageName.."/full_image")
         --levelDescription:setText(level:getDescription())
         -- only enable config button for "gametype" levels
Index: /code/branches/cegui0.8_ogre1.9/data/gui/scripts/SingleplayerMenu.lua
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/gui/scripts/SingleplayerMenu.lua	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/gui/scripts/SingleplayerMenu.lua	(revision 11795)
@@ -87,5 +87,5 @@
         if tag == nil or v:hasTag(tag) then
             local item = CEGUI.createListboxTextItem(v:getName())
-            item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+            item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
             listbox:addItem(item)
             table.insert(tabIndexes, k)
@@ -130,5 +130,5 @@
         local imageName = level:getScreenshot()
         -- set the screenshot and the description for the selected level
-        levelImage:setProperty("Image", "set:"..levelXMLFilename..imageName.." image:full_image")
+        levelImage:setProperty("Image", levelXMLFilename..imageName.."/full_image")
         levelDescription:setText(level:getDescription())
         -- only enable config button for "gametype" levels
Index: /code/branches/cegui0.8_ogre1.9/data/gui/scripts/UndockingDialog.lua
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/gui/scripts/UndockingDialog.lua	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/gui/scripts/UndockingDialog.lua	(revision 11795)
@@ -42,5 +42,5 @@
     for k in pairs(P.docks) do
         local item = CEGUI.createListboxTextItem("Dock " .. k)
-        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
         listbox:addItem(item)
         if k == 1 then
Index: /code/branches/cegui0.8_ogre1.9/data/levels/asteroidField.oxw
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/levels/asteroidField.oxw	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/levels/asteroidField.oxw	(revision 11795)
@@ -66,5 +66,5 @@
 
     <!-- Planet close to spawn point -->
-    <Planet
+    <MovableEntity
       position="15000,0,0"
       scale="5000"
@@ -74,20 +74,25 @@
       mass="10000000"
       pitch="0"
-      mesh="planets/muunilinst.mesh"
-      atmosphere="atmosphere1"
       rotationaxis="1,0,0"
       rotationrate="1.0"
-      atmospheresize="80.0f"
-      imagesize="1024.0f"
       collisiondamage = 2
       enablecollisiondamage = true
     >
       <attached>
-        <ForceField position="5000,0,0" mode="sphere" diameter="10000" velocity="-50" />
+        <Planet
+          mesh="planets/muunilinst.mesh"
+          atmosphere="atmosphere1"
+          atmospheresize="80.0f"
+          imagesize="1024.0f"
+        >
+          <attached>
+            <ForceField position="5000,0,0" mode="sphere" diameter="10000" velocity="-50" />
+          </attached>
+        </Planet>
       </attached>
       <collisionShapes>
         <SphereCollisionShape radius="5000" position="0,0,0" />
       </collisionShapes>
-    </Planet>
+    </MovableEntity>
 
 
Index: /code/branches/cegui0.8_ogre1.9/data/levels/dockingToASpaceStation.oxw
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/levels/dockingToASpaceStation.oxw	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/levels/dockingToASpaceStation.oxw	(revision 11795)
@@ -153,5 +153,5 @@
     ?>
 
-    <Planet
+    <MovableEntity
       position="15000,0,-1000"
       scale="5000"
@@ -161,20 +161,25 @@
       mass="10000000"
       pitch="0"
-      mesh="planets/ganymede.mesh"
-      atmosphere="atmosphere1"
       rotationaxis="1,0,0"
       rotationrate="1.0"
-      atmospheresize="80.0f"
-      imagesize="1024.0f"
       collisiondamage = 2
       enablecollisiondamage = true
     >
       <attached>
-        <ForceField position="5000,0,0" mode="sphere" diameter="10000" velocity="-50" />
+        <Planet
+          mesh="planets/ganymede.mesh"
+          atmosphere="atmosphere1"
+          atmospheresize="80.0f"
+          imagesize="1024.0f"
+        >
+          <attached>
+            <ForceField position="5000,0,0" mode="sphere" diameter="10000" velocity="-50" />
+          </attached>
+        </Planet>
       </attached>
       <collisionShapes>
         <SphereCollisionShape radius="5000" position="0,0,0" />
       </collisionShapes>
-    </Planet>
+    </MovableEntity>
 
   </Scene>
Index: /code/branches/cegui0.8_ogre1.9/data/levels/dynamicMatch.oxw
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/levels/dynamicMatch.oxw	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/levels/dynamicMatch.oxw	(revision 11795)
@@ -33,6 +33,10 @@
 
 <!-- ------------------Planet needs gravity----------------- -->
-<Planet position="0,0,0" scale=500 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="8,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
-<StaticEntity position="0,0,0" collisionType=static>
+    <MovableEntity position="0,0,0" scale=500 pitch=-90 rotationaxis="8,1,0" rotationrate="1">
+      <attached>
+        <Planet mesh="iceplanet.mesh" atmosphere="atmosphere1" atmospheresize=224.0f imagesize=1024.0f />
+      </attached>
+    </MovableEntity>
+    <StaticEntity position="0,0,0" collisionType=static>
       <collisionShapes>
         <SphereCollisionShape radius="499" />
Index: /code/branches/cegui0.8_ogre1.9/data/levels/earth.oxw
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/levels/earth.oxw	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/levels/earth.oxw	(revision 11795)
@@ -56,54 +56,64 @@
 
     <!-- This is a model of Earth: mass=EarthMass/1000 and radius=EarthRadius[km]*10 -->
-    <Planet
+    <MovableEntity
       position="0,0,0"
       scale="63000"
+      pitch="0"
       collisionType="dynamic"
       linearDamping="0.8"
       angularDamping="0"
       mass="5.9e21"
-      pitch="0"
-      mesh="planets/earth.mesh"
-      atmosphere="atmosphere1"
       rotationaxis="0,1,0"
       rotationrate="0.2"
-      atmospheresize="80.0f"
-      imagesize="1024.0f"
       collisiondamage = 2
       enablecollisiondamage = true
     >
       <attached>
-        <ForceField position="0,0,0" mode="newtonianGravity" diameter="140000" massDiameter="126000" mass="5.9e21" />
+        <Planet
+          mesh="planets/earth.mesh"
+          atmosphere="atmosphere1"
+          atmospheresize="80.0f"
+          imagesize="1024.0f"
+        >
+          <attached>
+            <ForceField position="0,0,0" mode="newtonianGravity" diameter="140000" massDiameter="126000" mass="5.9e21" />
+          </attached>
+        </Planet>
       </attached>
       <collisionShapes>
         <SphereCollisionShape radius="63000" position="0,0,0" />
       </collisionShapes>
-    </Planet>
+    </MovableEntity>
 
     <!-- This is a model of our Moon: mass=MoonMass/1000 and radius=MoonRadius[km]*10 and position=DistanceFromEarth[km]*10 -->
-    <Planet
+    <MovableEntity
       position="3625700,0,0"
       scale="17370"
+      pitch="0"
       collisionType="dynamic"
       linearDamping="0.8"
       angularDamping="0"
       mass="7.36e19"
-      pitch="0"
-      mesh="planets/moon.mesh"
-      atmosphere="atmosphere1"
       rotationaxis="0,1,0"
       rotationrate="0.2"
-      atmospheresize="80.0f"
-      imagesize="1024.0f"
       collisiondamage = 2
       enablecollisiondamage = true
     >
       <attached>
-        <ForceField position="0,0,0" mode="newtonianGravity" diameter="40000" massDiameter="34740" mass="7.36e19" />
+        <Planet
+          mesh="planets/moon.mesh"
+          atmosphere="atmosphere1"
+          atmospheresize="80.0f"
+          imagesize="1024.0f"
+        >
+          <attached>
+            <ForceField position="0,0,0" mode="newtonianGravity" diameter="40000" massDiameter="34740" mass="7.36e19" />
+          </attached>
+        </Planet>
       </attached>
       <collisionShapes>
         <SphereCollisionShape radius="17370" position="0,0,0" />
       </collisionShapes>
-    </Planet>
+    </MovableEntity>
     <PortalEndPoint position="3603330,100,0" id="2" distance="40" target="MobileEntity" design="PortalDefault"/>
 
Index: /code/branches/cegui0.8_ogre1.9/data/levels/expeditionSector.oxw
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/levels/expeditionSector.oxw	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/levels/expeditionSector.oxw	(revision 11795)
@@ -588,5 +588,5 @@
     <!-- Planets -->
 
-   <Planet
+    <MovableEntity
         position="<?lua printC(cPlanet1) ?>"
         scale="3000"
@@ -596,22 +596,27 @@
         mass="5000000"
         pitch="0"
-        mesh="planets/muunilinst.mesh"
-        atmosphere="atmosphere1"
         rotationaxis="1,0,0"
         rotationrate="1.0"
-        atmospheresize="80.0f"
-        imagesize="1024.0f"
         collisiondamage=2
         enablecollisiondamage=true
-	      visible=true
-	      active=ture
-      >
+    >
       <attached>
-        <ForceField position="0,0,0" mode="sphere" diameter="6000" velocity="-500" />
-        </attached>
-          <collisionShapes>
-            <SphereCollisionShape radius="3000" position="0,0,0" />
+        <Planet
+            mesh="planets/muunilinst.mesh"
+            atmosphere="atmosphere1"
+            atmospheresize="80.0f"
+            imagesize="1024.0f"
+            visible=true
+            active=ture
+        >
+          <attached>
+            <ForceField position="0,0,0" mode="sphere" diameter="6000" velocity="-500" />
+          </attached>
+        </Planet>
+      </attached>
+      <collisionShapes>
+        <SphereCollisionShape radius="3000" position="0,0,0" />
       </collisionShapes>
-    </Planet>
+    </MovableEntity>
 
     <?lua
@@ -620,5 +625,5 @@
     ?>
 
-    <Planet
+    <MovableEntity
         position="<?lua printC(cPlanet2) ?>"
         scale="2000"
@@ -628,22 +633,27 @@
         mass="5000000"
         pitch="0"
-        mesh="planets/ganymede.mesh"
-        atmosphere="atmosphere1"
         rotationaxis="1,0,0"
         rotationrate="1.0"
-        atmospheresize="80.0f"
-        imagesize="1024.0f"
         collisiondamage=2
         enablecollisiondamage=true
-	      visible=true
-	      active=true
-      >
+    >
       <attached>
-        <ForceField position="0,0,0" mode="sphere" diameter="4000" velocity="-500" />
-        </attached>
-          <collisionShapes>
-            <SphereCollisionShape radius="2000" position="0,0,0" />
+          <Planet
+            mesh="planets/ganymede.mesh"
+            atmosphere="atmosphere1"
+            atmospheresize="80.0f"
+            imagesize="1024.0f"
+            visible=true
+            active=true
+          >
+            <attached>
+              <ForceField position="0,0,0" mode="sphere" diameter="4000" velocity="-500" />
+            </attached>
+          </Planet>
+      </attached>
+      <collisionShapes>
+        <SphereCollisionShape radius="2000" position="0,0,0" />
       </collisionShapes>
-    </Planet>
+    </MovableEntity>
 
     <?lua
@@ -654,5 +664,5 @@
     <!-- EnemyPlanet(s) -->
 
-    <Planet
+    <MovableEntity
         position="<?lua printC(cEnemyBasePlanet) ?>"
         scale="5000"
@@ -662,22 +672,27 @@
         mass="5000000"
         pitch="0"
-        mesh="planets/jupiter.mesh"
-        atmosphere="atmosphere1"
         rotationaxis="1,0,0"
         rotationrate="1.0"
-        atmospheresize="80.0f"
-        imagesize="1024.0f"
         collisiondamage=2
         enablecollisiondamage=true
-	      visible=false
-	      active=false
-      >
+    >
       <attached>
-        <ForceField position="0,0,0" mode="sphere" diameter="10000" velocity="-500" />
-        </attached>
-          <collisionShapes>
-            <SphereCollisionShape radius="5000" position="0,0,0" />
+        <Planet
+            mesh="planets/jupiter.mesh"
+            atmosphere="atmosphere1"
+            atmospheresize="80.0f"
+            imagesize="1024.0f"
+            visible=false
+            active=false
+          >
+          <attached>
+            <ForceField position="0,0,0" mode="sphere" diameter="10000" velocity="-500" />
+          </attached>
+        </Planet>
+      </attached>
+      <collisionShapes>
+        <SphereCollisionShape radius="5000" position="0,0,0" />
       </collisionShapes>
-    </Planet>
+    </MovableEntity>
 
     <?lua
Index: /code/branches/cegui0.8_ogre1.9/data/levels/iiJohnVane_Area51UnderFire.oxw
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/levels/iiJohnVane_Area51UnderFire.oxw	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/levels/iiJohnVane_Area51UnderFire.oxw	(revision 11795)
@@ -2004,19 +2004,24 @@
 
     <!-- PLANETS -->
-      <Planet
-            position="2000,-250,9000" 
-            scale=5000 
-            pitch=1 
+    <MovableEntity
+        position="2000,-250,9000" 
+        scale=5000 
+        pitch=1 
+        rotationaxis="1,1,0" 
+        rotationrate="0.5" 
+        mass="10000000"
+        angularDamping=0
+        collisiondamage=2
+        enablecollisiondamage=true
+        collisionType="dynamic"
+    >
+      <attached>
+        <Planet
             mesh="iceplanet.mesh" 
             atmosphere="atmosphere1" 
-            rotationaxis="1,1,0" 
-            rotationrate="0.5" 
             atmospheresize=224.0f 
-            imagesize=1024.0f
-            mass="10000000"
-            angularDamping=0
-            collisiondamage=2
-            enablecollisiondamage=true
-            collisionType="dynamic" />
+            imagesize=1024.0f />
+      </attached>
+    </MovableEntity>
 
 <!--  PICKUPS to make travelling faster  -->
Index: /code/branches/cegui0.8_ogre1.9/data/levels/iiiJohnVane_EscapeTheBastards.oxw
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/levels/iiiJohnVane_EscapeTheBastards.oxw	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/levels/iiiJohnVane_EscapeTheBastards.oxw	(revision 11795)
@@ -778,5 +778,9 @@
 
 <!--Planet sun-->
-    <Planet position="15000,0,0" scale=1500 pitch=-90 mesh="planets/sol.mesh" atmosphere="atmosphere1" rotationaxis="8,1,0" rotationrate="1" atmospheresize=0 imagesize=1024.0f />
+    <MovableEntity position="15000,0,0" scale=1500 pitch=-90 rotationaxis="8,1,0" rotationrate="1">
+      <attached>
+        <Planet mesh="planets/sol.mesh" atmosphere="atmosphere1" atmospheresize=0 imagesize=1024.0f />
+      </attached>
+    </MovableEntity>
     <StaticEntity position="2600,0,0" collisionType=static>
         <collisionShapes>
@@ -790,5 +794,5 @@
 
 <!--Planet with Ally-->
-    <Planet
+    <MovableEntity
       position="0,0,0"
       scale="100"
@@ -798,24 +802,29 @@
       mass="5000000"
       pitch="0"
-      mesh="iceplanet.mesh"
-      atmosphere="atmosphere1"
       rotationaxis="1,0,0"
       rotationrate="1.0"
-      atmospheresize="80.0f"
-      imagesize="1024.0f"
     >
       <attached>
-        <ForceField position="0,0,0" mode="sphere" diameter="1000" velocity="-500" />
-                    <ParticleEmitter position="0,0,0" source="Orxonox/fire3" />
+        <Planet
+          mesh="iceplanet.mesh"
+          atmosphere="atmosphere1"
+          atmospheresize="80.0f"
+          imagesize="1024.0f"
+        >
+          <attached>
+            <ForceField position="0,0,0" mode="sphere" diameter="1000" velocity="-500" />
+                        <ParticleEmitter position="0,0,0" source="Orxonox/fire3" />
+          </attached>
+        </Planet>
       </attached>
       <collisionShapes>
         <SphereCollisionShape radius="100" position="0,0,0" />
       </collisionShapes>
-    </Planet>
+    </MovableEntity>
 <!-- Planet with Ally END-->
 
 
 <!-- Homeplanet -->
-    <Planet
+    <MovableEntity
       position="-3000,12000,-10000"
       scale="3000"
@@ -825,28 +834,37 @@
       mass="5000000000000"
       pitch="0"
-      mesh="planets/muunilinst.mesh"
-      atmosphere="atmosphere1"
       rotationaxis="0,0,0"
       rotationrate="0.0"
-      atmospheresize="80.0f"
-      imagesize="1024.0f"
     >
       <attached>
-        <ForceField position="0,0,0" mode="sphere" diameter="10000" velocity="-900" />
+        <Planet
+          mesh="planets/muunilinst.mesh"
+          atmosphere="atmosphere1"
+          atmospheresize="80.0f"
+          imagesize="1024.0f"
+        >
+          <attached>
+            <ForceField position="0,0,0" mode="sphere" diameter="10000" velocity="-900" />
+          </attached>
+        </Planet>
       </attached>
       <collisionShapes>
         <SphereCollisionShape radius="3000" position="0,0,0" />
       </collisionShapes>
-    </Planet>
+    </MovableEntity>
 <!-- Homeplanet  END-->
 
 <!-- Planet around the cave-->
 
-<Planet position="-43500,-30000,31900" scale=5000 pitch=-90 mesh="planets/moon.mesh" atmosphere="atmosphere1" rotationaxis="8,1,0" rotationrate="1" atmospheresize=0 imagesize=1024.0f />
+    <MovableEntity position="-43500,-30000,31900" scale=5000 pitch=-90 rotationaxis="8,1,0" rotationrate="1">
+      <attached>
+        <Planet mesh="planets/moon.mesh" atmosphere="atmosphere1" atmospheresize=0 imagesize=1024.0f />
+      </attached>
+    </MovableEntity>
 
 <!-- Planet around the cave END-->
 
 <!-- Anotherplanet -->
-    <Planet
+    <MovableEntity
       position="-20000,6000,7000"
       scale="3000"
@@ -856,15 +874,19 @@
       mass="5000000000000"
       pitch="0"
-      mesh="planets/ganymede.mesh"
-      atmosphere="atmosphere1"
       rotationaxis="0,0,0"
       rotationrate="0.0"
-      atmospheresize="80.0f"
-      imagesize="1024.0f"
     >
+      <attached>
+        <Planet
+          mesh="planets/ganymede.mesh"
+          atmosphere="atmosphere1"
+          atmospheresize="80.0f"
+          imagesize="1024.0f"
+        />
+      </attached>
       <collisionShapes>
         <SphereCollisionShape radius="3000" position="0,0,0" />
       </collisionShapes>
-    </Planet>
+    </MovableEntity>
 <!-- LAAAGS :-(
 
Index: /code/branches/cegui0.8_ogre1.9/data/levels/kecks.oxw
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/levels/kecks.oxw	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/levels/kecks.oxw	(revision 11795)
@@ -423,30 +423,35 @@
 	   
 	<!--Heimatplanet-->
+    <MovableEntity
+      position="0,100000,0"
+      scale="10000"
+      collisionType="dynamic"
+      linearDamping="0.8"
+      angularDamping="0"
+      mass="5000000"
+      pitch="180"
+      yaw="0"
+      roll="0"
+      rotationaxis="0,0,1"
+      rotationrate="5.0"
+      collisiondamage = 1
+      enablecollisiondamage = true
+    >
+      <attached>
 		<Planet
-		  position="0,100000,0"
-		  scale="10000"
-		  collisionType="dynamic"
-		  linearDamping="0.8"
-		  angularDamping="0"
-		  mass="5000000"
-		  pitch="180"
-		  yaw="0"
-		  roll="0"
 		  mesh="planets/earth.mesh"
 		  atmosphere="atmosphere1"
-		  rotationaxis="0,0,1"
-		  rotationrate="5.0"
 		  atmospheresize="80.0f"
 		  imagesize="1024.0f"
-		  collisiondamage = 1
-		  enablecollisiondamage = true
 		  >
 		  <attached>
-			  <ForceField position="0,0,0" mode="sphere" diameter="1000" velocity="-500" />
-			</attached>
-			<collisionShapes>
-			  <SphereCollisionShape radius="10000" position="0,0,0" />
-			</collisionShapes>
-		  </Planet>	 
+			<ForceField position="0,0,0" mode="sphere" diameter="1000" velocity="-500" />
+		  </attached>
+		</Planet>	 
+      </attached>
+      <collisionShapes>
+        <SphereCollisionShape radius="10000" position="0,0,0" />
+      </collisionShapes>
+    </MovableEntity>
 	<!--ENDE Heimatplanet-->	
 
Index: /code/branches/cegui0.8_ogre1.9/data/levels/levelTry.oxw
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/levels/levelTry.oxw	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/levels/levelTry.oxw	(revision 11795)
@@ -149,5 +149,5 @@
     ?>
 
-    <Planet
+    <MovableEntity
       position="15000,0,-1000"
       scale="5000"
@@ -157,20 +157,25 @@
       mass="10000000"
       pitch="0"
-      mesh="planets/ganymede.mesh"
-      atmosphere="atmosphere1"
       rotationaxis="1,0,0"
       rotationrate="1.0"
-      atmospheresize="80.0f"
-      imagesize="1024.0f"
       collisiondamage = 2
       enablecollisiondamage = true
     >
       <attached>
-        <ForceField position="5000,0,0" mode="sphere" diameter="10000" velocity="-50" />
+        <Planet
+          mesh="planets/ganymede.mesh"
+          atmosphere="atmosphere1"
+          atmospheresize="80.0f"
+          imagesize="1024.0f"
+        >
+          <attached>
+            <ForceField position="5000,0,0" mode="sphere" diameter="10000" velocity="-50" />
+          </attached>
+        </Planet>
       </attached>
       <collisionShapes>
         <SphereCollisionShape radius="5000" position="0,0,0" />
       </collisionShapes>
-    </Planet>
+    </MovableEntity>
 
   </Scene>
Index: /code/branches/cegui0.8_ogre1.9/data/levels/missionOne.oxw
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/levels/missionOne.oxw	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/levels/missionOne.oxw	(revision 11795)
@@ -1205,5 +1205,5 @@
 
 <!-- @Objects: planet && spaceboundaries  -->
-    <Planet
+    <MovableEntity
       position="-44000,0,0"
       scale="2500"
@@ -1213,20 +1213,25 @@
       mass="10000000"
       pitch="0"
-      mesh="planets/muunilinst.mesh"
-      atmosphere="atmosphere1"
       rotationaxis="1,0,0"
       rotationrate="1.0"
-      atmospheresize="80.0f"
-      imagesize="1024.0f"
       collisiondamage = "2"
       enablecollisiondamage = "false"
     >
-      <!--attached>
-        <ForceField position="0,0,0" mode="sphere" diameter="10000" velocity="-50" />
-      </attached-->  <!-- Forcefield kills HYDROGEN FARMER-->
+      <attached>
+        <Planet
+          mesh="planets/muunilinst.mesh"
+          atmosphere="atmosphere1"
+          atmospheresize="80.0f"
+          imagesize="1024.0f"
+        >
+          <!--attached>
+            <ForceField position="0,0,0" mode="sphere" diameter="10000" velocity="-50" />
+          </attached-->  <!-- Forcefield kills HYDROGEN FARMER-->
+        </Planet>
+      </attached>
       <collisionShapes>
         <SphereCollisionShape radius="2500" position="0,0,0" />
       </collisionShapes>
-    </Planet>
+    </MovableEntity>
 
 
Index: /code/branches/cegui0.8_ogre1.9/data/levels/planets.oxw
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/levels/planets.oxw	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/levels/planets.oxw	(revision 11795)
@@ -45,5 +45,5 @@
     />
 
-    <Planet
+    <MovableEntity
       position="0,0,0"
       scale="1000"
@@ -53,22 +53,27 @@
       mass="10000000"
       pitch="0"
-      mesh="planets/muunilinst.mesh"
-      atmosphere="atmosphere1"
       rotationaxis="1,0,0"
       rotationrate="1.0"
-      atmospheresize="80.0f"
-      imagesize="1024.0f"
       collisiondamage = 2
       enablecollisiondamage = true
     >
       <attached>
-        <ForceField position="0,0,0" mode="sphere" diameter="10000" velocity="-50" />
+        <Planet
+          mesh="planets/muunilinst.mesh"
+          atmosphere="atmosphere1"
+          atmospheresize="80.0f"
+          imagesize="1024.0f"
+        >
+          <attached>
+            <ForceField position="0,0,0" mode="sphere" diameter="10000" velocity="-50" />
+          </attached>
+        </Planet>
       </attached>
       <collisionShapes>
         <SphereCollisionShape radius="1000" position="0,0,0" />
       </collisionShapes>
-    </Planet>
+    </MovableEntity>
 
-    <Planet
+    <MovableEntity
       position="10000,0,0"
       scale="100"
@@ -78,20 +83,25 @@
       mass="5000000"
       pitch="0"
-      mesh="planets/muunilinst.mesh"
-      atmosphere="atmosphere1"
       rotationaxis="1,0,0"
       rotationrate="1.0"
-      atmospheresize="80.0f"
-      imagesize="1024.0f"
       collisiondamage = 2
       enablecollisiondamage = true
     >
       <attached>
-        <ForceField position="0,0,0" mode="sphere" diameter="1000" velocity="-500" />
+        <Planet
+          mesh="planets/muunilinst.mesh"
+          atmosphere="atmosphere1"
+          atmospheresize="80.0f"
+          imagesize="1024.0f"
+        >
+          <attached>
+            <ForceField position="0,0,0" mode="sphere" diameter="1000" velocity="-500" />
+          </attached>
+        </Planet>
       </attached>
       <collisionShapes>
         <SphereCollisionShape radius="100" position="0,0,0" />
       </collisionShapes>
-    </Planet>
+    </MovableEntity>
   </Scene>
 </Level>
Index: /code/branches/cegui0.8_ogre1.9/data/levels/presentation09.oxw
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/levels/presentation09.oxw	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/levels/presentation09.oxw	(revision 11795)
@@ -57,5 +57,9 @@
     <?lua end ?>
     
-    <Planet position="0,0,0" scale=10000 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="1,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
+    <MovableEntity position="0,0,0" scale=10000 pitch=-90 rotationaxis="1,1,0" rotationrate="1">
+      <attached>
+        <Planet mesh="iceplanet.mesh" atmosphere="atmosphere1" atmospheresize=224.0f imagesize=1024.0f />
+      </attached>
+    </MovableEntity>
 
   </Scene>
Index: /code/branches/cegui0.8_ogre1.9/data/levels/presentationFS11.oxw
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/levels/presentationFS11.oxw	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/levels/presentationFS11.oxw	(revision 11795)
@@ -111,5 +111,5 @@
 
     <!-- EARTH -->
-    <Planet
+    <MovableEntity
       position="80500,0,0"
       scale="63000"
@@ -120,20 +120,25 @@
       pitch="-90"
       yaw="50"
-      mesh="planets/earth.mesh"
-      atmosphere="atmosphere1"
       rotationaxis="0,1,0"
       rotationrate="0.2"
-      atmospheresize="80.0f"
-      imagesize="1024.0f"
       collisiondamage = 2
       enablecollisiondamage = true
     >
       <attached>
-        <ForceField position="0,0,0" mode="newtonianGravity" diameter="140000" massDiameter="126000" mass="5.9e21" />
+        <Planet
+          mesh="planets/earth.mesh"
+          atmosphere="atmosphere1"
+          atmospheresize="80.0f"
+          imagesize="1024.0f"
+        >
+          <attached>
+            <ForceField position="0,0,0" mode="newtonianGravity" diameter="140000" massDiameter="126000" mass="5.9e21" />
+          </attached>
+        </Planet>
       </attached>
       <collisionShapes>
         <SphereCollisionShape radius="63000" position="0,0,0" />
       </collisionShapes>
-    </Planet>
+    </MovableEntity>
 
     <!-- PARTICLE EFFECT -->
@@ -329,5 +334,5 @@
     
     <!-- MOON -->
-    <Planet
+    <MovableEntity
       position="-80000,0,0"
       scale="4000"
@@ -337,20 +342,25 @@
       mass="7.36e19"
       pitch="0"
-      mesh="planets/moon.mesh"
-      atmosphere="atmosphere1"
       rotationaxis="0,1,0"
       rotationrate="0.2"
-      atmospheresize="0.0f"
-      imagesize="1024.0f"
       collisiondamage = 2
       enablecollisiondamage = true
     >
       <attached>
-        <ForceField position="0,0,0" mode="newtonianGravity" diameter="40000" massDiameter="34740" mass="7.36e19" />
+        <Planet
+          mesh="planets/moon.mesh"
+          atmosphere="atmosphere1"
+          atmospheresize="0.0f"
+          imagesize="1024.0f"
+        >
+          <attached>
+            <ForceField position="0,0,0" mode="newtonianGravity" diameter="40000" massDiameter="34740" mass="7.36e19" />
+          </attached>
+        </Planet>
       </attached>
       <collisionShapes>
         <SphereCollisionShape radius="4000" position="0,0,0" />
       </collisionShapes>
-    </Planet>
+    </MovableEntity>
 
     <SimpleNotification message="Hydrogen farmer/space station by Hans" >
Index: /code/branches/cegui0.8_ogre1.9/data/levels/presentationHS09.oxw
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/levels/presentationHS09.oxw	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/levels/presentationHS09.oxw	(revision 11795)
@@ -393,8 +393,4 @@
       </MovableEntity>
     <?lua end ?>
-    
-<!--
-    <Planet position="1000,0,0" mass=900000 scale=1000 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="1,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
--->
 
   </Scene>
Index: /code/branches/cegui0.8_ogre1.9/data/levels/presentationHS12.oxw
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/levels/presentationHS12.oxw	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/levels/presentationHS12.oxw	(revision 11795)
@@ -353,5 +353,5 @@
     ?>
 
-    <Planet
+    <MovableEntity
       position="15000,0,-1000"
       scale="5000"
@@ -361,20 +361,25 @@
       mass="10000000"
       pitch="0"
-      mesh="planets/ganymede.mesh"
-      atmosphere="atmosphere1"
       rotationaxis="1,0,0"
       rotationrate="1.0"
-      atmospheresize="80.0f"
-      imagesize="1024.0f"
       collisiondamage = 2
       enablecollisiondamage = true
     >
       <attached>
-        <ForceField position="5000,0,0" mode="sphere" diameter="10000" velocity="-50" />
+        <Planet
+          mesh="planets/ganymede.mesh"
+          atmosphere="atmosphere1"
+          atmospheresize="80.0f"
+          imagesize="1024.0f"
+        >
+          <attached>
+            <ForceField position="5000,0,0" mode="sphere" diameter="10000" velocity="-50" />
+          </attached>
+        </Planet>
       </attached>
       <collisionShapes>
         <SphereCollisionShape radius="5000" position="0,0,0" />
       </collisionShapes>
-    </Planet>
+    </MovableEntity>
 
 <StaticEntity position="6750,-750,2000" yaw=0 pitch=0>
Index: /code/branches/cegui0.8_ogre1.9/data/levels/shadertest.oxw
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/levels/shadertest.oxw	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/levels/shadertest.oxw	(revision 11795)
@@ -78,5 +78,5 @@
     <!-- Planet close to spawn point -->
 
-    <Planet
+    <MovableEntity
       position="15000,0,-1000"
       scale="5000"
@@ -86,20 +86,25 @@
       mass="10000000"
       pitch="0"
-      mesh="planets/muunilinst.mesh"
-      atmosphere="atmosphere1"
       rotationaxis="1,0,0"
       rotationrate="1.0"
-      atmospheresize="80.0f"
-      imagesize="1024.0f"
       collisiondamage = 2
       enablecollisiondamage = true
     >
       <attached>
-        <ForceField position="5000,0,0" mode="sphere" diameter="10000" velocity="-50" />
+        <Planet
+          mesh="planets/muunilinst.mesh"
+          atmosphere="atmosphere1"
+          atmospheresize="80.0f"
+          imagesize="1024.0f"
+        >
+          <attached>
+            <ForceField position="5000,0,0" mode="sphere" diameter="10000" velocity="-50" />
+          </attached>
+        </Planet>
       </attached>
       <collisionShapes>
         <SphereCollisionShape radius="5000" position="0,0,0" />
       </collisionShapes>
-    </Planet>
+    </MovableEntity>
 
 
Index: /code/branches/cegui0.8_ogre1.9/data/levels/shuttleAttack.oxw
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/levels/shuttleAttack.oxw	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/levels/shuttleAttack.oxw	(revision 11795)
@@ -930,5 +930,5 @@
     ?>
 
-    <Planet
+    <MovableEntity
         position="<?lua printC(cPlanet1) ?>"
         scale="2000"
@@ -938,20 +938,25 @@
         mass="5000000"
         pitch="0"
-        mesh="planets/muunilinst.mesh"
-        atmosphere="atmosphere1"
         rotationaxis="1,0,0"
         rotationrate="1.0"
-        atmospheresize="80.0f"
-        imagesize="1024.0f"
         collisiondamage = 2
         enablecollisiondamage = true
-      >
+    >
       <attached>
-        <ForceField position="0,0,0" mode="sphere" diameter="4000" velocity="-500" />
-        </attached>
-          <collisionShapes>
-            <SphereCollisionShape radius="2000" position="0,0,0" />
+        <Planet
+            mesh="planets/muunilinst.mesh"
+            atmosphere="atmosphere1"
+            atmospheresize="80.0f"
+            imagesize="1024.0f"
+        >
+          <attached>
+            <ForceField position="0,0,0" mode="sphere" diameter="4000" velocity="-500" />
+          </attached>
+        </Planet>
+      </attached>
+      <collisionShapes>
+        <SphereCollisionShape radius="2000" position="0,0,0" />
       </collisionShapes>
-    </Planet>
+    </MovableEntity>
 
     <?lua
@@ -960,5 +965,5 @@
     ?>
 
-    <Planet
+    <MovableEntity
         position="<?lua printC(cPlanet2) ?>"
         scale="3000"
@@ -968,20 +973,25 @@
         mass="5000000"
         pitch="0"
-        mesh="planets/planet3.mesh"
-        atmosphere="atmosphere1"
         rotationaxis="1,0,0"
         rotationrate="1.0"
-        atmospheresize="80.0f"
-        imagesize="1024.0f"
         collisiondamage = 2
         enablecollisiondamage = true
-      >
+    >
       <attached>
-        <ForceField position="0,0,0" mode="sphere" diameter="6000" velocity="-500" />
-        </attached>
-          <collisionShapes>
-            <SphereCollisionShape radius="3000" position="0,0,0" />
+        <Planet
+            mesh="planets/planet3.mesh"
+            atmosphere="atmosphere1"
+            atmospheresize="80.0f"
+            imagesize="1024.0f"
+          >
+          <attached>
+            <ForceField position="0,0,0" mode="sphere" diameter="6000" velocity="-500" />
+          </attached>
+        </Planet>
+      </attached>
+      <collisionShapes>
+        <SphereCollisionShape radius="3000" position="0,0,0" />
       </collisionShapes>
-    </Planet>
+    </MovableEntity>
 
     <?lua
Index: /code/branches/cegui0.8_ogre1.9/data/levels/shuttleRetaliation.oxw
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/levels/shuttleRetaliation.oxw	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/levels/shuttleRetaliation.oxw	(revision 11795)
@@ -880,5 +880,5 @@
     <!-- Planets -->
 
-   <Planet
+    <MovableEntity
         position="<?lua printC(cPlanet1) ?>"
         scale="3000"
@@ -888,22 +888,27 @@
         mass="5000000"
         pitch="0"
-        mesh="planets/muunilinst.mesh"
-        atmosphere="atmosphere1"
         rotationaxis="1,0,0"
         rotationrate="1.0"
-        atmospheresize="80.0f"
-        imagesize="1024.0f"
         collisiondamage = 2
         enablecollisiondamage = true
-    visible=true
-    active=true
-      >
+    >
       <attached>
-        <ForceField position="0,0,0" mode="sphere" diameter="6000" velocity="-500" />
-        </attached>
-        <collisionShapes>
-            <SphereCollisionShape radius="3000" position="0,0,0" />
+        <Planet
+            mesh="planets/muunilinst.mesh"
+            atmosphere="atmosphere1"
+            atmospheresize="80.0f"
+            imagesize="1024.0f"
+            visible=true
+            active=true
+        >
+          <attached>
+            <ForceField position="0,0,0" mode="sphere" diameter="6000" velocity="-500" />
+          </attached>
+        </Planet>
+      </attached>
+      <collisionShapes>
+        <SphereCollisionShape radius="3000" position="0,0,0" />
       </collisionShapes>
-    </Planet>
+    </MovableEntity>
 
     <?lua
@@ -912,5 +917,5 @@
     ?>
 
-    <Planet
+    <MovableEntity
         position="<?lua printC(cPlanet2) ?>"
         scale="2000"
@@ -920,22 +925,27 @@
         mass="5000000"
         pitch="0"
-        mesh="planets/ganymede.mesh"
-        atmosphere="atmosphere1"
         rotationaxis="1,0,0"
         rotationrate="1.0"
-        atmospheresize="80.0f"
-        imagesize="1024.0f"
         collisiondamage = 2
         enablecollisiondamage = true
-        visible=true
-        active=true
-      >
+    >
       <attached>
-        <ForceField position="0,0,0" mode="sphere" diameter="4000" velocity="-500" />
-        </attached>
-          <collisionShapes>
-            <SphereCollisionShape radius="2000" position="0,0,0" />
+        <Planet
+            mesh="planets/ganymede.mesh"
+            atmosphere="atmosphere1"
+            atmospheresize="80.0f"
+            imagesize="1024.0f"
+            visible=true
+            active=true
+        >
+          <attached>
+            <ForceField position="0,0,0" mode="sphere" diameter="4000" velocity="-500" />
+          </attached>
+        </Planet>
+      </attached>
+      <collisionShapes>
+        <SphereCollisionShape radius="2000" position="0,0,0" />
       </collisionShapes>
-    </Planet>
+    </MovableEntity>
 
     <?lua
@@ -946,5 +956,5 @@
     <!-- EnemyPlanet -->
 
-    <Planet
+    <MovableEntity
         position="<?lua printC(cEnemyBasePlanet) ?>"
         scale="5000"
@@ -954,19 +964,22 @@
         mass="5000000"
         pitch="0"
-        mesh="planets/jupiter.mesh"
-        atmosphere="atmosphere1"
         rotationaxis="1,0,0"
         rotationrate="1.0"
-        atmospheresize="80.0f"
-        imagesize="1024.0f"
         collisiondamage = 2
         enablecollisiondamage = true
-        visible=false
-        active=false
     >
-        <attached>
+      <attached>
+        <Planet
+            mesh="planets/jupiter.mesh"
+            atmosphere="atmosphere1"
+            atmospheresize="80.0f"
+            imagesize="1024.0f"
+            visible=false
+            active=false
+        >
+          <attached>
            <ForceField position="0,0,0" rotationaxis="0.1,1,0.1"mode="sphere" diameter="10000" velocity="-500" />
-        </attached>
-        <events>
+          </attached>
+          <events>
             <activity>
                 <Trigger  name="enemyPlanetVisible" mode=and>
@@ -1005,9 +1018,11 @@
                  </Trigger>
             </visibility>
-        </events>
-        <collisionShapes>
-          <SphereCollisionShape position="0,0,0" radius=5000/>
-        </collisionShapes>
-    </Planet>
+          </events>
+        </Planet>
+      </attached>
+      <collisionShapes>
+        <SphereCollisionShape position="0,0,0" radius=5000/>
+      </collisionShapes>
+    </MovableEntity>
 
     <!-- Pawn that represents the planet during destruction -->
Index: /code/branches/cegui0.8_ogre1.9/data/levels/testSwallow.oxw
===================================================================
--- /code/branches/cegui0.8_ogre1.9/data/levels/testSwallow.oxw	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/data/levels/testSwallow.oxw	(revision 11795)
@@ -56,5 +56,9 @@
 ?>
 <?lua end ?>
-    <Planet position="0,0,0" scale=10000 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="1,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
+    <MovableEntity position="0,0,0" scale=10000 pitch=-90 rotationaxis="1,1,0" rotationrate="1" >
+      <attached>
+        <Planet mesh="iceplanet.mesh" atmosphere="atmosphere1" atmospheresize=224.0f imagesize=1024.0f />
+      </attached>
+    </MovableEntity>
 
   </Scene>
Index: /code/branches/cegui0.8_ogre1.9/src/libraries/core/CMakeLists.txt
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/libraries/core/CMakeLists.txt	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/libraries/core/CMakeLists.txt	(revision 11795)
@@ -95,4 +95,5 @@
   LINK_LIBRARIES
     ${OGRE_LIBRARY}
+    ${OGRE_OVERLAY_LIBRARY}
     ${Boost_FILESYSTEM_LIBRARY}
     ${Boost_SYSTEM_LIBRARY} # Filesystem dependency
Index: /code/branches/cegui0.8_ogre1.9/src/libraries/core/GUIManager.cc
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/libraries/core/GUIManager.cc	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/libraries/core/GUIManager.cc	(revision 11795)
@@ -482,4 +482,7 @@
         assert(guiSystem_);
         this->protectedCeguiSystemCall(std::bind(&CEGUI::System::injectTimePulse, arg::_1, time.getDeltaTime()));
+#if CEGUI_VERSION >= 0x000800
+        this->protectedCeguiContextCall(std::bind(&CEGUI::GUIContext::injectTimePulse, arg::_1, time.getDeltaTime()));
+#endif
     }
 
@@ -664,5 +667,5 @@
             this->setBackgroundImage("");
         else
-            this->setBackgroundImage("set: " + imageSet + " image: " + imageName);
+            this->setBackgroundImage(imageSet + "/" + imageName);
     }
 
@@ -846,5 +849,5 @@
     bool GUIManager::protectedCeguiContextCall(FunctionType function)
     {
-        return this->protectedCall(function, this->guiSystem_->getDefaultGUIContext());
+        return this->protectedCall(function, &this->guiSystem_->getDefaultGUIContext());
     }
 #endif
Index: /code/branches/cegui0.8_ogre1.9/src/libraries/core/GraphicsManager.cc
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/libraries/core/GraphicsManager.cc	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/libraries/core/GraphicsManager.cc	(revision 11795)
@@ -45,4 +45,7 @@
 #include <OgreViewport.h>
 #include <OgreWindowEventUtilities.h>
+#if OGRE_VERSION >= 0x010900
+#   include <Overlay/OgreOverlaySystem.h>
+#endif
 
 #include "SpecialConfig.h"
@@ -115,4 +118,10 @@
         this->loadOgreRoot();
 
+#if OGRE_VERSION >= 0x010900
+        this->overlaySystem_ = new Ogre::OverlaySystem();
+#else
+        this->overlaySystem_ = nullptr;
+#endif
+
         // At first, add the root paths of the data directories as resource locations
         Ogre::ResourceGroupManager::getSingleton().addResourceLocation(ConfigurablePaths::getDataPathString(), "FileSystem");
@@ -155,4 +164,7 @@
         Loader::getInstance().unload(extResources_.get());
 
+#if OGRE_VERSION >= 0x010900
+        safeObjectDelete(&overlaySystem_);
+#endif
         safeObjectDelete(&ogreRoot_);
         safeObjectDelete(&ogreLogger_);
Index: /code/branches/cegui0.8_ogre1.9/src/libraries/core/GraphicsManager.h
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/libraries/core/GraphicsManager.h	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/libraries/core/GraphicsManager.h	(revision 11795)
@@ -52,4 +52,5 @@
 
 #include "util/DestructionHelper.h"
+#include "util/OgreForwardRefs.h"
 #include "util/Singleton.h"
 #include "config/Configurable.h"
@@ -79,6 +80,7 @@
         void postUpdate(const Clock& time);
 
-        Ogre::Viewport* getViewport()         { return this->viewport_; }
-        Ogre::RenderWindow* getRenderWindow() { return this->renderWindow_; }
+        Ogre::Viewport* getViewport()           { return this->viewport_; }
+        Ogre::RenderWindow* getRenderWindow()   { return this->renderWindow_; }
+        Ogre::OverlaySystem* getOverlaySystem() { return this->overlaySystem_; }
         size_t getRenderWindowHandle();
 
@@ -129,4 +131,5 @@
         Ogre::RenderWindow*      renderWindow_;            //!< the one and only render window
         Ogre::Viewport*          viewport_;                //!< default full size viewport
+        Ogre::OverlaySystem*     overlaySystem_;
         GlowMaterialListener*    glowMaterialListener_;    //!< Material Listener for the 'Glow' compositor
         float                    lastFrameStartTime_;      //!< Time stamp of the beginning of the last frame
Index: /code/branches/cegui0.8_ogre1.9/src/libraries/util/DisplayStringConversions.h
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/libraries/util/DisplayStringConversions.h	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/libraries/util/DisplayStringConversions.h	(revision 11795)
@@ -37,5 +37,10 @@
 
 #include "UtilPrereqs.h"
-#include <OgreOverlayElement.h>
+#include <OgrePrerequisites.h>
+#if OGRE_VERSION >= 0x010900
+#   include <Overlay/OgreOverlayElement.h>
+#else
+#   include <OgreOverlayElement.h>
+#endif
 
 #if OGRE_UNICODE_SUPPORT
Index: /code/branches/cegui0.8_ogre1.9/src/libraries/util/OgreForwardRefs.h
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/libraries/util/OgreForwardRefs.h	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/libraries/util/OgreForwardRefs.h	(revision 11795)
@@ -67,5 +67,4 @@
     class Factory;
     class Font;
-    class FontPtr;
     class FontManager;
     struct FrameEvent;
@@ -73,5 +72,4 @@
     class Frustum;
     class GpuProgram;
-    class GpuProgramPtr;
     class GpuProgramManager;
     class GpuProgramUsage;
@@ -82,5 +80,4 @@
     class HardwarePixelBufferSharedPtr;
     class HighLevelGpuProgram;
-    class HighLevelGpuProgramPtr;
     class HighLevelGpuProgramManager;
     class HighLevelGpuProgramFactory;
@@ -96,5 +93,4 @@
     class ManualObject;
     class Material;
-    class MaterialPtr;
     class MaterialManager;
     class MaterialScriptCompiler;
@@ -104,5 +100,4 @@
     class MemoryManager;
     class Mesh;
-    class MeshPtr;
     class MeshSerializer;
     class MeshSerializerImpl;
@@ -120,4 +115,5 @@
     class OverlayElementFactory;
     class OverlayManager;
+    class OverlaySystem;
     class Particle;
     class ParticleAffector;
@@ -179,5 +175,4 @@
     class SimpleSpline;
     class Skeleton;
-    class SkeletonPtr;
     class SkeletonInstance;
     class SkeletonManager;
@@ -195,5 +190,4 @@
     class TextureUnitState;
     class Texture;
-    class TexturePtr;
     class TextureFont;
     class TextureManager;
Index: /code/branches/cegui0.8_ogre1.9/src/modules/designtools/ScreenshotManager.cc
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/modules/designtools/ScreenshotManager.cc	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/modules/designtools/ScreenshotManager.cc	(revision 11795)
@@ -101,5 +101,5 @@
         }
         if(!this->tempTexture_.isNull())
-            this->tempTexture_.freeMethod();
+            this->tempTexture_.setNull();
     }
     
Index: /code/branches/cegui0.8_ogre1.9/src/modules/hover/FlagHUD.cc
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/modules/hover/FlagHUD.cc	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/modules/hover/FlagHUD.cc	(revision 11795)
@@ -32,7 +32,11 @@
 #include "FlagHUD.h"
 
-#include <OgreOverlayManager.h>
-#include <OgreMaterialManager.h>
-#include <OgrePanelOverlayElement.h>
+#if OGRE_VERSION >= 0x010900
+#   include <Overlay/OgreOverlayManager.h>
+#   include <Overlay/OgrePanelOverlayElement.h>
+#else
+#   include <OgreOverlayManager.h>
+#   include <OgrePanelOverlayElement.h>
+#endif
 
 #include "util/StringUtils.h"
Index: /code/branches/cegui0.8_ogre1.9/src/modules/objects/Planet.cc
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/modules/objects/Planet.cc	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/modules/objects/Planet.cc	(revision 11795)
@@ -31,5 +31,4 @@
 #include <OgreEntity.h>
 #include <OgreBillboardSet.h>
-#include <OgreProgressiveMesh.h>
 
 #include "core/CoreIncludes.h"
@@ -47,7 +46,8 @@
      * @brief Constructor
      */
-    Planet::Planet(Context* context) : MovableEntity(context)
+    Planet::Planet(Context* context) : Model(context)
     {
         RegisterObject(Planet);
+        this->setLodEnabled(false);
         this->registerVariables();
     }
@@ -58,6 +58,4 @@
     Planet::~Planet()
     {
-        if (this->isInitialized() && this->mesh_.getEntity())
-            this->detachOgreObject(this->mesh_.getEntity());
     }
 
@@ -87,62 +85,17 @@
     }
 
-    void Planet::changedMesh()
+    void Planet::changedAtmosphere()
     {
         if( GameMode::showsGraphics() )
         {
-            if (this->mesh_.getEntity())
-                this->detachOgreObject(this->mesh_.getEntity());
-
-            this->mesh_.setMeshSource(this->getScene()->getSceneManager(), this->meshSrc_);
-
-            if (this->mesh_.getEntity())
+            if (this->getMesh().getEntity())
             {
-                this->attachOgreObject(this->mesh_.getEntity());
-                this->mesh_.getEntity()->setCastShadows(this->bCastShadows_);
-                this->mesh_.setVisible(this->isVisible());
-
-                float scaleFactor = this->getScale();
-
-#if OGRE_VERSION >= 0x010800
-                Ogre::ProgressiveMesh::LodValueList distList;
-#elif OGRE_VERSION >= 0x010700
-                Ogre::Mesh::LodValueList distList;
-#else
-                Ogre::Mesh::LodDistanceList distList;
-#endif
-
-                distList.push_back(10.0f*scaleFactor);
-                distList.push_back(19.0f*scaleFactor);
-                distList.push_back(27.0f*scaleFactor);
-                distList.push_back(34.0f*scaleFactor);
-                distList.push_back(40.0f*scaleFactor);
-                distList.push_back(45.0f*scaleFactor);
-                distList.push_back(49.0f*scaleFactor);
-                distList.push_back(52.0f*scaleFactor);
-                distList.push_back(54.0f*scaleFactor);
-                distList.push_back(55.0f*scaleFactor);
-
-                float reductionValue = 0.2f;
-
-#if OGRE_VERSION >= 0x010800
-                Ogre::ProgressiveMesh::generateLodLevels(this->mesh_.getEntity()->getMesh().get(), distList, Ogre::ProgressiveMesh::VRQ_PROPORTIONAL,
-                    reductionValue);
-#else
-                this->mesh_.getEntity()->getMesh()->generateLodLevels(distList, Ogre::ProgressiveMesh::VRQ_PROPORTIONAL, reductionValue);
-#endif
-                billboard_.setBillboardSet(this->getScene()->getSceneManager(), this->atmosphere_, Vector3(0,0,0));
+                this->billboard_.setBillboardSet(this->getScene()->getSceneManager(), this->atmosphere_, Vector3(0,0,0));
 
                 this->attachOgreObject(this->billboard_.getBillboardSet());
                 this->billboard_.getBillboardSet()->setUseAccurateFacing(true);
-                this->setCastShadows(true);
-                this->billboard_.getBillboardSet()->setRenderQueueGroup(this->mesh_.getEntity()->getRenderQueueGroup());
-                this->mesh_.setCastShadows(true);
+                this->billboard_.getBillboardSet()->setRenderQueueGroup(this->getMesh().getEntity()->getRenderQueueGroup());
             }
         }
-    }
-
-    void Planet::changedShadows()
-    {
-        this->mesh_.setCastShadows(this->bCastShadows_);
     }
 
@@ -154,16 +107,11 @@
         XMLPortParam(Planet, "atmospheresize", setAtmosphereSize, getAtmosphereSize, xmlelement,mode);
         XMLPortParam(Planet, "imagesize", setImageSize, getImageSize, xmlelement,mode);
-        XMLPortParam(Planet, "mesh", setMeshSource, getMeshSource, xmlelement, mode);
-        XMLPortParam(Planet, "shadow", setCastShadows, getCastShadows, xmlelement, mode).defaultValues(true);
     }
 
     void Planet::registerVariables()
     {
-        registerVariable(this->atmosphere_, VariableDirection::ToClient);
+        registerVariable(this->atmosphere_, VariableDirection::ToClient, new NetworkCallback<Planet>(this, &Planet::changedAtmosphere));
         registerVariable(this->atmosphereSize, VariableDirection::ToClient);
         registerVariable(this->imageSize, VariableDirection::ToClient);
-        // Note: the meshSrc should be synchronised after atmosphere and other values, because the meshSrc callback setts the atmosphere billboards
-        registerVariable(this->meshSrc_, VariableDirection::ToClient, new NetworkCallback<Planet>(this, &Planet::changedMesh));
-        registerVariable(this->bCastShadows_, VariableDirection::ToClient, new NetworkCallback<Planet>(this, &Planet::changedShadows));
     }
 
@@ -171,9 +119,6 @@
     {
         SUPER(Planet, changedVisibility);
-        if (this->isInitialized())
-        {
-            this->mesh_.setVisible(this->isVisible());
-            this->billboard_.setVisible(this->isVisible());
-        }
+
+        this->billboard_.setVisible(this->isVisible());
     }
 }
Index: /code/branches/cegui0.8_ogre1.9/src/modules/objects/Planet.h
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/modules/objects/Planet.h	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/modules/objects/Planet.h	(revision 11795)
@@ -40,10 +40,10 @@
 #include <string>
 #include "tools/BillboardSet.h"
-#include "tools/Mesh.h"
-#include "worldentities/MovableEntity.h"
+#include "tools/interfaces/Tickable.h"
+#include "graphics/Model.h"
 
 namespace orxonox
 {
-    class _ObjectsExport Planet : public MovableEntity
+    class _ObjectsExport Planet : public Model, public Tickable
     {
         public:
@@ -58,20 +58,4 @@
             virtual void changedVisibility() override;
 
-            inline void setMeshSource(const std::string& meshname)
-                { this->meshSrc_ = meshname; this->changedMesh(); }
-
-            inline const std::string& getMeshSource() const
-                { return this->meshSrc_; }
-
-            inline void setCastShadows(bool bCastShadows)
-                { this->bCastShadows_ = bCastShadows; this->changedShadows(); }
-
-            inline bool getCastShadows() const
-                { return this->bCastShadows_; }
-
-            inline const std::string& getMesh() const{
-                return this->meshSrc_;
-            }
-
             inline void setAtmosphereSize(float size){
                 this->atmosphereSize = size;
@@ -84,4 +68,5 @@
             inline void setAtmosphere(const std::string& atmosphere){
                 this->atmosphere_ = atmosphere;
+                this->changedAtmosphere();
             }
 
@@ -103,14 +88,10 @@
             void registerVariables();
 
-            void changedMesh();
-            void changedShadows();
+            void changedAtmosphere();
 
-            std::string meshSrc_;
             std::string atmosphere_;
-            Mesh mesh_;
             float atmosphereSize;
             float imageSize;
             BillboardSet billboard_;
-            bool bCastShadows_;
 
     };
Index: /code/branches/cegui0.8_ogre1.9/src/modules/overlays/FadeoutText.cc
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/modules/overlays/FadeoutText.cc	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/modules/overlays/FadeoutText.cc	(revision 11795)
@@ -29,5 +29,9 @@
 #include "FadeoutText.h"
 
-#include <OgreTextAreaOverlayElement.h>
+#if OGRE_VERSION >= 0x010900
+#   include <Overlay/OgreTextAreaOverlayElement.h>
+#else
+#   include <OgreTextAreaOverlayElement.h>
+#endif
 #include "util/Math.h"
 #include "core/CoreIncludes.h"
Index: /code/branches/cegui0.8_ogre1.9/src/modules/overlays/OverlayText.cc
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/modules/overlays/OverlayText.cc	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/modules/overlays/OverlayText.cc	(revision 11795)
@@ -29,7 +29,13 @@
 #include "OverlayText.h"
 
-#include <OgreOverlayManager.h>
-#include <OgrePanelOverlayElement.h>
-#include <OgreTextAreaOverlayElement.h>
+#if OGRE_VERSION >= 0x010900
+#   include <Overlay/OgreOverlayManager.h>
+#   include <Overlay/OgrePanelOverlayElement.h>
+#   include <Overlay/OgreTextAreaOverlayElement.h>
+#else
+#   include <OgreOverlayManager.h>
+#   include <OgrePanelOverlayElement.h>
+#   include <OgreTextAreaOverlayElement.h>
+#endif
 
 #include "util/StringUtils.h"
Index: /code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/ChatOverlay.cc
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/ChatOverlay.cc	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/ChatOverlay.cc	(revision 11795)
@@ -30,5 +30,10 @@
 
 #include <string>
-#include <OgreTextAreaOverlayElement.h>
+
+#if OGRE_VERSION >= 0x010900
+#   include <Overlay/OgreTextAreaOverlayElement.h>
+#else
+#   include <OgreTextAreaOverlayElement.h>
+#endif
 
 #include "util/Convert.h"
Index: /code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/ChatOverlay.h
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/ChatOverlay.h	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/ChatOverlay.h	(revision 11795)
@@ -33,5 +33,11 @@
 
 #include <list>
-#include <OgreOverlayElement.h>
+
+#include <OgrePrerequisites.h>
+#if OGRE_VERSION >= 0x010900
+#   include <Overlay/OgreOverlayElement.h>
+#else
+#   include <OgreOverlayElement.h>
+#endif
 
 #include "chat/ChatListener.h"
Index: /code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDBar.cc
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDBar.cc	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDBar.cc	(revision 11795)
@@ -32,9 +32,15 @@
 #include "HUDBar.h"
 
-#include <OgreOverlayManager.h>
 #include <OgreMaterialManager.h>
 #include <OgreTechnique.h>
 #include <OgrePass.h>
-#include <OgrePanelOverlayElement.h>
+
+#if OGRE_VERSION >= 0x010900
+#   include <Overlay/OgreOverlayManager.h>
+#   include <Overlay/OgrePanelOverlayElement.h>
+#else
+#   include <OgreOverlayManager.h>
+#   include <OgrePanelOverlayElement.h>
+#endif
 
 #include "util/Convert.h"
@@ -248,3 +254,13 @@
         return this->icon_->getMaterialName();
     }
+
+    void HUDBar::setIconPosition(Vector2 position)
+    {
+        this->icon_->setPosition(position.x, position.y);
+    }
+
+    void HUDBar::setIconDimensions(Vector2 dimensions)
+    {
+        this->icon_->setDimensions(dimensions.x, dimensions.y);
+    }
 }
Index: /code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDBar.h
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDBar.h	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDBar.h	(revision 11795)
@@ -37,5 +37,4 @@
 #include <map>
 #include <vector>
-#include <OgrePanelOverlayElement.h>
 
 #include "util/Math.h"
@@ -122,8 +121,6 @@
             { return this->currentColour_; }
 
-        inline void setIconPosition(Vector2 position)
-            { this->icon_->setPosition(position.x, position.y); }
-        inline void setIconDimensions(Vector2 dimensions)
-            { this->icon_->setDimensions(dimensions.x, dimensions.y); }
+        void setIconPosition(Vector2 position);
+        void setIconDimensions(Vector2 dimensions);
 
     protected:
Index: /code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDNavigation.cc
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDNavigation.cc	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDNavigation.cc	(revision 11795)
@@ -32,8 +32,16 @@
 
 #include <OgreCamera.h>
-#include <OgreFontManager.h>
-#include <OgreOverlayManager.h>
-#include <OgreTextAreaOverlayElement.h>
-#include <OgrePanelOverlayElement.h>
+
+#if OGRE_VERSION >= 0x010900
+#   include <Overlay/OgreFontManager.h>
+#   include <Overlay/OgreOverlayManager.h>
+#   include <Overlay/OgreTextAreaOverlayElement.h>
+#   include <Overlay/OgrePanelOverlayElement.h>
+#else
+#   include <OgreFontManager.h>
+#   include <OgreOverlayManager.h>
+#   include <OgreTextAreaOverlayElement.h>
+#   include <OgrePanelOverlayElement.h>
+#endif
 
 #include <typeinfo>
Index: /code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDRadar.cc
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDRadar.cc	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDRadar.cc	(revision 11795)
@@ -31,6 +31,11 @@
 #include "HUDRadar.h"
 
-#include <OgreOverlayManager.h>
-#include <OgrePanelOverlayElement.h>
+#if OGRE_VERSION >= 0x010900
+#   include <Overlay/OgreOverlayManager.h>
+#   include <Overlay/OgrePanelOverlayElement.h>
+#else
+#   include <OgreOverlayManager.h>
+#   include <OgrePanelOverlayElement.h>
+#endif
 
 #include "util/Math.h"
Index: /code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDWeapon.cc
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDWeapon.cc	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDWeapon.cc	(revision 11795)
@@ -28,4 +28,12 @@
 
 #include "HUDWeapon.h"
+
+#if OGRE_VERSION >= 0x010900
+#   include <Overlay/OgreOverlayManager.h>
+#   include <Overlay/OgrePanelOverlayElement.h>
+#else
+#   include <OgreOverlayManager.h>
+#   include <OgrePanelOverlayElement.h>
+#endif
 
 #include "core/CoreIncludes.h"
Index: /code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDWeapon.h
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDWeapon.h	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDWeapon.h	(revision 11795)
@@ -35,7 +35,4 @@
 #include <vector>
 #include <string>
-
-#include <OgreOverlayManager.h>
-#include <OgrePanelOverlayElement.h> 
 
 #include "overlays/OrxonoxOverlay.h"
Index: /code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDWeaponMode.cc
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDWeaponMode.cc	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDWeaponMode.cc	(revision 11795)
@@ -28,4 +28,12 @@
 
 #include "HUDWeaponMode.h"
+
+#if OGRE_VERSION >= 0x010900
+#   include <Overlay/OgreOverlayManager.h>
+#   include <Overlay/OgrePanelOverlayElement.h>
+#else
+#   include <OgreOverlayManager.h>
+#   include <OgrePanelOverlayElement.h>
+#endif
 
 #include "util/Convert.h"
Index: /code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDWeaponMode.h
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDWeaponMode.h	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDWeaponMode.h	(revision 11795)
@@ -36,7 +36,4 @@
 #include <vector>
 #include <string>
-
-#include <OgreOverlayManager.h>
-#include <OgrePanelOverlayElement.h> 
 
 #include "overlays/OrxonoxOverlay.h"
Index: /code/branches/cegui0.8_ogre1.9/src/modules/overlays/stats/Stats.cc
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/modules/overlays/stats/Stats.cc	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/modules/overlays/stats/Stats.cc	(revision 11795)
@@ -30,6 +30,12 @@
 
 #include <string>
-#include <OgreOverlayManager.h>
-#include <OgreBorderPanelOverlayElement.h>
+
+#if OGRE_VERSION >= 0x010900
+#   include <Overlay/OgreOverlayManager.h>
+#   include <Overlay/OgreBorderPanelOverlayElement.h>
+#else
+#   include <OgreOverlayManager.h>
+#   include <OgreBorderPanelOverlayElement.h>
+#endif
 
 #include "util/StringUtils.h"
Index: /code/branches/cegui0.8_ogre1.9/src/orxonox/CMakeLists.txt
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/orxonox/CMakeLists.txt	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/orxonox/CMakeLists.txt	(revision 11795)
@@ -71,4 +71,5 @@
   LINK_LIBRARIES
     ${OGRE_LIBRARY}
+    ${OGRE_OVERLAY_LIBRARY}
     ${CEGUI}
     ${LUA5.1_LIBRARY}
Index: /code/branches/cegui0.8_ogre1.9/src/orxonox/RenderQueueListener.cc
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/orxonox/RenderQueueListener.cc	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/orxonox/RenderQueueListener.cc	(revision 11795)
@@ -83,4 +83,7 @@
             renderSystem->setStencilBufferParams(Ogre::CMPF_ALWAYS_PASS,
                 STENCIL_VALUE_FOR_GLOW, STENCIL_FULL_MASK, 
+#if OGRE_VERSION >= 0x010900
+                STENCIL_FULL_MASK,
+#endif
                 Ogre::SOP_KEEP,Ogre::SOP_KEEP,Ogre::SOP_REPLACE,false);       
         } 
@@ -91,4 +94,7 @@
             renderSystem->setStencilBufferParams(Ogre::CMPF_NOT_EQUAL,
                 STENCIL_VALUE_FOR_GLOW, STENCIL_FULL_MASK, 
+#if OGRE_VERSION >= 0x010900
+                STENCIL_FULL_MASK,
+#endif
                 Ogre::SOP_KEEP,Ogre::SOP_KEEP,Ogre::SOP_REPLACE,false);       
         }
Index: /code/branches/cegui0.8_ogre1.9/src/orxonox/Scene.cc
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/orxonox/Scene.cc	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/orxonox/Scene.cc	(revision 11795)
@@ -40,4 +40,7 @@
 #include <OgreSceneManagerEnumerator.h>
 #include <OgreSceneNode.h>
+#if OGRE_VERSION >= 0x010900
+#   include <Overlay/OgreOverlaySystem.h>
+#endif
 
 #include <BulletCollision/BroadphaseCollision/btAxisSweep3.h>
@@ -90,4 +93,7 @@
             this->renderQueueListener_ = new RenderQueueListener();
             this->sceneManager_->addRenderQueueListener(this->renderQueueListener_);//add our own renderQueueListener
+#if OGRE_VERSION >= 0x010900
+            this->sceneManager_->addRenderQueueListener(GraphicsManager::getInstance().getOverlaySystem());
+#endif
 
             this->radar_ = new Radar();
@@ -134,4 +140,7 @@
             if (GameMode::showsGraphics())
             {
+#if OGRE_VERSION >= 0x010900
+                this->sceneManager_->removeRenderQueueListener(GraphicsManager::getInstance().getOverlaySystem());
+#endif
                 this->sceneManager_->removeRenderQueueListener(this->renderQueueListener_);
                 delete this->renderQueueListener_;
Index: /code/branches/cegui0.8_ogre1.9/src/orxonox/chat/ChatInputHandler.cc
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/orxonox/chat/ChatInputHandler.cc	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/orxonox/chat/ChatInputHandler.cc	(revision 11795)
@@ -131,15 +131,32 @@
     /* GET WINDOW POINTERS */
 #if CEGUI_VERSION >= 0x000800
-    input = CEGUI::System::getSingleton().getDefaultGUIContext().getRootWindow()->getChild( "orxonox/ChatBox/input" );
-    inputonly = CEGUI::System::getSingleton().getDefaultGUIContext().getRootWindow()->getChild( "orxonox/ChatBox-inputonly/input" );
-    CEGUI::Window *history = CEGUI::System::getSingleton().getDefaultGUIContext().getRootWindow()->getChild( "orxonox/ChatBox/history" );
+    //input = CEGUI::System::getSingleton().getDefaultGUIContext().getRootWindow()->getChild( "ChatBox/input" );
+    //const CEGUI::Window* root = CEGUI::System::getSingleton().getDefaultGUIContext().getRootWindow()->getChild("MenuRootWindow");
+    //std::cout << "Count: " << root->getChildCount() << std::endl;
+    //for (int i = 0; i < root->getChildCount(); ++i) {
+    //	std::cout << "Child: " << root->getChildAtIdx(i)->getName() << std::endl;
+    //}
+    for (auto iterator = CEGUI::WindowManager::getSingleton().getIterator(); !iterator.isAtEnd(); iterator++) {
+    	CEGUI::Window* currentWindow = iterator.getCurrentValue();
+    	if (currentWindow->getName().compare("ChatBox") == 0) {
+    		input = currentWindow->getChild("frame")->getChild("input");
+    		CEGUI::Window* history = currentWindow->getChild("frame")->getChild("history");
+    		lb_history = dynamic_cast<CEGUI::Listbox*>(history);
+    	} else if (currentWindow->getName().compare("ChatBox-inputonly") == 0) {
+    		inputonly = currentWindow->getChild("input");
+    	}
+    }
+
+    //input = CEGUI::System::getSingleton().getDefaultGUIContext().getRootWindow()->getChild( "ChatBox" )->getChild("frame")->getChild("input");
+    //inputonly = CEGUI::System::getSingleton().getDefaultGUIContext().getRootWindow()->getChild( "orxonox/ChatBox-inputonly/input" );
+    //CEGUI::Window *history = CEGUI::System::getSingleton().getDefaultGUIContext().getRootWindow()->getChild( "orxonox/ChatBox/history" );
 #else
     input = CEGUI::WindowManager::getSingleton().getWindow( "orxonox/ChatBox/input" );
     inputonly = CEGUI::WindowManager::getSingleton().getWindow( "orxonox/ChatBox-inputonly/input" );
     CEGUI::Window *history = CEGUI::WindowManager::getSingleton().getWindow( "orxonox/ChatBox/history" );
-#endif
 
     /* cast it to a listbox */
     lb_history = dynamic_cast<CEGUI::Listbox*>(history);
+#endif
 
     /* assert wee */
Index: /code/branches/cegui0.8_ogre1.9/src/orxonox/controllers/NewHumanController.cc
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/orxonox/controllers/NewHumanController.cc	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/orxonox/controllers/NewHumanController.cc	(revision 11795)
@@ -397,5 +397,10 @@
                 try
                 {
-                    wePtr = orxonox_cast<WorldEntity*>(Ogre::any_cast<OrxonoxClass*>(itr->movable->getUserAny()));
+#if OGRE_VERSION >= 0x010900
+                    const Ogre::Any& any = itr->movable->getUserObjectBindings().getUserAny();
+#else
+                    const Ogre::Any& any = itr->movable->getUserAny();
+#endif
+                    wePtr = orxonox_cast<WorldEntity*>(Ogre::any_cast<OrxonoxClass*>(any));
                 }
                 catch (...)
Index: /code/branches/cegui0.8_ogre1.9/src/orxonox/graphics/AnimatedModel.cc
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/orxonox/graphics/AnimatedModel.cc	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/orxonox/graphics/AnimatedModel.cc	(revision 11795)
@@ -49,6 +49,6 @@
     AnimatedModel::~AnimatedModel()
     {
-        if (this->isInitialized() && this->mesh_.getEntity())
-            this->detachOgreObject(this->mesh_.getEntity());
+        if (this->isInitialized() && this->getMesh().getEntity())
+            this->detachOgreObject(this->getMesh().getEntity());
     }
 
@@ -66,15 +66,15 @@
         if (GameMode::showsGraphics())
         {
-            if (this->mesh_.getEntity())
-                this->detachOgreObject(this->mesh_.getEntity());
+            if (this->getMesh().getEntity())
+                this->detachOgreObject(this->getMesh().getEntity());
 
-            this->mesh_.setMeshSource(this->getScene()->getSceneManager(), this->meshSrc_);
+            this->getMesh().setMeshSource(this->getScene()->getSceneManager(), this->getMeshSource());
 
-            if (this->mesh_.getEntity())
+            if (this->getMesh().getEntity())
             {
-                this->attachOgreObject(this->mesh_.getEntity());
-                this->mesh_.getEntity()->setCastShadows(this->bCastShadows_);
+                this->attachOgreObject(this->getMesh().getEntity());
+                this->getMesh().getEntity()->setCastShadows(this->getCastShadows());
                 this->setAnimationState(this->bAnimLoop_, this->bAnimEnabled_, this->anims_);
-                this->mesh_.setVisible(this->isVisible());
+                this->getMesh().setVisible(this->isVisible());
             }
         }
@@ -89,7 +89,7 @@
         if(state!="")
         {
-        if(this->mesh_.getEntity()->getAnimationState(state))
+        if(this->getMesh().getEntity()->getAnimationState(state))
         {
-        Ogre::AnimationState* as = this->mesh_.getEntity()->getAnimationState(state);
+        Ogre::AnimationState* as = this->getMesh().getEntity()->getAnimationState(state);
         as->setLoop(loop);
         as->setEnabled(enabled);
@@ -109,9 +109,9 @@
     void AnimatedModel::tick(float dt)
     {
-        if(this->mesh_.getEntity()->getAnimationState(anims_))
+        if(this->getMesh().getEntity()->getAnimationState(anims_))
         {
 // Test to change Material at runtime!
 
-//            Ogre::MaterialPtr mat = this->mesh_.getEntity()->getSubEntity(0)->getMaterial();
+//            Ogre::MaterialPtr mat = this->getMesh().getEntity()->getSubEntity(0)->getMaterial();
 //            mat->setDiffuse(0.4, 0.3, 0.1, 0.1);
 //            mat->setAmbient(0.3, 0.7, 0.8);
@@ -121,5 +121,5 @@
 //            mat->setSceneBlending(sbt);
 
-            Ogre::AnimationState* as = this->mesh_.getEntity()->getAnimationState(anims_);
+            Ogre::AnimationState* as = this->getMesh().getEntity()->getAnimationState(anims_);
             as->addTime(dt);
     }
Index: /code/branches/cegui0.8_ogre1.9/src/orxonox/graphics/Camera.cc
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/orxonox/graphics/Camera.cc	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/orxonox/graphics/Camera.cc	(revision 11795)
@@ -62,5 +62,10 @@
 
         this->camera_ = this->getScene()->getSceneManager()->createCamera(getUniqueNumberString());
-        static_cast<Ogre::MovableObject*>(this->camera_)->setUserAny(Ogre::Any(static_cast<OrxonoxClass*>(this)));
+        Ogre::MovableObject* movable = static_cast<Ogre::MovableObject*>(this->camera_);
+#if OGRE_VERSION >= 0x010900
+        movable->getUserObjectBindings().setUserAny(Ogre::Any(static_cast<OrxonoxClass*>(this)));
+#else
+        movable->setUserAny(Ogre::Any(static_cast<OrxonoxClass*>(this)));
+#endif
         this->cameraNode_ = this->getScene()->getRootSceneNode()->createChildSceneNode();
         this->attachNode(this->cameraNode_);
Index: /code/branches/cegui0.8_ogre1.9/src/orxonox/graphics/Model.cc
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/orxonox/graphics/Model.cc	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/orxonox/graphics/Model.cc	(revision 11795)
@@ -30,5 +30,10 @@
 
 #include <OgreEntity.h>
-#include <OgreProgressiveMesh.h>
+#if OGRE_VERSION >= 0x010900
+#   include <OgreProgressiveMeshGenerator.h>
+#   include <OgreDistanceLodStrategy.h>
+#else
+#   include <OgreProgressiveMesh.h>
+#endif
 
 #include "core/CoreIncludes.h"
@@ -203,19 +208,9 @@
             {
                 float volume = this->mesh_.getEntity()->getBoundingBox().volume();
-/*
-                float scaleFactor = 1;
-
-                BaseObject* creatorPtr = this;
-
-                while(creatorPtr!=nullptr&&orxonox_cast<WorldEntity*>(creatorPtr))
-                {
-                    scaleFactor *= getBiggestScale(((WorldEntity*) creatorPtr)->getScale3D());
-                    creatorPtr = creatorPtr->getCreator();
-                }
-                orxout() << "name: " << this->meshSrc_ << "scaleFactor: " << scaleFactor << ", volume: " << volume << endl;
-*/
                 orxout(verbose, context::lod) << "Setting lodLevel for " << this->meshSrc_<< " with lodLevel_: " << this->lodLevel_ <<" and volume: "<< volume << ":" << endl;
 
-#if OGRE_VERSION >= 0x010800
+#if OGRE_VERSION >= 0x010900
+                Ogre::LodConfig::LodLevelList distList;
+#elif OGRE_VERSION >= 0x010800
                 Ogre::ProgressiveMesh::LodValueList distList;
 #elif OGRE_VERSION >= 0x010700
@@ -227,19 +222,18 @@
                 if( lodLevel_>0 )
                 {
-//                    float factor = scaleFactor*5/lodLevel_;
                     float factor = pow(volume, 2.0f / 3.0f) * 15.0f / lodLevel_;
 
                     orxout(verbose, context::lod) << "LodLevel set with factor: " << factor << endl;
 
-                    distList.push_back(70.0f*factor);
-                    distList.push_back(140.0f*factor);
-                    distList.push_back(170.0f*factor);
-                    distList.push_back(200.0f*factor);
-                    distList.push_back(230.0f*factor);
-                    distList.push_back(250.0f*factor);
-                    distList.push_back(270.0f*factor);
-                    distList.push_back(290.0f*factor);
-                    distList.push_back(310.0f*factor);
-                    distList.push_back(330.0f*factor);
+                    addLodDistanceToList(distList, 70.0f*factor);
+                    addLodDistanceToList(distList, 140.0f*factor);
+                    addLodDistanceToList(distList, 170.0f*factor);
+                    addLodDistanceToList(distList, 200.0f*factor);
+                    addLodDistanceToList(distList, 230.0f*factor);
+                    addLodDistanceToList(distList, 250.0f*factor);
+                    addLodDistanceToList(distList, 270.0f*factor);
+                    addLodDistanceToList(distList, 290.0f*factor);
+                    addLodDistanceToList(distList, 310.0f*factor);
+                    addLodDistanceToList(distList, 330.0f*factor);
                     while(distList.size()>this->numLodLevels_)
                         distList.pop_back();
@@ -247,5 +241,13 @@
 
                     //Generiert LOD-Levels
-#if OGRE_VERSION >= 0x010800
+#if OGRE_VERSION >= 0x010900
+                    Ogre::LodConfig config;
+                    config.mesh = this->mesh_.getEntity()->getMesh();
+                    config.levels = distList;
+                    config.strategy = Ogre::DistanceLodSphereStrategy::getSingletonPtr();
+
+                    Ogre::ProgressiveMeshGenerator generator;
+                    generator.generateLodLevels(config);
+#elif OGRE_VERSION >= 0x010800
                     Ogre::ProgressiveMesh::generateLodLevels(this->mesh_.getEntity()->getMesh().get(), distList, Ogre::ProgressiveMesh::VRQ_PROPORTIONAL,
                         this->lodReductionRate_);
@@ -270,3 +272,13 @@
 #endif
     }
+
+    template <class T>
+    void Model::addLodDistanceToList(T& list, float distance)
+    {
+#if OGRE_VERSION >= 0x010900
+        list.push_back({distance, Ogre::LodLevel::VRM_COLLAPSE_COST, this->lodReductionRate_, 0, false});
+#else
+        list.push_back(distance);
+#endif
+    }
 }
Index: /code/branches/cegui0.8_ogre1.9/src/orxonox/graphics/Model.h
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/orxonox/graphics/Model.h	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/orxonox/graphics/Model.h	(revision 11795)
@@ -89,4 +89,11 @@
 
         protected:
+            inline Mesh& getMesh()
+                { return this->mesh_; }
+
+            inline void setLodEnabled(bool bLodEnabled)
+                { this->bLodEnabled_ = bLodEnabled; }
+
+        private:
             /**
             @brief
@@ -108,4 +115,7 @@
             //LoD
             void enableLod();
+
+            template <class T>
+            void addLodDistanceToList(T& list, float distance);
 
             inline void setLodLevel(float lodLevel)
Index: /code/branches/cegui0.8_ogre1.9/src/orxonox/overlays/InGameConsole.cc
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/orxonox/overlays/InGameConsole.cc	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/orxonox/overlays/InGameConsole.cc	(revision 11795)
@@ -32,12 +32,24 @@
 #include <algorithm>
 #include <string>
-#include <OgreOverlay.h>
-#include <OgreOverlayElement.h>
-#include <OgreOverlayManager.h>
-#include <OgreOverlayContainer.h>
-#include <OgreBorderPanelOverlayElement.h>
-#include <OgreTextAreaOverlayElement.h>
-#include <OgreFontManager.h>
-#include <OgreFont.h>
+#include <OgrePrerequisites.h>
+#if OGRE_VERSION >= 0x010900
+#   include <Overlay/OgreOverlay.h>
+#   include <Overlay/OgreOverlayElement.h>
+#   include <Overlay/OgreOverlayManager.h>
+#   include <Overlay/OgreOverlayContainer.h>
+#   include <Overlay/OgreBorderPanelOverlayElement.h>
+#   include <Overlay/OgreTextAreaOverlayElement.h>
+#   include <Overlay/OgreFontManager.h>
+#   include <Overlay/OgreFont.h>
+#else
+#   include <OgreOverlay.h>
+#   include <OgreOverlayElement.h>
+#   include <OgreOverlayManager.h>
+#   include <OgreOverlayContainer.h>
+#   include <OgreBorderPanelOverlayElement.h>
+#   include <OgreTextAreaOverlayElement.h>
+#   include <OgreFontManager.h>
+#   include <OgreFont.h>
+#endif
 
 #include "util/Clock.h"
Index: /code/branches/cegui0.8_ogre1.9/src/orxonox/overlays/OrxonoxOverlay.cc
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/orxonox/overlays/OrxonoxOverlay.cc	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/orxonox/overlays/OrxonoxOverlay.cc	(revision 11795)
@@ -35,7 +35,13 @@
 
 #include <cmath>
-#include <OgreOverlay.h>
-#include <OgreOverlayManager.h>
-#include <OgrePanelOverlayElement.h>
+#if OGRE_VERSION >= 0x010900
+#   include <Overlay/OgreOverlay.h>
+#   include <Overlay/OgreOverlayManager.h>
+#   include <Overlay/OgrePanelOverlayElement.h>
+#else
+#   include <OgreOverlay.h>
+#   include <OgreOverlayManager.h>
+#   include <OgrePanelOverlayElement.h>
+#endif
 #include <OgreRenderWindow.h>
 #include <OgreMaterialManager.h>
Index: /code/branches/cegui0.8_ogre1.9/src/orxonox/worldentities/WorldEntity.cc
===================================================================
--- /code/branches/cegui0.8_ogre1.9/src/orxonox/worldentities/WorldEntity.cc	(revision 11794)
+++ /code/branches/cegui0.8_ogre1.9/src/orxonox/worldentities/WorldEntity.cc	(revision 11795)
@@ -548,5 +548,9 @@
     {
         this->node_->attachObject(object);
+#if OGRE_VERSION >= 0x010900
+        object->getUserObjectBindings().setUserAny(Ogre::Any(static_cast<OrxonoxClass*>(this)));
+#else
         object->setUserAny(Ogre::Any(static_cast<OrxonoxClass*>(this)));
+#endif
     }
 
@@ -563,5 +567,9 @@
     void WorldEntity::detachOgreObject(Ogre::MovableObject* object)
     {
+#if OGRE_VERSION >= 0x010900
+        object->getUserObjectBindings().setUserAny(Ogre::Any(static_cast<OrxonoxClass*>(nullptr)));
+#else
         object->setUserAny(Ogre::Any(static_cast<OrxonoxClass*>(nullptr)));
+#endif
         this->node_->detachObject(object);
     }
