From 00a338c202b319afda8dfa2eca976e506e4c3591 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.sassi@egalware.com>
Date: Fri, 21 Mar 2025 19:21:02 +0100
Subject: [PATCH] Revert "Merge commit
 'f1aae48a2b80f96ae94b59a69addd6cc6e48ee14'"

This reverts commit 1f49d0936ee394d427807c3ea201dcb332220f22, reversing
changes made to 236eeac038b0d2a253673ba2d5709f80ca70155b.
---
 .../BeamMachiningsWindowVM.vb                 |   26 +-
 CheckParamV.xaml                              |   82 +
 CheckParamV.xaml.vb                           |   53 +-
 ComboParamV.xaml                              |   91 +-
 ComboParamV.xaml.vb                           |   15 +
 Constants/ConstIni.vb                         |  104 +-
 Constants/ConstMachIni.vb                     |  280 ++
 Constants/ConstMsg.vb                         |   58 +
 CurrentMachine.vb                             |    3 +
 EgtColorPicker/EgtColorPickerVM.vb            | 1012 -------
 EgtColorPicker/EgtHexagon.vb                  |  374 ---
 EgtCustomWindow.vb                            |   10 +
 EgtFloating/EgtFloatingManager.vb             |   10 +
 EgtFloating/EgtFloatingTray.vb                |   14 +
 EgtMainWindow.vb                              |   20 +
 EgtManageFileDialog/EgtManageFileDialogV.xaml |  430 ---
 .../EgtManageFileDialogV.xaml.vb              |  140 -
 EgtManageFileDialog/EgtManageFileDialogVM.vb  |  926 ------
 EgtMessageBox/EgtMessageBoxV.xaml             |   52 -
 EgtMessageBox/EgtMessageBoxV.xaml.vb          |  107 -
 EgtMessageBox/EgtMessageBoxVM.vb              |  232 --
 EgtOpenFileDialog.xaml.vb                     |    8 +-
 EgtPanelWindow.vb                             |    3 +
 EgtScrollViewer.vb                            |    1 +
 EgtTextBox.xaml                               |   21 +
 EgtTextBox.xaml.vb                            |    6 +
 EgtTextBox2.vb                                |   17 +
 EgtWPFLib5.vbproj                             |   52 +-
 EgtWPFLib5Resources.xaml                      |   29 +-
 .../EstimationsDetailsWndV.xaml.vb            |    4 +-
 .../EstimationsDetailsWndVM.vb                |    9 +-
 InstrumentPanel/InstrumentPanelVM.vb          |   14 +-
 MachGroupPanel/MachGroupPanelVM.vb            |   18 +-
 .../NewMachGroupWnd/NewMachGroupWndV.xaml     |    3 +-
 .../NewMachGroupWnd/NewMachGroupWndVM.vb      |    9 +-
 MachinePanel/MachinePanelVM.vb                |    9 +-
 MachiningDbWindow/BeamMillingParamPageV.xaml  |   82 +-
 MachiningDbWindow/ChiselingParamPageV.xaml    |   81 +-
 .../FiveAxisMachinigParamPageV.xaml           |   81 +-
 MachiningDbWindow/GenMachiningParamPageV.xaml |   81 +-
 .../ImportExportMachiningWindowVM.vb          |   29 +-
 MachiningDbWindow/MachiningDbWindowV.xaml     |   73 +
 MachiningDbWindow/MachiningDbWindowVM.vb      |   72 +-
 MachiningDbWindow/MachiningTreeView.vb        | 1147 ++++----
 MachiningDbWindow/MortisingParamPageV.xaml    |   82 +-
 MachiningDbWindow/PocketingParamPageV.xaml    |   82 +-
 .../Stone5DrillingParamPageV.xaml             |   84 +-
 .../Stone5MillingParamPageV.xaml              |   84 +-
 .../Stone5SawFinishingParamPageV.xaml         |   84 +-
 .../Stone5SawRoughingParamPageV.xaml          |   84 +-
 MachiningDbWindow/Stone5SawingParamPageV.xaml |   84 +-
 .../Stone5WaterjettingParamPageV.xaml         |   84 +-
 .../StoneDrillingParamPageV.xaml              |   82 +-
 MachiningDbWindow/StoneMillingParamPageV.xaml |   82 +-
 .../StoneSawFinishingParamPageV.xaml          |   82 +-
 .../StoneSawRoughingParamPageV.xaml           |   82 +-
 MachiningDbWindow/StoneSawingParamPageV.xaml  |   82 +-
 .../SurfFinishingParamPageV.xaml              |   74 +
 MachiningDbWindow/SurfRoughingParamPageV.xaml |   74 +
 MachiningDbWindow/WaterjettingParamPageV.xaml |   82 +-
 MachiningDbWindow/WoodDrillingParamPageV.xaml |   82 +-
 MachiningDbWindow/WoodMillingParamPageV.xaml  |   82 +-
 MachiningDbWindow/WoodSawingParamPageV.xaml   |   82 +-
 Mapi/MAPI.vb                                  |   16 +-
 NameDialog/NameDialogV.xaml.vb                |    7 +-
 NameDialog/NameDialogVM.vb                    |   15 +-
 OptionPanel/EstimationsVM.vb                  |   16 +-
 OptionPanel/MachineAxis.vb                    |    8 +-
 OptionPanel/SimulationVM.vb                   |   47 +-
 Resources/EgtDialog/Folder.png                |  Bin 1292 -> 0 bytes
 Resources/EgtDialog/New.png                   |  Bin 374 -> 0 bytes
 Resources/EgtDialog/Restore.png               |  Bin 254 -> 0 bytes
 Resources/EgtDialog/Root.png                  |  Bin 753 -> 0 bytes
 Resources/EgtMessageBox/Asterisk.png          |  Bin 605 -> 0 bytes
 Resources/EgtMessageBox/Error.png             |  Bin 3263 -> 0 bytes
 Resources/EgtMessageBox/Exclamation.png       |  Bin 813 -> 0 bytes
 Resources/EgtMessageBox/Hand.png              |  Bin 616 -> 0 bytes
 Resources/EgtMessageBox/Information.png       |  Bin 2689 -> 0 bytes
 Resources/EgtMessageBox/Question.png          |  Bin 1057 -> 0 bytes
 Resources/EgtMessageBox/Warning.png           |  Bin 2223 -> 0 bytes
 SaveFileDialog/SaveFileDialogV.xaml           |    5 +
 SaveFileDialog/SaveFileDialogV.xaml.vb        |    5 +-
 SaveFileDialog/SaveFileDialogVM.vb            |   30 +-
 .../SaveFileDialogWithListV.xaml.vb           |   31 +-
 .../SaveFileDialogWithListVM.vb               |   34 +-
 SceneHost/SceneHostV.xaml.vb                  |    7 +-
 SceneHost/SceneHostVM.vb                      |  178 ++
 SetUpWindow/SetUpWindowV.xaml                 |    2 +
 SetUpWindow/SetUpWindowVM.vb                  |  190 +-
 ShowPanel/ShowPanelVM.vb                      |   16 +-
 StatusBar/StatusBarVM.vb                      |   32 +-
 StringParamV.xaml                             |   93 +
 StringParamV.xaml.vb                          |   52 +-
 StringParamWithButtonV.xaml                   |   97 +-
 StringParamWithButtonV.xaml.vb                |   34 +-
 Themes/Generic.xaml                           |   93 +-
 ToolDbWindow/BeamMillParamPageV.xaml          |   46 +-
 ToolDbWindow/ChiselParamPageV.xaml            |   49 +-
 ToolDbWindow/ImportExportToolWindowVM.vb      |   30 +-
 ToolDbWindow/MortiseParamPageV.xaml           |   55 +-
 ToolDbWindow/StoneDrillParamPageV.xaml        |   49 +-
 ToolDbWindow/StoneMillParamPageV.xaml         |   49 +-
 ToolDbWindow/StoneSawParamPageV.xaml          |   49 +-
 ToolDbWindow/ToolDbWindowV.xaml               |   27 +
 ToolDbWindow/ToolDbWindowVM.vb                |  136 +-
 ToolDbWindow/ToolTreeView.vb                  |  754 ++---
 ToolDbWindow/WaterjetParamPageV.xaml          |   49 +-
 ToolDbWindow/WoodDrillParamPageV.xaml         |   49 +-
 ToolDbWindow/WoodMillParamPageV.xaml          |   49 +-
 ToolDbWindow/WoodSawParamPageV.xaml           |   49 +-
 Utility/InheritableTreeViewItem.vb            |   12 +-
 Utility/IniFile.vb                            |    2 +
 Utility/MachineModel.vb                       |    5 +-
 Utility/MachineUtility.vb                     |   77 +-
 Utility/MsgConversion.vb                      |    3 +-
 Utility/TMDbParamVisibility.vb                | 2520 ++++++++---------
 Utility/Utility.vb                            |    9 +
 ViewPanel/ViewPanelVM.vb                      |   26 +-
 WaterjetDbWindow/WaterjetDbWindowV.xaml       |   21 +
 WaterjetDbWindow/WaterjetDbWindowVM.vb        |  126 +-
 120 files changed, 6714 insertions(+), 5977 deletions(-)
 delete mode 100644 EgtColorPicker/EgtColorPickerVM.vb
 delete mode 100644 EgtColorPicker/EgtHexagon.vb
 delete mode 100644 EgtManageFileDialog/EgtManageFileDialogV.xaml
 delete mode 100644 EgtManageFileDialog/EgtManageFileDialogV.xaml.vb
 delete mode 100644 EgtManageFileDialog/EgtManageFileDialogVM.vb
 delete mode 100644 EgtMessageBox/EgtMessageBoxV.xaml
 delete mode 100644 EgtMessageBox/EgtMessageBoxV.xaml.vb
 delete mode 100644 EgtMessageBox/EgtMessageBoxVM.vb
 delete mode 100644 Resources/EgtDialog/Folder.png
 delete mode 100644 Resources/EgtDialog/New.png
 delete mode 100644 Resources/EgtDialog/Restore.png
 delete mode 100644 Resources/EgtDialog/Root.png
 delete mode 100644 Resources/EgtMessageBox/Asterisk.png
 delete mode 100644 Resources/EgtMessageBox/Error.png
 delete mode 100644 Resources/EgtMessageBox/Exclamation.png
 delete mode 100644 Resources/EgtMessageBox/Hand.png
 delete mode 100644 Resources/EgtMessageBox/Information.png
 delete mode 100644 Resources/EgtMessageBox/Question.png
 delete mode 100644 Resources/EgtMessageBox/Warning.png

diff --git a/BeamMachiningsWindow/BeamMachiningsWindowVM.vb b/BeamMachiningsWindow/BeamMachiningsWindowVM.vb
index a737575..dd9126d 100644
--- a/BeamMachiningsWindow/BeamMachiningsWindowVM.vb
+++ b/BeamMachiningsWindow/BeamMachiningsWindowVM.vb
@@ -45,8 +45,7 @@ Public Class BeamMachiningsWindowVM
          ' se modificata, chiedo se salvare
          If TableModified Then
             ' Salvare le modifiche apportate? - Salva
-            'Select Case MessageBox.Show(EgtMsg(9007), EgtMsg(9006), MessageBoxButton.YesNo, MessageBoxImage.Question)
-            Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(9007), EgtMsg(9006), MessageBoxButton.YesNo, MessageBoxImage.Question)   ' Salvare le modifiche apportate? Salva
+            Select Case MessageBox.Show(EgtMsg(9007), EgtMsg(9006), MessageBoxButton.YesNo, MessageBoxImage.Question)
                Case MessageBoxResult.Yes
                   Save()
                Case MessageBoxResult.No
@@ -57,7 +56,7 @@ Public Class BeamMachiningsWindowVM
          LoadMachiningList()
          LoadTypeList()
          ReadTableFile()
-         NotifyPropertyChanged(NameOf(SelMachining))
+         NotifyPropertyChanged("SelMachining")
       End Set
    End Property
    Private Sub SetSelMachining(value As String)
@@ -65,7 +64,7 @@ Public Class BeamMachiningsWindowVM
       LoadMachiningList()
       LoadTypeList()
       ReadTableFile()
-      NotifyPropertyChanged(NameOf(SelMachining))
+      NotifyPropertyChanged("SelMachining")
    End Sub
 
    Private m_TableRowList As ObservableCollection(Of GridLine)
@@ -104,37 +103,37 @@ Public Class BeamMachiningsWindowVM
 
    Public ReadOnly Property OnHdr As String
       Get
-         Return EgtMsg(9001)     ' On
+         Return EgtMsg(9001)               'On
       End Get
    End Property
 
    Public ReadOnly Property NameHdr As String
       Get
-         Return EgtMsg(9002)     ' Nome
+         Return EgtMsg(9002)               'Nome
       End Get
    End Property
 
    Public ReadOnly Property TypeHdr As String
       Get
-         Return EgtMsg(9003)     ' Tipo
+         Return EgtMsg(9003)               'Tipo
       End Get
    End Property
 
    Public ReadOnly Property AddRowMsg As String
       Get
-         Return EgtMsg(9004)     ' Aggiungi
+         Return EgtMsg(9004)               'Aggiungi
       End Get
    End Property
 
    Public ReadOnly Property DeleteRowMsg As String
       Get
-         Return EgtMsg(9005)     ' Elimina
+         Return EgtMsg(9005)               'Elimina
       End Get
    End Property
 
    Public ReadOnly Property SaveMsg As String
       Get
-         Return EgtMsg(9006)     ' Salva
+         Return EgtMsg(9006)               'Salva
       End Get
    End Property
 
@@ -170,7 +169,7 @@ Public Class BeamMachiningsWindowVM
       If m_MachiningList.Count > 0 Then
          SetSelMachining(m_MachiningList(0))
       End If
-      NotifyPropertyChanged(NameOf(MachiningList))
+      NotifyPropertyChanged("MachiningList")
    End Sub
 
 #End Region    ' CONSTRUCTOR
@@ -254,7 +253,7 @@ Public Class BeamMachiningsWindowVM
             End If
          End If
       Next
-      NotifyPropertyChanged(NameOf(TableRowList))
+      NotifyPropertyChanged("TableRowList")
       Return True
    End Function
 
@@ -454,8 +453,7 @@ Public Class BeamMachiningsWindowVM
       ' se modificata, chiedo se salvare
       If TableModified Then
          ' Salvare le modifiche apportate? - Salva
-         'Select Case MessageBox.Show(EgtMsg(9007), EgtMsg(9006), MessageBoxButton.YesNo, MessageBoxImage.Question)
-         Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(9007), EgtMsg(9006), MessageBoxButton.YesNo, MessageBoxImage.Question)   ' Salvare le modifiche apportate? Salva
+         Select Case MessageBox.Show(EgtMsg(9007), EgtMsg(9006), MessageBoxButton.YesNo, MessageBoxImage.Question)
             Case MessageBoxResult.Yes
                Save()
             Case MessageBoxResult.No
diff --git a/CheckParamV.xaml b/CheckParamV.xaml
index c205670..4efbbc0 100644
--- a/CheckParamV.xaml
+++ b/CheckParamV.xaml
@@ -4,6 +4,7 @@
              xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5"
              xmlns:theme="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero">
+   <!--x:Name="Self">-->
 
    <UserControl.Resources>
       <ResourceDictionary>
@@ -61,10 +62,87 @@
       </ResourceDictionary>
    </UserControl.Resources>
 
+   <!--Visibility="{Binding ParamVisibility, ElementName=Self,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">-->
    <Grid Style="{DynamicResource Param_GpBxHeaderAlignment}">
+      <!--<Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource Invert}}">-->
+
       <Grid.Resources>
+         <EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
          <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
          <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Invert">0</sys:Int32>
+         <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+         <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+         <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+         <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+         <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+         <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+         <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+         <sys:Int32 x:Key="StepType">8</sys:Int32>
+         <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+         <sys:Int32 x:Key="Speed">10</sys:Int32>
+         <sys:Int32 x:Key="Feed">11</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+         <sys:Int32 x:Key="OffSr">15</sys:Int32>
+         <sys:Int32 x:Key="OffSl">16</sys:Int32>
+         <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+         <sys:Int32 x:Key="Approx">18</sys:Int32>
+         <sys:Int32 x:Key="StartPos">19</sys:Int32>
+         <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+         <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+         <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+         <sys:Int32 x:Key="StepPar">23</sys:Int32>
+         <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+         <sys:Int32 x:Key="TabLen">25</sys:Int32>
+         <sys:Int32 x:Key="TabDist">26</sys:Int32>
+         <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+         <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+         <sys:Int32 x:Key="LiTang">29</sys:Int32>
+         <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+         <sys:Int32 x:Key="LiElev">31</sys:Int32>
+         <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+         <sys:Int32 x:Key="LoTang">33</sys:Int32>
+         <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+         <sys:Int32 x:Key="LoElev">35</sys:Int32>
+         <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+         <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+         <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+         <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+         <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+         <sys:Int32 x:Key="SideStep">41</sys:Int32>
+         <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+         <sys:Int32 x:Key="NamePar">43</sys:Int32>
+         <sys:Int32 x:Key="Tool">44</sys:Int32>
+         <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+         <sys:Int32 x:Key="OverLap">47</sys:Int32>
+         <sys:Int32 x:Key="SubType">49</sys:Int32>
+         <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
+         <sys:Int32 x:Key="InitAngs">51</sys:Int32>
+         <sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
+         <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+         <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+         <sys:Int32 x:Key="StepBack">55</sys:Int32>
+         <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
+         <sys:Int32 x:Key="BackFeed">57</sys:Int32>
+         <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
+         <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
+         <sys:Int32 x:Key="Probing">60</sys:Int32>
+         <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
+         <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
+         <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
+         <sys:Int32 x:Key="IntCornType">64</sys:Int32>
+         <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
+         <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
+         <sys:Int32 x:Key="LiHole">67</sys:Int32>
+         <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
+         <sys:Int32 x:Key="LpTurns">69</sys:Int32>
+         <sys:Int32 x:Key="HpTurns">70</sys:Int32>
+         <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
       </Grid.Resources>
 
       <Grid.ColumnDefinitions>
@@ -88,6 +166,10 @@
                                     Path=ParamChBx,
                                     Mode=TwoWay,
                                     UpdateSourceTrigger=PropertyChanged}"/>
+      <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=LeaveTabTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
 
    </Grid>
 
diff --git a/CheckParamV.xaml.vb b/CheckParamV.xaml.vb
index 011e3e1..89e53ba 100644
--- a/CheckParamV.xaml.vb
+++ b/CheckParamV.xaml.vb
@@ -1,4 +1,6 @@
-Imports System.ComponentModel
+Imports System.Globalization
+Imports System.Windows.Controls.Primitives
+Imports System.ComponentModel
 
 
 Public Class CheckParamV
@@ -40,6 +42,20 @@ Public Class CheckParamV
       End Set
    End Property
 
+   ' ------------------------------------------------------------------- Colore TextBlock -------------------------------------------------------------------
+   'Public Shared ReadOnly ForegroundParamTxBlProperty As DependencyProperty =
+   '   DependencyProperty.Register("ForegroundParamTxBl",
+   '                               GetType(Windows.Media.Brush),
+   '                               GetType(CheckParamV),
+   '                               New PropertyMetadata(Windows.Media.Brushes.Black))
+   'Public Property ForegroundParamTxBl() As Windows.Media.Brush
+   '   Get
+   '      Return DirectCast(GetValue(ForegroundParamTxBlProperty), Windows.Media.Brush)
+   '   End Get
+   '   Set(ByVal value As Windows.Media.Brush)
+   '      SetValue(ForegroundParamTxBlProperty, value)
+   '   End Set
+   'End Property
    Public Shared ReadOnly ForegroundChxTxBlProperty As DependencyProperty = DependencyProperty.RegisterAttached(
                                                                          NameOf(ForegroundChxTxBl),
                                                                          GetType(Brush),
@@ -63,6 +79,41 @@ Public Class CheckParamV
          SetValue(ForegroundChxTxBlProperty, value)
       End Set
    End Property
+   ' ---------------------------------------------------------------------------------------------------------------------------------------------------------
+
+   'Private Shared Sub OnParamTxBxChangedCallback(sender As DependencyObject, e As DependencyPropertyChangedEventArgs)
+   '   Dim StringParamV As StringParamV = DirectCast(sender, StringParamV)
+   '   If Not IsNothing(sender) Then
+   '      'StringParamV.ParamValue.Text = CStr(e.NewValue)
+   '      StringParamV.ParamTxBx = CStr(e.NewValue)
+   '      StringParamV.NotifyPropertyChanged("ParamTxBx")
+   '   End If
+   'End Sub
+
+   'Public Property ParamErrorMsg() As String
+   '   Get
+   '      Return CStr(GetValue(ParamErrorMsgProperty))
+   '   End Get
+   '   Set(ByVal value As String)
+   '      SetValue(ParamErrorMsgProperty, value)
+   '   End Set
+   'End Property
+
+   'Public Shared ReadOnly ParamErrorMsgProperty As DependencyProperty =
+   '      DependencyProperty.Register("ParamErrorMsg", GetType(String), GetType(CheckParamV))
+
+   'Public Property ParamVisibility() As Visibility
+   '   Get
+   '      Return CType(GetValue(ParamVisibilityProperty), Visibility)
+   '   End Get
+   '   Set(ByVal value As Visibility)
+   '      SetValue(ParamVisibilityProperty, value)
+   '   End Set
+   'End Property
+
+   'Friend Sub ParamValue_TextChanged(sender As Object, e As TextChangedEventArgs) Handles ParamValue.TextChanged
+   '   ParamTxBx = ParamValue.Text
+   'End Sub
 
    Public Shared ReadOnly ParamVisibilityProperty As DependencyProperty =
          DependencyProperty.Register("ParamVisibility", GetType(Visibility), GetType(CheckParamV))
diff --git a/ComboParamV.xaml b/ComboParamV.xaml
index b23c995..b5cddea 100644
--- a/ComboParamV.xaml
+++ b/ComboParamV.xaml
@@ -1,8 +1,10 @@
 <UserControl x:Class="ComboParamV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5"
              x:Name="PIPPO">
+   <!--x:Name="Self">-->
 
    <UserControl.Resources>
       <ResourceDictionary>
@@ -31,6 +33,7 @@
                </Setter.Value>
             </Setter>
          </Style>
+         <!--<Geometry x:Key="DownArrowGeometry">M 0 0 L 3.5 4 L 7 0 Z</Geometry>-->
          <Geometry x:Key="DownArrowGeometry">F1 M 0,0 L 2.667,2.66665 L 5.3334,0 L 5.3334,-1.78168 L 2.6667,0.88501 L0,-1.78168 L0,0 Z</Geometry>
          <Style x:Key="ComboBoxReadonlyToggleButton" TargetType="{x:Type ToggleButton}">
             <Setter Property="OverridesDefaultStyle" Value="true"/>
@@ -127,6 +130,9 @@
                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
                            <Setter Property="Background" Value="#FFF4F4F4"/>
                         </Trigger>
+                        <!--<Trigger Property="IsDropDownOpen" Value="True">
+                           <Setter Property="Background" Value="White"/>
+                        </Trigger>-->
                         <MultiTrigger>
                            <MultiTrigger.Conditions>
                               <Condition Property="IsGrouping" Value="true"/>
@@ -170,10 +176,87 @@
       </ResourceDictionary>
    </UserControl.Resources>
 
+   <!--Visibility="{Binding ParamVisibility, ElementName=Self,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">-->
    <Grid Style="{DynamicResource Param_GpBxHeaderAlignment}">
+      <!--<Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource Invert}}">-->
+
       <Grid.Resources>
+         <EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
          <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
          <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Invert">0</sys:Int32>
+         <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+         <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+         <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+         <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+         <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+         <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+         <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+         <sys:Int32 x:Key="StepType">8</sys:Int32>
+         <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+         <sys:Int32 x:Key="Speed">10</sys:Int32>
+         <sys:Int32 x:Key="Feed">11</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+         <sys:Int32 x:Key="OffSr">15</sys:Int32>
+         <sys:Int32 x:Key="OffSl">16</sys:Int32>
+         <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+         <sys:Int32 x:Key="Approx">18</sys:Int32>
+         <sys:Int32 x:Key="StartPos">19</sys:Int32>
+         <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+         <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+         <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+         <sys:Int32 x:Key="StepPar">23</sys:Int32>
+         <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+         <sys:Int32 x:Key="TabLen">25</sys:Int32>
+         <sys:Int32 x:Key="TabDist">26</sys:Int32>
+         <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+         <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+         <sys:Int32 x:Key="LiTang">29</sys:Int32>
+         <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+         <sys:Int32 x:Key="LiElev">31</sys:Int32>
+         <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+         <sys:Int32 x:Key="LoTang">33</sys:Int32>
+         <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+         <sys:Int32 x:Key="LoElev">35</sys:Int32>
+         <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+         <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+         <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+         <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+         <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+         <sys:Int32 x:Key="SideStep">41</sys:Int32>
+         <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+         <sys:Int32 x:Key="NamePar">43</sys:Int32>
+         <sys:Int32 x:Key="Tool">44</sys:Int32>
+         <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+         <sys:Int32 x:Key="OverLap">47</sys:Int32>
+         <sys:Int32 x:Key="SubType">49</sys:Int32>
+         <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
+         <sys:Int32 x:Key="InitAngs">51</sys:Int32>
+         <sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
+         <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+         <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+         <sys:Int32 x:Key="StepBack">55</sys:Int32>
+         <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
+         <sys:Int32 x:Key="BackFeed">57</sys:Int32>
+         <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
+         <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
+         <sys:Int32 x:Key="Probing">60</sys:Int32>
+         <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
+         <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
+         <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
+         <sys:Int32 x:Key="IntCornType">64</sys:Int32>
+         <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
+         <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
+         <sys:Int32 x:Key="LiHole">67</sys:Int32>
+         <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
+         <sys:Int32 x:Key="LpTurns">69</sys:Int32>
+         <sys:Int32 x:Key="HpTurns">70</sys:Int32>
+         <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
       </Grid.Resources>
 
       <Grid.ColumnDefinitions>
@@ -192,6 +275,7 @@
                                       RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:ComboParamV}},
                                       Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
                  Style="{DynamicResource MachiningsToolTextBlock}"/>
+      <!--Style="{DynamicResource MachiningsComboBox}-->
       <ComboBox x:Name="ComboValue" Grid.Column="1" 
                 ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:ComboParamV}},
                                       Path=ParamCmBxList,
@@ -203,15 +287,14 @@
                 DisplayMemberPath="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:ComboParamV}}, 
                                             Path=ParamDisplayMemberPath,
                                             Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                IsSynchronizedWithCurrentItem="True" Margin="0,3,3,3"/>
-      
+                IsSynchronizedWithCurrentItem="True" Margin="0,3,3,3"
+/>
       <TextBlock Grid.Row="1" Grid.ColumnSpan="2" Style="{DynamicResource ValidationErrorTextBlock}"
                  Text="{Binding ParamErrorMsg,
                                 RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:ComboParamV}}}" 
                  Visibility="{Binding ParamErrorMsg,
                                       RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:ComboParamV}},
-                                      Converter={StaticResource ErrorVisibilityConverter}}" 
-                 Margin="0,0,0,3"/>
+                                      Converter={StaticResource ErrorVisibilityConverter}}" Margin="0,0,0,3"/>
 
    </Grid>
 
diff --git a/ComboParamV.xaml.vb b/ComboParamV.xaml.vb
index f61312c..c814b87 100644
--- a/ComboParamV.xaml.vb
+++ b/ComboParamV.xaml.vb
@@ -18,6 +18,20 @@ Public Class ComboParamV
       End Set
    End Property
 
+   ' ------------------------------------------------------------------- Colore TextBlock -------------------------------------------------------------------
+   'Public Shared ReadOnly ForegroundParamTxBlProperty As DependencyProperty =
+   '   DependencyProperty.Register("ForegroundParamTxBl",
+   '                               GetType(Windows.Media.Brush),
+   '                               GetType(ComboParamV),
+   '                               New PropertyMetadata(Windows.Media.Brushes.Black))
+   'Public Property ForegroundParamTxBl() As Windows.Media.Brush
+   '   Get
+   '      Return DirectCast(GetValue(ForegroundParamTxBlProperty), Windows.Media.Brush)
+   '   End Get
+   '   Set(ByVal value As Windows.Media.Brush)
+   '      SetValue(ForegroundParamTxBlProperty, value)
+   '   End Set
+   'End Property
    ' Proprietà che permette di impostare l'altezza della TitleBar
    Public Shared ReadOnly ForegroundParamCmBxTxBlProperty As DependencyProperty = DependencyProperty.RegisterAttached(
                                                                          NameOf(ForegroundParamCmBxTxBl),
@@ -398,6 +412,7 @@ Public Class ComboParamV
 
    ' ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+
 #End Region    ' ComboBox Manage Page
 
 End Class
diff --git a/Constants/ConstIni.vb b/Constants/ConstIni.vb
index 50436cd..c60852f 100644
--- a/Constants/ConstIni.vb
+++ b/Constants/ConstIni.vb
@@ -13,17 +13,104 @@
 
 Public Module ConstIni
 
-   Public Const S_GENERAL As String = "General"
+   'Public Const INI_FILE_NAME As String = "EgtCAM5.ini"
 
+   Public Const S_GENERAL As String = "General"
+   'Public Const K_DEBUG As String = "Debug"
+   'Public Const K_LICENCE As String = "Licence"
+   'Public Const K_USERLEVEL As String = "UserLevel"
+   'Public Const K_MAXINST As String = "MaxInstances"
+   'Public Const K_INSTANCES As String = "Instances"
+   'Public Const K_COMMANDLOG As String = "CommandLog"
+   'Public Const K_MESSAGESDIR As String = "MessagesDir"
+   'Public Const K_MESSAGES As String = "Messages"
    Public Const K_WINPLACE As String = "WinPlace"
+   'Public Const K_LASTNGEDIR As String = "LastNgeDir"
+   'Public Const K_LASTNGEOBJDIR As String = "LastNgeObjDir"
+   'Public Const K_LASTLUADIR As String = "LastLuaDir"
+   'Public Const K_LASTIMPDIR As String = "LastImpDir"
+   'Public Const K_LASTEXPDIR As String = "LastExpDir"
+   'Public Const K_DRAW2D As String = "2DDraw"
+   'Public Const K_DRAW3D As String = "3DDraw"
+   'Public Const K_MODIFY As String = "Modify"
+   'Public Const K_TRANSFORM As String = "Transform"
+   'Public Const K_ONLYDRAW As String = "OnlyDraw"
+   'Public Const K_SUPPORT As String = "Support"
+
+   'Public Const S_LANGUAGES As String = "Languages"
+   'Public Const K_LANGUAGE As String = "Language"
+
+   'Public Const S_LUA As String = "Lua"
+   'Public Const K_LIBSDIR As String = "LibsDir"
+   'Public Const K_BASELIB As String = "BaseLib"
 
    Public Const S_GEOMDB As String = "GeomDB"
-
+   'Public Const K_DEFAULTFONT As String = "DefaultFont"
+   'Public Const K_NFEFONTDIR As String = "NfeFontDir"
+   'Public Const K_DEFAULTCOLOR As String = "DefaultColor"
    Public Const K_SAVETYPE As String = "SaveType"
 
-   Public Const S_MACH As String = "Mach"
+   'Public Const S_OPENGL As String = "OpenGL"
+   'Public Const K_DOUBLEBUFFER As String = "DoubleBuffer"
+   'Public Const K_COLORBITS As String = "ColorBits"
+   'Public Const K_DEPTHBITS As String = "DepthBits"
+   'Public Const K_DRIVER As String = "Driver"
 
+   'Public Const S_SCENE As String = "Scene"
+   'Public Const K_BACKTOP As String = "BackTop"
+   'Public Const K_BACKBOTTOM As String = "BackBottom"
+   'Public Const K_SHOWGFRAME As String = "ShowGFrame"
+   'Public Const K_MARK As String = "Mark"
+   'Public Const K_SELSURF As String = "SelSurf"
+   'Public Const K_SHOWMODE As String = "ShowMode"
+   'Public Const K_CURVEDIR As String = "CurveDir"
+   'Public Const K_SHOWTRIAADV As String = "ShowTriaAdv"
+   'Public Const K_SHOWZMAP As String = "ShowZmap"
+   'Public Const K_ZOOMWIN As String = "ZoomWin"
+   'Public Const K_DISTLINE As String = "DistLine"
+   'Public Const K_MMUNITS As String = "MmUnits"
+
+   'Public Const S_GRID As String = "Grid"
+   'Public Const K_DRAWSHOWGRID As String = "DrawShowGrid"
+   'Public Const K_MACHININGSHOWGRID As String = "MachiningShowGrid"
+   'Public Const K_SHOWFRAME As String = "ShowFrame"
+   'Public Const K_SNAPSTEP As String = "SnapStep"
+   'Public Const K_SNAPSTEPINCH As String = "SnapStepInch"
+   'Public Const K_MINLINESSTEP As String = "MinLineSStep"
+   'Public Const K_MAJLINESSTEP As String = "MajLineSStep"
+   'Public Const K_EXTSSTEP As String = "ExtSStep"
+   'Public Const K_MINLNCOLOR As String = "MinLnColor"
+   'Public Const K_MAJLNCOLOR As String = "MajLnColor"
+
+   'Public Const S_IMPORT As String = "Import"
+   'Public Const K_CNCFLAG As String = "CncFlag"
+
+   'Public Const S_EXPORT As String = "Export"
+   'Public Const K_IMGWIDTH As String = "ImgWidth"
+   'Public Const K_IMGHEIGHT As String = "ImgHeight"
+
+   Public Const S_MACH As String = "Mach"
+   'Public Const K_MACHINESDIR As String = "MachinesDir"
    Public Const K_TOOLMAKERSDIR As String = "ToolMakersDir"
+   'Public Const K_CURRMACH As String = "CurrMach"
+   'Public Const K_SELGEOMSAWING As String = "SelGeomSawing"
+   'Public Const K_SELGEOMDRILLING As String = "SelGeomDrilling"
+   'Public Const K_SELGEOMMILLING As String = "SelGeomMilling"
+   'Public Const K_SELGEOMPOCKETING As String = "SelGeomPocketing"
+   'Public Const K_SELGEOMMORTISING As String = "SelGeomMortising"
+   'Public Const K_SELGEOMSAWROUGHING As String = "SelGeomSawRoughing"
+   'Public Const K_SELGEOMSAWFINISHING As String = "SelGeomSawFinishing"
+   'Public Const K_SELGEOMGENMACHINING As String = "SelGeomGenMachining"
+   'Public Const K_SELGEOMCHISELING As String = "SelGeomChiseling"
+   'Public Const K_MACHININGGROUP As String = "MachiningGroup"
+
+   'Public Const S_SIMUL As String = "Simul"
+   'Public Const K_SLIDERX As String = "SliderX"
+   'Public Const K_SLIDERVAL As String = "SliderVal"
+
+   'Public Const S_OPTIONS As String = "Options"
+   'Public Const K_NEWMACHININGISLASTONE As String = "NewMachiningIsLastOne"
+   'Public Const K_USEDISPOSITIONSCRIPT As String = "UseDispositionScript"
 
    Public Const S_MRUFILES As String = "MruFiles"
    Public Const S_MRUIMPORT As String = "MruImport"
@@ -31,12 +118,12 @@ Public Module ConstIni
    Public Const S_MRUDOORS As String = "MruDoors"
    Public Const S_MRUGUNSTOCKMOD As String = "MruGunStockMod"
    Public Const S_MRUGUNSTOCKPEZ As String = "MruGunStockPez"
-
    Public Const K_FILE As String = "File"
 
    ' Aggiunte da OmagOFFICE
    Public Const INI_FILE_NAME As String = "OmagOFFICE.ini"
 
+   'Public Const S_GENERAL As String = "General"
    Public Const K_DEBUG As String = "Debug"
    Public Const K_LICENCE As String = "Licence"
    Public Const K_USERLEVEL As String = "UserLevel"
@@ -45,6 +132,7 @@ Public Module ConstIni
    Public Const K_COMMANDLOG As String = "CommandLog"
    Public Const K_MESSAGESDIR As String = "MessagesDir"
    Public Const K_MESSAGES As String = "Messages"
+   'Public Const K_WINPLACE As String = "WinPlace"
    Public Const K_CSVWINPLACE As String = "CsvWinPlace"
    Public Const K_MMUNITS As String = "MmUnits"
    Public Const K_LASTPROJ As String = "LastProj"
@@ -61,9 +149,11 @@ Public Module ConstIni
    Public Const K_LIBSDIR As String = "LibsDir"
    Public Const K_BASELIB As String = "BaseLib"
 
+   'Public Const S_GEOMDB As String = "GeomDB"
    Public Const K_DEFAULTFONT As String = "DefaultFont"
    Public Const K_NFEFONTDIR As String = "NfeFontDir"
    Public Const K_DEFAULTCOLOR As String = "DefaultColor"
+   'Public Const K_SAVETYPE As String = "SaveType"
 
    Public Const S_OPENGL As String = "OpenGL"
    Public Const K_DOUBLEBUFFER As String = "DoubleBuffer"
@@ -167,7 +257,9 @@ Public Module ConstIni
    Public Const K_CAM_TOLERANCE As String = "Tolerance"
    Public Const K_CAM_TIMEOUT As String = "Timeout"
 
+   'Public Const S_MACH As String = "Mach"
    Public Const K_MACHINESDIR As String = "MachinesDir"
+   'Public Const K_TOOLMAKERSDIR As String = "ToolMakersDir"
    Public Const K_CURRMACH As String = "CurrMach"
 
    Public Const S_SIMUL As String = "Simul"
@@ -200,8 +292,4 @@ Public Module ConstIni
    ' Direttorio THolders
    Public Const T_HOLDER As String = "THolders"
 
-   ' EgtManageDialog
-   Public Const S_TEMPLETESEL As String = "TempleteSel"
-   Public Const K_CURRTEMPLETESEL As String = "CurrTempleteSel"
-
 End Module
diff --git a/Constants/ConstMachIni.vb b/Constants/ConstMachIni.vb
index 368c620..c78046f 100644
--- a/Constants/ConstMachIni.vb
+++ b/Constants/ConstMachIni.vb
@@ -10,11 +10,17 @@
    Public Const K_CHISEL As String = "Chisel"
    Public Const K_COMPO As String = "Compo"
    Public Const K_WATERJET As String = "Waterjet"
+   'Public Const K_SHOWTOOLCHANGER As String = "ShowToolChanger"
+   'Public Const K_SHOWHEADEXIT As String = "ShowHeadExit"
+   'Public Const K_DRILLHOLDER As String = "DrillHolder"
+   'Public Const K_SAWBLADEHOLDER As String = "SawBladeHolder"
+   'Public Const K_MILLHOLDER As String = "MillHolder"
    Public Const K_DRILLMAKER As String = "DrillMaker"
    Public Const K_SAWBLADEMAKER As String = "SawbladeMaker"
    Public Const K_MILLMAKER As String = "MillMaker"
    Public Const K_MORTISEMAKER As String = "MortiseMaker"
    Public Const K_CHISELMAKER As String = "ChiselMaker"
+   'Public Const K_MOUNTEDTOOLCONFIG As String = "MountedToolConfig"
 
    Public Const S_TOOLHOLDER As String = "ToolHolder"
 
@@ -40,10 +46,24 @@
    Public Const S_5AXMILLING As String = "5AxMilling"
    Public Const K_5AXSCRIPT As String = "5AxScript"
 
+   'Public Const S_TOOLCHANGER As String = "ToolChanger"
+   'Public Const K_NUMBER As String = "Number"
    Public Const K_POS As String = "Pos"
+   'Public Const K_NAME As String = "Name"
+   'Public Const K_MANUALNUMBER As String = "ManualNumber"
+   'Public Const K_MANUALPOS As String = "ManualPos"
+   'Public Const K_MANUALNAME As String = "ManualName"
+
+   'Public Const S_DISPOSITION As String = "Disposition"
+   'Public Const K_INITSCRIPT As String = "InitScript"
+
+   'Public Const S_FIXTURES As String = "Fixtures"
 
    Public Const S_HEADS As String = "Heads"
 
+   'Public Const S_SETUP As String = "SetUp"
+   'Public Const K_DEFAULT As String = "Default"
+
    Public Const S_ESTIMATIONS As String = "Estimations"
 
    'Aggiunti da OmagOFFICE
@@ -160,7 +180,12 @@
    Public Const K_PHOTO_TAB2_OFFSETX As String = "Tab2OffsetX"
    Public Const K_PHOTO_TAB2_OFFSETY As String = "Tab2OffsetY"
 
+   'Public Const S_TOOLS As String = "Tools"
+   'Public Const K_DRILLBIT As String = "Drillbit"
+   'Public Const K_SAWBLADE As String = "Sawblade"
+   'Public Const K_MILL As String = "Mill"
    Public Const K_MILLNOTIP As String = "MillNoTip"
+   'Public Const K_WATERJET As String = "WaterJet"
    Public Const K_SHOWTOOLCHANGER As String = "ShowToolChanger"
    Public Const K_SHOWHEADEXIT As String = "ShowHeadExit"
    Public Const K_SHOWUSERNOTES As String = "ShowUserNotes"
@@ -168,10 +193,22 @@
    Public Const K_DRILLHOLDER As String = "DrillHolder"
    Public Const K_SAWBLADEHOLDER As String = "SawBladeHolder"
    Public Const K_MILLHOLDER As String = "MillHolder"
+   'Public Const K_DRILLMAKER As String = "DrillMaker"
+   'Public Const K_SAWBLADEMAKER As String = "SawBladeMaker"
+   'Public Const K_MILLMAKER As String = "MillMaker"
    Public Const K_MOUNTEDTOOLCONFIG As String = "MountedToolConfig"
    Public Const K_MAXSAWDIAMFORVAC As String = "MaxSawDiamForVac"
    Public Const K_MAXSAWDIAMFORPROBE As String = "MaxSawDiamForProbe"
 
+   'Public Const S_MACHININGS As String = "Machinings"
+   'Public Const K_SAWING As String = "Sawing"
+   'Public Const K_DRILLING As String = "Drilling"
+   'Public Const K_MILLING As String = "Milling"
+   'Public Const K_POCKETING As String = "Pocketing"
+   'Public Const K_SAWROUGHING As String = "SawRoughing"
+   'Public Const K_SAWFINISHING As String = "SawFinishing"
+   'Public Const K_WATERJETTING As String = "WaterJetting"
+
    Public Const S_MACH_NEST As String = "Nest"
    Public Const K_MACH_HOLES_OFFSET As String = "HolesOffset"
    Public Const K_MACH_HOLES_OVERLAP As String = "HolesOverlap"
@@ -194,6 +231,11 @@
    Public Const K_MACH_CUTFSEVENABLE As String = "CutFsevEnable"
    Public Const K_MACH_CUTFSEVLEN As String = "CutFsevLen"
    Public Const K_MACH_CUTFSEVPERC As String = "CutFsevPerc"
+   ' DrillMillC90
+   ' CutLongDxSx
+   ' AngRotMultiCut
+   ' MinDistHeadsMultiCut
+   ' MinSawRbHeight
 
    Public Const S_MACH_RAWMOVE As String = "RawMove"
    Public Const K_MACH_RM_ROTATE As String = "Rotate"
@@ -204,6 +246,7 @@
 
    Public Const S_TOOLCHANGER As String = "ToolChanger"
    Public Const K_NUMBER As String = "Number"
+   'Public Const K_POS As String = "Pos"
    Public Const K_NAME As String = "Name"
    Public Const K_MANUALNUMBER As String = "ManualNumber"
    Public Const K_MANUALPOS As String = "ManualPos"
@@ -261,4 +304,241 @@
    Public Const S_SETUP As String = "SetUp"
    Public Const K_DEFAULT As String = "Default"
 
+   ' Aggiunte da ConstMachIni di EgtStone (eliminato perché entrava in conflitto)
+   'Public Const S_NUMERICALCONTROL As String = "NumericalControl"
+   'Public Const K_TYPE As String = "Type"
+
+   'Public Const S_PARTPROGRAM As String = "PartProgram"
+   'Public Const K_EXTENSION As String = "Extension"
+
+   'Public Const S_AXES As String = "Axes"
+   'Public Const K_AXESNUM As String = "AxesNum"
+   'Public Const K_SIMULATIONAXESNUM As String = "SimulationAxesNum"
+   'Public Const K_L1NAME As String = "L1Name"
+   'Public Const K_L1ID As String = "L1Id"
+   'Public Const K_L2NAME As String = "L2Name"
+   'Public Const K_L2ID As String = "L2Id"
+   'Public Const K_L3NAME As String = "L3Name"
+   'Public Const K_L3ID As String = "L3Id"
+   'Public Const K_R1NAME As String = "R1Name"
+   'Public Const K_R1ID As String = "R1Id"
+   'Public Const K_R2NAME As String = "R2Name"
+   'Public Const K_R2ID As String = "R2Id"
+   'Public Const K_A6NAME As String = "A6Name"
+   'Public Const K_A6ID As String = "A6Id"
+   'Public Const K_A7NAME As String = "A7Name"
+   'Public Const K_A7ID As String = "A7Id"
+   'Public Const K_A8NAME As String = "A8Name"
+   'Public Const K_A8ID As String = "A8Id"
+   'Public Const K_A9NAME As String = "A9Name"
+   'Public Const K_A9ID As String = "A9Id"
+   'Public Const K_A10NAME As String = "A10Name"
+   'Public Const K_A10ID As String = "A10Id"
+   'Public Const K_DELTA_C As String = "DeltaC"
+   'Public Const K_ININCHES As String = "InInches"
+
+   'Public Const S_NCSIEMENS As String = "NcSiemens"
+   'Public Const K_COMM_NAME As String = "CommName"
+   'Public Const K_PATH_HMI As String = "PathHmi"
+
+   'Public Const S_NCNUM As String = "NcNUM"
+   'Public Const K_RESETSENDDELAY As String = "ResetSendDelay"
+
+   'Public Const S_NCDATA As String = "NcData"
+   'Public Const K_COMM As String = "Comm"
+   'Public Const K_REFRESH As String = "Refresh"
+   'Public Const K_MODE As String = "Mode"
+   'Public Const K_JOGINCR As String = "JogIncr"
+   'Public Const K_FEED As String = "Feed"
+   'Public Const K_FEEDOVR As String = "FeedOvr"
+   'Public Const K_SPEED As String = "Speed"
+   'Public Const K_SPEEDOVR As String = "SpeedOvr"
+   'Public Const K_POWER As String = "Power"
+   'Public Const K_SPINDLE As String = "Spindle"
+   'Public Const K_LASER As String = "Laser"
+   'Public Const K_COOLANT As String = "Coolant"
+   'Public Const K_INTERNALCOOLANT As String = "InternalCoolant"
+   'Public Const K_EXTERNCOOLANT As String = "ExternCoolant"
+   'Public Const K_CAXES As String = "CAxes"
+   'Public Const K_BAXES As String = "BAxes"
+   'Public Const K_THREEAXES As String = "ThreeAxes"
+   'Public Const K_FIVEAXES As String = "FiveAxes"
+   'Public Const K_AIRBLOW As String = "AirBlow"
+   'Public Const K_HOME As String = "Home"
+   'Public Const K_TABLEUP As String = "TableUp"
+   'Public Const K_TABLEDOWN As String = "TableDown"
+   'Public Const K_MANUAL As String = "Manual"
+   'Public Const K_DOORCLOSED As String = "DoorClosed"
+   'Public Const K_LIMITZ As String = "LimitZ"
+   'Public Const K_POWEROVR As String = "PowerOvr"
+   'Public Const K_VACUUMUP As String = "VacuumUp"
+   'Public Const K_VACUUMDOWN As String = "VacuumDown"
+   'Public Const K_VACUUM0 As String = "Vacuum0"
+   'Public Const K_VACUUM90 As String = "Vacuum90"
+   'Public Const K_VACUU3STATE As String = "Vacuum3State"
+   'Public Const K_VACUU4STATE As String = "Vacuum4State"
+   'Public Const K_VACUU135STATE As String = "Vacuum135State"
+   'Public Const K_VACUU246STATE As String = "Vacuum246State"
+   'Public Const K_OPENALLSTATE As String = "OpenAllState"
+   'Public Const K_CLOSEALLSTATE As String = "CloseAllState"
+   'Public Const K_BLOWSTATE As String = "BlowState"
+   'Public Const K_VACUUMSTATE As String = "VacuumState"
+   'Public Const K_VACUUMON As String = "VacuumOn"
+   'Public Const K_VACUUMOFF As String = "VacuumOff"
+   'Public Const K_BYPASSTATE As String = "BypassState"
+
+   'Public Const S_PRODUCTIONLINE As String = "ProductionLine"
+   'Public Const K_ACTIVE As String = "Active"
+   'Public Const K_NAMEPROG1 As String = "NameProg1"
+   'Public Const K_VARPROG1 As String = "VarProg1"
+   'Public Const K_NAMEPROG2 As String = "NameProg2"
+   'Public Const K_VARPROG2 As String = "VarProg2"
+   'Public Const K_LINEDATADIR As String = "DataDir"
+   'Public Const K_VARPROJCOPY As String = "VarProjCopy"
+   'Public Const K_SPECIALUNLOAD As String = "SpecialUnload"
+   'Public Const K_SAVEPRODUCED As String = "SaveProduced"
+   'Public Const K_VARPROGTWINS As String = "VarProgTwins"
+   'Public Const K_PRODLIENABLESAWPROBE As String = "EnableSawProbe"
+   'Public Const K_PRODLIPROBINGSTATEVAR As String = "ProbingStateVar"
+   'Public Const K_PRODLIPROBINGTCPOSVAR As String = "ProbingTcPosVar"
+   'Public Const K_PRODLISAWDIAMETERVAR As String = "SawDiameterVar"
+   'Public Const K_PRODLIPROBINGSTATE2VAR As String = "ProbingState2Var"
+   'Public Const K_PRODLIPROBINGTCPOS2VAR As String = "ProbingTcPos2Var"
+   'Public Const K_PRODLISAWDIAMETER2VAR As String = "SawDiameter2Var"
+
+   'Public Const S_TABLE As String = "Table"
+   'Public Const K_ADDITIONALTABLE As String = "AdditionalTable"
+   'Public Const K_TAB2_ADDITIONALTABLE As String = "Tab2AdditionalTable"
+   'Public Const K_TAB3_ADDITIONALTABLE As String = "Tab3AdditionalTable"
+   'Public Const K_CENTER_RAW_ONX As String = "CenterRawOnX"
+
+   'Public Const S_PHOTO As String = "Photo"
+   'Public Const K_PHOTO_OFFSETX As String = "OffsetX"
+   'Public Const K_PHOTO_OFFSETY As String = "OffsetY"
+   'Public Const K_PHOTO_TAB2_OFFSETX As String = "Tab2OffsetX"
+   'Public Const K_PHOTO_TAB2_OFFSETY As String = "Tab2OffsetY"
+
+   'Public Const S_TOOLS As String = "Tools"
+   'Public Const K_DRILLBIT As String = "Drillbit"
+   'Public Const K_SAWBLADE As String = "Sawblade"
+   'Public Const K_MILL As String = "Mill"
+   'Public Const K_MILLNOTIP As String = "MillNoTip"
+   'Public Const K_WATERJET As String = "WaterJet"
+   'Public Const K_SHOWTOOLCHANGER As String = "ShowToolChanger"
+   'Public Const K_SHOWHEADEXIT As String = "ShowHeadExit"
+   'Public Const K_SHOWUSERNOTES As String = "ShowUserNotes"
+   'Public Const K_SHOWSPECIALS As String = "ShowSpecials"
+   'Public Const K_DRILLHOLDER As String = "DrillHolder"
+   'Public Const K_SAWBLADEHOLDER As String = "SawBladeHolder"
+   'Public Const K_MILLHOLDER As String = "MillHolder"
+   'Public Const K_DRILLMAKER As String = "DrillMaker"
+   'Public Const K_SAWBLADEMAKER As String = "SawBladeMaker"
+   'Public Const K_MILLMAKER As String = "MillMaker"
+   'Public Const K_MOUNTEDTOOLCONFIG As String = "MountedToolConfig"
+   'Public Const K_MAXSAWDIAMFORVAC As String = "MaxSawDiamForVac"
+   'Public Const K_MAXSAWDIAMFORPROBE As String = "MaxSawDiamForProbe"
+
+   ''Public Const S_MACHININGS As String = "Machinings"
+   'Public Const K_SAWING As String = "Sawing"
+   'Public Const K_DRILLING As String = "Drilling"
+   'Public Const K_MILLING As String = "Milling"
+   'Public Const K_POCKETING As String = "Pocketing"
+   'Public Const K_SAWROUGHING As String = "SawRoughing"
+   'Public Const K_SAWFINISHING As String = "SawFinishing"
+   'Public Const K_WATERJETTING As String = "WaterJetting"
+
+   'Public Const S_MACH_NEST As String = "Nest"
+   'Public Const K_MACH_HOLES_OFFSET As String = "HolesOffset"
+   'Public Const K_MACH_HOLES_OVERLAP As String = "HolesOverlap"
+   'Public Const K_MACH_HOLES_DIAMTOLER As String = "HolesDiamToler"
+   'Public Const K_MACH_ONEHOLE_INTCORNER As String = "OneHoleOnIntCorner"
+   'Public Const K_MACH_SAFE_LEN_CUT As String = "SafeLenOnCut"
+   'Public Const K_MACH_SAFE_LEN_INTCORNER As String = "SafeLenOnIntCorner"
+   'Public Const K_MACH_REDUCEDCUT As String = "ReducedCut"
+   'Public Const K_MACH_REDUCEDDEPTH As String = "ReducedDepth"
+   'Public Const K_MACH_EXTARCMINRAD As String = "ExtArcMinRad"
+   'Public Const K_MACH_INTARCMAXSIDEANG As String = "IntArcMaxSideAng"
+   'Public Const K_MACH_MILLING_ON_CORNERS As String = "MillingOnCorners"
+   'Public Const K_MACH_MILLING_ON_SINKS As String = "MillingOnSinks"
+   'Public Const K_MACH_MILLING_SHORTENING As String = "MillingShortening"
+   'Public Const K_MACH_NEST_ALIGNED As String = "Aligned"
+   'Public Const K_MACH_WASHING As String = "Washing"
+   'Public Const K_MACH_SACPROBE As String = "SacProbe"
+   'Public Const K_MACH_ENABLERESTART As String = "EnableRestart"
+   'Public Const K_MACH_ENABLEPAUSE As String = "EnablePause"
+   'Public Const K_MACH_CUTFSEVENABLE As String = "CutFsevEnable"
+   'Public Const K_MACH_CUTFSEVLEN As String = "CutFsevLen"
+   'Public Const K_MACH_CUTFSEVPERC As String = "CutFsevPerc"
+   '' DrillMillC90
+   '' CutLongDxSx
+   '' AngRotMultiCut
+   '' MinDistHeadsMultiCut
+   '' MinSawRbHeight
+
+   'Public Const S_MACH_RAWMOVE As String = "RawMove"
+   'Public Const K_MACH_RM_ROTATE As String = "Rotate"
+   'Public Const K_MACH_RM_FINALMOVE As String = "FinalMove"
+
+   'Public Const S_MACH_REG As String = "Reg"
+   'Public Const K_MACH_MAX_ROT_ANG As String = "MaxRotAng"
+
+   'Public Const S_TOOLCHANGER As String = "ToolChanger"
+   'Public Const K_NUMBER As String = "Number"
+   'Public Const K_POS As String = "Pos"
+   'Public Const K_NAME As String = "Name"
+   'Public Const K_MANUALNUMBER As String = "ManualNumber"
+   'Public Const K_MANUALPOS As String = "ManualPos"
+   'Public Const K_MANUALNAME As String = "ManualName"
+
+   'Public Const S_MACH_DIRECTCUTS As String = "DirectCuts"
+   'Public Const K_FINALHOME As String = "FinalHome"
+
+   'Public Const S_MACHBUTTONS As String = "MachButtons"
+   'Public Const S_CONTROLMACHBUTTONS As String = "ControlMachButtons"
+   'Public Const S_VACUUMMACHBUTTONS As String = "VacuumMachButtons"
+   'Public Const K_BUTTON As String = "Button"
+
+   'Public Const S_MACH_INPROGRESS As String = "InProgress"
+   'Public Const K_PHASEVAR As String = "PhaseVar"
+
+   'Public Const S_MACH_PROBING As String = "Probing"
+   'Public Const K_PROBINGSTATEVAR As String = "ProbingStateVar"
+   'Public Const K_SAWDIAMETER As String = "SawDiameter"
+   'Public Const K_RAWTHICKNESS As String = "RawThickness"
+   'Public Const K_ENABLERAWPROBE As String = "EnableRawProbe"
+
+   'Public Const S_MACH_BARCODEREADER As String = "BarcodeReader"
+   'Public Const K_ENABLEBCR As String = "EnableBCR"
+
+   'Public Const S_MACH_ESTIMATIONS As String = "Estimations"
+   'Public Const K_ENABLEEST As String = "Enable"
+
+   'Public Const S_MACH_MACH As String = "Mach"
+   'Public Const K_CURRSAW As String = "CurrSaw"
+   'Public Const K_CURRDRILL As String = "CurrDrill"
+   'Public Const K_CURRMILL As String = "CurrMill"
+   'Public Const K_CURRMILLNOTIP As String = "CurrMillNoTip"
+   'Public Const K_CURRDRIPSAW As String = "CurrDripSaw"
+   'Public Const K_CURRDRIPDRILL As String = "CurrDripDrill"
+   'Public Const K_CURRWATERJET As String = "CurrWaterJet"
+   'Public Const K_CURRSAWING As String = "CurrSawing"
+   'Public Const K_CURRDRILLING As String = "CurrDrilling"
+   'Public Const K_CURRMILLING As String = "CurrMilling"
+   'Public Const K_CURRPOCKETING As String = "CurrPocketing"
+   'Public Const K_CURRSAWROUGHING As String = "CurrSawRoughing"
+   'Public Const K_CURRSAWFINISHING As String = "CurrSawFinishing"
+   'Public Const K_CURRSAWSIDEFINISHING As String = "CurrSawSideFinishing"
+   'Public Const K_CURRSAWSINGLE As String = "CurrSawSingle"
+   'Public Const K_CURRDRIPSAWING As String = "CurrDripSawing"
+   'Public Const K_CURRDRIPDRILLING As String = "CurrDripDrilling"
+   'Public Const K_CURRWATERJETTING As String = "CurrWaterJetting"
+
+   'Public Const S_MATERIALS As String = "Materials"
+   'Public Const K_CURRMATERIAL As String = "CurrMaterial"
+   'Public Const K_CURROFFICEMATERIAL As String = "CurrOfficeMaterial"
+   'Public Const K_MATERIAL As String = "Material"
+
+   'Public Const S_SETUP As String = "SetUp"
+   'Public Const K_DEFAULT As String = "Default"
+
 End Module
diff --git a/Constants/ConstMsg.vb b/Constants/ConstMsg.vb
index b70c17d..4e98245 100644
--- a/Constants/ConstMsg.vb
+++ b/Constants/ConstMsg.vb
@@ -2,15 +2,59 @@
 
    Public Const MSG_EGTCAM5 As Integer = 5000
    Public Const MSG_MAINWINDOW As Integer = MSG_EGTCAM5
+   'Public Const MSG_TOPCOMMANDBAR As Integer = MSG_EGTCAM5 + 100
+   'Public Const MSG_DRAWPANEL As Integer = MSG_EGTCAM5 + 200
    Public Const MSG_GRIDVIEWPANEL As Integer = MSG_EGTCAM5 + 250
+   'Public Const MSG_SIMULATION As Integer = MSG_EGTCAM5 + 300
+   'Public Const MSG_DRAWOPTION As Integer = MSG_EGTCAM5 + 350
+   'Public Const MSG_OPERATION As Integer = MSG_EGTCAM5 + 400
+   'Public Const MSG_DISPOSITION As Integer = MSG_EGTCAM5 + 430
+   'Public Const MSG_DISPOSITIONERRORS As Integer = MSG_EGTCAM5 + 460
+   'Public Const MSG_MACHGROUP As Integer = MSG_EGTCAM5 + 500
    Public Const MSG_TOOLSDBPAGE As Integer = MSG_EGTCAM5 + 1000
+   'Public Const MSG_TOOLSERRORS As Integer = MSG_EGTCAM5 + 1100
+   'Public Const MSG_MACHININGSDBPAGE As Integer = MSG_EGTCAM5 + 1200
+   'Public Const MSG_MACHININGSERRORS As Integer = MSG_EGTCAM5 + 1350
+   'Public Const MSG_SETUP As Integer = MSG_EGTCAM5 + 1450
+   'Public Const MSG_SETUPERRORS As Integer = MSG_EGTCAM5 + 1470
+   'Public Const MSG_OPTIONPAGE As Integer = MSG_EGTCAM5 + 1500
+   'Public Const MSG_DOORS As Integer = MSG_EGTCAM5 + 3000
    Public Const MSG_DOORSERRORS As Integer = MSG_EGTCAM5 + 3100
+   'Public Const MSG_GUNSTOCK As Integer = MSG_EGTCAM5 + 3200
+   'Public Const MSG_GUNSTOCKERRORS As Integer = MSG_EGTCAM5 + 3250
+   'Public Const MSG_MISSINGKEYWD As Integer = 10100
    Public Const MSG_MESSAGEBOX As Integer = 15000
 
    Public Const MSG_EGTSAVEFILEDIALOG As Integer = MSG_EGTWPFLIB5
 
+   'Public Const MSG_NUMERICKEYBOARDWD As Integer = 10200
+
    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_EGTWPFLIB5 As Integer = 30000
    Public Const MSG_MACHGROUPPANEL As Integer = MSG_EGTWPFLIB5 + 900
@@ -30,22 +74,36 @@
    Public Const MSG_VEINMATCHING As Integer = MSG_OMAGOFFICE + 200
 
    ' Aggiunto da EgtCAM5 
+   'Public Const MSG_EGTCAM5 As Integer = 5000
+   'Public Const MSG_MAINWINDOW As Integer = MSG_EGTCAM5
    Public Const MSG_TOPCOMMANDBAR As Integer = MSG_EGTCAM5 + 100
    Public Const MSG_DRAWPANEL As Integer = MSG_EGTCAM5 + 200
+   'Public Const MSG_GRIDVIEWPANEL As Integer = MSG_EGTCAM5 + 250
+   'Public Const MSG_SIMULATION As Integer = MSG_EGTCAM5 + 300
    Public Const MSG_DRAWOPTION As Integer = MSG_EGTCAM5 + 350
    Public Const MSG_OPERATION As Integer = MSG_EGTCAM5 + 400
    Public Const MSG_DISPOSITION As Integer = MSG_EGTCAM5 + 430
    Public Const MSG_DISPOSITIONERRORS As Integer = MSG_EGTCAM5 + 460
    Public Const MSG_MACHGROUP As Integer = MSG_EGTCAM5 + 500
+   'Public Const MSG_TOOLSDBPAGE As Integer = MSG_EGTCAM5 + 1000
    Public Const MSG_TOOLSERRORS As Integer = MSG_EGTCAM5 + 1100
    Public Const MSG_MACHININGSDBPAGE As Integer = MSG_EGTCAM5 + 1200
+   'Public Const MSG_MACHININGDB As Integer = MSG_EGTWPFLIB5 + 1200
    Public Const MSG_MACHININGSERRORS As Integer = MSG_EGTCAM5 + 1370
    Public Const MSG_MACHININGOPTIONPAGE As Integer = MSG_EGTCAM5 + 1400
+   'Public Const MSG_SETUP As Integer = MSG_EGTCAM5 + 1450
+   'Public Const MSG_SETUPERRORS As Integer = MSG_EGTCAM5 + 1470
    Public Const MSG_OPTIONPAGE As Integer = MSG_EGTCAM5 + 1500
    Public Const MSG_STATUSBAR As Integer = MSG_EGTCAM5 + 1800
    Public Const MSG_DOORS As Integer = MSG_EGTCAM5 + 3000
+   'Public Const MSG_DOORSERRORS As Integer = MSG_EGTCAM5 + 3100
    Public Const MSG_GUNSTOCK As Integer = MSG_EGTCAM5 + 3200
    Public Const MSG_GUNSTOCKERRORS As Integer = MSG_EGTCAM5 + 3250
+   'Public Const MSG_MESSAGEBOX As Integer = 15000
    Public Const MSG_MISSINGKEYWD As Integer = 10100
 
+   'Public Const MSG_EGTWPFLIB5 As Integer = 30000
+   'Public Const MSG_EGTSAVEFILEDIALOG As Integer = MSG_EGTWPFLIB5
+   'Public Const MSG_MACHININGDBERRORS As Integer = MSG_EGTWPFLIB5 + 1400
+
 End Module
diff --git a/CurrentMachine.vb b/CurrentMachine.vb
index c5e5d51..8b40859 100644
--- a/CurrentMachine.vb
+++ b/CurrentMachine.vb
@@ -203,7 +203,10 @@ Public Module CurrentMachine
       Return False
    End Function
 
+   'Sub InitCurrentMachine(sMachinesRootDir As String, sMachineName As String,
+   '                       bKeyProdLine As Boolean, bKeyMill As Boolean, bKeyWJ As Boolean, Optional bOffice As Boolean = False)
    Sub InitCurrentMachine(sMachIniFile As String)
+
       m_sMachIniFile = sMachIniFile
       m_sMachDir = Path.GetDirectoryName(m_sMachIniFile)
 
diff --git a/EgtColorPicker/EgtColorPickerVM.vb b/EgtColorPicker/EgtColorPickerVM.vb
deleted file mode 100644
index b5dd517..0000000
--- a/EgtColorPicker/EgtColorPickerVM.vb
+++ /dev/null
@@ -1,1012 +0,0 @@
-Imports System.Windows.Forms
-Imports EgtUILib
-
-Public Class EgtColorPickerVM
-   Inherits VMBase
-
-#Region "FIELDS & PROPERTIES"
-
-   Public Event m_CloseWindow(bDialogResult As MessageBoxResult)
-
-   Public ReadOnly Property sTitle As String
-      Get
-         Return EgtMsg(15059)    ' Color Picker
-      End Get
-   End Property
-
-   ' Lista nido d'ape colori
-   Private m_HexList As New List(Of HexItem)
-   Public Property HexList As List(Of HexItem)
-      Get
-         Return m_HexList
-      End Get
-      Set(value As List(Of HexItem))
-         m_HexList = value
-      End Set
-   End Property
-
-   ' Lista colori di base con sfumature
-   Private m_BasicColorsTheme As New List(Of EgtColorPicker)
-   Public Property BasicColorsTheme As List(Of EgtColorPicker)
-      Get
-         Return m_BasicColorsTheme
-      End Get
-      Set(value As List(Of EgtColorPicker))
-         m_BasicColorsTheme = value
-      End Set
-   End Property
-
-   ' Lista colori di base
-   Private m_BasicColors As New List(Of EgtColorPicker)
-   Public Property BasicColors As List(Of EgtColorPicker)
-      Get
-         Return m_BasicColors
-      End Get
-      Set(value As List(Of EgtColorPicker))
-         m_BasicColors = value
-      End Set
-   End Property
-
-   'Lista colori costumizzabili
-   Private m_CustomColors As New List(Of EgtColorPicker)
-   Public Property CustomColors As List(Of EgtColorPicker)
-      Get
-         Return m_CustomColors
-      End Get
-      Set(value As List(Of EgtColorPicker))
-         m_CustomColors = value
-      End Set
-   End Property
-
-   Public Sub SetCustomColors(value As Integer())
-      Dim coloraRGB As System.Drawing.Color
-      Dim colorRGB As Color
-      For i As Integer = 0 To value.Length - 1
-         coloraRGB = System.Drawing.Color.FromArgb(value(i))
-         colorRGB = Color.FromRgb(coloraRGB.R, coloraRGB.G, coloraRGB.B)
-         m_CustomColors.Insert(i, New EgtColorPicker(New SolidColorBrush(colorRGB)))
-         m_CustomColors.RemoveAt(m_CustomColors.Count - 1)
-      Next
-      SelCustomColor = m_CustomColors(0)
-      NotifyPropertyChanged(NameOf(SelCustomColor))
-   End Sub
-
-   Public Function GetCustomColors() As Integer()
-      Dim arrayColor As Integer() = New Integer(m_CustomColors.Count - 1) {}
-      Dim coloraRGB As System.Drawing.Color
-      Dim colorCode As Integer
-      For i As Integer = 0 To m_CustomColors.Count - 1
-         Dim intValue As Integer = Integer.Parse(m_CustomColors(i).Fill.ToString().Remove(0, 3), System.Globalization.NumberStyles.HexNumber)
-         coloraRGB = System.Drawing.Color.FromArgb(intValue)
-         colorCode = coloraRGB.ToArgb()
-         arrayColor(i) = colorCode
-      Next
-      Return arrayColor
-   End Function
-
-   Private m_CurrColor As Color
-   Public ReadOnly Property CurrColor As SolidColorBrush
-      Get
-         Return New SolidColorBrush(m_CurrColor)
-      End Get
-   End Property
-
-   ' Colore selezionato dalla lista sfumature
-   Private m_SelColorTheme As EgtColorPicker
-   Public Property SelColorTheme As EgtColorPicker
-      Get
-         Return m_SelColorTheme
-      End Get
-      Set(value As EgtColorPicker)
-         m_SelColorTheme = value
-         SetCurrColorFill(value.Fill.Color)
-         NotifyPropertyChanged(NameOf(SelColorTheme))
-         UpdateChangeColor()
-      End Set
-   End Property
-
-   ' Singolo esagono selezionato
-   Private m_sHexSelColor As HexItem
-   Public Property sHexSelColor As HexItem
-      Get
-         Return m_sHexSelColor
-      End Get
-      Set(value As HexItem)
-         m_sHexSelColor = value
-         SetCurrColorFill(value.Background.Color)
-         NotifyPropertyChanged(NameOf(sHexSelColor))
-         UpdateChangeColor()
-      End Set
-   End Property
-
-   Private m_SelColor As EgtColorPicker
-   Public Property SelColor As EgtColorPicker
-      Get
-         Return m_SelColor
-      End Get
-      Set(value As EgtColorPicker)
-         m_SelColor = value
-         m_Fill = value.Fill
-         SetCurrColorFill(value.Fill.Color)
-         NotifyPropertyChanged(NameOf(SelColor))
-         UpdateChangeColor()
-      End Set
-   End Property
-
-   Private m_CustomColor As EgtColorPicker
-   Public Property SelCustomColor As EgtColorPicker
-      Get
-         Return m_CustomColor
-      End Get
-      Set(value As EgtColorPicker)
-         m_CustomColor = value
-         SetCurrColorFill(value.Fill.Color)
-         NotifyPropertyChanged(NameOf(SelCustomColor))
-         UpdateChangeColor()
-      End Set
-   End Property
-
-   Private m_Fill As SolidColorBrush
-   Public ReadOnly Property Fill As SolidColorBrush
-      Get
-         Return m_Fill
-      End Get
-   End Property
-
-   Friend Sub SetCurrColorFill(value As Color)
-      m_CurrColor = value
-      SetRed(m_CurrColor.R)
-      SetGreen(m_CurrColor.G)
-      SetBlu(m_CurrColor.B)
-      SetHexadecimal(m_CurrColor.ToString)
-      NotifyPropertyChanged(NameOf(CurrColor))
-   End Sub
-
-   Private m_Hexadecimal As String
-   Public Property Hexadecimal As String
-      Get
-         Return "#" & System.Drawing.Color.FromArgb(CInt(m_Red), CInt(m_Green), CInt(m_Blue)).ToArgb().ToString("X6").Remove(0, 2)
-      End Get
-      Set(value As String)
-         m_Hexadecimal = value
-         Dim Color As Color = CType(ColorConverter.ConvertFromString(m_Hexadecimal), Color)
-         SetCurrColorFill(Color)
-         NotifyPropertyChanged(NameOf(Fill))
-         NotifyPropertyChanged(NameOf(Hexadecimal))
-      End Set
-   End Property
-
-   Friend Sub SetHexadecimal(value As String)
-      m_Hexadecimal = value
-      NotifyPropertyChanged(NameOf(Hexadecimal))
-   End Sub
-
-   Private m_Red As Double
-   Public Property Red As String
-      Get
-         Return DoubleToString(m_Red, 0)
-      End Get
-      Set(value As String)
-         If StringToDouble(value, m_Red) And (m_Red >= 0 AndAlso m_Red <= 255) Then
-            UpdateColor(m_Red)
-            m_Fill = New SolidColorBrush(Color.FromRgb(CByte(m_Red), CByte(m_Green), CByte(m_Blue)))
-            SetCurrColorFill(m_Fill.Color)
-            NotifyPropertyChanged(NameOf(Fill))
-            NotifyPropertyChanged(NameOf(Red))
-         Else
-            NotifyPropertyChanged(NameOf(Red))
-         End If
-      End Set
-   End Property
-
-   Friend Sub SetRed(value As Double)
-      m_Red = value
-      NotifyPropertyChanged(NameOf(Red))
-   End Sub
-
-   Private m_Green As Double
-   Public Property Green As String
-      Get
-         Return DoubleToString(m_Green, 0)
-      End Get
-      Set(value As String)
-         If StringToDouble(value, m_Green) And (m_Green >= 0 AndAlso m_Green <= 255) Then
-            UpdateColor(CDbl(value))
-            m_Green = CDbl(value)
-            m_Fill = New SolidColorBrush(Color.FromRgb(CByte(m_Red), CByte(m_Green), CByte(m_Blue)))
-            SetCurrColorFill(m_Fill.Color)
-            NotifyPropertyChanged(NameOf(Fill))
-         Else
-            NotifyPropertyChanged(NameOf(Green))
-         End If
-      End Set
-   End Property
-
-   Friend Sub SetGreen(value As Double)
-      m_Green = value
-      NotifyPropertyChanged(NameOf(Green))
-   End Sub
-
-   Private m_Blue As Double
-   Public Property Blue As String
-      Get
-         Return DoubleToString(m_Blue, 0)
-      End Get
-      Set(value As String)
-         If StringToDouble(value, m_Blue) And (m_Blue >= 0 AndAlso m_Blue <= 255) Then
-            UpdateColor(CDbl(value))
-            m_Blue = CDbl(value)
-            m_Fill = New SolidColorBrush(Color.FromRgb(CByte(m_Red), CByte(m_Green), CByte(m_Blue)))
-            SetCurrColorFill(m_Fill.Color)
-            NotifyPropertyChanged(NameOf(Fill))
-         Else
-            NotifyPropertyChanged(NameOf(Blue))
-         End If
-      End Set
-   End Property
-
-   Friend Sub SetBlu(value As Double)
-      m_Blue = value
-      NotifyPropertyChanged(NameOf(Blue))
-   End Sub
-
-   ' Definizione comandi
-   Private m_cmdCancel As ICommand
-   Private m_cmdOk As ICommand
-   Private m_cmdSaveColor As ICommand
-
-#Region "Messages"
-
-   Public ReadOnly Property Red_Msg As String
-      Get
-         Return EgtMsg(15050)    ' Rosso (0 - 255)
-      End Get
-   End Property
-
-   Public ReadOnly Property Green_Msg As String
-      Get
-         Return EgtMsg(15051)    ' Verde (0 - 255)
-      End Get
-   End Property
-
-   Public ReadOnly Property Blu_Msg As String
-      Get
-         Return EgtMsg(15052)    ' Blu (0 - 255)
-      End Get
-   End Property
-
-   Public ReadOnly Property Hexadecimal_Msg As String
-      Get
-         Return EgtMsg(15053)    ' Esadecimale
-      End Get
-   End Property
-   Public ReadOnly Property AddCColor_Msg As String
-      Get
-         Return EgtMsg(15054)    ' Agg Colore Personalizzato
-      End Get
-   End Property
-
-   Public ReadOnly Property BasicColor_Msg As String
-      Get
-         Return EgtMsg(15055)    ' Colori Base
-      End Get
-   End Property
-
-   Public ReadOnly Property CustomColor_Msg As String
-      Get
-         Return EgtMsg(15056)    ' Colori Personalizzati
-      End Get
-   End Property
-
-   Public ReadOnly Property ColorPicker_Msg As String
-      Get
-         Return EgtMsg(15057)    ' Honey Comb
-      End Get
-   End Property
-
-   Public ReadOnly Property ColorPickerTheme_Msg As String
-      Get
-         Return EgtMsg(15058)    ' Tema Colori
-      End Get
-   End Property
-
-#End Region    ' Messages
-
-#End Region    ' Fields & Proprierties
-
-#Region "CONTRUCTORS"
-
-   Sub New()
-      EgtColorPicker.SetOwner(Me)
-
-      'Colori di Base
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#F08080"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#F0E68C"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#90EE90"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#98FB98"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#00FFFF"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#4682b4"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFC0CB"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF69B4"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF0000"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFF00"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#32CD32"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#65FE08"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#00FFFF"), Color))))
-
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#6495ED"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#9370DB"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF00FF"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#964B00"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFA500"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#008000"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#3CB371"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#0000CD"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#7B68EE"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#C71585"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF1493"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#8B0000"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF8C00"), Color))))
-
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#6B8E23"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#556B2F"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#0000FF"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#000080"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#8B008B"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#8A2BE2"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#800000"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#B22222"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#228B22"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#006400"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#00008B"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#191970"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#483D8B"), Color))))
-
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#4B0082"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#000000"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#BDB76B"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#808000"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#A9A9A9"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#66DDAA"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#808080"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#9400D3"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFFFF"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#003366"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#336699"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#3366CC"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#003399"), Color))))
-
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#000099"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#0000CC"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#000066"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#006666"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#006699"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#0099CC"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#0066CC"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#0033CC"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#3333FF"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#333399"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#669999"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#009999"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#33CCCC"), Color))))
-
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#00CCFF"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#0099FF"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#0066FF"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#3366FF"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#3333CC"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#666699"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#339966"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#00CC99"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#00FFCC"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#33CCFF"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#3399FF"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#6699FF"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#6666FF"), Color))))
-
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#6600FF"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#6600CC"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#339933"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#00CC66"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#00FF99"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#66FFCC"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#66FFFF"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#66CCFF"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#99CCFF"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#9999FF"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#9966FF"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#9933FF"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#9900FF"), Color))))
-
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#006600"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#00CC00"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#00FF00"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#66FF99"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#99FFCC"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#CCFFFF"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#CCCCFF"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#CC99FF"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#CC66FF"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#CC33FF"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#CC00FF"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#9900CC"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#003300"), Color))))
-
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#009933"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#33CC33"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#66FF66"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#99FF99"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#CCFFCC"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFCCFF"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF99FF"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF66FF"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#CC00CC"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#660066"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#336600"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#009900"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#66FF33"), Color))))
-
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#99FF66"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#CCFF99"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFFCC"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFCCCC"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF99CC"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF66CC"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF33CC"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#CC0099"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#993399"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#333300"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#669900"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#99FF33"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#CCFF66"), Color))))
-
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFF99"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFCC99"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF9999"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF6699"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF3399"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#CC3399"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#990099"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#666633"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#99CC00"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#CCFF33"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFF66"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFCC66"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF9966"), Color))))
-
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF6666"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF0066"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#CC6699"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#993366"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#999966"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#CCCC00"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFCC00"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF9933"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF6600"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF5050"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#CC0066"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#660033"), Color))))
-      m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#996633"), Color))))
-
-      'Colori Personalizzati 
-      m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFFFF"), Color))))
-      m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFFFF"), Color))))
-      m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFFFF"), Color))))
-      m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFFFF"), Color))))
-      m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFFFF"), Color))))
-      m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFFFF"), Color))))
-      m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFFFF"), Color))))
-      m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFFFF"), Color))))
-      m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFFFF"), Color))))
-      m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFFFF"), Color))))
-      m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFFFF"), Color))))
-      m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFFFF"), Color))))
-      m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFFFF"), Color))))
-
-      m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFFFF"), Color))))
-      m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFFFF"), Color))))
-      m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFFFF"), Color))))
-      m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFFFF"), Color))))
-      m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFFFF"), Color))))
-      m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFFFF"), Color))))
-      m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFFFF"), Color))))
-      m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFFFF"), Color))))
-      m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFFFF"), Color))))
-      m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFFFF"), Color))))
-      m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFFFF"), Color))))
-      m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFFFF"), Color))))
-      m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFFFF"), Color))))
-
-      ' Lista Colori Esagono
-      m_HexList.Add(New HexItem(0, 3, CType(New BrushConverter().ConvertFrom("#003366"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(0, 4, CType(New BrushConverter().ConvertFrom("#336699"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(0, 5, CType(New BrushConverter().ConvertFrom("#3366CC"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(0, 6, CType(New BrushConverter().ConvertFrom("#003399"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(0, 7, CType(New BrushConverter().ConvertFrom("#000099"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(0, 8, CType(New BrushConverter().ConvertFrom("#0000CC"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(0, 9, CType(New BrushConverter().ConvertFrom("#000066"), SolidColorBrush)))
-
-      m_HexList.Add(New HexItem(1, 2, CType(New BrushConverter().ConvertFrom("#006666"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(1, 3, CType(New BrushConverter().ConvertFrom("#006699"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(1, 4, CType(New BrushConverter().ConvertFrom("#0099CC"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(1, 5, CType(New BrushConverter().ConvertFrom("#0066CC"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(1, 6, CType(New BrushConverter().ConvertFrom("#0033CC"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(1, 7, CType(New BrushConverter().ConvertFrom("#0000FF"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(1, 8, CType(New BrushConverter().ConvertFrom("#3333FF"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(1, 9, CType(New BrushConverter().ConvertFrom("#333399"), SolidColorBrush)))
-
-      m_HexList.Add(New HexItem(2, 2, CType(New BrushConverter().ConvertFrom("#669999"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(2, 3, CType(New BrushConverter().ConvertFrom("#009999"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(2, 4, CType(New BrushConverter().ConvertFrom("#33CCCC"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(2, 5, CType(New BrushConverter().ConvertFrom("#00CCFF"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(2, 6, CType(New BrushConverter().ConvertFrom("#0099FF"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(2, 7, CType(New BrushConverter().ConvertFrom("#0066FF"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(2, 8, CType(New BrushConverter().ConvertFrom("#3366FF"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(2, 9, CType(New BrushConverter().ConvertFrom("#3333CC"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(2, 10, CType(New BrushConverter().ConvertFrom("#666699"), SolidColorBrush)))
-
-      m_HexList.Add(New HexItem(3, 1, CType(New BrushConverter().ConvertFrom("#339966"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(3, 2, CType(New BrushConverter().ConvertFrom("#00CC99"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(3, 3, CType(New BrushConverter().ConvertFrom("#00FFCC"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(3, 4, CType(New BrushConverter().ConvertFrom("#00FFFF"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(3, 5, CType(New BrushConverter().ConvertFrom("#33CCFF"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(3, 6, CType(New BrushConverter().ConvertFrom("#3399FF"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(3, 7, CType(New BrushConverter().ConvertFrom("#6699FF"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(3, 8, CType(New BrushConverter().ConvertFrom("#6666FF"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(3, 9, CType(New BrushConverter().ConvertFrom("#6600FF"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(3, 10, CType(New BrushConverter().ConvertFrom("#6600CC"), SolidColorBrush)))
-
-      m_HexList.Add(New HexItem(4, 1, CType(New BrushConverter().ConvertFrom("#339933"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(4, 2, CType(New BrushConverter().ConvertFrom("#00CC66"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(4, 3, CType(New BrushConverter().ConvertFrom("#00FF99"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(4, 4, CType(New BrushConverter().ConvertFrom("#66FFCC"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(4, 5, CType(New BrushConverter().ConvertFrom("#66FFFF"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(4, 6, CType(New BrushConverter().ConvertFrom("#66CCFF"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(4, 7, CType(New BrushConverter().ConvertFrom("#99CCFF"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(4, 8, CType(New BrushConverter().ConvertFrom("#9999FF"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(4, 9, CType(New BrushConverter().ConvertFrom("#9966FF"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(4, 10, CType(New BrushConverter().ConvertFrom("#9933FF"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(4, 11, CType(New BrushConverter().ConvertFrom("#9900FF"), SolidColorBrush)))
-
-      m_HexList.Add(New HexItem(5, 0, CType(New BrushConverter().ConvertFrom("#006600"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(5, 1, CType(New BrushConverter().ConvertFrom("#00CC00"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(5, 2, CType(New BrushConverter().ConvertFrom("#00FF00"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(5, 3, CType(New BrushConverter().ConvertFrom("#66FF99"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(5, 4, CType(New BrushConverter().ConvertFrom("#99FFCC"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(5, 5, CType(New BrushConverter().ConvertFrom("#CCFFFF"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(5, 6, CType(New BrushConverter().ConvertFrom("#CCCCFF"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(5, 7, CType(New BrushConverter().ConvertFrom("#CC99FF"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(5, 8, CType(New BrushConverter().ConvertFrom("#CC66FF"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(5, 9, CType(New BrushConverter().ConvertFrom("#CC33FF"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(5, 10, CType(New BrushConverter().ConvertFrom("#CC00FF"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(5, 11, CType(New BrushConverter().ConvertFrom("#9900CC"), SolidColorBrush)))
-
-      m_HexList.Add(New HexItem(6, 0, CType(New BrushConverter().ConvertFrom("#003300"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(6, 1, CType(New BrushConverter().ConvertFrom("#009933"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(6, 2, CType(New BrushConverter().ConvertFrom("#33CC33"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(6, 3, CType(New BrushConverter().ConvertFrom("#66FF66"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(6, 4, CType(New BrushConverter().ConvertFrom("#99FF99"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(6, 5, CType(New BrushConverter().ConvertFrom("#CCFFCC"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(6, 6, CType(New BrushConverter().ConvertFrom("#FFFFFF"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(6, 7, CType(New BrushConverter().ConvertFrom("#FFCCFF"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(6, 8, CType(New BrushConverter().ConvertFrom("#FF99FF"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(6, 9, CType(New BrushConverter().ConvertFrom("#FF66FF"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(6, 10, CType(New BrushConverter().ConvertFrom("#FF00FF"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(6, 11, CType(New BrushConverter().ConvertFrom("#CC00CC"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(6, 12, CType(New BrushConverter().ConvertFrom("#660066"), SolidColorBrush)))
-
-      m_HexList.Add(New HexItem(7, 0, CType(New BrushConverter().ConvertFrom("#336600"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(7, 1, CType(New BrushConverter().ConvertFrom("#009900"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(7, 2, CType(New BrushConverter().ConvertFrom("#66FF33"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(7, 3, CType(New BrushConverter().ConvertFrom("#99FF66"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(7, 4, CType(New BrushConverter().ConvertFrom("#CCFF99"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(7, 5, CType(New BrushConverter().ConvertFrom("#FFFFCC"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(7, 6, CType(New BrushConverter().ConvertFrom("#FFCCCC"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(7, 7, CType(New BrushConverter().ConvertFrom("#FF99CC"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(7, 8, CType(New BrushConverter().ConvertFrom("#FF66CC"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(7, 9, CType(New BrushConverter().ConvertFrom("#FF33CC"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(7, 10, CType(New BrushConverter().ConvertFrom("#CC0099"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(7, 11, CType(New BrushConverter().ConvertFrom("#993399"), SolidColorBrush)))
-
-      m_HexList.Add(New HexItem(8, 1, CType(New BrushConverter().ConvertFrom("#333300"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(8, 2, CType(New BrushConverter().ConvertFrom("#669900"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(8, 3, CType(New BrushConverter().ConvertFrom("#99FF33"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(8, 4, CType(New BrushConverter().ConvertFrom("#CCFF66"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(8, 5, CType(New BrushConverter().ConvertFrom("#FFFF99"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(8, 6, CType(New BrushConverter().ConvertFrom("#FFCC99"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(8, 7, CType(New BrushConverter().ConvertFrom("#FF9999"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(8, 8, CType(New BrushConverter().ConvertFrom("#FF6699"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(8, 9, CType(New BrushConverter().ConvertFrom("#FF3399"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(8, 10, CType(New BrushConverter().ConvertFrom("#CC3399"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(8, 11, CType(New BrushConverter().ConvertFrom("#990099"), SolidColorBrush)))
-
-      m_HexList.Add(New HexItem(9, 1, CType(New BrushConverter().ConvertFrom("#666633"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(9, 2, CType(New BrushConverter().ConvertFrom("#99CC00"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(9, 3, CType(New BrushConverter().ConvertFrom("#CCFF33"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(9, 4, CType(New BrushConverter().ConvertFrom("#FFFF66"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(9, 5, CType(New BrushConverter().ConvertFrom("#FFCC66"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(9, 6, CType(New BrushConverter().ConvertFrom("#FF9966"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(9, 7, CType(New BrushConverter().ConvertFrom("#FF6666"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(9, 8, CType(New BrushConverter().ConvertFrom("#FF0066"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(9, 9, CType(New BrushConverter().ConvertFrom("#CC6699"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(9, 10, CType(New BrushConverter().ConvertFrom("#993366"), SolidColorBrush)))
-
-      m_HexList.Add(New HexItem(10, 2, CType(New BrushConverter().ConvertFrom("#999966"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(10, 3, CType(New BrushConverter().ConvertFrom("#CCCC00"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(10, 4, CType(New BrushConverter().ConvertFrom("#FFFF00"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(10, 5, CType(New BrushConverter().ConvertFrom("#FFCC00"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(10, 6, CType(New BrushConverter().ConvertFrom("#FF9933"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(10, 7, CType(New BrushConverter().ConvertFrom("#FF6600"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(10, 8, CType(New BrushConverter().ConvertFrom("#FF5050"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(10, 9, CType(New BrushConverter().ConvertFrom("#CC0066"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(10, 10, CType(New BrushConverter().ConvertFrom("#660033"), SolidColorBrush)))
-
-      m_HexList.Add(New HexItem(11, 2, CType(New BrushConverter().ConvertFrom("#996633"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(11, 3, CType(New BrushConverter().ConvertFrom("#CC9900"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(11, 4, CType(New BrushConverter().ConvertFrom("#FF9900"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(11, 5, CType(New BrushConverter().ConvertFrom("#CC6600"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(11, 6, CType(New BrushConverter().ConvertFrom("#FF3300"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(11, 7, CType(New BrushConverter().ConvertFrom("#FF0000"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(11, 8, CType(New BrushConverter().ConvertFrom("#CC0000"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(11, 9, CType(New BrushConverter().ConvertFrom("#990033"), SolidColorBrush)))
-
-      m_HexList.Add(New HexItem(12, 3, CType(New BrushConverter().ConvertFrom("#663300"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(12, 4, CType(New BrushConverter().ConvertFrom("#996600"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(12, 5, CType(New BrushConverter().ConvertFrom("#CC3300"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(12, 6, CType(New BrushConverter().ConvertFrom("#993300"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(12, 7, CType(New BrushConverter().ConvertFrom("#990000"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(12, 8, CType(New BrushConverter().ConvertFrom("#800000"), SolidColorBrush)))
-      m_HexList.Add(New HexItem(12, 9, CType(New BrushConverter().ConvertFrom("#993333"), SolidColorBrush)))
-
-      'Color Theme
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFFFF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#000000"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#999966"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#333399"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#0066FF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#CC0000"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#99CC00"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#9933FF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#0099CC"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF9933"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFF00"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF0000"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#66FF33"), Color))))
-
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#F2F2F2"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#8C8C8C"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#F5F5F0"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#ECECF9"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#E6F0FF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFE6E6"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#F9FFE6"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#F2E6FF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#E6F9FF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFF2E6"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFFE6"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFE6E6"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#ECFFE6"), Color))))
-
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#E6E6E6"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#808080"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#EBEBE0"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#D9D9F2"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#CCE0FF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFCCCC"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#F2FFCC"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#E6CCFF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#CCF2FF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFE6CC"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFFCC"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFCCCC"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#D9FFCC"), Color))))
-
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#D9D9D9"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#737373"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#E0E0D1"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#C6C6EC"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#B3D1FF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFB3B3"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#ECFFB3"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#D9B3FF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#B3ECFF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFD9B3"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFFB3"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFB3B3"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#C6FFB3"), Color))))
-
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#CCCCCC"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#666666"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#D6D6C2"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#B3B3E6"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#99C2FF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF9999"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#E6FF99"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#CC99FF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#99E6FF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFCC99"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFF99"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF9999"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#B3FF99"), Color))))
-
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#BFBFBF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#595959"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#CCCCB3"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#9F9FDF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#80B3FF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF8080"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#DFFF80"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#BF80FF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#80DFFF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFBF80"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFF80"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF8080"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#9FFF80"), Color))))
-
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#B3B3B3"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#4D4D4D"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#C2C2A3"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#8C8CD9"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#80B3FF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF6666"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#D9FF66"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#B366FF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#66D9FF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFB366"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFF66"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF6666"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#8CFF66"), Color))))
-
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#A6A6A6"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#404040"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#B8B894"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#7979D2"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#66A3FF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF4D4D"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#D2FF4D"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#A64DFF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#4DD2FF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFA64D"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFF4D"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF4D4D"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#79FF4D"), Color))))
-
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#999999"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#333333"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#ADAD85"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#6666CC"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#4D94FF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF3333"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#CCFF33"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#8C1AFF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#33CCFF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF8C1A"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFF33"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF3333"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#53FF1A"), Color))))
-
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#8C8C8C"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#262626"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#A3A375"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#5353C6"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#3385FF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF1A1A"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#C6FF1A"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#8000FF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#1AC6FF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF8000"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FFFF1A"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF1A1A"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#40FF00"), Color))))
-
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#808080"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#1A1A1A"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#999966"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#4040BF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#1A75FF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#FF0000"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#BFFF00"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#7300E6"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#00BFFF"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#E67300"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#E6E600"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#E60000"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#39E600"), Color))))
-
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#737373"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#0D0D0D"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#8A8A5C"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#3939AC"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#005CE6"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#E60000"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#ACE600"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#6600CC"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#00ACE6"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#CC6600"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#CCCC00"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#CC0000"), Color))))
-      m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(CType(ColorConverter.ConvertFromString("#33CC00"), Color))))
-
-      NotifyPropertyChanged(NameOf(HexList))
-      NotifyPropertyChanged(NameOf(BasicColors))
-      NotifyPropertyChanged(NameOf(CustomColors))
-      NotifyPropertyChanged(NameOf(BasicColorsTheme))
-
-      SelCustomColor = m_CustomColors(0)
-      NotifyPropertyChanged(NameOf(SelCustomColor))
-   End Sub
-
-#End Region    'Constructors
-
-#Region "METHODS"
-
-   Friend Sub UpdateColor(value As Double)
-      NotifyPropertyChanged(NameOf(CurrColor))
-      NotifyPropertyChanged(NameOf(Red))
-      NotifyPropertyChanged(NameOf(Green))
-      NotifyPropertyChanged(NameOf(Blue))
-      NotifyPropertyChanged(NameOf(Hexadecimal))
-   End Sub
-
-   Private Sub UpdateChangeColor()
-      NotifyPropertyChanged(NameOf(CurrColor))
-      NotifyPropertyChanged(NameOf(Red))
-      NotifyPropertyChanged(NameOf(Green))
-      NotifyPropertyChanged(NameOf(Blue))
-      NotifyPropertyChanged(NameOf(Hexadecimal))
-   End Sub
-
-#End Region    ' Methods
-
-#Region "COMMANDS"
-
-   Public ReadOnly Property Ok_Command As ICommand
-      Get
-         If m_cmdOk Is Nothing Then
-            m_cmdOk = New Command(AddressOf Ok)
-         End If
-         Return m_cmdOk
-      End Get
-   End Property
-
-   Public Sub Ok()
-      RaiseEvent m_CloseWindow(CType(DialogResult.OK, MessageBoxResult))
-   End Sub
-
-   Public ReadOnly Property Cancel_Command As ICommand
-      Get
-         If m_cmdCancel Is Nothing Then
-            m_cmdCancel = New Command(AddressOf Cancel)
-         End If
-         Return m_cmdCancel
-      End Get
-   End Property
-
-   Public Sub Cancel()
-      RaiseEvent m_CloseWindow(CType(DialogResult.Cancel, MessageBoxResult))
-   End Sub
-
-   Public ReadOnly Property SaveColor_Command As ICommand
-      Get
-         If m_cmdSaveColor Is Nothing Then
-            m_cmdSaveColor = New Command(AddressOf SaveColor)
-         End If
-         Return m_cmdSaveColor
-      End Get
-   End Property
-
-   Public Sub SaveColor()
-      If Not IsNothing(m_CustomColor) Then
-         m_CustomColor.SetFill(CurrColor)
-         Dim nIndex As Integer = m_CustomColors.IndexOf(SelCustomColor)
-         m_CustomColor = If(nIndex >= 0 AndAlso nIndex < m_CustomColors.Count - 1, m_CustomColors(nIndex + 1), m_CustomColors(0))
-         NotifyPropertyChanged(NameOf(SelCustomColor))
-      End If
-   End Sub
-
-#End Region    'Commands
-
-End Class
-
-Public Class EgtColorPicker
-   Inherits VMBase
-
-#Region "FIELDS & PROPERTIES"
-
-   Private Shared Owner As EgtColorPickerVM
-
-   Private m_Fill As SolidColorBrush
-   Public ReadOnly Property Fill As SolidColorBrush
-      Get
-         Return m_Fill
-      End Get
-   End Property
-
-   Friend Sub SetFill(value As SolidColorBrush)
-      m_Fill = value
-      NotifyPropertyChanged(NameOf(Fill))
-   End Sub
-
-   Private m_CurrColorFill As SolidColorBrush
-   Public ReadOnly Property CurrColor_Fill As SolidColorBrush
-      Get
-         Return m_CurrColorFill
-      End Get
-   End Property
-
-   Friend Sub SetCurrFill(value As SolidColorBrush)
-      m_CurrColorFill = value
-      NotifyPropertyChanged(NameOf(CurrColor_Fill))
-   End Sub
-
-#End Region    ' Fields & Properties
-
-#Region "CONTRUCTORS"
-
-   Sub New(Fill As SolidColorBrush)
-      m_Fill = Fill
-   End Sub
-
-#End Region    'Constructors
-
-#Region "METHODS"
-
-   Friend Shared Sub SetOwner(value As EgtColorPickerVM)
-      Owner = value
-   End Sub
-
-#End Region    ' Methods
-
-End Class
-
-Public Class HexItem
-   Inherits VMBase
-
-#Region "FIELDS & PROPERTIES"
-
-   Private m_nRow As Integer
-   Public Property nRow As Integer
-      Get
-         Return m_nRow
-      End Get
-      Set(value As Integer)
-         m_nRow = value
-         NotifyPropertyChanged(NameOf(nRow))
-      End Set
-   End Property
-
-   Private m_nColumn As Integer
-   Public Property nColumn As Integer
-      Get
-         Return m_nColumn
-      End Get
-      Set(value As Integer)
-         m_nColumn = value
-         NotifyPropertyChanged(NameOf(nColumn))
-      End Set
-   End Property
-
-   Private m_Background As SolidColorBrush
-   Public Property Background As SolidColorBrush
-      Get
-         Return m_Background
-      End Get
-      Set(value As SolidColorBrush)
-         m_Background = value
-         NotifyPropertyChanged(NameOf(Background))
-      End Set
-   End Property
-
-#End Region    ' Fields & Properties
-
-#Region "CONTRUCTORS"
-
-   Sub New(nRow As Integer, nColumn As Integer, Background As SolidColorBrush)
-      m_nRow = nRow
-      m_nColumn = nColumn
-      m_Background = Background
-   End Sub
-
-#End Region    ' Constructors
-
-End Class
diff --git a/EgtColorPicker/EgtHexagon.vb b/EgtColorPicker/EgtHexagon.vb
deleted file mode 100644
index c81450c..0000000
--- a/EgtColorPicker/EgtHexagon.vb
+++ /dev/null
@@ -1,374 +0,0 @@
-Imports System.Globalization
-
-Public Class EgtHexagon
-   Inherits Panel
-
-#Region "ORIENTATION"
-
-   Public Shared ReadOnly OrientationProperty As DependencyProperty = DependencyProperty.RegisterAttached("Orientation",
-                                                                                                          GetType(Orientation),
-                                                                                                          GetType(EgtHexagon),
-                                                                                                          New FrameworkPropertyMetadata(Orientation.Horizontal, FrameworkPropertyMetadataOptions.AffectsMeasure Or FrameworkPropertyMetadataOptions.AffectsArrange Or FrameworkPropertyMetadataOptions.[Inherits]))
-
-   Public Shared Sub SetOrientation(element As DependencyObject, value As Orientation)
-      element.SetValue(OrientationProperty, value)
-   End Sub
-
-   Public Shared Function GetOrientation(element As DependencyObject) As Orientation
-      Return CType(element.GetValue(OrientationProperty), Orientation)
-   End Function
-
-   Public Property Orientation As Orientation
-      Get
-         Return CType(GetValue(OrientationProperty), Orientation)
-      End Get
-      Set(value As Orientation)
-         SetValue(OrientationProperty, value)
-      End Set
-   End Property
-
-#End Region    ' Orientation
-
-#Region "ROW"
-
-   Public Shared ReadOnly RowCountProperty As DependencyProperty = DependencyProperty.Register("RowCount",
-                                                                                               GetType(Integer),
-                                                                                               GetType(EgtHexagon),
-                                                                                               New FrameworkPropertyMetadata(1, FrameworkPropertyMetadataOptions.AffectsMeasure Or FrameworkPropertyMetadataOptions.AffectsArrange), AddressOf ValidateCountCallback)
-
-   Public Property RowCount As Integer
-      Get
-         Return CInt(GetValue(RowCountProperty))
-      End Get
-      Set(value As Integer)
-         SetValue(RowCountProperty, value)
-      End Set
-   End Property
-
-#End Region    ' Row
-
-#Region "COLUMN"
-
-   Public Shared ReadOnly ColumnCountProperty As DependencyProperty = DependencyProperty.Register("ColumnCount",
-                                                                                                  GetType(Integer),
-                                                                                                  GetType(EgtHexagon),
-                                                                                                  New FrameworkPropertyMetadata(1, FrameworkPropertyMetadataOptions.AffectsMeasure Or FrameworkPropertyMetadataOptions.AffectsArrange), AddressOf ValidateCountCallback)
-
-   Public Property ColumnCount As Integer
-      Get
-         Return CInt(GetValue(ColumnCountProperty))
-      End Get
-      Set(value As Integer)
-         SetValue(ColumnCountProperty, value)
-      End Set
-   End Property
-
-#End Region    'Column
-
-#Region "VALIDATE"
-
-   Private Shared Function ValidateCountCallback(value As Object) As Boolean
-      If TypeOf value Is Integer Then
-         Dim count As Integer = CInt(value)
-         Return count > 0
-      End If
-
-      Return False
-   End Function
-
-   Private Function GetRow(e As UIElement) As Integer
-      Dim row As Integer = CInt(e.GetValue(Grid.RowProperty))
-      If row >= RowCount Then row = RowCount - 1
-      Return row
-   End Function
-
-   Private Function GetColumn(e As UIElement) As Integer
-      Dim column As Integer = CInt(e.GetValue(Grid.ColumnProperty))
-      If column >= ColumnCount Then column = ColumnCount - 1
-      Return column
-   End Function
-
-   Protected Overrides Function MeasureOverride(ByVal availableSize As Size) As Size
-      Dim w As Double = availableSize.Width
-      Dim h As Double = availableSize.Height
-
-      If Double.IsInfinity(w) OrElse Double.IsInfinity(h) Then
-         h = 0
-         w = 0
-
-         For Each e As UIElement In InternalChildren
-            e.Measure(availableSize)
-            Dim s = e.DesiredSize
-            If s.Height > h Then h = s.Height
-            If s.Width > w Then w = s.Width
-         Next
-
-         If Orientation = Orientation.Horizontal Then Return New Size(w * (ColumnCount * 3 + 1) / 4, h * (RowCount * 2 + 1) / 2)
-         Return New Size(w * (ColumnCount * 2 + 1) / 2, h * (RowCount * 3 + 1) / 4)
-      End If
-
-      Return availableSize
-   End Function
-
-#End Region    ' Validate
-
-#Region "HASSHIFT"
-
-   Private Sub HasShift(first As Boolean, last As Boolean)
-      If Orientation = Orientation.Horizontal Then
-         HasRowShift(first, last)
-      Else
-         HasColumnShift(first, last)
-      End If
-   End Sub
-
-   Private Sub HasRowShift(firstRow As Boolean, lastRow As Boolean)
-      lastRow = True
-      firstRow = lastRow
-      Dim elements As UIElementCollection = MyBase.InternalChildren
-      Dim i As Integer = 0
-
-      While i < elements.Count AndAlso (firstRow OrElse lastRow)
-         Dim e = elements(i)
-         If e.Visibility = Visibility.Collapsed Then Continue While
-         Dim row As Integer = GetRow(e)
-         Dim column As Integer = GetColumn(e)
-         Dim modify As Integer = column Mod 2
-         If row = 0 AndAlso modify = 0 Then firstRow = False
-         If row = RowCount - 1 AndAlso modify = 1 Then lastRow = False
-         i += 1
-      End While
-   End Sub
-
-   Private Sub HasColumnShift(firstColumn As Boolean, lastColumn As Boolean)
-      lastColumn = True
-      firstColumn = lastColumn
-      Dim elements As UIElementCollection = MyBase.InternalChildren
-      Dim i As Integer = 0
-
-      While i < elements.Count AndAlso (firstColumn OrElse lastColumn)
-         Dim e = elements(i)
-         If e.Visibility = Visibility.Collapsed Then Continue While
-         Dim row As Integer = GetRow(e)
-         Dim column As Integer = GetColumn(e)
-         Dim modify As Integer = row Mod 2
-         If column = 0 AndAlso modify = 0 Then firstColumn = False
-         If column = ColumnCount - 1 AndAlso modify = 1 Then lastColumn = False
-         i += 1
-      End While
-   End Sub
-
-#End Region    ' HasShift
-
-#Region "GETHEXSIZE"
-
-   Private Function GetHexSize(gridSize As Size) As Size
-      Dim minH As Double = 0
-      Dim minW As Double = 0
-
-      For Each e As UIElement In InternalChildren
-         Dim f = TryCast(e, FrameworkElement)
-
-         If f IsNot Nothing Then
-            If f.MinHeight > minH Then minH = f.MinHeight
-            If f.MinWidth > minW Then minW = f.MinWidth
-         End If
-      Next
-
-      Dim first, last As Boolean
-      HasShift(first, last)
-      Dim possibleSize = GetPossibleSize(gridSize)
-      Dim possibleW As Double = possibleSize.Width
-      Dim possibleH As Double = possibleSize.Height
-      Dim w = Math.Max(minW, possibleW)
-      Dim h = Math.Max(minH, possibleH)
-
-      Return New Size(w, h)
-   End Function
-
-   Private Function GetPossibleSize(gridSize As Size) As Size
-      Dim first, last As Boolean
-      HasShift(first, last)
-      If Orientation = Orientation.Horizontal Then Return GetPossibleSizeHorizontal(gridSize, first, last)
-      Return GetPossibleSizeVertical(gridSize, first, last)
-   End Function
-
-   Private Function GetPossibleSizeVertical(gridSize As Size, first As Boolean, last As Boolean) As Size
-      Dim columns As Integer = ((If(first, 0, 1)) + 2 * ColumnCount - (If(last, 1, 0)))
-      Dim w As Double = 2 * (gridSize.Width / columns)
-      Dim rows As Integer = 1 + 3 * RowCount
-      Dim h As Double = 4 * (gridSize.Height / rows)
-      Return New Size(w, h)
-   End Function
-
-   Private Function GetPossibleSizeHorizontal(gridSize As Size, first As Boolean, last As Boolean) As Size
-      Dim columns As Integer = 1 + 3 * ColumnCount
-      Dim w As Double = 4 * (gridSize.Width / columns)
-      Dim rows As Integer = (If(first, 0, 1)) + 2 * RowCount - (If(last, 1, 0))
-      Dim h As Double = 2 * (gridSize.Height / rows)
-      Return New Size(w, h)
-   End Function
-
-#End Region    ' GetHexSize
-
-#Region "ARRANGE"
-
-   Protected Overrides Function ArrangeOverride(finalSize As Size) As Size
-      Dim first, last As Boolean
-      HasShift(first, last)
-      Dim hexSize As Size = GetHexSize(finalSize)
-      Dim columnWidth, rowHeight As Double
-
-      If Orientation = Orientation.Horizontal Then
-         rowHeight = 0.5 * hexSize.Height
-         columnWidth = 0.25 * hexSize.Width
-      Else
-         rowHeight = 0.25 * hexSize.Height
-         columnWidth = 0.5 * hexSize.Width
-      End If
-
-      Dim elements As UIElementCollection = MyBase.InternalChildren
-
-      For i As Integer = 0 To elements.Count - 1
-         If elements(i).Visibility = Visibility.Collapsed Then Continue For
-         ArrangeElement(elements(i), hexSize, columnWidth, rowHeight, first)
-      Next
-
-      Return finalSize
-   End Function
-
-   Private Sub ArrangeElement(e As UIElement, hexSize As Size, columnWidth As Double, rowHeight As Double, shift As Boolean)
-      Dim row As Integer = GetRow(e)
-      Dim column As Integer = GetColumn(e)
-      Dim x As Double
-      Dim y As Double
-
-      If Orientation = Orientation.Horizontal Then
-         x = 3 * columnWidth * column
-         y = rowHeight * (2 * row + (If(column Mod 2 = 1, 1, 0)) + (If(shift, -1, 0)))
-      Else
-         x = columnWidth * (2 * column + (If(row Mod 2 = 1, 1, 0)) + (If(shift, -1, 0)))
-         y = 3 * rowHeight * row
-      End If
-
-      e.Arrange(New Rect(x, y, hexSize.Width, hexSize.Height))
-   End Sub
-
-#End Region    ' Arrange
-
-End Class
-
-Public Class EgtHexList
-   Inherits ListBox
-
-   Shared Sub New()
-      DefaultStyleKeyProperty.OverrideMetadata(GetType(EgtHexList),
-                                               New FrameworkPropertyMetadata(GetType(EgtHexList)))
-   End Sub
-
-   Public Shared ReadOnly OrientationProperty As DependencyProperty = EgtHexagon.OrientationProperty.AddOwner(GetType(EgtHexList))
-   Public Shared ReadOnly RowCountProperty As DependencyProperty = EgtHexagon.RowCountProperty.AddOwner(GetType(EgtHexList))
-   Public Shared ReadOnly ColumnCountProperty As DependencyProperty = EgtHexagon.ColumnCountProperty.AddOwner(GetType(EgtHexList))
-
-   Public Property Orientation As Orientation
-      Get
-         Return CType(GetValue(OrientationProperty), Orientation)
-      End Get
-      Set(value As Orientation)
-         SetValue(OrientationProperty, value)
-      End Set
-   End Property
-
-   Public Property RowCount As Integer
-      Get
-         Return CInt(GetValue(RowCountProperty))
-      End Get
-      Set(value As Integer)
-         SetValue(RowCountProperty, value)
-      End Set
-   End Property
-
-   Public Property ColumnCount As Integer
-      Get
-         Return CInt(GetValue(ColumnCountProperty))
-      End Get
-      Set(value As Integer)
-         SetValue(ColumnCountProperty, value)
-      End Set
-   End Property
-
-   Protected Overrides Function IsItemItsOwnContainerOverride(item As Object) As Boolean
-      Return (TypeOf item Is EgtHexItem)
-   End Function
-
-   Protected Overrides Function GetContainerForItemOverride() As DependencyObject
-      Return New EgtHexItem()
-   End Function
-
-End Class
-
-Public Class EgtHexItem
-   Inherits ListBoxItem
-
-   Shared Sub New()
-      DefaultStyleKeyProperty.OverrideMetadata(GetType(EgtHexItem),
-                                               New FrameworkPropertyMetadata(GetType(EgtHexItem)))
-   End Sub
-
-   Public Shared ReadOnly OrientationProperty As DependencyProperty = EgtHexagon.OrientationProperty.AddOwner(GetType(EgtHexItem))
-
-   Public Property Orientation As Orientation
-      Get
-         Return CType(GetValue(OrientationProperty), Orientation)
-      End Get
-      Set(value As Orientation)
-         SetValue(OrientationProperty, value)
-      End Set
-   End Property
-
-End Class
-
-Public Class HexClipConverter
-   Implements IMultiValueConverter
-
-   Public Function Convert(values() As Object, targetType As Type, parameter As Object, culture As CultureInfo) As Object Implements IMultiValueConverter.Convert
-      Dim width As Double = CDbl(values(0))
-      Dim height As Double = CDbl(values(1))
-      Dim orientation As Orientation = CType(values(2), Orientation)
-
-      If width <= 0 OrElse height <= 0 Then Return Nothing
-
-      Dim pathGeometry As New PathGeometry With {
-         .Figures = New PathFigureCollection()
-      }
-
-      Dim pathFigure As New PathFigure()
-
-      If orientation = Orientation.Horizontal Then
-         pathFigure.StartPoint = New Point(0, height * 0.5)
-
-         pathFigure.Segments.Add(New LineSegment() With {.Point = New Point(width * 0.25, 0)})
-         pathFigure.Segments.Add(New LineSegment() With {.Point = New Point(width * 0.75, 0)})
-         pathFigure.Segments.Add(New LineSegment() With {.Point = New Point(width, height * 0.5)})
-         pathFigure.Segments.Add(New LineSegment() With {.Point = New Point(width * 0.75, height)})
-         pathFigure.Segments.Add(New LineSegment() With {.Point = New Point(width * 0.25, height)})
-      Else
-         pathFigure.StartPoint = New Point(width * 0.5, 0)
-
-         pathFigure.Segments.Add(New LineSegment() With {.Point = New Point(width, height * 0.25)})
-         pathFigure.Segments.Add(New LineSegment() With {.Point = New Point(width, height * 0.75)})
-         pathFigure.Segments.Add(New LineSegment() With {.Point = New Point(width * 0.5, height)})
-         pathFigure.Segments.Add(New LineSegment() With {.Point = New Point(0, height * 0.75)})
-         pathFigure.Segments.Add(New LineSegment() With {.Point = New Point(0, height * 0.25)})
-      End If
-
-      pathGeometry.Figures.Add(pathFigure)
-
-      Return pathGeometry
-
-   End Function
-
-   Public Function ConvertBack(value As Object, targetTypes() As Type, parameter As Object, culture As CultureInfo) As Object() Implements IMultiValueConverter.ConvertBack
-      Throw New NotImplementedException()
-   End Function
-End Class
\ No newline at end of file
diff --git a/EgtCustomWindow.vb b/EgtCustomWindow.vb
index 1a65f8b..66516c3 100644
--- a/EgtCustomWindow.vb
+++ b/EgtCustomWindow.vb
@@ -27,8 +27,10 @@
 '     <MyNamespace:EgtCustomWindow/>
 '
 
+Imports System.Windows.Controls.Primitives
 Imports System.Windows.Interop
 Imports System.Runtime.InteropServices
+Imports EgtWPFLib5
 
 <TemplatePart(Name:="PART_MoveRectangle", Type:=GetType(TextBlock))>
 <TemplatePart(Name:="PART_ResizeGrid", Type:=GetType(Grid))>
@@ -218,6 +220,8 @@ Public Class EgtCustomWindow
    End Sub
 
    Sub New()
+      ' necessario per impostare l'altezza della barra che per default si autoadatta al contenuto
+      'TitleBarHeight = Double.NaN
    End Sub
 
    Sub New(Owner As Window)
@@ -391,6 +395,12 @@ Public Class EgtCustomWindow
       End If
    End Sub
 
+   'Private Sub MoveRectangle_PreviewMouseDown(sender As Object, e As System.Windows.Input.MouseButtonEventArgs)
+   '   If m_IsMovable And e.LeftButton = MouseButtonState.Pressed Then
+   '      Me.DragMove()
+   '   End If
+   'End Sub
+
    Private mRestoreIfMove As Boolean = False
 
    Private Sub MoveRectangle_MouseLeftButtonDown(sender As Object, e As System.Windows.Input.MouseButtonEventArgs)
diff --git a/EgtFloating/EgtFloatingManager.vb b/EgtFloating/EgtFloatingManager.vb
index 02db6cd..88e2761 100644
--- a/EgtFloating/EgtFloatingManager.vb
+++ b/EgtFloating/EgtFloatingManager.vb
@@ -27,6 +27,7 @@
 '     <MyNamespace:EgtFloatingManager/>
 '
 
+Imports System.Windows.Controls.Primitives
 Imports System.Collections.ObjectModel
 
 Namespace EgtFloating
@@ -74,10 +75,19 @@ Namespace EgtFloating
       End Sub
 
       Private Sub Me_Loaded(sender As Object, e As System.Windows.RoutedEventArgs) Handles Me.Loaded
+         'm_ParentWindow = Utility.FindAncestor(Of Window)(Me)
          m_ParentWindow = Window.GetWindow(Me)
          If Me.Items.Count > 0 AndAlso TypeOf Me.Items(Me.Items.Count - 1) Is EgtFloatingTray Then
             LastChildFill = False
          End If
+         ' PERMETTE DI SPOSTARE LE WINDOW TRAY NEL CASO VENGA SPOSTATA LA MAINWINDOW!!!!!!!
+         'For TrayIndex = 0 To Me.Items.Count - 1
+         '   If TypeOf Me.Items(TrayIndex) Is EgtFloatingTray Then
+         '      Dim TrayItem As EgtFloatingTray = DirectCast(Me.Items(TrayIndex), EgtFloatingTray)
+         '      AddHandler ParentWindow.LocationChanged, AddressOf TrayItem.Me_LocationChanged
+         '      AddHandler ParentWindow.SizeChanged, AddressOf TrayItem.Me_DimensionChanged
+         '   End If
+         'Next
       End Sub
 
    End Class
diff --git a/EgtFloating/EgtFloatingTray.vb b/EgtFloating/EgtFloatingTray.vb
index 955a620..3bd789e 100644
--- a/EgtFloating/EgtFloatingTray.vb
+++ b/EgtFloating/EgtFloatingTray.vb
@@ -27,6 +27,8 @@
 '     <MyNamespace:EgtFloatingPanelTray/>
 '
 
+Imports System.Collections.ObjectModel
+
 Namespace EgtFloating
 
    <TemplatePart(Name:="PART_StackPanel", Type:=GetType(StackPanel))>
@@ -35,6 +37,16 @@ Namespace EgtFloating
 
       Private m_FloatingManager As EgtFloatingManager    ' Riferimento al floating manager da cui è stato creato
 
+      'Private m_EgtFloatingPanelList As New ObservableCollection(Of EgtFloatingPanel)
+      'Public Property EgtFloatingPanelList As ObservableCollection(Of EgtFloatingPanel)
+      '   Get
+      '      Return m_EgtFloatingPanelList
+      '   End Get
+      '   Set(value As ObservableCollection(Of EgtFloatingPanel))
+      '      value = m_EgtFloatingPanelList
+      '   End Set
+      'End Property
+
       Private m_TrayWindow As Window
       Public ReadOnly Property TrayWindow As Window
          Get
@@ -65,6 +77,8 @@ Namespace EgtFloating
          m_TrayWindow.Height = Me.ActualHeight
          m_TrayWindow.Width = Me.ActualWidth
          m_TrayWindow.Show()
+         'DA ABILITARE PER PERMETTERE DI SPOSTARE LE WINDOW TRAY NEL CASO VENGA SPOSTATA LA MAINWINDOW!!!!!!!
+         'AddHandler m_FloatingManager.ParentWindow.LocationChanged, AddressOf Me_LocationChanged
          AddHandler m_FloatingManager.ParentWindow.SizeChanged, AddressOf Me_DimensionChanged
          ' eseguo il calcolo delle dimensioni all'avvio
          Me_DimensionChanged()
diff --git a/EgtMainWindow.vb b/EgtMainWindow.vb
index a7414fc..bde3774 100644
--- a/EgtMainWindow.vb
+++ b/EgtMainWindow.vb
@@ -28,6 +28,7 @@
 '
 
 Imports System.Runtime.InteropServices
+Imports System.Windows.Controls.Primitives
 Imports System.Windows.Interop
 
 <TemplatePart(Name:="PART_MoveRectangle", Type:=GetType(TextBlock))>
@@ -118,6 +119,8 @@ Public Class EgtMainWindow
    End Sub
 
    Sub New()
+      ' necessario per impostare l'altezza della barra che per default si autoadatta al contenuto
+      'TitleBarHeight = Double.NaN
    End Sub
 
    Sub New(Owner As Window)
@@ -285,6 +288,12 @@ Public Class EgtMainWindow
       End If
    End Sub
 
+   'Private Sub MoveRectangle_PreviewMouseDown(sender As Object, e As System.Windows.Input.MouseButtonEventArgs)
+   '   If m_IsMovable And e.LeftButton = MouseButtonState.Pressed Then
+   '      Me.DragMove()
+   '   End If
+   'End Sub
+
    Private mRestoreIfMove As Boolean = False
 
    Private Sub MoveRectangle_MouseLeftButtonDown(sender As Object, e As System.Windows.Input.MouseButtonEventArgs)
@@ -355,6 +364,17 @@ Public Class EgtMainWindow
 
 #End Region
 
+   ''Evento che lancia una finestra come figlia in modalità dialogo
+   'Friend Sub TitleBarIcon_PreviewMouseDown()
+   '   If Not IsNothing(AboutBox) And TypeOf AboutBox Is Window Then
+   '      If m_bFirst Then
+   '         AboutBox.ShowDialog()
+   '      Else
+   '         AboutBox.Visibility = Windows.Visibility.Visible
+   '      End If
+   '   End If
+   'End Sub
+
 #Region "Call Win32 MSG"
 
    Const MONITOR_DEFAULTTONEAREST As Integer = &H2
diff --git a/EgtManageFileDialog/EgtManageFileDialogV.xaml b/EgtManageFileDialog/EgtManageFileDialogV.xaml
deleted file mode 100644
index ae1e860..0000000
--- a/EgtManageFileDialog/EgtManageFileDialogV.xaml
+++ /dev/null
@@ -1,430 +0,0 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="EgtManageFileDialogV"
-                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5"
-                            Title="{Binding sTitle}"
-                            WindowStartupLocation="CenterOwner"
-                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="32"
-                            IsMinimizable="False" ShowInTaskbar="False"
-                            Height="500" Width="800"
-                            CloseCommand="{Binding Close_Command,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
-
-   <Grid Margin="5,5,5,0">
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="Auto"/>
-      </Grid.RowDefinitions>
-      <Grid Margin="5,5,5,0">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="Auto"/>
-         </Grid.ColumnDefinitions>
-         <Button Command="{Binding GoBack_Command}"
-                 HorizontalAlignment="Right"
-                 Margin="2.5,0,5,0"
-                 BorderBrush="Transparent"
-                 Height="24"
-                 Width="64"
-                 BorderThickness="1"
-                 FontSize="12">
-            <Image Source="\Resources\EgtDialog\Restore.png"
-                   Stretch="Uniform"/>
-         </Button>
-         <TextBlock Grid.Column="1"
-                    Margin="5"
-                    Text="{Binding sSelPath}"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    FontSize="12"/>
-         <ComboBox Grid.Column="2"
-                   HorizontalAlignment="Right"
-                   IsSynchronizedWithCurrentItem="True"
-                   ItemsSource="{Binding ViewModeList}"
-                   SelectedItem="{Binding SelViewMode}"
-                   Width="200"
-                   Height="25"
-                   Margin="2.5,5,2.5,5"
-                   BorderThickness="1"/>
-      </Grid>
-      <Grid Grid.Row="1"
-            Margin="5,5,5,0">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="4*"/>
-         </Grid.ColumnDefinitions>
-         <TreeView x:Name="FileTree" 
-                   ItemsSource="{Binding RootList}"                   
-                   Margin="10"
-                   FontSize="15"
-                   BorderBrush="White">
-            <TreeView.Resources>
-               <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:EgtFolder}" 
-                                         ItemsSource="{Binding TreeItemList_View}">
-                  <StackPanel Orientation="Horizontal">
-                     <Image Source="{Binding sIconSource}"
-                            Height="15"
-                            Stretch="Uniform"/>
-                     <TextBlock Text="{Binding sName}"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                FontSize="12"/>
-                  </StackPanel>
-               </HierarchicalDataTemplate>
-               <DataTemplate DataType="{x:Type EgtWPFLib5:EgtItem}">
-                  <StackPanel Orientation="Horizontal">
-                     <Image Source="{Binding sIconSource}"
-                            Height="15"
-                            Stretch="Uniform"/>
-                     <TextBlock Text="{Binding sName}"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                FontSize="12"/>
-                  </StackPanel>
-               </DataTemplate>
-            </TreeView.Resources>
-            <TreeView.ItemContainerStyle>
-               <Style TargetType="{x:Type TreeViewItem}">
-                  <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}"/>
-                  <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}"/>
-               </Style>
-            </TreeView.ItemContainerStyle>
-         </TreeView>
-         <TabControl Grid.Column="1"
-                     Background="Transparent"
-                     BorderBrush="White"
-                     BorderThickness="0"
-                     SelectedIndex="{Binding nSelTab}">
-            <TabControl.ItemContainerStyle>
-               <Style TargetType="{x:Type TabItem}">
-                  <Setter Property="Visibility" Value="Collapsed"/>
-               </Style>
-            </TabControl.ItemContainerStyle>
-            <TabItem Header="LISTBOX">
-               <ListBox x:Name="FileList" 
-                        Grid.Row="1"
-                        Margin="5,5,5,5"
-                        BorderBrush="White"
-                        IsSynchronizedWithCurrentItem="True"
-                        ItemsSource="{Binding SelTreeItem.FolderList, Mode=TwoWay}"
-                        SelectedItem="{Binding ItemSelected, Mode=TwoWay}">
-                  <ListBox.Resources>
-                     <DataTemplate x:Key="ListTemplateView" 
-                                   DataType="{x:Type EgtWPFLib5:EgtDirectory}">
-                        <Grid Margin="5,5,5,0"
-                              Height="20">
-                           <Grid.ColumnDefinitions>
-                              <ColumnDefinition Width="Auto"/>
-                              <ColumnDefinition Width="Auto"/>
-                           </Grid.ColumnDefinitions>
-                           <Image Source="{Binding sIconSource}"
-                                  Height="15"
-                                  Stretch="Uniform"/>
-                           <TextBlock Grid.Column="1"
-                                      Text="{Binding sName}"
-                                      HorizontalAlignment="Center"
-                                      VerticalAlignment="Center"
-                                      FontSize="12"/>
-                        </Grid>
-                     </DataTemplate>
-                     <DataTemplate x:Key="TilesTemplateView"
-                                   DataType="{x:Type EgtWPFLib5:EgtDirectory}">
-                        <Grid Margin="5,5,5,0"
-                              Height="50"
-                              Width="250">
-                           <Grid.ColumnDefinitions>
-                              <ColumnDefinition Width="Auto"/>
-                              <ColumnDefinition Width="1*"/>
-                           </Grid.ColumnDefinitions>
-                           <Image Source="{Binding sIconSource}"
-                                  Stretch="Uniform"/>
-                           <UniformGrid Grid.Column="1"
-                                        Rows="3"
-                                        Margin="2.5,0,2.5,5">
-                              <TextBlock TextAlignment="Left"
-                                         Text="{Binding sName}"
-                                         HorizontalAlignment="Left"
-                                         VerticalAlignment="Center"
-                                         FontSize="12"/>
-                              <TextBlock TextAlignment="Left"
-                                         Text="{Binding ghTypeItem}"
-                                         HorizontalAlignment="Left"
-                                         VerticalAlignment="Center"
-                                         FontSize="12"/>
-                              <TextBlock TextAlignment="Left"
-                                         Text="{Binding sDimension}"
-                                         HorizontalAlignment="Left"
-                                         VerticalAlignment="Center"
-                                         FontSize="12"/>
-                           </UniformGrid>
-                        </Grid>
-                     </DataTemplate>
-                     <DataTemplate x:Key="ContentTemplateView"
-                                   DataType="{x:Type EgtWPFLib5:EgtDirectory}">
-                        <Grid Margin="5,5,5,0"
-                              Height="50">
-                           <Grid.RowDefinitions>
-                              <RowDefinition Height="1*"/>
-                              <RowDefinition Height="Auto"/>
-                           </Grid.RowDefinitions>
-                           <Grid>
-                              <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="Auto"/>
-                                 <ColumnDefinition Width="1*"/>
-                                 <ColumnDefinition Width="1*"/>
-                              </Grid.ColumnDefinitions>
-                              <Image Source="{Binding sIconSource}"
-                                     Stretch="Uniform"/>
-                              <UniformGrid Grid.Column="1"
-                                           Rows="2"
-                                           Margin="2.5,0,2.5,5">
-                                 <TextBlock TextAlignment="Left"
-                                            HorizontalAlignment="Left"
-                                            VerticalAlignment="Center"
-                                            FontSize="12"
-                                            Text="{Binding sName}"/>
-                                 <TextBlock TextAlignment="Left"
-                                            HorizontalAlignment="Left"
-                                            VerticalAlignment="Center"
-                                            FontSize="12"
-                                            Text="{Binding ghTypeItem}"/>
-                              </UniformGrid>
-                              <UniformGrid Grid.Column="2"
-                                           Rows="2"
-                                           Margin="2.5,0,2.5,5">
-                                 <TextBlock TextAlignment="Left"
-                                            HorizontalAlignment="Left"
-                                            VerticalAlignment="Center"
-                                            FontSize="12"
-                                            Text="{Binding sLastModifyDate}"/>
-                                 <TextBlock TextAlignment="Left"
-                                            HorizontalAlignment="Left"
-                                            VerticalAlignment="Center"
-                                            FontSize="12"
-                                            Text="{Binding sDimension}"/>
-                              </UniformGrid>
-                           </Grid>
-                           <Border Grid.Row="1"
-                                   BorderThickness="1"
-                                   BorderBrush="LightGray"/>
-                        </Grid>
-                     </DataTemplate>
-                  </ListBox.Resources>
-                  <ListBox.ItemTemplate>
-                     <DataTemplate DataType="{x:Type EgtWPFLib5:EgtDirectory}">
-                        <ContentControl Content="{Binding}">
-                           <ContentControl.Style>
-                              <Style TargetType="{x:Type ContentControl}">
-                                 <Style.Triggers>
-                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}" Value="0">
-                                       <Setter Property="ContentTemplate" Value="{StaticResource ListTemplateView}" />
-                                    </DataTrigger>
-                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}" Value="1">
-                                       <Setter Property="ContentTemplate" Value="{StaticResource TilesTemplateView}" />
-                                    </DataTrigger>
-                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}" Value="2">
-                                       <Setter Property="ContentTemplate" Value="{StaticResource ContentTemplateView}" />
-                                    </DataTrigger>
-                                 </Style.Triggers>
-                              </Style>
-                           </ContentControl.Style>
-                        </ContentControl>
-                     </DataTemplate>
-                  </ListBox.ItemTemplate>
-                  <ListBox.ItemContainerStyle>
-                     <Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource {x:Type ListBoxItem}}">
-                        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-                        <EventSetter Event="MouseDoubleClick" Handler="ListBoxItem_MouseDoubleClick"/>
-                     </Style>
-                  </ListBox.ItemContainerStyle>
-                  <ListBox.Style>
-                     <Style TargetType="{x:Type ListBox}">
-                        <Style.Triggers>
-                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"
-                                        Value="0">
-                              <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
-                              <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled"/>
-                              <Setter Property="ItemsPanel">
-                                 <Setter.Value>
-                                    <ItemsPanelTemplate>
-                                       <WrapPanel Orientation="Vertical"/>
-                                    </ItemsPanelTemplate>
-                                 </Setter.Value>
-                              </Setter>
-                           </DataTrigger>
-                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"
-                                        Value="1">
-                              <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
-                              <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-                              <Setter Property="ItemsPanel">
-                                 <Setter.Value>
-                                    <ItemsPanelTemplate>
-                                       <WrapPanel Orientation="Horizontal"/>
-                                    </ItemsPanelTemplate>
-                                 </Setter.Value>
-                              </Setter>
-                           </DataTrigger>
-                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"
-                                        Value="2">
-                              <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
-                              <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-                              <Setter Property="ItemsPanel">
-                                 <Setter.Value>
-                                    <ItemsPanelTemplate>
-                                       <StackPanel Orientation="Vertical"
-                                                   HorizontalAlignment="Stretch"/>
-                                    </ItemsPanelTemplate>
-                                 </Setter.Value>
-                              </Setter>
-                           </DataTrigger>
-                        </Style.Triggers>
-                     </Style>
-                  </ListBox.Style>
-               </ListBox>
-            </TabItem>
-            <TabItem Header="DATAGRID">
-               <DataGrid AutoGenerateColumns="False"
-                         IsReadOnly="True"
-                         HeadersVisibility="Column"
-                         ItemsSource="{Binding SelTreeItem.FolderList, Mode=TwoWay}"
-                         SelectedItem="{Binding ItemSelected}">
-                  <DataGrid.Columns>
-                     <DataGridTemplateColumn Width="5*">
-                        <DataGridTemplateColumn.HeaderTemplate>
-                           <DataTemplate>
-                              <TextBlock Text="{Binding DataContext.Name_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         HorizontalAlignment="Left"/>
-                           </DataTemplate>
-                        </DataGridTemplateColumn.HeaderTemplate>
-                        <DataGridTemplateColumn.CellTemplate>
-                           <DataTemplate>
-                              <Grid>
-                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition Width="1*"/>
-                                 </Grid.ColumnDefinitions>
-                                 <Image Source="{Binding sIconSource}"
-                                        Margin="2.5,0,2.5,0"
-                                        Stretch="Uniform"/>
-                                 <TextBlock Grid.Column="1"
-                                            Text="{Binding sName}"
-                                            VerticalAlignment="Center"
-                                            Margin="2.5,0,0,0"/>
-                              </Grid>
-                           </DataTemplate>
-                        </DataGridTemplateColumn.CellTemplate>
-                     </DataGridTemplateColumn>
-                     <DataGridTextColumn Binding="{Binding sLastModifyDate}"
-                                         Width="2*">
-                        <DataGridTextColumn.HeaderTemplate>
-                           <DataTemplate>
-                              <TextBlock Text="{Binding DataContext.LastModify_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         HorizontalAlignment="Left"/>
-                           </DataTemplate>
-                        </DataGridTextColumn.HeaderTemplate>
-                        <DataGridTextColumn.ElementStyle>
-                           <Style TargetType="TextBlock">
-                              <Setter Property="HorizontalAlignment" Value="Left"/>
-                              <Setter Property="VerticalAlignment" Value="Center"/>
-                              <Setter Property="TextAlignment" Value="Left"/>
-                              <Setter Property="Padding" Value="12,6,12,6"/>
-                           </Style>
-                        </DataGridTextColumn.ElementStyle>
-                     </DataGridTextColumn>
-                     <DataGridTextColumn Binding="{Binding ghTypeItem}"
-                                         Width="1*">
-                        <DataGridTextColumn.HeaderTemplate>
-                           <DataTemplate>
-                              <TextBlock Text="{Binding DataContext.Type_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         HorizontalAlignment="Left"/>
-                           </DataTemplate>
-                        </DataGridTextColumn.HeaderTemplate>
-                        <DataGridTextColumn.ElementStyle>
-                           <Style TargetType="TextBlock">
-                              <Setter Property="HorizontalAlignment" Value="Left"/>
-                              <Setter Property="VerticalAlignment" Value="Center"/>
-                              <Setter Property="TextAlignment" Value="Left"/>
-                              <Setter Property="Padding" Value="12,6,12,6"/>
-                           </Style>
-                        </DataGridTextColumn.ElementStyle>
-                     </DataGridTextColumn>
-                     <DataGridTextColumn Binding="{Binding sDimension}"
-                                         Width="1*">
-                        <DataGridTextColumn.HeaderTemplate>
-                           <DataTemplate>
-                              <TextBlock Text="{Binding DataContext.Dimension_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         HorizontalAlignment="Left"/>
-                           </DataTemplate>
-                        </DataGridTextColumn.HeaderTemplate>
-                        <DataGridTextColumn.ElementStyle>
-                           <Style TargetType="TextBlock">
-                              <Setter Property="HorizontalAlignment" Value="Right"/>
-                              <Setter Property="VerticalAlignment" Value="Center"/>
-                              <Setter Property="TextAlignment" Value="Right"/>
-                              <Setter Property="Padding" Value="12,6,12,6"/>
-                           </Style>
-                        </DataGridTextColumn.ElementStyle>
-                     </DataGridTextColumn>
-                  </DataGrid.Columns>
-                  <DataGrid.InputBindings>
-                     <MouseBinding MouseAction="LeftDoubleClick" Command="{Binding DataContext.DoubleClick_Command, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"/>
-                  </DataGrid.InputBindings>
-               </DataGrid>
-            </TabItem>
-         </TabControl>
-      </Grid>
-      <Grid Grid.Row="2" 
-            Margin="5,5,5,0">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="Auto"/>
-         </Grid.ColumnDefinitions>
-         <TextBlock Margin="5,5,5,5"
-                    Text="{Binding FileName_Msg}"
-                    HorizontalAlignment="Right"
-                    VerticalAlignment="Center"
-                    FontSize="12"/>
-         <TextBox Grid.Column="1"
-                  Margin="2.5,2.5,2.5,5"
-                  TextAlignment="Left"
-                  HorizontalAlignment="Stretch"
-                  Height="22"
-                  FontSize="12"
-                  VerticalContentAlignment="Center"
-                  VerticalAlignment="Center"
-                  Text="{Binding sSaveFileName, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"/>
-         <ComboBox Grid.Column="2"
-                   IsSynchronizedWithCurrentItem="True"
-                   ItemsSource="{Binding FilterList}"
-                   SelectedItem="{Binding SelFilter, Mode=OneWayToSource}"
-                   DisplayMemberPath="sNameExstension"
-                   HorizontalAlignment="Right"
-                   Width="200"
-                   Height="25"
-                   Margin="10,2.5,2.5,5"
-                   BorderThickness="1"/>
-      </Grid>
-      <UniformGrid Grid.Row="3"  
-                   Rows="1"
-                   Margin="2.5,0,2.5,0">
-         <Button IsDefault="True"
-                 Content="OK"
-                 Command="{Binding Ok_Command}"
-                 HorizontalAlignment="Right"
-                 Margin="15,0,2.5,0"
-                 BorderThickness="1,1,1,0"
-                 Height="24"
-                 Width="64"/>
-         <Button Content="Cancel"
-                 Command="{Binding Cancel_Command}"
-                 HorizontalAlignment="Left"
-                 Margin="2.5,0,0,0"
-                 BorderThickness="1,1,1,0"
-                 Height="24"
-                 Width="64"/>
-      </UniformGrid>
-   </Grid>
-</EgtWPFLib5:EgtCustomWindow>
\ No newline at end of file
diff --git a/EgtManageFileDialog/EgtManageFileDialogV.xaml.vb b/EgtManageFileDialog/EgtManageFileDialogV.xaml.vb
deleted file mode 100644
index 409dcc9..0000000
--- a/EgtManageFileDialog/EgtManageFileDialogV.xaml.vb
+++ /dev/null
@@ -1,140 +0,0 @@
-Imports System.Windows.Forms
-
-Public Class EgtManageFileDialogV
-
-#Region "FIELDS & PROPERTIES"
-
-   Private WithEvents m_EgtManageFileDialogVM As EgtManageFileDialogVM
-
-   Private Shadows DialogResult As DialogResult
-
-   ''' <summary>
-   ''' Stringa che specifica il titolo da mostrare
-   ''' </summary>
-   Public Overloads Property Title As String
-      Get
-         Return m_EgtManageFileDialogVM.sTitle
-      End Get
-      Set(value As String)
-         m_EgtManageFileDialogVM.sTitle = value
-      End Set
-   End Property
-
-   Public Property Filter As String
-      Get
-         Return m_EgtManageFileDialogVM.sFilter
-      End Get
-      Set(value As String)
-         m_EgtManageFileDialogVM.sFilter = value
-      End Set
-   End Property
-
-   Public Property InitialDirectory As String
-      Get
-         Return m_EgtManageFileDialogVM.sInitialDirectory
-      End Get
-      Set(value As String)
-         m_EgtManageFileDialogVM.sInitialDirectory = value
-      End Set
-   End Property
-
-   Public Property SafeFileName As String
-      Get
-         Return m_EgtManageFileDialogVM.sSaveFileName
-      End Get
-      Set(value As String)
-         m_EgtManageFileDialogVM.sSaveFileName = value
-      End Set
-   End Property
-
-   Public Property FileName As String
-      Get
-         Return m_EgtManageFileDialogVM.sFileName
-      End Get
-      Set(value As String)
-         m_EgtManageFileDialogVM.sFileName = value
-      End Set
-   End Property
-
-   Public Property FilterIndex As Integer
-      Get
-         Return m_EgtManageFileDialogVM.nFilterIndex
-      End Get
-      Set(value As Integer)
-         m_EgtManageFileDialogVM.nFilterIndex = value
-      End Set
-   End Property
-
-   Public Property Mode As Integer
-      Get
-         Return m_EgtManageFileDialogVM.nMode
-      End Get
-      Set(value As Integer)
-         m_EgtManageFileDialogVM.nMode = value
-      End Set
-   End Property
-
-   Public Property CheckFileExists As Boolean
-      Get
-         Return m_EgtManageFileDialogVM.bCheckFileExists
-      End Get
-      Set(value As Boolean)
-         m_EgtManageFileDialogVM.bCheckFileExists = value
-      End Set
-   End Property
-
-   Public Property ValidateNames As Boolean
-      Get
-         Return m_EgtManageFileDialogVM.bValidateNames
-      End Get
-      Set(value As Boolean)
-         m_EgtManageFileDialogVM.bValidateNames = value
-      End Set
-   End Property
-
-   Public Property OverwritePrompt As Boolean
-      Get
-         Return m_EgtManageFileDialogVM.bOverwritePrompt
-      End Get
-      Set(value As Boolean)
-         m_EgtManageFileDialogVM.bOverwritePrompt = value
-      End Set
-   End Property
-
-#End Region    ' FIELDS & PROPERTIES
-
-#Region "CONTRUCTORS"
-
-   Sub New(Owner As Window, EgtManageFileDialogVM As EgtManageFileDialogVM)
-      MyBase.New(Owner)
-      InitializeComponent()
-      Me.DataContext = EgtManageFileDialogVM
-      ' Assegno al riferimento locale al VM il VM preso dal DataContext
-      m_EgtManageFileDialogVM = EgtManageFileDialogVM
-   End Sub
-
-#End Region
-
-#Region "EVENTS"
-
-   Private Sub CloseWindow(DialogResult As DialogResult) Handles m_EgtManageFileDialogVM.m_CloseWindow
-      Me.DialogResult = DialogResult
-      Me.Close()
-   End Sub
-
-#End Region
-
-#Region "METHODS"
-
-   Public Overloads Function ShowDialog() As DialogResult
-      MyBase.ShowDialog()
-      Return Me.DialogResult
-   End Function
-
-   Private Sub ListBoxItem_MouseDoubleClick(sender As Object, e As MouseButtonEventArgs)
-      m_EgtManageFileDialogVM.MouseDoubleClick()
-   End Sub
-
-#End Region    '  METHODS
-
-End Class
\ No newline at end of file
diff --git a/EgtManageFileDialog/EgtManageFileDialogVM.vb b/EgtManageFileDialog/EgtManageFileDialogVM.vb
deleted file mode 100644
index 63a11dc..0000000
--- a/EgtManageFileDialog/EgtManageFileDialogVM.vb
+++ /dev/null
@@ -1,926 +0,0 @@
-Imports System.Collections.ObjectModel
-Imports System.IO
-Imports System.Windows.Forms
-Imports EgtUILib
-Imports System.Data
-
-Public Class EgtManageFileDialogVM
-   Inherits VMBase
-
-#Region "FIELDS & PROPERTIES"
-
-   Public Enum VisualizationContainerType As Integer
-      LISTBOX = 0
-      DATAGRID = 1
-   End Enum
-
-   Public Enum VisualizationType As Integer
-      LISTTEMPLATE = 0
-      TILESTEMPLATE = 1
-      CONTENTTEMPLATE = 2
-      DETAILSTEMPLATE = 3
-   End Enum
-
-   Public Enum ModeTypes As Integer
-      FILE = 1
-      FOLDER = 2
-   End Enum
-
-   Private m_sTitle As String
-   Public Property sTitle As String
-      Get
-         Return m_sTitle
-      End Get
-      Set(value As String)
-         m_sTitle = value
-      End Set
-   End Property
-
-   'Scelta della modalità di salvataggio 1 = file 2 = folder 
-   Private m_nMode As Integer
-   Public Property nMode As Integer
-      Get
-         Return m_nMode
-      End Get
-      Set(value As Integer)
-         m_nMode = value
-      End Set
-   End Property
-
-   Private m_bCheckFileExists As Boolean
-   Public Property bCheckFileExists As Boolean
-      Get
-         Return m_bCheckFileExists
-      End Get
-      Set(value As Boolean)
-         m_bCheckFileExists = value
-      End Set
-   End Property
-
-   Private m_bValidateNames As Boolean
-   Public Property bValidateNames As Boolean
-      Get
-         Return m_bValidateNames
-      End Get
-      Set(value As Boolean)
-         m_bValidateNames = value
-      End Set
-   End Property
-
-   Private m_bOverwritePrompt As Boolean
-   Public Property bOverwritePrompt As Boolean
-      Get
-         Return m_bOverwritePrompt
-      End Get
-      Set(value As Boolean)
-         m_bOverwritePrompt = value
-      End Set
-   End Property
-
-   Private m_RootList As New ObservableCollection(Of EgtDirectory)
-   Public Property RootList As ObservableCollection(Of EgtDirectory)
-      Get
-         Return m_RootList
-      End Get
-      Set(value As ObservableCollection(Of EgtDirectory))
-         m_RootList = value
-      End Set
-   End Property
-
-   Public m_SelTreeItem As EgtDirectory
-   Public Property SelTreeItem As EgtDirectory
-      Get
-         Return m_SelTreeItem
-      End Get
-      Set(value As EgtDirectory)
-         m_SelTreeItem = value
-         NotifyPropertyChanged(NameOf(SelTreeItem))
-      End Set
-   End Property
-   Friend Sub UpdateSelTreeItem(Item As EgtDirectory)
-      m_SelTreeItem = Item
-      NotifyPropertyChanged(NameOf(SelTreeItem))
-   End Sub
-
-   Public m_ItemSelected As EgtDirectory
-   Public Property ItemSelected As EgtDirectory
-      Get
-         Return m_ItemSelected
-      End Get
-      Set(value As EgtDirectory)
-         m_ItemSelected = value
-         Dim Item As EgtItem = TryCast(m_ItemSelected, EgtItem)
-         If Not IsNothing(Item) Then
-            sSaveFileName = Item.sName
-         Else
-            Dim Folder As EgtFolder = TryCast(m_ItemSelected, EgtFolder)
-            If Not IsNothing(Folder) Then
-               sSaveFileName = Folder.sName
-            End If
-         End If
-      End Set
-   End Property
-   Friend Sub SetItemSelected(value As EgtDirectory)
-      m_ItemSelected = value
-      NotifyPropertyChanged(NameOf(ItemSelected))
-   End Sub
-
-   'Percorso del file o della cartella
-   Private m_sSelPath As String
-   Public Overloads Property sSelPath As String
-      Get
-         Return m_sSelPath
-      End Get
-      Set(value As String)
-         m_sSelPath = value
-         NotifyPropertyChanged(NameOf(sSelPath))
-      End Set
-   End Property
-
-   'Textbox per visualizzare il file o la folder selezionata
-   Private m_sSaveFileName As String
-   Public Property sSaveFileName As String
-      Get
-         Return m_sSaveFileName
-      End Get
-      Set(value As String)
-         m_sSaveFileName = value
-         NotifyPropertyChanged(NameOf(sSaveFileName))
-      End Set
-   End Property
-
-   'Lista filtri estensione
-   Private m_FilterList As ObservableCollection(Of EgtExstension)
-   Public Property FilterList As ObservableCollection(Of EgtExstension)
-      Get
-         Return m_FilterList
-      End Get
-      Set(value As ObservableCollection(Of EgtExstension))
-         m_FilterList = value
-      End Set
-   End Property
-
-   'Scelta filtro estensione per visualizzazione
-   Public m_SelFilter As EgtExstension
-   Public Property SelFilter As EgtExstension
-      Get
-         Return m_SelFilter
-      End Get
-      Set(value As EgtExstension)
-         m_SelFilter = value
-         Dim CurrItem As EgtFolder = TryCast(m_SelTreeItem, EgtFolder)
-         If Not IsNothing(CurrItem) Then
-            CollectionViewSource.GetDefaultView(CurrItem.FolderList).Refresh()
-         End If
-      End Set
-   End Property
-
-   ' Lista modalita' di visualizzazione
-   Private m_ViewModeList As ObservableCollection(Of IdNameStruct)
-   Public Property ViewModeList As ObservableCollection(Of IdNameStruct)
-      Get
-         Return m_ViewModeList
-      End Get
-      Set(value As ObservableCollection(Of IdNameStruct))
-         m_ViewModeList = value
-      End Set
-   End Property
-
-   'Scelta modalita' di visualizzazione
-   Private m_SelViewMode As IdNameStruct
-   Public Property SelViewMode As IdNameStruct
-      Get
-         Return m_SelViewMode
-      End Get
-      Set(value As IdNameStruct)
-         m_SelViewMode = value
-         Select Case m_SelViewMode.Id
-            Case VisualizationType.LISTTEMPLATE
-               m_nSelTab = VisualizationContainerType.LISTBOX
-               nSelTempleteListView = 0
-               WriteMainPrivateProfileString(S_TEMPLETESEL, K_CURRTEMPLETESEL, CStr(VisualizationType.LISTTEMPLATE))
-            Case VisualizationType.TILESTEMPLATE
-               m_nSelTab = VisualizationContainerType.LISTBOX
-               nSelTempleteListView = 1
-               WriteMainPrivateProfileString(S_TEMPLETESEL, K_CURRTEMPLETESEL, CStr(VisualizationType.TILESTEMPLATE))
-            Case VisualizationType.CONTENTTEMPLATE
-               m_nSelTab = VisualizationContainerType.LISTBOX
-               nSelTempleteListView = 2
-               WriteMainPrivateProfileString(S_TEMPLETESEL, K_CURRTEMPLETESEL, CStr(VisualizationType.CONTENTTEMPLATE))
-            Case VisualizationType.DETAILSTEMPLATE
-               m_nSelTab = VisualizationContainerType.DATAGRID
-               WriteMainPrivateProfileString(S_TEMPLETESEL, K_CURRTEMPLETESEL, CStr(VisualizationType.DETAILSTEMPLATE))
-         End Select
-         NotifyPropertyChanged(NameOf(nSelTab))
-      End Set
-   End Property
-
-   ' Indice modalita' di visualizzazione
-   Private m_nSelViewModeIndex As Integer
-   Public Property nSelViewModeIndex As Integer
-      Get
-         Return m_nSelViewModeIndex
-      End Get
-      Set(value As Integer)
-         m_nSelViewModeIndex = value
-      End Set
-   End Property
-
-   ' indice di selezione del TabControl che cambia la ListBox/DataGrid
-   Private m_nSelTab As Integer
-   Public Property nSelTab As Integer
-      Get
-         Return m_nSelTab
-      End Get
-      Set(value As Integer)
-         m_nSelTab = value
-      End Set
-   End Property
-
-#Region "Initial data from window opening"
-
-   ' Indice del filtro estensione impostato durante creazione finestra
-   Private m_nFilterIndex As Integer
-   Public Property nFilterIndex As Integer
-      Get
-         Return m_nFilterIndex
-      End Get
-      Set(value As Integer)
-         m_nFilterIndex = value
-         m_SelFilter = m_FilterList.FirstOrDefault(Function(x) x.nIndexExstension = m_nFilterIndex)
-      End Set
-   End Property
-
-   ' lista delle estensioni impostata durante creazione finestra
-   Private m_sFilter As String
-   Public Property sFilter As String
-      Get
-         Return m_sFilter
-      End Get
-      Set(value As String)
-         m_sFilter = value
-         Dim nIndex As Integer = 1
-         If Not IsNothing(sFilter) Then
-            Dim FilterListSplit As String() = sFilter.Split("|"c)
-            For i As Integer = 0 To FilterListSplit.Count - 1
-               If i Mod 2 = 0 Then
-                  Dim strExstension As New EgtExstension() With {.m_nIndexExstension = nIndex, .m_sNameExstension = FilterListSplit(i), .m_sExstension = FilterListSplit(i + 1)}
-                  m_FilterList.Add(strExstension)
-                  nIndex += 1
-               End If
-            Next
-         End If
-      End Set
-   End Property
-
-   ' Path della cartella iniziale impostata durante creazione finestra
-   Private m_sInitialDirectory As String
-   Public Property sInitialDirectory As String
-      Get
-         Return m_sInitialDirectory
-      End Get
-      Set(value As String)
-         m_sInitialDirectory = value
-         If m_sFileName = String.Empty Then m_sSaveFileName = "New.icrs"
-         m_sSelPath = m_sInitialDirectory
-
-         Dim DirectoryStart As String() = m_sInitialDirectory.Split("\"c)
-         Dim m_RootListTmp As New ObservableCollection(Of EgtDirectory)
-         Dim dir As EgtDirectory
-         Dim count As Integer = 1
-         Dim currItem As EgtFolder
-         m_RootListTmp = m_RootList
-
-         For Each directory As String In DirectoryStart
-            dir = m_RootListTmp.FirstOrDefault(Function(x) x.sName.Trim("\"c) = directory)
-            dir.IsExpanded = True
-            currItem = TryCast(dir, EgtFolder)
-            m_RootListTmp = currItem.FolderList
-            If count = DirectoryStart.Count Then
-               dir.IsSelected = True
-            Else
-               count += 1
-            End If
-         Next
-
-      End Set
-   End Property
-
-   ' Nome del file iniziale impostato durante creazione finestra
-   Private m_sFileName As String
-   Public Property sFileName As String
-      Get
-         Return m_sFileName
-      End Get
-      Set(value As String)
-         m_sFileName = value
-         m_sSaveFileName = Path.GetFileName(m_sFileName)
-      End Set
-   End Property
-
-#End Region    ' Initial data from window opening
-
-   ' Scelta per la visualizzazione del templete della lista
-   Private m_nSelTempleteListView As Integer
-   Public Property nSelTempleteListView As Integer
-      Get
-         Return m_nSelTempleteListView
-      End Get
-      Set(value As Integer)
-         m_nSelTempleteListView = value
-         NotifyPropertyChanged(NameOf(nSelTempleteListView))
-      End Set
-   End Property
-
-#Region "Messages"
-
-   Public ReadOnly Property Name_Msg As String
-      Get
-         Return EgtMsg(15060)    ' Nome
-      End Get
-   End Property
-
-   Public ReadOnly Property LastModify_Msg As String
-      Get
-         Return EgtMsg(15061)    ' Ultima Modifica
-      End Get
-   End Property
-
-   Public ReadOnly Property Type_Msg As String
-      Get
-         Return EgtMsg(15062)    ' Tipo
-      End Get
-   End Property
-
-   Public ReadOnly Property Dimension_Msg As String
-      Get
-         Return EgtMsg(15063)    ' Dimensione
-      End Get
-   End Property
-
-   Public ReadOnly Property FileName_Msg As String
-      Get
-         Return If(m_nMode = ModeTypes.FILE, EgtMsg(15065), EgtMsg(15066))    ' File Name          Folder Name
-      End Get
-   End Property
-
-#End Region
-
-   'Comandi
-   Private m_cmdCancel As ICommand
-   Private m_cmdOk As ICommand
-   Private m_cmdGoBack As ICommand
-   Private m_cmdDoubleClick As ICommand
-   Public Event m_CloseWindow(bDialogResult As DialogResult)
-
-#End Region    ' FIELDS & PROPERTIES
-
-#Region "CONTRUCTORS"
-
-   Sub New()
-      m_RootList.Clear()
-      EgtDirectory.refUpdateSelTreeItem = AddressOf UpdateSelTreeItem
-      Dim drives As DriveInfo() = DriveInfo.GetDrives().Where(Function(d) d.IsReady).ToArray()
-
-      m_FilterList = New ObservableCollection(Of EgtExstension)
-
-      EgtFolder.SetEgtManageFileDialogVM(Me)
-
-      For i As Integer = 0 To drives.Count() - 1
-         Dim directory As New EgtFolder(drives(i).RootDirectory, Nothing, "\Resources\EgtDialog\Root.png")
-         m_RootList.Add(directory)
-      Next
-
-      m_SelFilter = New EgtExstension()
-      SetVisualizzationList()
-
-      Dim IndexTemplete As Integer = GetMainPrivateProfileInt(S_TEMPLETESEL, K_CURRTEMPLETESEL, VisualizationContainerType.DATAGRID)
-
-      SelViewMode = m_ViewModeList.FirstOrDefault(Function(x) x.Id = IndexTemplete)
-
-      NotifyPropertyChanged(NameOf(RootList))
-      NotifyPropertyChanged(NameOf(FilterList))
-      NotifyPropertyChanged(NameOf(ViewModeList))
-      NotifyPropertyChanged(NameOf(FileName_Msg))
-      NotifyPropertyChanged(NameOf(SelViewMode))
-   End Sub
-
-#End Region    ' CONTRUCTORS
-
-
-#Region "METHODS"
-
-   ''' <summary>
-   ''' Inizializza la ComboBox per la scelta dei template
-   ''' </summary>
-   Private Sub SetVisualizzationList()
-      m_ViewModeList = New ObservableCollection(Of IdNameStruct)
-      Dim ItemVisualization As New IdNameStruct With {
-         .Id = 0,
-         .Name = EgtMsg(15067)      ' List Templete
-      }
-      m_ViewModeList.Add(ItemVisualization)
-      ItemVisualization.Id = 3
-      ItemVisualization.Name = EgtMsg(15068)    ' Detalis Templete
-      m_ViewModeList.Add(ItemVisualization)
-      ItemVisualization.Id = 1
-      ItemVisualization.Name = EgtMsg(15069)    ' Tiles Templete
-      m_ViewModeList.Add(ItemVisualization)
-      ItemVisualization.Id = 2
-      ItemVisualization.Name = EgtMsg(15070)    ' Content Templete
-      m_ViewModeList.Add(ItemVisualization)
-   End Sub
-
-#End Region
-
-#Region "COMMANDS"
-
-#Region "Ok"
-
-   Public ReadOnly Property Ok_Command As ICommand
-      Get
-         If m_cmdOk Is Nothing Then
-            m_cmdOk = New Command(AddressOf Ok)
-         End If
-         Return m_cmdOk
-      End Get
-   End Property
-
-   Public Sub Ok()
-      Dim CurrItem As EgtItem = TryCast(m_ItemSelected, EgtItem)
-      Dim simbolsCharacter As String() = {"<"c, ">"c, ":"c, "'"c, "/"c, "\"c, "|"c, "?"c, "*"c,
-                                          "CON", "PRN", "AUX", "NUL", "COM0", "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9",
-                                          "LPT0", "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9"}
-
-      If nMode = ModeTypes.FILE Then
-         If Not IsNothing(CurrItem) And m_bCheckFileExists And m_bValidateNames Then
-            For Each simbol As String In simbolsCharacter
-               If m_sSaveFileName.Contains(simbol) Then
-                  If EgtMessageBoxV.Show(System.Windows.Application.Current.MainWindow, EgtMsg(15072), sTitle, MessageBoxButton.OKCancel, MessageBoxImage.Error) = MessageBoxResult.Cancel Then ' Errore file contiene simboli non conformi
-                     sSaveFileName = CurrItem.sName
-                     Return
-                  End If
-               Else
-                  m_sFileName = m_SelTreeItem.sFullName & "\" & m_sSaveFileName
-               End If
-            Next
-         ElseIf m_bValidateNames = False And m_bOverwritePrompt Then
-            If Not IsNothing(CurrItem) Then
-               If m_sFileName.Equals(m_sSaveFileName) OrElse m_sSaveFileName.Equals(CurrItem.sName) Then
-                  If EgtMessageBoxV.Show(System.Windows.Application.Current.MainWindow, EgtMsg(15073), sTitle, MessageBoxButton.YesNo, MessageBoxImage.Warning) = MessageBoxResult.No Then
-                     Return
-                  End If
-               End If
-            Else
-               m_sFileName = m_SelTreeItem.sFullName & "\" & m_sSaveFileName
-            End If
-         Else
-            m_sFileName = m_SelTreeItem.sFullName & "\" & m_sSaveFileName
-         End If
-      ElseIf nMode = ModeTypes.FOLDER Then
-         For Each simbol As String In simbolsCharacter
-            If m_sSaveFileName.Contains(simbol) Then
-               If EgtMessageBoxV.Show(System.Windows.Application.Current.MainWindow, EgtMsg(15072), sTitle, MessageBoxButton.OKCancel, MessageBoxImage.Error) = MessageBoxResult.Cancel Then ' Errore file contiene simboli non conformi
-                  Return
-               End If
-            Else
-               m_sFileName = m_SelTreeItem.sFullName
-            End If
-         Next
-      End If
-      RaiseEvent m_CloseWindow(DialogResult.OK)
-   End Sub
-
-#End Region    'Ok
-
-#Region "GoBack"
-
-   Public ReadOnly Property GoBack_Command As ICommand
-      Get
-         If m_cmdGoBack Is Nothing Then
-            m_cmdGoBack = New Command(AddressOf GoBack)
-         End If
-         Return m_cmdGoBack
-      End Get
-   End Property
-
-   Public Sub GoBack()
-      If Not IsNothing(m_SelTreeItem) AndAlso Not IsNothing(m_SelTreeItem.m_ParentFolder) Then
-         If TypeOf m_SelTreeItem.m_ParentFolder Is EgtFolder Then
-            Dim CurrParentFolder As EgtFolder = DirectCast(m_SelTreeItem.m_ParentFolder, EgtFolder)
-            CurrParentFolder.SetIsSelected(True, False)
-         End If
-         m_sSelPath = DirectCast(m_SelTreeItem, EgtFolder).sFullName
-         NotifyPropertyChanged(NameOf(sSelPath))
-      End If
-   End Sub
-
-#End Region    'GoBack
-
-#Region "Cancel"
-
-   Public ReadOnly Property Cancel_Command As ICommand
-      Get
-         If m_cmdCancel Is Nothing Then
-            m_cmdCancel = New Command(AddressOf Cancel)
-         End If
-         Return m_cmdCancel
-      End Get
-   End Property
-
-   Public Sub Cancel()
-      RaiseEvent m_CloseWindow(DialogResult.Cancel)
-   End Sub
-
-#End Region    'Cancel
-
-#Region "DoubleClick"
-
-   Public ReadOnly Property DoubleClick_Command As ICommand
-      Get
-         If m_cmdDoubleClick Is Nothing Then
-            m_cmdDoubleClick = New Command(AddressOf MouseDoubleClick)
-         End If
-         Return m_cmdDoubleClick
-      End Get
-   End Property
-
-   Public Sub MouseDoubleClick()
-      m_ItemSelected.IsExpanded = True
-      If TypeOf m_ItemSelected Is EgtFolder Then
-         Dim CurrItemSelected As EgtFolder = DirectCast(m_ItemSelected, EgtFolder)
-         CurrItemSelected.SetIsSelected(True, True)
-         m_sSelPath = CurrItemSelected.sFullName
-      Else
-         m_ItemSelected.IsSelected = True
-      End If
-      NotifyPropertyChanged(NameOf(sSelPath))
-   End Sub
-
-#End Region    'DoubleClick
-
-#End Region    ' COMMANDS
-
-End Class
-
-Public Class EgtExstension
-   Inherits VMBase
-
-   ' Indice estensione
-   Public m_nIndexExstension As Integer
-   Public Property nIndexExstension As Integer
-      Get
-         Return m_nIndexExstension
-      End Get
-      Set(value As Integer)
-         m_nIndexExstension = value
-         NotifyPropertyChanged(NameOf(nIndexExstension))
-      End Set
-   End Property
-
-   ' Nome della stringa Filter Splittata           m_sNameExstension = Icarus project
-   Public m_sNameExstension As String
-   Public Property sNameExstension As String
-      Get
-         Return m_sNameExstension
-      End Get
-      Set(value As String)
-         m_sNameExstension = value
-         NotifyPropertyChanged(NameOf(sNameExstension))
-      End Set
-   End Property
-
-   ' Estensione della stringa Filter Splittata     m_sExstension = *.icrs
-   Public m_sExstension As String
-   Public Property sExstension As String
-      Get
-         Return m_sExstension
-      End Get
-      Set(value As String)
-         m_sExstension = value
-         NotifyPropertyChanged(NameOf(sExstension))
-      End Set
-   End Property
-
-End Class
-
-Public MustInherit Class EgtDirectory
-   Inherits VMBase
-
-#Region "FIELDS & PROPERTIES"
-
-   Friend Shared refUpdateSelTreeItem As Action(Of EgtDirectory)
-
-   Friend Shared m_refEgtManageFileDialogVM As EgtManageFileDialogVM
-   Friend Shared Sub SetEgtManageFileDialogVM(EgtManageFileDialogVM As EgtManageFileDialogVM)
-      m_refEgtManageFileDialogVM = EgtManageFileDialogVM
-   End Sub
-
-   Protected m_bIsSelected As Boolean
-   Public MustOverride Property IsSelected As Boolean
-
-   Protected m_bIsExpanded As Boolean
-   Public Overridable Property IsExpanded As Boolean
-
-   Public MustOverride ReadOnly Property sFullName As String
-
-   Protected m_sName As String
-   Public MustOverride ReadOnly Property sName As String
-
-   Protected m_sIconSource As String
-   Public Overridable ReadOnly Property sIconSource As String
-      Get
-         Return m_sIconSource
-      End Get
-   End Property
-
-   Protected m_sTypeItem As String
-   Public MustOverride ReadOnly Property sTypeItem As String
-
-   Protected m_ghTypeItem As String
-   Public Overridable ReadOnly Property ghTypeItem As String
-
-   Protected m_dtLastModifyDate As Date
-   Public MustOverride ReadOnly Property sLastModifyDate As String
-
-   Public m_ParentFolder As EgtFolder
-   Public Property ParentFolder As EgtFolder
-      Get
-         Return m_ParentFolder
-      End Get
-      Set(value As EgtFolder)
-         m_ParentFolder = value
-      End Set
-   End Property
-
-#End Region    ' FIELDS & PROPERTIES
-
-End Class
-
-Public Class EgtFolder
-   Inherits EgtDirectory
-
-#Region "FIELDS & PROPERTIES"
-
-   Private m_ItemList_View As CollectionView = Nothing
-   Private m_TreeItemList_ViewSource As CollectionViewSource = Nothing
-   Private m_TreeItemList_View As CollectionView = Nothing
-   Public ReadOnly Property TreeItemList_View As CollectionView
-      Get
-         Return m_TreeItemList_View
-      End Get
-   End Property
-
-   Private m_DirectoryInfo As DirectoryInfo
-
-   Private m_FolderList As New ObservableCollection(Of EgtDirectory)
-   Public Property FolderList As ObservableCollection(Of EgtDirectory)
-      Get
-         Return m_FolderList
-      End Get
-      Set(value As ObservableCollection(Of EgtDirectory))
-         m_FolderList = value
-      End Set
-   End Property
-
-   Public Overrides ReadOnly Property sFullName As String
-      Get
-         Return m_DirectoryInfo.FullName
-      End Get
-   End Property
-
-   Public Overrides ReadOnly Property sName As String
-      Get
-         Return m_DirectoryInfo.Name
-      End Get
-   End Property
-
-   Public Overrides ReadOnly Property sTypeItem As String
-      Get
-         Return EgtMsg(15064)    ' Cartella di File
-      End Get
-   End Property
-
-   Public Overrides ReadOnly Property sLastModifyDate As String
-      Get
-         Return m_DirectoryInfo.LastWriteTime.ToString("dd/MM/yyyy HH:mm:ss")
-      End Get
-   End Property
-
-   Public Overrides Property IsExpanded As Boolean
-      Get
-         Return m_bIsExpanded
-      End Get
-      Set(value As Boolean)
-         m_bIsExpanded = value
-         NotifyPropertyChanged(NameOf(IsExpanded))
-         If m_bIsExpanded Then
-            SetFolderList()
-         End If
-      End Set
-   End Property
-
-   Public Overrides Property IsSelected As Boolean
-      Get
-         Return m_bIsSelected
-      End Get
-      Set(value As Boolean)
-         m_bIsSelected = value
-         m_refEgtManageFileDialogVM.sSelPath = m_DirectoryInfo.FullName
-         If m_bIsSelected Then
-            SetFolderList()
-            refUpdateSelTreeItem(Me)
-            NotifyPropertyChanged(NameOf(IsSelected))
-         End If
-      End Set
-   End Property
-   Friend Sub SetIsSelected(value As Boolean, bRefreshList As Boolean)
-      Dim sSelListItemPath As String = ""
-      If Not IsNothing(m_refEgtManageFileDialogVM.SelTreeItem) Then
-         sSelListItemPath = m_refEgtManageFileDialogVM.SelTreeItem.sFullName
-      End If
-      m_bIsSelected = value
-      m_refEgtManageFileDialogVM.sSelPath = m_DirectoryInfo.FullName
-      If m_bIsSelected Then
-         If bRefreshList Then SetFolderList()
-         refUpdateSelTreeItem(Me)
-      End If
-      If Not IsNothing(sSelListItemPath) Then
-         Dim SelFolderItem As EgtDirectory = m_FolderList.FirstOrDefault(Function(x) x.sFullName = sSelListItemPath)
-         If Not IsNothing(SelFolderItem) Then
-            m_refEgtManageFileDialogVM.SetItemSelected(SelFolderItem)
-         End If
-      End If
-      NotifyPropertyChanged(NameOf(IsSelected))
-   End Sub
-
-#End Region    ' FIELDS & PROPERTIES
-
-#Region "CONTRUCTORS"
-
-   Sub New()
-   End Sub
-
-   Sub New(DirectoryInfo As DirectoryInfo, Parent As EgtDirectory, Optional IconSource As String = "\Resources\EgtDialog\Folder.png")
-      m_DirectoryInfo = DirectoryInfo
-      m_sIconSource = IconSource
-      Try
-         If DirectoryInfo.EnumerateDirectories.Count > 0 Then
-            m_FolderList.Add(New EgtFolder())
-         End If
-      Catch ex As Exception
-      End Try
-      m_ParentFolder = CType(Parent, EgtFolder)
-
-      m_ItemList_View = CType(CollectionViewSource.GetDefaultView(m_FolderList), CollectionView)
-      m_ItemList_View.Filter = AddressOf ItemFilter
-      m_TreeItemList_ViewSource = New CollectionViewSource() With {.Source = m_FolderList}
-      m_TreeItemList_View = CType(m_TreeItemList_ViewSource.View, CollectionView)
-      m_TreeItemList_View.Filter = AddressOf TreeItemListFilter
-
-      NotifyPropertyChanged(NameOf(sName))
-      NotifyPropertyChanged(NameOf(sLastModifyDate))
-      NotifyPropertyChanged(NameOf(sTypeItem))
-      NotifyPropertyChanged(NameOf(sIconSource))
-      NotifyPropertyChanged(NameOf(FolderList))
-      NotifyPropertyChanged(NameOf(ParentFolder))
-   End Sub
-
-#End Region    '  CONTRUCTORS
-
-#Region "METHODS"
-
-   ''' <summary>
-   ''' Funzione per la visualizzazione delle sole cartelle nell'albero TreeView
-   ''' </summary>
-   ''' <param name="CurrItem"></param>
-   ''' <returns></returns>
-   Private Function TreeItemListFilter(CurrItem As Object) As Boolean
-      Return TypeOf CurrItem Is EgtFolder
-   End Function
-
-   ''' <summary>
-   ''' Funzione per il controllo del filtro per i singoli Item    se l'estensione scelta e' .icrs verrano visualizzati tutti i file con l'estensione .icrs
-   ''' </summary>
-   ''' <param name="Item"></param>
-   ''' <returns></returns>
-   Private Function ItemFilter(Item As Object) As Boolean
-      Dim CurrItem As EgtItem = TryCast(Item, EgtItem)
-      If Not IsNothing(CurrItem) AndAlso Not IsNothing(m_refEgtManageFileDialogVM.m_SelFilter.m_sExstension) Then
-         If CurrItem.sTypeItem = m_refEgtManageFileDialogVM.m_SelFilter.m_sExstension.TrimStart("*"c) Then
-            Return True
-         ElseIf m_refEgtManageFileDialogVM.m_SelFilter.m_sExstension.TrimStart("*"c) = ".*" Then
-            Return True
-         Else
-            Return False
-         End If
-      End If
-      Return True
-   End Function
-
-   ''' <summary>
-   ''' Funzione per popolare la lista FolderList
-   ''' </summary>
-   Private Sub SetFolderList()
-      Dim DirectoryList() As DirectoryInfo
-      Dim FileList() As FileInfo
-      Try
-         DirectoryList = m_DirectoryInfo.GetDirectories().Where(Function(file) (file.Attributes And FileAttributes.Hidden And CType(file.Name <> EgtMsg(15071), Global.System.IO.FileAttributes)) = 0).ToArray()  ' ProgramData
-         FileList = m_DirectoryInfo.GetFiles().Where(Function(file) (file.Attributes And FileAttributes.Hidden) = 0).ToArray()
-      Catch ex As Exception
-         DirectoryList = Nothing
-         FileList = Nothing
-      End Try
-      m_FolderList.Clear()
-      If Not IsNothing(DirectoryList) AndAlso m_FolderList.Count = 0 Then
-         For Each subDir As DirectoryInfo In DirectoryList
-            Dim directory As New EgtFolder(subDir, Me)
-            m_FolderList.Add(directory)
-         Next
-      End If
-      If Not IsNothing(FileList) Then
-         For Each files As FileInfo In FileList
-            Dim file As New EgtItem(files)
-            m_FolderList.Add(file)
-         Next
-      End If
-   End Sub
-
-#End Region
-
-End Class
-
-Public Class EgtItem
-   Inherits EgtDirectory
-
-#Region "FIELDS & PROPERTIES"
-
-   Private m_FileInfo As FileInfo
-
-   Public Overrides ReadOnly Property sFullName As String
-      Get
-         Return m_FileInfo.FullName
-      End Get
-   End Property
-
-   Public Overrides ReadOnly Property sName As String
-      Get
-         Return m_FileInfo.Name
-      End Get
-   End Property
-
-   Public Overrides ReadOnly Property sTypeItem As String
-      Get
-         If Not IsNothing(m_FileInfo) AndAlso Not IsNothing(m_FileInfo.Extension) AndAlso Not String.IsNullOrWhiteSpace(m_FileInfo.Extension) Then
-            Return m_FileInfo.Extension
-         Else
-            Return ""
-         End If
-      End Get
-   End Property
-
-   Public Overrides ReadOnly Property ghTypeItem As String
-      Get
-         Return If(Not String.IsNullOrWhiteSpace(sTypeItem), "File " & sTypeItem.ToUpper(), "")
-      End Get
-   End Property
-
-   Public ReadOnly Property sDimension As String
-      Get
-         Return If(m_FileInfo.Length / 1024 / 1024 > 1, String.Format("{0:#,##0.00}", m_FileInfo.Length / 1024 / 1024) & " Mb", String.Format("{0:#,##0.00}", m_FileInfo.Length / 1024) & " Kb")
-      End Get
-   End Property
-
-   Public Overrides ReadOnly Property sLastModifyDate As String
-      Get
-         Return m_FileInfo.LastWriteTime.ToString("dd/MM/yyyy HH:mm:ss")
-      End Get
-   End Property
-
-   Public Overrides Property IsSelected As Boolean
-      Get
-         Return m_bIsSelected
-      End Get
-      Set(value As Boolean)
-         m_bIsSelected = value
-         refUpdateSelTreeItem(Me)
-      End Set
-   End Property
-
-#End Region    ' FIELDS & PROPERTIES
-
-#Region "CONTRUCTORS"
-
-   Sub New(FileInfo As FileInfo)
-      m_FileInfo = FileInfo
-      m_sIconSource = "\Resources\EgtDialog\New.png"
-      NotifyPropertyChanged(NameOf(sName))
-      NotifyPropertyChanged(NameOf(sDimension))
-      NotifyPropertyChanged(NameOf(sLastModifyDate))
-      NotifyPropertyChanged(NameOf(sTypeItem))
-      NotifyPropertyChanged(NameOf(sIconSource))
-   End Sub
-
-#End Region    '  CONTRUCTORS
-
-End Class
\ No newline at end of file
diff --git a/EgtMessageBox/EgtMessageBoxV.xaml b/EgtMessageBox/EgtMessageBoxV.xaml
deleted file mode 100644
index 4648ebd..0000000
--- a/EgtMessageBox/EgtMessageBoxV.xaml
+++ /dev/null
@@ -1,52 +0,0 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="EgtMessageBoxV"
-                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5"
-                            Title="{Binding sTitle}"
-                            SizeToContent="WidthAndHeight"
-                            WindowStartupLocation="CenterOwner"
-                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="32"
-                            IsMinimizable="False" ShowInTaskbar="False"
-                            CloseCommand="{Binding Close_Command,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
-
-   <Grid Margin="2.5,2.5,2.5,0">
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="Auto"/>
-      </Grid.RowDefinitions>
-      <Grid Margin="20,20,20,20">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="1*"/>
-         </Grid.ColumnDefinitions>
-         <Image Source="{Binding sIconSource}"
-                Margin="0,0,0,0"/>
-         <TextBlock Grid.Column="1"
-                    Text="{Binding sMessage}"
-                    Margin="5,0,5,0"
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center"
-                    FontSize="12"/>
-      </Grid>
-      <ItemsControl Grid.Row="1"
-                    ItemsSource="{Binding ButtonList}"
-                    HorizontalAlignment="Center">
-         <ItemsControl.ItemsPanel>
-            <ItemsPanelTemplate>
-               <UniformGrid Rows="1"/>
-            </ItemsPanelTemplate>
-         </ItemsControl.ItemsPanel>
-         <ItemsControl.ItemTemplate>
-            <DataTemplate>
-               <Button IsDefault="{Binding bIsDefault}"
-                       Content="{Binding sMessage}"
-                       Command="{Binding Command_Command}"
-                       Margin="2.5,0,2.5,0"
-                       Height="24"
-                       Width="64"
-                       BorderThickness="1,1,1,0"/>
-            </DataTemplate>
-         </ItemsControl.ItemTemplate>
-      </ItemsControl>
-   </Grid>
-</EgtWPFLib5:EgtCustomWindow>
diff --git a/EgtMessageBox/EgtMessageBoxV.xaml.vb b/EgtMessageBox/EgtMessageBoxV.xaml.vb
deleted file mode 100644
index 390bae4..0000000
--- a/EgtMessageBox/EgtMessageBoxV.xaml.vb
+++ /dev/null
@@ -1,107 +0,0 @@
-Public Class EgtMessageBoxV
-
-#Region "FIELDS & PROPERTIES"
-
-   Private WithEvents m_EgtMessageBoxVM As EgtMessageBoxVM
-
-   Private Shadows DialogResult As MessageBoxResult
-
-#End Region    ' FIELDS & PROPERTIES
-
-#Region "CONTRUCTORS"
-
-   Sub New(Owner As Window, EgtMessageBoxVM As EgtMessageBoxVM)
-      MyBase.New(Owner)
-      ' This call is required by the designer.
-      InitializeComponent()
-      Me.DataContext = EgtMessageBoxVM
-      ' Assegno al riferimento locale al VM il VM preso dal DataContext
-      m_EgtMessageBoxVM = EgtMessageBoxVM
-   End Sub
-
-#End Region
-
-#Region "METHODS"
-
-   ''' <summary>
-   ''' Apre una EgtMessageBox con un messaggio che ritorna un risultato
-   ''' </summary>
-   ''' <param name="Owner">Finestra di appartenenza</param>
-   ''' <param name="sMessageBoxText">Stringa che specifica il messaggio da mostrare</param>
-   ''' <returns>Valore che specifica quale bottone e' stato premuto dall'utente</returns>
-   Public Overloads Shared Function Show(Owner As Window, sMessageBoxText As String) As MessageBoxResult
-      Dim NewMessagebox As New EgtMessageBoxV(Owner, New EgtMessageBoxVM(sMessageBoxText))
-      NewMessagebox.ShowDialog()
-      Return NewMessagebox.DialogResult
-   End Function
-
-   ''' <summary>
-   ''' Apre una EgtMessageBox con un titolo ed un messaggio che ritorna un risultato
-   ''' </summary>
-   ''' <param name="Owner">Finestra di appartenenza</param>
-   ''' <param name="sMessageBoxText">Stringa che specifica il messaggio da mostrare</param>
-   ''' <param name="sCaption">Stringa che specifica il titolo da mostrare</param>
-   ''' <returns>Valore che specifica quale bottone e' stato premuto dall'utente</returns>
-   Public Overloads Shared Function Show(Owner As Window, sMessageBoxText As String, sCaption As String) As MessageBoxResult
-      Dim NewMessagebox As New EgtMessageBoxV(Owner, New EgtMessageBoxVM(sMessageBoxText, sCaption))
-      NewMessagebox.ShowDialog()
-      Return NewMessagebox.DialogResult
-   End Function
-
-   ''' <summary>
-   ''' Apre una EgtMessageBox con un titolo ed un messaggio che ritorna un risultato
-   ''' </summary>
-   ''' <param name="Owner">Finestra di appartenenza</param>
-   ''' <param name="sMessageBoxText">Stringa che specifica il messaggio da mostrare</param>
-   ''' <param name="sCaption">Stringa che specifica il titolo da mostrare</param>
-   ''' <param name="Button">Valore che specifica quali bottoni mostrare</param>
-   ''' <returns>Valore che specifica quale bottone e' stato premuto dall'utente</returns>
-   Public Overloads Shared Function Show(Owner As Window, sMessageBoxText As String, sCaption As String, Button As MessageBoxButton) As MessageBoxResult
-      Dim NewMessagebox As New EgtMessageBoxV(Owner, New EgtMessageBoxVM(sMessageBoxText, sCaption, Button))
-      NewMessagebox.ShowDialog()
-      Return NewMessagebox.DialogResult
-   End Function
-
-   ''' <summary>
-   ''' Apre una EgtMessageBox con un titolo ed un messaggio che ritorna un risultato
-   ''' </summary>
-   ''' <param name="Owner">Finestra di appartenenza</param>
-   ''' <param name="sMessageBoxText">Stringa che specifica il messaggio da mostrare</param>
-   ''' <param name="sCaption">Stringa che specifica il titolo da mostrare</param>
-   ''' <param name="Button">Valore che specifica quali bottoni mostrare</param>
-   ''' <param name="Icon">Valore che specifica quale icona mostrare</param>
-   ''' <returns>Valore che specifica quale bottone e' stato premuto dall'utente</returns>
-   Public Overloads Shared Function Show(Owner As Window, sMessageBoxText As String, sCaption As String, Button As MessageBoxButton, Icon As MessageBoxImage) As MessageBoxResult
-      Dim NewMessagebox As New EgtMessageBoxV(Owner, New EgtMessageBoxVM(sMessageBoxText, sCaption, Button, Icon))
-      NewMessagebox.ShowDialog()
-      Return NewMessagebox.DialogResult
-   End Function
-
-   ''' <summary>
-   ''' Apre una EgtMessageBox con un titolo ed un messaggio che ritorna un risultato
-   ''' </summary>
-   ''' <param name="Owner">Finestra di appartenenza</param>
-   ''' <param name="sMessageBoxText">Stringa che specifica il messaggio da mostrare</param>
-   ''' <param name="sCaption">Stringa che specifica il titolo da mostrare</param>
-   ''' <param name="Button">Valore che specifica quali bottoni mostrare</param>
-   ''' <param name="Icon">Valore che specifica quale icona mostrare</param>
-   ''' <param name="DefaultResult">Valore che specifica il bottone di default</param>
-   ''' <returns>Valore che specifica quale bottone e' stato premuto dall'utente</returns>
-   Public Overloads Shared Function Show(Owner As Window, sMessageBoxText As String, sCaption As String, Button As MessageBoxButton, Icon As MessageBoxImage, DefaultResult As MessageBoxResult) As MessageBoxResult
-      Dim NewMessagebox As New EgtMessageBoxV(Owner, New EgtMessageBoxVM(sMessageBoxText, sCaption, Button, Icon, DefaultResult))
-      NewMessagebox.ShowDialog()
-      Return NewMessagebox.DialogResult
-   End Function
-
-#End Region    ' METHODS
-
-#Region "EVENTS"
-
-   Private Sub CloseWindow(DialogResult As MessageBoxResult) Handles m_EgtMessageBoxVM.m_CloseWindow
-      Me.DialogResult = DialogResult
-      Me.Close()
-   End Sub
-
-#End Region
-
-End Class
diff --git a/EgtMessageBox/EgtMessageBoxVM.vb b/EgtMessageBox/EgtMessageBoxVM.vb
deleted file mode 100644
index 0561e41..0000000
--- a/EgtMessageBox/EgtMessageBoxVM.vb
+++ /dev/null
@@ -1,232 +0,0 @@
-Imports EgtUILib
-
-Public Class EgtMessageBoxVM
-   Inherits VMBase
-
-#Region "FIELDS & PROPERTIES"
-
-   Public Event m_CloseWindow(DialogResult As MessageBoxResult)
-
-   Private m_sTitle As String = ""
-   Public ReadOnly Property sTitle As String
-      Get
-         Return m_sTitle
-      End Get
-   End Property
-
-   Private m_sMessage As String = ""
-   Public ReadOnly Property sMessage As String
-      Get
-         Return m_sMessage
-      End Get
-   End Property
-
-   Private m_Button As MessageBoxButton
-   Private m_Icon As MessageBoxImage
-   Public ReadOnly Property sIconSource As String
-      Get
-         Select Case m_Icon
-            Case MessageBoxImage.Hand
-               Return "\Resources\EgtMessageBox\Hand.png"
-            Case MessageBoxImage.Question
-               Return "\Resources\EgtMessageBox\Question.png"
-            Case MessageBoxImage.Exclamation
-               Return "\Resources\EgtMessageBox\Exclamation.png"
-            Case MessageBoxImage.Asterisk
-               Return "\Resources\EgtMessageBox\Asterisk.png"
-            Case MessageBoxImage.Stop
-               Return "\Resources\EgtMessageBox\Hand.png"
-            Case MessageBoxImage.Error
-               Return "\Resources\EgtMessageBox\Hand.png"
-            Case MessageBoxImage.Warning
-               Return "\Resources\EgtMessageBox\Exclamation.png"
-            Case MessageBoxImage.Information
-               Return "\Resources\EgtMessageBox\Asterisk.png"
-            Case Else ' MessageBoxImage.None
-               Return ""
-         End Select
-      End Get
-   End Property
-
-   Private m_ButtonList As New List(Of EgtMsgBoxButton)
-   Public Property ButtonList As List(Of EgtMsgBoxButton)
-      Get
-         Return m_ButtonList
-      End Get
-      Set(value As List(Of EgtMsgBoxButton))
-         m_ButtonList = value
-      End Set
-   End Property
-
-#End Region    ' FIELDS & PROPERTIES
-
-#Region "CONTRUCTORS"
-
-   Sub New(sMessageBoxText As String)
-      EgtMsgBoxButton.SetOwner(Me)
-      m_sMessage = sMessageBoxText
-      m_Button = MessageBoxButton.OK
-      m_Icon = MessageBoxImage.None
-      NotifyPropertyChanged(NameOf(ButtonList))
-      NotifyPropertyChanged(NameOf(sIconSource))
-   End Sub
-
-   Sub New(sMessageBoxText As String, sCaption As String)
-      MyClass.New(sMessageBoxText)
-      m_sTitle = sCaption
-   End Sub
-
-   Sub New(sMessageBoxText As String, sCaption As String, Button As MessageBoxButton)
-      MyClass.New(sMessageBoxText, sCaption)
-      m_Button = Button
-      Select Case m_Button
-         Case MessageBoxButton.OK
-            m_ButtonList.Add(New EgtMsgBoxButton(EgtMsgBoxButton.Types.OK))
-         Case MessageBoxButton.OKCancel
-            m_ButtonList.Add(New EgtMsgBoxButton(EgtMsgBoxButton.Types.OK))
-            m_ButtonList.Add(New EgtMsgBoxButton(EgtMsgBoxButton.Types.CANCEL))
-         Case MessageBoxButton.YesNoCancel
-            m_ButtonList.Add(New EgtMsgBoxButton(EgtMsgBoxButton.Types.YES))
-            m_ButtonList.Add(New EgtMsgBoxButton(EgtMsgBoxButton.Types.NO))
-            m_ButtonList.Add(New EgtMsgBoxButton(EgtMsgBoxButton.Types.CANCEL))
-         Case MessageBoxButton.YesNo
-            m_ButtonList.Add(New EgtMsgBoxButton(EgtMsgBoxButton.Types.YES))
-            m_ButtonList.Add(New EgtMsgBoxButton(EgtMsgBoxButton.Types.NO))
-      End Select
-      NotifyPropertyChanged(NameOf(ButtonList))
-   End Sub
-
-   Sub New(sMessageBoxText As String, sCaption As String, Button As MessageBoxButton, Icon As MessageBoxImage)
-      MyClass.New(sMessageBoxText, sCaption, Button)
-      m_Icon = Icon
-      NotifyPropertyChanged(NameOf(sIconSource))
-   End Sub
-
-   Sub New(sMessageBoxText As String, sCaption As String, Button As MessageBoxButton, Icon As MessageBoxImage, DefaultResult As MessageBoxResult)
-      MyClass.New(sMessageBoxText, sCaption, Button, Icon)
-      Dim DefaultBtn As EgtMsgBoxButton = m_ButtonList.FirstOrDefault(Function(x) (x.Type = EgtMsgBoxButton.Types.OK AndAlso DefaultResult = MessageBoxResult.OK) OrElse
-                                                                                  (x.Type = EgtMsgBoxButton.Types.CANCEL AndAlso DefaultResult = MessageBoxResult.Cancel) OrElse
-                                                                                  (x.Type = EgtMsgBoxButton.Types.YES AndAlso DefaultResult = MessageBoxResult.Yes) OrElse
-                                                                                  (x.Type = EgtMsgBoxButton.Types.NO AndAlso DefaultResult = MessageBoxResult.No))
-      If Not IsNothing(DefaultBtn) Then
-         DefaultBtn.SetIsDefault(True)
-      End If
-      NotifyPropertyChanged(NameOf(ButtonList))
-   End Sub
-
-#End Region    ' CONTRUCTORS
-
-#Region "METHODS"
-
-   Friend Sub CloseWindow(DialogResult As MessageBoxResult)
-      RaiseEvent m_CloseWindow(DialogResult)
-   End Sub
-
-#End Region    ' METHODS
-
-End Class
-
-Public Class EgtMsgBoxButton
-   Inherits VMBase
-
-#Region "FIELDS & PROPERTIES"
-
-   Public Enum Types As Integer
-      OK = 1
-      CANCEL = 2
-      YES = 3
-      NO = 4
-   End Enum
-
-   Private Shared Owner As EgtMessageBoxVM
-
-   Private m_Type As Types
-   Public ReadOnly Property Type As Types
-      Get
-         Return m_Type
-      End Get
-   End Property
-
-   Private m_sMessage As String
-   Public ReadOnly Property sMessage As String
-      Get
-         Return m_sMessage
-      End Get
-   End Property
-
-   Private m_bIsDefault As Boolean = False
-   Public ReadOnly Property bIsDefault As Boolean
-      Get
-         Return m_bIsDefault
-      End Get
-   End Property
-   Friend Sub SetIsDefault(bValue As Boolean)
-      m_bIsDefault = bValue
-   End Sub
-   ' Definizione comandi
-   Private m_cmdCommand As ICommand
-
-#End Region    ' FIELDS & PROPERTIES
-
-#Region "CONTRUCTORS"
-
-   Sub New(Type As Types)
-      m_Type = Type
-      Select Case m_Type
-         Case Types.OK
-            m_sMessage = EgtMsg(35001)    ' Ok
-         Case Types.CANCEL
-            m_sMessage = EgtMsg(35002)    ' Cancel
-         Case Types.YES
-            m_sMessage = EgtMsg(35003)    ' Yes
-         Case Types.NO
-            m_sMessage = EgtMsg(35004)    ' No
-      End Select
-   End Sub
-
-   Sub New(Type As Types, bIsDefault As Boolean)
-      MyClass.New(Type)
-      m_bIsDefault = bIsDefault
-   End Sub
-
-#End Region    ' CONTRUCTORS
-
-#Region "METHODS"
-
-   Friend Shared Sub SetOwner(value As EgtMessageBoxVM)
-      Owner = value
-   End Sub
-
-#End Region    ' METHODS
-
-#Region "COMMANDS"
-
-#Region "Command"
-
-   Public ReadOnly Property Command_Command As ICommand
-      Get
-         If m_cmdCommand Is Nothing Then
-            m_cmdCommand = New Command(AddressOf Command)
-         End If
-         Return m_cmdCommand
-      End Get
-   End Property
-
-   Public Sub Command()
-      Select Case m_Type
-         Case Types.OK
-            Owner.CloseWindow(MessageBoxResult.OK)
-         Case Types.CANCEL
-            Owner.CloseWindow(MessageBoxResult.Cancel)
-         Case Types.YES
-            Owner.CloseWindow(MessageBoxResult.Yes)
-         Case Types.NO
-            Owner.CloseWindow(MessageBoxResult.No)
-      End Select
-   End Sub
-
-#End Region ' Ok
-
-#End Region    ' COMMANDS 
-
-End Class
\ No newline at end of file
diff --git a/EgtOpenFileDialog.xaml.vb b/EgtOpenFileDialog.xaml.vb
index a15293f..e3007fc 100644
--- a/EgtOpenFileDialog.xaml.vb
+++ b/EgtOpenFileDialog.xaml.vb
@@ -51,7 +51,7 @@ Public Class EgtOpenFileDialog
       End Get
       Set(value As List(Of String))
          m_FileList = value
-         NotifyPropertyChanged(NameOf(FileList))
+         NotifyPropertyChanged("FileList")
       End Set
    End Property
 
@@ -62,7 +62,7 @@ Public Class EgtOpenFileDialog
       End Get
       Set(value As String)
          m_SelectedFile = value
-         NotifyPropertyChanged(NameOf(SelectedFile))
+         NotifyPropertyChanged("SelectedFile")
       End Set
    End Property
 
@@ -80,12 +80,12 @@ Public Class EgtOpenFileDialog
 
    Public ReadOnly Property OpenMsg As String
       Get
-         Return EgtMsg(30006)    ' Apri
+         Return EgtMsg(MSG_EGTSAVEFILEDIALOG + 6)
       End Get
    End Property
    Public ReadOnly Property CancelMsg As String
       Get
-         Return EgtMsg(30002)    ' Annulla
+         Return EgtMsg(MSG_EGTSAVEFILEDIALOG + 2)
       End Get
    End Property
 
diff --git a/EgtPanelWindow.vb b/EgtPanelWindow.vb
index af1e12e..5fd1dbc 100644
--- a/EgtPanelWindow.vb
+++ b/EgtPanelWindow.vb
@@ -27,6 +27,9 @@
 '     <MyNamespace:EgtPanelWindow/>
 '
 
+Imports System.Windows.Controls.Primitives
+
+
 <TemplatePart(Name:="PART_MoveRectangle", Type:=GetType(Rectangle))>
 Public Class EgtPanelWindow
    Inherits System.Windows.Window
diff --git a/EgtScrollViewer.vb b/EgtScrollViewer.vb
index 69bca00..03c5298 100644
--- a/EgtScrollViewer.vb
+++ b/EgtScrollViewer.vb
@@ -28,6 +28,7 @@
 '
 
 Imports System.Windows.Controls.Primitives
+Imports EgtWPFLib5
 
 Public Class EgtScrollViewer
    Inherits System.Windows.Controls.ScrollViewer
diff --git a/EgtTextBox.xaml b/EgtTextBox.xaml
index 501e378..a906066 100644
--- a/EgtTextBox.xaml
+++ b/EgtTextBox.xaml
@@ -7,7 +7,16 @@
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800">
 
+   <!--<UserControl.Resources>
+        <LinearGradientBrush x:Key="BrushBorderIsMouseOverFText" EndPoint="0,20" MappingMode="Absolute" StartPoint="0,0">
+            <GradientStop Color="#ABADB3" Offset="0.05"/>
+            <GradientStop Color="#E2E3EA" Offset="0.07"/>
+            <GradientStop Color="#E3E9EF" Offset="1"/>
+        </LinearGradientBrush>
+    </UserControl.Resources>-->
+
    <Grid>
+
       <Border x:Name="Brd"
               BorderThickness="1"
               Padding="1"
@@ -15,32 +24,38 @@
               FocusVisualStyle="{x:Null}"
               ScrollViewer.PanningMode="VerticalFirst"
               Stylus.IsFlicksEnabled="False">
+         <!--Background="{Binding CCBackground, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"-->
          <Border.Style>
             <Style TargetType="Border">
                <Style.Triggers>
                   <Trigger Property="IsEnabled" Value="True">
+                     <!--<Setter Property="Background" Value="{DynamicResource BackgroundBorderEnableTText}"/>-->
                      <Setter Property="Background" Value="{Binding BackgroundBrdEnable,
                                                                    RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtTextBox}},
                                                                    Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
                   </Trigger>
                   <Trigger Property="IsEnabled" Value="False">
+                     <!--<Setter Property="Background" Value="{DynamicResource BackgroundBorderEnableFText}"/>-->
                      <Setter Property="Background" Value="{Binding BackgroundBrdDisable,
                                                                    RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtTextBox}},
                                                                    Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
                   </Trigger>
                   <Trigger Property="IsMouseOver" Value="True">
+                     <!--<Setter Property="BorderBrush" Value="{DynamicResource BrushBorderIsMouseOverTText}"/>-->
                      <Setter Property="BorderBrush" Value="{Binding BorderBrushIsMouseOver,
                                                                     RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtTextBox}},
                                                                     Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
                      <Setter Property="Cursor" Value="IBeam"/>
                   </Trigger>
                   <Trigger Property="IsMouseOver" Value="False">
+                     <!--<Setter Property="BorderBrush" Value="{DynamicResource BrushBorderIsMouseOverFText}"/>-->
                      <Setter Property="BorderBrush" Value="{Binding GeneralBorderBrush,
                                                                     RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtTextBox}},
                                                                     Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
                      <Setter Property="Cursor" Value="Arrow"/>
                   </Trigger>
                   <Trigger Property="IsKeyboardFocused" Value="True">
+                     <!--<Setter Property="BorderBrush" Value="{DynamicResource BrushBorderIsKeyboardFocusedTText}"/>-->
                      <Setter Property="BorderBrush" Value="{Binding BorderBrushBrdIsFocused,
                                                                     RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtTextBox}},
                                                                     Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
@@ -55,17 +70,21 @@
                <Style TargetType="TextBlock">
                   <Style.Triggers>
                      <Trigger Property="IsEnabled" Value="False">
+                        <!--<Setter Property="Background" Value="{DynamicResource BackgroundTextBlockIsEnableFText}"/>-->
                         <Setter Property="Background" Value="{Binding BackgroundTxBlDisable,
                                                                       RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtTextBox}},
                                                                       Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
+                        <!--<Setter Property="Foreground" Value="{DynamicResource ForegroundTextBlockIsEnableFText}"/>-->
                         <Setter Property="Foreground" Value="{Binding ForegroundTxBlDisable,
                                                                       RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtTextBox}},
                                                                       Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
                      </Trigger>
                      <Trigger Property="IsEnabled" Value="True">
+                        <!--<Setter Property="Background" Value="{DynamicResource BackgroundTextBlockIsEnableTText}"/>-->
                         <Setter Property="Background" Value="{Binding GeneralBackground,
                                                                       RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtTextBox}},
                                                                       Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
+                        <!--<Setter Property="Foreground" Value="{DynamicResource ForegroundTextBlockIsEnableTText}"/>-->
                         <Setter Property="Foreground" Value="{Binding ForegroundTxBlEnable,
                                                                       RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtTextBox}},
                                                                       Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
@@ -76,6 +95,8 @@
          </TextBlock>
       </Border>
 
+      <!--Background="{DynamicResource BackgroundTextBoxText}"-->
+      <!--Foreground="{DynamicResource ForegroundTextBoxText}"-->
       <TextBox Name="TxBx"
                Visibility="Hidden"
                Padding="1,1,1,0"
diff --git a/EgtTextBox.xaml.vb b/EgtTextBox.xaml.vb
index 99048d1..eb8af84 100644
--- a/EgtTextBox.xaml.vb
+++ b/EgtTextBox.xaml.vb
@@ -658,6 +658,12 @@ Public Class EgtTextBox
       EnterKeyPress = 2
    End Enum
 
+   'Shared Sub New()
+   '    'This OverrideMetadata call tells the system that this element wants to provide a style that is different than its base class.
+   '    'This style is defined in themes\generic.xaml
+   '    DefaultStyleKeyProperty.OverrideMetadata(GetType(EgtTextBox), New FrameworkPropertyMetadata(GetType(EgtTextBox)))
+   'End Sub
+
    Private Shared Sub OnIsFocusedPropertyChanged(d As DependencyObject, e As DependencyPropertyChangedEventArgs)
       If CBool(e.NewValue) Then
          Dim CurrEgtTextBox As EgtTextBox = TryCast(d, EgtTextBox)
diff --git a/EgtTextBox2.vb b/EgtTextBox2.vb
index 0341933..c0c6f31 100644
--- a/EgtTextBox2.vb
+++ b/EgtTextBox2.vb
@@ -27,6 +27,13 @@
 '     <MyNamespace:EgtTextBox2/>
 '
 
+Imports System.Globalization
+Imports System.Runtime
+Imports System.Text
+Imports System.Windows.Markup
+Imports System.Windows.Threading
+Imports System.Xml
+
 <TemplatePart(Name:="PART_TextBox", Type:=GetType(TextBox))>
 Public Class EgtTextBox2
    Inherits System.Windows.Controls.Control
@@ -310,6 +317,16 @@ Public Class EgtTextBox2
       'This OverrideMetadata call tells the system that this element wants to provide a style that is different than its base class.
       'This style is defined in themes\generic.xaml
       DefaultStyleKeyProperty.OverrideMetadata(GetType(EgtTextBox2), New FrameworkPropertyMetadata(GetType(EgtTextBox2)))
+
+      ' il codice seguent permette di vedere lo stile xaml di un controllo base (tipo TextBox) e salvarlo in un file
+      'Dim Style As Style = Application.Current.TryFindResource(GetType(TextBox))
+      'If IsNothing(Style) Then Return
+      'Dim settings As XmlWriterSettings = New XmlWriterSettings()
+      'settings.Indent = True
+      'Dim sb As StringBuilder = New StringBuilder()
+      'Dim writer As XmlWriter = XmlWriter.Create(sb, settings)
+      'XamlWriter.Save(Style, writer)
+      'IO.File.WriteAllText("c:\Temp\TextBox.txt", sb.ToString())
    End Sub
 
    Sub New()
diff --git a/EgtWPFLib5.vbproj b/EgtWPFLib5.vbproj
index b2a8de1..ace787c 100644
--- a/EgtWPFLib5.vbproj
+++ b/EgtWPFLib5.vbproj
@@ -92,17 +92,7 @@
     <Compile Include="CheckParamV.xaml.vb">
       <DependentUpon>CheckParamV.xaml</DependentUpon>
     </Compile>
-    <Compile Include="EgtColorPicker\EgtColorPickerVM.vb" />
-    <Compile Include="EgtColorPicker\EgtHexagon.vb" />
     <Compile Include="EgtMainWindow.vb" />
-    <Compile Include="EgtManageFileDialog\EgtManageFileDialogV.xaml.vb">
-      <DependentUpon>EgtManageFileDialogV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="EgtManageFileDialog\EgtManageFileDialogVM.vb" />
-    <Compile Include="EgtMessageBox\EgtMessageBoxV.xaml.vb">
-      <DependentUpon>EgtMessageBoxV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="EgtMessageBox\EgtMessageBoxVM.vb" />
     <Compile Include="EgtTextBox.xaml.vb">
       <DependentUpon>EgtTextBox.xaml</DependentUpon>
     </Compile>
@@ -280,6 +270,7 @@
     <Compile Include="Utility\MachineModel.vb" />
     <Compile Include="Utility\MsgConversion.vb" />
     <Compile Include="Utility\TableUtility.vb" />
+    <Compile Include="Utility\TMDbParamVisibility.vb" />
     <Compile Include="Utility\Utility.vb" />
     <Compile Include="EgtPanelWindow.vb" />
     <Compile Include="EgtScrollViewer.vb" />
@@ -348,14 +339,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="EgtManageFileDialog\EgtManageFileDialogV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="EgtMessageBox\EgtMessageBoxV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>XamlIntelliSenseFileGenerator</Generator>
-    </Page>
     <Page Include="EgtTextBox.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -577,39 +560,6 @@
     <Resource Include="Resources\Rotazione\CCW.png" />
     <Resource Include="Resources\Rotazione\CW.png" />
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\EgtMessageBox\Information.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\EgtMessageBox\Question.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\EgtMessageBox\Error.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\EgtMessageBox\Warning.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\EgtDialog\Folder.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\EgtDialog\New.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\EgtDialog\Restore.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\EgtDialog\Root.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\EgtMessageBox\Asterisk.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\EgtMessageBox\Exclamation.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\EgtMessageBox\Hand.png" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Dll32\EgtWPFLib5.dll
diff --git a/EgtWPFLib5Resources.xaml b/EgtWPFLib5Resources.xaml
index a07ef70..4dc8738 100644
--- a/EgtWPFLib5Resources.xaml
+++ b/EgtWPFLib5Resources.xaml
@@ -300,6 +300,16 @@
                   </Grid.RowDefinitions>
                   <Border BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="4" Grid.Column="0" CornerRadius="4" Grid.Row="1" Grid.RowSpan="3"/>
                   <Border BorderBrush="White" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="4" CornerRadius="4" Grid.Row="1" Grid.RowSpan="3">
+                     <!--<Border.OpacityMask>
+                                    <MultiBinding ConverterParameter="7" UpdateSourceTrigger="Default">
+                                        <MultiBinding.Converter>
+                                            <BorderGapMaskConverter/>
+                                        </MultiBinding.Converter>
+                                        <Binding ElementName="Header" Path="ActualWidth"/>
+                                        <Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}"/>
+                                        <Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}"/>
+                                    </MultiBinding>
+                                </Border.OpacityMask>-->
                      <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="3">
                         <Border BorderBrush="White" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2"/>
                      </Border>
@@ -380,6 +390,16 @@
                   </Grid.RowDefinitions>
                   <Border BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="4" Grid.Column="0" CornerRadius="4" Grid.Row="1" Grid.RowSpan="3"/>
                   <Border BorderBrush="White" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="4" CornerRadius="4" Grid.Row="1" Grid.RowSpan="3">
+                     <!--<Border.OpacityMask>
+                                    <MultiBinding ConverterParameter="7" UpdateSourceTrigger="Default">
+                                        <MultiBinding.Converter>
+                                            <BorderGapMaskConverter/>
+                                        </MultiBinding.Converter>
+                                        <Binding ElementName="Header" Path="ActualWidth"/>
+                                        <Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}"/>
+                                        <Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}"/>
+                                    </MultiBinding>
+                                </Border.OpacityMask>-->
                      <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="3">
                         <Border BorderBrush="White" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2"/>
                      </Border>
@@ -417,13 +437,4 @@
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!-- EgtMessageBox -->
-
-   <Style x:Key="DialogWindow_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="FontSize" Value="12"/>
-   </Style>
-
-
 </ResourceDictionary>
diff --git a/EstimationsDetailsWnd/EstimationsDetailsWndV.xaml.vb b/EstimationsDetailsWnd/EstimationsDetailsWndV.xaml.vb
index 49a7a14..9ea2c71 100644
--- a/EstimationsDetailsWnd/EstimationsDetailsWndV.xaml.vb
+++ b/EstimationsDetailsWnd/EstimationsDetailsWndV.xaml.vb
@@ -1,4 +1,6 @@
-Public Class EstimationsDetailsWndV
+Imports EgtWPFLib5
+
+Public Class EstimationsDetailsWndV
 
    Private m_EstimationsDetailsWndVM As EstimationsDetailsWndVM
 
diff --git a/EstimationsDetailsWnd/EstimationsDetailsWndVM.vb b/EstimationsDetailsWnd/EstimationsDetailsWndVM.vb
index 09f27f4..49f0fb2 100644
--- a/EstimationsDetailsWnd/EstimationsDetailsWndVM.vb
+++ b/EstimationsDetailsWnd/EstimationsDetailsWndVM.vb
@@ -23,12 +23,15 @@ Public Class EstimationsDetailsWndVM
 
    Public ReadOnly Property TitleMsg As String
       Get
-         Return EgtMsg(31616)       ' Estimation details
+         Return EgtMsg(MSG_SIMULATION + 16)       ' Estimation details
       End Get
    End Property
 
 #End Region    ' Messages
 
+   ' Definizione comandi
+   Private m_cmdOk As ICommand
+   Private m_cmdCancel As ICommand
 
 #End Region    'FIELDS & PROPERTIES
 
@@ -41,4 +44,8 @@ Public Class EstimationsDetailsWndVM
 
 #End Region    ' CONSTRUCTOR
 
+#Region "METHODS"
+
+#End Region    ' METHODS
+
 End Class
diff --git a/InstrumentPanel/InstrumentPanelVM.vb b/InstrumentPanel/InstrumentPanelVM.vb
index 44f08e5..5bd1ff6 100644
--- a/InstrumentPanel/InstrumentPanelVM.vb
+++ b/InstrumentPanel/InstrumentPanelVM.vb
@@ -19,8 +19,8 @@ Public Class InstrumentPanelVM
             Else
                LibMap.refSceneHostVM.MainScene.ResetStatusAnalyze()
             End If
-            NotifyPropertyChanged(NameOf(GetDistIsChecked))
-            NotifyPropertyChanged(NameOf(AnalyzeIsChecked))
+            NotifyPropertyChanged("GetDistIsChecked")
+            NotifyPropertyChanged("AnalyzeIsChecked")
          End If
       End Set
    End Property
@@ -33,7 +33,7 @@ Public Class InstrumentPanelVM
       Set(value As Boolean)
          If value <> m_AnalyzeIsEnabled Then
             m_AnalyzeIsEnabled = value
-            NotifyPropertyChanged(NameOf(AnalyzeIsEnabled))
+            NotifyPropertyChanged("AnalyzeIsEnabled")
          End If
       End Set
    End Property
@@ -55,8 +55,8 @@ Public Class InstrumentPanelVM
                LibMap.refStatusBarVM.ClearOutputMessage()
                OnPostGetDistIsChecked()
             End If
-            NotifyPropertyChanged(NameOf(GetDistIsChecked))
-            NotifyPropertyChanged(NameOf(AnalyzeIsChecked))
+            NotifyPropertyChanged("GetDistIsChecked")
+            NotifyPropertyChanged("AnalyzeIsChecked")
          End If
       End Set
    End Property
@@ -71,12 +71,12 @@ Public Class InstrumentPanelVM
 
    Public ReadOnly Property AnalyzeToolTip As String
       Get
-         Return EgtMsg(5267)     ' Analizza
+         Return EgtMsg(MSG_GRIDVIEWPANEL + 17)
       End Get
    End Property
    Public ReadOnly Property GetDistToolTip As String
       Get
-         Return EgtMsg(5268)     ' Distanza
+         Return EgtMsg(MSG_GRIDVIEWPANEL + 18)
       End Get
    End Property
 
diff --git a/MachGroupPanel/MachGroupPanelVM.vb b/MachGroupPanel/MachGroupPanelVM.vb
index 69debd5..47c7894 100644
--- a/MachGroupPanel/MachGroupPanelVM.vb
+++ b/MachGroupPanel/MachGroupPanelVM.vb
@@ -1,5 +1,7 @@
 Imports System.Collections.ObjectModel
+Imports System.IO
 Imports EgtUILib
+Imports EgtWPFLib5
 
 Public Class MachGroupPanelVM
    Inherits VMBase
@@ -50,7 +52,7 @@ Public Class MachGroupPanelVM
             End If
             OnPostSetCurrMachGroup()
          End If
-         NotifyPropertyChanged(NameOf(SelectedMachGroup))
+         NotifyPropertyChanged("SelectedMachGroup")
       End Set
    End Property
 
@@ -67,7 +69,7 @@ Public Class MachGroupPanelVM
       Else
          m_MachGroupPanel_Visibility = Visibility.Collapsed
       End If
-      NotifyPropertyChanged(NameOf(MachGroupPanel_Visibility))
+      NotifyPropertyChanged("MachGroupPanel_Visibility")
    End Sub
 
 
@@ -79,7 +81,7 @@ Public Class MachGroupPanelVM
       End Get
       Set(value As Boolean)
          m_IsEnabledAddRemove = value
-         NotifyPropertyChanged(NameOf(IsEnabledAddRemove))
+         NotifyPropertyChanged("IsEnabledAddRemove")
       End Set
    End Property
    ' Variabile che definisce lo stato (attivi/disattivi) di tutti i gruppi tranne quello selezionato
@@ -262,7 +264,7 @@ Public Class MachGroupPanelVM
             End If
          Next
          m_IsEnabledAddRemove = True
-         NotifyPropertyChanged(NameOf(IsEnabledAddRemove))
+         NotifyPropertyChanged("IsEnabledAddRemove")
          m_IsEnabledMachGroups = True
          Return True
       Else
@@ -274,7 +276,7 @@ Public Class MachGroupPanelVM
             End If
          Next
          m_IsEnabledAddRemove = False
-         NotifyPropertyChanged(NameOf(IsEnabledAddRemove))
+         NotifyPropertyChanged("IsEnabledAddRemove")
          m_IsEnabledMachGroups = False
          Return True
       End If
@@ -359,8 +361,7 @@ Public Class MachGroupPanelVM
          ' non c'è alcunchè da cancellare
       ElseIf MachGroupList.Count = 1 Then
          'chiedo conferma prima di resettare il gruppo di lavorazione
-         'Select Case MessageBox.Show("Eliminare?", "", MessageBoxButton.YesNo, MessageBoxImage.Question)
-         Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, "Eliminare?", "", MessageBoxButton.YesNo, MessageBoxImage.Question)
+         Select Case MessageBox.Show("Eliminare?", "", MessageBoxButton.YesNo, MessageBoxImage.Question)
             Case MessageBoxResult.Yes
                ' cancello il gruppo corrente e ne creo uno nuovo con lo stesso nome
                OnPreRemoveCurrMachGroup()
@@ -373,8 +374,7 @@ Public Class MachGroupPanelVM
          End Select
       Else
          'chiedo conferma prima di cancellare il gruppo di lavorazione
-         'Select Case MessageBox.Show("Eliminare?", "", MessageBoxButton.YesNo, MessageBoxImage.Question)
-         Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, "Eliminare?", "", MessageBoxButton.YesNo, MessageBoxImage.Question)
+         Select Case MessageBox.Show("Eliminare?", "", MessageBoxButton.YesNo, MessageBoxImage.Question)
             Case MessageBoxResult.Yes
                ' cancello quello selezionato (ovvero il corrente)
                OnPreRemoveCurrMachGroup()
diff --git a/MachGroupPanel/NewMachGroupWnd/NewMachGroupWndV.xaml b/MachGroupPanel/NewMachGroupWnd/NewMachGroupWndV.xaml
index e234008..8fa938e 100644
--- a/MachGroupPanel/NewMachGroupWnd/NewMachGroupWndV.xaml
+++ b/MachGroupPanel/NewMachGroupWnd/NewMachGroupWndV.xaml
@@ -31,7 +31,8 @@
          </Grid.ColumnDefinitions>
          <TextBlock Text="{Binding MachineMsg}"
                     Grid.Row="1"
-                    Margin="0,0,5,0"/>
+                    Margin="0,0,5,0"
+                    Style="{StaticResource OptionTextBlock}"/>
          <ComboBox Text="{Binding Machine}"
                    ItemsSource="{Binding MachineList}"
                    DisplayMemberPath="Name"
diff --git a/MachGroupPanel/NewMachGroupWnd/NewMachGroupWndVM.vb b/MachGroupPanel/NewMachGroupWnd/NewMachGroupWndVM.vb
index a6ea8c1..d332cf1 100644
--- a/MachGroupPanel/NewMachGroupWnd/NewMachGroupWndVM.vb
+++ b/MachGroupPanel/NewMachGroupWnd/NewMachGroupWndVM.vb
@@ -1,4 +1,5 @@
 Imports EgtUILib
+Imports EgtWPFLib5
 
 Public Class NewMachGroupWndVM
    Inherits VMBase
@@ -45,7 +46,7 @@ Public Class NewMachGroupWndVM
       Set(value As Machine)
          If value IsNot m_SelectedMachine Then
             m_SelectedMachine = value
-            NotifyPropertyChanged(NameOf(SelectedMachine))
+            NotifyPropertyChanged("SelectedMachine")
          End If
       End Set
    End Property
@@ -74,17 +75,17 @@ Public Class NewMachGroupWndVM
 
    Public ReadOnly Property TitleMsg As String
       Get
-         Return EgtMsg(30901)    ' Nuovo gruppo di lavorazione
+         Return EgtMsg(MSG_MACHGROUPPANEL + 1)
       End Get
    End Property
    Public ReadOnly Property NameMsg As String
       Get
-         Return EgtMsg(30902)    ' Nome:
+         Return EgtMsg(MSG_MACHGROUPPANEL + 2)
       End Get
    End Property
    Public ReadOnly Property MachineMsg As String
       Get
-         Return EgtMsg(30903)    ' Macchina:
+         Return EgtMsg(MSG_MACHGROUPPANEL + 3)
       End Get
    End Property
 
diff --git a/MachinePanel/MachinePanelVM.vb b/MachinePanel/MachinePanelVM.vb
index 1420b22..cc36ab5 100644
--- a/MachinePanel/MachinePanelVM.vb
+++ b/MachinePanel/MachinePanelVM.vb
@@ -1,4 +1,5 @@
 Imports System.Collections.ObjectModel
+Imports System.IO
 Imports EgtUILib
 
 Public Class MachinePanelVM
@@ -28,7 +29,7 @@ Public Class MachinePanelVM
             'EgtSetCurrentContext(IniFile.m_ProjectSceneContext)
             If EgtSetCurrMachine(value.Name) Then
                m_SelectedMachine = value
-               NotifyPropertyChanged(NameOf(SelectedMachine))
+               NotifyPropertyChanged("SelectedMachine")
             End If
          End If
       End Set
@@ -41,7 +42,7 @@ Public Class MachinePanelVM
       End Get
       Set(value As Brush)
          m_SetUp_Background = value
-         NotifyPropertyChanged(NameOf(SetUp_Background))
+         NotifyPropertyChanged("SetUp_Background")
       End Set
    End Property
 
@@ -62,6 +63,10 @@ Public Class MachinePanelVM
 
 #End Region    ' CONSTRUCTOR
 
+#Region "METHODS"
+
+#End Region
+
 #Region "COMMANDS"
 
 #Region "ToolDbCommand"
diff --git a/MachiningDbWindow/BeamMillingParamPageV.xaml b/MachiningDbWindow/BeamMillingParamPageV.xaml
index 3cdd7a5..8248f55 100644
--- a/MachiningDbWindow/BeamMillingParamPageV.xaml
+++ b/MachiningDbWindow/BeamMillingParamPageV.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="BeamMillingParamPageV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
 
    <UserControl.Resources>
@@ -18,7 +19,80 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
          <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+         <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Invert">0</sys:Int32>
+         <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+         <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+         <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+         <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+         <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+         <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+         <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+         <sys:Int32 x:Key="StepType">8</sys:Int32>
+         <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+         <sys:Int32 x:Key="Speed">10</sys:Int32>
+         <sys:Int32 x:Key="Feed">11</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+         <sys:Int32 x:Key="OffSr">15</sys:Int32>
+         <sys:Int32 x:Key="OffSl">16</sys:Int32>
+         <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+         <sys:Int32 x:Key="Approx">18</sys:Int32>
+         <sys:Int32 x:Key="StartPos">19</sys:Int32>
+         <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+         <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+         <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+         <sys:Int32 x:Key="StepPar">23</sys:Int32>
+         <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+         <sys:Int32 x:Key="TabLen">25</sys:Int32>
+         <sys:Int32 x:Key="TabDist">26</sys:Int32>
+         <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+         <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+         <sys:Int32 x:Key="LiTang">29</sys:Int32>
+         <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+         <sys:Int32 x:Key="LiElev">31</sys:Int32>
+         <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+         <sys:Int32 x:Key="LoTang">33</sys:Int32>
+         <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+         <sys:Int32 x:Key="LoElev">35</sys:Int32>
+         <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+         <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+         <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+         <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+         <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+         <sys:Int32 x:Key="SideStep">41</sys:Int32>
+         <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+         <sys:Int32 x:Key="NamePar">43</sys:Int32>
+         <sys:Int32 x:Key="Tool">44</sys:Int32>
+         <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+         <sys:Int32 x:Key="OverLap">47</sys:Int32>
+         <sys:Int32 x:Key="SubType">49</sys:Int32>
+         <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
+         <sys:Int32 x:Key="InitAngs">51</sys:Int32>
+         <sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
+         <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+         <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+         <sys:Int32 x:Key="StepBack">55</sys:Int32>
+         <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
+         <sys:Int32 x:Key="BackFeed">57</sys:Int32>
+         <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
+         <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
+         <sys:Int32 x:Key="Probing">60</sys:Int32>
+         <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
+         <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
+         <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
+         <sys:Int32 x:Key="IntCornType">64</sys:Int32>
+         <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
+         <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
+         <sys:Int32 x:Key="LiHole">67</sys:Int32>
+         <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
+         <sys:Int32 x:Key="LpTurns">69</sys:Int32>
+         <sys:Int32 x:Key="HpTurns">70</sys:Int32>
+         <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
@@ -428,7 +502,10 @@
                   <RowDefinition Height="1*"/>
                </Grid.RowDefinitions>
 
-               <TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"/>
+               <TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
+                          Visibility="{Binding Path=Type, 
+                                               Converter={StaticResource MachiningParamVisibilityConverter},
+                                               ConverterParameter={StaticResource Tool}}"/>
                <ComboBox Grid.Row="0" 
                          Grid.Column="1" 
                          ItemsSource="{Binding Path=ToolList,
@@ -436,6 +513,9 @@
                          Style="{DynamicResource MachiningsToolComboBox}"
                          SelectedIndex="{Binding Path=SelectedTool}"
                          IsSynchronizedWithCurrentItem="True"
+                         Visibility="{Binding Path=Type, 
+                                              Converter={StaticResource MachiningParamVisibilityConverter},
+                                              ConverterParameter={StaticResource Tool}}"
                          Margin="0,3,3,3"/>
 
                <UniformGrid Columns="1" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2">
diff --git a/MachiningDbWindow/ChiselingParamPageV.xaml b/MachiningDbWindow/ChiselingParamPageV.xaml
index dcb1f4b..0716826 100644
--- a/MachiningDbWindow/ChiselingParamPageV.xaml
+++ b/MachiningDbWindow/ChiselingParamPageV.xaml
@@ -19,7 +19,80 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
          <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+         <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Invert">0</sys:Int32>
+         <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+         <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+         <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+         <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+         <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+         <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+         <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+         <sys:Int32 x:Key="StepType">8</sys:Int32>
+         <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+         <sys:Int32 x:Key="Speed">10</sys:Int32>
+         <sys:Int32 x:Key="Feed">11</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+         <sys:Int32 x:Key="OffSr">15</sys:Int32>
+         <sys:Int32 x:Key="OffSl">16</sys:Int32>
+         <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+         <sys:Int32 x:Key="Approx">18</sys:Int32>
+         <sys:Int32 x:Key="StartPos">19</sys:Int32>
+         <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+         <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+         <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+         <sys:Int32 x:Key="StepPar">23</sys:Int32>
+         <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+         <sys:Int32 x:Key="TabLen">25</sys:Int32>
+         <sys:Int32 x:Key="TabDist">26</sys:Int32>
+         <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+         <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+         <sys:Int32 x:Key="LiTang">29</sys:Int32>
+         <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+         <sys:Int32 x:Key="LiElev">31</sys:Int32>
+         <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+         <sys:Int32 x:Key="LoTang">33</sys:Int32>
+         <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+         <sys:Int32 x:Key="LoElev">35</sys:Int32>
+         <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+         <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+         <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+         <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+         <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+         <sys:Int32 x:Key="SideStep">41</sys:Int32>
+         <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+         <sys:Int32 x:Key="NamePar">43</sys:Int32>
+         <sys:Int32 x:Key="Tool">44</sys:Int32>
+         <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+         <sys:Int32 x:Key="OverLap">47</sys:Int32>
+         <sys:Int32 x:Key="SubType">49</sys:Int32>
+         <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
+         <sys:Int32 x:Key="InitAngs">51</sys:Int32>
+         <sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
+         <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+         <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+         <sys:Int32 x:Key="StepBack">55</sys:Int32>
+         <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
+         <sys:Int32 x:Key="BackFeed">57</sys:Int32>
+         <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
+         <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
+         <sys:Int32 x:Key="Probing">60</sys:Int32>
+         <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
+         <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
+         <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
+         <sys:Int32 x:Key="IntCornType">64</sys:Int32>
+         <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
+         <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
+         <sys:Int32 x:Key="LiHole">67</sys:Int32>
+         <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
+         <sys:Int32 x:Key="LpTurns">69</sys:Int32>
+         <sys:Int32 x:Key="HpTurns">70</sys:Int32>
+         <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
@@ -285,7 +358,10 @@
                   <RowDefinition Height="1*"/>
                </Grid.RowDefinitions>
 
-               <TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"/>
+               <TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
+                          Visibility="{Binding Path=Type, 
+                                               Converter={StaticResource MachiningParamVisibilityConverter},
+                                               ConverterParameter={StaticResource Tool}}"/>
                <ComboBox Grid.Row="0" 
                          Grid.Column="1" 
                          ItemsSource="{Binding Path=ToolList,
@@ -293,6 +369,9 @@
                          Style="{DynamicResource MachiningsToolComboBox}"
                          SelectedIndex="{Binding Path=SelectedTool}"
                          IsSynchronizedWithCurrentItem="True"
+                         Visibility="{Binding Path=Type, 
+                                              Converter={StaticResource MachiningParamVisibilityConverter},
+                                              ConverterParameter={StaticResource Tool}}"
                          Margin="0,3,3,3"/>
 
                <Grid Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2">
diff --git a/MachiningDbWindow/FiveAxisMachinigParamPageV.xaml b/MachiningDbWindow/FiveAxisMachinigParamPageV.xaml
index d93ab39..33797cb 100644
--- a/MachiningDbWindow/FiveAxisMachinigParamPageV.xaml
+++ b/MachiningDbWindow/FiveAxisMachinigParamPageV.xaml
@@ -19,7 +19,80 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
          <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+         <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Invert">0</sys:Int32>
+         <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+         <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+         <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+         <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+         <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+         <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+         <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+         <sys:Int32 x:Key="StepType">8</sys:Int32>
+         <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+         <sys:Int32 x:Key="Speed">10</sys:Int32>
+         <sys:Int32 x:Key="Feed">11</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+         <sys:Int32 x:Key="OffSr">15</sys:Int32>
+         <sys:Int32 x:Key="OffSl">16</sys:Int32>
+         <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+         <sys:Int32 x:Key="Approx">18</sys:Int32>
+         <sys:Int32 x:Key="StartPos">19</sys:Int32>
+         <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+         <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+         <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+         <sys:Int32 x:Key="StepPar">23</sys:Int32>
+         <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+         <sys:Int32 x:Key="TabLen">25</sys:Int32>
+         <sys:Int32 x:Key="TabDist">26</sys:Int32>
+         <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+         <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+         <sys:Int32 x:Key="LiTang">29</sys:Int32>
+         <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+         <sys:Int32 x:Key="LiElev">31</sys:Int32>
+         <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+         <sys:Int32 x:Key="LoTang">33</sys:Int32>
+         <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+         <sys:Int32 x:Key="LoElev">35</sys:Int32>
+         <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+         <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+         <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+         <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+         <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+         <sys:Int32 x:Key="SideStep">41</sys:Int32>
+         <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+         <sys:Int32 x:Key="NamePar">43</sys:Int32>
+         <sys:Int32 x:Key="Tool">44</sys:Int32>
+         <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+         <sys:Int32 x:Key="OverLap">47</sys:Int32>
+         <sys:Int32 x:Key="SubType">49</sys:Int32>
+         <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
+         <sys:Int32 x:Key="InitAngs">51</sys:Int32>
+         <sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
+         <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+         <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+         <sys:Int32 x:Key="StepBack">55</sys:Int32>
+         <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
+         <sys:Int32 x:Key="BackFeed">57</sys:Int32>
+         <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
+         <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
+         <sys:Int32 x:Key="Probing">60</sys:Int32>
+         <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
+         <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
+         <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
+         <sys:Int32 x:Key="IntCornType">64</sys:Int32>
+         <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
+         <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
+         <sys:Int32 x:Key="LiHole">67</sys:Int32>
+         <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
+         <sys:Int32 x:Key="LpTurns">69</sys:Int32>
+         <sys:Int32 x:Key="HpTurns">70</sys:Int32>
+         <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
@@ -262,7 +335,10 @@
                   <RowDefinition Height="1*"/>
                </Grid.RowDefinitions>
 
-               <TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"/>
+               <TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
+                          Visibility="{Binding Path=Type, 
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource Tool}}"/>
                <ComboBox Grid.Row="0" 
                          Grid.Column="1" 
                          ItemsSource="{Binding Path=ToolList,
@@ -270,6 +346,9 @@
                          Style="{DynamicResource MachiningsToolComboBox}"
                          SelectedIndex="{Binding Path=SelectedTool}"
                          IsSynchronizedWithCurrentItem="True"
+                         Visibility="{Binding Path=Type, 
+                                              Converter={StaticResource MachiningParamVisibilityConverter},
+                                              ConverterParameter={StaticResource Tool}}"
                          Margin="0,3,3,3"/>
 
                <UniformGrid Columns="1" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2">
diff --git a/MachiningDbWindow/GenMachiningParamPageV.xaml b/MachiningDbWindow/GenMachiningParamPageV.xaml
index 273bfe4..950594f 100644
--- a/MachiningDbWindow/GenMachiningParamPageV.xaml
+++ b/MachiningDbWindow/GenMachiningParamPageV.xaml
@@ -19,7 +19,80 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
          <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+         <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Invert">0</sys:Int32>
+         <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+         <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+         <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+         <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+         <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+         <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+         <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+         <sys:Int32 x:Key="StepType">8</sys:Int32>
+         <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+         <sys:Int32 x:Key="Speed">10</sys:Int32>
+         <sys:Int32 x:Key="Feed">11</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+         <sys:Int32 x:Key="OffSr">15</sys:Int32>
+         <sys:Int32 x:Key="OffSl">16</sys:Int32>
+         <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+         <sys:Int32 x:Key="Approx">18</sys:Int32>
+         <sys:Int32 x:Key="StartPos">19</sys:Int32>
+         <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+         <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+         <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+         <sys:Int32 x:Key="StepPar">23</sys:Int32>
+         <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+         <sys:Int32 x:Key="TabLen">25</sys:Int32>
+         <sys:Int32 x:Key="TabDist">26</sys:Int32>
+         <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+         <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+         <sys:Int32 x:Key="LiTang">29</sys:Int32>
+         <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+         <sys:Int32 x:Key="LiElev">31</sys:Int32>
+         <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+         <sys:Int32 x:Key="LoTang">33</sys:Int32>
+         <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+         <sys:Int32 x:Key="LoElev">35</sys:Int32>
+         <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+         <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+         <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+         <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+         <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+         <sys:Int32 x:Key="SideStep">41</sys:Int32>
+         <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+         <sys:Int32 x:Key="NamePar">43</sys:Int32>
+         <sys:Int32 x:Key="Tool">44</sys:Int32>
+         <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+         <sys:Int32 x:Key="OverLap">47</sys:Int32>
+         <sys:Int32 x:Key="SubType">49</sys:Int32>
+         <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
+         <sys:Int32 x:Key="InitAngs">51</sys:Int32>
+         <sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
+         <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+         <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+         <sys:Int32 x:Key="StepBack">55</sys:Int32>
+         <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
+         <sys:Int32 x:Key="BackFeed">57</sys:Int32>
+         <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
+         <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
+         <sys:Int32 x:Key="Probing">60</sys:Int32>
+         <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
+         <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
+         <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
+         <sys:Int32 x:Key="IntCornType">64</sys:Int32>
+         <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
+         <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
+         <sys:Int32 x:Key="LiHole">67</sys:Int32>
+         <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
+         <sys:Int32 x:Key="LpTurns">69</sys:Int32>
+         <sys:Int32 x:Key="HpTurns">70</sys:Int32>
+         <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
@@ -263,7 +336,10 @@
                   <RowDefinition Height="1*"/>
                </Grid.RowDefinitions>
 
-               <TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"/>
+               <TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
+                          Visibility="{Binding Path=Type, 
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource Tool}}"/>
                <ComboBox Grid.Row="0" 
                          Grid.Column="1" 
                          ItemsSource="{Binding Path=ToolList,
@@ -271,6 +347,9 @@
                          Style="{DynamicResource MachiningsToolComboBox}"
                          SelectedIndex="{Binding Path=SelectedTool}"
                          IsSynchronizedWithCurrentItem="True"
+                         Visibility="{Binding Path=Type, 
+                                              Converter={StaticResource MachiningParamVisibilityConverter},
+                                              ConverterParameter={StaticResource Tool}}"
                          Margin="0,3,3,3"/>
 
                <UniformGrid Columns="1" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2">
diff --git a/MachiningDbWindow/ImportExportMachiningWindowVM.vb b/MachiningDbWindow/ImportExportMachiningWindowVM.vb
index 9ad364e..61e6ef3 100644
--- a/MachiningDbWindow/ImportExportMachiningWindowVM.vb
+++ b/MachiningDbWindow/ImportExportMachiningWindowVM.vb
@@ -69,9 +69,9 @@ Public Class ImportExportMachiningWindowVM
    Public ReadOnly Property OkMsg As String
       Get
          If WindowMode = WindowModeEnum.IMPORT Then
-            Return EgtMsg(31450)    ' Importa
+            Return EgtMsg(31450)
          Else
-            Return EgtMsg(31451)    ' Esporta
+            Return EgtMsg(31451)
          End If
       End Get
    End Property
@@ -120,8 +120,8 @@ Public Class ImportExportMachiningWindowVM
             EgtMdbImport(ImportFilePath, vsImportMachiningName, vsFinalName, m_vsImported)
             ' Report
             Dim ImportedMachiningList As New List(Of String)(vsImported)
-            'MessageBox.Show(EgtMsg(31455) & " " & vbCrLf & String.Join(vbCrLf, ImportedMachiningList.ToArray()), "", MessageBoxButton.OK)
-            EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31455) & " " & vbCrLf & String.Join(vbCrLf, ImportedMachiningList.ToArray()), "", MessageBoxButton.OK) ' Le seguenti Lavorazioni sono state importate correttamente:
+            MessageBox.Show(EgtMsg(31455) & " " & vbCrLf &
+                         String.Join(vbCrLf, ImportedMachiningList.ToArray()), "", MessageBoxButton.OK)
 
          Case WindowModeEnum.EXPORT
             ' recupero le lavorazioni checkate
@@ -141,11 +141,6 @@ Public Class ImportExportMachiningWindowVM
                .Filter = "File data (*.data)|*.data|Tutti i file (*.*)|*.*",
                .FileName = String.Empty
             }
-            'Dim SaveFileDlg As New EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
-            '   .Title = EgtMsg(31451) & " " & EgtMsg(31452),      ' Esporta lavorazioni
-            '   .Filter = "File data (*.data)|*.data|Tutti i file (*.*)|*.*",
-            '   .FileName = String.Empty
-            '}
             If SaveFileDlg.ShowDialog() <> System.Windows.Forms.DialogResult.OK Then Return
             Dim sFilePath As String = String.Empty
             sFilePath = SaveFileDlg.FileName
@@ -181,9 +176,9 @@ Public Class ImportExportMachiningWindowVM
 
 #Region "METHODS"
 
-   Private Sub EnableOkBtn()
+   Private sub EnableOkBtn()
       NotifyPropertyChanged(NameOf(IsEnabledOkBtn))
-   End Sub
+   End sub
 
 #End Region     ' Methods
 
@@ -274,20 +269,18 @@ Public Class ImpExpMachiningItem
          ' se esiste gia' chiedo se sovrascriverla
          If value Then
             If m_AlreadyExist Then
-               'Select Case System.Windows.MessageBox.Show(EgtMsg(31453), "", MessageBoxButton.YesNoCancel)
-               Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31453), "", MessageBoxButton.YesNoCancel)  ' La lavorazione esiste già, sovrascriverla?
+               Select Case System.Windows.MessageBox.Show(EgtMsg(31453), "", MessageBoxButton.YesNoCancel)
                   Case MessageBoxResult.Yes
                      m_ChangeName = False
                      m_Active = True
                   Case MessageBoxResult.No
-                     'System.Windows.MessageBox.Show(EgtMsg(31454), "", MessageBoxButton.OK)
-                     EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31454), "", MessageBoxButton.OK)  ' La lavorazione verrà importata col nome seguito da "_imp"
+                     System.Windows.MessageBox.Show(EgtMsg(31454), "", MessageBoxButton.OK)
                      m_ChangeName = True
                      m_Active = True
                   Case Else
                      m_Active = False
                End Select
-               NotifyPropertyChanged(NameOf(Active))
+               NotifyPropertyChanged("Active")
             Else
                m_Active = True
             End If
@@ -295,7 +288,7 @@ Public Class ImpExpMachiningItem
             m_ChangeName = False
             m_Active = False
          End If
-         If Not IsNothing(m_delEnableOkBtn) Then m_delEnableOkBtn()
+         If Not IsNothing(m_delEnableOkBtn) Then m_delEnableOkBtn
       End Set
    End Property
 
@@ -315,7 +308,7 @@ Public Class ImpExpMachiningItem
       End Get
       Set(value As Boolean)
          m_ChangeName = value
-         NotifyPropertyChanged(NameOf(Name))
+         NotifyPropertyChanged("Name")
       End Set
    End Property
 
diff --git a/MachiningDbWindow/MachiningDbWindowV.xaml b/MachiningDbWindow/MachiningDbWindowV.xaml
index 8796614..03ac300 100644
--- a/MachiningDbWindow/MachiningDbWindowV.xaml
+++ b/MachiningDbWindow/MachiningDbWindowV.xaml
@@ -1,6 +1,7 @@
 <EgtWPFLib5:EgtCustomWindow x:Class="MachiningDbWindowV"
                             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:sys="clr-namespace:System;assembly=mscorlib"
                             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5"
                             Title="{Binding Title}"
                             Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
@@ -17,8 +18,80 @@
    </EgtWPFLib5:EgtCustomWindow.InputBindings>
 
    <EgtWPFLib5:EgtCustomWindow.Resources>
+      <EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
       <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
       <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+      <sys:Int32 x:Key="Invert">0</sys:Int32>
+      <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+      <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+      <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+      <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+      <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+      <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+      <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+      <sys:Int32 x:Key="StepType">8</sys:Int32>
+      <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+      <sys:Int32 x:Key="Speed">10</sys:Int32>
+      <sys:Int32 x:Key="Feed">11</sys:Int32>
+      <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+      <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+      <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+      <sys:Int32 x:Key="OffSr">15</sys:Int32>
+      <sys:Int32 x:Key="OffSl">16</sys:Int32>
+      <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+      <sys:Int32 x:Key="Approx">18</sys:Int32>
+      <sys:Int32 x:Key="StartPos">19</sys:Int32>
+      <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+      <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+      <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+      <sys:Int32 x:Key="StepPar">23</sys:Int32>
+      <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+      <sys:Int32 x:Key="TabLen">25</sys:Int32>
+      <sys:Int32 x:Key="TabDist">26</sys:Int32>
+      <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+      <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+      <sys:Int32 x:Key="LiTang">29</sys:Int32>
+      <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+      <sys:Int32 x:Key="LiElev">31</sys:Int32>
+      <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+      <sys:Int32 x:Key="LoTang">33</sys:Int32>
+      <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+      <sys:Int32 x:Key="LoElev">35</sys:Int32>
+      <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+      <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+      <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+      <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+      <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+      <sys:Int32 x:Key="SideStep">41</sys:Int32>
+      <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+      <sys:Int32 x:Key="NamePar">43</sys:Int32>
+      <sys:Int32 x:Key="Tool">44</sys:Int32>
+      <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+      <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+      <sys:Int32 x:Key="OverLap">47</sys:Int32>
+      <sys:Int32 x:Key="SubType">49</sys:Int32>
+      <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
+      <sys:Int32 x:Key="InitAngs">51</sys:Int32>
+      <sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
+      <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+      <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+      <sys:Int32 x:Key="StepBack">55</sys:Int32>
+      <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
+      <sys:Int32 x:Key="BackFeed">57</sys:Int32>
+      <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
+      <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
+      <sys:Int32 x:Key="Probing">60</sys:Int32>
+      <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
+      <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
+      <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
+      <sys:Int32 x:Key="IntCornType">64</sys:Int32>
+      <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
+      <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
+      <sys:Int32 x:Key="LiHole">67</sys:Int32>
+      <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
+      <sys:Int32 x:Key="LpTurns">69</sys:Int32>
+      <sys:Int32 x:Key="HpTurns">70</sys:Int32>
+      <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
    </EgtWPFLib5:EgtCustomWindow.Resources>
 
    <Grid>
diff --git a/MachiningDbWindow/MachiningDbWindowVM.vb b/MachiningDbWindow/MachiningDbWindowVM.vb
index 7929d17..23b3601 100644
--- a/MachiningDbWindow/MachiningDbWindowVM.vb
+++ b/MachiningDbWindow/MachiningDbWindowVM.vb
@@ -1,4 +1,6 @@
-Imports System.Collections.ObjectModel
+Imports System.Windows.Forms.Integration
+Imports System.Collections.ObjectModel
+Imports System.IO
 Imports EgtUILib
 Imports EgtWPFLib5.MachiningTreeViewItem
 
@@ -444,43 +446,43 @@ Public Class MachiningDbWindowVM
    Private m_Title As String
    Public ReadOnly Property Title As String
       Get
-         Return EgtMsg(5004)     ' Db Lavorazioni
+         Return EgtMsg(MSG_MAINWINDOW + 4)
       End Get
    End Property
 
    Public ReadOnly Property NewMsg As String
       Get
-         Return EgtMsg(31701)    ' Nuovo
+         Return EgtMsg(31701)
       End Get
    End Property
 
    Public ReadOnly Property SaveMsg As String
       Get
-         Return EgtMsg(31702)    ' Salva
+         Return EgtMsg(31702)
       End Get
    End Property
 
    Public ReadOnly Property RemoveMsg As String
       Get
-         Return EgtMsg(31703)    ' Rimuovi
+         Return EgtMsg(31703)
       End Get
    End Property
 
    Public ReadOnly Property ImportMsg As String
       Get
-         Return EgtMsg(31450)    ' Importa
+         Return EgtMsg(31450)
       End Get
    End Property
 
    Public ReadOnly Property ExportMsg As String
       Get
-         Return EgtMsg(31451)    ' Esorta
+         Return EgtMsg(31451)
       End Get
    End Property
 
    Public ReadOnly Property ResetMsg As String
       Get
-         Return EgtMsg(31456)    ' Reset
+         Return EgtMsg(31456)
       End Get
    End Property
 
@@ -1333,8 +1335,7 @@ Public Class MachiningDbWindowVM
             ' Se il materiale spcificato nel file INI della macchina non corrisponde a STONE, WOOD o BEAM (STONE5 è 
             ' comunque STONE nell'INI ma prevede pagine esclusive per EgtCAM5) viene emesso un messaggio di errore 
             MachiningTreeViewItem.m_MatType = Nothing
-            'MsgBox(EgtMsg(31409), MsgBoxStyle.Exclamation, EgtMsg(31551))
-            EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31409), EgtMsg(31551), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) ' ateriale della macchina non riconosciuto Errore
+            MsgBox(EgtMsg(31409), MsgBoxStyle.Exclamation, EgtMsg(31551))
             Exit Sub
       End Select
 
@@ -1354,7 +1355,7 @@ Public Class MachiningDbWindowVM
 
       LibMap.SetRefMachiningDbWindowVM(Me)
 
-      NotifyPropertyChanged(NameOf(ParamPageV))
+      NotifyPropertyChanged("ParamPageV")
    End Sub
 
 #End Region    ' Constructor
@@ -1373,16 +1374,16 @@ Public Class MachiningDbWindowVM
    End Function
 
    Private Sub ccc()
-      NotifyPropertyChanged(NameOf(ParamPageV))
+      NotifyPropertyChanged("ParamPageV")
    End Sub
 
    Private Sub IsEnabledBtns(bIsEnabledNewBtn As Boolean, bIsEnabledSaveBtn As Boolean, bIsEnabledDeleteBtn As Boolean)
       m_IsEnabledNewBtn = bIsEnabledNewBtn
       m_IsEnabledSaveBtn = bIsEnabledSaveBtn
       m_IsEnabledRemoveBtn = bIsEnabledDeleteBtn
-      NotifyPropertyChanged(NameOf(IsEnabledNewBtn))
-      NotifyPropertyChanged(NameOf(IsEnabledSaveBtn))
-      NotifyPropertyChanged(NameOf(IsEnabledRemoveBtn))
+      NotifyPropertyChanged("IsEnabledNewBtn")
+      NotifyPropertyChanged("IsEnabledSaveBtn")
+      NotifyPropertyChanged("IsEnabledRemoveBtn")
    End Sub
 
    ' Quando chiamato, disattiva tutti gli item dell'albero o li riattiva a seconda che ci sia o meno un errore
@@ -1416,7 +1417,7 @@ Public Class MachiningDbWindowVM
       ' Se esiste almeno una famiglia di lavorazioni, la seleziono
       If MachiningsList.Count > 0 Then
          MachiningsList(0).IsSelected = True
-         MachiningsList(0).NotifyPropertyChanged(NameOf(MachiningTreeViewItem.IsSelected))
+         MachiningsList(0).NotifyPropertyChanged("IsSelected")
       End If
    End Sub
 
@@ -1470,14 +1471,13 @@ Public Class MachiningDbWindowVM
       ' Verifico salvataggio
       SelMachining.WriteMachiningParam()
       If EgtMdbIsCurrMachiningModified() Or SelMachining.m_IsModifiedName Or SelMachining.NewMachining Then
-         'Select Case MsgBox(EgtMsg(MSG_MACHININGDBERRORS + 1), MsgBoxStyle.YesNoCancel, EgtMsg(MSG_MACHININGDBERRORS + 2))
-         Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31401), EgtMsg(31402), MessageBoxButton.YesNoCancel)   ' Salvare la lavorazione modificata? SALVA
-            Case MessageBoxResult.Yes
+         Select Case MsgBox(EgtMsg(MSG_MACHININGDBERRORS + 1), MsgBoxStyle.YesNoCancel, EgtMsg(MSG_MACHININGDBERRORS + 2))
+            Case MsgBoxResult.Yes
                SelMachining.NewMachining = False
                SelMachining.m_Name = SelMachining.m_Name.Trim()
                SelMachining.WriteMachiningName()
                EgtMdbSaveCurrMachining()
-            Case MessageBoxResult.No
+            Case MsgBoxResult.No
                If SelMachining.NewMachining Then
                   RemoveMachining(SelMachining)
                ElseIf SelMachining.m_IsModifiedName Then
@@ -1485,7 +1485,7 @@ Public Class MachiningDbWindowVM
                   EgtMdbGetCurrMachiningParam(MCH_MP.NAME, DbName)
                   SelMachining.NamePar = DbName
                End If
-            Case MessageBoxResult.Cancel
+            Case MsgBoxResult.Cancel
                Return False
          End Select
       End If
@@ -1527,7 +1527,7 @@ Public Class MachiningDbWindowVM
             NewMachiningItem.NewMachining = True
             If Not MachiningFamily.IsExpanded Then MachiningFamily.IsExpanded = True
             NewMachiningItem.IsSelected = True
-            NewMachiningItem.NotifyPropertyChanged(NameOf(MachiningTreeViewItem.IsSelected))
+            NewMachiningItem.NotifyPropertyChanged("IsSelected")
             ' Se il Materiale della nuova Lav. è Stone setto Lato Testa e Lato Lavoro a Destra di default
             If NewMachiningItem.MatType = MaterialType.STONE Then
                NewMachiningItem.SelectedHeadSide = IdNameStruct.IndFromId(MCH_SAW_HS.RIGHT, NewMachiningItem.HeadSideList)
@@ -1551,7 +1551,7 @@ Public Class MachiningDbWindowVM
                   ' Reimposto la lavorazione vecchia nel Db per deselezionarla e fare le verifiche correttamente
                   EgtMdbSetCurrMachining(MachiningCopied.Name)
                   MachiningCopied.IsSelected = False
-                  MachiningCopied.NotifyPropertyChanged(NameOf(MachiningTreeViewItem.IsSelected))
+                  MachiningCopied.NotifyPropertyChanged("IsSelected")
                   NewMachiningItem.IsSelected = True
                   Exit For
                End If
@@ -1614,8 +1614,9 @@ Public Class MachiningDbWindowVM
       EgtSetCurrentContext(m_ProjectSceneContext)
       Dim MachiningToRemove As MachiningTreeViewItem = DirectCast(param, MachiningTreeViewItem)
       ' Chiedo conferma cancellazione lavorazione
-      'If MessageBox.Show(EgtMsg(MSG_MACHININGDBERRORS + 5) & " " & MachiningToRemove.Name & EgtMsg(MSG_MACHININGDBERRORS + 6), EgtMsg(MSG_MACHININGDBERRORS + 7), MessageBoxButton.YesNo, MessageBoxImage.Question) <> MessageBoxResult.Yes Then Return
-      If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31405) & " " & MachiningToRemove.Name & EgtMsg(31406), EgtMsg(31407), MessageBoxButton.YesNo, MessageBoxImage.Question) <> MessageBoxResult.Yes Then Return  ' Sei sicuro di voler cancellare xxx ? CANCELLA
+      If MessageBox.Show(EgtMsg(MSG_MACHININGDBERRORS + 5) & " " & MachiningToRemove.Name & EgtMsg(MSG_MACHININGDBERRORS + 6), EgtMsg(MSG_MACHININGDBERRORS + 7), MessageBoxButton.YesNo, MessageBoxImage.Question) <> MessageBoxResult.Yes Then
+         Return
+      End If
       RemoveMachining(MachiningToRemove)
    End Sub
 
@@ -1667,17 +1668,10 @@ Public Class MachiningDbWindowVM
          .ValidateNames = True
       }
       If ImportFileDlg.ShowDialog() <> True Then Return
-      'Dim ImportFileDlg As New EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
-      '   .Title = EgtMsg(31161) & " " & EgtMsg(31163),      ' Importa Utensili
-      '   .Filter = "Machinings (.data)|*.data",
-      '   .CheckFileExists = True,
-      '   .ValidateNames = True
-      '}
-      'If ImportFileDlg.ShowDialog() <> Windows.Forms.DialogResult.OK Then Return
       Dim ImportFilePath As String = ImportFileDlg.FileName
       ' recupero liste lavorazioni da importare
-      Dim ImportFileMachiningNameList As String() = Nothing
-      Dim ImportFileMachiningFamilyList As Integer() = Nothing
+      Dim ImportFileMachiningNameList As String()
+      Dim ImportFileMachiningFamilyList As Integer()
       EgtMdbToBeImported(ImportFilePath, ImportFileMachiningNameList, ImportFileMachiningFamilyList)
       ' li inserisco in lista per finestra di scelta
       Dim MachiningToImportList As New ObservableCollection(Of ImpExpMachiningFamily)
@@ -1847,14 +1841,13 @@ Public Class MachiningDbWindowVM
          If CurrMachining.IsValid Then
             CurrMachining.WriteMachiningParam()
             If EgtMdbIsCurrMachiningModified() Or CurrMachining.m_IsModifiedName Or CurrMachining.NewMachining Then
-               'Select Case MsgBox(EgtMsg(MSG_MACHININGDBERRORS + 1), MsgBoxStyle.YesNo, EgtMsg(MSG_MACHININGDBERRORS + 2))
-               Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31401), EgtMsg(31402), MessageBoxButton.YesNo)   ' Salvare la lavorazione modificata? SALVA
-                  Case MessageBoxResult.Yes
+               Select Case MsgBox(EgtMsg(MSG_MACHININGDBERRORS + 1), MsgBoxStyle.YesNo, EgtMsg(MSG_MACHININGDBERRORS + 2))
+                  Case MsgBoxResult.Yes
                      CurrMachining.NewMachining = False
                      CurrMachining.m_Name = CurrMachining.m_Name.Trim()
                      CurrMachining.WriteMachiningName()
                      EgtMdbSaveCurrMachining()
-                  Case MessageBoxResult.No
+                  Case MsgBoxResult.No
                      If CurrMachining.NewMachining Then
                         RemoveMachining(CurrMachining)
                      ElseIf CurrMachining.m_IsModifiedName Then
@@ -1866,8 +1859,7 @@ Public Class MachiningDbWindowVM
             End If
          Else
             'Lavorazione non valida, correggerla o cancellarla prima di uscire. - Errore
-            'MessageBox.Show(EgtMsg(31410), EgtMsg(31126))
-            EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31410), EgtMsg(31126))   ' Lavorazione non valida, correggerla o cancellarla prima di uscire. Errore
+            MessageBox.Show(EgtMsg(31410), EgtMsg(31126))
             Return
          End If
       End If
diff --git a/MachiningDbWindow/MachiningTreeView.vb b/MachiningDbWindow/MachiningTreeView.vb
index 5047354..fc49da7 100644
--- a/MachiningDbWindow/MachiningTreeView.vb
+++ b/MachiningDbWindow/MachiningTreeView.vb
@@ -1,6 +1,5 @@
 Imports System.Collections.ObjectModel
 Imports EgtUILib
-Imports Microsoft.VisualBasic.Devices
 
 ''' <summary>
 ''' Class that represent a FamilyMachining in the treeview.
@@ -21,10 +20,10 @@ Public Class FamilyMachiningTreeViewItem
          Return m_IsSelected
       End Get
       Set(value As Boolean)
-         If value <> m_IsSelected Then
+         If (value <> m_IsSelected) Then
             m_IsSelected = value
             If value Then
-               m_delNotifyPropertyChanged(NameOf(LibMap.refMachiningDbWindowVM.ParamPageV))
+               m_delNotifyPropertyChanged("ParamPageV")
                m_delIsEnabledBtns(True, False, False)
             End If
          End If
@@ -88,7 +87,7 @@ Public Class FamilyMachiningTreeViewItem
             m_HaveInvalidMachining = True
          End If
       Next
-      NotifyPropertyChanged(NameOf(FamilyColor))
+      NotifyPropertyChanged("FamilyColor")
    End Sub
 
 End Class
@@ -524,20 +523,19 @@ Public Class MachiningTreeViewItem
                EgtMdbSetCurrMachining(Me.Name)
                ReadMachiningParam()
                IsModifiedReset()
-               NotifyPropertyChanged(NameOf(Type))
+               NotifyPropertyChanged("Type")
                'm_delNotifyPropertyChanged("ParamPageV")
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             Else
                WriteMachiningParam()
                If EgtMdbIsCurrMachiningModified() Or m_IsModifiedName Or Me.NewMachining Then
-                  'Select Case MsgBox(EgtMsg(MSG_MACHININGDBERRORS + 1), MsgBoxStyle.YesNo, EgtMsg(MSG_MACHININGDBERRORS + 2))
-                  Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31401), EgtMsg(31402), MessageBoxButton.YesNo)   ' Salvare la lavorazione modificata? SALVA
-                     Case MessageBoxResult.Yes
+                  Select Case MsgBox(EgtMsg(MSG_MACHININGDBERRORS + 1), MsgBoxStyle.YesNo, EgtMsg(MSG_MACHININGDBERRORS + 2))
+                     Case MsgBoxResult.Yes
                         m_NewMachining = False
                         m_Name = m_Name.Trim()
                         WriteMachiningName()
                         EgtMdbSaveCurrMachining()
-                     Case MessageBoxResult.No
+                     Case MsgBoxResult.No
                         If m_NewMachining Then
                            m_delRemoveMachining(Me)
                         ElseIf m_IsModifiedName Then
@@ -548,7 +546,7 @@ Public Class MachiningTreeViewItem
                   End Select
                End If
             End If
-            NotifyPropertyChanged(NameOf(IsSelected))
+            NotifyPropertyChanged("IsSelected")
          End If
       End Set
    End Property
@@ -574,7 +572,7 @@ Public Class MachiningTreeViewItem
                EgtMdbGetCurrMachiningParam(MCH_MP.INVERT, DbInvert)
                m_IsModifiedInvert = value <> DbInvert
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
-               NotifyPropertyChanged(NameOf(Invert))
+               NotifyPropertyChanged("Invert")
             Else
                Dim OrigInvert As Boolean = False
                EgtGetMachiningParam(MCH_MP.INVERT, OrigInvert)
@@ -601,8 +599,7 @@ Public Class MachiningTreeViewItem
                   ' L'abilitazione di {0} disabiliterà {1}. Procedere? - Tab - Oscillazione
                   Dim sMsg As String = String.Format(EgtMsg(31419), EgtMsg(31252), EgtMsg(31382))
                   ' Chiedo autorizzazione a procedere : ATTENZIONE
-                  'If MessageBox.Show(sMsg, EgtMsg(31614), MessageBoxButton.YesNo, MessageBoxImage.Question) <> MessageBoxResult.Yes Then
-                  If EgtMessageBoxV.Show(Application.Current.MainWindow, sMsg, EgtMsg(31614), MessageBoxButton.YesNo, MessageBoxImage.Question) <> MessageBoxResult.Yes Then
+                  If MessageBox.Show(sMsg, EgtMsg(31614), MessageBoxButton.YesNo, MessageBoxImage.Question) <> MessageBoxResult.Yes Then
                      Return
                   Else
                      OscEnable = Not OscEnable
@@ -648,7 +645,7 @@ Public Class MachiningTreeViewItem
                End If
                RaiseEvent m_IsModified(IsModified())
             End If
-            NotifyPropertyChanged(NameOf(LeaveTab))
+            NotifyPropertyChanged("LeaveTab")
          End If
       End Set
    End Property
@@ -670,7 +667,7 @@ Public Class MachiningTreeViewItem
                EgtMdbGetCurrMachiningParam(MCH_MP.TOOLINVERT, DbToolInvert)
                m_IsModifiedToolInvert = value <> DbToolInvert
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
-               NotifyPropertyChanged(NameOf(InvertToolDir))
+               NotifyPropertyChanged("InvertToolDir")
             Else
                Dim OrigToolInvert As Boolean = False
                EgtGetMachiningParam(MCH_MP.TOOLINVERT, OrigToolInvert)
@@ -698,17 +695,17 @@ Public Class MachiningTreeViewItem
          Select Case m_Type
             Case MCH_MY.MORTISING
                m_WorkSideList = New ObservableCollection(Of Object)(
-                                          {New IdNameStruct(MCH_MORTISE_WS.LEFT, EgtMsg(31321)),      ' Sinistra
-                                           New IdNameStruct(MCH_MORTISE_WS.RIGHT, EgtMsg(31322))})    ' Destra
+                                          {New IdNameStruct(MCH_MORTISE_WS.LEFT, EgtMsg(MSG_MACHININGDB + 121)),
+                                           New IdNameStruct(MCH_MORTISE_WS.RIGHT, EgtMsg(MSG_MACHININGDB + 122))})
             Case MCH_MY.CHISELING
                m_WorkSideList = New ObservableCollection(Of Object)(
-                                          {New IdNameStruct(MCH_CHISEL_WS.LEFT, EgtMsg(31321)),       ' Sinistra
-                                           New IdNameStruct(MCH_CHISEL_WS.RIGHT, EgtMsg(31322))})     ' Destra
+                                          {New IdNameStruct(MCH_CHISEL_WS.LEFT, EgtMsg(MSG_MACHININGDB + 121)),
+                                           New IdNameStruct(MCH_CHISEL_WS.RIGHT, EgtMsg(MSG_MACHININGDB + 122))})
             Case Else
                m_WorkSideList = New ObservableCollection(Of Object)(
-                                          {New IdNameStruct(MCH_SAW_WS.CENTER, EgtMsg(31320)),        ' Centro
-                                           New IdNameStruct(MCH_SAW_WS.LEFT, EgtMsg(31321)),          ' Sinistra
-                                           New IdNameStruct(MCH_SAW_WS.RIGHT, EgtMsg(31322))})        ' Destra
+                                          {New IdNameStruct(MCH_SAW_WS.CENTER, EgtMsg(MSG_MACHININGDB + 120)),
+                                           New IdNameStruct(MCH_SAW_WS.LEFT, EgtMsg(MSG_MACHININGDB + 121)),
+                                           New IdNameStruct(MCH_SAW_WS.RIGHT, EgtMsg(MSG_MACHININGDB + 122))})
          End Select
          Return m_WorkSideList
       End Get
@@ -732,7 +729,7 @@ Public Class MachiningTreeViewItem
                   DbWorkSide = IdNameStruct.IndFromId(DbWorkSide, WorkSideList)
                   m_IsModifiedSelectedWorkSide = value <> DbWorkSide
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
-                  NotifyPropertyChanged(NameOf(SelectedWorkSide))
+                  NotifyPropertyChanged("SelectedWorkSide")
                Else
                   Dim OrigWorkSide As Integer = 0
                   EgtGetMachiningParam(MCH_MP.WORKSIDE, OrigWorkSide)
@@ -746,7 +743,7 @@ Public Class MachiningTreeViewItem
    End Property
 
    'ObservableCollection che contiene le variabili per il combobox HeadSide
-   Private m_HeadSideList As New ObservableCollection(Of Object)({New IdNameStruct(MCH_SAW_HS.LEFT, EgtMsg(31321)), New IdNameStruct(MCH_SAW_HS.RIGHT, EgtMsg(31322))}) ' Sinistra - Destra
+   Private m_HeadSideList As New ObservableCollection(Of Object)({New IdNameStruct(MCH_SAW_HS.LEFT, EgtMsg(MSG_MACHININGDB + 121)), New IdNameStruct(MCH_SAW_HS.RIGHT, EgtMsg(MSG_MACHININGDB + 122))})
    Public ReadOnly Property HeadSideList As ObservableCollection(Of Object)
       Get
          Return m_HeadSideList
@@ -771,7 +768,7 @@ Public Class MachiningTreeViewItem
                   DbHeadSide = IdNameStruct.IndFromId(DbHeadSide, HeadSideList)
                   m_IsModifiedSelectedHeadSide = value <> DbHeadSide
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
-                  NotifyPropertyChanged(NameOf(SelectedHeadSide))
+                  NotifyPropertyChanged("SelectedHeadSide")
                Else
                   Dim OrigHeadSide As Integer = 0
                   EgtGetMachiningParam(MCH_MP.HEADSIDE, OrigHeadSide)
@@ -791,48 +788,48 @@ Public Class MachiningTreeViewItem
          Select Case m_Type
             Case MCH_MY.SAWING
                m_LeadInTypeList = New ObservableCollection(Of Object)(
-                                          {New IdNameStruct(MCH_SAW_LI.CENT, EgtMsg(31320)),          ' Centro
-                                           New IdNameStruct(MCH_SAW_LI.STRICT, EgtMsg(31325)),        ' Interno
-                                           New IdNameStruct(MCH_SAW_LI.OUT, EgtMsg(31326)),           ' Esterno
-                                           New IdNameStruct(MCH_SAW_LI.EXT_CENT, EgtMsg(31327)),      ' Esteso centrato
-                                           New IdNameStruct(MCH_SAW_LI.EXT_OUT, EgtMsg(31328))})      ' Esteso esternos
+                                          {New IdNameStruct(MCH_SAW_LI.CENT, EgtMsg(MSG_MACHININGDB + 120)),
+                                           New IdNameStruct(MCH_SAW_LI.STRICT, EgtMsg(MSG_MACHININGDB + 125)),
+                                           New IdNameStruct(MCH_SAW_LI.OUT, EgtMsg(MSG_MACHININGDB + 126)),
+                                           New IdNameStruct(MCH_SAW_LI.EXT_CENT, EgtMsg(MSG_MACHININGDB + 127)),
+                                           New IdNameStruct(MCH_SAW_LI.EXT_OUT, EgtMsg(MSG_MACHININGDB + 128))})
             Case MCH_MY.MILLING
                If m_MatType = MaterialType.STONE Then
                   m_LeadInTypeList = New ObservableCollection(Of Object)(
-                                          {New IdNameStruct(MCH_MIL_LI.NONE, EgtMsg(31329)),          ' Nessuno
-                                           New IdNameStruct(MCH_MIL_LI.GLIDE, EgtMsg(31332))})        ' Inseguimento
+                                          {New IdNameStruct(MCH_MIL_LI.NONE, EgtMsg(MSG_MACHININGDB + 129)),
+                                           New IdNameStruct(MCH_MIL_LI.GLIDE, EgtMsg(MSG_MACHININGDB + 132))})
                Else
                   m_LeadInTypeList = New ObservableCollection(Of Object)(
-                                          {New IdNameStruct(MCH_MIL_LI.NONE, EgtMsg(31329)),          ' Nessuno
-                                           New IdNameStruct(MCH_MIL_LI.LINEAR, EgtMsg(31330)),        ' Lineare
-                                           New IdNameStruct(MCH_MIL_LI.TANGENT, EgtMsg(31331)),       ' Tangente
-                                           New IdNameStruct(MCH_MIL_LI.GLIDE, EgtMsg(31332)),         ' Inseguimento
-                                           New IdNameStruct(MCH_MIL_LI.ZIGZAG, EgtMsg(31342)),        ' ZigZag
-                                           New IdNameStruct(MCH_MIL_LI.HELIX, EgtMsg(31333)),         ' Elica
-                                           New IdNameStruct(MCH_MIL_LI.TG_PERP, EgtMsg(31388))})      ' Tang+Perp
+                                          {New IdNameStruct(MCH_MIL_LI.NONE, EgtMsg(MSG_MACHININGDB + 129)),
+                                           New IdNameStruct(MCH_MIL_LI.LINEAR, EgtMsg(MSG_MACHININGDB + 130)),
+                                           New IdNameStruct(MCH_MIL_LI.TANGENT, EgtMsg(MSG_MACHININGDB + 131)),
+                                           New IdNameStruct(MCH_MIL_LI.GLIDE, EgtMsg(MSG_MACHININGDB + 132)),
+                                           New IdNameStruct(MCH_MIL_LI.ZIGZAG, EgtMsg(MSG_MACHININGDB + 142)),
+                                           New IdNameStruct(MCH_MIL_LI.HELIX, EgtMsg(MSG_MACHININGDB + 133)),
+                                           New IdNameStruct(MCH_MIL_LI.TG_PERP, EgtMsg(MSG_MACHININGDB + 188))})
                End If
             Case MCH_MY.POCKETING
                m_LeadInTypeList = New ObservableCollection(Of Object)(
-                                          {New IdNameStruct(MCH_POCK_LI.NONE, EgtMsg(31329)),         ' Nessuno
-                                           New IdNameStruct(MCH_POCK_LI.GLIDE, EgtMsg(31332)),        ' Inseguimento
-                                           New IdNameStruct(MCH_POCK_LI.ZIGZAG, EgtMsg(31342)),       ' ZigZag
-                                           New IdNameStruct(MCH_POCK_LI.HELIX, EgtMsg(31333))})       ' Elica
+                                          {New IdNameStruct(MCH_POCK_LI.NONE, EgtMsg(MSG_MACHININGDB + 129)),
+                                           New IdNameStruct(MCH_POCK_LI.GLIDE, EgtMsg(MSG_MACHININGDB + 132)),
+                                           New IdNameStruct(MCH_POCK_LI.ZIGZAG, EgtMsg(MSG_MACHININGDB + 142)),
+                                           New IdNameStruct(MCH_POCK_LI.HELIX, EgtMsg(MSG_MACHININGDB + 133))})
             Case MCH_MY.SURFFINISHING
                m_LeadInTypeList = New ObservableCollection(Of Object)(
-                                          {New IdNameStruct(MCH_SURFFIN_LI.NONE, EgtMsg(31329)),      ' Nessuno
-                                           New IdNameStruct(MCH_SURFFIN_LI.LINEAR, EgtMsg(31330)),    ' Lineare
-                                           New IdNameStruct(MCH_SURFFIN_LI.TANGENT, EgtMsg(31331))})  ' Tangente
+                                          {New IdNameStruct(MCH_SURFFIN_LI.NONE, EgtMsg(MSG_MACHININGSDBPAGE + 129)),
+                                           New IdNameStruct(MCH_SURFFIN_LI.LINEAR, EgtMsg(MSG_MACHININGSDBPAGE + 130)),
+                                           New IdNameStruct(MCH_SURFFIN_LI.TANGENT, EgtMsg(MSG_MACHININGSDBPAGE + 131))})
             Case MCH_MY.SURFROUGHING
                m_LeadInTypeList = New ObservableCollection(Of Object)(
-                                          {New IdNameStruct(MCH_SURFROU_LI.NONE, EgtMsg(31329)),      ' Nessuno
-                                           New IdNameStruct(MCH_SURFROU_LI.GLIDE, EgtMsg(31332)),     ' Inseguimento
-                                           New IdNameStruct(MCH_SURFROU_LI.ZIGZAG, EgtMsg(31342)),    ' ZigZag
-                                           New IdNameStruct(MCH_SURFROU_LI.HELIX, EgtMsg(31333))})    ' Elica
+                                          {New IdNameStruct(MCH_SURFROU_LI.NONE, EgtMsg(MSG_MACHININGDB + 129)),
+                                           New IdNameStruct(MCH_SURFROU_LI.GLIDE, EgtMsg(MSG_MACHININGDB + 132)),
+                                           New IdNameStruct(MCH_SURFROU_LI.ZIGZAG, EgtMsg(MSG_MACHININGDB + 142)),
+                                           New IdNameStruct(MCH_SURFROU_LI.HELIX, EgtMsg(MSG_MACHININGDB + 133))})
             Case MCH_MY.WATERJETTING
                m_LeadInTypeList = New ObservableCollection(Of Object)(
-                                          {New IdNameStruct(MCH_MIL_LI.NONE, EgtMsg(31329)),          ' Nessuno
-                                           New IdNameStruct(MCH_MIL_LI.LINEAR, EgtMsg(31330)),        ' Lineare
-                                           New IdNameStruct(MCH_MIL_LI.TANGENT, EgtMsg(31331))})      ' Tangente
+                                          {New IdNameStruct(MCH_MIL_LI.NONE, EgtMsg(31329)),
+                                           New IdNameStruct(MCH_MIL_LI.LINEAR, EgtMsg(31330)),
+                                           New IdNameStruct(MCH_MIL_LI.TANGENT, EgtMsg(31331))})
             Case Else
                m_LeadInTypeList = Nothing
          End Select
@@ -858,7 +855,7 @@ Public Class MachiningTreeViewItem
                   DbLeadInType = IdNameStruct.IndFromId(DbLeadInType, LeadInTypeList)
                   m_IsModifiedSelectedLeadInType = value <> DbLeadInType
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
-                  NotifyPropertyChanged(NameOf(SelectedLeadInType))
+                  NotifyPropertyChanged("SelectedLeadInType")
                Else
                   Dim OrigLeadInType As Integer = 0
                   EgtGetMachiningParam(MCH_MP.LEADINTYPE, OrigLeadInType)
@@ -872,7 +869,7 @@ Public Class MachiningTreeViewItem
    End Property
 
    'ObservableCollection che contiene le variabili per il combobox ExtLinkType
-   Private m_ExtLinkTypeList As New ObservableCollection(Of Object)({New IdNameStruct(MCH_SAW_EL.CENT, EgtMsg(31320)), New IdNameStruct(MCH_SAW_EL.EXT_PREV, EgtMsg(31334)), New IdNameStruct(MCH_SAW_EL.EXT_NEXT, EgtMsg(31335)), New IdNameStruct(MCH_SAW_EL.EXT_BOTH, EgtMsg(31336))}) ' Centro - stendi precedente - Estendi successivo - Estendi entrambi
+   Private m_ExtLinkTypeList As New ObservableCollection(Of Object)({New IdNameStruct(MCH_SAW_EL.CENT, EgtMsg(MSG_MACHININGDB + 120)), New IdNameStruct(MCH_SAW_EL.EXT_PREV, EgtMsg(MSG_MACHININGDB + 134)), New IdNameStruct(MCH_SAW_EL.EXT_NEXT, EgtMsg(MSG_MACHININGDB + 135)), New IdNameStruct(MCH_SAW_EL.EXT_BOTH, EgtMsg(MSG_MACHININGDB + 136))})
    Public ReadOnly Property ExtLinkTypeList As ObservableCollection(Of Object)
       Get
          Return m_ExtLinkTypeList
@@ -897,7 +894,7 @@ Public Class MachiningTreeViewItem
                   DbExtLinkType = IdNameStruct.IndFromId(DbExtLinkType, ExtLinkTypeList)
                   m_IsModifiedSelectedExtLinkType = value <> DbExtLinkType
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
-                  NotifyPropertyChanged(NameOf(SelectedExtLinkType))
+                  NotifyPropertyChanged("SelectedExtLinkType")
                Else
                   Dim OrigExtLinkType As Integer = 0
                   EgtGetMachiningParam(MCH_MP.EXTLINKTYPE, OrigExtLinkType)
@@ -917,46 +914,46 @@ Public Class MachiningTreeViewItem
          Select Case m_Type
             Case MCH_MY.SAWING
                m_LeadOutTypeList = New ObservableCollection(Of Object)(
-                                          {New IdNameStruct(MCH_SAW_LO.CENT, EgtMsg(31320)),          ' Centro
-                                           New IdNameStruct(MCH_SAW_LO.STRICT, EgtMsg(31325)),        ' Interno
-                                           New IdNameStruct(MCH_SAW_LO.OUT, EgtMsg(31326)),           ' Esterno
-                                           New IdNameStruct(MCH_SAW_LO.EXT_CENT, EgtMsg(31327)),      ' Esteso centrato
-                                           New IdNameStruct(MCH_SAW_LO.EXT_OUT, EgtMsg(31328))})      ' Esteso esterno
+                                          {New IdNameStruct(MCH_SAW_LO.CENT, EgtMsg(MSG_MACHININGDB + 120)),
+                                           New IdNameStruct(MCH_SAW_LO.STRICT, EgtMsg(MSG_MACHININGDB + 125)),
+                                           New IdNameStruct(MCH_SAW_LO.OUT, EgtMsg(MSG_MACHININGDB + 126)),
+                                           New IdNameStruct(MCH_SAW_LO.EXT_CENT, EgtMsg(MSG_MACHININGDB + 127)),
+                                           New IdNameStruct(MCH_SAW_LO.EXT_OUT, EgtMsg(MSG_MACHININGDB + 128))})
             Case MCH_MY.MILLING
                If m_MatType = MaterialType.STONE Then
                   m_LeadOutTypeList = New ObservableCollection(Of Object)(
-                                          {New IdNameStruct(MCH_MIL_LO.NONE, EgtMsg(31329)),          ' Nessuno
-                                           New IdNameStruct(MCH_MIL_LO.GLIDE, EgtMsg(31332)),         ' Inseguimento
-                                           New IdNameStruct(MCH_MIL_LO.AS_LI, EgtMsg(31337))})        ' Come attacco
+                                          {New IdNameStruct(MCH_MIL_LO.NONE, EgtMsg(MSG_MACHININGDB + 129)),
+                                           New IdNameStruct(MCH_MIL_LO.GLIDE, EgtMsg(MSG_MACHININGDB + 132)),
+                                           New IdNameStruct(MCH_MIL_LO.AS_LI, EgtMsg(MSG_MACHININGDB + 137))})
                Else
                   m_LeadOutTypeList = New ObservableCollection(Of Object)(
-                                          {New IdNameStruct(MCH_MIL_LO.NONE, EgtMsg(31329)),          ' Nessuno
-                                           New IdNameStruct(MCH_MIL_LO.LINEAR, EgtMsg(31330)),        ' Lineare
-                                           New IdNameStruct(MCH_MIL_LO.TANGENT, EgtMsg(31331)),       ' Tangente
-                                           New IdNameStruct(MCH_MIL_LO.GLIDE, EgtMsg(31332)),         ' Inseguimento
-                                           New IdNameStruct(MCH_MIL_LO.AS_LI, EgtMsg(31337)),         ' Come attacco
-                                           New IdNameStruct(MCH_MIL_LO.PERP_TG, EgtMsg(31389))})      ' Perp+Tang
+                                          {New IdNameStruct(MCH_MIL_LO.NONE, EgtMsg(MSG_MACHININGDB + 129)),
+                                           New IdNameStruct(MCH_MIL_LO.LINEAR, EgtMsg(MSG_MACHININGDB + 130)),
+                                           New IdNameStruct(MCH_MIL_LO.TANGENT, EgtMsg(MSG_MACHININGDB + 131)),
+                                           New IdNameStruct(MCH_MIL_LO.GLIDE, EgtMsg(MSG_MACHININGDB + 132)),
+                                           New IdNameStruct(MCH_MIL_LO.AS_LI, EgtMsg(MSG_MACHININGDB + 137)),
+                                           New IdNameStruct(MCH_MIL_LO.PERP_TG, EgtMsg(MSG_MACHININGDB + 189))})
                End If
             Case MCH_MY.POCKETING
                m_LeadOutTypeList = New ObservableCollection(Of Object)(
-                                          {New IdNameStruct(MCH_POCK_LO.NONE, EgtMsg(31329)),         ' Nessuno
-                                           New IdNameStruct(MCH_POCK_LO.GLIDE, EgtMsg(31332))})       ' Inseguimento
+                                          {New IdNameStruct(MCH_POCK_LO.NONE, EgtMsg(MSG_MACHININGDB + 129)),
+                                           New IdNameStruct(MCH_POCK_LO.GLIDE, EgtMsg(MSG_MACHININGDB + 132))})
             Case MCH_MY.SURFFINISHING
                m_LeadOutTypeList = New ObservableCollection(Of Object)(
-                                          {New IdNameStruct(MCH_SURFFIN_LO.NONE, EgtMsg(31329)),      ' Nessuno
-                                           New IdNameStruct(MCH_SURFFIN_LO.LINEAR, EgtMsg(31330)),    ' Lineare
-                                           New IdNameStruct(MCH_SURFFIN_LO.TANGENT, EgtMsg(31331)),   ' Tangente   
-                                           New IdNameStruct(MCH_SURFFIN_LO.AS_LI, EgtMsg(31337))})    ' Come attacco
+                                          {New IdNameStruct(MCH_SURFFIN_LO.NONE, EgtMsg(MSG_MACHININGSDBPAGE + 129)),
+                                           New IdNameStruct(MCH_SURFFIN_LO.LINEAR, EgtMsg(MSG_MACHININGSDBPAGE + 130)),
+                                           New IdNameStruct(MCH_SURFFIN_LO.TANGENT, EgtMsg(MSG_MACHININGSDBPAGE + 131)),
+                                           New IdNameStruct(MCH_SURFFIN_LO.AS_LI, EgtMsg(MSG_MACHININGSDBPAGE + 137))})
             Case MCH_MY.SURFROUGHING
                m_LeadOutTypeList = New ObservableCollection(Of Object)(
-                                          {New IdNameStruct(MCH_SURFROU_LO.NONE, EgtMsg(31329)),      ' Nessuno
-                                           New IdNameStruct(MCH_SURFROU_LO.GLIDE, EgtMsg(31332))})    ' Inseguimento
+                                          {New IdNameStruct(MCH_SURFROU_LO.NONE, EgtMsg(MSG_MACHININGDB + 129)),
+                                           New IdNameStruct(MCH_SURFROU_LO.GLIDE, EgtMsg(MSG_MACHININGDB + 132))})
             Case MCH_MY.WATERJETTING
                m_LeadOutTypeList = New ObservableCollection(Of Object)(
-                                          {New IdNameStruct(MCH_MIL_LI.NONE, EgtMsg(31329)),          ' Nessuno
-                                           New IdNameStruct(MCH_MIL_LI.LINEAR, EgtMsg(31330)),        ' Lineare
-                                           New IdNameStruct(MCH_MIL_LI.TANGENT, EgtMsg(31331)),       ' Tangente
-                                           New IdNameStruct(MCH_MIL_LO.AS_LI, EgtMsg(31337))})        ' Come attacco
+                                          {New IdNameStruct(MCH_MIL_LI.NONE, EgtMsg(31329)),
+                                           New IdNameStruct(MCH_MIL_LI.LINEAR, EgtMsg(31330)),
+                                           New IdNameStruct(MCH_MIL_LI.TANGENT, EgtMsg(31331)),
+                                           New IdNameStruct(MCH_MIL_LO.AS_LI, EgtMsg(31337))})
             Case Else
                m_LeadOutTypeList = Nothing
          End Select
@@ -982,7 +979,7 @@ Public Class MachiningTreeViewItem
                   DbLeadOutType = IdNameStruct.IndFromId(DbLeadOutType, LeadOutTypeList)
                   m_IsModifiedSelectedLeadOutType = value <> DbLeadOutType
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
-                  NotifyPropertyChanged(NameOf(SelectedLeadOutType))
+                  NotifyPropertyChanged("SelectedLeadOutType")
                Else
                   Dim OrigLeadOutType As Integer = 0
                   EgtGetMachiningParam(MCH_MP.LEADOUTTYPE, OrigLeadOutType)
@@ -1001,15 +998,15 @@ Public Class MachiningTreeViewItem
       Get
          If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_SAWINGONARCS, 0, MachiningDbWindowVM.m_sMachineIniPath) <> 0 Then
             m_CurveUseList = New ObservableCollection(Of Object)(
-                                    {New IdNameStruct(MCH_SAW_CU.SKIP, EgtMsg(31338)),    ' Salta
-                                     New IdNameStruct(MCH_SAW_CU.APPROX, EgtMsg(31339)),  ' Approssima
-                                     New IdNameStruct(MCH_SAW_CU.CONVEX, EgtMsg(31340)),  ' Convesso
-                                     New IdNameStruct(MCH_SAW_CU.KEEP, EgtMsg(31341))})   ' Mantieni
+                                    {New IdNameStruct(MCH_SAW_CU.SKIP, EgtMsg(MSG_MACHININGDB + 138)),
+                                     New IdNameStruct(MCH_SAW_CU.APPROX, EgtMsg(MSG_MACHININGDB + 139)),
+                                     New IdNameStruct(MCH_SAW_CU.CONVEX, EgtMsg(MSG_MACHININGDB + 140)),
+                                     New IdNameStruct(MCH_SAW_CU.KEEP, EgtMsg(MSG_MACHININGDB + 141))})
          Else
             m_CurveUseList = New ObservableCollection(Of Object)(
-                                    {New IdNameStruct(MCH_SAW_CU.SKIP, EgtMsg(31338)),    ' Salta
-                                     New IdNameStruct(MCH_SAW_CU.APPROX, EgtMsg(31339)),  ' Approssima
-                                     New IdNameStruct(MCH_SAW_CU.CONVEX, EgtMsg(31340))}) ' Convesso
+                                    {New IdNameStruct(MCH_SAW_CU.SKIP, EgtMsg(MSG_MACHININGDB + 138)),
+                                     New IdNameStruct(MCH_SAW_CU.APPROX, EgtMsg(MSG_MACHININGDB + 139)),
+                                     New IdNameStruct(MCH_SAW_CU.CONVEX, EgtMsg(MSG_MACHININGDB + 140))})
          End If
          Return m_CurveUseList
       End Get
@@ -1033,7 +1030,7 @@ Public Class MachiningTreeViewItem
                   DbCurveUse = IdNameStruct.IndFromId(DbCurveUse, CurveUseList)
                   m_IsModifiedSelectedCurveUse = value <> DbCurveUse
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
-                  NotifyPropertyChanged(NameOf(SelectedCurveUse))
+                  NotifyPropertyChanged("SelectedCurveUse")
                Else
                   Dim OrigCurveUse As Integer = 0
                   EgtGetMachiningParam(MCH_MP.CURVEUSE, OrigCurveUse)
@@ -1053,22 +1050,22 @@ Public Class MachiningTreeViewItem
          Select Case m_Type
             Case MCH_MY.SAWING
                m_StepTypeList = New ObservableCollection(Of Object)(
-                                       {New IdNameStruct(MCH_SAW_ST.ZIGZAG, EgtMsg(31342)),        ' ZigZag
-                                        New IdNameStruct(MCH_SAW_ST.ONEWAY, EgtMsg(31343)),        ' OneWay
-                                        New IdNameStruct(MCH_SAW_ST.TOANDFROM, EgtMsg(31345))})    ' Va e torna
+                                       {New IdNameStruct(MCH_SAW_ST.ZIGZAG, EgtMsg(MSG_MACHININGDB + 142)),
+                                        New IdNameStruct(MCH_SAW_ST.ONEWAY, EgtMsg(MSG_MACHININGDB + 143)),
+                                        New IdNameStruct(MCH_SAW_ST.TOANDFROM, EgtMsg(MSG_MACHININGDB + 145))})
             Case MCH_MY.MILLING
                m_StepTypeList = New ObservableCollection(Of Object)(
-                                       {New IdNameStruct(MCH_MIL_ST.ZIGZAG, EgtMsg(31342)),        ' ZigZag
-                                        New IdNameStruct(MCH_MIL_ST.ONEWAY, EgtMsg(31343)),        ' OneWay
-                                        New IdNameStruct(MCH_MIL_ST.SPIRAL, EgtMsg(31344))})       ' Spirale
+                                       {New IdNameStruct(MCH_MIL_ST.ZIGZAG, EgtMsg(MSG_MACHININGDB + 142)),
+                                        New IdNameStruct(MCH_MIL_ST.ONEWAY, EgtMsg(MSG_MACHININGDB + 143)),
+                                        New IdNameStruct(MCH_MIL_ST.SPIRAL, EgtMsg(MSG_MACHININGDB + 144))})
             Case MCH_MY.MORTISING
                m_StepTypeList = New ObservableCollection(Of Object)(
-                                       {New IdNameStruct(MCH_MORTISE_ST.ZIGZAG, EgtMsg(31342)),    ' ZigZag
-                                        New IdNameStruct(MCH_MORTISE_ST.ONEWAY, EgtMsg(31343))})   ' OneWay
+                                       {New IdNameStruct(MCH_MORTISE_ST.ZIGZAG, EgtMsg(MSG_MACHININGDB + 142)),
+                                        New IdNameStruct(MCH_MORTISE_ST.ONEWAY, EgtMsg(MSG_MACHININGDB + 143))})
             Case MCH_MY.SAWROUGHING, MCH_MY.SAWFINISHING
                m_StepTypeList = New ObservableCollection(Of Object)(
-                                       {New IdNameStruct(MCH_SAWROU_ST.ZIGZAG, EgtMsg(31342)),     ' ZigZag
-                                        New IdNameStruct(MCH_SAWROU_ST.ONEWAY, EgtMsg(31343))})    ' OneWay
+                                       {New IdNameStruct(MCH_SAWROU_ST.ZIGZAG, EgtMsg(MSG_MACHININGDB + 142)),
+                                        New IdNameStruct(MCH_SAWROU_ST.ONEWAY, EgtMsg(MSG_MACHININGDB + 143))})
             Case Else
                m_StepTypeList = Nothing
          End Select
@@ -1094,7 +1091,7 @@ Public Class MachiningTreeViewItem
                   DbStepType = IdNameStruct.IndFromId(DbStepType, StepTypeList)
                   m_IsModifiedSelectedStepType = value <> DbStepType
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
-                  NotifyPropertyChanged(NameOf(SelectedStepType))
+                  NotifyPropertyChanged("SelectedStepType")
                Else
                   Dim OrigStepType As Integer = 0
                   EgtGetMachiningParam(MCH_MP.STEPTYPE, OrigStepType)
@@ -1188,7 +1185,7 @@ Public Class MachiningTreeViewItem
                   DbSubType = IdNameStruct.IndFromId(DbSubType, SubTypeList)
                   m_IsModifiedSelectedSubType = value <> DbSubType
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
-                  NotifyPropertyChanged(NameOf(SelectedSubType))
+                  NotifyPropertyChanged("SelectedSubType")
                Else
                   Dim OrigSubType As Integer = 0
                   EgtGetMachiningParam(MCH_MP.SUBTYPE, OrigSubType)
@@ -1207,9 +1204,9 @@ Public Class MachiningTreeViewItem
       Get
          Select Case m_Type
             Case MCH_MY.SAWROUGHING
-               m_LeadLinkTypeList = New ObservableCollection(Of Object)({New IdNameStruct(MCH_SAWROU_LL.CENT, EgtMsg(31320)), New IdNameStruct(MCH_SAWROU_LL.EXT, EgtMsg(31323))})  ' Centro - Estendi
+               m_LeadLinkTypeList = New ObservableCollection(Of Object)({New IdNameStruct(MCH_SAWROU_LL.CENT, EgtMsg(MSG_MACHININGDB + 120)), New IdNameStruct(MCH_SAWROU_LL.EXT, EgtMsg(MSG_MACHININGDB + 123))})
             Case MCH_MY.SAWFINISHING
-               m_LeadLinkTypeList = New ObservableCollection(Of Object)({New IdNameStruct(MCH_SAWFIN_LL.STD, EgtMsg(31324)), New IdNameStruct(MCH_SAWFIN_LL.CENT, EgtMsg(31320)), New IdNameStruct(MCH_SAWFIN_LL.EXT, EgtMsg(31323))}) ' Standard - Centro - Estendi
+               m_LeadLinkTypeList = New ObservableCollection(Of Object)({New IdNameStruct(MCH_SAWFIN_LL.STD, EgtMsg(MSG_MACHININGDB + 124)), New IdNameStruct(MCH_SAWFIN_LL.CENT, EgtMsg(MSG_MACHININGDB + 120)), New IdNameStruct(MCH_SAWFIN_LL.EXT, EgtMsg(MSG_MACHININGDB + 123))})
             Case Else
                m_LeadLinkTypeList = Nothing
          End Select
@@ -1235,7 +1232,7 @@ Public Class MachiningTreeViewItem
                   DbLeadLinkType = IdNameStruct.IndFromId(DbLeadLinkType, LeadLinkTypeList)
                   m_IsModifiedSelectedLeadLinkType = value <> DbLeadLinkType
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
-                  NotifyPropertyChanged(NameOf(SelectedLeadLinkType))
+                  NotifyPropertyChanged("SelectedLeadLinkType")
                Else
                   Dim OrigLeadLinkType As Integer = 0
                   EgtGetMachiningParam(MCH_MP.LEADLINKTYPE, OrigLeadLinkType)
@@ -1255,36 +1252,36 @@ Public Class MachiningTreeViewItem
          Select Case m_Type
             Case MCH_MY.MORTISING
                m_FaceUseTypeList = New ObservableCollection(Of Object)(
-                                       {New IdNameStruct(MCH_MIL_FU.NONE, EgtMsg(31353)),                         ' Non definito
-                                        New IdNameStruct(MCH_MIL_FU.PARAL_DOWN, EgtMsg(31357) & EgtMsg(31354)),   ' Sotto Parallelo
-                                        New IdNameStruct(MCH_MIL_FU.PARAL_TOP, EgtMsg(31358) & EgtMsg(31354)),    ' Sopra Parallelo
-                                        New IdNameStruct(MCH_MIL_FU.PARAL_FRONT, EgtMsg(31359) & EgtMsg(31354)),  ' Davanti Parallelo
-                                        New IdNameStruct(MCH_MIL_FU.PARAL_BACK, EgtMsg(31360) & EgtMsg(31354)),   ' Dietro Parallelo
-                                        New IdNameStruct(MCH_MIL_FU.PARAL_LEFT, EgtMsg(31361) & EgtMsg(31354)),   ' Sinistra Parallelo
-                                        New IdNameStruct(MCH_MIL_FU.PARAL_RIGHT, EgtMsg(31362) & EgtMsg(31354))}) ' Destra Parallelo
+                                       {New IdNameStruct(MCH_MIL_FU.NONE, EgtMsg(MSG_MACHININGDB + 153)),
+                                        New IdNameStruct(MCH_MIL_FU.PARAL_DOWN, EgtMsg(MSG_MACHININGDB + 157) & EgtMsg(MSG_MACHININGDB + 154)),
+                                        New IdNameStruct(MCH_MIL_FU.PARAL_TOP, EgtMsg(MSG_MACHININGDB + 158) & EgtMsg(MSG_MACHININGDB + 154)),
+                                        New IdNameStruct(MCH_MIL_FU.PARAL_FRONT, EgtMsg(MSG_MACHININGDB + 159) & EgtMsg(MSG_MACHININGDB + 154)),
+                                        New IdNameStruct(MCH_MIL_FU.PARAL_BACK, EgtMsg(MSG_MACHININGDB + 160) & EgtMsg(MSG_MACHININGDB + 154)),
+                                        New IdNameStruct(MCH_MIL_FU.PARAL_LEFT, EgtMsg(MSG_MACHININGDB + 161) & EgtMsg(MSG_MACHININGDB + 154)),
+                                        New IdNameStruct(MCH_MIL_FU.PARAL_RIGHT, EgtMsg(MSG_MACHININGDB + 162) & EgtMsg(MSG_MACHININGDB + 154))})
             Case Else
                m_FaceUseTypeList = New ObservableCollection(Of Object)(
-                                       {New IdNameStruct(MCH_MIL_FU.NONE, EgtMsg(31353)),                         ' Non definito
-                                        New IdNameStruct(MCH_MIL_FU.PARAL_DOWN, EgtMsg(31357) & EgtMsg(31354)),   ' Sotto Parallelo
-                                        New IdNameStruct(MCH_MIL_FU.PARAL_TOP, EgtMsg(31358) & EgtMsg(31354)),    ' Sopra Parallelo
-                                        New IdNameStruct(MCH_MIL_FU.PARAL_FRONT, EgtMsg(31359) & EgtMsg(31354)),  ' Davanti Parallelo
-                                        New IdNameStruct(MCH_MIL_FU.PARAL_BACK, EgtMsg(31360) & EgtMsg(31354)),   ' Dietro Parallelo
-                                        New IdNameStruct(MCH_MIL_FU.PARAL_LEFT, EgtMsg(31361) & EgtMsg(31354)),   ' Sinistra Parallelo
-                                        New IdNameStruct(MCH_MIL_FU.PARAL_RIGHT, EgtMsg(31362) & EgtMsg(31354)),  ' Destra Parallelo
-                                        New IdNameStruct(MCH_MIL_FU.ORTHO_DOWN, EgtMsg(31357) & EgtMsg(31355)),   ' Sotto Ortogonale
-                                        New IdNameStruct(MCH_MIL_FU.ORTHO_TOP, EgtMsg(31358) & EgtMsg(31355)),    ' Sopra Ortogonale
-                                        New IdNameStruct(MCH_MIL_FU.ORTHO_FRONT, EgtMsg(31359) & EgtMsg(31355)),  ' Davanti Ortogonale
-                                        New IdNameStruct(MCH_MIL_FU.ORTHO_BACK, EgtMsg(31360) & EgtMsg(31355)),   ' Dietro Ortogonale
-                                        New IdNameStruct(MCH_MIL_FU.ORTHO_LEFT, EgtMsg(31361) & EgtMsg(31355)),   ' Sinistra Ortogonale
-                                        New IdNameStruct(MCH_MIL_FU.ORTHO_RIGHT, EgtMsg(31362) & EgtMsg(31355)),  ' Destra Ortogonale
-                                        New IdNameStruct(MCH_MIL_FU.ORTHO_CONT, EgtMsg(31363) & EgtMsg(31355)),   ' Contorno Ortogonale
-                                        New IdNameStruct(MCH_MIL_FU.ORTUP_DOWN, EgtMsg(31357) & EgtMsg(31356)),   ' Sotto Ortog. Su     
-                                        New IdNameStruct(MCH_MIL_FU.ORTUP_TOP, EgtMsg(31358) & EgtMsg(31356)),    ' Sopra Ortog. Su
-                                        New IdNameStruct(MCH_MIL_FU.ORTUP_FRONT, EgtMsg(31359) & EgtMsg(31356)),  ' Davanti Ortog. Su
-                                        New IdNameStruct(MCH_MIL_FU.ORTUP_BACK, EgtMsg(31360) & EgtMsg(31356)),   ' Dietro Ortog. Su
-                                        New IdNameStruct(MCH_MIL_FU.ORTUP_LEFT, EgtMsg(31361) & EgtMsg(31356)),   ' Sinistra Ortog. Su
-                                        New IdNameStruct(MCH_MIL_FU.ORTUP_RIGHT, EgtMsg(31362) & EgtMsg(31356)),  ' Destra Ortog. Su
-                                        New IdNameStruct(MCH_MIL_FU.ORTUP_CONT, EgtMsg(31363) & EgtMsg(31356))})  ' Contorno Ortog. Su
+                                       {New IdNameStruct(MCH_MIL_FU.NONE, EgtMsg(MSG_MACHININGDB + 153)),
+                                        New IdNameStruct(MCH_MIL_FU.PARAL_DOWN, EgtMsg(MSG_MACHININGDB + 157) & EgtMsg(MSG_MACHININGDB + 154)),
+                                        New IdNameStruct(MCH_MIL_FU.PARAL_TOP, EgtMsg(MSG_MACHININGDB + 158) & EgtMsg(MSG_MACHININGDB + 154)),
+                                        New IdNameStruct(MCH_MIL_FU.PARAL_FRONT, EgtMsg(MSG_MACHININGDB + 159) & EgtMsg(MSG_MACHININGDB + 154)),
+                                        New IdNameStruct(MCH_MIL_FU.PARAL_BACK, EgtMsg(MSG_MACHININGDB + 160) & EgtMsg(MSG_MACHININGDB + 154)),
+                                        New IdNameStruct(MCH_MIL_FU.PARAL_LEFT, EgtMsg(MSG_MACHININGDB + 161) & EgtMsg(MSG_MACHININGDB + 154)),
+                                        New IdNameStruct(MCH_MIL_FU.PARAL_RIGHT, EgtMsg(MSG_MACHININGDB + 162) & EgtMsg(MSG_MACHININGDB + 154)),
+                                        New IdNameStruct(MCH_MIL_FU.ORTHO_DOWN, EgtMsg(MSG_MACHININGDB + 157) & EgtMsg(MSG_MACHININGDB + 155)),
+                                        New IdNameStruct(MCH_MIL_FU.ORTHO_TOP, EgtMsg(MSG_MACHININGDB + 158) & EgtMsg(MSG_MACHININGDB + 155)),
+                                        New IdNameStruct(MCH_MIL_FU.ORTHO_FRONT, EgtMsg(MSG_MACHININGDB + 159) & EgtMsg(MSG_MACHININGDB + 155)),
+                                        New IdNameStruct(MCH_MIL_FU.ORTHO_BACK, EgtMsg(MSG_MACHININGDB + 160) & EgtMsg(MSG_MACHININGDB + 155)),
+                                        New IdNameStruct(MCH_MIL_FU.ORTHO_LEFT, EgtMsg(MSG_MACHININGDB + 161) & EgtMsg(MSG_MACHININGDB + 155)),
+                                        New IdNameStruct(MCH_MIL_FU.ORTHO_RIGHT, EgtMsg(MSG_MACHININGDB + 162) & EgtMsg(MSG_MACHININGDB + 155)),
+                                        New IdNameStruct(MCH_MIL_FU.ORTHO_CONT, EgtMsg(MSG_MACHININGDB + 163) & EgtMsg(MSG_MACHININGDB + 155)),
+                                        New IdNameStruct(MCH_MIL_FU.ORTUP_DOWN, EgtMsg(MSG_MACHININGDB + 157) & EgtMsg(MSG_MACHININGDB + 156)),
+                                        New IdNameStruct(MCH_MIL_FU.ORTUP_TOP, EgtMsg(MSG_MACHININGDB + 158) & EgtMsg(MSG_MACHININGDB + 156)),
+                                        New IdNameStruct(MCH_MIL_FU.ORTUP_FRONT, EgtMsg(MSG_MACHININGDB + 159) & EgtMsg(MSG_MACHININGDB + 156)),
+                                        New IdNameStruct(MCH_MIL_FU.ORTUP_BACK, EgtMsg(MSG_MACHININGDB + 160) & EgtMsg(MSG_MACHININGDB + 156)),
+                                        New IdNameStruct(MCH_MIL_FU.ORTUP_LEFT, EgtMsg(MSG_MACHININGDB + 161) & EgtMsg(MSG_MACHININGDB + 156)),
+                                        New IdNameStruct(MCH_MIL_FU.ORTUP_RIGHT, EgtMsg(MSG_MACHININGDB + 162) & EgtMsg(MSG_MACHININGDB + 156)),
+                                        New IdNameStruct(MCH_MIL_FU.ORTUP_CONT, EgtMsg(MSG_MACHININGDB + 163) & EgtMsg(MSG_MACHININGDB + 156))})
          End Select
          Return m_FaceUseTypeList
       End Get
@@ -1309,7 +1306,7 @@ Public Class MachiningTreeViewItem
                   OrigFaceUseType = IdNameStruct.IndFromId(OrigFaceUseType, FaceUseTypeList)
                   m_IsModifiedSelectedFaceUseType = value <> OrigFaceUseType
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
-                  NotifyPropertyChanged(NameOf(SelectedFaceUseType))
+                  NotifyPropertyChanged("SelectedFaceUseType")
                Else
                   Dim OrigFaceUseType As Integer = 0
                   EgtGetMachiningParam(MCH_MP.FACEUSE, OrigFaceUseType)
@@ -1324,17 +1321,17 @@ Public Class MachiningTreeViewItem
 
    'ObservableCollection che contiene le variabili per il combobox SolChoiceType
    Private m_SolChoiceTypeList As New ObservableCollection(Of Object)(
-                           {New IdNameStruct(MCH_SCC.NONE, EgtMsg(31305)),       ' Nessuno
-                            New IdNameStruct(MCH_SCC.STD, EgtMsg(31306)),        ' Standard
-                            New IdNameStruct(MCH_SCC.OPPOSITE, EgtMsg(31307)),   ' Opposto
-                            New IdNameStruct(MCH_SCC.ADIR_XP, EgtMsg(31308)),    ' AuxDir Destra
-                            New IdNameStruct(MCH_SCC.ADIR_XM, EgtMsg(31309)),    ' AuxDir Sinistra
-                            New IdNameStruct(MCH_SCC.ADIR_YP, EgtMsg(31310)),    ' AuxDir Dietro
-                            New IdNameStruct(MCH_SCC.ADIR_YM, EgtMsg(31311)),    ' AuxDir Davanti
-                            New IdNameStruct(MCH_SCC.ADIR_ZP, EgtMsg(31312)),    ' AuxDir Sopra
-                            New IdNameStruct(MCH_SCC.ADIR_ZM, EgtMsg(31313)),    ' AuxDir Sotto
-                            New IdNameStruct(MCH_SCC.ADIR_NEAR, EgtMsg(31314)),  ' Più Vicino AuxDir
-                            New IdNameStruct(MCH_SCC.ADIR_FAR, EgtMsg(31315))})  ' Più Lontano AuxDir
+                           {New IdNameStruct(MCH_SCC.NONE, EgtMsg(MSG_MACHININGDB + 105)),
+                            New IdNameStruct(MCH_SCC.STD, EgtMsg(MSG_MACHININGDB + 106)),
+                            New IdNameStruct(MCH_SCC.OPPOSITE, EgtMsg(MSG_MACHININGDB + 107)),
+                            New IdNameStruct(MCH_SCC.ADIR_XP, EgtMsg(MSG_MACHININGDB + 108)),
+                            New IdNameStruct(MCH_SCC.ADIR_XM, EgtMsg(MSG_MACHININGDB + 109)),
+                            New IdNameStruct(MCH_SCC.ADIR_YP, EgtMsg(MSG_MACHININGDB + 110)),
+                            New IdNameStruct(MCH_SCC.ADIR_YM, EgtMsg(MSG_MACHININGDB + 111)),
+                            New IdNameStruct(MCH_SCC.ADIR_ZP, EgtMsg(MSG_MACHININGDB + 112)),
+                            New IdNameStruct(MCH_SCC.ADIR_ZM, EgtMsg(MSG_MACHININGDB + 113)),
+                            New IdNameStruct(MCH_SCC.ADIR_NEAR, EgtMsg(MSG_MACHININGDB + 114)),
+                            New IdNameStruct(MCH_SCC.ADIR_FAR, EgtMsg(MSG_MACHININGDB + 115))})
    Public ReadOnly Property SolChoiceTypeList As ObservableCollection(Of Object)
       Get
          Return m_SolChoiceTypeList
@@ -1359,7 +1356,7 @@ Public Class MachiningTreeViewItem
                   DbSolChoiceType = IdNameStruct.IndFromId(DbSolChoiceType, SolChoiceTypeList)
                   m_IsModifiedSelectedSolChoiceType = value <> DbSolChoiceType
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
-                  NotifyPropertyChanged(NameOf(SelectedSolChoiceType))
+                  NotifyPropertyChanged("SelectedSolChoiceType")
                Else
                   Dim OrigSolChoiceType As Integer = 0
                   EgtGetMachiningParam(MCH_MP.SOLCHOICETYPE, OrigSolChoiceType)
@@ -1418,7 +1415,7 @@ Public Class MachiningTreeViewItem
                End If
                RaiseEvent m_IsModified(IsModified())
             End If
-            NotifyPropertyChanged(NameOf(Speed))
+            NotifyPropertyChanged("Speed")
          End If
       End Set
    End Property
@@ -1450,7 +1447,7 @@ Public Class MachiningTreeViewItem
                   FeedChecked = Math.Abs(dVal - dValue) < 10 * EPS_ANG_SMALL
                End If
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
-               NotifyPropertyChanged(NameOf(Feed))
+               NotifyPropertyChanged("Feed")
             Else
                Dim OrigFeed As Double = 0
                Dim dValue As Double = 0
@@ -1466,7 +1463,7 @@ Public Class MachiningTreeViewItem
                m_delErrorOnMachining(Not IsValid)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             End If
-            NotifyPropertyChanged(NameOf(Feed))
+            NotifyPropertyChanged("Feed")
          End If
       End Set
    End Property
@@ -1498,7 +1495,7 @@ Public Class MachiningTreeViewItem
                   StartFeedChecked = Math.Abs(dVal - dValue) < 10 * EPS_ANG_SMALL
                End If
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
-               NotifyPropertyChanged(NameOf(StartFeed))
+               NotifyPropertyChanged("StartFeed")
             Else
                Dim OrigStartFeed As Double = 0
                Dim dValue As Double = 0
@@ -1514,7 +1511,7 @@ Public Class MachiningTreeViewItem
                m_delErrorOnMachining(Not IsValid)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             End If
-            NotifyPropertyChanged(NameOf(StartFeed))
+            NotifyPropertyChanged("StartFeed")
          End If
       End Set
    End Property
@@ -1546,7 +1543,7 @@ Public Class MachiningTreeViewItem
                   EndFeedChecked = Math.Abs(dVal - dValue) < 10 * EPS_ANG_SMALL
                End If
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
-               NotifyPropertyChanged(NameOf(EndFeed))
+               NotifyPropertyChanged("EndFeed")
             Else
                Dim OrigEndFeed As Double = 0
                Dim dValue As Double = 0
@@ -1562,7 +1559,7 @@ Public Class MachiningTreeViewItem
                m_delErrorOnMachining(Not IsValid)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             End If
-            NotifyPropertyChanged(NameOf(EndFeed))
+            NotifyPropertyChanged("EndFeed")
          End If
       End Set
    End Property
@@ -1594,7 +1591,7 @@ Public Class MachiningTreeViewItem
                   TipFeedChecked = Math.Abs(dVal - dValue) < 10 * EPS_ANG_SMALL
                End If
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
-               NotifyPropertyChanged(NameOf(TipFeed))
+               NotifyPropertyChanged("TipFeed")
             Else
                Dim OrigTipFeed As Double = 0
                Dim dValue As Double = 0
@@ -1610,7 +1607,7 @@ Public Class MachiningTreeViewItem
                m_delErrorOnMachining(Not IsValid)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             End If
-            NotifyPropertyChanged(NameOf(TipFeed))
+            NotifyPropertyChanged("TipFeed")
          End If
       End Set
    End Property
@@ -1642,7 +1639,7 @@ Public Class MachiningTreeViewItem
                   BackFeedChecked = Math.Abs(dVal - dValue) < 10 * EPS_ANG_SMALL
                End If
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
-               NotifyPropertyChanged(NameOf(BackFeed))
+               NotifyPropertyChanged("BackFeed")
             Else
                Dim OrigBackFeed As Double = 0
                Dim dValue As Double = 0
@@ -1658,7 +1655,7 @@ Public Class MachiningTreeViewItem
                m_delErrorOnMachining(Not IsValid)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             End If
-            NotifyPropertyChanged(NameOf(BackFeed))
+            NotifyPropertyChanged("BackFeed")
          End If
       End Set
    End Property
@@ -1690,7 +1687,7 @@ Public Class MachiningTreeViewItem
                   SideAngFeedChecked = Math.Abs(dVal - dValue) < 10 * EPS_ANG_SMALL
                End If
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
-               NotifyPropertyChanged(NameOf(SideAngFeed))
+               NotifyPropertyChanged("SideAngFeed")
             Else
                Dim OrigSideAngFeed As Double = 0
                Dim dValue As Double = 0
@@ -1706,7 +1703,7 @@ Public Class MachiningTreeViewItem
                m_delErrorOnMachining(Not IsValid)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             End If
-            NotifyPropertyChanged(NameOf(SideAngFeed))
+            NotifyPropertyChanged("SideAngFeed")
          End If
       End Set
    End Property
@@ -1744,7 +1741,7 @@ Public Class MachiningTreeViewItem
                m_IsModifiedThicknessFeed = Math.Abs(dValue - OrigThicknessFeed) > 10 * EPS_SMALL
                RaiseEvent m_IsModified(IsModified())
             End If
-            NotifyPropertyChanged(NameOf(ThicknessFeed))
+            NotifyPropertyChanged("ThicknessFeed")
          End If
       End Set
    End Property
@@ -1776,7 +1773,7 @@ Public Class MachiningTreeViewItem
                   OffSrChecked = Math.Abs(dVal - dValue) < 10 * EPS_ANG_SMALL
                End If
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
-               NotifyPropertyChanged(NameOf(OffSr))
+               NotifyPropertyChanged("OffSr")
             Else
                Dim OrigOffSr As Double = 0
                Dim dValue As Double = 0
@@ -1792,7 +1789,7 @@ Public Class MachiningTreeViewItem
                m_delErrorOnMachining(Not IsValid)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             End If
-            NotifyPropertyChanged(NameOf(OffSr))
+            NotifyPropertyChanged("OffSr")
          End If
       End Set
    End Property
@@ -1824,7 +1821,7 @@ Public Class MachiningTreeViewItem
                   OffSlChecked = Math.Abs(dVal - dValue) < 10 * EPS_ANG_SMALL
                End If
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
-               NotifyPropertyChanged(NameOf(OffSl))
+               NotifyPropertyChanged("OffSl")
             Else
                Dim OrigOffSl As Double = 0
                Dim dValue As Double = 0
@@ -1840,7 +1837,7 @@ Public Class MachiningTreeViewItem
                m_delErrorOnMachining(Not IsValid)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             End If
-            NotifyPropertyChanged(NameOf(OffSl))
+            NotifyPropertyChanged("OffSl")
          End If
       End Set
    End Property
@@ -1863,8 +1860,16 @@ Public Class MachiningTreeViewItem
                EgtMdbGetCurrMachiningParam(MCH_MP.EPICYCLESRAD, DbEpicyclesRad)
                StringToLen(value, dValue)
                m_IsModifiedEpicyclesRad = Math.Abs(dValue - DbEpicyclesRad) > 10 * EPS_SMALL
+               'If SelectedTool >= 0 And SelectedTool < m_ToolList.Count Then
+               '   ' Setto l'Utensile corrente a quello selezionato e leggo il parametro corrispondente dal Db Utensili
+               '   EgtTdbSetCurrTool(m_ToolList(SelectedTool))
+               '   Dim dVal As Double = 0
+               '   EgtTdbGetCurrToolParam(MCH_TP.EPICYCLESRAD, dVal)
+               '   ' Se il valore del parametro corrispondente è uguale a quello appena immesso setto il bottone a "premuto" altrimenti a "non premuto"
+               '   EpicyclesRadChecked = Math.Abs(dVal - dValue) < 10 * EPS_ANG_SMALL
+               'End If
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
-               NotifyPropertyChanged(NameOf(EpicyclesRad))
+               NotifyPropertyChanged("EpicyclesRad")
             Else
                Dim OrigEpicyclesRad As Double = 0
                Dim dValue As Double = 0
@@ -1880,7 +1885,7 @@ Public Class MachiningTreeViewItem
                m_delErrorOnMachining(Not IsValid)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             End If
-            NotifyPropertyChanged(NameOf(EpicyclesRad))
+            NotifyPropertyChanged("EpicyclesRad")
          End If
       End Set
    End Property
@@ -1903,8 +1908,16 @@ Public Class MachiningTreeViewItem
                EgtMdbGetCurrMachiningParam(MCH_MP.EPICYCLESDIST, DbEpicyclesDist)
                StringToLen(value, dValue)
                m_IsModifiedEpicyclesDist = Math.Abs(dValue - DbEpicyclesDist) > 10 * EPS_SMALL
+               'If SelectedTool >= 0 And SelectedTool < m_ToolList.Count Then
+               '   ' Setto l'Utensile corrente a quello selezionato e leggo il parametro corrispondente dal Db Utensili
+               '   EgtTdbSetCurrTool(m_ToolList(SelectedTool))
+               '   Dim dVal As Double = 0
+               '   EgtTdbGetCurrToolParam(MCH_TP.EPICYCLESDIST, dVal)
+               '   ' Se il valore del parametro corrispondente è uguale a quello appena immesso setto il bottone a "premuto" altrimenti a "non premuto"
+               '   EpicyclesDistChecked = Math.Abs(dVal - dValue) < 10 * EPS_ANG_SMALL
+               'End If
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
-               NotifyPropertyChanged(NameOf(EpicyclesDist))
+               NotifyPropertyChanged("EpicyclesDist")
             Else
                Dim OrigEpicyclesDist As Double = 0
                Dim dValue As Double = 0
@@ -1920,7 +1933,7 @@ Public Class MachiningTreeViewItem
                m_delErrorOnMachining(Not IsValid)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             End If
-            NotifyPropertyChanged(NameOf(EpicyclesDist))
+            NotifyPropertyChanged("EpicyclesDist")
          End If
       End Set
    End Property
@@ -1935,7 +1948,7 @@ Public Class MachiningTreeViewItem
       End Get
       Set(value As Visibility)
          m_Epicycles_Visibility = value
-         NotifyPropertyChanged(NameOf(Epicycles_Visibility))
+         NotifyPropertyChanged("Epicycles_Visibility")
       End Set
    End Property
 
@@ -1964,7 +1977,7 @@ Public Class MachiningTreeViewItem
                   m_delErrorOnMachining(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(SideAngle))
+               NotifyPropertyChanged("SideAngle")
             Else
                Dim OrigSideAngle As Double = 0
                Dim dValue As Double = 0
@@ -2002,7 +2015,7 @@ Public Class MachiningTreeViewItem
                   m_delErrorOnMachining(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(Approx))
+               NotifyPropertyChanged("Approx")
             Else
                Dim OrigApprox As Double = 0
                Dim dValue As Double = 0
@@ -2040,7 +2053,7 @@ Public Class MachiningTreeViewItem
                   m_delErrorOnMachining(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(StartPos))
+               NotifyPropertyChanged("StartPos")
             Else
                Dim OrigStartPos As Double = 0
                Dim dValue As Double = 0
@@ -2078,7 +2091,7 @@ Public Class MachiningTreeViewItem
                   m_delErrorOnMachining(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(StartSlowLen))
+               NotifyPropertyChanged("StartSlowLen")
             Else
                Dim OrigStartSlowLen As Double = 0
                Dim dValue As Double = 0
@@ -2116,7 +2129,7 @@ Public Class MachiningTreeViewItem
                   m_delErrorOnMachining(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(EndSlowLen))
+               NotifyPropertyChanged("EndSlowLen")
             Else
                Dim OrigEndSlowLen As Double = 0
                Dim dValue As Double = 0
@@ -2192,7 +2205,7 @@ Public Class MachiningTreeViewItem
                   m_delErrorOnMachining(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(StepPar))
+               NotifyPropertyChanged("StepPar")
             Else
                Dim OrigStepPar As Double = 0
                Dim dValue As Double = 0
@@ -2230,7 +2243,7 @@ Public Class MachiningTreeViewItem
                   m_delErrorOnMachining(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(StepBack))
+               NotifyPropertyChanged("StepBack")
             Else
                Dim OrigStepBack As Double = 0
                Dim dValue As Double = 0
@@ -2268,7 +2281,7 @@ Public Class MachiningTreeViewItem
                   m_delErrorOnMachining(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(StepLast))
+               NotifyPropertyChanged("StepLast")
             Else
                Dim OrigStepLast As Double = 0
                Dim dValue As Double = 0
@@ -2306,7 +2319,7 @@ Public Class MachiningTreeViewItem
                   m_delErrorOnMachining(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(ReturnPos))
+               NotifyPropertyChanged("ReturnPos")
             Else
                Dim OrigReturnPos As Double = 0
                Dim dValue As Double = 0
@@ -2344,7 +2357,7 @@ Public Class MachiningTreeViewItem
                   m_delErrorOnMachining(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(OverLap))
+               NotifyPropertyChanged("OverLap")
             Else
                Dim OrigOverLap As Double = 0
                Dim dValue As Double = 0
@@ -2382,7 +2395,7 @@ Public Class MachiningTreeViewItem
                   m_delErrorOnMachining(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(TabLen))
+               NotifyPropertyChanged("TabLen")
             Else
                Dim OrigTabLen As Double = 0
                Dim dValue As Double = 0
@@ -2425,7 +2438,7 @@ Public Class MachiningTreeViewItem
                   m_delErrorOnMachining(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(TabDist))
+               NotifyPropertyChanged("TabDist")
             Else
                Dim OrigTabDist As Double = 0
                Dim dValue As Double = 0
@@ -2468,7 +2481,7 @@ Public Class MachiningTreeViewItem
                   m_delErrorOnMachining(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(TabHeight))
+               NotifyPropertyChanged("TabHeight")
             Else
                Dim OrigTabHeight As Double = 0
                Dim dValue As Double = 0
@@ -2511,7 +2524,7 @@ Public Class MachiningTreeViewItem
                   m_delErrorOnMachining(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(TabAngle))
+               NotifyPropertyChanged("TabAngle")
             Else
                Dim OrigTabAngle As Double = 0
                Dim dValue As Double = 0
@@ -2567,7 +2580,7 @@ Public Class MachiningTreeViewItem
                End If
                RaiseEvent m_IsModified(IsModified())
             End If
-            NotifyPropertyChanged(NameOf(TabMax))
+            NotifyPropertyChanged("TabMax")
          End If
       End Set
    End Property
@@ -2610,7 +2623,7 @@ Public Class MachiningTreeViewItem
                End If
                RaiseEvent m_IsModified(IsModified())
             End If
-            NotifyPropertyChanged(NameOf(TabMin))
+            NotifyPropertyChanged("TabMin")
          End If
       End Set
    End Property
@@ -2640,7 +2653,7 @@ Public Class MachiningTreeViewItem
                   m_delErrorOnMachining(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(LiTang))
+               NotifyPropertyChanged("LiTang")
             Else
                Dim OrigLiTang As Double = 0
                Dim dValue As Double = 0
@@ -2678,7 +2691,7 @@ Public Class MachiningTreeViewItem
                   m_delErrorOnMachining(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(LiPerp))
+               NotifyPropertyChanged("LiPerp")
             Else
                Dim OrigLiPerp As Double = 0
                Dim dValue As Double = 0
@@ -2716,7 +2729,7 @@ Public Class MachiningTreeViewItem
                   m_delErrorOnMachining(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(LiElev))
+               NotifyPropertyChanged("LiElev")
             Else
                Dim OrigLiElev As Double = 0
                Dim dValue As Double = 0
@@ -2754,7 +2767,7 @@ Public Class MachiningTreeViewItem
                   m_delErrorOnMachining(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(LiCompLen))
+               NotifyPropertyChanged("LiCompLen")
             Else
                Dim OrigLiCompLen As Double = 0
                Dim dValue As Double = 0
@@ -2792,7 +2805,7 @@ Public Class MachiningTreeViewItem
                   m_delErrorOnMachining(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(LoTang))
+               NotifyPropertyChanged("LoTang")
             Else
                Dim OrigLoTang As Double = 0
                Dim dValue As Double = 0
@@ -2830,7 +2843,7 @@ Public Class MachiningTreeViewItem
                   m_delErrorOnMachining(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(LoPerp))
+               NotifyPropertyChanged("LoPerp")
             Else
                Dim OrigLoPerp As Double = 0
                Dim dValue As Double = 0
@@ -2868,7 +2881,7 @@ Public Class MachiningTreeViewItem
                   m_delErrorOnMachining(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(LoElev))
+               NotifyPropertyChanged("LoElev")
             Else
                Dim OrigLoElev As Double = 0
                Dim dValue As Double = 0
@@ -2906,7 +2919,7 @@ Public Class MachiningTreeViewItem
                   m_delErrorOnMachining(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(LoCompLen))
+               NotifyPropertyChanged("LoCompLen")
             Else
                Dim OrigLoCompLen As Double = 0
                Dim dValue As Double = 0
@@ -2944,7 +2957,7 @@ Public Class MachiningTreeViewItem
                   m_delErrorOnMachining(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(StartAddLen))
+               NotifyPropertyChanged("StartAddLen")
             Else
                Dim OrigStartAddLen As Double = 0
                Dim dValue As Double = 0
@@ -2982,7 +2995,7 @@ Public Class MachiningTreeViewItem
                   m_delErrorOnMachining(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(EndAddLen))
+               NotifyPropertyChanged("EndAddLen")
             Else
                Dim OrigEndAddLen As Double = 0
                Dim dValue As Double = 0
@@ -3020,7 +3033,7 @@ Public Class MachiningTreeViewItem
                   m_delErrorOnMachining(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(StepExtArc))
+               NotifyPropertyChanged("StepExtArc")
             Else
                Dim OrigStepExtArc As Double = 0
                Dim dValue As Double = 0
@@ -3058,7 +3071,7 @@ Public Class MachiningTreeViewItem
                   m_delErrorOnMachining(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(StepIntArc))
+               NotifyPropertyChanged("StepIntArc")
             Else
                Dim OrigStepIntArc As Double = 0
                Dim dValue As Double = 0
@@ -3096,7 +3109,7 @@ Public Class MachiningTreeViewItem
                   m_delErrorOnMachining(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(SideStep))
+               NotifyPropertyChanged("SideStep")
             Else
                Dim OrigSideStep As Double = 0
                Dim dValue As Double = 0
@@ -3172,7 +3185,7 @@ Public Class MachiningTreeViewItem
                   m_delErrorOnMachining(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(StepSideAng))
+               NotifyPropertyChanged("StepSideAng")
             Else
                Dim OrigStepSideAng As Double = 0
                Dim dValue As Double = 0
@@ -3210,7 +3223,7 @@ Public Class MachiningTreeViewItem
                   m_delErrorOnMachining(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(StepSideAngBack))
+               NotifyPropertyChanged("StepSideAngBack")
             Else
                Dim OrigStepSideAngBack As Double = 0
                Dim dValue As Double = 0
@@ -3250,7 +3263,7 @@ Public Class MachiningTreeViewItem
                   VertFeedChecked = Math.Abs(dVal - dValue) < 10 * EPS_ANG_SMALL
                End If
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
-               NotifyPropertyChanged(NameOf(VertFeed))
+               NotifyPropertyChanged("VertFeed")
             Else
                Dim OrigVertFeed As Double = 0
                Dim dValue As Double = 0
@@ -3266,7 +3279,7 @@ Public Class MachiningTreeViewItem
                m_delErrorOnMachining(Not IsValid)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             End If
-            NotifyPropertyChanged(NameOf(VertFeed))
+            NotifyPropertyChanged("VertFeed")
          End If
       End Set
    End Property
@@ -3287,8 +3300,7 @@ Public Class MachiningTreeViewItem
                   ' L'abilitazione di {0} disabiliterà {1}. Procedere? - Oscillazione - Tab
                   Dim sMsg As String = String.Format(EgtMsg(31419), EgtMsg(31382), EgtMsg(31252))
                   ' Chiedo autorizzazione a procedere : ATTENZIONE
-                  'If MessageBox.Show(sMsg, EgtMsg(31614), MessageBoxButton.YesNo, MessageBoxImage.Question) <> MessageBoxResult.Yes Then
-                  If EgtMessageBoxV.Show(Application.Current.MainWindow, sMsg, EgtMsg(31614), MessageBoxButton.YesNo, MessageBoxImage.Question) <> MessageBoxResult.Yes Then  ' ATTENZIONE
+                  If MessageBox.Show(sMsg, EgtMsg(31614), MessageBoxButton.YesNo, MessageBoxImage.Question) <> MessageBoxResult.Yes Then
                      Return
                   Else
                      LeaveTab = Not LeaveTab
@@ -3307,7 +3319,7 @@ Public Class MachiningTreeViewItem
                m_IsModifiedOscEnable = value <> OrigOscEnable
                RaiseEvent m_IsModified(IsModified())
             End If
-            NotifyPropertyChanged(NameOf(OscEnable))
+            NotifyPropertyChanged("OscEnable")
          End If
       End Set
    End Property
@@ -3337,7 +3349,7 @@ Public Class MachiningTreeViewItem
                   m_delErrorOnMachining(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(OscHeight))
+               NotifyPropertyChanged("OscHeight")
             Else
                Dim OrigOscHeight As Double = 0
                Dim dValue As Double = 0
@@ -3375,7 +3387,7 @@ Public Class MachiningTreeViewItem
                   m_delErrorOnMachining(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(OscRampLen))
+               NotifyPropertyChanged("OscRampLen")
             Else
                Dim OrigOscRampLen As Double = 0
                Dim dValue As Double = 0
@@ -3413,7 +3425,7 @@ Public Class MachiningTreeViewItem
                   m_delErrorOnMachining(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(OscFlatLen))
+               NotifyPropertyChanged("OscFlatLen")
             Else
                Dim OrigOscFlatLen As Double = 0
                Dim dValue As Double = 0
@@ -3450,14 +3462,14 @@ Public Class MachiningTreeViewItem
             If m_IsModifiedName And Not value = sTempName Then
                nErrorMachiningName = 1
             End If
-            If Not GetValidationError(NameOf(NamePar)) Then
+            If Not GetValidationError("NamePar") Then
                m_delErrorOnMachining(True)
                m_delIsEnabledBtns(False, False, True)
             Else
                m_delErrorOnMachining(Not IsValid)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             End If
-            NotifyPropertyChanged(NameOf(NamePar))
+            NotifyPropertyChanged("NamePar")
          End If
       End Set
    End Property
@@ -3593,7 +3605,7 @@ Public Class MachiningTreeViewItem
                End If
             End If
             m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
-            NotifyPropertyChanged(NameOf(SelectedTool))
+            NotifyPropertyChanged("SelectedTool")
          End If
       End Set
    End Property
@@ -3615,7 +3627,7 @@ Public Class MachiningTreeViewItem
                EgtMdbGetCurrMachiningParam(MCH_MP.DEPTH_STR, DbDepthStr)
                m_IsModifiedDepthStr = value <> DbDepthStr
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
-               NotifyPropertyChanged(NameOf(DepthStr))
+               NotifyPropertyChanged("DepthStr")
             Else
                Dim DbDepthStr As String = String.Empty
                EgtGetMachiningParam(MCH_MP.DEPTH_STR, DbDepthStr)
@@ -3681,7 +3693,7 @@ Public Class MachiningTreeViewItem
                EgtMdbGetCurrMachiningParam(MCH_MP.INITANGS, DbInitAngs)
                m_IsModifiedInitAngs = value <> DbInitAngs
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
-               NotifyPropertyChanged(NameOf(InitAngs))
+               NotifyPropertyChanged("InitAngs")
             Else
                Dim OrigInitAngs As String = String.Empty
                EgtGetMachiningParam(MCH_MP.INITANGS, OrigInitAngs)
@@ -3709,7 +3721,7 @@ Public Class MachiningTreeViewItem
                EgtMdbGetCurrMachiningParam(MCH_MP.BLOCKEDAXIS, DbBlockedAxis)
                m_IsModifiedBlockedAxis = value <> DbBlockedAxis
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
-               NotifyPropertyChanged(NameOf(BlockedAxis))
+               NotifyPropertyChanged("BlockedAxis")
             Else
                Dim OrigBlockedAxis As String = String.Empty
                EgtGetMachiningParam(MCH_MP.BLOCKEDAXIS, OrigBlockedAxis)
@@ -3741,7 +3753,7 @@ Public Class MachiningTreeViewItem
       Set(value As Boolean)
          If value <> m_IsValidTool Then
             m_IsValidTool = value
-            NotifyPropertyChanged(NameOf(ToolColor))
+            NotifyPropertyChanged("ToolColor")
          End If
       End Set
    End Property
@@ -3779,7 +3791,7 @@ Public Class MachiningTreeViewItem
                m_IsModifiedForwardAngle = Math.Abs(dValue - OrigForwardAngle) > 10 * EPS_SMALL
                RaiseEvent m_IsModified(IsModified())
             End If
-            NotifyPropertyChanged(NameOf(ForwardAngle))
+            NotifyPropertyChanged("ForwardAngle")
          End If
       End Set
    End Property
@@ -3807,7 +3819,7 @@ Public Class MachiningTreeViewItem
                m_IsModifiedProbing = value <> OrigProbing
                RaiseEvent m_IsModified(IsModified())
             End If
-            NotifyPropertyChanged(NameOf(Probing))
+            NotifyPropertyChanged("Probing")
          End If
       End Set
    End Property
@@ -3845,7 +3857,7 @@ Public Class MachiningTreeViewItem
                m_IsModifiedProbingMinDist = Math.Abs(dValue - OrigProbingMinDist) > 10 * EPS_SMALL
                RaiseEvent m_IsModified(IsModified())
             End If
-            NotifyPropertyChanged(NameOf(ProbingMinDist))
+            NotifyPropertyChanged("ProbingMinDist")
          End If
       End Set
    End Property
@@ -3883,13 +3895,13 @@ Public Class MachiningTreeViewItem
                m_IsModifiedProbingMaxDist = Math.Abs(dValue - OrigProbingMaxDist) > 10 * EPS_SMALL
                RaiseEvent m_IsModified(IsModified())
             End If
-            NotifyPropertyChanged(NameOf(ProbingMaxDist))
+            NotifyPropertyChanged("ProbingMaxDist")
          End If
       End Set
    End Property
 
    'ObservableCollection che contiene le variabili per il combobox ExtCornType
-   Private m_ExtCornTypeList As New ObservableCollection(Of Object)({New IdNameStruct(MCH_WATERJET_EC.NONE, EgtMsg(31391)), New IdNameStruct(MCH_WATERJET_EC.SLOW, EgtMsg(31392)), New IdNameStruct(MCH_WATERJET_EC.LOOP_, EgtMsg(31393))})  ' Normale - Rallenta - Anello
+   Private m_ExtCornTypeList As New ObservableCollection(Of Object)({New IdNameStruct(MCH_WATERJET_EC.NONE, EgtMsg(31391)), New IdNameStruct(MCH_WATERJET_EC.SLOW, EgtMsg(31392)), New IdNameStruct(MCH_WATERJET_EC.LOOP_, EgtMsg(31393))})
    Public ReadOnly Property ExtCornTypeList As ObservableCollection(Of Object)
       Get
          Return m_ExtCornTypeList
@@ -3920,14 +3932,14 @@ Public Class MachiningTreeViewItem
                   m_IsModifiedSelectedExtCornType = value <> OrigExtCornType
                   RaiseEvent m_IsModified(IsModified())
                End If
-               NotifyPropertyChanged(NameOf(SelectedExtCornType))
+               NotifyPropertyChanged("SelectedExtCornType")
             End If
          End If
       End Set
    End Property
 
    'ObservableCollection che contiene le variabili per il combobox IntCornType
-   Private m_IntCornTypeList As New ObservableCollection(Of Object)({New IdNameStruct(MCH_WATERJET_IC.NONE, EgtMsg(31391)), New IdNameStruct(MCH_WATERJET_IC.SLOW, EgtMsg(31392)), New IdNameStruct(MCH_WATERJET_IC.SLOW_FULL, EgtMsg(31420))})  ' Normale - Rallenta - Rallenta Tutto
+   Private m_IntCornTypeList As New ObservableCollection(Of Object)({New IdNameStruct(MCH_WATERJET_IC.NONE, EgtMsg(31391)), New IdNameStruct(MCH_WATERJET_IC.SLOW, EgtMsg(31392)), New IdNameStruct(MCH_WATERJET_IC.SLOW_FULL, EgtMsg(31420))})
    Public ReadOnly Property IntCornTypeList As ObservableCollection(Of Object)
       Get
          Return m_IntCornTypeList
@@ -3952,7 +3964,7 @@ Public Class MachiningTreeViewItem
                   DbIntCornType = IdNameStruct.IndFromId(DbIntCornType, IntCornTypeList)
                   m_IsModifiedSelectedIntCornType = value <> DbIntCornType
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
-                  NotifyPropertyChanged(NameOf(SelectedIntCornType))
+                  NotifyPropertyChanged("SelectedIntCornType")
                Else
                   Dim OrigIntCornType As Integer = 0
                   EgtGetMachiningParam(MCH_MP.INTCORNERTYPE, OrigIntCornType)
@@ -3998,7 +4010,7 @@ Public Class MachiningTreeViewItem
                m_IsModifiedCornSlowLen = Math.Abs(dValue - OrigCornSlowLen) > 10 * EPS_SMALL
                RaiseEvent m_IsModified(IsModified())
             End If
-            NotifyPropertyChanged(NameOf(CornSlowLen))
+            NotifyPropertyChanged("CornSlowLen")
          End If
       End Set
    End Property
@@ -4036,7 +4048,7 @@ Public Class MachiningTreeViewItem
                m_IsModifiedCornSlowPerc = Math.Abs(nValue - OrigCornSlowPerc) > 10 * EPS_SMALL
                RaiseEvent m_IsModified(IsModified())
             End If
-            NotifyPropertyChanged(NameOf(CornSlowPerc))
+            NotifyPropertyChanged("CornSlowPerc")
          End If
       End Set
    End Property
@@ -4064,7 +4076,7 @@ Public Class MachiningTreeViewItem
                m_IsModifiedLiHole = value <> OrigLiHole
                RaiseEvent m_IsModified(IsModified())
             End If
-            NotifyPropertyChanged(NameOf(LiHole))
+            NotifyPropertyChanged("LiHole")
          End If
       End Set
    End Property
@@ -4102,7 +4114,7 @@ Public Class MachiningTreeViewItem
                m_IsModifiedLiHoleRad = Math.Abs(dValue - OrigLiHoleRad) > 10 * EPS_SMALL
                RaiseEvent m_IsModified(IsModified())
             End If
-            NotifyPropertyChanged(NameOf(LiHoleRad))
+            NotifyPropertyChanged("LiHoleRad")
          End If
       End Set
    End Property
@@ -4140,7 +4152,7 @@ Public Class MachiningTreeViewItem
                m_IsModifiedLpTurns = Math.Abs(nValue - OrigLpTurns) > 10 * EPS_SMALL
                RaiseEvent m_IsModified(IsModified())
             End If
-            NotifyPropertyChanged(NameOf(LpTurns))
+            NotifyPropertyChanged("LpTurns")
          End If
       End Set
    End Property
@@ -4178,7 +4190,7 @@ Public Class MachiningTreeViewItem
                m_IsModifiedHpTurns = Math.Abs(nValue - OrigHpTurns) > 10 * EPS_SMALL
                RaiseEvent m_IsModified(IsModified())
             End If
-            NotifyPropertyChanged(NameOf(HpTurns))
+            NotifyPropertyChanged("HpTurns")
          End If
       End Set
    End Property
@@ -4215,7 +4227,7 @@ Public Class MachiningTreeViewItem
       Set(value As String)
          m_SystemNotes = value
          If (m_CurrMachTreeViewItemType = MachTreeViewItemType.MACH_DB) Then
-            NotifyPropertyChanged(NameOf(SystemNotes))
+            NotifyPropertyChanged("SystemNotes")
          End If
       End Set
    End Property
@@ -4276,7 +4288,7 @@ Public Class MachiningTreeViewItem
             ' Aggiorno il valore immesso nella TextBox con quello letto dal Db Utensili
             Speed = DoubleToString(dVal, 4)
          End If
-         NotifyPropertyChanged(NameOf(SpeedChecked))
+         NotifyPropertyChanged("SpeedChecked")
       End Set
    End Property
 
@@ -4297,7 +4309,7 @@ Public Class MachiningTreeViewItem
             ' Aggiorno il valore immesso nella TextBox con quello letto dal Db Utensili
             Feed = LenToString(dVal, 4)
          End If
-         NotifyPropertyChanged(NameOf(FeedChecked))
+         NotifyPropertyChanged("FeedChecked")
       End Set
    End Property
 
@@ -4318,7 +4330,7 @@ Public Class MachiningTreeViewItem
             ' Aggiorno il valore immesso nella TextBox con quello letto dal Db Utensili
             StartFeed = LenToString(dVal, 4)
          End If
-         NotifyPropertyChanged(NameOf(StartFeedChecked))
+         NotifyPropertyChanged("StartFeedChecked")
       End Set
    End Property
 
@@ -4339,7 +4351,7 @@ Public Class MachiningTreeViewItem
             ' Aggiorno il valore immesso nella TextBox con quello letto dal Db Utensili
             EndFeed = LenToString(dVal, 4)
          End If
-         NotifyPropertyChanged(NameOf(EndFeedChecked))
+         NotifyPropertyChanged("EndFeedChecked")
       End Set
    End Property
 
@@ -4360,7 +4372,7 @@ Public Class MachiningTreeViewItem
             ' Aggiorno il valore immesso nella TextBox con quello letto dal Db Utensili
             TipFeed = LenToString(dVal, 4)
          End If
-         NotifyPropertyChanged(NameOf(TipFeedChecked))
+         NotifyPropertyChanged("TipFeedChecked")
       End Set
    End Property
 
@@ -4381,7 +4393,7 @@ Public Class MachiningTreeViewItem
             ' Aggiorno il valore immesso nella TextBox con quello letto dal Db Utensili
             BackFeed = LenToString(dVal, 4)
          End If
-         NotifyPropertyChanged(NameOf(BackFeedChecked))
+         NotifyPropertyChanged("BackFeedChecked")
       End Set
    End Property
 
@@ -4402,7 +4414,7 @@ Public Class MachiningTreeViewItem
             ' Aggiorno il valore immesso nella TextBox con quello letto dal Db Utensili
             SideAngFeed = LenToString(dVal, 4)
          End If
-         NotifyPropertyChanged(NameOf(SideAngFeedChecked))
+         NotifyPropertyChanged("SideAngFeedChecked")
       End Set
    End Property
 
@@ -4423,7 +4435,7 @@ Public Class MachiningTreeViewItem
             ' Aggiorno il valore immesso nella TextBox con quello letto dal Db Utensili
             VertFeed = LenToString(dVal, 4)
          End If
-         NotifyPropertyChanged(NameOf(VertFeedChecked))
+         NotifyPropertyChanged("VertFeedChecked")
       End Set
    End Property
 
@@ -4444,7 +4456,7 @@ Public Class MachiningTreeViewItem
             ' Aggiorno il valore immesso nella TextBox con quello letto dal Db Utensili
             OffSr = LenToString(dVal, 4)
          End If
-         NotifyPropertyChanged(NameOf(OffSrChecked))
+         NotifyPropertyChanged("OffSrChecked")
       End Set
    End Property
 
@@ -4465,7 +4477,7 @@ Public Class MachiningTreeViewItem
             ' Aggiorno il valore immesso nella TextBox con quello letto dal Db Utensili
             OffSl = LenToString(dVal, 4)
          End If
-         NotifyPropertyChanged(NameOf(OffSlChecked))
+         NotifyPropertyChanged("OffSlChecked")
       End Set
    End Property
 
@@ -4476,7 +4488,7 @@ Public Class MachiningTreeViewItem
       End Get
       Set(value As Boolean)
          m_SpeedEnabled = value
-         NotifyPropertyChanged(NameOf(SpeedEnabled))
+         NotifyPropertyChanged("SpeedEnabled")
       End Set
    End Property
 
@@ -4487,7 +4499,7 @@ Public Class MachiningTreeViewItem
       End Get
       Set(value As Boolean)
          m_FeedEnabled = value
-         NotifyPropertyChanged(NameOf(FeedEnabled))
+         NotifyPropertyChanged("FeedEnabled")
       End Set
    End Property
 
@@ -4498,7 +4510,7 @@ Public Class MachiningTreeViewItem
       End Get
       Set(value As Boolean)
          m_StartFeedEnabled = value
-         NotifyPropertyChanged(NameOf(StartFeedEnabled))
+         NotifyPropertyChanged("StartFeedEnabled")
       End Set
    End Property
 
@@ -4509,7 +4521,7 @@ Public Class MachiningTreeViewItem
       End Get
       Set(value As Boolean)
          m_EndFeedEnabled = value
-         NotifyPropertyChanged(NameOf(EndFeedEnabled))
+         NotifyPropertyChanged("EndFeedEnabled")
       End Set
    End Property
 
@@ -4520,7 +4532,7 @@ Public Class MachiningTreeViewItem
       End Get
       Set(value As Boolean)
          m_TipFeedEnabled = value
-         NotifyPropertyChanged(NameOf(TipFeedEnabled))
+         NotifyPropertyChanged("TipFeedEnabled")
       End Set
    End Property
 
@@ -4531,7 +4543,7 @@ Public Class MachiningTreeViewItem
       End Get
       Set(value As Boolean)
          m_BackFeedEnabled = value
-         NotifyPropertyChanged(NameOf(BackFeedEnabled))
+         NotifyPropertyChanged("BackFeedEnabled")
       End Set
    End Property
 
@@ -4542,7 +4554,7 @@ Public Class MachiningTreeViewItem
       End Get
       Set(value As Boolean)
          m_SideAngFeedEnabled = value
-         NotifyPropertyChanged(NameOf(SideAngFeedEnabled))
+         NotifyPropertyChanged("SideAngFeedEnabled")
       End Set
    End Property
 
@@ -4553,7 +4565,7 @@ Public Class MachiningTreeViewItem
       End Get
       Set(value As Boolean)
          m_VertFeedEnabled = value
-         NotifyPropertyChanged(NameOf(VertFeedEnabled))
+         NotifyPropertyChanged("VertFeedEnabled")
       End Set
    End Property
 
@@ -4564,7 +4576,7 @@ Public Class MachiningTreeViewItem
       End Get
       Set(value As Boolean)
          m_OffSrEnabled = value
-         NotifyPropertyChanged(NameOf(OffSrEnabled))
+         NotifyPropertyChanged("OffSrEnabled")
       End Set
    End Property
 
@@ -4575,10 +4587,13 @@ Public Class MachiningTreeViewItem
       End Get
       Set(value As Boolean)
          m_OffSlEnabled = value
-         NotifyPropertyChanged(NameOf(OffSlEnabled))
+         NotifyPropertyChanged("OffSlEnabled")
       End Set
    End Property
 
+   'EgtMdbGetCurrMachiningParam( MCH_MP.LIELEV, ToolDouble)
+   'SpecificStepTxBx.Text = LenToString(ToolDouble, 3)
+
 #End Region    ' Machining Property
 
 #Region "Operation Property"
@@ -4751,71 +4766,71 @@ Public Class MachiningTreeViewItem
    'Definizione dei messaggi della pagina
    Public ReadOnly Property InvertTxBl As String
       Get
-         Return EgtMsg(31251)    ' Inverti
+         Return EgtMsg(MSG_MACHININGDB + 51)
       End Get
    End Property
 
    Public ReadOnly Property LeaveTabTxBl As String
       Get
-         Return EgtMsg(31252)    ' Tab
+         Return EgtMsg(MSG_MACHININGDB + 52)
       End Get
    End Property
 
    Public ReadOnly Property WorkSideTxBl As String
       Get
-         Return EgtMsg(31254)    ' Lato di lavoro
+         Return EgtMsg(MSG_MACHININGDB + 54)
       End Get
    End Property
 
    Public ReadOnly Property HeadSideTxBl As String
       Get
-         Return EgtMsg(31255)    ' Lato della testa
+         Return EgtMsg(MSG_MACHININGDB + 55)
       End Get
    End Property
 
    Public ReadOnly Property LeadInTypeTxBl As String
       Get
-         Return EgtMsg(31256)    ' Attacco
+         Return EgtMsg(MSG_MACHININGDB + 56)
       End Get
    End Property
 
    Public ReadOnly Property StartAddLenTxBl As String
       Get
          If m_MatType = MaterialType.STONE And (m_Type = MCH_MY.SAWFINISHING Or m_Type = MCH_MY.SAWROUGHING) Then
-            Return EgtMsg(31396)    ' Inizio
+            Return EgtMsg(31396)             ' Inizio
          Else
-            Return EgtMsg(6291)     ' Lungh. addiz.
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 91)
          End If
       End Get
    End Property
 
    Public ReadOnly Property LiTangTxBl As String
       Get
-         Return EgtMsg(6283)     ' Dist. tangente
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 83)
       End Get
    End Property
 
    Public ReadOnly Property LiPerpTxBl As String
       Get
-         Return EgtMsg(6284)     ' Dist. perp.
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 84)
       End Get
    End Property
 
    Public ReadOnly Property LiElevTxBl As String
       Get
-         Return EgtMsg(6285)     ' Elevazione
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 85)
       End Get
    End Property
 
    Public ReadOnly Property LiCompLenTxBl As String
       Get
-         Return EgtMsg(6286)     ' Lungh. correz.
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 86)
       End Get
    End Property
 
    Public ReadOnly Property LeadOutTypeTxBl As String
       Get
-         Return EgtMsg(31258)    ' Uscita
+         Return EgtMsg(MSG_MACHININGDB + 58)
       End Get
    End Property
 
@@ -4824,50 +4839,50 @@ Public Class MachiningTreeViewItem
          If m_MatType = MaterialType.STONE And (m_Type = MCH_MY.SAWFINISHING Or m_Type = MCH_MY.SAWROUGHING) Then
             Return EgtMsg(31397)             ' Fine
          Else
-            Return EgtMsg(6292)              ' Lungh. addiz.
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 92)
          End If
       End Get
    End Property
 
    Public ReadOnly Property LoTangTxBl As String
       Get
-         Return EgtMsg(6287)     ' Dist. tangente
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 87)
       End Get
    End Property
 
    Public ReadOnly Property LoPerpTxBl As String
       Get
-         Return EgtMsg(6288)     ' Dist. perp.
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 88)
       End Get
    End Property
 
    Public ReadOnly Property LoElevTxBl As String
       Get
-         Return EgtMsg(6289)     ' Elevazione
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 89)
       End Get
    End Property
 
    Public ReadOnly Property LoCompLenTxBl As String
       Get
-         Return EgtMsg(6290)     ' Lungh. correz.
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 90)
       End Get
    End Property
 
    Public ReadOnly Property ExtLinkTypeTxBl As String
       Get
-         Return EgtMsg(31257)    ' Collegamento
+         Return EgtMsg(MSG_MACHININGDB + 57)
       End Get
    End Property
 
    Public ReadOnly Property CurveUseTxBl As String
       Get
-         Return EgtMsg(31259)    ' Uso curve
+         Return EgtMsg(MSG_MACHININGDB + 59)
       End Get
    End Property
 
    Public ReadOnly Property StepTypeTxBl As String
       Get
-         Return EgtMsg(31260)    ' Tipo di Step
+         Return EgtMsg(MSG_MACHININGDB + 60)
       End Get
    End Property
 
@@ -4876,38 +4891,38 @@ Public Class MachiningTreeViewItem
          If m_MatType = MaterialType.STONE Then
             Return EgtMsg(90770)             ' Collegamento
          Else
-            Return EgtMsg(31262)             ' Tipo approccio
+            Return EgtMsg(MSG_MACHININGDB + 62)             ' Tipo approccio
          End If
       End Get
    End Property
 
    Public ReadOnly Property InvertToolDirTxBl As String
       Get
-         Return EgtMsg(31351)    ' Inverti direz. utensile
+         Return EgtMsg(MSG_MACHININGDB + 151)
       End Get
    End Property
 
    Public ReadOnly Property FaceUseTypeTxBl As String
       Get
-         Return EgtMsg(31352)    ' Lavorazione faccia
+         Return EgtMsg(MSG_MACHININGDB + 152)
       End Get
    End Property
 
    Public ReadOnly Property InitAngsTxBl As String
       Get
-         Return EgtMsg(31364)               ' Angoli suggeriti
+         Return EgtMsg(MSG_MACHININGDB + 164)               ' Angoli suggeriti
       End Get
    End Property
 
    Public ReadOnly Property BlockedAxisTxBl As String
       Get
-         Return EgtMsg(31365)               ' Asse bloccato
+         Return EgtMsg(MSG_MACHININGDB + 165)               ' Asse bloccato
       End Get
    End Property
 
    Public ReadOnly Property SolChoiceTypeTxBl As String
       Get
-         Return EgtMsg(31304)    ' SCC
+         Return EgtMsg(MSG_MACHININGDB + 104)
       End Get
    End Property
 
@@ -4916,7 +4931,7 @@ Public Class MachiningTreeViewItem
          If m_MatType = MaterialType.STONE Then
             Return EgtMsg(90725)             ' Rotazione
          Else
-            Return EgtMsg(31263)    ' Speed
+            Return EgtMsg(MSG_MACHININGDB + 63)    ' Speed
          End If
       End Get
    End Property
@@ -4926,7 +4941,7 @@ Public Class MachiningTreeViewItem
          If m_MatType = MaterialType.STONE Then
             Return EgtMsg(90729)             ' Avanzamento
          Else
-            Return EgtMsg(31264)    ' Feed
+            Return EgtMsg(MSG_MACHININGDB + 64)    ' Feed
          End If
       End Get
    End Property
@@ -4936,7 +4951,7 @@ Public Class MachiningTreeViewItem
          If m_MatType = MaterialType.STONE Then
             Return EgtMsg(90731)             ' Ingresso
          Else
-            Return EgtMsg(31265)    ' Feed iniziale
+            Return EgtMsg(MSG_MACHININGDB + 65)    ' Feed iniziale
          End If
       End Get
    End Property
@@ -4946,7 +4961,7 @@ Public Class MachiningTreeViewItem
          If m_MatType = MaterialType.STONE Then
             Return EgtMsg(90732)             ' Uscita
          Else
-            Return EgtMsg(31266)    ' Feed finale
+            Return EgtMsg(MSG_MACHININGDB + 66)    ' Feed finale
          End If
       End Get
    End Property
@@ -4956,7 +4971,7 @@ Public Class MachiningTreeViewItem
          If m_MatType = MaterialType.STONE Then
             Return EgtMsg(90866)             ' Ultimo ritorno
          Else
-            Return EgtMsg(31366)            ' Feed ultimo all'indietro
+            Return EgtMsg(MSG_MACHININGDB + 166)            ' Feed ultimo all'indietro
          End If
       End Get
    End Property
@@ -4972,7 +4987,7 @@ Public Class MachiningTreeViewItem
          If m_MatType = MaterialType.STONE Then
             Return EgtMsg(90737)             ' Radiale
          Else
-            Return EgtMsg(31268)             ' Offset radiale
+            Return EgtMsg(MSG_MACHININGDB + 68)             ' Offset radiale
          End If
       End Get
    End Property
@@ -4982,7 +4997,7 @@ Public Class MachiningTreeViewItem
          If m_MatType = MaterialType.STONE Then
             Return EgtMsg(90736)             ' Longitudinale
          Else
-            Return EgtMsg(31269)             ' Offset longitudinale
+            Return EgtMsg(MSG_MACHININGDB + 69)             ' Offset longitudinale
          End If
       End Get
    End Property
@@ -5004,26 +5019,26 @@ Public Class MachiningTreeViewItem
          If m_MatType = MaterialType.STONE And m_Type = MCH_MY.SAWING Then
             Return EgtMsg(90763)             ' Angolo di sbandamento
          Else
-            Return EgtMsg(31271)             ' Angolo di fianco
+            Return EgtMsg(MSG_MACHININGDB + 71)             ' Angolo di fianco
          End If
       End Get
    End Property
 
    Public ReadOnly Property OffsetSrTxBl As String
       Get
-         Return EgtMsg(6268)     ' Offset radiale
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 68)
       End Get
    End Property
 
    Public ReadOnly Property OffsetSlTxBl As String
       Get
-         Return EgtMsg(6269)     ' Offset longitudinale
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 69)
       End Get
    End Property
 
    Public ReadOnly Property ApproxTxBl As String
       Get
-         Return EgtMsg(31272)    ' Approssimazione
+         Return EgtMsg(MSG_MACHININGDB + 72)
       End Get
    End Property
 
@@ -5032,20 +5047,28 @@ Public Class MachiningTreeViewItem
          If m_MatType = MaterialType.STONE Then
             Return EgtMsg(90768)             ' Posizione inizio
          Else
-            Return EgtMsg(31273)             ' Dist. di sicurezza
+            Return EgtMsg(MSG_MACHININGDB + 73)             ' Dist. di sicurezza
          End If
       End Get
    End Property
 
    Public ReadOnly Property StartSlowLenTxBl As String
       Get
-         Return EgtMsg(31274)             ' Lungh. rallent. iniziale
+         'If m_MatType = MaterialType.STONE And m_Type = MCH_MY.DRILLING Then
+         '   Return EgtMsg(90780)             ' Iniziale
+         'Else
+         Return EgtMsg(MSG_MACHININGDB + 74)             ' Lungh. rallent. iniziale
+         'End If
       End Get
    End Property
 
    Public ReadOnly Property EndSlowLenTxBl As String
       Get
-         Return EgtMsg(31275)             ' Lungh. rallent. finale
+         'If m_MatType = MaterialType.STONE And m_Type = MCH_MY.DRILLING Then
+         '   Return EgtMsg(90781)             ' Finale
+         'Else
+         Return EgtMsg(MSG_MACHININGDB + 75)             ' Lungh. rallent. finale
+         'End If
       End Get
    End Property
 
@@ -5054,7 +5077,7 @@ Public Class MachiningTreeViewItem
          If m_MatType = MaterialType.STONE And m_Type = MCH_MY.DRILLING Then
             Return EgtMsg(90782)             ' Affondamento aggiuntivo
          Else
-            Return EgtMsg(31276)             ' Lungh. passante agg.
+            Return EgtMsg(MSG_MACHININGDB + 76)             ' Lungh. passante agg.
          End If
       End Get
    End Property
@@ -5072,10 +5095,10 @@ Public Class MachiningTreeViewItem
             ElseIf m_Type = MCH_MY.DRILLING Then
                Return EgtMsg(90774)            ' Passo di affondamento
             Else
-               Return EgtMsg(31277)          ' Passo
+               Return EgtMsg(MSG_MACHININGDB + 77)          ' Passo
             End If
          Else
-            Return EgtMsg(31277)          ' Passo
+            Return EgtMsg(MSG_MACHININGDB + 77)          ' Passo
          End If
       End Get
    End Property
@@ -5085,7 +5108,7 @@ Public Class MachiningTreeViewItem
          If m_MatType = MaterialType.STONE Then
             Return EgtMsg(90865)          ' Ritorno
          Else
-            Return EgtMsg(31367)          ' Passo all'indietro
+            Return EgtMsg(MSG_MACHININGDB + 167)            ' Passo all'indietro
          End If
       End Get
    End Property
@@ -5098,43 +5121,43 @@ Public Class MachiningTreeViewItem
 
    Public ReadOnly Property ReturnPosTxBl As String
       Get
-         Return EgtMsg(31278)             ' Posizione di ritorno
+         Return EgtMsg(MSG_MACHININGDB + 78)
       End Get
    End Property
 
    Public ReadOnly Property TabLenTxBl As String
       Get
-         Return EgtMsg(31279)    ' Lunghezza
+         Return EgtMsg(31279)
       End Get
    End Property
 
    Public ReadOnly Property TabDistTxBl As String
       Get
-         Return EgtMsg(31282)    ' Distanza
+         Return EgtMsg(31282)
       End Get
    End Property
 
    Public ReadOnly Property TabHeightTxBl As String
       Get
-         Return EgtMsg(31280)    ' Altezza
+         Return EgtMsg(31280)
       End Get
    End Property
 
    Public ReadOnly Property TabAngleTxBl As String
       Get
-         Return EgtMsg(31281)    ' Angolo
+         Return EgtMsg(31281)
       End Get
    End Property
 
    Public ReadOnly Property TabMinTxBl As String
       Get
-         Return EgtMsg(31287)    ' N° minimo
+         Return EgtMsg(31287)
       End Get
    End Property
 
    Public ReadOnly Property TabMaxTxBl As String
       Get
-         Return EgtMsg(31288)    ' N° massimo
+         Return EgtMsg(31288)
       End Get
    End Property
 
@@ -5143,7 +5166,7 @@ Public Class MachiningTreeViewItem
          If m_MatType = MaterialType.STONE Then
             Return EgtMsg(90778)             ' Esterno archi
          Else
-            Return EgtMsg(31293)          ' Passo su esterno arco
+            Return EgtMsg(MSG_MACHININGDB + 93)          ' Passo su esterno arco
          End If
       End Get
    End Property
@@ -5153,7 +5176,7 @@ Public Class MachiningTreeViewItem
          If m_MatType = MaterialType.STONE Then
             Return EgtMsg(90777)             ' Interno archi
          Else
-            Return EgtMsg(31294)          ' Passo su interno arco
+            Return EgtMsg(MSG_MACHININGDB + 94)          ' Passo su interno arco
          End If
       End Get
    End Property
@@ -5163,7 +5186,7 @@ Public Class MachiningTreeViewItem
          If m_MatType = MaterialType.STONE Then
             Return EgtMsg(90789)             ' Di lato
          Else
-            Return EgtMsg(31295)             ' Passo di lato
+            Return EgtMsg(MSG_MACHININGDB + 95)             ' Passo di lato
          End If
       End Get
    End Property
@@ -5183,7 +5206,7 @@ Public Class MachiningTreeViewItem
          If m_MatType = MaterialType.STONE Then
             Return EgtMsg(90862)             ' Inclinato
          Else
-            Return EgtMsg(31368)               ' Passo inclinato
+            Return EgtMsg(MSG_MACHININGDB + 168)               ' Passo inclinato
          End If
       End Get
    End Property
@@ -5193,7 +5216,7 @@ Public Class MachiningTreeViewItem
          If m_MatType = MaterialType.STONE Then
             Return EgtMsg(90863)             ' Incl. ritorno
          Else
-            Return EgtMsg(31369)               ' Passo all'indietro inclinato
+            Return EgtMsg(MSG_MACHININGDB + 169)               ' Passo all'indietro inclinato
          End If
       End Get
    End Property
@@ -5203,38 +5226,38 @@ Public Class MachiningTreeViewItem
          If m_MatType = MaterialType.STONE Then
             Return EgtMsg(90790)               ' In verticale
          Else
-            Return EgtMsg(31296)             ' Feed verticale
+            Return EgtMsg(MSG_MACHININGDB + 96)             ' Feed verticale
          End If
       End Get
    End Property
 
    Public ReadOnly Property NameParTxBl As String
       Get
-         Return EgtMsg(31297)    ' Nome
+         Return EgtMsg(MSG_MACHININGDB + 97)
       End Get
    End Property
 
    Public ReadOnly Property ToolTxBl As String
       Get
-         Return EgtMsg(31298)    ' Utensile
+         Return EgtMsg(MSG_MACHININGDB + 98)
       End Get
    End Property
 
    Public ReadOnly Property DepthStrTxBl As String
       Get
-         Return EgtMsg(31299)    ' Affondamento
+         Return EgtMsg(MSG_MACHININGDB + 99)
       End Get
    End Property
 
    Public ReadOnly Property UserNotesTxBl As String
       Get
-         Return EgtMsg(31300)    ' Note
+         Return EgtMsg(MSG_MACHININGDB + 100)
       End Get
    End Property
 
    Public ReadOnly Property OverLapTxBl As String
       Get
-         Return EgtMsg(31301)    ' Sovrapposizione
+         Return EgtMsg(MSG_MACHININGDB + 101)
       End Get
    End Property
 
@@ -5243,14 +5266,14 @@ Public Class MachiningTreeViewItem
          If m_Type = MCH_MY.SAWFINISHING Then
             Return EgtMsg(90861)              ' Spatolatura
          Else
-            Return EgtMsg(31303)               ' Sottotipo
+            Return EgtMsg(MSG_MACHININGDB + 103)               ' Sottotipo
          End If
       End Get
    End Property
 
    Public ReadOnly Property ForwardAngleTxBl As String
       Get
-         Return EgtMsg(31370)    ' Inclinazione in avanti
+         Return EgtMsg(31370)
       End Get
    End Property
 
@@ -5262,61 +5285,61 @@ Public Class MachiningTreeViewItem
 
    Public ReadOnly Property ProbingMinDistTxBl As String
       Get
-         Return EgtMsg(31372)    ' Min dist. punti
+         Return EgtMsg(31372)
       End Get
    End Property
 
    Public ReadOnly Property ProbingMaxDistTxBl As String
       Get
-         Return EgtMsg(31373)    ' Max dist. punti
+         Return EgtMsg(31373)
       End Get
    End Property
 
    Public ReadOnly Property ExtCornTypeTxBl As String
       Get
-         Return EgtMsg(31374)    ' Esterni
+         Return EgtMsg(31374)
       End Get
    End Property
 
    Public ReadOnly Property IntCornTypeTxBl As String
       Get
-         Return EgtMsg(31375)    ' Interni
+         Return EgtMsg(31375)
       End Get
    End Property
 
    Public ReadOnly Property CornSlowLenTxBl As String
       Get
-         Return EgtMsg(31376)    ' Lungh. rall.
+         Return EgtMsg(31376)
       End Get
    End Property
 
    Public ReadOnly Property CornSlowPercTxBl As String
       Get
-         Return EgtMsg(31377)    ' Rallentam. %
+         Return EgtMsg(31377)
       End Get
    End Property
 
    Public ReadOnly Property LiHoleTxBl As String
       Get
-         Return EgtMsg(31378)    ' Foro di attacco
+         Return EgtMsg(31378)
       End Get
    End Property
 
    Public ReadOnly Property LiHoleRadTxBl As String
       Get
-         Return EgtMsg(31379)    ' Raggio
+         Return EgtMsg(31379)
       End Get
    End Property
 
    Public ReadOnly Property LpTurnsTxBl As String
       Get
-         Return EgtMsg(31380)    ' Num. giri in LP
+         Return EgtMsg(31380)
       End Get
    End Property
 
    Public ReadOnly Property HpTurnsTxBl As String
       Get
-         Return EgtMsg(31381)    ' Num. giri in HP
+         Return EgtMsg(31381)
       End Get
    End Property
 
@@ -5335,7 +5358,7 @@ Public Class MachiningTreeViewItem
                Return EgtMsg(90730)             ' Testa
             End If
          Else
-            Return EgtMsg(31267)    ' Feed di testa
+            Return EgtMsg(MSG_MACHININGDB + 67)    ' Feed di testa
          End If
       End Get
    End Property
@@ -5408,7 +5431,7 @@ Public Class MachiningTreeViewItem
 
    Public ReadOnly Property StepGpBxLbl As String
       Get
-         Return EgtMsg(31277)              ' Passo
+         Return EgtMsg(MSG_MACHININGDB + 77)              ' Passo
       End Get
    End Property
 
@@ -5450,19 +5473,19 @@ Public Class MachiningTreeViewItem
 
    Public ReadOnly Property LeadInTypeGpBxLbl As String
       Get
-         Return EgtMsg(31256)          ' Attacco
+         Return EgtMsg(MSG_MACHININGDB + 56)          ' Attacco
       End Get
    End Property
 
    Public ReadOnly Property LeadOutTypeGpBxLbl As String
       Get
-         Return EgtMsg(31258)          ' Uscita
+         Return EgtMsg(MSG_MACHININGDB + 58)          ' Uscita
       End Get
    End Property
 
    Public ReadOnly Property CurveUseGpBxLbl As String
       Get
-         Return EgtMsg(31259)          ' Uso curve
+         Return EgtMsg(MSG_MACHININGDB + 59)          ' Uso curve
       End Get
    End Property
 
@@ -5542,31 +5565,31 @@ Public Class MachiningTreeViewItem
 
    Public ReadOnly Property InvertMsg As String
       Get
-         Return EgtMsg(6251)     ' Inverti
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 51)
       End Get
    End Property
 
    Public ReadOnly Property DepthMsg As String
       Get
-         Return EgtMsg(6299)     ' Affondamento
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 99)
       End Get
    End Property
 
    Public ReadOnly Property HeadSideMsg As String
       Get
-         Return EgtMsg(6255)     ' Lato della testa
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 55)
       End Get
    End Property
 
    Public ReadOnly Property WorkSideMsg As String
       Get
-         Return EgtMsg(6254)     ' Lato di lavoro
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 54)
       End Get
    End Property
 
    Public ReadOnly Property UserNotesMsg As String
       Get
-         Return EgtMsg(6300)     ' Note
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 100)
       End Get
    End Property
 
@@ -5579,289 +5602,293 @@ Public Class MachiningTreeViewItem
 
    Public ReadOnly Property StartPosMsg As String
       Get
-         Return EgtMsg(6273)     ' Dist. di sicurezza
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 73)
       End Get
    End Property
 
    Public ReadOnly Property ReturnPosMsg As String
       Get
-         Return EgtMsg(6278)     ' Posizione di ritorno
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 78)
       End Get
    End Property
 
    Public ReadOnly Property OverLapMsg As String
       Get
-         Return EgtMsg(6301)     ' Sovrapposizione
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 101)
       End Get
    End Property
 
    Public ReadOnly Property ThrouAddLenMsg As String
       Get
-         Return EgtMsg(6276)     ' Lungh. passante agg.
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 76)
       End Get
    End Property
 
    Public ReadOnly Property StepTypeMsg As String
       Get
-         Return EgtMsg(6260)     ' Tipo di Step
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 60)
       End Get
    End Property
 
    Public ReadOnly Property SubTypeMsg As String
       Get
-         Return EgtMsg(6303)     ' Sottotipo
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 103)
       End Get
    End Property
 
    Public ReadOnly Property LeadLinkTypeMsg As String
       Get
-         Return EgtMsg(6262)     ' Tipo approccio
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 62)
       End Get
    End Property
 
    Public ReadOnly Property StepParMsg As String
       Get
-         Return EgtMsg(6277)     ' Passo
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 77)
       End Get
    End Property
 
    Public ReadOnly Property SideStepMsg As String
       Get
-         Return EgtMsg(6295)     ' Passo di lato
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 95)
       End Get
    End Property
 
    Public ReadOnly Property StartSlowLenMsg As String
       Get
-         Return EgtMsg(6274)     ' Lungh. rallent. iniziale
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 74)
       End Get
    End Property
 
    Public ReadOnly Property EndSlowLenMsg As String
       Get
-         Return EgtMsg(6275)     ' Lungh. rallent. finale
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 75)
       End Get
    End Property
 
    Public ReadOnly Property SideAngleMsg As String
       Get
-         Return EgtMsg(6271)     ' Angolo di fianco
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 71)
       End Get
    End Property
 
    Public ReadOnly Property OffsetSrMsg As String
       Get
-         Return EgtMsg(6268)     ' Offset radiale
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 68)
       End Get
    End Property
 
    Public ReadOnly Property OffsetSlMsg As String
       Get
-         Return EgtMsg(6269)     ' Offset longitudinale
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 69)
       End Get
    End Property
 
    Public ReadOnly Property AdvancedParamMsg As String
       Get
-         Return EgtMsg(6350)     ' Avanzati
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 150)
       End Get
    End Property
 
    Public ReadOnly Property InvertToolDirMsg As String
       Get
-         Return EgtMsg(6351)     ' Inverti direz. utensile
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 151)
       End Get
    End Property
 
    Public ReadOnly Property FaceUseTypeMsg As String
       Get
-         Return EgtMsg(6352)     ' Lavorazione faccia
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 152)
       End Get
    End Property
 
    Public ReadOnly Property InitAngsMsg As String
       Get
-         Return EgtMsg(6364)     ' Angoli Suggeriti
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 164)
       End Get
    End Property
 
    Public ReadOnly Property BlockedAxisMsg As String
       Get
-         Return EgtMsg(6365)     ' Asse Bloccato
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 165)
       End Get
    End Property
 
    Public ReadOnly Property SolChoiceTypeMsg As String
       Get
-         Return EgtMsg(6304)     ' SCC
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 104)
       End Get
    End Property
 
    Public ReadOnly Property LeadInTypeMsg As String
       Get
-         Return EgtMsg(6256)     ' Attacco
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 56)
       End Get
    End Property
 
    Public ReadOnly Property StartAddLenMsg As String
       Get
-         Return EgtMsg(6291)     ' Lungh. addiz.
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 91)
       End Get
    End Property
 
    Public ReadOnly Property LiTangMsg As String
       Get
-         Return EgtMsg(6283)     ' Dist. tangente
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 83)
       End Get
    End Property
 
    Public ReadOnly Property LiPerpMsg As String
       Get
-         Return EgtMsg(6284)     ' Dist. perp.
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 84)
       End Get
    End Property
 
    Public ReadOnly Property LiElevMsg As String
       Get
-         Return EgtMsg(6285)     ' Elevazione
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 85)
       End Get
    End Property
 
    Public ReadOnly Property LiCompLenMsg As String
       Get
-         Return EgtMsg(6286)     ' Lungh. correz.
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 86)
       End Get
    End Property
 
    Public ReadOnly Property LeadOutTypeMsg As String
       Get
-         Return EgtMsg(6258)     ' Uscita
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 58)
       End Get
    End Property
 
    Public ReadOnly Property EndAddLenMsg As String
       Get
-         Return EgtMsg(6292)     ' Lungh. addiz.
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 92)
       End Get
    End Property
 
    Public ReadOnly Property LoTangMsg As String
       Get
-         Return EgtMsg(6287)     ' Dist. tangente
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 87)
       End Get
    End Property
 
    Public ReadOnly Property LoPerpMsg As String
       Get
-         Return EgtMsg(6288)     ' Dist. perp.
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 88)
       End Get
    End Property
 
    Public ReadOnly Property LoElevMsg As String
       Get
-         Return EgtMsg(6289)     ' Elevazione
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 89)
       End Get
    End Property
 
    Public ReadOnly Property LoCompLenMsg As String
       Get
-         Return EgtMsg(6290)     ' Lungh. correz.
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 90)
       End Get
    End Property
 
    Public ReadOnly Property ExtLinkTypeMsg As String
       Get
-         Return EgtMsg(6257)     ' Collegamento
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 57)
       End Get
    End Property
 
    Public ReadOnly Property LeaveTabMsg As String
       Get
-         Return EgtMsg(6252)     ' Tab
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 52)
       End Get
    End Property
 
    Public ReadOnly Property TabLenMsg As String
       Get
-         Return EgtMsg(6279)     ' Lunghezza
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 79)
       End Get
    End Property
 
    Public ReadOnly Property TabHeightMsg As String
       Get
-         Return EgtMsg(6280)     ' Distanza
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 80)
       End Get
    End Property
 
    Public ReadOnly Property TabAngleMsg As String
       Get
-         Return EgtMsg(6281)     ' Altezza
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 81)
       End Get
    End Property
 
    Public ReadOnly Property TabDistMsg As String
       Get
-         Return EgtMsg(6282)     ' Angolo
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 82)
       End Get
    End Property
 
    Public ReadOnly Property CurveUseMsg As String
       Get
-         Return EgtMsg(6259)     ' Uso curve
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 59)
       End Get
    End Property
 
    Public ReadOnly Property ApproxMsg As String
       Get
-         Return EgtMsg(6272)     ' Approssimazione
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 72)
       End Get
    End Property
 
    Public ReadOnly Property StepExtArcMsg As String
       Get
-         Return EgtMsg(6293)     ' Passo su esterno arco
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 93)
       End Get
    End Property
 
    Public ReadOnly Property StepIntArcMsg As String
       Get
-         Return EgtMsg(6294)     ' Passo su interno arco
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 94)
       End Get
    End Property
 
    Public ReadOnly Property SpeedMsg As String
       Get
-         Return EgtMsg(6263)     ' Rotazione
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 63)
       End Get
    End Property
 
    Public ReadOnly Property FeedMsg As String
       Get
-         Return EgtMsg(6264)     ' Feed
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 64)
       End Get
    End Property
 
    Public ReadOnly Property TipFeedMsg As String
       Get
-         Return EgtMsg(6267)     ' Feed di testa
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 67)
       End Get
    End Property
 
    Public ReadOnly Property StartFeedMsg As String
       Get
-         Return EgtMsg(6265)     ' Feed iniziale
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 65)
       End Get
    End Property
 
    Public ReadOnly Property EndFeedMsg As String
       Get
-         Return EgtMsg(6266)     ' Feed finale
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 66)
       End Get
    End Property
 
    Public ReadOnly Property BackFeedMsg As String
       Get
-         Return EgtMsg(31366)            ' Feed ultimo all'indietro
+         'If m_MatType = MaterialType.STONE Then
+         '   Return EgtMsg(90866)             ' Ultimo ritorno
+         'Else
+         Return EgtMsg(MSG_MACHININGDB + 166)            ' Feed ultimo all'indietro
+         'End If
       End Get
    End Property
 
@@ -5873,7 +5900,11 @@ Public Class MachiningTreeViewItem
 
    Public ReadOnly Property StepBackMsg As String
       Get
-         Return EgtMsg(31367)            ' Passo all'indietro
+         'If m_MatType = MaterialType.STONE Then
+         '   Return EgtMsg(90865)          ' Ritorno
+         'Else
+         Return EgtMsg(MSG_MACHININGDB + 167)            ' Passo all'indietro
+         'End If
       End Get
    End Property
 
@@ -5885,55 +5916,63 @@ Public Class MachiningTreeViewItem
 
    Public ReadOnly Property StepSideAngMsg As String
       Get
-         Return EgtMsg(31368)               ' Passo inclinato
+         'If m_MatType = MaterialType.STONE Then
+         '   Return EgtMsg(90862)             ' Inclinato
+         'Else
+         Return EgtMsg(MSG_MACHININGDB + 168)               ' Passo inclinato
+         'End If
       End Get
    End Property
 
    Public ReadOnly Property StepSideAngBackMsg As String
       Get
-         Return EgtMsg(31369)               ' Passo all'indietro inclinato
+         'If m_MatType = MaterialType.STONE Then
+         '   Return EgtMsg(90863)             ' Incl. ritorno
+         'Else
+         Return EgtMsg(MSG_MACHININGDB + 169)               ' Passo all'indietro inclinato
+         'End If
       End Get
    End Property
 
    Public ReadOnly Property OperationListHeader As String
       Get
-         Return EgtMsg(5401)        'Lista Operazioni
+         Return EgtMsg(MSG_OPERATION + 1)        'Lista Operazioni
       End Get
    End Property
 
    Public ReadOnly Property UpdateMachiningBtnMsg As String
       Get
-         Return EgtMsg(5403)        'Applica Lavorazione
+         Return EgtMsg(MSG_OPERATION + 3)        'Applica Lavorazione
       End Get
    End Property
 
    Public ReadOnly Property GenericExpanderHeader As String
       Get
-         Return EgtMsg(5407)        'Generici
+         Return EgtMsg(MSG_OPERATION + 7)        'Generici
       End Get
    End Property
 
    Public ReadOnly Property ToolExpanderHeader As String
       Get
-         Return EgtMsg(6298) & " (" & m_Tool & ")"    ' Utensile
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 98) & " (" & m_Tool & ")"
       End Get
    End Property
 
    Public ReadOnly Property ViewToolBtnMsg As String
       Get
-         Return EgtMsg(5413)       'Anteprima Utensile
+         Return EgtMsg(MSG_OPERATION + 13)       'Anteprima Utensile
       End Get
    End Property
 
    Public ReadOnly Property NextStepToolBtnMsg As String
       Get
-         Return EgtMsg(5414)       'Avanti
+         Return EgtMsg(MSG_OPERATION + 14)       'Avanti
       End Get
    End Property
 
    Public ReadOnly Property PrevStepToolBtnMsg As String
       Get
-         Return EgtMsg(5415)       'Indietro
+         Return EgtMsg(MSG_OPERATION + 15)       'Indietro
       End Get
    End Property
 
@@ -5967,13 +6006,13 @@ Public Class MachiningTreeViewItem
 
    Public ReadOnly Property NoteExpanderName As String
       Get
-         Return EgtMsg(6076)     ' Note
+         Return EgtMsg(6076)
       End Get
    End Property
 
    Public ReadOnly Property ShowNoteToolTip As String
       Get
-         Return EgtMsg(5425)     ' Parametri Avanzati
+         Return EgtMsg(5425)
       End Get
    End Property
 
@@ -6014,8 +6053,8 @@ Public Class MachiningTreeViewItem
       Dim sValue As String = String.Empty
       m_SuspendAutoToolParamUpdate = True
       ReadSelectedTool()
-      m_delNotifyPropertyChanged(NameOf(LibMap.refMachiningDbWindowVM.ParamPageV))
-      NotifyPropertyChanged(NameOf(TipFeedTxBl))
+      m_delNotifyPropertyChanged("ParamPageV")
+      NotifyPropertyChanged("TipFeedTxBl")
       EgtMdbGetCurrMachiningParam(MCH_MP.INVERT, Invert)
       EgtMdbGetCurrMachiningParam(MCH_MP.LEAVETAB, LeaveTab)
       EgtMdbGetCurrMachiningParam(MCH_MP.TOOLINVERT, InvertToolDir)
@@ -6212,8 +6251,10 @@ Public Class MachiningTreeViewItem
                   Material.SetMinThickness(LenToString(dVal, 2))
                   StringToDouble(Param(2), dVal)
                   Material.SetMaxThickness(LenToString(dVal, 2))
+                  'Material.bIsActive = True
                   Index += 1
                Else
+                  'Material.bIsActive = False
                End If
             Next
          Else
@@ -6227,8 +6268,10 @@ Public Class MachiningTreeViewItem
                   Material.SetMinThickness(LenToString(dVal, 2))
                   StringToDouble(Param(2), dVal)
                   Material.SetMaxThickness(LenToString(dVal, 2))
+                  'Material.bIsActive = True
                   Index += 1
                Else
+                  'Material.bIsActive = False
                End If
             Next
          End If
@@ -6240,7 +6283,7 @@ Public Class MachiningTreeViewItem
       GetNoteList()
       GetComboNoteList()
 
-      NotifyPropertyChanged(NameOf(MaterialList))
+      NotifyPropertyChanged("MaterialList")
       m_SuspendAutoToolParamUpdate = False
    End Sub
 
@@ -6250,254 +6293,253 @@ Public Class MachiningTreeViewItem
       NotifyPropertyChanged("ParamExpanderPageV")
       EgtGetMachiningParam(MCH_MP.TYPE, nValue)
       m_Type = DirectCast(nValue, MCH_MY)
-      NotifyPropertyChanged(NameOf(Type))
+      NotifyPropertyChanged("Type")
       EgtGetMachiningParam(MCH_MP.INVERT, m_Invert)
-      NotifyPropertyChanged(NameOf(Invert))
+      NotifyPropertyChanged("Invert")
       m_IsModifiedInvert = False
       EgtGetMachiningParam(MCH_MP.LEAVETAB, m_LeaveTab)
-      NotifyPropertyChanged(NameOf(LeaveTab))
+      NotifyPropertyChanged("LeaveTab")
       m_IsModifiedLeaveTab = False
       EgtGetMachiningParam(MCH_MP.TOOLINVERT, m_ToolInvert)
-      'NotifyPropertyChanged("ToolInvert")
-      NotifyPropertyChanged(NameOf(InvertToolDir))
+      NotifyPropertyChanged("ToolInvert")
       m_IsModifiedToolInvert = False
       EgtGetMachiningParam(MCH_MP.OSCENABLE, m_OscEnable)
-      NotifyPropertyChanged(NameOf(OscEnable))
+      NotifyPropertyChanged("OscEnable")
       m_IsModifiedOscEnable = False
-      NotifyPropertyChanged(NameOf(WorkSideList))
+      NotifyPropertyChanged("WorkSideList")
       EgtGetMachiningParam(MCH_MP.WORKSIDE, nValue)
       m_SelectedWorkSide = If(IsNothing(WorkSideList), nValue, IdNameStruct.IndFromId(nValue, WorkSideList))
-      NotifyPropertyChanged(NameOf(SelectedWorkSide))
+      NotifyPropertyChanged("SelectedWorkSide")
       m_IsModifiedSelectedWorkSide = False
-      NotifyPropertyChanged(NameOf(HeadSideList))
+      NotifyPropertyChanged("HeadSideList")
       EgtGetMachiningParam(MCH_MP.HEADSIDE, nValue)
       m_SelectedHeadSide = If(IsNothing(HeadSideList), nValue, IdNameStruct.IndFromId(nValue, HeadSideList))
-      NotifyPropertyChanged(NameOf(SelectedHeadSide))
+      NotifyPropertyChanged("SelectedHeadSide")
       m_IsModifiedSelectedHeadSide = False
-      NotifyPropertyChanged(NameOf(LeadInTypeList))
+      NotifyPropertyChanged("LeadInTypeList")
       EgtGetMachiningParam(MCH_MP.LEADINTYPE, nValue)
       m_SelectedLeadInType = If(IsNothing(LeadInTypeList), nValue, IdNameStruct.IndFromId(nValue, LeadInTypeList))
-      NotifyPropertyChanged(NameOf(SelectedLeadInType))
+      NotifyPropertyChanged("SelectedLeadInType")
       m_IsModifiedSelectedLeadInType = False
-      NotifyPropertyChanged(NameOf(ExtLinkTypeList))
+      NotifyPropertyChanged("ExtLinkTypeList")
       EgtGetMachiningParam(MCH_MP.EXTLINKTYPE, nValue)
       m_SelectedExtLinkType = If(IsNothing(ExtLinkTypeList), nValue, IdNameStruct.IndFromId(nValue, ExtLinkTypeList))
-      NotifyPropertyChanged(NameOf(SelectedExtLinkType))
+      NotifyPropertyChanged("SelectedExtLinkType")
       m_IsModifiedSelectedExtLinkType = False
-      NotifyPropertyChanged(NameOf(LeadOutTypeList))
+      NotifyPropertyChanged("LeadOutTypeList")
       EgtGetMachiningParam(MCH_MP.LEADOUTTYPE, nValue)
       m_SelectedLeadOutType = If(IsNothing(LeadOutTypeList), nValue, IdNameStruct.IndFromId(nValue, LeadOutTypeList))
-      NotifyPropertyChanged(NameOf(SelectedLeadOutType))
+      NotifyPropertyChanged("SelectedLeadOutType")
       m_IsModifiedSelectedLeadOutType = False
-      NotifyPropertyChanged(NameOf(CurveUseList))
+      NotifyPropertyChanged("CurveUseList")
       EgtGetMachiningParam(MCH_MP.CURVEUSE, nValue)
       m_SelectedCurveUse = If(IsNothing(CurveUseList), nValue, IdNameStruct.IndFromId(nValue, CurveUseList))
-      NotifyPropertyChanged(NameOf(SelectedCurveUse))
+      NotifyPropertyChanged("SelectedCurveUse")
       m_IsModifiedSelectedCurveUse = False
-      NotifyPropertyChanged(NameOf(StepTypeList))
+      NotifyPropertyChanged("StepTypeList")
       EgtGetMachiningParam(MCH_MP.STEPTYPE, nValue)
       m_SelectedStepType = If(IsNothing(StepTypeList), nValue, IdNameStruct.IndFromId(nValue, StepTypeList))
-      NotifyPropertyChanged(NameOf(SelectedStepType))
+      NotifyPropertyChanged("SelectedStepType")
       m_IsModifiedSelectedStepType = False
-      NotifyPropertyChanged(NameOf(SubTypeList))
+      NotifyPropertyChanged("SubTypeList")
       EgtGetMachiningParam(MCH_MP.SUBTYPE, nValue)
       m_SelectedSubType = If(IsNothing(SubTypeList), nValue, IdNameStruct.IndFromId(nValue, SubTypeList))
-      NotifyPropertyChanged(NameOf(SelectedSubType))
+      NotifyPropertyChanged("SelectedSubType")
       m_IsModifiedSelectedSubType = False
-      NotifyPropertyChanged(NameOf(LeadLinkTypeList))
+      NotifyPropertyChanged("LeadLinkTypeList")
       EgtGetMachiningParam(MCH_MP.LEADLINKTYPE, nValue)
       m_SelectedLeadLinkType = If(IsNothing(LeadLinkTypeList), nValue, IdNameStruct.IndFromId(nValue, LeadLinkTypeList))
-      NotifyPropertyChanged(NameOf(SelectedLeadLinkType))
+      NotifyPropertyChanged("SelectedLeadLinkType")
       m_IsModifiedSelectedLeadLinkType = False
-      NotifyPropertyChanged(NameOf(FaceUseTypeList))
+      NotifyPropertyChanged("FaceUseTypeList")
       EgtGetMachiningParam(MCH_MP.FACEUSE, nValue)
       m_SelectedFaceUseType = If(IsNothing(FaceUseTypeList), nValue, IdNameStruct.IndFromId(nValue, FaceUseTypeList))
-      NotifyPropertyChanged(NameOf(SelectedFaceUseType))
+      NotifyPropertyChanged("SelectedFaceUseType")
       m_IsModifiedSelectedFaceUseType = False
-      NotifyPropertyChanged(NameOf(SolChoiceTypeList))
+      NotifyPropertyChanged("SolChoiceTypeList")
       EgtGetMachiningParam(MCH_MP.SOLCHOICETYPE, nValue)
       m_SelectedSolChoiceType = If(IsNothing(SolChoiceTypeList), nValue, IdNameStruct.IndFromId(nValue, SolChoiceTypeList))
-      NotifyPropertyChanged(NameOf(SelectedSolChoiceType))
+      NotifyPropertyChanged("SelectedSolChoiceType")
       m_IsModifiedSelectedSolChoiceType = False
       EgtGetMachiningParam(MCH_MP.SPEED, dValue)
       m_Speed = DoubleToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(Speed))
+      NotifyPropertyChanged("Speed")
       m_IsModifiedSpeed = False
       EgtGetMachiningParam(MCH_MP.FEED, dValue)
       m_Feed = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(Feed))
+      NotifyPropertyChanged("Feed")
       m_IsModifiedFeed = False
       EgtGetMachiningParam(MCH_MP.STARTFEED, dValue)
       m_StartFeed = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(StartFeed))
+      NotifyPropertyChanged("StartFeed")
       m_IsModifiedStartFeed = False
       EgtGetMachiningParam(MCH_MP.ENDFEED, dValue)
       m_EndFeed = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(EndFeed))
+      NotifyPropertyChanged("EndFeed")
       m_IsModifiedEndFeed = False
       EgtGetMachiningParam(MCH_MP.TIPFEED, dValue)
       m_TipFeed = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(TipFeed))
+      NotifyPropertyChanged("TipFeed")
       m_IsModifiedTipFeed = False
       EgtGetMachiningParam(MCH_MP.BACKFEED, dValue)
       m_BackFeed = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(BackFeed))
+      NotifyPropertyChanged("BackFeed")
       m_IsModifiedBackFeed = False
       EgtGetMachiningParam(MCH_MP.SIDEANGFEED, dValue)
       m_SideAngFeed = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(SideAngFeed))
+      NotifyPropertyChanged("SideAngFeed")
       m_IsModifiedSideAngFeed = False
       EgtGetMachiningParam(MCH_MP.THICKREF, dValue)
       m_ThicknessFeed = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(ThicknessFeed))
+      NotifyPropertyChanged("ThicknessFeed")
       m_IsModifiedThicknessFeed = False
       EgtGetMachiningParam(MCH_MP.OFFSR, dValue)
       m_OffSr = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(OffSr))
+      NotifyPropertyChanged("OffSr")
       m_IsModifiedOffSr = False
       EgtGetMachiningParam(MCH_MP.OFFSL, dValue)
       m_OffSl = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(OffSl))
+      NotifyPropertyChanged("OffSl")
       m_IsModifiedOffSl = False
       EgtGetMachiningParam(MCH_MP.EPICYCLESRAD, dValue)
       m_EpicyclesRad = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(EpicyclesRad))
+      NotifyPropertyChanged("EpicyclesRad")
       m_IsModifiedEpicyclesRad = False
       EgtGetMachiningParam(MCH_MP.EPICYCLESDIST, dValue)
       m_EpicyclesDist = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(EpicyclesDist))
+      NotifyPropertyChanged("EpicyclesDist")
       m_IsModifiedEpicyclesDist = False
       EgtGetMachiningParam(MCH_MP.SIDEANGLE, dValue)
       m_SideAngle = DoubleToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(SideAngle))
+      NotifyPropertyChanged("SideAngle")
       m_IsModifiedSideAngle = False
       EgtGetMachiningParam(MCH_MP.APPROX, dValue)
       m_Approx = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(Approx))
+      NotifyPropertyChanged("Approx")
       m_IsModifiedApprox = False
       EgtGetMachiningParam(MCH_MP.STARTPOS, dValue)
       m_StartPos = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(StartPos))
+      NotifyPropertyChanged("StartPos")
       m_IsModifiedStartPos = False
       EgtGetMachiningParam(MCH_MP.STARTSLOWLEN, dValue)
       m_StartSlowLen = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(StartSlowLen))
+      NotifyPropertyChanged("StartSlowLen")
       m_IsModifiedStartSlowLen = False
       EgtGetMachiningParam(MCH_MP.ENDSLOWLEN, dValue)
       m_EndSlowLen = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(EndSlowLen))
+      NotifyPropertyChanged("EndSlowLen")
       m_IsModifiedEndSlowLen = False
       EgtGetMachiningParam(MCH_MP.THROUADDLEN, dValue)
       m_ThrouAddLen = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(ThrouAddLen))
+      NotifyPropertyChanged("ThrouAddLen")
       m_IsModifiedThrouAddLen = False
       EgtGetMachiningParam(MCH_MP.STEP_, dValue)
       m_StepPar = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(StepPar))
+      NotifyPropertyChanged("StepPar")
       m_IsModifiedStepPar = False
       EgtGetMachiningParam(MCH_MP.STEPBACK, dValue)
       m_StepBack = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(StepBack))
+      NotifyPropertyChanged("StepBack")
       m_IsModifiedStepBack = False
       EgtGetMachiningParam(MCH_MP.STEPLAST, dValue)
       m_StepLast = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(StepLast))
+      NotifyPropertyChanged("StepLast")
       m_IsModifiedStepLast = False
       EgtGetMachiningParam(MCH_MP.STEPSIDEANG, dValue)
       m_StepSideAng = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(StepSideAng))
+      NotifyPropertyChanged("StepSideAng")
       m_IsModifiedStepSideAng = False
       EgtGetMachiningParam(MCH_MP.STEPSIDEANGBACK, dValue)
       m_StepSideAngBack = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(StepSideAngBack))
+      NotifyPropertyChanged("StepSideAngBack")
       m_IsModifiedStepSideAngBack = False
       EgtGetMachiningParam(MCH_MP.RETURNPOS, dValue)
       m_ReturnPos = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(ReturnPos))
+      NotifyPropertyChanged("ReturnPos")
       m_IsModifiedReturnPos = False
       EgtGetMachiningParam(MCH_MP.OVERL, dValue)
       m_OverLap = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(OverLap))
+      NotifyPropertyChanged("OverLap")
       m_IsModifiedOverLap = False
       EgtGetMachiningParam(MCH_MP.TABLEN, dValue)
       m_TabLen = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(TabLen))
+      NotifyPropertyChanged("TabLen")
       m_IsModifiedTabLen = False
       EgtGetMachiningParam(MCH_MP.TABDIST, dValue)
       m_TabDist = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(TabDist))
+      NotifyPropertyChanged("TabDist")
       m_IsModifiedTabDist = False
       EgtGetMachiningParam(MCH_MP.TABHEIGHT, dValue)
       m_TabHeight = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(TabHeight))
+      NotifyPropertyChanged("TabHeight")
       m_IsModifiedTabHeight = False
       EgtGetMachiningParam(MCH_MP.TABANGLE, dValue)
       m_TabAngle = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(TabAngle))
+      NotifyPropertyChanged("TabAngle")
       m_IsModifiedTabAngle = False
       EgtGetMachiningParam(MCH_MP.TABMAX, nValue)
       m_TabMax = nValue.ToString()
-      NotifyPropertyChanged(NameOf(TabMax))
+      NotifyPropertyChanged("TabMax")
       m_IsModifiedTabMax = False
       EgtGetMachiningParam(MCH_MP.TABMIN, nValue)
       m_TabMin = nValue.ToString()
-      NotifyPropertyChanged(NameOf(TabMin))
+      NotifyPropertyChanged("TabMin")
       m_IsModifiedTabMin = False
       EgtGetMachiningParam(MCH_MP.LITANG, dValue)
       m_LiTang = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(LiTang))
+      NotifyPropertyChanged("LiTang")
       m_IsModifiedLiTang = False
       EgtGetMachiningParam(MCH_MP.LIPERP, dValue)
       m_LiPerp = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(LiPerp))
+      NotifyPropertyChanged("LiPerp")
       m_IsModifiedLiPerp = False
       EgtGetMachiningParam(MCH_MP.LIELEV, dValue)
       m_LiElev = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(LiElev))
+      NotifyPropertyChanged("LiElev")
       m_IsModifiedLiElev = False
       EgtGetMachiningParam(MCH_MP.LICOMPLEN, dValue)
       m_LiCompLen = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(LiCompLen))
+      NotifyPropertyChanged("LiCompLen")
       m_IsModifiedLiCompLen = False
       EgtGetMachiningParam(MCH_MP.LOTANG, dValue)
       m_LoTang = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(LoTang))
+      NotifyPropertyChanged("LoTang")
       m_IsModifiedLoTang = False
       EgtGetMachiningParam(MCH_MP.LOPERP, dValue)
       m_LoPerp = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(LoPerp))
+      NotifyPropertyChanged("LoPerp")
       m_IsModifiedLoPerp = False
       EgtGetMachiningParam(MCH_MP.LOELEV, dValue)
       m_LoElev = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(LoElev))
+      NotifyPropertyChanged("LoElev")
       m_IsModifiedLoElev = False
       EgtGetMachiningParam(MCH_MP.LOCOMPLEN, dValue)
       m_LoCompLen = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(LoCompLen))
+      NotifyPropertyChanged("LoCompLen")
       m_IsModifiedLoCompLen = False
       EgtGetMachiningParam(MCH_MP.STARTADDLEN, dValue)
       m_StartAddLen = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(StartAddLen))
+      NotifyPropertyChanged("StartAddLen")
       m_IsModifiedStartAddLen = False
       EgtGetMachiningParam(MCH_MP.ENDADDLEN, dValue)
       m_EndAddLen = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(EndAddLen))
+      NotifyPropertyChanged("EndAddLen")
       m_IsModifiedEndAddLen = False
       EgtGetMachiningParam(MCH_MP.STEPEXTARC, dValue)
       m_StepExtArc = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(StepExtArc))
+      NotifyPropertyChanged("StepExtArc")
       m_IsModifiedStepExtArc = False
       EgtGetMachiningParam(MCH_MP.STEPEXTARC, dValue)
       m_StepExtArc = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(StepExtArc))
+      NotifyPropertyChanged("StepExtArc")
       m_IsModifiedStepExtArc = False
       EgtGetMachiningParam(MCH_MP.STEPINTARC, dValue)
       m_StepIntArc = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(StepIntArc))
+      NotifyPropertyChanged("StepIntArc")
       m_IsModifiedStepIntArc = False
       EgtGetMachiningParam(MCH_MP.SIDESTEP, dValue)
       m_SideStep = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(SideStep))
+      NotifyPropertyChanged("SideStep")
       m_IsModifiedSideStep = False
       EgtGetMachiningParam(MCH_MP.SUBSTEP, dValue)
       m_SubStep = LenToString(dValue, 4)
@@ -6505,83 +6547,83 @@ Public Class MachiningTreeViewItem
       m_IsModifiedSubStep = False
       EgtGetMachiningParam(MCH_MP.VERTFEED, dValue)
       m_VertFeed = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(VertFeed))
+      NotifyPropertyChanged("VertFeed")
       m_IsModifiedVertFeed = False
       EgtGetMachiningParam(MCH_MP.OSCHEIGHT, dValue)
       m_OscHeight = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(OscHeight))
+      NotifyPropertyChanged("OscHeight")
       m_IsModifiedOscHeight = False
       EgtGetMachiningParam(MCH_MP.OSCRAMPLEN, dValue)
       m_OscRampLen = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(OscRampLen))
+      NotifyPropertyChanged("OscRampLen")
       m_IsModifiedOscRampLen = False
       EgtGetMachiningParam(MCH_MP.OSCFLATLEN, dValue)
       m_OscFlatLen = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(OscFlatLen))
+      NotifyPropertyChanged("OscFlatLen")
       m_IsModifiedOscFlatLen = False
       EgtGetMachiningParam(MCH_MP.TOOL, m_Tool)
-      NotifyPropertyChanged(NameOf(ToolExpanderHeader))
+      NotifyPropertyChanged("ToolExpanderHeader")
       EgtGetMachiningParam(MCH_MP.DEPTH_STR, m_DepthStr)
-      NotifyPropertyChanged(NameOf(DepthStr))
+      NotifyPropertyChanged("DepthStr")
       m_IsModifiedDepthStr = False
       EgtGetMachiningParam(MCH_MP.USERNOTES, m_UserNotes)
       NotifyPropertyChanged(NameOf(UserNotes))
       m_IsModifiedUserNotes = False
       EgtGetMachiningParam(MCH_MP.SYSNOTES, m_SystemNotes)
-      NotifyPropertyChanged(NameOf(SystemNotes))
+      NotifyPropertyChanged("SystemNotes")
       EgtGetMachiningParam(MCH_MP.INITANGS, m_InitAngs)
-      NotifyPropertyChanged(NameOf(InitAngs))
+      NotifyPropertyChanged("InitAngs")
       m_IsModifiedInitAngs = False
       EgtGetMachiningParam(MCH_MP.BLOCKEDAXIS, m_BlockedAxis)
-      NotifyPropertyChanged(NameOf(BlockedAxis))
+      NotifyPropertyChanged("BlockedAxis")
       m_IsModifiedBlockedAxis = False
       EgtGetMachiningParam(MCH_MP.FORWARDANGLE, dValue)
       m_ForwardAngle = DoubleToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(ForwardAngle))
+      NotifyPropertyChanged("ForwardAngle")
       m_IsModifiedForwardAngle = False
       EgtGetMachiningParam(MCH_MP.PROBING, m_Probing)
-      NotifyPropertyChanged(NameOf(Probing))
+      NotifyPropertyChanged("Probing")
       m_IsModifiedProbing = False
       EgtGetMachiningParam(MCH_MP.PROBINGMINDIST, dValue)
       m_ProbingMinDist = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(ProbingMinDist))
+      NotifyPropertyChanged("ProbingMinDist")
       m_IsModifiedProbingMinDist = False
       EgtGetMachiningParam(MCH_MP.PROBINGMAXDIST, dValue)
       m_ProbingMaxDist = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(ProbingMaxDist))
+      NotifyPropertyChanged("ProbingMaxDist")
       m_IsModifiedProbingMaxDist = False
-      NotifyPropertyChanged(NameOf(ExtCornTypeList))
+      NotifyPropertyChanged("ExtCornTypeList")
       EgtGetMachiningParam(MCH_MP.EXTCORNERTYPE, nValue)
       m_SelectedExtCornType = If(IsNothing(ExtCornTypeList), nValue, IdNameStruct.IndFromId(nValue, ExtCornTypeList))
-      NotifyPropertyChanged(NameOf(SelectedExtCornType))
+      NotifyPropertyChanged("SelectedExtCornType")
       m_IsModifiedSelectedExtCornType = False
-      NotifyPropertyChanged(NameOf(IntCornTypeList))
+      NotifyPropertyChanged("IntCornTypeList")
       EgtGetMachiningParam(MCH_MP.INTCORNERTYPE, nValue)
       m_SelectedIntCornType = If(IsNothing(IntCornTypeList), nValue, IdNameStruct.IndFromId(nValue, IntCornTypeList))
-      NotifyPropertyChanged(NameOf(SelectedIntCornType))
+      NotifyPropertyChanged("SelectedIntCornType")
       m_IsModifiedSelectedIntCornType = False
       EgtGetMachiningParam(MCH_MP.CORNERSLOWLEN, dValue)
       m_CornSlowLen = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(CornSlowLen))
+      NotifyPropertyChanged("CornSlowLen")
       m_IsModifiedCornSlowLen = False
       EgtGetMachiningParam(MCH_MP.CORNERSLOWPERC, nValue)
       m_CornSlowPerc = nValue.ToString()
-      NotifyPropertyChanged(NameOf(CornSlowPerc))
+      NotifyPropertyChanged("CornSlowPerc")
       m_IsModifiedCornSlowPerc = False
       EgtGetMachiningParam(MCH_MP.LIHOLE, LiHole)
-      NotifyPropertyChanged(NameOf(LiHole))
+      NotifyPropertyChanged("LiHole")
       m_IsModifiedLiHole = False
       EgtGetMachiningParam(MCH_MP.LIHOLERAD, dValue)
       m_LiHoleRad = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(LiHoleRad))
+      NotifyPropertyChanged("LiHoleRad")
       m_IsModifiedLiHoleRad = False
       EgtGetMachiningParam(MCH_MP.LPTURNS, nValue)
       m_LpTurns = nValue.ToString()
-      NotifyPropertyChanged(NameOf(LpTurns))
+      NotifyPropertyChanged("LpTurns")
       m_IsModifiedLpTurns = False
       EgtGetMachiningParam(MCH_MP.HPTURNS, nValue)
       m_HpTurns = nValue.ToString()
-      NotifyPropertyChanged(NameOf(HpTurns))
+      NotifyPropertyChanged("HpTurns")
       m_IsModifiedHpTurns = False
 
       ' Apro paragrafo Note
@@ -7306,22 +7348,22 @@ Public Class MachiningTreeViewItem
       Dim tmpVal As New List(Of String)
       Dim sSplitNotes() As String = m_UserNotes.TrimEnd(";"c).Split(New Char() {";"c})
       For Index As Integer = 0 To sSplitNotes.Count - 1
-         Dim sKeyVal() As String = sSplitNotes(Index).Trim().Split(New Char() {"="c})
-         If sKeyVal.Count() >= 1 AndAlso Not String.IsNullOrWhiteSpace(sKeyVal(0)) Then
+         Dim sKeyVal() As String = sSplitNotes( Index).Trim().Split(New Char() {"="c}) 
+         If sKeyVal.Count() >= 1 AndAlso Not String.IsNullOrWhiteSpace( sKeyVal(0)) Then
             ' Assegno chiave
             tmpDsc.Add(sKeyVal(0))
             ' Assegno valore o indicazione sua mancanza
             If sKeyVal.Count() >= 2 Then
-               tmpVal.Add(sKeyVal(1))
+               tmpVal.Add( sKeyVal(1))
             Else
-               tmpVal.Add("")
+               tmpVal.Add( "")
             End If
          End If
       Next
       m_UserNotes = ""
 
       ' Recupero le info dal file Notes.ini
-      Dim tmpType As String = If(m_Type.Equals(MCH_MY.FIVEAXISMILLING), "5AxMilling", m_Type.ToString())
+      Dim tmpType As String = If( m_Type.Equals(MCH_MY.FIVEAXISMILLING), "5AxMilling", m_Type.ToString())
       Dim IndexNote As Integer = 0
       Dim sNoteDescription As String = ""
       While EgtUILib.GetPrivateProfileString(tmpType, IndexNote.ToString(), "", sNoteDescription, sMachDir & "\" & MACH_NOTES) > 0
@@ -7349,7 +7391,7 @@ Public Class MachiningTreeViewItem
          ' Controllo se la lista contiene la stessa descrizione
          If tmpDscList.Contains(tmpDsc(TmpInd)) Then
             m_UserNotes &= ""  ' Se si la text UserNote rimane vuota
-         ElseIf Not String.IsNullOrEmpty(tmpVal(TmpInd)) Then
+         ElseIf Not String.IsNullOrEmpty( tmpVal(TmpInd)) Then
             m_UserNotes &= (tmpDsc(TmpInd) & "=" & tmpVal(TmpInd) & ";").Trim()  ' Altrimenti assegno descrizione + valore a UserNote
          Else
             m_UserNotes &= (tmpDsc(TmpInd) & ";").Trim() ' Se la lista valori e' vuota assegno solo la descrizione
@@ -7385,7 +7427,7 @@ Public Class MachiningTreeViewItem
       EgtGetCurrMachineDir(sMachDir)
 
       ' Recupero le info dal file Notes.ini
-      Dim tmpType As String = If(m_Type.Equals(MCH_MY.FIVEAXISMILLING), "5AxMilling", m_Type.ToString())
+      Dim tmpType As String = If( m_Type.Equals(MCH_MY.FIVEAXISMILLING), "5AxMilling", m_Type.ToString())
       Dim IndexNote As Integer = 0
       Dim sNoteDescription As String = ""
       Dim tmpsNotes As New ObservableCollection(Of NoteListBoxItem)
@@ -7458,15 +7500,15 @@ Public Class MachiningTreeViewItem
       Dim tmpVal = New List(Of String)
       Dim sSplitNotes() As String = m_UserNotes.TrimEnd(";"c).Split(New Char() {";"c})
       For Index As Integer = 0 To sSplitNotes.Count - 1
-         Dim sKeyVal() As String = sSplitNotes(Index).Trim().Split(New Char() {"="c})
-         If sKeyVal.Count() >= 1 AndAlso Not String.IsNullOrWhiteSpace(sKeyVal(0)) Then
+         Dim sKeyVal() As String = sSplitNotes( Index).Trim().Split(New Char() {"="c}) 
+         If sKeyVal.Count() >= 1 AndAlso Not String.IsNullOrWhiteSpace( sKeyVal(0)) Then
             ' Assegno chiave
             tmpDsc.Add(sKeyVal(0))
             ' Assegno valore o indicazione sua mancanza
             If sKeyVal.Count() >= 2 Then
-               tmpVal.Add(sKeyVal(1))
+               tmpVal.Add( sKeyVal(1))
             Else
-               tmpVal.Add("")
+               tmpVal.Add( "")
             End If
          End If
       Next
@@ -7477,14 +7519,14 @@ Public Class MachiningTreeViewItem
          ' Verifico se la chiave è presente nelle descrizioni avanzate
          Dim bAdvDesc As Boolean = False
          For IndexNote As Integer = 0 To m_NotesList.Count - 1
-            If m_NotesList(IndexNote).Description.Equals(tmpDsc(NewInd)) Then
+            If m_NotesList(IndexNote).Description.Equals( tmpDsc(NewInd)) Then
                bAdvDesc = True
                Exit For
             End If
          Next
          ' Se non presente posso aggiungere
          If Not bAdvDesc Then
-            If Not String.IsNullOrEmpty(tmpVal(NewInd)) Then
+            If Not String.IsNullOrEmpty( tmpVal(NewInd)) Then
                sStdNotes &= tmpDsc(NewInd) & "=" & tmpVal(NewInd) & ";"   ' Assegno a sUserNotes descrizione + valore
             Else
                sStdNotes &= tmpDsc(NewInd) & ";" ' Se non e' presente il valore solo la descrizione
@@ -7854,11 +7896,11 @@ Public Class MachiningTreeViewItem
       m_NameError = String.Empty
       Select Case nErrorMachiningName
          Case 1
-            m_NameError = EgtMsg(31403)   ' Nome non valido
+            m_NameError = EgtMsg(MSG_MACHININGDBERRORS + 3)
          Case 2
-            m_NameError = EgtMsg(31404)   ' I caratteri \ / : * ? " < > | non sono permessi
+            m_NameError = EgtMsg(MSG_MACHININGDBERRORS + 4)
       End Select
-      NotifyPropertyChanged(NameOf(NameErrorMsg))
+      NotifyPropertyChanged("NameErrorMsg")
       If String.IsNullOrEmpty(m_NameError) Then
          Return True
       Else
@@ -7877,7 +7919,7 @@ Public Class MachiningTreeViewItem
                EgtTdbSetCurrTool(m_ToolList(SelectedTool))
                EgtTdbGetCurrToolParam(MCH_TP.MAXSPEED, dMaxSpeed)
                If Math.Abs(dSpeed) > dMaxSpeed + EPS_ZERO Then
-                  m_SpeedError = EgtMsg(31111)  ' La Rotazione deve essere minore della Rotazione Massima
+                  m_SpeedError = EgtMsg(MSG_TOOLDBERRORS + 11)
                End If
             End If
          End If
@@ -7889,15 +7931,17 @@ Public Class MachiningTreeViewItem
             EgtTdbSetCurrTool(m_Tool)
             EgtTdbGetCurrToolParam(MCH_TP.MAXSPEED, dMaxSpeed)
             If Math.Abs(dSpeed) > dMaxSpeed + EPS_ZERO Then
-               m_SpeedError = EgtMsg(31111)  ' La Rotazione deve essere minore della Rotazione Massima
+               m_SpeedError = EgtMsg(MSG_TOOLDBERRORS + 11)
             End If
          End If
       End If
-      NotifyPropertyChanged(NameOf(SpeedErrorMsg))
+      NotifyPropertyChanged("SpeedErrorMsg")
       Return String.IsNullOrEmpty(m_SpeedError)
    End Function
 
    Private Function ValidateTabLen() As Boolean
+      '' Se non è fresatura del legno, salto il controllo
+      'If m_Type <> MCH_MY.MILLING OrElse m_MatType <> MaterialType.WOOD Then Return True
       ' Eseguo il controllo
       m_TabLenError = String.Empty
       If Not IsNothing(m_TabLen) Then
@@ -7907,11 +7951,13 @@ Public Class MachiningTreeViewItem
             m_TabLenError = EgtMsg(31411)               'La Lunghezza deve essere positiva
          End If
       End If
-      NotifyPropertyChanged(NameOf(TabLenErrorMsg))
+      NotifyPropertyChanged("TabLenErrorMsg")
       Return String.IsNullOrEmpty(m_TabLenError)
    End Function
 
    Private Function ValidateTabDist() As Boolean
+      '' Se non è fresatura del legno, salto il controllo
+      'If m_Type <> MCH_MY.MILLING OrElse m_MatType <> MaterialType.WOOD Then Return True
       ' Eseguo il controllo
       m_TabDistError = String.Empty
       If Not IsNothing(m_TabDist) Then
@@ -7921,11 +7967,13 @@ Public Class MachiningTreeViewItem
             m_TabDistError = EgtMsg(31412)                'La Distanza deve essere positiva
          End If
       End If
-      NotifyPropertyChanged(NameOf(TabDistErrorMsg))
+      NotifyPropertyChanged("TabDistErrorMsg")
       Return String.IsNullOrEmpty(m_TabDistError)
    End Function
 
    Private Function ValidateTabHeight() As Boolean
+      '' Se non è fresatura del legno, salto il controllo
+      'If m_Type <> MCH_MY.MILLING OrElse m_MatType <> MaterialType.WOOD Then Return True
       ' Eseguo il controllo
       m_TabHeightError = String.Empty
       If Not IsNothing(m_TabHeight) Then
@@ -7935,11 +7983,13 @@ Public Class MachiningTreeViewItem
             m_TabHeightError = EgtMsg(31413)              'L'Altezza deve essere positiva
          End If
       End If
-      NotifyPropertyChanged(NameOf(TabHeightErrorMsg))
+      NotifyPropertyChanged("TabHeightErrorMsg")
       Return String.IsNullOrEmpty(m_TabHeightError)
    End Function
 
    Private Function ValidateTabAngle() As Boolean
+      '' Se non è fresatura del legno, salto il controllo
+      'If m_Type <> MCH_MY.MILLING OrElse m_MatType <> MaterialType.WOOD Then Return True
       ' Eseguo il controllo
       m_TabAngleError = String.Empty
       If Not IsNothing(m_TabAngle) Then
@@ -7951,11 +8001,13 @@ Public Class MachiningTreeViewItem
             m_TabAngleError = String.Format(EgtMsg(31414), "30", "75")            'L'Angolo deve essere compreso tra {0}° e {1}°
          End If
       End If
-      NotifyPropertyChanged(NameOf(TabAngleErrorMsg))
+      NotifyPropertyChanged("TabAngleErrorMsg")
       Return String.IsNullOrEmpty(m_TabAngleError)
    End Function
 
    Private Function ValidateTabMax() As Boolean
+      '' Se non è fresatura del legno, salto il controllo
+      'If m_Type <> MCH_MY.MILLING OrElse m_MatType <> MaterialType.WOOD Then Return True
       ' Eseguo il controllo
       m_TabMaxError = String.Empty
       If Not IsNothing(m_TabMax) Then
@@ -7972,11 +8024,13 @@ Public Class MachiningTreeViewItem
             End If
          End If
       End If
-      NotifyPropertyChanged(NameOf(TabMaxErrorMsg))
+      NotifyPropertyChanged("TabMaxErrorMsg")
       Return String.IsNullOrEmpty(m_TabMaxError)
    End Function
 
    Private Function ValidateTabMin() As Boolean
+      '' Se non è fresatura del legno, salto il controllo
+      'If m_Type <> MCH_MY.MILLING OrElse m_MatType <> MaterialType.WOOD Then Return True
       ' Eseguo il controllo
       m_TabMinError = String.Empty
       If Not IsNothing(m_TabMin) Then
@@ -7993,7 +8047,7 @@ Public Class MachiningTreeViewItem
             End If
          End If
       End If
-      NotifyPropertyChanged(NameOf(TabMinErrorMsg))
+      NotifyPropertyChanged("TabMinErrorMsg")
       Return String.IsNullOrEmpty(m_TabMinError)
    End Function
 
@@ -8004,12 +8058,12 @@ Public Class MachiningTreeViewItem
       m_TabAngleError = String.Empty
       m_TabMinError = String.Empty
       m_TabMaxError = String.Empty
-      NotifyPropertyChanged(NameOf(TabLenErrorMsg))
-      NotifyPropertyChanged(NameOf(TabDistErrorMsg))
-      NotifyPropertyChanged(NameOf(TabHeightErrorMsg))
-      NotifyPropertyChanged(NameOf(TabAngleErrorMsg))
-      NotifyPropertyChanged(NameOf(TabMinErrorMsg))
-      NotifyPropertyChanged(NameOf(TabMaxErrorMsg))
+      NotifyPropertyChanged("TabLenErrorMsg")
+      NotifyPropertyChanged("TabDistErrorMsg")
+      NotifyPropertyChanged("TabHeightErrorMsg")
+      NotifyPropertyChanged("TabAngleErrorMsg")
+      NotifyPropertyChanged("TabMinErrorMsg")
+      NotifyPropertyChanged("TabMaxErrorMsg")
    End Sub
 
 #End Region    ' Validation
@@ -8053,6 +8107,49 @@ Public Class MachiningTreeViewItem
 
 End Class
 
+''' <summary>
+''' Class that represent a Converter that use machining type and param type, to set the visibility state of the param type.
+''' </summary>
+Public Class MachiningParamVisibilityConverter
+   Implements IValueConverter
+
+   Public Function Convert(value As Object, targetType As Type, parameter As Object, culture As System.Globalization.CultureInfo) As Object Implements IValueConverter.Convert
+      Select Case CInt(value)
+         Case MCH_MY.NONE
+            Return Visibility.Hidden
+         Case MCH_MY.DRILLING
+            Return TMDbParamVisibility.Drilling(CInt(parameter))
+         Case MCH_MY.SAWING
+            Return TMDbParamVisibility.Sawing(CInt(parameter))
+         Case MCH_MY.MILLING
+            Return TMDbParamVisibility.Milling(CInt(parameter))
+         Case MCH_MY.POCKETING
+            Return TMDbParamVisibility.Pocketing(CInt(parameter))
+         Case MCH_MY.MORTISING
+            Return TMDbParamVisibility.Mortising(CInt(parameter))
+         Case MCH_MY.SAWROUGHING
+            Return TMDbParamVisibility.Sawroughing(CInt(parameter))
+         Case MCH_MY.SAWFINISHING
+            Return TMDbParamVisibility.Sawfinishing(CInt(parameter))
+         Case MCH_MY.GENMACHINING
+            Return TMDbParamVisibility.GenMachining(CInt(parameter))
+         Case MCH_MY.CHISELING
+            Return TMDbParamVisibility.Chiseling(CInt(parameter))
+         Case MCH_MY.WATERJETTING
+            Return TMDbParamVisibility.Waterjetting(CInt(parameter))
+         Case MCH_MY.FIVEAXISMILLING
+            Return TMDbParamVisibility.FiveAxMachining(CInt(parameter))
+         Case Else
+            Return Visibility.Hidden
+      End Select
+   End Function
+
+   Public Function ConvertBack(value As Object, targetType As Type, parameter As Object, culture As System.Globalization.CultureInfo) As Object Implements IValueConverter.ConvertBack
+      Throw New NotImplementedException
+   End Function
+
+End Class
+
 Public Class ErrorVisibilityConverter
    Implements IValueConverter
 
diff --git a/MachiningDbWindow/MortisingParamPageV.xaml b/MachiningDbWindow/MortisingParamPageV.xaml
index 59a7ddb..55dca88 100644
--- a/MachiningDbWindow/MortisingParamPageV.xaml
+++ b/MachiningDbWindow/MortisingParamPageV.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="MortisingParamPageV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
 
    <UserControl.Resources>
@@ -18,7 +19,80 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
          <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+         <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Invert">0</sys:Int32>
+         <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+         <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+         <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+         <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+         <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+         <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+         <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+         <sys:Int32 x:Key="StepType">8</sys:Int32>
+         <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+         <sys:Int32 x:Key="Speed">10</sys:Int32>
+         <sys:Int32 x:Key="Feed">11</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+         <sys:Int32 x:Key="OffSr">15</sys:Int32>
+         <sys:Int32 x:Key="OffSl">16</sys:Int32>
+         <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+         <sys:Int32 x:Key="Approx">18</sys:Int32>
+         <sys:Int32 x:Key="StartPos">19</sys:Int32>
+         <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+         <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+         <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+         <sys:Int32 x:Key="StepPar">23</sys:Int32>
+         <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+         <sys:Int32 x:Key="TabLen">25</sys:Int32>
+         <sys:Int32 x:Key="TabDist">26</sys:Int32>
+         <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+         <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+         <sys:Int32 x:Key="LiTang">29</sys:Int32>
+         <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+         <sys:Int32 x:Key="LiElev">31</sys:Int32>
+         <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+         <sys:Int32 x:Key="LoTang">33</sys:Int32>
+         <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+         <sys:Int32 x:Key="LoElev">35</sys:Int32>
+         <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+         <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+         <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+         <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+         <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+         <sys:Int32 x:Key="SideStep">41</sys:Int32>
+         <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+         <sys:Int32 x:Key="NamePar">43</sys:Int32>
+         <sys:Int32 x:Key="Tool">44</sys:Int32>
+         <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+         <sys:Int32 x:Key="OverLap">47</sys:Int32>
+         <sys:Int32 x:Key="SubType">49</sys:Int32>
+         <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
+         <sys:Int32 x:Key="InitAngs">51</sys:Int32>
+         <sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
+         <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+         <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+         <sys:Int32 x:Key="StepBack">55</sys:Int32>
+         <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
+         <sys:Int32 x:Key="BackFeed">57</sys:Int32>
+         <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
+         <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
+         <sys:Int32 x:Key="Probing">60</sys:Int32>
+         <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
+         <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
+         <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
+         <sys:Int32 x:Key="IntCornType">64</sys:Int32>
+         <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
+         <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
+         <sys:Int32 x:Key="LiHole">67</sys:Int32>
+         <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
+         <sys:Int32 x:Key="LpTurns">69</sys:Int32>
+         <sys:Int32 x:Key="HpTurns">70</sys:Int32>
+         <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
@@ -306,12 +380,18 @@
                   <RowDefinition Height="1*"/>
                </Grid.RowDefinitions>
 
-               <TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"/>
+               <TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
+                          Visibility="{Binding Path=Type, 
+                                               Converter={StaticResource MachiningParamVisibilityConverter},
+                                               ConverterParameter={StaticResource Tool}}"/>
                <ComboBox Grid.Row="0" Grid.Column="1" 
                          ItemsSource="{Binding Path=ToolList, Mode=OneWay}"
                          Style="{DynamicResource MachiningsToolComboBox}"
                          SelectedIndex="{Binding Path=SelectedTool}"
                          IsSynchronizedWithCurrentItem="True"
+                         Visibility="{Binding Path=Type, 
+                                              Converter={StaticResource MachiningParamVisibilityConverter},
+                                              ConverterParameter={StaticResource Tool}}"
                          Margin="0,3,3,3"/>
 
                <UniformGrid Columns="1" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2">
diff --git a/MachiningDbWindow/PocketingParamPageV.xaml b/MachiningDbWindow/PocketingParamPageV.xaml
index 52861b1..733cb44 100644
--- a/MachiningDbWindow/PocketingParamPageV.xaml
+++ b/MachiningDbWindow/PocketingParamPageV.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="PocketingParamPageV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
 
    <UserControl.Resources>
@@ -18,7 +19,80 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
          <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+         <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Invert">0</sys:Int32>
+         <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+         <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+         <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+         <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+         <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+         <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+         <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+         <sys:Int32 x:Key="StepType">8</sys:Int32>
+         <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+         <sys:Int32 x:Key="Speed">10</sys:Int32>
+         <sys:Int32 x:Key="Feed">11</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+         <sys:Int32 x:Key="OffSr">15</sys:Int32>
+         <sys:Int32 x:Key="OffSl">16</sys:Int32>
+         <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+         <sys:Int32 x:Key="Approx">18</sys:Int32>
+         <sys:Int32 x:Key="StartPos">19</sys:Int32>
+         <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+         <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+         <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+         <sys:Int32 x:Key="StepPar">23</sys:Int32>
+         <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+         <sys:Int32 x:Key="TabLen">25</sys:Int32>
+         <sys:Int32 x:Key="TabDist">26</sys:Int32>
+         <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+         <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+         <sys:Int32 x:Key="LiTang">29</sys:Int32>
+         <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+         <sys:Int32 x:Key="LiElev">31</sys:Int32>
+         <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+         <sys:Int32 x:Key="LoTang">33</sys:Int32>
+         <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+         <sys:Int32 x:Key="LoElev">35</sys:Int32>
+         <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+         <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+         <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+         <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+         <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+         <sys:Int32 x:Key="SideStep">41</sys:Int32>
+         <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+         <sys:Int32 x:Key="NamePar">43</sys:Int32>
+         <sys:Int32 x:Key="Tool">44</sys:Int32>
+         <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+         <sys:Int32 x:Key="OverLap">47</sys:Int32>
+         <sys:Int32 x:Key="SubType">49</sys:Int32>
+         <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
+         <sys:Int32 x:Key="InitAngs">51</sys:Int32>
+         <sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
+         <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+         <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+         <sys:Int32 x:Key="StepBack">55</sys:Int32>
+         <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
+         <sys:Int32 x:Key="BackFeed">57</sys:Int32>
+         <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
+         <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
+         <sys:Int32 x:Key="Probing">60</sys:Int32>
+         <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
+         <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
+         <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
+         <sys:Int32 x:Key="IntCornType">64</sys:Int32>
+         <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
+         <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
+         <sys:Int32 x:Key="LiHole">67</sys:Int32>
+         <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
+         <sys:Int32 x:Key="LpTurns">69</sys:Int32>
+         <sys:Int32 x:Key="HpTurns">70</sys:Int32>
+         <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
@@ -332,12 +406,18 @@
                   <RowDefinition Height="1*"/>
                </Grid.RowDefinitions>
 
-               <TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"/>
+               <TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
+                          Visibility="{Binding Path=Type, 
+                                               Converter={StaticResource MachiningParamVisibilityConverter},
+                                               ConverterParameter={StaticResource Tool}}"/>
                <ComboBox Grid.Row="0" Grid.Column="1" 
                          ItemsSource="{Binding Path=ToolList, Mode=OneWay}"
                          Style="{DynamicResource MachiningsToolComboBox}"
                          SelectedIndex="{Binding Path=SelectedTool}"
                          IsSynchronizedWithCurrentItem="True"
+                         Visibility="{Binding Path=Type, 
+                                              Converter={StaticResource MachiningParamVisibilityConverter},
+                                              ConverterParameter={StaticResource Tool}}"
                          Margin="0,3,3,3"/>
 
                <UniformGrid Columns="1" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2">
diff --git a/MachiningDbWindow/Stone5DrillingParamPageV.xaml b/MachiningDbWindow/Stone5DrillingParamPageV.xaml
index 8d0069e..f528a40 100644
--- a/MachiningDbWindow/Stone5DrillingParamPageV.xaml
+++ b/MachiningDbWindow/Stone5DrillingParamPageV.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="Stone5DrillingParamPageV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
 
    <UserControl.Resources>
@@ -18,7 +19,80 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
          <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+         <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Invert">0</sys:Int32>
+         <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+         <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+         <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+         <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+         <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+         <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+         <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+         <sys:Int32 x:Key="StepType">8</sys:Int32>
+         <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+         <sys:Int32 x:Key="Speed">10</sys:Int32>
+         <sys:Int32 x:Key="Feed">11</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+         <sys:Int32 x:Key="OffSr">15</sys:Int32>
+         <sys:Int32 x:Key="OffSl">16</sys:Int32>
+         <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+         <sys:Int32 x:Key="Approx">18</sys:Int32>
+         <sys:Int32 x:Key="StartPos">19</sys:Int32>
+         <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+         <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+         <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+         <sys:Int32 x:Key="StepPar">23</sys:Int32>
+         <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+         <sys:Int32 x:Key="TabLen">25</sys:Int32>
+         <sys:Int32 x:Key="TabDist">26</sys:Int32>
+         <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+         <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+         <sys:Int32 x:Key="LiTang">29</sys:Int32>
+         <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+         <sys:Int32 x:Key="LiElev">31</sys:Int32>
+         <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+         <sys:Int32 x:Key="LoTang">33</sys:Int32>
+         <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+         <sys:Int32 x:Key="LoElev">35</sys:Int32>
+         <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+         <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+         <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+         <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+         <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+         <sys:Int32 x:Key="SideStep">41</sys:Int32>
+         <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+         <sys:Int32 x:Key="NamePar">43</sys:Int32>
+         <sys:Int32 x:Key="Tool">44</sys:Int32>
+         <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+         <sys:Int32 x:Key="OverLap">47</sys:Int32>
+         <sys:Int32 x:Key="SubType">49</sys:Int32>
+         <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
+         <sys:Int32 x:Key="InitAngs">51</sys:Int32>
+         <sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
+         <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+         <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+         <sys:Int32 x:Key="StepBack">55</sys:Int32>
+         <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
+         <sys:Int32 x:Key="BackFeed">57</sys:Int32>
+         <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
+         <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
+         <sys:Int32 x:Key="Probing">60</sys:Int32>
+         <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
+         <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
+         <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
+         <sys:Int32 x:Key="IntCornType">64</sys:Int32>
+         <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
+         <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
+         <sys:Int32 x:Key="LiHole">67</sys:Int32>
+         <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
+         <sys:Int32 x:Key="LpTurns">69</sys:Int32>
+         <sys:Int32 x:Key="HpTurns">70</sys:Int32>
+         <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
@@ -278,12 +352,18 @@
                   <RowDefinition Height="1*"/>
                </Grid.RowDefinitions>
 
-               <TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"/>
+               <TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
+                          Visibility="{Binding Path=Type, 
+                                               Converter={StaticResource MachiningParamVisibilityConverter},
+                                               ConverterParameter={StaticResource Tool}}"/>
                <ComboBox Grid.Column="1" 
                          ItemsSource="{Binding Path=ToolList, Mode=OneWay}"
                          Style="{DynamicResource MachiningsToolComboBox}"
                          SelectedIndex="{Binding Path=SelectedTool}"
-                         IsSynchronizedWithCurrentItem="True"/>
+                         IsSynchronizedWithCurrentItem="True"
+                         Visibility="{Binding Path=Type, 
+                                              Converter={StaticResource MachiningParamVisibilityConverter},
+                                              ConverterParameter={StaticResource Tool}}"/>
             </Grid>
          </GroupBox>
 
diff --git a/MachiningDbWindow/Stone5MillingParamPageV.xaml b/MachiningDbWindow/Stone5MillingParamPageV.xaml
index 5cba677..2b2df07 100644
--- a/MachiningDbWindow/Stone5MillingParamPageV.xaml
+++ b/MachiningDbWindow/Stone5MillingParamPageV.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="Stone5MillingParamPageV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
 
    <UserControl.Resources>
@@ -18,7 +19,80 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
          <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+         <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Invert">0</sys:Int32>
+         <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+         <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+         <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+         <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+         <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+         <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+         <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+         <sys:Int32 x:Key="StepType">8</sys:Int32>
+         <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+         <sys:Int32 x:Key="Speed">10</sys:Int32>
+         <sys:Int32 x:Key="Feed">11</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+         <sys:Int32 x:Key="OffSr">15</sys:Int32>
+         <sys:Int32 x:Key="OffSl">16</sys:Int32>
+         <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+         <sys:Int32 x:Key="Approx">18</sys:Int32>
+         <sys:Int32 x:Key="StartPos">19</sys:Int32>
+         <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+         <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+         <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+         <sys:Int32 x:Key="StepPar">23</sys:Int32>
+         <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+         <sys:Int32 x:Key="TabLen">25</sys:Int32>
+         <sys:Int32 x:Key="TabDist">26</sys:Int32>
+         <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+         <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+         <sys:Int32 x:Key="LiTang">29</sys:Int32>
+         <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+         <sys:Int32 x:Key="LiElev">31</sys:Int32>
+         <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+         <sys:Int32 x:Key="LoTang">33</sys:Int32>
+         <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+         <sys:Int32 x:Key="LoElev">35</sys:Int32>
+         <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+         <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+         <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+         <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+         <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+         <sys:Int32 x:Key="SideStep">41</sys:Int32>
+         <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+         <sys:Int32 x:Key="NamePar">43</sys:Int32>
+         <sys:Int32 x:Key="Tool">44</sys:Int32>
+         <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+         <sys:Int32 x:Key="OverLap">47</sys:Int32>
+         <sys:Int32 x:Key="SubType">49</sys:Int32>
+         <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
+         <sys:Int32 x:Key="InitAngs">51</sys:Int32>
+         <sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
+         <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+         <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+         <sys:Int32 x:Key="StepBack">55</sys:Int32>
+         <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
+         <sys:Int32 x:Key="BackFeed">57</sys:Int32>
+         <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
+         <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
+         <sys:Int32 x:Key="Probing">60</sys:Int32>
+         <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
+         <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
+         <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
+         <sys:Int32 x:Key="IntCornType">64</sys:Int32>
+         <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
+         <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
+         <sys:Int32 x:Key="LiHole">67</sys:Int32>
+         <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
+         <sys:Int32 x:Key="LpTurns">69</sys:Int32>
+         <sys:Int32 x:Key="HpTurns">70</sys:Int32>
+         <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
@@ -280,12 +354,18 @@
                   <RowDefinition Height="1*"/>
                </Grid.RowDefinitions>
 
-               <TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"/>
+               <TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
+                          Visibility="{Binding Path=Type, 
+                                               Converter={StaticResource MachiningParamVisibilityConverter},
+                                               ConverterParameter={StaticResource Tool}}"/>
                <ComboBox Grid.Column="1" 
                          ItemsSource="{Binding Path=ToolList, Mode=OneWay}"
                          Style="{DynamicResource MachiningsToolComboBox}"
                          SelectedIndex="{Binding Path=SelectedTool}"
-                         IsSynchronizedWithCurrentItem="True"/>
+                         IsSynchronizedWithCurrentItem="True"
+                         Visibility="{Binding Path=Type, 
+                                              Converter={StaticResource MachiningParamVisibilityConverter},
+                                              ConverterParameter={StaticResource Tool}}"/>
             </Grid>
          </GroupBox>
 
diff --git a/MachiningDbWindow/Stone5SawFinishingParamPageV.xaml b/MachiningDbWindow/Stone5SawFinishingParamPageV.xaml
index d5c565a..8711ed1 100644
--- a/MachiningDbWindow/Stone5SawFinishingParamPageV.xaml
+++ b/MachiningDbWindow/Stone5SawFinishingParamPageV.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="Stone5SawFinishingParamPageV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
 
    <UserControl.Resources>
@@ -18,7 +19,80 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
          <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+         <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Invert">0</sys:Int32>
+         <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+         <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+         <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+         <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+         <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+         <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+         <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+         <sys:Int32 x:Key="StepType">8</sys:Int32>
+         <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+         <sys:Int32 x:Key="Speed">10</sys:Int32>
+         <sys:Int32 x:Key="Feed">11</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+         <sys:Int32 x:Key="OffSr">15</sys:Int32>
+         <sys:Int32 x:Key="OffSl">16</sys:Int32>
+         <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+         <sys:Int32 x:Key="Approx">18</sys:Int32>
+         <sys:Int32 x:Key="StartPos">19</sys:Int32>
+         <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+         <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+         <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+         <sys:Int32 x:Key="StepPar">23</sys:Int32>
+         <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+         <sys:Int32 x:Key="TabLen">25</sys:Int32>
+         <sys:Int32 x:Key="TabDist">26</sys:Int32>
+         <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+         <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+         <sys:Int32 x:Key="LiTang">29</sys:Int32>
+         <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+         <sys:Int32 x:Key="LiElev">31</sys:Int32>
+         <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+         <sys:Int32 x:Key="LoTang">33</sys:Int32>
+         <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+         <sys:Int32 x:Key="LoElev">35</sys:Int32>
+         <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+         <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+         <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+         <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+         <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+         <sys:Int32 x:Key="SideStep">41</sys:Int32>
+         <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+         <sys:Int32 x:Key="NamePar">43</sys:Int32>
+         <sys:Int32 x:Key="Tool">44</sys:Int32>
+         <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+         <sys:Int32 x:Key="OverLap">47</sys:Int32>
+         <sys:Int32 x:Key="SubType">49</sys:Int32>
+         <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
+         <sys:Int32 x:Key="InitAngs">51</sys:Int32>
+         <sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
+         <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+         <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+         <sys:Int32 x:Key="StepBack">55</sys:Int32>
+         <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
+         <sys:Int32 x:Key="BackFeed">57</sys:Int32>
+         <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
+         <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
+         <sys:Int32 x:Key="Probing">60</sys:Int32>
+         <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
+         <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
+         <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
+         <sys:Int32 x:Key="IntCornType">64</sys:Int32>
+         <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
+         <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
+         <sys:Int32 x:Key="LiHole">67</sys:Int32>
+         <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
+         <sys:Int32 x:Key="LpTurns">69</sys:Int32>
+         <sys:Int32 x:Key="HpTurns">70</sys:Int32>
+         <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
@@ -322,12 +396,18 @@
                   <RowDefinition Height="1*"/>
                </Grid.RowDefinitions>
 
-               <TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"/>
+               <TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
+                          Visibility="{Binding Path=Type, 
+                                               Converter={StaticResource MachiningParamVisibilityConverter},
+                                               ConverterParameter={StaticResource Tool}}"/>
                <ComboBox Grid.Column="1" 
                          ItemsSource="{Binding Path=ToolList, Mode=OneWay}"
                          Style="{DynamicResource MachiningsToolComboBox}"
                          SelectedIndex="{Binding Path=SelectedTool}"
-                         IsSynchronizedWithCurrentItem="True"/>
+                         IsSynchronizedWithCurrentItem="True"
+                         Visibility="{Binding Path=Type, 
+                                              Converter={StaticResource MachiningParamVisibilityConverter},
+                                              ConverterParameter={StaticResource Tool}}"/>
             </Grid>
          </GroupBox>
 
diff --git a/MachiningDbWindow/Stone5SawRoughingParamPageV.xaml b/MachiningDbWindow/Stone5SawRoughingParamPageV.xaml
index 2a567d7..f700112 100644
--- a/MachiningDbWindow/Stone5SawRoughingParamPageV.xaml
+++ b/MachiningDbWindow/Stone5SawRoughingParamPageV.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="Stone5SawRoughingParamPageV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
 
    <UserControl.Resources>
@@ -18,7 +19,80 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
          <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+         <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Invert">0</sys:Int32>
+         <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+         <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+         <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+         <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+         <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+         <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+         <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+         <sys:Int32 x:Key="StepType">8</sys:Int32>
+         <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+         <sys:Int32 x:Key="Speed">10</sys:Int32>
+         <sys:Int32 x:Key="Feed">11</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+         <sys:Int32 x:Key="OffSr">15</sys:Int32>
+         <sys:Int32 x:Key="OffSl">16</sys:Int32>
+         <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+         <sys:Int32 x:Key="Approx">18</sys:Int32>
+         <sys:Int32 x:Key="StartPos">19</sys:Int32>
+         <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+         <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+         <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+         <sys:Int32 x:Key="StepPar">23</sys:Int32>
+         <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+         <sys:Int32 x:Key="TabLen">25</sys:Int32>
+         <sys:Int32 x:Key="TabDist">26</sys:Int32>
+         <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+         <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+         <sys:Int32 x:Key="LiTang">29</sys:Int32>
+         <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+         <sys:Int32 x:Key="LiElev">31</sys:Int32>
+         <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+         <sys:Int32 x:Key="LoTang">33</sys:Int32>
+         <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+         <sys:Int32 x:Key="LoElev">35</sys:Int32>
+         <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+         <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+         <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+         <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+         <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+         <sys:Int32 x:Key="SideStep">41</sys:Int32>
+         <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+         <sys:Int32 x:Key="NamePar">43</sys:Int32>
+         <sys:Int32 x:Key="Tool">44</sys:Int32>
+         <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+         <sys:Int32 x:Key="OverLap">47</sys:Int32>
+         <sys:Int32 x:Key="SubType">49</sys:Int32>
+         <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
+         <sys:Int32 x:Key="InitAngs">51</sys:Int32>
+         <sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
+         <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+         <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+         <sys:Int32 x:Key="StepBack">55</sys:Int32>
+         <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
+         <sys:Int32 x:Key="BackFeed">57</sys:Int32>
+         <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
+         <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
+         <sys:Int32 x:Key="Probing">60</sys:Int32>
+         <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
+         <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
+         <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
+         <sys:Int32 x:Key="IntCornType">64</sys:Int32>
+         <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
+         <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
+         <sys:Int32 x:Key="LiHole">67</sys:Int32>
+         <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
+         <sys:Int32 x:Key="LpTurns">69</sys:Int32>
+         <sys:Int32 x:Key="HpTurns">70</sys:Int32>
+         <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
@@ -310,12 +384,18 @@
                   <RowDefinition Height="1*"/>
                </Grid.RowDefinitions>
 
-               <TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"/>
+               <TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
+                          Visibility="{Binding Path=Type, 
+                                               Converter={StaticResource MachiningParamVisibilityConverter},
+                                               ConverterParameter={StaticResource Tool}}"/>
                <ComboBox Grid.Column="1" 
                          ItemsSource="{Binding Path=ToolList, Mode=OneWay}"
                          Style="{DynamicResource MachiningsToolComboBox}"
                          SelectedIndex="{Binding Path=SelectedTool}"
-                         IsSynchronizedWithCurrentItem="True"/>
+                         IsSynchronizedWithCurrentItem="True"
+                         Visibility="{Binding Path=Type, 
+                                              Converter={StaticResource MachiningParamVisibilityConverter},
+                                              ConverterParameter={StaticResource Tool}}"/>
             </Grid>
          </GroupBox>
 
diff --git a/MachiningDbWindow/Stone5SawingParamPageV.xaml b/MachiningDbWindow/Stone5SawingParamPageV.xaml
index 29ecd4e..a64cd16 100644
--- a/MachiningDbWindow/Stone5SawingParamPageV.xaml
+++ b/MachiningDbWindow/Stone5SawingParamPageV.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="Stone5SawingParamPageV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
 
    <UserControl.Resources>
@@ -18,7 +19,80 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
          <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+         <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Invert">0</sys:Int32>
+         <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+         <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+         <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+         <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+         <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+         <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+         <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+         <sys:Int32 x:Key="StepType">8</sys:Int32>
+         <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+         <sys:Int32 x:Key="Speed">10</sys:Int32>
+         <sys:Int32 x:Key="Feed">11</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+         <sys:Int32 x:Key="OffSr">15</sys:Int32>
+         <sys:Int32 x:Key="OffSl">16</sys:Int32>
+         <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+         <sys:Int32 x:Key="Approx">18</sys:Int32>
+         <sys:Int32 x:Key="StartPos">19</sys:Int32>
+         <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+         <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+         <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+         <sys:Int32 x:Key="StepPar">23</sys:Int32>
+         <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+         <sys:Int32 x:Key="TabLen">25</sys:Int32>
+         <sys:Int32 x:Key="TabDist">26</sys:Int32>
+         <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+         <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+         <sys:Int32 x:Key="LiTang">29</sys:Int32>
+         <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+         <sys:Int32 x:Key="LiElev">31</sys:Int32>
+         <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+         <sys:Int32 x:Key="LoTang">33</sys:Int32>
+         <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+         <sys:Int32 x:Key="LoElev">35</sys:Int32>
+         <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+         <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+         <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+         <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+         <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+         <sys:Int32 x:Key="SideStep">41</sys:Int32>
+         <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+         <sys:Int32 x:Key="NamePar">43</sys:Int32>
+         <sys:Int32 x:Key="Tool">44</sys:Int32>
+         <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+         <sys:Int32 x:Key="OverLap">47</sys:Int32>
+         <sys:Int32 x:Key="SubType">49</sys:Int32>
+         <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
+         <sys:Int32 x:Key="InitAngs">51</sys:Int32>
+         <sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
+         <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+         <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+         <sys:Int32 x:Key="StepBack">55</sys:Int32>
+         <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
+         <sys:Int32 x:Key="BackFeed">57</sys:Int32>
+         <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
+         <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
+         <sys:Int32 x:Key="Probing">60</sys:Int32>
+         <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
+         <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
+         <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
+         <sys:Int32 x:Key="IntCornType">64</sys:Int32>
+         <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
+         <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
+         <sys:Int32 x:Key="LiHole">67</sys:Int32>
+         <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
+         <sys:Int32 x:Key="LpTurns">69</sys:Int32>
+         <sys:Int32 x:Key="HpTurns">70</sys:Int32>
+         <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
@@ -381,12 +455,18 @@
                   <RowDefinition Height="1*"/>
                </Grid.RowDefinitions>
 
-               <TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"/>
+               <TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
+                          Visibility="{Binding Path=Type, 
+                                               Converter={StaticResource MachiningParamVisibilityConverter},
+                                               ConverterParameter={StaticResource Tool}}"/>
                <ComboBox Grid.Column="1" 
                          ItemsSource="{Binding Path=ToolList, Mode=OneWay}"
                          Style="{DynamicResource MachiningsToolComboBox}"
                          SelectedIndex="{Binding Path=SelectedTool}"
-                         IsSynchronizedWithCurrentItem="True"/>
+                         IsSynchronizedWithCurrentItem="True"
+                         Visibility="{Binding Path=Type, 
+                                              Converter={StaticResource MachiningParamVisibilityConverter},
+                                              ConverterParameter={StaticResource Tool}}"/>
             </Grid>
          </GroupBox>
 
diff --git a/MachiningDbWindow/Stone5WaterjettingParamPageV.xaml b/MachiningDbWindow/Stone5WaterjettingParamPageV.xaml
index b923824..de155f8 100644
--- a/MachiningDbWindow/Stone5WaterjettingParamPageV.xaml
+++ b/MachiningDbWindow/Stone5WaterjettingParamPageV.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="Stone5WaterjettingParamPageV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
 
    <UserControl.Resources>
@@ -18,7 +19,80 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
          <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+         <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Invert">0</sys:Int32>
+         <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+         <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+         <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+         <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+         <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+         <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+         <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+         <sys:Int32 x:Key="StepType">8</sys:Int32>
+         <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+         <sys:Int32 x:Key="Speed">10</sys:Int32>
+         <sys:Int32 x:Key="Feed">11</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+         <sys:Int32 x:Key="OffSr">15</sys:Int32>
+         <sys:Int32 x:Key="OffSl">16</sys:Int32>
+         <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+         <sys:Int32 x:Key="Approx">18</sys:Int32>
+         <sys:Int32 x:Key="StartPos">19</sys:Int32>
+         <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+         <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+         <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+         <sys:Int32 x:Key="StepPar">23</sys:Int32>
+         <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+         <sys:Int32 x:Key="TabLen">25</sys:Int32>
+         <sys:Int32 x:Key="TabDist">26</sys:Int32>
+         <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+         <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+         <sys:Int32 x:Key="LiTang">29</sys:Int32>
+         <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+         <sys:Int32 x:Key="LiElev">31</sys:Int32>
+         <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+         <sys:Int32 x:Key="LoTang">33</sys:Int32>
+         <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+         <sys:Int32 x:Key="LoElev">35</sys:Int32>
+         <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+         <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+         <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+         <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+         <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+         <sys:Int32 x:Key="SideStep">41</sys:Int32>
+         <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+         <sys:Int32 x:Key="NamePar">43</sys:Int32>
+         <sys:Int32 x:Key="Tool">44</sys:Int32>
+         <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+         <sys:Int32 x:Key="OverLap">47</sys:Int32>
+         <sys:Int32 x:Key="SubType">49</sys:Int32>
+         <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
+         <sys:Int32 x:Key="InitAngs">51</sys:Int32>
+         <sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
+         <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+         <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+         <sys:Int32 x:Key="StepBack">55</sys:Int32>
+         <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
+         <sys:Int32 x:Key="BackFeed">57</sys:Int32>
+         <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
+         <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
+         <sys:Int32 x:Key="Probing">60</sys:Int32>
+         <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
+         <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
+         <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
+         <sys:Int32 x:Key="IntCornType">64</sys:Int32>
+         <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
+         <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
+         <sys:Int32 x:Key="LiHole">67</sys:Int32>
+         <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
+         <sys:Int32 x:Key="LpTurns">69</sys:Int32>
+         <sys:Int32 x:Key="HpTurns">70</sys:Int32>
+         <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
@@ -404,12 +478,18 @@
                   <RowDefinition Height="1*"/>
                </Grid.RowDefinitions>
 
-               <TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"/>
+               <TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
+                          Visibility="{Binding Path=Type, 
+                                               Converter={StaticResource MachiningParamVisibilityConverter},
+                                               ConverterParameter={StaticResource Tool}}"/>
                <ComboBox Grid.Column="1" 
                          ItemsSource="{Binding Path=ToolList,Mode=OneWay}"
                          Style="{DynamicResource MachiningsToolComboBox}"
                          SelectedIndex="{Binding Path=SelectedTool}"
-                         IsSynchronizedWithCurrentItem="True"/>
+                         IsSynchronizedWithCurrentItem="True"
+                         Visibility="{Binding Path=Type, 
+                                              Converter={StaticResource MachiningParamVisibilityConverter},
+                                              ConverterParameter={StaticResource Tool}}"/>
             </Grid>
          </GroupBox>
 
diff --git a/MachiningDbWindow/StoneDrillingParamPageV.xaml b/MachiningDbWindow/StoneDrillingParamPageV.xaml
index 23e4b63..c8c57c1 100644
--- a/MachiningDbWindow/StoneDrillingParamPageV.xaml
+++ b/MachiningDbWindow/StoneDrillingParamPageV.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="StoneDrillingParamPageV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5"
              x:Name="PIPPO">
 
@@ -64,7 +65,80 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
          <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+         <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Invert">0</sys:Int32>
+         <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+         <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+         <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+         <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+         <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+         <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+         <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+         <sys:Int32 x:Key="StepType">8</sys:Int32>
+         <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+         <sys:Int32 x:Key="Speed">10</sys:Int32>
+         <sys:Int32 x:Key="Feed">11</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+         <sys:Int32 x:Key="OffSr">15</sys:Int32>
+         <sys:Int32 x:Key="OffSl">16</sys:Int32>
+         <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+         <sys:Int32 x:Key="Approx">18</sys:Int32>
+         <sys:Int32 x:Key="StartPos">19</sys:Int32>
+         <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+         <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+         <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+         <sys:Int32 x:Key="StepPar">23</sys:Int32>
+         <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+         <sys:Int32 x:Key="TabLen">25</sys:Int32>
+         <sys:Int32 x:Key="TabDist">26</sys:Int32>
+         <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+         <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+         <sys:Int32 x:Key="LiTang">29</sys:Int32>
+         <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+         <sys:Int32 x:Key="LiElev">31</sys:Int32>
+         <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+         <sys:Int32 x:Key="LoTang">33</sys:Int32>
+         <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+         <sys:Int32 x:Key="LoElev">35</sys:Int32>
+         <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+         <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+         <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+         <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+         <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+         <sys:Int32 x:Key="SideStep">41</sys:Int32>
+         <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+         <sys:Int32 x:Key="NamePar">43</sys:Int32>
+         <sys:Int32 x:Key="Tool">44</sys:Int32>
+         <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+         <sys:Int32 x:Key="OverLap">47</sys:Int32>
+         <sys:Int32 x:Key="SubType">49</sys:Int32>
+         <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
+         <sys:Int32 x:Key="InitAngs">51</sys:Int32>
+         <sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
+         <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+         <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+         <sys:Int32 x:Key="StepBack">55</sys:Int32>
+         <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
+         <sys:Int32 x:Key="BackFeed">57</sys:Int32>
+         <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
+         <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
+         <sys:Int32 x:Key="Probing">60</sys:Int32>
+         <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
+         <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
+         <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
+         <sys:Int32 x:Key="IntCornType">64</sys:Int32>
+         <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
+         <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
+         <sys:Int32 x:Key="LiHole">67</sys:Int32>
+         <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
+         <sys:Int32 x:Key="LpTurns">69</sys:Int32>
+         <sys:Int32 x:Key="HpTurns">70</sys:Int32>
+         <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
@@ -377,12 +451,18 @@
                </Grid.RowDefinitions>
 
                <TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
-                          Foreground="{Binding ElementName=PIPPO, Path=MyForegroundGrbColor}"/>
+                          Foreground="{Binding ElementName=PIPPO, Path=MyForegroundGrbColor}"
+                          Visibility="{Binding Path=Type, 
+                                               Converter={StaticResource MachiningParamVisibilityConverter},
+                                               ConverterParameter={StaticResource Tool}}"/>
                <ComboBox Grid.Column="1" 
                          ItemsSource="{Binding Path=ToolList, Mode=OneWay}"
                          Style="{DynamicResource MachiningsToolComboBox}"
                          SelectedIndex="{Binding Path=SelectedTool}"
                          IsSynchronizedWithCurrentItem="True"
+                         Visibility="{Binding Path=Type, 
+                                              Converter={StaticResource MachiningParamVisibilityConverter},
+                                              ConverterParameter={StaticResource Tool}}"
                          Background="{Binding ElementName=PIPPO, Path=BackgroundCmBxTxBl}"
                          Foreground="{Binding ElementName=PIPPO, Path=ForegroundCmBxTxBl}"
                          BorderThickness="{Binding ElementName=PIPPO, Path=BorderThicknessCmBxTxBl}"
diff --git a/MachiningDbWindow/StoneMillingParamPageV.xaml b/MachiningDbWindow/StoneMillingParamPageV.xaml
index f2be6eb..a3b9f74 100644
--- a/MachiningDbWindow/StoneMillingParamPageV.xaml
+++ b/MachiningDbWindow/StoneMillingParamPageV.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="StoneMillingParamPageV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5"
              x:Name="PIPPO">
 
@@ -64,7 +65,80 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
          <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+         <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Invert">0</sys:Int32>
+         <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+         <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+         <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+         <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+         <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+         <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+         <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+         <sys:Int32 x:Key="StepType">8</sys:Int32>
+         <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+         <sys:Int32 x:Key="Speed">10</sys:Int32>
+         <sys:Int32 x:Key="Feed">11</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+         <sys:Int32 x:Key="OffSr">15</sys:Int32>
+         <sys:Int32 x:Key="OffSl">16</sys:Int32>
+         <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+         <sys:Int32 x:Key="Approx">18</sys:Int32>
+         <sys:Int32 x:Key="StartPos">19</sys:Int32>
+         <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+         <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+         <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+         <sys:Int32 x:Key="StepPar">23</sys:Int32>
+         <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+         <sys:Int32 x:Key="TabLen">25</sys:Int32>
+         <sys:Int32 x:Key="TabDist">26</sys:Int32>
+         <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+         <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+         <sys:Int32 x:Key="LiTang">29</sys:Int32>
+         <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+         <sys:Int32 x:Key="LiElev">31</sys:Int32>
+         <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+         <sys:Int32 x:Key="LoTang">33</sys:Int32>
+         <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+         <sys:Int32 x:Key="LoElev">35</sys:Int32>
+         <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+         <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+         <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+         <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+         <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+         <sys:Int32 x:Key="SideStep">41</sys:Int32>
+         <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+         <sys:Int32 x:Key="NamePar">43</sys:Int32>
+         <sys:Int32 x:Key="Tool">44</sys:Int32>
+         <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+         <sys:Int32 x:Key="OverLap">47</sys:Int32>
+         <sys:Int32 x:Key="SubType">49</sys:Int32>
+         <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
+         <sys:Int32 x:Key="InitAngs">51</sys:Int32>
+         <sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
+         <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+         <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+         <sys:Int32 x:Key="StepBack">55</sys:Int32>
+         <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
+         <sys:Int32 x:Key="BackFeed">57</sys:Int32>
+         <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
+         <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
+         <sys:Int32 x:Key="Probing">60</sys:Int32>
+         <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
+         <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
+         <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
+         <sys:Int32 x:Key="IntCornType">64</sys:Int32>
+         <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
+         <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
+         <sys:Int32 x:Key="LiHole">67</sys:Int32>
+         <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
+         <sys:Int32 x:Key="LpTurns">69</sys:Int32>
+         <sys:Int32 x:Key="HpTurns">70</sys:Int32>
+         <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
@@ -379,12 +453,18 @@
                </Grid.RowDefinitions>
 
                <TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
-                          Foreground="{Binding ElementName=PIPPO, Path=MyForegroundGrbColor}"/>
+                          Foreground="{Binding ElementName=PIPPO, Path=MyForegroundGrbColor}"
+                          Visibility="{Binding Path=Type, 
+                                               Converter={StaticResource MachiningParamVisibilityConverter},
+                                               ConverterParameter={StaticResource Tool}}"/>
                <ComboBox Grid.Column="1" 
                          ItemsSource="{Binding Path=ToolList, Mode=OneWay}"
                          Style="{DynamicResource MachiningsToolComboBox}"
                          SelectedIndex="{Binding Path=SelectedTool}"
                          IsSynchronizedWithCurrentItem="True"
+                         Visibility="{Binding Path=Type, 
+                                              Converter={StaticResource MachiningParamVisibilityConverter},
+                                              ConverterParameter={StaticResource Tool}}"
                          Background="{Binding ElementName=PIPPO, Path=BackgroundCmBxTxBl}"
                          Foreground="{Binding ElementName=PIPPO, Path=ForegroundCmBxTxBl}"
                          BorderThickness="{Binding ElementName=PIPPO, Path=BorderThicknessCmBxTxBl}"
diff --git a/MachiningDbWindow/StoneSawFinishingParamPageV.xaml b/MachiningDbWindow/StoneSawFinishingParamPageV.xaml
index 4d898b8..13c6649 100644
--- a/MachiningDbWindow/StoneSawFinishingParamPageV.xaml
+++ b/MachiningDbWindow/StoneSawFinishingParamPageV.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="StoneSawFinishingParamPageV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5"
              x:Name="PIPPO">
 
@@ -66,7 +67,80 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
          <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+         <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Invert">0</sys:Int32>
+         <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+         <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+         <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+         <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+         <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+         <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+         <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+         <sys:Int32 x:Key="StepType">8</sys:Int32>
+         <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+         <sys:Int32 x:Key="Speed">10</sys:Int32>
+         <sys:Int32 x:Key="Feed">11</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+         <sys:Int32 x:Key="OffSr">15</sys:Int32>
+         <sys:Int32 x:Key="OffSl">16</sys:Int32>
+         <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+         <sys:Int32 x:Key="Approx">18</sys:Int32>
+         <sys:Int32 x:Key="StartPos">19</sys:Int32>
+         <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+         <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+         <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+         <sys:Int32 x:Key="StepPar">23</sys:Int32>
+         <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+         <sys:Int32 x:Key="TabLen">25</sys:Int32>
+         <sys:Int32 x:Key="TabDist">26</sys:Int32>
+         <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+         <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+         <sys:Int32 x:Key="LiTang">29</sys:Int32>
+         <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+         <sys:Int32 x:Key="LiElev">31</sys:Int32>
+         <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+         <sys:Int32 x:Key="LoTang">33</sys:Int32>
+         <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+         <sys:Int32 x:Key="LoElev">35</sys:Int32>
+         <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+         <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+         <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+         <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+         <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+         <sys:Int32 x:Key="SideStep">41</sys:Int32>
+         <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+         <sys:Int32 x:Key="NamePar">43</sys:Int32>
+         <sys:Int32 x:Key="Tool">44</sys:Int32>
+         <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+         <sys:Int32 x:Key="OverLap">47</sys:Int32>
+         <sys:Int32 x:Key="SubType">49</sys:Int32>
+         <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
+         <sys:Int32 x:Key="InitAngs">51</sys:Int32>
+         <sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
+         <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+         <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+         <sys:Int32 x:Key="StepBack">55</sys:Int32>
+         <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
+         <sys:Int32 x:Key="BackFeed">57</sys:Int32>
+         <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
+         <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
+         <sys:Int32 x:Key="Probing">60</sys:Int32>
+         <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
+         <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
+         <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
+         <sys:Int32 x:Key="IntCornType">64</sys:Int32>
+         <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
+         <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
+         <sys:Int32 x:Key="LiHole">67</sys:Int32>
+         <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
+         <sys:Int32 x:Key="LpTurns">69</sys:Int32>
+         <sys:Int32 x:Key="HpTurns">70</sys:Int32>
+         <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
@@ -422,12 +496,18 @@
                </Grid.RowDefinitions>
 
                <TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
-                          Foreground="{Binding ElementName=PIPPO, Path=MyForegroundGrbColor}"/>
+                          Foreground="{Binding ElementName=PIPPO, Path=MyForegroundGrbColor}"
+                          Visibility="{Binding Path=Type, 
+                                               Converter={StaticResource MachiningParamVisibilityConverter},
+                                               ConverterParameter={StaticResource Tool}}"/>
                <ComboBox Grid.Column="1" 
                          ItemsSource="{Binding Path=ToolList, Mode=OneWay}"
                          Style="{DynamicResource MachiningsToolComboBox}"
                          SelectedIndex="{Binding Path=SelectedTool}"
                          IsSynchronizedWithCurrentItem="True"
+                         Visibility="{Binding Path=Type, 
+                                              Converter={StaticResource MachiningParamVisibilityConverter},
+                                              ConverterParameter={StaticResource Tool}}"
                          Background="{Binding ElementName=PIPPO, Path=BackgroundCmBxTxBl}"
                          Foreground="{Binding ElementName=PIPPO, Path=ForegroundCmBxTxBl}"
                          BorderThickness="{Binding ElementName=PIPPO, Path=BorderThicknessCmBxTxBl}"
diff --git a/MachiningDbWindow/StoneSawRoughingParamPageV.xaml b/MachiningDbWindow/StoneSawRoughingParamPageV.xaml
index a7c3281..4959c1a 100644
--- a/MachiningDbWindow/StoneSawRoughingParamPageV.xaml
+++ b/MachiningDbWindow/StoneSawRoughingParamPageV.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="StoneSawRoughingParamPageV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5"
              x:Name="PIPPO">
 
@@ -66,7 +67,80 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
          <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+         <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Invert">0</sys:Int32>
+         <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+         <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+         <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+         <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+         <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+         <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+         <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+         <sys:Int32 x:Key="StepType">8</sys:Int32>
+         <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+         <sys:Int32 x:Key="Speed">10</sys:Int32>
+         <sys:Int32 x:Key="Feed">11</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+         <sys:Int32 x:Key="OffSr">15</sys:Int32>
+         <sys:Int32 x:Key="OffSl">16</sys:Int32>
+         <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+         <sys:Int32 x:Key="Approx">18</sys:Int32>
+         <sys:Int32 x:Key="StartPos">19</sys:Int32>
+         <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+         <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+         <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+         <sys:Int32 x:Key="StepPar">23</sys:Int32>
+         <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+         <sys:Int32 x:Key="TabLen">25</sys:Int32>
+         <sys:Int32 x:Key="TabDist">26</sys:Int32>
+         <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+         <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+         <sys:Int32 x:Key="LiTang">29</sys:Int32>
+         <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+         <sys:Int32 x:Key="LiElev">31</sys:Int32>
+         <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+         <sys:Int32 x:Key="LoTang">33</sys:Int32>
+         <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+         <sys:Int32 x:Key="LoElev">35</sys:Int32>
+         <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+         <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+         <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+         <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+         <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+         <sys:Int32 x:Key="SideStep">41</sys:Int32>
+         <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+         <sys:Int32 x:Key="NamePar">43</sys:Int32>
+         <sys:Int32 x:Key="Tool">44</sys:Int32>
+         <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+         <sys:Int32 x:Key="OverLap">47</sys:Int32>
+         <sys:Int32 x:Key="SubType">49</sys:Int32>
+         <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
+         <sys:Int32 x:Key="InitAngs">51</sys:Int32>
+         <sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
+         <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+         <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+         <sys:Int32 x:Key="StepBack">55</sys:Int32>
+         <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
+         <sys:Int32 x:Key="BackFeed">57</sys:Int32>
+         <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
+         <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
+         <sys:Int32 x:Key="Probing">60</sys:Int32>
+         <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
+         <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
+         <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
+         <sys:Int32 x:Key="IntCornType">64</sys:Int32>
+         <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
+         <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
+         <sys:Int32 x:Key="LiHole">67</sys:Int32>
+         <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
+         <sys:Int32 x:Key="LpTurns">69</sys:Int32>
+         <sys:Int32 x:Key="HpTurns">70</sys:Int32>
+         <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
@@ -410,12 +484,18 @@
                </Grid.RowDefinitions>
 
                <TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
-                          Foreground="{Binding ElementName=PIPPO, Path=MyForegroundGrbColor}"/>
+                          Foreground="{Binding ElementName=PIPPO, Path=MyForegroundGrbColor}"
+                          Visibility="{Binding Path=Type, 
+                                               Converter={StaticResource MachiningParamVisibilityConverter},
+                                               ConverterParameter={StaticResource Tool}}"/>
                <ComboBox Grid.Column="1" 
                          ItemsSource="{Binding Path=ToolList, Mode=OneWay}"
                          Style="{DynamicResource MachiningsToolComboBox}"
                          SelectedIndex="{Binding Path=SelectedTool}"
                          IsSynchronizedWithCurrentItem="True"
+                         Visibility="{Binding Path=Type, 
+                                              Converter={StaticResource MachiningParamVisibilityConverter},
+                                              ConverterParameter={StaticResource Tool}}"
                          Background="{Binding ElementName=PIPPO, Path=BackgroundCmBxTxBl}"
                          Foreground="{Binding ElementName=PIPPO, Path=ForegroundCmBxTxBl}"
                          BorderThickness="{Binding ElementName=PIPPO, Path=BorderThicknessCmBxTxBl}"
diff --git a/MachiningDbWindow/StoneSawingParamPageV.xaml b/MachiningDbWindow/StoneSawingParamPageV.xaml
index cb40053..63a9245 100644
--- a/MachiningDbWindow/StoneSawingParamPageV.xaml
+++ b/MachiningDbWindow/StoneSawingParamPageV.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="StoneSawingParamPageV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5"
              x:Name="PIPPO">
 
@@ -123,7 +124,80 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
          <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+         <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Invert">0</sys:Int32>
+         <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+         <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+         <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+         <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+         <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+         <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+         <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+         <sys:Int32 x:Key="StepType">8</sys:Int32>
+         <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+         <sys:Int32 x:Key="Speed">10</sys:Int32>
+         <sys:Int32 x:Key="Feed">11</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+         <sys:Int32 x:Key="OffSr">15</sys:Int32>
+         <sys:Int32 x:Key="OffSl">16</sys:Int32>
+         <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+         <sys:Int32 x:Key="Approx">18</sys:Int32>
+         <sys:Int32 x:Key="StartPos">19</sys:Int32>
+         <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+         <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+         <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+         <sys:Int32 x:Key="StepPar">23</sys:Int32>
+         <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+         <sys:Int32 x:Key="TabLen">25</sys:Int32>
+         <sys:Int32 x:Key="TabDist">26</sys:Int32>
+         <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+         <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+         <sys:Int32 x:Key="LiTang">29</sys:Int32>
+         <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+         <sys:Int32 x:Key="LiElev">31</sys:Int32>
+         <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+         <sys:Int32 x:Key="LoTang">33</sys:Int32>
+         <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+         <sys:Int32 x:Key="LoElev">35</sys:Int32>
+         <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+         <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+         <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+         <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+         <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+         <sys:Int32 x:Key="SideStep">41</sys:Int32>
+         <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+         <sys:Int32 x:Key="NamePar">43</sys:Int32>
+         <sys:Int32 x:Key="Tool">44</sys:Int32>
+         <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+         <sys:Int32 x:Key="OverLap">47</sys:Int32>
+         <sys:Int32 x:Key="SubType">49</sys:Int32>
+         <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
+         <sys:Int32 x:Key="InitAngs">51</sys:Int32>
+         <sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
+         <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+         <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+         <sys:Int32 x:Key="StepBack">55</sys:Int32>
+         <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
+         <sys:Int32 x:Key="BackFeed">57</sys:Int32>
+         <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
+         <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
+         <sys:Int32 x:Key="Probing">60</sys:Int32>
+         <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
+         <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
+         <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
+         <sys:Int32 x:Key="IntCornType">64</sys:Int32>
+         <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
+         <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
+         <sys:Int32 x:Key="LiHole">67</sys:Int32>
+         <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
+         <sys:Int32 x:Key="LpTurns">69</sys:Int32>
+         <sys:Int32 x:Key="HpTurns">70</sys:Int32>
+         <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
@@ -519,13 +593,19 @@
                </Grid.RowDefinitions>
 
                <TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
-                          Foreground="{Binding ElementName=PIPPO, Path=MyForegroundGrbColor}"/>
+                          Foreground="{Binding ElementName=PIPPO, Path=MyForegroundGrbColor}"
+                          Visibility="{Binding Path=Type, 
+                                               Converter={StaticResource MachiningParamVisibilityConverter},
+                                               ConverterParameter={StaticResource Tool}}"/>
                                                
                <ComboBox Grid.Column="1" 
                          ItemsSource="{Binding Path=ToolList, Mode=OneWay}"
                          Style="{DynamicResource MachiningsToolComboBox}"
                          SelectedIndex="{Binding Path=SelectedTool}"
                          IsSynchronizedWithCurrentItem="True"
+                         Visibility="{Binding Path=Type, 
+                                              Converter={StaticResource MachiningParamVisibilityConverter},
+                                              ConverterParameter={StaticResource Tool}}"
                          Background="{Binding ElementName=PIPPO, Path=BackgroundCmBxTxBl}"
                          Foreground="{Binding ElementName=PIPPO, Path=ForegroundCmBxTxBl}"
                          BorderThickness="{Binding ElementName=PIPPO, Path=BorderThicknessCmBxTxBl}"
diff --git a/MachiningDbWindow/SurfFinishingParamPageV.xaml b/MachiningDbWindow/SurfFinishingParamPageV.xaml
index b93c710..e05de41 100644
--- a/MachiningDbWindow/SurfFinishingParamPageV.xaml
+++ b/MachiningDbWindow/SurfFinishingParamPageV.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="SurfFinishingParamPageV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
 
    <UserControl.Resources>
@@ -18,7 +19,80 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
          <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+         <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Invert">0</sys:Int32>
+         <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+         <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+         <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+         <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+         <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+         <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+         <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+         <sys:Int32 x:Key="StepType">8</sys:Int32>
+         <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+         <sys:Int32 x:Key="Speed">10</sys:Int32>
+         <sys:Int32 x:Key="Feed">11</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+         <sys:Int32 x:Key="OffSr">15</sys:Int32>
+         <sys:Int32 x:Key="OffSl">16</sys:Int32>
+         <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+         <sys:Int32 x:Key="Approx">18</sys:Int32>
+         <sys:Int32 x:Key="StartPos">19</sys:Int32>
+         <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+         <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+         <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+         <sys:Int32 x:Key="StepPar">23</sys:Int32>
+         <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+         <sys:Int32 x:Key="TabLen">25</sys:Int32>
+         <sys:Int32 x:Key="TabDist">26</sys:Int32>
+         <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+         <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+         <sys:Int32 x:Key="LiTang">29</sys:Int32>
+         <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+         <sys:Int32 x:Key="LiElev">31</sys:Int32>
+         <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+         <sys:Int32 x:Key="LoTang">33</sys:Int32>
+         <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+         <sys:Int32 x:Key="LoElev">35</sys:Int32>
+         <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+         <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+         <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+         <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+         <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+         <sys:Int32 x:Key="SideStep">41</sys:Int32>
+         <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+         <sys:Int32 x:Key="NamePar">43</sys:Int32>
+         <sys:Int32 x:Key="Tool">44</sys:Int32>
+         <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+         <sys:Int32 x:Key="OverLap">47</sys:Int32>
+         <sys:Int32 x:Key="SubType">49</sys:Int32>
+         <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
+         <sys:Int32 x:Key="InitAngs">51</sys:Int32>
+         <sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
+         <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+         <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+         <sys:Int32 x:Key="StepBack">55</sys:Int32>
+         <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
+         <sys:Int32 x:Key="BackFeed">57</sys:Int32>
+         <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
+         <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
+         <sys:Int32 x:Key="Probing">60</sys:Int32>
+         <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
+         <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
+         <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
+         <sys:Int32 x:Key="IntCornType">64</sys:Int32>
+         <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
+         <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
+         <sys:Int32 x:Key="LiHole">67</sys:Int32>
+         <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
+         <sys:Int32 x:Key="LpTurns">69</sys:Int32>
+         <sys:Int32 x:Key="HpTurns">70</sys:Int32>
+         <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
diff --git a/MachiningDbWindow/SurfRoughingParamPageV.xaml b/MachiningDbWindow/SurfRoughingParamPageV.xaml
index 62d895b..7be6d25 100644
--- a/MachiningDbWindow/SurfRoughingParamPageV.xaml
+++ b/MachiningDbWindow/SurfRoughingParamPageV.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="SurfRoughingParamPageV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
 
    <UserControl.Resources>
@@ -18,7 +19,80 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
          <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+         <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Invert">0</sys:Int32>
+         <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+         <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+         <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+         <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+         <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+         <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+         <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+         <sys:Int32 x:Key="StepType">8</sys:Int32>
+         <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+         <sys:Int32 x:Key="Speed">10</sys:Int32>
+         <sys:Int32 x:Key="Feed">11</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+         <sys:Int32 x:Key="OffSr">15</sys:Int32>
+         <sys:Int32 x:Key="OffSl">16</sys:Int32>
+         <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+         <sys:Int32 x:Key="Approx">18</sys:Int32>
+         <sys:Int32 x:Key="StartPos">19</sys:Int32>
+         <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+         <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+         <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+         <sys:Int32 x:Key="StepPar">23</sys:Int32>
+         <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+         <sys:Int32 x:Key="TabLen">25</sys:Int32>
+         <sys:Int32 x:Key="TabDist">26</sys:Int32>
+         <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+         <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+         <sys:Int32 x:Key="LiTang">29</sys:Int32>
+         <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+         <sys:Int32 x:Key="LiElev">31</sys:Int32>
+         <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+         <sys:Int32 x:Key="LoTang">33</sys:Int32>
+         <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+         <sys:Int32 x:Key="LoElev">35</sys:Int32>
+         <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+         <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+         <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+         <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+         <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+         <sys:Int32 x:Key="SideStep">41</sys:Int32>
+         <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+         <sys:Int32 x:Key="NamePar">43</sys:Int32>
+         <sys:Int32 x:Key="Tool">44</sys:Int32>
+         <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+         <sys:Int32 x:Key="OverLap">47</sys:Int32>
+         <sys:Int32 x:Key="SubType">49</sys:Int32>
+         <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
+         <sys:Int32 x:Key="InitAngs">51</sys:Int32>
+         <sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
+         <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+         <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+         <sys:Int32 x:Key="StepBack">55</sys:Int32>
+         <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
+         <sys:Int32 x:Key="BackFeed">57</sys:Int32>
+         <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
+         <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
+         <sys:Int32 x:Key="Probing">60</sys:Int32>
+         <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
+         <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
+         <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
+         <sys:Int32 x:Key="IntCornType">64</sys:Int32>
+         <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
+         <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
+         <sys:Int32 x:Key="LiHole">67</sys:Int32>
+         <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
+         <sys:Int32 x:Key="LpTurns">69</sys:Int32>
+         <sys:Int32 x:Key="HpTurns">70</sys:Int32>
+         <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
diff --git a/MachiningDbWindow/WaterjettingParamPageV.xaml b/MachiningDbWindow/WaterjettingParamPageV.xaml
index c3d3d55..836d653 100644
--- a/MachiningDbWindow/WaterjettingParamPageV.xaml
+++ b/MachiningDbWindow/WaterjettingParamPageV.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="WaterjettingParamPageV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5"
              x:Name="PIPPO">
 
@@ -66,7 +67,80 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
          <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+         <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Invert">0</sys:Int32>
+         <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+         <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+         <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+         <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+         <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+         <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+         <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+         <sys:Int32 x:Key="StepType">8</sys:Int32>
+         <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+         <sys:Int32 x:Key="Speed">10</sys:Int32>
+         <sys:Int32 x:Key="Feed">11</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+         <sys:Int32 x:Key="OffSr">15</sys:Int32>
+         <sys:Int32 x:Key="OffSl">16</sys:Int32>
+         <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+         <sys:Int32 x:Key="Approx">18</sys:Int32>
+         <sys:Int32 x:Key="StartPos">19</sys:Int32>
+         <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+         <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+         <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+         <sys:Int32 x:Key="StepPar">23</sys:Int32>
+         <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+         <sys:Int32 x:Key="TabLen">25</sys:Int32>
+         <sys:Int32 x:Key="TabDist">26</sys:Int32>
+         <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+         <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+         <sys:Int32 x:Key="LiTang">29</sys:Int32>
+         <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+         <sys:Int32 x:Key="LiElev">31</sys:Int32>
+         <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+         <sys:Int32 x:Key="LoTang">33</sys:Int32>
+         <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+         <sys:Int32 x:Key="LoElev">35</sys:Int32>
+         <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+         <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+         <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+         <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+         <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+         <sys:Int32 x:Key="SideStep">41</sys:Int32>
+         <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+         <sys:Int32 x:Key="NamePar">43</sys:Int32>
+         <sys:Int32 x:Key="Tool">44</sys:Int32>
+         <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+         <sys:Int32 x:Key="OverLap">47</sys:Int32>
+         <sys:Int32 x:Key="SubType">49</sys:Int32>
+         <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
+         <sys:Int32 x:Key="InitAngs">51</sys:Int32>
+         <sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
+         <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+         <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+         <sys:Int32 x:Key="StepBack">55</sys:Int32>
+         <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
+         <sys:Int32 x:Key="BackFeed">57</sys:Int32>
+         <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
+         <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
+         <sys:Int32 x:Key="Probing">60</sys:Int32>
+         <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
+         <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
+         <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
+         <sys:Int32 x:Key="IntCornType">64</sys:Int32>
+         <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
+         <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
+         <sys:Int32 x:Key="LiHole">67</sys:Int32>
+         <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
+         <sys:Int32 x:Key="LpTurns">69</sys:Int32>
+         <sys:Int32 x:Key="HpTurns">70</sys:Int32>
+         <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
@@ -495,12 +569,18 @@
                </Grid.RowDefinitions>
 
                <TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
-                          Foreground="{Binding ElementName=PIPPO, Path=MyForegroundGrbColor}"/>
+                          Foreground="{Binding ElementName=PIPPO, Path=MyForegroundGrbColor}"
+                          Visibility="{Binding Path=Type, 
+                                               Converter={StaticResource MachiningParamVisibilityConverter},
+                                               ConverterParameter={StaticResource Tool}}"/>
                <ComboBox Grid.Column="1" 
                          ItemsSource="{Binding Path=ToolList, Mode=OneWay}"
                          Style="{DynamicResource MachiningsToolComboBox}"
                          SelectedIndex="{Binding Path=SelectedTool}"
                          IsSynchronizedWithCurrentItem="True"
+                         Visibility="{Binding Path=Type, 
+                                              Converter={StaticResource MachiningParamVisibilityConverter},
+                                              ConverterParameter={StaticResource Tool}}"
                          Background="{Binding ElementName=PIPPO, Path=BackgroundCmBxTxBl}"
                          Foreground="{Binding ElementName=PIPPO, Path=ForegroundCmBxTxBl}"
                          BorderThickness="{Binding ElementName=PIPPO, Path=BorderThicknessCmBxTxBl}"
diff --git a/MachiningDbWindow/WoodDrillingParamPageV.xaml b/MachiningDbWindow/WoodDrillingParamPageV.xaml
index 9dfc09b..09f437a 100644
--- a/MachiningDbWindow/WoodDrillingParamPageV.xaml
+++ b/MachiningDbWindow/WoodDrillingParamPageV.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="WoodDrillingParamPageV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
 
    <UserControl.Resources>
@@ -18,7 +19,80 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
          <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+         <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Invert">0</sys:Int32>
+         <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+         <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+         <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+         <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+         <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+         <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+         <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+         <sys:Int32 x:Key="StepType">8</sys:Int32>
+         <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+         <sys:Int32 x:Key="Speed">10</sys:Int32>
+         <sys:Int32 x:Key="Feed">11</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+         <sys:Int32 x:Key="OffSr">15</sys:Int32>
+         <sys:Int32 x:Key="OffSl">16</sys:Int32>
+         <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+         <sys:Int32 x:Key="Approx">18</sys:Int32>
+         <sys:Int32 x:Key="StartPos">19</sys:Int32>
+         <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+         <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+         <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+         <sys:Int32 x:Key="StepPar">23</sys:Int32>
+         <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+         <sys:Int32 x:Key="TabLen">25</sys:Int32>
+         <sys:Int32 x:Key="TabDist">26</sys:Int32>
+         <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+         <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+         <sys:Int32 x:Key="LiTang">29</sys:Int32>
+         <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+         <sys:Int32 x:Key="LiElev">31</sys:Int32>
+         <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+         <sys:Int32 x:Key="LoTang">33</sys:Int32>
+         <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+         <sys:Int32 x:Key="LoElev">35</sys:Int32>
+         <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+         <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+         <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+         <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+         <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+         <sys:Int32 x:Key="SideStep">41</sys:Int32>
+         <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+         <sys:Int32 x:Key="NamePar">43</sys:Int32>
+         <sys:Int32 x:Key="Tool">44</sys:Int32>
+         <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+         <sys:Int32 x:Key="OverLap">47</sys:Int32>
+         <sys:Int32 x:Key="SubType">49</sys:Int32>
+         <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
+         <sys:Int32 x:Key="InitAngs">51</sys:Int32>
+         <sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
+         <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+         <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+         <sys:Int32 x:Key="StepBack">55</sys:Int32>
+         <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
+         <sys:Int32 x:Key="BackFeed">57</sys:Int32>
+         <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
+         <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
+         <sys:Int32 x:Key="Probing">60</sys:Int32>
+         <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
+         <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
+         <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
+         <sys:Int32 x:Key="IntCornType">64</sys:Int32>
+         <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
+         <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
+         <sys:Int32 x:Key="LiHole">67</sys:Int32>
+         <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
+         <sys:Int32 x:Key="LpTurns">69</sys:Int32>
+         <sys:Int32 x:Key="HpTurns">70</sys:Int32>
+         <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
@@ -278,11 +352,17 @@
                   <RowDefinition Height="1*"/>
                </Grid.RowDefinitions>
 
-               <TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"/>
+               <TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
+                          Visibility="{Binding Path=Type, 
+                                               Converter={StaticResource MachiningParamVisibilityConverter},
+                                               ConverterParameter={StaticResource Tool}}"/>
                <ComboBox Grid.Row="0" Grid.Column="1" ItemsSource="{Binding Path=ToolList, Mode=OneWay}"
                          Style="{DynamicResource MachiningsToolComboBox}"
                          SelectedIndex="{Binding Path=SelectedTool}"
                          IsSynchronizedWithCurrentItem="True"
+                         Visibility="{Binding Path=Type, 
+                                              Converter={StaticResource MachiningParamVisibilityConverter},
+                                              ConverterParameter={StaticResource Tool}}"
                          Margin="0,3,3,3"/>
 
                <UniformGrid Columns="1" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2">
diff --git a/MachiningDbWindow/WoodMillingParamPageV.xaml b/MachiningDbWindow/WoodMillingParamPageV.xaml
index c6d24d5..1f42e61 100644
--- a/MachiningDbWindow/WoodMillingParamPageV.xaml
+++ b/MachiningDbWindow/WoodMillingParamPageV.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="WoodMillingParamPageV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
 
    <UserControl.Resources>
@@ -18,7 +19,80 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
          <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+         <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Invert">0</sys:Int32>
+         <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+         <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+         <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+         <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+         <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+         <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+         <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+         <sys:Int32 x:Key="StepType">8</sys:Int32>
+         <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+         <sys:Int32 x:Key="Speed">10</sys:Int32>
+         <sys:Int32 x:Key="Feed">11</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+         <sys:Int32 x:Key="OffSr">15</sys:Int32>
+         <sys:Int32 x:Key="OffSl">16</sys:Int32>
+         <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+         <sys:Int32 x:Key="Approx">18</sys:Int32>
+         <sys:Int32 x:Key="StartPos">19</sys:Int32>
+         <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+         <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+         <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+         <sys:Int32 x:Key="StepPar">23</sys:Int32>
+         <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+         <sys:Int32 x:Key="TabLen">25</sys:Int32>
+         <sys:Int32 x:Key="TabDist">26</sys:Int32>
+         <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+         <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+         <sys:Int32 x:Key="LiTang">29</sys:Int32>
+         <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+         <sys:Int32 x:Key="LiElev">31</sys:Int32>
+         <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+         <sys:Int32 x:Key="LoTang">33</sys:Int32>
+         <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+         <sys:Int32 x:Key="LoElev">35</sys:Int32>
+         <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+         <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+         <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+         <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+         <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+         <sys:Int32 x:Key="SideStep">41</sys:Int32>
+         <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+         <sys:Int32 x:Key="NamePar">43</sys:Int32>
+         <sys:Int32 x:Key="Tool">44</sys:Int32>
+         <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+         <sys:Int32 x:Key="OverLap">47</sys:Int32>
+         <sys:Int32 x:Key="SubType">49</sys:Int32>
+         <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
+         <sys:Int32 x:Key="InitAngs">51</sys:Int32>
+         <sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
+         <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+         <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+         <sys:Int32 x:Key="StepBack">55</sys:Int32>
+         <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
+         <sys:Int32 x:Key="BackFeed">57</sys:Int32>
+         <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
+         <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
+         <sys:Int32 x:Key="Probing">60</sys:Int32>
+         <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
+         <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
+         <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
+         <sys:Int32 x:Key="IntCornType">64</sys:Int32>
+         <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
+         <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
+         <sys:Int32 x:Key="LiHole">67</sys:Int32>
+         <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
+         <sys:Int32 x:Key="LpTurns">69</sys:Int32>
+         <sys:Int32 x:Key="HpTurns">70</sys:Int32>
+         <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
@@ -458,11 +532,17 @@
                   <RowDefinition Height="1*"/>
                </Grid.RowDefinitions>
 
-               <TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"/>
+               <TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
+                          Visibility="{Binding Path=Type, 
+                                               Converter={StaticResource MachiningParamVisibilityConverter},
+                                               ConverterParameter={StaticResource Tool}}"/>
                <ComboBox Grid.Row="0" Grid.Column="1" ItemsSource="{Binding Path=ToolList, Mode=OneWay}"
                          Style="{DynamicResource MachiningsToolComboBox}"
                          SelectedIndex="{Binding Path=SelectedTool}"
                          IsSynchronizedWithCurrentItem="True"
+                         Visibility="{Binding Path=Type, 
+                                              Converter={StaticResource MachiningParamVisibilityConverter},
+                                              ConverterParameter={StaticResource Tool}}"
                          Margin="0,3,3,3"/>
 
                <UniformGrid Columns="1" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2">
diff --git a/MachiningDbWindow/WoodSawingParamPageV.xaml b/MachiningDbWindow/WoodSawingParamPageV.xaml
index 73adcaa..de4b3a7 100644
--- a/MachiningDbWindow/WoodSawingParamPageV.xaml
+++ b/MachiningDbWindow/WoodSawingParamPageV.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="WoodSawingParamPageV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
 
    <UserControl.Resources>
@@ -18,7 +19,80 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
          <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+         <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Invert">0</sys:Int32>
+         <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+         <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+         <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+         <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+         <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+         <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+         <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+         <sys:Int32 x:Key="StepType">8</sys:Int32>
+         <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+         <sys:Int32 x:Key="Speed">10</sys:Int32>
+         <sys:Int32 x:Key="Feed">11</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+         <sys:Int32 x:Key="OffSr">15</sys:Int32>
+         <sys:Int32 x:Key="OffSl">16</sys:Int32>
+         <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+         <sys:Int32 x:Key="Approx">18</sys:Int32>
+         <sys:Int32 x:Key="StartPos">19</sys:Int32>
+         <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+         <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+         <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+         <sys:Int32 x:Key="StepPar">23</sys:Int32>
+         <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+         <sys:Int32 x:Key="TabLen">25</sys:Int32>
+         <sys:Int32 x:Key="TabDist">26</sys:Int32>
+         <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+         <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+         <sys:Int32 x:Key="LiTang">29</sys:Int32>
+         <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+         <sys:Int32 x:Key="LiElev">31</sys:Int32>
+         <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+         <sys:Int32 x:Key="LoTang">33</sys:Int32>
+         <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+         <sys:Int32 x:Key="LoElev">35</sys:Int32>
+         <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+         <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+         <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+         <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+         <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+         <sys:Int32 x:Key="SideStep">41</sys:Int32>
+         <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+         <sys:Int32 x:Key="NamePar">43</sys:Int32>
+         <sys:Int32 x:Key="Tool">44</sys:Int32>
+         <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+         <sys:Int32 x:Key="OverLap">47</sys:Int32>
+         <sys:Int32 x:Key="SubType">49</sys:Int32>
+         <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
+         <sys:Int32 x:Key="InitAngs">51</sys:Int32>
+         <sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
+         <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+         <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+         <sys:Int32 x:Key="StepBack">55</sys:Int32>
+         <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
+         <sys:Int32 x:Key="BackFeed">57</sys:Int32>
+         <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
+         <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
+         <sys:Int32 x:Key="Probing">60</sys:Int32>
+         <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
+         <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
+         <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
+         <sys:Int32 x:Key="IntCornType">64</sys:Int32>
+         <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
+         <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
+         <sys:Int32 x:Key="LiHole">67</sys:Int32>
+         <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
+         <sys:Int32 x:Key="LpTurns">69</sys:Int32>
+         <sys:Int32 x:Key="HpTurns">70</sys:Int32>
+         <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
@@ -351,11 +425,17 @@
                   <RowDefinition Height="1*"/>
                </Grid.RowDefinitions>
 
-               <TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"/>
+               <TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
+                          Visibility="{Binding Path=Type, 
+                                               Converter={StaticResource MachiningParamVisibilityConverter},
+                                               ConverterParameter={StaticResource Tool}}"/>
                <ComboBox Grid.Row="0" Grid.Column="1" ItemsSource="{Binding Path=ToolList, Mode=OneWay}"
                          Style="{DynamicResource MachiningsToolComboBox}"
                          SelectedIndex="{Binding Path=SelectedTool}"
                          IsSynchronizedWithCurrentItem="True"
+                         Visibility="{Binding Path=Type, 
+                                              Converter={StaticResource MachiningParamVisibilityConverter},
+                                              ConverterParameter={StaticResource Tool}}"
                          Margin="0,3,3,3"/>
 
                <UniformGrid Columns="1" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2">
diff --git a/Mapi/MAPI.vb b/Mapi/MAPI.vb
index 2275826..69702b4 100644
--- a/Mapi/MAPI.vb
+++ b/Mapi/MAPI.vb
@@ -1,4 +1,7 @@
-Imports System.IO
+Imports System.Collections
+Imports System.ComponentModel
+Imports System.Diagnostics
+Imports System.IO
 Imports System.Runtime.InteropServices
 Imports System.Threading
 Imports EgtUILib
@@ -172,6 +175,15 @@ Public Class MapiMailMessage
    ''' Displays the mail message dialog asynchronously.
    ''' </summary>
    Public Sub ShowDialog()
+      '' Create the mail message in an STA thread
+      'Dim t As New Thread(New ThreadStart(AddressOf _ShowMail))
+      't.IsBackground = True
+      't.SetApartmentState(ApartmentState.STA)
+      't.Start()
+
+      '' only return when the new thread has built it's interop representation
+      'Dim x = _manualResetEvent.WaitOne()
+      'Dim y = _manualResetEvent.Reset()
       _ShowMail()
    End Sub
 
@@ -215,7 +227,7 @@ Public Class MapiMailMessage
          ' Check for error
          m_ErrorCode = [error]
          If [error] <> SUCCESS_SUCCESS Then
-            EgtOutLog(_LogErrorMapi(CType([error], MAPIError)))
+            EgtOutLog(_LogErrorMapi([error]))
          End If
       End Using
    End Sub
diff --git a/NameDialog/NameDialogV.xaml.vb b/NameDialog/NameDialogV.xaml.vb
index 455b5f1..de5b434 100644
--- a/NameDialog/NameDialogV.xaml.vb
+++ b/NameDialog/NameDialogV.xaml.vb
@@ -1,4 +1,9 @@
-Public Class NameDialogV
+Imports System.ComponentModel
+Imports System.IO
+Imports EgtUILib
+
+Public Class NameDialogV
+   'Implements INotifyPropertyChanged
 
    Private m_NameDialogVM As NameDialogVM
 
diff --git a/NameDialog/NameDialogVM.vb b/NameDialog/NameDialogVM.vb
index a8bb33c..b987911 100644
--- a/NameDialog/NameDialogVM.vb
+++ b/NameDialog/NameDialogVM.vb
@@ -42,18 +42,15 @@ Public Class NameDialogVM
             If TempName.Length = value.Length Then
                m_Name = value
             Else
-               'MessageBox.Show(EgtMsg(MSG_MACHININGDBERRORS + 4),
-               '                EgtMsg(MSG_EGTSAVEFILEDIALOG + 7),
-               '                MessageBoxButton.OK, MessageBoxImage.Error)
-               EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31404),   ' I caratteri \ / : * ? " < > | non sono permessi
-                                                                   EgtMsg(31407),   ' Cancella
-                                                                   MessageBoxButton.OK, MessageBoxImage.Error)
+               MessageBox.Show(EgtMsg(MSG_MACHININGDBERRORS + 4),
+                               EgtMsg(MSG_EGTSAVEFILEDIALOG + 7),
+                               MessageBoxButton.OK, MessageBoxImage.Error)
                m_Name = TempName
             End If
          Else
             m_Name = value
          End If
-         NotifyPropertyChanged(NameOf(Name))
+         NotifyPropertyChanged("Name")
       End Set
    End Property
 
@@ -61,12 +58,12 @@ Public Class NameDialogVM
 
    Public ReadOnly Property SaveMsg As String
       Get
-         Return EgtMsg(30001)    ' Salva
+         Return EgtMsg(MSG_EGTSAVEFILEDIALOG + 1)
       End Get
    End Property
    Public ReadOnly Property CancelMsg As String
       Get
-         Return EgtMsg(30002)    ' Annulla
+         Return EgtMsg(MSG_EGTSAVEFILEDIALOG + 2)
       End Get
    End Property
 
diff --git a/OptionPanel/EstimationsVM.vb b/OptionPanel/EstimationsVM.vb
index 2be4c25..d0ad7fa 100644
--- a/OptionPanel/EstimationsVM.vb
+++ b/OptionPanel/EstimationsVM.vb
@@ -1,4 +1,6 @@
-Imports EgtUILib
+Imports System.Collections.ObjectModel
+Imports System.IO
+Imports EgtUILib
 
 Public Class EstimationsVM
    Inherits VMBase
@@ -64,37 +66,37 @@ Public Class EstimationsVM
 
    Public ReadOnly Property EstimationMsg As String
       Get
-         Return EgtMsg(90569)                 'Stime
+         Return EgtMsg(MSG_ESTIMATIONS + 19)                 'Stime
       End Get
    End Property
 
    Public ReadOnly Property TimeMsg As String
       Get
-         Return EgtMsg(90565)                 'Tempo totale
+         Return EgtMsg(MSG_ESTIMATIONS + 15)                 'Tempo totale
       End Get
    End Property
 
    Public ReadOnly Property CutLenMsg As String
       Get
-         Return EgtMsg(90566)                 'Lunghezza totale
+         Return EgtMsg(MSG_ESTIMATIONS + 16)                 'Lunghezza totale
       End Get
    End Property
 
    Public ReadOnly Property NetAreaMsg As String
       Get
-         Return EgtMsg(90567)                 'Area utilizzata
+         Return EgtMsg(MSG_ESTIMATIONS + 17)                 'Area utilizzata
       End Get
    End Property
 
    Public ReadOnly Property UsageMsg As String
       Get
-         Return EgtMsg(90568)                 'Percentuale di utilizzo
+         Return EgtMsg(MSG_ESTIMATIONS + 18)                 'Percentuale di utilizzo
       End Get
    End Property
 
    Public ReadOnly Property DetailsMsg As String
       Get
-         Return EgtMsg(90570)                 'Dettagli
+         Return EgtMsg(MSG_ESTIMATIONS + 20)                 'Dettagli
       End Get
    End Property
 
diff --git a/OptionPanel/MachineAxis.vb b/OptionPanel/MachineAxis.vb
index f9ebea6..981c5ee 100644
--- a/OptionPanel/MachineAxis.vb
+++ b/OptionPanel/MachineAxis.vb
@@ -12,8 +12,8 @@ Public Class MachineAxis
       Set(value As Boolean)
          If value <> m_IsReadOnlyAxesValue Then
             m_IsReadOnlyAxesValue = value
-            NotifyPropertyChanged(NameOf(IsReadOnlyAxesValue))
-            NotifyPropertyChanged(NameOf(IsEnabledAxesValue))
+            NotifyPropertyChanged("IsReadOnlyAxesValue")
+            NotifyPropertyChanged("IsEnabledAxesValue")
          End If
       End Set
    End Property
@@ -47,7 +47,7 @@ Public Class MachineAxis
       Set(value As String)
          If value <> m_Token Then
             m_Token = value
-            NotifyPropertyChanged(NameOf(Token))
+            NotifyPropertyChanged("Token")
          End If
       End Set
    End Property
@@ -81,7 +81,7 @@ Public Class MachineAxis
    End Property
    Friend Sub SetValue(value As String)
       m_Value = value
-      NotifyPropertyChanged(NameOf(value))
+      NotifyPropertyChanged("Value")
    End Sub
 
    Sub New()
diff --git a/OptionPanel/SimulationVM.vb b/OptionPanel/SimulationVM.vb
index ea29cd4..38ecd38 100644
--- a/OptionPanel/SimulationVM.vb
+++ b/OptionPanel/SimulationVM.vb
@@ -1,4 +1,5 @@
 Imports System.Collections.ObjectModel
+Imports System.IO
 Imports EgtUILib
 
 Public Class SimulationVM
@@ -63,7 +64,7 @@ Public Class SimulationVM
       Set(value As String)
          If value <> m_GCode Then
             m_GCode = value
-            NotifyPropertyChanged(NameOf(GCode))
+            NotifyPropertyChanged("GCode")
          End If
       End Set
    End Property
@@ -76,7 +77,7 @@ Public Class SimulationVM
       Set(value As String)
          If value <> m_FValue Then
             m_FValue = value
-            NotifyPropertyChanged(NameOf(FValue))
+            NotifyPropertyChanged("FValue")
          End If
       End Set
    End Property
@@ -89,7 +90,7 @@ Public Class SimulationVM
       Set(value As String)
          If value <> m_TName Then
             m_TName = value
-            NotifyPropertyChanged(NameOf(TName))
+            NotifyPropertyChanged("TName")
          End If
       End Set
    End Property
@@ -102,7 +103,7 @@ Public Class SimulationVM
       Set(value As String)
          If value <> m_SValue Then
             m_SValue = value
-            NotifyPropertyChanged(NameOf(SValue))
+            NotifyPropertyChanged("SValue")
          End If
       End Set
    End Property
@@ -115,7 +116,7 @@ Public Class SimulationVM
       Set(value As String)
          If value <> m_OpeName Then
             m_OpeName = value
-            NotifyPropertyChanged(NameOf(OpeName))
+            NotifyPropertyChanged("OpeName")
          End If
       End Set
    End Property
@@ -138,7 +139,7 @@ Public Class SimulationVM
       End Get
       Set(value As String)
          m_StatusMsg = value
-         NotifyPropertyChanged(NameOf(StatusMsg))
+         NotifyPropertyChanged("StatusMsg")
       End Set
    End Property
 
@@ -151,7 +152,7 @@ Public Class SimulationVM
          If Math.Abs(value - m_SliderValue) > EPS_SMALL Then
             m_SliderValue = value
             EgtSimSetStep(m_SliderValue * m_SliderX)
-            NotifyPropertyChanged(NameOf(SliderValue))
+            NotifyPropertyChanged("SliderValue")
          End If
       End Set
    End Property
@@ -163,13 +164,13 @@ Public Class SimulationVM
       End Get
       Set(value As Boolean)
          m_VMillActive = value
-         NotifyPropertyChanged(NameOf(VMillActive))
+         NotifyPropertyChanged("VMillActive")
          VMillActiveInfoTitle(m_VMillActive)
       End Set
    End Property
    Public Sub SetVMillActive(value As Boolean)
       m_VMillActive = value
-      NotifyPropertyChanged(NameOf(VMillActive))
+      NotifyPropertyChanged("VMillActive")
    End Sub
 
    Private m_VMill_Visibility As Visibility = Visibility.Collapsed
@@ -179,7 +180,7 @@ Public Class SimulationVM
       End Get
       Set(value As Visibility)
          m_VMill_Visibility = value
-         NotifyPropertyChanged(NameOf(VMill_Visibility))
+         NotifyPropertyChanged("VMill_Visibility")
       End Set
    End Property
 
@@ -190,7 +191,7 @@ Public Class SimulationVM
       End Get
       Set(value As Boolean)
          m_VMill_IsEnabled = value
-         NotifyPropertyChanged(NameOf(VMill_IsEnabled))
+         NotifyPropertyChanged("VMill_IsEnabled")
       End Set
    End Property
 
@@ -203,13 +204,13 @@ Public Class SimulationVM
 
    Public ReadOnly Property SimulationMsg As String
       Get
-         Return EgtMsg(31607)    ' Simulazione
+         Return EgtMsg(MSG_SIMULATION + 7)                  'Simulazione
       End Get
    End Property
 
    Public ReadOnly Property VMillMsg As String
       Get
-         Return EgtMsg(5316)     ' Virtual Milling
+         Return EgtMsg(5316)                                'Virtual Milling
       End Get
    End Property
 
@@ -237,17 +238,17 @@ Public Class SimulationVM
 
    Public ReadOnly Property OneStepToolTip As String
       Get
-         Return EgtMsg(31608)    ' Un passo alla volta
+         Return EgtMsg(MSG_SIMULATION + 8)
       End Get
    End Property
    Public ReadOnly Property PlayPauseToolTip As String
       Get
-         Return EgtMsg(31609)    ' Play/Pausa
+         Return EgtMsg(MSG_SIMULATION + 9)
       End Get
    End Property
    Public ReadOnly Property StopHomeToolTip As String
       Get
-         Return EgtMsg(31610)    ' Stop/Home
+         Return EgtMsg(MSG_SIMULATION + 10)
       End Get
    End Property
 
@@ -488,17 +489,17 @@ Public Class SimulationVM
          SimulationStatus = MCH_SIM_ST.UI_STEP
          ' Aggiorno bottone
          m_bShowPlay = False
-         NotifyPropertyChanged(NameOf(PlayPauseImage))
+         NotifyPropertyChanged("PlayPauseImage")
          ExecSim()
          ' Aggiorno bottone
          m_bShowPlay = True
-         NotifyPropertyChanged(NameOf(PlayPauseImage))
+         NotifyPropertyChanged("PlayPauseImage")
          ' Alrimenti imposto solo il nuovo stato
       Else
          SimulationStatus = MCH_SIM_ST.UI_STEP
          ' Aggiornamenti per bottone Play/Pause
          m_bShowPlay = False
-         NotifyPropertyChanged(NameOf(PlayPauseImage))
+         NotifyPropertyChanged("PlayPauseImage")
       End If
    End Sub
 
@@ -528,7 +529,7 @@ Public Class SimulationVM
          VMill_IsEnabled = False
          ' Aggiorno bottone
          m_bShowPlay = False
-         NotifyPropertyChanged(NameOf(PlayPauseImage))
+         NotifyPropertyChanged("PlayPauseImage")
          ' Eseguo
          If m_nStatus = MCH_SIM_ST.UI_STOP Then
             ' Lancio simulazione
@@ -536,14 +537,14 @@ Public Class SimulationVM
             ExecSim()
             ' Aggiorno bottone
             m_bShowPlay = True
-            NotifyPropertyChanged(NameOf(PlayPauseImage))
+            NotifyPropertyChanged("PlayPauseImage")
          ElseIf m_nStatus = MCH_SIM_ST.UI_PAUSE Then
             SimulationStatus = MCH_SIM_ST.UI_PLAY
          End If
       Else
          ' Aggiorno bottone
          m_bShowPlay = True
-         NotifyPropertyChanged(NameOf(PlayPauseImage))
+         NotifyPropertyChanged("PlayPauseImage")
          ' Se play o step, imposto stato pausa
          If m_nStatus = MCH_SIM_ST.UI_PLAY Or m_nStatus = MCH_SIM_ST.UI_STEP Then
             SimulationStatus = MCH_SIM_ST.UI_PAUSE
@@ -589,7 +590,7 @@ Public Class SimulationVM
       End If
       ' Aggiorno bottone
       m_bShowPlay = True
-      NotifyPropertyChanged(NameOf(PlayPauseImage))
+      NotifyPropertyChanged("PlayPauseImage")
       ' Imposto il nuovo stato
       SimulationStatus = MCH_SIM_ST.UI_STOP
    End Sub
diff --git a/Resources/EgtDialog/Folder.png b/Resources/EgtDialog/Folder.png
deleted file mode 100644
index 2c1339d04ed24a4dbbe8aeecdde99b279336a84f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1292
zcmV+n1@roeP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4#WTe4#WYKD-Ig~000McNliru-v<x}5ep2#W5@si1er-h
zK~z}7?Uze$RaF$ne{1i3Zrj^iN(<$s7>H7$(J1j1ltl0mh9(YV<j8?xV4Uc8@C&Gk
zQ)FaS9H7w<8jTt-v7}0nM@w61FVH8~_Vzx`*?T!S=l0fOYa~sWuue|0v-VzV{r7sF
zBdW^1B*Q(X`vBGjfE+sH?pn5ygySE`!P^xc1rR|1#9~my3W7oA%ADE%DZc?;*C~5N
zRT+3so^H?c?B2r+Q6NDHI3Pv|SR8H46J0ya){A2dA3nw}Ky5h)5ix*K)#QJNKobt^
zeTfkY<S}f;(Sy*1VGDV-0X?+S_0Wsl?%lzjV@G%lh(tshic~eMG%h0l85#$Wc%X+m
zj*SR{Vu=BRrHsL02sk>}u<K<?oB!as%R6}m;L7_VjgSSwnkufUn6^CT_Yav6k>jem
zuqFUiOlCOXF?a-UBv>qtKn_C=$kEBh!a>S=0%Zab7K6v41ZpUTm;|AY>-&TkfIbna
zt7?5!0BCvx;;bqhLX2RE@Hheyo)&~0hKM?yI3fa;fJZQZ4Gs-4t{MXgR=Ozzt-#`%
z9;kW*Pnzoi!P5m)33!U+&YvP=N)`o-r2Z1I7y`yxB&70U9fBgZPV2q`48P0U0E0)R
zZQj!+F)f{W@=tuc>mAjRYMKLegn-3hQ8o~0DNWHif18eIn5&N;W`T(6dX(LzOZ1*S
z!!zyeqn$tofD}F8Fu0_QSzI7Lbp_e?JT*Ms#B5m)0B3%n_uLF$sbWRMn5+r}MNuq@
zo1P+Hnna#_gmIKAfu8j+J~T!&Jju;3uJWt3)PY>u2RuTQm0t}vHBB@<iJER^2|Sop
zh{+Px(5#v!PqL@MYpi{9@8k(~pPk|JnHehiJQX1IK;0u$Feq9q(td6LJ+Plq00LbI
z1_MainzL|8X394D4x|Z~ol9kG%KxsP&EsXxe}9qjN`-}6x2OTJ0q}|;qLrA|;tgzj
z3kmQSp505z(vq{8Sy}Q#di&<uAoyixK+22c1_tOpIl|XKEqguS9YBZyrEv2WoBq6j
zzV!xUcnV3N!!+Hw)c1pe$+};bJ9koOE{~sJ$F)HJjT-Y=Img)?Q3nvGwI5Gh$8PVW
zic%)<6pBj}6+tvJBZ5fkHJXC})$B}Tzricc(ptPm_-T?K=jL?mUmH>INWFv(T|kb!
z&M1NHl{y8dsF$Xl<wDD+j!`sZ=ZvC8kf3NH$d`R=yJk2xJ571@Ss=*JC=YDvWC2U9
zvdF_eU^Tr-b8cpCjaMk~EB1_}au-Kwo1A6*)ClK`b1bYr4HKBSO8aZCGDJ+T59C6C
zV8Dcb8V_W=l_3vcQn(TV!~yfoNj80ZosX_hvItaG_dpAUn-c_}rBq?3(JYPuQP2>Y
zPRK4NOCwBER085bO}009nL=@%{=p*CKpCj7`bG5Fn{srt#6AG6riv5AdV}lfKy4xI
z5iBBgLlP-2ZiK=^WFSg2C2Z`*Bnj^4LHheHak^Ba1kA5Cjzv`wkqGDj+ThNlyGsf{
zH7mQis)n@yNEQyq`jKYMCRytPR__0r-3M^50sIXfKPV$j2v|t~0000<MNUMnLSTYK
CJUhYw

diff --git a/Resources/EgtDialog/New.png b/Resources/EgtDialog/New.png
deleted file mode 100644
index b6185973b91acb749a555c110b8d156eccf2cfe0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 374
zcmV-+0g3*JP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XT
z000XT0n*)m`~Uy}C`m*?R9J=WnBNV8Fc61-7~gdR9l;IM33LN-fTl?oP#0)yx`1xr
z2#(?kPJlVX16CpjrG|(55*|pd$4CEMp;=KB7#gF&837nqZ@jZx0E>>fE=rpRC(t{)
z0zlVYX><Q6MTr4SI!aM;mQ*QpsI>ba9KNnXZ>Xoev(uOyNHC`sWp783Vxn)nv&WbO
zA0@#%8&e<F!CcuZZ7yx|Ds8fqCE@Iy?X;4^)z>GqXl^7%Z(q$@4lniSNon&n)TxW-
zjKtbD`bR}ydS}mV8vJXU(camd8{GGt`l`+q<~4D(@qLzrE2nVQ?R6o2_SCMtn#h_0
z2KnhCQd~rei%4-1DJ~+#MWnch6c>@=5=uQ2KaZ6^{2b0B&ZnA~a{mG4c##Ew7Z`C!
Uy$xW$X8-^I07*qoM6N<$f-jhw0{{R3

diff --git a/Resources/EgtDialog/Restore.png b/Resources/EgtDialog/Restore.png
deleted file mode 100644
index dd24cf127a3d9e9957614daf49da9d22d08febfd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 254
zcmeAS@N?(olHy`uVBq!ia0vp^q9Dw{1|(OCFP#RYI14-?iy0WWg+Q3`(%rg0K*0^3
zE{-7<y~%(6|F>t}$|!u*Hzgq<L2*gKrz3Vrdp8-H@7HM1aCTHM-`_E@;V2&u4-c<_
zo$ns|5}wv}O_Laz4VtrTHm+yv{H<udKZD86d15Trr4<e>&c8a#G(~hyoYl8#cy{X7
zoj;4%QtT9++0{N8D;$zmpWoPcupz|RTuD7g!{K=|gUt;NDX!C19_#+hpB>*~I`zPT
yj6NquVKx6Zza4y?g*(m!vK$mx=_er}!EnaY!1I*WeGj1989ZJ6T-G@yGywqYV_04Q

diff --git a/Resources/EgtDialog/Root.png b/Resources/EgtDialog/Root.png
deleted file mode 100644
index 8d321d719bce8f80b3b5157d278b3fcb6207e935..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 753
zcmV<N0uKF&P)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00004b3#c}2nYxW
zd<bNS00001b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf5dZ)S5dnW>
zUy%R+0(MD6K~z{r?Up-e6hQ!n?~I9xLO?-LtbBl&Xnb^HCqzLItu&Pyt<pqWd&MRY
zwY0DilnVsKM6pv)u2LJtLL`ldk0c6;MG|v<|K5!3ZDwz0avRd@2OqmL_t<})JEekx
zoGF`YoP)T(ew)fqe1?-zX^A<9HBS}nIOa~gr&i!6oW}Dwi>{tjpsjcdx8Qcv?{Xvl
z&{e3`SMaPVGU&p$_z|z-cT~fC&~x>y=TWH%3iS)`MI}E@;x|kVt*?)8H8zm!DNWol
z>{Ep&YjFp5;!0I`as;p72~;>IO?#?RsdQAU)lH_DWV5-3uoKl=7o$=NnZsAB)m(Gt
zH0sZvVuva`Ie_||7F7ej6EmV*F3+1=ivr!p&)AC(F(jCipil{Hpf|V&2k;mwSUcuI
z$m+90ra<deVYq~<e~ekdQim^&Z>Y3D78~pdHVc+pC>!WCx&m1)qrNwe+A>_^5^5Lf
zPhMfOKo;9$H>1)*a#?*F&Gj1U{g}ltPN5nTL`bMPb9L?73tkll^~6m5)}O^}3Gr8x
z0;)&8qJ~vNVsV`?yl7>g5*Kg~U*I+z!DZb%#Ua$N>aceM6>I~x#9~7IHdpZnHE-hR
zoFr7Q*HZ8>hJ<P}*Q2QYO76zLDD3AtQlCK`f7Yp@6|(lJeW=za{eVJq%k}wfbdkDG
zg&gwq-My&R>(7MhbV8WGHK@;Rk6GU1kNRx`3Z)g>k9SnzLZLKY?nb4hrw7$Ig=!!^
zr!*<m%9iJWC#hRUa%GI-DSV0AiGx>;C+Z<B5*@F*@g4pr`B3dKLwFd~Yj*DBjYjAT
jUdIQjC@3gceoCc(s?efj>7S3J00000NkvXXu0mjfLHbQE

diff --git a/Resources/EgtMessageBox/Asterisk.png b/Resources/EgtMessageBox/Asterisk.png
deleted file mode 100644
index 82b2dcaa06441f5bf6a6a7a761834326a7e968a1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 605
zcmeAS@N?(olHy`uVBq!ia0vp^YCx>Y!3HGtR?Y^J3@qu6zK#qG8~eHcB(ehe3dtTp
zz6=aiK!pu03=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z;_UY8Fx&~
zehU<2OY(MiVfYV%3-&Ib3>0B6@$_|Nf59do#KawZCpHBrq*~${QIe8al4_M)lnSI6
zj0}uSbPddO4b4IfEvyWTtPBmb4GgRd48&UZ{X@}^o1c=IR*73f`VBTG1_nkSPZ!6K
z2=}+s4E+uph_uB=t1R+pWn5CG<E*{zzyZq%Rs}6`ZOjG+A)(9VmJ2a!hbB68b+Ihm
zls);ujdRs~lP751f24kNqy69Wojkh7o!oo!Z1(=^@H+qZLS^l*?n)!Ij!8dGu5;4z
zaGWzkUz5}6oZZ3g6S`b4=!9*XaztUdxU$#XUZ#pYmdziQFrSydZxFe+Q{BU)DArIc
zsY<j!^Vp92%{NO=yjDs%x+*JC>g>EYq1pT2DEzWob2jSdhQ114r-{FB-?qBsHQ6dV
zPDs01Wg}DO#`Q&o)#qM+KQEy-Jvz=>G3fK88wwuNc3OPB+){u0R9KIfw%bz1q-nbY
zQ%xS8zb~-S>h{VvbA8V^=56kFW!-;WUTBu>SE11O`U^=ttDf-48g(0<nzmU+diRVa
zJO}4&?h#J@G3m76qz6Y;)-`!3a>nZT&Ql3oc2u^(R-`^+vEY-&T3|#lc)I$ztaD0e
F0svzF;cEZ@

diff --git a/Resources/EgtMessageBox/Error.png b/Resources/EgtMessageBox/Error.png
deleted file mode 100644
index 4f6d82fb063911b6dfeb82390276d23ff0fbe052..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3263
zcmV;w3_$aVP)<h;3K|Lk000e1NJLTq001Tc001Qj1^@s6E~%RU00004XF*Lt006O%
z3;baP0000WV@Og>004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00009
za7bBm000ic000ic0Tn1pfB*mh24YJ`L;(K){{a7>y{D4^000McNliru=mr-FC@TGW
z^*R6m03~!qSaf7zbY(hYa%Ew3WdJfTGBhnPHZ3wUR4_R@G%z|eF)J`IIxsLLWTx-{
z001R)MObuXVRU6WZEs|0W_bWIFfuePFg7hRGgL4+Iy5jkG%+hMFgh?WR5>0@000ZF
zNkl<ZSVygxX>eQB6~~YC<fnbH7O%2wMNS;MaZJcUmLY6u5>lWB)6$T%v@=Zlfqp5S
z(g1B?rc;<{J4`zaFda%ufI@&IWZcA_Gz-Ku3nU>VIN&Tci8tAjY{^=mq^I}#zgk?`
zu@e}2#&@1{b(h~e+dbC`nnBjr*Q=dI;}*3fwWLJx)RA-NUiq9TmH+u0$#Y8OLwbc`
zRWg&gc#7!dZA78`PgCS7u#Jls+YO@Fxk?b0G=#%+$z-A<L?4|Ah3+{vI_k?0``Ypp
z5pOOj*}2^1x~sOPhQ>xm=}1pc-$_}%>lLCe^1~*D%RjU7P*YO{uTt&5B^q6{_Toh<
zi$<wB7$lX|>P%=fYk8vffkYybAO4jEP#Po8x3Bbg?wsrKP+F3x0&q5+t~BZOwz`N8
zoFp2}56{XZ*rw)Yr%J0ma9c3AU|nx7sVgc-^XjW4oH|97fYjS;6@Xi>k>!8&3qm+Q
z?Yi;{BE40s-Fvggv!>Q=r?A;f_N`kf#$KG~$ze2_gyG@)>WK~=C-UZ}<-i_jX{qDY
z>Vvlj0uA5!@=MY(sP=YJuUSJHv~WiUmG||L$>AtV@caf7&+qMv#b)%4VtLAHHCdF(
z&ee0~+)`yU(zsqvwa-3FhNVl1Z)~L4C!bKc!9aF{!H^gnY@18eb&P0;&E+0!ZZ6gE
z{LwpnK2PhFE2OKcBE|OYq?k94GJ}J}S*@g7w~m7Q_mcx~HiyF=Q7Z2;s8pSO@%VU_
zU<TQ0HkTSDY2R&b_sTN0ngW2Tf94s|VEwe$OG<oKEnG;+&p)RM__0;5*Chr9+G>gR
zeMB_E&GUG++!_pS+z3tS=Fg|}OD_?*TqKW-keo`96bg|N6AjRu|L|cd#kh*HGHYC+
zxW~eA`z|IDfjrBkJZdo5tsJ-i_S)K|7JT;uV*b-lliJ}R(eKZ#8-c6Blw3mtWd;Vw
z4l`SlN$sW4(aQIU-d1La%1aXo(qe(kqD3UaDcQix#6+$kGSm33)M%*g`R6HKTT5k^
zF3|?9wzk<|*#BLNr8!HJm&f(`ay!o-yu;<XQ4fF-t(F=edyIIUj#97yTd%Ng29cRj
zsYt?}B+F!gbwsEI%V@cI4o5hu*Ke^R0-dmV25%$+kYX{C1%c#bGTYcfN|>bd=9_8o
z<Vn)Q>~qS?O^AYfs}+hv-O1$06IN@rUadaxZKrcV3FiCZKP`_wN<5zFu`y)A)Z}_h
zYcgP@<Ht$g-A!?5@I+S^wI`E1&l7cW=SN0{&31dl>u{_qjmN3_^l1{u$4OeSfaGa#
zO#Mo{p?$>)x^m_W@%{bOP+4j4%ksS~YW0AT<6d50RrM{xd}h8IA9;ijRFp=_$$}I^
zA!Ue&c-{H)B*0=Hc6QQhk;vX1M1O$ByxFMi_4$sOtk&?T-M-F>iIr#1QaTVI36VpX
zB(s)ZG{fMON-A5tn7)MLDq-gNRaN>>CUgI-c6(XI=gVqp>BA3G30@)%A1!D~Ld$;6
zWGMORr=-1nnbPSrbs?}`k4ATICwdY%-Hd56kM;Te$4wSXz-O~<uw!C5Hcep@s;|#!
ztq4wn*_ALuMN13yUARDL_|8fM%ov_5C9K%InN)xm;Y-ssMWRS?m`;Ppl(5g?Lx&jD
z&UcA^1B`PynrWH8FAz9kHkrIWtMzUNHg;gsBpg%;htC2PYYt{sVBxB!ChCX3eF2jw
z5m_tR+K9v4^fV}@DX53SJw2p>zbRnK58zX;MWb);&O!C$C~`6dj7jhK_$jl|*zYr&
z@2TK8g%zhjg27c+=QLLw5b#L_Hmd+QqMH^hUrs7K(<~L_$7CCWLJK0AHPE(7p`e3D
zk1|dDb5Hifq6=*AVwthJV6xWj-qfViZEKsD;9M|K-039!%9Yu$W{z7d3Ye{=q=ZC3
zO4EM>1Z!h39jXe_V%)(KC+N*cWZOQX-(g5^Zsb(CN@E4-4TU~4>-9az*sWE1J!gTF
zhv9R4X=zpi5;Qld6?_(9TGm(4Qo+&Ln9-pj(gI2csDC38--twB*`I^z%k6fx%nHT?
zaOaE~O*b66wc2P@nef&@<T(wZj%`>BGQDM?@%u2w>yY7*-)J9F%p1|@Uy<2=kL54t
zc9~hO3C5%^9PTOMxFaE*?(RynS!;yj2GMjl36yz_Olg2o<UbF>*K~+dEucC+`z-nQ
zX!N<`viv73JCIv_c2VY^*A%zeoZ=M<r3(I~;5dr2tPa0p#U9gO2stkVSk{6_rU68x
z7f=!S9CKnN%*Z2<TnYuNxdyX~UPrF0u^%@!Zm8zCj@CrNU>_c)acDwDe;C>thjx5O
zAzrjWM5rGiK{!7v)&#r&51&e)PXmoDtf}F26BBFdQ>l@ovW%+w+Hy^>hZ-AOD;0`e
zt&s>{2B;v5I`p&Dz@CNAg~lP%vuvMj0OQbDv<jHV!_OLPYLr4Scz3-ZjG<ir7*l4I
zS;2nT-26R2?YJ)(<SJ1DO(2;vP2u#P0#o?TAe8`7<$;PDgG(ag^YF_CR1!FgH+Tdg
z@*g79g)_^HV4GW7HdV{=TWx;7q6U5xg?S3vnGFo?o`sqTtN@q7%c)TY&1DHW5LnkB
z2*P1vcb%){DzMFq7X74JlD6HC)Zm6=$I&+vNbz^XCfN~v0ybt4DwuLQ7;DVL8N4J9
zxca&}!hydAaMA}Tsj<WqnF99Uk|kTJGnv1AAIWqsN|yxsiXjRh#h;O8$%D$Y*6k((
zHV@#)VF0tjL30dFgTm2`IjEFx1Dp!E4S)ZWNw5c&E&G`(oqq8Fl+KL^ceWwhc)EiZ
zz}S<SufD8|k^tL_l;N~ks20iB&(6bH;0pb$NYp~h?1f~ncXg8>=nmo<hb6O;1^dCW
zWk0V?rT(%JSE>bAlx<i5m<f!vG@2VgF|=J{W5Ex@;b)VnRE5W4aky|t7@GyI@SQ!`
zxvIsBxNz5`p`lexiG&$sI6?u|cGFEa%}J%+-Gs8G1-Xd%3){2+G#!ln#=x8?aRLk~
z6bkML1b+KPGWln<B(=vAiM6#xqr(O51+iW>Qj6e<!B}HOfevuhfa3-RRyY%hF*w}E
zN{QoIm%_;xB1tj`)@BoyE|@rNHW~)hj&OMFZNL8suPDBXZt;CVxN;zoSl=-?cs79C
zH4j%cwy}gZo3P3wg`};)MWpG58%Ry`BXpN2QAG}TaT#UV`g-RRJ6_7MKre%eMEu)*
zzO6n{d>!4<>;T9~K^WMXO5NGf-~Y)7%voPqnVoknI995|t`tPR#6>lRt`e?Bt-cU6
znc8Ant<8=4oL%E)G9_Eqh?3`Ac{%NlMn`sxjy@hrr%|S7Gs+Yh6UE4IDz#e^kFPE(
zDRH_nCkm}FfMQd!CyP=&OnC{nrH->_qi+%Y5f{}HTwgGlL{jVw+iZ6VdVLm7gSTUF
z1;1jVF`MZWHfT>IhTa((+8WJd-a$9ZC^JeBZ{C|uzh{WWR@phu<%Z_sFfS`A3;xBL
z34w9}*TFrfPls{UehOE&H!(etjmnX5c$|}@Ju#bYZPH+H)S)uqp;`vV%)nvtF)Z8;
zGwm20{8d7dcA}eQlxqqK?8I47++~l&mRn@GZVr5o9Zhho?Ad9-%U;BFanG4Ep%+m1
zqm=yzrcJQ9lX+}377L-kYZq*`J5nZ7c^&-2fJ~l*|8-$OTtqML92j^kB}wmLILjzs
zNib0862<qNk;oELCgX9VL@z<LVMGq=Md8@q-97dq(Xac7wqf|>zqqDke!n1uQ=-@|
znoPF{7E6_g?0f<d*pW<L+I9KzFGX2y$1s*rzOE#@Bx#o`5^2%K<MT|=))m~q_MAWO
z1Jsj4L~mdWbNWe{@iJm0vaR-bo<woDBoK=YedzVRhHfP0Z~X60{-+AX6J}Yy6*tx(
x?vmR<gNxEssIMYAG#04;Z_%K!wPz8c{{ljf8rqV4NKgO(002ovPDHLkV1ktJ4*viE

diff --git a/Resources/EgtMessageBox/Exclamation.png b/Resources/EgtMessageBox/Exclamation.png
deleted file mode 100644
index 7e098c6c36abd69a2268b19fe3c15ce681fa5cd8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 813
zcmV+|1JeA7P)<h;3K|Lk000e1NJLTq001Tc001Qj1^@s6E~%RU0004mX+uL$Nkc;*
zaB^>EX>4Tx04UFukv&MmKpe$iQ>7wRhju99kfAzR5EXHhC>Fs&X)CnqU~=gfG-*gu
zTpR`0f`cE6RR<SmT^(EnLGS~_*}+NCMN0f%QfLt>cyPHN@A4jZ?*O4uVVc!50cg5y
zrs9&A&8>=oR|F8jAbmqJvy4P~F@vt->mEM7-o<zp{x=5Hyu|>YNIb_3(<a^^p4qew
z&ilk+R+3fXbK-H64oLjSb;aX1&PA66o*6bXsd?fsu~_V2rGr_?)QG2vqpGG;zL51;
z<-EmNtJGNQocxBtyuOm=I?WNpv4jMY5TT%kGAghUqg5xxLW=gKF8*QHpCp$;t}+-o
z7Epx-+4Y0J!S8OZ!qlXf6qJD87svS+1p>Q3v+g+G$BxrH0sPOvmEQJO8^G)*>Gif2
zJpzWdfs5<5rtATiJ3!>gkWJZ@{4|9^0eC;7XUYMgTcCf<>#enq(+40!T`k`L2Zz8|
zk+Rpj+`F%{w?F@J`-AiYMg?+}b{@1N00009a7bBm000XQ000XQ0h0Lxr2qf`24YJ`
zL;(K){{a7>y{D4^000McNliru=m!`M4lK8e{73)*0V+vEK~z{rV;BXa01f>A#PA=4
zp<IdqBb25HpgV|>k8*RFp!A>v6#EQU^idjW!!yJPC3Z?ejckp?=0I{CH@u>f)bfg)
zP@_tSMI?eP2jdlMpn?<vk{yOEv_5=*GJxRG6DR`-kQ%}uFlf^lNe&~&=P*F3UZNdF
ziKAeE6f=f)R8k|fV1QV&hHi*aGqhlU7&EC7VgdqC1`zNA3t4IaybdEaw2btj3?R_f
zgfa*KLT2N17%id@9pJNrDp83XeY`wS2894?txu28LI&7cA5;mkt_jp{U0}GBoX`@I
zV_<j>ZDF`OGcfE}4`Gu6&_j(XAw~;;;xKa4Rz(q%0R#!rPzH$r-EMgB(L2H80<b6@
rv{8wY;08L>uoWAlU=+{>FfafBlVo2!olDX>00000NkvXXu0mjfsN7YU

diff --git a/Resources/EgtMessageBox/Hand.png b/Resources/EgtMessageBox/Hand.png
deleted file mode 100644
index 59dfe1c1db62a29ba82fe369604df7a2e24a8214..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 616
zcmeAS@N?(olHy`uVBq!ia0vp^YCx>Y!3HGtR?Y^J3@qu6zK#qG8~eHcB(ehe3dtTp
zz6=aiK!pu03=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z;_UY8Fx&~
zehU<2OY(MiVfYV%3-&Ib3>0B6@$_|Nf59fssiF0^>Z=t{NVUW@q9i4;B-JXpC>2OC
z7#SFu=o*;m8X1QeSX!AFSeY1V8yHv_7^tQ!`+%Y$H$NpatrE9}5KB291_s7(PZ!6K
z2=}+s4EYWj@VGL&H;9_;_}`e&EV_=ts7v+nt&`g)>ve43vP$N6;&PLx=htsodEKP{
z@XOGA@i*_Um;AeOXj+eZh>^$~!AlF80xs|<`ucCs-qt2^c~W-Q*=e`#>U~`|<@v`y
zJFAM;Nq9$|G&*6^awhd;?rTveb@!8NjE_bs_lRwLRQh~vRkv7_qeoHq3oFZ@j45H8
z;+}7^Z)^N6p?bB`c4wgGqwFa!?l<e{boY6Ev~bQ>eO#L7wtU7EiH9dWHwC#w^<;?3
zO;l<-V&k^7L(wq1rscbhQ`DO9nh-tJXSpS|hXgHOOjh~0M8%5jZt+8Zp=J+3V=MOV
zg+V>4;({?flP)~&@$$T|_1A`svNKkJUIChix~^^t+xsC}a$=HE_N=*%{?Zzof^}Z|
zF4uHBGi~ygZ9d^W5zgzj_bVEvO-u0a;^;Jtbad(P>@@61aCzoGFX&#X|5k%#f$AN=
PIAQQ~^>bP0l+XkK^J(VN

diff --git a/Resources/EgtMessageBox/Information.png b/Resources/EgtMessageBox/Information.png
deleted file mode 100644
index 755d51b8c147906f05d51784e54bdac3a9be75d0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2689
zcmV-{3V!v8P)<h;3K|Lk000e1NJLTq001Tc001Qj1^@s6E~%RU00004XF*Lt006O%
z3;baP0000WV@Og>004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00009
za7bBm000ic000ic0Tn1pfB*mh24YJ`L;(K){{a7>y{D4^000McNliru=mroH0t-{z
zU1R_N03~!qSaf7zbY(hYa%Ew3WdJfTGBhnPHZ3tWR53U@FfuwZFe@-HIxsL6g}(j(
z001R)MObuXVRU6WZEs|0W_bWIFfuePFg7hQHdHY<IxsRiF)%AIFgh?WXV?Zp000Sa
zNkl<ZSV!%bYitzP701u)Joe>%c)i$O?Bx-#3B^rGMSwyQ<3J2e@}Wsc0!@RWd`MMQ
z?FSm6erX9(q^gPXsSl}<nzSlPs7e~qN`OjugcRxo2qrZz1F>BoUO(3MdY`lN>N)q$
z%&s30_*kh&do{B&=l<{SoO|cY9r(Z9r3v=&u5IT|%X21sveneoCFQc71TZ6}$!=v(
z^@ie=dRILq_U`KF(Am|yw7Uk|yyN6bwQM{ufZ6F)#3j+%S|Jehfh<dS*8+ruY&H++
zbQ<z`^{Q!EAJ#>sJ$v8i{D>>uncXqilRJ*CwhZNGexLGKGT8`C4SuMrRUjBpKv6^x
zJpu^WkPURhfP6uNq0u5-8_2+wYd4^n&mEuFApG(VuRXTkmb|TfCD_iLJ3T#x&R<B9
zv}5t2Cb%aVK%fA4L;(!L0?V>MKo!J7Fg)TP4+2V(2#V}s0}PGk;MC{CaIU8h0%CFZ
zPd0~lw70hp@)2gY+k(CD(?fMdBd~W)L*u%oi)tXz7y`?*5XfWz1mYnoltD%YC`$-N
z_Xv=H@#ytR2q{2sUm6Y^>x1mr;N`9Bf-k+ab^S>`(oDN0*w*bw<GSQM+|)exzP2SH
z2>QLC=>{8|LD>UizL@`<h{*1Z<tzp!iWNV)PS*kf8L~MQ{<8lfe0hCf<i$<FZQGuH
z^dJ+MW?Xfez5McNc`RH!);uq{rmZ!E3tME<Mgwplo-OK5a1Sl>Lo!Z_AK*sXfUaJZ
z9GRcTo?iT+w*Wq$glo`*-GBWYMp6TVuWqZ`vUY9zan`xYnEZ50hjMS$H#V(lSrA|Y
zsHy=5PN8Wx1M32TmdYl~ua{gXvgSGwlGx~;Y5O^i`WA{B0(;<@$G--0pg!^I57KX%
zneJA*yK6JRp4)L^jXxOq(Y(0|%T&2+a3GA54M2n0fVysif)BxTqsn36J@Vte1j+l-
zu~;hO)9i&O*0(@^+PC73cT+z$&EBxxo!Ja9-Oyf7Bw`Q=c`;MEE9eeFk+Te#7`X*k
zzEmM!;+2)GpqlW-AY}zhF7tJ=Rtbn&F0aDk1#_V7-X=KGo!xrzT<Q^9g4q<XXJ0wK
zwk8x^8w-1&Oc6VRGyoHH0Qr$}mC5U{uWJ%cUn#<wt3~+xr#Z+J47^kEbAhV#=vczQ
zzxB-|<g`F+|EKxQX6{sifuKzRL%A1gV^Q$o<E?2lg*^4tss(9)vSxycK2$!^lREtK
zd>&f?#_(Lg+U8`6Wo=qO4rr;QL492al1*_qeYx;pDy1*CQ7T~cBx3p>4fqg{Ix+~m
z*@7-4wi=%Y!T}LN0T0yHh^$=935yU7dO#9!{V^cBudTzUmabPo$){yu9Sn|X%@_KM
zD+dR=gT&*4Wum#ovMkT1g{xyWD$(%_aZnR$8L#%ww%5Y84Ka9OeGI<4E(%-Qqp$_r
za}P(MWv&+rC3=#p1FGm%gR1y$P1J|M5d32QkiN`c&NdK_3x+-|zCegATB<WVGTvN4
zX8^oEFr?xlS79P&uvZXoD999fpXz`(Ol4^}pk-VRLB9f$;)TKSa#AgO8cD$gvn)@8
zB+K*;=0ezMil7Zj*`jIMcVZ0QIXD8JUCDESDr3Po8g4+mIeJdksH}(>je=8^D;Tw!
zCDf6I3uc-It}gzFJA#fF6J(-XkQO$TFNrcVvy34;1;_o}tl5B5LFwFN$)L9bx_fb(
zR6`mrn8zcQ*poy+j+iaZj&$7?<O6VF%HVW!d@8<N!_l1z$_urQ?_os(LDzx3MyfJq
z4r!XkoSgZ0I@AB@pv(u4vw_jI*#oN5B@OD2|4XWdtxQk3j<+<@sANnst`!SeR-e!p
zJ8_um3{4rt9n==6GMo<AZ+bv%dL0eyOl3MVS;R_EhD4p5Q!Q(fG+eMYf5R1BSFfw=
z<x8FH=48kQbt7i?ZjmvBW&IpK7C;5I8kBY*H&PSemvv~4%Oi!HF-jUP*sfh|Wpp}H
z()iAl1lbfiVotLGc_#4umQ%@_8xXZwK&dqK_6@^54WiKymHSJECq)`A7#Y5|cjt3i
zHs^e&>NFmm1L}y=HS(Ko%!l=HK)AmXkONA!Z+K)9Qp4l0YH0v7WnIv9eV8<+fW7_N
zu_KzAIh!le)5c#-mFPH#16ssA8ddi)z6qwAhW872pY~+424o)v+?RcFt{)cG3vmD9
zz{T-`aJHkPqeL20zyx8JnTQCl<_iTZcDM^gW6`;yJoPkH-|K9I?OT$trY*w!s%_QM
zF#PbzCU|Du9OkPdyc3XflqCuJu8%<9e}>?R)io1d#d89))niLc1ta^-&)5IW2bsN@
zyve>1DIX-nr+|cc^!K-h;okW{h(~4KvC8TqGPEZBaNnXJ^JTBNs?2+^(&zFe`0&If
zcx1UBR<s5_!B^X1%obbtWV6(5fcFo4l=$<}^2eqaTNIBdObF+nRcA6u^uTx8>v3nn
zx77A!c2af9HjoFq(yaWj?@qi%AI6l${m1?d4dF7pvN?7Mzw~}JnN$C`apOk!{pRS*
zu($U7WA&jko_)FysgFm!n0k>#OpF9b>xZoR<Ai^7(0_hTFn%BZdZPbcMaJDk84jPk
z1QEXq+n<Wvj7P<HM#rqTHf?IZ&IE0{B^cRz9~@b~ugmy-P7BSCg=MJm``FY{#55QK
zqCr_U__=$H9r-y0MIXSak#YD}cOSGQ1o-~rksI-_v?rY@z1`W_d6AD;G3<7G>ppd4
z)$b1IulJA24=aivVqq`%y$X#?giL`%7>o@_aP*}v;m0Li&*qA7xi1ByV-vWhys-J9
z$azJC_tP2ky-k}sF7c738fku|ndXW4zx`9`2VIx+=Z7byW=Zzq`cfd^li7BKwk=eX
z2#ORbqvf&&6WJo9Ml(<-<YDn#0lxh}&FJz)zOIsL?#mXm0~<DMxM>eD!|n)-%rsB>
zulAH5Jk)JG-P5P8yO}l@7BopQaWjDVae;VA(D9E3A)f&Y8wLG=*1*uR1>OsorH?ZO
zIE+u`XHLDkmEAFzV+a@<?bpA4e!y5cFl>BdXk1^A$s2JjwD@%ll1~v#-1n=Am^9fG
zmxtmZ@e9MUda^n5tY%pk5om%d-QMmR%rUcfzqc5R#tRc>0$%|2x*<d`S@bD`*@B{G
vh~wG3HeA$&R4^DEU9n;X+s^!t8^C`7f<`#TsOhd200000NkvXXu0mjfCYkh2

diff --git a/Resources/EgtMessageBox/Question.png b/Resources/EgtMessageBox/Question.png
deleted file mode 100644
index 8312408f59531bdd88aaf37f7d6a032d593f58b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1057
zcmV++1m63JP)<h;3K|Lk000e1NJLTq001Tc001Qj1^@s6E~%RU0004mX+uL$Nkc;*
zaB^>EX>4Tx04UFukv&MmKpe$iQ>7wRhju99kfAzR5EXHhC>Fs&X)CnqU~=gfG-*gu
zTpR`0f`cE6RR<SmT^(EnLGS~_*}+NCMN0f%QfLt>cyPHN@A4jZ?*O4uVVc!50cg5y
zrs9&A&8>=oR|F8jAbmqJvy4P~F@vt->mEM7-o<zp{x=5Hyu|>YNIb_3(<a^^p4qew
z&ilk+R+3fXbK-H64oLjSb;aX1&PA66o*6bXsd?fsu~_V2rGr_?)QG2vqpGG;zL51;
z<-EmNtJGNQocxBtyuOm=I?WNpv4jMY5TT%kGAghUqg5xxLW=gKF8*QHpCp$;t}+-o
z7Epx-+4Y0J!S8OZ!qlXf6qJD87svS+1p>Q3v+g+G$BxrH0sPOvmEQJO8^G)*>Gif2
zJpzWdfs5<5rtATiJ3!>gkWJZ@{4|9^0eC;7XUYMgTcCf<>#enq(+40!T`k`L2Zz8|
zk+Rpj+`F%{w?F@J`-AiYMg?+}b{@1N00009a7bBm000XR000XR0j(pwbpQYW24YJ`
zL;(K){{a7>y{D4^000McNliru=m!`M3MAb;v3>vm0v<_3K~z{r?Up%913?skUk+l3
zCgMS~uuxGHgrw3!(LZ1#Sa@Lk1)`OmTIerO!Oq5rU~el3!Ae9;<pCZj7=<V?hcPC`
z%x2bX_MDkaVv`TTzFBs6zP$HlcA*L-CVXULCzQpJI<u|J&!@l9NJa}vN%D(Xh2#(l
zl8Nz>5+RT?7UL}?MMqFytejFJ8ggcQR8k2k9n>>cX(^SgDa9zHHV2$A;<iDT(*h1_
z{!vef3><~NVd*>u5Alp}jtH5Yb}0?;57on5j{`gn);}pko5KP#opv}KZG_>RG%Lko
z6xnjwl*yLTRAYwiK^GnoAe);xV;`w3+(a|57L0?*|04WQ9RB*jR{(V9N<7hS$0It5
z|2BuFU-j0(vZof00CsPa;5&}skpYrED`bq*N?f^!;V6$$$%~LUFqcw``CbQ(@*F;=
za6|`JF(kFvR}e$}wsD!jBRaT<J&rd+*4F~-{Z3)K5ZSu=#1TDQ#H2Ea;CmV-0}(~P
z(ZIdO7EYqzJqW}8eG;ExgS*(-TN+2DQ4rJlHZnroR1@he1YX%zp@77J`vzMQsvB$x
zT#w~fWqiub{0fp&EXGhyB!b?F2=tXP-N7g(o11&{^Fk>`nKiU6psx%BYW}@DhHXM+
zPHl-wE(8^^|1YIRh4jl-?yTvwjlP%&Z$W}SCKE&Ok|U5pkc)}13K9y5(2GeilBATW
b!VbVMrsAXk9~JKw00000NkvXXu0mjf3|iFO

diff --git a/Resources/EgtMessageBox/Warning.png b/Resources/EgtMessageBox/Warning.png
deleted file mode 100644
index 1e72f684bdda4ea65a56f28ca3c26035cdcf7d31..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2223
zcmV;g2vGNlP)<h;3K|Lk000e1NJLTq001Tc001Qj1^@s6E~%RU0004mX+uL$Nkc;*
zaB^>EX>4Tx04UFukv&MmKpe$iQ>7wRhju99kfAzR5EXHhC>Fs&X)CnqU~=gfG-*gu
zTpR`0f`cE6RR<SmT^(EnLGS~_*}+NCMN0f%QfLt>cyPHN@A4jZ?*O4uVVc!50cg5y
zrs9&A&8>=oR|F8jAbmqJvy4P~F@vt->mEM7-o<zp{x=5Hyu|>YNIb_3(<a^^p4qew
z&ilk+R+3fXbK-H64oLjSb;aX1&PA66o*6bXsd?fsu~_V2rGr_?)QG2vqpGG;zL51;
z<-EmNtJGNQocxBtyuOm=I?WNpv4jMY5TT%kGAghUqg5xxLW=gKF8*QHpCp$;t}+-o
z7Epx-+4Y0J!S8OZ!qlXf6qJD87svS+1p>Q3v+g+G$BxrH0sPOvmEQJO8^G)*>Gif2
zJpzWdfs5<5rtATiJ3!>gkWJZ@{4|9^0eC;7XUYMgTcCf<>#enq(+40!T`k`L2Zz8|
zk+Rpj+`F%{w?F@J`-AiYMg?+}b{@1N00009a7bBm000XR000XR0j(pwbpQYW24YJ`
zL;(K){{a7>y{D4^000McNliru=m!`M4lK8e{73)*2CPX$K~z{r?UxH|R8<<s|L4Bv
zJ<}N+`VfNF@~Ggt>|#*_7SJHs-9#JIfLkIMqG8>{sI0LfJ|nX6u`jfUudJ?YcQID*
z#V%-q>)JLxvR14VLFmJ72ih5Crt`e#_}%GMLnw6Gb&bjLOHR(2^Z4%ne&2V`IfK*u
zUm}Fi?B@R*$*zlq+x7PXMnxHFes>h(F>&zVK{tglWd9x((cj>+o8JnSH%5eW?qQ7S
zRF2qPUqgaf&yL!So&c7+6y@_=!gZao=;^)o@R%t|*s0)c*WAaz>k*9uAsuE!?n)~2
z7x-r1&|yy*6QfQ3<KX*OT$D^WZ@=RyAJ%OxLxiNrCHV?%@cri+g^=xOV`9w0IKNRB
zDSh*;TU6Gz?L`<z_u|2qLg0NV7~>MN7Vo_2W_#+G7`w*~CGOqc8kpAd@-94niy!sB
z4kIs2{OwH_CEg$mt@o}YJMNik&mJ{n62^O1)bw<EZ&|mo4eOR1!T6t?3+QhAa!CR&
z{X2lZ4ijpaJDgJcAM7QgX4Jy05Tak(a`!V?Hd|}P+@H?GhHX>u-aq50oWe0{Y95ch
z5dh*TIL^o|h&HWQZ7&@aqxaZ>W9xUedaIjv?7@9Ec=2{@2AVt1M#G;Y$R0k5Rf|*j
zwBL!A7Ba1ya5!QcI=8K@uvZt&sD$y(YcGg&J8r9gXdl)t=*74TXP`5pA>ih;TVxUI
zjlvVwaLv2~8r}>b+nt6MRsw!`-=nsPqA6OK5Dh8@%!UmwfKAJ`U|HQ1QtCoJ516J2
zMP#9<WNr{xazPqyzk(Nb8$dP#cQ9W&u=UDX+f-2$FRXpn9dCaeIPa~dX54wL6Rd0^
zkjq1n1kx!I!j8f1bCOCr=T#MJE{$UQ$3b-MO#v<j!+G>~ho4wgVw)S0qJ;5|<v)xb
zao6AeNEg=B975&%=|F}CBo3#+5g&-6!jpvRx3&rrMq^dyn3!{J7JuAHTB5XljMvJ1
z?#~_^vN$p$3KODHW+}1xw@tcSHt;U$>dvOShL;A+!fH1~Yp_3pNnrsv$z$BQ8Bsg0
zV&(iO4kQA2>tEEx1zdi9UGI|%7ZnVTz{tY(ZoBP+{lS?{Ti?gJWen=XvnYfl%7QUC
z)f5t4`%yWO6w0c#qA(;V_q-tqbr(m`u%{Hs&NyVh0k<o;seAoudV^DQ%JYnWvTS-f
zra!mp{+P0~ycIuRc|JXn!e!kT1)cvSY@8#8Y5rc!nNtBtqvwesVFi68uBtSN-R*vS
z(KU!4Po}TbBL%afOWoMi^N*p4!*f!PiS<H4)@*p}b(gLkdKatf&ZK=QNCV_8>!FnN
zi3IR`YZaQ~HRw2)rp}zTa%kLYSy9y#tXUYr_VzM#d_*4tQ{eKMH%A^{^rN9!!*g<B
zmtS?$fu7Lpr=Mv<eQgHLs&l>xp@kyQeN@Jt&noa*n;(B|Y$r!j*0bYH@(e?DWd?Jm
z=kfbpVTfn~Mu{P7&c02JOB+ubv0(>z%ks&&obs3JA4;k7oGtjp^>h|0bU`h+z=lHU
zb8)bA1i{z`Sh~Q0(1bIFqFnIWSB2)#^y+XNPregI$c#`vGU!fT9xiQ7{HCevogstA
zbArdn6oZ_9_&-s%<HPs5aaoN{;qcQ&X@^Rp#8IipbWqcgbLAxis9#%x$qOr~pH>?t
zm`-A7OrotsqP7+GU|Ak@bE9~+WjqpnNqR2@PRHO~eNSCMp*WEfZm_XkD<^w>srE!t
z;GRE8=;}_v?@^)33<~*IRU|5+Q0uZ)3rO@=#j4#pgM;3~p>XK*fg04O$$7|<30=wI
z!^0jl?iSdxtPR0QKC+oc|3LXGC0FhE8C~1yt-j#|Vf}w!I>Dpn_9>-K9jP4RUkD5&
zOeE6+gOo2RN~0vzgH$KTiK&bz^jRgHrFNDfo8!pjB;-wj968xa%`7?D&@@~<?Q<-u
z$%AV$Se`tmSA$Kub&4@{)~B|F0>j?<`=6gbPtvn16q8TTHD>JrUM4FpCNnpaBnMQc
zFed5bGIA9a@*X6rY5ORcv~tTz#~js`Dk?lfp|$o8+U__B=lKkMKgW<V=5k}|ug;Rn
zst*+&ZZoW~VPFk2OC3L`@i{{7tcx3QEk|M<Zl70G6t4vCmo&-AnG#YI#ii;ZKs&4t
zLUKdaf|4W*Rh8%t!VS)aOMtm3bj(#+)nf)Oc|e=7YP0>EuPIj8f6c3lD|Lq_rh3j)
xjByhu`SkMhgju_(x12G$kDTT-r}@4Ed<i2wiHQbV0!{z`002ovPDHLkV1kBAHr@aL

diff --git a/SaveFileDialog/SaveFileDialogV.xaml b/SaveFileDialog/SaveFileDialogV.xaml
index 8ba4de4..21046a2 100644
--- a/SaveFileDialog/SaveFileDialogV.xaml
+++ b/SaveFileDialog/SaveFileDialogV.xaml
@@ -9,12 +9,17 @@
                             Height="130" Width="300" Topmost="True"
                             DataContext="{Binding RelativeSource={RelativeSource Self}}">
 
+   <!--<EgtWPFLib5:EgtCustomWindow.Resources>
+      <EgtWPFLib5:FileNameConverter x:Key="FileNameConverter"/>
+   </EgtWPFLib5:EgtCustomWindow.Resources>-->
+
    <Grid>
       <Grid.RowDefinitions>
          <RowDefinition Height="1*"/>
          <RowDefinition Height="1*"/>
       </Grid.RowDefinitions>
 
+
       <TextBox Margin="5" Height="24" x:Name="FilePath"
                Text="{Binding WriteFileName, UpdateSourceTrigger=PropertyChanged}"
                VerticalAlignment="Center" VerticalContentAlignment="Center"/>
diff --git a/SaveFileDialog/SaveFileDialogV.xaml.vb b/SaveFileDialog/SaveFileDialogV.xaml.vb
index bf7ddb3..d41faa8 100644
--- a/SaveFileDialog/SaveFileDialogV.xaml.vb
+++ b/SaveFileDialog/SaveFileDialogV.xaml.vb
@@ -1,6 +1,9 @@
-Imports System.IO
+Imports System.ComponentModel
+Imports System.IO
+Imports EgtUILib
 
 Public Class SaveFileDialogV
+   'Implements INotifyPropertyChanged
 
    Private m_SaveFileDialogVM As SaveFileDialogVM
 
diff --git a/SaveFileDialog/SaveFileDialogVM.vb b/SaveFileDialog/SaveFileDialogVM.vb
index 3c028ac..6deffef 100644
--- a/SaveFileDialog/SaveFileDialogVM.vb
+++ b/SaveFileDialog/SaveFileDialogVM.vb
@@ -9,9 +9,9 @@ Public Class SaveFileDialogVM
       Get
          If IsNothing(m_Title) Then
             If IsFolder Then
-               Return EgtMsg(30011)    ' Nome File
+               Return EgtMsg(MSG_EGTSAVEFILEDIALOG + 11)
             Else
-               Return EgtMsg(30010)    ' Nome Cartella
+               Return EgtMsg(MSG_EGTSAVEFILEDIALOG + 10)
             End If
          Else
             Return m_Title
@@ -74,14 +74,11 @@ Public Class SaveFileDialogVM
          If TempName.Length = value.Length Then
             m_WriteFileName = value
          Else
-            'MessageBox.Show(EgtMsg(MSG_MACHININGDBERRORS + 4),
-            '                EgtMsg(MSG_EGTSAVEFILEDIALOG + 7),
-            '                MessageBoxButton.OK, MessageBoxImage.Error)
-            EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31404),      ' I caratteri \ / : * ? " < > | non sono permessi
-                                                                EgtMsg(31407),      ' CANCELLA
-                                                                MessageBoxButton.OK, MessageBoxImage.Error)
+            MessageBox.Show(EgtMsg(MSG_MACHININGDBERRORS + 4),
+                            EgtMsg(MSG_EGTSAVEFILEDIALOG + 7),
+                            MessageBoxButton.OK, MessageBoxImage.Error)
          End If
-         NotifyPropertyChanged(NameOf(WriteFileName))
+         NotifyPropertyChanged("WriteFileName")
       End Set
    End Property
 
@@ -89,12 +86,12 @@ Public Class SaveFileDialogVM
 
    Public ReadOnly Property SaveMsg As String
       Get
-         Return EgtMsg(30001)    ' Salva
+         Return EgtMsg(MSG_EGTSAVEFILEDIALOG + 1)
       End Get
    End Property
    Public ReadOnly Property CancelMsg As String
       Get
-         Return EgtMsg(30002)    ' Annulla
+         Return EgtMsg(MSG_EGTSAVEFILEDIALOG + 2)
       End Get
    End Property
 
@@ -116,28 +113,25 @@ Public Class SaveFileDialogVM
       If Not String.IsNullOrWhiteSpace(m_FileName) Then
          m_WriteFileName = m_FileName
       End If
-      NotifyPropertyChanged(NameOf(WriteFileName))
+      NotifyPropertyChanged("WriteFileName")
       If IsFolder Then m_sExtension = ""
    End Sub
 
    Friend Function Save() As Boolean
       Dim sCompleteFileName As String = m_sDirectory & "\" & m_WriteFileName & If(IsFolder, "", m_sExtension)
       If String.IsNullOrWhiteSpace(m_WriteFileName) Then
-         'MessageBox.Show(EgtMsg(MSG_EGTSAVEFILEDIALOG + 8), EgtMsg(MSG_EGTSAVEFILEDIALOG + 7), MessageBoxButton.OK, MessageBoxImage.Error)
-         EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(30008), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error) ' Il nome non può essere vuoto! - ERRORE 
+         MessageBox.Show(EgtMsg(MSG_EGTSAVEFILEDIALOG + 8), EgtMsg(MSG_EGTSAVEFILEDIALOG + 7), MessageBoxButton.OK, MessageBoxImage.Error)
          Return False
       End If
       If IsFolder Then
          If System.IO.Directory.Exists(sCompleteFileName) Then
-            'If MessageBox.Show(m_WriteFileName & " " & EgtMsg(MSG_EGTSAVEFILEDIALOG + 3) & vbCrLf & EgtMsg(MSG_EGTSAVEFILEDIALOG + 4), EgtMsg(MSG_EGTSAVEFILEDIALOG + 9), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then
-            If EgtMessageBoxV.Show(Application.Current.MainWindow, m_WriteFileName & " " & EgtMsg(30003) & vbCrLf & EgtMsg(30004), EgtMsg(30009), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then ' esiste già - Sostituirlo? - ATTENZIONE
+            If MessageBox.Show(m_WriteFileName & " " & EgtMsg(MSG_EGTSAVEFILEDIALOG + 3) & vbCrLf & EgtMsg(MSG_EGTSAVEFILEDIALOG + 4), EgtMsg(MSG_EGTSAVEFILEDIALOG + 9), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then
                Return False
             End If
          End If
       Else
          If File.Exists(sCompleteFileName) Then
-            'If MessageBox.Show(m_WriteFileName & " " & EgtMsg(MSG_EGTSAVEFILEDIALOG + 3) & vbCrLf & EgtMsg(MSG_EGTSAVEFILEDIALOG + 4), EgtMsg(MSG_EGTSAVEFILEDIALOG + 9), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then
-            If EgtMessageBoxV.Show(Application.Current.MainWindow, m_WriteFileName & " " & EgtMsg(30003) & vbCrLf & EgtMsg(30004), EgtMsg(30009), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then ' esiste già - Sostituirlo? - ATTENZIONE
+            If MessageBox.Show(m_WriteFileName & " " & EgtMsg(MSG_EGTSAVEFILEDIALOG + 3) & vbCrLf & EgtMsg(MSG_EGTSAVEFILEDIALOG + 4), EgtMsg(MSG_EGTSAVEFILEDIALOG + 9), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then
                Return False
             End If
          End If
diff --git a/SaveFileDialogWithList/SaveFileDialogWithListV.xaml.vb b/SaveFileDialogWithList/SaveFileDialogWithListV.xaml.vb
index f06c8d2..7f54f51 100644
--- a/SaveFileDialogWithList/SaveFileDialogWithListV.xaml.vb
+++ b/SaveFileDialogWithList/SaveFileDialogWithListV.xaml.vb
@@ -1,4 +1,9 @@
-Public Class SaveFileDialogWithListV
+Imports System.ComponentModel
+Imports System.IO
+Imports EgtUILib
+
+Public Class SaveFileDialogWithListV
+   'Implements INotifyPropertyChanged
 
    Private m_SaveFileDialogWithListVM As SaveFileDialogWithListVM
 
@@ -30,4 +35,26 @@
       Return MyBase.ShowDialog()
    End Function
 
-End Class
\ No newline at end of file
+   'Private Sub FilePath_TextChanged(sender As Object, e As TextChangedEventArgs) Handles FilePath.TextChanged
+   '   FileNameList.UnselectAll()
+   'End Sub
+End Class
+
+'''' <summary>
+'''' Class that represent a Converter that convert the complete file path in the file name and vice versa.
+'''' </summary>
+'Public Class FileNameConverter
+'   Implements IValueConverter
+
+'   Dim TempPath As String
+
+'   Public Function Convert(value As Object, targetType As Type, parameter As Object, culture As System.Globalization.CultureInfo) As Object Implements IValueConverter.Convert
+'      TempPath = CStr(value)
+'      Return Path.GetFileNameWithoutExtension(TempPath)
+'   End Function
+
+'   Public Function ConvertBack(value As Object, targetType As Type, parameter As Object, culture As System.Globalization.CultureInfo) As Object Implements IValueConverter.ConvertBack
+'      Return Path.GetDirectoryName(TempPath) & "\" & CStr(value) & Path.GetExtension(TempPath)
+'   End Function
+
+'End Class
\ No newline at end of file
diff --git a/SaveFileDialogWithList/SaveFileDialogWithListVM.vb b/SaveFileDialogWithList/SaveFileDialogWithListVM.vb
index 1a78cf4..10f0a89 100644
--- a/SaveFileDialogWithList/SaveFileDialogWithListVM.vb
+++ b/SaveFileDialogWithList/SaveFileDialogWithListVM.vb
@@ -9,9 +9,9 @@ Public Class SaveFileDialogWithListVM
       Get
          If IsNothing(m_Title) Then
             If IsFolder Then
-               Return EgtMsg(30011)    ' Nome Cartella
+               Return EgtMsg(MSG_EGTSAVEFILEDIALOG + 11)
             Else
-               Return EgtMsg(30010)    ' Nome File
+               Return EgtMsg(MSG_EGTSAVEFILEDIALOG + 10)
             End If
          Else
             Return m_Title
@@ -74,14 +74,11 @@ Public Class SaveFileDialogWithListVM
          If TempName.Length = value.Length Then
             m_WriteFileName = value
          Else
-            'MessageBox.Show(EgtMsg(MSG_MACHININGDBERRORS + 4),
-            '                EgtMsg(MSG_EGTSAVEFILEDIALOG + 7),
-            '                MessageBoxButton.OK, MessageBoxImage.Error)
-            EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31404),      ' I caratteri \ / : * ? " < > | non sono permessi
-                                                                EgtMsg(31407),      ' CANCELLA
-                                                                MessageBoxButton.OK, MessageBoxImage.Error)
+            MessageBox.Show(EgtMsg(MSG_MACHININGDBERRORS + 4),
+                            EgtMsg(MSG_EGTSAVEFILEDIALOG + 7),
+                            MessageBoxButton.OK, MessageBoxImage.Error)
          End If
-         NotifyPropertyChanged(NameOf(WriteFileName))
+         NotifyPropertyChanged("WriteFileName")
       End Set
    End Property
 
@@ -119,7 +116,7 @@ Public Class SaveFileDialogWithListVM
       End Get
       Set(value As List(Of String))
          m_FileList = value
-         NotifyPropertyChanged(NameOf(FileList))
+         NotifyPropertyChanged("FileList")
       End Set
    End Property
 
@@ -130,11 +127,11 @@ Public Class SaveFileDialogWithListVM
       End Get
       Set(value As String)
          m_SelectedFile = value
-         NotifyPropertyChanged(NameOf(SelectedFile))
+         NotifyPropertyChanged("SelectedFile")
 
          If Not IsNothing(m_SelectedFile) Then
             m_WriteFileName = Path.GetFileNameWithoutExtension(SelectedFile)
-            NotifyPropertyChanged(NameOf(WriteFileName))
+            NotifyPropertyChanged("WriteFileName")
          End If
       End Set
    End Property
@@ -143,12 +140,12 @@ Public Class SaveFileDialogWithListVM
 
    Public ReadOnly Property SaveMsg As String
       Get
-         Return EgtMsg(30001)    ' Salva
+         Return EgtMsg(MSG_EGTSAVEFILEDIALOG + 1)
       End Get
    End Property
    Public ReadOnly Property CancelMsg As String
       Get
-         Return EgtMsg(30002)    ' Annulla
+         Return EgtMsg(MSG_EGTSAVEFILEDIALOG + 2)
       End Get
    End Property
 
@@ -252,21 +249,18 @@ Public Class SaveFileDialogWithListVM
    Friend Function Save() As Boolean
       Dim sCompleteFileName As String = m_sDirectory & "\" & m_WriteFileName & If(IsFolder, "", m_sExtension)
       If String.IsNullOrWhiteSpace(m_WriteFileName) Then
-         'MessageBox.Show(EgtMsg(MSG_EGTSAVEFILEDIALOG + 8), EgtMsg(MSG_EGTSAVEFILEDIALOG + 7), MessageBoxButton.OK, MessageBoxImage.Error)
-         EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(30008), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error) ' Il nome non può essere vuoto! - ERRORE
+         MessageBox.Show(EgtMsg(MSG_EGTSAVEFILEDIALOG + 8), EgtMsg(MSG_EGTSAVEFILEDIALOG + 7), MessageBoxButton.OK, MessageBoxImage.Error)
          Return False
       End If
       If IsFolder Then
          If System.IO.Directory.Exists(sCompleteFileName) Then
-            'If MessageBox.Show(m_WriteFileName & " " & EgtMsg(MSG_EGTSAVEFILEDIALOG + 3) & vbCrLf & EgtMsg(MSG_EGTSAVEFILEDIALOG + 4), EgtMsg(MSG_EGTSAVEFILEDIALOG + 9), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then
-            If EgtMessageBoxV.Show(Application.Current.MainWindow, m_WriteFileName & " " & EgtMsg(30003) & vbCrLf & EgtMsg(30004), EgtMsg(30009), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then ' eiste già - Sostituirlo? - ATTENZIONE
+            If MessageBox.Show(m_WriteFileName & " " & EgtMsg(MSG_EGTSAVEFILEDIALOG + 3) & vbCrLf & EgtMsg(MSG_EGTSAVEFILEDIALOG + 4), EgtMsg(MSG_EGTSAVEFILEDIALOG + 9), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then
                Return False
             End If
          End If
       Else
          If File.Exists(sCompleteFileName) Then
-            'If MessageBox.Show(m_WriteFileName & " " & EgtMsg(MSG_EGTSAVEFILEDIALOG + 3) & vbCrLf & EgtMsg(MSG_EGTSAVEFILEDIALOG + 4), EgtMsg(MSG_EGTSAVEFILEDIALOG + 9), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then
-            If EgtMessageBoxV.Show(Application.Current.MainWindow, m_WriteFileName & " " & EgtMsg(30003) & vbCrLf & EgtMsg(30004), EgtMsg(30009), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then ' eiste già - Sostituirlo? - ATTENZIONE
+            If MessageBox.Show(m_WriteFileName & " " & EgtMsg(MSG_EGTSAVEFILEDIALOG + 3) & vbCrLf & EgtMsg(MSG_EGTSAVEFILEDIALOG + 4), EgtMsg(MSG_EGTSAVEFILEDIALOG + 9), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then
                Return False
             End If
          End If
diff --git a/SceneHost/SceneHostV.xaml.vb b/SceneHost/SceneHostV.xaml.vb
index ce2e491..29c3f02 100644
--- a/SceneHost/SceneHostV.xaml.vb
+++ b/SceneHost/SceneHostV.xaml.vb
@@ -1,4 +1,9 @@
-Public Class SceneHostV
+Imports System.Windows.Interop
+Imports System.IO
+Imports EgtUILib
+Imports EgtWPFLib5
+
+Public Class SceneHostV
 
    Private m_SceneHostVM As SceneHostVM
 
diff --git a/SceneHost/SceneHostVM.vb b/SceneHost/SceneHostVM.vb
index 275a5e9..4d45584 100644
--- a/SceneHost/SceneHostVM.vb
+++ b/SceneHost/SceneHostVM.vb
@@ -1,5 +1,6 @@
 Imports System.IO
 Imports EgtUILib
+Imports EgtWPFLib5
 
 Public Class SceneHostVM
    Inherits VMBase
@@ -91,6 +92,8 @@ Public Class SceneHostVM
          If Not String.IsNullOrWhiteSpace(sFile) Then
             sFile = Path.GetDirectoryName(sFile) & "\"
          End If
+         'sFile.TrimEnd("\"c)
+         'sFile += "\New" & m_nInstance.ToString() & ".nge"    'KK?
       End If
 
       Return m_MainController.SaveAsProject(sFile, nType)
@@ -208,4 +211,179 @@ Public Class SceneHostVM
 
 #End Region
 
+   '#Region "EVENTS"
+
+   '   Private Sub OnNewProject(sender As Object, bOk As Boolean) Handles m_Controller.OnNewProject
+   '      OmagOFFICEMap.refMainWindowVM.Title = " New - OmagOFFICE"
+   '   End Sub
+
+   '   Private Sub OnOpenProject(sender As Object, sFile As String, bOk As Boolean) Handles m_Controller.OnOpenProject
+   '      OmagOFFICEMap.refMainWindowVM.Title = sFile & " - OmagOFFICE"
+   '      WriteMainPrivateProfileString(S_GENERAL, K_LASTPROJ, sFile)
+   '      If bOk Then
+   '         OmagOFFICEMap.refTopCommandBarVM.m_MruFiles.Add(sFile)
+   '      Else
+   '         OmagOFFICEMap.refTopCommandBarVM.m_MruFiles.Remove(sFile)
+   '         Dim sMsg As String = EgtMsg(10003) & " '" & sFile & "'"            'Error opening file
+   '         MessageBox.Show(sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)        'Error
+   '      End If
+   '   End Sub
+
+   '   Private Sub OnSavingProject(ByVal sender As Object, sFile As String) Handles m_Controller.OnSavingProject
+   '      ' Recupero tutti i file di texture associabili ai gruppi di lavoro del progetto
+   '      Dim sDirToSearch As String = Path.GetDirectoryName(sFile)
+   '      Dim sFileToSearch As String = Path.GetFileNameWithoutExtension(sFile) & "." & PHOTO_NAME & "*"
+   '      Dim vsTxrFile As New List(Of String)
+   '      For Each sTxrFile In My.Computer.FileSystem.GetFiles(sDirToSearch, FileIO.SearchOption.SearchTopLevelOnly, sFileToSearch)
+   '         vsTxrFile.Add(sTxrFile)
+   '      Next
+   '      ' Rinomino path di eventuali fotografie
+   '      Dim nPhotoId As Integer = EgtGetFirstInGroup(EgtGetFirstNameInGroup(GDB_ID.ROOT, PHOTO_GRP))
+   '      While nPhotoId <> GDB_ID.NULL
+   '         ' Path originale
+   '         Dim sPhoto As String = String.Empty
+   '         If EgtGetPhotoPath(nPhotoId, sPhoto) Then
+   '            ' Nome della foto
+   '            Dim sName As String = String.Empty
+   '            EgtGetName(nPhotoId, sName)
+   '            ' Nuova path
+   '            Dim sNewPhoto As String = Path.GetDirectoryName(sFile) & "\" &
+   '                                      Path.GetFileNameWithoutExtension(sFile) & "." & sName &
+   '                                      Path.GetExtension(sPhoto)
+   '            ' Se diverse, eseguo copia
+   '            If String.Compare(sPhoto, sNewPhoto, True) <> 0 Then
+   '               Try
+   '                  ' Eseguo copia
+   '                  File.Copy(sPhoto, sNewPhoto, True)
+   '                  ' Notifico a foto il cambio di path
+   '                  EgtChangePhotoPath(nPhotoId, sNewPhoto)
+   '                  ' Eventuale notifica a VeinMatching del cambio di path
+   '                  VeinMatching.ChangePhotoPath(sPhoto, sNewPhoto)
+   '               Catch ex As Exception
+   '               End Try
+   '            End If
+   '            ' Tolgo da lista file texture associabili, se presente
+   '            vsTxrFile.Remove(sNewPhoto)
+   '         End If
+   '         ' passo alla successiva
+   '         nPhotoId = EgtGetNext(nPhotoId)
+   '      End While
+   '      ' Se rimasti file associabili, li cancello
+   '      For Each sTxrFile In vsTxrFile
+   '         Try
+   '            My.Computer.FileSystem.DeleteFile(sTxrFile)
+   '         Catch
+   '         End Try
+   '      Next
+   '   End Sub
+
+   '   Private Sub OnSavedProject(ByVal sender As Object, ByVal sFile As String, ByVal bOk As Boolean) Handles m_Controller.OnSavedProject
+   '      ' Se salvataggio non riuscito, esco subito
+   '      If Not bOk Then
+   '         OmagOFFICEMap.refTopCommandBarVM.m_MruFiles.Remove(sFile)
+   '         Dim sMsg As String = EgtMsg(10004) & " '" & sFile & "'"            'Error saving file
+   '         MessageBox.Show(sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)     ' Error
+   '         Return
+   '      End If
+   '      ' Eventuale salvataggio VM
+   '      Dim sVmFile As String = Path.ChangeExtension(sFile, ".vme")
+   '      VeinMatching.Save(sVmFile)
+   '      ' Eventuale salvataggio CSV
+   '      CsvM.SaveCsvPartList()
+   '      ' Aggiornamento titolo
+   '      OmagOFFICEMap.refMainWindowVM.Title = sFile & " - OmagOFFICE"
+   '      ' Riabilito visualizzazione pezzi in parcheggio
+   '      EstCalc.ShowParkedParts()
+   '      ' Inserisco nome in MRU
+   '      OmagOFFICEMap.refTopCommandBarVM.m_MruFiles.Add(sFile)
+   '      ' Salvo nome ultimo file
+   '      WriteMainPrivateProfileString(S_GENERAL, K_LASTPROJ, sFile)
+   '   End Sub
+
+   '   Private Sub OnMouseDownScene(sender As Object, e As Windows.Forms.MouseEventArgs) Handles OmagOFFICEScene.OnMouseDownScene
+   '      ' Si può selezionare solo con il tasto sinistro e se stato NULL
+   '      If e.Button <> Windows.Forms.MouseButtons.Left Or Not OmagOFFICEScene.IsStatusNull() Then
+   '         Return
+   '      End If
+   '      ' Chiamo l'opportuno gestore
+   '      Select Case OmagOFFICEMap.refOptionPanelVM.SelItem
+   '         Case OptionPanelVM.Tabs.RAWPART
+   '            OmagOFFICEMap.refRawPartTabVM.OnMouseDownScene(sender, e)
+   '         Case OptionPanelVM.Tabs.NESTING
+   '            OmagOFFICEMap.refNestingTabVM.OnMouseDownScene(sender, e)
+   '         Case OptionPanelVM.Tabs.MACHINING
+   '            OmagOFFICEMap.refMachiningTabVM.OnMouseDownScene(sender, e)
+   '         Case OptionPanelVM.Tabs.SIMUL
+   '      End Select
+   '   End Sub
+
+   '   Private Sub OnMouseMoveScene(sender As Object, e As Windows.Forms.MouseEventArgs) Handles OmagOFFICEScene.OnMouseMoveScene
+   '      ' Chiamo l'opportuno gestore
+   '      Select Case OmagOFFICEMap.refOptionPanelVM.SelItem
+   '         Case OptionPanelVM.Tabs.RAWPART
+   '            OmagOFFICEMap.refRawPartTabVM.OnMouseMoveScene(sender, e)
+   '         Case OptionPanelVM.Tabs.NESTING
+   '            OmagOFFICEMap.refNestingTabVM.OnMouseMoveScene(sender, e)
+   '         Case OptionPanelVM.Tabs.MACHINING
+   '         Case OptionPanelVM.Tabs.SIMUL
+   '      End Select
+   '   End Sub
+
+   '   Private Sub OnMouseUpScene(sender As Object, e As Windows.Forms.MouseEventArgs) Handles OmagOFFICEScene.OnMouseUpScene
+   '      ' Chiamo l'opportuno gestore
+   '      Select Case OmagOFFICEMap.refOptionPanelVM.SelItem
+   '         Case OptionPanelVM.Tabs.RAWPART
+   '            OmagOFFICEMap.refRawPartTabVM.OnMouseUpScene(sender, e)
+   '         Case OptionPanelVM.Tabs.NESTING
+   '            OmagOFFICEMap.refNestingTabVM.OnMouseUpScene(sender, e)
+   '         Case OptionPanelVM.Tabs.MACHINING
+   '         Case OptionPanelVM.Tabs.SIMUL
+   '      End Select
+   '   End Sub
+
+   '   Private Sub OnCursorPos(ByVal sender As Object, ByVal sCursorPos As String) Handles OmagOFFICEScene.OnCursorPos
+   '      OmagOFFICEMap.refStatusBarVM.SetCurrPos(sCursorPos)
+   '   End Sub
+
+   '   Private Sub OnShowDistance(ByVal sender As Object, ByVal sDistance As String) Handles OmagOFFICEScene.OnShowDistance
+   '      OmagOFFICEMap.refStatusBarVM.SetOutputMessage(sDistance)
+   '   End Sub
+
+   '   Private Sub OnChangedSnapPointType(ByVal sender As Object, ByVal nSpType As SP, ByVal bUser As Boolean) Handles OmagOFFICEScene.OnChangedSnapPointType
+   '      Dim BtnColor As Brush
+   '      If bUser Then
+   '         BtnColor = New SolidColorBrush(SystemColors.ControlColor)
+   '      Else
+   '         BtnColor = Brushes.Bisque
+   '      End If
+   '      Select Case nSpType
+   '         Case SP.PT_SKETCH
+   '            OmagOFFICEMap.refStatusBarVM.SetSnapPointType(EgtMsg(1102), BtnColor)             'Sketch Point
+   '         Case SP.PT_GRID
+   '            OmagOFFICEMap.refStatusBarVM.SetSnapPointType(EgtMsg(1104), BtnColor)             'Grid Point
+   '         Case SP.PT_END
+   '            OmagOFFICEMap.refStatusBarVM.SetSnapPointType(EgtMsg(1106), BtnColor)             'End Point
+   '         Case SP.PT_MID
+   '            OmagOFFICEMap.refStatusBarVM.SetSnapPointType(EgtMsg(1108), BtnColor)             'Mid Point
+   '         Case SP.CENTER
+   '            OmagOFFICEMap.refStatusBarVM.SetSnapPointType(EgtMsg(1110), BtnColor)             'Center
+   '         Case SP.CENTROID
+   '            OmagOFFICEMap.refStatusBarVM.SetSnapPointType(EgtMsg(1112), BtnColor)             'Centroid
+   '         Case SP.PT_NEAR
+   '            OmagOFFICEMap.refStatusBarVM.SetSnapPointType(EgtMsg(1114), BtnColor)             'Near Point
+   '         Case SP.PT_INTERS
+   '            OmagOFFICEMap.refStatusBarVM.SetSnapPointType(EgtMsg(1116), BtnColor)             'Inters Point
+   '         Case SP.PT_TANGENT
+   '            OmagOFFICEMap.refStatusBarVM.SetSnapPointType(EgtMsg(1118), BtnColor)             'Tang Point
+   '         Case SP.PT_PERPENDICULAR
+   '            OmagOFFICEMap.refStatusBarVM.SetSnapPointType(EgtMsg(1120), BtnColor)             'Perp Point
+   '         Case SP.PT_MINDIST
+   '            OmagOFFICEMap.refStatusBarVM.SetSnapPointType(EgtMsg(1122), BtnColor)             'MinDist Point
+   '         Case Else
+   '            OmagOFFICEMap.refStatusBarVM.SetSnapPointType("---", BtnColor)
+   '      End Select
+   '   End Sub
+
+   '#End Region    ' EVENTS
+
 End Class
diff --git a/SetUpWindow/SetUpWindowV.xaml b/SetUpWindow/SetUpWindowV.xaml
index 7d1c7bf..3be5c53 100644
--- a/SetUpWindow/SetUpWindowV.xaml
+++ b/SetUpWindow/SetUpWindowV.xaml
@@ -87,6 +87,7 @@
                         <ColumnDefinition Width="Auto"/>
                      </Grid.ColumnDefinitions>
 
+                     <!--<Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Margin="0,8,6,4" />-->
                      <TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="0,-2,5,0" VerticalAlignment="Center" />
                      <Ellipse Grid.Column="2" Height="10" Width="10" Fill="{Binding ToolColor}" />
 
@@ -136,6 +137,7 @@
                                             HorizontalAlignment="Left">
                                  <ItemsControl.ItemsPanel>
                                     <ItemsPanelTemplate>
+                                       <!--<WrapPanel Orientation="Horizontal" MaxWidth="200"/>-->
                                        <UniformGrid Columns="1"/>
                                     </ItemsPanelTemplate>
                                  </ItemsControl.ItemsPanel>
diff --git a/SetUpWindow/SetUpWindowVM.vb b/SetUpWindow/SetUpWindowVM.vb
index babfb21..e2a4afe 100644
--- a/SetUpWindow/SetUpWindowVM.vb
+++ b/SetUpWindow/SetUpWindowVM.vb
@@ -34,7 +34,7 @@ Public Class SetUpWindowVM
    Private m_Title As String
    Public ReadOnly Property Title As String
       Get
-         Return EgtMsg(31501)    ' SetUp
+         Return EgtMsg(MSG_SETUP + 1)
       End Get
    End Property
 
@@ -88,28 +88,28 @@ Public Class SetUpWindowVM
 
    Public ReadOnly Property TitleMsg As String
       Get
-         Return EgtMsg(31501)    ' SetUp
+         Return EgtMsg(MSG_SETUP + 1)
       End Get
    End Property
 
    Public ReadOnly Property ApplyMsg As String
       Get
-         Return EgtMsg(31502)    ' Applica
+         Return EgtMsg(MSG_SETUP + 2)
       End Get
    End Property
    Public ReadOnly Property ArchiveMsg As String
       Get
-         Return EgtMsg(31503)    ' Archivia
+         Return EgtMsg(MSG_SETUP + 3)
       End Get
    End Property
    Public ReadOnly Property RetrievesMsg As String
       Get
-         Return EgtMsg(31504)    ' Recupera
+         Return EgtMsg(MSG_SETUP + 4)
       End Get
    End Property
    Public ReadOnly Property AutomaticMsg As String
       Get
-         Return EgtMsg(31505)    ' Auto
+         Return EgtMsg(MSG_SETUP + 5)
       End Get
    End Property
 
@@ -155,8 +155,7 @@ Public Class SetUpWindowVM
          Case Else
             ' Se il materiale spcificato nel file INI della macchina non corrisponde ai 3 sopracitati viene emesso un messaggio di errore 
             EgtWPFLib5.ToolDbWindowVM.m_MatType = Nothing
-            'MsgBox(EgtMsg(31409), MsgBoxStyle.Exclamation, EgtMsg(31551))
-            EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31409), EgtMsg(31551), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) ' Materiale della macchina non riconosciuto - Errore
+            MsgBox(EgtMsg(31409), MsgBoxStyle.Exclamation, EgtMsg(31551))
             Exit Sub
       End Select
 
@@ -214,7 +213,7 @@ Public Class SetUpWindowVM
                ElseIf sFamilyName = EgtMsg(90756) And nType = MCH_TY.MILL_POLISHING Then
                   ' --- MOLA LUCIDANTE ---
                   FamilyToolItem.Items.Add(New ToolItem(ToolName, ExitPar, nType, Head, TcPos, Uuid, IsInCurrMachGroup))
-               ElseIf sFamilyName = EgtMsg(31103) And nType = MCH_TY.MILL_STD Then
+               ElseIf sFamilyName = EgtMsg(MSG_TOOLDB + 3) And nType = MCH_TY.MILL_STD Then
                   ' --- FRESA ---
                   FamilyToolItem.Items.Add(New ToolItem(ToolName, ExitPar, nType, Head, TcPos, Uuid, IsInCurrMachGroup))
                End If
@@ -444,12 +443,10 @@ Public Class SetUpWindowVM
                         EgtTdbGetToolFromUUID(sToolList(ToolIndex), sSearchedTool)
                         If Not String.IsNullOrWhiteSpace(sSearchedTool) Then
                            ' Impossibile trovare l'utensile xxx nel DB utensili
-                           'MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 3) & " " & sSearchedTool & " " & EgtMsg(MSG_SETUPERRORS + 4), EgtMsg(MSG_SETUPERRORS + 2), MessageBoxButton.OK, MessageBoxImage.Error)
-                           EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31553) & " " & sSearchedTool & " " & EgtMsg(31554), EgtMsg(31552), MessageBoxButton.OK, MessageBoxImage.Error)
+                           MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 3) & " " & sSearchedTool & " " & EgtMsg(MSG_SETUPERRORS + 4), EgtMsg(MSG_SETUPERRORS + 2), MessageBoxButton.OK, MessageBoxImage.Error)
                         Else
                            ' Impossibile trovare l'utensile nel DB utensili
-                           'MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 3) & " " & EgtMsg(MSG_SETUPERRORS + 4), EgtMsg(MSG_SETUPERRORS + 2), MessageBoxButton.OK, MessageBoxImage.Error)
-                           EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31553) & " " & EgtMsg(31554), EgtMsg(31552), MessageBoxButton.OK, MessageBoxImage.Error)
+                           MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 3) & " " & EgtMsg(MSG_SETUPERRORS + 4), EgtMsg(MSG_SETUPERRORS + 2), MessageBoxButton.OK, MessageBoxImage.Error)
                         End If
                      End If
                   End If
@@ -459,6 +456,94 @@ Public Class SetUpWindowVM
       End If
    End Sub
 
+   '' Funzione che dati l'indice della posizione e la sua stringa di attrezzaggio, carica l'attrezzaggio descritto
+   'Private Sub ReadPositionString(nIndex As Integer, sPosition As String)
+   '   Dim sTcPos As String = String.Empty
+   '   Dim sHead As String = String.Empty
+   '   Dim sExitList As New List(Of String)
+   '   Dim sToolList As New List(Of String)
+   '   ' la spezzo sui ;
+   '   Dim sItems() As String = sPosition.Split(";".ToCharArray)
+   '   ' se c'è almeno un elemento sono sicuro che ci sia la T
+   '   If sItems.Count() >= 1 Then
+   '      Dim nGroup As Integer = 0
+   '      sTcPos = sItems(0)
+   '      ' recupero il suo gruppo
+   '      If Not GetGroupFromTcPos(sTcPos, nGroup) Then
+   '         ' se non lo trovo lo metto nel primo
+   '         nGroup = 1
+   '      End If
+   '      If Not VerifyIndexValidity(nGroup) Then
+   '         ' se mi viene passato un indice non valido, lo metto nel primo
+   '         nGroup = 1
+   '      End If
+   '      ' se ci sono almeno due elementi sono sicuro che ci sia la H
+   '      If sItems.Count >= 2 Then
+   '         sHead = sItems(1)
+   '         m_PositionGroupList(nGroup - 1).PositionList.Add(New Position(sTcPos, sHead, EgtGetHeadExitCount(sHead)))
+   '         ' se ci sono almeno tre elementi sono sicuro che ci sia almeno un'uscita attrezzata
+   '         If sItems.Count >= 3 Then
+   '            ' separo le uscite divise dalla ,
+   '            Dim sExitToolAssList() As String = sItems(2).Split(",".ToCharArray)
+   '            sExitList.Clear()
+   '            sToolList.Clear()
+   '            ' creo le liste di uscite e utensili attrezzati ricavati
+   '            For AssIndex = 0 To sExitToolAssList.Count() - 1
+   '               Dim sExitToolAssItem() As String = sExitToolAssList(AssIndex).Split("/".ToCharArray)
+   '               If sExitToolAssItem.Count > 1 Then
+   '                  sExitList.Add(sExitToolAssItem(0))
+   '                  sToolList.Add(sExitToolAssItem(1))
+   '               End If
+   '            Next
+   '            ' analizzo la lista di utensili attrezzati
+   '            For ToolIndex = 0 To sToolList.Count - 1
+   '               If Not String.IsNullOrEmpty(sToolList(ToolIndex)) Then
+   '                  Dim TempTool As ToolItem = Nothing
+   '                  Dim bFound As Boolean = False
+   '                  ' cerco l'utensile attrezzato nella lista utensili
+   '                  For FamilyListIndex = 0 To m_ToolsList.Count - 1
+   '                     For ToolListIndex = 0 To m_ToolsList(FamilyListIndex).Items.Count - 1
+   '                        TempTool = DirectCast(m_ToolsList(FamilyListIndex).Items(ToolListIndex), ToolItem)
+   '                        If TempTool.Uuid = sToolList(ToolIndex) Then
+   '                           ' lo salvo in una variabile temporanea e lo tolgo dalla lista
+   '                           m_ToolsList(FamilyListIndex).Items.Remove(m_ToolsList(FamilyListIndex).Items(ToolListIndex))
+   '                           bFound = True
+   '                           Exit For
+   '                        End If
+   '                     Next
+   '                     If bFound Then Exit For
+   '                  Next
+   '                  ' se lo trovo
+   '                  If bFound Then
+   '                     ' cerco la relativa uscita
+   '                     For ExitIndex = 0 To m_PositionGroupList(nGroup - 1).PositionList(m_PositionGroupList(nGroup - 1).PositionList.Count - 1).ExitToolAssociationList.Count - 1
+   '                        Dim CurrExitToolAss As ExitToolAssociation = m_PositionGroupList(nGroup - 1).PositionList(m_PositionGroupList(nGroup - 1).PositionList.Count - 1).ExitToolAssociationList(ExitIndex)
+   '                        If CurrExitToolAss.ExitPar = sExitList(ToolIndex) Then
+   '                           ' vi metto l'utensile e segno l'uscita come occupata
+   '                           CurrExitToolAss.Tool = TempTool
+   '                           CurrExitToolAss.IsOccupied = True
+   '                           ' lo metto anche come utensile originale
+   '                           CurrExitToolAss.OrigTool = TempTool
+   '                           Exit For
+   '                        End If
+   '                     Next
+   '                     ' altrimenti, se non l'ho trovato
+   '                  Else
+   '                     Dim sSearchedTool As String = String.Empty
+   '                     EgtTdbGetToolFromUUID(sToolList(ToolIndex), sSearchedTool)
+   '                     MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 3) & " " & sSearchedTool & " " & EgtMsg(MSG_SETUPERRORS + 4), EgtMsg(MSG_SETUPERRORS + 2), MessageBoxButton.OK, MessageBoxImage.Error)
+   '                  End If
+   '               End If
+   '            Next
+   '         End If
+   '         ' non è presente la H, quindi la recupero dal modello delle posizioni nel file MachIni 
+   '      Else
+   '         CreateStdPosFromPosIndex(nIndex)
+   '      End If
+   '   End If
+
+   'End Sub
+
    ' Funzione che data una T restituisce il gruppo a cui appartiene
    Private Function GetGroupFromTcPos(sTcPos As String, ByRef nGroup As Integer) As Boolean
       Dim sGroup As String = String.Empty
@@ -510,7 +595,7 @@ Public Class SetUpWindowVM
    ' Funzione che verifica se ci sono state modifiche all'attrezzaggio corrente e permette di attivare e disattivare il bottone applica
    Private Sub IsEnabledBtns()
       m_IsEnabledApplyBtn = IsModifiedSetUp()
-      NotifyPropertyChanged(NameOf(IsEnabledApplyBtn))
+      NotifyPropertyChanged("IsEnabledApplyBtn")
    End Sub
 
 #Region "ToolDoubleClickCommand"
@@ -524,12 +609,11 @@ Public Class SetUpWindowVM
       ' verifico se ci sono errori
       If ErrorList.Count > 0 Then
          ' li raccolgo tutti nello stesso messaggio
-         Dim sError As String = EgtMsg(31556) & Environment.NewLine     ' La posizione predefinita dell'utensile è già occupata.
+         Dim sError As String = EgtMsg(MSG_SETUPERRORS + 6) & Environment.NewLine
          For ErrorIndex = 0 To ErrorList.Count - 1
             sError &= "- " & ErrorList(ErrorIndex) & Environment.NewLine
          Next
-         'MessageBox.Show(sError, EgtMsg(MSG_SETUPERRORS + 2), MessageBoxButton.OK, MessageBoxImage.Exclamation)
-         EgtMessageBoxV.Show(Application.Current.MainWindow, sError, EgtMsg(31552), MessageBoxButton.OK, MessageBoxImage.Exclamation)  ' Avviso
+         MessageBox.Show(sError, EgtMsg(MSG_SETUPERRORS + 2), MessageBoxButton.OK, MessageBoxImage.Exclamation)
       End If
       IsEnabledBtns()
    End Sub
@@ -576,8 +660,7 @@ Public Class SetUpWindowVM
       ' se la posizione non è valida, restituisco errore
       If sHead = INVALIDPOS Then
          EgtOutLog("SetUp warning: try to set " & SelTool.Name & " on " & Position.TcPos)
-         'MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 5), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31555), EgtMsg(31551), MessageBoxButton.OK, MessageBoxImage.Error)
+         MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 5), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
          Return False
          ' altrimenti, se la posizione nell'attrezzaggio è vuota
       ElseIf Not PosIsOccupied Then
@@ -604,11 +687,13 @@ Public Class SetUpWindowVM
             ' altrimenti restituisco falso
          Else
             ErrorList.Add(SelTool.Name)
+            'MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 9) & " " & SelTool.Name & " " & EgtMsg(MSG_SETUPERRORS + 6), EgtMsg(MSG_SETUPERRORS + 2), MessageBoxButton.OK, MessageBoxImage.Exclamation)
             Return False
          End If
          ' altrimenti restituisco falso
       Else
          ErrorList.Add(SelTool.Name)
+         'MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 9) & " " & SelTool.Name & " " & EgtMsg(MSG_SETUPERRORS + 6), EgtMsg(MSG_SETUPERRORS + 2), MessageBoxButton.OK, MessageBoxImage.Exclamation)
          Return False
       End If
       Return True
@@ -694,7 +779,7 @@ Public Class SetUpWindowVM
          Next
       Next
       m_IsEnabledApplyBtn = False
-      NotifyPropertyChanged(NameOf(IsEnabledApplyBtn))
+      NotifyPropertyChanged("IsEnabledApplyBtn")
       ' aggiorno le librerie sottostanti
       EgtUpdateCurrSetup()
    End Sub
@@ -732,7 +817,7 @@ Public Class SetUpWindowVM
       End If
       ' Apertura dialogo di salvataggio
       Dim SaveFileDialogViewVM As New SaveFileDialogWithListVM With {
-         .Title = EgtMsg(31503) & " " & EgtMsg(31501),      ' Archivia SetUp
+         .Title = EgtMsg(MSG_SETUP + 3) & " " & EgtMsg(MSG_SETUP + 1),
          .Extension = ".stu",
          .Filter = "*.stu",
          .Directory = sDir,
@@ -798,7 +883,7 @@ Public Class SetUpWindowVM
       End If
       ' Apertura dialogo di salvataggio
       Dim OpenFileDialogView As New EgtWPFLib5.EgtOpenFileDialog With {
-         .Title = EgtMsg(31504) & " " & EgtMsg(31501),      ' Recupera SetUp
+         .Title = EgtMsg(MSG_SETUP + 4) & " " & EgtMsg(MSG_SETUP + 1),
          .Filter = "*.stu",
          .Directory = sDir,
          .FileName = String.Empty
@@ -889,12 +974,11 @@ Public Class SetUpWindowVM
       ' verifico se ci sono errori
       If ErrorList.Count > 0 Then
          ' li raccolgo tutti nello stesso messaggio
-         Dim sError As String = EgtMsg(31556) & Environment.NewLine     ' La posizione predefinita dell'utensile è già occupata.
+         Dim sError As String = EgtMsg(MSG_SETUPERRORS + 6) & Environment.NewLine
          For ErrorIndex = 0 To ErrorList.Count - 1
             sError &= "- " & ErrorList(ErrorIndex) & Environment.NewLine
          Next
-         'MessageBox.Show(sError, EgtMsg(MSG_SETUPERRORS + 2), MessageBoxButton.OK, MessageBoxImage.Exclamation)
-         EgtMessageBoxV.Show(Application.Current.MainWindow, sError, EgtMsg(31552), MessageBoxButton.OK, MessageBoxImage.Exclamation)  ' Avviso
+         MessageBox.Show(sError, EgtMsg(MSG_SETUPERRORS + 2), MessageBoxButton.OK, MessageBoxImage.Exclamation)
       End If
 
       ' abilito e disabilito tutte le uscite in base all'utensile selezionato 
@@ -935,8 +1019,7 @@ Public Class SetUpWindowVM
       ' Verifico se l'attrezzaggio è stato modificato
       If IsModifiedSetUp() Then
          ' se modificato chiedo se salvarlo prima di uscire
-         'If MessageBox.Show(EgtMsg(MSG_SETUP + 6), EgtMsg(MSG_SETUP + 2), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
-         If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31506), EgtMsg(31502), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then   ' Applicare l'attrezzaggio corrente prima di uscire? - Applica
+         If MessageBox.Show(EgtMsg(MSG_SETUP + 6), EgtMsg(MSG_SETUP + 2), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
             ' lo salvo
             Apply()
          End If
@@ -1224,7 +1307,7 @@ Public Class ExitToolAssociation
       Set(value As Boolean)
          If value <> m_IsOccupied Then
             m_IsOccupied = value
-            NotifyPropertyChanged(NameOf(IsOccupied))
+            NotifyPropertyChanged("IsOccupied")
          End If
       End Set
    End Property
@@ -1240,7 +1323,7 @@ Public Class ExitToolAssociation
       Set(value As Boolean)
          If value <> m_IsEnabledPos Then
             m_IsEnabledPos = value
-            NotifyPropertyChanged(NameOf(IsEnabledPos))
+            NotifyPropertyChanged("IsEnabledPos")
          End If
       End Set
    End Property
@@ -1255,7 +1338,7 @@ Public Class ExitToolAssociation
       End Get
       Set(value As Boolean?)
          m_IsValidPos = value
-         NotifyPropertyChanged(NameOf(ExitBtnBackgroundCol))
+         NotifyPropertyChanged("ExitBtnBackgroundCol")
       End Set
    End Property
 
@@ -1312,7 +1395,7 @@ Public Class ExitToolAssociation
       Set(value As ToolItem)
          m_Tool = value
          m_IsModifiedTool = m_Tool IsNot m_OrigTool
-         NotifyPropertyChanged(NameOf(Tool))
+         NotifyPropertyChanged("Tool")
       End Set
    End Property
 
@@ -1331,31 +1414,31 @@ Public Class ExitToolAssociation
          Dim sLen As String = LenToString(dValue, 4)
          EgtTdbGetCurrToolParam(MCH_TP.MAXMAT, dValue)
          Dim MaxMat As String = LenToString(dValue, 4)
-         Return (EgtMsg(31053) & ": " & ConvertToolTypeToString(nType) & Environment.NewLine &     ' Tipo
-                 EgtMsg(31056) & ": " & sDiam & Environment.NewLine &                              ' Diametro
-                 EgtMsg(31062) & ": " & sLen & Environment.NewLine &                               ' Lunghezza
-                 EgtMsg(31064) & ": " & MaxMat)                                                    ' Massimo Materiale
+         Return (EgtMsg(MSG_TOOLDB + 53) & ": " & ConvertToolTypeToString(nType) & Environment.NewLine &
+                 EgtMsg(MSG_TOOLDB + 56) & ": " & sDiam & Environment.NewLine &
+                 EgtMsg(MSG_TOOLDB + 62) & ": " & sLen & Environment.NewLine &
+                 EgtMsg(MSG_TOOLDB + 64) & ": " & MaxMat)
       End Get
    End Property
 
    Private Function ConvertToolTypeToString(ToolType As Integer) As String
       Select Case ToolType
          Case MCH_TY.DRILL_STD
-            Return EgtMsg(31001)    ' Punta
+            Return EgtMsg(MSG_TOOLDB + 1)
          Case MCH_TY.DRILL_LONG
-            Return EgtMsg(31006)    ' Punta lunga
+            Return EgtMsg(MSG_TOOLDB + 6)
          Case MCH_TY.SAW_STD
-            Return EgtMsg(31002)    ' Lama
+            Return EgtMsg(MSG_TOOLDB + 2)
          Case MCH_TY.SAW_FLAT
-            Return EgtMsg(31007)    ' Lama piatta
+            Return EgtMsg(MSG_TOOLDB + 7)
          Case MCH_TY.MILL_STD
-            Return EgtMsg(31003)    ' Fresa
+            Return EgtMsg(MSG_TOOLDB + 3)
          Case MCH_TY.MILL_NOTIP
-            Return EgtMsg(31008)    ' Fresa senza punta
+            Return EgtMsg(MSG_TOOLDB + 8)
          Case MCH_TY.MORTISE_STD
-            Return EgtMsg(31004)    ' Mortasatrice
+            Return EgtMsg(MSG_TOOLDB + 4)
          Case MCH_TY.COMPO
-            Return EgtMsg(31005)    ' Composito
+            Return EgtMsg(MSG_TOOLDB + 5)
          Case Else
             Return String.Empty
       End Select
@@ -1399,7 +1482,7 @@ Public Class ExitToolAssociation
          ' se quello selezionato nella lista non è un utensile esco
          If Not TypeOf param Is ToolItem Then
             m_IsOccupied = False
-            NotifyPropertyChanged(NameOf(IsOccupied))
+            NotifyPropertyChanged("IsOccupied")
             Return
          End If
          Dim SelTool As ToolItem = DirectCast(param, ToolItem)
@@ -1419,7 +1502,7 @@ Public Class ExitToolAssociation
             EgtTdbGetToolFromUUID(SelTool.Uuid, sToolName)
             EgtOutLog("Error in setup! Tool:" & sToolName & " TcPos: " & m_MyPos.TcPos)
             m_IsOccupied = False
-            NotifyPropertyChanged(NameOf(IsOccupied))
+            NotifyPropertyChanged("IsOccupied")
             Return
          End If
          ' se la testa restituita non coincide con quella della posizione
@@ -1447,7 +1530,7 @@ Public Class ExitToolAssociation
                ElseIf sh_ToolsList(Index).Name = EgtMsg(90756) And SelTool.Type = MCH_TY.MILL_POLISHING Then
                   ' --- MOLA LUCIDANTE ---
                   sh_ToolsList(Index).Items.Remove(SelTool)
-               ElseIf sh_ToolsList(Index).Name = EgtMsg(31003) And SelTool.Type = MCH_TY.MILL_STD Then
+               ElseIf sh_ToolsList(Index).Name = EgtMsg(MSG_TOOLDB + 3) And SelTool.Type = MCH_TY.MILL_STD Then
                   ' --- FRESA ---
                   sh_ToolsList(Index).Items.Remove(SelTool)
                End If
@@ -1460,7 +1543,7 @@ Public Class ExitToolAssociation
                Exit For
             End If
          Next
-         NotifyPropertyChanged(NameOf(ToolTipMsg))
+         NotifyPropertyChanged("ToolTipMsg")
       Else
          ' lo rimetto nella lista utensili
          For Index = 0 To sh_ToolsList.Count - 1
@@ -1503,7 +1586,7 @@ Public Class ExitToolAssociation
                   ' espando la famiglia in cui l'ho messo
                   sh_ToolsList(Index).IsExpanded = True
                   Exit For
-               ElseIf sh_ToolsList(Index).Name = EgtMsg(31003) And Tool.Type = MCH_TY.MILL_STD Then
+               ElseIf sh_ToolsList(Index).Name = EgtMsg(MSG_TOOLDB + 3) And Tool.Type = MCH_TY.MILL_STD Then
                   ' --- FRESA ---
                   Dim TempList As New List(Of String)
                   Dim ToolIndex As Integer
@@ -1556,7 +1639,7 @@ Public Class ExitToolAssociation
 
          ' seleziono utensile rimesso in lista
          m_Tool.IsSelected = True
-         Tool.NotifyPropertyChanged(NameOf(Tool.IsSelected))
+         Tool.NotifyPropertyChanged("IsSelected")
          ' e lo tolgo dalla posizione di attrezzaggio
          Tool = Nothing
          IsOccupied = False
@@ -1645,7 +1728,7 @@ Public Class FamilyToolItem
             m_HaveToolsInCurrMachGroup = True
          End If
       Next
-      NotifyPropertyChanged(NameOf(FamilyColor))
+      NotifyPropertyChanged("FamilyColor")
    End Sub
 
 End Class
@@ -1696,6 +1779,7 @@ Public Class ToolItem
       Set(value As Boolean)
          If value <> m_IsInCurrMachGroup Then
             m_IsInCurrMachGroup = value
+            'NotifyPropertyChanged("IsInCurrMachGroup")
          End If
       End Set
    End Property
@@ -1769,9 +1853,9 @@ Public Class ToolItem
 
    Public ReadOnly Property ToolTipMsg As String
       Get
-         Return (EgtMsg(31075) & ": " & m_Name & Environment.NewLine &     ' Nome
-                 EgtMsg(31078) & ": " & m_TcPos & Environment.NewLine &    ' Posizione
-                 EgtMsg(31074) & ": " & m_Head & "." & m_Exit)             ' Testa
+         Return (EgtMsg(MSG_TOOLDB + 75) & ": " & m_Name & Environment.NewLine &
+                 EgtMsg(MSG_TOOLDB + 78) & ": " & m_TcPos & Environment.NewLine &
+                 EgtMsg(MSG_TOOLDB + 74) & ": " & m_Head & "." & m_Exit)
       End Get
    End Property
 
diff --git a/ShowPanel/ShowPanelVM.vb b/ShowPanel/ShowPanelVM.vb
index 9ccf59c..51fa0e7 100644
--- a/ShowPanel/ShowPanelVM.vb
+++ b/ShowPanel/ShowPanelVM.vb
@@ -12,25 +12,25 @@ Public Class ShowPanelVM
 
    Public ReadOnly Property RenderingWFToolTip As String
       Get
-         Return EgtMsg(5251)     ' Wireframe
+         Return EgtMsg(MSG_GRIDVIEWPANEL + 1)
       End Get
    End Property
 
    Public ReadOnly Property RenderingHLToolTip As String
       Get
-         Return EgtMsg(5252)     ' Linee Nascoste
+         Return EgtMsg(MSG_GRIDVIEWPANEL + 2)
       End Get
    End Property
 
    Public ReadOnly Property RenderingSHToolTip As String
       Get
-         Return EgtMsg(5253)     ' Ombreggiature
+         Return EgtMsg(MSG_GRIDVIEWPANEL + 3)
       End Get
    End Property
 
    Public ReadOnly Property CurveDirToolTip As String
       Get
-         Return EgtMsg(5266)     ' Mostra Direzione Curve
+         Return EgtMsg(MSG_GRIDVIEWPANEL + 16)
       End Get
    End Property
 
@@ -46,7 +46,7 @@ Public Class ShowPanelVM
             m_WireframeIsChecked = value
             If value Then
                LibMap.refSceneHostVM.ShowMode(SM.WIREFRAME)
-               NotifyPropertyChanged(NameOf(WireframeIsChecked))
+               NotifyPropertyChanged("WireframeIsChecked")
             End If
          End If
       End Set
@@ -62,7 +62,7 @@ Public Class ShowPanelVM
             m_HiddenLineIsChecked = value
             If value Then
                LibMap.refSceneHostVM.ShowMode(SM.HIDDENLINE)
-               NotifyPropertyChanged(NameOf(HiddenLineIsChecked))
+               NotifyPropertyChanged("HiddenLineIsChecked")
             End If
          End If
       End Set
@@ -78,7 +78,7 @@ Public Class ShowPanelVM
             m_ShadingIsChecked = value
             If value Then
                LibMap.refSceneHostVM.ShowMode(SM.SHADING)
-               NotifyPropertyChanged(NameOf(ShadingIsChecked))
+               NotifyPropertyChanged("ShadingIsChecked")
             End If
          End If
       End Set
@@ -93,7 +93,7 @@ Public Class ShowPanelVM
          If value <> m_CurveDirIsChecked Then
             m_CurveDirIsChecked = value
             EgtSetShowCurveDirection(value)
-            NotifyPropertyChanged(NameOf(CurveDirIsChecked))
+            NotifyPropertyChanged("CurveDirIsChecked")
          End If
       End Set
    End Property
diff --git a/StatusBar/StatusBarVM.vb b/StatusBar/StatusBarVM.vb
index 3ced018..d85eac8 100644
--- a/StatusBar/StatusBarVM.vb
+++ b/StatusBar/StatusBarVM.vb
@@ -1,4 +1,6 @@
-Public Class StatusBarVM
+Imports EgtWPFLib5
+
+Public Class StatusBarVM
    Inherits VMBase
 
 #Region "FIELDS & PROPERTIES"
@@ -50,7 +52,7 @@
       End Get
       Set(value As String)
          m_OutputMessage = value
-         NotifyPropertyChanged(NameOf(OutputMessage))
+         NotifyPropertyChanged( "OutputMessage")
       End Set
    End Property
 
@@ -61,7 +63,7 @@
       End Get
       Set(value As Brush)
          m_OutputMessage_Foreground = value
-         NotifyPropertyChanged(NameOf(OutputMessage_Foreground))
+         NotifyPropertyChanged("OutputMessage_Foreground")
       End Set
    End Property
 
@@ -123,7 +125,7 @@
 
    Public Sub SetLoadingProgress(sProgress As Integer)
       m_LoadingProgress = sProgress
-      NotifyPropertyChanged(NameOf(LoadingProgress))
+      NotifyPropertyChanged("LoadingProgress")
    End Sub
 
    Public Sub SetLoadingProgress_Visibility(IsVisible As Boolean)
@@ -138,13 +140,13 @@
          m_LoadingProgress_Visibility = Visibility.Hidden
          m_StopProgress_Visibility = Visibility.Hidden
       End If
-      NotifyPropertyChanged(NameOf(LoadingProgress_Visibility))
-      NotifyPropertyChanged(NameOf(StopProgress_Visibility))
+      NotifyPropertyChanged("LoadingProgress_Visibility")
+      NotifyPropertyChanged("StopProgress_Visibility")
    End Sub
 
    Public Sub SetStopProgress_IsEnabled(IsEnabled As Boolean)
       m_StopProgress_IsEnabled = IsEnabled
-      NotifyPropertyChanged(NameOf(StopProgress_IsEnabled))
+      NotifyPropertyChanged("StopProgress_IsEnabled")
    End Sub
 
    Public Sub SetStopProgress_IsActive(IsActive As Boolean)
@@ -154,13 +156,13 @@
    Public Overloads Sub SetOutputMessage(sMessage As String, Optional nMsgType As MSG_TYPE = MSG_TYPE.INFO)
       SetMsgColor(nMsgType)
       m_OutputMessage = sMessage
-      NotifyPropertyChanged(NameOf(OutputMessage))
+      NotifyPropertyChanged("OutputMessage")
    End Sub
 
    Public Overloads Sub SetOutputMessage(sMessage As String, nTime As Integer, Optional nMsgType As MSG_TYPE = MSG_TYPE.INFO)
       SetMsgColor(nMsgType)
       m_OutputMessage = sMessage
-      NotifyPropertyChanged(NameOf(OutputMessage))
+      NotifyPropertyChanged("OutputMessage")
       OutputMessageTimer.Interval = TimeSpan.FromSeconds(nTime)
       OutputMessageTimer.IsEnabled = True
       OutputMessageTimer.Start()
@@ -170,7 +172,7 @@
       m_OutputMessage_Foreground = Brushes.Black
       NotifyPropertyChanged("MsgColor")
       m_OutputMessage = String.Empty
-      NotifyPropertyChanged(NameOf(OutputMessage))
+      NotifyPropertyChanged("OutputMessage")
       If OutputMessageTimer.IsEnabled Then
          OutputMessageTimer.Stop()
          OutputMessageTimer.IsEnabled = False
@@ -179,12 +181,12 @@
 
    Public Sub SetMeasureUnit(nMeasureUnit As Integer)
       m_MeasureUnit = If(nMeasureUnit = 0, "in", "mm")
-      NotifyPropertyChanged(NameOf(MeasureUnit))
+      NotifyPropertyChanged("MeasureUnit")
    End Sub
 
    Public Sub SetCurrPos(sCurrPos As String)
       m_CurrPos = sCurrPos
-      NotifyPropertyChanged(NameOf(CurrPos))
+      NotifyPropertyChanged("CurrPos")
    End Sub
 
    Public Sub SetMsgColor(nMsgType As MSG_TYPE)
@@ -196,14 +198,14 @@
          Case MSG_TYPE.ERROR_
             m_OutputMessage_Foreground = Brushes.Red
       End Select
-      NotifyPropertyChanged(NameOf(OutputMessage_Foreground))
+      NotifyPropertyChanged("OutputMessage_Foreground")
    End Sub
 
    Public Sub SetSnapPointType(sSnapPntType As String, Optional SnapPntTypeBackground As Brush = Nothing)
       m_SnapPointType = sSnapPntType
-      NotifyPropertyChanged(NameOf(SnapPointType))
+      NotifyPropertyChanged("SnapPointType")
       If Not IsNothing(SnapPntTypeBackground) Then
-         m_SnapPointType_Background = DirectCast(SnapPntTypeBackground, SolidColorBrush)
+         m_SnapPointType_Background = SnapPntTypeBackground
          NotifyPropertyChanged("SnapPointTypeBackground")
       End If
    End Sub
diff --git a/StringParamV.xaml b/StringParamV.xaml
index 00770c3..9f62836 100644
--- a/StringParamV.xaml
+++ b/StringParamV.xaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:sys="clr-namespace:System;assembly=mscorlib" 
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
+   <!--x:Name="Self">-->
 
    <UserControl.Resources>
       <ResourceDictionary>
@@ -12,10 +13,84 @@
       </ResourceDictionary>
    </UserControl.Resources>
 
+   <!--Visibility="{Binding ParamVisibility, ElementName=Self,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">-->
    <Grid Style="{DynamicResource Param_GpBxHeaderAlignment}">
+
       <Grid.Resources>
+         <EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
          <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
          <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Invert">0</sys:Int32>
+         <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+         <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+         <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+         <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+         <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+         <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+         <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+         <sys:Int32 x:Key="StepType">8</sys:Int32>
+         <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+         <sys:Int32 x:Key="Speed">10</sys:Int32>
+         <sys:Int32 x:Key="Feed">11</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+         <sys:Int32 x:Key="OffSr">15</sys:Int32>
+         <sys:Int32 x:Key="OffSl">16</sys:Int32>
+         <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+         <sys:Int32 x:Key="Approx">18</sys:Int32>
+         <sys:Int32 x:Key="StartPos">19</sys:Int32>
+         <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+         <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+         <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+         <sys:Int32 x:Key="StepPar">23</sys:Int32>
+         <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+         <sys:Int32 x:Key="TabLen">25</sys:Int32>
+         <sys:Int32 x:Key="TabDist">26</sys:Int32>
+         <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+         <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+         <sys:Int32 x:Key="LiTang">29</sys:Int32>
+         <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+         <sys:Int32 x:Key="LiElev">31</sys:Int32>
+         <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+         <sys:Int32 x:Key="LoTang">33</sys:Int32>
+         <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+         <sys:Int32 x:Key="LoElev">35</sys:Int32>
+         <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+         <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+         <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+         <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+         <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+         <sys:Int32 x:Key="SideStep">41</sys:Int32>
+         <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+         <sys:Int32 x:Key="NamePar">43</sys:Int32>
+         <sys:Int32 x:Key="Tool">44</sys:Int32>
+         <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+         <sys:Int32 x:Key="OverLap">47</sys:Int32>
+         <sys:Int32 x:Key="SubType">49</sys:Int32>
+         <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
+         <sys:Int32 x:Key="InitAngs">51</sys:Int32>
+         <sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
+         <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+         <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+         <sys:Int32 x:Key="StepBack">55</sys:Int32>
+         <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
+         <sys:Int32 x:Key="BackFeed">57</sys:Int32>
+         <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
+         <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
+         <sys:Int32 x:Key="Probing">60</sys:Int32>
+         <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
+         <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
+         <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
+         <sys:Int32 x:Key="IntCornType">64</sys:Int32>
+         <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
+         <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
+         <sys:Int32 x:Key="LiHole">67</sys:Int32>
+         <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
+         <sys:Int32 x:Key="LpTurns">69</sys:Int32>
+         <sys:Int32 x:Key="HpTurns">70</sys:Int32>
+         <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
       </Grid.Resources>
 
       <Grid.ColumnDefinitions>
@@ -81,6 +156,24 @@
                                       RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:StringParamV}},
                                       Converter={StaticResource ErrorVisibilityConverter}}" 
                  Margin="0,0,0,3"/>
+      <!--Visibility="{Binding Path=SelectedItem.SpeedErrorMsg, ElementName=MachiningsTreeView,
+                  Converter={StaticResource ErrorVisibilityConverter}}" Margin="0,0,5,0"/>-->
+
+      <!--Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:StringParamV}},
+                                       Path=ParamErrorMsgVisibility,
+                                       Mode=TwoWay,
+                                       UpdateSourceTrigger=PropertyChanged,
+                                       Converter={StaticResource ErrorVisibilityConverter}}" Margin="0,0,5,0"/>-->
+
+
+      <!--<TextBlock x:Name="ParamMsg" Style="{DynamicResource MachiningsToolTextBlock}"/>
+        <EgtWPFLib5:EgtTextBox x:Name="ParamValue" Grid.Column="1" Style="{DynamicResource MachiningsToolTextBox}"
+                                />
+        <TextBlock Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource ValidationErrorTextBlock}"
+                  x:Name="ErrorMsg"
+                  Visibility="{Binding Path=SelectedItem.SpeedErrorMsg, ElementName=MachiningsTreeView,
+                  Converter={StaticResource ErrorVisibilityConverter}}" Margin="0,0,5,0"/>-->
+
    </Grid>
 
 </UserControl>
diff --git a/StringParamV.xaml.vb b/StringParamV.xaml.vb
index ec737b8..cca026c 100644
--- a/StringParamV.xaml.vb
+++ b/StringParamV.xaml.vb
@@ -1,4 +1,6 @@
-Imports System.ComponentModel
+Imports System.Globalization
+Imports System.Windows.Controls.Primitives
+Imports System.ComponentModel
 
 
 Public Class StringParamV
@@ -420,6 +422,41 @@ Public Class StringParamV
 
    ' ---------------------------------------------------------------------------------------------------------------------------------------------------------
 
+   ' Gestione BorderBrushIsFocused textbox
+   'Public Shared ReadOnly EgtBorderBrushIsFocusedProperty As DependencyProperty = DependencyProperty.RegisterAttached(
+   '                         NameOf(EgtBorderBrushIsFocused),
+   '                         GetType(Brush),
+   '                         GetType(StringParamV),
+   '                         New FrameworkPropertyMetadata(DirectCast(New BrushConverter().ConvertFromString("#FF569DE5"), Brush), 
+   '                                                       New PropertyChangedCallback(AddressOf EgtBorderBrushIsFocused_PropertyChanged)) With {.BindsTwoWayByDefault = True})
+
+   '' Declare a get accessor method.
+   'Public Shared Function GetEgtBorderBrushIsFocused(element As StringParamV) As Brush
+   '   Return DirectCast(element.GetValue(EgtBorderBrushIsFocusedProperty), Brush)
+   'End Function
+
+   '' Declare a set accessor method.
+   'Public Shared Sub SetEgtBorderBrushIsFocused(element As StringParamV, value As Brush)
+   '   element.SetValue(EgtBorderBrushIsFocusedProperty, value)
+   'End Sub
+
+   '' Declare public property.
+   'Public Property EgtBorderBrushIsFocused As Brush
+   '   Get
+   '      Return CType(GetValue(EgtBorderBrushIsFocusedProperty), Brush)
+   '   End Get
+   '   Set(value As Brush)
+   '      SetValue(EgtBorderBrushIsFocusedProperty, value)
+   '   End Set
+   'End Property
+
+   '' Declare method invoke by changing property.
+   'Private Shared Sub EgtBorderBrushIsFocused_PropertyChanged(sender As DependencyObject, e As DependencyPropertyChangedEventArgs)
+   '   Dim TempMe As StringParamV = DirectCast(sender, StringParamV)
+   'End Sub
+
+   ' ---------------------------------------------------------------------------------------------------------------------------------------------------------
+
    Public Shared ReadOnly ParamTxBxProperty As DependencyProperty =
          DependencyProperty.Register("ParamTxBx", GetType(String), GetType(StringParamV), New FrameworkPropertyMetadata() With {.BindsTwoWayByDefault = True})
    Public Property ParamTxBx As String
@@ -431,6 +468,15 @@ Public Class StringParamV
       End Set
    End Property
 
+   'Private Shared Sub OnParamTxBxChangedCallback(sender As DependencyObject, e As DependencyPropertyChangedEventArgs)
+   '   Dim StringParamV As StringParamV = DirectCast(sender, StringParamV)
+   '   If Not IsNothing(sender) Then
+   '      'StringParamV.ParamValue.Text = CStr(e.NewValue)
+   '      StringParamV.ParamTxBx = CStr(e.NewValue)
+   '      StringParamV.NotifyPropertyChanged("ParamTxBx")
+   '   End If
+   'End Sub
+
    Public Property ParamErrorMsg() As String
       Get
          Return CStr(GetValue(ParamErrorMsgProperty))
@@ -452,6 +498,10 @@ Public Class StringParamV
       End Set
    End Property
 
+   'Friend Sub ParamValue_TextChanged(sender As Object, e As TextChangedEventArgs) Handles ParamValue.TextChanged
+   '   ParamTxBx = ParamValue.Text
+   'End Sub
+
    Public Shared ReadOnly ParamVisibilityProperty As DependencyProperty =
          DependencyProperty.Register("ParamVisibility", GetType(Visibility), GetType(StringParamV))
 
diff --git a/StringParamWithButtonV.xaml b/StringParamWithButtonV.xaml
index 62cdee2..2dc9cd8 100644
--- a/StringParamWithButtonV.xaml
+++ b/StringParamWithButtonV.xaml
@@ -1,7 +1,10 @@
 <UserControl x:Class="StringParamWithButtonV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5"
+             xmlns:theme="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero">
+   <!--x:Name="Self">-->
 
    <UserControl.Resources>
       <ResourceDictionary>
@@ -61,16 +64,90 @@
       </ResourceDictionary>
    </UserControl.Resources>
 
+   <!--Visibility="{Binding ParamVisibility, ElementName=Self,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">-->
    <Grid Style="{DynamicResource Param_GpBxHeaderAlignment}">
 
       <Grid.Resources>
+         <EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
          <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
          <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Invert">0</sys:Int32>
+         <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+         <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+         <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+         <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+         <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+         <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+         <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+         <sys:Int32 x:Key="StepType">8</sys:Int32>
+         <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+         <sys:Int32 x:Key="Speed">10</sys:Int32>
+         <sys:Int32 x:Key="Feed">11</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+         <sys:Int32 x:Key="OffSr">15</sys:Int32>
+         <sys:Int32 x:Key="OffSl">16</sys:Int32>
+         <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+         <sys:Int32 x:Key="Approx">18</sys:Int32>
+         <sys:Int32 x:Key="StartPos">19</sys:Int32>
+         <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+         <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+         <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+         <sys:Int32 x:Key="StepPar">23</sys:Int32>
+         <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+         <sys:Int32 x:Key="TabLen">25</sys:Int32>
+         <sys:Int32 x:Key="TabDist">26</sys:Int32>
+         <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+         <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+         <sys:Int32 x:Key="LiTang">29</sys:Int32>
+         <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+         <sys:Int32 x:Key="LiElev">31</sys:Int32>
+         <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+         <sys:Int32 x:Key="LoTang">33</sys:Int32>
+         <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+         <sys:Int32 x:Key="LoElev">35</sys:Int32>
+         <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+         <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+         <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+         <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+         <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+         <sys:Int32 x:Key="SideStep">41</sys:Int32>
+         <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+         <sys:Int32 x:Key="NamePar">43</sys:Int32>
+         <sys:Int32 x:Key="Tool">44</sys:Int32>
+         <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+         <sys:Int32 x:Key="OverLap">47</sys:Int32>
+         <sys:Int32 x:Key="SubType">49</sys:Int32>
+         <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
+         <sys:Int32 x:Key="InitAngs">51</sys:Int32>
+         <sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
+         <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+         <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+         <sys:Int32 x:Key="StepBack">55</sys:Int32>
+         <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
+         <sys:Int32 x:Key="BackFeed">57</sys:Int32>
+         <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
+         <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
+         <sys:Int32 x:Key="Probing">60</sys:Int32>
+         <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
+         <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
+         <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
+         <sys:Int32 x:Key="IntCornType">64</sys:Int32>
+         <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
+         <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
+         <sys:Int32 x:Key="LiHole">67</sys:Int32>
+         <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
+         <sys:Int32 x:Key="LpTurns">69</sys:Int32>
+         <sys:Int32 x:Key="HpTurns">70</sys:Int32>
+         <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
       </Grid.Resources>
 
       <Grid.ColumnDefinitions>
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="1*"/>
+         <!--<ColumnDefinition Width="Auto"/>-->
       </Grid.ColumnDefinitions>
       <Grid.RowDefinitions>
          <RowDefinition Height="1*"/>
@@ -148,6 +225,24 @@
                                       Converter={StaticResource ErrorVisibilityConverter}}" 
                  Margin="0,0,0,3"/>
 
+      <!--Visibility="{Binding Path=SelectedItem.SpeedErrorMsg, ElementName=MachiningsTreeView,
+                  Converter={StaticResource ErrorVisibilityConverter}}" Margin="0,0,5,0"/>-->
+
+      <!--Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:StringParamV}},
+                                       Path=ParamErrorMsgVisibility,
+                                       Mode=TwoWay,
+                                       UpdateSourceTrigger=PropertyChanged,
+                                       Converter={StaticResource ErrorVisibilityConverter}}" Margin="0,0,5,0"/>-->
+
+
+      <!--<TextBlock x:Name="ParamMsg" Style="{DynamicResource MachiningsToolTextBlock}"/>
+        <EgtWPFLib5:EgtTextBox x:Name="ParamValue" Grid.Column="1" Style="{DynamicResource MachiningsToolTextBox}"
+                                />
+        <TextBlock Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource ValidationErrorTextBlock}"
+                  x:Name="ErrorMsg"
+                  Visibility="{Binding Path=SelectedItem.SpeedErrorMsg, ElementName=MachiningsTreeView,
+                  Converter={StaticResource ErrorVisibilityConverter}}" Margin="0,0,5,0"/>-->
+
    </Grid>
 
 </UserControl>
diff --git a/StringParamWithButtonV.xaml.vb b/StringParamWithButtonV.xaml.vb
index 667f911..497badb 100644
--- a/StringParamWithButtonV.xaml.vb
+++ b/StringParamWithButtonV.xaml.vb
@@ -1,4 +1,7 @@
-Imports System.ComponentModel
+Imports System.Globalization
+Imports System.Windows.Controls.Primitives
+Imports System.ComponentModel
+
 
 Public Class StringParamWithButtonV
    Implements INotifyPropertyChanged
@@ -40,7 +43,19 @@ Public Class StringParamWithButtonV
    End Property
 
    ' ------------------------------------------------------------------- Colore TextBlock -------------------------------------------------------------------
-
+   'Public Shared ReadOnly ForegroundParamTxBlProperty As DependencyProperty =
+   '   DependencyProperty.Register("ForegroundParamTxBl",
+   '                               GetType(Windows.Media.Brush),
+   '                               GetType(StringParamWithButtonV),
+   '                               New PropertyMetadata(Windows.Media.Brushes.Black))
+   'Public Property ForegroundParamTxBl() As Windows.Media.Brush
+   '   Get
+   '      Return DirectCast(GetValue(ForegroundParamTxBlProperty), Windows.Media.Brush)
+   '   End Get
+   '   Set(ByVal value As Windows.Media.Brush)
+   '      SetValue(ForegroundParamTxBlProperty, value)
+   '   End Set
+   'End Property
    Public Shared ReadOnly ForegroundParamBtnTxBlProperty As DependencyProperty = DependencyProperty.RegisterAttached(
                                                                          NameOf(ForegroundParamBtnTxBl),
                                                                          GetType(Windows.Media.Brush),
@@ -64,9 +79,18 @@ Public Class StringParamWithButtonV
          SetValue(ForegroundParamBtnTxBlProperty, value)
       End Set
    End Property
-
    ' ---------------------------------------------------------------------------------------------------------------------------------------------------------
 
+
+   'Private Shared Sub OnParamTxBxChangedCallback(sender As DependencyObject, e As DependencyPropertyChangedEventArgs)
+   '   Dim StringParamV As StringParamV = DirectCast(sender, StringParamV)
+   '   If Not IsNothing(sender) Then
+   '      'StringParamV.ParamValue.Text = CStr(e.NewValue)
+   '      StringParamV.ParamTxBx = CStr(e.NewValue)
+   '      StringParamV.NotifyPropertyChanged("ParamTxBx")
+   '   End If
+   'End Sub
+
    Public Property ParamErrorMsg() As String
       Get
          Return CStr(GetValue(ParamErrorMsgProperty))
@@ -88,6 +112,10 @@ Public Class StringParamWithButtonV
       End Set
    End Property
 
+   'Friend Sub ParamValue_TextChanged(sender As Object, e As TextChangedEventArgs) Handles ParamValue.TextChanged
+   '   ParamTxBx = ParamValue.Text
+   'End Sub
+
    Public Shared ReadOnly ParamVisibilityProperty As DependencyProperty =
          DependencyProperty.Register("ParamVisibility", GetType(Visibility), GetType(StringParamWithButtonV))
 
diff --git a/Themes/Generic.xaml b/Themes/Generic.xaml
index 466a8f6..b21eeaa 100644
--- a/Themes/Generic.xaml
+++ b/Themes/Generic.xaml
@@ -1,7 +1,8 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:EgtWPFLib5"
-                    xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating">
+<ResourceDictionary
+   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+   xmlns:local="clr-namespace:EgtWPFLib5"
+   xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating">
 
    <!--Colori predefiniti-->
    <SolidColorBrush x:Key="EgaltechBlue1" Color="#FF4D84C4" />
@@ -160,8 +161,59 @@
 
 
    <Style BasedOn="{x:Null}" TargetType="{x:Type local:EgtTextBox}">
+      <!--<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"/>
+      <Setter Property="BorderBrush" Value="{StaticResource TextBoxBorder}"/>
+      <Setter Property="BorderThickness" Value="1"/>
+      <Setter Property="Padding" Value="1"/>
+      <Setter Property="AllowDrop" Value="true"/>
+      <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+      <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
+      <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:EgtTextBox}">
+               <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+                  <ScrollViewer x:Name="PART_ContentHost" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Background" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
+                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                  </Trigger>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter Property="BorderBrush" TargetName="Bd" Value="#FF7EB4EA"/>
+                  </Trigger>
+                  <Trigger Property="IsKeyboardFocused" Value="True">
+                     <Setter Property="BorderBrush" TargetName="Bd" Value="#FF569DE5"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>-->
    </Style>
 
+   <!--Style for the EgtMsgBox that is used for basic validation question -->
+   <!--<Style TargetType="{x:Type local:EgtMsgBox}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:EgtMsgBox}">
+               <Grid Name="PART_Grid" >
+                  <TextBlock Name="PART_Title" FontSize="{DynamicResource EgtMsgBox_TitleFontSize}"
+                     VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                  <Image Name="PART_Icon" HorizontalAlignment="left" VerticalAlignment="Top" Height="70" Width="70"/>
+                  <TextBlock Name="PART_Text" FontSize="{DynamicResource EgtMsgBox_TextFontSize}"
+                     VerticalAlignment="Center" HorizontalAlignment="Left" TextWrapping="WrapWithOverflow"/>
+                  <ProgressBar Name="PART_ProgressBar" Grid.Row="2" Minimum="0" Maximum="100"/>
+                  <Button Name="PART_Button1" IsCancel="True"/>
+                  <Button Name="PART_Button2" IsCancel="True"/>
+                  <Button Name="PART_Button3" IsCancel="True"/>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+    </Style>-->
+
    <!--Style per i button della CustomWindow-->
    <SolidColorBrush x:Key="Button.Disabled.Background" Color="#FFF4F4F4"/>
    <SolidColorBrush x:Key="Button.Disabled.Border" Color="#FFADB2B5"/>
@@ -201,7 +253,7 @@
       <Setter Property="FontFamily" Value="Webdings"/>
       <Setter Property="FontSize" Value="13.333" />
       <Setter Property="Foreground" Value="Black" />
-      <Setter Property="Margin" Value="2"/>
+      <Setter Property="Margin" Value="0,2,3,0"/>
       <Style.Triggers>
          <Trigger Property="IsMouseOver" Value="True">
             <Setter Property="Foreground" Value="Gray" />
@@ -409,6 +461,9 @@
                   </Canvas>
                </Border>
                <ControlTemplate.Triggers>
+                  <!--<Trigger Property="IsDefaulted" Value="true">
+                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                  </Trigger>-->
                   <Trigger Property="IsMouseOver" Value="true">
                      <Setter Property="Background" TargetName="border" Value="{StaticResource Button.MouseOver.Background}"/>
                      <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
@@ -455,6 +510,9 @@
                   </Canvas>
                </Border>
                <ControlTemplate.Triggers>
+                  <!--<Trigger Property="IsDefaulted" Value="true">
+                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                  </Trigger>-->
                   <Trigger Property="IsMouseOver" Value="true">
                      <Setter Property="Background" TargetName="border" Value="{StaticResource Button.MouseOver.Background}"/>
                      <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
@@ -609,6 +667,26 @@
          <Setter.Value>
             <ControlTemplate TargetType="{x:Type EgtFloating:EgtFloatingTray}">
                <Grid Background="{TemplateBinding Background}">
+                  <!--Separatore che si colora quando si avvicina il
+                  mouse durante il trascinamento per ancorare il Panel al Tray-->
+                  <!--<Border Name="PART_Border">
+                     <Border.Style>
+                        <Style TargetType="Border">
+                           <Style.Triggers>
+                              <DataTrigger Binding="{Binding Path=(PART_StackPanel)}"
+                                            Value="Horizontal">
+                                 <Setter Property="Height" Value="5"/>
+                                 <Setter Property="Width" Value="Auto"/>
+                              </DataTrigger>
+                              <DataTrigger Binding="{Binding Path=(DockPanel.Dock), RelativeSource={RelativeSource AncestorType=ItemsControl}}"
+                                            Value="Bottom">
+                                 <Setter Property="Height" Value="Auto"/>
+                                 <Setter Property="Width" Value="5"/>
+                              </DataTrigger>
+                           </Style.Triggers>
+                        </Style>
+                     </Border.Style>
+                  </Border>-->
                   <ItemsPresenter/>
                </Grid>
             </ControlTemplate>
@@ -718,6 +796,11 @@
                                     Fill="{StaticResource ScrollBar.Static.Glyph}" Margin="3"
                                     Stretch="Uniform"/>
                            </RepeatButton>
+                           <!--<ScrollContentPresenter x:Name="PART_ScrollContentPresenter"
+                CanContentScroll="{TemplateBinding CanContentScroll}"
+                ContentTemplate="{TemplateBinding ContentTemplate}"
+                CanHorizontallyScroll="False"              Grid.Column="1" 
+                Content="{TemplateBinding Content}"/>-->
                            <ScrollContentPresenter x:Name="PART_ScrollContentPresenter"
                                                    CanContentScroll="{TemplateBinding CanContentScroll}"
                                                    CanHorizontallyScroll="False" CanVerticallyScroll="False"
diff --git a/ToolDbWindow/BeamMillParamPageV.xaml b/ToolDbWindow/BeamMillParamPageV.xaml
index 6ae3dc0..7227218 100644
--- a/ToolDbWindow/BeamMillParamPageV.xaml
+++ b/ToolDbWindow/BeamMillParamPageV.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="BeamMillParamPageV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
 
    <UserControl.Resources>
@@ -17,8 +18,35 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:ToolParamVisibilityConverter x:Key="ToolParamVisibilityConverter"/>
          <EgtWPFLib5:ToolDrawUUIDConverter x:Key="ToolDrawUUIDConverter"/>
          <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Corr">0</sys:Int32>
+         <sys:Int32 x:Key="ExitPar">1</sys:Int32>
+         <sys:Int32 x:Key="Coolant">2</sys:Int32>
+         <sys:Int32 x:Key="CornRad">3</sys:Int32>
+         <sys:Int32 x:Key="Diam">4</sys:Int32>
+         <sys:Int32 x:Key="TotDiam">5</sys:Int32>
+         <sys:Int32 x:Key="Feed">6</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">7</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">8</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">9</sys:Int32>
+         <sys:Int32 x:Key="Len">10</sys:Int32>
+         <sys:Int32 x:Key="TotLen">11</sys:Int32>
+         <sys:Int32 x:Key="MaxMat">12</sys:Int32>
+         <sys:Int32 x:Key="LonOffset">13</sys:Int32>
+         <sys:Int32 x:Key="RadOffset">14</sys:Int32>
+         <sys:Int32 x:Key="Speed">15</sys:Int32>
+         <sys:Int32 x:Key="SideAng">16</sys:Int32>
+         <sys:Int32 x:Key="MaxSpeed">17</sys:Int32>
+         <sys:Int32 x:Key="Thick">18</sys:Int32>
+         <sys:Int32 x:Key="MaxAbsorption">19</sys:Int32>
+         <sys:Int32 x:Key="MinFeed">20</sys:Int32>
+         <sys:Int32 x:Key="Draw">21</sys:Int32>
+         <sys:Int32 x:Key="Head">22</sys:Int32>
+         <sys:Int32 x:Key="NamePar">23</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">24</sys:Int32>
+         <sys:Int32 x:Key="TcPos">25</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
@@ -58,6 +86,9 @@
                   </Grid.RowDefinitions>
 
                   <TextBlock Text="{Binding DrawTxBl}"
+                             Visibility="{Binding Path=Type, 
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}"
                              Style="{DynamicResource MachiningsToolTextBlock}"/>
                   <Grid Grid.Column="1">
                      <Grid.ColumnDefinitions>
@@ -65,7 +96,10 @@
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="Auto"/>
                      </Grid.ColumnDefinitions>
-                     <Border BorderThickness="0.5,1,0.5,0.5" Margin="0,3,0,0" BorderBrush="#FFABAdB3">
+                     <Border BorderThickness="0.5,1,0.5,0.5" Margin="0,3,0,0" BorderBrush="#FFABAdB3"
+                             Visibility="{Binding Path=Type,
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}">
                         <TextBlock Name="DrawTxBx" Grid.Column="0" Margin="3,0,0,0"
                                    VerticalAlignment="Center" Foreground="Gray"
                                    ToolTip="{Binding Path=Draw, UpdateSourceTrigger=PropertyChanged,
@@ -77,10 +111,16 @@
                      </Border>
                      <Button Grid.Column="1" Style="{DynamicResource AutoDrawButtonMargin}" Content="A"
                              Command="{Binding Path=AutoDrawCommand}"
-                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"/>
+                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
+                             Visibility="{Binding Path=Type,
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}"/>
                      <Button Grid.Column="2" Style="{DynamicResource OpenDrawFileButtonMargin}" Content=". . ."
                              Command="{Binding Path=OpenDrawFileCommand}"
-                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"/>
+                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
+                             Visibility="{Binding Path=Type,
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}"/>
                   </Grid>
                   <TextBlock Grid.Row="1" Grid.ColumnSpan="2" Style="{DynamicResource ValidationErrorTextBlock}"
                              Text="{Binding Path=DrawErrorMsg}"
diff --git a/ToolDbWindow/ChiselParamPageV.xaml b/ToolDbWindow/ChiselParamPageV.xaml
index 75aa9d6..2eeadc6 100644
--- a/ToolDbWindow/ChiselParamPageV.xaml
+++ b/ToolDbWindow/ChiselParamPageV.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="ChiselParamPageV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
 
    <UserControl.Resources>
@@ -17,8 +18,35 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:ToolParamVisibilityConverter x:Key="ToolParamVisibilityConverter"/>
          <EgtWPFLib5:ToolDrawUUIDConverter x:Key="ToolDrawUUIDConverter"/>
          <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Corr">0</sys:Int32>
+         <sys:Int32 x:Key="ExitPar">1</sys:Int32>
+         <sys:Int32 x:Key="Coolant">2</sys:Int32>
+         <sys:Int32 x:Key="CornRad">3</sys:Int32>
+         <sys:Int32 x:Key="Diam">4</sys:Int32>
+         <sys:Int32 x:Key="TotDiam">5</sys:Int32>
+         <sys:Int32 x:Key="Feed">6</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">7</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">8</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">9</sys:Int32>
+         <sys:Int32 x:Key="Len">10</sys:Int32>
+         <sys:Int32 x:Key="TotLen">11</sys:Int32>
+         <sys:Int32 x:Key="MaxMat">12</sys:Int32>
+         <sys:Int32 x:Key="LonOffset">13</sys:Int32>
+         <sys:Int32 x:Key="RadOffset">14</sys:Int32>
+         <sys:Int32 x:Key="Speed">15</sys:Int32>
+         <sys:Int32 x:Key="SideAng">16</sys:Int32>
+         <sys:Int32 x:Key="MaxSpeed">17</sys:Int32>
+         <sys:Int32 x:Key="Thick">18</sys:Int32>
+         <sys:Int32 x:Key="MaxAbsorption">19</sys:Int32>
+         <sys:Int32 x:Key="MinFeed">20</sys:Int32>
+         <sys:Int32 x:Key="Draw">21</sys:Int32>
+         <sys:Int32 x:Key="Head">22</sys:Int32>
+         <sys:Int32 x:Key="NamePar">23</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">24</sys:Int32>
+         <sys:Int32 x:Key="TcPos">25</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
@@ -58,6 +86,9 @@
                   </Grid.RowDefinitions>
 
                   <TextBlock Text="{Binding DrawTxBl}"
+                             Visibility="{Binding Path=Type, 
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}"
                              Style="{DynamicResource MachiningsToolTextBlock}"/>
                   <Grid Grid.Column="1">
                      <Grid.ColumnDefinitions>
@@ -65,7 +96,10 @@
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="Auto"/>
                      </Grid.ColumnDefinitions>
-                     <Border BorderThickness="0.5,1,0.5,0.5" Margin="0,3,0,0" BorderBrush="#FFABAdB3">
+                     <Border BorderThickness="0.5,1,0.5,0.5" Margin="0,3,0,0" BorderBrush="#FFABAdB3"
+                             Visibility="{Binding Path=Type,
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}">
                         <TextBlock Name="DrawTxBx" Grid.Column="0" Margin="3,0,0,0"
                                    VerticalAlignment="Center" Foreground="Gray"
                                    ToolTip="{Binding Path=Draw, UpdateSourceTrigger=PropertyChanged,
@@ -77,16 +111,21 @@
                      </Border>
                      <Button Grid.Column="1" Style="{DynamicResource AutoDrawButtonMargin}" Content="A"
                              Command="{Binding Path=AutoDrawCommand}"
-                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"/>
+                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
+                             Visibility="{Binding Path=Type,
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}"/>
                      <Button Grid.Column="2" Style="{DynamicResource OpenDrawFileButtonMargin}" Content=". . ."
                              Command="{Binding Path=OpenDrawFileCommand}"
-                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"/>
+                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
+                             Visibility="{Binding Path=Type,
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}"/>
                   </Grid>
                   <TextBlock Grid.Row="1" Grid.ColumnSpan="2" Style="{DynamicResource ValidationErrorTextBlock}"
                              Text="{Binding Path=DrawErrorMsg}"
                              Visibility="{Binding Path=DrawErrorMsg,
-                                                  Converter={StaticResource ErrorVisibilityConverter}}"
-                             Margin="0,0,5,0"/>
+                                                  Converter={StaticResource ErrorVisibilityConverter}}" Margin="0,0,5,0"/>
                        
                </Grid>                      
             </Grid>
diff --git a/ToolDbWindow/ImportExportToolWindowVM.vb b/ToolDbWindow/ImportExportToolWindowVM.vb
index 7e14df3..694b7b7 100644
--- a/ToolDbWindow/ImportExportToolWindowVM.vb
+++ b/ToolDbWindow/ImportExportToolWindowVM.vb
@@ -69,9 +69,9 @@ Public Class ImportExportToolWindowVM
    Public ReadOnly Property OkMsg As String
       Get
          If WindowMode = WindowModeEnum.IMPORT Then
-            Return EgtMsg(31161)    ' Importa
+            Return EgtMsg(31161)
          Else
-            Return EgtMsg(31162)    ' Esporta
+            Return EgtMsg(31162)
          End If
       End Get
    End Property
@@ -97,9 +97,9 @@ Public Class ImportExportToolWindowVM
 
 #Region "METHODS"
 
-   Private Sub EnableOkBtn()
+   Private sub EnableOkBtn()
       NotifyPropertyChanged(NameOf(IsEnabledOkBtn))
-   End Sub
+   End sub
 
 #End Region     ' Methods
 
@@ -145,8 +145,8 @@ Public Class ImportExportToolWindowVM
             EgtTdbImport(ImportFilePath, vsImportToolName, vsFinalName, m_vsImported)
             ' Report
             Dim ImportedToolList As New List(Of String)(vsImported)
-            'MessageBox.Show(EgtMsg(31166) & " " & vbCrLf & String.Join(vbCrLf, ImportedToolList.ToArray()), "", MessageBoxButton.OK)
-            EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31166) & " " & vbCrLf & String.Join(vbCrLf, ImportedToolList.ToArray()), "", MessageBoxButton.OK)   ' I seguenti Utensili sono stati importati correttamente:
+            MessageBox.Show(EgtMsg(31166) & " " & vbCrLf &
+                            String.Join(vbCrLf, ImportedToolList.ToArray()), "", MessageBoxButton.OK)
 
          Case WindowModeEnum.EXPORT
             ' recupero gli utensili checkati
@@ -166,12 +166,6 @@ Public Class ImportExportToolWindowVM
                .Filter = "File data (*.data)|*.data|Tutti i file (*.*)|*.*",
                .FileName = String.Empty
             }
-            'Dim SaveFileDlg As New EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
-            '   .Title = EgtMsg(31162) & " " & EgtMsg(31163),      ' Esporta Utensili
-            '   .Filter = "File data (*.data)|*.data|Tutti i file (*.*)|*.*",
-            '   .FileName = String.Empty
-            '}
-
             If SaveFileDlg.ShowDialog() <> System.Windows.Forms.DialogResult.OK Then Return
             Dim sFilePath As String = String.Empty
             sFilePath = SaveFileDlg.FileName
@@ -275,20 +269,18 @@ Public Class ImpExpToolItem
          ' se esiste gia' chiedo se sovrascriverlo
          If value Then
             If m_AlreadyExist Then
-               'Select Case System.Windows.MessageBox.Show(EgtMsg(31164), "", MessageBoxButton.YesNoCancel)
-               Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31164), "", MessageBoxButton.YesNoCancel)  ' L'utensile esiste già, sovrascriverlo?
+               Select Case System.Windows.MessageBox.Show(EgtMsg(31164), "", MessageBoxButton.YesNoCancel)
                   Case MessageBoxResult.Yes
                      m_ChangeName = False
                      m_Active = True
                   Case MessageBoxResult.No
-                     'System.Windows.MessageBox.Show(EgtMsg(31165), "", MessageBoxButton.OK)
-                     EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31165), "", MessageBoxButton.OK)  ' L'utensile verrà importato col nome seguito da "_imp"
+                     System.Windows.MessageBox.Show(EgtMsg(31165), "", MessageBoxButton.OK)
                      m_ChangeName = True
                      m_Active = True
                   Case Else
                      m_Active = False
                End Select
-               NotifyPropertyChanged(NameOf(Active))
+               NotifyPropertyChanged("Active")
             Else
                m_Active = True
             End If
@@ -296,7 +288,7 @@ Public Class ImpExpToolItem
             m_ChangeName = False
             m_Active = False
          End If
-         If Not IsNothing(m_delEnableOkBtn) Then m_delEnableOkBtn()
+         If Not IsNothing(m_delEnableOkBtn) Then m_delEnableOkBtn
       End Set
    End Property
 
@@ -316,7 +308,7 @@ Public Class ImpExpToolItem
       End Get
       Set(value As Boolean)
          m_ChangeName = value
-         NotifyPropertyChanged(NameOf(Name))
+         NotifyPropertyChanged("Name")
       End Set
    End Property
 
diff --git a/ToolDbWindow/MortiseParamPageV.xaml b/ToolDbWindow/MortiseParamPageV.xaml
index 5a9a4b8..1ae3f9b 100644
--- a/ToolDbWindow/MortiseParamPageV.xaml
+++ b/ToolDbWindow/MortiseParamPageV.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="MortiseParamPageV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
 
    <UserControl.Resources>
@@ -17,8 +18,36 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:ToolParamVisibilityConverter x:Key="ToolParamVisibilityConverter"/>
          <EgtWPFLib5:ToolDrawUUIDConverter x:Key="ToolDrawUUIDConverter"/>
          <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Corr">0</sys:Int32>
+         <sys:Int32 x:Key="ExitPar">1</sys:Int32>
+         <sys:Int32 x:Key="Coolant">2</sys:Int32>
+         <sys:Int32 x:Key="CornRad">3</sys:Int32>
+         <sys:Int32 x:Key="Diam">4</sys:Int32>
+         <sys:Int32 x:Key="TotDiam">5</sys:Int32>
+         <sys:Int32 x:Key="Feed">6</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">7</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">8</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">9</sys:Int32>
+         <sys:Int32 x:Key="Len">10</sys:Int32>
+         <sys:Int32 x:Key="TotLen">11</sys:Int32>
+         <sys:Int32 x:Key="MaxMat">12</sys:Int32>
+         <sys:Int32 x:Key="LonOffset">13</sys:Int32>
+         <sys:Int32 x:Key="RadOffset">14</sys:Int32>
+         <sys:Int32 x:Key="Speed">15</sys:Int32>
+         <sys:Int32 x:Key="SideAng">16</sys:Int32>
+         <sys:Int32 x:Key="MaxSpeed">17</sys:Int32>
+         <sys:Int32 x:Key="Thick">18</sys:Int32>
+         <sys:Int32 x:Key="MaxAbsorption">19</sys:Int32>
+         <sys:Int32 x:Key="MinFeed">20</sys:Int32>
+         <sys:Int32 x:Key="Draw">21</sys:Int32>
+         <sys:Int32 x:Key="Head">22</sys:Int32>
+         <sys:Int32 x:Key="NamePar">23</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">24</sys:Int32>
+         <sys:Int32 x:Key="TcPos">25</sys:Int32>
+         <sys:Int32 x:Key="Dist">26</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
@@ -58,6 +87,9 @@
                   </Grid.RowDefinitions>
 
                   <TextBlock Text="{Binding DrawTxBl}"
+                             Visibility="{Binding Path=Type, 
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}"
                              Style="{DynamicResource MachiningsToolTextBlock}"/>
                   <Grid Grid.Column="1">
                      <Grid.ColumnDefinitions>
@@ -65,7 +97,10 @@
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="Auto"/>
                      </Grid.ColumnDefinitions>
-                     <Border BorderThickness="0.5,1,0.5,0.5" Margin="0,3,0,0" BorderBrush="#FFABAdB3">
+                     <Border BorderThickness="0.5,1,0.5,0.5" Margin="0,3,0,0" BorderBrush="#FFABAdB3"
+                             Visibility="{Binding Path=Type,
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}">
                         <TextBlock Name="DrawTxBx" Grid.Column="0" Margin="3,0,0,0"
                                    VerticalAlignment="Center" Foreground="Gray"
                                    ToolTip="{Binding Path=Draw, UpdateSourceTrigger=PropertyChanged,
@@ -77,16 +112,21 @@
                      </Border>
                      <Button Grid.Column="1" Style="{DynamicResource AutoDrawButtonMargin}" Content="A"
                              Command="{Binding Path=AutoDrawCommand}"
-                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"/>
+                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
+                             Visibility="{Binding Path=Type,
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}"/>
                      <Button Grid.Column="2" Style="{DynamicResource OpenDrawFileButtonMargin}" Content=". . ."
                              Command="{Binding Path=OpenDrawFileCommand}"
-                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"/>
+                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
+                             Visibility="{Binding Path=Type,
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}"/>
                   </Grid>
                   <TextBlock Grid.Row="1" Grid.ColumnSpan="2" Style="{DynamicResource ValidationErrorTextBlock}"
                              Text="{Binding Path=DrawErrorMsg}"
                              Visibility="{Binding Path=DrawErrorMsg,
-                                                  Converter={StaticResource ErrorVisibilityConverter}}"
-                             Margin="0,0,5,0"/>
+                                                  Converter={StaticResource ErrorVisibilityConverter}}" Margin="0,0,5,0"/>
 
                </Grid>
             </Grid>
@@ -190,8 +230,7 @@
                                               ParamTxBx="{Binding Path=TotLen,
                                                                   UpdateSourceTrigger=PropertyChanged,
                                                                   ValidatesOnDataErrors=True}" 
-                                              ParamErrorMsg="{Binding Path=TotLenErrorMsg}"
-                                              ParamErrorMsgVisibility="Collapsed"/>
+                                              ParamErrorMsg="{Binding Path=TotLenErrorMsg}" />
 
                      <EgtWPFLib5:StringParamV ParamTxBl="{Binding LenTxBl}" 
                                               ParamTxBx="{Binding Path=Len,
@@ -314,7 +353,7 @@
                                              ParamCmBxList="{Binding Path=TcPosList,
                                                                      UpdateSourceTrigger=PropertyChanged,
                                                                      ValidatesOnDataErrors=True}"
-                                             ParamCmBxSelIndex="{Binding Path=SelectedTcPos}"/>
+                                             ParamCmBxSelIndex="{Binding Path=SelectedTcPos}" />
                   </UniformGrid>
                </Grid>
             </GroupBox>
diff --git a/ToolDbWindow/StoneDrillParamPageV.xaml b/ToolDbWindow/StoneDrillParamPageV.xaml
index 71f9a18..6b12fcd 100644
--- a/ToolDbWindow/StoneDrillParamPageV.xaml
+++ b/ToolDbWindow/StoneDrillParamPageV.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="StoneDrillParamPageV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5"
              x:Name="PIPPO">
 
@@ -95,8 +96,35 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:ToolParamVisibilityConverter x:Key="ToolParamVisibilityConverter"/>
          <EgtWPFLib5:ToolDrawUUIDConverter x:Key="ToolDrawUUIDConverter"/>
          <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Corr">0</sys:Int32>
+         <sys:Int32 x:Key="ExitPar">1</sys:Int32>
+         <sys:Int32 x:Key="Coolant">2</sys:Int32>
+         <sys:Int32 x:Key="CornRad">3</sys:Int32>
+         <sys:Int32 x:Key="Diam">4</sys:Int32>
+         <sys:Int32 x:Key="TotDiam">5</sys:Int32>
+         <sys:Int32 x:Key="Feed">6</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">7</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">8</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">9</sys:Int32>
+         <sys:Int32 x:Key="Len">10</sys:Int32>
+         <sys:Int32 x:Key="TotLen">11</sys:Int32>
+         <sys:Int32 x:Key="MaxMat">12</sys:Int32>
+         <sys:Int32 x:Key="LonOffset">13</sys:Int32>
+         <sys:Int32 x:Key="RadOffset">14</sys:Int32>
+         <sys:Int32 x:Key="Speed">15</sys:Int32>
+         <sys:Int32 x:Key="SideAng">16</sys:Int32>
+         <sys:Int32 x:Key="MaxSpeed">17</sys:Int32>
+         <sys:Int32 x:Key="Thick">18</sys:Int32>
+         <sys:Int32 x:Key="MaxAbsorption">19</sys:Int32>
+         <sys:Int32 x:Key="MinFeed">20</sys:Int32>
+         <sys:Int32 x:Key="Draw">21</sys:Int32>
+         <sys:Int32 x:Key="Head">22</sys:Int32>
+         <sys:Int32 x:Key="NamePar">23</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">24</sys:Int32>
+         <sys:Int32 x:Key="TcPos">25</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
@@ -137,6 +165,9 @@
 
                   <TextBlock Text="{Binding DrawTxBl}"
                              Foreground="{Binding ElementName=PIPPO, Path=MyForegroundGrbColor}"
+                             Visibility="{Binding Path=Type, 
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}"
                              Style="{DynamicResource MachiningsToolTextBlock}"/>
                   <Grid Grid.Column="1">
                      <Grid.ColumnDefinitions>
@@ -144,7 +175,10 @@
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="Auto"/>
                      </Grid.ColumnDefinitions>
-                     <Border BorderThickness="0.5,1,0.5,0.5" Margin="0,3,0,0" BorderBrush="#FFABAdB3">
+                     <Border BorderThickness="0.5,1,0.5,0.5" Margin="0,3,0,0" BorderBrush="#FFABAdB3"
+                             Visibility="{Binding Path=Type,
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}">
                         <TextBlock Name="DrawTxBx" Grid.Column="0" Margin="3,0,0,0"
                                    VerticalAlignment="Center" Foreground="Gray"
                                    ToolTip="{Binding Path=Draw, UpdateSourceTrigger=PropertyChanged,
@@ -156,16 +190,21 @@
                      </Border>
                      <Button Grid.Column="1" Style="{DynamicResource Manage_ButtonStyle}" Content="A"
                              Command="{Binding Path=AutoDrawCommand}"
-                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"/>
+                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
+                             Visibility="{Binding Path=Type,
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}"/>
                      <Button Grid.Column="2" Style="{DynamicResource Manage_ButtonStyle}" Content=". . ."
                              Command="{Binding Path=OpenDrawFileCommand}"
-                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"/>
+                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
+                             Visibility="{Binding Path=Type,
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}"/>
                   </Grid>
                   <TextBlock Grid.Row="1" Grid.ColumnSpan="2" Style="{DynamicResource ValidationErrorTextBlock}"
                              Text="{Binding Path=DrawErrorMsg}"
                              Visibility="{Binding Path=DrawErrorMsg,
-                                                  Converter={StaticResource ErrorVisibilityConverter}}"
-                             Margin="0,0,5,0"/>
+                                                  Converter={StaticResource ErrorVisibilityConverter}}" Margin="0,0,5,0"/>
 
                </Grid>
             </Grid>
diff --git a/ToolDbWindow/StoneMillParamPageV.xaml b/ToolDbWindow/StoneMillParamPageV.xaml
index d3893dd..1655ef3 100644
--- a/ToolDbWindow/StoneMillParamPageV.xaml
+++ b/ToolDbWindow/StoneMillParamPageV.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="StoneMillParamPageV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5"
              x:Name="PIPPO">
 
@@ -129,8 +130,35 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:ToolParamVisibilityConverter x:Key="ToolParamVisibilityConverter"/>
          <EgtWPFLib5:ToolDrawUUIDConverter x:Key="ToolDrawUUIDConverter"/>
          <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Corr">0</sys:Int32>
+         <sys:Int32 x:Key="ExitPar">1</sys:Int32>
+         <sys:Int32 x:Key="Coolant">2</sys:Int32>
+         <sys:Int32 x:Key="CornRad">3</sys:Int32>
+         <sys:Int32 x:Key="Diam">4</sys:Int32>
+         <sys:Int32 x:Key="TotDiam">5</sys:Int32>
+         <sys:Int32 x:Key="Feed">6</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">7</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">8</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">9</sys:Int32>
+         <sys:Int32 x:Key="Len">10</sys:Int32>
+         <sys:Int32 x:Key="TotLen">11</sys:Int32>
+         <sys:Int32 x:Key="MaxMat">12</sys:Int32>
+         <sys:Int32 x:Key="LonOffset">13</sys:Int32>
+         <sys:Int32 x:Key="RadOffset">14</sys:Int32>
+         <sys:Int32 x:Key="Speed">15</sys:Int32>
+         <sys:Int32 x:Key="SideAng">16</sys:Int32>
+         <sys:Int32 x:Key="MaxSpeed">17</sys:Int32>
+         <sys:Int32 x:Key="Thick">18</sys:Int32>
+         <sys:Int32 x:Key="MaxAbsorption">19</sys:Int32>
+         <sys:Int32 x:Key="MinFeed">20</sys:Int32>
+         <sys:Int32 x:Key="Draw">21</sys:Int32>
+         <sys:Int32 x:Key="Head">22</sys:Int32>
+         <sys:Int32 x:Key="NamePar">23</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">24</sys:Int32>
+         <sys:Int32 x:Key="TcPos">25</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
@@ -171,6 +199,9 @@
 
                   <TextBlock Text="{Binding DrawTxBl}"
                              Foreground="{Binding ElementName=PIPPO, Path=MyForegroundGrbColor}"
+                             Visibility="{Binding Path=Type, 
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}"
                              Style="{DynamicResource MachiningsToolTextBlock}"/>
                   <Grid Grid.Column="1">
                      <Grid.ColumnDefinitions>
@@ -178,7 +209,10 @@
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="Auto"/>
                      </Grid.ColumnDefinitions>
-                     <Border BorderThickness="0.5,1,0.5,0.5" Margin="0,3,0,0" BorderBrush="#FFABAdB3">
+                     <Border BorderThickness="0.5,1,0.5,0.5" Margin="0,3,0,0" BorderBrush="#FFABAdB3"
+                             Visibility="{Binding Path=Type,
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}">
                         <TextBlock Name="DrawTxBx" Grid.Column="0" Margin="3,0,0,0"
                                    VerticalAlignment="Center" Foreground="Gray"
                                    ToolTip="{Binding Path=Draw, UpdateSourceTrigger=PropertyChanged,
@@ -190,16 +224,21 @@
                      </Border>
                      <Button Grid.Column="1" Style="{DynamicResource Manage_ButtonStyle}" Content="A"
                              Command="{Binding Path=AutoDrawCommand}"
-                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"/>
+                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
+                             Visibility="{Binding Path=Type,
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}"/>
                      <Button Grid.Column="2" Style="{DynamicResource Manage_ButtonStyle}" Content=". . ."
                              Command="{Binding Path=OpenDrawFileCommand}"
-                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"/>
+                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
+                             Visibility="{Binding Path=Type,
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}"/>
                   </Grid>
                   <TextBlock Grid.Row="1" Grid.ColumnSpan="2" Style="{DynamicResource ValidationErrorTextBlock}"
                              Text="{Binding Path=DrawErrorMsg}"
                              Visibility="{Binding Path=DrawErrorMsg,
-                                                  Converter={StaticResource ErrorVisibilityConverter}}"
-                             Margin="0,0,5,0"/>
+                                                  Converter={StaticResource ErrorVisibilityConverter}}" Margin="0,0,5,0"/>
 
                </Grid>
             </Grid>
diff --git a/ToolDbWindow/StoneSawParamPageV.xaml b/ToolDbWindow/StoneSawParamPageV.xaml
index 774bcb7..930408f 100644
--- a/ToolDbWindow/StoneSawParamPageV.xaml
+++ b/ToolDbWindow/StoneSawParamPageV.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="StoneSawParamPageV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5"
              x:Name="PIPPO">
 
@@ -129,8 +130,35 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:ToolParamVisibilityConverter x:Key="ToolParamVisibilityConverter"/>
          <EgtWPFLib5:ToolDrawUUIDConverter x:Key="ToolDrawUUIDConverter"/>
          <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Corr">0</sys:Int32>
+         <sys:Int32 x:Key="ExitPar">1</sys:Int32>
+         <sys:Int32 x:Key="Coolant">2</sys:Int32>
+         <sys:Int32 x:Key="CornRad">3</sys:Int32>
+         <sys:Int32 x:Key="Diam">4</sys:Int32>
+         <sys:Int32 x:Key="TotDiam">5</sys:Int32>
+         <sys:Int32 x:Key="Feed">6</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">7</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">8</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">9</sys:Int32>
+         <sys:Int32 x:Key="Len">10</sys:Int32>
+         <sys:Int32 x:Key="TotLen">11</sys:Int32>
+         <sys:Int32 x:Key="MaxMat">12</sys:Int32>
+         <sys:Int32 x:Key="LonOffset">13</sys:Int32>
+         <sys:Int32 x:Key="RadOffset">14</sys:Int32>
+         <sys:Int32 x:Key="Speed">15</sys:Int32>
+         <sys:Int32 x:Key="SideAng">16</sys:Int32>
+         <sys:Int32 x:Key="MaxSpeed">17</sys:Int32>
+         <sys:Int32 x:Key="Thick">18</sys:Int32>
+         <sys:Int32 x:Key="MaxAbsorption">19</sys:Int32>
+         <sys:Int32 x:Key="MinFeed">20</sys:Int32>
+         <sys:Int32 x:Key="Draw">21</sys:Int32>
+         <sys:Int32 x:Key="Head">22</sys:Int32>
+         <sys:Int32 x:Key="NamePar">23</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">24</sys:Int32>
+         <sys:Int32 x:Key="TcPos">25</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
@@ -171,6 +199,9 @@
 
                   <TextBlock Text="{Binding DrawTxBl}"
                              Foreground="{Binding ElementName=PIPPO, Path=MyForegroundGrbColor}"
+                             Visibility="{Binding Path=Type, 
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}"
                              Style="{DynamicResource MachiningsToolTextBlock}"/>
                   <Grid Grid.Column="1">
                      <Grid.ColumnDefinitions>
@@ -178,7 +209,10 @@
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="Auto"/>
                      </Grid.ColumnDefinitions>
-                     <Border BorderThickness="0.5,1,0.5,0.5" Margin="0,3,0,0" BorderBrush="#FFABAdB3">
+                     <Border BorderThickness="0.5,1,0.5,0.5" Margin="0,3,0,0" BorderBrush="#FFABAdB3"
+                             Visibility="{Binding Path=Type,
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}">
                         <TextBlock Name="DrawTxBx" Grid.Column="0" Margin="3,0,0,0"
                                    VerticalAlignment="Center" Foreground="Gray"
                                    ToolTip="{Binding Path=Draw, UpdateSourceTrigger=PropertyChanged,
@@ -190,16 +224,21 @@
                      </Border>
                      <Button Grid.Column="1" Style="{DynamicResource Manage_ButtonStyle}" Content="A"
                              Command="{Binding Path=AutoDrawCommand}"
-                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"/>
+                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
+                             Visibility="{Binding Path=Type,
+                                          Converter={StaticResource ToolParamVisibilityConverter},
+                                          ConverterParameter={StaticResource Draw}}"/>
                      <Button Grid.Column="2" Style="{DynamicResource Manage_ButtonStyle}" Content=". . ."
                              Command="{Binding Path=OpenDrawFileCommand}"
-                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"/>
+                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
+                             Visibility="{Binding Path=Type,
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}"/>
                   </Grid>
                   <TextBlock Grid.Row="1" Grid.ColumnSpan="2" Style="{DynamicResource ValidationErrorTextBlock}"
                              Text="{Binding Path=DrawErrorMsg}"
                              Visibility="{Binding Path=DrawErrorMsg,
-                                                  Converter={StaticResource ErrorVisibilityConverter}}"
-                             Margin="0,0,5,0"/>
+                                                  Converter={StaticResource ErrorVisibilityConverter}}" Margin="0,0,5,0"/>
 
                </Grid>
             </Grid>
diff --git a/ToolDbWindow/ToolDbWindowV.xaml b/ToolDbWindow/ToolDbWindowV.xaml
index 7575738..8cd42cb 100644
--- a/ToolDbWindow/ToolDbWindowV.xaml
+++ b/ToolDbWindow/ToolDbWindowV.xaml
@@ -15,8 +15,35 @@
    </EgtWPFLib5:EgtCustomWindow.InputBindings>
 
    <EgtWPFLib5:EgtCustomWindow.Resources>
+      <EgtWPFLib5:ToolParamVisibilityConverter x:Key="ToolParamVisibilityConverter"/>
       <EgtWPFLib5:ToolDrawUUIDConverter x:Key="ToolDrawUUIDConverter"/>
       <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+      <sys:Int32 x:Key="Corr">0</sys:Int32>
+      <sys:Int32 x:Key="ExitPar">1</sys:Int32>
+      <sys:Int32 x:Key="Coolant">2</sys:Int32>
+      <sys:Int32 x:Key="CornRad">3</sys:Int32>
+      <sys:Int32 x:Key="Diam">4</sys:Int32>
+      <sys:Int32 x:Key="TotDiam">5</sys:Int32>
+      <sys:Int32 x:Key="Feed">6</sys:Int32>
+      <sys:Int32 x:Key="EndFeed">7</sys:Int32>
+      <sys:Int32 x:Key="StartFeed">8</sys:Int32>
+      <sys:Int32 x:Key="TipFeed">9</sys:Int32>
+      <sys:Int32 x:Key="Len">10</sys:Int32>
+      <sys:Int32 x:Key="TotLen">11</sys:Int32>
+      <sys:Int32 x:Key="MaxMat">12</sys:Int32>
+      <sys:Int32 x:Key="LonOffset">13</sys:Int32>
+      <sys:Int32 x:Key="RadOffset">14</sys:Int32>
+      <sys:Int32 x:Key="Speed">15</sys:Int32>
+      <sys:Int32 x:Key="SideAng">16</sys:Int32>
+      <sys:Int32 x:Key="MaxSpeed">17</sys:Int32>
+      <sys:Int32 x:Key="Thick">18</sys:Int32>
+      <sys:Int32 x:Key="MaxAbsorption">19</sys:Int32>
+      <sys:Int32 x:Key="MinFeed">20</sys:Int32>
+      <sys:Int32 x:Key="Draw">21</sys:Int32>
+      <sys:Int32 x:Key="Head">22</sys:Int32>
+      <sys:Int32 x:Key="NamePar">23</sys:Int32>
+      <sys:Int32 x:Key="UserNotes">24</sys:Int32>
+      <sys:Int32 x:Key="TcPos">25</sys:Int32>
    </EgtWPFLib5:EgtCustomWindow.Resources>
 
    <Grid>
diff --git a/ToolDbWindow/ToolDbWindowVM.vb b/ToolDbWindow/ToolDbWindowVM.vb
index 92f9c16..8647267 100644
--- a/ToolDbWindow/ToolDbWindowVM.vb
+++ b/ToolDbWindow/ToolDbWindowVM.vb
@@ -1,6 +1,9 @@
 Imports System.Windows.Forms.Integration
 Imports System.Collections.ObjectModel
+Imports System.Reflection
+Imports System.IO
 Imports EgtUILib
+Imports EgtWPFLib5
 
 Public Class ToolDbWindowVM
    Inherits VMBase
@@ -447,7 +450,7 @@ Public Class ToolDbWindowVM
    Private m_Title As String
    Public ReadOnly Property Title As String
       Get
-         Return EgtMsg(5003)     ' Db Utensili
+         Return EgtMsg(MSG_MAINWINDOW + 3)
       End Get
    End Property
 
@@ -580,7 +583,7 @@ Public Class ToolDbWindowVM
                   'Imposto stile groupbox
                   StoneDrillToolParamPageV.MyBorderGrbThickness = m_MyBorderGrbThickness
                   StoneDrillToolParamPageV.MyForegroundGrbColor = m_MyForegroundGrbColor
-                  ' Imposto il colore delle TextBlock (definito nel programma chiamante)
+                  ' Imposto il colore delle TextBlock (definito nel programma chimamante)
                   StoneDrillToolParamPageV.BorderBrushIsMouseOver = m_BorderBrushIsMouseOver
                   StoneDrillToolParamPageV.GeneralBorderBrush = m_GeneralBorderBrush
                   StoneDrillToolParamPageV.BorderBrushIsFocused = m_BorderBrushIsFocused
@@ -870,6 +873,7 @@ Public Class ToolDbWindowVM
             m_ToolDbSceneContext = m_ToolScene.GetCtx()
             ' inibisco selezione diretta da Scene
             m_ToolScene.SetStatusNull()
+            'OnPropertyChanged("SelectedMachine")
             m_bfirst = False
          End If
          Return SceneHost
@@ -908,199 +912,199 @@ Public Class ToolDbWindowVM
    'Definizione dei messaggi della pagina
    Public ReadOnly Property NewMsg As String
       Get
-         Return EgtMsg(31701)    ' Nuovo
+         Return EgtMsg(31701)
       End Get
    End Property
 
    Public ReadOnly Property SaveMsg As String
       Get
-         Return EgtMsg(31702)    ' Salva
+         Return EgtMsg(31702)
       End Get
    End Property
 
    Public ReadOnly Property RemoveMsg As String
       Get
-         Return EgtMsg(31703)    ' Rimuovi
+         Return EgtMsg(31703)
       End Get
    End Property
 
    Public ReadOnly Property ImportMsg As String
       Get
-         Return EgtMsg(31161)    ' Importa
+         Return EgtMsg(31161)
       End Get
    End Property
 
    Public ReadOnly Property ExportMsg As String
       Get
-         Return EgtMsg(31162)    ' Esporta
+         Return EgtMsg(31162)
       End Get
    End Property
 
    Public ReadOnly Property ResetMsg As String
       Get
-         Return EgtMsg(31167)    ' Reset
+         Return EgtMsg(31167)
       End Get
    End Property
 
    Public ReadOnly Property CorrTxBl As String
       Get
-         Return EgtMsg(31051)    ' Correttore
+         Return EgtMsg(MSG_TOOLDB + 51)
       End Get
    End Property
 
    Public ReadOnly Property ExitParTxBl As String
       Get
-         Return EgtMsg(31052)    ' Uscita
+         Return EgtMsg(MSG_TOOLDB + 52)
       End Get
    End Property
 
    Public ReadOnly Property TypeTxBl As String
       Get
-         Return EgtMsg(31053)    ' Tipo
+         Return EgtMsg(MSG_TOOLDB + 53)
       End Get
    End Property
 
    Public ReadOnly Property CoolantTxBl As String
       Get
-         Return EgtMsg(31054)    ' Refrigerante
+         Return EgtMsg(MSG_TOOLDB + 54)
       End Get
    End Property
 
    Public ReadOnly Property CornRadTxBl As String
       Get
-         Return EgtMsg(31055)    ' Raggio Corner
+         Return EgtMsg(MSG_TOOLDB + 55)
       End Get
    End Property
 
    Public ReadOnly Property DiamTxBl As String
       Get
-         Return EgtMsg(31056)    ' Diametro
+         Return EgtMsg(MSG_TOOLDB + 56)
       End Get
    End Property
 
    Public ReadOnly Property TotDiamTxBl As String
       Get
-         Return EgtMsg(31057)    ' Diametro Totale
+         Return EgtMsg(MSG_TOOLDB + 57)
       End Get
    End Property
 
    Public ReadOnly Property FeedTxBl As String
       Get
-         Return EgtMsg(31058)    ' Avanzamento
+         Return EgtMsg(MSG_TOOLDB + 58)
       End Get
    End Property
 
    Public ReadOnly Property EndFeedTxBl As String
       Get
-         Return EgtMsg(31059)    ' Avanzamento Finale
+         Return EgtMsg(MSG_TOOLDB + 59)
       End Get
    End Property
 
    Public ReadOnly Property StartFeedTxBl As String
       Get
-         Return EgtMsg(31060)    ' Avanzamento Iniziale
+         Return EgtMsg(MSG_TOOLDB + 60)
       End Get
    End Property
 
    Public ReadOnly Property LenTxBl As String
       Get
-         Return EgtMsg(31062)    ' Lunghezza
+         Return EgtMsg(MSG_TOOLDB + 62)
       End Get
    End Property
 
    Public ReadOnly Property TotLenTxBl As String
       Get
-         Return EgtMsg(31063)    ' Lunghezza Totale
+         Return EgtMsg(MSG_TOOLDB + 63)
       End Get
    End Property
 
    Public ReadOnly Property MaxMatTxBl As String
       Get
-         Return EgtMsg(31064)    ' Massimo Materiale
+         Return EgtMsg(MSG_TOOLDB + 64)
       End Get
    End Property
 
    Public ReadOnly Property LonOffsetTxBl As String
       Get
-         Return EgtMsg(31065)    ' Offset Longitudinale
+         Return EgtMsg(MSG_TOOLDB + 65)
       End Get
    End Property
 
    Public ReadOnly Property RadOffsetTxBl As String
       Get
-         Return EgtMsg(31066)    ' Offset Radiale
+         Return EgtMsg(MSG_TOOLDB + 66)
       End Get
    End Property
 
    Public ReadOnly Property SpeedTxBl As String
       Get
-         Return EgtMsg(31067)    ' Rotazione
+         Return EgtMsg(MSG_TOOLDB + 67)
       End Get
    End Property
 
    Public ReadOnly Property SideAngTxBl As String
       Get
-         Return EgtMsg(31068)    ' Angolo di Lato
+         Return EgtMsg(MSG_TOOLDB + 68)
       End Get
    End Property
 
    Public ReadOnly Property MaxSpeedTxBl As String
       Get
-         Return EgtMsg(31069)    ' Rotazione Massima
+         Return EgtMsg(MSG_TOOLDB + 69)
       End Get
    End Property
 
    Public ReadOnly Property ThickTxBl As String
       Get
-         Return EgtMsg(31070)    ' Spessore
+         Return EgtMsg(MSG_TOOLDB + 70)
       End Get
    End Property
 
    Public ReadOnly Property StemDiamTxBl As String
       Get
-         Return EgtMsg(31081)    ' Diametro del Gambo
+         Return EgtMsg(MSG_TOOLDB + 81)
       End Get
    End Property
 
    Public ReadOnly Property MaxAbsorptionTxBl As String
       Get
-         Return EgtMsg(31071)    ' Assorbimento Massimo
+         Return EgtMsg(MSG_TOOLDB + 71)
       End Get
    End Property
 
    Public ReadOnly Property MinFeedTxBl As String
       Get
-         Return EgtMsg(31072)    ' Avanzamento Minimo
+         Return EgtMsg(MSG_TOOLDB + 72)
       End Get
    End Property
 
    Public ReadOnly Property DrawTxBl As String
       Get
-         Return EgtMsg(31073)    ' Disegno
+         Return EgtMsg(MSG_TOOLDB + 73)
       End Get
    End Property
 
    Public ReadOnly Property HeadTxBl As String
       Get
-         Return EgtMsg(31074)    ' Testa
+         Return EgtMsg(MSG_TOOLDB + 74)
       End Get
    End Property
 
    Public ReadOnly Property NameParTxBl As String
       Get
-         Return EgtMsg(31075)    ' Nome
+         Return EgtMsg(MSG_TOOLDB + 75)
       End Get
    End Property
 
    Public ReadOnly Property UserNotesTxBl As String
       Get
-         Return EgtMsg(31076)    ' Note
+         Return EgtMsg(MSG_TOOLDB + 76)
       End Get
    End Property
 
    Public ReadOnly Property TcPosTxBl As String
       Get
-         Return EgtMsg(31077)    ' Posiz. Cambio Utensile
+         Return EgtMsg(MSG_TOOLDB + 77)
       End Get
    End Property
 
@@ -1132,8 +1136,7 @@ Public Class ToolDbWindowVM
          Case Else
             ' Se il materiale spcificato nel file INI della macchina non corrisponde ai 3 sopracitati viene emesso un messaggio di errore 
             m_MatType = Nothing
-            'MsgBox(EgtMsg(31409), MsgBoxStyle.Exclamation, EgtMsg(31551))
-            EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31409), EgtMsg(31551), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) ' Materiale della macchina non riconosciuto Errore
+            MsgBox(EgtMsg(31409), MsgBoxStyle.Exclamation, EgtMsg(31551))
             Exit Sub
       End Select
 
@@ -1189,8 +1192,7 @@ Public Class ToolDbWindowVM
             ToolTreeViewItem.m_OrigHeadList.Add(New HeadItem(sHeadList(HeadIndex), sHTextMsg))
          Next
       Else
-         'MessageBox.Show("Impossible loading Head list from machine!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
-         EgtMessageBoxV.Show(Application.Current.MainWindow, "Impossible loading Head list from machine!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+         MessageBox.Show("Impossible loading Head list from machine!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
          EgtOutLog("Error: Impossible loading Head list from machine!")
       End If
 
@@ -1214,17 +1216,27 @@ Public Class ToolDbWindowVM
       End If
 
       If Not bScriptFileExec Then
-         'MessageBox.Show(EgtMsg(MSG_TOOLDBERRORS + 25), EgtMsg(MSG_TOOLDBERRORS + 26), MessageBoxButton.OK, MessageBoxImage.Error)
-         EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31125), EgtMsg(31126), MessageBoxButton.OK, MessageBoxImage.Error) ' File di configurazione attrezzaggio non trovato! - Errore
+         MessageBox.Show(EgtMsg(MSG_TOOLDBERRORS + 25), EgtMsg(MSG_TOOLDBERRORS + 26), MessageBoxButton.OK, MessageBoxImage.Error)
          EgtOutLog("Error: SetUp configuration file not found!")
       End If
 
       ' leggo da ini se parametro Active è attivo
       m_Active_Visibility = (EgtUILib.GetPrivateProfileInt(S_TOOLS, K_ACTIVE, 0, m_sMachineIniPath) <> 0)
 
+      ' StoneDrillToolParamPageV = New StoneDrillParamPageV
+      ' WoodDrillToolParamPageV = New WoodDrillParamPageV
+      ' StoneSawToolParamPageV = New StoneSawParamPageV
+      ' WoodSawToolParamPageV = New WoodSawParamPageV
+      ' StoneMillToolParamPageV = New StoneMillParamPageV
+      ' WoodMillToolParamPageV = New WoodMillParamPageV
+      ' BeamMillToolParamPageV = New BeamMillParamPageV
+      ' MortiseToolParamPageV = New MortiseParamPageV
+      ' ChiselToolParamPageV = New ChiselParamPageV
+      ' WaterjetToolParamPageV = New WaterjetParamPageV
+
       LibMap.SetRefToolDbWindowVM(Me)
 
-      NotifyPropertyChanged(NameOf(ParamPageV))
+      NotifyPropertyChanged("ParamPageV")
    End Sub
 
 #End Region    ' Constructor
@@ -1232,17 +1244,17 @@ Public Class ToolDbWindowVM
 #Region "METHODS"
 
    Private Sub ccc()
-      NotifyPropertyChanged(NameOf(ParamPageV))
+      NotifyPropertyChanged("ParamPageV")
    End Sub
 
    Private Sub IsEnabledBtns(bIsEnabledNewBtn As Boolean, bIsEnabledSaveBtn As Boolean, bIsEnabledDeleteBtn As Boolean)
       m_IsEnabledNewBtn = bIsEnabledNewBtn
       m_IsEnabledSaveBtn = bIsEnabledSaveBtn
       m_IsEnabledRemoveBtn = bIsEnabledDeleteBtn
-      NotifyPropertyChanged(NameOf(IsEnabledNewBtn))
-      NotifyPropertyChanged(NameOf(IsEnabledSaveBtn))
-      NotifyPropertyChanged(NameOf(IsEnabledRemoveBtn))
-      NotifyPropertyChanged(NameOf(IsEnabledImpExpBtn))
+      NotifyPropertyChanged("IsEnabledNewBtn")
+      NotifyPropertyChanged("IsEnabledSaveBtn")
+      NotifyPropertyChanged("IsEnabledRemoveBtn")
+      NotifyPropertyChanged("IsEnabledImpExpBtn")
    End Sub
 
    ' Quando chiamato, disattiva tutti gli item dell'albero o li riattiva a seconda che ci sia o meno un errore
@@ -1353,14 +1365,13 @@ Public Class ToolDbWindowVM
       ' Verifico salvataggio
       SelTool.WriteToolParam()
       If EgtTdbIsCurrToolModified() Or SelTool.m_IsModifiedName Or SelTool.NewTool Then
-         'Select Case MsgBox(EgtMsg(MSG_TOOLDBERRORS), MsgBoxStyle.YesNoCancel, EgtMsg(MSG_TOOLDBERRORS + 1))
-         Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31100), EgtMsg(31101), MessageBoxButton.YesNo)   ' Salvare l'utensile modificato ? - SALVA
-            Case MessageBoxResult.Yes
+         Select Case MsgBox(EgtMsg(MSG_TOOLDBERRORS), MsgBoxStyle.YesNoCancel, EgtMsg(MSG_TOOLDBERRORS + 1))
+            Case MsgBoxResult.Yes
                SelTool.NewTool = False
                SelTool.m_Name = SelTool.m_Name.Trim()
                SelTool.WriteToolName()
                EgtTdbSaveCurrTool()
-            Case MessageBoxResult.No
+            Case MsgBoxResult.No
                If SelTool.NewTool Then
                   RemoveTool(SelTool)
                ElseIf SelTool.m_IsModifiedName Then
@@ -1368,7 +1379,7 @@ Public Class ToolDbWindowVM
                   EgtTdbGetCurrToolParam(MCH_TP.NAME, DbName)
                   SelTool.NamePar = DbName
                End If
-            Case MessageBoxResult.Cancel
+            Case MsgBoxResult.Cancel
                Return False
          End Select
       End If
@@ -1595,7 +1606,7 @@ Public Class ToolDbWindowVM
             EgtMdbGetNextMachining(MachiningsType.Id, MachiningName)
          End While
       Next
-      Dim MessageBoxText As String = EgtMsg(31122) & " " & ToolToRemove.Name & EgtMsg(31123) ' Sei sicuro di voler cancellare l'utensile ?
+      Dim MessageBoxText As String = EgtMsg(MSG_TOOLDBERRORS + 22) & " " & ToolToRemove.Name & EgtMsg(MSG_TOOLDBERRORS + 23)
       If UsingMachining.Count > 0 Then
          MessageBoxText &= "This is the list of Machining that use this tool:" & Environment.NewLine
          For MachiningIndex = 0 To UsingMachining.Count - 1
@@ -1603,8 +1614,9 @@ Public Class ToolDbWindowVM
          Next
       End If
       ' Chiedo conferma cancellazione lavorazione
-      'If MessageBox.Show(MessageBoxText, EgtMsg(MSG_TOOLDBERRORS + 24), MessageBoxButton.YesNo, MessageBoxImage.Question) <> MessageBoxResult.Yes Then Return
-      If EgtMessageBoxV.Show(Application.Current.MainWindow, MessageBoxText, EgtMsg(31124), MessageBoxButton.YesNo, MessageBoxImage.Question) <> MessageBoxResult.Yes Then Return   ' CANCELLA
+      If MessageBox.Show(MessageBoxText, EgtMsg(MSG_TOOLDBERRORS + 24), MessageBoxButton.YesNo, MessageBoxImage.Question) <> MessageBoxResult.Yes Then
+         Return
+      End If
       RemoveTool(ToolToRemove)
    End Sub
 
@@ -1657,17 +1669,10 @@ Public Class ToolDbWindowVM
          .ValidateNames = True
       }
       If ImportFileDlg.ShowDialog() <> True Then Return
-      'Dim ImportFileDlg As New EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
-      '   .Title = EgtMsg(31161) & " " & EgtMsg(31163),   ' Importa Utensili
-      '   .Filter = "Tools (.data)|*.data",
-      '   .CheckFileExists = True,
-      '   .ValidateNames = True
-      '}
-      'If ImportFileDlg.ShowDialog() <> Windows.Forms.DialogResult.OK Then Return
       Dim ImportFilePath As String = ImportFileDlg.FileName
       ' recupero liste utensili da importare
-      Dim ImportFileToolNameList As String() = Nothing
-      Dim ImportFileToolFamilyList As Integer() = Nothing
+      Dim ImportFileToolNameList As String()
+      Dim ImportFileToolFamilyList As Integer()
       EgtTdbToBeImported(ImportFilePath, ImportFileToolNameList, ImportFileToolFamilyList)
       ' li inserisco in lista per finestra di scelta
       Dim ToolToImportList As New ObservableCollection(Of ImpExpToolFamily)
@@ -1830,8 +1835,7 @@ Public Class ToolDbWindowVM
       If Not VerifySelectedToolModification() Then
          If Not SelTool.IsValid() Then
             'Utensile non valido, correggerlo o cancellarlo prima di uscire dal Db Utensili. - Errore
-            'MessageBox.Show(EgtMsg(31129), EgtMsg(31126))
-            EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31129), EgtMsg(31126))   ' Utensile non valido, correggerlo o cancellarlo prima di uscire dal Db Utensili. - Errore
+            MessageBox.Show(EgtMsg(31129), EgtMsg(31126))
          End If
          Return
       End If
diff --git a/ToolDbWindow/ToolTreeView.vb b/ToolDbWindow/ToolTreeView.vb
index c1e8399..6bb9bbd 100644
--- a/ToolDbWindow/ToolTreeView.vb
+++ b/ToolDbWindow/ToolTreeView.vb
@@ -1,5 +1,7 @@
-Imports System.IO
+Imports System.ComponentModel
+Imports System.IO
 Imports System.Collections.ObjectModel
+Imports System.Text.RegularExpressions
 Imports EgtUILib
 
 Public Class FamilyToolTreeViewItem
@@ -31,11 +33,10 @@ Public Class FamilyToolTreeViewItem
                   m_delIsEnabledBtns(True, False, False)
                End If
             End If
-            NotifyPropertyChanged(NameOf(IsSelected))
+            NotifyPropertyChanged("IsSelected")
          End If
       End Set
    End Property
-
    Private m_ToolType As MCH_TF
    ''' <summary>
    ''' Property that determines the tool type of the family
@@ -118,19 +119,19 @@ Public Class ToolTreeViewItem
                EgtTdbSetCurrTool(Me.Name)
                ReadToolParam()
                IsModifiedReset()
-               NotifyPropertyChanged(NameOf(Type))
+               NotifyPropertyChanged("Type")
+               'm_delNotifyPropertyChanged("ParamPageV")
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             Else
                WriteToolParam()
                If EgtTdbIsCurrToolModified() Or m_IsModifiedName Or Me.NewTool Then
-                  'Select Case MsgBox(EgtMsg(MSG_TOOLDBERRORS), MsgBoxStyle.YesNo, EgtMsg(MSG_TOOLDBERRORS + 1))
-                  Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31100), EgtMsg(31101), MessageBoxButton.YesNo)   ' Salvare l'utensile modificato ? - SALVA
-                     Case MessageBoxResult.Yes
+                  Select Case MsgBox(EgtMsg(MSG_TOOLDBERRORS), MsgBoxStyle.YesNo, EgtMsg(MSG_TOOLDBERRORS + 1))
+                     Case MsgBoxResult.Yes
                         m_NewTool = False
                         m_Name = m_Name.Trim()
                         WriteToolName()
                         EgtTdbSaveCurrTool()
-                     Case MessageBoxResult.No
+                     Case MsgBoxResult.No
                         If m_NewTool Then
                            m_delRemoveTool(Me)
                         ElseIf m_IsModifiedName Then
@@ -144,8 +145,8 @@ Public Class ToolTreeViewItem
             End If
             ' ricarico utensile per avere valore Active e ricaricarlo
             EgtTdbSetCurrTool(Me.Name)
-            NotifyPropertyChanged(NameOf(Active))
-            NotifyPropertyChanged(NameOf(IsSelected))
+            NotifyPropertyChanged("Active")
+            NotifyPropertyChanged("IsSelected")
          End If
       End Set
    End Property
@@ -179,7 +180,7 @@ Public Class ToolTreeViewItem
                m_delErrorOnTool(Not IsValid)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             End If
-            NotifyPropertyChanged(NameOf(Corr))
+            NotifyPropertyChanged("Corr")
          End If
       End Set
    End Property
@@ -222,7 +223,7 @@ Public Class ToolTreeViewItem
                   If Not m_SuspendToolDrawUpdate Then
                      UpdateSceneToolDraw()
                   End If
-                  NotifyPropertyChanged(NameOf(SelectedExit))
+                  NotifyPropertyChanged("SelectedExit")
                End If
             End If
          End If
@@ -274,7 +275,7 @@ Public Class ToolTreeViewItem
                DbCoolant = IdNameStruct.IndFromId(DbCoolant, CoolantList)
                m_IsModifiedSelCoolant = If(value <> DbCoolant, True, False)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
-               NotifyPropertyChanged(NameOf(SelCoolant))
+               NotifyPropertyChanged("SelCoolant")
             End If
          End If
       End Set
@@ -308,7 +309,7 @@ Public Class ToolTreeViewItem
             If Not m_SuspendToolDrawUpdate Then
                UpdateSceneToolDraw()
             End If
-            NotifyPropertyChanged(NameOf(CornRad))
+            NotifyPropertyChanged("CornRad")
          End If
       End Set
    End Property
@@ -341,7 +342,7 @@ Public Class ToolTreeViewItem
             If Not m_SuspendToolDrawUpdate Then
                UpdateSceneToolDraw()
             End If
-            NotifyPropertyChanged(NameOf(Diam))
+            NotifyPropertyChanged("Diam")
          End If
       End Set
    End Property
@@ -374,7 +375,7 @@ Public Class ToolTreeViewItem
                m_delErrorOnTool(Not IsValid)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             End If
-            NotifyPropertyChanged(NameOf(TotDiam))
+            NotifyPropertyChanged("TotDiam")
          End If
       End Set
    End Property
@@ -404,7 +405,7 @@ Public Class ToolTreeViewItem
                m_delErrorOnTool(Not IsValid)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             End If
-            NotifyPropertyChanged(NameOf(Feed))
+            NotifyPropertyChanged("Feed")
          End If
       End Set
    End Property
@@ -434,7 +435,7 @@ Public Class ToolTreeViewItem
                m_delErrorOnTool(Not IsValid)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             End If
-            NotifyPropertyChanged(NameOf(EndFeed))
+            NotifyPropertyChanged("EndFeed")
          End If
       End Set
    End Property
@@ -464,7 +465,7 @@ Public Class ToolTreeViewItem
                m_delErrorOnTool(Not IsValid)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             End If
-            NotifyPropertyChanged(NameOf(StartFeed))
+            NotifyPropertyChanged("StartFeed")
          End If
       End Set
    End Property
@@ -494,7 +495,7 @@ Public Class ToolTreeViewItem
                m_delErrorOnTool(Not IsValid)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             End If
-            NotifyPropertyChanged(NameOf(TipFeed))
+            NotifyPropertyChanged("TipFeed")
             ' Se fresa e 0 non può lavorare di testa
             If (Type And MCH_TF.MILL) <> 0 Then
                If dValue > EPS_SMALL Then
@@ -532,7 +533,7 @@ Public Class ToolTreeViewItem
                m_delErrorOnTool(Not IsValid)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             End If
-            NotifyPropertyChanged(NameOf(Len))
+            NotifyPropertyChanged("Len")
             ' Se lama
             If (Type And MCH_TF.SAWBLADE) <> 0 Then
                Dim CurrTotLen As Double = 0
@@ -578,7 +579,7 @@ Public Class ToolTreeViewItem
                m_delErrorOnTool(Not IsValid)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             End If
-            NotifyPropertyChanged(NameOf(TotLen))
+            NotifyPropertyChanged("TotLen")
             ' Se lama e len e totlen coincidono tipo piatto
             If (Type And MCH_TF.SAWBLADE) <> 0 Then
                If Not IsNothing(Len) Then
@@ -624,7 +625,7 @@ Public Class ToolTreeViewItem
                m_delErrorOnTool(Not IsValid)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             End If
-            NotifyPropertyChanged(NameOf(Dist))
+            NotifyPropertyChanged("Dist")
          End If
       End Set
    End Property
@@ -655,7 +656,7 @@ Public Class ToolTreeViewItem
                m_delErrorOnTool(Not IsValid)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             End If
-            NotifyPropertyChanged(NameOf(MaxMat))
+            NotifyPropertyChanged("MaxMat")
          End If
       End Set
    End Property
@@ -684,7 +685,7 @@ Public Class ToolTreeViewItem
                m_delErrorOnTool(Not IsValid)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             End If
-            NotifyPropertyChanged(NameOf(LonOffset))
+            NotifyPropertyChanged("LonOffset")
          End If
       End Set
    End Property
@@ -713,7 +714,7 @@ Public Class ToolTreeViewItem
                m_delErrorOnTool(Not IsValid)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             End If
-            NotifyPropertyChanged(NameOf(RadOffset))
+            NotifyPropertyChanged("RadOffset")
          End If
       End Set
    End Property
@@ -743,7 +744,7 @@ Public Class ToolTreeViewItem
                m_delErrorOnTool(Not IsValid)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             End If
-            NotifyPropertyChanged(NameOf(StepPar))
+            NotifyPropertyChanged("StepPar")
          End If
       End Set
    End Property
@@ -773,7 +774,7 @@ Public Class ToolTreeViewItem
                m_delErrorOnTool(Not IsValid)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             End If
-            NotifyPropertyChanged(NameOf(SideStep))
+            NotifyPropertyChanged("SideStep")
          End If
       End Set
    End Property
@@ -906,7 +907,7 @@ Public Class ToolTreeViewItem
             If Not m_SuspendToolDrawUpdate Then
                UpdateSceneToolDraw()
             End If
-            NotifyPropertyChanged(NameOf(SideAng))
+            NotifyPropertyChanged("SideAng")
          End If
       End Set
    End Property
@@ -936,7 +937,7 @@ Public Class ToolTreeViewItem
                m_delErrorOnTool(Not IsValid)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             End If
-            NotifyPropertyChanged(NameOf(MaxSpeed))
+            NotifyPropertyChanged("MaxSpeed")
          End If
       End Set
    End Property
@@ -969,7 +970,7 @@ Public Class ToolTreeViewItem
                m_delErrorOnTool(Not IsValid)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             End If
-            NotifyPropertyChanged(NameOf(Thick))
+            NotifyPropertyChanged("Thick")
          End If
       End Set
    End Property
@@ -1002,7 +1003,7 @@ Public Class ToolTreeViewItem
                m_delErrorOnTool(Not IsValid)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             End If
-            NotifyPropertyChanged(NameOf(StemDiam))
+            NotifyPropertyChanged("StemDiam")
          End If
       End Set
    End Property
@@ -1032,7 +1033,7 @@ Public Class ToolTreeViewItem
                m_delErrorOnTool(Not IsValid)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             End If
-            NotifyPropertyChanged(NameOf(MaxAbsorption))
+            NotifyPropertyChanged("MaxAbsorption")
          End If
       End Set
    End Property
@@ -1062,7 +1063,7 @@ Public Class ToolTreeViewItem
                m_delErrorOnTool(Not IsValid)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             End If
-            NotifyPropertyChanged(NameOf(MinFeed))
+            NotifyPropertyChanged("MinFeed")
          End If
       End Set
    End Property
@@ -1083,8 +1084,8 @@ Public Class ToolTreeViewItem
             Dim DbDraw As String = String.Empty
             EgtSetCurrentContext(ToolDbWindowVM.m_ProjectSceneContext)
             EgtTdbGetCurrToolParam(MCH_TP.DRAW, DbDraw)
-            m_IsModifiedDraw = value <> DbDraw
-            NotifyPropertyChanged(NameOf(Draw))
+            m_IsModifiedDraw = If(value <> DbDraw, True, False)
+            NotifyPropertyChanged("Draw")
          End If
       End Set
    End Property
@@ -1119,7 +1120,7 @@ Public Class ToolTreeViewItem
                Dim DbHead As String = String.Empty
                EgtSetCurrentContext(ToolDbWindowVM.m_ProjectSceneContext)
                EgtTdbGetCurrToolParam(MCH_TP.HEAD, DbHead)
-               m_IsModifiedSelectedHead = CBool((value < 0 Or value >= m_HeadList.Count OrElse m_HeadList(value).HName IsNot DbHead))
+               m_IsModifiedSelectedHead = ((value < 0 Or value >= m_HeadList.Count) OrElse m_HeadList(value).HName <> DbHead)
                ' se modificato disattivo l'utensile
                If m_IsModifiedSelectedHead And Not m_SuspendToolDrawUpdate Then EgtTdbSetCurrToolParam(MCH_TP.ACTIVE, False)
                If Not m_SuspendToolDrawUpdate Then
@@ -1132,17 +1133,17 @@ Public Class ToolTreeViewItem
                   m_delErrorOnTool(Not IsValid)
                   m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
                End If
-               NotifyPropertyChanged(NameOf(SelectedHead))
+               NotifyPropertyChanged("SelectedHead")
                ' verifico se le uscite sono cambiate
                EgtSetCurrentContext(ToolDbWindowVM.m_ProjectSceneContext)
-               Dim nExitNum As Integer = EgtGetHeadExitCount(CStr(m_HeadList(m_SelectedHead).HName))
+               Dim nExitNum As Integer = EgtGetHeadExitCount(m_HeadList(m_SelectedHead).HName)
                ' ricalcolo la lista uscite
                Dim nErr As Integer = 0
                Dim bIsValid As Boolean = False
 
                If nExitNum > m_ExitList.Count Then
                   For ExitIndex = m_ExitList.Count To nExitNum - 1
-                     EgtLuaSetGlobStringVar("STU.HEAD", CStr(m_HeadList(m_SelectedHead).HName))
+                     EgtLuaSetGlobStringVar("STU.HEAD", m_HeadList(m_SelectedHead).HName)
                      EgtLuaSetGlobIntVar("STU.EXIT", ExitIndex + 1)
                      EgtLuaSetGlobIntVar("STU.TYPE", m_Type)
                      If EgtLuaExistsFunction("STU.IsValidExit") AndAlso EgtLuaCallFunction("STU.IsValidExit") Then
@@ -1173,29 +1174,29 @@ Public Class ToolTreeViewItem
                   Dim CurrTcPos As String = m_OrigTcPosList(OrigTcPosIndex)
                   bIsValid = False
                   EgtLuaSetGlobStringVar("STU.TCPOS", CurrTcPos)
-                  EgtLuaSetGlobStringVar("STU.HEAD", CStr(m_HeadList(m_SelectedHead).HName))
+                  EgtLuaSetGlobStringVar("STU.HEAD", m_HeadList(m_SelectedHead).HName)
                   EgtLuaSetGlobIntVar("STU.TYPE", m_Type)
                   If Not EgtLuaCallFunction("STU.IsValidTcPosFromHead") Then nErr = 999
                   ' Leggo variabili
                   EgtLuaGetGlobBoolVar("STU.ISVALID", bIsValid)
                   If Not EgtLuaGetGlobIntVar("STU.ERR", nErr) Then nErr = 999
                   If nErr = 0 AndAlso bIsValid Then
-                     If m_TcPosList.Count - 1 >= TcPosIndex AndAlso m_TcPosList(TcPosIndex).Name Is CurrTcPos Then
+                     If m_TcPosList.Count - 1 >= TcPosIndex AndAlso m_TcPosList(TcPosIndex).Name = CurrTcPos Then
                         TcPosIndex += 1
                      Else
                         m_TcPosList.Insert(TcPosIndex, New IdNameStruct(TcPosIndex, CurrTcPos))
                         TcPosIndex += 1
                      End If
                   Else
-                     If m_TcPosList.Count - 1 >= TcPosIndex AndAlso m_TcPosList(TcPosIndex).Name Is CurrTcPos Then
+                     If m_TcPosList.Count - 1 >= TcPosIndex AndAlso m_TcPosList(TcPosIndex).Name = CurrTcPos Then
                         m_TcPosList.RemoveAt(TcPosIndex)
                      End If
                   End If
                Next
                ' quando la lista di posizioni valide è ricaricata non va selezionato nessun TcPos di default
                SelectedTcPos = -1
-               NotifyPropertyChanged(NameOf(ExitList))
-               NotifyPropertyChanged(NameOf(TcPosList))
+               NotifyPropertyChanged("ExitList")
+               NotifyPropertyChanged("TcPosList")
             End If
          End If
       End Set
@@ -1234,7 +1235,7 @@ Public Class ToolTreeViewItem
                m_delErrorOnTool(Not IsValid)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
             End If
-            NotifyPropertyChanged(NameOf(NamePar))
+            NotifyPropertyChanged("NamePar")
          End If
       End Set
    End Property
@@ -1294,14 +1295,14 @@ Public Class ToolTreeViewItem
                EgtSetCurrentContext(ToolDbWindowVM.m_ProjectSceneContext)
                EgtTdbGetCurrToolParam(MCH_TP.TCPOS, sDbTcPos)
                ' DbTcPos = IdNameStruct.IndFromId(DbTcPos, TcPosList)
-               m_IsModifiedSelectedTcPos = CBool((value < 0 Or value >= m_TcPosList.Count OrElse m_TcPosList(value).Name IsNot sDbTcPos))
+               m_IsModifiedSelectedTcPos = ((value < 0 Or value >= m_TcPosList.Count) OrElse m_TcPosList(value).Name <> sDbTcPos)
                ' se modificato disattivo l'utensile
                If m_IsModifiedSelectedTcPos And Not m_SuspendToolDrawUpdate Then
                   EgtTdbSetCurrToolParam(MCH_TP.ACTIVE, False)
                   NotifyPropertyChanged("Active")
                End If
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True)
-               NotifyPropertyChanged(NameOf(SelectedTcPos))
+               NotifyPropertyChanged("SelectedTcPos")
             End If
          End If
       End Set
@@ -1337,8 +1338,7 @@ Public Class ToolTreeViewItem
          Dim SelTool As ToolTreeViewItem = m_delGetSelectedTool()
          If Not IsNothing(SelTool) AndAlso SelTool.IsModified Then
             ' chiedo di salvare
-            'If MessageBox.Show(String.Format(EgtMsg(6144), SelTool.Name), EgtMsg(6143), MessageBoxButton.YesNo, MessageBoxImage.Question) <> MessageBoxResult.Yes Then
-            If EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(6144), SelTool.Name), EgtMsg(6143), MessageBoxButton.YesNo, MessageBoxImage.Question) <> MessageBoxResult.Yes Then  ' Utensile modificato! Tutti gli utensili devono essere salvati prima di cambiare le attivazioni. Salvare l'utensile {0}? Salvataggio utensile
+            If MessageBox.Show(String.Format(EgtMsg(6144), SelTool.Name), EgtMsg(6143), MessageBoxButton.YesNo, MessageBoxImage.Question) <> MessageBoxResult.Yes Then
                Return
             Else
                SelTool.WriteToolParam()
@@ -1361,8 +1361,7 @@ Public Class ToolTreeViewItem
             EgtTdbGetCurrToolParam(MCH_TP.TCPOS, sTcPos)
             If String.IsNullOrWhiteSpace(sTcPos) Then
                ' Posizione non definita!
-               'MessageBox.Show(EgtMsg(6146), EgtMsg(6126), MessageBoxButton.OK, MessageBoxImage.Exclamation)
-               EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6146), EgtMsg(6126), MessageBoxButton.OK, MessageBoxImage.Exclamation)   ' Posizione non definita! - Errore
+               MessageBox.Show(EgtMsg(6146), EgtMsg(6126), MessageBoxButton.OK, MessageBoxImage.Exclamation)
                ' ripristino utensile corrente
                EgtTdbSetCurrTool(PreviousCurrentTool)
                Return
@@ -1370,8 +1369,7 @@ Public Class ToolTreeViewItem
             ' verifico se c'è un utensile con la stessa posizione
             If Not VerifyAllPositions() Then
                ' Posizione già occupata!
-               'MessageBox.Show(EgtMsg(6145), EgtMsg(6126), MessageBoxButton.OK, MessageBoxImage.Exclamation)
-               EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6145), EgtMsg(6126), MessageBoxButton.OK, MessageBoxImage.Exclamation)   ' Posizione già occupata! - Errore
+               MessageBox.Show(EgtMsg(6145), EgtMsg(6126), MessageBoxButton.OK, MessageBoxImage.Exclamation)
                ' ripristino utensile corrente
                EgtTdbSetCurrTool(PreviousCurrentTool)
                Return
@@ -1381,7 +1379,7 @@ Public Class ToolTreeViewItem
          EgtTdbSetCurrTool(Me.Name)
          EgtTdbSetCurrToolParam(MCH_TP.ACTIVE, value)
          EgtTdbSaveCurrTool()
-         NotifyPropertyChanged(NameOf(Active))
+         NotifyPropertyChanged("Active")
          ' ripristino utensile corrente
          EgtTdbSetCurrTool(PreviousCurrentTool)
       End Set
@@ -1397,7 +1395,7 @@ Public Class ToolTreeViewItem
       End Get
       Set(value As String)
          m_SystemNotes = value
-         NotifyPropertyChanged(NameOf(SystemNotes))
+         NotifyPropertyChanged("SystemNotes")
       End Set
    End Property
 
@@ -1492,7 +1490,7 @@ Public Class ToolTreeViewItem
             If m_SelNoteItemCombo.Type.Equals("d") OrElse m_SelNoteItemCombo.Type.Equals("l") OrElse m_SelNoteItemCombo.Type.Equals("s") OrElse
                m_SelNoteItemCombo.Type.Equals("dr") OrElse m_SelNoteItemCombo.Type.Equals("lr") OrElse m_SelNoteItemCombo.Type.Equals("sr") Then
                m_SelNoteItemCombo.SelTypeValue = 0 ' Seleziona la TextBox
-            ElseIf m_SelNoteItemCombo.Type.Equals("th") OrElse m_SelNoteItemCombo.Type.Equals("tl") Then
+            ElseIf m_SelNoteItemCombo.Type.Equals("th") Then
                m_SelNoteItemCombo.SelTypeValue = 2 ' Seleziona la ComboBox
             Else
                m_SelNoteItemCombo.SelTypeValue = 1 ' Seleziona la CheckBox
@@ -1510,7 +1508,6 @@ Public Class ToolTreeViewItem
                                                          m_SelNoteItemCombo.Type.Equals("lr") OrElse
                                                          m_SelNoteItemCombo.Type.Equals("sr") OrElse
                                                          m_SelNoteItemCombo.Type.Equals("br") OrElse
-                                                         m_SelNoteItemCombo.Type.Equals("tl") OrElse
                                                          m_SelNoteItemCombo.Type.Equals("th") Then SelTool.UpdateSceneToolDraw()
 
                   ' Nascondo la combobox
@@ -1578,35 +1575,6 @@ Public Class ToolTreeViewItem
       End Set
    End Property
 
-   ''' <summary>
-   ''' Utensile Selezionato
-   ''' </summary>
-   Private m_ToolItem As FamilyToolTreeViewItem
-   Private Property ToolItem As FamilyToolTreeViewItem
-      Get
-         Return m_ToolItem
-      End Get
-      Set(value As FamilyToolTreeViewItem)
-         m_ToolItem = value
-         NotifyPropertyChanged(NameOf(ToolItem))
-      End Set
-   End Property
-
-   ''' <summary>
-   ''' Lista Utensili
-   ''' </summary>
-   Private m_ToolItemNameList As New ObservableCollection(Of String)
-   Public Property ToolItemNameList As ObservableCollection(Of String)
-      Get
-         Return m_ToolItemNameList
-      End Get
-      Set(value As ObservableCollection(Of String))
-         m_ToolItemNameList = value
-         NotifyPropertyChanged(NameOf(ToolItemNameList))
-      End Set
-   End Property
-
-
    ' Comandi
    Private m_cmdShowNoteListCombo As ICommand
 
@@ -1617,276 +1585,335 @@ Public Class ToolTreeViewItem
    'Definizione dei messaggi della pagina
    Public ReadOnly Property CorrTxBl As String
       Get
-         Return EgtMsg(6051)     ' Correttore
+         Return EgtMsg(MSG_TOOLSDBPAGE + 51)
       End Get
    End Property
 
    Public ReadOnly Property ExitParTxBl As String
       Get
-         Return EgtMsg(6052)     ' Uscita
+         Return EgtMsg(MSG_TOOLSDBPAGE + 52)
       End Get
    End Property
 
    Public ReadOnly Property TypeTxBl As String
       Get
-         Return EgtMsg(6053)     ' Tipo
+         Return EgtMsg(MSG_TOOLSDBPAGE + 53)
       End Get
    End Property
 
    Public ReadOnly Property CoolantTxBl As String
       Get
-         Return EgtMsg(6054)     ' Refrigerante
+         Return EgtMsg(MSG_TOOLSDBPAGE + 54)
       End Get
    End Property
 
    Public ReadOnly Property CornRadTxBl As String
       Get
-         Return EgtMsg(6055)     ' Raggio Corner
+         Return EgtMsg(MSG_TOOLSDBPAGE + 55)
       End Get
    End Property
 
    Public ReadOnly Property DiamTxBl As String
       Get
-         Return EgtMsg(6056)     ' Diametro
+         Return EgtMsg(MSG_TOOLSDBPAGE + 56)
       End Get
    End Property
 
    Public ReadOnly Property TotDiamTxBl As String
       Get
-         Return EgtMsg(6057)     ' Diametro Totale
+         Return EgtMsg(MSG_TOOLSDBPAGE + 57)
       End Get
    End Property
 
    Public ReadOnly Property FeedTxBl As String
       Get
-         Return EgtMsg(6058)     ' Avanzamento
+         Return EgtMsg(MSG_TOOLSDBPAGE + 58)
       End Get
    End Property
 
    Public ReadOnly Property EndFeedTxBl As String
       Get
-         Return EgtMsg(6059)     ' Avanzamento Finale
+         Return EgtMsg(MSG_TOOLSDBPAGE + 59)
       End Get
    End Property
 
    Public ReadOnly Property StartFeedTxBl As String
       Get
-         Return EgtMsg(6060)     ' Avanzamento Iniziale
+         Return EgtMsg(MSG_TOOLSDBPAGE + 60)
       End Get
    End Property
 
+   'Public ReadOnly Property TipFeedTxBl As String
+   '   Get
+   '      Return EgtMsg(MSG_TOOLSDBPAGE + 61)
+   '   End Get
+   'End Property
+
    Public ReadOnly Property LenTxBl As String
       Get
-         Return EgtMsg(6062)     ' Lunghezza
+         Return EgtMsg(MSG_TOOLSDBPAGE + 62)
       End Get
    End Property
 
    Public ReadOnly Property TotLenTxBl As String
       Get
-         Return EgtMsg(6063)     ' Lunghezza Totale
+         Return EgtMsg(MSG_TOOLSDBPAGE + 63)
       End Get
    End Property
 
    Public ReadOnly Property DistTxBl As String
       Get
-         Return EgtMsg(6079)     ' Distanza
+         Return EgtMsg(6079)
       End Get
    End Property
 
    Public ReadOnly Property MaxMatTxBl As String
       Get
+         '' Determino il tipo di utensile
+         'Dim nType As Integer
+         'EgtTdbGetCurrToolParam(MCH_TP.TYPE, nType)
          If ToolDbWindowVM.m_MatType = MaterialType.BEAM And (Type And MCH_TF.MILL) <> 0 Then
-            Return EgtMsg(31080)    ' Tagliente
+            Return EgtMsg(31080)                            ' Tagliente
          Else
-            Return EgtMsg(6064)     ' Massimo materiale
+            Return EgtMsg(MSG_TOOLSDBPAGE + 64)             ' Massimo materiale
          End If
       End Get
    End Property
 
    Public ReadOnly Property LonOffsetTxBl As String
       Get
-         Return EgtMsg(6065)     ' Offset Longitudinale
+         Return EgtMsg(MSG_TOOLSDBPAGE + 65)
       End Get
    End Property
 
    Public ReadOnly Property RadOffsetTxBl As String
       Get
-         Return EgtMsg(6066)     ' Offset Radiale
+         Return EgtMsg(MSG_TOOLSDBPAGE + 66)
       End Get
    End Property
 
    Public ReadOnly Property SpeedTxBl As String
       Get
-         Return EgtMsg(6067)     ' Rotazione
+         Return EgtMsg(MSG_TOOLSDBPAGE + 67)
       End Get
    End Property
 
    Public ReadOnly Property SideAngTxBl As String
       Get
-         Return EgtMsg(6068)     ' Angolo di Lato
+         Return EgtMsg(MSG_TOOLSDBPAGE + 68)
       End Get
    End Property
 
    Public ReadOnly Property MaxSpeedTxBl As String
       Get
-         Return EgtMsg(6069)     ' Rotazione Massima
+         Return EgtMsg(MSG_TOOLSDBPAGE + 69)
       End Get
    End Property
 
    Public ReadOnly Property ThickTxBl As String
       Get
-         Return EgtMsg(6070)     ' Spessore
+         Return EgtMsg(MSG_TOOLSDBPAGE + 70)
       End Get
    End Property
 
    Public ReadOnly Property StemDiamTxBl As String
       Get
-         Return EgtMsg(6081)     ' Diametro del Gambo
+         Return EgtMsg(MSG_TOOLSDBPAGE + 81)
       End Get
    End Property
 
    Public ReadOnly Property MaxAbsorptionTxBl As String
       Get
-         Return EgtMsg(6071)     ' Assorbimento Massimo
+         Return EgtMsg(MSG_TOOLSDBPAGE + 71)
       End Get
    End Property
 
    Public ReadOnly Property MinFeedTxBl As String
       Get
-         Return EgtMsg(6072)     ' Avanzamento Minimo
+         Return EgtMsg(MSG_TOOLSDBPAGE + 72)
       End Get
    End Property
 
    Public ReadOnly Property DrawTxBl As String
       Get
-         Return EgtMsg(6073)     ' Disegno
+         Return EgtMsg(MSG_TOOLSDBPAGE + 73)
       End Get
    End Property
 
    Public ReadOnly Property HeadTxBl As String
       Get
-         Return EgtMsg(6074)     ' Testa
+         Return EgtMsg(MSG_TOOLSDBPAGE + 74)
       End Get
    End Property
 
    Public ReadOnly Property NameParTxBl As String
       Get
-         Return EgtMsg(6075)     ' Nome
+         Return EgtMsg(MSG_TOOLSDBPAGE + 75)
       End Get
    End Property
 
    Public ReadOnly Property UserNotesTxBl As String
       Get
-         Return EgtMsg(6076)     ' Note
+         Return EgtMsg(MSG_TOOLSDBPAGE + 76)
       End Get
    End Property
 
    Public ReadOnly Property TcPosTxBl As String
       Get
-         Return EgtMsg(6077)     ' Posiz. Cambio Utensile
+         Return EgtMsg(MSG_TOOLSDBPAGE + 77)
       End Get
    End Property
 
    Public ReadOnly Property InvertTxBl As String
       Get
-         Return EgtMsg(31251)    ' Inverti
+         Return EgtMsg(MSG_MACHININGDB + 51)
       End Get
    End Property
 
    Public ReadOnly Property LeaveTabTxBl As String
       Get
-         Return EgtMsg(31252)    ' Tab
+         Return EgtMsg(MSG_MACHININGDB + 52)
       End Get
    End Property
 
    Public ReadOnly Property WorkSideTxBl As String
       Get
-         Return EgtMsg(31254)    ' Lato di lavoro
+         Return EgtMsg(MSG_MACHININGDB + 54)
       End Get
    End Property
 
    Public ReadOnly Property HeadSideTxBl As String
       Get
-         Return EgtMsg(31255)    ' Lato della testa
+         Return EgtMsg(MSG_MACHININGDB + 55)
       End Get
    End Property
 
    Public ReadOnly Property LeadInTypeTxBl As String
       Get
-         Return EgtMsg(31256)    ' Attacco
+         Return EgtMsg(MSG_MACHININGDB + 56)
       End Get
    End Property
 
    Public ReadOnly Property ExtLinkTypeTxBl As String
       Get
-         Return EgtMsg(31257)    ' Collegamento
+         Return EgtMsg(MSG_MACHININGDB + 57)
       End Get
    End Property
 
    Public ReadOnly Property LeadOutTypeTxBl As String
       Get
-         Return EgtMsg(31258)    ' Uscita
+         Return EgtMsg(MSG_MACHININGDB + 58)
       End Get
    End Property
 
    Public ReadOnly Property CurveUseTxBl As String
       Get
-         Return EgtMsg(31259)    ' Uso curve
+         Return EgtMsg(MSG_MACHININGDB + 59)
       End Get
    End Property
 
    Public ReadOnly Property StepTypeTxBl As String
       Get
-         Return EgtMsg(31260)    ' Tipo di Step
+         Return EgtMsg(MSG_MACHININGDB + 60)
       End Get
    End Property
 
    Public ReadOnly Property LeadLinkTypeTxBl As String
       Get
          If ToolDbWindowVM.m_MatType = MaterialType.STONE Then
-            Return EgtMsg(90770)    ' Collegamento
+            Return EgtMsg(90770)             ' Collegamento
          Else
-            Return EgtMsg(31262)    ' Tipo approccio
+            Return EgtMsg(MSG_MACHININGDB + 62)             ' Tipo approccio
          End If
       End Get
    End Property
 
    Public ReadOnly Property InvertToolDirTxBl As String
       Get
-         Return EgtMsg(31351)    ' Inverti direz. utensile
+         Return EgtMsg(MSG_MACHININGDB + 151)
       End Get
    End Property
 
    Public ReadOnly Property FaceUseTypeTxBl As String
       Get
-         Return EgtMsg(31352)    ' Lavorazione faccia
+         Return EgtMsg(MSG_MACHININGDB + 152)
       End Get
    End Property
 
    Public ReadOnly Property InitAngsTxBl As String
       Get
-         Return EgtMsg(31364)    ' Angoli suggeriti
+         Return EgtMsg(MSG_MACHININGDB + 164)               ' Angoli suggeriti
       End Get
    End Property
 
    Public ReadOnly Property BlockedAxisTxBl As String
       Get
-         Return EgtMsg(31365)    ' Asse bloccato
+         Return EgtMsg(MSG_MACHININGDB + 165)               ' Asse bloccato
       End Get
    End Property
 
    Public ReadOnly Property SolChoiceTypeTxBl As String
       Get
-         Return EgtMsg(31304)    ' SCC
+         Return EgtMsg(MSG_MACHININGDB + 104)
       End Get
    End Property
 
+   'Public ReadOnly Property SpeedTxBl As String
+   '   Get
+   '      If ToolDbWindowVM.m_MatType = MaterialType.STONE Then
+   '         Return EgtMsg(90725)             ' Rotazione
+   '      Else
+   '         Return EgtMsg(MSG_MACHININGDB + 63)    ' Speed
+   '      End If
+   '   End Get
+   'End Property
+
+   'Public ReadOnly Property FeedTxBl As String
+   '   Get
+   '      If ToolDbWindowVM.m_MatType = MaterialType.STONE Then
+   '         Return EgtMsg(90729)             ' Avanzamento
+   '      Else
+   '         Return EgtMsg(MSG_MACHININGDB + 64)    ' Feed
+   '      End If
+   '   End Get
+   'End Property
+
+   'Public ReadOnly Property StartFeedTxBl As String
+   '   Get
+   '      If ToolDbWindowVM.m_MatType = MaterialType.STONE Then
+   '         Return EgtMsg(90731)             ' Ingresso
+   '      Else
+   '         Return EgtMsg(MSG_MACHININGDB + 65)    ' Feed iniziale
+   '      End If
+   '   End Get
+   'End Property
+
+   'Public ReadOnly Property EndFeedTxBl As String
+   '   Get
+   '      If ToolDbWindowVM.m_MatType = MaterialType.STONE Then
+   '         Return EgtMsg(90732)             ' Uscita
+   '      Else
+   '         Return EgtMsg(MSG_MACHININGDB + 66)    ' Feed finale
+   '      End If
+   '   End Get
+   'End Property
+
+   'Public ReadOnly Property BackFeedTxBl As String
+   '   Get
+   '      If ToolDbWindowVM.m_MatType = MaterialType.STONE Then
+   '         Return EgtMsg(90866)             ' Ultimo ritorno
+   '      Else
+   '         Return EgtMsg(MSG_MACHININGDB + 166)            ' Feed ultimo all'indietro
+   '      End If
+   '   End Get
+   'End Property
+
    Public ReadOnly Property OffSrTxBl As String
       Get
          If ToolDbWindowVM.m_MatType = MaterialType.STONE Then
-            Return EgtMsg(90737)    ' Radiale
+            Return EgtMsg(90737)             ' Radiale
          Else
-            Return EgtMsg(31268)    ' Offset radiale
+            Return EgtMsg(MSG_MACHININGDB + 68)             ' Offset radiale
          End If
       End Get
    End Property
@@ -1894,9 +1921,9 @@ Public Class ToolTreeViewItem
    Public ReadOnly Property OffSlTxBl As String
       Get
          If ToolDbWindowVM.m_MatType = MaterialType.STONE Then
-            Return EgtMsg(90736)    ' Longitudinale
+            Return EgtMsg(90736)             ' Longitudinale
          Else
-            Return EgtMsg(31269)    ' Offset longitudinale
+            Return EgtMsg(MSG_MACHININGDB + 69)             ' Offset longitudinale
          End If
       End Get
    End Property
@@ -1904,25 +1931,25 @@ Public Class ToolTreeViewItem
    Public ReadOnly Property SideAngleTxBl As String
       Get
          If ToolDbWindowVM.m_MatType = MaterialType.STONE And m_Type = MCH_MY.SAWING Then
-            Return EgtMsg(90763)    ' Angolo di sbandamento
+            Return EgtMsg(90763)             ' Angolo di sbandamento
          Else
-            Return EgtMsg(31271)    ' Angolo di fianco
+            Return EgtMsg(MSG_MACHININGDB + 71)             ' Angolo di fianco
          End If
       End Get
    End Property
 
    Public ReadOnly Property ApproxTxBl As String
       Get
-         Return EgtMsg(31272)    ' Approssimazione
+         Return EgtMsg(MSG_MACHININGDB + 72)
       End Get
    End Property
 
    Public ReadOnly Property StartPosTxBl As String
       Get
          If ToolDbWindowVM.m_MatType = MaterialType.STONE Then
-            Return EgtMsg(90768)    ' Posizione inizio
+            Return EgtMsg(90768)             ' Posizione inizio
          Else
-            Return EgtMsg(31273)    ' Dist. di sicurezza
+            Return EgtMsg(MSG_MACHININGDB + 73)             ' Dist. di sicurezza
          End If
       End Get
    End Property
@@ -1930,9 +1957,9 @@ Public Class ToolTreeViewItem
    Public ReadOnly Property StartSlowLenTxBl As String
       Get
          If ToolDbWindowVM.m_MatType = MaterialType.STONE And m_Type = MCH_MY.DRILLING Then
-            Return EgtMsg(90780)    ' Iniziale
+            Return EgtMsg(90780)             ' Iniziale
          Else
-            Return EgtMsg(31274)    ' Lungh. rallent. iniziale
+            Return EgtMsg(MSG_MACHININGDB + 74)             ' Lungh. rallent. iniziale
          End If
       End Get
    End Property
@@ -1940,9 +1967,9 @@ Public Class ToolTreeViewItem
    Public ReadOnly Property EndSlowLenTxBl As String
       Get
          If ToolDbWindowVM.m_MatType = MaterialType.STONE And m_Type = MCH_MY.DRILLING Then
-            Return EgtMsg(90781)    ' Finale
+            Return EgtMsg(90781)             ' Finale
          Else
-            Return EgtMsg(31275)    ' Lungh. rallent. finale
+            Return EgtMsg(MSG_MACHININGDB + 75)             ' Lungh. rallent. finale
          End If
       End Get
    End Property
@@ -1950,65 +1977,65 @@ Public Class ToolTreeViewItem
    Public ReadOnly Property ThrouAddLenTxBl As String
       Get
          If ToolDbWindowVM.m_MatType = MaterialType.STONE And m_Type = MCH_MY.DRILLING Then
-            Return EgtMsg(90782)    ' Affondamento aggiuntivo
+            Return EgtMsg(90782)             ' Affondamento aggiuntivo
          Else
-            Return EgtMsg(31276)    ' Lungh. passante agg.
+            Return EgtMsg(MSG_MACHININGDB + 76)             ' Lungh. passante agg.
          End If
       End Get
    End Property
 
    Public ReadOnly Property StepParTxBl As String
       Get
-         Return EgtMsg(31277)    ' Passo
+         Return EgtMsg(MSG_MACHININGDB + 77)          ' Passo
       End Get
    End Property
 
    Public ReadOnly Property StepBackTxBl As String
       Get
          If ToolDbWindowVM.m_MatType = MaterialType.STONE Then
-            Return EgtMsg(90865)    ' Ritorno
+            Return EgtMsg(90865)          ' Ritorno
          Else
-            Return EgtMsg(31367)    ' Passo all'indietro
+            Return EgtMsg(MSG_MACHININGDB + 167)            ' Passo all'indietro
          End If
       End Get
    End Property
 
    Public ReadOnly Property ReturnPosTxBl As String
       Get
-         Return EgtMsg(31278)    ' Posizione di ritorno
+         Return EgtMsg(MSG_MACHININGDB + 78)
       End Get
    End Property
 
    Public ReadOnly Property TabLenTxBl As String
       Get
-         Return EgtMsg(31279)    ' Lunghezza
+         Return EgtMsg(MSG_MACHININGDB + 79)
       End Get
    End Property
 
    Public ReadOnly Property TabDistTxBl As String
       Get
-         Return EgtMsg(31280)    ' Altezza
+         Return EgtMsg(MSG_MACHININGDB + 80)
       End Get
    End Property
 
    Public ReadOnly Property TabHeightTxBl As String
       Get
-         Return EgtMsg(31281)    ' Angolo
+         Return EgtMsg(MSG_MACHININGDB + 81)
       End Get
    End Property
 
    Public ReadOnly Property TabAngleTxBl As String
       Get
-         Return EgtMsg(31282)    ' Distanza
+         Return EgtMsg(MSG_MACHININGDB + 82)
       End Get
    End Property
 
    Public ReadOnly Property StepExtArcTxBl As String
       Get
          If ToolDbWindowVM.m_MatType = MaterialType.STONE Then
-            Return EgtMsg(90778)    ' Esterno archi
+            Return EgtMsg(90778)             ' Esterno archi
          Else
-            Return EgtMsg(31293)    ' Passo su esterno arco
+            Return EgtMsg(MSG_MACHININGDB + 93)          ' Passo su esterno arco
          End If
       End Get
    End Property
@@ -2016,25 +2043,25 @@ Public Class ToolTreeViewItem
    Public ReadOnly Property StepIntArcTxBl As String
       Get
          If ToolDbWindowVM.m_MatType = MaterialType.STONE Then
-            Return EgtMsg(90777)    ' Interno archi
+            Return EgtMsg(90777)             ' Interno archi
          Else
-            Return EgtMsg(31294)    ' Passo su interno arco
+            Return EgtMsg(MSG_MACHININGDB + 94)          ' Passo su interno arco
          End If
       End Get
    End Property
 
    Public ReadOnly Property SideStepTxBl As String
       Get
-         Return EgtMsg(31295)    ' Passo di lato
+         Return EgtMsg(MSG_MACHININGDB + 95)             ' Passo di lato
       End Get
    End Property
 
    Public ReadOnly Property StepSideAngTxBl As String
       Get
          If ToolDbWindowVM.m_MatType = MaterialType.STONE Then
-            Return EgtMsg(90862)    ' Inclinato
+            Return EgtMsg(90862)             ' Inclinato
          Else
-            Return EgtMsg(31368)    ' Passo inclinato
+            Return EgtMsg(MSG_MACHININGDB + 168)               ' Passo inclinato
          End If
       End Get
    End Property
@@ -2042,9 +2069,9 @@ Public Class ToolTreeViewItem
    Public ReadOnly Property StepSideAngBackTxBl As String
       Get
          If ToolDbWindowVM.m_MatType = MaterialType.STONE Then
-            Return EgtMsg(90863)    ' Incl. ritorno
+            Return EgtMsg(90863)             ' Incl. ritorno
          Else
-            Return EgtMsg(31369)    ' Passo all'indietro inclinato
+            Return EgtMsg(MSG_MACHININGDB + 169)               ' Passo all'indietro inclinato
          End If
       End Get
    End Property
@@ -2052,306 +2079,338 @@ Public Class ToolTreeViewItem
    Public ReadOnly Property VertFeedTxBl As String
       Get
          If ToolDbWindowVM.m_MatType = MaterialType.STONE Then
-            Return EgtMsg(90790)    ' In verticale
+            Return EgtMsg(90790)               ' In verticale
          Else
-            Return EgtMsg(31296)    ' Feed verticale
+            Return EgtMsg(MSG_MACHININGDB + 96)             ' Feed verticale
          End If
       End Get
    End Property
 
+   'Public ReadOnly Property NameParTxBl As String
+   '   Get
+   '      Return EgtMsg(MSG_MACHININGDB + 97)
+   '   End Get
+   'End Property
+
    Public ReadOnly Property ToolTxBl As String
       Get
-         Return EgtMsg(31298)    ' Utensile
+         Return EgtMsg(MSG_MACHININGDB + 98)
       End Get
    End Property
 
    Public ReadOnly Property DepthStrTxBl As String
       Get
-         Return EgtMsg(31299)    ' Affondamento
+         Return EgtMsg(MSG_MACHININGDB + 99)
       End Get
    End Property
 
+   'Public ReadOnly Property UserNotesTxBl As String
+   '   Get
+   '      Return EgtMsg(MSG_MACHININGDB + 100)
+   '   End Get
+   'End Property
+
    Public ReadOnly Property OverLapTxBl As String
       Get
-         Return EgtMsg(31301)    ' Sovrapposizione
+         Return EgtMsg(MSG_MACHININGDB + 101)
       End Get
    End Property
 
    Public ReadOnly Property SubTypeTxBl As String
       Get
          If m_Type = MCH_MY.SAWFINISHING Then
-            Return EgtMsg(90861)    ' Spatolatura
+            Return EgtMsg(90861)              ' Spatolatura
          Else
-            Return EgtMsg(31303)    ' Sottotipo
+            Return EgtMsg(MSG_MACHININGDB + 103)               ' Sottotipo
          End If
       End Get
    End Property
 
    Public ReadOnly Property ForwardAngleTxBl As String
       Get
-         Return EgtMsg(31370)    ' Inclinazione in avanti
+         Return EgtMsg(31370)
       End Get
    End Property
 
    Public ReadOnly Property ProbingTxBl As String
       Get
-         Return EgtMsg(90879)    ' Abilitazione
+         Return EgtMsg(90879)             ' Abilitazione
       End Get
    End Property
 
    Public ReadOnly Property ProbingMinDistTxBl As String
       Get
-         Return EgtMsg(31372)    ' Min dist. punti
+         Return EgtMsg(31372)
       End Get
    End Property
 
    Public ReadOnly Property ProbingMaxDistTxBl As String
       Get
-         Return EgtMsg(31373)    ' Max dist. punti
+         Return EgtMsg(31373)
       End Get
    End Property
 
    Public ReadOnly Property ExtCornTypeTxBl As String
       Get
-         Return EgtMsg(31374)    ' Esterni
+         Return EgtMsg(31374)
       End Get
    End Property
 
    Public ReadOnly Property IntCornTypeTxBl As String
       Get
-         Return EgtMsg(31375)    ' Interni
+         Return EgtMsg(31375)
       End Get
    End Property
 
    Public ReadOnly Property CornSlowLenTxBl As String
       Get
-         Return EgtMsg(31376)    ' Lungh. rall.
+         Return EgtMsg(31376)
       End Get
    End Property
 
    Public ReadOnly Property CornSlowPercTxBl As String
       Get
-         Return EgtMsg(31377)    ' Rallentam. %
+         Return EgtMsg(31377)
       End Get
    End Property
 
    Public ReadOnly Property LiHoleTxBl As String
       Get
-         Return EgtMsg(31378)    ' Foro di attacco
+         Return EgtMsg(31378)
       End Get
    End Property
 
    Public ReadOnly Property LiHoleRadTxBl As String
       Get
-         Return EgtMsg(31379)    ' Raggio
+         Return EgtMsg(31379)
       End Get
    End Property
 
    Public ReadOnly Property LpTurnsTxBl As String
       Get
-         Return EgtMsg(31380)    ' Num. giri in LP
+         Return EgtMsg(31380)
       End Get
    End Property
 
    Public ReadOnly Property HpTurnsTxBl As String
       Get
-         Return EgtMsg(31381)    ' Num. giri in HP
+         Return EgtMsg(31381)
       End Get
    End Property
 
    Public ReadOnly Property ThicknessFeedTxBl As String
       Get
-         Return EgtMsg(31070)    ' Spessore
+         Return EgtMsg(31070)             ' Spessore
       End Get
    End Property
 
+   'Public ReadOnly Property TipFeedTxBl As String
+   '   Get
+   '      If ToolDbWindowVM.m_MatType = MaterialType.STONE Then
+   '         If m_Type = MCH_MY.WATERJETTING Then
+   '            Return EgtMsg(31201)             ' Foratura
+   '         Else
+   '            Return EgtMsg(90730)             ' Testa
+   '         End If
+   '      Else
+   '         Return EgtMsg(MSG_MACHININGDB + 67)    ' Feed di testa
+   '      End If
+   '   End Get
+   'End Property
+
    Public ReadOnly Property TipFeedTxBl As String
       Get
          If m_Type = MCH_TY.WATERJET Then
-            Return EgtMsg(31079)    ' Foratura
+            Return EgtMsg(31079)
          Else
-            Return EgtMsg(31061)    ' Avanzamento di Punta
+            Return EgtMsg(MSG_TOOLDB + 61)
          End If
       End Get
    End Property
 
    Public ReadOnly Property MaterialMsg As String
       Get
-         Return EgtMsg(91451)    ' Materiale
+         Return EgtMsg(91451)             ' Materiale
       End Get
    End Property
 
    Public ReadOnly Property MinThicknessMsg As String
       Get
-         Return EgtMsg(91452)    ' Spessore minimo
+         Return EgtMsg(91452)             ' Spessore minimo
       End Get
    End Property
 
    Public ReadOnly Property MaxThicknessMsg As String
       Get
-         Return EgtMsg(91453)    ' Spessore massimo
+         Return EgtMsg(91453)             ' Spessore massimo
       End Get
    End Property
 
    Public ReadOnly Property OscillationGpBxLbl As String
       Get
-         Return EgtMsg(31382)    ' Oscillazione
+         Return EgtMsg(31382)             ' Oscillazione
       End Get
    End Property
 
    Public ReadOnly Property OscHeightTxBl As String
       Get
-         Return EgtMsg(31383)    ' Ampiezza
+         Return EgtMsg(31383)             ' Ampiezza
       End Get
    End Property
 
    Public ReadOnly Property OscRampLenTxBl As String
       Get
-         Return EgtMsg(31384)    ' Lungh. rampa
+         Return EgtMsg(31384)              ' Lungh. rampa
       End Get
    End Property
 
    Public ReadOnly Property OscFlatLenTxBl As String
       Get
-         Return EgtMsg(31385)    ' Lungh. cresta
+         Return EgtMsg(31385)              ' Lungh. cresta
       End Get
    End Property
 
    Public ReadOnly Property AcrossTxBl As String
       Get
-         Return EgtMsg(90861)    ' Spatolatura
+         Return EgtMsg(90861)              ' Spatolatura
       End Get
    End Property
 
    Public ReadOnly Property GenericGpBxLbl As String
       Get
-         Return EgtMsg(31386)    ' Generici
+         Return EgtMsg(31386)              ' Generici
       End Get
    End Property
 
    Public ReadOnly Property AdvancedGpBxLbl As String
       Get
-         Return EgtMsg(31387)    ' Avanzati
+         Return EgtMsg(31387)              ' Avanzati
       End Get
    End Property
 
    Public ReadOnly Property StepGpBxLbl As String
       Get
-         Return EgtMsg(31277)    ' Passo
+         Return EgtMsg(MSG_MACHININGDB + 77)              ' Passo
       End Get
    End Property
 
    Public ReadOnly Property FeedGpBxLbl As String
       Get
-         Return EgtMsg(90728)    ' Feed
+         Return EgtMsg(90728)              ' Feed
       End Get
    End Property
 
    Public ReadOnly Property OffsetGpBxLbl As String
       Get
-         Return EgtMsg(90735)    ' Sovramateriale
+         Return EgtMsg(90735)              ' Sovramateriale
       End Get
    End Property
 
    Public ReadOnly Property SlowLenGpBxLbl As String
       Get
-         Return EgtMsg(90779)    ' Lunghezza del rallentamento
+         Return EgtMsg(90779)              ' Lunghezza del rallentamento
       End Get
    End Property
 
    Public ReadOnly Property OverlapGpBxLbl As String
       Get
-         Return EgtMsg(90227)    ' Sovrapposizione
+         Return EgtMsg(90227)              ' Sovrapposizione
       End Get
    End Property
 
    Public ReadOnly Property AnglesGpBxLbl As String
       Get
-         Return EgtMsg(90880)    ' Angoli
+         Return EgtMsg(90880)              ' Angoli
       End Get
    End Property
 
    Public ReadOnly Property ProbingGpBxLbl As String
       Get
-         Return EgtMsg(90868)    ' Tastatura
+         Return EgtMsg(90868)              ' Tastatura
       End Get
    End Property
 
    Public ReadOnly Property LeadInTypeGpBxLbl As String
       Get
-         Return EgtMsg(31256)    ' Attacco
+         Return EgtMsg(MSG_MACHININGDB + 56)          ' Attacco
       End Get
    End Property
 
    Public ReadOnly Property LeadOutTypeGpBxLbl As String
       Get
-         Return EgtMsg(31258)    ' Uscita
+         Return EgtMsg(MSG_MACHININGDB + 58)          ' Uscita
       End Get
    End Property
 
    Public ReadOnly Property CurveUseGpBxLbl As String
       Get
-         Return EgtMsg(31259)    ' Uso curve
+         Return EgtMsg(MSG_MACHININGDB + 59)          ' Uso curve
       End Get
    End Property
 
    Public ReadOnly Property SpeedGpBxLbl As String
       Get
-         Return EgtMsg(6067)     ' Rotazione
+         Return EgtMsg(MSG_TOOLSDBPAGE + 67)          ' Rotazione
       End Get
    End Property
 
    Public ReadOnly Property OvertableGpBxLbl As String
       Get
-         Return EgtMsg(6080)     ' Sovratavola
+         Return EgtMsg(6080)          ' Sovratavola
       End Get
    End Property
 
+   'Public ReadOnly Property TypeTxBl As String
+   '   Get
+   '      Return EgtMsg(31053)              ' Tipo
+   '   End Get
+   'End Property
+
    Public ReadOnly Property LeadTangTxBl As String
       Get
-         Return EgtMsg(31283)    ' Dist. tangente
+         Return EgtMsg(31283)             ' Dist. tangente
       End Get
    End Property
 
    Public ReadOnly Property LeadPerpTxBl As String
       Get
-         Return EgtMsg(31284)    ' Dist. perp.
+         Return EgtMsg(31284)             ' Dist. perp.
       End Get
    End Property
 
    Public ReadOnly Property LeadElevTxBl As String
       Get
-         Return EgtMsg(31285)    ' Elevazione
+         Return EgtMsg(31285)             ' Elevazione
       End Get
    End Property
 
    Public ReadOnly Property LeadCompLenTxBl As String
       Get
-         Return EgtMsg(31286)    ' Lungh. correz.
+         Return EgtMsg(31286)             ' Lungh. correz.
       End Get
    End Property
 
    Public ReadOnly Property AddLenTxBl As String
       Get
-         Return EgtMsg(31291)    ' Lungh. addiz.
+         Return EgtMsg(31291)             ' Lungh. addiz.
       End Get
    End Property
 
    Public ReadOnly Property EnableTxBl As String
       Get
-         Return EgtMsg(31394)    ' Abilitazione
+         Return EgtMsg(31394)             ' Abilitazione
       End Get
    End Property
 
    Public ReadOnly Property SystemNotesTxBl As String
       Get
-         Return EgtMsg(31398)    ' Note di sistema
+         Return EgtMsg(31398)             ' Note di sistema
       End Get
    End Property
 
    Public ReadOnly Property ToolNotesBxLbl As String
       Get
-         Return EgtMsg(31705)       ' Note Utensile
+         Return EgtMsg(31705)              ' Note Utensile
       End Get
    End Property
 
@@ -2387,14 +2446,14 @@ Public Class ToolTreeViewItem
       Select Case m_Type
          Case MCH_TF.SAWBLADE
             m_CoolantList = New ObservableCollection(Of Object)(
-                                       {New IdNameStruct(MCH_TC.NO, EgtMsg(90801)),       ' No
-                                        New IdNameStruct(MCH_TC.OUTER, EgtMsg(90803))})   ' Esterna
+                                       {New IdNameStruct(MCH_TC.NO, EgtMsg(MSG_COMBOBOXPARAM + 1)),
+                                        New IdNameStruct(MCH_TC.OUTER, EgtMsg(MSG_COMBOBOXPARAM + 3))})
          Case Else
             m_CoolantList = New ObservableCollection(Of Object)(
-                                       {New IdNameStruct(MCH_TC.NO, EgtMsg(90801)),       ' No
-                                        New IdNameStruct(MCH_TC.INNER, EgtMsg(90802)),    ' Interna
-                                        New IdNameStruct(MCH_TC.OUTER, EgtMsg(90803)),    ' Esterna
-                                        New IdNameStruct(MCH_TC.BOTH, EgtMsg(90804))})    ' Entrambe
+                                       {New IdNameStruct(MCH_TC.NO, EgtMsg(MSG_COMBOBOXPARAM + 1)),
+                                        New IdNameStruct(MCH_TC.INNER, EgtMsg(MSG_COMBOBOXPARAM + 2)),
+                                        New IdNameStruct(MCH_TC.OUTER, EgtMsg(MSG_COMBOBOXPARAM + 3)),
+                                        New IdNameStruct(MCH_TC.BOTH, EgtMsg(MSG_COMBOBOXPARAM + 4))})
       End Select
       NotifyPropertyChanged("CoolantList")
    End Sub
@@ -2409,22 +2468,21 @@ Public Class ToolTreeViewItem
       EgtTdbGetCurrToolParam(MCH_TP.TYPE, nValue)
       m_Type = nValue
       m_TypeM = DirectCast(nValue, MCH_TY)
-      NotifyPropertyChanged(NameOf(Type))
+      NotifyPropertyChanged("Type")
       m_delNotifyPropertyChanged("ParamPageV")
-      NotifyPropertyChanged(NameOf(TipFeedTxBl))
+      NotifyPropertyChanged("TipFeedTxBl")
       ReadToolParamList()
       EgtTdbGetCurrToolParam(MCH_TP.CORR, nValue)
       m_Corr = nValue.ToString()
-      NotifyPropertyChanged(NameOf(Corr))
+      NotifyPropertyChanged("Corr")
       m_IsModifiedCorr = False
       EgtTdbGetCurrToolParam(MCH_TP.COOLANT, nValue)
       SelCoolant = If(IsNothing(CoolantList), nValue, IdNameStruct.IndFromId(nValue, CoolantList))
-      'NotifyPropertyChanged("Coolant")
-      NotifyPropertyChanged(NameOf(SelCoolant))
+      NotifyPropertyChanged("Coolant")
       m_IsModifiedSelCoolant = False
       EgtTdbGetCurrToolParam(MCH_TP.CORNRAD, dValue)
       m_CornRad = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(CornRad))
+      NotifyPropertyChanged("CornRad")
       m_IsModifiedCornRad = False
       EgtTdbGetCurrToolParam(MCH_TP.DIAM, dValue)
       m_Diam = LenToString(dValue, 4)
@@ -2432,25 +2490,23 @@ Public Class ToolTreeViewItem
       EgtTdbGetCurrToolParam(MCH_TP.TOTDIAM, dValue)
       m_TotDiam = LenToString(dValue, 4)
       m_IsModifiedTotDiam = False
-      'ValidateProperty("TotDiam")
-      'ValidateProperty("Diam")
-      ValidateProperty(NameOf(TotDiam))
-      ValidateProperty(NameOf(Diam))
+      ValidateProperty("TotDiam")
+      ValidateProperty("Diam")
       EgtTdbGetCurrToolParam(MCH_TP.FEED, dValue)
       m_Feed = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(Feed))
+      NotifyPropertyChanged("Feed")
       m_IsModifiedFeed = False
       EgtTdbGetCurrToolParam(MCH_TP.ENDFEED, dValue)
       m_EndFeed = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(EndFeed))
+      NotifyPropertyChanged("EndFeed")
       m_IsModifiedEndFeed = False
       EgtTdbGetCurrToolParam(MCH_TP.STARTFEED, dValue)
       m_StartFeed = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(StartFeed))
+      NotifyPropertyChanged("StartFeed")
       m_IsModifiedStartFeed = False
       EgtTdbGetCurrToolParam(MCH_TP.TIPFEED, dValue)
       m_TipFeed = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(TipFeed))
+      NotifyPropertyChanged("TipFeed")
       m_IsModifiedTipFeed = False
       EgtTdbGetCurrToolParam(MCH_TP.LEN, dValue)
       m_Len = LenToString(dValue, 4)
@@ -2461,37 +2517,32 @@ Public Class ToolTreeViewItem
       EgtTdbGetCurrToolParam(MCH_TP.MAXMAT, dValue)
       m_MaxMat = LenToString(dValue, 4)
       m_IsModifiedMaxMat = False
-      'ValidateProperty("TotLen")
-      'ValidateProperty("Len")
-      'ValidateProperty("MaxMat")
-      ValidateProperty(NameOf(TotLen))
-      ValidateProperty(NameOf(Len))
-      ValidateProperty(NameOf(MaxMat))
+      ValidateProperty("TotLen")
+      ValidateProperty("Len")
+      ValidateProperty("MaxMat")
       EgtTdbGetCurrToolParam(MCH_TP.DIST, dValue)
       m_Dist = LenToString(dValue, 4)
-      'ValidateProperty("Dist")
-      ValidateProperty(NameOf(Dist))
+      ValidateProperty("Dist")
       m_IsModifiedDist = False
       EgtTdbGetCurrToolParam(MCH_TP.STEMDIAM, dValue)
       m_StemDiam = LenToString(dValue, 4)
-      'ValidateProperty("StemDiam")
-      ValidateProperty(NameOf(StemDiam))
+      ValidateProperty("StemDiam")
       m_IsModifiedStemDiam = False
       EgtTdbGetCurrToolParam(MCH_TP.LONOFFSET, dValue)
       m_LonOffset = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(LonOffset))
+      NotifyPropertyChanged("LonOffset")
       m_IsModifiedLonOffset = False
       EgtTdbGetCurrToolParam(MCH_TP.RADOFFSET, dValue)
       m_RadOffset = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(RadOffset))
+      NotifyPropertyChanged("RadOffset")
       m_IsModifiedRadOffset = False
       EgtTdbGetCurrToolValInNotes(MCH_TP.SYSNOTES, K_STEPPAR, dValue)
       m_StepPar = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(StepPar))
+      NotifyPropertyChanged("StepPar")
       m_IsModifiedStepPar = False
       EgtTdbGetCurrToolValInNotes(MCH_TP.SYSNOTES, K_SIDESTEP, dValue)
       m_SideStep = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(SideStep))
+      NotifyPropertyChanged("SideStep")
       m_IsModifiedSideStep = False
       EgtTdbGetCurrToolParam(MCH_TP.SPEED, dValue)
       m_Speed = DoubleToString(dValue, 4)
@@ -2507,25 +2558,23 @@ Public Class ToolTreeViewItem
       EgtTdbGetCurrToolParam(MCH_TP.MAXSPEED, dValue)
       m_MaxSpeed = DoubleToString(dValue, 4)
       m_IsModifiedMaxSpeed = False
-      'ValidateProperty("Speed")
-      ValidateProperty(NameOf(Speed))
-      NotifyPropertyChanged(NameOf(MaxSpeed))
+      ValidateProperty("Speed")
+      NotifyPropertyChanged("MaxSpeed")
       EgtTdbGetCurrToolParam(MCH_TP.SIDEANG, dValue)
       m_SideAng = DoubleToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(SideAng))
+      NotifyPropertyChanged("SideAng")
       m_IsModifiedSideAng = False
       EgtTdbGetCurrToolParam(MCH_TP.THICK, dValue)
       m_Thick = LenToString(dValue, 4)
       m_IsModifiedThick = False
-      'ValidateProperty("Thick")
-      ValidateProperty(NameOf(Thick))
+      ValidateProperty("Thick")
       EgtTdbGetCurrToolParam(MCH_TP.MAXABSORPTION, dValue)
       m_MaxAbsorption = DoubleToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(MaxAbsorption))
+      NotifyPropertyChanged("MaxAbsorption")
       m_IsModifiedMaxAbsorption = False
       EgtTdbGetCurrToolParam(MCH_TP.MINFEED, dValue)
       m_MinFeed = LenToString(dValue, 4)
-      NotifyPropertyChanged(NameOf(MinFeed))
+      NotifyPropertyChanged("MinFeed")
       m_IsModifiedMinFeed = False
       EgtTdbGetCurrToolParam(MCH_TP.DRAW, sValue)
       m_Draw = sValue
@@ -2535,29 +2584,27 @@ Public Class ToolTreeViewItem
       m_HeadList = New ObservableCollection(Of Object)(OrigHeadList)
       NotifyPropertyChanged("HeadList")
       For HeadIndex = 0 To m_HeadList.Count - 1
-         If sValue Is m_HeadList(HeadIndex).HName Then
+         If sValue = m_HeadList(HeadIndex).HName Then
             SelectedHead = HeadIndex
             Exit For
          End If
       Next
-      'ValidateProperty("SelectedHead")
-      ValidateProperty(NameOf(SelectedHead))
+      ValidateProperty("SelectedHead")
       EgtTdbGetCurrToolParam(MCH_TP.EXIT_, nValue)
       SelectedExit = If(IsNothing(ExitList), nValue, IdNameStruct.IndFromId(nValue, ExitList))
       m_IsModifiedSelectedExit = False
-      'ValidateProperty("SelectedExit")
-      ValidateProperty(NameOf(SelectedExit))
+      ValidateProperty("SelectedExit")
       EgtTdbGetCurrToolParam(MCH_TP.USERNOTES, sValue)
       m_UserNotes = sValue
-      NotifyPropertyChanged(NameOf(UserNotes))
+      NotifyPropertyChanged("UserNotes")
       EgtTdbGetCurrToolParam(MCH_TP.SYSNOTES, sValue)
       m_SystemNotes = sValue
-      NotifyPropertyChanged(NameOf(SystemNotes))
+      NotifyPropertyChanged("SystemNotes")
       m_IsModifiedUserNotes = False
       EgtTdbGetCurrToolParam(MCH_TP.TCPOS, sValue)
-      If TcPosList.Any(Function(n) n.Name Is sValue) Then
+      If TcPosList.Any(Function(n) n.Name = sValue) Then
          For TcPosIndex = 0 To m_TcPosList.Count - 1
-            If sValue Is m_TcPosList(TcPosIndex).Name Then
+            If sValue = m_TcPosList(TcPosIndex).Name Then
                SelectedTcPos = TcPosIndex
                m_IsModifiedSelectedTcPos = False
                Exit For
@@ -2567,7 +2614,7 @@ Public Class ToolTreeViewItem
          m_SelectedTcPos = -1
          EgtTdbSetCurrToolParam(MCH_TP.TCPOS, String.Empty)
       End If
-      NotifyPropertyChanged(NameOf(SelectedTcPos))
+      NotifyPropertyChanged("SelectedTcPos")
       EgtTdbGetCurrToolParam(MCH_TP.UUID, sValue)
       m_Uuid = sValue
 
@@ -2575,7 +2622,6 @@ Public Class ToolTreeViewItem
       m_NotesList.Clear()
       m_NotesListCombo.Clear()
       m_THolders.Clear()
-      m_ToolItemNameList.Clear()
       GetNoteList()
       GetComboNoteList()
 
@@ -2656,7 +2702,9 @@ Public Class ToolTreeViewItem
       EgtTdbSetCurrToolParam(MCH_TP.DRAW, Draw)
       EgtTdbSetCurrToolParam(MCH_TP.HEAD, HeadList(SelectedHead).HName)
       EgtTdbSetCurrToolParam(MCH_TP.USERNOTES, UserNotes)
-      sValue = CStr(If(SelectedTcPos < 0 Or SelectedTcPos >= TcPosList.Count, String.Empty, m_TcPosList(m_SelectedTcPos).Name))
+      'If String.IsNullOrEmpty(SelectedTcPos) Then m_SelectedTcPos = String.Empty
+      'EgtTdbSetCurrToolParam(MCH_TP.TCPOS, m_SelectedTcPos)
+      sValue = If(SelectedTcPos < 0 Or SelectedTcPos >= TcPosList.Count, String.Empty, m_TcPosList(m_SelectedTcPos).Name)
       EgtTdbSetCurrToolParam(MCH_TP.TCPOS, sValue)
 
       ' Scrivo le note utente
@@ -2751,13 +2799,6 @@ Public Class ToolTreeViewItem
          m_THolders.Add(Path.GetFileName(File))
       Next
 
-      ' Recupero utensile 
-      m_ToolItemNameList.Clear()
-      m_ToolItem = LibMap.refToolDbWindowVM.ToolsList.FirstOrDefault(Function(x) x.IsExpanded)
-      For IndToolItem As Integer = 0 To m_ToolItem.Items.Count - 1
-         m_ToolItemNameList.Add(m_ToolItem.Items(IndToolItem).Name)
-      Next
-
       ' Divido UserNotes in due Array di String Chiave e Valore (anche non presente)
       EgtTdbGetCurrToolParam(MCH_TP.USERNOTES, m_UserNotes)
       Dim tmpDsc As New List(Of String)
@@ -2792,8 +2833,6 @@ Public Class ToolTreeViewItem
             If tmpDsc(IndexNoteUser) = sNotes(1) Then
                If Not sNotes(0).Equals("th") Then
                   m_NotesList.Add(New NoteListBoxItem(IndexNote, sNotes(0), sNotes(1), tmpVal(IndexNoteUser)))
-               ElseIf sNotes(0).Equals("tl") Then
-                  m_NotesList.Add(New NoteListBoxItem(IndexNote, sNotes(0), sNotes(1), m_ToolItemNameList))
                Else
                   m_NotesList.Add(New NoteListBoxItem(IndexNote, sNotes(0), sNotes(1), m_THolders))
                   m_NotesList(m_NotesList.Count - 1).SelListValue = tmpVal(IndexNoteUser)
@@ -2826,7 +2865,7 @@ Public Class ToolTreeViewItem
          If ItemNote.Type.Equals("d") OrElse ItemNote.Type.Equals("l") OrElse ItemNote.Type.Equals("s") OrElse
             ItemNote.Type.Equals("dr") OrElse ItemNote.Type.Equals("lr") OrElse ItemNote.Type.Equals("sr") Then
             ItemNote.SelTypeValue = 0 ' Seleziona la TextBox
-         ElseIf ItemNote.Type.Equals("th") OrElse ItemNote.Type.Equals("tl") Then
+         ElseIf ItemNote.Type.Equals("th") Then
             ItemNote.SelTypeValue = 2 ' Seleziona la ComboBox
          Else
             ItemNote.SelTypeValue = 1 ' Seleziona la CheckBox
@@ -2841,7 +2880,6 @@ Public Class ToolTreeViewItem
       NotifyPropertyChanged(NameOf(UserNotes))
       NotifyPropertyChanged(NameOf(NotesList))
       NotifyPropertyChanged(NameOf(THolders))
-      NotifyPropertyChanged(NameOf(ToolItem))
       NotifyPropertyChanged(NameOf(ToolNoteVisibility))
    End Sub
 
@@ -2871,8 +2909,6 @@ Public Class ToolTreeViewItem
             tmpsNotes.Add(New NoteListBoxItem(IndexNote, sNotes(0), sNotes(1), ""))
          ElseIf sNotes(0).Equals("th") Then
             tmpsNotes.Add(New NoteListBoxItem(IndexNote, sNotes(0), sNotes(1), m_THolders))
-         ElseIf sNotes(0).Equals("tl") Then
-            tmpsNotes.Add(New NoteListBoxItem(IndexNote, sNotes(0), sNotes(1), m_ToolItemNameList))
          Else
             tmpsNotes.Add(New NoteListBoxItem(IndexNote, sNotes(0), sNotes(1), sNotes(2)))
          End If
@@ -2899,7 +2935,6 @@ Public Class ToolTreeViewItem
       NotifyPropertyChanged(NameOf(NotesListCombo))
       NotifyPropertyChanged(NameOf(SelNoteItemCombo))
       NotifyPropertyChanged(NameOf(THolders))
-      NotifyPropertyChanged(NameOf(ToolItem))
       NotifyPropertyChanged(NameOf(ShowNoteListCombo_Visibility))
       NotifyPropertyChanged(NameOf(ShowNoteListCombo_IsEnable))
    End Sub
@@ -2916,7 +2951,7 @@ Public Class ToolTreeViewItem
       Dim sAdvNotes As String = ""
       For IndexNote As Integer = 0 To m_NotesList.Count - 1
          ' Scrivo in MCH_TP.USERNOTES la nota modificata
-         If m_NotesList(IndexNote).Type.Equals("th") OrElse m_NotesList(IndexNote).Type.Equals("tl") Then
+         If m_NotesList(IndexNote).Type.Equals("th") Then
             sAdvNotes &= m_NotesList(IndexNote).Description & "=" & m_NotesList(IndexNote).SelListValue & ";"
          ElseIf m_NotesList(IndexNote).Type.Equals("b") OrElse m_NotesList(IndexNote).Type.Equals("br") Then
             sAdvNotes &= m_NotesList(IndexNote).Description & "=" & If(m_NotesList(IndexNote).Value.Equals("True"), "1", "0") & ";"
@@ -2997,7 +3032,6 @@ Public Class ToolTreeViewItem
                                              NoteItem.Type.Equals("lr") OrElse
                                              NoteItem.Type.Equals("sr") OrElse
                                              NoteItem.Type.Equals("br") OrElse
-                                             NoteItem.Type.Equals("tl") OrElse
                                              NoteItem.Type.Equals("th") Then UpdateSceneToolDraw()
 
       NotifyPropertyChanged(NameOf(NotesList))
@@ -3021,7 +3055,6 @@ Public Class ToolTreeViewItem
                                                 NoteItem.Type.Equals("lr") OrElse
                                                 NoteItem.Type.Equals("sr") OrElse
                                                 NoteItem.Type.Equals("br") OrElse
-                                                NoteItem.Type.Equals("tl") OrElse
                                                 NoteItem.Type.Equals("th") Then SelTool.UpdateSceneToolDraw()
 
       End If
@@ -3036,7 +3069,7 @@ Public Class ToolTreeViewItem
       Dim SelTool As ToolTreeViewItem = m_delGetSelectedTool()
       If Not IsNothing(NoteItem.SelListValue) Then
          ' Aggiorno il disegno
-         If Not m_SuspendToolDrawUpdate AndAlso (NoteItem.Type.Equals("th") OrElse NoteItem.Type.Equals("tl")) Then SelTool.UpdateSceneToolDraw()
+         If Not m_SuspendToolDrawUpdate AndAlso NoteItem.Type.Equals("th") Then SelTool.UpdateSceneToolDraw()
       End If
    End Sub
 
@@ -3077,8 +3110,8 @@ Public Class ToolTreeViewItem
 
    Private Function CreateToolDraw() As Boolean
       ' Calcolo parametri per disegno
-      Dim sHeadName As String = CStr(If(Not (IsNothing(HeadList) OrElse HeadList.Count = 0) And SelectedHead <> -1 AndAlso Not IsNothing(HeadList(SelectedHead)), HeadList(SelectedHead).HName, ""))
-      Dim nExit As Integer = 0 : If Not (IsNothing(ExitList) OrElse ExitList.Count = 0) And SelectedExit <> -1 AndAlso Not IsNothing(ExitList(SelectedExit)) AndAlso Not IsNothing(ExitList(SelectedExit).Name) Then StringToInt(CStr(ExitList(SelectedExit).Name), nExit)
+      Dim sHeadName As String = If(Not (IsNothing(HeadList) OrElse HeadList.Count = 0) And SelectedHead <> -1 AndAlso Not IsNothing(HeadList(SelectedHead)), HeadList(SelectedHead).HName, "")
+      Dim nExit As Integer = 0 : If Not (IsNothing(ExitList) OrElse ExitList.Count = 0) And SelectedExit <> -1 AndAlso Not IsNothing(ExitList(SelectedExit)) AndAlso Not IsNothing(ExitList(SelectedExit).Name) Then StringToInt(ExitList(SelectedExit).Name, nExit)
       Dim nType As Integer = Type
       Dim dTotLen As Double = 0 : StringToLen(TotLen, dTotLen)
       Dim dLen As Double = 0 : StringToLen(Len, dLen)
@@ -3415,11 +3448,11 @@ Public Class ToolTreeViewItem
       m_NameError = String.Empty
       Select Case nErrorToolName
          Case 1
-            m_NameError = EgtMsg(31403)      ' Nome non valido
+            m_NameError = EgtMsg(MSG_MACHININGDBERRORS + 3)
          Case 2
-            m_NameError = EgtMsg(31404)      ' I caratteri \ / : * ? " < > | non sono permessi
+            m_NameError = EgtMsg(MSG_MACHININGDBERRORS + 4)
       End Select
-      NotifyPropertyChanged(NameOf(NameErrorMsg))
+      NotifyPropertyChanged("NameErrorMsg")
       If String.IsNullOrEmpty(m_NameError) Then
          Return True
       Else
@@ -3435,10 +3468,10 @@ Public Class ToolTreeViewItem
          Dim dMaxSpeed As Double = 0
          StringToDouble(m_MaxSpeed, dMaxSpeed)
          If Math.Abs(dSpeed) > dMaxSpeed + EPS_ZERO Then
-            m_SpeedError = EgtMsg(31111)     ' La Rotazione deve essere minore della Rotazione Massima
+            m_SpeedError = EgtMsg(MSG_TOOLDBERRORS + 11)
          End If
       End If
-      NotifyPropertyChanged(NameOf(SpeedErrorMsg))
+      NotifyPropertyChanged("SpeedErrorMsg")
       If String.IsNullOrEmpty(m_SpeedError) Then
          Return True
       Else
@@ -3452,10 +3485,10 @@ Public Class ToolTreeViewItem
          Dim dTotDiam As Double = 0
          StringToLen(m_TotDiam, dTotDiam)
          If dTotDiam < EPS_SMALL Then
-            m_TotDiamError = EgtMsg(31120)      ' Il Diametro Totale deve essere maggiore di 0
+            m_TotDiamError = EgtMsg(31120)                ' Il Diametro Totale deve essere maggiore di 0
          End If
       End If
-      NotifyPropertyChanged(NameOf(TotDiamErrorMsg))
+      NotifyPropertyChanged("TotDiamErrorMsg")
       If String.IsNullOrEmpty(m_TotDiamError) Then
          Return True
       Else
@@ -3470,10 +3503,10 @@ Public Class ToolTreeViewItem
          Dim dThick As Double = 0
          StringToLen(m_Thick, dThick)
          If (m_Type = MCH_TY.SAW_FLAT Or m_Type = MCH_TY.SAW_STD) And dCornRad > 0.5 * dThick Then
-            m_CornRadError = EgtMsg(31135)      ' Raggio Corner ha un valore troppo grande
+            m_CornRadError = EgtMsg(31135)                                    ' Raggio Corner ha un valore troppo grande
          End If
       End If
-      NotifyPropertyChanged(NameOf(CornRadErrorMsg))
+      NotifyPropertyChanged("CornRadErrorMsg")
       Return String.IsNullOrEmpty(m_CornRadError)
    End Function
 
@@ -3483,17 +3516,17 @@ Public Class ToolTreeViewItem
          Dim dDiam As Double = 0
          StringToLen(m_Diam, dDiam)
          If dDiam < -EPS_SMALL Then
-            m_DiamError = EgtMsg(31109)         ' Il Diametro deve essere maggiore di 0
+            m_DiamError = EgtMsg(31109)                         ' Il Diametro deve essere maggiore di 0
          End If
          If Not IsNothing(m_TotDiam) Then
             Dim dTotDiam As Double = 0
             StringToLen(m_TotDiam, dTotDiam)
             If dDiam > dTotDiam + EPS_SMALL Then
-               m_DiamError = EgtMsg(31118)      ' Il Diametro deve essere minore del Diametro Totale
+               m_DiamError = EgtMsg(31118)                      ' Il Diametro deve essere minore del Diametro Totale
             End If
          End If
       End If
-      NotifyPropertyChanged(NameOf(DiamErrorMsg))
+      NotifyPropertyChanged("DiamErrorMsg")
       If String.IsNullOrEmpty(m_DiamError) Then
          Return True
       Else
@@ -3506,10 +3539,10 @@ Public Class ToolTreeViewItem
          Dim dTotLen As Double = 0
          StringToLen(m_TotLen, dTotLen)
          If dTotLen < EPS_SMALL Then
-            m_TotLenError = EgtMsg(31115)    ' La Lunghezza Totale deve essere maggiore di 0
+            m_TotLenError = EgtMsg(MSG_TOOLDBERRORS + 15)
          End If
       End If
-      NotifyPropertyChanged(NameOf(TotLenErrorMsg))
+      NotifyPropertyChanged("TotLenErrorMsg")
       If String.IsNullOrEmpty(m_TotLenError) Then
          Return True
       Else
@@ -3523,17 +3556,17 @@ Public Class ToolTreeViewItem
          Dim dLen As Double = 0
          StringToLen(m_Len, dLen)
          If dLen < EPS_SMALL Then
-            m_LenError = EgtMsg(31110)       ' La Lunghezza deve essere maggiore di 0
+            m_LenError = EgtMsg(MSG_TOOLDBERRORS + 10)
          End If
          If Not IsNothing(m_TotLen) Then
             Dim dTotLen As Double = 0
             StringToLen(m_TotLen, dTotLen)
             If dLen > dTotLen + EPS_SMALL Then
-               m_LenError = EgtMsg(31113)    ' La Lunghezza deve essere minore della Lunghezza Totale
+               m_LenError = EgtMsg(MSG_TOOLDBERRORS + 13)
             End If
          End If
       End If
-      NotifyPropertyChanged(NameOf(LenErrorMsg))
+      NotifyPropertyChanged("LenErrorMsg")
       If String.IsNullOrEmpty(m_LenError) Then
          Return True
       Else
@@ -3543,7 +3576,7 @@ Public Class ToolTreeViewItem
 
    Private Function ValidateDist() As Boolean
       m_DistError = String.Empty
-      NotifyPropertyChanged(NameOf(DistErrorMsg))
+      NotifyPropertyChanged("DistErrorMsg")
       Return String.IsNullOrEmpty(m_DistError)
    End Function
 
@@ -3555,9 +3588,9 @@ Public Class ToolTreeViewItem
          ' Non ammesso valore nullo o negativo
          If dMaxMat < EPS_SMALL Then
             If ToolDbWindowVM.m_MatType = MaterialType.BEAM And (Type And MCH_TF.MILL) <> 0 Then
-               m_MaxMatError = EgtMsg(31142)    ' Il Tagliente deve essere maggiore di 0
+               m_MaxMatError = EgtMsg(31142)             ' Il Tagliente deve essere maggiore di 0
             Else
-               m_MaxMatError = EgtMsg(31106)    ' Il Massimo Materiale deve essere maggiore di 0
+               m_MaxMatError = EgtMsg(31106)             ' Il Massimo Materiale deve essere maggiore di 0
             End If
          End If
          ' Per getto d'acqua
@@ -3580,15 +3613,15 @@ Public Class ToolTreeViewItem
                StringToLen(m_Len, dLen)
                If dMaxMat > dLen + EPS_SMALL Then
                   If ToolDbWindowVM.m_MatType = MaterialType.BEAM And (Type And MCH_TF.MILL) <> 0 Then
-                     m_MaxMatError = EgtMsg(31143)    ' Il Tagliente deve essere minore di Len
+                     m_MaxMatError = EgtMsg(31143)       ' Il Tagliente deve essere minore di Len
                   Else
-                     m_MaxMatError = EgtMsg(31107)    ' Il Massimo Materiale deve essere minore di Len
+                     m_MaxMatError = EgtMsg(31107)       ' Il Massimo Materiale deve essere minore di Len
                   End If
                End If
             End If
          End If
       End If
-      NotifyPropertyChanged(NameOf(MaxMatErrorMsg))
+      NotifyPropertyChanged("MaxMatErrorMsg")
       If String.IsNullOrEmpty(m_MaxMatError) Then
          Return True
       Else
@@ -3601,10 +3634,10 @@ Public Class ToolTreeViewItem
          Dim dThick As Double = 0
          StringToLen(m_Thick, dThick)
          If (m_Type = MCH_TY.SAW_FLAT Or m_Type = MCH_TY.SAW_STD Or m_Type = MCH_TY.MORTISE_STD) And dThick < EPS_SMALL Then
-            m_ThickError = EgtMsg(31108)     ' Lo Spessore deve essere maggiore di 0
+            m_ThickError = EgtMsg(MSG_TOOLDBERRORS + 8)
          End If
       End If
-      NotifyPropertyChanged(NameOf(ThickErrorMsg))
+      NotifyPropertyChanged("ThickErrorMsg")
       If String.IsNullOrEmpty(m_ThickError) Then
          Return True
       Else
@@ -3651,7 +3684,7 @@ Public Class ToolTreeViewItem
       ElseIf m_nDrawingError <> 0 Then
          m_DrawError = EgtMsg(31105)              ' Impossibile creare l'utensile con questi parametri
       End If
-      NotifyPropertyChanged(NameOf(DrawErrorMsg))
+      NotifyPropertyChanged("DrawErrorMsg")
       If String.IsNullOrEmpty(m_DrawError) Then
          Return True
       Else
@@ -3661,15 +3694,15 @@ Public Class ToolTreeViewItem
    Private Function ValidateSelectedHead() As Boolean
       m_SelectedHeadError = String.Empty
       If IsNothing(m_SelectedHead) Then
-         m_SelectedHeadError = EgtMsg(31127)          ' Impostare il tipo di testa.
+         m_SelectedHeadError = EgtMsg(MSG_TOOLDBERRORS + 27)
       Else
          If Not IsNothing(m_HeadList) Then
             If (m_SelectedHead < 0 Or m_SelectedHead >= m_HeadList.Count) OrElse IsNothing(m_HeadList(m_SelectedHead)) Then
-               m_SelectedHeadError = EgtMsg(31127)    ' Impostare il tipo di testa.
+               m_SelectedHeadError = EgtMsg(MSG_TOOLDBERRORS + 27)
             End If
          End If
       End If
-      NotifyPropertyChanged(NameOf(SelectedHeadErrorMsg))
+      NotifyPropertyChanged("SelectedHeadErrorMsg")
       If String.IsNullOrEmpty(m_SelectedHeadError) Then
          Return True
       Else
@@ -3680,15 +3713,15 @@ Public Class ToolTreeViewItem
    Private Function ValidateSelectedExit() As Boolean
       m_SelectedExitError = String.Empty
       If IsNothing(m_SelectedExit) Then
-         m_SelectedExitError = EgtMsg(31128)          ' Impostare il tipo di uscita.
+         m_SelectedExitError = EgtMsg(MSG_TOOLDBERRORS + 28)
       Else
          If Not IsNothing(m_ExitList) Then
             If (m_SelectedExit < 0 Or m_SelectedExit >= m_ExitList.Count) OrElse IsNothing(m_ExitList(m_SelectedExit)) Then
-               m_SelectedExitError = EgtMsg(31128)    ' Impostare il tipo di uscita.
+               m_SelectedExitError = EgtMsg(MSG_TOOLDBERRORS + 28)
             End If
          End If
       End If
-      NotifyPropertyChanged(NameOf(SelectedExitErrorMsg))
+      NotifyPropertyChanged("SelectedExitErrorMsg")
       If String.IsNullOrEmpty(m_SelectedExitError) Then
          Return True
       Else
@@ -3714,25 +3747,33 @@ Public Class ToolTreeViewItem
       End Get
    End Property
 
+   '''' <summary>
+   '''' Creata the new tool.  This method is invoked by the NewCommand.
+   '''' </summary>
+   'Public Sub OpenDrawFile(ByVal param As Object)
+   '   Dim OpenFileDialog As New EgtWPFLib5.EgtOpenFileDialog With {
+   '      .Title = "Open draw file",
+   '      .Filter = "*.nge",
+   '      .FileNameFilter = AddressOf FilterFileName,
+   '      .Directory = ToolDbWindowVM.m_sToolDirPath,
+   '      .FileName = m_Draw
+   '   }
+   '   If OpenFileDialog.EgtShowDialog <> True Then Return
+   '   m_Draw = Path.GetFileName(OpenFileDialog.FileName)
+   '   UpdateSceneToolDraw()
+   'End Sub
+
    ''' <summary>
    ''' Creata the new tool.  This method is invoked by the NewCommand.
    ''' </summary>
    Public Sub OpenDrawFile(ByVal param As Object)
-      Dim OpenFileDialog As New Microsoft.Win32.OpenFileDialog With {
-         .Title = "Open draw file",
-         .DefaultExt = ".nge",
-         .Filter = "File Nge (.nge)|*.nge",
-         .InitialDirectory = ToolDbWindowVM.m_sToolDirPath,
-         .FileName = m_Draw
-      }
+      Dim OpenFileDialog As New Microsoft.Win32.OpenFileDialog()
+      OpenFileDialog.Title = "Open draw file"
+      OpenFileDialog.DefaultExt = ".nge"
+      OpenFileDialog.Filter = "File Nge (.nge)|*.nge"
+      OpenFileDialog.InitialDirectory = ToolDbWindowVM.m_sToolDirPath
+      OpenFileDialog.FileName = m_Draw
       If OpenFileDialog.ShowDialog <> True Then Return
-      'Dim OpenFileDialog As New EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
-      '   .Title = "Open draw file",
-      '   .InitialDirectory = ToolDbWindowVM.m_sToolDirPath,
-      '   .Filter = "File Nge (.nge)|*.nge",
-      '   .FileName = m_Draw
-      '}
-      'If OpenFileDialog.ShowDialog() <> Windows.Forms.DialogResult.OK Then Return
       m_Draw = Path.GetFileName(OpenFileDialog.FileName)
       ' Se il file è preso da una cartella diversa da quella degli utensili viene copiato nella cartella degli utensili
       Dim sFilePath As String = Path.GetDirectoryName(OpenFileDialog.FileName)
@@ -3832,6 +3873,47 @@ Public Class HeadItem
 
 End Class
 
+''' <summary>
+''' Class that represent a Converter that use tool type and param type, to set the visibility state of the param type.
+''' </summary>
+Public Class ToolParamVisibilityConverter
+   Implements IValueConverter
+
+   Public Function Convert(value As Object, targetType As Type, parameter As Object, culture As System.Globalization.CultureInfo) As Object Implements IValueConverter.Convert
+      Select Case CInt(value)
+         Case MCH_TY.NONE
+            Return Visibility.Hidden
+         Case MCH_TY.DRILL_STD
+            Return TMDbParamVisibility.Drill_Std(CInt(parameter))
+         Case MCH_TY.DRILL_LONG
+            Return TMDbParamVisibility.Drill_Long(CInt(parameter))
+         Case MCH_TY.SAW_STD
+            Return TMDbParamVisibility.Saw_Std(CInt(parameter))
+         Case MCH_TY.SAW_FLAT
+            Return TMDbParamVisibility.Saw_Flat(CInt(parameter))
+         Case MCH_TY.MILL_STD
+            Return TMDbParamVisibility.Mill_Std(CInt(parameter))
+         Case MCH_TY.MILL_NOTIP
+            Return TMDbParamVisibility.Mill_NoTip(CInt(parameter))
+         Case MCH_TY.MORTISE_STD
+            Return TMDbParamVisibility.Mortise_Std(CInt(parameter))
+         Case MCH_TY.CHISEL_STD
+            Return TMDbParamVisibility.Chisel_Std(CInt(parameter))
+         Case MCH_TY.COMPO
+            Return TMDbParamVisibility.Compo(CInt(parameter))
+         Case MCH_TY.WATERJET
+            Return TMDbParamVisibility.Waterjet(CInt(parameter))
+         Case Else
+            Return Visibility.Hidden
+      End Select
+   End Function
+
+   Public Function ConvertBack(value As Object, targetType As Type, parameter As Object, culture As System.Globalization.CultureInfo) As Object Implements IValueConverter.ConvertBack
+      Throw New NotImplementedException
+   End Function
+
+End Class
+
 ''' <summary>
 ''' Class that represent a Converter that convert UUID to ***** in Draw param
 ''' </summary>
diff --git a/ToolDbWindow/WaterjetParamPageV.xaml b/ToolDbWindow/WaterjetParamPageV.xaml
index 54198c3..3ae4881 100644
--- a/ToolDbWindow/WaterjetParamPageV.xaml
+++ b/ToolDbWindow/WaterjetParamPageV.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="WaterjetParamPageV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5"
              x:Name="PIPPO">
 
@@ -129,8 +130,35 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:ToolParamVisibilityConverter x:Key="ToolParamVisibilityConverter"/>
          <EgtWPFLib5:ToolDrawUUIDConverter x:Key="ToolDrawUUIDConverter"/>
          <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Corr">0</sys:Int32>
+         <sys:Int32 x:Key="ExitPar">1</sys:Int32>
+         <sys:Int32 x:Key="Coolant">2</sys:Int32>
+         <sys:Int32 x:Key="CornRad">3</sys:Int32>
+         <sys:Int32 x:Key="Diam">4</sys:Int32>
+         <sys:Int32 x:Key="TotDiam">5</sys:Int32>
+         <sys:Int32 x:Key="Feed">6</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">7</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">8</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">9</sys:Int32>
+         <sys:Int32 x:Key="Len">10</sys:Int32>
+         <sys:Int32 x:Key="TotLen">11</sys:Int32>
+         <sys:Int32 x:Key="MaxMat">12</sys:Int32>
+         <sys:Int32 x:Key="LonOffset">13</sys:Int32>
+         <sys:Int32 x:Key="RadOffset">14</sys:Int32>
+         <sys:Int32 x:Key="Speed">15</sys:Int32>
+         <sys:Int32 x:Key="SideAng">16</sys:Int32>
+         <sys:Int32 x:Key="MaxSpeed">17</sys:Int32>
+         <sys:Int32 x:Key="Thick">18</sys:Int32>
+         <sys:Int32 x:Key="MaxAbsorption">19</sys:Int32>
+         <sys:Int32 x:Key="MinFeed">20</sys:Int32>
+         <sys:Int32 x:Key="Draw">21</sys:Int32>
+         <sys:Int32 x:Key="Head">22</sys:Int32>
+         <sys:Int32 x:Key="NamePar">23</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">24</sys:Int32>
+         <sys:Int32 x:Key="TcPos">25</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
@@ -171,6 +199,9 @@
 
                   <TextBlock Text="{Binding DrawTxBl}"
                              Foreground="{Binding ElementName=PIPPO, Path=MyForegroundGrbColor}"
+                             Visibility="{Binding Path=Type, 
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}"
                              Style="{DynamicResource MachiningsToolTextBlock}"/>
                   <Grid Grid.Column="1">
                      <Grid.ColumnDefinitions>
@@ -178,7 +209,10 @@
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="Auto"/>
                      </Grid.ColumnDefinitions>
-                     <Border BorderThickness="0.5,1,0.5,0.5" Margin="0,3,0,0" BorderBrush="#FFABAdB3">
+                     <Border BorderThickness="0.5,1,0.5,0.5" Margin="0,3,0,0" BorderBrush="#FFABAdB3"
+                             Visibility="{Binding Path=Type,
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}">
                         <TextBlock Name="DrawTxBx" Grid.Column="0" Margin="3,0,0,0"
                                    VerticalAlignment="Center" Foreground="Gray"
                                    ToolTip="{Binding Path=Draw, UpdateSourceTrigger=PropertyChanged,
@@ -190,16 +224,21 @@
                      </Border>
                      <Button Grid.Column="1" Style="{DynamicResource Manage_ButtonStyle}" Content="A"
                              Command="{Binding Path=AutoDrawCommand}"
-                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"/>
+                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
+                             Visibility="{Binding Path=Type,
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}"/>
                      <Button Grid.Column="2" Style="{DynamicResource Manage_ButtonStyle}" Content=". . ."
                              Command="{Binding Path=OpenDrawFileCommand}"
-                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"/>
+                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
+                             Visibility="{Binding Path=Type,
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}"/>
                   </Grid>
                   <TextBlock Grid.Row="1" Grid.ColumnSpan="2" Style="{DynamicResource ValidationErrorTextBlock}"
                              Text="{Binding Path=DrawErrorMsg}"
                              Visibility="{Binding Path=DrawErrorMsg,
-                                                  Converter={StaticResource ErrorVisibilityConverter}}"
-                             Margin="0,0,5,0"/>
+                                                  Converter={StaticResource ErrorVisibilityConverter}}" Margin="0,0,5,0"/>
 
                </Grid>
             </Grid>
diff --git a/ToolDbWindow/WoodDrillParamPageV.xaml b/ToolDbWindow/WoodDrillParamPageV.xaml
index 83026db..c0478b7 100644
--- a/ToolDbWindow/WoodDrillParamPageV.xaml
+++ b/ToolDbWindow/WoodDrillParamPageV.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="WoodDrillParamPageV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
 
    <UserControl.Resources>
@@ -17,8 +18,35 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:ToolParamVisibilityConverter x:Key="ToolParamVisibilityConverter"/>
          <EgtWPFLib5:ToolDrawUUIDConverter x:Key="ToolDrawUUIDConverter"/>
          <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Corr">0</sys:Int32>
+         <sys:Int32 x:Key="ExitPar">1</sys:Int32>
+         <sys:Int32 x:Key="Coolant">2</sys:Int32>
+         <sys:Int32 x:Key="CornRad">3</sys:Int32>
+         <sys:Int32 x:Key="Diam">4</sys:Int32>
+         <sys:Int32 x:Key="TotDiam">5</sys:Int32>
+         <sys:Int32 x:Key="Feed">6</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">7</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">8</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">9</sys:Int32>
+         <sys:Int32 x:Key="Len">10</sys:Int32>
+         <sys:Int32 x:Key="TotLen">11</sys:Int32>
+         <sys:Int32 x:Key="MaxMat">12</sys:Int32>
+         <sys:Int32 x:Key="LonOffset">13</sys:Int32>
+         <sys:Int32 x:Key="RadOffset">14</sys:Int32>
+         <sys:Int32 x:Key="Speed">15</sys:Int32>
+         <sys:Int32 x:Key="SideAng">16</sys:Int32>
+         <sys:Int32 x:Key="MaxSpeed">17</sys:Int32>
+         <sys:Int32 x:Key="Thick">18</sys:Int32>
+         <sys:Int32 x:Key="MaxAbsorption">19</sys:Int32>
+         <sys:Int32 x:Key="MinFeed">20</sys:Int32>
+         <sys:Int32 x:Key="Draw">21</sys:Int32>
+         <sys:Int32 x:Key="Head">22</sys:Int32>
+         <sys:Int32 x:Key="NamePar">23</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">24</sys:Int32>
+         <sys:Int32 x:Key="TcPos">25</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
@@ -58,6 +86,9 @@
                   </Grid.RowDefinitions>
 
                   <TextBlock Text="{Binding DrawTxBl}"
+                             Visibility="{Binding Path=Type, 
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}"
                              Style="{DynamicResource MachiningsToolTextBlock}"/>
                   <Grid Grid.Column="1">
                      <Grid.ColumnDefinitions>
@@ -65,7 +96,10 @@
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="Auto"/>
                      </Grid.ColumnDefinitions>
-                     <Border BorderThickness="0.5,1,0.5,0.5" Margin="0,3,0,0" BorderBrush="#FFABAdB3">
+                     <Border BorderThickness="0.5,1,0.5,0.5" Margin="0,3,0,0" BorderBrush="#FFABAdB3"
+                             Visibility="{Binding Path=Type,
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}">
                         <TextBlock Name="DrawTxBx" Grid.Column="0" Margin="3,0,0,0"
                                    VerticalAlignment="Center" Foreground="Gray"
                                    ToolTip="{Binding Path=Draw, UpdateSourceTrigger=PropertyChanged,
@@ -77,16 +111,21 @@
                      </Border>
                      <Button Grid.Column="1" Style="{DynamicResource AutoDrawButtonMargin}" Content="A"
                              Command="{Binding Path=AutoDrawCommand}"
-                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"/>
+                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
+                             Visibility="{Binding Path=Type,
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}"/>
                      <Button Grid.Column="2" Style="{DynamicResource OpenDrawFileButtonMargin}" Content=". . ."
                              Command="{Binding Path=OpenDrawFileCommand}"
-                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"/>
+                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
+                             Visibility="{Binding Path=Type,
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}"/>
                   </Grid>
                   <TextBlock Grid.Row="1" Grid.ColumnSpan="2" Style="{DynamicResource ValidationErrorTextBlock}"
                              Text="{Binding Path=DrawErrorMsg}"
                              Visibility="{Binding Path=DrawErrorMsg,
-                                                  Converter={StaticResource ErrorVisibilityConverter}}"
-                             Margin="0,0,5,0"/>
+                                                  Converter={StaticResource ErrorVisibilityConverter}}" Margin="0,0,5,0"/>
 
                </Grid>
             </Grid>
diff --git a/ToolDbWindow/WoodMillParamPageV.xaml b/ToolDbWindow/WoodMillParamPageV.xaml
index d66c706..2ceed86 100644
--- a/ToolDbWindow/WoodMillParamPageV.xaml
+++ b/ToolDbWindow/WoodMillParamPageV.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="WoodMillParamPageV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
 
    <UserControl.Resources>
@@ -17,8 +18,35 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:ToolParamVisibilityConverter x:Key="ToolParamVisibilityConverter"/>
          <EgtWPFLib5:ToolDrawUUIDConverter x:Key="ToolDrawUUIDConverter"/>
          <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Corr">0</sys:Int32>
+         <sys:Int32 x:Key="ExitPar">1</sys:Int32>
+         <sys:Int32 x:Key="Coolant">2</sys:Int32>
+         <sys:Int32 x:Key="CornRad">3</sys:Int32>
+         <sys:Int32 x:Key="Diam">4</sys:Int32>
+         <sys:Int32 x:Key="TotDiam">5</sys:Int32>
+         <sys:Int32 x:Key="Feed">6</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">7</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">8</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">9</sys:Int32>
+         <sys:Int32 x:Key="Len">10</sys:Int32>
+         <sys:Int32 x:Key="TotLen">11</sys:Int32>
+         <sys:Int32 x:Key="MaxMat">12</sys:Int32>
+         <sys:Int32 x:Key="LonOffset">13</sys:Int32>
+         <sys:Int32 x:Key="RadOffset">14</sys:Int32>
+         <sys:Int32 x:Key="Speed">15</sys:Int32>
+         <sys:Int32 x:Key="SideAng">16</sys:Int32>
+         <sys:Int32 x:Key="MaxSpeed">17</sys:Int32>
+         <sys:Int32 x:Key="Thick">18</sys:Int32>
+         <sys:Int32 x:Key="MaxAbsorption">19</sys:Int32>
+         <sys:Int32 x:Key="MinFeed">20</sys:Int32>
+         <sys:Int32 x:Key="Draw">21</sys:Int32>
+         <sys:Int32 x:Key="Head">22</sys:Int32>
+         <sys:Int32 x:Key="NamePar">23</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">24</sys:Int32>
+         <sys:Int32 x:Key="TcPos">25</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
@@ -58,6 +86,9 @@
                   </Grid.RowDefinitions>
 
                   <TextBlock Text="{Binding DrawTxBl}"
+                             Visibility="{Binding Path=Type, 
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}"
                              Style="{DynamicResource MachiningsToolTextBlock}"/>
                   <Grid Grid.Column="1">
                      <Grid.ColumnDefinitions>
@@ -65,7 +96,10 @@
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="Auto"/>
                      </Grid.ColumnDefinitions>
-                     <Border BorderThickness="0.5,1,0.5,0.5" Margin="0,3,0,0" BorderBrush="#FFABAdB3">
+                     <Border BorderThickness="0.5,1,0.5,0.5" Margin="0,3,0,0" BorderBrush="#FFABAdB3"
+                             Visibility="{Binding Path=Type,
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}">
                         <TextBlock Name="DrawTxBx" Grid.Column="0" Margin="3,0,0,0"
                                    VerticalAlignment="Center" Foreground="Gray"
                                    ToolTip="{Binding Path=Draw, UpdateSourceTrigger=PropertyChanged,
@@ -77,16 +111,21 @@
                      </Border>
                      <Button Grid.Column="1" Style="{DynamicResource AutoDrawButtonMargin}" Content="A"
                              Command="{Binding Path=AutoDrawCommand}"
-                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"/>
+                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
+                             Visibility="{Binding Path=Type,
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}"/>
                      <Button Grid.Column="2" Style="{DynamicResource OpenDrawFileButtonMargin}" Content=". . ."
                              Command="{Binding Path=OpenDrawFileCommand}"
-                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"/>
+                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
+                             Visibility="{Binding Path=Type,
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}"/>
                   </Grid>
                   <TextBlock Grid.Row="1" Grid.ColumnSpan="2" Style="{DynamicResource ValidationErrorTextBlock}"
                              Text="{Binding Path=DrawErrorMsg}"
                              Visibility="{Binding Path=DrawErrorMsg,
-                                                  Converter={StaticResource ErrorVisibilityConverter}}"
-                             Margin="0,0,5,0"/>
+                                                  Converter={StaticResource ErrorVisibilityConverter}}" Margin="0,0,5,0"/>
 
                </Grid>
             </Grid>
diff --git a/ToolDbWindow/WoodSawParamPageV.xaml b/ToolDbWindow/WoodSawParamPageV.xaml
index 3d788be..55fadbf 100644
--- a/ToolDbWindow/WoodSawParamPageV.xaml
+++ b/ToolDbWindow/WoodSawParamPageV.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="WoodSawParamPageV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
 
    <UserControl.Resources>
@@ -17,8 +18,35 @@
       </Grid.ColumnDefinitions>
 
       <Grid.Resources>
+         <EgtWPFLib5:ToolParamVisibilityConverter x:Key="ToolParamVisibilityConverter"/>
          <EgtWPFLib5:ToolDrawUUIDConverter x:Key="ToolDrawUUIDConverter"/>
          <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+         <sys:Int32 x:Key="Corr">0</sys:Int32>
+         <sys:Int32 x:Key="ExitPar">1</sys:Int32>
+         <sys:Int32 x:Key="Coolant">2</sys:Int32>
+         <sys:Int32 x:Key="CornRad">3</sys:Int32>
+         <sys:Int32 x:Key="Diam">4</sys:Int32>
+         <sys:Int32 x:Key="TotDiam">5</sys:Int32>
+         <sys:Int32 x:Key="Feed">6</sys:Int32>
+         <sys:Int32 x:Key="EndFeed">7</sys:Int32>
+         <sys:Int32 x:Key="StartFeed">8</sys:Int32>
+         <sys:Int32 x:Key="TipFeed">9</sys:Int32>
+         <sys:Int32 x:Key="Len">10</sys:Int32>
+         <sys:Int32 x:Key="TotLen">11</sys:Int32>
+         <sys:Int32 x:Key="MaxMat">12</sys:Int32>
+         <sys:Int32 x:Key="LonOffset">13</sys:Int32>
+         <sys:Int32 x:Key="RadOffset">14</sys:Int32>
+         <sys:Int32 x:Key="Speed">15</sys:Int32>
+         <sys:Int32 x:Key="SideAng">16</sys:Int32>
+         <sys:Int32 x:Key="MaxSpeed">17</sys:Int32>
+         <sys:Int32 x:Key="Thick">18</sys:Int32>
+         <sys:Int32 x:Key="MaxAbsorption">19</sys:Int32>
+         <sys:Int32 x:Key="MinFeed">20</sys:Int32>
+         <sys:Int32 x:Key="Draw">21</sys:Int32>
+         <sys:Int32 x:Key="Head">22</sys:Int32>
+         <sys:Int32 x:Key="NamePar">23</sys:Int32>
+         <sys:Int32 x:Key="UserNotes">24</sys:Int32>
+         <sys:Int32 x:Key="TcPos">25</sys:Int32>
       </Grid.Resources>
 
       <Grid Grid.Column="0">
@@ -58,6 +86,9 @@
                   </Grid.RowDefinitions>
 
                   <TextBlock Text="{Binding DrawTxBl}"
+                             Visibility="{Binding Path=Type, 
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}"
                              Style="{DynamicResource MachiningsToolTextBlock}"/>
                   <Grid Grid.Column="1">
                      <Grid.ColumnDefinitions>
@@ -65,7 +96,10 @@
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="Auto"/>
                      </Grid.ColumnDefinitions>
-                     <Border BorderThickness="0.5,1,0.5,0.5" Margin="0,3,0,0" BorderBrush="#FFABAdB3">
+                     <Border BorderThickness="0.5,1,0.5,0.5" Margin="0,3,0,0" BorderBrush="#FFABAdB3"
+                             Visibility="{Binding Path=Type,
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}">
                         <TextBlock Name="DrawTxBx" Grid.Column="0" Margin="3,0,0,0"
                                    VerticalAlignment="Center" Foreground="Gray"
                                    ToolTip="{Binding Path=Draw, UpdateSourceTrigger=PropertyChanged,
@@ -77,16 +111,21 @@
                      </Border>
                      <Button Grid.Column="1" Style="{DynamicResource AutoDrawButtonMargin}" Content="A"
                              Command="{Binding Path=AutoDrawCommand}"
-                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"/>
+                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
+                             Visibility="{Binding Path=Type,
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}"/>
                      <Button Grid.Column="2" Style="{DynamicResource OpenDrawFileButtonMargin}" Content=". . ."
                              Command="{Binding Path=OpenDrawFileCommand}"
-                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"/>
+                             Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
+                             Visibility="{Binding Path=Type,
+                                                  Converter={StaticResource ToolParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Draw}}"/>
                   </Grid>
                   <TextBlock Grid.Row="1" Grid.ColumnSpan="2" Style="{DynamicResource ValidationErrorTextBlock}"
                              Text="{Binding Path=DrawErrorMsg}"
                              Visibility="{Binding Path=DrawErrorMsg,
-                                                  Converter={StaticResource ErrorVisibilityConverter}}"
-                             Margin="0,0,5,0"/>
+                                                  Converter={StaticResource ErrorVisibilityConverter}}" Margin="0,0,5,0"/>
 
                </Grid>
             </Grid>
diff --git a/Utility/InheritableTreeViewItem.vb b/Utility/InheritableTreeViewItem.vb
index 498cf63..1f58be2 100644
--- a/Utility/InheritableTreeViewItem.vb
+++ b/Utility/InheritableTreeViewItem.vb
@@ -12,7 +12,7 @@ Public Class InheritableTreeViewItem
       Set(value As String)
          If (value <> m_Name) Then
             m_Name = value
-            NotifyPropertyChanged(NameOf(Name))
+            NotifyPropertyChanged("Name")
          End If
       End Set
    End Property
@@ -32,7 +32,7 @@ Public Class InheritableTreeViewItem
       Set(value As Boolean)
          If (value <> m_IsSelected) Then
             m_IsSelected = value
-            NotifyPropertyChanged(NameOf(IsSelected))
+            NotifyPropertyChanged("IsSelected")
          End If
       End Set
    End Property
@@ -45,7 +45,7 @@ Public Class InheritableTreeViewItem
       Set(value As Boolean)
          If (value <> m_isExpanded) Then
             m_isExpanded = value
-            NotifyPropertyChanged(NameOf(IsExpanded))
+            NotifyPropertyChanged("IsExpanded")
          End If
       End Set
    End Property
@@ -58,7 +58,7 @@ Public Class InheritableTreeViewItem
       Set(value As Boolean)
          If value <> m_IsActive Then
             m_IsActive = value
-            NotifyPropertyChanged(NameOf(IsActive))
+            NotifyPropertyChanged("IsActive")
          End If
       End Set
    End Property
@@ -70,7 +70,7 @@ Public Class InheritableTreeViewItem
       End Get
       Set(value As Boolean)
          m_IsEnabled = value
-         NotifyPropertyChanged(NameOf(IsEnabled))
+         NotifyPropertyChanged("IsEnabled")
       End Set
    End Property
 
@@ -82,7 +82,7 @@ Public Class InheritableTreeViewItem
       Set(value As String)
          If value <> m_sPictureString Then
             m_sPictureString = value
-            NotifyPropertyChanged(NameOf(PictureString))
+            NotifyPropertyChanged("PictureString")
          End If
       End Set
    End Property
diff --git a/Utility/IniFile.vb b/Utility/IniFile.vb
index 0ae23e2..649d1a3 100644
--- a/Utility/IniFile.vb
+++ b/Utility/IniFile.vb
@@ -11,6 +11,8 @@
 '
 '----------------------------------------------------------------------------
 
+
+Imports System.Collections.ObjectModel
 Imports EgtUILib
 
 Public Module IniFile
diff --git a/Utility/MachineModel.vb b/Utility/MachineModel.vb
index c0383ab..75af017 100644
--- a/Utility/MachineModel.vb
+++ b/Utility/MachineModel.vb
@@ -1,4 +1,6 @@
-Imports EgtUILib
+Imports System.ComponentModel
+Imports System.IO
+Imports EgtUILib
 
 Public Module MachineModel
 
@@ -43,4 +45,5 @@ Public Module MachineModel
 
 #End Region    ' Machining
 
+
 End Module
\ No newline at end of file
diff --git a/Utility/MachineUtility.vb b/Utility/MachineUtility.vb
index 7547bf8..c6c9bcb 100644
--- a/Utility/MachineUtility.vb
+++ b/Utility/MachineUtility.vb
@@ -23,55 +23,75 @@ Public Module MachineUtility
       ' Se il materiale lavorato è Marmo l'ordine di lettura e inserimento di Foratura e Taglio di lama nelle famiglie di lavorazioni attive è invertito 
       If EgtWPFLib5.MachiningTreeViewItem.m_MatType = MaterialType.STONE Then
          If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_SAWING, 0, sMachineIniPath) <> 0 Then
-            ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.SAWING, .Name = EgtMsg(31202)})      ' Taglio di lama
+            ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.SAWING, .Name = EgtMsg(MSG_MACHININGDB + 2)})
          End If
          If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_DRILLING, 0, sMachineIniPath) <> 0 Then
-            ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.DRILLING, .Name = EgtMsg(31201)})    ' Foratura
+            ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.DRILLING, .Name = EgtMsg(MSG_MACHININGDB + 1)})
          End If
       Else
          If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_DRILLING, 0, sMachineIniPath) <> 0 Then
-            ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.DRILLING, .Name = EgtMsg(31201)})    ' Foratura
+            ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.DRILLING, .Name = EgtMsg(MSG_MACHININGDB + 1)})
          End If
          If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_SAWING, 0, sMachineIniPath) <> 0 Then
-            ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.SAWING, .Name = EgtMsg(31202)})      ' Taglio di lama
+            ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.SAWING, .Name = EgtMsg(MSG_MACHININGDB + 2)})
          End If
       End If
       If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_MILLING, 0, sMachineIniPath) <> 0 Then
-         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.MILLING, .Name = EgtMsg(31203)})        ' Fresatura
+         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.MILLING, .Name = EgtMsg(MSG_MACHININGDB + 3)})
       End If
       If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_POCKETING, 0, sMachineIniPath) <> 0 Then
-         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.POCKETING, .Name = EgtMsg(31204)})      ' Svuotatura
+         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.POCKETING, .Name = EgtMsg(MSG_MACHININGDB + 4)})
       End If
       If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_MORTISING, 0, sMachineIniPath) <> 0 Then
-         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.MORTISING, .Name = EgtMsg(31205)})      ' Mortasatura
+         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.MORTISING, .Name = EgtMsg(MSG_MACHININGDB + 5)})
       End If
       If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_SAWROUGHING, 0, sMachineIniPath) <> 0 Then
-         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.SAWROUGHING, .Name = EgtMsg(31206)})    ' Sgrossatura con lama
+         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.SAWROUGHING, .Name = EgtMsg(MSG_MACHININGDB + 6)})
       End If
       If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_SAWFINISHING, 0, sMachineIniPath) <> 0 Then
-         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.SAWFINISHING, .Name = EgtMsg(31207)})   ' Finitura con lama
+         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.SAWFINISHING, .Name = EgtMsg(MSG_MACHININGDB + 7)})
       End If
       If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_GENMACHINING, 0, sMachineIniPath) <> 0 Then
-         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.GENMACHINING, .Name = EgtMsg(31208)})   ' Lav. generica
+         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.GENMACHINING, .Name = EgtMsg(MSG_MACHININGDB + 8)})
       End If
       If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_CHISELING, 0, sMachineIniPath) <> 0 Then
-         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.CHISELING, .Name = EgtMsg(31209)})      ' Scalpellatura
+         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.CHISELING, .Name = EgtMsg(MSG_MACHININGDB + 9)})
       End If
       If m_bEnableAdvMachinings AndAlso EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_SURFROUGHING, 0, sMachineIniPath) <> 0 Then
-         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.SURFROUGHING, .Name = EgtMsg(31212)})   ' Sgrossatura superfici
+         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.SURFROUGHING, .Name = EgtMsg(31212)})
       End If
       If m_bEnableAdvMachinings AndAlso EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_SURFFINISHING, 0, sMachineIniPath) <> 0 Then
-         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.SURFFINISHING, .Name = EgtMsg(31211)})  ' Finitura superfici
+         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.SURFFINISHING, .Name = EgtMsg(31211)})
       End If
       If m_bEnableAdvMachinings AndAlso EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_5AXMILLING, 0, sMachineIniPath) <> 0 Then
-         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.FIVEAXISMILLING, .Name = EgtMsg(31213)}) ' Lav. 5 assi
+         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.FIVEAXISMILLING, .Name = EgtMsg(31213)})
       End If
       If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_WATERJETTING, 0, sMachineIniPath) <> 0 Then
-         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.WATERJETTING, .Name = EgtMsg(31210)})   ' Waterjetting
+         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.WATERJETTING, .Name = EgtMsg(31210)})
       End If
       Return ActiveMachiningsFamiliesList.ToArray
    End Function
 
+   'Friend Sub LoadMachiningListByType(MachiningList As List(Of String), nType As MCH_MY)
+   '   Dim MachiningName As String = String.Empty
+   '   EgtMdbGetFirstMachining(nType, MachiningName)
+   '   While Not String.IsNullOrWhiteSpace(MachiningName)
+   '      MachiningList.Add(MachiningName)
+   '      EgtMdbGetNextMachining(nType, MachiningName)
+   '   End While
+   'End Sub
+
+   '' Funzione che imposta la macchina corrente se la trova, altrimenti chiede se ricaricarla o annullare
+   'Friend Function EgtTrySettingCurrMachine(sMachineName As String) As Boolean
+   '   If EgtSetCurrMachine(sMachineName) Then
+   '      Return True
+   '   End If
+   '   If MessageBox.Show(String.Format(EgtMsg(MSG_DOORSERRORS + 13) & Environment.NewLine & EgtMsg(MSG_DOORSERRORS + 14), sMachineName), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.YesNo, MessageBoxImage.Error) = MessageBoxResult.Yes Then
+   '      Return EgtTrySettingCurrMachine(sMachineName)
+   '   End If
+   '   Return False
+   'End Function
+
    ' Funzione che verifica l'esistenza e la connessione della cartella Machines
    Public Function VerifyMachinesDir(sMachinesDirPath As String) As Boolean
       ' verifico l'esistenza della cartella Machines
@@ -85,8 +105,7 @@ Public Module MachineUtility
       If Directory.Exists(sMachinesDirPath) Then
          Return True
       Else
-         'If MessageBox.Show(String.Format(EgtMsg(MSG_DOORSERRORS + 13) & Environment.NewLine & EgtMsg(MSG_DOORSERRORS + 14), sMachinesDirPath), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.YesNo, MessageBoxImage.Error) = MessageBoxResult.Yes Then
-         If EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(8113) & Environment.NewLine & EgtMsg(8114), sMachinesDirPath), EgtMsg(15001), MessageBoxButton.YesNo, MessageBoxImage.Error) = MessageBoxResult.Yes Then   ' Impossibile trovare la cartella delle macchine {0}. Se la cartella delle macchine è su un server, verificare che la connessione sia attiva. - Provare a ricaricare la macchina? - ERRORE
+         If MessageBox.Show(String.Format(EgtMsg(MSG_DOORSERRORS + 13) & Environment.NewLine & EgtMsg(MSG_DOORSERRORS + 14), sMachinesDirPath), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.YesNo, MessageBoxImage.Error) = MessageBoxResult.Yes Then
             Return RecursiveVerifyMachinesDir(sMachinesDirPath)
          End If
          Return False
@@ -126,47 +145,47 @@ Public Module MachineUtility
       ' Se il materiale lavorato è Marmo l'ordine di lettura e inserimento di Punta e Lama nelle famiglie di utensili attivi è invertito 
       If EgtWPFLib5.ToolDbWindowVM.m_MatType = MaterialType.STONE Then
          If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_SAWBLADE, 0, sMachineIniPath) <> 0 Then
-            ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.SAWBLADE, EgtMsg(31002)))  ' Lama
+            ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.SAWBLADE, EgtMsg(MSG_TOOLDB + 2)))
          End If
          If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_DRILLBIT, 0, sMachineIniPath) <> 0 Then
-            ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.DRILLBIT, EgtMsg(31001)))  ' Punta
+            ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.DRILLBIT, EgtMsg(MSG_TOOLDB + 1)))
          End If
       Else
          If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_DRILLBIT, 0, sMachineIniPath) <> 0 Then
-            ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.DRILLBIT, EgtMsg(31001)))  ' Punta
+            ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.DRILLBIT, EgtMsg(MSG_TOOLDB + 1)))
          End If
          If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_SAWBLADE, 0, sMachineIniPath) <> 0 Then
-            ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.SAWBLADE, EgtMsg(31002)))  ' Lama
+            ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.SAWBLADE, EgtMsg(MSG_TOOLDB + 2)))
          End If
       End If
 
       If EgtWPFLib5.ToolDbWindowVM.m_MatType = MaterialType.STONE Then
          If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_MILL, 0, sMachineIniPath) <> 0 Then
-            ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.MILL, EgtMsg(31003)))      ' Fresa
+            ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.MILL, EgtMsg(MSG_TOOLDB + 3)))
          End If
          If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_CUPWHEEL, 0, sMachineIniPath) <> 0 Then
-            ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.MILL, EgtMsg(90754)))      ' Mola da scasso
+            ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.MILL, EgtMsg(90754)))
          End If
          If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_POLISHINGWHEEL, 0, sMachineIniPath) <> 0 Then
-            ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.MILL, EgtMsg(90756)))      ' Mola lucidante
+            ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.MILL, EgtMsg(90756)))
          End If
       Else
          If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_MILL, 0, sMachineIniPath) <> 0 Then
-            ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.MILL, EgtMsg(31003)))      ' Fresa
+            ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.MILL, EgtMsg(MSG_TOOLDB + 3)))
          End If
       End If
 
       If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_MORTISE, 0, sMachineIniPath) <> 0 Then
-         ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.MORTISE, EgtMsg(31004)))      ' Mortasatrice
+         ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.MORTISE, EgtMsg(MSG_TOOLDB + 4)))
       End If
       If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_CHISEL, 0, sMachineIniPath) <> 0 Then
-         ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.CHISEL, EgtMsg(31009)))       ' Scalpello
+         ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.CHISEL, EgtMsg(MSG_TOOLDB + 9)))
       End If
       If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_COMPO, 0, sMachineIniPath) <> 0 Then
-         ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.COMPO, EgtMsg(31005)))        ' Composito
+         ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.COMPO, EgtMsg(MSG_TOOLDB + 5)))
       End If
       If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_WATERJET, 0, sMachineIniPath) <> 0 Then
-         ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.WATERJET, EgtMsg(31010)))     ' Waterjet
+         ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.WATERJET, EgtMsg(31010)))
       End If
       Return ActiveToolsFamiliesList.ToArray
    End Function
diff --git a/Utility/MsgConversion.vb b/Utility/MsgConversion.vb
index d1449b2..f376333 100644
--- a/Utility/MsgConversion.vb
+++ b/Utility/MsgConversion.vb
@@ -1,4 +1,5 @@
-Imports EgtUILib
+Imports System.Globalization
+Imports EgtUILib
 
 Public Module MsgConversion
 
diff --git a/Utility/TMDbParamVisibility.vb b/Utility/TMDbParamVisibility.vb
index cc1b7d4..7ad1c5c 100644
--- a/Utility/TMDbParamVisibility.vb
+++ b/Utility/TMDbParamVisibility.vb
@@ -1,1295 +1,1295 @@
-'Public Class TMDbParamVisibility
+Public Class TMDbParamVisibility
 
-'   ' Array che contiene il valore della proprietà visibility per ogni campo dell'utensile
-'   Public Shared Drill_Std(25) As Visibility
-'   Public Shared Drill_Long(25) As Visibility
-'   Public Shared Saw_Std(25) As Visibility
-'   Public Shared Saw_Flat(25) As Visibility
-'   Public Shared Mill_Std(25) As Visibility
-'   Public Shared Mill_NoTip(25) As Visibility
-'   Public Shared Mortise_Std(25) As Visibility
-'   Public Shared Chisel_Std(25) As Visibility
-'   Public Shared Compo(25) As Visibility
-'   Public Shared Waterjet(25) As Visibility
+   ' Array che contiene il valore della proprietà visibility per ogni campo dell'utensile
+   Public Shared Drill_Std(25) As Visibility
+   Public Shared Drill_Long(25) As Visibility
+   Public Shared Saw_Std(25) As Visibility
+   Public Shared Saw_Flat(25) As Visibility
+   Public Shared Mill_Std(25) As Visibility
+   Public Shared Mill_NoTip(25) As Visibility
+   Public Shared Mortise_Std(25) As Visibility
+   Public Shared Chisel_Std(25) As Visibility
+   Public Shared Compo(25) As Visibility
+   Public Shared Waterjet(25) As Visibility
 
-'   ' Array che contiene il valore della proprietà visibility per ogni campo della lavorazione
-'   Public Shared Milling(115) As Visibility
-'   Public Shared Drilling(115) As Visibility
-'   Public Shared Sawing(115) As Visibility
-'   Public Shared Pocketing(115) As Visibility
-'   Public Shared Mortising(115) As Visibility
-'   Public Shared Sawroughing(115) As Visibility
-'   Public Shared Sawfinishing(115) As Visibility
-'   Public Shared GenMachining(115) As Visibility
-'   Public Shared Chiseling(115) As Visibility
-'   Public Shared Waterjetting(115) As Visibility
-'   Public Shared FiveAxMachining(115) As Visibility
+   ' Array che contiene il valore della proprietà visibility per ogni campo della lavorazione
+   Public Shared Milling(115) As Visibility
+   Public Shared Drilling(115) As Visibility
+   Public Shared Sawing(115) As Visibility
+   Public Shared Pocketing(115) As Visibility
+   Public Shared Mortising(115) As Visibility
+   Public Shared Sawroughing(115) As Visibility
+   Public Shared Sawfinishing(115) As Visibility
+   Public Shared GenMachining(115) As Visibility
+   Public Shared Chiseling(115) As Visibility
+   Public Shared Waterjetting(115) As Visibility
+   Public Shared FiveAxMachining(115) As Visibility
 
-'   ' Array che contiene il valore della proprietà visibility per ogni campo delle operazioni
-'   Public Shared OperationDisposition(49) As Visibility
+   ' Array che contiene il valore della proprietà visibility per ogni campo delle operazioni
+   Public Shared OperationDisposition(49) As Visibility
 
-'   Sub New()
-'      ' Parametri drill standard
-'      Drill_Std(0) = Visibility.Visible                             ' Corrector
-'      Drill_Std(1) = Visibility.Visible                             ' ExitPar
-'      Drill_Std(2) = Visibility.Collapsed                           ' Coolant
-'      Drill_Std(3) = Visibility.Collapsed                           ' CornRad
-'      Drill_Std(4) = Visibility.Visible                             ' Diam
-'      Drill_Std(5) = Visibility.Visible                             ' TotDiam
-'      Drill_Std(6) = Visibility.Visible                             ' Feed
-'      Drill_Std(7) = Visibility.Visible                             ' EndFeed
-'      Drill_Std(8) = Visibility.Visible                             ' StartFeed
-'      Drill_Std(9) = Visibility.Visible                             ' TipFeed
-'      Drill_Std(10) = Visibility.Visible                            ' Len
-'      Drill_Std(11) = Visibility.Visible                            ' TotLen
-'      Drill_Std(12) = Visibility.Visible                            ' MaxMat
-'      Drill_Std(13) = Visibility.Collapsed                          ' LonOffset
-'      Drill_Std(14) = Visibility.Collapsed                          ' RadOffset
-'      Drill_Std(15) = Visibility.Visible                            ' Speed
-'      Drill_Std(16) = Visibility.Collapsed                          ' SideAng
-'      Drill_Std(17) = Visibility.Visible                            ' MaxSpeed
-'      Drill_Std(18) = Visibility.Collapsed                          ' Thick
-'      Drill_Std(19) = Visibility.Collapsed                          ' MaxAbsorption
-'      Drill_Std(20) = Visibility.Collapsed                          ' MinFeed
-'      Drill_Std(21) = Visibility.Visible                            ' Draw
-'      Drill_Std(22) = Visibility.Visible                            ' Head
-'      Drill_Std(23) = Visibility.Visible                            ' NamePar
-'      Drill_Std(24) = Visibility.Visible                            ' UserNotes
-'      Drill_Std(25) = Visibility.Visible                            ' TcPOs
+   Sub New()
+      ' Parametri drill standard
+      Drill_Std(0) = Visibility.Visible                             ' Corrector
+      Drill_Std(1) = Visibility.Visible                             ' ExitPar
+      Drill_Std(2) = Visibility.Collapsed                           ' Coolant
+      Drill_Std(3) = Visibility.Collapsed                           ' CornRad
+      Drill_Std(4) = Visibility.Visible                             ' Diam
+      Drill_Std(5) = Visibility.Visible                             ' TotDiam
+      Drill_Std(6) = Visibility.Visible                             ' Feed
+      Drill_Std(7) = Visibility.Visible                             ' EndFeed
+      Drill_Std(8) = Visibility.Visible                             ' StartFeed
+      Drill_Std(9) = Visibility.Visible                             ' TipFeed
+      Drill_Std(10) = Visibility.Visible                            ' Len
+      Drill_Std(11) = Visibility.Visible                            ' TotLen
+      Drill_Std(12) = Visibility.Visible                            ' MaxMat
+      Drill_Std(13) = Visibility.Collapsed                          ' LonOffset
+      Drill_Std(14) = Visibility.Collapsed                          ' RadOffset
+      Drill_Std(15) = Visibility.Visible                            ' Speed
+      Drill_Std(16) = Visibility.Collapsed                          ' SideAng
+      Drill_Std(17) = Visibility.Visible                            ' MaxSpeed
+      Drill_Std(18) = Visibility.Collapsed                          ' Thick
+      Drill_Std(19) = Visibility.Collapsed                          ' MaxAbsorption
+      Drill_Std(20) = Visibility.Collapsed                          ' MinFeed
+      Drill_Std(21) = Visibility.Visible                            ' Draw
+      Drill_Std(22) = Visibility.Visible                            ' Head
+      Drill_Std(23) = Visibility.Visible                            ' NamePar
+      Drill_Std(24) = Visibility.Visible                            ' UserNotes
+      Drill_Std(25) = Visibility.Visible                            ' TcPOs
 
-'      ' Parametri drill long
-'      Drill_Long(0) = Visibility.Visible                            ' Corrector
-'      Drill_Long(1) = Visibility.Visible                            ' ExitPar
-'      Drill_Long(2) = Visibility.Collapsed                          ' Coolant
-'      Drill_Long(3) = Visibility.Collapsed                          ' CornRad
-'      Drill_Long(4) = Visibility.Visible                            ' Diam
-'      Drill_Long(5) = Visibility.Visible                            ' TotDiam
-'      Drill_Long(6) = Visibility.Visible                            ' Feed
-'      Drill_Long(7) = Visibility.Visible                            ' EndFeed
-'      Drill_Long(8) = Visibility.Visible                            ' StartFeed
-'      Drill_Long(9) = Visibility.Visible                            ' TipFeed
-'      Drill_Long(10) = Visibility.Visible                           ' Len
-'      Drill_Long(11) = Visibility.Visible                           ' TotLen
-'      Drill_Long(12) = Visibility.Visible                           ' MaxMat
-'      Drill_Long(13) = Visibility.Visible                           ' LonOffset
-'      Drill_Long(14) = Visibility.Visible                           ' RadOffset
-'      Drill_Long(15) = Visibility.Visible                           ' Speed
-'      Drill_Long(16) = Visibility.Collapsed                         ' SideAng
-'      Drill_Long(17) = Visibility.Visible                           ' MaxSpeed
-'      Drill_Long(18) = Visibility.Collapsed                         ' Thick
-'      Drill_Long(19) = Visibility.Collapsed                         ' MaxAbsorption
-'      Drill_Long(20) = Visibility.Collapsed                         ' MinFeed
-'      Drill_Long(21) = Visibility.Visible                           ' Draw
-'      Drill_Long(22) = Visibility.Visible                           ' Head
-'      Drill_Long(23) = Visibility.Visible                           ' NamePar
-'      Drill_Long(24) = Visibility.Visible                           ' UserNotes
-'      Drill_Long(25) = Visibility.Visible                           ' TcPOs
+      ' Parametri drill long
+      Drill_Long(0) = Visibility.Visible                            ' Corrector
+      Drill_Long(1) = Visibility.Visible                            ' ExitPar
+      Drill_Long(2) = Visibility.Collapsed                          ' Coolant
+      Drill_Long(3) = Visibility.Collapsed                          ' CornRad
+      Drill_Long(4) = Visibility.Visible                            ' Diam
+      Drill_Long(5) = Visibility.Visible                            ' TotDiam
+      Drill_Long(6) = Visibility.Visible                            ' Feed
+      Drill_Long(7) = Visibility.Visible                            ' EndFeed
+      Drill_Long(8) = Visibility.Visible                            ' StartFeed
+      Drill_Long(9) = Visibility.Visible                            ' TipFeed
+      Drill_Long(10) = Visibility.Visible                           ' Len
+      Drill_Long(11) = Visibility.Visible                           ' TotLen
+      Drill_Long(12) = Visibility.Visible                           ' MaxMat
+      Drill_Long(13) = Visibility.Visible                           ' LonOffset
+      Drill_Long(14) = Visibility.Visible                           ' RadOffset
+      Drill_Long(15) = Visibility.Visible                           ' Speed
+      Drill_Long(16) = Visibility.Collapsed                         ' SideAng
+      Drill_Long(17) = Visibility.Visible                           ' MaxSpeed
+      Drill_Long(18) = Visibility.Collapsed                         ' Thick
+      Drill_Long(19) = Visibility.Collapsed                         ' MaxAbsorption
+      Drill_Long(20) = Visibility.Collapsed                         ' MinFeed
+      Drill_Long(21) = Visibility.Visible                           ' Draw
+      Drill_Long(22) = Visibility.Visible                           ' Head
+      Drill_Long(23) = Visibility.Visible                           ' NamePar
+      Drill_Long(24) = Visibility.Visible                           ' UserNotes
+      Drill_Long(25) = Visibility.Visible                           ' TcPOs
 
-'      'Parametri Saw Standard
-'      Saw_Std(0) = Visibility.Visible                               ' Corrector
-'      Saw_Std(1) = Visibility.Visible                               ' ExitPar
-'      Saw_Std(2) = Visibility.Collapsed                             ' Coolant
-'      Saw_Std(3) = Visibility.Collapsed                             ' CornRad
-'      Saw_Std(4) = Visibility.Visible                               ' Diam
-'      Saw_Std(5) = Visibility.Visible                               ' TotDiam
-'      Saw_Std(6) = Visibility.Visible                               ' Feed
-'      Saw_Std(7) = Visibility.Visible                               ' EndFeed
-'      Saw_Std(8) = Visibility.Visible                               ' StartFeed
-'      Saw_Std(9) = Visibility.Visible                               ' TipFeed
-'      Saw_Std(10) = Visibility.Visible                              ' Len
-'      Saw_Std(11) = Visibility.Visible                              ' TotLen
-'      Saw_Std(12) = Visibility.Visible                              ' MaxMat
-'      Saw_Std(13) = Visibility.Visible                              ' LonOffset
-'      Saw_Std(14) = Visibility.Visible                              ' RadOffset
-'      Saw_Std(15) = Visibility.Visible                              ' Speed
-'      Saw_Std(16) = Visibility.Collapsed                            ' SideAng
-'      Saw_Std(17) = Visibility.Visible                              ' MaxSpeed
-'      Saw_Std(18) = Visibility.Visible                              ' Thick
-'      Saw_Std(19) = Visibility.Collapsed                            ' MaxAbsorption
-'      Saw_Std(20) = Visibility.Collapsed                            ' MinFeed
-'      Saw_Std(21) = Visibility.Visible                              ' Draw
-'      Saw_Std(22) = Visibility.Visible                              ' Head
-'      Saw_Std(23) = Visibility.Visible                              ' NamePar
-'      Saw_Std(24) = Visibility.Visible                              ' UserNotes
-'      Saw_Std(25) = Visibility.Visible                              ' TcPOs
+      'Parametri Saw Standard
+      Saw_Std(0) = Visibility.Visible                               ' Corrector
+      Saw_Std(1) = Visibility.Visible                               ' ExitPar
+      Saw_Std(2) = Visibility.Collapsed                             ' Coolant
+      Saw_Std(3) = Visibility.Collapsed                             ' CornRad
+      Saw_Std(4) = Visibility.Visible                               ' Diam
+      Saw_Std(5) = Visibility.Visible                               ' TotDiam
+      Saw_Std(6) = Visibility.Visible                               ' Feed
+      Saw_Std(7) = Visibility.Visible                               ' EndFeed
+      Saw_Std(8) = Visibility.Visible                               ' StartFeed
+      Saw_Std(9) = Visibility.Visible                               ' TipFeed
+      Saw_Std(10) = Visibility.Visible                              ' Len
+      Saw_Std(11) = Visibility.Visible                              ' TotLen
+      Saw_Std(12) = Visibility.Visible                              ' MaxMat
+      Saw_Std(13) = Visibility.Visible                              ' LonOffset
+      Saw_Std(14) = Visibility.Visible                              ' RadOffset
+      Saw_Std(15) = Visibility.Visible                              ' Speed
+      Saw_Std(16) = Visibility.Collapsed                            ' SideAng
+      Saw_Std(17) = Visibility.Visible                              ' MaxSpeed
+      Saw_Std(18) = Visibility.Visible                              ' Thick
+      Saw_Std(19) = Visibility.Collapsed                            ' MaxAbsorption
+      Saw_Std(20) = Visibility.Collapsed                            ' MinFeed
+      Saw_Std(21) = Visibility.Visible                              ' Draw
+      Saw_Std(22) = Visibility.Visible                              ' Head
+      Saw_Std(23) = Visibility.Visible                              ' NamePar
+      Saw_Std(24) = Visibility.Visible                              ' UserNotes
+      Saw_Std(25) = Visibility.Visible                              ' TcPOs
 
-'      'Parametri Saw Flat
-'      Saw_Flat(0) = Visibility.Visible                              ' Corrector
-'      Saw_Flat(1) = Visibility.Visible                              ' ExitPar
-'      Saw_Flat(2) = Visibility.Collapsed                            ' Coolant
-'      Saw_Flat(3) = Visibility.Collapsed                            ' CornRad
-'      Saw_Flat(4) = Visibility.Visible                              ' Diam
-'      Saw_Flat(5) = Visibility.Visible                              ' TotDiam
-'      Saw_Flat(6) = Visibility.Visible                              ' Feed
-'      Saw_Flat(7) = Visibility.Visible                              ' EndFeed
-'      Saw_Flat(8) = Visibility.Visible                              ' StartFeed
-'      Saw_Flat(9) = Visibility.Visible                              ' TipFeed
-'      Saw_Flat(10) = Visibility.Visible                             ' Len
-'      Saw_Flat(11) = Visibility.Visible                             ' TotLen
-'      Saw_Flat(12) = Visibility.Visible                             ' MaxMat
-'      Saw_Flat(13) = Visibility.Visible                             ' LonOffset
-'      Saw_Flat(14) = Visibility.Visible                             ' RadOffset
-'      Saw_Flat(15) = Visibility.Visible                             ' Speed
-'      Saw_Flat(16) = Visibility.Collapsed                           ' SideAng
-'      Saw_Flat(17) = Visibility.Visible                             ' MaxSpeed
-'      Saw_Flat(18) = Visibility.Visible                             ' Thick
-'      Saw_Flat(19) = Visibility.Collapsed                           ' MaxAbsorption
-'      Saw_Flat(20) = Visibility.Collapsed                           ' MinFeed
-'      Saw_Flat(21) = Visibility.Visible                             ' Draw
-'      Saw_Flat(22) = Visibility.Visible                             ' Head
-'      Saw_Flat(23) = Visibility.Visible                             ' NamePar
-'      Saw_Flat(24) = Visibility.Visible                             ' UserNotes
-'      Saw_Flat(25) = Visibility.Visible                             ' TcPOs
+      'Parametri Saw Flat
+      Saw_Flat(0) = Visibility.Visible                              ' Corrector
+      Saw_Flat(1) = Visibility.Visible                              ' ExitPar
+      Saw_Flat(2) = Visibility.Collapsed                            ' Coolant
+      Saw_Flat(3) = Visibility.Collapsed                            ' CornRad
+      Saw_Flat(4) = Visibility.Visible                              ' Diam
+      Saw_Flat(5) = Visibility.Visible                              ' TotDiam
+      Saw_Flat(6) = Visibility.Visible                              ' Feed
+      Saw_Flat(7) = Visibility.Visible                              ' EndFeed
+      Saw_Flat(8) = Visibility.Visible                              ' StartFeed
+      Saw_Flat(9) = Visibility.Visible                              ' TipFeed
+      Saw_Flat(10) = Visibility.Visible                             ' Len
+      Saw_Flat(11) = Visibility.Visible                             ' TotLen
+      Saw_Flat(12) = Visibility.Visible                             ' MaxMat
+      Saw_Flat(13) = Visibility.Visible                             ' LonOffset
+      Saw_Flat(14) = Visibility.Visible                             ' RadOffset
+      Saw_Flat(15) = Visibility.Visible                             ' Speed
+      Saw_Flat(16) = Visibility.Collapsed                           ' SideAng
+      Saw_Flat(17) = Visibility.Visible                             ' MaxSpeed
+      Saw_Flat(18) = Visibility.Visible                             ' Thick
+      Saw_Flat(19) = Visibility.Collapsed                           ' MaxAbsorption
+      Saw_Flat(20) = Visibility.Collapsed                           ' MinFeed
+      Saw_Flat(21) = Visibility.Visible                             ' Draw
+      Saw_Flat(22) = Visibility.Visible                             ' Head
+      Saw_Flat(23) = Visibility.Visible                             ' NamePar
+      Saw_Flat(24) = Visibility.Visible                             ' UserNotes
+      Saw_Flat(25) = Visibility.Visible                             ' TcPOs
 
-'      'Parametri Mill standard
-'      Mill_Std(0) = Visibility.Visible                              ' Corrector
-'      Mill_Std(1) = Visibility.Visible                              ' ExitPar
-'      Mill_Std(2) = Visibility.Collapsed                            ' Coolant
-'      Mill_Std(3) = Visibility.Visible                              ' CornRad
-'      Mill_Std(4) = Visibility.Visible                              ' Diam
-'      Mill_Std(5) = Visibility.Visible                              ' TotDiam
-'      Mill_Std(6) = Visibility.Visible                              ' Feed
-'      Mill_Std(7) = Visibility.Visible                              ' EndFeed
-'      Mill_Std(8) = Visibility.Visible                              ' StartFeed
-'      Mill_Std(9) = Visibility.Visible                              ' TipFeed
-'      Mill_Std(10) = Visibility.Visible                             ' Len
-'      Mill_Std(11) = Visibility.Visible                             ' TotLen
-'      Mill_Std(12) = Visibility.Visible                             ' MaxMat
-'      Mill_Std(13) = Visibility.Visible                             ' LonOffset
-'      Mill_Std(14) = Visibility.Visible                             ' RadOffset
-'      Mill_Std(15) = Visibility.Visible                             ' Speed
-'      Mill_Std(16) = Visibility.Visible                             ' SideAng
-'      Mill_Std(17) = Visibility.Visible                             ' MaxSpeed
-'      Mill_Std(18) = Visibility.Visible                             ' Thick
-'      Mill_Std(19) = Visibility.Collapsed                           ' MaxAbsorption
-'      Mill_Std(20) = Visibility.Collapsed                           ' MinFeed
-'      Mill_Std(21) = Visibility.Visible                             ' Draw
-'      Mill_Std(22) = Visibility.Visible                             ' Head
-'      Mill_Std(23) = Visibility.Visible                             ' NamePar
-'      Mill_Std(24) = Visibility.Visible                             ' UserNotes
-'      Mill_Std(25) = Visibility.Visible                             ' TcPOs
+      'Parametri Mill standard
+      Mill_Std(0) = Visibility.Visible                              ' Corrector
+      Mill_Std(1) = Visibility.Visible                              ' ExitPar
+      Mill_Std(2) = Visibility.Collapsed                            ' Coolant
+      Mill_Std(3) = Visibility.Visible                              ' CornRad
+      Mill_Std(4) = Visibility.Visible                              ' Diam
+      Mill_Std(5) = Visibility.Visible                              ' TotDiam
+      Mill_Std(6) = Visibility.Visible                              ' Feed
+      Mill_Std(7) = Visibility.Visible                              ' EndFeed
+      Mill_Std(8) = Visibility.Visible                              ' StartFeed
+      Mill_Std(9) = Visibility.Visible                              ' TipFeed
+      Mill_Std(10) = Visibility.Visible                             ' Len
+      Mill_Std(11) = Visibility.Visible                             ' TotLen
+      Mill_Std(12) = Visibility.Visible                             ' MaxMat
+      Mill_Std(13) = Visibility.Visible                             ' LonOffset
+      Mill_Std(14) = Visibility.Visible                             ' RadOffset
+      Mill_Std(15) = Visibility.Visible                             ' Speed
+      Mill_Std(16) = Visibility.Visible                             ' SideAng
+      Mill_Std(17) = Visibility.Visible                             ' MaxSpeed
+      Mill_Std(18) = Visibility.Visible                             ' Thick
+      Mill_Std(19) = Visibility.Collapsed                           ' MaxAbsorption
+      Mill_Std(20) = Visibility.Collapsed                           ' MinFeed
+      Mill_Std(21) = Visibility.Visible                             ' Draw
+      Mill_Std(22) = Visibility.Visible                             ' Head
+      Mill_Std(23) = Visibility.Visible                             ' NamePar
+      Mill_Std(24) = Visibility.Visible                             ' UserNotes
+      Mill_Std(25) = Visibility.Visible                             ' TcPOs
 
-'      'Parametri Mill NoTip
-'      Mill_NoTip(0) = Visibility.Visible                            ' Corrector
-'      Mill_NoTip(1) = Visibility.Visible                            ' ExitPar
-'      Mill_NoTip(2) = Visibility.Collapsed                          ' Coolant
-'      Mill_NoTip(3) = Visibility.Visible                            ' CornRad
-'      Mill_NoTip(4) = Visibility.Visible                            ' Diam
-'      Mill_NoTip(5) = Visibility.Visible                            ' TotDiam
-'      Mill_NoTip(6) = Visibility.Visible                            ' Feed
-'      Mill_NoTip(7) = Visibility.Visible                            ' EndFeed
-'      Mill_NoTip(8) = Visibility.Visible                            ' StartFeed
-'      Mill_NoTip(9) = Visibility.Visible                            ' TipFeed
-'      Mill_NoTip(10) = Visibility.Visible                           ' Len
-'      Mill_NoTip(11) = Visibility.Visible                           ' TotLen
-'      Mill_NoTip(12) = Visibility.Visible                           ' MaxMat
-'      Mill_NoTip(13) = Visibility.Visible                           ' LonOffset
-'      Mill_NoTip(14) = Visibility.Visible                           ' RadOffset
-'      Mill_NoTip(15) = Visibility.Visible                           ' Speed
-'      Mill_NoTip(16) = Visibility.Visible                           ' SideAng
-'      Mill_NoTip(17) = Visibility.Visible                           ' MaxSpeed
-'      Mill_NoTip(18) = Visibility.Visible                           ' Thick
-'      Mill_NoTip(19) = Visibility.Collapsed                         ' MaxAbsorption
-'      Mill_NoTip(20) = Visibility.Collapsed                         ' MinFeed
-'      Mill_NoTip(21) = Visibility.Visible                           ' Draw
-'      Mill_NoTip(22) = Visibility.Visible                           ' Head
-'      Mill_NoTip(23) = Visibility.Visible                           ' NamePar
-'      Mill_NoTip(24) = Visibility.Visible                           ' UserNotes
-'      Mill_NoTip(25) = Visibility.Visible                           ' TcPOs
+      'Parametri Mill NoTip
+      Mill_NoTip(0) = Visibility.Visible                            ' Corrector
+      Mill_NoTip(1) = Visibility.Visible                            ' ExitPar
+      Mill_NoTip(2) = Visibility.Collapsed                          ' Coolant
+      Mill_NoTip(3) = Visibility.Visible                            ' CornRad
+      Mill_NoTip(4) = Visibility.Visible                            ' Diam
+      Mill_NoTip(5) = Visibility.Visible                            ' TotDiam
+      Mill_NoTip(6) = Visibility.Visible                            ' Feed
+      Mill_NoTip(7) = Visibility.Visible                            ' EndFeed
+      Mill_NoTip(8) = Visibility.Visible                            ' StartFeed
+      Mill_NoTip(9) = Visibility.Visible                            ' TipFeed
+      Mill_NoTip(10) = Visibility.Visible                           ' Len
+      Mill_NoTip(11) = Visibility.Visible                           ' TotLen
+      Mill_NoTip(12) = Visibility.Visible                           ' MaxMat
+      Mill_NoTip(13) = Visibility.Visible                           ' LonOffset
+      Mill_NoTip(14) = Visibility.Visible                           ' RadOffset
+      Mill_NoTip(15) = Visibility.Visible                           ' Speed
+      Mill_NoTip(16) = Visibility.Visible                           ' SideAng
+      Mill_NoTip(17) = Visibility.Visible                           ' MaxSpeed
+      Mill_NoTip(18) = Visibility.Visible                           ' Thick
+      Mill_NoTip(19) = Visibility.Collapsed                         ' MaxAbsorption
+      Mill_NoTip(20) = Visibility.Collapsed                         ' MinFeed
+      Mill_NoTip(21) = Visibility.Visible                           ' Draw
+      Mill_NoTip(22) = Visibility.Visible                           ' Head
+      Mill_NoTip(23) = Visibility.Visible                           ' NamePar
+      Mill_NoTip(24) = Visibility.Visible                           ' UserNotes
+      Mill_NoTip(25) = Visibility.Visible                           ' TcPOs
 
-'      'Parametri Mortise Standard
-'      Mortise_Std(0) = Visibility.Collapsed                         ' Corrector
-'      Mortise_Std(1) = Visibility.Visible                           ' ExitPar
-'      Mortise_Std(2) = Visibility.Collapsed                         ' Coolant
-'      Mortise_Std(3) = Visibility.Visible                           ' CornRad
-'      Mortise_Std(4) = Visibility.Visible                           ' Diam
-'      Mortise_Std(5) = Visibility.Visible                           ' TotDiam
-'      Mortise_Std(6) = Visibility.Visible                           ' Feed
-'      Mortise_Std(7) = Visibility.Visible                           ' EndFeed
-'      Mortise_Std(8) = Visibility.Visible                           ' StartFeed
-'      Mortise_Std(9) = Visibility.Visible                           ' TipFeed
-'      Mortise_Std(10) = Visibility.Visible                          ' Len
-'      Mortise_Std(11) = Visibility.Visible                          ' TotLen
-'      Mortise_Std(12) = Visibility.Visible                          ' MaxMat
-'      Mortise_Std(13) = Visibility.Visible                          ' LonOffset
-'      Mortise_Std(14) = Visibility.Visible                          ' RadOffset
-'      Mortise_Std(15) = Visibility.Visible                          ' Speed
-'      Mortise_Std(16) = Visibility.Collapsed                        ' SideAng
-'      Mortise_Std(17) = Visibility.Visible                          ' MaxSpeed
-'      Mortise_Std(18) = Visibility.Visible                          ' Thick
-'      Mortise_Std(19) = Visibility.Collapsed                        ' MaxAbsorption
-'      Mortise_Std(20) = Visibility.Collapsed                        ' MinFeed
-'      Mortise_Std(21) = Visibility.Visible                          ' Draw
-'      Mortise_Std(22) = Visibility.Visible                          ' Head
-'      Mortise_Std(23) = Visibility.Visible                          ' NamePar
-'      Mortise_Std(24) = Visibility.Visible                          ' UserNotes
-'      Mortise_Std(25) = Visibility.Visible                          ' TcPOs
+      'Parametri Mortise Standard
+      Mortise_Std(0) = Visibility.Collapsed                         ' Corrector
+      Mortise_Std(1) = Visibility.Visible                           ' ExitPar
+      Mortise_Std(2) = Visibility.Collapsed                         ' Coolant
+      Mortise_Std(3) = Visibility.Visible                           ' CornRad
+      Mortise_Std(4) = Visibility.Visible                           ' Diam
+      Mortise_Std(5) = Visibility.Visible                           ' TotDiam
+      Mortise_Std(6) = Visibility.Visible                           ' Feed
+      Mortise_Std(7) = Visibility.Visible                           ' EndFeed
+      Mortise_Std(8) = Visibility.Visible                           ' StartFeed
+      Mortise_Std(9) = Visibility.Visible                           ' TipFeed
+      Mortise_Std(10) = Visibility.Visible                          ' Len
+      Mortise_Std(11) = Visibility.Visible                          ' TotLen
+      Mortise_Std(12) = Visibility.Visible                          ' MaxMat
+      Mortise_Std(13) = Visibility.Visible                          ' LonOffset
+      Mortise_Std(14) = Visibility.Visible                          ' RadOffset
+      Mortise_Std(15) = Visibility.Visible                          ' Speed
+      Mortise_Std(16) = Visibility.Collapsed                        ' SideAng
+      Mortise_Std(17) = Visibility.Visible                          ' MaxSpeed
+      Mortise_Std(18) = Visibility.Visible                          ' Thick
+      Mortise_Std(19) = Visibility.Collapsed                        ' MaxAbsorption
+      Mortise_Std(20) = Visibility.Collapsed                        ' MinFeed
+      Mortise_Std(21) = Visibility.Visible                          ' Draw
+      Mortise_Std(22) = Visibility.Visible                          ' Head
+      Mortise_Std(23) = Visibility.Visible                          ' NamePar
+      Mortise_Std(24) = Visibility.Visible                          ' UserNotes
+      Mortise_Std(25) = Visibility.Visible                          ' TcPOs
 
-'      'Parametri Chisel Standard
-'      Chisel_Std(0) = Visibility.Visible                           ' Corrector
-'      Chisel_Std(1) = Visibility.Visible                           ' ExitPar
-'      Chisel_Std(2) = Visibility.Collapsed                         ' Coolant
-'      Chisel_Std(3) = Visibility.Collapsed                         ' CornRad
-'      Chisel_Std(4) = Visibility.Visible                           ' Diam
-'      Chisel_Std(5) = Visibility.Visible                           ' TotDiam
-'      Chisel_Std(6) = Visibility.Visible                           ' Feed
-'      Chisel_Std(7) = Visibility.Visible                           ' EndFeed
-'      Chisel_Std(8) = Visibility.Collapsed                         ' StartFeed
-'      Chisel_Std(9) = Visibility.Visible                           ' TipFeed
-'      Chisel_Std(10) = Visibility.Visible                          ' Len
-'      Chisel_Std(11) = Visibility.Visible                          ' TotLen
-'      Chisel_Std(12) = Visibility.Visible                          ' MaxMat
-'      Chisel_Std(13) = Visibility.Visible                          ' LonOffset
-'      Chisel_Std(14) = Visibility.Visible                          ' RadOffset
-'      Chisel_Std(15) = Visibility.Collapsed                        ' Speed
-'      Chisel_Std(16) = Visibility.Collapsed                        ' SideAng
-'      Chisel_Std(17) = Visibility.Collapsed                        ' MaxSpeed
-'      Chisel_Std(18) = Visibility.Collapsed                        ' Thick
-'      Chisel_Std(19) = Visibility.Collapsed                        ' MaxAbsorption
-'      Chisel_Std(20) = Visibility.Collapsed                        ' MinFeed
-'      Chisel_Std(21) = Visibility.Visible                          ' Draw
-'      Chisel_Std(22) = Visibility.Visible                          ' Head
-'      Chisel_Std(23) = Visibility.Visible                          ' NamePar
-'      Chisel_Std(24) = Visibility.Visible                          ' UserNotes
-'      Chisel_Std(25) = Visibility.Visible                          ' TcPos
+      'Parametri Chisel Standard
+      Chisel_Std(0) = Visibility.Visible                           ' Corrector
+      Chisel_Std(1) = Visibility.Visible                           ' ExitPar
+      Chisel_Std(2) = Visibility.Collapsed                         ' Coolant
+      Chisel_Std(3) = Visibility.Collapsed                         ' CornRad
+      Chisel_Std(4) = Visibility.Visible                           ' Diam
+      Chisel_Std(5) = Visibility.Visible                           ' TotDiam
+      Chisel_Std(6) = Visibility.Visible                           ' Feed
+      Chisel_Std(7) = Visibility.Visible                           ' EndFeed
+      Chisel_Std(8) = Visibility.Collapsed                         ' StartFeed
+      Chisel_Std(9) = Visibility.Visible                           ' TipFeed
+      Chisel_Std(10) = Visibility.Visible                          ' Len
+      Chisel_Std(11) = Visibility.Visible                          ' TotLen
+      Chisel_Std(12) = Visibility.Visible                          ' MaxMat
+      Chisel_Std(13) = Visibility.Visible                          ' LonOffset
+      Chisel_Std(14) = Visibility.Visible                          ' RadOffset
+      Chisel_Std(15) = Visibility.Collapsed                        ' Speed
+      Chisel_Std(16) = Visibility.Collapsed                        ' SideAng
+      Chisel_Std(17) = Visibility.Collapsed                        ' MaxSpeed
+      Chisel_Std(18) = Visibility.Collapsed                        ' Thick
+      Chisel_Std(19) = Visibility.Collapsed                        ' MaxAbsorption
+      Chisel_Std(20) = Visibility.Collapsed                        ' MinFeed
+      Chisel_Std(21) = Visibility.Visible                          ' Draw
+      Chisel_Std(22) = Visibility.Visible                          ' Head
+      Chisel_Std(23) = Visibility.Visible                          ' NamePar
+      Chisel_Std(24) = Visibility.Visible                          ' UserNotes
+      Chisel_Std(25) = Visibility.Visible                          ' TcPos
 
-'      'Parametri Compo
-'      Compo(0) = Visibility.Collapsed                               ' Corrector
-'      Compo(1) = Visibility.Visible                                 ' ExitPar
-'      Compo(2) = Visibility.Collapsed                               ' Coolant
-'      Compo(3) = Visibility.Collapsed                               ' CornRad
-'      Compo(4) = Visibility.Visible                                 ' Diam
-'      Compo(5) = Visibility.Visible                                 ' TotDiam
-'      Compo(6) = Visibility.Visible                                 ' Feed
-'      Compo(7) = Visibility.Visible                                 ' EndFeed
-'      Compo(8) = Visibility.Visible                                 ' StartFeed
-'      Compo(9) = Visibility.Visible                                 ' TipFeed
-'      Compo(10) = Visibility.Visible                                ' Len
-'      Compo(11) = Visibility.Visible                                ' TotLen
-'      Compo(12) = Visibility.Visible                                ' MaxMat
-'      Compo(13) = Visibility.Visible                                ' LonOffset
-'      Compo(14) = Visibility.Visible                                ' RadOffset
-'      Compo(15) = Visibility.Visible                                ' Speed
-'      Compo(16) = Visibility.Collapsed                              ' SideAng
-'      Compo(17) = Visibility.Visible                                ' MaxSpeed
-'      Compo(18) = Visibility.Collapsed                              ' Thick
-'      Compo(19) = Visibility.Collapsed                              ' MaxAbsorption
-'      Compo(20) = Visibility.Collapsed                              ' MinFeed
-'      Compo(21) = Visibility.Visible                                ' Draw
-'      Compo(22) = Visibility.Visible                                ' Head
-'      Compo(23) = Visibility.Visible                                ' NamePar
-'      Compo(24) = Visibility.Visible                                ' UserNotes
-'      Compo(25) = Visibility.Visible                                ' TcPOs
+      'Parametri Compo
+      Compo(0) = Visibility.Collapsed                               ' Corrector
+      Compo(1) = Visibility.Visible                                 ' ExitPar
+      Compo(2) = Visibility.Collapsed                               ' Coolant
+      Compo(3) = Visibility.Collapsed                               ' CornRad
+      Compo(4) = Visibility.Visible                                 ' Diam
+      Compo(5) = Visibility.Visible                                 ' TotDiam
+      Compo(6) = Visibility.Visible                                 ' Feed
+      Compo(7) = Visibility.Visible                                 ' EndFeed
+      Compo(8) = Visibility.Visible                                 ' StartFeed
+      Compo(9) = Visibility.Visible                                 ' TipFeed
+      Compo(10) = Visibility.Visible                                ' Len
+      Compo(11) = Visibility.Visible                                ' TotLen
+      Compo(12) = Visibility.Visible                                ' MaxMat
+      Compo(13) = Visibility.Visible                                ' LonOffset
+      Compo(14) = Visibility.Visible                                ' RadOffset
+      Compo(15) = Visibility.Visible                                ' Speed
+      Compo(16) = Visibility.Collapsed                              ' SideAng
+      Compo(17) = Visibility.Visible                                ' MaxSpeed
+      Compo(18) = Visibility.Collapsed                              ' Thick
+      Compo(19) = Visibility.Collapsed                              ' MaxAbsorption
+      Compo(20) = Visibility.Collapsed                              ' MinFeed
+      Compo(21) = Visibility.Visible                                ' Draw
+      Compo(22) = Visibility.Visible                                ' Head
+      Compo(23) = Visibility.Visible                                ' NamePar
+      Compo(24) = Visibility.Visible                                ' UserNotes
+      Compo(25) = Visibility.Visible                                ' TcPOs
 
-'      'Parametri Waterjet
-'      Waterjet(0) = Visibility.Visible                              ' Corrector
-'      Waterjet(1) = Visibility.Visible                              ' ExitPar
-'      Waterjet(2) = Visibility.Collapsed                            ' Coolant
-'      Waterjet(3) = Visibility.Collapsed                              ' CornRad
-'      Waterjet(4) = Visibility.Visible                              ' Diam
-'      Waterjet(5) = Visibility.Visible                              ' TotDiam
-'      Waterjet(6) = Visibility.Collapsed                              ' Feed
-'      Waterjet(7) = Visibility.Collapsed                              ' EndFeed
-'      Waterjet(8) = Visibility.Visible                              ' StartFeed
-'      Waterjet(9) = Visibility.Visible                              ' TipFeed
-'      Waterjet(10) = Visibility.Visible                             ' Len
-'      Waterjet(11) = Visibility.Visible                             ' TotLen
-'      Waterjet(12) = Visibility.Visible                             ' MaxMat
-'      Waterjet(13) = Visibility.Collapsed                             ' LonOffset
-'      Waterjet(14) = Visibility.Visible                             ' RadOffset
-'      Waterjet(15) = Visibility.Collapsed                             ' Speed
-'      Waterjet(16) = Visibility.Collapsed                             ' SideAng
-'      Waterjet(17) = Visibility.Collapsed                             ' MaxSpeed
-'      Waterjet(18) = Visibility.Visible                             ' Thick
-'      Waterjet(19) = Visibility.Collapsed                           ' MaxAbsorption
-'      Waterjet(20) = Visibility.Collapsed                           ' MinFeed
-'      Waterjet(21) = Visibility.Visible                             ' Draw
-'      Waterjet(22) = Visibility.Visible                             ' Head
-'      Waterjet(23) = Visibility.Visible                             ' NamePar
-'      Waterjet(24) = Visibility.Visible                             ' UserNotes
-'      Waterjet(25) = Visibility.Visible                             ' TcPOs
+      'Parametri Waterjet
+      Waterjet(0) = Visibility.Visible                              ' Corrector
+      Waterjet(1) = Visibility.Visible                              ' ExitPar
+      Waterjet(2) = Visibility.Collapsed                            ' Coolant
+      Waterjet(3) = Visibility.Collapsed                              ' CornRad
+      Waterjet(4) = Visibility.Visible                              ' Diam
+      Waterjet(5) = Visibility.Visible                              ' TotDiam
+      Waterjet(6) = Visibility.Collapsed                              ' Feed
+      Waterjet(7) = Visibility.Collapsed                              ' EndFeed
+      Waterjet(8) = Visibility.Visible                              ' StartFeed
+      Waterjet(9) = Visibility.Visible                              ' TipFeed
+      Waterjet(10) = Visibility.Visible                             ' Len
+      Waterjet(11) = Visibility.Visible                             ' TotLen
+      Waterjet(12) = Visibility.Visible                             ' MaxMat
+      Waterjet(13) = Visibility.Collapsed                             ' LonOffset
+      Waterjet(14) = Visibility.Visible                             ' RadOffset
+      Waterjet(15) = Visibility.Collapsed                             ' Speed
+      Waterjet(16) = Visibility.Collapsed                             ' SideAng
+      Waterjet(17) = Visibility.Collapsed                             ' MaxSpeed
+      Waterjet(18) = Visibility.Visible                             ' Thick
+      Waterjet(19) = Visibility.Collapsed                           ' MaxAbsorption
+      Waterjet(20) = Visibility.Collapsed                           ' MinFeed
+      Waterjet(21) = Visibility.Visible                             ' Draw
+      Waterjet(22) = Visibility.Visible                             ' Head
+      Waterjet(23) = Visibility.Visible                             ' NamePar
+      Waterjet(24) = Visibility.Visible                             ' UserNotes
+      Waterjet(25) = Visibility.Visible                             ' TcPOs
 
-'      ' Parametri Milling
-'      Milling(0) = Visibility.Visible                               ' Invert
-'      Milling(1) = Visibility.Visible                               ' LeaveTab
-'      Milling(2) = Visibility.Visible                               ' WorkSide
-'      Milling(3) = Visibility.Collapsed                             ' HeadSide
-'      Milling(4) = Visibility.Visible                               ' LeadInType
-'      Milling(5) = Visibility.Collapsed                             ' ExtLinkType
-'      Milling(6) = Visibility.Visible                               ' LeadOutType
-'      Milling(7) = Visibility.Collapsed                             ' CurveUse
-'      Milling(8) = Visibility.Visible                               ' StepType
-'      Milling(9) = Visibility.Collapsed                             ' LeadLinkType
-'      Milling(10) = Visibility.Visible                              ' Speed
-'      Milling(11) = Visibility.Visible                              ' Feed
-'      Milling(12) = Visibility.Visible                              ' StartFeed
-'      Milling(13) = Visibility.Visible                              ' EndFeed
-'      Milling(14) = Visibility.Visible                              ' TipFeed
-'      Milling(15) = Visibility.Visible                              ' OffSr
-'      Milling(16) = Visibility.Visible                              ' OffSl
-'      Milling(17) = Visibility.Visible                              ' SideAngle
-'      Milling(18) = Visibility.Collapsed                            ' Approx
-'      Milling(19) = Visibility.Visible                              ' StartPos
-'      Milling(20) = Visibility.Collapsed                            ' StartSlowLen
-'      Milling(21) = Visibility.Collapsed                            ' EndSlowLen
-'      Milling(22) = Visibility.Collapsed                            ' ThroughAddlen
-'      Milling(23) = Visibility.Visible                              ' StepPar
-'      Milling(24) = Visibility.Collapsed                            ' ReturnPos
-'      Milling(25) = Visibility.Visible                              ' TabLen
-'      Milling(26) = Visibility.Visible                              ' TabDist
-'      Milling(27) = Visibility.Visible                              ' TabHeight
-'      Milling(28) = Visibility.Visible                              ' TabAngle
-'      Milling(29) = Visibility.Visible                              ' LiTang
-'      Milling(30) = Visibility.Visible                              ' LiPerp
-'      Milling(31) = Visibility.Visible                              ' LiElev
-'      Milling(32) = Visibility.Visible                              ' LiCompLen
-'      Milling(33) = Visibility.Visible                              ' LoTang
-'      Milling(34) = Visibility.Visible                              ' LoPerp
-'      Milling(35) = Visibility.Visible                              ' LoElev
-'      Milling(36) = Visibility.Visible                              ' LoCompLen
-'      Milling(37) = Visibility.Visible                              ' StartAddLen
-'      Milling(38) = Visibility.Visible                              ' EndAddLen
-'      Milling(39) = Visibility.Collapsed                            ' StepExtArc
-'      Milling(40) = Visibility.Collapsed                            ' StepIntArc
-'      Milling(41) = Visibility.Collapsed                            ' SideStep
-'      Milling(42) = Visibility.Collapsed                            ' VertFeed
-'      Milling(43) = Visibility.Visible                              ' NamePar
-'      Milling(44) = Visibility.Visible                              ' Tool
-'      Milling(45) = Visibility.Visible                              ' DepthStr
-'      Milling(46) = Visibility.Visible                              ' UserNotes
-'      Milling(47) = Visibility.Visible                              ' OverLapStr
-'      Milling(48) = Visibility.Collapsed                            ' OffsetStr
-'      Milling(49) = Visibility.Collapsed                            ' SubType
-'      Milling(50) = Visibility.Collapsed                            ' SelectedSolChoiceType
-'      Milling(51) = Visibility.Collapsed                            ' InitAngs
-'      Milling(52) = Visibility.Collapsed                            ' BlockedAxis
-'      Milling(53) = Visibility.Collapsed                            ' FaceUseType
-'      Milling(54) = Visibility.Collapsed                            ' InvertToolDir
-'      Milling(55) = Visibility.Collapsed                            ' StepBack
-'      Milling(56) = Visibility.Collapsed                            ' StepSideAngBack
-'      Milling(57) = Visibility.Collapsed                            ' BackFeed
-'      Milling(58) = Visibility.Collapsed                            ' StepSideAng
-'      Milling(59) = Visibility.Collapsed                            ' ForwardAngle
-'      Milling(60) = Visibility.Collapsed                            ' Probing
-'      Milling(61) = Visibility.Collapsed                            ' ProbingMinDist
-'      Milling(62) = Visibility.Collapsed                            ' ProbingMaxDist
-'      Milling(63) = Visibility.Collapsed                            ' ExtCornType
-'      Milling(64) = Visibility.Collapsed                            ' IntCornType
-'      Milling(65) = Visibility.Collapsed                            ' CornSlowLen
-'      Milling(66) = Visibility.Collapsed                            ' CornSlowPerc
-'      Milling(67) = Visibility.Collapsed                            ' LiHole
-'      Milling(68) = Visibility.Collapsed                            ' LiHoleRad
-'      Milling(69) = Visibility.Collapsed                            ' LpTurns
-'      Milling(70) = Visibility.Collapsed                            ' HpTurns
-'      Milling(71) = Visibility.Collapsed                            ' ThicknessFeed
-'      Milling(102) = Visibility.Collapsed                           ' Expander LeadIn
-'      Milling(103) = Visibility.Collapsed                           ' Expander LeadOut
+      ' Parametri Milling
+      Milling(0) = Visibility.Visible                               ' Invert
+      Milling(1) = Visibility.Visible                               ' LeaveTab
+      Milling(2) = Visibility.Visible                               ' WorkSide
+      Milling(3) = Visibility.Collapsed                             ' HeadSide
+      Milling(4) = Visibility.Visible                               ' LeadInType
+      Milling(5) = Visibility.Collapsed                             ' ExtLinkType
+      Milling(6) = Visibility.Visible                               ' LeadOutType
+      Milling(7) = Visibility.Collapsed                             ' CurveUse
+      Milling(8) = Visibility.Visible                               ' StepType
+      Milling(9) = Visibility.Collapsed                             ' LeadLinkType
+      Milling(10) = Visibility.Visible                              ' Speed
+      Milling(11) = Visibility.Visible                              ' Feed
+      Milling(12) = Visibility.Visible                              ' StartFeed
+      Milling(13) = Visibility.Visible                              ' EndFeed
+      Milling(14) = Visibility.Visible                              ' TipFeed
+      Milling(15) = Visibility.Visible                              ' OffSr
+      Milling(16) = Visibility.Visible                              ' OffSl
+      Milling(17) = Visibility.Visible                              ' SideAngle
+      Milling(18) = Visibility.Collapsed                            ' Approx
+      Milling(19) = Visibility.Visible                              ' StartPos
+      Milling(20) = Visibility.Collapsed                            ' StartSlowLen
+      Milling(21) = Visibility.Collapsed                            ' EndSlowLen
+      Milling(22) = Visibility.Collapsed                            ' ThroughAddlen
+      Milling(23) = Visibility.Visible                              ' StepPar
+      Milling(24) = Visibility.Collapsed                            ' ReturnPos
+      Milling(25) = Visibility.Visible                              ' TabLen
+      Milling(26) = Visibility.Visible                              ' TabDist
+      Milling(27) = Visibility.Visible                              ' TabHeight
+      Milling(28) = Visibility.Visible                              ' TabAngle
+      Milling(29) = Visibility.Visible                              ' LiTang
+      Milling(30) = Visibility.Visible                              ' LiPerp
+      Milling(31) = Visibility.Visible                              ' LiElev
+      Milling(32) = Visibility.Visible                              ' LiCompLen
+      Milling(33) = Visibility.Visible                              ' LoTang
+      Milling(34) = Visibility.Visible                              ' LoPerp
+      Milling(35) = Visibility.Visible                              ' LoElev
+      Milling(36) = Visibility.Visible                              ' LoCompLen
+      Milling(37) = Visibility.Visible                              ' StartAddLen
+      Milling(38) = Visibility.Visible                              ' EndAddLen
+      Milling(39) = Visibility.Collapsed                            ' StepExtArc
+      Milling(40) = Visibility.Collapsed                            ' StepIntArc
+      Milling(41) = Visibility.Collapsed                            ' SideStep
+      Milling(42) = Visibility.Collapsed                            ' VertFeed
+      Milling(43) = Visibility.Visible                              ' NamePar
+      Milling(44) = Visibility.Visible                              ' Tool
+      Milling(45) = Visibility.Visible                              ' DepthStr
+      Milling(46) = Visibility.Visible                              ' UserNotes
+      Milling(47) = Visibility.Visible                              ' OverLapStr
+      Milling(48) = Visibility.Collapsed                            ' OffsetStr
+      Milling(49) = Visibility.Collapsed                            ' SubType
+      Milling(50) = Visibility.Collapsed                            ' SelectedSolChoiceType
+      Milling(51) = Visibility.Collapsed                            ' InitAngs
+      Milling(52) = Visibility.Collapsed                            ' BlockedAxis
+      Milling(53) = Visibility.Collapsed                            ' FaceUseType
+      Milling(54) = Visibility.Collapsed                            ' InvertToolDir
+      Milling(55) = Visibility.Collapsed                            ' StepBack
+      Milling(56) = Visibility.Collapsed                            ' StepSideAngBack
+      Milling(57) = Visibility.Collapsed                            ' BackFeed
+      Milling(58) = Visibility.Collapsed                            ' StepSideAng
+      Milling(59) = Visibility.Collapsed                            ' ForwardAngle
+      Milling(60) = Visibility.Collapsed                            ' Probing
+      Milling(61) = Visibility.Collapsed                            ' ProbingMinDist
+      Milling(62) = Visibility.Collapsed                            ' ProbingMaxDist
+      Milling(63) = Visibility.Collapsed                            ' ExtCornType
+      Milling(64) = Visibility.Collapsed                            ' IntCornType
+      Milling(65) = Visibility.Collapsed                            ' CornSlowLen
+      Milling(66) = Visibility.Collapsed                            ' CornSlowPerc
+      Milling(67) = Visibility.Collapsed                            ' LiHole
+      Milling(68) = Visibility.Collapsed                            ' LiHoleRad
+      Milling(69) = Visibility.Collapsed                            ' LpTurns
+      Milling(70) = Visibility.Collapsed                            ' HpTurns
+      Milling(71) = Visibility.Collapsed                            ' ThicknessFeed
+      Milling(102) = Visibility.Collapsed                           ' Expander LeadIn
+      Milling(103) = Visibility.Collapsed                           ' Expander LeadOut
 
-'      ' Parametri Drilling
-'      Drilling(0) = Visibility.Visible                              ' Invert
-'      Drilling(1) = Visibility.Collapsed                            ' LeaveTab
-'      Drilling(2) = Visibility.Collapsed                            ' WorkSide
-'      Drilling(3) = Visibility.Collapsed                            ' HeadSide
-'      Drilling(4) = Visibility.Collapsed                            ' LeadInType
-'      Drilling(5) = Visibility.Collapsed                            ' ExtLinkType
-'      Drilling(6) = Visibility.Collapsed                            ' LeadOutType
-'      Drilling(7) = Visibility.Collapsed                            ' CurveUse
-'      Drilling(8) = Visibility.Collapsed                            ' StepType
-'      Drilling(9) = Visibility.Collapsed                            ' LeadLinkType
-'      Drilling(10) = Visibility.Visible                             ' Speed
-'      Drilling(11) = Visibility.Visible                             ' Feed
-'      Drilling(12) = Visibility.Visible                             ' StartFeed
-'      Drilling(13) = Visibility.Visible                             ' EndFeed
-'      Drilling(14) = Visibility.Visible                             ' TipFeed
-'      Drilling(15) = Visibility.Collapsed                           ' OffSr
-'      Drilling(16) = Visibility.Collapsed                           ' OffSl
-'      Drilling(17) = Visibility.Collapsed                           ' SideAngle
-'      Drilling(18) = Visibility.Collapsed                           ' Approx
-'      Drilling(19) = Visibility.Visible                             ' StartPos
-'      Drilling(20) = Visibility.Visible                             ' StartSlowLen
-'      Drilling(21) = Visibility.Visible                             ' EndSlowLen
-'      Drilling(22) = Visibility.Visible                             ' ThroughAddlen
-'      Drilling(23) = Visibility.Visible                             ' StepPar
-'      Drilling(24) = Visibility.Visible                             ' ReturnPos
-'      Drilling(25) = Visibility.Collapsed                           ' TabLen
-'      Drilling(26) = Visibility.Collapsed                           ' TabDist
-'      Drilling(27) = Visibility.Collapsed                           ' TabHeight
-'      Drilling(28) = Visibility.Collapsed                           ' TabAngle
-'      Drilling(29) = Visibility.Collapsed                           ' LiTang
-'      Drilling(30) = Visibility.Collapsed                           ' LiPerp
-'      Drilling(31) = Visibility.Collapsed                           ' LiElev
-'      Drilling(32) = Visibility.Collapsed                           ' LiCompLen
-'      Drilling(33) = Visibility.Collapsed                           ' LoTang
-'      Drilling(34) = Visibility.Collapsed                           ' LoPerp
-'      Drilling(35) = Visibility.Collapsed                           ' LoElev
-'      Drilling(36) = Visibility.Collapsed                           ' LoCompLen
-'      Drilling(37) = Visibility.Collapsed                           ' StartAddLen
-'      Drilling(38) = Visibility.Collapsed                           ' EndAddLen
-'      Drilling(39) = Visibility.Collapsed                           ' StepExtArc
-'      Drilling(40) = Visibility.Collapsed                           ' StepIntArc
-'      Drilling(41) = Visibility.Collapsed                           ' SideStep
-'      Drilling(42) = Visibility.Collapsed                           ' VertFeed
-'      Drilling(43) = Visibility.Visible                             ' NamePar
-'      Drilling(44) = Visibility.Visible                             ' Tool
-'      Drilling(45) = Visibility.Visible                             ' DepthStr
-'      Drilling(46) = Visibility.Visible                             ' UserNotes
-'      Drilling(47) = Visibility.Collapsed                           ' OverLapStr
-'      Drilling(48) = Visibility.Collapsed                           ' OffsetStr
-'      Drilling(49) = Visibility.Collapsed                           ' SubType
-'      Drilling(50) = Visibility.Collapsed                           ' SelectedSolChoiceType
-'      Drilling(51) = Visibility.Collapsed                           ' InitAngs
-'      Drilling(52) = Visibility.Collapsed                           ' BlockedAxis
-'      Drilling(53) = Visibility.Collapsed                           ' FaceUseType
-'      Drilling(54) = Visibility.Collapsed                           ' InvertToolDir
-'      Drilling(55) = Visibility.Collapsed                           ' StepBack
-'      Drilling(56) = Visibility.Collapsed                           ' StepSideAngBack
-'      Drilling(57) = Visibility.Collapsed                           ' BackFeed
-'      Drilling(58) = Visibility.Collapsed                           ' StepSideAng
-'      Drilling(59) = Visibility.Collapsed                           ' ForwardAngle
-'      Drilling(60) = Visibility.Collapsed                           ' Probing
-'      Drilling(61) = Visibility.Collapsed                           ' ProbingMinDist
-'      Drilling(62) = Visibility.Collapsed                           ' ProbingMaxDist
-'      Drilling(63) = Visibility.Collapsed                           ' ExtCornType
-'      Drilling(64) = Visibility.Collapsed                           ' IntCornType
-'      Drilling(65) = Visibility.Collapsed                           ' CornSlowLen
-'      Drilling(66) = Visibility.Collapsed                           ' CornSlowPerc
-'      Drilling(67) = Visibility.Collapsed                           ' LiHole
-'      Drilling(68) = Visibility.Collapsed                           ' LiHoleRad
-'      Drilling(69) = Visibility.Collapsed                           ' LpTurns
-'      Drilling(70) = Visibility.Collapsed                           ' HpTurns
-'      Drilling(71) = Visibility.Collapsed                           ' ThicknessFeed
-'      Drilling(102) = Visibility.Collapsed                          ' Expander LeadIn
-'      Drilling(103) = Visibility.Collapsed                          ' Expander LeadOut
+      ' Parametri Drilling
+      Drilling(0) = Visibility.Visible                              ' Invert
+      Drilling(1) = Visibility.Collapsed                            ' LeaveTab
+      Drilling(2) = Visibility.Collapsed                            ' WorkSide
+      Drilling(3) = Visibility.Collapsed                            ' HeadSide
+      Drilling(4) = Visibility.Collapsed                            ' LeadInType
+      Drilling(5) = Visibility.Collapsed                            ' ExtLinkType
+      Drilling(6) = Visibility.Collapsed                            ' LeadOutType
+      Drilling(7) = Visibility.Collapsed                            ' CurveUse
+      Drilling(8) = Visibility.Collapsed                            ' StepType
+      Drilling(9) = Visibility.Collapsed                            ' LeadLinkType
+      Drilling(10) = Visibility.Visible                             ' Speed
+      Drilling(11) = Visibility.Visible                             ' Feed
+      Drilling(12) = Visibility.Visible                             ' StartFeed
+      Drilling(13) = Visibility.Visible                             ' EndFeed
+      Drilling(14) = Visibility.Visible                             ' TipFeed
+      Drilling(15) = Visibility.Collapsed                           ' OffSr
+      Drilling(16) = Visibility.Collapsed                           ' OffSl
+      Drilling(17) = Visibility.Collapsed                           ' SideAngle
+      Drilling(18) = Visibility.Collapsed                           ' Approx
+      Drilling(19) = Visibility.Visible                             ' StartPos
+      Drilling(20) = Visibility.Visible                             ' StartSlowLen
+      Drilling(21) = Visibility.Visible                             ' EndSlowLen
+      Drilling(22) = Visibility.Visible                             ' ThroughAddlen
+      Drilling(23) = Visibility.Visible                             ' StepPar
+      Drilling(24) = Visibility.Visible                             ' ReturnPos
+      Drilling(25) = Visibility.Collapsed                           ' TabLen
+      Drilling(26) = Visibility.Collapsed                           ' TabDist
+      Drilling(27) = Visibility.Collapsed                           ' TabHeight
+      Drilling(28) = Visibility.Collapsed                           ' TabAngle
+      Drilling(29) = Visibility.Collapsed                           ' LiTang
+      Drilling(30) = Visibility.Collapsed                           ' LiPerp
+      Drilling(31) = Visibility.Collapsed                           ' LiElev
+      Drilling(32) = Visibility.Collapsed                           ' LiCompLen
+      Drilling(33) = Visibility.Collapsed                           ' LoTang
+      Drilling(34) = Visibility.Collapsed                           ' LoPerp
+      Drilling(35) = Visibility.Collapsed                           ' LoElev
+      Drilling(36) = Visibility.Collapsed                           ' LoCompLen
+      Drilling(37) = Visibility.Collapsed                           ' StartAddLen
+      Drilling(38) = Visibility.Collapsed                           ' EndAddLen
+      Drilling(39) = Visibility.Collapsed                           ' StepExtArc
+      Drilling(40) = Visibility.Collapsed                           ' StepIntArc
+      Drilling(41) = Visibility.Collapsed                           ' SideStep
+      Drilling(42) = Visibility.Collapsed                           ' VertFeed
+      Drilling(43) = Visibility.Visible                             ' NamePar
+      Drilling(44) = Visibility.Visible                             ' Tool
+      Drilling(45) = Visibility.Visible                             ' DepthStr
+      Drilling(46) = Visibility.Visible                             ' UserNotes
+      Drilling(47) = Visibility.Collapsed                           ' OverLapStr
+      Drilling(48) = Visibility.Collapsed                           ' OffsetStr
+      Drilling(49) = Visibility.Collapsed                           ' SubType
+      Drilling(50) = Visibility.Collapsed                           ' SelectedSolChoiceType
+      Drilling(51) = Visibility.Collapsed                           ' InitAngs
+      Drilling(52) = Visibility.Collapsed                           ' BlockedAxis
+      Drilling(53) = Visibility.Collapsed                           ' FaceUseType
+      Drilling(54) = Visibility.Collapsed                           ' InvertToolDir
+      Drilling(55) = Visibility.Collapsed                           ' StepBack
+      Drilling(56) = Visibility.Collapsed                           ' StepSideAngBack
+      Drilling(57) = Visibility.Collapsed                           ' BackFeed
+      Drilling(58) = Visibility.Collapsed                           ' StepSideAng
+      Drilling(59) = Visibility.Collapsed                           ' ForwardAngle
+      Drilling(60) = Visibility.Collapsed                           ' Probing
+      Drilling(61) = Visibility.Collapsed                           ' ProbingMinDist
+      Drilling(62) = Visibility.Collapsed                           ' ProbingMaxDist
+      Drilling(63) = Visibility.Collapsed                           ' ExtCornType
+      Drilling(64) = Visibility.Collapsed                           ' IntCornType
+      Drilling(65) = Visibility.Collapsed                           ' CornSlowLen
+      Drilling(66) = Visibility.Collapsed                           ' CornSlowPerc
+      Drilling(67) = Visibility.Collapsed                           ' LiHole
+      Drilling(68) = Visibility.Collapsed                           ' LiHoleRad
+      Drilling(69) = Visibility.Collapsed                           ' LpTurns
+      Drilling(70) = Visibility.Collapsed                           ' HpTurns
+      Drilling(71) = Visibility.Collapsed                           ' ThicknessFeed
+      Drilling(102) = Visibility.Collapsed                          ' Expander LeadIn
+      Drilling(103) = Visibility.Collapsed                          ' Expander LeadOut
 
-'      ' Parametri Sawing
-'      Sawing(0) = Visibility.Visible                                ' Invert
-'      Sawing(1) = Visibility.Collapsed                              ' LeaveTab
-'      Sawing(2) = Visibility.Visible                                ' WorkSide
-'      Sawing(3) = Visibility.Visible                                ' HeadSide
-'      Sawing(4) = Visibility.Visible                                ' LeadInType
-'      Sawing(5) = Visibility.Visible                                ' ExtLinkType
-'      Sawing(6) = Visibility.Visible                                ' LeadOutType
-'      Sawing(7) = Visibility.Collapsed                              ' CurveUse
-'      Sawing(8) = Visibility.Visible                                ' StepType
-'      Sawing(9) = Visibility.Collapsed                              ' LeadLinkType
-'      Sawing(10) = Visibility.Visible                               ' Speed
-'      Sawing(11) = Visibility.Visible                               ' Feed
-'      Sawing(12) = Visibility.Visible                               ' StartFeed
-'      Sawing(13) = Visibility.Visible                               ' EndFeed
-'      Sawing(14) = Visibility.Visible                               ' TipFeed
-'      Sawing(15) = Visibility.Visible                               ' OffSr
-'      Sawing(16) = Visibility.Visible                               ' OffSl
-'      Sawing(17) = Visibility.Visible                               ' SideAngle
-'      Sawing(18) = Visibility.Collapsed                             ' Approx
-'      Sawing(19) = Visibility.Visible                               ' StartPos
-'      Sawing(20) = Visibility.Collapsed                             ' StartSlowLen
-'      Sawing(21) = Visibility.Collapsed                             ' EndSlowLen
-'      Sawing(22) = Visibility.Collapsed                             ' ThroughAddlen
-'      Sawing(23) = Visibility.Visible                               ' StepPar
-'      Sawing(24) = Visibility.Collapsed                             ' ReturnPos
-'      Sawing(25) = Visibility.Collapsed                             ' TabLen
-'      Sawing(26) = Visibility.Collapsed                             ' TabDist
-'      Sawing(27) = Visibility.Collapsed                             ' TabHeight
-'      Sawing(28) = Visibility.Collapsed                             ' TabAngle
-'      Sawing(29) = Visibility.Collapsed                             ' LiTang
-'      Sawing(30) = Visibility.Collapsed                             ' LiPerp
-'      Sawing(31) = Visibility.Collapsed                             ' LiElev
-'      Sawing(32) = Visibility.Collapsed                             ' LiCompLen
-'      Sawing(33) = Visibility.Collapsed                             ' LoTang
-'      Sawing(34) = Visibility.Collapsed                             ' LoPerp
-'      Sawing(35) = Visibility.Collapsed                             ' LoElev
-'      Sawing(36) = Visibility.Collapsed                             ' LoCompLen
-'      Sawing(37) = Visibility.Visible                               ' StartAddLen
-'      Sawing(38) = Visibility.Visible                               ' EndAddLen
-'      Sawing(39) = Visibility.Collapsed                             ' StepExtArc
-'      Sawing(40) = Visibility.Collapsed                             ' StepIntArc
-'      Sawing(41) = Visibility.Collapsed                             ' SideStep
-'      Sawing(42) = Visibility.Collapsed                             ' VertFeed
-'      Sawing(43) = Visibility.Visible                               ' NamePar
-'      Sawing(44) = Visibility.Visible                               ' Tool
-'      Sawing(45) = Visibility.Visible                               ' DepthStr
-'      Sawing(46) = Visibility.Visible                               ' UserNotes
-'      Sawing(47) = Visibility.Collapsed                             ' OverLapStr
-'      Sawing(48) = Visibility.Collapsed                             ' OffsetStr
-'      Sawing(49) = Visibility.Collapsed                             ' SubType
-'      Sawing(50) = Visibility.Collapsed                             ' SelectedSolChoiceType
-'      Sawing(51) = Visibility.Collapsed                             ' InitAngs
-'      Sawing(52) = Visibility.Collapsed                             ' BlockedAxis
-'      Sawing(53) = Visibility.Collapsed                             ' FaceUseType
-'      Sawing(54) = Visibility.Collapsed                             ' InvertToolDir
-'      Sawing(55) = Visibility.Visible                               ' StepBack
-'      Sawing(56) = Visibility.Visible                               ' StepSideAngBack
-'      Sawing(57) = Visibility.Visible                               ' BackFeed
-'      Sawing(58) = Visibility.Visible                               ' StepSideAng
-'      Sawing(59) = Visibility.Collapsed                             ' ForwardAngle
-'      Sawing(60) = Visibility.Collapsed                             ' Probing
-'      Sawing(61) = Visibility.Collapsed                             ' ProbingMinDist
-'      Sawing(62) = Visibility.Collapsed                             ' ProbingMaxDist
-'      Sawing(63) = Visibility.Collapsed                             ' ExtCornType
-'      Sawing(64) = Visibility.Collapsed                             ' IntCornType
-'      Sawing(65) = Visibility.Collapsed                             ' CornSlowLen
-'      Sawing(66) = Visibility.Collapsed                             ' CornSlowPerc
-'      Sawing(67) = Visibility.Collapsed                             ' LiHole
-'      Sawing(68) = Visibility.Collapsed                             ' LiHoleRad
-'      Sawing(69) = Visibility.Collapsed                             ' LpTurns
-'      Sawing(70) = Visibility.Collapsed                             ' HpTurns
-'      Sawing(71) = Visibility.Collapsed                             ' ThicknessFeed
-'      Sawing(102) = Visibility.Collapsed                            ' Expander LeadIn
-'      Sawing(103) = Visibility.Collapsed                            ' Expander LeadOut
+      ' Parametri Sawing
+      Sawing(0) = Visibility.Visible                                ' Invert
+      Sawing(1) = Visibility.Collapsed                              ' LeaveTab
+      Sawing(2) = Visibility.Visible                                ' WorkSide
+      Sawing(3) = Visibility.Visible                                ' HeadSide
+      Sawing(4) = Visibility.Visible                                ' LeadInType
+      Sawing(5) = Visibility.Visible                                ' ExtLinkType
+      Sawing(6) = Visibility.Visible                                ' LeadOutType
+      Sawing(7) = Visibility.Collapsed                              ' CurveUse
+      Sawing(8) = Visibility.Visible                                ' StepType
+      Sawing(9) = Visibility.Collapsed                              ' LeadLinkType
+      Sawing(10) = Visibility.Visible                               ' Speed
+      Sawing(11) = Visibility.Visible                               ' Feed
+      Sawing(12) = Visibility.Visible                               ' StartFeed
+      Sawing(13) = Visibility.Visible                               ' EndFeed
+      Sawing(14) = Visibility.Visible                               ' TipFeed
+      Sawing(15) = Visibility.Visible                               ' OffSr
+      Sawing(16) = Visibility.Visible                               ' OffSl
+      Sawing(17) = Visibility.Visible                               ' SideAngle
+      Sawing(18) = Visibility.Collapsed                             ' Approx
+      Sawing(19) = Visibility.Visible                               ' StartPos
+      Sawing(20) = Visibility.Collapsed                             ' StartSlowLen
+      Sawing(21) = Visibility.Collapsed                             ' EndSlowLen
+      Sawing(22) = Visibility.Collapsed                             ' ThroughAddlen
+      Sawing(23) = Visibility.Visible                               ' StepPar
+      Sawing(24) = Visibility.Collapsed                             ' ReturnPos
+      Sawing(25) = Visibility.Collapsed                             ' TabLen
+      Sawing(26) = Visibility.Collapsed                             ' TabDist
+      Sawing(27) = Visibility.Collapsed                             ' TabHeight
+      Sawing(28) = Visibility.Collapsed                             ' TabAngle
+      Sawing(29) = Visibility.Collapsed                             ' LiTang
+      Sawing(30) = Visibility.Collapsed                             ' LiPerp
+      Sawing(31) = Visibility.Collapsed                             ' LiElev
+      Sawing(32) = Visibility.Collapsed                             ' LiCompLen
+      Sawing(33) = Visibility.Collapsed                             ' LoTang
+      Sawing(34) = Visibility.Collapsed                             ' LoPerp
+      Sawing(35) = Visibility.Collapsed                             ' LoElev
+      Sawing(36) = Visibility.Collapsed                             ' LoCompLen
+      Sawing(37) = Visibility.Visible                               ' StartAddLen
+      Sawing(38) = Visibility.Visible                               ' EndAddLen
+      Sawing(39) = Visibility.Collapsed                             ' StepExtArc
+      Sawing(40) = Visibility.Collapsed                             ' StepIntArc
+      Sawing(41) = Visibility.Collapsed                             ' SideStep
+      Sawing(42) = Visibility.Collapsed                             ' VertFeed
+      Sawing(43) = Visibility.Visible                               ' NamePar
+      Sawing(44) = Visibility.Visible                               ' Tool
+      Sawing(45) = Visibility.Visible                               ' DepthStr
+      Sawing(46) = Visibility.Visible                               ' UserNotes
+      Sawing(47) = Visibility.Collapsed                             ' OverLapStr
+      Sawing(48) = Visibility.Collapsed                             ' OffsetStr
+      Sawing(49) = Visibility.Collapsed                             ' SubType
+      Sawing(50) = Visibility.Collapsed                             ' SelectedSolChoiceType
+      Sawing(51) = Visibility.Collapsed                             ' InitAngs
+      Sawing(52) = Visibility.Collapsed                             ' BlockedAxis
+      Sawing(53) = Visibility.Collapsed                             ' FaceUseType
+      Sawing(54) = Visibility.Collapsed                             ' InvertToolDir
+      Sawing(55) = Visibility.Visible                               ' StepBack
+      Sawing(56) = Visibility.Visible                               ' StepSideAngBack
+      Sawing(57) = Visibility.Visible                               ' BackFeed
+      Sawing(58) = Visibility.Visible                               ' StepSideAng
+      Sawing(59) = Visibility.Collapsed                             ' ForwardAngle
+      Sawing(60) = Visibility.Collapsed                             ' Probing
+      Sawing(61) = Visibility.Collapsed                             ' ProbingMinDist
+      Sawing(62) = Visibility.Collapsed                             ' ProbingMaxDist
+      Sawing(63) = Visibility.Collapsed                             ' ExtCornType
+      Sawing(64) = Visibility.Collapsed                             ' IntCornType
+      Sawing(65) = Visibility.Collapsed                             ' CornSlowLen
+      Sawing(66) = Visibility.Collapsed                             ' CornSlowPerc
+      Sawing(67) = Visibility.Collapsed                             ' LiHole
+      Sawing(68) = Visibility.Collapsed                             ' LiHoleRad
+      Sawing(69) = Visibility.Collapsed                             ' LpTurns
+      Sawing(70) = Visibility.Collapsed                             ' HpTurns
+      Sawing(71) = Visibility.Collapsed                             ' ThicknessFeed
+      Sawing(102) = Visibility.Collapsed                            ' Expander LeadIn
+      Sawing(103) = Visibility.Collapsed                            ' Expander LeadOut
 
-'      ' Parametri Pocketing
-'      Pocketing(0) = Visibility.Visible                             ' Invert
-'      Pocketing(1) = Visibility.Collapsed                           ' LeaveTab
-'      Pocketing(2) = Visibility.Collapsed                           ' WorkSide
-'      Pocketing(3) = Visibility.Collapsed                           ' HeadSide
-'      Pocketing(4) = Visibility.Visible                             ' LeadInType
-'      Pocketing(5) = Visibility.Collapsed                           ' ExtLinkType
-'      Pocketing(6) = Visibility.Visible                             ' LeadOutType
-'      Pocketing(7) = Visibility.Collapsed                           ' CurveUse
-'      Pocketing(8) = Visibility.Collapsed                           ' StepType
-'      Pocketing(9) = Visibility.Collapsed                           ' LeadLinkType
-'      Pocketing(10) = Visibility.Visible                            ' Speed
-'      Pocketing(11) = Visibility.Visible                            ' Feed
-'      Pocketing(12) = Visibility.Visible                            ' StartFeed
-'      Pocketing(13) = Visibility.Visible                            ' EndFeed
-'      Pocketing(14) = Visibility.Visible                            ' TipFeed
-'      Pocketing(15) = Visibility.Visible                            ' OffSr
-'      Pocketing(16) = Visibility.Visible                            ' OffSl
-'      Pocketing(17) = Visibility.Visible                            ' SideAngle
-'      Pocketing(18) = Visibility.Collapsed                          ' Approx
-'      Pocketing(19) = Visibility.Visible                            ' StartPos
-'      Pocketing(20) = Visibility.Collapsed                          ' StartSlowLen
-'      Pocketing(21) = Visibility.Collapsed                          ' EndSlowLen
-'      Pocketing(22) = Visibility.Collapsed                          ' ThroughAddlen
-'      Pocketing(23) = Visibility.Visible                            ' StepPar
-'      Pocketing(24) = Visibility.Collapsed                          ' ReturnPos
-'      Pocketing(25) = Visibility.Collapsed                          ' TabLen
-'      Pocketing(26) = Visibility.Collapsed                          ' TabDist
-'      Pocketing(27) = Visibility.Collapsed                          ' TabHeight
-'      Pocketing(28) = Visibility.Collapsed                          ' TabAngle
-'      Pocketing(29) = Visibility.Visible                            ' LiTang
-'      Pocketing(30) = Visibility.Collapsed                          ' LiPerp
-'      Pocketing(31) = Visibility.Visible                            ' LiElev
-'      Pocketing(32) = Visibility.Collapsed                          ' LiCompLen
-'      Pocketing(33) = Visibility.Visible                            ' LoTang
-'      Pocketing(34) = Visibility.Collapsed                          ' LoPerp
-'      Pocketing(35) = Visibility.Collapsed                          ' LoElev
-'      Pocketing(36) = Visibility.Collapsed                          ' LoCompLen
-'      Pocketing(37) = Visibility.Collapsed                          ' StartAddLen
-'      Pocketing(38) = Visibility.Collapsed                          ' EndAddLen
-'      Pocketing(39) = Visibility.Collapsed                          ' StepExtArc
-'      Pocketing(40) = Visibility.Collapsed                          ' StepIntArc
-'      Pocketing(41) = Visibility.Visible                            ' SideStep
-'      Pocketing(42) = Visibility.Collapsed                          ' VertFeed
-'      Pocketing(43) = Visibility.Visible                            ' NamePar
-'      Pocketing(44) = Visibility.Visible                            ' Tool
-'      Pocketing(45) = Visibility.Visible                            ' DepthStr
-'      Pocketing(46) = Visibility.Visible                            ' UserNotes
-'      Pocketing(47) = Visibility.Collapsed                          ' OverLapStr
-'      Pocketing(48) = Visibility.Collapsed                          ' OffsetStr
-'      Pocketing(49) = Visibility.Visible                            ' SubType
-'      Pocketing(50) = Visibility.Collapsed                          ' SelectedSolChoiceType
-'      Pocketing(51) = Visibility.Collapsed                          ' InitAngs
-'      Pocketing(52) = Visibility.Collapsed                          ' BlockedAxis
-'      Pocketing(53) = Visibility.Collapsed                          ' FaceUseType
-'      Pocketing(54) = Visibility.Collapsed                          ' InvertToolDir
-'      Pocketing(55) = Visibility.Collapsed                          ' StepBack
-'      Pocketing(56) = Visibility.Collapsed                          ' StepSideAngBack
-'      Pocketing(57) = Visibility.Collapsed                          ' BackFeed
-'      Pocketing(58) = Visibility.Collapsed                          ' StepSideAng
-'      Pocketing(59) = Visibility.Collapsed                          ' ForwardAngle
-'      Pocketing(60) = Visibility.Collapsed                          ' Probing
-'      Pocketing(61) = Visibility.Collapsed                          ' ProbingMinDist
-'      Pocketing(62) = Visibility.Collapsed                          ' ProbingMaxDist
-'      Pocketing(63) = Visibility.Collapsed                          ' ExtCornType
-'      Pocketing(64) = Visibility.Collapsed                          ' IntCornType
-'      Pocketing(65) = Visibility.Collapsed                          ' CornSlowLen
-'      Pocketing(66) = Visibility.Collapsed                          ' CornSlowPerc
-'      Pocketing(67) = Visibility.Collapsed                          ' LiHole
-'      Pocketing(68) = Visibility.Collapsed                          ' LiHoleRad
-'      Pocketing(69) = Visibility.Collapsed                          ' LpTurns
-'      Pocketing(70) = Visibility.Collapsed                          ' HpTurns
-'      Pocketing(71) = Visibility.Collapsed                          ' ThicknessFeed
-'      Pocketing(102) = Visibility.Collapsed                         ' Expander LeadIn
-'      Pocketing(103) = Visibility.Collapsed                         ' Expander LeadOut
+      ' Parametri Pocketing
+      Pocketing(0) = Visibility.Visible                             ' Invert
+      Pocketing(1) = Visibility.Collapsed                           ' LeaveTab
+      Pocketing(2) = Visibility.Collapsed                           ' WorkSide
+      Pocketing(3) = Visibility.Collapsed                           ' HeadSide
+      Pocketing(4) = Visibility.Visible                             ' LeadInType
+      Pocketing(5) = Visibility.Collapsed                           ' ExtLinkType
+      Pocketing(6) = Visibility.Visible                             ' LeadOutType
+      Pocketing(7) = Visibility.Collapsed                           ' CurveUse
+      Pocketing(8) = Visibility.Collapsed                           ' StepType
+      Pocketing(9) = Visibility.Collapsed                           ' LeadLinkType
+      Pocketing(10) = Visibility.Visible                            ' Speed
+      Pocketing(11) = Visibility.Visible                            ' Feed
+      Pocketing(12) = Visibility.Visible                            ' StartFeed
+      Pocketing(13) = Visibility.Visible                            ' EndFeed
+      Pocketing(14) = Visibility.Visible                            ' TipFeed
+      Pocketing(15) = Visibility.Visible                            ' OffSr
+      Pocketing(16) = Visibility.Visible                            ' OffSl
+      Pocketing(17) = Visibility.Visible                            ' SideAngle
+      Pocketing(18) = Visibility.Collapsed                          ' Approx
+      Pocketing(19) = Visibility.Visible                            ' StartPos
+      Pocketing(20) = Visibility.Collapsed                          ' StartSlowLen
+      Pocketing(21) = Visibility.Collapsed                          ' EndSlowLen
+      Pocketing(22) = Visibility.Collapsed                          ' ThroughAddlen
+      Pocketing(23) = Visibility.Visible                            ' StepPar
+      Pocketing(24) = Visibility.Collapsed                          ' ReturnPos
+      Pocketing(25) = Visibility.Collapsed                          ' TabLen
+      Pocketing(26) = Visibility.Collapsed                          ' TabDist
+      Pocketing(27) = Visibility.Collapsed                          ' TabHeight
+      Pocketing(28) = Visibility.Collapsed                          ' TabAngle
+      Pocketing(29) = Visibility.Visible                            ' LiTang
+      Pocketing(30) = Visibility.Collapsed                          ' LiPerp
+      Pocketing(31) = Visibility.Visible                            ' LiElev
+      Pocketing(32) = Visibility.Collapsed                          ' LiCompLen
+      Pocketing(33) = Visibility.Visible                            ' LoTang
+      Pocketing(34) = Visibility.Collapsed                          ' LoPerp
+      Pocketing(35) = Visibility.Collapsed                          ' LoElev
+      Pocketing(36) = Visibility.Collapsed                          ' LoCompLen
+      Pocketing(37) = Visibility.Collapsed                          ' StartAddLen
+      Pocketing(38) = Visibility.Collapsed                          ' EndAddLen
+      Pocketing(39) = Visibility.Collapsed                          ' StepExtArc
+      Pocketing(40) = Visibility.Collapsed                          ' StepIntArc
+      Pocketing(41) = Visibility.Visible                            ' SideStep
+      Pocketing(42) = Visibility.Collapsed                          ' VertFeed
+      Pocketing(43) = Visibility.Visible                            ' NamePar
+      Pocketing(44) = Visibility.Visible                            ' Tool
+      Pocketing(45) = Visibility.Visible                            ' DepthStr
+      Pocketing(46) = Visibility.Visible                            ' UserNotes
+      Pocketing(47) = Visibility.Collapsed                          ' OverLapStr
+      Pocketing(48) = Visibility.Collapsed                          ' OffsetStr
+      Pocketing(49) = Visibility.Visible                            ' SubType
+      Pocketing(50) = Visibility.Collapsed                          ' SelectedSolChoiceType
+      Pocketing(51) = Visibility.Collapsed                          ' InitAngs
+      Pocketing(52) = Visibility.Collapsed                          ' BlockedAxis
+      Pocketing(53) = Visibility.Collapsed                          ' FaceUseType
+      Pocketing(54) = Visibility.Collapsed                          ' InvertToolDir
+      Pocketing(55) = Visibility.Collapsed                          ' StepBack
+      Pocketing(56) = Visibility.Collapsed                          ' StepSideAngBack
+      Pocketing(57) = Visibility.Collapsed                          ' BackFeed
+      Pocketing(58) = Visibility.Collapsed                          ' StepSideAng
+      Pocketing(59) = Visibility.Collapsed                          ' ForwardAngle
+      Pocketing(60) = Visibility.Collapsed                          ' Probing
+      Pocketing(61) = Visibility.Collapsed                          ' ProbingMinDist
+      Pocketing(62) = Visibility.Collapsed                          ' ProbingMaxDist
+      Pocketing(63) = Visibility.Collapsed                          ' ExtCornType
+      Pocketing(64) = Visibility.Collapsed                          ' IntCornType
+      Pocketing(65) = Visibility.Collapsed                          ' CornSlowLen
+      Pocketing(66) = Visibility.Collapsed                          ' CornSlowPerc
+      Pocketing(67) = Visibility.Collapsed                          ' LiHole
+      Pocketing(68) = Visibility.Collapsed                          ' LiHoleRad
+      Pocketing(69) = Visibility.Collapsed                          ' LpTurns
+      Pocketing(70) = Visibility.Collapsed                          ' HpTurns
+      Pocketing(71) = Visibility.Collapsed                          ' ThicknessFeed
+      Pocketing(102) = Visibility.Collapsed                         ' Expander LeadIn
+      Pocketing(103) = Visibility.Collapsed                         ' Expander LeadOut
 
-'      ' Parametri Mortising
-'      Mortising(0) = Visibility.Visible                             ' Invert
-'      Mortising(1) = Visibility.Collapsed                           ' LeaveTab
-'      Mortising(2) = Visibility.Collapsed                           ' WorkSide
-'      Mortising(3) = Visibility.Collapsed                           ' HeadSide
-'      Mortising(4) = Visibility.Collapsed                           ' LeadInType
-'      Mortising(5) = Visibility.Collapsed                           ' ExtLinkType
-'      Mortising(6) = Visibility.Collapsed                           ' LeadOutType
-'      Mortising(7) = Visibility.Collapsed                           ' CurveUse
-'      Mortising(8) = Visibility.Collapsed                           ' StepType
-'      Mortising(9) = Visibility.Collapsed                           ' LeadLinkType
-'      Mortising(10) = Visibility.Visible                            ' Speed
-'      Mortising(11) = Visibility.Visible                            ' Feed
-'      Mortising(12) = Visibility.Visible                            ' StartFeed
-'      Mortising(13) = Visibility.Visible                            ' EndFeed
-'      Mortising(14) = Visibility.Visible                            ' TipFeed
-'      Mortising(15) = Visibility.Collapsed                          ' OffSr
-'      Mortising(16) = Visibility.Collapsed                          ' OffSl
-'      Mortising(17) = Visibility.Collapsed                          ' SideAngle
-'      Mortising(18) = Visibility.Collapsed                          ' Approx
-'      Mortising(19) = Visibility.Visible                            ' StartPos
-'      Mortising(20) = Visibility.Collapsed                          ' StartSlowLen
-'      Mortising(21) = Visibility.Collapsed                          ' EndSlowLen
-'      Mortising(22) = Visibility.Collapsed                          ' ThroughAddlen
-'      Mortising(23) = Visibility.Collapsed                          ' StepPar
-'      Mortising(24) = Visibility.Collapsed                          ' Returnpos
-'      Mortising(25) = Visibility.Collapsed                          ' TabLen
-'      Mortising(26) = Visibility.Collapsed                          ' TabDist
-'      Mortising(27) = Visibility.Collapsed                          ' TabHeight
-'      Mortising(28) = Visibility.Collapsed                          ' TabAngle
-'      Mortising(29) = Visibility.Collapsed                          ' LiTang
-'      Mortising(30) = Visibility.Collapsed                          ' LiPerp
-'      Mortising(31) = Visibility.Collapsed                          ' LiElev
-'      Mortising(32) = Visibility.Collapsed                          ' LiCompLen
-'      Mortising(33) = Visibility.Collapsed                          ' LoTang
-'      Mortising(34) = Visibility.Collapsed                          ' LoPerp
-'      Mortising(35) = Visibility.Collapsed                          ' LoElev
-'      Mortising(36) = Visibility.Collapsed                          ' LoCompLen
-'      Mortising(37) = Visibility.Collapsed                          ' StartAddLen
-'      Mortising(38) = Visibility.Collapsed                          ' EndAddLen
-'      Mortising(39) = Visibility.Collapsed                          ' StepExtArc
-'      Mortising(40) = Visibility.Collapsed                          ' StepIntArc
-'      Mortising(41) = Visibility.Collapsed                          ' SideStep
-'      Mortising(42) = Visibility.Collapsed                          ' VertFeed
-'      Mortising(43) = Visibility.Visible                            ' Name
-'      Mortising(44) = Visibility.Visible                            ' Tool
-'      Mortising(45) = Visibility.Visible                            ' DepthStr
-'      Mortising(46) = Visibility.Visible                            ' UserNotes
-'      Mortising(47) = Visibility.Collapsed                          ' OverLapStr
-'      Mortising(48) = Visibility.Collapsed                          ' OffsetStr
-'      Mortising(49) = Visibility.Collapsed                          ' SubType
-'      Mortising(50) = Visibility.Collapsed                          ' SelectedSolChoiceType
-'      Mortising(51) = Visibility.Collapsed                          ' InitAngs
-'      Mortising(52) = Visibility.Collapsed                          ' BlockedAxis
-'      Mortising(53) = Visibility.Collapsed                          ' FaceUseType
-'      Mortising(54) = Visibility.Collapsed                          ' InvertToolDir
-'      Mortising(55) = Visibility.Collapsed                          ' StepBack
-'      Mortising(56) = Visibility.Collapsed                          ' StepSideAngBack
-'      Mortising(57) = Visibility.Collapsed                          ' BackFeed
-'      Mortising(58) = Visibility.Collapsed                          ' StepSideAng
-'      Mortising(59) = Visibility.Collapsed                          ' ForwardAngle
-'      Mortising(60) = Visibility.Collapsed                          ' Probing
-'      Mortising(61) = Visibility.Collapsed                          ' ProbingMinDist
-'      Mortising(62) = Visibility.Collapsed                          ' ProbingMaxDist
-'      Mortising(63) = Visibility.Collapsed                          ' ExtCornType
-'      Mortising(64) = Visibility.Collapsed                          ' IntCornType
-'      Mortising(65) = Visibility.Collapsed                          ' CornSlowLen
-'      Mortising(66) = Visibility.Collapsed                          ' CornSlowPerc
-'      Mortising(67) = Visibility.Collapsed                          ' LiHole
-'      Mortising(68) = Visibility.Collapsed                          ' LiHoleRad
-'      Mortising(69) = Visibility.Collapsed                          ' LpTurns
-'      Mortising(70) = Visibility.Collapsed                          ' HpTurns
-'      Mortising(71) = Visibility.Collapsed                          ' ThicknessFeed
-'      Mortising(102) = Visibility.Collapsed                         ' Expander LeadIn
-'      Mortising(103) = Visibility.Collapsed                         ' Expander LeadOut
+      ' Parametri Mortising
+      Mortising(0) = Visibility.Visible                             ' Invert
+      Mortising(1) = Visibility.Collapsed                           ' LeaveTab
+      Mortising(2) = Visibility.Collapsed                           ' WorkSide
+      Mortising(3) = Visibility.Collapsed                           ' HeadSide
+      Mortising(4) = Visibility.Collapsed                           ' LeadInType
+      Mortising(5) = Visibility.Collapsed                           ' ExtLinkType
+      Mortising(6) = Visibility.Collapsed                           ' LeadOutType
+      Mortising(7) = Visibility.Collapsed                           ' CurveUse
+      Mortising(8) = Visibility.Collapsed                           ' StepType
+      Mortising(9) = Visibility.Collapsed                           ' LeadLinkType
+      Mortising(10) = Visibility.Visible                            ' Speed
+      Mortising(11) = Visibility.Visible                            ' Feed
+      Mortising(12) = Visibility.Visible                            ' StartFeed
+      Mortising(13) = Visibility.Visible                            ' EndFeed
+      Mortising(14) = Visibility.Visible                            ' TipFeed
+      Mortising(15) = Visibility.Collapsed                          ' OffSr
+      Mortising(16) = Visibility.Collapsed                          ' OffSl
+      Mortising(17) = Visibility.Collapsed                          ' SideAngle
+      Mortising(18) = Visibility.Collapsed                          ' Approx
+      Mortising(19) = Visibility.Visible                            ' StartPos
+      Mortising(20) = Visibility.Collapsed                          ' StartSlowLen
+      Mortising(21) = Visibility.Collapsed                          ' EndSlowLen
+      Mortising(22) = Visibility.Collapsed                          ' ThroughAddlen
+      Mortising(23) = Visibility.Collapsed                          ' StepPar
+      Mortising(24) = Visibility.Collapsed                          ' Returnpos
+      Mortising(25) = Visibility.Collapsed                          ' TabLen
+      Mortising(26) = Visibility.Collapsed                          ' TabDist
+      Mortising(27) = Visibility.Collapsed                          ' TabHeight
+      Mortising(28) = Visibility.Collapsed                          ' TabAngle
+      Mortising(29) = Visibility.Collapsed                          ' LiTang
+      Mortising(30) = Visibility.Collapsed                          ' LiPerp
+      Mortising(31) = Visibility.Collapsed                          ' LiElev
+      Mortising(32) = Visibility.Collapsed                          ' LiCompLen
+      Mortising(33) = Visibility.Collapsed                          ' LoTang
+      Mortising(34) = Visibility.Collapsed                          ' LoPerp
+      Mortising(35) = Visibility.Collapsed                          ' LoElev
+      Mortising(36) = Visibility.Collapsed                          ' LoCompLen
+      Mortising(37) = Visibility.Collapsed                          ' StartAddLen
+      Mortising(38) = Visibility.Collapsed                          ' EndAddLen
+      Mortising(39) = Visibility.Collapsed                          ' StepExtArc
+      Mortising(40) = Visibility.Collapsed                          ' StepIntArc
+      Mortising(41) = Visibility.Collapsed                          ' SideStep
+      Mortising(42) = Visibility.Collapsed                          ' VertFeed
+      Mortising(43) = Visibility.Visible                            ' Name
+      Mortising(44) = Visibility.Visible                            ' Tool
+      Mortising(45) = Visibility.Visible                            ' DepthStr
+      Mortising(46) = Visibility.Visible                            ' UserNotes
+      Mortising(47) = Visibility.Collapsed                          ' OverLapStr
+      Mortising(48) = Visibility.Collapsed                          ' OffsetStr
+      Mortising(49) = Visibility.Collapsed                          ' SubType
+      Mortising(50) = Visibility.Collapsed                          ' SelectedSolChoiceType
+      Mortising(51) = Visibility.Collapsed                          ' InitAngs
+      Mortising(52) = Visibility.Collapsed                          ' BlockedAxis
+      Mortising(53) = Visibility.Collapsed                          ' FaceUseType
+      Mortising(54) = Visibility.Collapsed                          ' InvertToolDir
+      Mortising(55) = Visibility.Collapsed                          ' StepBack
+      Mortising(56) = Visibility.Collapsed                          ' StepSideAngBack
+      Mortising(57) = Visibility.Collapsed                          ' BackFeed
+      Mortising(58) = Visibility.Collapsed                          ' StepSideAng
+      Mortising(59) = Visibility.Collapsed                          ' ForwardAngle
+      Mortising(60) = Visibility.Collapsed                          ' Probing
+      Mortising(61) = Visibility.Collapsed                          ' ProbingMinDist
+      Mortising(62) = Visibility.Collapsed                          ' ProbingMaxDist
+      Mortising(63) = Visibility.Collapsed                          ' ExtCornType
+      Mortising(64) = Visibility.Collapsed                          ' IntCornType
+      Mortising(65) = Visibility.Collapsed                          ' CornSlowLen
+      Mortising(66) = Visibility.Collapsed                          ' CornSlowPerc
+      Mortising(67) = Visibility.Collapsed                          ' LiHole
+      Mortising(68) = Visibility.Collapsed                          ' LiHoleRad
+      Mortising(69) = Visibility.Collapsed                          ' LpTurns
+      Mortising(70) = Visibility.Collapsed                          ' HpTurns
+      Mortising(71) = Visibility.Collapsed                          ' ThicknessFeed
+      Mortising(102) = Visibility.Collapsed                         ' Expander LeadIn
+      Mortising(103) = Visibility.Collapsed                         ' Expander LeadOut
 
-'      ' Parametri Sawroughing
-'      Sawroughing(0) = Visibility.Visible                           ' Invert
-'      Sawroughing(1) = Visibility.Collapsed                         ' LeaveTab
-'      Sawroughing(2) = Visibility.Collapsed                         ' WorkSide
-'      Sawroughing(3) = Visibility.Visible                           ' HeadSide
-'      Sawroughing(4) = Visibility.Collapsed                         ' LeadInType
-'      Sawroughing(5) = Visibility.Collapsed                         ' ExtLinkType
-'      Sawroughing(6) = Visibility.Collapsed                         ' LeadOutType
-'      Sawroughing(7) = Visibility.Collapsed                         ' CurveUse
-'      Sawroughing(8) = Visibility.Visible                           ' StepType
-'      Sawroughing(9) = Visibility.Visible                           ' LeadLinkType
-'      Sawroughing(10) = Visibility.Visible                          ' Speed
-'      Sawroughing(11) = Visibility.Visible                          ' Feed
-'      Sawroughing(12) = Visibility.Visible                          ' StartFeed
-'      Sawroughing(13) = Visibility.Visible                          ' EndFeed
-'      Sawroughing(14) = Visibility.Visible                          ' TipFeed
-'      Sawroughing(15) = Visibility.Collapsed                        ' OffSr
-'      Sawroughing(16) = Visibility.Collapsed                        ' OffSl
-'      Sawroughing(17) = Visibility.Collapsed                        ' SideAngle
-'      Sawroughing(18) = Visibility.Collapsed                        ' Approx
-'      Sawroughing(19) = Visibility.Visible                          ' StartPos
-'      Sawroughing(20) = Visibility.Collapsed                        ' StartSlowLen
-'      Sawroughing(21) = Visibility.Collapsed                        ' EndSlowLen
-'      Sawroughing(22) = Visibility.Collapsed                        ' ThroughAddlen
-'      Sawroughing(23) = Visibility.Visible                          ' StepPar
-'      Sawroughing(24) = Visibility.Collapsed                        ' Returnpos
-'      Sawroughing(25) = Visibility.Collapsed                        ' TabLen
-'      Sawroughing(26) = Visibility.Collapsed                        ' TabDist
-'      Sawroughing(27) = Visibility.Collapsed                        ' TabHeight
-'      Sawroughing(28) = Visibility.Collapsed                        ' TabAngle
-'      Sawroughing(29) = Visibility.Collapsed                        ' LiTang
-'      Sawroughing(30) = Visibility.Collapsed                        ' LiPerp
-'      Sawroughing(31) = Visibility.Collapsed                        ' LiElev
-'      Sawroughing(32) = Visibility.Collapsed                        ' LiCompLen
-'      Sawroughing(33) = Visibility.Collapsed                        ' LoTang
-'      Sawroughing(34) = Visibility.Collapsed                        ' LoPerp
-'      Sawroughing(35) = Visibility.Collapsed                        ' LoElev
-'      Sawroughing(36) = Visibility.Collapsed                        ' LoCompLen
-'      Sawroughing(37) = Visibility.Collapsed                        ' StartAddLen
-'      Sawroughing(38) = Visibility.Collapsed                        ' EndAddLen
-'      Sawroughing(39) = Visibility.Collapsed                        ' StepExtArc
-'      Sawroughing(40) = Visibility.Collapsed                        ' StepIntArc
-'      Sawroughing(41) = Visibility.Visible                          ' SideStep
-'      Sawroughing(42) = Visibility.Visible                          ' VertFeed
-'      Sawroughing(43) = Visibility.Visible                          ' Name
-'      Sawroughing(44) = Visibility.Visible                          ' Tool
-'      Sawroughing(45) = Visibility.Visible                          ' DepthStr
-'      Sawroughing(46) = Visibility.Visible                          ' UserNotes
-'      Sawroughing(47) = Visibility.Collapsed                        ' OverLapStr
-'      Sawroughing(48) = Visibility.Collapsed                        ' OffsetStr
-'      Sawroughing(49) = Visibility.Collapsed                        ' SubType
-'      Sawroughing(50) = Visibility.Collapsed                        ' SelectedSolChoiceType
-'      Sawroughing(51) = Visibility.Collapsed                        ' InitAngs
-'      Sawroughing(52) = Visibility.Collapsed                        ' BlockedAxis
-'      Sawroughing(53) = Visibility.Collapsed                        ' FaceUseType
-'      Sawroughing(54) = Visibility.Collapsed                        ' InvertToolDir
-'      Sawroughing(55) = Visibility.Collapsed                        ' StepBack
-'      Sawroughing(56) = Visibility.Collapsed                        ' StepSideAngBack
-'      Sawroughing(57) = Visibility.Collapsed                        ' BackFeed
-'      Sawroughing(58) = Visibility.Collapsed                        ' StepSideAng
-'      Sawroughing(59) = Visibility.Collapsed                        ' ForwardAngle
-'      Sawroughing(60) = Visibility.Collapsed                        ' Probing
-'      Sawroughing(61) = Visibility.Collapsed                        ' ProbingMinDist
-'      Sawroughing(62) = Visibility.Collapsed                        ' ProbingMaxDist
-'      Sawroughing(63) = Visibility.Collapsed                        ' ExtCornType
-'      Sawroughing(64) = Visibility.Collapsed                        ' IntCornType
-'      Sawroughing(65) = Visibility.Collapsed                        ' CornSlowLen
-'      Sawroughing(66) = Visibility.Collapsed                        ' CornSlowPerc
-'      Sawroughing(67) = Visibility.Collapsed                        ' LiHole
-'      Sawroughing(68) = Visibility.Collapsed                        ' LiHoleRad
-'      Sawroughing(69) = Visibility.Collapsed                        ' LpTurns
-'      Sawroughing(70) = Visibility.Collapsed                        ' HpTurns
-'      Sawroughing(71) = Visibility.Collapsed                        ' ThicknessFeed
-'      Sawroughing(102) = Visibility.Collapsed                       ' Expander LeadIn
-'      Sawroughing(103) = Visibility.Collapsed                       ' Expander LeadOut
+      ' Parametri Sawroughing
+      Sawroughing(0) = Visibility.Visible                           ' Invert
+      Sawroughing(1) = Visibility.Collapsed                         ' LeaveTab
+      Sawroughing(2) = Visibility.Collapsed                         ' WorkSide
+      Sawroughing(3) = Visibility.Visible                           ' HeadSide
+      Sawroughing(4) = Visibility.Collapsed                         ' LeadInType
+      Sawroughing(5) = Visibility.Collapsed                         ' ExtLinkType
+      Sawroughing(6) = Visibility.Collapsed                         ' LeadOutType
+      Sawroughing(7) = Visibility.Collapsed                         ' CurveUse
+      Sawroughing(8) = Visibility.Visible                           ' StepType
+      Sawroughing(9) = Visibility.Visible                           ' LeadLinkType
+      Sawroughing(10) = Visibility.Visible                          ' Speed
+      Sawroughing(11) = Visibility.Visible                          ' Feed
+      Sawroughing(12) = Visibility.Visible                          ' StartFeed
+      Sawroughing(13) = Visibility.Visible                          ' EndFeed
+      Sawroughing(14) = Visibility.Visible                          ' TipFeed
+      Sawroughing(15) = Visibility.Collapsed                        ' OffSr
+      Sawroughing(16) = Visibility.Collapsed                        ' OffSl
+      Sawroughing(17) = Visibility.Collapsed                        ' SideAngle
+      Sawroughing(18) = Visibility.Collapsed                        ' Approx
+      Sawroughing(19) = Visibility.Visible                          ' StartPos
+      Sawroughing(20) = Visibility.Collapsed                        ' StartSlowLen
+      Sawroughing(21) = Visibility.Collapsed                        ' EndSlowLen
+      Sawroughing(22) = Visibility.Collapsed                        ' ThroughAddlen
+      Sawroughing(23) = Visibility.Visible                          ' StepPar
+      Sawroughing(24) = Visibility.Collapsed                        ' Returnpos
+      Sawroughing(25) = Visibility.Collapsed                        ' TabLen
+      Sawroughing(26) = Visibility.Collapsed                        ' TabDist
+      Sawroughing(27) = Visibility.Collapsed                        ' TabHeight
+      Sawroughing(28) = Visibility.Collapsed                        ' TabAngle
+      Sawroughing(29) = Visibility.Collapsed                        ' LiTang
+      Sawroughing(30) = Visibility.Collapsed                        ' LiPerp
+      Sawroughing(31) = Visibility.Collapsed                        ' LiElev
+      Sawroughing(32) = Visibility.Collapsed                        ' LiCompLen
+      Sawroughing(33) = Visibility.Collapsed                        ' LoTang
+      Sawroughing(34) = Visibility.Collapsed                        ' LoPerp
+      Sawroughing(35) = Visibility.Collapsed                        ' LoElev
+      Sawroughing(36) = Visibility.Collapsed                        ' LoCompLen
+      Sawroughing(37) = Visibility.Collapsed                        ' StartAddLen
+      Sawroughing(38) = Visibility.Collapsed                        ' EndAddLen
+      Sawroughing(39) = Visibility.Collapsed                        ' StepExtArc
+      Sawroughing(40) = Visibility.Collapsed                        ' StepIntArc
+      Sawroughing(41) = Visibility.Visible                          ' SideStep
+      Sawroughing(42) = Visibility.Visible                          ' VertFeed
+      Sawroughing(43) = Visibility.Visible                          ' Name
+      Sawroughing(44) = Visibility.Visible                          ' Tool
+      Sawroughing(45) = Visibility.Visible                          ' DepthStr
+      Sawroughing(46) = Visibility.Visible                          ' UserNotes
+      Sawroughing(47) = Visibility.Collapsed                        ' OverLapStr
+      Sawroughing(48) = Visibility.Collapsed                        ' OffsetStr
+      Sawroughing(49) = Visibility.Collapsed                        ' SubType
+      Sawroughing(50) = Visibility.Collapsed                        ' SelectedSolChoiceType
+      Sawroughing(51) = Visibility.Collapsed                        ' InitAngs
+      Sawroughing(52) = Visibility.Collapsed                        ' BlockedAxis
+      Sawroughing(53) = Visibility.Collapsed                        ' FaceUseType
+      Sawroughing(54) = Visibility.Collapsed                        ' InvertToolDir
+      Sawroughing(55) = Visibility.Collapsed                        ' StepBack
+      Sawroughing(56) = Visibility.Collapsed                        ' StepSideAngBack
+      Sawroughing(57) = Visibility.Collapsed                        ' BackFeed
+      Sawroughing(58) = Visibility.Collapsed                        ' StepSideAng
+      Sawroughing(59) = Visibility.Collapsed                        ' ForwardAngle
+      Sawroughing(60) = Visibility.Collapsed                        ' Probing
+      Sawroughing(61) = Visibility.Collapsed                        ' ProbingMinDist
+      Sawroughing(62) = Visibility.Collapsed                        ' ProbingMaxDist
+      Sawroughing(63) = Visibility.Collapsed                        ' ExtCornType
+      Sawroughing(64) = Visibility.Collapsed                        ' IntCornType
+      Sawroughing(65) = Visibility.Collapsed                        ' CornSlowLen
+      Sawroughing(66) = Visibility.Collapsed                        ' CornSlowPerc
+      Sawroughing(67) = Visibility.Collapsed                        ' LiHole
+      Sawroughing(68) = Visibility.Collapsed                        ' LiHoleRad
+      Sawroughing(69) = Visibility.Collapsed                        ' LpTurns
+      Sawroughing(70) = Visibility.Collapsed                        ' HpTurns
+      Sawroughing(71) = Visibility.Collapsed                        ' ThicknessFeed
+      Sawroughing(102) = Visibility.Collapsed                       ' Expander LeadIn
+      Sawroughing(103) = Visibility.Collapsed                       ' Expander LeadOut
 
-'      ' Parametri Sawfinishing
-'      Sawfinishing(0) = Visibility.Visible                          ' Invert
-'      Sawfinishing(1) = Visibility.Collapsed                        ' LeaveTab
-'      Sawfinishing(2) = Visibility.Collapsed                        ' WorkSide
-'      Sawfinishing(3) = Visibility.Visible                          ' HeadSide
-'      Sawfinishing(4) = Visibility.Collapsed                        ' LeadInType
-'      Sawfinishing(5) = Visibility.Collapsed                        ' ExtLinkType
-'      Sawfinishing(6) = Visibility.Collapsed                        ' LeadOutType
-'      Sawfinishing(7) = Visibility.Collapsed                        ' CurveUse
-'      Sawfinishing(8) = Visibility.Visible                          ' StepType
-'      Sawfinishing(9) = Visibility.Visible                          ' LeadLinkType
-'      Sawfinishing(10) = Visibility.Visible                         ' Speed
-'      Sawfinishing(11) = Visibility.Visible                         ' Feed
-'      Sawfinishing(12) = Visibility.Visible                         ' StartFeed
-'      Sawfinishing(13) = Visibility.Visible                         ' EndFeed
-'      Sawfinishing(14) = Visibility.Visible                         ' TipFeed
-'      Sawfinishing(15) = Visibility.Collapsed                       ' OffSr
-'      Sawfinishing(16) = Visibility.Collapsed                       ' OffSl
-'      Sawfinishing(17) = Visibility.Collapsed                       ' SideAngle
-'      Sawfinishing(18) = Visibility.Collapsed                       ' Approx
-'      Sawfinishing(19) = Visibility.Visible                         ' StartPos
-'      Sawfinishing(20) = Visibility.Collapsed                       ' StartSlowLen
-'      Sawfinishing(21) = Visibility.Collapsed                       ' EndSlowLen
-'      Sawfinishing(22) = Visibility.Collapsed                       ' ThroughAddlen
-'      Sawfinishing(23) = Visibility.Visible                         ' StepPar
-'      Sawfinishing(24) = Visibility.Collapsed                       ' Returnpos
-'      Sawfinishing(25) = Visibility.Collapsed                       ' TabLen
-'      Sawfinishing(26) = Visibility.Collapsed                       ' TabDist
-'      Sawfinishing(27) = Visibility.Collapsed                       ' TabHeight
-'      Sawfinishing(28) = Visibility.Collapsed                       ' TabAngle
-'      Sawfinishing(29) = Visibility.Collapsed                       ' LiTang
-'      Sawfinishing(30) = Visibility.Collapsed                       ' LiPerp
-'      Sawfinishing(31) = Visibility.Collapsed                       ' LiElev
-'      Sawfinishing(32) = Visibility.Collapsed                       ' LiCompLen
-'      Sawfinishing(33) = Visibility.Collapsed                       ' LoTang
-'      Sawfinishing(34) = Visibility.Collapsed                       ' LoPerp
-'      Sawfinishing(35) = Visibility.Collapsed                       ' LoElev
-'      Sawfinishing(36) = Visibility.Collapsed                       ' LoCompLen
-'      Sawfinishing(37) = Visibility.Collapsed                       ' StartAddLen
-'      Sawfinishing(38) = Visibility.Collapsed                       ' EndAddLen
-'      Sawfinishing(39) = Visibility.Collapsed                       ' StepExtArc
-'      Sawfinishing(40) = Visibility.Collapsed                       ' StepIntArc
-'      Sawfinishing(41) = Visibility.Visible                         ' SideStep
-'      Sawfinishing(42) = Visibility.Visible                         ' VertFeed
-'      Sawfinishing(43) = Visibility.Visible                         ' Name
-'      Sawfinishing(44) = Visibility.Visible                         ' Tool
-'      Sawfinishing(45) = Visibility.Visible                         ' DepthStr
-'      Sawfinishing(46) = Visibility.Visible                         ' UserNotes
-'      Sawfinishing(47) = Visibility.Collapsed                       ' OverLapStr
-'      Sawfinishing(48) = Visibility.Collapsed                       ' OffsetStr
-'      Sawfinishing(49) = Visibility.Visible                         ' SubType
-'      Sawfinishing(50) = Visibility.Collapsed                       ' SelectedSolChoiceType
-'      Sawfinishing(51) = Visibility.Collapsed                       ' InitAngs
-'      Sawfinishing(52) = Visibility.Collapsed                       ' BlockedAxis
-'      Sawfinishing(53) = Visibility.Collapsed                       ' FaceUseType
-'      Sawfinishing(54) = Visibility.Collapsed                       ' InvertToolDir
-'      Sawfinishing(55) = Visibility.Collapsed                       ' StepBack
-'      Sawfinishing(56) = Visibility.Collapsed                       ' StepSideAngBack
-'      Sawfinishing(57) = Visibility.Collapsed                       ' BackFeed
-'      Sawfinishing(58) = Visibility.Collapsed                       ' StepSideAng
-'      Sawfinishing(59) = Visibility.Collapsed                       ' ForwardAngle
-'      Sawfinishing(60) = Visibility.Collapsed                       ' Probing
-'      Sawfinishing(61) = Visibility.Collapsed                       ' ProbingMinDist
-'      Sawfinishing(62) = Visibility.Collapsed                       ' ProbingMaxDist
-'      Sawfinishing(63) = Visibility.Collapsed                       ' ExtCornType
-'      Sawfinishing(64) = Visibility.Collapsed                       ' IntCornType
-'      Sawfinishing(65) = Visibility.Collapsed                       ' CornSlowLen
-'      Sawfinishing(66) = Visibility.Collapsed                       ' CornSlowPerc
-'      Sawfinishing(67) = Visibility.Collapsed                       ' LiHole
-'      Sawfinishing(68) = Visibility.Collapsed                       ' LiHoleRad
-'      Sawfinishing(69) = Visibility.Collapsed                       ' LpTurns
-'      Sawfinishing(70) = Visibility.Collapsed                       ' HpTurns
-'      Sawfinishing(71) = Visibility.Collapsed                       ' ThicknessFeed
-'      Sawfinishing(102) = Visibility.Collapsed                      ' Expander LeadIn
-'      Sawfinishing(103) = Visibility.Collapsed                      ' Expander LeadOut
+      ' Parametri Sawfinishing
+      Sawfinishing(0) = Visibility.Visible                          ' Invert
+      Sawfinishing(1) = Visibility.Collapsed                        ' LeaveTab
+      Sawfinishing(2) = Visibility.Collapsed                        ' WorkSide
+      Sawfinishing(3) = Visibility.Visible                          ' HeadSide
+      Sawfinishing(4) = Visibility.Collapsed                        ' LeadInType
+      Sawfinishing(5) = Visibility.Collapsed                        ' ExtLinkType
+      Sawfinishing(6) = Visibility.Collapsed                        ' LeadOutType
+      Sawfinishing(7) = Visibility.Collapsed                        ' CurveUse
+      Sawfinishing(8) = Visibility.Visible                          ' StepType
+      Sawfinishing(9) = Visibility.Visible                          ' LeadLinkType
+      Sawfinishing(10) = Visibility.Visible                         ' Speed
+      Sawfinishing(11) = Visibility.Visible                         ' Feed
+      Sawfinishing(12) = Visibility.Visible                         ' StartFeed
+      Sawfinishing(13) = Visibility.Visible                         ' EndFeed
+      Sawfinishing(14) = Visibility.Visible                         ' TipFeed
+      Sawfinishing(15) = Visibility.Collapsed                       ' OffSr
+      Sawfinishing(16) = Visibility.Collapsed                       ' OffSl
+      Sawfinishing(17) = Visibility.Collapsed                       ' SideAngle
+      Sawfinishing(18) = Visibility.Collapsed                       ' Approx
+      Sawfinishing(19) = Visibility.Visible                         ' StartPos
+      Sawfinishing(20) = Visibility.Collapsed                       ' StartSlowLen
+      Sawfinishing(21) = Visibility.Collapsed                       ' EndSlowLen
+      Sawfinishing(22) = Visibility.Collapsed                       ' ThroughAddlen
+      Sawfinishing(23) = Visibility.Visible                         ' StepPar
+      Sawfinishing(24) = Visibility.Collapsed                       ' Returnpos
+      Sawfinishing(25) = Visibility.Collapsed                       ' TabLen
+      Sawfinishing(26) = Visibility.Collapsed                       ' TabDist
+      Sawfinishing(27) = Visibility.Collapsed                       ' TabHeight
+      Sawfinishing(28) = Visibility.Collapsed                       ' TabAngle
+      Sawfinishing(29) = Visibility.Collapsed                       ' LiTang
+      Sawfinishing(30) = Visibility.Collapsed                       ' LiPerp
+      Sawfinishing(31) = Visibility.Collapsed                       ' LiElev
+      Sawfinishing(32) = Visibility.Collapsed                       ' LiCompLen
+      Sawfinishing(33) = Visibility.Collapsed                       ' LoTang
+      Sawfinishing(34) = Visibility.Collapsed                       ' LoPerp
+      Sawfinishing(35) = Visibility.Collapsed                       ' LoElev
+      Sawfinishing(36) = Visibility.Collapsed                       ' LoCompLen
+      Sawfinishing(37) = Visibility.Collapsed                       ' StartAddLen
+      Sawfinishing(38) = Visibility.Collapsed                       ' EndAddLen
+      Sawfinishing(39) = Visibility.Collapsed                       ' StepExtArc
+      Sawfinishing(40) = Visibility.Collapsed                       ' StepIntArc
+      Sawfinishing(41) = Visibility.Visible                         ' SideStep
+      Sawfinishing(42) = Visibility.Visible                         ' VertFeed
+      Sawfinishing(43) = Visibility.Visible                         ' Name
+      Sawfinishing(44) = Visibility.Visible                         ' Tool
+      Sawfinishing(45) = Visibility.Visible                         ' DepthStr
+      Sawfinishing(46) = Visibility.Visible                         ' UserNotes
+      Sawfinishing(47) = Visibility.Collapsed                       ' OverLapStr
+      Sawfinishing(48) = Visibility.Collapsed                       ' OffsetStr
+      Sawfinishing(49) = Visibility.Visible                         ' SubType
+      Sawfinishing(50) = Visibility.Collapsed                       ' SelectedSolChoiceType
+      Sawfinishing(51) = Visibility.Collapsed                       ' InitAngs
+      Sawfinishing(52) = Visibility.Collapsed                       ' BlockedAxis
+      Sawfinishing(53) = Visibility.Collapsed                       ' FaceUseType
+      Sawfinishing(54) = Visibility.Collapsed                       ' InvertToolDir
+      Sawfinishing(55) = Visibility.Collapsed                       ' StepBack
+      Sawfinishing(56) = Visibility.Collapsed                       ' StepSideAngBack
+      Sawfinishing(57) = Visibility.Collapsed                       ' BackFeed
+      Sawfinishing(58) = Visibility.Collapsed                       ' StepSideAng
+      Sawfinishing(59) = Visibility.Collapsed                       ' ForwardAngle
+      Sawfinishing(60) = Visibility.Collapsed                       ' Probing
+      Sawfinishing(61) = Visibility.Collapsed                       ' ProbingMinDist
+      Sawfinishing(62) = Visibility.Collapsed                       ' ProbingMaxDist
+      Sawfinishing(63) = Visibility.Collapsed                       ' ExtCornType
+      Sawfinishing(64) = Visibility.Collapsed                       ' IntCornType
+      Sawfinishing(65) = Visibility.Collapsed                       ' CornSlowLen
+      Sawfinishing(66) = Visibility.Collapsed                       ' CornSlowPerc
+      Sawfinishing(67) = Visibility.Collapsed                       ' LiHole
+      Sawfinishing(68) = Visibility.Collapsed                       ' LiHoleRad
+      Sawfinishing(69) = Visibility.Collapsed                       ' LpTurns
+      Sawfinishing(70) = Visibility.Collapsed                       ' HpTurns
+      Sawfinishing(71) = Visibility.Collapsed                       ' ThicknessFeed
+      Sawfinishing(102) = Visibility.Collapsed                      ' Expander LeadIn
+      Sawfinishing(103) = Visibility.Collapsed                      ' Expander LeadOut
 
-'      ' Parametri GenMachining
-'      GenMachining(0) = Visibility.Visible                          ' Invert
-'      GenMachining(1) = Visibility.Collapsed                        ' LeaveTab
-'      GenMachining(2) = Visibility.Collapsed                        ' WorkSide
-'      GenMachining(3) = Visibility.Collapsed                        ' HeadSide
-'      GenMachining(4) = Visibility.Collapsed                        ' LeadInType
-'      GenMachining(5) = Visibility.Collapsed                        ' ExtLinkType
-'      GenMachining(6) = Visibility.Collapsed                        ' LeadOutType
-'      GenMachining(7) = Visibility.Collapsed                        ' CurveUse
-'      GenMachining(8) = Visibility.Collapsed                        ' StepType
-'      GenMachining(9) = Visibility.Collapsed                        ' LeadLinkType
-'      GenMachining(10) = Visibility.Visible                         ' Speed
-'      GenMachining(11) = Visibility.Visible                         ' Feed
-'      GenMachining(12) = Visibility.Visible                         ' StartFeed
-'      GenMachining(13) = Visibility.Visible                         ' EndFeed
-'      GenMachining(14) = Visibility.Visible                         ' TipFeed
-'      GenMachining(15) = Visibility.Visible                         ' OffSr
-'      GenMachining(16) = Visibility.Visible                         ' OffSl
-'      GenMachining(17) = Visibility.Collapsed                       ' SideAngle
-'      GenMachining(18) = Visibility.Collapsed                       ' Approx
-'      GenMachining(19) = Visibility.Visible                         ' StartPos
-'      GenMachining(20) = Visibility.Collapsed                       ' StartSlowLen
-'      GenMachining(21) = Visibility.Collapsed                       ' EndSlowLen
-'      GenMachining(22) = Visibility.Collapsed                       ' ThroughAddlen
-'      GenMachining(23) = Visibility.Collapsed                       ' StepPar
-'      GenMachining(24) = Visibility.Collapsed                       ' Returnpos
-'      GenMachining(25) = Visibility.Collapsed                       ' TabLen
-'      GenMachining(26) = Visibility.Collapsed                       ' TabDist
-'      GenMachining(27) = Visibility.Collapsed                       ' TabHeight
-'      GenMachining(28) = Visibility.Collapsed                       ' TabAngle
-'      GenMachining(29) = Visibility.Collapsed                       ' LiTang
-'      GenMachining(30) = Visibility.Collapsed                       ' LiPerp
-'      GenMachining(31) = Visibility.Collapsed                       ' LiElev
-'      GenMachining(32) = Visibility.Collapsed                       ' LiCompLen
-'      GenMachining(33) = Visibility.Collapsed                       ' LoTang
-'      GenMachining(34) = Visibility.Collapsed                       ' LoPerp
-'      GenMachining(35) = Visibility.Collapsed                       ' LoElev
-'      GenMachining(36) = Visibility.Collapsed                       ' LoCompLen
-'      GenMachining(37) = Visibility.Collapsed                       ' StartAddLen
-'      GenMachining(38) = Visibility.Collapsed                       ' EndAddLen
-'      GenMachining(39) = Visibility.Collapsed                       ' StepExtArc
-'      GenMachining(40) = Visibility.Collapsed                       ' StepIntArc
-'      GenMachining(41) = Visibility.Collapsed                       ' SideStep
-'      GenMachining(42) = Visibility.Collapsed                       ' VertFeed
-'      GenMachining(43) = Visibility.Visible                         ' Name
-'      GenMachining(44) = Visibility.Visible                         ' Tool
-'      GenMachining(45) = Visibility.Visible                         ' DepthStr
-'      GenMachining(46) = Visibility.Visible                         ' UserNotes
-'      GenMachining(47) = Visibility.Collapsed                       ' OverLapStr
-'      GenMachining(48) = Visibility.Collapsed                       ' OffsetStr
-'      GenMachining(49) = Visibility.Visible                         ' SubType
-'      GenMachining(50) = Visibility.Collapsed                       ' SelectedSolChoiceType
-'      GenMachining(51) = Visibility.Collapsed                       ' InitAngs
-'      GenMachining(52) = Visibility.Collapsed                       ' BlockedAxis
-'      GenMachining(53) = Visibility.Collapsed                       ' FaceUseType
-'      GenMachining(54) = Visibility.Collapsed                       ' InvertToolDir
-'      GenMachining(55) = Visibility.Collapsed                       ' StepBack
-'      GenMachining(56) = Visibility.Collapsed                       ' StepSideAngBack
-'      GenMachining(57) = Visibility.Collapsed                       ' BackFeed
-'      GenMachining(58) = Visibility.Collapsed                       ' StepSideAng
-'      GenMachining(59) = Visibility.Collapsed                       ' ForwardAngle
-'      GenMachining(60) = Visibility.Collapsed                       ' Probing
-'      GenMachining(61) = Visibility.Collapsed                       ' ProbingMinDist
-'      GenMachining(62) = Visibility.Collapsed                       ' ProbingMaxDist
-'      GenMachining(63) = Visibility.Collapsed                       ' ExtCornType
-'      GenMachining(64) = Visibility.Collapsed                       ' IntCornType
-'      GenMachining(65) = Visibility.Collapsed                       ' CornSlowLen
-'      GenMachining(66) = Visibility.Collapsed                       ' CornSlowPerc
-'      GenMachining(67) = Visibility.Collapsed                       ' LiHole
-'      GenMachining(68) = Visibility.Collapsed                       ' LiHoleRad
-'      GenMachining(69) = Visibility.Collapsed                       ' LpTurns
-'      GenMachining(70) = Visibility.Collapsed                       ' HpTurns
-'      GenMachining(71) = Visibility.Collapsed                       ' ThicknessFeed
-'      GenMachining(102) = Visibility.Collapsed                      ' Expander LeadIn
-'      GenMachining(103) = Visibility.Collapsed                      ' Expander LeadOut
+      ' Parametri GenMachining
+      GenMachining(0) = Visibility.Visible                          ' Invert
+      GenMachining(1) = Visibility.Collapsed                        ' LeaveTab
+      GenMachining(2) = Visibility.Collapsed                        ' WorkSide
+      GenMachining(3) = Visibility.Collapsed                        ' HeadSide
+      GenMachining(4) = Visibility.Collapsed                        ' LeadInType
+      GenMachining(5) = Visibility.Collapsed                        ' ExtLinkType
+      GenMachining(6) = Visibility.Collapsed                        ' LeadOutType
+      GenMachining(7) = Visibility.Collapsed                        ' CurveUse
+      GenMachining(8) = Visibility.Collapsed                        ' StepType
+      GenMachining(9) = Visibility.Collapsed                        ' LeadLinkType
+      GenMachining(10) = Visibility.Visible                         ' Speed
+      GenMachining(11) = Visibility.Visible                         ' Feed
+      GenMachining(12) = Visibility.Visible                         ' StartFeed
+      GenMachining(13) = Visibility.Visible                         ' EndFeed
+      GenMachining(14) = Visibility.Visible                         ' TipFeed
+      GenMachining(15) = Visibility.Visible                         ' OffSr
+      GenMachining(16) = Visibility.Visible                         ' OffSl
+      GenMachining(17) = Visibility.Collapsed                       ' SideAngle
+      GenMachining(18) = Visibility.Collapsed                       ' Approx
+      GenMachining(19) = Visibility.Visible                         ' StartPos
+      GenMachining(20) = Visibility.Collapsed                       ' StartSlowLen
+      GenMachining(21) = Visibility.Collapsed                       ' EndSlowLen
+      GenMachining(22) = Visibility.Collapsed                       ' ThroughAddlen
+      GenMachining(23) = Visibility.Collapsed                       ' StepPar
+      GenMachining(24) = Visibility.Collapsed                       ' Returnpos
+      GenMachining(25) = Visibility.Collapsed                       ' TabLen
+      GenMachining(26) = Visibility.Collapsed                       ' TabDist
+      GenMachining(27) = Visibility.Collapsed                       ' TabHeight
+      GenMachining(28) = Visibility.Collapsed                       ' TabAngle
+      GenMachining(29) = Visibility.Collapsed                       ' LiTang
+      GenMachining(30) = Visibility.Collapsed                       ' LiPerp
+      GenMachining(31) = Visibility.Collapsed                       ' LiElev
+      GenMachining(32) = Visibility.Collapsed                       ' LiCompLen
+      GenMachining(33) = Visibility.Collapsed                       ' LoTang
+      GenMachining(34) = Visibility.Collapsed                       ' LoPerp
+      GenMachining(35) = Visibility.Collapsed                       ' LoElev
+      GenMachining(36) = Visibility.Collapsed                       ' LoCompLen
+      GenMachining(37) = Visibility.Collapsed                       ' StartAddLen
+      GenMachining(38) = Visibility.Collapsed                       ' EndAddLen
+      GenMachining(39) = Visibility.Collapsed                       ' StepExtArc
+      GenMachining(40) = Visibility.Collapsed                       ' StepIntArc
+      GenMachining(41) = Visibility.Collapsed                       ' SideStep
+      GenMachining(42) = Visibility.Collapsed                       ' VertFeed
+      GenMachining(43) = Visibility.Visible                         ' Name
+      GenMachining(44) = Visibility.Visible                         ' Tool
+      GenMachining(45) = Visibility.Visible                         ' DepthStr
+      GenMachining(46) = Visibility.Visible                         ' UserNotes
+      GenMachining(47) = Visibility.Collapsed                       ' OverLapStr
+      GenMachining(48) = Visibility.Collapsed                       ' OffsetStr
+      GenMachining(49) = Visibility.Visible                         ' SubType
+      GenMachining(50) = Visibility.Collapsed                       ' SelectedSolChoiceType
+      GenMachining(51) = Visibility.Collapsed                       ' InitAngs
+      GenMachining(52) = Visibility.Collapsed                       ' BlockedAxis
+      GenMachining(53) = Visibility.Collapsed                       ' FaceUseType
+      GenMachining(54) = Visibility.Collapsed                       ' InvertToolDir
+      GenMachining(55) = Visibility.Collapsed                       ' StepBack
+      GenMachining(56) = Visibility.Collapsed                       ' StepSideAngBack
+      GenMachining(57) = Visibility.Collapsed                       ' BackFeed
+      GenMachining(58) = Visibility.Collapsed                       ' StepSideAng
+      GenMachining(59) = Visibility.Collapsed                       ' ForwardAngle
+      GenMachining(60) = Visibility.Collapsed                       ' Probing
+      GenMachining(61) = Visibility.Collapsed                       ' ProbingMinDist
+      GenMachining(62) = Visibility.Collapsed                       ' ProbingMaxDist
+      GenMachining(63) = Visibility.Collapsed                       ' ExtCornType
+      GenMachining(64) = Visibility.Collapsed                       ' IntCornType
+      GenMachining(65) = Visibility.Collapsed                       ' CornSlowLen
+      GenMachining(66) = Visibility.Collapsed                       ' CornSlowPerc
+      GenMachining(67) = Visibility.Collapsed                       ' LiHole
+      GenMachining(68) = Visibility.Collapsed                       ' LiHoleRad
+      GenMachining(69) = Visibility.Collapsed                       ' LpTurns
+      GenMachining(70) = Visibility.Collapsed                       ' HpTurns
+      GenMachining(71) = Visibility.Collapsed                       ' ThicknessFeed
+      GenMachining(102) = Visibility.Collapsed                      ' Expander LeadIn
+      GenMachining(103) = Visibility.Collapsed                      ' Expander LeadOut
 
-'      ' Parametri Chiseling
-'      Chiseling(0) = Visibility.Visible                          ' Invert
-'      Chiseling(1) = Visibility.Collapsed                        ' LeaveTab
-'      Chiseling(2) = Visibility.Visible                          ' WorkSide
-'      Chiseling(3) = Visibility.Collapsed                        ' HeadSide
-'      Chiseling(4) = Visibility.Collapsed                        ' LeadInType
-'      Chiseling(5) = Visibility.Collapsed                        ' ExtLinkType
-'      Chiseling(6) = Visibility.Collapsed                        ' LeadOutType
-'      Chiseling(7) = Visibility.Collapsed                        ' CurveUse
-'      Chiseling(8) = Visibility.Collapsed                        ' StepType
-'      Chiseling(9) = Visibility.Collapsed                        ' LeadLinkType
-'      Chiseling(10) = Visibility.Collapsed                       ' Speed
-'      Chiseling(11) = Visibility.Visible                         ' Feed
-'      Chiseling(12) = Visibility.Collapsed                       ' StartFeed
-'      Chiseling(13) = Visibility.Visible                         ' EndFeed
-'      Chiseling(14) = Visibility.Visible                         ' TipFeed
-'      Chiseling(15) = Visibility.Visible                         ' OffSr
-'      Chiseling(16) = Visibility.Visible                         ' OffSl
-'      Chiseling(17) = Visibility.Collapsed                       ' SideAngle
-'      Chiseling(18) = Visibility.Collapsed                       ' Approx
-'      Chiseling(19) = Visibility.Visible                         ' StartPos
-'      Chiseling(20) = Visibility.Collapsed                       ' StartSlowLen
-'      Chiseling(21) = Visibility.Collapsed                       ' EndSlowLen
-'      Chiseling(22) = Visibility.Collapsed                       ' ThroughAddlen
-'      Chiseling(23) = Visibility.Visible                         ' StepPar
-'      Chiseling(24) = Visibility.Visible                         ' Returnpos
-'      Chiseling(25) = Visibility.Collapsed                       ' TabLen
-'      Chiseling(26) = Visibility.Collapsed                       ' TabDist
-'      Chiseling(27) = Visibility.Collapsed                       ' TabHeight
-'      Chiseling(28) = Visibility.Collapsed                       ' TabAngle
-'      Chiseling(29) = Visibility.Collapsed                       ' LiTang
-'      Chiseling(30) = Visibility.Collapsed                       ' LiPerp
-'      Chiseling(31) = Visibility.Collapsed                       ' LiElev
-'      Chiseling(32) = Visibility.Collapsed                       ' LiCompLen
-'      Chiseling(33) = Visibility.Collapsed                       ' LoTang
-'      Chiseling(34) = Visibility.Collapsed                       ' LoPerp
-'      Chiseling(35) = Visibility.Collapsed                       ' LoElev
-'      Chiseling(36) = Visibility.Collapsed                       ' LoCompLen
-'      Chiseling(37) = Visibility.Collapsed                       ' StartAddLen
-'      Chiseling(38) = Visibility.Visible                         ' EndAddLen
-'      Chiseling(39) = Visibility.Collapsed                       ' StepExtArc
-'      Chiseling(40) = Visibility.Collapsed                       ' StepIntArc
-'      Chiseling(41) = Visibility.Collapsed                       ' SideStep
-'      Chiseling(42) = Visibility.Collapsed                       ' VertFeed
-'      Chiseling(43) = Visibility.Visible                         ' Name
-'      Chiseling(44) = Visibility.Visible                         ' Tool
-'      Chiseling(45) = Visibility.Visible                         ' DepthStr
-'      Chiseling(46) = Visibility.Visible                         ' UserNotes
-'      Chiseling(47) = Visibility.Collapsed                       ' OverLapStr
-'      Chiseling(48) = Visibility.Collapsed                       ' OffsetStr
-'      Chiseling(49) = Visibility.Collapsed                       ' SubType
-'      Chiseling(50) = Visibility.Collapsed                       ' SelectedSolChoiceType
-'      Chiseling(51) = Visibility.Collapsed                       ' InitAngs
-'      Chiseling(52) = Visibility.Collapsed                       ' BlockedAxis
-'      Chiseling(53) = Visibility.Collapsed                       ' FaceUseType
-'      Chiseling(54) = Visibility.Collapsed                       ' InvertToolDir
-'      Chiseling(55) = Visibility.Collapsed                       ' StepBack
-'      Chiseling(56) = Visibility.Collapsed                       ' StepSideAngBack
-'      Chiseling(57) = Visibility.Collapsed                       ' BackFeed
-'      Chiseling(58) = Visibility.Collapsed                       ' StepSideAng
-'      Chiseling(59) = Visibility.Collapsed                       ' ForwardAngle
-'      Chiseling(60) = Visibility.Collapsed                       ' Probing
-'      Chiseling(61) = Visibility.Collapsed                       ' ProbingMinDist
-'      Chiseling(62) = Visibility.Collapsed                       ' ProbingMaxDist
-'      Chiseling(63) = Visibility.Collapsed                       ' ExtCornType
-'      Chiseling(64) = Visibility.Collapsed                       ' IntCornType
-'      Chiseling(65) = Visibility.Collapsed                       ' CornSlowLen
-'      Chiseling(66) = Visibility.Collapsed                       ' CornSlowPerc
-'      Chiseling(67) = Visibility.Collapsed                       ' LiHole
-'      Chiseling(68) = Visibility.Collapsed                       ' LiHoleRad
-'      Chiseling(69) = Visibility.Collapsed                       ' LpTurns
-'      Chiseling(70) = Visibility.Collapsed                       ' HpTurns
-'      Chiseling(71) = Visibility.Collapsed                       ' ThicknessFeed
-'      Chiseling(102) = Visibility.Collapsed                      ' Expander LeadIn
-'      Chiseling(103) = Visibility.Collapsed                      ' Expander LeadOut
+      ' Parametri Chiseling
+      Chiseling(0) = Visibility.Visible                          ' Invert
+      Chiseling(1) = Visibility.Collapsed                        ' LeaveTab
+      Chiseling(2) = Visibility.Visible                          ' WorkSide
+      Chiseling(3) = Visibility.Collapsed                        ' HeadSide
+      Chiseling(4) = Visibility.Collapsed                        ' LeadInType
+      Chiseling(5) = Visibility.Collapsed                        ' ExtLinkType
+      Chiseling(6) = Visibility.Collapsed                        ' LeadOutType
+      Chiseling(7) = Visibility.Collapsed                        ' CurveUse
+      Chiseling(8) = Visibility.Collapsed                        ' StepType
+      Chiseling(9) = Visibility.Collapsed                        ' LeadLinkType
+      Chiseling(10) = Visibility.Collapsed                       ' Speed
+      Chiseling(11) = Visibility.Visible                         ' Feed
+      Chiseling(12) = Visibility.Collapsed                       ' StartFeed
+      Chiseling(13) = Visibility.Visible                         ' EndFeed
+      Chiseling(14) = Visibility.Visible                         ' TipFeed
+      Chiseling(15) = Visibility.Visible                         ' OffSr
+      Chiseling(16) = Visibility.Visible                         ' OffSl
+      Chiseling(17) = Visibility.Collapsed                       ' SideAngle
+      Chiseling(18) = Visibility.Collapsed                       ' Approx
+      Chiseling(19) = Visibility.Visible                         ' StartPos
+      Chiseling(20) = Visibility.Collapsed                       ' StartSlowLen
+      Chiseling(21) = Visibility.Collapsed                       ' EndSlowLen
+      Chiseling(22) = Visibility.Collapsed                       ' ThroughAddlen
+      Chiseling(23) = Visibility.Visible                         ' StepPar
+      Chiseling(24) = Visibility.Visible                         ' Returnpos
+      Chiseling(25) = Visibility.Collapsed                       ' TabLen
+      Chiseling(26) = Visibility.Collapsed                       ' TabDist
+      Chiseling(27) = Visibility.Collapsed                       ' TabHeight
+      Chiseling(28) = Visibility.Collapsed                       ' TabAngle
+      Chiseling(29) = Visibility.Collapsed                       ' LiTang
+      Chiseling(30) = Visibility.Collapsed                       ' LiPerp
+      Chiseling(31) = Visibility.Collapsed                       ' LiElev
+      Chiseling(32) = Visibility.Collapsed                       ' LiCompLen
+      Chiseling(33) = Visibility.Collapsed                       ' LoTang
+      Chiseling(34) = Visibility.Collapsed                       ' LoPerp
+      Chiseling(35) = Visibility.Collapsed                       ' LoElev
+      Chiseling(36) = Visibility.Collapsed                       ' LoCompLen
+      Chiseling(37) = Visibility.Collapsed                       ' StartAddLen
+      Chiseling(38) = Visibility.Visible                         ' EndAddLen
+      Chiseling(39) = Visibility.Collapsed                       ' StepExtArc
+      Chiseling(40) = Visibility.Collapsed                       ' StepIntArc
+      Chiseling(41) = Visibility.Collapsed                       ' SideStep
+      Chiseling(42) = Visibility.Collapsed                       ' VertFeed
+      Chiseling(43) = Visibility.Visible                         ' Name
+      Chiseling(44) = Visibility.Visible                         ' Tool
+      Chiseling(45) = Visibility.Visible                         ' DepthStr
+      Chiseling(46) = Visibility.Visible                         ' UserNotes
+      Chiseling(47) = Visibility.Collapsed                       ' OverLapStr
+      Chiseling(48) = Visibility.Collapsed                       ' OffsetStr
+      Chiseling(49) = Visibility.Collapsed                       ' SubType
+      Chiseling(50) = Visibility.Collapsed                       ' SelectedSolChoiceType
+      Chiseling(51) = Visibility.Collapsed                       ' InitAngs
+      Chiseling(52) = Visibility.Collapsed                       ' BlockedAxis
+      Chiseling(53) = Visibility.Collapsed                       ' FaceUseType
+      Chiseling(54) = Visibility.Collapsed                       ' InvertToolDir
+      Chiseling(55) = Visibility.Collapsed                       ' StepBack
+      Chiseling(56) = Visibility.Collapsed                       ' StepSideAngBack
+      Chiseling(57) = Visibility.Collapsed                       ' BackFeed
+      Chiseling(58) = Visibility.Collapsed                       ' StepSideAng
+      Chiseling(59) = Visibility.Collapsed                       ' ForwardAngle
+      Chiseling(60) = Visibility.Collapsed                       ' Probing
+      Chiseling(61) = Visibility.Collapsed                       ' ProbingMinDist
+      Chiseling(62) = Visibility.Collapsed                       ' ProbingMaxDist
+      Chiseling(63) = Visibility.Collapsed                       ' ExtCornType
+      Chiseling(64) = Visibility.Collapsed                       ' IntCornType
+      Chiseling(65) = Visibility.Collapsed                       ' CornSlowLen
+      Chiseling(66) = Visibility.Collapsed                       ' CornSlowPerc
+      Chiseling(67) = Visibility.Collapsed                       ' LiHole
+      Chiseling(68) = Visibility.Collapsed                       ' LiHoleRad
+      Chiseling(69) = Visibility.Collapsed                       ' LpTurns
+      Chiseling(70) = Visibility.Collapsed                       ' HpTurns
+      Chiseling(71) = Visibility.Collapsed                       ' ThicknessFeed
+      Chiseling(102) = Visibility.Collapsed                      ' Expander LeadIn
+      Chiseling(103) = Visibility.Collapsed                      ' Expander LeadOut
 
-'      ' Parametri Waterjetting
-'      Waterjetting(0) = Visibility.Visible                               ' Invert
-'      Waterjetting(1) = Visibility.Visible                               ' LeaveTab
-'      Waterjetting(2) = Visibility.Visible                               ' WorkSide
-'      Waterjetting(3) = Visibility.Collapsed                             ' HeadSide
-'      Waterjetting(4) = Visibility.Visible                               ' LeadInType
-'      Waterjetting(5) = Visibility.Collapsed                             ' ExtLinkType
-'      Waterjetting(6) = Visibility.Visible                               ' LeadOutType
-'      Waterjetting(7) = Visibility.Collapsed                             ' CurveUse
-'      Waterjetting(8) = Visibility.Visible                               ' StepType
-'      Waterjetting(9) = Visibility.Collapsed                             ' LeadLinkType
-'      Waterjetting(10) = Visibility.Visible                              ' Speed
-'      Waterjetting(11) = Visibility.Visible                              ' Feed
-'      Waterjetting(12) = Visibility.Visible                              ' StartFeed
-'      Waterjetting(13) = Visibility.Visible                              ' EndFeed
-'      Waterjetting(14) = Visibility.Visible                              ' TipFeed
-'      Waterjetting(15) = Visibility.Visible                              ' OffSr
-'      Waterjetting(16) = Visibility.Visible                              ' OffSl
-'      Waterjetting(17) = Visibility.Visible                              ' SideAngle
-'      Waterjetting(18) = Visibility.Collapsed                            ' Approx
-'      Waterjetting(19) = Visibility.Visible                              ' StartPos
-'      Waterjetting(20) = Visibility.Collapsed                            ' StartSlowLen
-'      Waterjetting(21) = Visibility.Collapsed                            ' EndSlowLen
-'      Waterjetting(22) = Visibility.Collapsed                            ' ThroughAddlen
-'      Waterjetting(23) = Visibility.Visible                              ' StepPar
-'      Waterjetting(24) = Visibility.Collapsed                            ' ReturnPos
-'      Waterjetting(25) = Visibility.Visible                              ' TabLen
-'      Waterjetting(26) = Visibility.Visible                              ' TabDist
-'      Waterjetting(27) = Visibility.Visible                              ' TabHeight
-'      Waterjetting(28) = Visibility.Visible                              ' TabAngle
-'      Waterjetting(29) = Visibility.Visible                              ' LiTang
-'      Waterjetting(30) = Visibility.Visible                              ' LiPerp
-'      Waterjetting(31) = Visibility.Visible                              ' LiElev
-'      Waterjetting(32) = Visibility.Visible                              ' LiCompLen
-'      Waterjetting(33) = Visibility.Visible                              ' LoTang
-'      Waterjetting(34) = Visibility.Visible                              ' LoPerp
-'      Waterjetting(35) = Visibility.Visible                              ' LoElev
-'      Waterjetting(36) = Visibility.Visible                              ' LoCompLen
-'      Waterjetting(37) = Visibility.Visible                              ' StartAddLen
-'      Waterjetting(38) = Visibility.Visible                              ' EndAddLen
-'      Waterjetting(39) = Visibility.Collapsed                            ' StepExtArc
-'      Waterjetting(40) = Visibility.Collapsed                            ' StepIntArc
-'      Waterjetting(41) = Visibility.Collapsed                            ' SideStep
-'      Waterjetting(42) = Visibility.Collapsed                            ' VertFeed
-'      Waterjetting(43) = Visibility.Visible                              ' NamePar
-'      Waterjetting(44) = Visibility.Visible                              ' Tool
-'      Waterjetting(45) = Visibility.Visible                              ' DepthStr
-'      Waterjetting(46) = Visibility.Visible                              ' UserNotes
-'      Waterjetting(47) = Visibility.Visible                              ' OverLapStr
-'      Waterjetting(48) = Visibility.Collapsed                            ' OffsetStr
-'      Waterjetting(49) = Visibility.Collapsed                            ' SubType
-'      Waterjetting(50) = Visibility.Collapsed                            ' SelectedSolChoiceType
-'      Waterjetting(51) = Visibility.Collapsed                            ' InitAngs
-'      Waterjetting(52) = Visibility.Collapsed                            ' BlockedAxis
-'      Waterjetting(53) = Visibility.Collapsed                            ' FaceUseType
-'      Waterjetting(54) = Visibility.Collapsed                            ' InvertToolDir
-'      Waterjetting(55) = Visibility.Collapsed                            ' StepBack
-'      Waterjetting(56) = Visibility.Collapsed                            ' StepSideAngBack
-'      Waterjetting(57) = Visibility.Collapsed                            ' BackFeed
-'      Waterjetting(58) = Visibility.Collapsed                            ' StepSideAng
-'      Waterjetting(59) = Visibility.Visible                              ' ForwardAngle
-'      Waterjetting(60) = Visibility.Visible                              ' Probing
-'      Waterjetting(61) = Visibility.Visible                              ' ProbingMinDist
-'      Waterjetting(62) = Visibility.Visible                              ' ProbingMaxDist
-'      Waterjetting(63) = Visibility.Visible                              ' ExtCornType
-'      Waterjetting(64) = Visibility.Visible                              ' IntCornType
-'      Waterjetting(65) = Visibility.Visible                              ' CornSlowLen
-'      Waterjetting(66) = Visibility.Visible                              ' CornSlowPerc
-'      Waterjetting(67) = Visibility.Visible                              ' LiHole
-'      Waterjetting(68) = Visibility.Visible                              ' LiHoleRad
-'      Waterjetting(69) = Visibility.Visible                              ' LpTurns
-'      Waterjetting(70) = Visibility.Visible                              ' HpTurns
-'      Waterjetting(71) = Visibility.Visible                              ' ThicknessFeed
-'      Waterjetting(102) = Visibility.Collapsed                           ' Expander LeadIn
-'      Waterjetting(103) = Visibility.Collapsed                           ' Expander LeadOut
+      ' Parametri Waterjetting
+      Waterjetting(0) = Visibility.Visible                               ' Invert
+      Waterjetting(1) = Visibility.Visible                               ' LeaveTab
+      Waterjetting(2) = Visibility.Visible                               ' WorkSide
+      Waterjetting(3) = Visibility.Collapsed                             ' HeadSide
+      Waterjetting(4) = Visibility.Visible                               ' LeadInType
+      Waterjetting(5) = Visibility.Collapsed                             ' ExtLinkType
+      Waterjetting(6) = Visibility.Visible                               ' LeadOutType
+      Waterjetting(7) = Visibility.Collapsed                             ' CurveUse
+      Waterjetting(8) = Visibility.Visible                               ' StepType
+      Waterjetting(9) = Visibility.Collapsed                             ' LeadLinkType
+      Waterjetting(10) = Visibility.Visible                              ' Speed
+      Waterjetting(11) = Visibility.Visible                              ' Feed
+      Waterjetting(12) = Visibility.Visible                              ' StartFeed
+      Waterjetting(13) = Visibility.Visible                              ' EndFeed
+      Waterjetting(14) = Visibility.Visible                              ' TipFeed
+      Waterjetting(15) = Visibility.Visible                              ' OffSr
+      Waterjetting(16) = Visibility.Visible                              ' OffSl
+      Waterjetting(17) = Visibility.Visible                              ' SideAngle
+      Waterjetting(18) = Visibility.Collapsed                            ' Approx
+      Waterjetting(19) = Visibility.Visible                              ' StartPos
+      Waterjetting(20) = Visibility.Collapsed                            ' StartSlowLen
+      Waterjetting(21) = Visibility.Collapsed                            ' EndSlowLen
+      Waterjetting(22) = Visibility.Collapsed                            ' ThroughAddlen
+      Waterjetting(23) = Visibility.Visible                              ' StepPar
+      Waterjetting(24) = Visibility.Collapsed                            ' ReturnPos
+      Waterjetting(25) = Visibility.Visible                              ' TabLen
+      Waterjetting(26) = Visibility.Visible                              ' TabDist
+      Waterjetting(27) = Visibility.Visible                              ' TabHeight
+      Waterjetting(28) = Visibility.Visible                              ' TabAngle
+      Waterjetting(29) = Visibility.Visible                              ' LiTang
+      Waterjetting(30) = Visibility.Visible                              ' LiPerp
+      Waterjetting(31) = Visibility.Visible                              ' LiElev
+      Waterjetting(32) = Visibility.Visible                              ' LiCompLen
+      Waterjetting(33) = Visibility.Visible                              ' LoTang
+      Waterjetting(34) = Visibility.Visible                              ' LoPerp
+      Waterjetting(35) = Visibility.Visible                              ' LoElev
+      Waterjetting(36) = Visibility.Visible                              ' LoCompLen
+      Waterjetting(37) = Visibility.Visible                              ' StartAddLen
+      Waterjetting(38) = Visibility.Visible                              ' EndAddLen
+      Waterjetting(39) = Visibility.Collapsed                            ' StepExtArc
+      Waterjetting(40) = Visibility.Collapsed                            ' StepIntArc
+      Waterjetting(41) = Visibility.Collapsed                            ' SideStep
+      Waterjetting(42) = Visibility.Collapsed                            ' VertFeed
+      Waterjetting(43) = Visibility.Visible                              ' NamePar
+      Waterjetting(44) = Visibility.Visible                              ' Tool
+      Waterjetting(45) = Visibility.Visible                              ' DepthStr
+      Waterjetting(46) = Visibility.Visible                              ' UserNotes
+      Waterjetting(47) = Visibility.Visible                              ' OverLapStr
+      Waterjetting(48) = Visibility.Collapsed                            ' OffsetStr
+      Waterjetting(49) = Visibility.Collapsed                            ' SubType
+      Waterjetting(50) = Visibility.Collapsed                            ' SelectedSolChoiceType
+      Waterjetting(51) = Visibility.Collapsed                            ' InitAngs
+      Waterjetting(52) = Visibility.Collapsed                            ' BlockedAxis
+      Waterjetting(53) = Visibility.Collapsed                            ' FaceUseType
+      Waterjetting(54) = Visibility.Collapsed                            ' InvertToolDir
+      Waterjetting(55) = Visibility.Collapsed                            ' StepBack
+      Waterjetting(56) = Visibility.Collapsed                            ' StepSideAngBack
+      Waterjetting(57) = Visibility.Collapsed                            ' BackFeed
+      Waterjetting(58) = Visibility.Collapsed                            ' StepSideAng
+      Waterjetting(59) = Visibility.Visible                              ' ForwardAngle
+      Waterjetting(60) = Visibility.Visible                              ' Probing
+      Waterjetting(61) = Visibility.Visible                              ' ProbingMinDist
+      Waterjetting(62) = Visibility.Visible                              ' ProbingMaxDist
+      Waterjetting(63) = Visibility.Visible                              ' ExtCornType
+      Waterjetting(64) = Visibility.Visible                              ' IntCornType
+      Waterjetting(65) = Visibility.Visible                              ' CornSlowLen
+      Waterjetting(66) = Visibility.Visible                              ' CornSlowPerc
+      Waterjetting(67) = Visibility.Visible                              ' LiHole
+      Waterjetting(68) = Visibility.Visible                              ' LiHoleRad
+      Waterjetting(69) = Visibility.Visible                              ' LpTurns
+      Waterjetting(70) = Visibility.Visible                              ' HpTurns
+      Waterjetting(71) = Visibility.Visible                              ' ThicknessFeed
+      Waterjetting(102) = Visibility.Collapsed                           ' Expander LeadIn
+      Waterjetting(103) = Visibility.Collapsed                           ' Expander LeadOut
 
-'      ' Parametri OperationDisposition
-'      OperationDisposition(0) = Visibility.Collapsed                ' BaseParameters
-'      OperationDisposition(1) = Visibility.Collapsed                ' GenericParameters
-'      OperationDisposition(2) = Visibility.Collapsed                ' LeadInTypeParameters
-'      OperationDisposition(3) = Visibility.Collapsed                ' LeadOutTypeParameters
-'      OperationDisposition(4) = Visibility.Collapsed                ' LeaveTabParameters
-'      OperationDisposition(5) = Visibility.Collapsed                ' ToolParameters
-'      OperationDisposition(6) = Visibility.Collapsed                ' OverLap
-'      OperationDisposition(11) = Visibility.Collapsed               ' ThrouAddLen
-'      OperationDisposition(8) = Visibility.Collapsed                ' StepType
-'      OperationDisposition(9) = Visibility.Collapsed                ' StartSlowLen
-'      OperationDisposition(10) = Visibility.Collapsed               ' EndSlowLen
-'      OperationDisposition(11) = Visibility.Collapsed               ' SideAngle
-'      OperationDisposition(12) = Visibility.Collapsed               ' OffsetSr
-'      OperationDisposition(13) = Visibility.Collapsed               ' OffsetSl
-'      OperationDisposition(14) = Visibility.Collapsed               ' WorkSide
-'      OperationDisposition(15) = Visibility.Collapsed               ' HeadSide
+      ' Parametri OperationDisposition
+      OperationDisposition(0) = Visibility.Collapsed                ' BaseParameters
+      OperationDisposition(1) = Visibility.Collapsed                ' GenericParameters
+      OperationDisposition(2) = Visibility.Collapsed                ' LeadInTypeParameters
+      OperationDisposition(3) = Visibility.Collapsed                ' LeadOutTypeParameters
+      OperationDisposition(4) = Visibility.Collapsed                ' LeaveTabParameters
+      OperationDisposition(5) = Visibility.Collapsed                ' ToolParameters
+      OperationDisposition(6) = Visibility.Collapsed                ' OverLap
+      OperationDisposition(11) = Visibility.Collapsed               ' ThrouAddLen
+      OperationDisposition(8) = Visibility.Collapsed                ' StepType
+      OperationDisposition(9) = Visibility.Collapsed                ' StartSlowLen
+      OperationDisposition(10) = Visibility.Collapsed               ' EndSlowLen
+      OperationDisposition(11) = Visibility.Collapsed               ' SideAngle
+      OperationDisposition(12) = Visibility.Collapsed               ' OffsetSr
+      OperationDisposition(13) = Visibility.Collapsed               ' OffsetSl
+      OperationDisposition(14) = Visibility.Collapsed               ' WorkSide
+      OperationDisposition(15) = Visibility.Collapsed               ' HeadSide
 
-'      ' Parametri GenMachining
-'      FiveAxMachining(0) = Visibility.Visible                          ' Invert
-'      FiveAxMachining(1) = Visibility.Collapsed                        ' LeaveTab
-'      FiveAxMachining(2) = Visibility.Collapsed                        ' WorkSide
-'      FiveAxMachining(3) = Visibility.Collapsed                        ' HeadSide
-'      FiveAxMachining(4) = Visibility.Collapsed                        ' LeadInType
-'      FiveAxMachining(5) = Visibility.Collapsed                        ' ExtLinkType
-'      FiveAxMachining(6) = Visibility.Collapsed                        ' LeadOutType
-'      FiveAxMachining(7) = Visibility.Collapsed                        ' CurveUse
-'      FiveAxMachining(8) = Visibility.Collapsed                        ' StepType
-'      FiveAxMachining(9) = Visibility.Collapsed                        ' LeadLinkType
-'      FiveAxMachining(10) = Visibility.Visible                         ' Speed
-'      FiveAxMachining(11) = Visibility.Visible                         ' Feed
-'      FiveAxMachining(12) = Visibility.Visible                         ' StartFeed
-'      FiveAxMachining(13) = Visibility.Visible                         ' EndFeed
-'      FiveAxMachining(14) = Visibility.Visible                         ' TipFeed
-'      FiveAxMachining(15) = Visibility.Visible                         ' OffSr
-'      FiveAxMachining(16) = Visibility.Visible                         ' OffSl
-'      FiveAxMachining(17) = Visibility.Collapsed                       ' SideAngle
-'      FiveAxMachining(18) = Visibility.Collapsed                       ' Approx
-'      FiveAxMachining(19) = Visibility.Visible                         ' StartPos
-'      FiveAxMachining(20) = Visibility.Collapsed                       ' StartSlowLen
-'      FiveAxMachining(21) = Visibility.Collapsed                       ' EndSlowLen
-'      FiveAxMachining(22) = Visibility.Collapsed                       ' ThroughAddlen
-'      FiveAxMachining(23) = Visibility.Collapsed                       ' StepPar
-'      FiveAxMachining(24) = Visibility.Collapsed                       ' Returnpos
-'      FiveAxMachining(25) = Visibility.Collapsed                       ' TabLen
-'      FiveAxMachining(26) = Visibility.Collapsed                       ' TabDist
-'      FiveAxMachining(27) = Visibility.Collapsed                       ' TabHeight
-'      FiveAxMachining(28) = Visibility.Collapsed                       ' TabAngle
-'      FiveAxMachining(29) = Visibility.Collapsed                       ' LiTang
-'      FiveAxMachining(30) = Visibility.Collapsed                       ' LiPerp
-'      FiveAxMachining(31) = Visibility.Collapsed                       ' LiElev
-'      FiveAxMachining(32) = Visibility.Collapsed                       ' LiCompLen
-'      FiveAxMachining(33) = Visibility.Collapsed                       ' LoTang
-'      FiveAxMachining(34) = Visibility.Collapsed                       ' LoPerp
-'      FiveAxMachining(35) = Visibility.Collapsed                       ' LoElev
-'      FiveAxMachining(36) = Visibility.Collapsed                       ' LoCompLen
-'      FiveAxMachining(37) = Visibility.Collapsed                       ' StartAddLen
-'      FiveAxMachining(38) = Visibility.Collapsed                       ' EndAddLen
-'      FiveAxMachining(39) = Visibility.Collapsed                       ' StepExtArc
-'      FiveAxMachining(40) = Visibility.Collapsed                       ' StepIntArc
-'      FiveAxMachining(41) = Visibility.Collapsed                       ' SideStep
-'      FiveAxMachining(42) = Visibility.Collapsed                       ' VertFeed
-'      FiveAxMachining(43) = Visibility.Visible                         ' Name
-'      FiveAxMachining(44) = Visibility.Visible                         ' Tool
-'      FiveAxMachining(45) = Visibility.Visible                         ' DepthStr
-'      FiveAxMachining(46) = Visibility.Visible                         ' UserNotes
-'      FiveAxMachining(47) = Visibility.Collapsed                       ' OverLapStr
-'      FiveAxMachining(48) = Visibility.Collapsed                       ' OffsetStr
-'      FiveAxMachining(49) = Visibility.Visible                         ' SubType
-'      FiveAxMachining(50) = Visibility.Collapsed                       ' SelectedSolChoiceType
-'      FiveAxMachining(51) = Visibility.Collapsed                       ' InitAngs
-'      FiveAxMachining(52) = Visibility.Collapsed                       ' BlockedAxis
-'      FiveAxMachining(53) = Visibility.Collapsed                       ' FaceUseType
-'      FiveAxMachining(54) = Visibility.Collapsed                       ' InvertToolDir
-'      FiveAxMachining(55) = Visibility.Collapsed                       ' StepBack
-'      FiveAxMachining(56) = Visibility.Collapsed                       ' StepSideAngBack
-'      FiveAxMachining(57) = Visibility.Collapsed                       ' BackFeed
-'      FiveAxMachining(58) = Visibility.Collapsed                       ' StepSideAng
-'      FiveAxMachining(59) = Visibility.Collapsed                       ' ForwardAngle
-'      FiveAxMachining(60) = Visibility.Collapsed                       ' Probing
-'      FiveAxMachining(61) = Visibility.Collapsed                       ' ProbingMinDist
-'      FiveAxMachining(62) = Visibility.Collapsed                       ' ProbingMaxDist
-'      FiveAxMachining(63) = Visibility.Collapsed                       ' ExtCornType
-'      FiveAxMachining(64) = Visibility.Collapsed                       ' IntCornType
-'      FiveAxMachining(65) = Visibility.Collapsed                       ' CornSlowLen
-'      FiveAxMachining(66) = Visibility.Collapsed                       ' CornSlowPerc
-'      FiveAxMachining(67) = Visibility.Collapsed                       ' LiHole
-'      FiveAxMachining(68) = Visibility.Collapsed                       ' LiHoleRad
-'      FiveAxMachining(69) = Visibility.Collapsed                       ' LpTurns
-'      FiveAxMachining(70) = Visibility.Collapsed                       ' HpTurns
-'      FiveAxMachining(71) = Visibility.Collapsed                       ' ThicknessFeed
-'      FiveAxMachining(102) = Visibility.Collapsed                      ' Expander LeadIn
-'      FiveAxMachining(103) = Visibility.Collapsed                      ' Expander LeadOut
+      ' Parametri GenMachining
+      FiveAxMachining(0) = Visibility.Visible                          ' Invert
+      FiveAxMachining(1) = Visibility.Collapsed                        ' LeaveTab
+      FiveAxMachining(2) = Visibility.Collapsed                        ' WorkSide
+      FiveAxMachining(3) = Visibility.Collapsed                        ' HeadSide
+      FiveAxMachining(4) = Visibility.Collapsed                        ' LeadInType
+      FiveAxMachining(5) = Visibility.Collapsed                        ' ExtLinkType
+      FiveAxMachining(6) = Visibility.Collapsed                        ' LeadOutType
+      FiveAxMachining(7) = Visibility.Collapsed                        ' CurveUse
+      FiveAxMachining(8) = Visibility.Collapsed                        ' StepType
+      FiveAxMachining(9) = Visibility.Collapsed                        ' LeadLinkType
+      FiveAxMachining(10) = Visibility.Visible                         ' Speed
+      FiveAxMachining(11) = Visibility.Visible                         ' Feed
+      FiveAxMachining(12) = Visibility.Visible                         ' StartFeed
+      FiveAxMachining(13) = Visibility.Visible                         ' EndFeed
+      FiveAxMachining(14) = Visibility.Visible                         ' TipFeed
+      FiveAxMachining(15) = Visibility.Visible                         ' OffSr
+      FiveAxMachining(16) = Visibility.Visible                         ' OffSl
+      FiveAxMachining(17) = Visibility.Collapsed                       ' SideAngle
+      FiveAxMachining(18) = Visibility.Collapsed                       ' Approx
+      FiveAxMachining(19) = Visibility.Visible                         ' StartPos
+      FiveAxMachining(20) = Visibility.Collapsed                       ' StartSlowLen
+      FiveAxMachining(21) = Visibility.Collapsed                       ' EndSlowLen
+      FiveAxMachining(22) = Visibility.Collapsed                       ' ThroughAddlen
+      FiveAxMachining(23) = Visibility.Collapsed                       ' StepPar
+      FiveAxMachining(24) = Visibility.Collapsed                       ' Returnpos
+      FiveAxMachining(25) = Visibility.Collapsed                       ' TabLen
+      FiveAxMachining(26) = Visibility.Collapsed                       ' TabDist
+      FiveAxMachining(27) = Visibility.Collapsed                       ' TabHeight
+      FiveAxMachining(28) = Visibility.Collapsed                       ' TabAngle
+      FiveAxMachining(29) = Visibility.Collapsed                       ' LiTang
+      FiveAxMachining(30) = Visibility.Collapsed                       ' LiPerp
+      FiveAxMachining(31) = Visibility.Collapsed                       ' LiElev
+      FiveAxMachining(32) = Visibility.Collapsed                       ' LiCompLen
+      FiveAxMachining(33) = Visibility.Collapsed                       ' LoTang
+      FiveAxMachining(34) = Visibility.Collapsed                       ' LoPerp
+      FiveAxMachining(35) = Visibility.Collapsed                       ' LoElev
+      FiveAxMachining(36) = Visibility.Collapsed                       ' LoCompLen
+      FiveAxMachining(37) = Visibility.Collapsed                       ' StartAddLen
+      FiveAxMachining(38) = Visibility.Collapsed                       ' EndAddLen
+      FiveAxMachining(39) = Visibility.Collapsed                       ' StepExtArc
+      FiveAxMachining(40) = Visibility.Collapsed                       ' StepIntArc
+      FiveAxMachining(41) = Visibility.Collapsed                       ' SideStep
+      FiveAxMachining(42) = Visibility.Collapsed                       ' VertFeed
+      FiveAxMachining(43) = Visibility.Visible                         ' Name
+      FiveAxMachining(44) = Visibility.Visible                         ' Tool
+      FiveAxMachining(45) = Visibility.Visible                         ' DepthStr
+      FiveAxMachining(46) = Visibility.Visible                         ' UserNotes
+      FiveAxMachining(47) = Visibility.Collapsed                       ' OverLapStr
+      FiveAxMachining(48) = Visibility.Collapsed                       ' OffsetStr
+      FiveAxMachining(49) = Visibility.Visible                         ' SubType
+      FiveAxMachining(50) = Visibility.Collapsed                       ' SelectedSolChoiceType
+      FiveAxMachining(51) = Visibility.Collapsed                       ' InitAngs
+      FiveAxMachining(52) = Visibility.Collapsed                       ' BlockedAxis
+      FiveAxMachining(53) = Visibility.Collapsed                       ' FaceUseType
+      FiveAxMachining(54) = Visibility.Collapsed                       ' InvertToolDir
+      FiveAxMachining(55) = Visibility.Collapsed                       ' StepBack
+      FiveAxMachining(56) = Visibility.Collapsed                       ' StepSideAngBack
+      FiveAxMachining(57) = Visibility.Collapsed                       ' BackFeed
+      FiveAxMachining(58) = Visibility.Collapsed                       ' StepSideAng
+      FiveAxMachining(59) = Visibility.Collapsed                       ' ForwardAngle
+      FiveAxMachining(60) = Visibility.Collapsed                       ' Probing
+      FiveAxMachining(61) = Visibility.Collapsed                       ' ProbingMinDist
+      FiveAxMachining(62) = Visibility.Collapsed                       ' ProbingMaxDist
+      FiveAxMachining(63) = Visibility.Collapsed                       ' ExtCornType
+      FiveAxMachining(64) = Visibility.Collapsed                       ' IntCornType
+      FiveAxMachining(65) = Visibility.Collapsed                       ' CornSlowLen
+      FiveAxMachining(66) = Visibility.Collapsed                       ' CornSlowPerc
+      FiveAxMachining(67) = Visibility.Collapsed                       ' LiHole
+      FiveAxMachining(68) = Visibility.Collapsed                       ' LiHoleRad
+      FiveAxMachining(69) = Visibility.Collapsed                       ' LpTurns
+      FiveAxMachining(70) = Visibility.Collapsed                       ' HpTurns
+      FiveAxMachining(71) = Visibility.Collapsed                       ' ThicknessFeed
+      FiveAxMachining(102) = Visibility.Collapsed                      ' Expander LeadIn
+      FiveAxMachining(103) = Visibility.Collapsed                      ' Expander LeadOut
 
 
-'      '' Parametri OperationDrilling
-'      'OperationDrilling(0) = Visibility.Visible                     ' BaseParameters
-'      'OperationDrilling(1) = Visibility.Visible                     ' GenericParameters
-'      'OperationDrilling(2) = Visibility.Collapsed                   ' LeadInTypeParameters
-'      'OperationDrilling(3) = Visibility.Collapsed                   ' LeadOutTypeParameters
-'      'OperationDrilling(4) = Visibility.Collapsed                   ' LeaveTabParameters
-'      'OperationDrilling(5) = Visibility.Visible                     ' ToolParameters
-'      'OperationDrilling(6) = Visibility.Collapsed                   ' OverLap
-'      'OperationDrilling(7) = Visibility.Visible                     ' ThrouAddLen
-'      'OperationDrilling(8) = Visibility.Collapsed                   ' StepType
-'      'OperationDrilling(9) = Visibility.Visible                     ' StartSlowLen
-'      'OperationDrilling(10) = Visibility.Visible                    ' EndSlowLen
-'      'OperationDrilling(11) = Visibility.Collapsed                  ' SideAngle
-'      'OperationDrilling(12) = Visibility.Collapsed                  ' OffsetSr
-'      'OperationDrilling(13) = Visibility.Collapsed                  ' OffsetSl
-'      'OperationDrilling(14) = Visibility.Collapsed                  ' WorkSide
-'      'OperationDrilling(15) = Visibility.Collapsed                  ' HeadSide
+      '' Parametri OperationDrilling
+      'OperationDrilling(0) = Visibility.Visible                     ' BaseParameters
+      'OperationDrilling(1) = Visibility.Visible                     ' GenericParameters
+      'OperationDrilling(2) = Visibility.Collapsed                   ' LeadInTypeParameters
+      'OperationDrilling(3) = Visibility.Collapsed                   ' LeadOutTypeParameters
+      'OperationDrilling(4) = Visibility.Collapsed                   ' LeaveTabParameters
+      'OperationDrilling(5) = Visibility.Visible                     ' ToolParameters
+      'OperationDrilling(6) = Visibility.Collapsed                   ' OverLap
+      'OperationDrilling(7) = Visibility.Visible                     ' ThrouAddLen
+      'OperationDrilling(8) = Visibility.Collapsed                   ' StepType
+      'OperationDrilling(9) = Visibility.Visible                     ' StartSlowLen
+      'OperationDrilling(10) = Visibility.Visible                    ' EndSlowLen
+      'OperationDrilling(11) = Visibility.Collapsed                  ' SideAngle
+      'OperationDrilling(12) = Visibility.Collapsed                  ' OffsetSr
+      'OperationDrilling(13) = Visibility.Collapsed                  ' OffsetSl
+      'OperationDrilling(14) = Visibility.Collapsed                  ' WorkSide
+      'OperationDrilling(15) = Visibility.Collapsed                  ' HeadSide
 
-'      '' Parametri OperationSawing
-'      'OperationSawing(0) = Visibility.Visible                       ' BaseParameters
-'      'OperationSawing(1) = Visibility.Visible                       ' GenericParameters
-'      'OperationSawing(2) = Visibility.Collapsed                     ' LeadInTypeParameters
-'      'OperationSawing(3) = Visibility.Collapsed                     ' LeadOutTypeParameters
-'      'OperationSawing(4) = Visibility.Collapsed                     ' LeaveTabParameters
-'      'OperationSawing(5) = Visibility.Visible                       ' ToolParameters
-'      'OperationSawing(6) = Visibility.Collapsed                     ' OverLap
-'      'OperationSawing(7) = Visibility.Collapsed                     ' ThrouAddLen
-'      'OperationSawing(8) = Visibility.Visible                       ' StepType
-'      'OperationSawing(9) = Visibility.Collapsed                     ' StartSlowLen
-'      'OperationSawing(10) = Visibility.Collapsed                    ' EndSlowLen
-'      'OperationSawing(11) = Visibility.Visible                      ' SideAngle
-'      'OperationSawing(12) = Visibility.Visible                      ' OffsetSr
-'      'OperationSawing(13) = Visibility.Visible                      ' OffsetSl
-'      'OperationSawing(14) = Visibility.Visible                      ' WorkSide
-'      'OperationSawing(15) = Visibility.Visible                      ' HeadSide
+      '' Parametri OperationSawing
+      'OperationSawing(0) = Visibility.Visible                       ' BaseParameters
+      'OperationSawing(1) = Visibility.Visible                       ' GenericParameters
+      'OperationSawing(2) = Visibility.Collapsed                     ' LeadInTypeParameters
+      'OperationSawing(3) = Visibility.Collapsed                     ' LeadOutTypeParameters
+      'OperationSawing(4) = Visibility.Collapsed                     ' LeaveTabParameters
+      'OperationSawing(5) = Visibility.Visible                       ' ToolParameters
+      'OperationSawing(6) = Visibility.Collapsed                     ' OverLap
+      'OperationSawing(7) = Visibility.Collapsed                     ' ThrouAddLen
+      'OperationSawing(8) = Visibility.Visible                       ' StepType
+      'OperationSawing(9) = Visibility.Collapsed                     ' StartSlowLen
+      'OperationSawing(10) = Visibility.Collapsed                    ' EndSlowLen
+      'OperationSawing(11) = Visibility.Visible                      ' SideAngle
+      'OperationSawing(12) = Visibility.Visible                      ' OffsetSr
+      'OperationSawing(13) = Visibility.Visible                      ' OffsetSl
+      'OperationSawing(14) = Visibility.Visible                      ' WorkSide
+      'OperationSawing(15) = Visibility.Visible                      ' HeadSide
 
-'      '' Parametri OperationMilling
-'      'OperationMilling(0) = Visibility.Visible                      ' BaseParameters
-'      'OperationMilling(1) = Visibility.Visible                      ' GenericParameters
-'      'OperationMilling(2) = Visibility.Visible                      ' LeadInTypeParameters
-'      'OperationMilling(3) = Visibility.Visible                      ' LeadOutTypeParameters
-'      'OperationMilling(4) = Visibility.Visible                      ' LeaveTabParameters
-'      'OperationMilling(5) = Visibility.Visible                      ' ToolParameters
-'      'OperationMilling(6) = Visibility.Visible                      ' OverLap
-'      'OperationMilling(7) = Visibility.Collapsed                    ' ThrouAddLen
-'      'OperationMilling(8) = Visibility.Visible                      ' StepType
-'      'OperationMilling(9) = Visibility.Collapsed                    ' StartSlowLen
-'      'OperationMilling(10) = Visibility.Collapsed                   ' EndSlowLen
-'      'OperationMilling(11) = Visibility.Visible                     ' SideAngle
-'      'OperationMilling(12) = Visibility.Visible                     ' OffsetSr
-'      'OperationMilling(13) = Visibility.Visible                     ' OffsetSl
-'      'OperationMilling(14) = Visibility.Visible                     ' WorkSide
-'      'OperationMilling(15) = Visibility.Collapsed                   ' HeadSide
+      '' Parametri OperationMilling
+      'OperationMilling(0) = Visibility.Visible                      ' BaseParameters
+      'OperationMilling(1) = Visibility.Visible                      ' GenericParameters
+      'OperationMilling(2) = Visibility.Visible                      ' LeadInTypeParameters
+      'OperationMilling(3) = Visibility.Visible                      ' LeadOutTypeParameters
+      'OperationMilling(4) = Visibility.Visible                      ' LeaveTabParameters
+      'OperationMilling(5) = Visibility.Visible                      ' ToolParameters
+      'OperationMilling(6) = Visibility.Visible                      ' OverLap
+      'OperationMilling(7) = Visibility.Collapsed                    ' ThrouAddLen
+      'OperationMilling(8) = Visibility.Visible                      ' StepType
+      'OperationMilling(9) = Visibility.Collapsed                    ' StartSlowLen
+      'OperationMilling(10) = Visibility.Collapsed                   ' EndSlowLen
+      'OperationMilling(11) = Visibility.Visible                     ' SideAngle
+      'OperationMilling(12) = Visibility.Visible                     ' OffsetSr
+      'OperationMilling(13) = Visibility.Visible                     ' OffsetSl
+      'OperationMilling(14) = Visibility.Visible                     ' WorkSide
+      'OperationMilling(15) = Visibility.Collapsed                   ' HeadSide
 
-'      '' Parametri OperationPocketing
-'      'OperationPocketing(0) = Visibility.Visible                    ' BaseParameters
-'      'OperationPocketing(1) = Visibility.Visible                    ' GenericParameters
-'      'OperationPocketing(2) = Visibility.Collapsed                  ' LeadInTypeParameters
-'      'OperationPocketing(3) = Visibility.Collapsed                  ' LeadOutTypeParameters
-'      'OperationPocketing(4) = Visibility.Collapsed                  ' LeaveTabParameters
-'      'OperationPocketing(5) = Visibility.Visible                    ' ToolParameters
-'      'OperationPocketing(6) = Visibility.Collapsed                  ' OverLap
-'      'OperationPocketing(7) = Visibility.Collapsed                  ' ThrouAddLen
-'      'OperationPocketing(8) = Visibility.Collapsed                  ' StepType
-'      'OperationPocketing(9) = Visibility.Collapsed                  ' StartSlowLen
-'      'OperationPocketing(10) = Visibility.Collapsed                 ' EndSlowLen
-'      'OperationPocketing(11) = Visibility.Collapsed                 ' SideAngle
-'      'OperationPocketing(12) = Visibility.Collapsed                 ' OffsetSr
-'      'OperationPocketing(13) = Visibility.Collapsed                 ' OffsetSl
-'      'OperationPocketing(14) = Visibility.Visible                   ' WorkSide
-'      'OperationPocketing(15) = Visibility.Collapsed                 ' HeadSide
+      '' Parametri OperationPocketing
+      'OperationPocketing(0) = Visibility.Visible                    ' BaseParameters
+      'OperationPocketing(1) = Visibility.Visible                    ' GenericParameters
+      'OperationPocketing(2) = Visibility.Collapsed                  ' LeadInTypeParameters
+      'OperationPocketing(3) = Visibility.Collapsed                  ' LeadOutTypeParameters
+      'OperationPocketing(4) = Visibility.Collapsed                  ' LeaveTabParameters
+      'OperationPocketing(5) = Visibility.Visible                    ' ToolParameters
+      'OperationPocketing(6) = Visibility.Collapsed                  ' OverLap
+      'OperationPocketing(7) = Visibility.Collapsed                  ' ThrouAddLen
+      'OperationPocketing(8) = Visibility.Collapsed                  ' StepType
+      'OperationPocketing(9) = Visibility.Collapsed                  ' StartSlowLen
+      'OperationPocketing(10) = Visibility.Collapsed                 ' EndSlowLen
+      'OperationPocketing(11) = Visibility.Collapsed                 ' SideAngle
+      'OperationPocketing(12) = Visibility.Collapsed                 ' OffsetSr
+      'OperationPocketing(13) = Visibility.Collapsed                 ' OffsetSl
+      'OperationPocketing(14) = Visibility.Visible                   ' WorkSide
+      'OperationPocketing(15) = Visibility.Collapsed                 ' HeadSide
 
-'      '' Parametri OperationMortising
-'      'OperationMortising(0) = Visibility.Visible                    ' BaseParameters
-'      'OperationMortising(1) = Visibility.Visible                    ' GenericParameters
-'      'OperationMortising(2) = Visibility.Collapsed                  ' LeadInTypeParameters
-'      'OperationMortising(3) = Visibility.Collapsed                  ' LeadOutTypeParameters
-'      'OperationMortising(4) = Visibility.Collapsed                  ' LeaveTabParameters
-'      'OperationMortising(5) = Visibility.Visible                    ' ToolParameters
-'      'OperationMortising(6) = Visibility.Collapsed                  ' OverLap
-'      'OperationMortising(7) = Visibility.Collapsed                  ' ThrouAddLen
-'      'OperationMortising(8) = Visibility.Collapsed                  ' StepType
-'      'OperationMortising(9) = Visibility.Collapsed                  ' StartSlowLen
-'      'OperationMortising(10) = Visibility.Collapsed                 ' EndSlowLen
-'      'OperationMortising(11) = Visibility.Collapsed                 ' SideAngle
-'      'OperationMortising(12) = Visibility.Collapsed                 ' OffsetSr
-'      'OperationMortising(13) = Visibility.Collapsed                 ' OffsetSl
-'      'OperationMortising(14) = Visibility.Visible                   ' WorkSide
-'      'OperationMortising(15) = Visibility.Collapsed                 ' HeadSide
+      '' Parametri OperationMortising
+      'OperationMortising(0) = Visibility.Visible                    ' BaseParameters
+      'OperationMortising(1) = Visibility.Visible                    ' GenericParameters
+      'OperationMortising(2) = Visibility.Collapsed                  ' LeadInTypeParameters
+      'OperationMortising(3) = Visibility.Collapsed                  ' LeadOutTypeParameters
+      'OperationMortising(4) = Visibility.Collapsed                  ' LeaveTabParameters
+      'OperationMortising(5) = Visibility.Visible                    ' ToolParameters
+      'OperationMortising(6) = Visibility.Collapsed                  ' OverLap
+      'OperationMortising(7) = Visibility.Collapsed                  ' ThrouAddLen
+      'OperationMortising(8) = Visibility.Collapsed                  ' StepType
+      'OperationMortising(9) = Visibility.Collapsed                  ' StartSlowLen
+      'OperationMortising(10) = Visibility.Collapsed                 ' EndSlowLen
+      'OperationMortising(11) = Visibility.Collapsed                 ' SideAngle
+      'OperationMortising(12) = Visibility.Collapsed                 ' OffsetSr
+      'OperationMortising(13) = Visibility.Collapsed                 ' OffsetSl
+      'OperationMortising(14) = Visibility.Visible                   ' WorkSide
+      'OperationMortising(15) = Visibility.Collapsed                 ' HeadSide
 
-'      '' Parametri OperationSawroughing
-'      'OperationSawroughing(0) = Visibility.Visible                  ' BaseParameters
-'      'OperationSawroughing(1) = Visibility.Visible                  ' GenericParameters
-'      'OperationSawroughing(2) = Visibility.Collapsed                ' LeadInTypeParameters
-'      'OperationSawroughing(3) = Visibility.Collapsed                ' LeadOutTypeParameters
-'      'OperationSawroughing(4) = Visibility.Collapsed                ' LeaveTabParameters
-'      'OperationSawroughing(5) = Visibility.Visible                  ' ToolParameters
-'      'OperationSawroughing(6) = Visibility.Collapsed                ' OverLap
-'      'OperationSawroughing(7) = Visibility.Collapsed                ' ThrouAddLen
-'      'OperationSawroughing(8) = Visibility.Collapsed                ' StepType
-'      'OperationSawroughing(9) = Visibility.Collapsed                ' StartSlowLen
-'      'OperationSawroughing(10) = Visibility.Collapsed               ' EndSlowLen
-'      'OperationSawroughing(11) = Visibility.Collapsed               ' SideAngle
-'      'OperationSawroughing(12) = Visibility.Collapsed               ' OffsetSr
-'      'OperationSawroughing(13) = Visibility.Collapsed               ' OffsetSl
-'      'OperationSawroughing(14) = Visibility.Visible                 ' WorkSide
-'      'OperationSawroughing(15) = Visibility.Collapsed               ' HeadSide
+      '' Parametri OperationSawroughing
+      'OperationSawroughing(0) = Visibility.Visible                  ' BaseParameters
+      'OperationSawroughing(1) = Visibility.Visible                  ' GenericParameters
+      'OperationSawroughing(2) = Visibility.Collapsed                ' LeadInTypeParameters
+      'OperationSawroughing(3) = Visibility.Collapsed                ' LeadOutTypeParameters
+      'OperationSawroughing(4) = Visibility.Collapsed                ' LeaveTabParameters
+      'OperationSawroughing(5) = Visibility.Visible                  ' ToolParameters
+      'OperationSawroughing(6) = Visibility.Collapsed                ' OverLap
+      'OperationSawroughing(7) = Visibility.Collapsed                ' ThrouAddLen
+      'OperationSawroughing(8) = Visibility.Collapsed                ' StepType
+      'OperationSawroughing(9) = Visibility.Collapsed                ' StartSlowLen
+      'OperationSawroughing(10) = Visibility.Collapsed               ' EndSlowLen
+      'OperationSawroughing(11) = Visibility.Collapsed               ' SideAngle
+      'OperationSawroughing(12) = Visibility.Collapsed               ' OffsetSr
+      'OperationSawroughing(13) = Visibility.Collapsed               ' OffsetSl
+      'OperationSawroughing(14) = Visibility.Visible                 ' WorkSide
+      'OperationSawroughing(15) = Visibility.Collapsed               ' HeadSide
 
-'      '' Parametri OperationSawfinishing
-'      'OperationSawfinishing(0) = Visibility.Visible                 ' BaseParameters
-'      'OperationSawfinishing(1) = Visibility.Visible                 ' GenericParameters
-'      'OperationSawfinishing(2) = Visibility.Collapsed               ' LeadInTypeParameters
-'      'OperationSawfinishing(3) = Visibility.Collapsed               ' LeadOutTypeParameters
-'      'OperationSawfinishing(4) = Visibility.Collapsed               ' LeaveTabParameters
-'      'OperationSawfinishing(5) = Visibility.Visible                 ' ToolParameters
-'      'OperationSawfinishing(6) = Visibility.Collapsed               ' OverLap
-'      'OperationSawfinishing(7) = Visibility.Collapsed               ' ThrouAddLen
-'      'OperationSawfinishing(8) = Visibility.Collapsed               ' StepType
-'      'OperationSawfinishing(9) = Visibility.Collapsed               ' StartSlowLen
-'      'OperationSawfinishing(10) = Visibility.Collapsed              ' EndSlowLen
-'      'OperationSawfinishing(11) = Visibility.Collapsed              ' SideAngle
-'      'OperationSawfinishing(12) = Visibility.Collapsed              ' OffsetSr
-'      'OperationSawfinishing(13) = Visibility.Collapsed              ' OffsetSl
-'      'OperationSawfinishing(14) = Visibility.Visible                ' WorkSide
-'      'OperationSawfinishing(15) = Visibility.Collapsed              ' HeadSide
+      '' Parametri OperationSawfinishing
+      'OperationSawfinishing(0) = Visibility.Visible                 ' BaseParameters
+      'OperationSawfinishing(1) = Visibility.Visible                 ' GenericParameters
+      'OperationSawfinishing(2) = Visibility.Collapsed               ' LeadInTypeParameters
+      'OperationSawfinishing(3) = Visibility.Collapsed               ' LeadOutTypeParameters
+      'OperationSawfinishing(4) = Visibility.Collapsed               ' LeaveTabParameters
+      'OperationSawfinishing(5) = Visibility.Visible                 ' ToolParameters
+      'OperationSawfinishing(6) = Visibility.Collapsed               ' OverLap
+      'OperationSawfinishing(7) = Visibility.Collapsed               ' ThrouAddLen
+      'OperationSawfinishing(8) = Visibility.Collapsed               ' StepType
+      'OperationSawfinishing(9) = Visibility.Collapsed               ' StartSlowLen
+      'OperationSawfinishing(10) = Visibility.Collapsed              ' EndSlowLen
+      'OperationSawfinishing(11) = Visibility.Collapsed              ' SideAngle
+      'OperationSawfinishing(12) = Visibility.Collapsed              ' OffsetSr
+      'OperationSawfinishing(13) = Visibility.Collapsed              ' OffsetSl
+      'OperationSawfinishing(14) = Visibility.Visible                ' WorkSide
+      'OperationSawfinishing(15) = Visibility.Collapsed              ' HeadSide
 
-'   End Sub
+   End Sub
 
-'End Class
+End Class
diff --git a/Utility/Utility.vb b/Utility/Utility.vb
index 6798b41..58ebe4d 100644
--- a/Utility/Utility.vb
+++ b/Utility/Utility.vb
@@ -20,6 +20,15 @@
       Return TryCast(target, T)
    End Function
 
+   ' Funzione che permette di trovare il primo contenitore di tipo T di un elemento grafico dependencyObject 
+   'Public Function FindChild(Of T As Class)(dependencyObject As DependencyObject) As T
+   '   Dim target As DependencyObject = dependencyObject
+   '   Do
+   '      target = DirectCast(LogicalTreeHelper.GetChildren(target), DependencyObject)
+   '   Loop While target IsNot Nothing AndAlso Not (TypeOf target Is T)
+   '   Return TryCast(target, T)
+   'End Function
+
    Public Sub UpdateUI()
       ' Costringo ad aggiornare UI
       Dim nDummy As Integer
diff --git a/ViewPanel/ViewPanelVM.vb b/ViewPanel/ViewPanelVM.vb
index 9061e12..d6cbe4f 100644
--- a/ViewPanel/ViewPanelVM.vb
+++ b/ViewPanel/ViewPanelVM.vb
@@ -23,79 +23,79 @@ Public Class ViewPanelVM
 
    Public ReadOnly Property ZoomAllToolTip As String
       Get
-         Return EgtMsg(5254)     ' Zoom All
+         Return EgtMsg(MSG_GRIDVIEWPANEL + 4)
       End Get
    End Property
 
    Public ReadOnly Property ZoomInToolTip As String
       Get
-         Return EgtMsg(5255)     ' Zoom In
+         Return EgtMsg(MSG_GRIDVIEWPANEL + 5)
       End Get
    End Property
 
    Public ReadOnly Property ZoomOutToolTip As String
       Get
-         Return EgtMsg(5256)     ' Zoom Out
+         Return EgtMsg(MSG_GRIDVIEWPANEL + 6)
       End Get
    End Property
 
    Public ReadOnly Property LookFromTopToolTip As String
       Get
-         Return EgtMsg(5257)     ' Vista da Sopra
+         Return EgtMsg(MSG_GRIDVIEWPANEL + 7)
       End Get
    End Property
 
    Public ReadOnly Property LookFromFrontToolTip As String
       Get
-         Return EgtMsg(5258)     ' Vista di Fronte
+         Return EgtMsg(MSG_GRIDVIEWPANEL + 8)
       End Get
    End Property
 
    Public ReadOnly Property LookFromLeftToolTip As String
       Get
-         Return EgtMsg(5259)     ' Vista da Sinistra
+         Return EgtMsg(MSG_GRIDVIEWPANEL + 9)
       End Get
    End Property
 
    Public ReadOnly Property LookFromBackToolTip As String
       Get
-         Return EgtMsg(5260)     ' Vista da Dietro
+         Return EgtMsg(MSG_GRIDVIEWPANEL + 10)
       End Get
    End Property
 
    Public ReadOnly Property LookFromRightToolTip As String
       Get
-         Return EgtMsg(5261)     ' Vista da Destra
+         Return EgtMsg(MSG_GRIDVIEWPANEL + 11)
       End Get
    End Property
 
    Public ReadOnly Property LookFromIso_SEToolTip As String
       Get
-         Return EgtMsg(5263)     ' Vista Isometrica da SE
+         Return EgtMsg(MSG_GRIDVIEWPANEL + 13)
       End Get
    End Property
 
    Public ReadOnly Property LookFromIso_SWToolTip As String
       Get
-         Return EgtMsg(5262)     ' Vista Isometrica da SW
+         Return EgtMsg(MSG_GRIDVIEWPANEL + 12)
       End Get
    End Property
 
    Public ReadOnly Property LookFromIso_NEToolTip As String
       Get
-         Return EgtMsg(5264)     ' Vista Isometrica da NE
+         Return EgtMsg(MSG_GRIDVIEWPANEL + 14)
       End Get
    End Property
 
    Public ReadOnly Property LookFromIso_NWToolTip As String
       Get
-         Return EgtMsg(5265)     ' Vista Isometrica da NW
+         Return EgtMsg(MSG_GRIDVIEWPANEL + 15)
       End Get
    End Property
 
    Public ReadOnly Property ViewToCPlaneToolTip As String
       Get
-         Return EgtMsg(5282)     ' Vista da Griglia
+         Return EgtMsg(MSG_GRIDVIEWPANEL + 32)
       End Get
    End Property
 
diff --git a/WaterjetDbWindow/WaterjetDbWindowV.xaml b/WaterjetDbWindow/WaterjetDbWindowV.xaml
index 9b0bb17..cd06f19 100644
--- a/WaterjetDbWindow/WaterjetDbWindowV.xaml
+++ b/WaterjetDbWindow/WaterjetDbWindowV.xaml
@@ -128,6 +128,27 @@
                <KeyBinding Key="Esc" Command="{Binding CancelCommand}"/>
             </TextBox.InputBindings>
          </TextBox>
+
+         <!--<Grid DockPanel.Dock="Bottom" Visibility="{Binding NewMaterial_Visibility}">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="4*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                </Grid.ColumnDefinitions>
+                <EgtWPFLib5:EgtTextBox Text="{Binding sNewMaterial}"
+                                DockPanel.Dock="Bottom"          
+                                Margin="0,0,0,5"/>
+                <Button Content="{Binding OkMsg}" Grid.Column="1"
+                            Command="{Binding DoneCommand}"
+                            IsEnabled="{Binding EnableOkNewMat}"
+                            Style="{StaticResource OptionPanel_TextButton}"
+                            Margin="2.5,0,0,2.5"/>
+                <Button Content="{Binding CancelMsg}" Grid.Column="2"
+                            Command="{Binding CamcelCommand}"
+                            Style="{StaticResource OptionPanel_TextButton}"
+                            Margin="2.5,0,0,2.5"/>
+            </Grid>-->
+
       </Grid>
 
       <Grid Grid.Row="2">
diff --git a/WaterjetDbWindow/WaterjetDbWindowVM.vb b/WaterjetDbWindow/WaterjetDbWindowVM.vb
index db5330b..ff0bff6 100644
--- a/WaterjetDbWindow/WaterjetDbWindowVM.vb
+++ b/WaterjetDbWindow/WaterjetDbWindowVM.vb
@@ -2,6 +2,7 @@
 Imports System.IO
 Imports System.Text.RegularExpressions
 Imports EgtUILib
+'Imports EgtWPFLib
 
 Public Class WaterjetDbWindowVM
    Inherits VMBase
@@ -148,49 +149,49 @@ Public Class WaterjetDbWindowVM
 
    Public ReadOnly Property Title_Msg As String
       Get
-         Return EgtMsg(31751)    ' Db Waterjet
+         Return EgtMsg(31751)
       End Get
    End Property
 
    Public ReadOnly Property Thickness_Msg As String
       Get
-         Return EgtMsg(31752)    ' Spessore
+         Return EgtMsg(31752)
       End Get
    End Property
 
    Public ReadOnly Property Q1_Msg As String
       Get
-         Return EgtMsg(31753)    ' Q1
+         Return EgtMsg(31753)
       End Get
    End Property
 
    Public ReadOnly Property Q2_Msg As String
       Get
-         Return EgtMsg(31754)    ' Q2
+         Return EgtMsg(31754)
       End Get
    End Property
 
    Public ReadOnly Property Q3_Msg As String
       Get
-         Return EgtMsg(31755)    ' Q3
+         Return EgtMsg(31755)
       End Get
    End Property
 
    Public ReadOnly Property Q4_Msg As String
       Get
-         Return EgtMsg(31756)    ' Q4
+         Return EgtMsg(31756)
       End Get
    End Property
 
    Public ReadOnly Property Q5_Msg As String
       Get
-         Return EgtMsg(31757)    ' Q5
+         Return EgtMsg(31757)
       End Get
    End Property
 
    Public ReadOnly Property QExtra_Msg As String
       Get
-         Return EgtMsg(31758)    ' QExtra
+         Return EgtMsg(31758)
       End Get
    End Property
 
@@ -202,25 +203,25 @@ Public Class WaterjetDbWindowVM
 
    Public ReadOnly Property New_Msg As String
       Get
-         Return EgtMsg(31701)    ' Nuovo
+         Return EgtMsg(31701)
       End Get
    End Property
 
    Public ReadOnly Property Modify_Msg As String
       Get
-         Return EgtMsg(31704)    ' Modifica
+         Return EgtMsg(31704)
       End Get
    End Property
 
    Public ReadOnly Property Delete_Msg As String
       Get
-         Return EgtMsg(31703)    ' Rimuovi
+         Return EgtMsg(31703)
       End Get
    End Property
 
    Public ReadOnly Property Save_Msg As String
       Get
-         Return EgtMsg(31702)    ' Salva
+         Return EgtMsg(31702)
       End Get
    End Property
 
@@ -529,14 +530,13 @@ Public Class WaterjetDbWindowVM
 
    Public Sub CloseWaterjetDb(ByVal param As Object)
       If bIsModified Then
-         'Select Case MsgBox(EgtMsg(31759), MsgBoxStyle.YesNoCancel, EgtMsg(31402))
-         Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31759), EgtMsg(31402), MessageBoxButton.YesNoCancel)   ' Salvare le modifiche? - SALVA
-            Case MessageBoxResult.Cancel
+         Select Case MsgBox(EgtMsg(31759), MsgBoxStyle.YesNoCancel, EgtMsg(31402))
+            Case MsgBoxResult.Cancel
                Return
-            Case MessageBoxResult.Yes
+            Case MsgBoxResult.Yes
                WriteWaterjetDb()
                bIsModified = False
-            Case MessageBoxResult.No
+            Case MsgBoxResult.No
                RaiseEvent m_CloseWindow(True)
          End Select
       Else
@@ -556,14 +556,13 @@ Public Class WaterjetDbWindowVM
             If bExitFor Then Exit For
          Next
          If bExitFor Then
-            'Select Case MsgBox(EgtMsg(31759), MsgBoxStyle.YesNoCancel, EgtMsg(31402))
-            Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31759), EgtMsg(31402), MessageBoxButton.YesNoCancel)   ' Salvare le modifiche? - SALVA
-               Case MessageBoxResult.Cancel
+            Select Case MsgBox(EgtMsg(31759), MsgBoxStyle.YesNoCancel, EgtMsg(31402))
+               Case MsgBoxResult.Cancel
                   Return
-               Case MessageBoxResult.Yes
+               Case MsgBoxResult.Yes
                   WriteWaterjetDb()
                   bIsModified = False
-               Case MessageBoxResult.No
+               Case MsgBoxResult.No
                   RaiseEvent m_CloseWindow(True)
             End Select
          End If
@@ -680,6 +679,52 @@ Public Class WaterjetDbWindowVM
       Next
    End Sub
 
+   'Public Function CloseWaterjetDb_OmagCut(MainWindow As Window) As SaveWndBtnEnum
+   '   If bIsModified Then
+   '      Dim SaveWjDbWnd As New EgtMsgBox(MainWindow, "", EgtMsg(31759), EgtMsgBox.Buttons.YES_NO_CANCEL, EgtMsgBox.Icons.NULL)
+   '      Select Case SaveWjDbWnd.m_nPressedBtn
+   '         Case 1   ' Yes
+   '            WriteWaterjetDb()
+   '            bIsModified = False
+   '            Return SaveWndBtnEnum.YES
+   '         Case 2   ' No
+   '            Return SaveWndBtnEnum.NO
+   '         Case Else   ' Cancel
+   '            Return SaveWndBtnEnum.CANCEL
+   '      End Select
+   '   Else
+   '      Dim bExitFor As Boolean = False
+   '      For Each Material In MaterialList
+   '         If Not IsNothing(Material.SubMaterialList) Then
+   '            For Each SubMaterial In Material.SubMaterialList
+   '               If Not IsNothing(SubMaterial.ParamList) Then
+   '                  For Each QParam In SubMaterial.ParamList
+   '                     bExitFor = QParam.IsModified()
+   '                     If bExitFor Then Exit For
+   '                  Next
+   '               End If
+   '               If bExitFor Then Exit For
+   '            Next
+   '         End If
+   '         If bExitFor Then Exit For
+   '      Next
+   '      If bExitFor Then
+   '         Dim SaveWjDbWnd As New EgtMsgBox(MainWindow, "", EgtMsg(31759), EgtMsgBox.Buttons.YES_NO_CANCEL, EgtMsgBox.Icons.NULL)
+   '         Select Case SaveWjDbWnd.m_nPressedBtn
+   '            Case 1   ' Yes
+   '               WriteWaterjetDb()
+   '               bIsModified = False
+   '               Return SaveWndBtnEnum.YES
+   '            Case 2   ' No
+   '               Return SaveWndBtnEnum.NO
+   '            Case Else   ' Cancel
+   '               Return SaveWndBtnEnum.CANCEL
+   '         End Select
+   '      End If
+   '   End If
+   '   Return SaveWndBtnEnum.YES
+   'End Function
+
 #End Region ' Methods
 
 End Class
@@ -812,6 +857,7 @@ Public Class WjParam
             m_Thickness = sOldValue
          Else
             m_IsModifiedThickness = Math.Abs(dValue - dOldValue) > 10 * EPS_ANG_SMALL
+            ' m_Thickness = value
             m_Thickness = sValue
          End If
       End Set
@@ -835,6 +881,12 @@ Public Class WjParam
          Return m_Q1
       End Get
       Set(value As String)
+         'Dim dValue As Double = 0
+         'Dim dOldValue As Double = 0
+         'StringToLen(value, dValue)
+         'StringToLen(m_Q1, dOldValue)
+         'm_IsModifiedQ1 = Math.Abs(dValue - dOldValue) > 10 * EPS_ANG_SMALL
+         'm_Q1 = value
          ManageFraction(value, m_Q1)
       End Set
    End Property
@@ -849,6 +901,12 @@ Public Class WjParam
          Return m_Q2
       End Get
       Set(value As String)
+         'Dim dValue As Double = 0
+         'Dim dOldValue As Double = 0
+         'StringToLen(value, dValue)
+         'StringToLen(m_Q2, dOldValue)
+         'm_IsModifiedQ2 = Math.Abs(dValue - dOldValue) > 10 * EPS_ANG_SMALL
+         'm_Q2 = value
          ManageFraction(value, m_Q2)
       End Set
    End Property
@@ -863,6 +921,12 @@ Public Class WjParam
          Return m_Q3
       End Get
       Set(value As String)
+         'Dim dValue As Double = 0
+         'Dim dOldValue As Double = 0
+         'StringToLen(value, dValue)
+         'StringToLen(m_Q3, dOldValue)
+         'm_IsModifiedQ3 = Math.Abs(dValue - dOldValue) > 10 * EPS_ANG_SMALL
+         'm_Q3 = value
          ManageFraction(value, m_Q3)
       End Set
    End Property
@@ -877,6 +941,12 @@ Public Class WjParam
          Return m_Q4
       End Get
       Set(value As String)
+         'Dim dValue As Double = 0
+         'Dim dOldValue As Double = 0
+         'StringToLen(value, dValue)
+         'StringToLen(m_Q4, dOldValue)
+         'm_IsModifiedQ4 = Math.Abs(dValue - dOldValue) > 10 * EPS_ANG_SMALL
+         'm_Q4 = value
          ManageFraction(value, m_Q4)
       End Set
    End Property
@@ -891,6 +961,12 @@ Public Class WjParam
          Return m_Q5
       End Get
       Set(value As String)
+         'Dim dValue As Double = 0
+         'Dim dOldValue As Double = 0
+         'StringToLen(value, dValue)
+         'StringToLen(m_Q5, dOldValue)
+         'm_IsModifiedQ5 = Math.Abs(dValue - dOldValue) > 10 * EPS_ANG_SMALL
+         'm_Q5 = value
          ManageFraction(value, m_Q5)
       End Set
    End Property
@@ -905,6 +981,12 @@ Public Class WjParam
          Return m_QExtra
       End Get
       Set(value As String)
+         'Dim dValue As Double = 0
+         'Dim dOldValue As Double = 0
+         'StringToLen(value, dValue)
+         'StringToLen(m_QExtra, dOldValue)
+         'm_IsModifiedQExtra = Math.Abs(dValue - dOldValue) > 10 * EPS_ANG_SMALL
+         'm_QExtra = value
          ManageFraction(value, m_QExtra)
       End Set
    End Property