diff --git a/SystemInformer/chdlg.c b/SystemInformer/chdlg.c
index 812fcdabb079..d0388a53188d 100644
--- a/SystemInformer/chdlg.c
+++ b/SystemInformer/chdlg.c
@@ -570,7 +570,7 @@ INT_PTR CALLBACK PhChooseNewPageDlgProc(
 
             if (PhEnableThemeSupport)
             {
-                SetDCBrushColor(hdc, RGB(50, 50, 50));
+                SetDCBrushColor(hdc, PhMakeColorBrighter(PhThemeWindowBackgroundColor, 7)); // RGB(50, 50, 50)
                 FillRect(hdc, &clientRect, PhGetStockBrush(DC_BRUSH));
                 clientRect.bottom = clientRect.top + 1;
                 SetDCBrushColor(hdc, PhThemeWindowForegroundColor);
diff --git a/SystemInformer/mainwnd.c b/SystemInformer/mainwnd.c
index b5915bee142b..b5590bf055f2 100644
--- a/SystemInformer/mainwnd.c
+++ b/SystemInformer/mainwnd.c
@@ -654,6 +654,9 @@ static NTSTATUS PhMwpReInitializeThemeThread(
 
         PhEnableThemeAcrylicWindowSupport = PhEnableThemeAcrylicWindowSupport && PhEnableThemeSupport && PhIsThemeTransparencyEnabled();
 
+        PhSetIntegerSetting(L"GraphColorMode", PhEnableThemeSupport); // HACK switch to dark theme. (dmex)
+        PhCsGraphColorMode = PhGetIntegerSetting(L"GraphColorMode");
+
         PhReInitializeTheme(PhEnableThemeSupport);
 
         PhInvokeCallback(PhGetGeneralCallback(GeneralCallbackSettingsUpdated), NULL);
diff --git a/SystemInformer/options.c b/SystemInformer/options.c
index 8b3168db48eb..be5c5f3c685b 100644
--- a/SystemInformer/options.c
+++ b/SystemInformer/options.c
@@ -1554,6 +1554,12 @@ static VOID PhpOptionsNotifyChangeCallback(
 
     if (PhEnableThemeSupport != oldTheme || PhEnableThemeAcrylicWindowSupport != oldAcrylicWindowSupport)
     {
+        if (PhEnableThemeSupport != oldTheme)
+        {
+            PhSetIntegerSetting(L"GraphColorMode", PhEnableThemeSupport); // HACK switch to dark theme. (dmex)
+            PhCsGraphColorMode = PhGetIntegerSetting(L"GraphColorMode");
+        }
+
         PhReInitializeTheme(PhEnableThemeSupport);
     }
 
@@ -1735,11 +1741,6 @@ static VOID PhpAdvancedPageSave(
     SetSettingForLvItemCheck(listViewHandle, PHP_OPTIONS_INDEX_PROPAGATE_CPU_USAGE, L"PropagateCpuUsage");
     SetSettingForLvItemCheck(listViewHandle, PHP_OPTIONS_INDEX_SHOW_ADVANCED_OPTIONS, L"EnableAdvancedOptions");
 
-    if (PhEnableThemeSupport)
-    {
-        PhSetIntegerSetting(L"GraphColorMode", 1); // HACK switch to dark theme. (dmex)
-    }
-
     WriteCurrentUserRun(
         ListView_GetCheckState(listViewHandle, PHP_OPTIONS_INDEX_START_ATLOGON) == BST_CHECKED,
         ListView_GetCheckState(listViewHandle, PHP_OPTIONS_INDEX_START_HIDDEN) == BST_CHECKED
diff --git a/phlib/delayhook.c b/phlib/delayhook.c
index fdf6df7f88f6..68e36fc6c08f 100644
--- a/phlib/delayhook.c
+++ b/phlib/delayhook.c
@@ -1850,15 +1850,15 @@ HRESULT CALLBACK ThemeTaskDialogCallbackHook(
 {
     HRESULT result = S_OK;
 
-    PTASKDIALOG_CALLBACK_WRAP CallbackData = (PTASKDIALOG_CALLBACK_WRAP)dwRefData;
+    PTASKDIALOG_CALLBACK_WRAP callbackData = (PTASKDIALOG_CALLBACK_WRAP)dwRefData;
 
     if (uMsg == TDN_DIALOG_CONSTRUCTED) // Called on each new page, including the first one.
     {
         PhInitializeTaskDialogTheme(hwndDlg, hwndDlg);
     }
 
-    if (CallbackData->pfCallback)
-        result = CallbackData->pfCallback(hwndDlg, uMsg, wParam, lParam, CallbackData->lpCallbackData);
+    if (callbackData->pfCallback)
+        result = callbackData->pfCallback(hwndDlg, uMsg, wParam, lParam, callbackData->lpCallbackData);
 
     return result;
 }
@@ -1871,12 +1871,12 @@ HRESULT WINAPI PhTaskDialogIndirectHook(
     _Out_opt_ BOOL* pfVerificationFlagChecked
     )
 {
-    TASKDIALOG_CALLBACK_WRAP CallbackData;
-    CallbackData.pfCallback = pTaskConfig->pfCallback;
-    CallbackData.lpCallbackData = pTaskConfig->lpCallbackData;
+    TASKDIALOG_CALLBACK_WRAP callbackData;
+    callbackData.pfCallback = pTaskConfig->pfCallback;
+    callbackData.lpCallbackData = pTaskConfig->lpCallbackData;
     TASKDIALOGCONFIG myConfig = *pTaskConfig;
     myConfig.pfCallback = ThemeTaskDialogCallbackHook;
-    myConfig.lpCallbackData = (LONG_PTR)&CallbackData;
+    myConfig.lpCallbackData = (LONG_PTR)&callbackData;
 
     return DefaultTaskDialogIndirect(&myConfig, pnButton, pnRadioButton, pfVerificationFlagChecked);
 }
diff --git a/plugins/ExtendedTools/objprp.c b/plugins/ExtendedTools/objprp.c
index 2dec3290cdef..03bb496434c6 100644
--- a/plugins/ExtendedTools/objprp.c
+++ b/plugins/ExtendedTools/objprp.c
@@ -271,6 +271,7 @@ typedef enum _ET_OBJECT_POOLTYPE {
 #define OBJECT_CHILD_HANDLEPROP_WINDOW 1
 #define OBJECT_CORRECT_HANDLES_COUNT(real_count) ((ULONG)(real_count) - 1)
 
+#define OBJECT_HANDLES_CONTEXT_TAG (ULONG)'OBJH'
 typedef struct _ET_GENERAL_PAGE_CONTEXT
 {
     WNDPROC OldWndProc;
@@ -287,7 +288,7 @@ LRESULT CALLBACK EtpGeneralPageWindowSubclassProc(
 {
     PET_GENERAL_PAGE_CONTEXT context;
 
-    if (!(context = PhGetWindowContext(hWnd, 'OBJH')))
+    if (!(context = PhGetWindowContext(hWnd, OBJECT_HANDLES_CONTEXT_TAG)))
         return FALSE;
 
     WNDPROC oldWndProc = context->OldWndProc;
@@ -303,7 +304,7 @@ LRESULT CALLBACK EtpGeneralPageWindowSubclassProc(
     else if (uMsg == WM_NCDESTROY)
     {
         PhSetWindowProcedure(hWnd, oldWndProc);
-        PhRemoveWindowContext(hWnd, 'OBJH');
+        PhRemoveWindowContext(hWnd, OBJECT_HANDLES_CONTEXT_TAG);
         PhFree(context);
     }
 
@@ -312,7 +313,7 @@ LRESULT CALLBACK EtpGeneralPageWindowSubclassProc(
 
 VOID EtHandlePropertiesWindowInitialized(
     _In_ PVOID Parameter
-    )
+)
 {
     static INT EtListViewRowCache[OBJECT_GENERAL_INDEX_MAXIMUM];
 
@@ -340,7 +341,7 @@ VOID EtHandlePropertiesWindowInitialized(
             PET_GENERAL_PAGE_CONTEXT pageContext = PhAllocateZero(sizeof(ET_GENERAL_PAGE_CONTEXT));
             pageContext->OldWndProc = PhGetWindowProcedure(generalPage);
             pageContext->ParentWindow = context->ParentWindow;
-            PhSetWindowContext(generalPage, 'OBJH', pageContext);
+            PhSetWindowContext(generalPage, OBJECT_HANDLES_CONTEXT_TAG, pageContext);
             PhSetWindowProcedure(generalPage, EtpGeneralPageWindowSubclassProc);
 
             EtObjectManagerShowHandlesPage = FALSE;