diff --git a/AboutBoxWindow/AboutBoxV.xaml.vb b/AboutBoxWindow/AboutBoxV.xaml.vb
index af3a5a7..cc63c4f 100644
--- a/AboutBoxWindow/AboutBoxV.xaml.vb
+++ b/AboutBoxWindow/AboutBoxV.xaml.vb
@@ -24,7 +24,7 @@ Public Class AboutBoxV
       sInfo &= "DataRoot " & Map.refMainWindowVM.MainWindowM.sDataRoot & Environment.NewLine
       sInfo &= "LogRoot " & Map.refMainWindowVM.MainWindowM.sLogDir & Environment.NewLine
       InfoLbl.Text = sInfo
-      ExitBtn.Content = EgtMsg(MSG_MISSINGKEYWD + 4)          'Ok
+      ExitBtn.Content = "Ok"
    End Sub
 
 End Class
diff --git a/Constants/ConstMsg.vb b/Constants/ConstMsg.vb
deleted file mode 100644
index f039130..0000000
--- a/Constants/ConstMsg.vb
+++ /dev/null
@@ -1,53 +0,0 @@
-Module ConstMsg
-
-   Public Const MSG_SETUPERRORS As Integer = 5000 + 1470
-
-   Public Const MSG_MISSINGKEYWD As Integer = 10100
-   Public Const MSG_NUMERICKEYBOARDWD As Integer = 10200
-   Public Const MSG_MESSAGEBOX As Integer = 15000
-
-   Public Const MSG_OMAGCUT As Integer = 90000
-   Public Const MSG_GENERAL As Integer = MSG_OMAGCUT
-   Public Const MSG_WORKINPROGRESSPAGEUC As Integer = MSG_OMAGCUT + 100
-   Public Const MSG_DIRECTCUTPAGEUC As Integer = MSG_OMAGCUT + 200
-   Public Const MSG_MANUALAXESMOVEPAGEUC As Integer = MSG_OMAGCUT + 220
-   Public Const MSG_CADCUTPAGEUC As Integer = MSG_OMAGCUT + 300
-   Public Const MSG_NESTPAGEUC As Integer = MSG_OMAGCUT + 330
-   Public Const MSG_SPLITPAGEUC As Integer = MSG_OMAGCUT + 340
-   Public Const MSG_MOVERAWPAGEUC As Integer = MSG_OMAGCUT + 360
-   Public Const MSG_DRAWPAGEUC As Integer = MSG_OMAGCUT + 380
-   Public Const MSG_COMPONENTPAGEUC As Integer = MSG_OMAGCUT + 400
-   Public Const MSG_IMPORTPAGEUC As Integer = MSG_OMAGCUT + 450
-   Public Const MSG_OPENPAGEUC As Integer = MSG_OMAGCUT + 490
-   Public Const MSG_RAWPARTPAGEUC As Integer = MSG_OMAGCUT + 500
-   Public Const MSG_CHOOSEMACHININGPAGEUC As Integer = MSG_OMAGCUT + 535
-   Public Const MSG_SIMULATIONPAGEUC As Integer = MSG_OMAGCUT + 550
-   Public Const MSG_FRAMECUTPAGEUC As Integer = MSG_OMAGCUT + 600
-   Public Const MSG_MACHINEPAGEUC As Integer = MSG_OMAGCUT + 700
-   Public Const MSG_TOOLSDBPAGEUC As Integer = MSG_OMAGCUT + 720
-   Public Const MSG_MACHININGSDBPAGEUC As Integer = MSG_OMAGCUT + 760
-   Public Const MSG_COMBOBOXPARAM As Integer = MSG_OMAGCUT + 800
-   Public Const MSG_ALARMSPAGEUC As Integer = MSG_OMAGCUT + 900
-   Public Const MSG_MACHINECNPAGEUC As Integer = MSG_OMAGCUT + 950
-   Public Const MSG_OPTIONSPAGEUC As Integer = MSG_OMAGCUT + 980
-   Public Const MSG_EGTMSGBOX As Integer = MSG_OMAGCUT + 1100
-   Public Const MSG_CSVPAGEUC As Integer = MSG_OMAGCUT + 1200
-
-   Public Const MSG_OMAGOFFICE As Integer = 91400
-   Public Const MSG_OPTIONPANEL As Integer = MSG_OMAGOFFICE
-   Public Const MSG_MYMACHININGDBWINDOW As Integer = MSG_OMAGOFFICE + 50
-   Public Const MSG_TOPCMDBAR As Integer = MSG_OMAGOFFICE + 100
-   Public Const MSG_RAWPARTTAB As Integer = MSG_OMAGOFFICE + 150
-   Public Const MSG_VEINMATCHING As Integer = MSG_OMAGOFFICE + 200
-   Public Const MSG_GENERIC As Integer = MSG_OMAGOFFICE + 250
-
-   Public Const MSG_EGTWPFLIB5 As Integer = 30000
-   Public Const MSG_TOPCOMMANDBAR As Integer = MSG_EGTWPFLIB5 + 500
-   Public Const MSG_GRIDVIEWPANEL As Integer = MSG_EGTWPFLIB5 + 800
-   Public Const MSG_TOOLDB As Integer = MSG_EGTWPFLIB5 + 1000
-   Public Const MSG_TOOLDBERRORS As Integer = MSG_EGTWPFLIB5 + 1100
-   Public Const MSG_MACHININGDB As Integer = MSG_EGTWPFLIB5 + 1200
-   Public Const MSG_MACHININGDBERRORS As Integer = MSG_EGTWPFLIB5 + 1400
-   Public Const MSG_SIMULATION As Integer = MSG_EGTWPFLIB5 + 1600
-
-End Module
diff --git a/MainWindow/MainWindowM.vb b/MainWindow/MainWindowM.vb
index 3b47eba..78c1f15 100644
--- a/MainWindow/MainWindowM.vb
+++ b/MainWindow/MainWindowM.vb
@@ -143,26 +143,7 @@ Public Class MainWindowM
       EgtInit(m_nDebug, m_sLogFile, sLogMsg)
       EgtSetTempDir(m_sTempDir)
       EgtSetIniFile(IniFile.m_sIniFile)
-      ' Leggo direttorio dei messaggi (se manca uso direttorio di configurazione)
-      Dim sMsgDir As String = String.Empty
-      If GetMainPrivateProfileString(S_GENERAL, K_MESSAGESDIR, "", sMsgDir) = 0 Then
-         sMsgDir = m_sConfigDir
-      End If
-      ' Leggo lingua corrente
-      Dim sLanguage As String = String.Empty
-      GetMainPrivateProfileString(S_GENERAL, K_MESSAGES, "", sLanguage)
-      ' Recupero nome file dei messaggi della lingua corrente
-      Dim sMsgName As String = "EgalTechIta.txt"
-      Dim nIndex As Integer = 1
-      While True
-         Dim ReadLanguage As Language = GetMainPrivateProfileLanguage(S_LANGUAGES, K_LANGUAGE & nIndex)
-         If IsNothing(ReadLanguage) Then Exit While
-         If String.Compare(ReadLanguage.Name, sLanguage, True) = 0 Then
-            sMsgName = ReadLanguage.FilePath
-            Exit While
-         End If
-         nIndex += 1
-      End While
+      ' Verifiche
       If Not bProd Then
          If m_nKeyLevel = -1 Or m_nKeyLevel = -2 Then
             MessageBox.Show("Missing Protection Key. Insert Dongle and restart the program", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
@@ -171,11 +152,6 @@ Public Class MainWindowM
          End If
          End
       End If
-      ' Leggo file messaggi
-      Dim sMsgFilePath As String = sMsgDir & "\" & sMsgName
-      If Not EgtLoadMessages(sMsgFilePath) Then
-         EgtOutLog("Error in EgtLoadMessages")
-      End If
       ' Leggo e imposto livello utilizzatore
       m_nUserLevel = Math.Min(m_nKeyLevel, GetMainPrivateProfileInt(S_GENERAL, K_USERLEVEL, 1))
       ' Info su opzioni chiave
diff --git a/OmagVIEWPlus.vbproj b/OmagVIEWPlus.vbproj
index 4e9b12a..a13a677 100644
--- a/OmagVIEWPlus.vbproj
+++ b/OmagVIEWPlus.vbproj
@@ -12,6 +12,7 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <MyType>Custom</MyType>
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -24,7 +25,6 @@
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
@@ -67,15 +67,15 @@
     <OutputPath>bin\x86\Debug\</OutputPath>
     <DocumentationFile>
     </DocumentationFile>
-    <Optimize>false</Optimize>
+    <Optimize>true</Optimize>
     <NoWarn>
     </NoWarn>
     <DebugType>Full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <DebugSymbols>true</DebugSymbols>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
+    <DefineDebug>false</DefineDebug>
+    <DefineTrace>false</DefineTrace>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <DefineTrace>false</DefineTrace>
@@ -92,6 +92,9 @@
   <PropertyGroup>
     <ApplicationIcon>Resources\OmagVIEWPlus.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="EgtUILib">
       <HintPath>..\..\EgtProg\DllD32\EgtUILib.dll</HintPath>
@@ -129,7 +132,6 @@
     </Compile>
     <Compile Include="Constants\ConstGen.vb" />
     <Compile Include="Constants\ConstIni.vb" />
-    <Compile Include="Constants\ConstMsg.vb" />
     <Compile Include="NCCommunication\Nc_Debug.vb" />
     <Compile Include="NCCommunication\Nc_Parent.vb" />
     <Compile Include="NCCommunication\Nc_Siemens.vb" />
@@ -196,6 +198,7 @@
       <LastGenOutput>Resources.Designer.vb</LastGenOutput>
       <CustomToolNamespace>My.Resources</CustomToolNamespace>
     </EmbeddedResource>
+    <None Include="app.manifest" />
     <None Include="My Project\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.vb</LastGenOutput>
diff --git a/app.manifest b/app.manifest
new file mode 100644
index 0000000..ce9111f
--- /dev/null
+++ b/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>