diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs
index b08a39f5d9..d72307a8a1 100644
--- a/src/Setup/Files.wxs
+++ b/src/Setup/Files.wxs
@@ -446,36 +446,36 @@
 										<File Source="..\..\bin\Tools\PartCover\PartCover.CorDriver.dll" Id="PartCover.CorDriver.dll" Name="PartCover.CorDriver.dll" KeyPath="yes" />
 										<RegistryValue Id="PartCoverCorDriverRegistryAppIdGuid" Root="HKCR" Type="string" Key="AppId\7D0E6AAB-C5FC-4103-AAD4-8BF3112A56C4" Value="PartCoverCorDriver" />
 										<RegistryValue Id="PartCoverCorDriverRegistryAppIdDriverDll" Root="HKCR" Type="string" Key="AppId\PartCoverCorDriver.DLL" Name="AppId" Value="7D0E6AAB-C5FC-4103-AAD4-8BF3112A56C4" />
-										<RegistryValue Id="PartCoverCorDriverRegistryClsIdGuid" Root="HKCR" Type="string" Key="CLSID\{6F6225EA-0897-41fa-B1EF-8B4D3E15325E}" Value="PartCoverConnector Object" />
-										<RegistryValue Id="PartCoverCorDriverRegistryClsIdGuidAppId" Root="HKCR" Type="string" Key="CLSID\{6F6225EA-0897-41fa-B1EF-8B4D3E15325E}" Name="AppId" Value="7D0E6AAB-C5FC-4103-AAD4-8BF3112A56C4" />
-										<RegistryValue Id="PartCoverCorDriverRegistryClsIdGuidInProcServer" Root="HKCR" Type="string" Key="CLSID\{6F6225EA-0897-41fa-B1EF-8B4D3E15325E}\InProcServer32" Value="[#PartCover.CorDriver.dll]" />
-										<RegistryValue Id="PartCoverCorDriverRegistryClsIdGuidInProcServerThreadingModel" Root="HKCR" Type="string" Key="CLSID\{6F6225EA-0897-41fa-B1EF-8B4D3E15325E}\InProcServer32" Name="ThreadingModel" Value="both" />
-										<RegistryValue Id="PartCoverCorDriverRegistryClsIdGuidProgID" Root="HKCR" Type="string" Key="CLSID\{6F6225EA-0897-41fa-B1EF-8B4D3E15325E}\ProgID" Value="PartCover.CorDriver.Connector.2" />
-										<RegistryValue Id="PartCoverCorDriverRegistryClsIdGuidProgrammable" Root="HKCR" Type="string" Key="CLSID\{6F6225EA-0897-41fa-B1EF-8B4D3E15325E}\Programmable" Value=" " />
-										<RegistryValue Id="PartCoverCorDriverRegistryClsIdGuidTypeLib" Root="HKCR" Type="string" Key="CLSID\{6F6225EA-0897-41fa-B1EF-8B4D3E15325E}\TypeLib" Value="{7D0E6AAB-C5FC-4103-AAD4-8BF3112A56C4}" />
-										<RegistryValue Id="PartCoverCorDriverRegistryClsIdGuidVersionIndependentProgID" Root="HKCR" Type="string" Key="CLSID\{6F6225EA-0897-41fa-B1EF-8B4D3E15325E}\VersionIndependentProgID" Value="PartCover.CorDriver.Connector" />
-										<RegistryValue Id="PartCoverCorProfilerRegistryClsIdGuid" Root="HKCR" Type="string" Key="CLSID\{717FF691-2ADF-4ac0-985F-1DD3C42FDF90}" Value="CorProfiler Object" />
-										<RegistryValue Id="PartCoverCorProfilerRegistryClsIdGuidAppId" Root="HKCR" Type="string" Key="CLSID\{717FF691-2ADF-4ac0-985F-1DD3C42FDF90}\AppId" Value="7D0E6AAB-C5FC-4103-AAD4-8BF3112A56C4" />
-										<RegistryValue Id="PartCoverCorProfilerRegistryClsIdGuidInprocServer32" Root="HKCR" Type="string" Key="CLSID\{717FF691-2ADF-4ac0-985F-1DD3C42FDF90}\InprocServer32" Value="[#PartCover.CorDriver.dll]" />
-										<RegistryValue Id="PartCoverCorProfilerRegistryClsIdGuidInprocServer32ThreadingModel" Root="HKCR" Type="string" Key="CLSID\{717FF691-2ADF-4ac0-985F-1DD3C42FDF90}\InprocServer32" Name="ThreadingModel" Value="both" />
-										<RegistryValue Id="PartCoverCorProfilerRegistryClsIdGuidProgId" Root="HKCR" Type="string" Key="CLSID\{717FF691-2ADF-4ac0-985F-1DD3C42FDF90}\ProgId" Value="PartCover.CorDriver.CorProfiler.2" />
-										<RegistryValue Id="PartCoverCorProfilerRegistryClsIdGuidProgrammable" Root="HKCR" Type="string" Key="CLSID\{717FF691-2ADF-4ac0-985F-1DD3C42FDF90}\Programmable" Value=" " />
-										<RegistryValue Id="PartCoverCorProfilerRegistryClsIdGuidTypeLib" Root="HKCR" Type="string" Key="CLSID\{717FF691-2ADF-4ac0-985F-1DD3C42FDF90}\TypeLib" Value="{7D0E6AAB-C5FC-4103-AAD4-8BF3112A56C4}" />
-										<RegistryValue Id="PartCoverCorProfilerRegistryClsIdGuidVersionIndependentProgID" Root="HKCR" Type="string" Key="CLSID\{717FF691-2ADF-4ac0-985F-1DD3C42FDF90}\VersionIndependentProgID" Value="PartCover.CorDriver.CorProfiler" />
-										<RegistryValue Id="PartCoverCorConnectorRegistry" Root="HKCR" Type="string" Key="PartCover.CorDriver.Connector" Value="PartCoverConnector Object" />
-										<RegistryValue Id="PartCoverCorConnectorRegistryClsId" Root="HKCR" Type="string" Key="PartCover.CorDriver.Connector\CLSID" Value="{6F6225EA-0897-41fa-B1EF-8B4D3E15325E}" />
-										<RegistryValue Id="PartCoverCorConnectorRegistryCurVer" Root="HKCR" Type="string" Key="PartCover.CorDriver.Connector\CurVer" Value="PartCover.CorDriver.Connector.2" />
-										<RegistryValue Id="PartCoverCorConnectorRegistry2" Root="HKCR" Type="string" Key="PartCover.CorDriver.Connector.2" Value="PartCoverConnector Object" />
-										<RegistryValue Id="PartCoverCorConnectorRegistry2ClsId" Root="HKCR" Type="string" Key="PartCover.CorDriver.Connector.2\CLSID" Value="{6F6225EA-0897-41fa-B1EF-8B4D3E15325E}" />
+										<RegistryValue Id="PartCoverCorDriverRegistryClsIdGuid" Root="HKCR" Type="string" Key="CLSID\{717FF691-2ADF-4AC0-985F-1DD3C42FDF90}" Value="CorProfiler Object" />
+										<RegistryValue Id="PartCoverCorDriverRegistryClsIdGuidAppId" Root="HKCR" Type="string" Key="CLSID\{717FF691-2ADF-4AC0-985F-1DD3C42FDF90}" Name="AppId" Value="7D0E6AAB-C5FC-4103-AAD4-8BF3112A56C4" />
+										<RegistryValue Id="PartCoverCorDriverRegistryClsIdGuidInProcServer" Root="HKCR" Type="string" Key="CLSID\{717FF691-2ADF-4AC0-985F-1DD3C42FDF90}\InProcServer32" Value="[#PartCover.CorDriver.dll]" />
+										<RegistryValue Id="PartCoverCorDriverRegistryClsIdGuidInProcServerThreadingModel" Root="HKCR" Type="string" Key="CLSID\{717FF691-2ADF-4AC0-985F-1DD3C42FDF90}\InProcServer32" Name="ThreadingModel" Value="both" />
+										<RegistryValue Id="PartCoverCorDriverRegistryClsIdGuidProgID" Root="HKCR" Type="string" Key="CLSID\{717FF691-2ADF-4AC0-985F-1DD3C42FDF90}\ProgID" Value="PartCover.CorDriver.CorProfiler.2" />
+										<RegistryValue Id="PartCoverCorDriverRegistryClsIdGuidProgrammable" Root="HKCR" Type="string" Key="CLSID\{717FF691-2ADF-4AC0-985F-1DD3C42FDF90}\Programmable" Value="" />
+										<RegistryValue Id="PartCoverCorDriverRegistryClsIdGuidTypeLib" Root="HKCR" Type="string" Key="CLSID\{717FF691-2ADF-4AC0-985F-1DD3C42FDF90}\TypeLib" Value="{7D0E6AAB-C5FC-4103-AAD4-8BF3112A56C4}" />
+										<RegistryValue Id="PartCoverCorDriverRegistryClsIdGuidVersionIndependentProgID" Root="HKCR" Type="string" Key="CLSID\{717FF691-2ADF-4AC0-985F-1DD3C42FDF90}\VersionIndependentProgID" Value="PartCover.CorDriver.CorProfiler" />
+										<RegistryValue Id="PartCoverCorProfilerRegistryClsIdGuid" Root="HKCR" Type="string" Key="CLSID\{FB20430E-CDC9-45D7-8453-272268002E08}" Value="PartCoverConnector2 Object" />
+										<RegistryValue Id="PartCoverCorProfilerRegistryClsIdGuidAppId" Root="HKCR" Type="string" Key="CLSID\{FB20430E-CDC9-45D7-8453-272268002E08}\AppId" Value="7D0E6AAB-C5FC-4103-AAD4-8BF3112A56C4" />
+										<RegistryValue Id="PartCoverCorProfilerRegistryClsIdGuidInprocServer32" Root="HKCR" Type="string" Key="CLSID\{FB20430E-CDC9-45D7-8453-272268002E08}\InprocServer32" Value="[#PartCover.CorDriver.dll]" />
+										<RegistryValue Id="PartCoverCorProfilerRegistryClsIdGuidInprocServer32ThreadingModel" Root="HKCR" Type="string" Key="CLSID\{FB20430E-CDC9-45D7-8453-272268002E08}\InprocServer32" Name="ThreadingModel" Value="both" />
+										<RegistryValue Id="PartCoverCorProfilerRegistryClsIdGuidProgId" Root="HKCR" Type="string" Key="CLSID\{FB20430E-CDC9-45D7-8453-272268002E08}\ProgId" Value="PartCover.CorDriver.Connector.3" />
+										<RegistryValue Id="PartCoverCorProfilerRegistryClsIdGuidProgrammable" Root="HKCR" Type="string" Key="CLSID\{FB20430E-CDC9-45D7-8453-272268002E08}\Programmable" Value="" />
+										<RegistryValue Id="PartCoverCorProfilerRegistryClsIdGuidTypeLib" Root="HKCR" Type="string" Key="CLSID\{FB20430E-CDC9-45D7-8453-272268002E08}\TypeLib" Value="{7D0E6AAB-C5FC-4103-AAD4-8BF3112A56C4}" />
+										<RegistryValue Id="PartCoverCorProfilerRegistryClsIdGuidVersionIndependentProgID" Root="HKCR" Type="string" Key="CLSID\{FB20430E-CDC9-45D7-8453-272268002E08}\VersionIndependentProgID" Value="PartCover.CorDriver.Connector" />
+										<RegistryValue Id="PartCoverCorConnectorRegistry" Root="HKCR" Type="string" Key="PartCover.CorDriver.Connector" Value="PartCoverConnector2 Object" />
+										<RegistryValue Id="PartCoverCorConnectorRegistryClsId" Root="HKCR" Type="string" Key="PartCover.CorDriver.Connector\CLSID" Value="{FB20430E-CDC9-45D7-8453-272268002E08}" />
+										<RegistryValue Id="PartCoverCorConnectorRegistryCurVer" Root="HKCR" Type="string" Key="PartCover.CorDriver.Connector\CurVer" Value="PartCover.CorDriver.Connector.3" />
+										<RegistryValue Id="PartCoverCorConnectorRegistry3" Root="HKCR" Type="string" Key="PartCover.CorDriver.Connector.3" Value="PartCoverConnector2 Object" />
+										<RegistryValue Id="PartCoverCorConnectorRegistry3ClsId" Root="HKCR" Type="string" Key="PartCover.CorDriver.Connector.3\CLSID" Value="{FB20430E-CDC9-45D7-8453-272268002E08}" />
 										<RegistryValue Id="PartCoverCorProfilerRegistryName" Root="HKCR" Type="string" Key="PartCover.CorDriver.CorProfiler" Value="CorProfiler Object" />
 										<RegistryValue Id="PartCoverCorProfilerRegistryNameClsId" Root="HKCR" Type="string" Key="PartCover.CorDriver.CorProfiler\CLSID" Value="{717FF691-2ADF-4ac0-985F-1DD3C42FDF90}" />
 										<RegistryValue Id="PartCoverCorProfilerRegistryNameCurVer" Root="HKCR" Type="string" Key="PartCover.CorDriver.CorProfiler\CurVer" Value="PartCover.CorDriver.CorProfiler.2" />
 										<RegistryValue Id="PartCoverCorProfilerRegistry2" Root="HKCR" Type="string" Key="PartCover.CorDriver.CorProfiler.2" Value="CorProfiler Object" />
 										<RegistryValue Id="PartCoverCorProfilerRegistry2ClsId" Root="HKCR" Type="string" Key="PartCover.CorDriver.CorProfiler.2\CLSID" Value="{717FF691-2ADF-4ac0-985F-1DD3C42FDF90}" />
-										<RegistryValue Id="PartCoverTypeLibRegistryGuid" Root="HKCR" Type="string" Key="TypeLib\{7D0E6AAB-C5FC-4103-AAD4-8BF3112A56C4}\2.0" Value="PartCover module" />
-										<RegistryValue Id="PartCoverTypeLibRegistryGuidWin32" Root="HKCR" Type="string" Key="TypeLib\{7D0E6AAB-C5FC-4103-AAD4-8BF3112A56C4}\2.0\0\win32" Value="[#PartCover.CorDriver.dll]" />
-										<RegistryValue Id="PartCoverTypeLibRegistryGuidFlags" Root="HKCR" Type="string" Key="TypeLib\{7D0E6AAB-C5FC-4103-AAD4-8BF3112A56C4}\2.0\FLAGS" Value="0" />
-										<RegistryValue Id="PartCoverTypeLibRegistryGuidHelp" Root="HKCR" Type="string" Key="TypeLib\{7D0E6AAB-C5FC-4103-AAD4-8BF3112A56C4}\2.0\HELPDIR" Value=" " />
+										<RegistryValue Id="PartCoverTypeLibRegistryGuid" Root="HKCR" Type="string" Key="TypeLib\{7D0E6AAB-C5FC-4103-AAD4-8BF3112A56C4}\2.1" Value="PartCover module" />
+										<RegistryValue Id="PartCoverTypeLibRegistryGuidWin32" Root="HKCR" Type="string" Key="TypeLib\{7D0E6AAB-C5FC-4103-AAD4-8BF3112A56C4}\2.1\0\win32" Value="[#PartCover.CorDriver.dll]" />
+										<RegistryValue Id="PartCoverTypeLibRegistryGuidFlags" Root="HKCR" Type="string" Key="TypeLib\{7D0E6AAB-C5FC-4103-AAD4-8BF3112A56C4}\2.1\FLAGS" Value="0" />
+										<RegistryValue Id="PartCoverTypeLibRegistryGuidHelp" Root="HKCR" Type="string" Key="TypeLib\{7D0E6AAB-C5FC-4103-AAD4-8BF3112A56C4}\2.1\HELPDIR" Value="" />
 									</Component>
 									<Component Guid="429867BD-2DC0-4934-BED7-70A17978A57C" Id="PartCoverExe" DiskId="1">
 										<File Source="..\..\bin\Tools\PartCover\PartCover.exe" Id="PartCover.exe" Name="PartCover.exe" Assembly=".net" KeyPath="yes" AssemblyApplication="PartCover.exe" AssemblyManifest="PartCover.exe" />