diff --git a/reactos/boot/bootdata/hivecls.inf b/reactos/boot/bootdata/hivecls.inf
index 1a2e05954d9..935bfd4ca8f 100644
--- a/reactos/boot/bootdata/hivecls.inf
+++ b/reactos/boot/bootdata/hivecls.inf
@@ -4,11 +4,30 @@ Signature="$ReactOS$
 [AddReg]
 HKLM,"SOFTWARE\Classes",,0x00000010
 
+; Folders
+;HKCR,"Folder\Defaulticon","",0x00000000,"%SystemRoot%\System32\shell32.dll,-4"
+HKCR,"Folder\shell\open\command","",0x00000000,"explorer.exe ""%1"""
+HKCR,"Folder\shell\explore\command","",0x00000000,"explorer.exe /e,""%1"""
+HKCR,"Folder\shell\rootexplore","",0x00000000,"Explore from here"
+HKCR,"Folder\shell\rootexplore\command","",0x00000000,"explorer.exe /e,/root,""%1"""
+
+; Control Panel extensions
+HKCR,".cpl","",0x00000000,"cplfile"
+HKCR,"cplfile\shell\cplopen","",0x00000000,"Open with Control Panel"
+HKCR,"cplfile\shell\cplopen\command","",0x00020000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %1,%*"
+
 ; Show icons for executables in shell views
 HKCR,".exe","",0x00000000,"exefile"
 HKCR,"exefile\Defaulticon","",0x00000000,"%1"
 HKCR,"exefile\shell\open\command","",0x00000000,"""%1"" %*"
 
+; set MIME type for .html and .htm because Tiny webserver needs it
+HKCR,".htm","",0x00000000,"html"
+HKCR,".htm","Content Type",0x00000000,"text/html"
+
+HKCR,".html","",0x00000000,"html"
+HKCR,".html","Content Type",0x00000000,"text/html"
+
 ; ini (configuration) files
 HKCR,".ini","",0x00000000,"inifile"
 HKCR,"inifile\shell\open\command","",0x00000000,"notepad.exe ""%1"""
@@ -19,13 +38,6 @@ HKCR,"inffile\shell\open\command","",0x00000000,"notepad.exe ""%1"""
 HKCR,"inffile\DefaultIcon","",0x00000000,"%SystemRoot%\System32\shell32.dll,-151"
 HKCR,"inffile\shell\Install\command","",0x00020000,"%SystemRoot%\System32\rundll32.exe setupapi,InstallHinfSection DefaultInstall 132 %1"
 
-; Folders
-;HKCR,"Folder\Defaulticon","",0x00000000,"%SystemRoot%\System32\shell32.dll,-4"
-HKCR,"Folder\shell\open\command","",0x00000000,"explorer.exe ""%1"""
-HKCR,"Folder\shell\explore\command","",0x00000000,"explorer.exe /e,""%1"""
-HKCR,"Folder\shell\rootexplore","",0x00000000,"Explore from here"
-HKCR,"Folder\shell\rootexplore\command","",0x00000000,"explorer.exe /e,/root,""%1"""
-
 ; Show icons for shortcuts in shell views (lnkfile is handled specially in shell32)
 ; Don't display extension for shortcuts
 HKCR,".lnk","",0x00000000,"lnkfile"
@@ -35,6 +47,13 @@ HKCR,"lnkfile\CLSID","",0x00000000,"{00021401-0000-0000-C000-000000000046}"
 HKCR,"lnkfile\shellex\IconHandler","",0x00000000,"{00021401-0000-0000-C000-000000000046}"
 HKCR,lnkfile\shellex\ContextMenuHandlers\{00021401-0000-0000-C000-000000000046},,,
 
+; MSI files
+HKCR,".msi","",0x00000000,"MSI.Package"
+HKCR,"Msi.Package\DefaultIcon","",0x00000000,"msiexec.exe"
+HKCR,"Msi.Package\shell\Open\command","",0x00020000,"%SystemRoot%\System32\msiexec /i %1"
+HKCR,"Msi.Package\shell\Repair\command","",0x00020000,"%SystemRoot%\System32\msiexec /f %1"
+HKCR,"Msi.Package\shell\Uninstall\command","",0x00020000,"%SystemRoot%\System32\msiexec /x %1"
+
 ; shell command files (e.g. "Show Desktop" in quicklaunch bar)
 HKCR,".scf","",0x00000000,"SHCmdFile"
 HKCR,"SHCmdFile","NeverShowExt",0x00000000,""
@@ -43,6 +62,11 @@ HKCR,"SHCmdFile\shell\open\command","",0x00000000,"explorer.exe ""%1"""
 HKCR,"SHCmdFile\CLSID","",0x00000000,"{57651662-CE3E-11D0-8D77-00C04FC99D61}"
 HKCR,"SHCmdFile\shellex\IconHandler","",0x00000000,"{57651662-CE3E-11D0-8D77-00C04FC99D61}"
 
+; install notepad as handler for .txt files
+HKCR,".txt","",0x00000000,"txtfile"
+HKCR,".txt","Content Type",0x00000000,"text/plain"
+HKCR,"txtfile\shell\open\command","",0x00020000,"%SystemRoot%\System32\notepad.exe %1"
+
 ; URL shortcuts (e.g. used in favorites folder of IExplorer)
 HKCR,".url","",0x00000000,"InternetShortcut"
 HKCR,"InternetShortcut","NeverShowExt",0x00000000,""
@@ -50,30 +74,6 @@ HKCR,"InternetShortcut","IsShortcut",0x00000000,"yes"
 HKCR,"InternetShortcut\shell\open\command","",0x00000000,"rundll32.exe shdocvw.dll,OpenURL %l"
 HKCR,"InternetShortcut\DefaultIcon","",0x00020000,"%SystemRoot%\system32\url.dll,0"
 
-; Control Panel extensions
-HKCR,".cpl","",0x00000000,"cplfile"
-HKCR,"cplfile\shell\cplopen","",0x00000000,"Open with Control Panel"
-HKCR,"cplfile\shell\cplopen\command","",0x00020000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %1,%*"
-
-; install notepad as handler for .txt files
-HKCR,".txt","",0x00000000,"txtfile"
-HKCR,".txt","Content Type",0x00000000,"text/plain"
-HKCR,"txtfile\shell\open\command","",0x00020000,"%SystemRoot%\System32\notepad.exe %1"
-
-; MSI files
-HKCR,".msi","",0x00000000,"MSI.Package"
-HKCR,"Msi.Package\DefaultIcon","",0x00000000,"msiexec.exe"
-HKCR,"Msi.Package\shell\Open\command","",0x00020000,"%SystemRoot%\System32\msiexec /i %1"
-HKCR,"Msi.Package\shell\Repair\command","",0x00020000,"%SystemRoot%\System32\msiexec /f %1"
-HKCR,"Msi.Package\shell\Uninstall\command","",0x00020000,"%SystemRoot%\System32\msiexec /x %1"
-
-; set MIME type for .html and .htm because Tiny webserver needs it
-HKCR,".htm","",0x00000000,"html"
-HKCR,".htm","Content Type",0x00000000,"text/html"
-
-HKCR,".html","",0x00000000,"html"
-HKCR,".html","Content Type",0x00000000,"text/html"
-
 HKCR,"CLSID",,0x00000012
 
 ; For Shell32.dll