diff --git a/tools/wine.inf.in b/tools/wine.inf.in
index a01c8bb2d21..1b8e56ded8f 100644
--- a/tools/wine.inf.in
+++ b/tools/wine.inf.in
@@ -35,11 +35,10 @@ AddReg=\
     Classes,\
     ContentIndex,\
     ControlClass,\
+    ControlPanel,\
     CurrentVersion,\
     Debugger,\
-    Desktop,\
     Dotnet,\
-    Metrics,\
     DirectX,\
     Fonts,\
     MCI,\
@@ -61,11 +60,10 @@ AddReg=\
     Classes,\
     ContentIndex,\
     ControlClass,\
+    ControlPanel,\
     CurrentVersion,\
     Debugger,\
-    Desktop,\
     Dotnet,\
-    Metrics,\
     DirectX,\
     Fonts,\
     MCI,\
@@ -88,12 +86,11 @@ AddReg=\
     Classes,\
     ContentIndex,\
     ControlClass,\
+    ControlPanel,\
     CurrentVersion,\
     CurrentVersionWow64,\
     Debugger,\
-    Desktop,\
     Dotnet,\
-    Metrics,\
     DirectX,\
     Fonts,\
     MCI,\
@@ -156,8 +153,6 @@ AddService=FontCache3.0.0.0,0,FontCacheService
 [Strings]
 MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions"
 Mci32Str="Software\Microsoft\Windows NT\CurrentVersion\MCI32"
-Desktop="Control Panel\Desktop"
-Metrics="Control Panel\Desktop\WindowMetrics"
 CurrentVersion="Software\Microsoft\Windows\CurrentVersion"
 CurrentVersionNT="Software\Microsoft\Windows NT\CurrentVersion"
 FontSubStr="Software\Microsoft\Windows NT\CurrentVersion\FontSubstitutes"
@@ -500,13 +495,24 @@ HKLM,%CurrentVersionNT%\AeDebug,"Auto",2,"1"
 HKCU,Software\Wine\Debug,"RelayExclude",2,"ntdll.RtlEnterCriticalSection;ntdll.RtlLeaveCriticalSection;kernel32.48;kernel32.49;kernel32.94;kernel32.95;kernel32.96;kernel32.97;kernel32.98;kernel32.TlsGetValue;kernel32.TlsSetValue;kernel32.FlsGetValue;kernel32.FlsSetValue;kernel32.SetLastError"
 HKCU,Software\Wine\Debug,"RelayFromExclude",2,"winex11.drv;user32;gdi32;advapi32;kernel32"
 
-[Desktop]
-HKCU,%Desktop%,"FontSmoothing",2,"0"
-HKCU,%Desktop%,"DragFullWindows",2,"0"
-HKCU,%Desktop%,"SmoothScroll",3,00,00,00,00
-HKCU,%Desktop%,"UserPreferenceMask",3,10,00,00,80
-HKCU,%Desktop%,"LowPowerActive",,"0"
-HKCU,%Desktop%,"MenuShowDelay",2,"400"
+[ControlPanel]
+HKCU,Control Panel\Desktop,DragFullWindows,2,"0"
+HKCU,Control Panel\Desktop,FontSmoothing,2,"0"
+HKCU,Control Panel\Desktop,LowPowerActive,,"0"
+HKCU,Control Panel\Desktop,MenuShowDelay,2,"400"
+HKCU,Control Panel\Desktop,SmoothScroll,3,00,00,00,00
+HKCU,Control Panel\Desktop,UserPreferenceMask,3,10,00,00,80
+HKCU,Control Panel\Desktop\WindowMetrics,BorderWidth,2,"1"
+HKCU,Control Panel\Desktop\WindowMetrics,CaptionHeight,2,"18"
+HKCU,Control Panel\Desktop\WindowMetrics,CaptionWidth,2,"18"
+HKCU,Control Panel\Desktop\WindowMetrics,MenuHeight,2,"18"
+HKCU,Control Panel\Desktop\WindowMetrics,MenuWidth,2,"18"
+HKCU,Control Panel\Desktop\WindowMetrics,ScrollHeight,2,"16"
+HKCU,Control Panel\Desktop\WindowMetrics,ScrollWidth,2,"16"
+HKCU,Control Panel\Desktop\WindowMetrics,Shell Icon Size,2,"32"
+HKCU,Control Panel\Desktop\WindowMetrics,SmCaptionHeight,2,"15"
+HKCU,Control Panel\Desktop\WindowMetrics,SmCaptionWidth,2,"13"
+HKCU,Control Panel\Mouse,Beep,2,"No"
 
 [DotNet]
 HKLM,Software\Microsoft\.NETFramework,"InstallRoot",2,"%10%\Microsoft.NET\Framework\"
@@ -534,18 +540,6 @@ HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,Install,0x10003,1
 HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,Version,2,4.0.30319
 HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,TargetVersion,2,4.0.0
 
-[Metrics]
-HKCU,%Metrics%,"ScrollWidth",2,"16"
-HKCU,%Metrics%,"ScrollHeight",2,"16"
-HKCU,%Metrics%,"CaptionWidth",2,"18"
-HKCU,%Metrics%,"CaptionHeight",2,"18"
-HKCU,%Metrics%,"SmCaptionWidth",2,"13"
-HKCU,%Metrics%,"SmCaptionHeight",2,"15"
-HKCU,%Metrics%,"MenuWidth",2,"18"
-HKCU,%Metrics%,"MenuHeight",2,"18"
-HKCU,%Metrics%,"BorderWidth",2,"1"
-HKCU,%Metrics%,"Shell Icon Size",2,"32"
-
 [DirectX]
 HKLM,Software\Microsoft\DirectX,"Version",,"4.09.00.0904"
 HKLM,Software\Microsoft\DirectX,"InstalledVersion",1,00,00,00,09,00,00,00,00
@@ -658,7 +652,6 @@ HKLM,%MciExtStr%,"wmx",,"MPEGVideo"
 HKLM,%MciExtStr%,"wvx",,"MPEGVideo"
 
 [Misc]
-HKCU,Control Panel\Mouse,"Beep",2,"No"
 HKLM,Software\Borland\Database Engine\Settings\SYSTEM\INIT,SHAREDMEMLOCATION,,9000
 HKLM,Software\Clients\Mail,,2,"Native Mail Client"
 HKLM,Software\Clients\Mail\Native Mail Client,,2,"Native Mail Client"