diff --git a/Application.xaml b/Application.xaml
index 3cbad01..a45600c 100644
--- a/Application.xaml
+++ b/Application.xaml
@@ -9,7 +9,7 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary x:Name="ThemeDictionary">
                     <ResourceDictionary.MergedDictionaries>
-                        <ResourceDictionary Source="OmagCUTTestDictionary.xaml"/>
+                        <ResourceDictionary Source="OmagCUTDarkDictionary.xaml"/>
                         <ResourceDictionary Source="OmagCUTDictionary.xaml"/>
                     </ResourceDictionary.MergedDictionaries>
                 </ResourceDictionary>
diff --git a/ChooseMachining.xaml.vb b/ChooseMachining.xaml.vb
index 7b0f861..e286647 100644
--- a/ChooseMachining.xaml.vb
+++ b/ChooseMachining.xaml.vb
@@ -248,6 +248,7 @@ Public Class ChooseMachining
             ButtonsGrid.SetValue(Grid.RowProperty, 5)
             m_MainWindow.m_CurrentMachine.sCurrDrilling = String.Empty
             m_MainWindow.m_CurrentMachine.sCurrMilling = String.Empty
+            m_MainWindow.m_CurrentMachine.sCurrWaterJetting = String.Empty
             Me.Height = 341.2
          Case 1        ' Foratura
             ' Definizione di due righe della tabella con la giusta altezza
@@ -266,6 +267,7 @@ Public Class ChooseMachining
                CurrDrillingCmBx.SelectedItem = m_CurrentMachine.sCurrDrilling
             End If
             m_MainWindow.m_CurrentMachine.sCurrMilling = String.Empty
+            m_MainWindow.m_CurrentMachine.sCurrWaterJetting = String.Empty
             CurrDrillingTxBl.Visibility = Windows.Visibility.Visible
             CurrDrillingCmBx.Visibility = Windows.Visibility.Visible
             Me.Height = 426.5
@@ -286,6 +288,7 @@ Public Class ChooseMachining
                CurrMillingCmBx.SelectedItem = m_CurrentMachine.sCurrMilling
             End If
             m_MainWindow.m_CurrentMachine.sCurrDrilling = String.Empty
+            m_MainWindow.m_CurrentMachine.sCurrWaterJetting = String.Empty
             CurrMillingTxBl.Visibility = Windows.Visibility.Visible
             CurrMillingCmBx.Visibility = Windows.Visibility.Visible
             Me.Height = 426.5
@@ -305,6 +308,7 @@ Public Class ChooseMachining
             If m_CurrentMachine.sCurrMilling <> String.Empty Then
                CurrMillingCmBx.SelectedItem = m_CurrentMachine.sCurrMilling
             End If
+            m_MainWindow.m_CurrentMachine.sCurrWaterJetting = String.Empty
             CurrDrillingTxBl.SetValue(Grid.RowProperty, 4)
             CurrDrillingCmBx.SetValue(Grid.RowProperty, 5)
             CurrMillingTxBl.SetValue(Grid.RowProperty, 6)
@@ -331,7 +335,8 @@ Public Class ChooseMachining
             If m_CurrentMachine.sCurrWaterJetting <> String.Empty Then
                CurrWJettingCmBx.SelectedItem = m_CurrentMachine.sCurrWaterJetting
             End If
-            m_MainWindow.m_CurrentMachine.sCurrWaterJetting = String.Empty
+            m_MainWindow.m_CurrentMachine.sCurrDrilling = String.Empty
+            m_MainWindow.m_CurrentMachine.sCurrMilling = String.Empty
             CurrWJettingTxBl.Visibility = Windows.Visibility.Visible
             CurrWJettingCmBx.Visibility = Windows.Visibility.Visible
             Me.Height = 426.5
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 6a2bc13..2b0f3f5 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -62,5 +62,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.1.9.1")>
-<Assembly: AssemblyFileVersion("2.1.9.1")>
+<Assembly: AssemblyVersion("2.1.9.2")>
+<Assembly: AssemblyFileVersion("2.1.9.2")>
diff --git a/OmagCUT.sln b/OmagCUT.sln
index b6aead1..8730617 100644
--- a/OmagCUT.sln
+++ b/OmagCUT.sln
@@ -7,24 +7,15 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "OmagCUT", "OmagCUT.vbproj",
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
 		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
 		Release|x86 = Release|x86
-		Trial|Any CPU = Trial|Any CPU
 		Trial|x86 = Trial|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AC6C1390-231E-401C-89DD-AE0844B524E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AC6C1390-231E-401C-89DD-AE0844B524E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AC6C1390-231E-401C-89DD-AE0844B524E7}.Debug|x86.ActiveCfg = Debug|x86
 		{AC6C1390-231E-401C-89DD-AE0844B524E7}.Debug|x86.Build.0 = Debug|x86
-		{AC6C1390-231E-401C-89DD-AE0844B524E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AC6C1390-231E-401C-89DD-AE0844B524E7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AC6C1390-231E-401C-89DD-AE0844B524E7}.Release|x86.ActiveCfg = Release|x86
 		{AC6C1390-231E-401C-89DD-AE0844B524E7}.Release|x86.Build.0 = Release|x86
-		{AC6C1390-231E-401C-89DD-AE0844B524E7}.Trial|Any CPU.ActiveCfg = Trial|Any CPU
-		{AC6C1390-231E-401C-89DD-AE0844B524E7}.Trial|Any CPU.Build.0 = Trial|Any CPU
 		{AC6C1390-231E-401C-89DD-AE0844B524E7}.Trial|x86.ActiveCfg = Trial|x86
 		{AC6C1390-231E-401C-89DD-AE0844B524E7}.Trial|x86.Build.0 = Trial|x86
 	EndGlobalSection
diff --git a/OmagCUT.vbproj b/OmagCUT.vbproj
index ba60e0e..7e3270b 100644
--- a/OmagCUT.vbproj
+++ b/OmagCUT.vbproj
@@ -428,7 +428,7 @@
       <SubType>Designer</SubType>
       <Generator>XamlIntelliSenseFileGenerator</Generator>
     </Page>
-    <Page Include="OmagCUTTestDictionary.xaml">
+    <Page Include="OmagCUTDarkDictionary.xaml">
       <SubType>Designer</SubType>
       <Generator>XamlIntelliSenseFileGenerator</Generator>
     </Page>
diff --git a/OmagCUTTestDictionary.xaml b/OmagCUTDarkDictionary.xaml
similarity index 98%
rename from OmagCUTTestDictionary.xaml
rename to OmagCUTDarkDictionary.xaml
index ab1b208..846b18d 100644
--- a/OmagCUTTestDictionary.xaml
+++ b/OmagCUTDarkDictionary.xaml
@@ -8,7 +8,7 @@
    xmlns:sys="clr-namespace:System;assembly=mscorlib"
    xmlns:Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero"
    xmlns:local="clr-namespace:OmagCUT.ArithmeticConverterNameSpace"
-   x:Class="OmagCUTTestDictionary">
+   x:Class="OmagCUTDarkDictionary">
 
 
         <!--Importo EgtDictionary--><!--
diff --git a/OptionsPageUC.xaml.vb b/OptionsPageUC.xaml.vb
index cc63b1c..6d6ebd5 100644
--- a/OptionsPageUC.xaml.vb
+++ b/OptionsPageUC.xaml.vb
@@ -215,7 +215,7 @@ Public Class OptionsPageUC
          WritePrivateProfileString(S_GENERAL, K_THEME, 0, m_MainWindow.GetIniFile())
       End If
       If (ThemesCmBx.SelectedIndex = 1) Then
-         'app.ChangeTheme(New Uri("/OmagCUT;component/OmagCUTTestDictionary.xaml", UriKind.Relative))
+         'app.ChangeTheme(New Uri("/OmagCUT;component/OmagCUTDarkDictionary.xaml", UriKind.Relative))
          'Application.Current.Resources("GroupBox_CornerRadius") = 3
          'Application.Current.Resources("Button_CornerRadius") = 3
          'Application.Current.Resources("EmptyBorder_CornerRadius") = New CornerRadius(3)
@@ -226,12 +226,12 @@ Public Class OptionsPageUC
 
    Private Sub Themes_StartUp()
       Dim app As Application = Application.Current
-      If (ThemesCmBx.SelectedIndex = 0) Then
+      If ThemesCmBx.SelectedIndex = 0 Then
          app.ChangeTheme(New Uri("/OmagCUT;component/OmagCUTClassicDictionary.xaml", UriKind.Relative))
          m_MainWindow.EgtWPFInit()
       End If
-      If (ThemesCmBx.SelectedIndex = 1) Then
-         app.ChangeTheme(New Uri("/OmagCUT;component/OmagCUTTestDictionary.xaml", UriKind.Relative))
+      If ThemesCmBx.SelectedIndex = 1 Then
+         app.ChangeTheme(New Uri("/OmagCUT;component/OmagCUTDarkDictionary.xaml", UriKind.Relative))
          Application.Current.Resources("GroupBox_CornerRadius") = 3
          Application.Current.Resources("Button_CornerRadius") = 3
          Application.Current.Resources("EmptyBorder_CornerRadius") = New CornerRadius(3)