diff --git a/Library/Dialog.cpp b/Library/Dialog.cpp
index 11b17ebc..0b3531fb 100644
--- a/Library/Dialog.cpp
+++ b/Library/Dialog.cpp
@@ -74,32 +74,6 @@ BOOL CALLBACK CDialog::SetFontProc(HWND hWnd, LPARAM lParam)
 	return TRUE;
 }
 
-/*
-** OnColorDialog
-**
-** Paints dialog background.
-**
-*/
-INT_PTR CDialog::OnColorDialog(WPARAM wParam, LPARAM lParam)
-{
-	return (INT_PTR)GetStockObject(WHITE_BRUSH);
-}
-
-/*
-** OnColorStatic
-**
-** Paints control text and background.
-**
-*/
-INT_PTR CDialog::OnColorStatic(WPARAM wParam, LPARAM lParam)
-{
-	HDC hdc = (HDC)wParam;
-	SetTextColor(hdc, (COLORREF)GetSysColor(COLOR_WINDOWTEXT));
-	SetBkMode(hdc, TRANSPARENT);
-
-	return OnColorDialog(wParam, lParam);
-}
-
 /*
 ** CTab
 **
@@ -109,6 +83,7 @@ INT_PTR CDialog::OnColorStatic(WPARAM wParam, LPARAM lParam)
 CTab::CTab(HWND wnd) : CDialog(wnd),
 	m_Initialized(false)
 {
+	EnableThemeDialogTexture(wnd, ETDT_ENABLETAB);
 }
 
 /*
diff --git a/Library/Dialog.h b/Library/Dialog.h
index 7d73431a..ab363cd6 100644
--- a/Library/Dialog.h
+++ b/Library/Dialog.h
@@ -30,9 +30,6 @@ protected:
 
 	void SetDialogFont();
 
-	static INT_PTR OnColorDialog(WPARAM wParam, LPARAM lParam);
-	static INT_PTR OnColorStatic(WPARAM wParam, LPARAM lParam);
-
 	HWND m_Window;
 	HFONT m_Font;
 	HFONT m_FontBold;
diff --git a/Library/DialogAbout.cpp b/Library/DialogAbout.cpp
index 03ad36e2..2d20b395 100644
--- a/Library/DialogAbout.cpp
+++ b/Library/DialogAbout.cpp
@@ -475,13 +475,6 @@ INT_PTR CALLBACK CDialogAbout::CTabLog::DlgProc(HWND hWnd, UINT uMsg, WPARAM wPa
 	{
 	case WM_COMMAND:
 		return c_Dialog->m_TabLog->OnCommand(wParam, lParam);
-
-	case WM_CTLCOLORDLG:
-		return OnColorDialog(wParam, lParam);
-
-	case WM_CTLCOLORBTN:
-	case WM_CTLCOLORSTATIC:
-		return OnColorStatic(wParam, lParam);
 	}
 
 	return FALSE;
@@ -784,13 +777,6 @@ INT_PTR CALLBACK CDialogAbout::CTabMeasures::DlgProc(HWND hWnd, UINT uMsg, WPARA
 	{
 	case WM_COMMAND:
 		return c_Dialog->m_TabMeasures->OnCommand(wParam, lParam);
-
-	case WM_CTLCOLORDLG:
-		return OnColorDialog(wParam, lParam);
-
-	case WM_CTLCOLORBTN:
-	case WM_CTLCOLORSTATIC:
-		return OnColorStatic(wParam, lParam);
 	}
 
 	return FALSE;
@@ -947,16 +933,6 @@ void CDialogAbout::CTabPlugins::Resize(int w, int h)
 */
 INT_PTR CALLBACK CDialogAbout::CTabPlugins::DlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-	switch (uMsg)
-	{
-	case WM_CTLCOLORDLG:
-		return OnColorDialog(wParam, lParam);
-
-	case WM_CTLCOLORBTN:
-	case WM_CTLCOLORSTATIC:
-		return OnColorStatic(wParam, lParam);
-	}
-
 	return FALSE;
 }
 
@@ -1026,13 +1002,6 @@ INT_PTR CALLBACK CDialogAbout::CTabVersion::DlgProc(HWND hWnd, UINT uMsg, WPARAM
 
 	case WM_NOTIFY:
 		return c_Dialog->m_TabVersion->OnNotify(wParam, lParam);
-
-	case WM_CTLCOLORDLG:
-		return OnColorDialog(wParam, lParam);
-
-	case WM_CTLCOLORBTN:
-	case WM_CTLCOLORSTATIC:
-		return OnColorStatic(wParam, lParam);
 	}
 
 	return FALSE;
diff --git a/Library/DialogManage.cpp b/Library/DialogManage.cpp
index 2f1dde81..48ce30b8 100644
--- a/Library/DialogManage.cpp
+++ b/Library/DialogManage.cpp
@@ -838,13 +838,6 @@ INT_PTR CALLBACK CDialogManage::CTabSkins::DlgProc(HWND hWnd, UINT uMsg, WPARAM
 
 	case WM_NOTIFY:
 		return c_Dialog->m_TabSkins->OnNotify(wParam, lParam);
-
-	case WM_CTLCOLORDLG:
-		return OnColorDialog(wParam, lParam);
-
-	case WM_CTLCOLORBTN:
-	case WM_CTLCOLORSTATIC:
-		return OnColorStatic(wParam, lParam);
 	}
 
 	return FALSE;
@@ -1406,13 +1399,6 @@ INT_PTR CALLBACK CDialogManage::CTabThemes::DlgProc(HWND hWnd, UINT uMsg, WPARAM
 	{
 	case WM_COMMAND:
 		return c_Dialog->m_TabThemes->OnCommand(wParam, lParam);
-
-	case WM_CTLCOLORDLG:
-		return OnColorDialog(wParam, lParam);
-
-	case WM_CTLCOLORBTN:
-	case WM_CTLCOLORSTATIC:
-		return OnColorStatic(wParam, lParam);
 	}
 
 	return FALSE;
@@ -1717,13 +1703,6 @@ INT_PTR CALLBACK CDialogManage::CTabSettings::DlgProc(HWND hWnd, UINT uMsg, WPAR
 	{
 	case WM_COMMAND:
 		return c_Dialog->m_TabSettings->OnCommand(wParam, lParam);
-
-	case WM_CTLCOLORDLG:
-		return OnColorDialog(wParam, lParam);
-
-	case WM_CTLCOLORBTN:
-	case WM_CTLCOLORSTATIC:
-		return OnColorStatic(wParam, lParam);
 	}
 
 	return FALSE;