diff --git a/ExplorerPatcher/dllmain.c b/ExplorerPatcher/dllmain.c
index 131ce58..5b66ce3 100644
--- a/ExplorerPatcher/dllmain.c
+++ b/ExplorerPatcher/dllmain.c
@@ -5280,6 +5280,7 @@ INT64 ShowDesktopSubclassProc(
             {
                 lRes = 0;
             }
+            else if (dwVal) PostMessageW(hWnd, 794, 0, 0);
         }
         return lRes;
     }
@@ -7576,6 +7577,13 @@ HTHEME explorer_OpenThemeDataForDpi(
         }
         return hTheme;
     }
+    else if ((*((WORD*)&(pszClassList)+1)) && !wcscmp(pszClassList, L"TaskbarShowDesktop"))
+    {
+        DWORD dwVal = 0, dwSize = sizeof(DWORD);
+        RegGetValueW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", L"TaskbarSD", RRF_RT_REG_DWORD, NULL, &dwVal, &dwSize);
+        if (dwVal == 2) return NULL;
+        return OpenThemeDataForDpi(hwnd, pszClassList, dpi);
+    }
 
     // task list - Taskband2 from CTaskListWnd::_HandleThemeChanged
     if (bClassicThemeMitigations && (*((WORD*)&(pszClassList)+1)) && !wcscmp(pszClassList, L"Taskband2"))
diff --git a/ExplorerPatcher/settings.reg b/ExplorerPatcher/settings.reg
index 0801535..418fc78 100644
--- a/ExplorerPatcher/settings.reg
+++ b/ExplorerPatcher/settings.reg
@@ -41,9 +41,6 @@
 [HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced]
 ;b Show Task view button
 "ShowTaskViewButton"=dword:00000001
-[HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced]
-;b Show Desktop button
-"TaskbarSD"=dword:00000001
 [HKEY_CURRENT_USER\Software\ExplorerPatcher]
 ;b Automatically hide the taskbar
 ;"Virtualized_{D17F1E1A-5919-4427-8F89-A1A8503CA3EB}_AutoHideTaskbar"=dword:00000000
@@ -83,6 +80,7 @@
 ;x 0 Large (default)
 "TaskbarSmallIcons"=dword:00000000
 ;e 
+;e 
 ;g Taskbar_Windows10Section
 
 
@@ -97,17 +95,33 @@
 [HKEY_CURRENT_USER\Software\Microsoft\TabletTip\1.7]
 ;b Show touch keyboard button *
 "TipbandDesiredVisibility"=dword:00000000
+;s SystemTray_Section98 IsOldTaskbar
+[HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced]
+;b Show seconds in the clock
+"ShowSecondsInSystemClock"=dword:00000000
+;g SystemTray_Section98
+[HKEY_CURRENT_USER\Software\ExplorerPatcher]
+;i Control Center button *
+"HideControlCenterButton"=dword:00000000
+;s SystemTray_Section109 IsOldTaskbar
+[HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced]
+;c 3 Show desktop button
+;x 1 Enabled (default)
+;x 0 Disabled
+;x 2 Hidden
+"TaskbarSD"=dword:00000001
+;g SystemTray_Section109
+;s SystemTray_Section117 !IsOldTaskbar
+[HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced]
+;b Show desktop button
+"TaskbarSD"=dword:00000001
+;g SystemTray_Section117
 ;s SystemTray_Windows10Section IsOldTaskbar
 [HKEY_CURRENT_USER\Software\ExplorerPatcher]
 ;p 2
 ;b Apply Windows 11 style to system tray icons *
 "SkinIcons"=dword:00000001
-[HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced]
-;b Show seconds in the clock
-"ShowSecondsInSystemClock"=dword:00000000
 [HKEY_CURRENT_USER\Software\ExplorerPatcher]
-;b Hide Control Center button *
-"HideControlCenterButton"=dword:00000000
 ;a Choosing 'Open Network && Internet settings' when right clicking the
 ;c 3 network icon should open:
 ;x 0 Network section in the Settings app (default)
diff --git a/ExplorerPatcher/settings10.reg b/ExplorerPatcher/settings10.reg
index 2b0bf80..37ba0ba 100644
--- a/ExplorerPatcher/settings10.reg
+++ b/ExplorerPatcher/settings10.reg
@@ -37,9 +37,6 @@
 [HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced]
 ;b Show Task view button
 "ShowTaskViewButton"=dword:00000001
-[HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced]
-;b Show Desktop button
-"TaskbarSD"=dword:00000001
 [HKEY_CURRENT_USER\Software\ExplorerPatcher]
 ;b Automatically hide the taskbar
 ;"Virtualized_{D17F1E1A-5919-4427-8F89-A1A8503CA3EB}_AutoHideTaskbar"=dword:00000000
@@ -100,6 +97,12 @@
 [HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced]
 ;b Show seconds in the clock
 "ShowSecondsInSystemClock"=dword:00000000
+[HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced]
+;c 3 Show desktop button
+;x 1 Enabled (default)
+;x 0 Disabled
+;x 2 Hidden
+"TaskbarSD"=dword:00000001
 [HKEY_CURRENT_USER\Software\ExplorerPatcher]
 ;a Choosing 'Open Network && Internet settings' when right clicking the
 ;c 3 network icon should open: