diff --git a/Jenkinsfile b/Jenkinsfile
index 35f0e57..ddaeb86 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -36,24 +36,24 @@ pipeline {
             IO: {
               sleep 3;
                 // Reports lib
-                bat "\"${tool 'MSBuild-15.0'}\" SteamWare.IO\\SteamWare.IO.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /verbosity:minimal /m"
+                bat "\"${tool 'MSBuild-16.0'}\" SteamWare.IO\\SteamWare.IO.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /verbosity:minimal /m"
             },
             LOGGER: {
               sleep 5;
                 // Reports lib
-                bat "\"${tool 'MSBuild-15.0'}\" SteamWare.Logger\\SteamWare.Logger.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /verbosity:minimal /m"
+                bat "\"${tool 'MSBuild-16.0'}\" SteamWare.Logger\\SteamWare.Logger.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /verbosity:minimal /m"
             },
             MAIN_LIB: {
                 // MAIN lib
-                bat "\"${tool 'MSBuild-15.0'}\" SteamWareLib\\SteamWare.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /verbosity:minimal /m"
+                bat "\"${tool 'MSBuild-16.0'}\" SteamWareLib\\SteamWare.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /verbosity:minimal /m"
             },
             REPORTS: {
                 // Reports lib
-                bat "\"${tool 'MSBuild-15.0'}\" SteamWare.Reports\\SteamWare.Reports.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /verbosity:minimal /m"
+                bat "\"${tool 'MSBuild-16.0'}\" SteamWare.Reports\\SteamWare.Reports.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /verbosity:minimal /m"
             },
             SCHEDULER: {
                 // Reports lib
-                bat "\"${tool 'MSBuild-15.0'}\" Steamware.Scheduler\\SteamWare.Scheduler.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /verbosity:minimal /m"
+                bat "\"${tool 'MSBuild-16.0'}\" Steamware.Scheduler\\SteamWare.Scheduler.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /verbosity:minimal /m"
             },
           failFast: false)
          }			
diff --git a/SteamWareLib/SteamWare.csproj b/SteamWareLib/SteamWare.csproj
index 1cbe2b1..5a14294 100644
--- a/SteamWareLib/SteamWare.csproj
+++ b/SteamWareLib/SteamWare.csproj
@@ -68,6 +68,9 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="AegisImplicitMail, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\AIM.1.1.0\lib\netstandard2.0\AegisImplicitMail.dll</HintPath>
+    </Reference>
     <Reference Include="AjaxControlToolkit, Version=20.1.0.0, Culture=neutral, PublicKeyToken=28f01b0e84b6d53e, processorArchitecture=MSIL">
       <HintPath>..\packages\AjaxControlToolkit.20.1.0\lib\net40\AjaxControlToolkit.dll</HintPath>
     </Reference>
@@ -209,12 +212,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ApplicationSimplePage.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="ApplicationUserControl.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
+    <Compile Include="ApplicationSimplePage.cs" />
+    <Compile Include="ApplicationUserControl.cs" />
     <Compile Include="authProxy.cs" />
     <Compile Include="BillingProxy.cs" />
     <Compile Include="calc.cs" />
@@ -297,9 +296,7 @@
     <Compile Include="PasswordHash.cs" />
     <Compile Include="SteamwareStrings.cs" />
     <Compile Include="UpdateMan.cs" />
-    <Compile Include="UserPage.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
+    <Compile Include="UserPage.cs" />
     <Compile Include="pieChart.cs" />
     <Compile Include="Properties\Settings.Designer.cs">
       <AutoGen>True</AutoGen>
@@ -309,9 +306,7 @@
     <Compile Include="selDataVoc.cs" />
     <Compile Include="selettori.cs" />
     <Compile Include="DataType\DatoBarPlot.cs" />
-    <Compile Include="UserControl.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
+    <Compile Include="UserControl.cs" />
     <Compile Include="user_std.cs" />
     <Compile Include="utils.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/SteamWareLib/app.config b/SteamWareLib/app.config
index df5fdef..e00c0a7 100644
--- a/SteamWareLib/app.config
+++ b/SteamWareLib/app.config
@@ -63,7 +63,7 @@
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
             <dependentAssembly>
                 <assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-5.0.0.1" newVersion="5.0.0.1" />
+                <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="SharpCompress" publicKeyToken="afb0a02973931d96" culture="neutral" />
diff --git a/SteamWareLib/packages.config b/SteamWareLib/packages.config
index 302a84d..4a86ac9 100644
--- a/SteamWareLib/packages.config
+++ b/SteamWareLib/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AIM" version="1.1.1" targetFramework="net462" />
+  <package id="AIM" version="1.1.0" targetFramework="net462" />
   <package id="AjaxControlToolkit" version="20.1.0" targetFramework="net462" />
   <package id="Crc32C.NET" version="1.0.5.0" targetFramework="net462" />
   <package id="DnsClient" version="1.6.0" targetFramework="net462" />
diff --git a/SteamWareLib/utils.cs b/SteamWareLib/utils.cs
index 74c9b2e..d56262c 100644
--- a/SteamWareLib/utils.cs
+++ b/SteamWareLib/utils.cs
@@ -1,4 +1,5 @@
 using AegisImplicitMail;
+using System.Net.Mail;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -7,7 +8,6 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Net;
-using System.Net.Mail;
 using System.Net.Sockets;
 using System.Runtime.InteropServices;
 using System.Security.Cryptography;
diff --git a/TestBench/App.config b/TestBench/App.config
index 6f66d97..d10539f 100644
--- a/TestBench/App.config
+++ b/TestBench/App.config
@@ -56,7 +56,7 @@
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-5.0.0.1" newVersion="5.0.0.1" />
+                <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />