diff --git a/reactos/boot/bootdata/hivecls.inf b/reactos/boot/bootdata/hivecls.inf
index 52a2a6caed4..554eefbb090 100644
--- a/reactos/boot/bootdata/hivecls.inf
+++ b/reactos/boot/bootdata/hivecls.inf
@@ -266,18 +266,6 @@ HKCR,"sysfile","NoOpen",0x00000000,""
 HKCR,"sysfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-171"
 HKCR,"sysfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154"
 
-; MS Styles (Themes)
-HKCR,".msstyles","",0x00000000,"msstylesfile"
-HKCR,"msstylesfile","",0x00000000,"Visual Style File"
-HKCR,"msstylesfile\DefaultIcon","","0x00020000","%SystemRoot%\system32\themeui.dll,-1"
-HKCR,"msstylesfile\shell\open\command","",0x00000000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %SystemRoot%\system32\desk.cpl desk,@Appearance /Action:OpenMSTheme file:""%1"""
-
-; Theme File
-HKCR,".theme","",0x00000000,"themefile"
-HKCR,"themefile","",0x00000000,"Theme File"
-HKCR,"themefile\DefaultIcon","","0x00020000","%SystemRoot%\system32\themeui.dll,-1"
-HKCR,"themefile\shell\open\command","",0x00000000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %SystemRoot%\system32\desk.cpl desk,@Appearance /Action:OpenTheme /file:""%1"""
-
 ; URL shortcuts (e.g. used in favorites folder of IExplorer)
 HKCR,".url","",0x00000000,"InternetShortcut"
 
diff --git a/reactos/dll/win32/themeui/CMakeLists.txt b/reactos/dll/win32/themeui/CMakeLists.txt
index dcad389e1ef..21225c61833 100644
--- a/reactos/dll/win32/themeui/CMakeLists.txt
+++ b/reactos/dll/win32/themeui/CMakeLists.txt
@@ -1,4 +1,5 @@
 
 add_library(themeui SHARED themeui.rc)
 set_module_type(themeui win32dll ENTRYPOINT 0)
+add_registry_inf(themeui_reg.inf)
 add_cd_file(TARGET themeui DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/themeui/themeui_reg.inf b/reactos/dll/win32/themeui/themeui_reg.inf
new file mode 100644
index 00000000000..501527e0678
--- /dev/null
+++ b/reactos/dll/win32/themeui/themeui_reg.inf
@@ -0,0 +1,11 @@
+; MS Styles (Themes)
+HKCR,".msstyles","",0x00000000,"msstylesfile"
+HKCR,"msstylesfile","",0x00000000,"Visual Style File"
+HKCR,"msstylesfile\DefaultIcon","","0x00020000","%SystemRoot%\system32\themeui.dll,-1"
+HKCR,"msstylesfile\shell\open\command","",0x00000000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %SystemRoot%\system32\desk.cpl desk,@Appearance /Action:OpenMSTheme file:""%1"""
+
+; Theme File
+HKCR,".theme","",0x00000000,"themefile"
+HKCR,"themefile","",0x00000000,"Theme File"
+HKCR,"themefile\DefaultIcon","","0x00020000","%SystemRoot%\system32\themeui.dll,-1"
+HKCR,"themefile\shell\open\command","",0x00000000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %SystemRoot%\system32\desk.cpl desk,@Appearance /Action:OpenTheme /file:""%1"""