diff --git a/Myrtille.Admin.Services/App.config b/Myrtille.Admin.Services/App.config
index 79441d9..c1231ec 100644
--- a/Myrtille.Admin.Services/App.config
+++ b/Myrtille.Admin.Services/App.config
@@ -32,6 +32,6 @@
     </Myrtille.Admin.Services.Properties.Settings>
   </applicationSettings>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
   </startup>
 </configuration>
diff --git a/Myrtille.Admin.Services/Myrtille.Admin.Services.csproj b/Myrtille.Admin.Services/Myrtille.Admin.Services.csproj
index 1c4dc50..5096059 100644
--- a/Myrtille.Admin.Services/Myrtille.Admin.Services.csproj
+++ b/Myrtille.Admin.Services/Myrtille.Admin.Services.csproj
@@ -8,32 +8,21 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>Myrtille.Admin.Services</RootNamespace>
     <AssemblyName>Myrtille.Admin.Services</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>myrtille.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <OutputPath>bin\x64\Release\</OutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Owin, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Owin.4.0.1\lib\net45\Microsoft.Owin.dll</HintPath>
diff --git a/Myrtille.Admin.Web/Myrtille.Admin.Web.csproj b/Myrtille.Admin.Web/Myrtille.Admin.Web.csproj
index d5ffd1e..42b5c8d 100644
--- a/Myrtille.Admin.Web/Myrtille.Admin.Web.csproj
+++ b/Myrtille.Admin.Web/Myrtille.Admin.Web.csproj
@@ -7,12 +7,12 @@
     </ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4E20CD3A-C6F8-4AA6-9678-9E210D71F811}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <ProjectTypeGuids></ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Myrtille.Admin.Web</RootNamespace>
     <AssemblyName>Myrtille.Admin.Web</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <UseIISExpress>false</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
@@ -23,24 +23,6 @@
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -125,6 +107,14 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <OutputPath>bin\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <OutputPath>bin\</OutputPath>
+  </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
@@ -136,7 +126,7 @@
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>50729</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost/Myrtille_microarea_admin</IISUrl>
+          <IISUrl>https://localhost/Myrtille_microarea_admin</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>
diff --git a/Myrtille.Admin.Web/Web.config b/Myrtille.Admin.Web/Web.config
index cf29b75..92e1132 100644
--- a/Myrtille.Admin.Web/Web.config
+++ b/Myrtille.Admin.Web/Web.config
@@ -6,7 +6,7 @@
     </sectionGroup>
   </configSections>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
   </startup>
   <applicationSettings>
     <Myrtille.Admin.Web.Properties.Settings>
@@ -16,7 +16,7 @@
     </Myrtille.Admin.Web.Properties.Settings>
   </applicationSettings>
   <system.web>
-    <compilation debug="true" targetFramework="4.5"/>
-    <httpRuntime targetFramework="4.5"/>
+    <compilation debug="true" targetFramework="4.6.2"/>
+    <httpRuntime targetFramework="4.6.2"/>
   </system.web>
 </configuration>
\ No newline at end of file
diff --git a/Myrtille.Common/Myrtille.Common.csproj b/Myrtille.Common/Myrtille.Common.csproj
index a6b8176..3dbb4cb 100644
--- a/Myrtille.Common/Myrtille.Common.csproj
+++ b/Myrtille.Common/Myrtille.Common.csproj
@@ -15,7 +15,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>http://localhost/Common/</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Web</InstallFrom>
@@ -33,28 +33,13 @@
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <TargetFrameworkProfile />
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <Prefer32Bit>false</Prefer32Bit>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <OutputPath>bin\x64\Debug\</OutputPath>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <Prefer32Bit>false</Prefer32Bit>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <OutputPath>bin\x64\Release\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="CertEnroll_Interop, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
diff --git a/Myrtille.Enterprise/Myrtille.Enterprise.csproj b/Myrtille.Enterprise/Myrtille.Enterprise.csproj
index ceec2ad..80022ce 100644
--- a/Myrtille.Enterprise/Myrtille.Enterprise.csproj
+++ b/Myrtille.Enterprise/Myrtille.Enterprise.csproj
@@ -9,25 +9,16 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Myrtille.Enterprise</RootNamespace>
     <AssemblyName>Myrtille.Enterprise</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <OutputPath>bin\x64\Debug\</OutputPath>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <OutputPath>bin\x64\Release\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
diff --git a/Myrtille.MFAProviders/Myrtille.MFAProviders.csproj b/Myrtille.MFAProviders/Myrtille.MFAProviders.csproj
index 276da61..30a4316 100644
--- a/Myrtille.MFAProviders/Myrtille.MFAProviders.csproj
+++ b/Myrtille.MFAProviders/Myrtille.MFAProviders.csproj
@@ -9,26 +9,17 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Myrtille.MFAProviders</RootNamespace>
     <AssemblyName>Myrtille.MFAProviders</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <OutputPath>bin\x64\Debug\</OutputPath>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <OutputPath>bin\x64\Release\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="OASIS.Integration, Version=1.7.0.0, Culture=neutral, PublicKeyToken=bf7fa19775bc8b36, processorArchitecture=MSIL">
diff --git a/Myrtille.Printer/App.config b/Myrtille.Printer/App.config
index efd64f7..a1f378f 100644
--- a/Myrtille.Printer/App.config
+++ b/Myrtille.Printer/App.config
@@ -8,7 +8,7 @@
   </configSections>
   
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
   </startup>
 
   <system.diagnostics>
diff --git a/Myrtille.Printer/Myrtille.Printer.csproj b/Myrtille.Printer/Myrtille.Printer.csproj
index e6b2095..324f769 100644
--- a/Myrtille.Printer/Myrtille.Printer.csproj
+++ b/Myrtille.Printer/Myrtille.Printer.csproj
@@ -8,28 +8,9 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>Myrtille.Printer</RootNamespace>
     <AssemblyName>Myrtille.Printer</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>AdobeIcon.ico</ApplicationIcon>
   </PropertyGroup>
@@ -39,6 +20,14 @@
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <OutputPath>bin\x64\Release\</OutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/Myrtille.RDP/App.config b/Myrtille.RDP/App.config
index 3d65176..90e2c60 100644
--- a/Myrtille.RDP/App.config
+++ b/Myrtille.RDP/App.config
@@ -37,7 +37,7 @@
   </system.diagnostics>  
   
   <startup> 
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
   </startup>
   
 </configuration>
\ No newline at end of file
diff --git a/Myrtille.RDP/Myrtille.RDP.csproj b/Myrtille.RDP/Myrtille.RDP.csproj
index 9cc08d1..e373d22 100644
--- a/Myrtille.RDP/Myrtille.RDP.csproj
+++ b/Myrtille.RDP/Myrtille.RDP.csproj
@@ -7,8 +7,8 @@
     <ProjectGuid>{01E631B8-2A75-4C16-BAE9-E7F0523D89B1}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>Myrtille.RDP</RootNamespace>
-    <AssemblyName>Myrtille.RDP</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <AssemblyName>SecurdenRDPClient</AssemblyName>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
   </PropertyGroup>
@@ -32,7 +32,16 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>FreeRDP.ico</ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <OutputPath>bin\x64\Release\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
diff --git a/Myrtille.SSH/App.config b/Myrtille.SSH/App.config
index 2637d97..3622b23 100644
--- a/Myrtille.SSH/App.config
+++ b/Myrtille.SSH/App.config
@@ -37,7 +37,7 @@
   </system.diagnostics>
   
   <startup> 
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
   </startup>
 
 </configuration>
\ No newline at end of file
diff --git a/Myrtille.SSH/Myrtille.SSH.csproj b/Myrtille.SSH/Myrtille.SSH.csproj
index 7d79132..a9f2c29 100644
--- a/Myrtille.SSH/Myrtille.SSH.csproj
+++ b/Myrtille.SSH/Myrtille.SSH.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Myrtille.SSH</RootNamespace>
     <AssemblyName>Myrtille.SSH</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <IsWebBootstrapper>false</IsWebBootstrapper>
@@ -29,28 +29,17 @@
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <TargetFrameworkProfile />
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>icons8-console-50-black.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <OutputPath>bin\x64\Release\</OutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
@@ -89,9 +78,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <BootstrapperPackage Include=".NETFramework,Version=v4.5.2">
+    <BootstrapperPackage Include=".NETFramework,Version=v4.6.2">
       <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4.5.2 %28x86 and x64%29</ProductName>
+      <ProductName>Microsoft .NET Framework 4.6.2 %28x86 and x64%29</ProductName>
       <Install>true</Install>
     </BootstrapperPackage>
     <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
diff --git a/Myrtille.Services.Contracts/Myrtille.Services.Contracts.csproj b/Myrtille.Services.Contracts/Myrtille.Services.Contracts.csproj
index 159f8d5..fac9436 100644
--- a/Myrtille.Services.Contracts/Myrtille.Services.Contracts.csproj
+++ b/Myrtille.Services.Contracts/Myrtille.Services.Contracts.csproj
@@ -10,30 +10,17 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Myrtille.Services.Contracts</RootNamespace>
     <AssemblyName>Myrtille.Services.Contracts</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <Prefer32Bit>false</Prefer32Bit>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <OutputPath>bin\x64\Debug\</OutputPath>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <Prefer32Bit>false</Prefer32Bit>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <OutputPath>bin\x64\Release\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/Myrtille.Services/Myrtille.Services.csproj b/Myrtille.Services/Myrtille.Services.csproj
index 57f356f..541b050 100644
--- a/Myrtille.Services/Myrtille.Services.csproj
+++ b/Myrtille.Services/Myrtille.Services.csproj
@@ -9,8 +9,8 @@
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Myrtille.Services</RootNamespace>
-    <AssemblyName>Myrtille.Services</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <AssemblyName>SecurdenRDP</AssemblyName>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
@@ -30,42 +30,17 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Myrtille.Services.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-    <Prefer32Bit>false</Prefer32Bit>
+  <PropertyGroup>
+    <ApplicationIcon>
+    </ApplicationIcon>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Myrtille.Services.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-    <Prefer32Bit>false</Prefer32Bit>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <OutputPath>bin\x64\Debug\</OutputPath>
   </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationIcon>myrtille.ico</ApplicationIcon>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <OutputPath>bin\x64\Release\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Cassia, Version=2.0.0.60, Culture=neutral, processorArchitecture=MSIL">
diff --git a/Myrtille.Services/Program.cs b/Myrtille.Services/Program.cs
index e0a0c54..b51a626 100644
--- a/Myrtille.Services/Program.cs
+++ b/Myrtille.Services/Program.cs
@@ -94,11 +94,12 @@ private static void Main(string[] args)
             // database (enterprise mode)
             ConfigureEnterpriseDatabase();
 
+            /*
             if (!Environment.UserInteractive)
             {
                 Run(new Program());
             }
-            else
+            else*/
             {
                 var consoleTraceListener = new ConsoleTraceListener();
                 consoleTraceListener.Filter = new EventTypeFilter(SourceLevels.Information);
diff --git a/Myrtille.Services/RemoteSessionProcess.cs b/Myrtille.Services/RemoteSessionProcess.cs
index 4da5f28..e49632f 100644
--- a/Myrtille.Services/RemoteSessionProcess.cs
+++ b/Myrtille.Services/RemoteSessionProcess.cs
@@ -161,7 +161,7 @@ public void StartProcess(
                     // see https://github.com/cedrozor/myrtille/blob/master/DOCUMENTATION.md#build for information and steps to build FreeRDP along with myrtille
                     case HostType.RDP:
                         clientFilePath = @"Myrtille.RDP\bin";
-                        clientFileName = "Myrtille.RDP.exe";
+                        clientFileName = "SecurdenRDPClient.exe"; //"Myrtille.RDP.exe";
                         break;
                     case HostType.SSH:
                         clientFilePath = @"Myrtille.SSH\bin";
diff --git a/Myrtille.Services/ServicesInstaller.cs b/Myrtille.Services/ServicesInstaller.cs
index d52c6a0..dc5789b 100644
--- a/Myrtille.Services/ServicesInstaller.cs
+++ b/Myrtille.Services/ServicesInstaller.cs
@@ -71,7 +71,7 @@ public override void Install(
                 process.StartInfo.FileName = string.Format(@"{0}\WindowsPowerShell\v1.0\powershell.exe", Environment.Is64BitOperatingSystem && !Environment.Is64BitProcess ? Environment.SystemDirectory.ToLower().Replace("system32", "sysnative") : Environment.SystemDirectory);
                 process.StartInfo.Arguments = "-ExecutionPolicy Bypass" +
                     " -Command \"& '" + Path.Combine(Path.GetFullPath(Context.Parameters["targetdir"]), "bin", "Myrtille.Services.Install.ps1") + "'" +
-                    " -BinaryPath '" + Path.Combine(Path.GetFullPath(Context.Parameters["targetdir"]), "bin", "Myrtille.Services.exe") + "'" +
+                    " -BinaryPath '" + Path.Combine(Path.GetFullPath(Context.Parameters["targetdir"]), "bin", "SecurdenRDP.exe") + "'" +
                     " -DebugMode " + (debug ? "1" : "0") +
                     " | Tee-Object -FilePath '" + Path.Combine(Path.GetFullPath(Context.Parameters["targetdir"]), "log", "Myrtille.Services.Install.log") + "'" + "\"";
 
@@ -86,7 +86,7 @@ public override void Install(
 
                 // load config
                 var config = new XmlDocument();
-                var configPath = Path.Combine(Path.GetFullPath(Context.Parameters["targetdir"]), "bin", "Myrtille.Services.exe.config");
+                var configPath = Path.Combine(Path.GetFullPath(Context.Parameters["targetdir"]), "bin", "SecurdenRDP.exe.config");
                 config.Load(configPath);
 
                 var navigator = config.CreateNavigator();
diff --git a/Myrtille.Services/app.config b/Myrtille.Services/app.config
index 4b8843d..6091c97 100644
--- a/Myrtille.Services/app.config
+++ b/Myrtille.Services/app.config
@@ -28,7 +28,7 @@
       <appender-ref ref="LogFileAppender" />
     </root>
     <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
-      <param name="File" value="..\log\Myrtille.Services.log" />
+      <param name="File" value="..\..\logs\SecurdenRDP.log" />
       <param name="AppendToFile" value="true" />
       <rollingStyle value="Size" />
       <maxSizeRollBackups value="10" />
@@ -193,7 +193,7 @@
   </system.serviceModel>
   
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
   </startup>
 
   <!-- if you don't have a domain or don't want to use the enterprise mode (with group access restrictions), you can use the simplified (local admin) hosts management -->
diff --git a/Myrtille.Setup/Myrtille.Setup.vdproj b/Myrtille.Setup/Myrtille.Setup.vdproj
index ea535ab..549e4d5 100644
--- a/Myrtille.Setup/Myrtille.Setup.vdproj
+++ b/Myrtille.Setup/Myrtille.Setup.vdproj
@@ -1078,10 +1078,10 @@
             "ComponentsUrl" = "8:"
                 "Items"
                 {
-                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.5.2"
+                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.6.2"
                     {
-                    "Name" = "8:Microsoft .NET Framework 4.5.2 (x86 and x64)"
-                    "ProductCode" = "8:.NETFramework,Version=v4.5.2"
+                    "Name" = "8:Microsoft .NET Framework 4.6.2 (x86 and x64)"
+                    "ProductCode" = "8:.NETFramework,Version=v4.6.2"
                     }
                 }
             }
@@ -1110,10 +1110,10 @@
             "ComponentsUrl" = "8:"
                 "Items"
                 {
-                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.5.2"
+                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.6.2"
                     {
-                    "Name" = "8:Microsoft .NET Framework 4.5.2 (x86 and x64)"
-                    "ProductCode" = "8:.NETFramework,Version=v4.5.2"
+                    "Name" = "8:Microsoft .NET Framework 4.6.2 (x86 and x64)"
+                    "ProductCode" = "8:.NETFramework,Version=v4.6.2"
                     }
                 }
             }
@@ -1306,7 +1306,7 @@
                 {
                 "Name" = "8:.NET Framework"
                 "Message" = "8:[VSDNETMSG]"
-                "FrameworkVersion" = "8:.NETFramework,Version=v4.5"
+                "FrameworkVersion" = "8:.NETFramework,Version=v4.6.2"
                 "AllowLaterVersions" = "11:FALSE"
                 "InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=131000"
                 }
diff --git a/Myrtille.Web/App_Start/BundleConfig.cs b/Myrtille.Web/App_Start/BundleConfig.cs
index fe83ee9..1ae7a0a 100644
--- a/Myrtille.Web/App_Start/BundleConfig.cs
+++ b/Myrtille.Web/App_Start/BundleConfig.cs
@@ -61,6 +61,7 @@ public static void RegisterBundles(BundleCollection bundles)
             bundles.Add(new Bundle("~/js/xterm/xterm.js").Include("~/js/xterm/xterm.js"));
             bundles.Add(new Bundle("~/js/xterm/addons/fit/fit.js").Include("~/js/xterm/addons/fit/fit.js"));
             bundles.Add(new Bundle("~/js/audio/audiowebsocket.js").Include("~/js/audio/audiowebsocket.js"));
+            bundles.Add(new Bundle("~/js/securden.js").Include("~/js/securden.js"));
 
             // nodejs modules shouldn't be modified directly, but compute hashes anyway just in case...
             bundles.Add(new Bundle("~/node_modules/interactjs/dist/interact.js").Include("~/node_modules/interactjs/dist/interact.js"));
@@ -73,6 +74,7 @@ public static void RegisterBundles(BundleCollection bundles)
 
             bundles.Add(new Bundle("~/css/Default.css").Include("~/css/Default.css"));
             bundles.Add(new Bundle("~/css/xterm.css").Include("~/css/xterm.css"));
+            bundles.Add(new Bundle("~/css/securden.css").Include("~/css/securden.css"));
 
             // nodejs modules, same remark as above...
             bundles.Add(new Bundle("~/node_modules/simple-keyboard/build/css/index.css").Include("~/node_modules/simple-keyboard/build/css/index.css"));
diff --git a/Myrtille.Web/Default.aspx b/Myrtille.Web/Default.aspx
index 807bac6..3497366 100644
--- a/Myrtille.Web/Default.aspx
+++ b/Myrtille.Web/Default.aspx
@@ -35,11 +35,12 @@
         <!-- mobile devices -->
         <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1.0"/>
         
-        <title>Myrtille<%=RemoteSession != null && !RemoteSession.ConnectionService && (RemoteSession.State == RemoteSessionState.Connecting || RemoteSession.State == RemoteSessionState.Connected) && !string.IsNullOrEmpty(RemoteSession.ServerAddress) ? " - " + RemoteSession.ServerAddress.ToString() : ""%></title>
+        <title><%=RemoteSession != null && !RemoteSession.ConnectionService && (RemoteSession.State == RemoteSessionState.Connecting || RemoteSession.State == RemoteSessionState.Connected) && !string.IsNullOrEmpty(RemoteSession.ServerAddress) ? ((RemoteSession.isManageSession? "Shadow Session - " : "") + (RemoteSession.isDisplayTitle? RemoteSession.AccountTitle : (((!string.IsNullOrEmpty(RemoteSession.UserDomain))? RemoteSession.UserDomain.ToString() + "\\" : "") + RemoteSession.UserName.ToString())) + "@" + RemoteSession.ServerAddress.ToString() + " | Securden RDP Session") : "Securden RDP Gateway"%></title>
         
         <link rel="icon" type="image/x-icon" href="favicon.ico"/>
         <link rel="stylesheet" type="text/css" href="<%=BundleTable.Bundles.ResolveBundleUrl("~/css/Default.css", true)%>"/>
         <link rel="stylesheet" type="text/css" href="<%=BundleTable.Bundles.ResolveBundleUrl("~/css/xterm.css", true)%>"/>
+        <link rel="stylesheet" type="text/css" href="<%=BundleTable.Bundles.ResolveBundleUrl("~/css/securden.css", true)%>"/>
 
         <script language="javascript" type="text/javascript" src="<%=BundleTable.Bundles.ResolveBundleUrl("~/js/tools/common.js", true)%>"></script>
         <script language="javascript" type="text/javascript" src="<%=BundleTable.Bundles.ResolveBundleUrl("~/js/tools/convert.js", true)%>"></script>
@@ -63,11 +64,12 @@
         <script language="javascript" type="text/javascript" src="<%=BundleTable.Bundles.ResolveBundleUrl("~/js/xterm/xterm.js", true)%>"></script>
         <script language="javascript" type="text/javascript" src="<%=BundleTable.Bundles.ResolveBundleUrl("~/js/xterm/addons/fit/fit.js", true)%>"></script>
         <script language="javascript" type="text/javascript" src="<%=BundleTable.Bundles.ResolveBundleUrl("~/js/audio/audiowebsocket.js", true)%>"></script>
+        <script language="javascript" type="text/javascript" src="<%=BundleTable.Bundles.ResolveBundleUrl("~/js/securden.js", true)%>"></script>
         <script language="javascript" type="text/javascript" src="<%=BundleTable.Bundles.ResolveBundleUrl("~/node_modules/interactjs/dist/interact.js", true)%>"></script>
 
 	</head>
 	
-    <body onload="startMyrtille(
+    <body class="web-rdp-session-body" onload="startMyrtille(
         <%=(RemoteSession != null ? "'" + RemoteSession.State.ToString().ToUpper() + "'" : "null")%>,
         getToggleCookie((parent != null && window.name != '' ? window.name + '_' : '') + 'stat'),
         getToggleCookie((parent != null && window.name != '' ? window.name + '_' : '') + 'debug'),
@@ -76,7 +78,7 @@
         <%=(RemoteSession != null ? RemoteSession.ClientWidth.ToString() : "null")%>,
         <%=(RemoteSession != null ? RemoteSession.ClientHeight.ToString() : "null")%>,
         '<%=(RemoteSession != null ? RemoteSession.HostType.ToString() : HostType.RDP.ToString())%>',
-        <%=(RemoteSession != null && !string.IsNullOrEmpty(RemoteSession.VMGuid) && !RemoteSession.VMEnhancedMode).ToString().ToLower()%>);">
+        <%=(RemoteSession != null && !string.IsNullOrEmpty(RemoteSession.VMGuid) && !RemoteSession.VMEnhancedMode).ToString().ToLower()%>);resetIdleTimer()">
 
         <!-- custom UI: all elements below, including the logo, are customizable into Default.css -->
 
@@ -251,7 +253,7 @@
 			    <img src="img/icons8-menu-horizontal-21.png" alt="show/hide toolbar" width="21px" height="21px" onclick="toggleToolbar();"/>
             </div>
 
-            <div runat="server" id="toolbar" visible="false" style="visibility:hidden;display:none;">
+            <div runat="server" id="toolbar" visible="False" style="visibility:hidden;display:none;">
 
                 <!-- server info -->
                 <input type="text" runat="server" id="serverInfo" title="connected server" disabled="disabled"/>
@@ -259,46 +261,46 @@
                 <!-- user info -->
                 <input type="text" runat="server" id="userInfo" title="connected user" disabled="disabled"/>
 
-                <!-- stat bar -->
+                <!-- stat bar 
                 <input type="button" id="stat" value="Stat OFF" onclick="toggleStatMode();" title="display network and rendering info"/>
-
-                <!-- debug log -->
+                -->
+                <!-- debug log 
                 <input type="button" id="debug" value="Debug OFF" onclick="toggleDebugMode();" title="display debug info"/>
-
-                <!-- browser mode -->
+                -->
+                <!-- browser mode 
                 <input type="button" id="browser" value="HTML5 OFF" onclick="toggleCompatibilityMode();" title="rendering mode"/>
-
+                -->
                 <!-- scale display -->
                 <input type="button" runat="server" id="scale" value="Scale OFF" onclick="toggleScaleDisplay();" title="scale the remote session to the browser size" disabled="disabled"/>
-
-                <!-- reconnect session -->
+                
+                <!-- reconnect session 
                 <input type="button" runat="server" id="reconnect" value="Reconnect OFF" onclick="toggleReconnectSession();" title="reconnect the remote session to the browser size" disabled="disabled"/>
-
-                <!-- device keyboard. on devices without a physical keyboard, forces the device virtual keyboard to pop up, then allow to send text (a text target must be focused) -->
+                -->
+                <!-- device keyboard. on devices without a physical keyboard, forces the device virtual keyboard to pop up, then allow to send text (a text target must be focused)
                 <input type="button" runat="server" id="keyboard" value="Text" onclick="openPopup('virtualKeyboardPopup', 'VirtualKeyboard.aspx', false);" title="send some text into the remote session" disabled="disabled"/>
-
-                <!-- on-screen keyboard. on devices without a physical keyboard, display an on-screen keyboard, then allow to send characters (a text target must be focused) -->
+                -->
+                <!-- on-screen keyboard. on devices without a physical keyboard, display an on-screen keyboard, then allow to send characters (a text target must be focused)
                 <input type="button" runat="server" id="osk" value="Keyboard" onclick="openPopup('onScreenKeyboardPopup', 'onScreenKeyboard.aspx', false);" title="on-screen keyboard" disabled="disabled"/>
-
+                -->
                 <!-- clipboard synchronization -->
-                <!-- this is a fallback/manual action if the async clipboard API is not supported/enabled/allowed (requires read/write access and HTTPS) -->
+                <!-- this is a fallback/manual action if the async clipboard API is not supported/enabled/allowed (requires read/write access and HTTPS) 
                 <input type="button" runat="server" id="clipboard" value="Clipboard" onclick="openPopup('pasteClipboardPopup', 'PasteClipboard.aspx', false);" title="send some text into the remote clipboard" disabled="disabled"/>
-
-                <!-- upload/download file(s). only enabled if the connected server is localhost or if a domain is specified (so file(s) can be accessed within the remote session) -->
+                -->
+                <!-- upload/download file(s). only enabled if the connected server is localhost or if a domain is specified (so file(s) can be accessed within the remote session) 
                 <input type="button" runat="server" id="files" value="Files" onclick="openPopup('fileStoragePopup', 'FileStorage.aspx');" title="upload/download files to/from the user documents folder" disabled="disabled"/>
-
+                -->
                 <!-- send ctrl+alt+del. may be useful to change the user password, for example -->
                 <input type="button" runat="server" id="cad" value="Ctrl+Alt+Del" onclick="sendCtrlAltDel();" title="send Ctrl+Alt+Del" disabled="disabled"/>
 
                 <!-- send a right-click on the next touch or left-click action. may be useful on touchpads or iOS devices -->
                 <input type="button" runat="server" id="mrc" value="Right-Click OFF" onclick="toggleRightClick(this);" title="if toggled on, send a Right-Click on the next touch or left-click action" disabled="disabled"/>
 
-                <!-- swipe up/down gesture management for touchscreen devices. emulate vertical scroll in applications -->
+                <!-- swipe up/down gesture management for touchscreen devices. emulate vertical scroll in applications 
                 <input type="button" runat="server" id="vswipe" value="VSwipe ON" onclick="toggleVerticalSwipe(this);" title="if toggled on, allow vertical scroll on swipe (experimental feature, disabled on IE/Edge)" disabled="disabled"/>
-
-                <!-- share session -->
+                -->
+                <!-- share session 
                 <input type="button" runat="server" id="share" value="Share" onclick="openPopup('shareSessionPopup', 'ShareSession.aspx');" title="share session" disabled="disabled"/>
-
+                -->
                 <!-- disconnect -->
                 <input type="button" runat="server" id="disconnect" value="Disconnect" onclick="doDisconnect();" title="disconnect session" disabled="disabled"/>
 
@@ -329,11 +331,131 @@
 
         </form>
 
+        <!-- Securden start block -->
+        <form id="dummy_form" action="/" method="post">
+            <input type="hidden" id="dummy_data" value=""/>
+        </form>
+
+        <div runat="server" id="loadingDiv" visible="False">
+            <div class="sec-loading-wrap">
+                <div class="sec-loading-circle">
+                  <label></label>
+                  <label></label>
+                  <label></label>
+                  <label></label>
+                  <label></label>
+                  <label></label>
+                </div>
+                <div class="loading-text">Launching Connection</div>
+            </div>
+        </div>
+
+        <div class="container webrdp-container-body" style="display:none;" id="errorMessageDialogEle">
+            <div id="status" class="dialog-message-div">
+            <span id="webrdp-error-icon" class="webrdp-error-icon"></span>
+            <span id="webrdp-error-text" class="webrdp-dialog-message-text">Unable to establish a connection. Possible reasons: Invalid credentials or remote machine is not reachable.</span>
+            <span id="webrdp-back-home-btn" class="webrdp-back-btn" onclick="window.close();">Close</span>
+            </div>
+        </div>
+
+        <div runat="server" visible="False" class="container webrdp-container-body" id="certificateDiv">
+            <div class="success-message-div dialog-message-div">
+            <span class="webrdp-success-icon"></span>
+            <span class="webrdp-dialog-message-text">Certificate validated. You can launch web-based RDP connections.</span>
+            <span class="webrdp-back-btn" onclick="disableUserClose=false; window.history.back(); window.history.back(); window.close();">Close</span>
+            </div>
+        </div>
+
+        <div runat="server" id="remoteOperationsDivWrap" visible="False">
+            <div runat="server" id="remoteOperationsDiv">
+                <% if(RemoteSession.AllowRemoteClipboard) { %>
+                <div class="remote-oper-label-text" onclick="openPopup('pasteClipboardPopup', 'PasteClipboard.aspx');" id="clipboardOperDiv" runat="server" visible="True">
+                  <span class="remote-oper-label-text-icon clipboard-icon">
+                      <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+                      <g>
+                        <path d="M24.3,4.2h-1.5V3.7c0-0.6-0.5-1.1-1.1-1.1h-2c-0.7-1.5-2.2-2.5-3.9-2.5s-3.2,1-3.9,2.5H9.5c-0.6,0-1.1,0.5-1.1,1.1v0.5H6.9   c-1.8,0-3.3,1.5-3.3,3.2v21.1c0,1.8,1.5,3.2,3.3,3.2h17.5c1.8,0,3.2-1.5,3.2-3.2v-21C27.6,5.7,26.1,4.2,24.3,4.2z M10.6,4.9h2.1   h0.1c0.1,0,0.1,0,0.2,0c0.1,0,0.2-0.1,0.2-0.1c0.1,0,0.1-0.1,0.2-0.1c0.1-0.1,0.1-0.1,0.2-0.2c0-0.1,0.1-0.1,0.1-0.2   s0.1-0.1,0.1-0.2V4c0.2-0.9,1-1.6,2-1.6s1.8,0.7,2,1.6v0.1c0,0.1,0,0.1,0.1,0.2c0,0.1,0.1,0.1,0.1,0.2l0.1,0.1   c0.1,0.1,0.1,0.1,0.2,0.2l0.1,0.1C18.5,5,18.7,5,18.8,5l0,0l0,0h1.7v2.5h-9.9C10.6,7.5,10.6,4.9,10.6,4.9z M25.3,28.5   c0,0.5-0.4,1-1,1H6.9c-0.5,0-1-0.4-1-1v-21c0-0.5,0.4-1,1-1h1.5v2.1c0,0.6,0.5,1.1,1.1,1.1h12.2c0.6,0,1.1-0.5,1.1-1.1V6.5h1.5   c0.5,0,1,0.4,1,1C25.3,7.5,25.3,28.5,25.3,28.5z"></path>
+            
+                      </g>
+                      </svg>
+                  </span>
+                  <span class="remote-oper-label-text-val">Clipboard</span>
+                </div>
+                <% } %>
+
+                <div class="remote-oper-label-text" onclick="sendWinR();" id="winrOperDiv" runat="server" visible="True">
+                  <span class="remote-oper-label-text-icon win-r-icon">
+		            <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+		            <g>
+		            <path d="M7.5,5.2L1,26.7h24l6.5-21.6L7.5,5.2L7.5,5.2z M23.5,24.6H4.1l5-17.3h19.4L23.5,24.6z"/>
+		            <path d="M11.9,10.7l-3,10.6h11.7l3-10.6C23.6,10.7,11.9,10.7,11.9,10.7z M20.2,17.2l-8.7,0.1l1.5-4.9h8.6L20.2,17.2z"/>
+		            <polygon points="12.7,16.5 14.8,16.5 15.8,13.4 13.8,13.4  "/>
+		            </g>
+		            </svg>
+                  </span>
+                  <span class="remote-oper-label-text-val">Run (Win+R)</span>
+	            </div>
+
+                <div class="remote-oper-label-text" onclick="sendCtrlAltDel();" id="ctrlaltdelOperDiv" runat="server" visible="True">
+                  <span class="remote-oper-label-text-icon ctrl-alt-del-icon">
+                    <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+                    <g id="Setting_5_">
+                        <path d="M21.2,32c-1.2,0-2.4-0.7-2.9-1.8c-0.3-0.5-0.7-0.7-1.3-0.7c-0.7,0-1.4,0-2.1,0c-0.6,0-1,0.2-1.3,0.6   c-0.8,1.6-2.7,2.2-4.3,1.5c-1.5-0.6-2.3-2.4-1.8-4c0,0,0-0.1,0.1-0.1c0.1-0.4,0-0.9-0.4-1.2c-0.6-0.5-1.1-1-1.5-1.5   c-0.3-0.4-0.8-0.5-1.3-0.4H4.3c-1.6,0.5-3.4-0.3-4-1.9c-0.7-1.6,0-3.5,1.5-4.2C2.3,18,2.5,17.5,2.5,17c0-0.7,0-1.4,0-2.1   c0-0.5-0.2-1-0.6-1.3C0.3,12.8-0.3,11,0.3,9.4C1,7.8,2.8,7,4.4,7.5c0,0,0.1,0,0.1,0.1c0.4,0.1,0.9,0,1.2-0.4c0.5-0.6,1-1.1,1.5-1.5   c0.4-0.3,0.5-0.8,0.4-1.3V4.3C7.2,2.7,8,0.9,9.5,0.3c1.6-0.7,3.5,0,4.2,1.5C14,2.3,14.5,2.5,15,2.5c0.7,0,1.4,0,2.1,0   c0.5,0.1,1-0.2,1.3-0.6c0.8-1.6,2.7-2.2,4.3-1.5c1.5,0.6,2.3,2.4,1.8,4c0,0,0,0.1-0.1,0.1c-0.1,0.4,0,0.9,0.4,1.2   c0.6,0.5,1.1,1,1.5,1.5c0.3,0.4,0.8,0.5,1.3,0.4h0.1c1.6-0.5,3.4,0.3,4,1.9c0.7,1.6,0,3.5-1.5,4.2c-0.5,0.3-0.7,0.7-0.7,1.3l0,0   c0,0.7,0,1.3,0,2c0,0.5,0.2,1,0.6,1.3c1.6,0.8,2.2,2.7,1.5,4.3c-0.7,1.6-2.5,2.4-4.1,1.9h-0.1c-0.5-0.1-1,0-1.3,0.4   c-0.5,0.6-1,1.1-1.5,1.5c-0.4,0.3-0.5,0.8-0.4,1.3c0,0,0,0.1,0.1,0.1c0.5,1.6-0.3,3.4-1.9,4C22,31.9,21.6,32,21.2,32z M17.1,27.4   c1.2,0,2.4,0.7,3,1.8c0.3,0.6,1,0.9,1.6,0.6c0.6-0.2,0.9-0.9,0.7-1.5v-0.1c-0.4-1.3,0-2.6,1-3.5c0.4-0.3,0.8-0.7,1.3-1.2   c0.8-1,2.2-1.4,3.5-1c0.1,0,0.1,0,0.2,0.1c0.5,0.2,1.2-0.1,1.4-0.7c0.3-0.6,0-1.3-0.5-1.6c-1.2-0.7-1.9-1.9-1.8-3.3   c0-0.6,0-1.2,0-1.8c-0.1-1.3,0.6-2.6,1.8-3.2c0.6-0.3,0.9-1,0.6-1.6c-0.2-0.6-0.9-0.9-1.5-0.7h-0.1c-1.3,0.4-2.6,0-3.5-1   c-0.3-0.4-0.7-0.8-1.2-1.3c-1-0.8-1.4-2.2-1-3.5c0-0.1,0-0.1,0.1-0.2c0.2-0.5-0.1-1.2-0.7-1.4c-0.6-0.3-1.3,0-1.6,0.5   C19.6,4,18.3,4.7,17,4.6c-0.6,0-1.2,0-1.8,0C13.9,4.7,12.6,4,12,2.8c-0.3-0.6-1-0.9-1.6-0.6C9.8,2.4,9.5,3.1,9.6,3.7v0.1   c0.4,1.3,0,2.6-1,3.5C8.2,7.6,7.8,8,7.4,8.5c-0.8,1-2.2,1.4-3.5,1c-0.1,0-0.1,0-0.2-0.1c-0.5-0.2-1.2,0.1-1.4,0.7   c-0.3,0.6,0,1.3,0.5,1.6c1.2,0.7,1.9,2,1.8,3.3c0,0.6,0,1.2,0,1.8C4.7,18.1,4,19.4,2.8,20c-0.6,0.3-0.9,1-0.6,1.6   c0.2,0.6,0.9,0.9,1.5,0.7h0.1c1.3-0.4,2.6,0,3.5,1c0.5,0.6,0.8,0.9,1.2,1.3c1,0.8,1.4,2.2,1,3.5c0,0.1,0,0.1-0.1,0.2   c-0.2,0.5,0.1,1.2,0.7,1.4c0.6,0.3,1.3,0,1.6-0.5c0.7-1.2,1.9-1.9,3.3-1.8c0.6,0,1.2,0,1.8,0C16.9,27.4,17,27.4,17.1,27.4z"></path>
+                        <path d="M16,23.6c-4.2,0-7.6-3.4-7.6-7.6s3.4-7.6,7.6-7.6s7.6,3.4,7.6,7.6S20.2,23.6,16,23.6z M16,10.5c-3,0-5.5,2.5-5.5,5.5   s2.5,5.5,5.5,5.5s5.5-2.5,5.5-5.5C21.5,12.9,19,10.5,16,10.5z"></path>
+                    </g>
+                    </svg>
+                  </span>
+                <span class="remote-oper-label-text-val">Ctrl+Alt+Delete</span>
+                </div>
+
+                <div class="remote-oper-label-text" onclick="resizeSession();" id="resizeOperDiv" runat="server" visible="True">
+                  <span class="remote-oper-label-text-icon resize-icon">
+                    <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+                    <g>
+                    <path d="M3.8,25.3C5.5,23.5,7.3,21.8,9,20c1-1,1.9-1.1,2.7-0.4s0.7,1.8-0.3,2.8C9.7,24.1,8,25.8,6,27.8   c0.9,0,1.4,0,2,0c1.1,0,1.8,0.7,1.8,1.7S9.1,31.2,8,31.2c-2,0-4.1,0-6.1,0c-1.1,0-1.9-0.8-1.9-2c-0.1-2-0.1-3.9,0-5.9   c0-1.2,0.8-1.9,1.7-1.9c1,0,1.7,0.8,1.7,2c0,0.6,0,1.2,0,1.7C3.7,25.3,3.8,25.3,3.8,25.3z"/>
+                    <path d="M25.9,27.8c-2-2-3.7-3.8-5.5-5.5c-0.7-0.7-0.9-1.5-0.4-2.3c0.6-1,1.8-1.1,2.7-0.2c1.8,1.8,3.6,3.7,5.7,5.8   c0-0.9,0-1.6,0-2.2c0-1.1,0.7-1.9,1.7-1.9c0.9,0,1.7,0.7,1.7,1.8c0.1,2,0.1,4.1,0,6.1c0,1.2-0.9,1.9-2,1.9c-2,0-3.9,0-5.9,0   c-1.2,0-1.9-0.7-1.9-1.7s0.8-1.7,1.9-1.7C24.5,27.8,25.1,27.8,25.9,27.8z"/>
+                    <path d="M3.6,6.5c0,0.9,0,1.6,0,2.2c-0.1,1.2-0.7,1.9-1.7,1.9S0.2,9.9,0.2,8.8C0,6.7,0,4.7,0.1,2.7   c0-1.2,0.8-1.9,2-1.9c2,0,3.9,0,5.9,0c1.1,0,1.8,0.7,1.9,1.6c0.1,1-0.6,1.7-1.8,1.8c-0.5,0-1,0-1.8,0C6.7,4.6,6.8,4.9,7,5.1   c1.5,1.5,3,3,4.5,4.5c0.9,1,1,2,0.3,2.7C11,13,10,13,9.1,12C7.3,10.2,5.6,8.5,3.6,6.5z"/>
+                    <path d="M25.7,4.3c-0.9-0.1-1.6-0.1-2.2-0.2c-1-0.1-1.4-0.7-1.5-1.6c0-0.9,0.5-1.7,1.4-1.7c2.3-0.1,4.6-0.1,6.9,0   c0.9,0,1.5,0.8,1.5,1.7c0,2.1,0,4.3,0,6.4c0,0.9-0.7,1.6-1.6,1.6S28.6,9.9,28.5,9c-0.1-0.7,0-1.4,0-2.5c-0.8,0.8-1.3,1.3-1.8,1.8   c-1.3,1.3-2.5,2.6-3.8,3.8c-0.8,0.8-1.9,0.9-2.6,0.2c-0.8-0.7-0.7-1.7,0.1-2.6c1.5-1.5,3-3,4.5-4.5C25,5,25.3,4.7,25.7,4.3z"/>
+                    </g>
+                    </svg>
+                  </span>
+                  <span class="remote-oper-label-text-val">Fit to screen</span>
+                </div>
+
+                <div class="remote-oper-label-text" onclick="disconnectSession();" id="disconnectOperDiv" runat="server" visible="True">
+                  <span class="remote-oper-label-text-icon disconnect-icon">
+		            <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+		            <g>
+		            <path d="M23.7,23c-0.9,0-1.6,0.7-1.6,1.6v3.6H3.4V5h18.8v2.6c0,0.9,0.7,1.6,1.6,1.6s1.6-0.7,1.6-1.6V3.4c0-0.9-0.7-1.6-1.6-1.6H1.9   C1,1.8,0.3,2.5,0.3,3.4v26.3c0,0.9,0.7,1.6,1.6,1.6h21.9c0.9,0,1.6-0.7,1.6-1.6v-5.2C25.3,23.6,24.6,23,23.7,23z"/>
+		            <polygon points="31.6,16.1 29.5,13.9 29.5,13.9 26,10.4 23.9,12.5 25.9,14.6 12,14.6 12,17.6 25.9,17.6 23.8,19.7 25.9,21.8    29.5,18.2 29.5,18.2 31.6,16.1 31.6,16.1  "/>
+		            </g>
+		            </svg>
+                  </span>
+                  <span class="remote-oper-label-text-val">Disconnect</span>
+              </div>
+
+              <div class="show-icon" id="remoteOperationsDivHeader" title="Click to drag">
+	              <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+	              <polygon points="60.9,20 56.6,15.7 32.6,39.8 8.6,15.7 4.3,20 28.3,44 28.3,44 32.6,48.3 32.6,48.2 32.6,48.3 36.9,44 36.8,44 "></polygon>
+	              </svg>
+              </div>
+            </div>
+          <script type="text/javascript">
+                <% if(RemoteSession.isManageSession) { %>
+                    disableUserClose = false;
+                <% } %>
+            dragElement(document.getElementById("remoteOperationsDiv"));
+          </script>
+        </div>
+        <!-- Securden end block -->
+
         <script type="text/javascript" language="javascript" defer="defer">
 
             var dragDiv = document.getElementById('dragDiv');
             var dragHandle = document.getElementById('dragHandle');
-
+            var idleDialog = document.getElementById("dialog-overlay");
+            let idleTimer;
+            var IDLE_TIMEOUT;
+            
             interact(dragDiv)
                 .draggable({
                     allowFrom: dragHandle,
@@ -388,21 +510,21 @@
                             }
 
                             // in addition to having their states also saved into a cookie, stat, debug and compatibility buttons are always available into the toolbar (even for guest(s) if the remote session is shared)
-                            document.getElementById('stat').value = getToggleCookie((parent != null && window.name != '' ? window.name + '_' : '') + 'stat') ? 'Stat ON' : 'Stat OFF';
-                            document.getElementById('debug').value = getToggleCookie((parent != null && window.name != '' ? window.name + '_' : '') + 'debug') ? 'Debug ON' : 'Debug OFF';
-                            document.getElementById('browser').value = getToggleCookie((parent != null && window.name != '' ? window.name + '_' : '') + 'browser') ? 'HTML5 OFF' : 'HTML5 ON';
+                            //document.getElementById('stat').value = getToggleCookie((parent != null && window.name != '' ? window.name + '_' : '') + 'stat') ? 'Stat ON' : 'Stat OFF';
+                            //document.getElementById('debug').value = getToggleCookie((parent != null && window.name != '' ? window.name + '_' : '') + 'debug') ? 'Debug ON' : 'Debug OFF';
+                            //document.getElementById('browser').value = getToggleCookie((parent != null && window.name != '' ? window.name + '_' : '') + 'browser') ? 'HTML5 OFF' : 'HTML5 ON';
 
                             // swipe is disabled on IE/Edge because it emulates mouse events by default (experimental)
-                            document.getElementById('<%=vswipe.ClientID%>').disabled = document.getElementById('<%=vswipe.ClientID%>').disabled || display.isIEBrowser();
+                            //document.getElementById('<%=vswipe.ClientID%>').disabled = document.getElementById('<%=vswipe.ClientID%>').disabled || display.isIEBrowser();
                         }
                     }
                 }
                 catch (exc)
                 {
-                    alert('myrtille initDisplay error: ' + exc.message);
+                    alert('Unexpected Error');
                 }
             }
-
+            
             function onHostTypeChange(hostType)
             {
                 var securityProtocolDiv = document.getElementById('securityProtocolDiv');
@@ -495,6 +617,7 @@
 
             function onDragMove(event)
             {
+                resetIdleTimer()
                 var target = event.target,
                 x = (parseFloat(target.getAttribute('data-x')) || 0) + event.dx,
                 y = (parseFloat(target.getAttribute('data-y')) || 0) + event.dy;
@@ -514,9 +637,43 @@
                 target.setAttribute('data-x', x);
                 target.setAttribute('data-y', y);
             }
+            function resetIdleTimer() {
+                var idleTimeout =   <%= (RemoteSession != null && 
+                 (RemoteSession.State == RemoteSessionState.Connecting || RemoteSession.State == RemoteSessionState.Connected) &&
+                 !string.IsNullOrEmpty(RemoteSession.IdleTimeout) && (RemoteSession.isIdleTimeOutEnabled)) 
+                 ? RemoteSession.IdleTimeout 
+                 : "1" %>
+                    IDLE_TIMEOUT = parseInt(idleTimeout) * 60 * 1000;
+                IDLE_TIMEOUT = 0.6 * IDLE_TIMEOUT;
+                if (IDLE_TIMEOUT==0){
+                    return
+                }
+                clearTimeout(idleTimer);
+                var center_dialog = document.getElementById("dialog-overlay");
+                if (center_dialog.style.visibility === "visible") {
+                    center_dialog.style.visibility = "hidden";
+                }
+                idleTimer = window.setTimeout(() => {
+                center_dialog.style.visibility = "visible";
+                setClickAction()
+                }, IDLE_TIMEOUT);
 
-		</script>
+            }
+            function setClickAction() {
+                var center_dialog = document.getElementById("dialog-overlay");
+                center_dialog.removeEventListener("mouseover", resetIdleTimer);
+                center_dialog.addEventListener("mouseover", resetIdleTimer);
+            }
+            document.addEventListener("mousemove", resetIdleTimer);
+        </script>
 
 	</body>
+    <div class="overlay" id="dialog-overlay" style="visibility: hidden;">
+    <div class="dialog">
+        <h2>Idle Timeout</h2>
+        <p>An idle session has been detected and you will be timed out of this connection. Take action to prevent timeout.</p>
+
+    </div>
+</div>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/Myrtille.Web/Default.aspx.cs b/Myrtille.Web/Default.aspx.cs
index 084ec86..0c89fea 100644
--- a/Myrtille.Web/Default.aspx.cs
+++ b/Myrtille.Web/Default.aspx.cs
@@ -20,6 +20,9 @@ limitations under the License.
 using System.Collections.Generic;
 using System.Configuration;
 using System.IO;
+using System.Net;
+using System.Net.Security;
+using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
@@ -31,12 +34,14 @@ limitations under the License.
 using Myrtille.Helpers;
 using Myrtille.Services.Contracts;
 using Myrtille.Web.Properties;
+using Myrtille.Web.src.Utils;
+using Newtonsoft.Json.Linq;
 
 namespace Myrtille.Web
 {
     public partial class Default : Page
     {
-        private MFAAuthenticationClient _mfaAuthClient =  new MFAAuthenticationClient();
+        private MFAAuthenticationClient _mfaAuthClient = new MFAAuthenticationClient();
         private EnterpriseClient _enterpriseClient = new EnterpriseClient();
         private ConnectionClient _connectionClient = new ConnectionClient(Settings.Default.ConnectionServiceUrl);
 
@@ -117,7 +122,7 @@ protected void Page_Init(
             }
 
             // connect from a login page or url
-            if (!bool.TryParse(ConfigurationManager.AppSettings["LoginEnabled"], out _loginEnabled))
+            if (!bool.TryParse(ConfigurationManager.AppSettings["LoginEnabled"], out _loginEnabled) || (Request.RawUrl.Contains("auth_key") && Request.RawUrl.Contains("referrer") && Request.RawUrl.Contains("service_org_id")))
             {
                 _loginEnabled = true;
             }
@@ -239,6 +244,10 @@ protected void Page_Load(
 
                             ClientScript.RegisterClientScriptBlock(GetType(), Guid.NewGuid().ToString(), script, true);
                         }
+                        else
+                        {
+                            Response.Write("<script>alert('Session closed.'); window.close();</script>");
+                        }
 
                         // cleanup
                         Session[HttpSessionStateVariables.RemoteSession.ToString()] = null;
@@ -248,6 +257,10 @@ protected void Page_Load(
                         }
                         RemoteSession = null;
                     }
+                    else if (Session[HttpSessionStateVariables.GuestInfo.ToString()] != null)
+                    {
+                        remoteOperationsDiv.Visible = false;
+                    }
                 }
                 catch (Exception exc)
                 {
@@ -317,6 +330,10 @@ protected void Page_Load(
             // disable the browser cache; in addition to a "noCache" dummy param, with current time, on long-polling and xhr requests
             Response.Cache.SetCacheability(HttpCacheability.NoCache);
             Response.Cache.SetNoStore();
+            if (RemoteSession == null && (string.IsNullOrEmpty(Request["auth_key"]) || string.IsNullOrEmpty(Request["referrer"]) || string.IsNullOrEmpty(Request["service_org_id"])))
+            {
+                certificateDiv.Visible = true;
+            }
         }
 
         /// <summary>
@@ -344,6 +361,16 @@ private void UpdateControls()
             // remote session toolbar
             if (RemoteSession != null && (RemoteSession.State == RemoteSessionState.Connecting || RemoteSession.State == RemoteSessionState.Connected))
             {
+                remoteOperationsDivWrap.Visible = true;
+                if (RemoteSession.State == RemoteSessionState.Connecting)
+                {
+                    loadingDiv.Visible = true;
+                    remoteOperationsDiv.Style.Add("display", "block");
+                }
+                else
+                {
+                    remoteOperationsDiv.Style.Add("display", "block");
+                }
                 if (_toolbarEnabled)
                 {
                     // interacting with the remote session is available to guests with control access, but only the remote session owner should have control on the remote session itself
@@ -385,7 +412,7 @@ private void UpdateControls()
             else
             {
                 // connection params are sent when the login form is submitted, either through http post (the default form method) or http get (querystring)
-                login.Visible = _loginEnabled;
+                //login.Visible = _loginEnabled;
 
                 // MFA
                 if (_mfaAuthClient.GetState())
@@ -429,13 +456,11 @@ protected void ConnectButtonClick(
         {
             if (!_authorizedRequest)
                 return;
-
             // one time usage enterprise session url
             if (_enterpriseSession == null && Request["SI"] != null && Request["SD"] != null && Request["SK"] != null)
             {
                 CreateEnterpriseSessionFromUrl();
             }
-
             // MFA (OTP passcode)
             if (_enterpriseSession == null && _mfaAuthClient.GetState())
             {
@@ -447,7 +472,6 @@ protected void ConnectButtonClick(
                     return;
                 }
             }
-
             // enterprise mode from login
             if (_enterpriseSession == null && (_enterpriseClient.GetMode() == EnterpriseMode.Domain || _localAdmin))
             {
@@ -465,7 +489,6 @@ protected void ConnectButtonClick(
                 {
                     return;
                 }
-
                 // connect
                 if (ConnectRemoteServer())
                 {
@@ -513,8 +536,124 @@ protected void ConnectButtonClick(
         /// <remarks>
         /// authentication is delegated to the remote server or connection broker (if applicable)
         /// </remarks>
+        /// 
+        public void TerminateSession(HttpRequest Request, HttpResponse Response, string serverUrl, string authKey, Guid connectionId, string serviceOrgId)
+        {
+            try
+            {
+                var remoteSessions = ((IDictionary<Guid, RemoteSession>)Application[HttpApplicationStateVariables.RemoteSessions.ToString()]);
+                var idleSessionIds = new JArray();
+
+                foreach (KeyValuePair<Guid, RemoteSession> RemoteSessionMap in remoteSessions)
+                {
+                    var remotesession = RemoteSessionMap.Value;
+                    RemoteSessionManager manager = remotesession.Manager;
+                    bool isConnected = (remotesession.State == RemoteSessionState.Connected);
+                    if ((isConnected) && (manager != null) && (manager.lastActiveTime != null))
+                    {
+
+                        TimeSpan idleTime = DateTime.Now - manager.lastActiveTime;
+                        if ((int.Parse(remotesession.IdleTimeout) != 0) && (idleTime.TotalSeconds > (int.Parse(remotesession.IdleTimeout) * 60)))
+                        {
+                            bool isTerminated = false;
+                            try
+                            {
+                                manager.SendCommand(RemoteSessionCommand.CloseClient);
+                                isTerminated = true;
+                            }
+                            catch (Exception exc)
+                            {
+                                System.Diagnostics.Trace.TraceError($"Failed to terminate the session ({exc.ToString()})");
+                            }
+                            if (isTerminated)
+                            {
+                                Response.Write("<script>alert('Idle session terminated.'); window.close();</script>");
+                                continue;
+                            }
+                            idleSessionIds.Add(new JObject {
+                            new JProperty("SESSION_ID", RemoteSessionMap.Key),
+                            new JProperty("LAST_ACTIVE_TIME", (int)idleTime.TotalSeconds)
+                        });
+                        }
+                    }
+                }
+                bool isEmpty = remoteSessions.Count == 0;
+                bool isIdleSessionEmpty = idleSessionIds.Count == 0;
+                if (!isEmpty)
+                {
+                    string serverAccessUrl = null;
+                    JObject response = null;
+                    JObject paramObj = new JObject(new JProperty("SESSION_TYPE", 7));
+    
+                    if (Request["access_url"] != null && Request["access_url"].Trim() != "")
+                    {
+                        string accessUrl = Request["access_url"].Trim();
+                        if (!isIdleSessionEmpty) {
+                            paramObj.Add("ACTIVE_USER_SESSION_IDS", idleSessionIds);
+                        }
+                        if (accessUrl.EndsWith("/"))
+                        {
+                            accessUrl = accessUrl.Substring(0, accessUrl.Length - 1);
+                        }
+                        response = SecurdenWeb.SecurdenWebRequest(accessUrl, "/launcher/get_terminate_machine_session_ids", "GET", paramObj, serviceOrgId);
+                        if (response != null)
+                        {
+                            serverAccessUrl = accessUrl;
+                        }
+                        else
+                        {
+                            response = SecurdenWeb.SecurdenWebRequest(serverUrl, "/launcher/get_terminate_machine_session_ids", "GET", paramObj, serviceOrgId);
+                            if (response != null)
+                            {
+                                serverAccessUrl = serverUrl;
+                            }
+                        }
+                        if (response == null)
+                        {
+                            Response.Write("<script>alert('Not able to access Securden web server. Try again.'); window.close();</script>");
+                        }
+                        else if (response != null)
+                        {
+                            try
+                            {
+                                var valueArray = (JArray)response["machine_session_id_list"];
+                                foreach (var eachConnection in valueArray)
+                                {
+                                    var toTerminateConnectionId = eachConnection["connection_id"];
+                                    if (remoteSessions.ContainsKey((Guid)toTerminateConnectionId))
+                                    {
+                                        var RemoteSession = ((IDictionary<Guid, RemoteSession>)Application[HttpApplicationStateVariables.RemoteSessions.ToString()])[(Guid)toTerminateConnectionId];
+                                            RemoteSession.Manager.SendCommand(RemoteSessionCommand.CloseClient);
+                                    }
+                                }
+                            }
+                            catch (ThreadAbortException)
+                            {
+                                // occurs because the response is ended after redirect
+                            }
+                            catch (Exception exc)
+                            {
+                                System.Diagnostics.Trace.TraceError("Failed to terminate the session ({0})", exc);
+                            }
+                        }
+                    }
+                    Thread.Sleep(60000);
+                    TerminateSession(Request, Response, serverUrl, authKey, connectionId, serviceOrgId);
+                }
+                else
+                {
+                    Thread.CurrentThread.Abort();
+                    Response.Write("<script>alert('Session terminated.'); window.close();</script>");
+                }
+            }
+            catch (Exception exc)
+            {
+                System.Diagnostics.Trace.TraceError("Failed to terminate the session ({0})", exc);
+            }
+        }
         private bool ConnectRemoteServer()
         {
+            var connectionId = Guid.NewGuid();
             // connection parameters
             string loginHostName = null;
             var loginHostType = (HostType)Convert.ToInt32(hostType.Value);
@@ -527,7 +666,158 @@ private bool ConnectRemoteServer()
             var loginUser = user.Value;
             var loginPassword = string.IsNullOrEmpty(passwordHash.Value) ? password.Value : CryptoHelper.RDP_Decrypt(passwordHash.Value);
             var startProgram = program.Value;
+            if (RemoteSession == null && (Request["auth_key"] == null || Request["auth_key"].Trim() == "" || Request["referrer"] == null || Request["referrer"].Trim() == "" || Request["service_org_id"] == null || Request["service_org_id"].Trim() == ""))
+            {
+                Response.Write("<script>alert('Invalid command.'); window.close();</script>");
+                return false;
+            }
+            long userProfileId = 0;
+            long userSessionId = 0;
+            string accessUrl = null;
+            string serviceOrgId = Request["service_org_id"];
+            long auditId = 0;
+            bool isRecordingNeeded = false;
+            long remoteSessionId = 0;
+            bool isDisplayTitle = false;
+            string accountTitle = null;
+            string idleTime = null;
+            bool isSessionShadowed = false;
+            if (RemoteSession == null)
+            {
+                JObject connectionDetails = SecurdenWeb.ProcessLaunchRequest(Request, Response, Request["referrer"], Request["auth_key"], connectionId.ToString(), serviceOrgId);
+                if (connectionDetails == null)
+                {
+                    return false;
+                }
+                else
+                {
+                    if (connectionDetails["user_profile_id"] != null && connectionDetails["user_profile_id"].ToString() != "")
+                    {
+                        userProfileId = (long)connectionDetails["user_profile_id"];
+                    }
+                    if (connectionDetails["user_session_id"] != null && connectionDetails["user_session_id"].ToString() != "")
+                    {
+                        userSessionId = (long)connectionDetails["user_session_id"];
+                    }
+                    idleTime = (string)connectionDetails["IDLE_SESSION_TIME"];
+                    accessUrl = (string)connectionDetails["ACCESS_URL"];
+                    isSessionShadowed = (string)connectionDetails["type"] == "SHADOW_SESSION";
+                    if ((string)connectionDetails["type"] == "SHADOW_SESSION")
+                    {
+                        connectionDetails = (JObject)connectionDetails["details"];
+                        string guestShareId = "";
+                        try
+                        {
+                            Application.Lock();
 
+                            // create a new guest for the remote session
+                            var sharedSessions = (IDictionary<Guid, SharingInfo>)Application[HttpApplicationStateVariables.SharedRemoteSessions.ToString()];
+                            Guid OldConnectionId = new Guid((string)connectionDetails["connection_id"]);
+                            var sharingInfo = new SharingInfo
+                            {
+                                RemoteSession = ((IDictionary<Guid, RemoteSession>)Application[HttpApplicationStateVariables.RemoteSessions.ToString()])[OldConnectionId],
+                                GuestInfo = new GuestInfo
+                                {
+                                    Id = Guid.NewGuid(),
+                                    ConnectionId = OldConnectionId,
+                                    Control = false,
+                                }
+                            };
+                            sharingInfo.RemoteSession.isManageSession = true;
+
+                            sharedSessions.Add(sharingInfo.GuestInfo.Id, sharingInfo);
+                            guestShareId = sharingInfo.GuestInfo.Id.ToString();
+                        }
+                        catch (ThreadAbortException)
+                        {
+                            // occurs because the response is ended after redirect
+                        }
+                        catch (Exception exc)
+                        {
+                            System.Diagnostics.Trace.TraceError("Failed to generate a session sharing url ({0})", exc);
+                        }
+                        finally
+                        {
+                            Application.UnLock();
+                        }
+                        if (guestShareId != "")
+                        {
+                            Response.Redirect("~/?gid=" + guestShareId, true);
+                        }
+                        else
+                        {
+                            JObject response = SecurdenWeb.ManageSessionRequest(accessUrl, (string)connectionDetails["connection_id"], false, serviceOrgId, auditId, isRecordingNeeded, remoteSessionId);
+                            Response.Write("<script>alert('The session has already been closed or terminated.'); window.close();</script>");
+                        }
+                        return false;
+                    }
+                    else if ((string)connectionDetails["type"] == "TERMINATE_SESSION")
+                    {
+                        connectionDetails = (JObject)connectionDetails["details"];
+                        bool isTerminated = false;
+                        try
+                        {
+                            Guid OldConnectionId = new Guid((string)connectionDetails["connection_id"]);
+                            RemoteSession = ((IDictionary<Guid, RemoteSession>)Application[HttpApplicationStateVariables.RemoteSessions.ToString()])[OldConnectionId];
+                            RemoteSession.Manager.SendCommand(RemoteSessionCommand.CloseClient);
+                            isTerminated = true;
+                        }
+                        catch (ThreadAbortException)
+                        {
+                            // occurs because the response is ended after redirect
+                        }
+                        catch (Exception exc)
+                        {
+                            System.Diagnostics.Trace.TraceError("Failed to terminate the session ({0})", exc);
+                        }
+                        if (isTerminated)
+                        {
+                            Response.Write("<script>alert('Session terminated.'); window.close();</script>");
+                        }
+                        else
+                        {
+                            JObject response = SecurdenWeb.ManageSessionRequest(accessUrl, (string)connectionDetails["connection_id"], false, serviceOrgId, auditId, isRecordingNeeded, remoteSessionId);
+                            Response.Write("<script>alert('The session has already been closed or terminated.'); window.close();</script>");
+                        }
+                        return false;
+                    }
+                    if (connectionDetails.ContainsKey("audit_id"))
+                    {
+                        auditId = (long)connectionDetails["audit_id"];
+                        isRecordingNeeded = (bool)connectionDetails["details"]["is_recording_needed"];
+                        if (connectionDetails.ContainsKey("remote_session_id"))
+                        {
+                            remoteSessionId = (long)connectionDetails["remote_session_id"];
+                        }
+                    }
+                    connectionDetails = (JObject)connectionDetails["details"];
+                    loginServer = (string)connectionDetails["address"];
+                    loginDomain = "";
+                    loginUser = (string)connectionDetails["username"];
+                    loginPassword = (string)connectionDetails["password"];
+                    isDisplayTitle = (bool)connectionDetails["is_display_title"];
+                    accountTitle = (string)connectionDetails["account_title"];
+                    if (connectionDetails.ContainsKey("port"))
+                    {
+                        loginServer += ":" + connectionDetails["port"];
+                    }
+                    if (connectionDetails.ContainsKey("clipboard"))
+                    {
+                        _allowRemoteClipboard = (bool)connectionDetails["clipboard"];
+                    }
+                    string tempUsername = loginUser;
+                    if (loginUser.Contains(":"))
+                    {
+                        string addressAlone = loginUser.Substring(0, loginUser.IndexOf(":"));
+                        string portUsername = loginUser.Substring(loginUser.IndexOf(":") + 1);
+                        if (portUsername.Contains("\\"))
+                        {
+                            tempUsername = addressAlone + portUsername.Substring(portUsername.IndexOf("\\"));
+                        }
+                    }
+                    loginUser = tempUsername;
+                }
+            }
             // allowed features
             var allowRemoteClipboard = _allowRemoteClipboard;
             var allowFileTransfer = _allowFileTransfer;
@@ -538,8 +828,6 @@ private bool ConnectRemoteServer()
             // sharing parameters
             int maxActiveGuests = int.MaxValue;
 
-            var connectionId = Guid.NewGuid();
-
             // connect an host from the hosts list or from a one time session url
             if (_enterpriseSession != null && (!string.IsNullOrEmpty(Request["SD"])))
             {
@@ -645,7 +933,27 @@ private bool ConnectRemoteServer()
             try
             {
                 Application.Lock();
-
+                if (string.IsNullOrEmpty(loginDomain))
+                {
+                    int pos = loginUser.IndexOf("\\");
+                    if (pos != -1)
+                    {
+                        loginDomain = loginUser.Substring(0, pos);
+                    }
+                    // username@domain.com
+                    else
+                    {
+                        pos = loginUser.IndexOf("@");
+                        if (pos != -1)
+                        {
+                            loginDomain = loginUser.Substring(pos + 1);
+                        }
+                        else
+                        {
+                            loginDomain = "";
+                        }
+                    }
+                }
                 // create the remote session
                 RemoteSession = new RemoteSession(
                     connectionId,
@@ -656,7 +964,7 @@ private bool ConnectRemoteServer()
                     loginVMGuid,
                     loginVMAddress,
                     loginVMEnhancedMode,
-                    !string.IsNullOrEmpty(loginDomain) ? loginDomain : AccountHelper.GetDomain(loginUser, loginPassword),
+                    loginDomain,
                     AccountHelper.GetUserName(loginUser),
                     loginPassword,
                     int.Parse(width.Value),
@@ -670,15 +978,37 @@ private bool ConnectRemoteServer()
                     maxActiveGuests,
                     Session.SessionID,
                     (string)Session[HttpSessionStateVariables.ClientKey.ToString()],
-                    Request["cid"] != null
+                    Request["cid"] != null,
+                    accountTitle,
+                    isDisplayTitle,
+                    idleTime,
+                    isSessionShadowed
                 );
 
+                RemoteSession.UserProfileId = userProfileId;
+                RemoteSession.UserSessionId = userSessionId;
+                RemoteSession.accessUrl = accessUrl;
+                RemoteSession.serviceOrgId = serviceOrgId;
+                RemoteSession.auditId = auditId;
+                RemoteSession.remoteSessionId = remoteSessionId;
+                RemoteSession.isRecordingNeeded = isRecordingNeeded;
+                RemoteSession.IdleTimeout = idleTime;
+                RemoteSession.isIdleTimeOutEnabled = !isSessionShadowed;
+
                 // bind the remote session to the current http session
                 Session[HttpSessionStateVariables.RemoteSession.ToString()] = RemoteSession;
+                Session["IDLE_TIMEOUT"] = idleTime;
 
                 // register the remote session at the application level
                 var remoteSessions = (IDictionary<Guid, RemoteSession>)Application[HttpApplicationStateVariables.RemoteSessions.ToString()];
+                bool isactiveSessionEmpty = remoteSessions.Count == 0;
                 remoteSessions.Add(RemoteSession.Id, RemoteSession);
+                if (isactiveSessionEmpty)
+                {
+                    Thread sessionTerminateThread = new Thread(() => TerminateSession(Request, Response, Request["referrer"], Request["auth_key"], connectionId, serviceOrgId));
+                    sessionTerminateThread.Start();
+                }
+
             }
             catch (Exception exc)
             {
diff --git a/Myrtille.Web/Default.aspx.designer.cs b/Myrtille.Web/Default.aspx.designer.cs
index 1ff4e59..726f68b 100644
--- a/Myrtille.Web/Default.aspx.designer.cs
+++ b/Myrtille.Web/Default.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Myrtille.Web {
-    
-    
-    public partial class Default {
-        
+namespace Myrtille.Web
+{
+
+
+    public partial class Default
+    {
+
         /// <summary>
         /// mainForm control.
         /// </summary>
@@ -20,7 +22,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm mainForm;
-        
+
         /// <summary>
         /// width control.
         /// </summary>
@@ -29,7 +31,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputHidden width;
-        
+
         /// <summary>
         /// height control.
         /// </summary>
@@ -38,7 +40,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputHidden height;
-        
+
         /// <summary>
         /// login control.
         /// </summary>
@@ -47,7 +49,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl login;
-        
+
         /// <summary>
         /// logo control.
         /// </summary>
@@ -56,7 +58,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl logo;
-        
+
         /// <summary>
         /// hostConnectDiv control.
         /// </summary>
@@ -65,7 +67,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl hostConnectDiv;
-        
+
         /// <summary>
         /// hostType control.
         /// </summary>
@@ -74,7 +76,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlSelect hostType;
-        
+
         /// <summary>
         /// securityProtocol control.
         /// </summary>
@@ -83,7 +85,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlSelect securityProtocol;
-        
+
         /// <summary>
         /// server control.
         /// </summary>
@@ -92,7 +94,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText server;
-        
+
         /// <summary>
         /// vmGuid control.
         /// </summary>
@@ -101,7 +103,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText vmGuid;
-        
+
         /// <summary>
         /// vmEnhancedMode control.
         /// </summary>
@@ -110,7 +112,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputCheckBox vmEnhancedMode;
-        
+
         /// <summary>
         /// domain control.
         /// </summary>
@@ -119,7 +121,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText domain;
-        
+
         /// <summary>
         /// user control.
         /// </summary>
@@ -128,7 +130,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText user;
-        
+
         /// <summary>
         /// password control.
         /// </summary>
@@ -137,7 +139,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputPassword password;
-        
+
         /// <summary>
         /// passwordHash control.
         /// </summary>
@@ -146,7 +148,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputHidden passwordHash;
-        
+
         /// <summary>
         /// mfaDiv control.
         /// </summary>
@@ -155,7 +157,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl mfaDiv;
-        
+
         /// <summary>
         /// mfaProvider control.
         /// </summary>
@@ -164,7 +166,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlAnchor mfaProvider;
-        
+
         /// <summary>
         /// mfaPassword control.
         /// </summary>
@@ -173,7 +175,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText mfaPassword;
-        
+
         /// <summary>
         /// program control.
         /// </summary>
@@ -182,7 +184,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText program;
-        
+
         /// <summary>
         /// connect control.
         /// </summary>
@@ -191,7 +193,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputSubmit connect;
-        
+
         /// <summary>
         /// adminDiv control.
         /// </summary>
@@ -200,7 +202,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl adminDiv;
-        
+
         /// <summary>
         /// adminUrl control.
         /// </summary>
@@ -209,7 +211,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlAnchor adminUrl;
-        
+
         /// <summary>
         /// adminText control.
         /// </summary>
@@ -218,7 +220,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl adminText;
-        
+
         /// <summary>
         /// connectError control.
         /// </summary>
@@ -227,7 +229,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl connectError;
-        
+
         /// <summary>
         /// hosts control.
         /// </summary>
@@ -236,7 +238,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl hosts;
-        
+
         /// <summary>
         /// enterpriseUserInfo control.
         /// </summary>
@@ -245,7 +247,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText enterpriseUserInfo;
-        
+
         /// <summary>
         /// newRDPHost control.
         /// </summary>
@@ -254,7 +256,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputButton newRDPHost;
-        
+
         /// <summary>
         /// newSSHHost control.
         /// </summary>
@@ -263,7 +265,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputButton newSSHHost;
-        
+
         /// <summary>
         /// logout control.
         /// </summary>
@@ -272,7 +274,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputButton logout;
-        
+
         /// <summary>
         /// hostsList control.
         /// </summary>
@@ -281,7 +283,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Repeater hostsList;
-        
+
         /// <summary>
         /// toolbarToggle control.
         /// </summary>
@@ -290,7 +292,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl toolbarToggle;
-        
+
         /// <summary>
         /// toolbar control.
         /// </summary>
@@ -299,7 +301,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl toolbar;
-        
+
         /// <summary>
         /// serverInfo control.
         /// </summary>
@@ -308,7 +310,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText serverInfo;
-        
+
         /// <summary>
         /// userInfo control.
         /// </summary>
@@ -317,7 +319,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText userInfo;
-        
+
         /// <summary>
         /// scale control.
         /// </summary>
@@ -326,7 +328,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputButton scale;
-        
+
         /// <summary>
         /// reconnect control.
         /// </summary>
@@ -335,7 +337,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputButton reconnect;
-        
+
         /// <summary>
         /// keyboard control.
         /// </summary>
@@ -344,7 +346,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputButton keyboard;
-        
+
         /// <summary>
         /// osk control.
         /// </summary>
@@ -362,7 +364,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputButton clipboard;
-        
+
         /// <summary>
         /// files control.
         /// </summary>
@@ -371,7 +373,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputButton files;
-        
+
         /// <summary>
         /// cad control.
         /// </summary>
@@ -380,7 +382,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputButton cad;
-        
+
         /// <summary>
         /// mrc control.
         /// </summary>
@@ -389,7 +391,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputButton mrc;
-        
+
         /// <summary>
         /// vswipe control.
         /// </summary>
@@ -398,7 +400,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputButton vswipe;
-        
+
         /// <summary>
         /// share control.
         /// </summary>
@@ -407,7 +409,7 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputButton share;
-        
+
         /// <summary>
         /// disconnect control.
         /// </summary>
@@ -425,5 +427,86 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputGenericControl imageQuality;
+
+        /// <summary>
+        /// loadingDiv control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl loadingDiv;
+
+        /// <summary>
+        /// certificateDiv control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl certificateDiv;
+
+        /// <summary>
+        /// remoteOperationsDivWrap control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl remoteOperationsDivWrap;
+
+        /// <summary>
+        /// remoteOperationsDiv control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl remoteOperationsDiv;
+
+        /// <summary>
+        /// clipboardOperDiv control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl clipboardOperDiv;
+
+        /// <summary>
+        /// winrOperDiv control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl winrOperDiv;
+
+        /// <summary>
+        /// ctrlaltdelOperDiv control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl ctrlaltdelOperDiv;
+
+        /// <summary>
+        /// resizeOperDiv control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl resizeOperDiv;
+
+        /// <summary>
+        /// disconnectOperDiv control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl disconnectOperDiv;
     }
 }
diff --git a/Myrtille.Web/Myrtille.Web.csproj b/Myrtille.Web/Myrtille.Web.csproj
index 1958eb4..a359d92 100644
--- a/Myrtille.Web/Myrtille.Web.csproj
+++ b/Myrtille.Web/Myrtille.Web.csproj
@@ -8,7 +8,7 @@
     <ProductVersion>8.0.50727</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F00C33EB-EDA4-4980-AC2A-0BF574913A24}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <ProjectTypeGuids></ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Myrtille.Web</RootNamespace>
@@ -18,7 +18,7 @@
     <OldToolsVersion>4.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <UseIISExpress>false</UseIISExpress>
     <TargetFrameworkProfile />
     <IISExpressSSLPort />
@@ -33,31 +33,6 @@
     <TypeScriptToolsVersion>3.1</TypeScriptToolsVersion>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Antlr3.Runtime, Version=3.4.1.9004, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
       <HintPath>..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
@@ -259,6 +234,7 @@
     <Compile Include="src\Clients\RemoteSessionProcessClient.cs" />
     <Compile Include="src\Handlers\RemoteSessionAudioSocketHandler.cs" />
     <Compile Include="src\Handlers\RemoteSessionSocketHandler.cs" />
+    <Compile Include="src\Utils\WebRequest.cs" />
     <Compile Include="src\WebInstaller.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -297,6 +273,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="css\securden.css" />
     <Content Include="css\xterm.css" />
     <Content Include="handlers\EventSourceHandler.ashx" />
     <Content Include="favicon.ico" />
@@ -313,6 +290,7 @@
     <Content Include="js\display\divs.js" />
     <Content Include="js\display\terminaldiv.js" />
     <Content Include="js\network\eventsource.js" />
+    <Content Include="js\securden.js" />
     <Content Include="js\network\websocket.js" />
     <Content Include="js\tools\convert.js" />
     <Content Include="js\tools\common.js" />
@@ -539,6 +517,14 @@
   <PropertyGroup>
     <ApplicationIcon>favicon.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <OutputPath>bin\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <OutputPath>bin\</OutputPath>
+  </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.targets" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.targets')" />
   <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
@@ -558,7 +544,7 @@
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>2323</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost/Myrtille</IISUrl>
+          <IISUrl>https://localhost/Myrtille</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>
diff --git a/Myrtille.Web/Web.Base.config b/Myrtille.Web/Web.Base.config
index 0bda4b2..3e1841e 100644
--- a/Myrtille.Web/Web.Base.config
+++ b/Myrtille.Web/Web.Base.config
@@ -32,7 +32,7 @@
       <appender-ref ref="LogFileAppender"/>
     </root>
     <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
-      <param name="File" value="log\Myrtille.Web.log"/>
+      <param name="File" value="..\logs\SecurdenRDP.Web.log"/>
       <param name="AppendToFile" value="true"/>
       <rollingStyle value="Size"/>
       <maxSizeRollBackups value="10"/>
@@ -76,10 +76,10 @@
   </system.diagnostics>
   
   <system.web>
-    <compilation defaultLanguage="C#" debug="true" targetFramework="4.5"/>
+    <compilation defaultLanguage="C#" debug="true" targetFramework="4.6.2"/>
     <!-- handle file upload/download up to 1GB. maxRequestLength is measured in kilobytes and executionTimeout in seconds -->
     <!-- handle querystrings up to 32KB (default 2KB). this can prove useful with large XHRs in HTML4 mode -->
-    <httpRuntime requestValidationMode="4.5" targetFramework="4.5" maxRequestLength="1048576" maxQueryStringLength="32768" executionTimeout="360000"/>
+    <httpRuntime requestValidationMode="4.6.2" targetFramework="4.6.2" maxRequestLength="1048576" maxQueryStringLength="32768" executionTimeout="360000"/>
     <pages enableViewState="false" validateRequest="false" enableEventValidation="false" clientIDMode="AutoID"/>
     <authorization>
       <allow users="*"/>
@@ -173,27 +173,27 @@
     <!-- providing access to the remote clipboard could be a security issue, it can be disabled below -->
     <add key="AllowRemoteClipboard" value="true"/>
     <!-- allow file transfer (requires a domain to be specified on connect) -->
-    <add key="AllowFileTransfer" value="true"/>
+    <add key="AllowFileTransfer" value="false"/>
     <!-- allow print download (through a pdf virtual printer). requires the "Myrtille PDF" printer to be installed -->
     <add key="AllowPrintDownload" value="false"/>
     <!-- allow remote session sharing (the session is broadcasted to all guests; read/write access is granted individually) -->
-    <add key="AllowSessionSharing" value="true"/>
+    <add key="AllowSessionSharing" value="false"/>
     <!-- allow audio plaback -->
-    <add key="AllowAudioPlayback" value="true"/>
+    <add key="AllowAudioPlayback" value="false"/>
     <!-- share a session by url, with owner rights. set to false to disable and provide a session url spoofing protection. requires cookieless="UseUri" session state (system.web/sessionState section above) -->
     <!-- if a session is shared by url between different clients, each client is identified by a unique key instead of the http session id -->
     <add key="AllowShareSessionUrl" value="true"/>
     <!-- client ip protection -->
-    <add key="ClientIPTracking" value="false"/>
+    <add key="ClientIPTracking" value="true"/>
     <!-- if the browser window/tab of the remote session owner is closed without disconnecting first, or if the connection is lost, delay (ms) before the remote session is disconnected by the gateway. value must be greater than "browserPulseInterval" defined into config.js (default 10 secs). 0 to disable -->
     <!-- this comes in addition but does not replace the session idle timeout, defined at the RDS level, which will disconnect the session after no user inputs are received for a given time, independently of Myrtille -->
     <add key="ClientIdleTimeout" value="0"/>
     <!-- audio buffer. improves the audio quality at the expense of a slight latency -->
-    <add key="AudioBuffering" value="true"/>
+    <add key="AudioBuffering" value="false"/>
     <!-- show or hide the toolbar (you can hide it if using your own UI) -->
-    <add key="ToolbarEnabled" value="true"/>
+    <add key="ToolbarEnabled" value="false"/>
     <!-- connect from a login page or url (you can disable it if using a connection API) -->
-    <add key="LoginEnabled" value="true"/>
+    <add key="LoginEnabled" value="false"/>
     <!-- if login is enabled, url of the login page (change it if using your own page or leave empty to use the default page) -->
     <add key="LoginUrl" value=""/>
     <!-- recycle the application pool when there is no active remote session; not applicable if using the enterprise mode -->
diff --git a/Myrtille.Web/Web.config b/Myrtille.Web/Web.config
new file mode 100644
index 0000000..46f1f83
--- /dev/null
+++ b/Myrtille.Web/Web.config
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+  <!--
+    CAUTION! logging requires the ASP.NET IIS worker process to have write permission to the "log" folder.
+    Among other options, you may grant the myrtille application pool ("IIS AppPool\MyrtilleAppPool") write permission to it (normally automatically set by the myrtille installer).
+  -->
+
+  <configSections>
+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, Log4net"/>
+    <sectionGroup name="applicationSettings"
+      type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="Myrtille.Web.Properties.Settings"
+        type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
+    </sectionGroup>
+  </configSections>
+
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.5.1.25624" newVersion="1.5.2.14234"/>
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+  
+  <log4net>
+    <root>
+      <level value="DEBUG"/>
+      <appender-ref ref="LogFileAppender"/>
+    </root>
+    <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
+      <param name="File" value="..\logs\SecurdenRDP.Web.log"/>
+      <param name="AppendToFile" value="true"/>
+      <rollingStyle value="Size"/>
+      <maxSizeRollBackups value="10"/>
+      <maximumFileSize value="10MB"/>
+      <staticLogFileName value="true"/>
+      <layout type="log4net.Layout.PatternLayout">
+        <param name="ConversionPattern" value="%date [%thread] %-5level %logger [%property{NDC}] - %message%newline"/>
+      </layout>
+    </appender>
+  </log4net>
+
+  <system.diagnostics>
+    <trace autoflush="true" indentsize="4">
+      <listeners>
+        <add name="Log4netTraceListener" type="Myrtille.Log.Log4netTraceListener, Myrtille.Common">
+          <!-- trace level (Information, Warning or Error). CAUTION! Information level will hinder performance -->
+          <filter type="Myrtille.Log.Log4netTraceFilter, Myrtille.Common" initializeData="Error"/>
+        </add>
+        <!-- disable output window traces. CAUTION! enabling the default output window will hinder performance -->
+        <remove name="Default"/>
+      </listeners>
+    </trace>
+    <!-- enable the lines below for WCF tracing (caution as it will hinder performance). Use SvcTraceViewer.exe as viewer -->
+    <!--
+    <sources>
+      <source name="System.ServiceModel" switchValue="Information, ActivityTracing" propagateActivity="true">
+        <listeners>
+          <add name="xml" />
+        </listeners>
+      </source>
+      <source name="System.ServiceModel.MessageLogging">
+        <listeners>
+          <add name="xml" />
+        </listeners>
+      </source>
+    </sources>
+    <sharedListeners>
+      <add initializeData="log\Myrtille.Web.svclog" type="System.Diagnostics.XmlWriterTraceListener" name="xml" />
+    </sharedListeners>
+    -->
+  </system.diagnostics>
+  
+  <system.web>
+    <compilation defaultLanguage="C#" targetFramework="4.6.2"/>
+    <!-- handle file upload/download up to 1GB. maxRequestLength is measured in kilobytes and executionTimeout in seconds -->
+    <!-- handle querystrings up to 32KB (default 2KB). this can prove useful with large XHRs in HTML4 mode -->
+    <httpRuntime requestValidationMode="4.6.2" targetFramework="4.6.2" maxRequestLength="1048576" maxQueryStringLength="32768" executionTimeout="360000"/>
+    <pages enableViewState="false" validateRequest="false" enableEventValidation="false" clientIDMode="AutoID"/>
+    <authorization>
+      <allow users="*"/>
+    </authorization>
+    <authentication mode="None"/>
+    <!-- CAUTION! cookieless="UseUri" allows multiple connections/tabs but, as the http session id is passed into the url, it also implies a risk of session spoofing
+    to mitigate that risk, an authentication cookie is stored into the browser initiating the http session; any other client accessing the http session without it will be rejected
+    please note that, even if the http session is cookieless, this mechanism requires cookies to be enabled client side
+    the "cookieless=" attribute is really confusing because it's in fact the method used by the browser to send the http session id... and using a cookie is the standard way to do it
+    if using myrtille within iframe(s) on a same page, cookieless="UseUri" must be used -->
+    <sessionState mode="InProc" cookieless="UseUri" timeout="60"/>
+    <!--<sessionState mode="InProc" cookieless="UseCookies" cookieName="AuthSecToken" timeout="60"/>-->
+    <globalization requestEncoding="utf-8" responseEncoding="utf-8" culture="auto" uiCulture="auto"/>
+  </system.web>
+  
+  <system.webServer>
+    <defaultDocument>
+      <files>
+        <clear/>
+        <add value="Default.aspx"/>
+      </files>
+    </defaultDocument>
+    <urlCompression doDynamicCompression="false"/>
+    <staticContent>
+      <mimeMap fileExtension=".webp" mimeType="image/webp"/>
+    </staticContent>
+    <security>
+      <requestFiltering>
+        <!-- handle file upload/download up to 1GB. maxAllowedContentLength is measured in bytes -->
+        <!-- handle querystrings up to 32KB (default 2KB). this can prove useful with large XHRs in HTML4 mode -->
+        <requestLimits maxAllowedContentLength="1073741824" maxQueryString="32768"/>
+      </requestFiltering>
+    </security>
+    <handlers>
+      <add path="/handlers/SocketHandler.ashx" verb="*" name="SocketHandler" type="Myrtille.Web.SocketHandler"/>
+      <add path="/handlers/AudioSocketHandler.ashx" verb="*" name="AudioSocketHandler" type="Myrtille.Web.AudioSocketHandler"/>
+      <add path="/handlers/EventSourceHandler.ashx" verb="*" name="EventSourceHandler" type="Myrtille.Web.EventSourceHandler"/>
+      <add path="/handlers/LongPollingHandler.ashx" verb="*" name="LongPollingHandler" type="Myrtille.Web.LongPollingHandler"/>
+    </handlers>
+  </system.webServer>
+
+  <system.serviceModel>
+
+    <client>
+      <endpoint address="http://localhost:8080/Myrtille/RemoteSessionProcess" binding="wsDualHttpBinding" bindingConfiguration="wsDualHttpBindingCallback"
+        contract="Myrtille.Services.Contracts.IRemoteSessionProcess"/>
+      <endpoint address="http://localhost:8080/Myrtille/FileStorage" binding="basicHttpBinding" bindingConfiguration="basicHttpBindingFileStream"
+        contract="Myrtille.Services.Contracts.IFileStorage"/>
+      <endpoint address="http://localhost:8080/Myrtille/PrinterService" binding="basicHttpBinding" bindingConfiguration="basicHttpBindingFileStream"
+        contract="Myrtille.Services.Contracts.IPrinterService"/>
+      <endpoint address="http://localhost:8080/Myrtille/MFAAuthentication" binding="basicHttpBinding" contract="Myrtille.Services.Contracts.IMFAAuthentication"/>
+      <endpoint address="http://localhost:8080/Myrtille/EnterpriseService" binding="basicHttpBinding" contract="Myrtille.Services.Contracts.IEnterpriseService"/>
+      <endpoint address="http://localhost:8080/Myrtille/ApplicationPoolService" binding="basicHttpBinding"
+        contract="Myrtille.Services.Contracts.IApplicationPoolService"/>
+    </client>
+
+    <bindings>
+      <wsDualHttpBinding>
+        <binding name="wsDualHttpBindingCallback" receiveTimeout="infinite" maxReceivedMessageSize="2147483647">
+          <security mode="None"/>
+          <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647"
+            maxNameTableCharCount="2147483647"/>
+          <reliableSession inactivityTimeout="infinite"/>
+        </binding>
+      </wsDualHttpBinding>
+      <basicHttpBinding>
+        <!-- buffer size: 64KB; max file size: 1GB -->
+        <binding name="basicHttpBindingFileStream" transferMode="Streamed" messageEncoding="Mtom" maxBufferSize="65536" maxReceivedMessageSize="1073741824"
+          closeTimeout="infinite" openTimeout="infinite" receiveTimeout="infinite" sendTimeout="infinite">
+          <security mode="None"/>
+        </binding>
+      </basicHttpBinding>
+    </bindings>
+
+    <!-- enable the lines below for WCF tracing (caution as it will hinder performance). Use SvcTraceViewer.exe as viewer -->
+    <!--
+    <diagnostics>
+      <messageLogging logEntireMessage="true" maxMessagesToLog="300" logMessagesAtServiceLevel="true" logMalformedMessages="true" logMessagesAtTransportLevel="true" />
+    </diagnostics>
+    -->
+
+  </system.serviceModel>
+
+  <applicationSettings>
+    <Myrtille.Web.Properties.Settings>
+      <setting name="ConnectionServiceUrl" serializeAs="String">
+        <value>http://localhost:8008/MyrtilleAdmin/ConnectionService/</value>
+      </setting>
+    </Myrtille.Web.Properties.Settings>
+  </applicationSettings>
+
+  <appSettings>
+    <!-- disable Visual Studio SignalR -->
+    <add key="vs:EnableBrowserLink" value="false"/>
+    <!-- disable Visual Studio Page Inspector -->
+    <add key="PageInspector:ServerCodeMappingSupport" value="Disabled"/>
+    <!-- providing access to the remote clipboard could be a security issue, it can be disabled below -->
+    <add key="AllowRemoteClipboard" value="true"/>
+    <!-- allow file transfer (requires a domain to be specified on connect) -->
+    <add key="AllowFileTransfer" value="false"/>
+    <!-- allow print download (through a pdf virtual printer). requires the "Myrtille PDF" printer to be installed -->
+    <add key="AllowPrintDownload" value="false"/>
+    <!-- allow remote session sharing (the session is broadcasted to all guests; read/write access is granted individually) -->
+    <add key="AllowSessionSharing" value="false"/>
+    <!-- allow audio plaback -->
+    <add key="AllowAudioPlayback" value="false"/>
+    <!-- share a session by url, with owner rights. set to false to disable and provide a session url spoofing protection. requires cookieless="UseUri" session state (system.web/sessionState section above) -->
+    <!-- if a session is shared by url between different clients, each client is identified by a unique key instead of the http session id -->
+    <add key="AllowShareSessionUrl" value="true"/>
+    <!-- client ip protection -->
+    <add key="ClientIPTracking" value="true"/>
+    <!-- if the browser window/tab of the remote session owner is closed without disconnecting first, or if the connection is lost, delay (ms) before the remote session is disconnected by the gateway. value must be greater than "browserPulseInterval" defined into config.js (default 10 secs). 0 to disable -->
+    <!-- this comes in addition but does not replace the session idle timeout, defined at the RDS level, which will disconnect the session after no user inputs are received for a given time, independently of Myrtille -->
+    <add key="ClientIdleTimeout" value="0"/>
+    <!-- audio buffer. improves the audio quality at the expense of a slight latency -->
+    <add key="AudioBuffering" value="false"/>
+    <!-- show or hide the toolbar (you can hide it if using your own UI) -->
+    <add key="ToolbarEnabled" value="false"/>
+    <!-- connect from a login page or url (you can disable it if using a connection API) -->
+    <add key="LoginEnabled" value="false"/>
+    <!-- if login is enabled, url of the login page (change it if using your own page or leave empty to use the default page) -->
+    <add key="LoginUrl" value=""/>
+    <!-- recycle the application pool when there is no active remote session; not applicable if using the enterprise mode -->
+    <add key="IdleAppPoolRecycling" value="false"/>
+  </appSettings>
+  
+</configuration>
\ No newline at end of file
diff --git a/Myrtille.Web/css/securden.css b/Myrtille.Web/css/securden.css
new file mode 100644
index 0000000..47c8bb3
--- /dev/null
+++ b/Myrtille.Web/css/securden.css
@@ -0,0 +1,390 @@
+.web-rdp-session-body, * {
+    font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol"
+}
+
+.container.webrdp-container-body {
+    position: relative;
+    text-align: center;
+}
+
+span.webrdp-error-icon {
+    position: absolute;
+    width: 27px;
+    height: 27px;
+    opacity: 1;
+    background-color: #ff5353;
+    border-radius: 50px;
+    margin: 11px 0 0 5px;
+    left: 40px;
+    top: 21px;
+}
+
+    span.webrdp-error-icon:before, span.webrdp-error-icon:after {
+        position: absolute;
+        content: ' ';
+        height: 15px;
+        width: .139rem;
+        background-color: #ffffff;
+        top: 6px;
+        left: 12.5px;
+    }
+
+    span.webrdp-error-icon:after {
+        transform: rotate(-45deg);
+    }
+
+    span.webrdp-error-icon:before {
+        transform: rotate(45deg);
+    }
+
+span.webrdp-success-icon {
+    font-size: 11px;
+    list-style-type: none;
+    padding: 0;
+    position: absolute;
+    left: 50px;
+    top: 30px;
+    height: 27px;
+    width: 27px;
+    opacity: 1;
+    border-radius: 50px;
+    background-color: #4bad20;
+}
+
+    span.webrdp-success-icon:before {
+        content: " ";
+        width: .3em;
+        height: .9em;
+        border: solid #fff;
+        border-width: 0 .3em .3em 0;
+        position: absolute;
+        left: 0.92em;
+        top: 32%;
+        margin-top: -.2em;
+        -webkit-transform: rotate(45deg);
+        -moz-transform: rotate(45deg);
+        -o-transform: rotate(45deg);
+        transform: rotate(45deg);
+    }
+
+.webrdp-back-btn:hover {
+    background-color: #e92a2a;
+}
+
+.dialog-message-div {
+    z-index: 100;
+    color: #fff;
+    text-align: center;
+    display: inline-block;
+    margin: 0 auto;
+    position: relative;
+    background-color: #eee;
+    padding: 32px 60px 30px 90px;
+    border-radius: 4px;
+    margin-top: 150px;
+    min-height: 90px;
+    font-size: 18px;
+    border: 1px solid #ccc;
+    box-shadow: 0px 0px 30px rgba(169, 169, 169, .5);
+}
+
+span.webrdp-dialog-message-text {
+    display: block;
+    color: #222222;
+    font-weight: 500;
+}
+
+.webrdp-back-btn {
+    margin: 20px 0 0 -30px;
+    background-color: #ff5353;
+    display: inline-block;
+    padding: 5px 15px;
+    border-radius: 3px;
+    cursor: pointer;
+    font-size: 15px;
+}
+
+.success-message-div .webrdp-back-btn {
+    background-color: #4bad20;
+}
+
+.label-text {
+    float: left;
+    line-height: 40px;
+    background-color: #f1f1f1;
+    text-align: center;
+    width: 130px;
+    cursor: pointer;
+}
+
+    .label-text:hover {
+        color: #000000;
+        background-color: #eeeeee;
+    }
+
+.sec-loading-wrap {
+    position: absolute;
+    top: 0;
+    left: 0;
+    transform: translateY(-50%);
+    width: calc(100% - 200px);
+    color: #ffffff;
+    padding: 0 100px;
+    text-align: center;
+    bottom: 0;
+    margin: auto;
+    height: 70px;
+}
+
+.sec-loading-circle {
+  margin-top: 10px;
+}
+
+    .sec-loading-circle label {
+        font-size: 0px;
+        opacity: 0;
+        display: inline-block;
+        width: 7px;
+        height: 7px;
+        background-color: #fff;
+        border-radius: 50%;
+        float: none;
+        margin: 0;
+    }
+
+.loading-text {
+    width: 100%;
+    text-align: center;
+    font-size: 22px;
+    margin-top: 10px;
+}
+@keyframes connecting {
+  0% {
+    opacity: 0;
+    transform: translateX(-300px);
+  }
+  33% {
+    opacity: 1;
+    transform: translateX(0px);
+  }
+  66% {
+    opacity: 1;
+    transform: translateX(0px);
+  }
+  100% {
+    opacity: 0;
+    transform: translateX(300px);
+  }
+}
+
+@-webkit-keyframes connecting {
+  0% {
+    opacity: 0;
+    -webkit-transform: translateX(-300px);
+  }
+  33% {
+    opacity: 1;
+    -webkit-transform: translateX(0px);
+  }
+  66% {
+    opacity: 1;
+    -webkit-transform: translateX(0px);
+  }
+  100% {
+    opacity: 0;
+    -webkit-transform: translateX(300px);
+  }
+}
+
+.sec-loading-circle label:nth-child(6) {
+  -webkit-animation: connecting 3s infinite ease-in-out;
+  animation: connecting 3s infinite ease-in-out;
+}
+
+.sec-loading-circle label:nth-child(5) {
+  -webkit-animation: connecting 3s 100ms infinite ease-in-out;
+  animation: connecting 3s 100ms infinite ease-in-out;
+}
+
+.sec-loading-circle label:nth-child(4) {
+  -webkit-animation: connecting 3s 200ms infinite ease-in-out;
+  animation: connecting 3s 200ms infinite ease-in-out;
+}
+
+.sec-loading-circle label:nth-child(3) {
+  -webkit-animation: connecting 3s 300ms infinite ease-in-out;
+  animation: connecting 3s 300ms infinite ease-in-out;
+}
+
+.sec-loading-circle label:nth-child(2) {
+  -webkit-animation: connecting 3s 400ms infinite ease-in-out;
+  animation: connecting 3s 400ms infinite ease-in-out;
+}
+
+.sec-loading-circle label:nth-child(1) {
+  -webkit-animation: connecting 3s 500ms infinite ease-in-out;
+  animation: connecting 3s 500ms infinite ease-in-out;
+}
+
+#remoteOperationsDiv {
+    position: absolute;
+    text-align: center;
+    height: 56px;
+    top: -56px;
+    left: calc(50% - 300px);
+    opacity: .75;
+    background-color: #26282a;
+    transition: top .5s ease-in-out;
+    z-index: 1000;
+}
+
+    #remoteOperationsDiv:hover {
+        opacity: 1;
+        top: 0 !important;
+    }
+
+.remote-oper-label-text {
+    float: left;
+    text-align: center;
+    cursor: pointer !important;
+    font-size: 13px;
+    color: #ffffff;
+    padding: 10px 20px 0 20px;
+    height: 56px;
+    box-sizing: border-box;
+    width: 120px;
+}
+
+    .remote-oper-label-text span {
+        width: 100%;
+        float: left;
+        margin-bottom: 1px;
+    }
+
+svg {
+    width: 16px;
+    height: 16px;
+    fill: #ffffff;
+}
+
+.remote-oper-label-text:hover {
+    color: #ffffff;
+    background-color: #2096f3;
+}
+
+.show-icon {
+    position: absolute;
+    width: 50px;
+    height: 24px;
+    bottom: -24px;
+    left: 44%;
+    box-sizing: border-box;
+    padding-top: 5px;
+    top: auto;
+    border-radius: 0 0 3px 3px;
+    background-color: #2096f3;
+    cursor: move;
+}
+
+#remoteOperationsDivWrap:hover .show-icon {
+    background-color: #3d4042;
+}
+
+.remote-clip-span {
+    font-weight: normal !important;
+    height: 50px;
+    display: block;
+    line-height: 50px;
+    box-sizing: border-box;
+    font-size: 14px;
+    text-align: center;
+}
+
+.remote-clip-input {
+    resize: none;
+    width: 520px !important;
+    margin-left: 12px;
+}
+
+.remote-clip-button {
+    float: left;
+    margin: 8px 5px 5px;
+    font-size: 14px;
+    font-weight: bold;
+    border-radius: 2px;
+    cursor: pointer;
+    padding: 5px 15px;
+}
+
+    .remote-clip-button.remote-clip-copy {
+        background-color: #2196F3;
+        margin-left: 210px;
+    }
+
+    .remote-clip-button.remote-clip-close {
+        background-color: #d5d5d5;
+        color: #666;
+    }
+
+.remote-oper-label-text-icon {
+    height: 20px;
+}
+
+.remote-oper-label-text-val {
+    font-size: 12px;
+    margin-top: 2px;
+}
+
+.clipboard-icon svg {
+    height: 16px;
+    width: 16px;
+}
+
+.win-r-icon {
+    margin-top: -1px;
+    margin-bottom: 2px !important;
+}
+
+.win-r-icon svg {
+    height: 20px;
+    width: 20px;
+}
+
+.ctrl-alt-del-icon svg {
+    height: 16px;
+    width: 16px;
+}
+
+.disconnect-icon svg {
+    height: 15px;
+    width: 15px;
+}
+
+#pasteClipboardPopup {
+    width: 550px !important;
+    height: 260px !important;
+}
+
+.overlay {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.5);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    z-index: 1000;
+    visibility: inherit;
+}
+
+.dialog {
+    background-color: white;
+    padding: 20px;
+    border-radius: 8px;
+    width: 300px;
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
+    text-align: center;
+    color: black;
+}
\ No newline at end of file
diff --git a/Myrtille.Web/favicon.ico b/Myrtille.Web/favicon.ico
index 1ac6cc9..eb15780 100644
Binary files a/Myrtille.Web/favicon.ico and b/Myrtille.Web/favicon.ico differ
diff --git a/Myrtille.Web/js/config.js b/Myrtille.Web/js/config.js
index 2092fd6..4d5fbd1 100644
--- a/Myrtille.Web/js/config.js
+++ b/Myrtille.Web/js/config.js
@@ -137,7 +137,7 @@ function Config(
     var adaptiveFullscreenTimeout = 1500;                           // adaptive fullscreen update (ms); requested after a given period of user inactivity (=no input). fullscreen updates in adaptive mode are always done in higher quality (75%), regardless of the current image quality and bandwidth usage. 0 to disable
 
     // audio
-    var audioFormat = audioFormatEnum.WAV;                          // audio format (HTML5); requires websocket enabled and RDP host; IE doesn't support WAV format (MP3 fallback); others: WAV and MP3 support
+    var audioFormat = audioFormatEnum.NONE;                         // audio format (HTML5); requires websocket enabled and RDP host; IE doesn't support WAV format (MP3 fallback); others: WAV and MP3 support
     var audioBitrate = 1411;                                        // bitrate (kbps); possible values for WAV: 1411 (44100 Hz, 16 bits stereo); possible values for MP3: 128, 160, 256, 320 (CBR); lower = lesser quality, but also less bandwidth usage (128 kbps is good enough for sound notifications)
 
     // network
diff --git a/Myrtille.Web/js/display/canvas.js b/Myrtille.Web/js/display/canvas.js
index 29abf63..b71d98f 100644
--- a/Myrtille.Web/js/display/canvas.js
+++ b/Myrtille.Web/js/display/canvas.js
@@ -51,6 +51,7 @@ function Canvas(base, config, dialog, display)
 
                 // set a tab index so the canvas can be focused
                 canvasObject.setAttribute('tabindex', 0);
+                canvasObject.id = "canvasDisplayEle";
 
                 // disable drag & drop
                 canvasObject.setAttribute('draggable', false);
diff --git a/Myrtille.Web/js/myrtille.js b/Myrtille.Web/js/myrtille.js
index 7288620..d900c4f 100644
--- a/Myrtille.Web/js/myrtille.js
+++ b/Myrtille.Web/js/myrtille.js
@@ -113,7 +113,8 @@ function Myrtille(httpServerUrl, connectionState, statEnabled, debugEnabled, com
         }
         catch (exc)
         {
-            alert('myrtille init error: ' + exc.message);
+            alert('Unexpected Error');
+            console.log('init error: ' + exc.message);
             throw exc;
         }
     };
@@ -346,7 +347,7 @@ function startMyrtille(connectionState, statEnabled, debugEnabled, compatibility
     }
     catch (exc)
     {
-        alert('failed to start myrtille: ' + exc.message);
+        alert('failed to start: ' + exc.message);
         myrtille = null;
     }
 }
@@ -549,6 +550,15 @@ function toggleCompatibilityMode()
     }
 }
 
+function scaleDisplay() {
+    var width = display.getBrowserWidth();
+    var height = display.getBrowserHeight();
+
+    // send resolution while enabling display scaling
+    network.send(myrtille.getCommandEnum().SET_SCALE_DISPLAY.text + ((config.getKeepAspectRatio() ? '1' : '0') + '|' + width + 'x' + height));
+
+}
+
 function toggleScaleDisplay()
 {
     try
@@ -646,7 +656,11 @@ this.writeClipboard = function(text)
         else
         {
             dialog.showDebug('async clipboard API is not supported or clipboard write access is denied (do you use HTTPS?)');
-            openPopup('copyClipboardPopup', 'CopyClipboard.aspx');
+            if (window.clipboardData) {
+                window.clipboardData.setData("Text", text);
+            } else {
+                openPopup('copyClipboardPopup', 'CopyClipboard.aspx');
+            }
         }
     }
     catch (exc)
@@ -698,7 +712,7 @@ this.sendText = function(text)
     }
 }
 
-this.sendKey = function(keyCode, release)
+this.sendKey = function(keyCode, release, secondaryKeyCode)
 {
     try
     {
@@ -712,9 +726,16 @@ this.sendKey = function(keyCode, release)
         var keys = new Array();
 
         keys.push(myrtille.getCommandEnum().SEND_KEY_SCANCODE.text + keyCode + '-1');
+        if (secondaryKeyCode) {
+            keys.push(myrtille.getCommandEnum().SEND_KEY_SCANCODE.text + secondaryKeyCode + '-1');
+        }
 
-        if (release)
+        if (release) {
             keys.push(myrtille.getCommandEnum().SEND_KEY_SCANCODE.text + keyCode + '-0');
+            if (secondaryKeyCode) {
+                keys.push(myrtille.getCommandEnum().SEND_KEY_SCANCODE.text + secondaryKeyCode + '-0');
+            }
+        }
                 
         network.processUserEvent('keyboard', keys.toString());
     }
@@ -752,7 +773,7 @@ this.sendChar = function(char, release)
     }
 }
 
-this.sendCtrlAltDel = function()
+this.sendCtrlAltDel = function ()
 {
     try
     {
@@ -782,6 +803,16 @@ this.sendCtrlAltDel = function()
     }
 }
 
+this.sendWinR = function () {
+    try {
+        // win + r
+        sendKey(91, true, 82);
+    }
+    catch (exc) {
+        dialog.showDebug('myrtille sendWinR error: ' + exc.message);
+    }
+}
+
 this.setKeyCombination = function()
 {
     try
@@ -793,7 +824,7 @@ this.setKeyCombination = function()
     }
     catch (exc)
     {
-        alert('myrtille setKeyCombination error: ' + exc.message);
+        alert('setKeyCombination error: ' + exc.message);
     }
 }
 
@@ -892,7 +923,7 @@ this.downloadPdf = function(name)
     }
 	catch (exc)
 	{
-        alert('myrtille downloadPdf error: ' + exc.message);
+        alert('downloadPdf error: ' + exc.message);
 	}
 }
 
@@ -914,7 +945,7 @@ this.printPdf = function()
     }
 	catch (exc)
 	{
-        alert('myrtille printPdf error: ' + exc.message);
+        alert('printPdf error: ' + exc.message);
 	}
 }
 
@@ -927,7 +958,7 @@ this.writeTerminal = function(data)
     }
     catch (exc)
     {
-        alert('myrtille writeTerminal error: ' + exc.message);
+        alert('writeTerminal error: ' + exc.message);
     }
 }
 
@@ -937,9 +968,10 @@ this.doDisconnect = function()
     {
         disableToolbar();
         network.send(myrtille.getCommandEnum().CLOSE_CLIENT.text);
+        closeTab();
     }
     catch (exc)
     {
-        dialog.showDebug('myrtille doDisconnect error: ' + exc.message);
+        dialog.showDebug('doDisconnect error: ' + exc.message);
     }
 }
\ No newline at end of file
diff --git a/Myrtille.Web/js/network/websocket.js b/Myrtille.Web/js/network/websocket.js
index 32cca43..745a07a 100644
--- a/Myrtille.Web/js/network/websocket.js
+++ b/Myrtille.Web/js/network/websocket.js
@@ -377,6 +377,8 @@ function Websocket(base, config, dialog, display, network)
                     processMessage(text);
                 }
                 // image
+
+
                 else
                 {
                     var imgInfo, idx, posX, posY, width, height, format, quality, fullscreen, imgData;
diff --git a/Myrtille.Web/js/securden.js b/Myrtille.Web/js/securden.js
new file mode 100644
index 0000000..df927e4
--- /dev/null
+++ b/Myrtille.Web/js/securden.js
@@ -0,0 +1,153 @@
+var disableUserClose = true;
+var isSessionConnected = false;
+var isCloseTabCalled = false;
+
+this.isIEBrowserExceptEdge = function () {
+    var ua = navigator.userAgent;
+
+    // IE 10 or older
+    var msie = ua.indexOf('MSIE ');
+    if (msie > 0) {
+        return true;
+    }
+
+    // IE 11
+    var trident = ua.indexOf('Trident/');
+    if (trident > 0) {
+        return true;
+    }
+
+    return false;
+};
+
+window.onbeforeunload = function (evt) {
+    if (disableUserClose) {
+        if (!isIEBrowserExceptEdge() || isSessionConnected) {
+            return "Do you want to close tab?";
+        }
+    }
+}
+
+window.onunload = function (evt) {
+    if (isSessionConnected) {
+        doDisconnect();
+    }
+}
+
+function hideLoadingDiv() {
+    if (document.getElementById('loadingDiv')) {
+        document.getElementById('loadingDiv').style.display = 'none';
+    }
+}
+
+function showRemoteOperationsDiv() {
+    if (document.getElementById('remoteOperationsDiv')) {
+        document.getElementById('remoteOperationsDiv').style.display = 'block';
+    }
+}
+
+function hideRemoteOperationsDiv() {
+    if (document.getElementById('remoteOperationsDiv')) {
+        document.getElementById('remoteOperationsDiv').style.display = 'none';
+    }
+}
+
+function showErrorMessage(message, hideCloseButton) {
+    hideLoadingDiv();
+    hideRemoteOperationsDiv();
+    if (message) {
+        document.getElementById("webrdp-error-text").innerText = message;
+    }
+    if (hideCloseButton) {
+        document.getElementById("webrdp-back-home-btn").style.display = "none";
+    }
+    document.getElementById("errorMessageDialogEle").style.display = "block";
+}
+
+function onSessionConnection() {
+    isSessionConnected = true;
+    hideLoadingDiv();
+    setTimeout(showRemoteOperationsDiv, 2000);
+}
+
+function onSessionDisconnection() {
+    disableUserClose = false;
+    if (!isSessionConnected && document.getElementById('loadingDiv')) {
+        showErrorMessage();
+    } else {
+        closeTab();
+    }
+}
+
+function disconnectSession() {
+    if (confirm("Do you want to disconnect? The remote session will be simply disconnected and not logged out.")) {
+        disableUserClose = false;
+        doDisconnect();
+    }
+}
+
+function resizeSession() {
+    window.onbeforeunload = null;
+    window.onunload = null;
+    scaleDisplay();
+}
+
+function closeTab() {
+    if (isCloseTabCalled) {
+        return;
+    }
+    isCloseTabCalled = true;
+    disableUserClose = false;
+    window.close();
+    hideLoadingDiv();
+    hideRemoteOperationsDiv();
+    setTimeout(function () { showErrorMessage("Unexpected Error.", true); }, 1000);
+}
+
+function dragElement(elmnt) {
+    var clientWidth = window.innerWidth;
+    var pos1 = 0, pos2 = 0, pos3 = 0, pos4 = 0;
+    if (document.getElementById(elmnt.id + "Header")) {
+        /* if present, the header is where you move the DIV from:*/
+        document.getElementById(elmnt.id + "Header").onmousedown = dragMouseDown;
+    } else {
+        /* otherwise, move the DIV from anywhere inside the DIV:*/
+        elmnt.onmousedown = dragMouseDown;
+    }
+
+    function dragMouseDown(e) {
+        e = e || window.event;
+        e.preventDefault();
+        // get the mouse cursor position at startup:
+        pos3 = e.clientX;
+        pos4 = e.clientY;
+        document.onmouseup = closeDragElement;
+        // call a function whenever the cursor moves:
+        document.onmousemove = elementDrag;
+    }
+
+    function elementDrag(e) {
+        e = e || window.event;
+        e.preventDefault();
+        // calculate the new cursor position:
+        pos1 = pos3 - e.clientX;
+        pos2 = pos4 - e.clientY;
+        pos3 = e.clientX;
+        pos4 = e.clientY;
+        // set the element's new position:
+        var leftPos = elmnt.offsetLeft - pos1;
+        if (leftPos > (clientWidth - elmnt.offsetWidth)) {
+            leftPos = clientWidth - elmnt.offsetWidth;
+        }
+        if (leftPos < 0) {
+            leftPos = 0;
+        }
+        elmnt.style.left = leftPos + "px";
+    }
+
+    function closeDragElement() {
+        /* stop moving when mouse button is released:*/
+        document.onmouseup = null;
+        document.onmousemove = null;
+    }
+}
diff --git a/Myrtille.Web/js/user.js b/Myrtille.Web/js/user.js
index 44ea770..451bc85 100644
--- a/Myrtille.Web/js/user.js
+++ b/Myrtille.Web/js/user.js
@@ -193,6 +193,8 @@ function User(base, config, dialog, display, network)
         if (config.getBrowserResize() == config.getBrowserResizeEnum().NONE)
             return;
 
+        return;
+
         try
         {
             disableToolbar();
diff --git a/Myrtille.Web/js/user/mouse.js b/Myrtille.Web/js/user/mouse.js
index 479794c..771b6e3 100644
--- a/Myrtille.Web/js/user/mouse.js
+++ b/Myrtille.Web/js/user/mouse.js
@@ -176,6 +176,9 @@ function Mouse(base, config, dialog, display, network, user)
             if (!processEvent(e))
                 return false;
 
+            if (e.target.id != "canvasDisplayEle")
+                return false;
+
             user.triggerActivity();
 
             // IE
diff --git a/Myrtille.Web/popups/CopyClipboard.aspx b/Myrtille.Web/popups/CopyClipboard.aspx
index 894ad2f..4dfef41 100644
--- a/Myrtille.Web/popups/CopyClipboard.aspx
+++ b/Myrtille.Web/popups/CopyClipboard.aspx
@@ -73,11 +73,11 @@
                             // working on Edge and every other browsers
                             if (!parent.getMyrtille().getDisplay().isIEBrowser())
                             {
-                                alert('clipboard successfully synchronized');
+                                alert('Text copied from the clipboard of the remote computer.');
                             }
                             else
                             {
-                                alert('IE detected, hit Ctrl+C (Cmd-C on Mac) if you want to synchronize the clipboard');
+                                //alert('IE detected, hit Ctrl+C (Cmd-C on Mac) if you want to synchronize the clipboard');
                             }
                         }
                         else
diff --git a/Myrtille.Web/popups/PasteClipboard.aspx b/Myrtille.Web/popups/PasteClipboard.aspx
index 8e725af..bddd9aa 100644
--- a/Myrtille.Web/popups/PasteClipboard.aspx
+++ b/Myrtille.Web/popups/PasteClipboard.aspx
@@ -26,6 +26,8 @@
     <head>
         <title>Myrtille</title>
         <link rel="stylesheet" type="text/css" href="../css/Default.css"/>
+        <link rel="stylesheet" type="text/css" href="../css/securden.css"/>
+
         <script language="javascript" type="text/javascript" src="../js/tools/convert.js"></script>
 	</head>
 
@@ -34,13 +36,15 @@
         <form method="get" runat="server">
             
             <div>
-                <span id="pasteClipboardPopupDesc">
-                    Type or paste some text then click send
-                </span><hr/>
-                <textarea id="pasteClipboardPopupText" rows="10" cols="50"></textarea><br/>
+                <span id="pasteClipboardPopupDesc" class="remote-clip-span">
+                    Type or paste the content to be copied to the clipboard of the remote computer.
+                </span>
+                <textarea id="pasteClipboardPopupText" rows="10" cols="50" class="remote-clip-input"></textarea><br/>
                 <!--<input type="button" id="pasteClipboardButton" value="Paste" onclick="pasteClipboard();"/>-->
-                <input type="button" id="sendClipboardButton" value="Send" onclick="sendClipboard();"/>
-                <input type="button" id="closePopupButton" value="Close" onclick="parent.closePopup();"/>
+                <!--<input type="button" id="sendClipboardButton" value="Copy" onclick="sendClipboard();"/>-->
+                <!--<input type="button" id="closePopupButton" value="Close" onclick="parent.closePopup();"/>-->
+                <div id="sendClipboardButton" onclick="sendClipboard();" class="remote-clip-button remote-clip-copy">Copy</div>
+                <div id="closePopupButton" onclick="parent.closePopup();" class="remote-clip-button remote-clip-close">Close</div>
             </div>
 
         </form>
@@ -102,11 +106,11 @@
                             // working on Edge and every other browsers
                             if (!parent.getMyrtille().getDisplay().isIEBrowser())
                             {
-                                alert('clipboard successfully synchronized');
+                                alert('Text copied to the clipboard of the remote computer.');
                             }
                             else
                             {
-                                alert('IE detected, hit Ctrl+C (Cmd-C on Mac) if you want to synchronize the clipboard');
+                                //alert('IE detected, hit Ctrl+C (Cmd-C on Mac) if you want to synchronize the clipboard');
                             }
                         }
                         else
diff --git a/Myrtille.Web/src/Clients/RemoteSessionProcessClient.cs b/Myrtille.Web/src/Clients/RemoteSessionProcessClient.cs
index 327d530..0520dc0 100644
--- a/Myrtille.Web/src/Clients/RemoteSessionProcessClient.cs
+++ b/Myrtille.Web/src/Clients/RemoteSessionProcessClient.cs
@@ -20,12 +20,19 @@ limitations under the License.
 using System.Collections.Generic;
 using System.Configuration;
 using System.Diagnostics;
+using System.IO;
+using System.Net;
+using System.Net.Security;
+using System.Security.Cryptography.X509Certificates;
 using System.ServiceModel;
+using System.Text;
 using System.Threading;
 using System.Web;
 using Myrtille.Helpers;
 using Myrtille.Services.Contracts;
 using Myrtille.Web.Properties;
+using Myrtille.Web.src.Utils;
+using Newtonsoft.Json.Linq;
 
 namespace Myrtille.Web
 {
@@ -237,6 +244,15 @@ private void CleanupDisconnectedSession(RemoteSessionExitCode exitCode)
                 if (remoteSessions.ContainsKey(_remoteSessionManager.RemoteSession.Id))
                 {
                     remoteSessions.Remove(_remoteSessionManager.RemoteSession.Id);
+                    if (_remoteSessionManager.RemoteSession.isRecordingNeeded)
+                    {
+                        while (_remoteSessionManager.RemoteSession.imgDataQueue.Count != 0)
+                        {
+                            Thread.Sleep(1000);
+                        }
+                        RemoteSession.updateMainMetaFile(_remoteSessionManager.RemoteSession.recordingIndex, _remoteSessionManager.RemoteSession);
+                    }
+                    JObject response = SecurdenWeb.ManageSessionRequest(_remoteSessionManager.RemoteSession.accessUrl, _remoteSessionManager.RemoteSession.Id.ToString(), false, _remoteSessionManager.RemoteSession.serviceOrgId, _remoteSessionManager.RemoteSession.auditId, _remoteSessionManager.RemoteSession.isRecordingNeeded, _remoteSessionManager.RemoteSession.remoteSessionId);
                 }
 
                 #endregion
diff --git a/Myrtille.Web/src/Handlers/RemoteSessionEventSourceHandler.cs b/Myrtille.Web/src/Handlers/RemoteSessionEventSourceHandler.cs
index 45ac5a7..d01d870 100644
--- a/Myrtille.Web/src/Handlers/RemoteSessionEventSourceHandler.cs
+++ b/Myrtille.Web/src/Handlers/RemoteSessionEventSourceHandler.cs
@@ -17,6 +17,7 @@ limitations under the License.
 */
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Web;
 using Newtonsoft.Json;
@@ -129,6 +130,7 @@ public void SendImage(RemoteSessionImage image)
         public void SendMessage(RemoteSessionMessage message)
         {
             Send(JsonConvert.SerializeObject(message));
+
         }
 
         public void Send(string data)
diff --git a/Myrtille.Web/src/RemoteSession.cs b/Myrtille.Web/src/RemoteSession.cs
index 2861688..5cd6bf3 100644
--- a/Myrtille.Web/src/RemoteSession.cs
+++ b/Myrtille.Web/src/RemoteSession.cs
@@ -17,7 +17,14 @@ limitations under the License.
 */
 
 using System;
+using System.Web;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
 using Myrtille.Services.Contracts;
+using Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
+using System.Web.Http.Controllers;
 
 namespace Myrtille.Web
 {
@@ -28,10 +35,36 @@ public enum BrowserResize
         None = 2
     }
 
+
+
     public class RemoteSession
     {
         public RemoteSessionManager Manager { get; private set; }
 
+        public long UserProfileId;
+        public long UserSessionId;
+        public string accessUrl;
+        public string serviceOrgId;
+        public bool isManageSession;
+        public Queue<RemoteSessionImage> imgDataQueue;
+        public long recordStartTime;
+        public bool ImageQueueWriteCheck;
+        public int recordingIndex;
+        public bool isUpdateMainMeta;
+        public bool isupdateStartIndex;
+        public string folderLocationAbsolutePath;
+        public long auditId;
+        public long remoteSessionId;
+        public bool isRecordingNeeded = false;
+        public bool firstEnqueueDone = false;
+        private object recordinglockObj = new object();
+        private object recordingMetalockObj = new object();
+        private object recordingMainMetalockObj = new object();
+        public int si;
+        public int ei;
+        public long st;
+        public long et;
+
         public Guid Id;
         public RemoteSessionState State;
         public string HostName;
@@ -69,6 +102,218 @@ public class RemoteSession
         public bool Reconnect;
         public bool ConnectionService;
         public string ClipboardText;                    // clipboard text
+        public string AccountTitle;
+        public bool isDisplayTitle;
+        public string IdleTimeout;
+        public bool isIdleTimeOutEnabled;
+
+        public class MetaDataDetails
+        {
+            public int si;
+            public int ei;
+            public int Idx;
+            public int PosX;
+            public int PosY;
+            public int Width;
+            public int Height;
+            public ImageFormat imageFormat;
+            public int Quality;
+            public bool Fullscreen;
+            public long timeStamp;
+        }
+
+        public class MainMetaDetails
+        {
+            public int si;
+            public int ei;
+            public long st;
+            public long et;
+        }
+
+        public static void MetaFileWrite(RemoteSessionImage image, int si, int ei, RemoteSession remoteSession)
+        {
+            JObject timeStampSeekMapped = new JObject();
+            JArray timeStampList = new JArray();
+            string metafile = remoteSession.folderLocationAbsolutePath + "\\recording_meta.spbf" + remoteSession.recordingIndex.ToString();
+            if (!File.Exists(metafile))
+            {
+                lock (remoteSession.recordingMetalockObj)
+                {
+                    var metaFileCreate = File.Create(metafile);
+                    metaFileCreate.Close();
+                }
+            }
+            var metaDetails = new MetaDataDetails()
+            {
+                si = si,
+                ei = ei,
+                Idx = image.Idx,
+                PosX = image.PosX,
+                PosY = image.PosY,
+                Width = image.Width,
+                Height = image.Height,
+                imageFormat = image.Format,
+                Quality = image.Quality,
+                Fullscreen = image.Fullscreen,
+                timeStamp = image.timestamp
+            };
+            JObject jsonObject = new JObject();
+            string jsonData = "";
+            lock (remoteSession.recordingMetalockObj)
+            {
+                jsonData = File.ReadAllText(metafile);
+            }
+            if (jsonData.Length > 0)
+            {
+                jsonObject = (JObject)JsonConvert.DeserializeObject(jsonData);
+                if (jsonObject.ContainsKey("timestamp_list"))
+                {
+                    timeStampList = (JArray)jsonObject["timestamp_list"];
+                }
+                if (jsonObject.ContainsKey("timestamp_seek_mapped"))
+                {
+                    timeStampSeekMapped = (JObject)jsonObject["timestamp_seek_mapped"];
+                }
+            }
+            JObject imageMetaData = new JObject
+            {
+                ["si"] = si,
+                ["ei"] = ei,
+                ["Idx"] = image.Idx,
+                ["PosX"] = image.PosX,
+                ["PosY"] = image.PosY,
+                ["Width"] = image.Width,
+                ["Height"] = image.Height,
+                ["imageFormat"] = image.Format.ToString(),
+                ["Quality"] = image.Quality,
+                ["Fullscreen"] = image.Fullscreen,
+                ["timeStamp"] = image.timestamp
+            };
+            timeStampList.Add(image.timestamp);
+            jsonObject["timestamp_list"] = timeStampList;
+            var key = image.timestamp.ToString();
+            if (timeStampSeekMapped.ContainsKey(key)){
+                key = (image.timestamp + 1).ToString();
+            }
+            timeStampSeekMapped[key] = imageMetaData;
+            jsonObject["timestamp_seek_mapped"] = timeStampSeekMapped;
+            lock (remoteSession.recordingMetalockObj)
+            {
+                File.WriteAllText(metafile, jsonObject.ToString());
+            }
+        }
+        public static void updateMainMetaFile(int fileIndex, RemoteSession remoteSession)
+        {
+            string mainMetaFile = remoteSession.folderLocationAbsolutePath + "\\recording_main_meta.spbf";
+            if (!File.Exists(mainMetaFile))
+            {
+                lock (remoteSession.recordingMainMetalockObj)
+                {
+                    var mainMeta = File.Create(mainMetaFile);
+                    mainMeta.Close();
+                }
+            }
+            string jsonData = "";
+            lock (remoteSession.recordingMainMetalockObj)
+            {
+
+                jsonData = File.ReadAllText(mainMetaFile);
+            }
+            var mainMetaData = JsonConvert.DeserializeObject<Dictionary<string, MainMetaDetails>>(jsonData)
+                                  ?? new Dictionary<string, MainMetaDetails>();
+            var metaDetails = new MainMetaDetails()
+            {
+                si = remoteSession.si,
+                ei = remoteSession.ei,
+                st = remoteSession.st,
+                et = remoteSession.et,
+            };
+            mainMetaData[fileIndex.ToString()] = metaDetails;
+            jsonData = JsonConvert.SerializeObject(mainMetaData);
+            lock (remoteSession.recordingMainMetalockObj)
+            {
+                File.WriteAllText(mainMetaFile, jsonData);
+            }
+        }
+
+        public static void ImageByteFileWrite(RemoteSession remoteSession)
+        {
+            RemoteSessionImage image = remoteSession.imgDataQueue.Dequeue();
+            string folder = remoteSession.folderLocationAbsolutePath;
+            if (!Directory.Exists(folder))
+            {
+                Directory.CreateDirectory(folder);
+            }
+            string recordingFile = folder + "\\recording.spbf" + remoteSession.recordingIndex.ToString();
+
+            if (!File.Exists(recordingFile))
+            {
+                lock (remoteSession.recordinglockObj)
+                {
+                    var recordingImageFile = File.Create(recordingFile);
+                    recordingImageFile.Close();
+                }
+                remoteSession.isupdateStartIndex = true;
+            }
+            if (new FileInfo(recordingFile).Length > 250000)
+            {
+                remoteSession.recordingIndex++;
+                recordingFile = folder + "\\recording.spbf" + remoteSession.recordingIndex.ToString();
+                lock (remoteSession.recordinglockObj)
+                {
+                    var newrecordingImageFile = File.Create(recordingFile);
+                    newrecordingImageFile.Close();
+                }
+                remoteSession.isUpdateMainMeta = true;
+                remoteSession.isupdateStartIndex = true;
+            }
+            string fileData = "";
+            lock (remoteSession.recordinglockObj)
+            {
+                fileData = File.ReadAllText(recordingFile);
+            }
+
+            int byteStartIndex = fileData.Length;
+            byte[] imageData = image.Data;
+            var base64String = Convert.ToBase64String(imageData, 0, imageData.Length);
+            fileData += base64String;
+            lock (remoteSession.recordinglockObj)
+            {
+                File.WriteAllText(recordingFile, fileData);
+            }
+
+            int byteEndIndex = fileData.Length;
+            if (remoteSession.isUpdateMainMeta)
+            {
+                updateMainMetaFile(remoteSession.recordingIndex - 1, remoteSession);
+                remoteSession.isUpdateMainMeta = false;
+            }
+            if (remoteSession.isupdateStartIndex)
+            {
+                remoteSession.si = byteStartIndex;
+                remoteSession.st = image.timestamp;
+                remoteSession.isupdateStartIndex = false;
+            }
+            remoteSession.ei = byteEndIndex;
+            remoteSession.et = image.timestamp;
+            MetaFileWrite(image, byteStartIndex, byteEndIndex, remoteSession);
+        }
+
+        public static void ImageDataWriteToFile(RemoteSession remoteSession)
+        {
+            while (remoteSession.ImageQueueWriteCheck)
+            {
+                if (remoteSession.imgDataQueue.Count == 0)
+                {
+                    Thread.Sleep(5000);
+                }
+                else
+                {
+                    ImageByteFileWrite(remoteSession);
+                }
+            }
+        }
+
 
         public RemoteSession(
             Guid id,
@@ -93,7 +338,11 @@ public RemoteSession(
             int maxActiveGuests,
             string ownerSessionID,
             string ownerClientKey,
-            bool connectionService)
+            bool connectionService,
+            string accountTitle,
+            bool displayTitle,
+            string idleTime,
+            bool isSessionShadowed)
         {
             Id = id;
             State = RemoteSessionState.NotConnected;
@@ -120,12 +369,21 @@ public RemoteSession(
             OwnerSessionID = ownerSessionID;
             OwnerClientKey = ownerClientKey;
             ConnectionService = connectionService;
+            AccountTitle = accountTitle;
+            isDisplayTitle = displayTitle;
 
             // default capture API config
             ScreenshotIntervalSecs = 60;
             ScreenshotFormat = CaptureFormat.PNG;
             ScreenshotPath = string.Empty;
 
+            // session default recording config
+            imgDataQueue = new Queue<RemoteSessionImage>();
+            ImageQueueWriteCheck = true;
+            recordingIndex = 0;
+            isUpdateMainMeta = false;
+            IdleTimeout = idleTime;
+            isIdleTimeOutEnabled = !(isSessionShadowed);
             Manager = new RemoteSessionManager(this);
         }
     }
diff --git a/Myrtille.Web/src/RemoteSessionClient.cs b/Myrtille.Web/src/RemoteSessionClient.cs
index 5bdb9bc..688ec31 100644
--- a/Myrtille.Web/src/RemoteSessionClient.cs
+++ b/Myrtille.Web/src/RemoteSessionClient.cs
@@ -17,6 +17,11 @@ limitations under the License.
 */
 
 using System.Collections.Generic;
+using System;
+using System.IO;
+using System.Threading;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace Myrtille.Web
 {
diff --git a/Myrtille.Web/src/RemoteSessionImage.cs b/Myrtille.Web/src/RemoteSessionImage.cs
index 4d5ec93..2b33901 100644
--- a/Myrtille.Web/src/RemoteSessionImage.cs
+++ b/Myrtille.Web/src/RemoteSessionImage.cs
@@ -45,5 +45,6 @@ public class RemoteSessionImage
         public int Quality;
         public bool Fullscreen;
         public byte[] Data;
+        public long timestamp;
     }
 }
\ No newline at end of file
diff --git a/Myrtille.Web/src/RemoteSessionManager.cs b/Myrtille.Web/src/RemoteSessionManager.cs
index 9f02d36..81b46b9 100644
--- a/Myrtille.Web/src/RemoteSessionManager.cs
+++ b/Myrtille.Web/src/RemoteSessionManager.cs
@@ -21,6 +21,8 @@ limitations under the License.
 using System.Collections.Generic;
 using System.Configuration;
 using System.Diagnostics;
+using System.IO;
+using System.Security.AccessControl;
 using System.ServiceModel;
 using System.Text;
 using System.Threading;
@@ -30,13 +32,15 @@ limitations under the License.
 using System.Web.SessionState;
 using Myrtille.Helpers;
 using Myrtille.Services.Contracts;
+using Myrtille.Web.src.Utils;
+using Newtonsoft.Json.Linq;
 
 namespace Myrtille.Web
-{
+{               
     public class RemoteSessionManager : IDisposable
     {
         #region Init
-
+        public DateTime lastActiveTime;
         public RemoteSession RemoteSession { get; private set; }
 
         public RemoteSessionManager(RemoteSession remoteSession)
@@ -161,14 +165,32 @@ public void ProcessUpdatesPipeData(byte[] data)
                     if (RemoteSession.State == RemoteSessionState.Connecting)
                     {
                         RemoteSession.State = RemoteSessionState.Connected;
+                        JObject response = SecurdenWeb.ManageSessionRequest(RemoteSession.accessUrl, RemoteSession.Id.ToString(), true, RemoteSession.serviceOrgId, RemoteSession.auditId, RemoteSession.isRecordingNeeded, RemoteSession.remoteSessionId);
+                        // RemoteSession.folderLocationAbsolutePath = (string)response["return_dict"]["folder_location_absolute_path"];
+                        JObject backupLocationDict = (JObject)response["return_dict"]["backup_location_dict"];
+                        string folderLocationRelativePath = (string)response["return_dict"]["folder_location_relative_path"];
+                        string backupFolderLocation = (string)backupLocationDict["folder_location"];
+                        long recordedSessionID = (long)response["return_dict"]["recorded_session_id"];
+                        bool isRelativePath = (bool)backupLocationDict["is_relative_path"];
+                        if (isRelativePath)
+                        {
+                             string sessionRecordingFolder = Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().GetName().CodeBase))).Substring(6) + "\\";
+                             RemoteSession.folderLocationAbsolutePath = sessionRecordingFolder + "\\" + backupFolderLocation + "\\" + folderLocationRelativePath;
+                        }
+                        else
+                        {
+                            RemoteSession.folderLocationAbsolutePath = backupFolderLocation + "\\" + folderLocationRelativePath;
+                        }
+                        SecurdenWeb.UpdateRecordedFolder(RemoteSession.accessUrl, recordedSessionID, RemoteSession.folderLocationAbsolutePath, RemoteSession.serviceOrgId);
                         SendMessage(new RemoteSessionMessage { Type = MessageType.Connected });
 
                         // in case the remote session was reconnected, send the capture API config
                         SendCommand(RemoteSessionCommand.SetScreenshotConfig, string.Format("{0}|{1}|{2}", RemoteSession.ScreenshotIntervalSecs, (int)RemoteSession.ScreenshotFormat, RemoteSession.ScreenshotPath));
                     }
-
+                    
                     ProcessUpdate(data);
                 }
+
             }
             catch (Exception exc)
             {
@@ -486,7 +508,6 @@ public void SendCommand(RemoteSessionCommand command, string args = "")
                     if ((RemoteSession.State != RemoteSessionState.Connecting) &&
                         (RemoteSession.State != RemoteSessionState.Connected))
                         return;
-
                     RemoteSession.State = RemoteSessionState.Disconnecting;
 
                     Trace.TraceInformation("disconnecting remote session, remote session {0}", RemoteSession.Id);
@@ -501,6 +522,10 @@ public void SendCommand(RemoteSessionCommand command, string args = "")
                     Pipes.InputsPipe,
                     "remotesession_" + RemoteSession.Id + "_inputs",
                     commandWithArgs);
+                if ((command == RemoteSessionCommand.SendMouseMove) || (command == RemoteSessionCommand.SendKeyScancode) || (command == RemoteSessionCommand.SetReconnectSession)) {
+                    lastActiveTime = DateTime.Now;
+                }
+                
             }
             catch (Exception exc)
             {
@@ -667,7 +692,13 @@ private void ProcessUpdate(byte[] data)
                 // CAUTION! if the remote session is reconnected (i.e.: browser resize), a new instance of wfreerdp is spawned
                 // the image index can no longer be handled by wfreerdp, this must be done by the remote session manager
                 // the image index provided by wfreerdp is relative to its own instance, if needed
-
+                int IdX = _imageIdx == int.MaxValue ? 1 : ++_imageIdx;
+                if (IdX == 1)
+                {
+                    RemoteSession.recordStartTime = DateTime.Now.Ticks;
+                }
+                long ticks = DateTime.Now.Ticks - RemoteSession.recordStartTime;
+                long microseconds = ticks / (TimeSpan.TicksPerMillisecond / 1000);
                 var image = new RemoteSessionImage
                 {
                     //Idx = BitConverter.ToInt32(imgInfo, 0),
@@ -679,7 +710,8 @@ private void ProcessUpdate(byte[] data)
                     Format = (ImageFormat)BitConverter.ToInt32(imgInfo, 20),
                     Quality = BitConverter.ToInt32(imgInfo, 24),
                     Fullscreen = BitConverter.ToInt32(imgInfo, 28) == 1,
-                    Data = new byte[data.Length - 36]
+                    Data = new byte[data.Length - 36],
+                    timestamp = microseconds
                 };
 
                 Array.Copy(data, 36, image.Data, 0, data.Length - 36);
@@ -721,6 +753,15 @@ private void ProcessUpdate(byte[] data)
                 // send update to client(s)
                 foreach (var client in Clients.Values)
                 {
+                    if (RemoteSession.isRecordingNeeded)
+                    {
+                        RemoteSession.imgDataQueue.Enqueue(image);
+                        if (!RemoteSession.firstEnqueueDone) 
+                        {
+                            new Thread(() => RemoteSession.ImageDataWriteToFile(RemoteSession)).Start();
+                        }
+                        RemoteSession.firstEnqueueDone = true;
+                    }
                     // send the update if the client latency is normal or if it's a fullscreen update
                     if (client.Latency <= _imageCacheDuration || image.Fullscreen)
                     {
@@ -894,7 +935,6 @@ public void SendMessage(RemoteSessionMessage message)
                     }
                 }
             }
-
             StopWaitForImageEvent();
         }
 
diff --git a/Myrtille.Web/src/Utils/WebRequest.cs b/Myrtille.Web/src/Utils/WebRequest.cs
new file mode 100644
index 0000000..ab2c76d
--- /dev/null
+++ b/Myrtille.Web/src/Utils/WebRequest.cs
@@ -0,0 +1,160 @@
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Security;
+using System.Security.Cryptography.X509Certificates;
+using System.Text;
+using System.Web;
+
+
+namespace Myrtille.Web.src.Utils
+{
+    public static class SecurdenWeb
+    {
+        private static bool TrustCertificate(object sender, X509Certificate x509Certificate, X509Chain x509Chain, SslPolicyErrors sslPolicyErrors)
+        {
+            return true;
+        }
+
+        public static JObject SecurdenWebRequest(string serverUrl, string requestUrl, string requestMethod, JObject requestParams, string serviceOrgId)
+        {
+            requestUrl = serverUrl + requestUrl;
+            JObject result = null;
+            try
+            {
+                if (requestMethod == "GET" && requestParams != null)
+                {
+                    requestUrl += '?';
+                    requestUrl += "LAUNCHER_INPUT=" + requestParams.ToString();
+                }
+
+                ServicePointManager.ServerCertificateValidationCallback = TrustCertificate;
+                ServicePointManager.SecurityProtocol = SecurityProtocolType.Ssl3 | SecurityProtocolType.Tls | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12;
+                var uri = new Uri(requestUrl);
+                HttpWebRequest request = (HttpWebRequest)WebRequest.Create(uri);
+                request.Method = requestMethod;
+                request.UserAgent = "-SECURDEN-LAUNCHER-";
+                if (request.CookieContainer == null)
+                    request.CookieContainer = new CookieContainer();
+                JObject cookieData = new JObject()
+                {
+                    ["SERVICE_ORG_ID"] = serviceOrgId,
+                };
+                string cookieString = cookieData.ToString();
+                cookieString = Convert.ToBase64String(Encoding.UTF8.GetBytes(cookieString));
+                request.CookieContainer.Add(new Cookie("LAUNCHER_HEADER", cookieString, "/", uri.Host));
+                if (requestMethod == "POST" && requestParams != null)
+                {
+                    var postData = "LAUNCHER_INPUT=" + requestParams.ToString();
+                    var data = Encoding.UTF8.GetBytes(postData);
+                    request.ContentType = "application/x-www-form-urlencoded";
+                    request.ContentLength = data.Length;
+                    using (var stream = request.GetRequestStream())
+                    {
+                        stream.Write(data, 0, data.Length);
+                    }
+                }
+                var response = (HttpWebResponse)request.GetResponse();
+                var responseString = string.Empty;
+                using (var stream = new StreamReader(response.GetResponseStream()))
+                {
+                    responseString = stream.ReadToEnd();
+                }
+                result = JObject.Parse(responseString);
+                response.Close();
+            }
+            catch (Exception)
+            { }
+            return result;
+        }
+
+        public static JObject ManageSessionRequest(string serverUrl, string connectionId, bool status, string serviceOrgId, long auditId, bool isRecordingNeeded, long remoteSessionId)
+        {
+            JObject response = new JObject();
+            if (serverUrl != null && serverUrl != String.Empty)
+            {
+                JObject paramObj = new JObject(
+                    new JProperty("CONNECTION_ID", connectionId),
+                    new JProperty("STATUS", status),
+                    new JProperty("IS_RECORDING_ENABLED", isRecordingNeeded),
+                    new JProperty("AUDIT_ID", auditId),
+                    new JProperty("REMOTE_SESSION_ID", remoteSessionId),
+                    new JProperty("IS_FILE_CONTENT", isRecordingNeeded)
+                    );
+                response = SecurdenWebRequest(serverUrl, "/launcher/manage_web_session", "POST", paramObj, serviceOrgId);
+            }
+            return response;
+        }
+
+        public static JObject UpdateRecordedFolder(string serverUrl, long recordedSessionId, string folderLocation, string serviceOrgId)
+        {
+            JObject response = new JObject();
+            if (serverUrl != null && serverUrl != String.Empty)
+            {
+                JObject paramObj = new JObject(
+                    new JProperty("RECORDED_SESSION_ID", recordedSessionId),
+                    new JProperty("FOLDER_LOCATION", folderLocation)
+                    );
+                response = SecurdenWebRequest(serverUrl, "/launcher/update_recorded_folder", "POST", paramObj, serviceOrgId);
+            }
+            return response;
+        }
+
+        public static JObject ProcessLaunchRequest(HttpRequest Request, HttpResponse Response, string serverUrl, string authKey, string connectionId, string serviceOrgId)
+        {
+            JObject returnObj = null;
+            JObject paramObj = new JObject(new JProperty("AUTH_KEY", authKey), new JProperty("CONNECTION_ID", connectionId));
+            JObject response = null;
+            string serverAccessUrl = null;
+            if (Request["access_url"] != null && Request["access_url"].Trim() != "")
+            {
+                string accessUrl = Request["access_url"].Trim();
+                if (accessUrl.EndsWith("/"))
+                {
+                    accessUrl = accessUrl.Substring(0, accessUrl.Length - 1);
+                }
+                response = SecurdenWebRequest(accessUrl, "/launcher/verify_launch_info", "POST", paramObj, serviceOrgId);
+                if (response != null)
+                {
+                    serverAccessUrl = accessUrl;
+                }
+                else
+                {
+                    response = SecurdenWebRequest(serverUrl, "/launcher/verify_launch_info", "POST", paramObj, serviceOrgId);
+                    if (response != null)
+                    {
+                        serverAccessUrl = serverUrl;
+                    }
+                }
+            }
+            if (response == null)
+            {
+                Response.Write("<script>alert('Not able to access Securden web server. Try again.'); window.close();</script>");
+            }
+            else if (response.ContainsKey("type"))
+            {
+                if ((string)response["type"] == "WEB_RDP" || (string)response["type"] == "SHADOW_SESSION" || (string)response["type"] == "TERMINATE_SESSION")
+                {
+                    if ((string)response["type"] == "SHADOW_SESSION" || (string)response["type"] == "TERMINATE_SESSION" || (((JObject)response["details"]).ContainsKey("is_remote_session_managed") && (bool)response["details"]["is_remote_session_managed"]))
+                    {
+                        response["ACCESS_URL"] = serverAccessUrl;
+                    }
+                    returnObj = response;
+                }
+                else
+                {
+                    Response.Write("<script>alert('Invalid option.'); window.close();</script>");
+                }
+            }
+            else
+            {
+                Response.Write("<script>alert('Unable to launch the connection. Try again.'); window.close();</script>");
+            }
+            return returnObj;
+ 
+        }
+    }
+}
\ No newline at end of file
diff --git a/Myrtille.sln b/Myrtille.sln
index 38f26af..d8f37bb 100644
--- a/Myrtille.sln
+++ b/Myrtille.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27428.2015
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34723.18
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Myrtille.Common", "Myrtille.Common\Myrtille.Common.csproj", "{37630774-1321-4E6A-8661-4430A8946E9E}"
 EndProject
@@ -388,7 +388,8 @@ Global
 		{37630774-1321-4E6A-8661-4430A8946E9E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{37630774-1321-4E6A-8661-4430A8946E9E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{37630774-1321-4E6A-8661-4430A8946E9E}.Release|Win32.ActiveCfg = Release|Any CPU
-		{37630774-1321-4E6A-8661-4430A8946E9E}.Release|x64.ActiveCfg = Release|Any CPU
+		{37630774-1321-4E6A-8661-4430A8946E9E}.Release|x64.ActiveCfg = Release|x64
+		{37630774-1321-4E6A-8661-4430A8946E9E}.Release|x64.Build.0 = Release|x64
 		{37630774-1321-4E6A-8661-4430A8946E9E}.Release|x86.ActiveCfg = Release|Any CPU
 		{37630774-1321-4E6A-8661-4430A8946E9E}.RelWithDebInfo|.NET.ActiveCfg = Release|Any CPU
 		{37630774-1321-4E6A-8661-4430A8946E9E}.RelWithDebInfo|.NET.Build.0 = Release|Any CPU
@@ -430,7 +431,8 @@ Global
 		{F00C33EB-EDA4-4980-AC2A-0BF574913A24}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F00C33EB-EDA4-4980-AC2A-0BF574913A24}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F00C33EB-EDA4-4980-AC2A-0BF574913A24}.Release|Win32.ActiveCfg = Release|Any CPU
-		{F00C33EB-EDA4-4980-AC2A-0BF574913A24}.Release|x64.ActiveCfg = Release|Any CPU
+		{F00C33EB-EDA4-4980-AC2A-0BF574913A24}.Release|x64.ActiveCfg = Release|x64
+		{F00C33EB-EDA4-4980-AC2A-0BF574913A24}.Release|x64.Build.0 = Release|x64
 		{F00C33EB-EDA4-4980-AC2A-0BF574913A24}.Release|x86.ActiveCfg = Release|Any CPU
 		{F00C33EB-EDA4-4980-AC2A-0BF574913A24}.RelWithDebInfo|.NET.ActiveCfg = Release|Any CPU
 		{F00C33EB-EDA4-4980-AC2A-0BF574913A24}.RelWithDebInfo|.NET.Build.0 = Release|Any CPU
@@ -508,7 +510,8 @@ Global
 		{5F357488-8DEF-4E95-874E-FC526D92DE29}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5F357488-8DEF-4E95-874E-FC526D92DE29}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5F357488-8DEF-4E95-874E-FC526D92DE29}.Release|Win32.ActiveCfg = Release|Any CPU
-		{5F357488-8DEF-4E95-874E-FC526D92DE29}.Release|x64.ActiveCfg = Release|Any CPU
+		{5F357488-8DEF-4E95-874E-FC526D92DE29}.Release|x64.ActiveCfg = Release|x64
+		{5F357488-8DEF-4E95-874E-FC526D92DE29}.Release|x64.Build.0 = Release|x64
 		{5F357488-8DEF-4E95-874E-FC526D92DE29}.Release|x86.ActiveCfg = Release|Any CPU
 		{5F357488-8DEF-4E95-874E-FC526D92DE29}.RelWithDebInfo|.NET.ActiveCfg = Release|Any CPU
 		{5F357488-8DEF-4E95-874E-FC526D92DE29}.RelWithDebInfo|.NET.Build.0 = Release|Any CPU
@@ -548,7 +551,8 @@ Global
 		{010E1702-3045-4B13-BFB6-06FFC60B5CBB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{010E1702-3045-4B13-BFB6-06FFC60B5CBB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{010E1702-3045-4B13-BFB6-06FFC60B5CBB}.Release|Win32.ActiveCfg = Release|Any CPU
-		{010E1702-3045-4B13-BFB6-06FFC60B5CBB}.Release|x64.ActiveCfg = Release|Any CPU
+		{010E1702-3045-4B13-BFB6-06FFC60B5CBB}.Release|x64.ActiveCfg = Release|x64
+		{010E1702-3045-4B13-BFB6-06FFC60B5CBB}.Release|x64.Build.0 = Release|x64
 		{010E1702-3045-4B13-BFB6-06FFC60B5CBB}.Release|x86.ActiveCfg = Release|Any CPU
 		{010E1702-3045-4B13-BFB6-06FFC60B5CBB}.RelWithDebInfo|.NET.ActiveCfg = Release|Any CPU
 		{010E1702-3045-4B13-BFB6-06FFC60B5CBB}.RelWithDebInfo|.NET.Build.0 = Release|Any CPU
@@ -594,8 +598,8 @@ Global
 		{3573C84D-5FD3-4BAC-BF96-20B9FD0709FF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3573C84D-5FD3-4BAC-BF96-20B9FD0709FF}.Release|Win32.ActiveCfg = Release|Any CPU
 		{3573C84D-5FD3-4BAC-BF96-20B9FD0709FF}.Release|Win32.Build.0 = Release|Any CPU
-		{3573C84D-5FD3-4BAC-BF96-20B9FD0709FF}.Release|x64.ActiveCfg = Release|Any CPU
-		{3573C84D-5FD3-4BAC-BF96-20B9FD0709FF}.Release|x64.Build.0 = Release|Any CPU
+		{3573C84D-5FD3-4BAC-BF96-20B9FD0709FF}.Release|x64.ActiveCfg = Release|x64
+		{3573C84D-5FD3-4BAC-BF96-20B9FD0709FF}.Release|x64.Build.0 = Release|x64
 		{3573C84D-5FD3-4BAC-BF96-20B9FD0709FF}.Release|x86.ActiveCfg = Release|Any CPU
 		{3573C84D-5FD3-4BAC-BF96-20B9FD0709FF}.Release|x86.Build.0 = Release|Any CPU
 		{3573C84D-5FD3-4BAC-BF96-20B9FD0709FF}.RelWithDebInfo|.NET.ActiveCfg = Release|Any CPU
@@ -642,8 +646,8 @@ Global
 		{9E4BF7C3-8EA3-428C-BEA3-06CC3AFCAEB4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9E4BF7C3-8EA3-428C-BEA3-06CC3AFCAEB4}.Release|Win32.ActiveCfg = Release|Any CPU
 		{9E4BF7C3-8EA3-428C-BEA3-06CC3AFCAEB4}.Release|Win32.Build.0 = Release|Any CPU
-		{9E4BF7C3-8EA3-428C-BEA3-06CC3AFCAEB4}.Release|x64.ActiveCfg = Release|Any CPU
-		{9E4BF7C3-8EA3-428C-BEA3-06CC3AFCAEB4}.Release|x64.Build.0 = Release|Any CPU
+		{9E4BF7C3-8EA3-428C-BEA3-06CC3AFCAEB4}.Release|x64.ActiveCfg = Release|x64
+		{9E4BF7C3-8EA3-428C-BEA3-06CC3AFCAEB4}.Release|x64.Build.0 = Release|x64
 		{9E4BF7C3-8EA3-428C-BEA3-06CC3AFCAEB4}.Release|x86.ActiveCfg = Release|Any CPU
 		{9E4BF7C3-8EA3-428C-BEA3-06CC3AFCAEB4}.Release|x86.Build.0 = Release|Any CPU
 		{9E4BF7C3-8EA3-428C-BEA3-06CC3AFCAEB4}.RelWithDebInfo|.NET.ActiveCfg = Release|Any CPU
@@ -690,8 +694,7 @@ Global
 		{71AB3401-1B1A-4EF0-8870-BE9D822969A6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{71AB3401-1B1A-4EF0-8870-BE9D822969A6}.Release|Win32.ActiveCfg = Release|Any CPU
 		{71AB3401-1B1A-4EF0-8870-BE9D822969A6}.Release|Win32.Build.0 = Release|Any CPU
-		{71AB3401-1B1A-4EF0-8870-BE9D822969A6}.Release|x64.ActiveCfg = Release|Any CPU
-		{71AB3401-1B1A-4EF0-8870-BE9D822969A6}.Release|x64.Build.0 = Release|Any CPU
+		{71AB3401-1B1A-4EF0-8870-BE9D822969A6}.Release|x64.ActiveCfg = Release|x64
 		{71AB3401-1B1A-4EF0-8870-BE9D822969A6}.Release|x86.ActiveCfg = Release|Any CPU
 		{71AB3401-1B1A-4EF0-8870-BE9D822969A6}.Release|x86.Build.0 = Release|Any CPU
 		{71AB3401-1B1A-4EF0-8870-BE9D822969A6}.RelWithDebInfo|.NET.ActiveCfg = Release|Any CPU
@@ -1820,8 +1823,7 @@ Global
 		{A129611E-2B4E-4BDF-A083-9D3CEE7F149F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A129611E-2B4E-4BDF-A083-9D3CEE7F149F}.Release|Win32.ActiveCfg = Release|Any CPU
 		{A129611E-2B4E-4BDF-A083-9D3CEE7F149F}.Release|Win32.Build.0 = Release|Any CPU
-		{A129611E-2B4E-4BDF-A083-9D3CEE7F149F}.Release|x64.ActiveCfg = Release|Any CPU
-		{A129611E-2B4E-4BDF-A083-9D3CEE7F149F}.Release|x64.Build.0 = Release|Any CPU
+		{A129611E-2B4E-4BDF-A083-9D3CEE7F149F}.Release|x64.ActiveCfg = Release|x64
 		{A129611E-2B4E-4BDF-A083-9D3CEE7F149F}.Release|x86.ActiveCfg = Release|Any CPU
 		{A129611E-2B4E-4BDF-A083-9D3CEE7F149F}.Release|x86.Build.0 = Release|Any CPU
 		{A129611E-2B4E-4BDF-A083-9D3CEE7F149F}.RelWithDebInfo|.NET.ActiveCfg = Release|Any CPU
@@ -1868,8 +1870,7 @@ Global
 		{4E20CD3A-C6F8-4AA6-9678-9E210D71F811}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4E20CD3A-C6F8-4AA6-9678-9E210D71F811}.Release|Win32.ActiveCfg = Release|Any CPU
 		{4E20CD3A-C6F8-4AA6-9678-9E210D71F811}.Release|Win32.Build.0 = Release|Any CPU
-		{4E20CD3A-C6F8-4AA6-9678-9E210D71F811}.Release|x64.ActiveCfg = Release|Any CPU
-		{4E20CD3A-C6F8-4AA6-9678-9E210D71F811}.Release|x64.Build.0 = Release|Any CPU
+		{4E20CD3A-C6F8-4AA6-9678-9E210D71F811}.Release|x64.ActiveCfg = Release|x64
 		{4E20CD3A-C6F8-4AA6-9678-9E210D71F811}.Release|x86.ActiveCfg = Release|Any CPU
 		{4E20CD3A-C6F8-4AA6-9678-9E210D71F811}.Release|x86.Build.0 = Release|Any CPU
 		{4E20CD3A-C6F8-4AA6-9678-9E210D71F811}.RelWithDebInfo|.NET.ActiveCfg = Release|Any CPU
@@ -1884,54 +1885,30 @@ Global
 		{4E20CD3A-C6F8-4AA6-9678-9E210D71F811}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
 		{4E20CD3A-C6F8-4AA6-9678-9E210D71F811}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
 		{4E20CD3A-C6F8-4AA6-9678-9E210D71F811}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Debug|.NET.Build.0 = Debug|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Debug|Win32.Build.0 = Debug|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Debug|x64.Build.0 = Debug|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Debug|x86.Build.0 = Debug|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.MinSizeRel|.NET.ActiveCfg = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.MinSizeRel|.NET.Build.0 = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.MinSizeRel|Any CPU.ActiveCfg = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.MinSizeRel|Any CPU.Build.0 = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.MinSizeRel|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.MinSizeRel|Mixed Platforms.Build.0 = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.MinSizeRel|Win32.ActiveCfg = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.MinSizeRel|Win32.Build.0 = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.MinSizeRel|x64.ActiveCfg = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.MinSizeRel|x64.Build.0 = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.MinSizeRel|x86.ActiveCfg = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.MinSizeRel|x86.Build.0 = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Release|.NET.ActiveCfg = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Release|.NET.Build.0 = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Release|Win32.ActiveCfg = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Release|Win32.Build.0 = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Release|x64.ActiveCfg = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Release|x64.Build.0 = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Release|x86.ActiveCfg = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Release|x86.Build.0 = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.RelWithDebInfo|.NET.ActiveCfg = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.RelWithDebInfo|.NET.Build.0 = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.RelWithDebInfo|Mixed Platforms.Build.0 = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.RelWithDebInfo|Win32.ActiveCfg = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.RelWithDebInfo|Win32.Build.0 = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
-		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
+		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Debug|.NET.ActiveCfg = Debug|x64
+		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Debug|Win32.ActiveCfg = Debug|x64
+		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Debug|x64.ActiveCfg = Debug|x64
+		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Debug|x86.ActiveCfg = Debug|x64
+		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.MinSizeRel|.NET.ActiveCfg = Debug|x64
+		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.MinSizeRel|Any CPU.ActiveCfg = Debug|x64
+		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.MinSizeRel|Mixed Platforms.ActiveCfg = Debug|x64
+		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.MinSizeRel|Win32.ActiveCfg = Debug|x64
+		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.MinSizeRel|x64.ActiveCfg = Debug|x64
+		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.MinSizeRel|x86.ActiveCfg = Debug|x64
+		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Release|.NET.ActiveCfg = Release|x64
+		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Release|Any CPU.ActiveCfg = Release|x64
+		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Release|Mixed Platforms.ActiveCfg = Release|x64
+		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Release|Win32.ActiveCfg = Release|x64
+		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Release|x64.ActiveCfg = Release|x64
+		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.Release|x86.ActiveCfg = Release|x64
+		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.RelWithDebInfo|.NET.ActiveCfg = Debug|x64
+		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|x64
+		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.RelWithDebInfo|Mixed Platforms.ActiveCfg = Release|x64
+		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.RelWithDebInfo|Win32.ActiveCfg = Debug|x64
+		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.RelWithDebInfo|x64.ActiveCfg = Release|x64
+		{2705B2A1-B47A-4E4D-96F9-BACE48F9A807}.RelWithDebInfo|x86.ActiveCfg = Debug|x64
 		{01E631B8-2A75-4C16-BAE9-E7F0523D89B1}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{01E631B8-2A75-4C16-BAE9-E7F0523D89B1}.Debug|.NET.Build.0 = Debug|Any CPU
 		{01E631B8-2A75-4C16-BAE9-E7F0523D89B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1964,8 +1941,8 @@ Global
 		{01E631B8-2A75-4C16-BAE9-E7F0523D89B1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{01E631B8-2A75-4C16-BAE9-E7F0523D89B1}.Release|Win32.ActiveCfg = Release|Any CPU
 		{01E631B8-2A75-4C16-BAE9-E7F0523D89B1}.Release|Win32.Build.0 = Release|Any CPU
-		{01E631B8-2A75-4C16-BAE9-E7F0523D89B1}.Release|x64.ActiveCfg = Release|Any CPU
-		{01E631B8-2A75-4C16-BAE9-E7F0523D89B1}.Release|x64.Build.0 = Release|Any CPU
+		{01E631B8-2A75-4C16-BAE9-E7F0523D89B1}.Release|x64.ActiveCfg = Release|x64
+		{01E631B8-2A75-4C16-BAE9-E7F0523D89B1}.Release|x64.Build.0 = Release|x64
 		{01E631B8-2A75-4C16-BAE9-E7F0523D89B1}.Release|x86.ActiveCfg = Release|Any CPU
 		{01E631B8-2A75-4C16-BAE9-E7F0523D89B1}.Release|x86.Build.0 = Release|Any CPU
 		{01E631B8-2A75-4C16-BAE9-E7F0523D89B1}.RelWithDebInfo|.NET.ActiveCfg = Release|Any CPU