diff --git a/baseaddress.rbuild b/baseaddress.rbuild
index 260c17e2fe8..f0d5a55746b 100644
--- a/baseaddress.rbuild
+++ b/baseaddress.rbuild
@@ -171,7 +171,7 @@
 	<property name="BASEADDRESS_MSCTF"		value="0x746e0000" />
 	<property name="BASEADDRESS_QUARTZ"		value="0x747d0000" />
 	<property name="BASEADDRESS_USERENV"		value="0x74850000" />
-	<property name="BASEADDRESS_SYSSETUP"		value="0x74a10000" />
+	<property name="BASEADDRESS_SYSSETUP"		value="0x74900000" />
 	<property name="BASEADDRESS_WS2_32"		value="0x74aa0000" />
 	<property name="BASEADDRESS_POWRPROF"		value="0x74ad0000" />
 	<property name="BASEADDRESS_MSXML3"		value="0x74ae0000" />
diff --git a/boot/bootdata/packages/reactos.dff b/boot/bootdata/packages/reactos.dff
index 70f00e71828..843452aeea7 100644
--- a/boot/bootdata/packages/reactos.dff
+++ b/boot/bootdata/packages/reactos.dff
@@ -21,7 +21,9 @@ Signature = "$ReactOS$"
 6 = inf
 7 = bin
 8 = media
-9 = Resources\Themes\Lautus
+9 = Resources
+10 = Resources\Themes
+11 = Resources\Themes\Lautus
 
 .InfEnd
 
@@ -696,7 +698,7 @@ media\inf\xboxdisp.inf                              6
 media\sounds\ReactOS_LogOn.wav                      8
 
 ; Lautus Theme
-media\themes\Lautus.msstyles                        9   optional
+media\themes\Lautus.msstyles                        11  optional
 
 ; Ini Files
 boot\bootdata\system.ini                            4
diff --git a/boot/bootdata/packages/reactos.dff.in b/boot/bootdata/packages/reactos.dff.in
index 952967bea87..c9a0db7d076 100644
--- a/boot/bootdata/packages/reactos.dff.in
+++ b/boot/bootdata/packages/reactos.dff.in
@@ -22,7 +22,9 @@ Signature = "$ReactOS$"
 6 = inf
 7 = bin
 8 = media
-9 = Resources\Themes\Lautus
+9 = Resources
+10 = Resources\Themes
+11 = Resources\Themes\Lautus
 
 .InfEnd