diff --git a/OnTopReplica/OnTopReplica.csproj b/OnTopReplica/OnTopReplica.csproj
index e5c5e0c..724d2d6 100644
--- a/OnTopReplica/OnTopReplica.csproj
+++ b/OnTopReplica/OnTopReplica.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>OnTopReplica</RootNamespace>
     <AssemblyName>OnTopReplica</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>new-flat-icon.ico</ApplicationIcon>
     <IsWebBootstrapper>false</IsWebBootstrapper>
@@ -67,6 +67,7 @@
     </DocumentationFile>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <UseVSHostingProcess>true</UseVSHostingProcess>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -80,6 +81,7 @@
     </DocumentationFile>
     <DebugSymbols>true</DebugSymbols>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup />
   <PropertyGroup />
@@ -523,72 +525,72 @@
   <ItemGroup>
     <PublishFile Include="Assets\icon.ico">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>File</FileType>
     </PublishFile>
     <PublishFile Include="Assets\screenshot-icon.ico">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>File</FileType>
     </PublishFile>
     <PublishFile Include="Assets\window_multiple16.ico">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>File</FileType>
     </PublishFile>
     <PublishFile Include="Assets\xiao_arrow.png">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>File</FileType>
     </PublishFile>
     <PublishFile Include="cs\OnTopReplica.resources">
       <Visible>False</Visible>
-      <PublishState>Include</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Satellite</FileType>
     </PublishFile>
     <PublishFile Include="da\OnTopReplica.resources">
       <Visible>False</Visible>
-      <PublishState>Include</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Satellite</FileType>
     </PublishFile>
     <PublishFile Include="it\OnTopReplica.resources">
       <Visible>False</Visible>
-      <PublishState>Include</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Satellite</FileType>
     </PublishFile>
   </ItemGroup>
diff --git a/OnTopReplica/OnTopReplica.exe.manifest b/OnTopReplica/OnTopReplica.exe.manifest
index 0928f9f..f88dc73 100644
--- a/OnTopReplica/OnTopReplica.exe.manifest
+++ b/OnTopReplica/OnTopReplica.exe.manifest
@@ -1,26 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
-<asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<asmv1:assembly manifestVersion="1.0"
+  xmlns="urn:schemas-microsoft-com:asm.v1"
+  xmlns:asmv1="urn:schemas-microsoft-com:asm.v1"
+  xmlns:asmv2="urn:schemas-microsoft-com:asm.v2"
+  xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+        type="win32"
+        name="Microsoft.Windows.Common-Controls"
+        version="6.0.0.0"
+        processorArchitecture="*"
+        publicKeyToken="6595b64144ccf1df"
+        language="*"
+        />
+    </dependentAssembly>
+  </dependency>
+  
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="asInvoker" />
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
       </requestedPrivileges>
     </security>
   </trustInfo>
+
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
       <!-- Windows Vista -->
-      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
       <!-- Windows 7 -->
-      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
       <!-- Windows 8 -->
-      <!--<supportedOS ID="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <!-- Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
     </application>
   </compatibility>
+
   <description>Lightweight clone of a window.</description>
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" publicKeyToken="6595b64144ccf1df" language="*" processorArchitecture="*" />
-    </dependentAssembly>
-  </dependency>
-</asmv1:assembly>
\ No newline at end of file
+
+  <asmv3:application>
+    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+      <dpiAware>true</dpiAware>
+    </asmv3:windowsSettings>
+  </asmv3:application>
+
+</asmv1:assembly>
diff --git a/OnTopReplica/app.config b/OnTopReplica/app.config
index 0362e7a..c09a4d3 100644
--- a/OnTopReplica/app.config
+++ b/OnTopReplica/app.config
@@ -1,66 +1,78 @@
 <?xml version="1.0"?>
 <configuration>
-	<configSections>
-		<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-			<section name="OnTopReplica.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
-		</sectionGroup>
-	</configSections>
-	<userSettings>
-		<OnTopReplica.Properties.Settings>
-   <setting name="Opacity" serializeAs="String">
-    <value>255</value>
-   </setting>
-   <setting name="Language" serializeAs="String">
-    <value>(Default)</value>
-   </setting>
-   <setting name="MustUpdate" serializeAs="String">
-    <value>True</value>
-   </setting>
-   <setting name="ClickThrough" serializeAs="String">
-    <value>True</value>
-   </setting>
-   <setting name="FirstTimeClickThrough" serializeAs="String">
-    <value>True</value>
-   </setting>
-   <setting name="FirstTimeClickForwarding" serializeAs="String">
-    <value>True</value>
-   </setting>
-   <setting name="FullscreenAlwaysOnTop" serializeAs="String">
-    <value>False</value>
-   </setting>
-   <setting name="RestoreSizeAndPosition" serializeAs="String">
-    <value>False</value>
-   </setting>
-   <setting name="RestoreLastSize" serializeAs="String">
-    <value>0, 0</value>
-   </setting>
-   <setting name="RestoreLastPosition" serializeAs="String">
-    <value>0, 0</value>
-   </setting>
-   <setting name="RestoreLastWindow" serializeAs="String">
-    <value>False</value>
-   </setting>
-   <setting name="RestoreLastWindowClass" serializeAs="String">
-    <value/>
-   </setting>
-   <setting name="RestoreLastWindowTitle" serializeAs="String">
-    <value/>
-   </setting>
-   <setting name="RestoreLastWindowHwnd" serializeAs="String">
-    <value>0</value>
-   </setting>
-   <setting name="HotKeyCloneCurrent" serializeAs="String">
-    <value>[CTRL]+[SHIFT]+C</value>
-   </setting>
-   <setting name="HotKeyShowHide" serializeAs="String">
-    <value>[CTRL]+[SHIFT]+O</value>
-   </setting>
-   <setting name="FullscreenMode" serializeAs="String">
-    <value>Standard</value>
-   </setting>
-   <setting name="RestoreLastShowChrome" serializeAs="String">
-    <value>True</value>
-   </setting>
-  </OnTopReplica.Properties.Settings>
-	</userSettings>
-	<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+    <configSections>
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="OnTopReplica.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
+        </sectionGroup>
+    </configSections>
+  
+    <userSettings>
+      <OnTopReplica.Properties.Settings>
+       <setting name="Opacity" serializeAs="String">
+        <value>255</value>
+       </setting>
+       <setting name="Language" serializeAs="String">
+        <value>(Default)</value>
+       </setting>
+       <setting name="MustUpdate" serializeAs="String">
+        <value>True</value>
+       </setting>
+       <setting name="ClickThrough" serializeAs="String">
+        <value>True</value>
+       </setting>
+       <setting name="FirstTimeClickThrough" serializeAs="String">
+        <value>True</value>
+       </setting>
+       <setting name="FirstTimeClickForwarding" serializeAs="String">
+        <value>True</value>
+       </setting>
+       <setting name="FullscreenAlwaysOnTop" serializeAs="String">
+        <value>False</value>
+       </setting>
+       <setting name="RestoreSizeAndPosition" serializeAs="String">
+        <value>False</value>
+       </setting>
+       <setting name="RestoreLastSize" serializeAs="String">
+        <value>0, 0</value>
+       </setting>
+       <setting name="RestoreLastPosition" serializeAs="String">
+        <value>0, 0</value>
+       </setting>
+       <setting name="RestoreLastWindow" serializeAs="String">
+        <value>False</value>
+       </setting>
+       <setting name="RestoreLastWindowClass" serializeAs="String">
+        <value/>
+       </setting>
+       <setting name="RestoreLastWindowTitle" serializeAs="String">
+        <value/>
+       </setting>
+       <setting name="RestoreLastWindowHwnd" serializeAs="String">
+        <value>0</value>
+       </setting>
+       <setting name="HotKeyCloneCurrent" serializeAs="String">
+        <value>[CTRL]+[SHIFT]+C</value>
+       </setting>
+       <setting name="HotKeyShowHide" serializeAs="String">
+        <value>[CTRL]+[SHIFT]+O</value>
+       </setting>
+       <setting name="FullscreenMode" serializeAs="String">
+        <value>Standard</value>
+       </setting>
+       <setting name="RestoreLastShowChrome" serializeAs="String">
+        <value>True</value>
+       </setting>
+      </OnTopReplica.Properties.Settings>
+    </userSettings>
+
+  <!-- Runtiome support declaration -->
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" />
+  </startup>
+
+  <!-- Windows Forms configuration for .NET 4.7 -->
+  <System.Windows.Forms.ApplicationConfigurationSection>
+    <add key="DpiAwareness" value="PerMonitorV2"/>
+  </System.Windows.Forms.ApplicationConfigurationSection>
+
+</configuration>