Renamed our UxTheme to NewUxTheme to avoid accidendally using Delphi's UxThem which indeed Setup was doing.

Components/FolderTreeView.pas

@@ -134,7 +134,7 @@ implementation
 }
 
 uses
-  PathFunc, ShellApi, UxTheme, Types;
+  PathFunc, ShellApi, NewUxTheme, Types;
 
 const
   SHPPFW_NONE = $00000000;

Components/NewCheckListBox.pas

@@ -15,7 +15,7 @@ interface
 
 uses
   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  StdCtrls, UxTheme;
+  StdCtrls, NewUxTheme;
 
 const
   WM_UPDATEUISTATE = $0128;

Components/NewTabSet.pas

@@ -13,7 +13,7 @@ interface
 
 uses
   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Math, Generics.Collections,
-  ModernColors, UxTheme;
+  ModernColors, NewUxTheme;
 
 type
   TTabPosition = (tpTop, tpBottom);

Components/UxTheme.pas → Components/NewUxTheme.pas

@@ -47,9 +47,10 @@
 { Simplified by Martijn Laan for Inno Setup }
 
 { Cannot be replaced by Delphi's built in Winapi.UxTheme.pas even though it has
-  the same functions: see the comment at the bottom of this file. }
+  the same functions: see the comment at the bottom of this file. For this
+  reason this unit has been renamed to NewUxTheme.  }
 
-unit UxTheme;
+unit NewUxTheme;
 
 interface
 

Components/TmSchema.pas

@@ -44,7 +44,7 @@
 {                                                                              }
 {******************************************************************************}
 
-{ Simplified by Martijn Laan for Inno Setup and Delphi 2 }
+{ Simplified by Martijn Laan for Inno Setup }
 
 unit TmSchema;
 

Projects/Compil32.dpr

@@ -27,7 +27,7 @@ uses
   CompWizardFile in 'Src\CompWizardFile.pas' {WizardFileForm},
   CompFileAssoc in 'Src\CompFileAssoc.pas',
   TmSchema in '..\Components\TmSchema.pas',
-  UxTheme in '..\Components\UxTheme.pas',
+  NewUxTheme in '..\Components\NewUxTheme.pas',
   DebugStruct in 'Src\DebugStruct.pas',
   BrowseFunc in 'Src\BrowseFunc.pas',
   CompSignTools in 'Src\CompSignTools.pas' {SignToolsForm},

Projects/Compil32.dproj

@@ -102,7 +102,7 @@
         </DCCReference>
         <DCCReference Include="Src\CompFileAssoc.pas"/>
         <DCCReference Include="..\Components\TmSchema.pas"/>
-        <DCCReference Include="..\Components\UxTheme.pas"/>
+        <DCCReference Include="..\Components\NewUxTheme.pas"/>
         <DCCReference Include="Src\DebugStruct.pas"/>
         <DCCReference Include="Src\BrowseFunc.pas"/>
         <DCCReference Include="Src\CompSignTools.pas">

Projects/Setup.dpr

@@ -86,7 +86,8 @@ uses
   DotNet in 'Src\DotNet.pas',
   SetupEnt in 'Src\SetupEnt.pas',
   Msi in 'Src\Msi.pas',
-  DotNetVersion in 'Src\DotNetVersion.pas';
+  DotNetVersion in 'Src\DotNetVersion.pas',
+  NewUxTheme in '..\Components\NewUxTheme.pas';
 
 {$SetPEFlags IMAGE_FILE_RELOCS_STRIPPED}
 {$SETPEOSVERSION 6.1}

Projects/Setup.dproj

@@ -163,6 +163,7 @@
         <DCCReference Include="Src\SetupEnt.pas"/>
         <DCCReference Include="Src\Msi.pas"/>
         <DCCReference Include="Src\DotNetVersion.pas"/>
+        <DCCReference Include="..\Components\NewUxTheme.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

Projects/Src/CompForm.pas

@@ -25,7 +25,7 @@ uses
   Windows, Messages, SysUtils, Classes, Contnrs, Graphics, Controls, Forms, Dialogs, CommDlg,
   Generics.Collections, UIStateForm, StdCtrls, ExtCtrls, Menus, Buttons, ComCtrls, CommCtrl,
   ScintInt, ScintEdit, ScintStylerInnoSetup, NewTabSet, ModernColors, CompScintEdit,
-  DebugStruct, CompInt, UxTheme, ImageList, ImgList, ToolWin, CompFunc,
+  DebugStruct, CompInt, NewUxTheme, ImageList, ImgList, ToolWin, CompFunc,
   VirtualImageList, BaseImageCollection, ImageCollection;
 
 const