diff --git a/CBuilder/VirtualShellToolsC.cbproj b/CBuilder/VirtualShellToolsC.cbproj
index 603a990..e5d9249 100644
--- a/CBuilder/VirtualShellToolsC.cbproj
+++ b/CBuilder/VirtualShellToolsC.cbproj
@@ -6,7 +6,7 @@
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>18.0</ProjectVersion>
+        <ProjectVersion>18.2</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Package</AppType>
@@ -117,7 +117,7 @@
     <PropertyGroup Condition="'$(Base)'!=''">
         <DCC_UnitSearchPath>..\..\MustangpeakCommonLib\source;..\..\MustangpeakEasyListview\source;..\..\VirtualTreeView\source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
         <IntermediateOutputDir>.\$(Platform)\$(Config)</IntermediateOutputDir>
-        <DllSuffix>230</DllSuffix>
+        <DllSuffix>250</DllSuffix>
         <IncludePath>..\Source\;$(IncludePath)</IncludePath>
         <DCC_HppOutput>..\source\hpp\$(Platform)\$(Config)</DCC_HppOutput>
         <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
@@ -183,10 +183,10 @@
         <VerInfo_Locale>1033</VerInfo_Locale>
         <TASM_Defines>_DEBUG;$(TASM_Defines)</TASM_Defines>
         <IncludePath>$(BDSINCLUDE)\windows\vcl;$(IncludePath)</IncludePath>
-        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win64)'!=''">
-        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
         <DCC_Namespace>Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
@@ -212,13 +212,13 @@
         <DCC_RemoteDebug>true</DCC_RemoteDebug>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
-        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <BCC_Defines>_DEBUG;$(BCC_Defines);$(BCC_Defines)</BCC_Defines>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
-        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <BCC_Defines>_DEBUG;$(BCC_Defines);$(BCC_Defines)</BCC_Defines>
@@ -240,14 +240,14 @@
         <DCC_RemoteDebug>true</DCC_RemoteDebug>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
-        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <BCC_UserSuppliedOptions> -tWM -Vx -r- -k -Ve -r</BCC_UserSuppliedOptions>
         <BCC_Defines>NDEBUG;$(BCC_Defines);$(BCC_Defines)</BCC_Defines>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
-        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <BCC_Defines>NDEBUG;$(BCC_Defines);$(BCC_Defines)</BCC_Defines>
@@ -428,10 +428,10 @@
                     <Source Name="MainSource">VirtualShellToolsC.cpp</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k230.bpl">Embarcadero C++Builder-Package für Office 2000-Server</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp230.bpl">Embarcadero C++Builder-Package für Office XP-Server</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k230.bpl">Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp230.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k250.bpl">Embarcadero C++Builder-Package für Office 2000-Server</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp250.bpl">Embarcadero C++Builder-Package für Office XP-Server</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k250.bpl">Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp250.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
                 </Excluded_Packages>
             </CPlusPlusBuilder.Personality>
             <Platforms>
@@ -442,17 +442,23 @@
                 <Platform value="Win32">True</Platform>
                 <Platform value="Win64">True</Platform>
             </Platforms>
-            <Deployment Version="2">
-                <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx32\libcgcrtl.dylib" Class="DependencyModule">
-                    <Platform Name="OSX32">
+            <Deployment Version="3">
+                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32c250mt.dll" Class="DependencyModule">
+                    <Platform Name="Win32">
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32230.dll" Class="DependencyModule">
+                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32c250.dll" Class="DependencyModule">
                     <Platform Name="Win32">
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
+                <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx32\libcgcrtl.dylib" Class="DependencyModule">
+                    <Platform Name="OSX32">
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32230.dll" Class="DependencyModule"/>
                 <DeployFile Condition="'$(UsingDelphiRTL)'=='true'" LocalName="$(BDS)\bin\borlndmm.dll" Class="DependencyModule">
                     <Platform Name="Win32">
                         <Overwrite>true</Overwrite>
@@ -468,34 +474,41 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32230mt.dll" Class="DependencyModule">
+                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32230mt.dll" Class="DependencyModule"/>
+                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32250mt.dll" Class="DependencyModule">
                     <Platform Name="Win32">
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\17.0\BPL\VirtualShellToolsC230.tds" Configuration="Debug" Class="DebugSymbols">
-                    <Platform Name="Win32">
-                        <RemoteName>VirtualShellToolsC.tds</RemoteName>
+                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin64\cc64250mt.dll" Class="DependencyModule">
+                    <Platform Name="Win64">
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\17.0\BPL\VirtualShellToolsC230.bpl" Configuration="Debug" Class="ProjectOutput">
+                <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\17.0\BPL\VirtualShellToolsC230.tds" Configuration="Debug" Class="DebugSymbols"/>
+                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32250.dll" Class="DependencyModule">
                     <Platform Name="Win32">
-                        <RemoteName>VirtualShellToolsC.bpl</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin64\cc64230mt.dll" Class="DependencyModule">
+                <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\17.0\BPL\VirtualShellToolsC230.bpl" Configuration="Debug" Class="ProjectOutput"/>
+                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin64\cc64230mt.dll" Class="DependencyModule"/>
+                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64230.dll" Class="DependencyModule"/>
+                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64250.dll" Class="DependencyModule">
                     <Platform Name="Win64">
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64230.dll" Class="DependencyModule">
-                    <Platform Name="Win64">
-                        <Overwrite>true</Overwrite>
+                <DeployClass Name="DependencyModule">
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                        <Extensions>.dll;.bpl</Extensions>
                     </Platform>
-                </DeployFile>
-                <DeployClass Name="ProjectiOSDeviceResourceRules"/>
+                    <Platform Name="OSX32">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="ProjectOSXResource">
                     <Platform Name="OSX32">
                         <RemoteDir>Contents\Resources</RemoteDir>
@@ -541,18 +554,21 @@
                     </Platform>
                 </DeployClass>
                 <DeployClass Required="true" Name="ProjectOutput">
+                    <Platform Name="iOSDevice64">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice32">
+                        <Operation>1</Operation>
+                    </Platform>
                     <Platform Name="Win32">
                         <Operation>0</Operation>
                     </Platform>
-                    <Platform Name="iOSDevice64">
+                    <Platform Name="Linux64">
                         <Operation>1</Operation>
                     </Platform>
                     <Platform Name="OSX32">
                         <Operation>1</Operation>
                     </Platform>
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
                     <Platform Name="Android">
                         <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
                         <Operation>1</Operation>
@@ -570,6 +586,14 @@
                         <Extensions>.framework</Extensions>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="ProjectUWPManifest">
+                    <Platform Name="Win32">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Win64">
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="iPhone_Launch640">
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>
@@ -602,12 +626,6 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="AndroidLibnativeX86File">
-                    <Platform Name="Android">
-                        <RemoteDir>library\lib\x86</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
                 <DeployClass Name="iPhone_Launch320">
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>
@@ -692,6 +710,16 @@
                 </DeployClass>
                 <DeployClass Name="ProjectOSXInfoPList"/>
                 <DeployClass Name="ProjectOSXEntitlements"/>
+                <DeployClass Name="UWP_CppLogo150">
+                    <Platform Name="Win32">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Win64">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="iPad_Launch2048">
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>
@@ -743,6 +771,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="UWP_CppLogo44">
+                    <Platform Name="Win32">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Win64">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="File">
                     <Platform Name="Win32">
                         <Operation>0</Operation>
@@ -809,20 +847,12 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="DependencyModule">
-                    <Platform Name="Win32">
-                        <Operation>0</Operation>
-                        <Extensions>.dll;.bpl</Extensions>
-                    </Platform>
-                    <Platform Name="OSX32">
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                </DeployClass>
+                <DeployClass Name="ProjectiOSDeviceResourceRules"/>
                 <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
diff --git a/CBuilder/VirtualShellToolsCD.cbproj b/CBuilder/VirtualShellToolsCD.cbproj
index 25c584b..9acfa10 100644
--- a/CBuilder/VirtualShellToolsCD.cbproj
+++ b/CBuilder/VirtualShellToolsCD.cbproj
@@ -6,7 +6,7 @@
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>18.0</ProjectVersion>
+        <ProjectVersion>18.2</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Package</AppType>
@@ -116,7 +116,7 @@
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base)'!=''">
         <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
-        <DllSuffix>230</DllSuffix>
+        <DllSuffix>250</DllSuffix>
         <IncludePath>..\Design\;$(IncludePath)</IncludePath>
         <IntermediateOutputDir>.\$(Platform)\$(Config)</IntermediateOutputDir>
         <DCC_HppOutput>..\source\hpp\$(Platform)\$(Config)</DCC_HppOutput>
@@ -250,6 +250,12 @@
             <BuildOrder>26</BuildOrder>
             <BuildOrder>2</BuildOrder>
         </PackageImport>
+        <PackageImport Include="EasyListviewC.bpi">
+            <BuildOrder>7</BuildOrder>
+        </PackageImport>
+        <PackageImport Include="MPCommonLibC.bpi">
+            <BuildOrder>8</BuildOrder>
+        </PackageImport>
         <PackageImport Include="rtl.bpi">
             <BuildOrder>20</BuildOrder>
             <BuildOrder>0</BuildOrder>
@@ -258,6 +264,9 @@
             <BuildOrder>3</BuildOrder>
             <BuildOrder>23</BuildOrder>
         </PackageImport>
+        <PackageImport Include="VirtualShellToolsC.bpi">
+            <BuildOrder>9</BuildOrder>
+        </PackageImport>
         <CppCompile Include="VirtualShellToolsCD.cpp">
             <BuildOrder>6</BuildOrder>
             <BuildOrder>2</BuildOrder>
@@ -272,15 +281,6 @@
         <DelphiCompile Include="..\Design\VirtualShellToolsReg.pas">
             <BuildOrder>8</BuildOrder>
         </DelphiCompile>
-        <PackageImport Include="EasyListviewC.bpi">
-            <BuildOrder>7</BuildOrder>
-        </PackageImport>
-        <PackageImport Include="MPCommonLibC.bpi">
-            <BuildOrder>8</BuildOrder>
-        </PackageImport>
-        <PackageImport Include="VirtualShellToolsC.bpi">
-            <BuildOrder>9</BuildOrder>
-        </PackageImport>
         <BuildConfiguration Include="Release">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>
@@ -361,10 +361,10 @@
                     <Source Name="MainSource">VirtualShellToolsCD.cpp</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k230.bpl">Embarcadero C++Builder-Package für Office 2000-Server</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp230.bpl">Embarcadero C++Builder-Package für Office XP-Server</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k230.bpl">Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp230.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k250.bpl">Embarcadero C++Builder-Package für Office 2000-Server</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp250.bpl">Embarcadero C++Builder-Package für Office XP-Server</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k250.bpl">Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp250.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
                 </Excluded_Packages>
             </CPlusPlusBuilder.Personality>
             <Platforms>
@@ -375,23 +375,23 @@
                 <Platform value="Win32">True</Platform>
                 <Platform value="Win64">False</Platform>
             </Platforms>
-            <Deployment Version="2">
-                <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\17.0\BPL\VirtualShellToolsCD230.bpl" Configuration="Debug" Class="ProjectOutput">
+            <Deployment Version="3">
+                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32c250mt.dll" Class="DependencyModule">
                     <Platform Name="Win32">
-                        <RemoteName>VirtualShellToolsCD.bpl</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx32\libcgcrtl.dylib" Class="DependencyModule">
-                    <Platform Name="OSX32">
+                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32c250.dll" Class="DependencyModule">
+                    <Platform Name="Win32">
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32230.dll" Class="DependencyModule">
-                    <Platform Name="Win32">
+                <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx32\libcgcrtl.dylib" Class="DependencyModule">
+                    <Platform Name="OSX32">
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
+                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32230.dll" Class="DependencyModule"/>
                 <DeployFile Condition="'$(UsingDelphiRTL)'=='true'" LocalName="$(BDS)\bin\borlndmm.dll" Class="DependencyModule">
                     <Platform Name="Win32">
                         <Overwrite>true</Overwrite>
@@ -407,28 +407,41 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32230mt.dll" Class="DependencyModule">
+                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32230mt.dll" Class="DependencyModule"/>
+                <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\17.0\BPL\VirtualShellToolsCD230.bpl" Configuration="Debug" Class="ProjectOutput"/>
+                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32250mt.dll" Class="DependencyModule">
                     <Platform Name="Win32">
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\17.0\BPL\VirtualShellToolsCD230.tds" Configuration="Debug" Class="DebugSymbols">
-                    <Platform Name="Win32">
-                        <RemoteName>VirtualShellToolsCD.tds</RemoteName>
+                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin64\cc64250mt.dll" Class="DependencyModule">
+                    <Platform Name="Win64">
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin64\cc64230mt.dll" Class="DependencyModule">
-                    <Platform Name="Win64">
+                <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\17.0\BPL\VirtualShellToolsCD230.tds" Configuration="Debug" Class="DebugSymbols"/>
+                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32250.dll" Class="DependencyModule">
+                    <Platform Name="Win32">
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64230.dll" Class="DependencyModule">
+                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin64\cc64230mt.dll" Class="DependencyModule"/>
+                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64230.dll" Class="DependencyModule"/>
+                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64250.dll" Class="DependencyModule">
                     <Platform Name="Win64">
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployClass Name="ProjectiOSDeviceResourceRules"/>
+                <DeployClass Name="DependencyModule">
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                        <Extensions>.dll;.bpl</Extensions>
+                    </Platform>
+                    <Platform Name="OSX32">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="ProjectOSXResource">
                     <Platform Name="OSX32">
                         <RemoteDir>Contents\Resources</RemoteDir>
@@ -474,18 +487,21 @@
                     </Platform>
                 </DeployClass>
                 <DeployClass Required="true" Name="ProjectOutput">
+                    <Platform Name="iOSDevice64">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice32">
+                        <Operation>1</Operation>
+                    </Platform>
                     <Platform Name="Win32">
                         <Operation>0</Operation>
                     </Platform>
-                    <Platform Name="iOSDevice64">
+                    <Platform Name="Linux64">
                         <Operation>1</Operation>
                     </Platform>
                     <Platform Name="OSX32">
                         <Operation>1</Operation>
                     </Platform>
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
                     <Platform Name="Android">
                         <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
                         <Operation>1</Operation>
@@ -503,6 +519,14 @@
                         <Extensions>.framework</Extensions>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="ProjectUWPManifest">
+                    <Platform Name="Win32">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Win64">
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="iPhone_Launch640">
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>
@@ -535,12 +559,6 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="AndroidLibnativeX86File">
-                    <Platform Name="Android">
-                        <RemoteDir>library\lib\x86</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
                 <DeployClass Name="iPhone_Launch320">
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>
@@ -625,6 +643,16 @@
                 </DeployClass>
                 <DeployClass Name="ProjectOSXInfoPList"/>
                 <DeployClass Name="ProjectOSXEntitlements"/>
+                <DeployClass Name="UWP_CppLogo150">
+                    <Platform Name="Win32">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Win64">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="iPad_Launch2048">
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>
@@ -676,6 +704,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="UWP_CppLogo44">
+                    <Platform Name="Win32">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Win64">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="File">
                     <Platform Name="Win32">
                         <Operation>0</Operation>
@@ -742,20 +780,12 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="DependencyModule">
-                    <Platform Name="Win32">
-                        <Operation>0</Operation>
-                        <Extensions>.dll;.bpl</Extensions>
-                    </Platform>
-                    <Platform Name="OSX32">
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                </DeployClass>
+                <DeployClass Name="ProjectiOSDeviceResourceRules"/>
                 <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
diff --git a/Delphi/VirtualShellToolsD.dpk b/Delphi/VirtualShellToolsD.dpk
index e76c2b6..659d71d 100644
--- a/Delphi/VirtualShellToolsD.dpk
+++ b/Delphi/VirtualShellToolsD.dpk
@@ -9,24 +9,24 @@ package VirtualShellToolsD;
 {$EXTENDEDSYNTAX ON}
 {$IMPORTEDDATA ON}
 {$IOCHECKS ON}
-{$LOCALSYMBOLS ON}
+{$LOCALSYMBOLS OFF}
 {$LONGSTRINGS ON}
 {$OPENSTRINGS ON}
-{$OPTIMIZATION OFF}
+{$OPTIMIZATION ON}
 {$OVERFLOWCHECKS OFF}
 {$RANGECHECKS OFF}
-{$REFERENCEINFO ON}
+{$REFERENCEINFO OFF}
 {$SAFEDIVIDE OFF}
-{$STACKFRAMES ON}
+{$STACKFRAMES OFF}
 {$TYPEDADDRESS OFF}
 {$VARSTRINGCHECKS ON}
 {$WRITEABLECONST OFF}
 {$MINENUMSIZE 1}
 {$IMAGEBASE $400000}
-{$DEFINE DEBUG}
+{$DEFINE RELEASE}
 {$ENDIF IMPLICITBUILDING}
 {$DESCRIPTION 'VirtualShellTools Delphi Runtime Package'}
-{$LIBSUFFIX '240'}
+{$LIBSUFFIX '250'}
 {$RUNONLY}
 {$IMPLICITBUILD OFF}
 
diff --git a/Delphi/VirtualShellToolsD.dproj b/Delphi/VirtualShellToolsD.dproj
index 04a2005..9b46b8a 100644
--- a/Delphi/VirtualShellToolsD.dproj
+++ b/Delphi/VirtualShellToolsD.dproj
@@ -7,7 +7,7 @@
         <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Package</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>18.1</ProjectVersion>
+        <ProjectVersion>18.2</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
@@ -33,6 +33,12 @@
         <CfgParent>Base</CfgParent>
         <Base>true</Base>
     </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
+        <Cfg_1_Win32>true</Cfg_1_Win32>
+        <CfgParent>Cfg_1</CfgParent>
+        <Cfg_1>true</Cfg_1>
+        <Base>true</Base>
+    </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
         <Cfg_2>true</Cfg_2>
         <CfgParent>Base</CfgParent>
@@ -55,7 +61,7 @@
         <DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
         <DCC_CBuilderOutput>All</DCC_CBuilderOutput>
         <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
-        <DllSuffix>240</DllSuffix>
+        <DllSuffix>250</DllSuffix>
         <GenPackage>true</GenPackage>
         <RuntimeOnlyPackage>true</RuntimeOnlyPackage>
         <DCC_S>false</DCC_S>
@@ -79,13 +85,13 @@
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
-        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
         <DCC_Namespace>Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win64)'!=''">
         <DCC_Namespace>Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
         <VerInfo_Locale>1033</VerInfo_Locale>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1)'!=''">
@@ -94,6 +100,11 @@
         <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
         <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
     </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
+        <VerInfo_Locale>1033</VerInfo_Locale>
+        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
+        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+    </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2)'!=''">
         <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
         <DCC_Optimize>false</DCC_Optimize>
@@ -105,7 +116,7 @@
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
-        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -157,11 +168,10 @@
                     <Source Name="MainSource">VirtualShellToolsD.dpk</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclIntraweb_140_240.bpl">IntraWeb 14.0 Design Package for RAD Studio XE6</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder-Package für Office 2000-Server</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder-Package für Office XP-Server</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k250.bpl">Embarcadero C++Builder-Package für Office 2000-Server</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp250.bpl">Embarcadero C++Builder-Package für Office XP-Server</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k250.bpl">Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp250.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>
@@ -179,16 +189,7 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployClass Name="DependencyModule">
-                    <Platform Name="Win32">
-                        <Operation>0</Operation>
-                        <Extensions>.dll;.bpl</Extensions>
-                    </Platform>
-                    <Platform Name="OSX32">
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                </DeployClass>
+                <DeployClass Name="ProjectiOSDeviceResourceRules"/>
                 <DeployClass Name="ProjectOSXResource">
                     <Platform Name="OSX32">
                         <RemoteDir>Contents\Resources</RemoteDir>
@@ -266,6 +267,14 @@
                         <Extensions>.framework</Extensions>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="ProjectUWPManifest">
+                    <Platform Name="Win32">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Win64">
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="iPhone_Launch640">
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>
@@ -368,6 +377,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="UWP_DelphiLogo44">
+                    <Platform Name="Win32">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Win64">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="ProjectiOSEntitlements"/>
                 <DeployClass Name="Android_LauncherIcon72">
                     <Platform Name="Android">
@@ -383,6 +402,16 @@
                 </DeployClass>
                 <DeployClass Name="ProjectOSXInfoPList"/>
                 <DeployClass Name="ProjectOSXEntitlements"/>
+                <DeployClass Name="UWP_DelphiLogo150">
+                    <Platform Name="Win32">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Win64">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="iPad_Launch2048">
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>
@@ -500,7 +529,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="ProjectiOSDeviceResourceRules"/>
+                <DeployClass Name="DependencyModule">
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                        <Extensions>.dll;.bpl</Extensions>
+                    </Platform>
+                    <Platform Name="OSX32">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                </DeployClass>
                 <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
diff --git a/Delphi/VirtualShellToolsDD.dpk b/Delphi/VirtualShellToolsDD.dpk
index 3849474..98d04c3 100644
--- a/Delphi/VirtualShellToolsDD.dpk
+++ b/Delphi/VirtualShellToolsDD.dpk
@@ -10,24 +10,24 @@ package VirtualShellToolsDD;
 {$EXTENDEDSYNTAX ON}
 {$IMPORTEDDATA ON}
 {$IOCHECKS ON}
-{$LOCALSYMBOLS ON}
+{$LOCALSYMBOLS OFF}
 {$LONGSTRINGS ON}
 {$OPENSTRINGS ON}
-{$OPTIMIZATION OFF}
+{$OPTIMIZATION ON}
 {$OVERFLOWCHECKS OFF}
 {$RANGECHECKS OFF}
-{$REFERENCEINFO ON}
+{$REFERENCEINFO OFF}
 {$SAFEDIVIDE OFF}
-{$STACKFRAMES ON}
+{$STACKFRAMES OFF}
 {$TYPEDADDRESS OFF}
 {$VARSTRINGCHECKS ON}
 {$WRITEABLECONST OFF}
 {$MINENUMSIZE 1}
 {$IMAGEBASE $400000}
-{$DEFINE DEBUG}
+{$DEFINE RELEASE}
 {$ENDIF IMPLICITBUILDING}
 {$DESCRIPTION 'Virtual Shell Tools Delphi Designtime Package'}
-{$LIBSUFFIX '240'}
+{$LIBSUFFIX '250'}
 {$DESIGNONLY}
 {$IMPLICITBUILD OFF}
 
diff --git a/Delphi/VirtualShellToolsDD.dproj b/Delphi/VirtualShellToolsDD.dproj
index 975a6c1..879f0fa 100644
--- a/Delphi/VirtualShellToolsDD.dproj
+++ b/Delphi/VirtualShellToolsDD.dproj
@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Package</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>18.1</ProjectVersion>
+        <ProjectVersion>18.2</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
@@ -28,6 +28,12 @@
         <CfgParent>Base</CfgParent>
         <Base>true</Base>
     </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
+        <Cfg_1_Win32>true</Cfg_1_Win32>
+        <CfgParent>Cfg_1</CfgParent>
+        <Cfg_1>true</Cfg_1>
+        <Base>true</Base>
+    </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
         <Cfg_2>true</Cfg_2>
         <CfgParent>Base</CfgParent>
@@ -50,7 +56,7 @@
         <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
         <DCC_CBuilderOutput>All</DCC_CBuilderOutput>
         <DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
-        <DllSuffix>240</DllSuffix>
+        <DllSuffix>250</DllSuffix>
         <GenDll>true</GenDll>
         <GenPackage>true</GenPackage>
         <DCC_F>false</DCC_F>
@@ -74,7 +80,7 @@
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
         <DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
         <VerInfo_Locale>1033</VerInfo_Locale>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1)'!=''">
@@ -83,6 +89,11 @@
         <DCC_DebugInformation>0</DCC_DebugInformation>
         <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
     </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
+        <VerInfo_Locale>1033</VerInfo_Locale>
+        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
+        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+    </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2)'!=''">
         <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
         <DCC_Optimize>false</DCC_Optimize>
@@ -94,7 +105,7 @@
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
-        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -130,11 +141,10 @@
                     <Source Name="MainSource">VirtualShellToolsDD.dpk</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclIntraweb_140_240.bpl">IntraWeb 14.0 Design Package for RAD Studio XE6</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder-Package für Office 2000-Server</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder-Package für Office XP-Server</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k250.bpl">Embarcadero C++Builder-Package für Office 2000-Server</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp250.bpl">Embarcadero C++Builder-Package für Office XP-Server</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k250.bpl">Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp250.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>
@@ -152,16 +162,7 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployClass Name="DependencyModule">
-                    <Platform Name="Win32">
-                        <Operation>0</Operation>
-                        <Extensions>.dll;.bpl</Extensions>
-                    </Platform>
-                    <Platform Name="OSX32">
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                </DeployClass>
+                <DeployClass Name="ProjectiOSDeviceResourceRules"/>
                 <DeployClass Name="ProjectOSXResource">
                     <Platform Name="OSX32">
                         <RemoteDir>Contents\Resources</RemoteDir>
@@ -239,6 +240,14 @@
                         <Extensions>.framework</Extensions>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="ProjectUWPManifest">
+                    <Platform Name="Win32">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Win64">
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="iPhone_Launch640">
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>
@@ -341,6 +350,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="UWP_DelphiLogo44">
+                    <Platform Name="Win32">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Win64">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="ProjectiOSEntitlements"/>
                 <DeployClass Name="Android_LauncherIcon72">
                     <Platform Name="Android">
@@ -356,6 +375,16 @@
                 </DeployClass>
                 <DeployClass Name="ProjectOSXInfoPList"/>
                 <DeployClass Name="ProjectOSXEntitlements"/>
+                <DeployClass Name="UWP_DelphiLogo150">
+                    <Platform Name="Win32">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Win64">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="iPad_Launch2048">
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>
@@ -473,7 +502,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="ProjectiOSDeviceResourceRules"/>
+                <DeployClass Name="DependencyModule">
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                        <Extensions>.dll;.bpl</Extensions>
+                    </Platform>
+                    <Platform Name="OSX32">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                </DeployClass>
                 <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
diff --git a/Source/VirtualExplorerTree.pas b/Source/VirtualExplorerTree.pas
index 5c8311c..38790d1 100644
--- a/Source/VirtualExplorerTree.pas
+++ b/Source/VirtualExplorerTree.pas
@@ -5259,7 +5259,7 @@ function TCustomVirtualExplorerTree.ExpandNamespaceFolder(Node: PVirtualNode): i
             while UpdateCount > 0 do
               EndUpdate;
 
-            Result := NS.EnumerateFolderEx(Handle, FileObjects, EnumerateFolderCallback, Node, AfterValidEnumIDList);
+            NS.EnumerateFolderEx(Handle, FileObjects, EnumerateFolderCallback, Node, AfterValidEnumIDList);
 
             DoCustomNamespace(Node);
             { Sort calls InitChildren which can lead to endless recursion problems if }
diff --git a/Source/VirtualScrollbars.pas b/Source/VirtualScrollbars.pas
index 93baa05..42ba09d 100644
--- a/Source/VirtualScrollbars.pas
+++ b/Source/VirtualScrollbars.pas
@@ -642,7 +642,6 @@ function TCustomOwnerDrawScrollbar.Metric(Dimension: TScrollDimensions): Integer
   Percent: Single;
   Temp: integer;
 begin
-  Result := 0;
   case Dimension of
     sbVArrowWidth  : Result := GetSystemMetrics(SM_CXVSCROLL);
     sbVArrowHeight :
diff --git a/Source/hpp/Win32/Debug/AppletsAndWizards.hpp b/Source/hpp/Win32/Debug/AppletsAndWizards.hpp
index 9481dfe..0986b1c 100644
--- a/Source/hpp/Win32/Debug/AppletsAndWizards.hpp
+++ b/Source/hpp/Win32/Debug/AppletsAndWizards.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'AppletsAndWizards.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'AppletsAndWizards.pas' rev: 32.00 (Windows)
 
 #ifndef AppletsandwizardsHPP
 #define AppletsandwizardsHPP
diff --git a/Source/hpp/Win32/Debug/ColumnForm.hpp b/Source/hpp/Win32/Debug/ColumnForm.hpp
index d5f5bc9..5348299 100644
--- a/Source/hpp/Win32/Debug/ColumnForm.hpp
+++ b/Source/hpp/Win32/Debug/ColumnForm.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'ColumnForm.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'ColumnForm.pas' rev: 32.00 (Windows)
 
 #ifndef ColumnformHPP
 #define ColumnformHPP
diff --git a/Source/hpp/Win32/Debug/VirtualCommandLine.hpp b/Source/hpp/Win32/Debug/VirtualCommandLine.hpp
index 4f0a4a4..8cb65fd 100644
--- a/Source/hpp/Win32/Debug/VirtualCommandLine.hpp
+++ b/Source/hpp/Win32/Debug/VirtualCommandLine.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualCommandLine.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualCommandLine.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualcommandlineHPP
 #define VirtualcommandlineHPP
diff --git a/Source/hpp/Win32/Debug/VirtualExplorerEasyListModeview.hpp b/Source/hpp/Win32/Debug/VirtualExplorerEasyListModeview.hpp
index d0b72ca..28faa96 100644
--- a/Source/hpp/Win32/Debug/VirtualExplorerEasyListModeview.hpp
+++ b/Source/hpp/Win32/Debug/VirtualExplorerEasyListModeview.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualExplorerEasyListModeview.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualExplorerEasyListModeview.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualexplorereasylistmodeviewHPP
 #define VirtualexplorereasylistmodeviewHPP
diff --git a/Source/hpp/Win32/Debug/VirtualExplorerEasyListview.hpp b/Source/hpp/Win32/Debug/VirtualExplorerEasyListview.hpp
index 1f48a6f..1dafc90 100644
--- a/Source/hpp/Win32/Debug/VirtualExplorerEasyListview.hpp
+++ b/Source/hpp/Win32/Debug/VirtualExplorerEasyListview.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualExplorerEasyListview.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualExplorerEasyListview.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualexplorereasylistviewHPP
 #define VirtualexplorereasylistviewHPP
diff --git a/Source/hpp/Win32/Debug/VirtualExplorerTree.hpp b/Source/hpp/Win32/Debug/VirtualExplorerTree.hpp
index 38193d0..5bc0501 100644
--- a/Source/hpp/Win32/Debug/VirtualExplorerTree.hpp
+++ b/Source/hpp/Win32/Debug/VirtualExplorerTree.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualExplorerTree.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualExplorerTree.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualexplorertreeHPP
 #define VirtualexplorertreeHPP
diff --git a/Source/hpp/Win32/Debug/VirtualFileSearch.hpp b/Source/hpp/Win32/Debug/VirtualFileSearch.hpp
index 63d2635..7b0e70f 100644
--- a/Source/hpp/Win32/Debug/VirtualFileSearch.hpp
+++ b/Source/hpp/Win32/Debug/VirtualFileSearch.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualFileSearch.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualFileSearch.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualfilesearchHPP
 #define VirtualfilesearchHPP
diff --git a/Source/hpp/Win32/Debug/VirtualRedirector.hpp b/Source/hpp/Win32/Debug/VirtualRedirector.hpp
index e57d914..cb2f0bf 100644
--- a/Source/hpp/Win32/Debug/VirtualRedirector.hpp
+++ b/Source/hpp/Win32/Debug/VirtualRedirector.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualRedirector.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualRedirector.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualredirectorHPP
 #define VirtualredirectorHPP
diff --git a/Source/hpp/Win32/Debug/VirtualResources.hpp b/Source/hpp/Win32/Debug/VirtualResources.hpp
index 0bfa693..570a628 100644
--- a/Source/hpp/Win32/Debug/VirtualResources.hpp
+++ b/Source/hpp/Win32/Debug/VirtualResources.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualResources.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualResources.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualresourcesHPP
 #define VirtualresourcesHPP
diff --git a/Source/hpp/Win32/Debug/VirtualScrollbars.hpp b/Source/hpp/Win32/Debug/VirtualScrollbars.hpp
index 7934ff4..fb7dfd6 100644
--- a/Source/hpp/Win32/Debug/VirtualScrollbars.hpp
+++ b/Source/hpp/Win32/Debug/VirtualScrollbars.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualScrollbars.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualScrollbars.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualscrollbarsHPP
 #define VirtualscrollbarsHPP
diff --git a/Source/hpp/Win32/Debug/VirtualSendToMenu.hpp b/Source/hpp/Win32/Debug/VirtualSendToMenu.hpp
index f0dd060..522edf4 100644
--- a/Source/hpp/Win32/Debug/VirtualSendToMenu.hpp
+++ b/Source/hpp/Win32/Debug/VirtualSendToMenu.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualSendToMenu.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualSendToMenu.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualsendtomenuHPP
 #define VirtualsendtomenuHPP
diff --git a/Source/hpp/Win32/Debug/VirtualShellAutoComplete.hpp b/Source/hpp/Win32/Debug/VirtualShellAutoComplete.hpp
index fb4572c..109a031 100644
--- a/Source/hpp/Win32/Debug/VirtualShellAutoComplete.hpp
+++ b/Source/hpp/Win32/Debug/VirtualShellAutoComplete.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualShellAutoComplete.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualShellAutoComplete.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualshellautocompleteHPP
 #define VirtualshellautocompleteHPP
diff --git a/Source/hpp/Win32/Debug/VirtualShellHistory.hpp b/Source/hpp/Win32/Debug/VirtualShellHistory.hpp
index 2b2f411..a24330b 100644
--- a/Source/hpp/Win32/Debug/VirtualShellHistory.hpp
+++ b/Source/hpp/Win32/Debug/VirtualShellHistory.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualShellHistory.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualShellHistory.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualshellhistoryHPP
 #define VirtualshellhistoryHPP
diff --git a/Source/hpp/Win32/Debug/VirtualShellNewMenu.hpp b/Source/hpp/Win32/Debug/VirtualShellNewMenu.hpp
index 0fa141d..a8e9793 100644
--- a/Source/hpp/Win32/Debug/VirtualShellNewMenu.hpp
+++ b/Source/hpp/Win32/Debug/VirtualShellNewMenu.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualShellNewMenu.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualShellNewMenu.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualshellnewmenuHPP
 #define VirtualshellnewmenuHPP
diff --git a/Source/hpp/Win32/Debug/VirtualShellNotifier.hpp b/Source/hpp/Win32/Debug/VirtualShellNotifier.hpp
index b57e609..bd03935 100644
--- a/Source/hpp/Win32/Debug/VirtualShellNotifier.hpp
+++ b/Source/hpp/Win32/Debug/VirtualShellNotifier.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualShellNotifier.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualShellNotifier.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualshellnotifierHPP
 #define VirtualshellnotifierHPP
diff --git a/Source/hpp/Win32/Debug/VirtualShellToolBar.hpp b/Source/hpp/Win32/Debug/VirtualShellToolBar.hpp
index 9500865..462a517 100644
--- a/Source/hpp/Win32/Debug/VirtualShellToolBar.hpp
+++ b/Source/hpp/Win32/Debug/VirtualShellToolBar.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualShellToolBar.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualShellToolBar.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualshelltoolbarHPP
 #define VirtualshelltoolbarHPP
diff --git a/Source/hpp/Win32/Debug/VirtualShellToolsD.hpp b/Source/hpp/Win32/Debug/VirtualShellToolsD.hpp
index 8b5b0d2..b288ebc 100644
--- a/Source/hpp/Win32/Debug/VirtualShellToolsD.hpp
+++ b/Source/hpp/Win32/Debug/VirtualShellToolsD.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualShellToolsD.dpk' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualShellToolsD.dpk' rev: 32.00 (Windows)
 
 #ifndef VirtualshelltoolsdHPP
 #define VirtualshelltoolsdHPP
@@ -83,6 +83,11 @@
 #include <VirtualTrees.hpp>	// (VirtualTreesDR)
 #include <EasyListview.hpp>	// (EasyListviewD)
 #include <Vcl.Imaging.jpeg.hpp>	// (vclimg)
+// SO_SFX: 250
+// PRG_EXT: .bpl
+// BPI_DIR: C:\Users\Public\Documents\Embarcadero\Studio\19.0\Dcp
+// OBJ_DIR: C:\Users\Public\Documents\Embarcadero\Studio\19.0\Dcp
+// OBJ_EXT: .obj
 
 //-- user supplied -----------------------------------------------------------
 
diff --git a/Source/hpp/Win32/Debug/VirtualShellToolsDD.hpp b/Source/hpp/Win32/Debug/VirtualShellToolsDD.hpp
index 4fcbdb4..c2ab656 100644
--- a/Source/hpp/Win32/Debug/VirtualShellToolsDD.hpp
+++ b/Source/hpp/Win32/Debug/VirtualShellToolsDD.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualShellToolsDD.dpk' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualShellToolsDD.dpk' rev: 32.00 (Windows)
 
 #ifndef VirtualshelltoolsddHPP
 #define VirtualshelltoolsddHPP
@@ -94,6 +94,11 @@
 #include <ToolsAPI.hpp>	// (designide)
 #include <Proxies.hpp>	// (designide)
 #include <DesignEditors.hpp>	// (designide)
+// SO_SFX: 250
+// PRG_EXT: .bpl
+// BPI_DIR: C:\Users\Public\Documents\Embarcadero\Studio\19.0\Dcp
+// OBJ_DIR: C:\Users\Public\Documents\Embarcadero\Studio\19.0\Dcp
+// OBJ_EXT: .obj
 
 //-- user supplied -----------------------------------------------------------
 
diff --git a/Source/hpp/Win32/Debug/VirtualShellToolsReg.hpp b/Source/hpp/Win32/Debug/VirtualShellToolsReg.hpp
index c395b47..6f4e741 100644
--- a/Source/hpp/Win32/Debug/VirtualShellToolsReg.hpp
+++ b/Source/hpp/Win32/Debug/VirtualShellToolsReg.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualShellToolsReg.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualShellToolsReg.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualshelltoolsregHPP
 #define VirtualshelltoolsregHPP
diff --git a/Source/hpp/Win32/Debug/VirtualThumbnails.hpp b/Source/hpp/Win32/Debug/VirtualThumbnails.hpp
index dfc5101..fd39b2b 100644
--- a/Source/hpp/Win32/Debug/VirtualThumbnails.hpp
+++ b/Source/hpp/Win32/Debug/VirtualThumbnails.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualThumbnails.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualThumbnails.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualthumbnailsHPP
 #define VirtualthumbnailsHPP
diff --git a/Source/hpp/Win32/Release/AppletsAndWizards.hpp b/Source/hpp/Win32/Release/AppletsAndWizards.hpp
index 9481dfe..0986b1c 100644
--- a/Source/hpp/Win32/Release/AppletsAndWizards.hpp
+++ b/Source/hpp/Win32/Release/AppletsAndWizards.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'AppletsAndWizards.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'AppletsAndWizards.pas' rev: 32.00 (Windows)
 
 #ifndef AppletsandwizardsHPP
 #define AppletsandwizardsHPP
diff --git a/Source/hpp/Win32/Release/ColumnForm.hpp b/Source/hpp/Win32/Release/ColumnForm.hpp
index d5f5bc9..5348299 100644
--- a/Source/hpp/Win32/Release/ColumnForm.hpp
+++ b/Source/hpp/Win32/Release/ColumnForm.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'ColumnForm.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'ColumnForm.pas' rev: 32.00 (Windows)
 
 #ifndef ColumnformHPP
 #define ColumnformHPP
diff --git a/Source/hpp/Win32/Release/VirtualCommandLine.hpp b/Source/hpp/Win32/Release/VirtualCommandLine.hpp
index 4f0a4a4..8cb65fd 100644
--- a/Source/hpp/Win32/Release/VirtualCommandLine.hpp
+++ b/Source/hpp/Win32/Release/VirtualCommandLine.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualCommandLine.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualCommandLine.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualcommandlineHPP
 #define VirtualcommandlineHPP
diff --git a/Source/hpp/Win32/Release/VirtualExplorerEasyListModeview.hpp b/Source/hpp/Win32/Release/VirtualExplorerEasyListModeview.hpp
index d0b72ca..28faa96 100644
--- a/Source/hpp/Win32/Release/VirtualExplorerEasyListModeview.hpp
+++ b/Source/hpp/Win32/Release/VirtualExplorerEasyListModeview.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualExplorerEasyListModeview.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualExplorerEasyListModeview.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualexplorereasylistmodeviewHPP
 #define VirtualexplorereasylistmodeviewHPP
diff --git a/Source/hpp/Win32/Release/VirtualExplorerEasyListview.hpp b/Source/hpp/Win32/Release/VirtualExplorerEasyListview.hpp
index 1f48a6f..1dafc90 100644
--- a/Source/hpp/Win32/Release/VirtualExplorerEasyListview.hpp
+++ b/Source/hpp/Win32/Release/VirtualExplorerEasyListview.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualExplorerEasyListview.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualExplorerEasyListview.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualexplorereasylistviewHPP
 #define VirtualexplorereasylistviewHPP
diff --git a/Source/hpp/Win32/Release/VirtualExplorerTree.hpp b/Source/hpp/Win32/Release/VirtualExplorerTree.hpp
index 38193d0..5bc0501 100644
--- a/Source/hpp/Win32/Release/VirtualExplorerTree.hpp
+++ b/Source/hpp/Win32/Release/VirtualExplorerTree.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualExplorerTree.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualExplorerTree.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualexplorertreeHPP
 #define VirtualexplorertreeHPP
diff --git a/Source/hpp/Win32/Release/VirtualFileSearch.hpp b/Source/hpp/Win32/Release/VirtualFileSearch.hpp
index 63d2635..7b0e70f 100644
--- a/Source/hpp/Win32/Release/VirtualFileSearch.hpp
+++ b/Source/hpp/Win32/Release/VirtualFileSearch.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualFileSearch.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualFileSearch.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualfilesearchHPP
 #define VirtualfilesearchHPP
diff --git a/Source/hpp/Win32/Release/VirtualRedirector.hpp b/Source/hpp/Win32/Release/VirtualRedirector.hpp
index e57d914..cb2f0bf 100644
--- a/Source/hpp/Win32/Release/VirtualRedirector.hpp
+++ b/Source/hpp/Win32/Release/VirtualRedirector.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualRedirector.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualRedirector.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualredirectorHPP
 #define VirtualredirectorHPP
diff --git a/Source/hpp/Win32/Release/VirtualResources.hpp b/Source/hpp/Win32/Release/VirtualResources.hpp
index 0bfa693..570a628 100644
--- a/Source/hpp/Win32/Release/VirtualResources.hpp
+++ b/Source/hpp/Win32/Release/VirtualResources.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualResources.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualResources.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualresourcesHPP
 #define VirtualresourcesHPP
diff --git a/Source/hpp/Win32/Release/VirtualScrollbars.hpp b/Source/hpp/Win32/Release/VirtualScrollbars.hpp
index 7934ff4..fb7dfd6 100644
--- a/Source/hpp/Win32/Release/VirtualScrollbars.hpp
+++ b/Source/hpp/Win32/Release/VirtualScrollbars.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualScrollbars.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualScrollbars.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualscrollbarsHPP
 #define VirtualscrollbarsHPP
diff --git a/Source/hpp/Win32/Release/VirtualSendToMenu.hpp b/Source/hpp/Win32/Release/VirtualSendToMenu.hpp
index f0dd060..522edf4 100644
--- a/Source/hpp/Win32/Release/VirtualSendToMenu.hpp
+++ b/Source/hpp/Win32/Release/VirtualSendToMenu.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualSendToMenu.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualSendToMenu.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualsendtomenuHPP
 #define VirtualsendtomenuHPP
diff --git a/Source/hpp/Win32/Release/VirtualShellAutoComplete.hpp b/Source/hpp/Win32/Release/VirtualShellAutoComplete.hpp
index fb4572c..109a031 100644
--- a/Source/hpp/Win32/Release/VirtualShellAutoComplete.hpp
+++ b/Source/hpp/Win32/Release/VirtualShellAutoComplete.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualShellAutoComplete.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualShellAutoComplete.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualshellautocompleteHPP
 #define VirtualshellautocompleteHPP
diff --git a/Source/hpp/Win32/Release/VirtualShellHistory.hpp b/Source/hpp/Win32/Release/VirtualShellHistory.hpp
index 2b2f411..a24330b 100644
--- a/Source/hpp/Win32/Release/VirtualShellHistory.hpp
+++ b/Source/hpp/Win32/Release/VirtualShellHistory.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualShellHistory.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualShellHistory.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualshellhistoryHPP
 #define VirtualshellhistoryHPP
diff --git a/Source/hpp/Win32/Release/VirtualShellNewMenu.hpp b/Source/hpp/Win32/Release/VirtualShellNewMenu.hpp
index 0fa141d..a8e9793 100644
--- a/Source/hpp/Win32/Release/VirtualShellNewMenu.hpp
+++ b/Source/hpp/Win32/Release/VirtualShellNewMenu.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualShellNewMenu.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualShellNewMenu.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualshellnewmenuHPP
 #define VirtualshellnewmenuHPP
diff --git a/Source/hpp/Win32/Release/VirtualShellNotifier.hpp b/Source/hpp/Win32/Release/VirtualShellNotifier.hpp
index b57e609..bd03935 100644
--- a/Source/hpp/Win32/Release/VirtualShellNotifier.hpp
+++ b/Source/hpp/Win32/Release/VirtualShellNotifier.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualShellNotifier.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualShellNotifier.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualshellnotifierHPP
 #define VirtualshellnotifierHPP
diff --git a/Source/hpp/Win32/Release/VirtualShellToolBar.hpp b/Source/hpp/Win32/Release/VirtualShellToolBar.hpp
index 9500865..462a517 100644
--- a/Source/hpp/Win32/Release/VirtualShellToolBar.hpp
+++ b/Source/hpp/Win32/Release/VirtualShellToolBar.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualShellToolBar.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualShellToolBar.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualshelltoolbarHPP
 #define VirtualshelltoolbarHPP
diff --git a/Source/hpp/Win32/Release/VirtualShellToolsD.hpp b/Source/hpp/Win32/Release/VirtualShellToolsD.hpp
index 8b5b0d2..b288ebc 100644
--- a/Source/hpp/Win32/Release/VirtualShellToolsD.hpp
+++ b/Source/hpp/Win32/Release/VirtualShellToolsD.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualShellToolsD.dpk' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualShellToolsD.dpk' rev: 32.00 (Windows)
 
 #ifndef VirtualshelltoolsdHPP
 #define VirtualshelltoolsdHPP
@@ -83,6 +83,11 @@
 #include <VirtualTrees.hpp>	// (VirtualTreesDR)
 #include <EasyListview.hpp>	// (EasyListviewD)
 #include <Vcl.Imaging.jpeg.hpp>	// (vclimg)
+// SO_SFX: 250
+// PRG_EXT: .bpl
+// BPI_DIR: C:\Users\Public\Documents\Embarcadero\Studio\19.0\Dcp
+// OBJ_DIR: C:\Users\Public\Documents\Embarcadero\Studio\19.0\Dcp
+// OBJ_EXT: .obj
 
 //-- user supplied -----------------------------------------------------------
 
diff --git a/Source/hpp/Win32/Release/VirtualShellToolsDD.hpp b/Source/hpp/Win32/Release/VirtualShellToolsDD.hpp
index 4fcbdb4..c2ab656 100644
--- a/Source/hpp/Win32/Release/VirtualShellToolsDD.hpp
+++ b/Source/hpp/Win32/Release/VirtualShellToolsDD.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualShellToolsDD.dpk' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualShellToolsDD.dpk' rev: 32.00 (Windows)
 
 #ifndef VirtualshelltoolsddHPP
 #define VirtualshelltoolsddHPP
@@ -94,6 +94,11 @@
 #include <ToolsAPI.hpp>	// (designide)
 #include <Proxies.hpp>	// (designide)
 #include <DesignEditors.hpp>	// (designide)
+// SO_SFX: 250
+// PRG_EXT: .bpl
+// BPI_DIR: C:\Users\Public\Documents\Embarcadero\Studio\19.0\Dcp
+// OBJ_DIR: C:\Users\Public\Documents\Embarcadero\Studio\19.0\Dcp
+// OBJ_EXT: .obj
 
 //-- user supplied -----------------------------------------------------------
 
diff --git a/Source/hpp/Win32/Release/VirtualShellToolsReg.hpp b/Source/hpp/Win32/Release/VirtualShellToolsReg.hpp
index c395b47..6f4e741 100644
--- a/Source/hpp/Win32/Release/VirtualShellToolsReg.hpp
+++ b/Source/hpp/Win32/Release/VirtualShellToolsReg.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualShellToolsReg.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualShellToolsReg.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualshelltoolsregHPP
 #define VirtualshelltoolsregHPP
diff --git a/Source/hpp/Win32/Release/VirtualThumbnails.hpp b/Source/hpp/Win32/Release/VirtualThumbnails.hpp
index dfc5101..fd39b2b 100644
--- a/Source/hpp/Win32/Release/VirtualThumbnails.hpp
+++ b/Source/hpp/Win32/Release/VirtualThumbnails.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualThumbnails.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualThumbnails.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualthumbnailsHPP
 #define VirtualthumbnailsHPP
diff --git a/Source/hpp/Win64/Debug/AppletsAndWizards.hpp b/Source/hpp/Win64/Debug/AppletsAndWizards.hpp
index 002f0ab..c2449bd 100644
--- a/Source/hpp/Win64/Debug/AppletsAndWizards.hpp
+++ b/Source/hpp/Win64/Debug/AppletsAndWizards.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'AppletsAndWizards.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'AppletsAndWizards.pas' rev: 32.00 (Windows)
 
 #ifndef AppletsandwizardsHPP
 #define AppletsandwizardsHPP
diff --git a/Source/hpp/Win64/Debug/ColumnForm.hpp b/Source/hpp/Win64/Debug/ColumnForm.hpp
index 4491e60..68dd577 100644
--- a/Source/hpp/Win64/Debug/ColumnForm.hpp
+++ b/Source/hpp/Win64/Debug/ColumnForm.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'ColumnForm.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'ColumnForm.pas' rev: 32.00 (Windows)
 
 #ifndef ColumnformHPP
 #define ColumnformHPP
diff --git a/Source/hpp/Win64/Debug/VirtualCommandLine.hpp b/Source/hpp/Win64/Debug/VirtualCommandLine.hpp
index 7aa3d40..95c8504 100644
--- a/Source/hpp/Win64/Debug/VirtualCommandLine.hpp
+++ b/Source/hpp/Win64/Debug/VirtualCommandLine.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualCommandLine.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualCommandLine.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualcommandlineHPP
 #define VirtualcommandlineHPP
diff --git a/Source/hpp/Win64/Debug/VirtualExplorerEasyListModeview.hpp b/Source/hpp/Win64/Debug/VirtualExplorerEasyListModeview.hpp
index 6753f8e..5bc9f7c 100644
--- a/Source/hpp/Win64/Debug/VirtualExplorerEasyListModeview.hpp
+++ b/Source/hpp/Win64/Debug/VirtualExplorerEasyListModeview.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualExplorerEasyListModeview.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualExplorerEasyListModeview.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualexplorereasylistmodeviewHPP
 #define VirtualexplorereasylistmodeviewHPP
diff --git a/Source/hpp/Win64/Debug/VirtualExplorerEasyListview.hpp b/Source/hpp/Win64/Debug/VirtualExplorerEasyListview.hpp
index cc3bdd5..11bf99e 100644
--- a/Source/hpp/Win64/Debug/VirtualExplorerEasyListview.hpp
+++ b/Source/hpp/Win64/Debug/VirtualExplorerEasyListview.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualExplorerEasyListview.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualExplorerEasyListview.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualexplorereasylistviewHPP
 #define VirtualexplorereasylistviewHPP
diff --git a/Source/hpp/Win64/Debug/VirtualExplorerTree.hpp b/Source/hpp/Win64/Debug/VirtualExplorerTree.hpp
index 3db0525..7d498af 100644
--- a/Source/hpp/Win64/Debug/VirtualExplorerTree.hpp
+++ b/Source/hpp/Win64/Debug/VirtualExplorerTree.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualExplorerTree.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualExplorerTree.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualexplorertreeHPP
 #define VirtualexplorertreeHPP
diff --git a/Source/hpp/Win64/Debug/VirtualFileSearch.hpp b/Source/hpp/Win64/Debug/VirtualFileSearch.hpp
index 63b9f28..787024f 100644
--- a/Source/hpp/Win64/Debug/VirtualFileSearch.hpp
+++ b/Source/hpp/Win64/Debug/VirtualFileSearch.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualFileSearch.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualFileSearch.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualfilesearchHPP
 #define VirtualfilesearchHPP
diff --git a/Source/hpp/Win64/Debug/VirtualRedirector.hpp b/Source/hpp/Win64/Debug/VirtualRedirector.hpp
index ab519e4..cdc28ea 100644
--- a/Source/hpp/Win64/Debug/VirtualRedirector.hpp
+++ b/Source/hpp/Win64/Debug/VirtualRedirector.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualRedirector.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualRedirector.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualredirectorHPP
 #define VirtualredirectorHPP
diff --git a/Source/hpp/Win64/Debug/VirtualResources.hpp b/Source/hpp/Win64/Debug/VirtualResources.hpp
index 0bfa693..570a628 100644
--- a/Source/hpp/Win64/Debug/VirtualResources.hpp
+++ b/Source/hpp/Win64/Debug/VirtualResources.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualResources.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualResources.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualresourcesHPP
 #define VirtualresourcesHPP
diff --git a/Source/hpp/Win64/Debug/VirtualScrollbars.hpp b/Source/hpp/Win64/Debug/VirtualScrollbars.hpp
index 9112a77..bc81db8 100644
--- a/Source/hpp/Win64/Debug/VirtualScrollbars.hpp
+++ b/Source/hpp/Win64/Debug/VirtualScrollbars.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualScrollbars.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualScrollbars.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualscrollbarsHPP
 #define VirtualscrollbarsHPP
diff --git a/Source/hpp/Win64/Debug/VirtualSendToMenu.hpp b/Source/hpp/Win64/Debug/VirtualSendToMenu.hpp
index dcee1e8..87d7aee 100644
--- a/Source/hpp/Win64/Debug/VirtualSendToMenu.hpp
+++ b/Source/hpp/Win64/Debug/VirtualSendToMenu.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualSendToMenu.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualSendToMenu.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualsendtomenuHPP
 #define VirtualsendtomenuHPP
diff --git a/Source/hpp/Win64/Debug/VirtualShellAutoComplete.hpp b/Source/hpp/Win64/Debug/VirtualShellAutoComplete.hpp
index fb4572c..109a031 100644
--- a/Source/hpp/Win64/Debug/VirtualShellAutoComplete.hpp
+++ b/Source/hpp/Win64/Debug/VirtualShellAutoComplete.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualShellAutoComplete.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualShellAutoComplete.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualshellautocompleteHPP
 #define VirtualshellautocompleteHPP
diff --git a/Source/hpp/Win64/Debug/VirtualShellHistory.hpp b/Source/hpp/Win64/Debug/VirtualShellHistory.hpp
index 1a9d5fd..bb780ac 100644
--- a/Source/hpp/Win64/Debug/VirtualShellHistory.hpp
+++ b/Source/hpp/Win64/Debug/VirtualShellHistory.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualShellHistory.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualShellHistory.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualshellhistoryHPP
 #define VirtualshellhistoryHPP
diff --git a/Source/hpp/Win64/Debug/VirtualShellNewMenu.hpp b/Source/hpp/Win64/Debug/VirtualShellNewMenu.hpp
index 3951bc4..c64ff17 100644
--- a/Source/hpp/Win64/Debug/VirtualShellNewMenu.hpp
+++ b/Source/hpp/Win64/Debug/VirtualShellNewMenu.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualShellNewMenu.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualShellNewMenu.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualshellnewmenuHPP
 #define VirtualshellnewmenuHPP
diff --git a/Source/hpp/Win64/Debug/VirtualShellNotifier.hpp b/Source/hpp/Win64/Debug/VirtualShellNotifier.hpp
index 3a48077..a44a248 100644
--- a/Source/hpp/Win64/Debug/VirtualShellNotifier.hpp
+++ b/Source/hpp/Win64/Debug/VirtualShellNotifier.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualShellNotifier.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualShellNotifier.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualshellnotifierHPP
 #define VirtualshellnotifierHPP
diff --git a/Source/hpp/Win64/Debug/VirtualShellToolBar.hpp b/Source/hpp/Win64/Debug/VirtualShellToolBar.hpp
index 0c73989..51b3e52 100644
--- a/Source/hpp/Win64/Debug/VirtualShellToolBar.hpp
+++ b/Source/hpp/Win64/Debug/VirtualShellToolBar.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualShellToolBar.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualShellToolBar.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualshelltoolbarHPP
 #define VirtualshelltoolbarHPP
diff --git a/Source/hpp/Win64/Debug/VirtualShellToolsD.hpp b/Source/hpp/Win64/Debug/VirtualShellToolsD.hpp
index d993181..2ad49b3 100644
--- a/Source/hpp/Win64/Debug/VirtualShellToolsD.hpp
+++ b/Source/hpp/Win64/Debug/VirtualShellToolsD.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualShellToolsD.dpk' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualShellToolsD.dpk' rev: 32.00 (Windows)
 
 #ifndef VirtualshelltoolsdHPP
 #define VirtualshelltoolsdHPP
@@ -140,8 +140,8 @@
 #include <VirtualTrees.WorkerThread.hpp>	// (VirtualTreesDR)
 #include <VirtualTrees.ClipBoard.hpp>	// (VirtualTreesDR)
 #include <VirtualTrees.Utils.hpp>	// (VirtualTreesDR)
-#include <VTHeaderPopup.hpp>	// (VirtualTreesDR)
 #include <VirtualTrees.Export.hpp>	// (VirtualTreesDR)
+#include <VTHeaderPopup.hpp>	// (VirtualTreesDR)
 #include <VirtualTrees.hpp>	// (VirtualTreesDR)
 #include <EasyLVResources.hpp>	// (EasyListviewD)
 #include <EasyTaskPanelForm.hpp>	// (EasyListviewD)
@@ -149,6 +149,11 @@
 #include <EasyListview.hpp>	// (EasyListviewD)
 #include <Vcl.Imaging.JConsts.hpp>	// (vclimg)
 #include <Vcl.Imaging.jpeg.hpp>	// (vclimg)
+// SO_SFX: 250
+// PRG_EXT: .bpl
+// BPI_DIR: C:\Users\Public\Documents\Embarcadero\Studio\19.0\Dcp\Win64
+// OBJ_DIR: C:\Users\Public\Documents\Embarcadero\Studio\19.0\Dcp\Win64
+// OBJ_EXT: .o
 
 //-- user supplied -----------------------------------------------------------
 
diff --git a/Source/hpp/Win64/Debug/VirtualThumbnails.hpp b/Source/hpp/Win64/Debug/VirtualThumbnails.hpp
index c617109..03e9e7a 100644
--- a/Source/hpp/Win64/Debug/VirtualThumbnails.hpp
+++ b/Source/hpp/Win64/Debug/VirtualThumbnails.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualThumbnails.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualThumbnails.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualthumbnailsHPP
 #define VirtualthumbnailsHPP
diff --git a/Source/hpp/Win64/Release/AppletsAndWizards.hpp b/Source/hpp/Win64/Release/AppletsAndWizards.hpp
index 002f0ab..c2449bd 100644
--- a/Source/hpp/Win64/Release/AppletsAndWizards.hpp
+++ b/Source/hpp/Win64/Release/AppletsAndWizards.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'AppletsAndWizards.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'AppletsAndWizards.pas' rev: 32.00 (Windows)
 
 #ifndef AppletsandwizardsHPP
 #define AppletsandwizardsHPP
diff --git a/Source/hpp/Win64/Release/ColumnForm.hpp b/Source/hpp/Win64/Release/ColumnForm.hpp
index 4491e60..68dd577 100644
--- a/Source/hpp/Win64/Release/ColumnForm.hpp
+++ b/Source/hpp/Win64/Release/ColumnForm.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'ColumnForm.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'ColumnForm.pas' rev: 32.00 (Windows)
 
 #ifndef ColumnformHPP
 #define ColumnformHPP
diff --git a/Source/hpp/Win64/Release/VirtualCommandLine.hpp b/Source/hpp/Win64/Release/VirtualCommandLine.hpp
index 7aa3d40..95c8504 100644
--- a/Source/hpp/Win64/Release/VirtualCommandLine.hpp
+++ b/Source/hpp/Win64/Release/VirtualCommandLine.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualCommandLine.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualCommandLine.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualcommandlineHPP
 #define VirtualcommandlineHPP
diff --git a/Source/hpp/Win64/Release/VirtualExplorerEasyListModeview.hpp b/Source/hpp/Win64/Release/VirtualExplorerEasyListModeview.hpp
index 6753f8e..5bc9f7c 100644
--- a/Source/hpp/Win64/Release/VirtualExplorerEasyListModeview.hpp
+++ b/Source/hpp/Win64/Release/VirtualExplorerEasyListModeview.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualExplorerEasyListModeview.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualExplorerEasyListModeview.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualexplorereasylistmodeviewHPP
 #define VirtualexplorereasylistmodeviewHPP
diff --git a/Source/hpp/Win64/Release/VirtualExplorerEasyListview.hpp b/Source/hpp/Win64/Release/VirtualExplorerEasyListview.hpp
index cc3bdd5..11bf99e 100644
--- a/Source/hpp/Win64/Release/VirtualExplorerEasyListview.hpp
+++ b/Source/hpp/Win64/Release/VirtualExplorerEasyListview.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualExplorerEasyListview.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualExplorerEasyListview.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualexplorereasylistviewHPP
 #define VirtualexplorereasylistviewHPP
diff --git a/Source/hpp/Win64/Release/VirtualExplorerTree.hpp b/Source/hpp/Win64/Release/VirtualExplorerTree.hpp
index 3db0525..7d498af 100644
--- a/Source/hpp/Win64/Release/VirtualExplorerTree.hpp
+++ b/Source/hpp/Win64/Release/VirtualExplorerTree.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualExplorerTree.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualExplorerTree.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualexplorertreeHPP
 #define VirtualexplorertreeHPP
diff --git a/Source/hpp/Win64/Release/VirtualFileSearch.hpp b/Source/hpp/Win64/Release/VirtualFileSearch.hpp
index 63b9f28..787024f 100644
--- a/Source/hpp/Win64/Release/VirtualFileSearch.hpp
+++ b/Source/hpp/Win64/Release/VirtualFileSearch.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualFileSearch.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualFileSearch.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualfilesearchHPP
 #define VirtualfilesearchHPP
diff --git a/Source/hpp/Win64/Release/VirtualRedirector.hpp b/Source/hpp/Win64/Release/VirtualRedirector.hpp
index ab519e4..cdc28ea 100644
--- a/Source/hpp/Win64/Release/VirtualRedirector.hpp
+++ b/Source/hpp/Win64/Release/VirtualRedirector.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualRedirector.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualRedirector.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualredirectorHPP
 #define VirtualredirectorHPP
diff --git a/Source/hpp/Win64/Release/VirtualResources.hpp b/Source/hpp/Win64/Release/VirtualResources.hpp
index 0bfa693..570a628 100644
--- a/Source/hpp/Win64/Release/VirtualResources.hpp
+++ b/Source/hpp/Win64/Release/VirtualResources.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualResources.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualResources.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualresourcesHPP
 #define VirtualresourcesHPP
diff --git a/Source/hpp/Win64/Release/VirtualScrollbars.hpp b/Source/hpp/Win64/Release/VirtualScrollbars.hpp
index 9112a77..bc81db8 100644
--- a/Source/hpp/Win64/Release/VirtualScrollbars.hpp
+++ b/Source/hpp/Win64/Release/VirtualScrollbars.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualScrollbars.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualScrollbars.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualscrollbarsHPP
 #define VirtualscrollbarsHPP
diff --git a/Source/hpp/Win64/Release/VirtualSendToMenu.hpp b/Source/hpp/Win64/Release/VirtualSendToMenu.hpp
index dcee1e8..87d7aee 100644
--- a/Source/hpp/Win64/Release/VirtualSendToMenu.hpp
+++ b/Source/hpp/Win64/Release/VirtualSendToMenu.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualSendToMenu.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualSendToMenu.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualsendtomenuHPP
 #define VirtualsendtomenuHPP
diff --git a/Source/hpp/Win64/Release/VirtualShellAutoComplete.hpp b/Source/hpp/Win64/Release/VirtualShellAutoComplete.hpp
index fb4572c..109a031 100644
--- a/Source/hpp/Win64/Release/VirtualShellAutoComplete.hpp
+++ b/Source/hpp/Win64/Release/VirtualShellAutoComplete.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualShellAutoComplete.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualShellAutoComplete.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualshellautocompleteHPP
 #define VirtualshellautocompleteHPP
diff --git a/Source/hpp/Win64/Release/VirtualShellHistory.hpp b/Source/hpp/Win64/Release/VirtualShellHistory.hpp
index 1a9d5fd..bb780ac 100644
--- a/Source/hpp/Win64/Release/VirtualShellHistory.hpp
+++ b/Source/hpp/Win64/Release/VirtualShellHistory.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualShellHistory.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualShellHistory.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualshellhistoryHPP
 #define VirtualshellhistoryHPP
diff --git a/Source/hpp/Win64/Release/VirtualShellNewMenu.hpp b/Source/hpp/Win64/Release/VirtualShellNewMenu.hpp
index 3951bc4..c64ff17 100644
--- a/Source/hpp/Win64/Release/VirtualShellNewMenu.hpp
+++ b/Source/hpp/Win64/Release/VirtualShellNewMenu.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualShellNewMenu.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualShellNewMenu.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualshellnewmenuHPP
 #define VirtualshellnewmenuHPP
diff --git a/Source/hpp/Win64/Release/VirtualShellNotifier.hpp b/Source/hpp/Win64/Release/VirtualShellNotifier.hpp
index 3a48077..a44a248 100644
--- a/Source/hpp/Win64/Release/VirtualShellNotifier.hpp
+++ b/Source/hpp/Win64/Release/VirtualShellNotifier.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualShellNotifier.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualShellNotifier.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualshellnotifierHPP
 #define VirtualshellnotifierHPP
diff --git a/Source/hpp/Win64/Release/VirtualShellToolBar.hpp b/Source/hpp/Win64/Release/VirtualShellToolBar.hpp
index 0c73989..51b3e52 100644
--- a/Source/hpp/Win64/Release/VirtualShellToolBar.hpp
+++ b/Source/hpp/Win64/Release/VirtualShellToolBar.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualShellToolBar.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualShellToolBar.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualshelltoolbarHPP
 #define VirtualshelltoolbarHPP
diff --git a/Source/hpp/Win64/Release/VirtualShellToolsD.hpp b/Source/hpp/Win64/Release/VirtualShellToolsD.hpp
index d993181..2ad49b3 100644
--- a/Source/hpp/Win64/Release/VirtualShellToolsD.hpp
+++ b/Source/hpp/Win64/Release/VirtualShellToolsD.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualShellToolsD.dpk' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualShellToolsD.dpk' rev: 32.00 (Windows)
 
 #ifndef VirtualshelltoolsdHPP
 #define VirtualshelltoolsdHPP
@@ -140,8 +140,8 @@
 #include <VirtualTrees.WorkerThread.hpp>	// (VirtualTreesDR)
 #include <VirtualTrees.ClipBoard.hpp>	// (VirtualTreesDR)
 #include <VirtualTrees.Utils.hpp>	// (VirtualTreesDR)
-#include <VTHeaderPopup.hpp>	// (VirtualTreesDR)
 #include <VirtualTrees.Export.hpp>	// (VirtualTreesDR)
+#include <VTHeaderPopup.hpp>	// (VirtualTreesDR)
 #include <VirtualTrees.hpp>	// (VirtualTreesDR)
 #include <EasyLVResources.hpp>	// (EasyListviewD)
 #include <EasyTaskPanelForm.hpp>	// (EasyListviewD)
@@ -149,6 +149,11 @@
 #include <EasyListview.hpp>	// (EasyListviewD)
 #include <Vcl.Imaging.JConsts.hpp>	// (vclimg)
 #include <Vcl.Imaging.jpeg.hpp>	// (vclimg)
+// SO_SFX: 250
+// PRG_EXT: .bpl
+// BPI_DIR: C:\Users\Public\Documents\Embarcadero\Studio\19.0\Dcp\Win64
+// OBJ_DIR: C:\Users\Public\Documents\Embarcadero\Studio\19.0\Dcp\Win64
+// OBJ_EXT: .o
 
 //-- user supplied -----------------------------------------------------------
 
diff --git a/Source/hpp/Win64/Release/VirtualThumbnails.hpp b/Source/hpp/Win64/Release/VirtualThumbnails.hpp
index c617109..03e9e7a 100644
--- a/Source/hpp/Win64/Release/VirtualThumbnails.hpp
+++ b/Source/hpp/Win64/Release/VirtualThumbnails.hpp
@@ -2,7 +2,7 @@
 // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
 // All rights reserved
 
-// (DO NOT EDIT: machine generated header) 'VirtualThumbnails.pas' rev: 31.00 (Windows)
+// (DO NOT EDIT: machine generated header) 'VirtualThumbnails.pas' rev: 32.00 (Windows)
 
 #ifndef VirtualthumbnailsHPP
 #define VirtualthumbnailsHPP