diff --git a/AboutBoxWD.xaml.vb b/AboutBoxWD.xaml.vb
index 17389bb..77b64c8 100644
--- a/AboutBoxWD.xaml.vb
+++ b/AboutBoxWD.xaml.vb
@@ -20,10 +20,7 @@ Public Class AboutBoxWD
 
    Private Sub AboutBoxWD_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       DescriptionLbl.Text = My.Application.Info.Description.ToString()
-      VersionLbl.Text = "Version : " & My.Application.Info.Version.Major.ToString() &
-                                 "." & My.Application.Info.Version.Minor.ToString() &
-                                 (ChrW(97 - 1 + My.Application.Info.Version.Build)).ToString() &
-                                 My.Application.Info.Version.Revision.ToString()
+      VersionLbl.Text = "Version : " & m_MainWindow.GetVersion()
       Dim sKey As String = String.Empty
       EgtGetKeyInfo(sKey)
       Dim sOpts As String = m_MainWindow.GetKeyOptions().ToString()
diff --git a/MainWindow.xaml.vb b/MainWindow.xaml.vb
index 9c5b008..6c1cadf 100644
--- a/MainWindow.xaml.vb
+++ b/MainWindow.xaml.vb
@@ -20,6 +20,7 @@ Class MainWindow
    Private m_sProjDir As String = String.Empty
    Private m_sIniFile As String = String.Empty
    Private m_nDebug As Integer = 0
+   Private m_sVersion As String = "1.1a1"
    ' Variabile con la lingua corrente
    Friend m_CurrLanguage As Language
    ' Lista delle lingue disponibili e lingua corrente
@@ -79,6 +80,10 @@ Class MainWindow
       Return m_nKeyOptions
    End Function
 
+   Friend Function GetVersion() As String
+      Return m_sVersion
+   End Function
+
    Private Sub MainWindow_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       ' Verifico sia l'unica istanza
       ManageSingleIstance()
@@ -114,8 +119,12 @@ Class MainWindow
       EgtSetKey(sKey)
       ' Inizializzazione generale di EgtInterface
       m_nDebug = GetPrivateProfileInt(S_GENERAL, K_DEBUG, 0, m_sIniFile)
+      m_sVersion = My.Application.Info.Version.Major.ToString() & "." &
+                   My.Application.Info.Version.Minor.ToString() &
+                   (ChrW(97 - 1 + My.Application.Info.Version.Build)).ToString() &
+                   My.Application.Info.Version.Revision.ToString()
       Dim sLogFile As String = m_sTempDir & "\" & GENLOG_FILE_NAME
-      Dim sLogMsg As String = My.Application.Info.Description.ToString() & " ver. " & My.Application.Info.Version.ToString()
+      Dim sLogMsg As String = My.Application.Info.Description.ToString() & " ver. " & m_sVersion
       EgtInit(m_nDebug, sLogFile, sLogMsg)
       ' Leggo direttorio dei messaggi (se manca uso direttorio di configurazione)
       Dim sMsgDir As String = String.Empty
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index c2c1dbe..53d11e3 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -15,7 +15,7 @@ Imports System.Windows
 <Assembly: AssemblyDescription("OmagVIEWR32.exe")> 
 <Assembly: AssemblyCompany("")> 
 <Assembly: AssemblyProduct("OmagVIEW")> 
-<Assembly: AssemblyCopyright("Copyright ©  2016-2018 by EgalTech s.r.l.")> 
+<Assembly: AssemblyCopyright("Copyright ©  2016-2019 by EgalTech s.r.l.")> 
 <Assembly: AssemblyTrademark("")> 
 <Assembly: ComVisible(false)>
 
@@ -55,5 +55,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.9.11.1")> 
-<Assembly: AssemblyFileVersion("1.9.11.1")> 
+<Assembly: AssemblyVersion("2.1.3.1")> 
+<Assembly: AssemblyFileVersion("2.1.3.1")> 
diff --git a/My Project/app.manifest b/My Project/app.manifest
new file mode 100644
index 0000000..ce9111f
--- /dev/null
+++ b/My Project/app.manifest	
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- UAC Manifest Options
+             If you want to change the Windows User Account Control level replace the 
+             requestedExecutionLevel node with one of the following.
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            Specifying requestedExecutionLevel element will disable file and registry virtualization. 
+            Remove this element if your application requires this virtualization for backwards
+            compatibility.
+        -->
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- A list of the Windows versions that this application has been tested on
+           and is designed to work with. Uncomment the appropriate elements
+           and Windows will automatically select the most compatible environment. -->
+
+      <!-- Windows Vista -->
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />
+
+      <!-- Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
+
+      <!-- Windows 8 -->
+      <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>
+
+  <!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
+       DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need 
+       to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should 
+       also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->
+  <!--
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+    </windowsSettings>
+  </application>
+  -->
+
+  <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
+  <!--
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>
+  -->
+
+</assembly>
diff --git a/OmagVIEW.vbproj b/OmagVIEW.vbproj
index 04f57fb..9380f9d 100644
--- a/OmagVIEW.vbproj
+++ b/OmagVIEW.vbproj
@@ -67,6 +67,9 @@
   <PropertyGroup>
     <ApplicationIcon>Resources\OmagVIEW.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>My Project\app.manifest</ApplicationManifest>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="EgtUILib">
       <HintPath>..\..\EgtProg\DllD32\EgtUILib.dll</HintPath>
@@ -190,6 +193,7 @@
       <CustomToolNamespace>My.Resources</CustomToolNamespace>
     </EmbeddedResource>
     <None Include="app.config" />
+    <None Include="My Project\app.manifest" />
     <None Include="My Project\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.vb</LastGenOutput>
diff --git a/OmagVIEWDictionary.xaml b/OmagVIEWDictionary.xaml
index 3504f1e..b19ba33 100644
--- a/OmagVIEWDictionary.xaml
+++ b/OmagVIEWDictionary.xaml
@@ -6,7 +6,6 @@
    xmlns:ControlExtensions="clr-namespace:OmagVIEW.ControlExtensions"
 
    xmlns:sys="clr-namespace:System;assembly=mscorlib"
-   xmlns:Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero"
    xmlns:local="clr-namespace:OmagVIEW.ArithmeticConverterNameSpace"
    x:Class="OmagCUTDictionary">