diff --git a/Directory.Build.targets b/Directory.Build.targets
index e005fc7d4d6793d0e591650934a9d8a103390249..ff3cd346ec395300e60c8f96e00c22f7365d262d 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -10,8 +10,27 @@
 	<!--<Target Name="BeforeBuild">
 		<Message Text="Compiling the program in $(Configuration) Configuration" Importance="high" />
 	</Target>-->
+	<!-- msbuild VECTO.sln -target:CustomClean -->
+	<Target Name="CustomClean" >
+		<Message Text="Removing old files" Importance="high" />
+		<RemoveDir Directories="$(SolutionDir)VECTO\bin\" />
+		<RemoveDir Directories="$(SolutionDir)HashingTool\bin\" />
+		<RemoveDir Directories="$(SolutionDir)HashingCmd\bin\" />
+		<RemoveDir Directories="$(SolutionDir)VectoConsole\bin\" />
+		<RemoveDir Directories="$(SolutionDir)VECTO\bin\" />
+		<RemoveDir Directories="$(SolutionDir)VECTO3GUI2020\bin\" />
+		<RemoveDir Directories="$(SolutionDir)VECTO3GUI2020\bin\" />
 
-	<Target Name="AfterBuild" Condition="('$(Configuration)'=='Deploy') Or ('$(Configuration)' == 'MockupDeploy')">
+		<RemoveDir Directories="$(SolutionDir)Tools\VECTOConsoleStart\bin\" />
+		<RemoveDir Directories="$(SolutionDir)Tools\VECTOMultistageStart\bin\" />
+		<RemoveDir Directories="$(SolutionDir)Tools\VECTOStart\bin\" />
+		<RemoveDir Directories="$(SolutionDir)VectoCore\VectoCore\bin\" />
+		<RemoveDir Directories="$(SolutionDir)VectoCommon\VectoCommon\bin\"/>
+		<RemoveDir Directories="$(SolutionDir)VectoCommon\VectoHashing\bin\"/>
+		<RemoveDir Directories="$(SolutionDir)VectoMockup\VectoMockup\bin\"/>
+	</Target>
+
+	<Target Name="Packaging" AfterTargets="DispatchToInnerBuilds" Condition="('$(Configuration)'=='Deploy') Or ('$(Configuration)' == 'MockupDeploy')">
 		<Message Text="Packaging in $(Configuration) Configuration" Importance="high" />
 		<Exec Command="cscript &quot;$(SolutionDir)documentation\user manual source\convertpptxtopdf.vbs&quot; &quot;$(SolutionDir)documentation\user manual source\release notes vecto3.x.pptx&quot; &quot;$(SolutionDir)documentation\user manual source\release notes vecto3.x.pdf&quot;"/>
 		<PropertyGroup>
@@ -103,9 +122,9 @@
 			<VectoCommandLineRuntimes Include="$(SolutionDir)VectoConsole\bin\Release\net6.0\runtimes\**\*.*"/>
 			<HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net6.0\hashingcmd.*" Exclude="*.dev.json"/>
 			<HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net6.0\*.dll"/>
-			<HashingToolRuntimes Include="$(SolutionDir)HashingCmd\bin\Release\net6.0\runtimes\**\*.*"/>
-			<HashingTool Include="$(SolutionDir)HashingTool\bin\Release\net6.0\*.exe"/>
-			<HashingTool Include="$(SolutionDir)HashingTool\bin\Release\net6.0\*.dll*"/>
+			<HashingToolRuntimes Include="$(SolutionDir)HashingCmd\bin\Release\net6.0-windows\runtimes\**\*.*"/>
+			<HashingTool Include="$(SolutionDir)HashingTool\bin\Release\net6.0-windows\*.exe"/>
+			<HashingTool Include="$(SolutionDir)HashingTool\bin\Release\net6.0-windows\*.dll*"/>
 			<HashingToolRuntimes  Include="$(SolutionDir)HashingTool\bin\Release\net6.0\runtimes\**\*.*"/>
 			<VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\net6.0-windows\VECTOMultistage.*" Exclude="*.dev.json"/>
 			<VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\net6.0-windows\*.dll"/>
@@ -125,9 +144,9 @@
 			<HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net6.0\hashingcmd.*" Exclude="*.dev.json"/>
 			<HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net6.0\*.dll"/>
 			<HashingToolRuntimes Include="$(SolutionDir)HashingCmd\bin\Release\net6.0\runtimes\**\*.*"/>
-			<HashingTool Include="$(SolutionDir)HashingTool\bin\Release\net6.0\*.exe"/>
-			<HashingTool Include="$(SolutionDir)HashingTool\bin\Release\net6.0\*.dll*"/>
-			<HashingToolRuntimes  Include="$(SolutionDir)HashingTool\bin\Release\net6.0\runtimes\**\*.*"/>
+			<HashingTool Include="$(SolutionDir)HashingTool\bin\Release\net6.0-windows\*.exe"/>
+			<HashingTool Include="$(SolutionDir)HashingTool\bin\Release\net6.0-windows\*.dll*"/>
+			<HashingToolRuntimes  Include="$(SolutionDir)HashingTool\bin\Release\net6.0-windows\runtimes\**\*.*"/>
 			<VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\MockupRelease\net6.0-windows\VECTOMultistage.*" Exclude="*.dev.json"/>
 			<VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\MockupRelease\net6.0-windows\*.dll"/>
 			<VectoMultistageRuntimes Include="$(SolutionDir)VECTO3GUI2020\bin\MockupRelease\net6.0-windows\runtimes\**\*.*"/>
@@ -142,7 +161,15 @@
 		<Copy SourceFiles="@(VectoCommandLineRuntimes)" DestinationFiles="@(VectoCommandLineRuntimes->'$(DeployPath)net60\runtimes\%(RecursiveDir)%(Filename)%(Extension)')"/>
 		<Copy SourceFiles="@(VectoRuntimes)" DestinationFiles="@(VectoRuntimes->'$(DeployPath)net60\runtimes\%(RecursiveDir)%(Filename)%(Extension)')"/>
 
-		<ItemGroup>
+		<ItemGroup Condition="'$(Configuration)'=='Deploy'">
+			<!-- All files for the VECTO starters -->
+			<VectoStart Include="$(SolutionDir)Tools\VECTOStart\bin\Deploy\net45\VECTO.exe" />
+			<VectoStart Include="$(SolutionDir)Tools\VECTOMultistageStart\bin\Release\net45\VECTOMultistage.exe" />
+			<VectoStart Include="$(SolutionDir)Tools\HashingCmdStart\bin\Release\net45\hashingcmd.exe" />
+			<VectoStart Include="$(SolutionDir)Tools\HashingToolStart\bin\Release\net45\HashingTool.exe" />
+			<VectoStart Include="$(SolutionDir)Tools\VECTOConsoleStart\bin\Release\net45\vectocmd.exe" />
+		</ItemGroup>
+		<ItemGroup Condition="'$(Configuration)'=='MockupDeploy'">
 			<!-- All files for the VECTO starters -->
 			<VectoStart Include="$(SolutionDir)Tools\VECTOStart\bin\MockupDeploy\net45\VECTO.exe" />
 			<VectoStart Include="$(SolutionDir)Tools\VECTOMultistageStart\bin\Release\net45\VECTOMultistage.exe" />
diff --git a/VECTO.sln b/VECTO.sln
index 752a6b242006956c36bd2902835decd8203e6c72..cdc2fed5e6dfbbc2cf61f6eaae1c7250f583b603 100644
--- a/VECTO.sln
+++ b/VECTO.sln
@@ -382,8 +382,8 @@ Global
 		{D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
 		{D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.Deploy|Any CPU.Build.0 = Release|Any CPU
-		{D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.MockupDebug|Any CPU.ActiveCfg = MockupDebug|Any CPU
-		{D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.MockupDebug|Any CPU.Build.0 = MockupDebug|Any CPU
+		{D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU
 		{D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.MockupDeploy|Any CPU.ActiveCfg = Release|Any CPU
 		{D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.MockupDeploy|Any CPU.Build.0 = Release|Any CPU
 		{D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj
index a687e85b02e701ec060d85fca62a66466be646fd..010d6591e16210e0c6b0a995a951a970b4175ae9 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -49,12 +49,12 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0-windows'">
-	<PackageReference Include="System.Data.SqlClient">
-	  <Version>4.8.3</Version>
-	</PackageReference>
-	<PackageReference Include="System.Windows.Forms.DataVisualization">
-	  <Version>1.0.0-prerelease.20110.1</Version>
-	</PackageReference>
+		<PackageReference Include="System.Data.SqlClient">
+		  <Version>4.8.3</Version>
+		</PackageReference>
+		<PackageReference Include="System.Windows.Forms.DataVisualization">
+		  <Version>1.0.0-prerelease.20110.1</Version>
+		</PackageReference>
 	</ItemGroup>
 
 	<Choose>
diff --git a/VECTO3GUI2020/VECTO3GUI2020.csproj b/VECTO3GUI2020/VECTO3GUI2020.csproj
index 0659efb3d7d736d2b94a0ea813cc362fe5216b06..c76a66d831042dcae4217c022a706c1a0b22f757 100644
--- a/VECTO3GUI2020/VECTO3GUI2020.csproj
+++ b/VECTO3GUI2020/VECTO3GUI2020.csproj
@@ -10,7 +10,7 @@
     <UseWPF>true</UseWPF>
     <UseWindowsForms>true</UseWindowsForms>
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
-    <TargetFrameworks>net48;net60-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0-windows</TargetFrameworks>
     <DefineConstants />
     <Configurations>Debug;Release;MockupDebug;MockupRelease</Configurations>
 </PropertyGroup>
@@ -23,7 +23,7 @@
 	<PropertyGroup Condition="('$(Configuration)' == 'MockupRelease') Or ('$(Configuration)' == 'MockupDebug')">
 		<DefineConstants>$(DefineConstants);MOCKUP</DefineConstants>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupDebug|net60-windows|AnyCPU'">
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupDebug|net6.0-windows|AnyCPU'">
 	  <DebugType>full</DebugType>
 	</PropertyGroup>