Index: src/ch/FolderDialog.cpp
===================================================================
diff -u -r547f865c69434c14c6f16e4b529d4198f6fe2040 -rafedcb6f4d37159266b6eaa97d8a7d0ce157de00
--- src/ch/FolderDialog.cpp	(.../FolderDialog.cpp)	(revision 547f865c69434c14c6f16e4b529d4198f6fe2040)
+++ src/ch/FolderDialog.cpp	(.../FolderDialog.cpp)	(revision afedcb6f4d37159266b6eaa97d8a7d0ce157de00)
@@ -20,7 +20,6 @@
 #include "ch.h"
 #include "DirTreeCtrl.h"
 #include "FolderDialog.h"
-#include "Theme Helpers.h"
 #include "shlobj.h"
 #include "StringHelpers.h"
 #include "TRecentPathsTools.h"
@@ -1040,8 +1039,7 @@
 void CFolderDialog::ResizeControls(int cx, int cy)
 {
 	// is app themed ?
-	CUxThemeSupport uxt;
-	bool bThemed=uxt.IsThemeSupported() && uxt.IsAppThemed();
+	bool bThemed=IsAppThemed();
 
 	// settings
 	const int iMargin=7;	// dialog units
Fisheye: Tag afedcb6f4d37159266b6eaa97d8a7d0ce157de00 refers to a dead (removed) revision in file `src/ch/Theme Helpers.cpp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag afedcb6f4d37159266b6eaa97d8a7d0ce157de00 refers to a dead (removed) revision in file `src/ch/Theme Helpers.h'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: src/ch/ThemedButton.cpp
===================================================================
diff -u -r547f865c69434c14c6f16e4b529d4198f6fe2040 -rafedcb6f4d37159266b6eaa97d8a7d0ce157de00
--- src/ch/ThemedButton.cpp	(.../ThemedButton.cpp)	(revision 547f865c69434c14c6f16e4b529d4198f6fe2040)
+++ src/ch/ThemedButton.cpp	(.../ThemedButton.cpp)	(revision afedcb6f4d37159266b6eaa97d8a7d0ce157de00)
@@ -18,7 +18,6 @@
 ***************************************************************************/
 #include "stdafx.h"
 #include "ThemedButton.h"
-#include "Theme helpers.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -69,15 +68,14 @@
 	CRect rcItem=lpDrawItemStruct->rcItem;
 	
 	// draw button's frame
-	CUxThemeSupport uxTheme;
-	if (uxTheme.IsThemeSupported() && uxTheme.IsAppThemed())
+	if (IsAppThemed())
 	{
-		HTHEME ht=uxTheme.OpenThemeData(lpDrawItemStruct->hwndItem, L"TOOLBAR");
+		HTHEME ht=OpenThemeData(lpDrawItemStruct->hwndItem, L"TOOLBAR");
 		
-		uxTheme.DrawThemeParentBackground(lpDrawItemStruct->hwndItem, memdc.GetDC().GetSafeHdc(), &rcItem);
-		uxTheme.DrawThemeBackground(ht, memdc.GetDC().GetSafeHdc(), TP_BUTTON, bPushed ? TS_PRESSED : (m_bHovering ? TS_HOT : TS_NORMAL), &rcItem, nullptr);
+		DrawThemeParentBackground(lpDrawItemStruct->hwndItem, memdc.GetDC().GetSafeHdc(), &rcItem);
+		DrawThemeBackground(ht, memdc.GetDC().GetSafeHdc(), TP_BUTTON, bPushed ? TS_PRESSED : (m_bHovering ? TS_HOT : TS_NORMAL), &rcItem, nullptr);
 		
-		uxTheme.CloseThemeData(ht);
+		CloseThemeData(ht);
 	}
 	else
 		DrawFrameControl(memdc.GetDC().GetSafeHdc(), &rcItem, DFC_BUTTON, DFCS_ADJUSTRECT | DFCS_BUTTONPUSH | (bPushed ? DFCS_PUSHED : 0));
Index: src/ch/ch.vc140.vcxproj
===================================================================
diff -u -r814b694086d5dc450efb6a5e5c6902145ddc07fd -rafedcb6f4d37159266b6eaa97d8a7d0ce157de00
--- src/ch/ch.vc140.vcxproj	(.../ch.vc140.vcxproj)	(revision 814b694086d5dc450efb6a5e5c6902145ddc07fd)
+++ src/ch/ch.vc140.vcxproj	(.../ch.vc140.vcxproj)	(revision afedcb6f4d37159266b6eaa97d8a7d0ce157de00)
@@ -588,7 +588,6 @@
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="TCommandLineParser.h" />
     <ClInclude Include="MainWnd.h" />
-    <ClInclude Include="Theme Helpers.h" />
     <ClInclude Include="TrayIcon.h" />
     <ClInclude Include="DirTreeCtrl.h" />
     <ClInclude Include="FFListCtrl.h" />
@@ -680,7 +679,6 @@
     </ClCompile>
     <ClCompile Include="TCommandLineParser.cpp" />
     <ClCompile Include="MainWnd.cpp" />
-    <ClCompile Include="Theme Helpers.cpp" />
     <ClCompile Include="TrayIcon.cpp" />
     <ClCompile Include="DirTreeCtrl.cpp" />
     <ClCompile Include="FFListCtrl.cpp" />
Index: src/ch/ch.vc140.vcxproj.filters
===================================================================
diff -u -r814b694086d5dc450efb6a5e5c6902145ddc07fd -rafedcb6f4d37159266b6eaa97d8a7d0ce157de00
--- src/ch/ch.vc140.vcxproj.filters	(.../ch.vc140.vcxproj.filters)	(revision 814b694086d5dc450efb6a5e5c6902145ddc07fd)
+++ src/ch/ch.vc140.vcxproj.filters	(.../ch.vc140.vcxproj.filters)	(revision afedcb6f4d37159266b6eaa97d8a7d0ce157de00)
@@ -111,9 +111,6 @@
     <ClInclude Include="MainWnd.h">
       <Filter>Source Files\GUI</Filter>
     </ClInclude>
-    <ClInclude Include="Theme Helpers.h">
-      <Filter>Source Files\GUI</Filter>
-    </ClInclude>
     <ClInclude Include="TrayIcon.h">
       <Filter>Source Files\GUI</Filter>
     </ClInclude>
@@ -317,9 +314,6 @@
     <ClCompile Include="MainWnd.cpp">
       <Filter>Source Files\GUI</Filter>
     </ClCompile>
-    <ClCompile Include="Theme Helpers.cpp">
-      <Filter>Source Files\GUI</Filter>
-    </ClCompile>
     <ClCompile Include="TrayIcon.cpp">
       <Filter>Source Files\GUI</Filter>
     </ClCompile>