Index: base/applications/cmdutils/reg/reg.rbuild
===================================================================
--- base/applications/cmdutils/reg/reg.rbuild	(revision 46913)
+++ base/applications/cmdutils/reg/reg.rbuild	(working copy)
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="reg" type="win32cui" installbase="system32" installname="reg.exe" unicode="true">
 	<include base="reg">.</include>
 	<redefine name="_WIN32_WINNT">0x600</redefine>
Index: base/applications/downloader/downloader.rbuild
===================================================================
--- base/applications/downloader/downloader.rbuild	(revision 46913)
+++ base/applications/downloader/downloader.rbuild	(working copy)
@@ -1,25 +1,26 @@
 <?xml version="1.0"?>
-<group xmlns:xi="http://www.w3.org/2001/XInclude">
-	<installfile installbase="system32">downloader.xml</installfile>
-	<module name="downloader" type="win32gui" installbase="system32" installname="downloader.exe" unicode="yes">
-		<include base="downloader">.</include>
-		<include base="expat">.</include>
+<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
+<group>
+<installfile installbase="system32">downloader.xml</installfile>
+<module name="downloader" type="win32gui" installbase="system32" installname="downloader.exe" unicode="yes">
+	<include base="downloader">.</include>
+	<include base="expat">.</include>
 
-		<library>advapi32</library>
-		<library>ntdll</library>
-		<library>user32</library>
-		<library>gdi32</library>
-		<library>shell32</library>
-		<library>comctl32</library>
-		<library>msimg32</library>
-		<library>shlwapi</library>
-		<library>urlmon</library>
-		<library>uuid</library>
-		<library>expat</library>
+	<library>advapi32</library>
+	<library>ntdll</library>
+	<library>user32</library>
+	<library>gdi32</library>
+	<library>shell32</library>
+	<library>comctl32</library>
+	<library>msimg32</library>
+	<library>shlwapi</library>
+	<library>urlmon</library>
+	<library>uuid</library>
+	<library>expat</library>
 
-		<file>main.c</file>
-		<file>xml.c</file>
-		<file>download.c</file>
-		<file>downloader.rc</file>
-	</module>
-</group>
+	<file>main.c</file>
+	<file>xml.c</file>
+	<file>download.c</file>
+	<file>downloader.rc</file>
+</module>
+</group>
\ No newline at end of file
Index: base/applications/fontview/fontview.rbuild
===================================================================
--- base/applications/fontview/fontview.rbuild	(revision 46913)
+++ base/applications/fontview/fontview.rbuild	(working copy)
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="fontview" type="win32gui" installbase="system32" installname="fontview.exe">
 	<include base="fontview">.</include>
 	<library>gdi32</library>
Index: base/applications/kbswitch/kbswitch.rbuild
===================================================================
--- base/applications/kbswitch/kbswitch.rbuild	(revision 46913)
+++ base/applications/kbswitch/kbswitch.rbuild	(working copy)
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 <module name="kbswitch" type="win32gui" installbase="system32" installname="kbswitch.exe" unicode="yes">
 	<include base="kbswitch">.</include>
Index: base/applications/magnify/magnify.rbuild
===================================================================
--- base/applications/magnify/magnify.rbuild	(revision 46913)
+++ base/applications/magnify/magnify.rbuild	(working copy)
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE project SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="magnify" type="win32gui" installbase="system32" installname="magnify.exe">
 	<include base="magnify">.</include>
 	<library>user32</library>
Index: base/applications/mplay32/mplay32.rbuild
===================================================================
--- base/applications/mplay32/mplay32.rbuild	(revision 46913)
+++ base/applications/mplay32/mplay32.rbuild	(working copy)
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="mplay32" type="win32gui" installbase="system32" installname="mplay32.exe" unicode="yes">
 	<include base="mplay32">.</include>
 	<library>advapi32</library>
Index: base/applications/mscutils/eventvwr/eventvwr.rbuild
===================================================================
--- base/applications/mscutils/eventvwr/eventvwr.rbuild	(revision 46913)
+++ base/applications/mscutils/eventvwr/eventvwr.rbuild	(working copy)
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="eventvwr" type="win32gui" installbase="system32" installname="eventvwr.exe" unicode="yes">
 	<include base="eventvwr">.</include>
 	<library>user32</library>
@@ -8,4 +8,3 @@
 	<file>eventvwr.c</file>
 	<file>eventvwr.rc</file>
 </module>
-</rbuild>
Index: base/applications/rapps/rapps.rbuild
===================================================================
--- base/applications/rapps/rapps.rbuild	(revision 46913)
+++ base/applications/rapps/rapps.rbuild	(working copy)
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="rapps" type="win32gui" installbase="system32" installname="rapps.exe" unicode="yes">
 	<include base="ReactOS">include/reactos</include>
Index: base/applications/winver/winver.rbuild
===================================================================
--- base/applications/winver/winver.rbuild	(revision 46913)
+++ base/applications/winver/winver.rbuild	(working copy)
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="winver" type="win32gui" installbase="system32" installname="winver.exe" unicode="yes">
 	<include base="winver">.</include>
 	<library>shell32</library>
Index: base/services/rpcss/rpcss.rbuild
===================================================================
--- base/services/rpcss/rpcss.rbuild	(revision 46913)
+++ base/services/rpcss/rpcss.rbuild	(working copy)
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="rpcss" type="win32cui" installbase="system32" installname="rpcss.exe" unicode="yes">
 	<include base="rpcss">.</include>
Index: base/services/telnetd/telnetd.rbuild
===================================================================
--- base/services/telnetd/telnetd.rbuild	(revision 46913)
+++ base/services/telnetd/telnetd.rbuild	(working copy)
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="telnetd" type="win32cui" installbase="system32" installname="telnetd.exe" unicode="no">
 	<include base="reactos"></include>
 	<include base="telnetd">..</include>
Index: base/services/tftpd/tftpd.rbuild
===================================================================
--- base/services/tftpd/tftpd.rbuild	(revision 46913)
+++ base/services/tftpd/tftpd.rbuild	(working copy)
@@ -1,11 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="tftpd" type="win32cui" installbase="system32" installname="tftpd.exe" allowwarnings="true" unicode="no">
 	<include base="reactos"></include>
 	<include base="telnetd">..</include>
-
 	<library>ntdll</library>
 	<library>advapi32</library>
 	<library>ws2_32</library>
 	<library>wine</library>
-
 	<file>tftpd.cpp</file>
 </module>
Index: base/system/runonce/runonce.rbuild
===================================================================
--- base/system/runonce/runonce.rbuild	(revision 46913)
+++ base/system/runonce/runonce.rbuild	(working copy)
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="runonce" type="win32gui" installbase="system32" installname="runonce.exe" unicode="yes">
 	<include base="runonce">.</include>
 	<library>advapi32</library>
Index: boot/bootdata/bootcd/bootcd.rbuild
===================================================================
--- boot/bootdata/bootcd/bootcd.rbuild	(revision 46913)
+++ boot/bootdata/bootcd/bootcd.rbuild	(working copy)
@@ -1,12 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<if property="ARCH" value="i386>
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+<if property="ARCH" value="i386">
 	<module name="bootcd" type="iso" output="ReactOS.iso">
 		<bootsector>isoboot</bootsector>
 	</module>
 </if>
-<ifnot property="ARCH" value="i386>
+<ifnot property="ARCH" value="i386">
 	<module name="bootcd" type="iso" output="ReactOS-$(ARCH).iso">
 		<bootsector>isoboot</bootsector>
 	</module>
 </ifnot>
+</group>
\ No newline at end of file
Index: boot/bootdata/livecd/livecd.rbuild
===================================================================
--- boot/bootdata/livecd/livecd.rbuild	(revision 46913)
+++ boot/bootdata/livecd/livecd.rbuild	(working copy)
@@ -1,12 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<if property="ARCH" value="i386>
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+<if property="ARCH" value="i386">
 	<module name="livecd" type="liveiso" output="ReactOS-LiveCD.iso">
 		<bootsector>isoboot</bootsector>
 	</module>
 </if>
-<ifnot property="ARCH" value="i386>
+<ifnot property="ARCH" value="i386">
 	<module name="livecd" type="liveiso" output="ReactOS-LiveCD-$(ARCH).iso">
 		<bootsector>isoboot</bootsector>
 	</module>
 </ifnot>
+</group>
\ No newline at end of file
Index: boot/freeldr/freeldr/freeldr_arch.rbuild
===================================================================
--- boot/freeldr/freeldr/freeldr_arch.rbuild	(revision 46913)
+++ boot/freeldr/freeldr/freeldr_arch.rbuild	(working copy)
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE directory SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="freeldr_arch" type="objectlibrary" crt="static">
 	<include base="freeldr_base">include</include>
 	<include base="freeldr_base">cache</include>
Index: dll/win32/actxprxy/actxprxy.rbuild
===================================================================
--- dll/win32/actxprxy/actxprxy.rbuild	(revision 46913)
+++ dll/win32/actxprxy/actxprxy.rbuild	(working copy)
@@ -31,7 +31,6 @@
 	<file>actxprxy_ocmm.idl</file>
 	<file>actxprxy_servprov.idl</file>
 	<!-- file>actxprxy_shobjidl.idl</file -->
-	<file>actxprxy_urlhist.idl
-</file>
+	<file>actxprxy_urlhist.idl</file>
 </module>
 </group>
Index: dll/win32/msacm32/msacm32.rbuild
===================================================================
--- dll/win32/msacm32/msacm32.rbuild	(revision 46913)
+++ dll/win32/msacm32/msacm32.rbuild	(working copy)
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<group>
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
 <module name="msacm32" type="win32dll" baseaddress="${BASEADDRESS_MSACM32}" installbase="system32" installname="msacm32.dll" unicode="yes">
 	<importlibrary definition="msacm32.spec" />
 	<include base="msacm32">.</include>
Index: drivers/bus/acpi/acpi.rbuild
===================================================================
--- drivers/bus/acpi/acpi.rbuild	(revision 46913)
+++ drivers/bus/acpi/acpi.rbuild	(working copy)
@@ -10,8 +10,8 @@
 <directory name="compbatt">
 	<xi:include href="compbatt/compbatt.rbuild" />
 </directory>
-</group>
 
+
 <module name="acpi" type="kernelmodedriver" installbase="system32/drivers" installname="acpi.sys" allowwarnings="true">
 	<bootstrap installbase="$(CDOUTPUT)" />
 	<include base="acpi">include</include>
@@ -36,3 +36,4 @@
 	<file>buspdo.c</file>
 	<file>main.c</file>
 </module>
+</group>
\ No newline at end of file
Index: ntoskrnl/io/iomgr/ramdisk.c
===================================================================
--- ntoskrnl/io/iomgr/ramdisk.c	(revision 46913)
+++ ntoskrnl/io/iomgr/ramdisk.c	(working copy)
@@ -206,18 +206,18 @@
     //
     // Convert the GUID
     //
-    Status = RtlStringFromGUID(&RamdiskCreate.DiskGuid, &GuidString);
-    if (!NT_SUCCESS(Status))
-    {
-        //
-        // Bugcheck -- GUID convert failed
-        //
-        KeBugCheckEx(RAMDISK_BOOT_INITIALIZATION_FAILED,
-                     RD_GUID_CONVERT_FAILED,
-                     Status,
-                     0,
-                     0);
-    }
+    //Status = RtlStringFromGUID(&RamdiskCreate.DiskGuid, &GuidString);
+    //if (!NT_SUCCESS(Status))
+    //{
+    //    //
+    //    // Bugcheck -- GUID convert failed
+    //    //
+    //    KeBugCheckEx(RAMDISK_BOOT_INITIALIZATION_FAILED,
+    //                 RD_GUID_CONVERT_FAILED,
+    //                 Status,
+    //                 0,
+    //                 0);
+    //}
     
     //
     // Build the symbolic link name and target
@@ -225,7 +225,7 @@
     _snwprintf(SourceString,
                sizeof(SourceString),
                L"\\Device\\Ramdisk%wZ",
-               &GuidString);
+               1);
     SymbolicLinkName.Length = 38;
     SymbolicLinkName.MaximumLength = 38 + sizeof(UNICODE_NULL);
     SymbolicLinkName.Buffer = L"\\ArcName\\ramdisk(0)";
Index: tools/sysgen/RosFramework/RBuildModule.cs
===================================================================
--- tools/sysgen/RosFramework/RBuildModule.cs	(revision 46913)
+++ tools/sysgen/RosFramework/RBuildModule.cs	(working copy)
@@ -224,6 +224,7 @@
                     case ModuleType.Alias:
                     case ModuleType.BootProgram:
                     case ModuleType.IdlHeader:
+                    case ModuleType.IdlInterface:
                     case ModuleType.MessageHeader:
                     case ModuleType.Package:
                     case ModuleType.ModuleGroup:
@@ -234,7 +235,7 @@
                     case ModuleType.Cabinet:
                         return ".cab";
                     default:
-                        throw new Exception("Unknown module type");
+                        throw new Exception("Unknown Module Type: " + Type.ToString());
                 }
             }
         }
@@ -431,6 +432,7 @@
                     case ModuleType.RpcProxy:
                     case ModuleType.Alias:
                     case ModuleType.IdlHeader:
+                    case ModuleType.IdlInterface:
                     case ModuleType.MessageHeader:
                     case ModuleType.EmbeddedTypeLib:
                     case ModuleType.Cabinet:
@@ -439,7 +441,7 @@
                     case ModuleType.PlatformProfile:
                         return false;
                     default:
-                        throw new Exception("Unknown Module Type");
+                        throw new Exception("Unknown Module Type: " + Type.ToString());
                 }
             }
         }
@@ -479,6 +481,7 @@
                     case ModuleType.RpcProxy:
                     case ModuleType.Alias:
                     case ModuleType.IdlHeader:
+                    case ModuleType.IdlInterface:
                     case ModuleType.MessageHeader:
                     case ModuleType.EmbeddedTypeLib:
                     case ModuleType.Cabinet:
@@ -487,7 +490,7 @@
                     case ModuleType.PlatformProfile:
                         return false;
                     default:
-                        throw new Exception("Unknown Module Type");
+                        throw new Exception("Unknown Module Type: " + Type.ToString());
                 }
             }
         }
@@ -531,6 +534,7 @@
                     case ModuleType.Alias:
                     case ModuleType.BootProgram:
                     case ModuleType.IdlHeader:
+                    case ModuleType.IdlInterface:
                     case ModuleType.MessageHeader:
                     case ModuleType.EmbeddedTypeLib:
                     case ModuleType.Cabinet:
@@ -539,7 +543,7 @@
                     case ModuleType.PlatformProfile:
                         return string.Empty;
                     default:
-                        throw new Exception("Unknown Module Type");
+                        throw new Exception("Unknown Module Type: " + Type.ToString());
                 }
             }
         }
@@ -593,6 +597,7 @@
                     case ModuleType.Alias:
                     case ModuleType.BootProgram:
                     case ModuleType.IdlHeader:
+                    case ModuleType.IdlInterface:
                     case ModuleType.MessageHeader:
                     case ModuleType.EmbeddedTypeLib:
                     case ModuleType.Cabinet:
@@ -601,7 +606,7 @@
                     case ModuleType.PlatformProfile:
                         return string.Empty;
                     default:
-                        throw new Exception("Unknown Module Type");
+                        throw new Exception("Unknown Module Type: " + Type.ToString());
                 }
             }
         }
Index: tools/sysgen/SysGen.BuildEngine/Tasks/RBuild/ModuleTask.cs
===================================================================
--- tools/sysgen/SysGen.BuildEngine/Tasks/RBuild/ModuleTask.cs	(revision 46913)
+++ tools/sysgen/SysGen.BuildEngine/Tasks/RBuild/ModuleTask.cs	(working copy)
@@ -176,6 +176,7 @@
                 (Module.Type == ModuleType.BootSector) ||
                 (Module.Type == ModuleType.EmbeddedTypeLib) ||
                 (Module.Type == ModuleType.IdlHeader) ||
+                (Module.Type == ModuleType.IdlInterface) ||
                 (Module.Type == ModuleType.Kernel) ||
                 (Module.Type == ModuleType.KernelModeDLL) ||
                 (Module.Type == ModuleType.KernelModeDriver) ||