diff --git a/DrawImport/ImportPageUC.xaml b/DrawImport/ImportPageUC.xaml
index f5394fc..18760af 100644
--- a/DrawImport/ImportPageUC.xaml
+++ b/DrawImport/ImportPageUC.xaml
@@ -57,7 +57,7 @@
             </Grid.RowDefinitions>
 
             <TextBlock Name="FilePathTxBl" Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
-            <ListBox Name="FileListBox" Grid.Row="1" Grid.RowSpan="2" 
+            <ListBox Name="FileListBox" Grid.Row="1" Grid.RowSpan="2"
                      ItemTemplate="{DynamicResource DataTemplateItem}"
                      ItemsSource="{Binding ItemList}"/>
 
diff --git a/Machine/Alarms2PageUC.xaml b/Machine/Alarms2PageUC.xaml
index 3d9e238..bacd6ba 100644
--- a/Machine/Alarms2PageUC.xaml
+++ b/Machine/Alarms2PageUC.xaml
@@ -16,7 +16,7 @@
             <ColumnDefinition Width="3*"/>
          </Grid.ColumnDefinitions>
          <Grid.RowDefinitions>
-            <RowDefinition Height="2*"/>
+            <RowDefinition Height="Auto"/>
             <RowDefinition Height="0.5*"/>
             <RowDefinition Height="1.5*"/>
             <RowDefinition Height="0.5*"/>
@@ -27,7 +27,9 @@
             <RowDefinition Height="1*"/>
          </Grid.RowDefinitions>
 
-         <GroupBox Name="FinalSawCutGpBx" Style="{DynamicResource OmagCut_GroupBox}">
+         <!--Parametri Taglio Lama: 5 Parametri-->
+         <GroupBox Name="SawGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.RowSpan="4" Margin="5,0,5,0">
+            <!--definizione della grigli ainterna-->
             <Grid>
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="2*"/>
@@ -36,23 +38,182 @@
                <Grid.RowDefinitions>
                   <RowDefinition Height="0.5*"/>
                   <RowDefinition Height="0.5*"/>
+                  <RowDefinition Height="0.5*"/>
+                  <RowDefinition Height="0.5*"/>
+                  <RowDefinition Height="0.5*"/>
                </Grid.RowDefinitions>
 
-               <TextBlock Name="EnableFinalSawCutTxBl" Grid.Column="0" Grid.Row="0"
+               <TextBlock Name="CutExtraLenTxBl" Grid.Column="0" Grid.Row="0"
                           Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-               <CheckBox Name="EnableFinalSawCutChBx" Grid.Column="1" Grid.Row="0" Margin="10,0,10,0"
-                         Style="{StaticResource OmagCut_CheckBox_Single}" 
-                         HorizontalAlignment="Right"/>
-
-               <TextBlock Name="FinalDepthTxBl" Grid.Column="0" Grid.Row="1"
-                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-               <EgtWPFLib:EgtTextBox Name="FinalDepthTxBx" Grid.Column="1" Grid.Row="1" Margin="10,0,10,0"
+               <EgtWPFLib:EgtTextBox Name="CutExtraLenTxBx" Grid.Column="1" Grid.Row="0" Margin="10,0,10,0"
                                      Style="{DynamicResource OmagCut_CalculatorTextBox}" />
 
+               <TextBlock Name="AngleCutExtraLenTxBl" Grid.Column="0" Grid.Row="1" 
+                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+               <EgtWPFLib:EgtTextBox Name="AngleCutExtraLenTxBx" Grid.Column="1" Grid.Row="1" Margin="10,0,10,0" IsLength="False"
+                                     Style="{DynamicResource OmagCut_CalculatorTextBox}" />
 
+               <TextBlock Name="ExtArcMinRadTxBl" Grid.Column="0" Grid.Row="2"
+                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+               <EgtWPFLib:EgtTextBox Name="ExtArcMinRadTxBx" Grid.Column="1" Grid.Row="2" Margin="10,0,10,0"
+                                     Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+
+               <TextBlock Name="IntArcMaxSideAngTxBl" Grid.Column="0" Grid.Row="3"
+                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+               <EgtWPFLib:EgtTextBox Name="IntArcMaxSideAngTxBx" Grid.Column="1" Grid.Row="3" Margin="10,0,10,0" IsLength="False"
+                                     Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+
+               <TextBlock Name="PreCutExitTxBl" Grid.Column="0" Grid.Row="4"
+                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+               <CheckBox Name="PreCutExitChBx" Grid.Column="1" Grid.Row="4" Margin="10,0,10,0"
+                         Style="{DynamicResource OmagCut_CheckBox_Single}" 
+                         HorizontalAlignment="Right"/>
 
             </Grid>
          </GroupBox>
+
+         <!--Parametri fori: 4 Parametri-->
+         <GroupBox Name="HolesGpBx" Grid.Column="1" Grid.RowSpan="3" Margin="0,0,5,0"
+                   Style="{DynamicResource OmagCut_GroupBox}">
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="145*"/>
+                  <ColumnDefinition Width="23*"/>
+                  <ColumnDefinition Width="169*"/>
+               </Grid.ColumnDefinitions>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="0.5*"/>
+                  <RowDefinition Height="0.5*"/>
+                  <RowDefinition Height="0.5*"/>
+                  <RowDefinition Height="0.5*"/>
+               </Grid.RowDefinitions>
+
+               <TextBlock Name="HolesOffsetTxBl" Grid.Column="0" Grid.Row="0"
+                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="2" Margin="10,0,10,0"/>
+               <EgtWPFLib:EgtTextBox Name="HolesOffsetTxBx" Grid.Column="2" Grid.Row="0" Margin="10,0,10,0"
+                                     Style="{DynamicResource OmagCut_CalculatorTextBox}" />
+
+               <TextBlock Name="HolesOverlapTxBl" Grid.Column="0" Grid.Row="1"
+                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="2" Margin="10,0,10,0"/>
+               <EgtWPFLib:EgtTextBox Name="HolesOverlapTxBx" Grid.Column="2" Grid.Row="1" Margin="10,0,10,0"
+                                     Style="{DynamicResource OmagCut_CalculatorTextBox}" />
+
+               <TextBlock Name="HolesToleranceTxBl" Grid.Column="0" Grid.Row="2"
+                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="2" Margin="10,0,10,0"/>
+               <EgtWPFLib:EgtTextBox Name="HolesToleranceTxBx" Grid.Column="2" Grid.Row="2" Margin="10,0,10,0"
+                                     Style="{DynamicResource OmagCut_CalculatorTextBox}" />
+
+               <TextBlock Name="OneHoleInCornerTxBl" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="3"
+                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="10,0,10,0" />
+               <CheckBox Name="OneHoleInCornerChBx" Grid.Column="2" Grid.Row="3" 
+                         Style="{DynamicResource OmagCut_CheckBox_Single}"
+                         HorizontalAlignment="Right" Margin="10,0,10,0"/>
+
+            </Grid>
+         </GroupBox>
+
+         <!--Parametri rettifica tagli sottosquadra: 1 Parametro -->
+         <GroupBox Name="RectificationWJParamGpBx"  Grid.Column="1" Grid.Row="4" Margin="0,0,5,0"
+                   Style="{DynamicResource OmagCut_GroupBox}" >
+            <Grid Grid.Column="3" Grid.Row="2">
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="2*"/>
+                  <ColumnDefinition Width="2*"/>
+               </Grid.ColumnDefinitions>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="*"/>
+               </Grid.RowDefinitions>
+
+               <TextBlock Name="EnableRectificationTxBl" Grid.Row="0" Grid.ColumnSpan="2"
+                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
+               <CheckBox Name="EnableRectificationChBx" Grid.Row="0" Grid.ColumnSpan="2" 
+                         Style="{DynamicResource OmagCut_CheckBox_Single}"
+                         HorizontalAlignment="Right" Margin="0,0,10,0"/>
+
+            </Grid>
+         </GroupBox>
+
+         <!--Parametri WaterJet: 5 Parametro (se questo GroupBox attivo allora nascondo Fori/Fresatura)-->
+         <GroupBox Name="WjsParamGpBx" Grid.Column="1" Grid.RowSpan="4" Margin="0,0,5,0"
+                   Style="{DynamicResource OmagCut_GroupBox}">
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="145*"/>
+                  <ColumnDefinition Width="23*"/>
+                  <ColumnDefinition Width="169*"/>
+               </Grid.ColumnDefinitions>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="0.5*"/>
+                  <RowDefinition Height="0.5*"/>
+                  <RowDefinition Height="0.5*"/>
+                  <RowDefinition Height="0.5*"/>
+                  <RowDefinition Height="0.5*"/>
+               </Grid.RowDefinitions>
+
+               <TextBlock Name="WjIntCutsTxBl" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="3"
+                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="10,0,10,0" />
+               <CheckBox Name="WjIntCutsChBx" Grid.Column="2" Grid.Row="0" 
+                         Style="{DynamicResource OmagCut_CheckBox_Single}"
+                         HorizontalAlignment="Right" Margin="10,0,10,0"/>
+
+               <TextBlock Name="HolesDiameterWJTxBl" Grid.Column="0" Grid.Row="1"
+                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="2" Margin="10,0,10,0"/>
+               <EgtWPFLib:EgtTextBox Name="HolesDiameterWJTxBx" Grid.Column="2" Grid.Row="1" Margin="10,0,10,0"
+                                     Style="{DynamicResource OmagCut_CalculatorTextBox}" />
+
+               <TextBlock Name="HolesOffsetWJTxBl" Grid.Column="0" Grid.Row="2"
+                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="2" Margin="10,0,10,0"/>
+               <EgtWPFLib:EgtTextBox Name="HolesOffsetWJTxBx" Grid.Column="2" Grid.Row="2" Margin="10,0,10,0"
+                                     Style="{DynamicResource OmagCut_CalculatorTextBox}" />
+
+               <TextBlock Name="MinRadiusWJTxBl" Grid.Column="0" Grid.Row="3"
+                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="2" Margin="10,0,10,0"/>
+               <EgtWPFLib:EgtTextBox Name="MinRadiusWJTxBx" Grid.Column="2" Grid.Row="3" Margin="10,0,10,0"
+                                     Style="{DynamicResource OmagCut_CalculatorTextBox}" />
+
+               <TextBlock Name="OneHoleInCornerWJTxBl" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="3"
+                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="10,0,10,0" />
+               <CheckBox Name="OneHoleInCornerWJChBx" Grid.Column="2" Grid.Row="4" 
+                         Style="{DynamicResource OmagCut_CheckBox_Single}"
+                         HorizontalAlignment="Right" Margin="10,0,10,0"/>
+
+            </Grid>
+         </GroupBox>
+
+         <!--Parametri Fresatura: 3 Parametri-->
+         <GroupBox Name="MillingsParamGpBx" Grid.Column="2" Grid.RowSpan="3" Margin="0,0,5,0"
+                   Style="{DynamicResource OmagCut_GroupBox}">
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="2*"/>
+                  <ColumnDefinition Width="2*"/>
+               </Grid.ColumnDefinitions>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="*"/>
+                  <RowDefinition Height="*"/>
+                  <RowDefinition Height="*"/>
+               </Grid.RowDefinitions>
+
+               <TextBlock Name="CornerCutsTxBl" Grid.Row="0" Grid.ColumnSpan="2"
+                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
+               <CheckBox Name="CornerCutsChBx" Grid.Row="0" Grid.ColumnSpan="2" 
+                         Style="{DynamicResource OmagCut_CheckBox_Single}"
+                         HorizontalAlignment="Right" Margin="0,0,10,0"/>
+
+               <TextBlock Name="InternalCutsTxBl" Grid.Row="1" Grid.ColumnSpan="2"
+                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="10,0,0,10" VerticalAlignment="Bottom" />
+               <CheckBox Name="InternalCutsChBx" Grid.Row="1" Grid.ColumnSpan="2" 
+                         Style="{DynamicResource OmagCut_CheckBox_Single}"
+                         HorizontalAlignment="Right" Margin="0,0,10,0"/>
+
+               <TextBlock Name="ShortTxBl" Grid.Column="0" Grid.Row="2"
+                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+               <EgtWPFLib:EgtTextBox Name="ShortTxBx" Grid.Column="1" Grid.Row="2" Margin="10,0,10,0"
+                                     Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+
+            </Grid>
+         </GroupBox>
+
       </Grid>
    </Border>
 </UserControl>
diff --git a/Machine/Alarms2PageUC.xaml.vb b/Machine/Alarms2PageUC.xaml.vb
index 88b938c..15db7a6 100644
--- a/Machine/Alarms2PageUC.xaml.vb
+++ b/Machine/Alarms2PageUC.xaml.vb
@@ -1,30 +1,278 @@
 Imports EgtUILib
+Imports EgtWPFLib5
 
 Public Class Alarms2PageUC
 
+   ' Riferimento alla MainWindow
    Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
+   Private m_CurrentMachine As CurrentMachine
+
+   ' Properties
+   Private m_bFirst As Boolean = True
 
    Private Sub Alarms2Page_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
-      FinalSawCutGpBx.Header = EgtMsg(91254)     ' Taglio Finale
-      EnableFinalSawCutTxBl.Text = EgtMsg(91255) ' Abilita
-      FinalDepthTxBl.Text = EgtMsg(91256)        ' Ultimo Spessore
+      ' Variabile che accorcia il riferimento alla macchina corrente
+      m_CurrentMachine = m_MainWindow.m_CurrentMachine
+
+      SawGpBx.Header = EgtMsg(90925)                                     ' Parametri lama
+      HolesGpBx.Header = EgtMsg(90917)                                   ' Parametri fori
+      MillingsParamGpBx.Header = EgtMsg(90929)                           ' Parametri fresature
+      WjsParamGpBx.Header = EgtMsg(91058)                                ' Parametri waterjet
+      WjsParamGpBx.Header = EgtMsg(91058)                                ' Parametri waterjet
+      RectificationWJParamGpBx.Header = EgtMsg(91047)                    ' Rettifica
+
+      HolesOffsetTxBl.Text = EgtMsg(90909)                               ' Offset fori
+      HolesOverlapTxBl.Text = EgtMsg(90910)                              ' Sovrapp. fori
+      HolesToleranceTxBl.Text = EgtMsg(90911)                            ' Tolleranza fori
+      OneHoleInCornerTxBl.Text = EgtMsg(90926)                           ' Un solo foro in angolo
+      CutExtraLenTxBl.Text = EgtMsg(90906)                               ' Sicurezza tagli
+      AngleCutExtraLenTxBl.Text = EgtMsg(90907)                          ' Sicur. angoli
+      ExtArcMinRadTxBl.Text = EgtMsg(90918)                              ' Rmin archi est.
+      IntArcMaxSideAngTxBl.Text = EgtMsg(90924)                          ' Amax archi int.
+      PreCutExitTxBl.Text = EgtMsg(91065)                                ' PreTaglio uscite
+      CornerCutsTxBl.Text = EgtMsg(90944)                                ' Sempre sugli angoli
+      InternalCutsTxBl.Text = EgtMsg(90930)                              ' Sempre sugli interni
+      ShortTxBl.Text = EgtMsg(90949)                                     ' Accorciamento
+      '-- INIZIO -- nuovi parametro Rettifica tagli sottosquadra WJ
+      EnableRectificationTxBl.Text = EgtMsg(91048)                       ' Abilita (sottosquadra)
+      '-- INIZIO -- nuovi parametri per preforo lavello
+      WjIntCutsTxBl.Text = EgtMsg(90930)                                 ' Sempre sugli interni
+      HolesDiameterWJTxBl.Text = EgtMsg(91044)                           ' Diametro
+      HolesOffsetWJTxBl.Text = EgtMsg(91045)                             ' Offset
+      MinRadiusWJTxBl.Text = EgtMsg(91046)                               ' Raggio Minimo
+      OneHoleInCornerWJTxBl.Text = EgtMsg(90926)                         ' Un solo foro in angolo
+
    End Sub
 
    Private Sub Allarm2Page_Loaded() Handles Me.Loaded
-      EnableFinalSawCutChBx.IsChecked = m_MainWindow.m_CurrentMachine.bEnableFinalSawCut
-      FinalDepthTxBx.Text = m_MainWindow.m_CurrentMachine.dFinalDepth
+      If m_bFirst Then
+         ' in assenza dell'uscita H1 nascondo i parametri lama
+         If EgtGetHeadId("H1") = GDB_ID.NULL Then
+            SawGpBx.Visibility = Visibility.Hidden
+         End If
+
+         ' Verifico la configurazione della macchina per creare i combobox
+         Select Case m_CurrentMachine.MountedToolConfig
+            Case CurrentMachine.MountedToolConfigs.SAW
+               ' Disattivo il gruppo dei parametri fori
+               HolesGpBx.Visibility = Windows.Visibility.Hidden
+            Case CurrentMachine.MountedToolConfigs.SAWANDAUXTOOL
+            'Non faccio alcunchè
+            Case CurrentMachine.MountedToolConfigs.MANUALTOOLCHANGER, CurrentMachine.MountedToolConfigs.TOOLCHANGER, CurrentMachine.MountedToolConfigs.TOOLCHANGERWITHSAW
+               'Da implementare
+         End Select
+
+         ' Se non previste forature, disabilito relativo box
+         If Not m_CurrentMachine.bDrilling Then
+            HolesGpBx.Visibility = Visibility.Hidden
+         End If
+
+         ' Se non previste fresature, disabilito relativo box e uso fresa con incisione
+         If Not m_CurrentMachine.bMilling Then
+            MillingsParamGpBx.Visibility = Visibility.Hidden
+         End If
+
+         ' Se non previsti tagli waterjet, disabilito relativo box
+         If Not m_CurrentMachine.bWaterJetting Then
+            WjsParamGpBx.Visibility = Visibility.Hidden
+            RectificationWJParamGpBx.Visibility = Visibility.Hidden
+         End If
+
+         m_bFirst = False
+      End If
+
+      Dim dVal As Double
+      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_HOLES_OFFSET, 0, m_MainWindow.GetMachIniFile())
+      EgtMdbSetGeneralParam(MCH_GP.EXTRARONDRIREG, dVal)
+      HolesOffsetTxBx.Text = LenToString(dVal, 2)
+      ' Leggo sovrapposizione fori
+      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_HOLES_OVERLAP, 0, m_MainWindow.GetMachIniFile())
+      HolesOverlapTxBx.Text = LenToString(dVal, 2)
+      ' Leggo tolleranza diametro fori
+      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_HOLES_DIAMTOLER, 0, m_MainWindow.GetMachIniFile())
+      EgtMdbSetGeneralParam(MCH_GP.HOLEDIAMTOLER, dVal)
+      HolesToleranceTxBx.Text = LenToString(dVal, 2)
+      ' Leggo un solo foro in corner
+      OneHoleInCornerChBx.IsChecked = (GetPrivateProfileInt(S_MACH_NEST, K_MACH_ONEHOLE_INTCORNER, 0, m_MainWindow.GetMachIniFile()) <> 0)
+      ' Leggo sicurezza su tagli
+      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_SAFE_LEN_CUT, 0, m_MainWindow.GetMachIniFile())
+      EgtMdbSetGeneralParam(MCH_GP.EXTRALONCUTREG, dVal)
+      CutExtraLenTxBx.Text = LenToString(dVal, 2)
+      ' Leggo sicurezza su tagli in angoli interni
+      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_SAFE_LEN_INTCORNER, 0, m_MainWindow.GetMachIniFile())
+      AngleCutExtraLenTxBx.Text = LenToString(dVal, 2)
+      ' Leggo raggio minimo arco esterno
+      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_EXTARCMINRAD, 200, m_MainWindow.GetMachIniFile())
+      EgtMdbSetGeneralParam(MCH_GP.EXTSAWARCMINRAD, dVal)
+      ExtArcMinRadTxBx.Text = LenToString(dVal, 2)
+      ' Leggo angolo di fianco massimo arco interno
+      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_INTARCMAXSIDEANG, 45, m_MainWindow.GetMachIniFile())
+      EgtMdbSetGeneralParam(MCH_GP.INTSAWARCMAXSIDEANG, dVal)
+      IntArcMaxSideAngTxBx.Text = DoubleToString(dVal, 2)
+      ' Leggo se PreCutExit attivo (per taglio ceramico)
+      Dim nPreCutExit As Integer = GetPrivateProfileInt(S_MACH_NEST, K_MACH_PRECUTEXIT, -1, m_MainWindow.GetMachIniFile())
+      If nPreCutExit = -1 Then
+         PreCutExitTxBl.Visibility = Visibility.Hidden
+         PreCutExitChBx.Visibility = Visibility.Hidden
+      Else
+         PreCutExitChBx.IsChecked = (nPreCutExit <> 0)
+      End If
+      ' Salvo DB lavorazioni con aggiornamenti parametri generali
+      EgtMdbSave()
+      ' Leggo lavorazione angoli con fresa
+      CornerCutsChBx.IsChecked = (GetPrivateProfileInt(S_MACH_NEST, K_MACH_MILLING_ON_CORNERS, 1, m_MainWindow.GetMachIniFile()) <> 0)
+      ' Leggo lavorazione interni con fresa
+      InternalCutsChBx.IsChecked = (GetPrivateProfileInt(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, 0, m_MainWindow.GetMachIniFile()) <> 0)
+      ' Leggo accorciamento angoli con fresa
+      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_MILLING_SHORTENING, 0, m_MainWindow.GetMachIniFile())
+      ShortTxBx.Text = LenToString(dVal, 2)
+      ' leggo se attiva la rettifica degli angoli per WaterJet
+      EnableRectificationChBx.IsChecked = (GetPrivateProfileInt(S_MACH_NEST, K_MACH_RECTIFICATION_ON_SUBSQUARE, 0, m_MainWindow.GetMachIniFile()) <> 0)
+      WjIntCutsChBx.IsChecked = (GetPrivateProfileInt(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, 0, m_MainWindow.GetMachIniFile()) <> 0)
+      ' Lavorazione preforo lavello con WaterJet
+      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_HOLES_DIAMITERWJ, 0, m_MainWindow.GetMachIniFile())
+      HolesDiameterWJTxBx.Text = LenToString(dVal, 2)
+      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_HOLES_OFFSETWJ, 0, m_MainWindow.GetMachIniFile())
+      HolesOffsetWJTxBx.Text = LenToString(dVal, 2)
+      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MIN_RADIUSWJ, 0, m_MainWindow.GetMachIniFile())
+      MinRadiusWJTxBx.Text = LenToString(dVal, 2)
+      OneHoleInCornerWJChBx.IsChecked = (GetPrivateProfileInt(S_MACH_NEST, K_MACH_DRILLINGWJ_ON_CORNERS, 1, m_MainWindow.GetMachIniFile()) <> 0)
    End Sub
 
-   Private Sub EnableFinalSawCutChBx_IsChecked() Handles EnableFinalSawCutChBx.Click
-      m_MainWindow.m_CurrentMachine.bEnableFinalSawCut = EnableFinalSawCutChBx.IsChecked
-      WritePrivateProfileString(S_MACH, K_ENABLEFINALSAWCUT, If(m_MainWindow.m_CurrentMachine.bEnableFinalSawCut, "1", "0"), m_MainWindow.GetMachIniFile())
-   End Sub
-
-   Private Sub FinalDepthTxBx_EgtClosed() Handles FinalDepthTxBx.EgtClosed
+   Private Sub CutExtraLenTxBx_EgtClosed(sender As Object, e As EventArgs) Handles CutExtraLenTxBx.EgtClosed
       Dim dVal As Double = 0
-      StringToLen(FinalDepthTxBx.Text, dVal)
-      m_MainWindow.m_CurrentMachine.dFinalDepth = dVal
-      WritePrivateProfileString(S_MACH, K_FINALDEPTH, DoubleToString(m_MainWindow.m_CurrentMachine.dFinalDepth, 3), m_MainWindow.GetMachIniFile())
+      StringToLen(CutExtraLenTxBx.Text, dVal)
+      WritePrivateProfileString(S_MACH_NEST, K_MACH_SAFE_LEN_CUT, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile())
+      EgtMdbSetGeneralParam(MCH_GP.EXTRALONCUTREG, dVal)
+      EgtMdbSave()
    End Sub
 
+   Private Sub AngleCutExtraLenTxBx_EgtClosed(sender As Object, e As EventArgs) Handles AngleCutExtraLenTxBx.EgtClosed
+      Dim dVal As Double = 0
+      StringToLen(AngleCutExtraLenTxBx.Text, dVal)
+      WritePrivateProfileString(S_MACH_NEST, K_MACH_SAFE_LEN_INTCORNER, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile())
+   End Sub
+
+   Private Sub ExtArcMinRadTxBx_EgtClosed(sender As Object, e As EventArgs) Handles ExtArcMinRadTxBx.EgtClosed
+      Dim dVal As Double = 0
+      StringToLen(ExtArcMinRadTxBx.Text, dVal)
+      WritePrivateProfileString(S_MACH_NEST, K_MACH_EXTARCMINRAD, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile())
+      EgtMdbSetGeneralParam(MCH_GP.EXTSAWARCMINRAD, dVal)
+      EgtMdbSave()
+   End Sub
+
+   Private Sub IntArcMaxSideAngTxBx_EgtClosed(sender As Object, e As EventArgs) Handles IntArcMaxSideAngTxBx.EgtClosed
+      Dim dVal As Double = 0
+      StringToDouble(IntArcMaxSideAngTxBx.Text, dVal)
+      WritePrivateProfileString(S_MACH_NEST, K_MACH_INTARCMAXSIDEANG, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile())
+      EgtMdbSetGeneralParam(MCH_GP.INTSAWARCMAXSIDEANG, dVal)
+      EgtMdbSave()
+   End Sub
+
+   Private Sub PreCutExitChBx_Click(sender As Object, e As RoutedEventArgs) Handles PreCutExitChBx.Click
+      If PreCutExitChBx.IsChecked Then
+         WritePrivateProfileString(S_MACH_NEST, K_MACH_PRECUTEXIT, "1", m_MainWindow.GetMachIniFile())
+      Else
+         WritePrivateProfileString(S_MACH_NEST, K_MACH_PRECUTEXIT, "0", m_MainWindow.GetMachIniFile())
+      End If
+   End Sub
+
+   Private Sub HolesOffsetTxBx_EgtClosed(sender As Object, e As EventArgs) Handles HolesOffsetTxBx.EgtClosed
+      Dim dVal As Double = 0
+      StringToLen(HolesOffsetTxBx.Text, dVal)
+      WritePrivateProfileString(S_MACH_NEST, K_MACH_HOLES_OFFSET, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile())
+      EgtMdbSetGeneralParam(MCH_GP.EXTRARONDRIREG, dVal)
+      EgtMdbSave()
+   End Sub
+
+   Private Sub HolesOverlapTxBx_EgtClosed(sender As Object, e As EventArgs) Handles HolesOverlapTxBx.EgtClosed
+      Dim dVal As Double = 0
+      StringToLen(HolesOverlapTxBx.Text, dVal)
+      WritePrivateProfileString(S_MACH_NEST, K_MACH_HOLES_OVERLAP, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile())
+   End Sub
+
+   Private Sub HolesToleranceTxBx_EgtClosed(sender As Object, e As EventArgs) Handles HolesToleranceTxBx.EgtClosed
+      Dim dVal As Double = 0
+      StringToLen(HolesToleranceTxBx.Text, dVal)
+      WritePrivateProfileString(S_MACH_NEST, K_MACH_HOLES_DIAMTOLER, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile())
+      EgtMdbSetGeneralParam(MCH_GP.HOLEDIAMTOLER, dVal)
+      EgtMdbSave()
+   End Sub
+
+   Private Sub OneHoleInCornerChBx_Click(sender As Object, e As RoutedEventArgs) Handles OneHoleInCornerChBx.Click
+      If OneHoleInCornerChBx.IsChecked() Then
+         WritePrivateProfileString(S_MACH_NEST, K_MACH_ONEHOLE_INTCORNER, "1", m_MainWindow.GetMachIniFile())
+      Else
+         WritePrivateProfileString(S_MACH_NEST, K_MACH_ONEHOLE_INTCORNER, "0", m_MainWindow.GetMachIniFile())
+      End If
+   End Sub
+
+   Private Sub CornerCutsChBx_Click(sender As Object, e As RoutedEventArgs) Handles CornerCutsChBx.Click
+      If CornerCutsChBx.IsChecked() Then
+         WritePrivateProfileString(S_MACH_NEST, K_MACH_MILLING_ON_CORNERS, "1", m_MainWindow.GetMachIniFile())
+      Else
+         WritePrivateProfileString(S_MACH_NEST, K_MACH_MILLING_ON_CORNERS, "0", m_MainWindow.GetMachIniFile())
+      End If
+   End Sub
+
+   Private Sub ShortTxBx_EgtClosed(sender As Object, e As EventArgs) Handles ShortTxBx.EgtClosed
+      Dim dVal As Double = 0
+      StringToLen(ShortTxBx.Text, dVal)
+      WritePrivateProfileString(S_MACH_NEST, K_MACH_MILLING_SHORTENING, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile())
+   End Sub
+
+   Private Sub InternalCutsChBx_Click(sender As Object, e As RoutedEventArgs) Handles InternalCutsChBx.Click
+      If InternalCutsChBx.IsChecked() Then
+         WritePrivateProfileString(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, "1", m_MainWindow.GetMachIniFile())
+      Else
+         WritePrivateProfileString(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, "0", m_MainWindow.GetMachIniFile())
+      End If
+   End Sub
+
+   ' -- INIZIO -- nuovi parametri per Rettifica angoli in sottosquadra WaterJet
+   Private Sub EnableRectificationChBx_Click(sender As Object, e As EventArgs) Handles EnableRectificationChBx.Click
+      If EnableRectificationChBx.IsChecked() Then
+         WritePrivateProfileString(S_MACH_NEST, K_MACH_RECTIFICATION_ON_SUBSQUARE, "1", m_MainWindow.GetMachIniFile)
+      Else
+         WritePrivateProfileString(S_MACH_NEST, K_MACH_RECTIFICATION_ON_SUBSQUARE, "0", m_MainWindow.GetMachIniFile)
+      End If
+   End Sub
+   ' --   FINE   -- nuovi parametri per Rettifica angoli in sottosquadra WaterJet
+
+   Private Sub WjIntCutsChBx_Click(sender As Object, e As RoutedEventArgs) Handles WjIntCutsChBx.Click
+      If WjIntCutsChBx.IsChecked() Then
+         WritePrivateProfileString(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, "1", m_MainWindow.GetMachIniFile())
+      Else
+         WritePrivateProfileString(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, "0", m_MainWindow.GetMachIniFile())
+      End If
+   End Sub
+
+   ' -- INIZIO -- nuovi parametri per prefori WaterJet
+   Private Sub HolesDiameterWJTxBx_Click(sender As Object, e As EventArgs) Handles HolesDiameterWJTxBx.EgtClosed
+      Dim dVal As Double = 0
+      StringToLen(HolesDiameterWJTxBx.Text, dVal)
+      WritePrivateProfileString(S_MACH_NEST, K_HOLES_DIAMITERWJ, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile())
+   End Sub
+
+   Private Sub HolesOffsetWJTxBx_Click(sender As Object, e As EventArgs) Handles HolesOffsetWJTxBx.EgtClosed
+      Dim dVal As Double = 0
+      StringToLen(HolesOffsetWJTxBx.Text, dVal)
+      WritePrivateProfileString(S_MACH_NEST, K_HOLES_OFFSETWJ, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile())
+   End Sub
+
+   Private Sub MinRadiusWJTxBx_Click(sender As Object, e As EventArgs) Handles MinRadiusWJTxBx.EgtClosed
+      Dim dVal As Double = 0
+      StringToLen(MinRadiusWJTxBx.Text, dVal)
+      WritePrivateProfileString(S_MACH_NEST, K_MIN_RADIUSWJ, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile())
+   End Sub
+
+   Private Sub OneHoleInCornerWJChBx_Click(sender As Object, e As EventArgs) Handles OneHoleInCornerWJChBx.Click
+      If OneHoleInCornerWJChBx.IsChecked() Then
+         WritePrivateProfileString(S_MACH_NEST, K_MACH_DRILLINGWJ_ON_CORNERS, "1", m_MainWindow.GetMachIniFile())
+      Else
+         WritePrivateProfileString(S_MACH_NEST, K_MACH_DRILLINGWJ_ON_CORNERS, "0", m_MainWindow.GetMachIniFile())
+      End If
+   End Sub
+   ' --   FINE   -- nuovi parametri per prefori WaterJet
+
 End Class
diff --git a/Machine/AlarmsPageUC.xaml b/Machine/AlarmsPageUC.xaml
index 3132e9b..11240e5 100644
--- a/Machine/AlarmsPageUC.xaml
+++ b/Machine/AlarmsPageUC.xaml
@@ -20,7 +20,6 @@
          <Grid.RowDefinitions>
             <RowDefinition Height="2*"/>
             <RowDefinition Height="0.5*"/>
-
             <RowDefinition Height="1.5*"/>
             <RowDefinition Height="0.5*"/>
             <RowDefinition Height="1*"/>
@@ -30,254 +29,7 @@
             <RowDefinition Height="1*"/>
          </Grid.RowDefinitions>
 
-         <!--Costruisco le riche per la colonna 3-->
-         <Grid Grid.Column="2" Grid.RowSpan="9">
-            <Grid.RowDefinitions>
-               <!--GruopBox: taglio lama-->
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-               <!--GruopBoxs: Fresatura/>Foratura/WaterJet-->
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="0.5*"/>
-               <!--GroupBox: vai ad Home-->
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="0.375*"/>
-            </Grid.RowDefinitions>
-
-            <!--Parametri Taglio Lama: 5 Parametri-->
-            <GroupBox Name="SawGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="2" Grid.RowSpan="4">
-               <!--definizione della grigli ainterna-->
-               <Grid>
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="2*"/>
-                     <ColumnDefinition Width="2*"/>
-                  </Grid.ColumnDefinitions>
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="0.5*"/>
-                     <RowDefinition Height="0.5*"/>
-                     <RowDefinition Height="0.5*"/>
-                     <RowDefinition Height="0.5*"/>
-                     <RowDefinition Height="0.5*"/>
-                  </Grid.RowDefinitions>
-
-                  <TextBlock Name="CutExtraLenTxBl" Grid.Column="0" Grid.Row="0"
-                             Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                  <EgtWPFLib:EgtTextBox Name="CutExtraLenTxBx" Grid.Column="1" Grid.Row="0" Margin="10,0,10,0"
-                                        Style="{DynamicResource OmagCut_CalculatorTextBox}" />
-
-                  <TextBlock Name="AngleCutExtraLenTxBl" Grid.Column="0" Grid.Row="1" 
-                             Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                  <EgtWPFLib:EgtTextBox Name="AngleCutExtraLenTxBx" Grid.Column="1" Grid.Row="1" Margin="10,0,10,0" IsLength="False"
-                                        Style="{DynamicResource OmagCut_CalculatorTextBox}" />
-
-                  <TextBlock Name="ExtArcMinRadTxBl" Grid.Column="0" Grid.Row="2"
-                             Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                  <EgtWPFLib:EgtTextBox Name="ExtArcMinRadTxBx" Grid.Column="1" Grid.Row="2" Margin="10,0,10,0"
-                                        Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-
-                  <TextBlock Name="IntArcMaxSideAngTxBl" Grid.Column="0" Grid.Row="3"
-                             Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                  <EgtWPFLib:EgtTextBox Name="IntArcMaxSideAngTxBx" Grid.Column="1" Grid.Row="3" Margin="10,0,10,0" IsLength="False"
-                                        Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-
-                  <TextBlock Name="PreCutExitTxBl" Grid.Column="0" Grid.Row="4"
-                             Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                  <CheckBox Name="PreCutExitChBx" Grid.Column="1" Grid.Row="4" Margin="10,0,10,0"
-                            Style="{DynamicResource OmagCut_CheckBox_Single}" 
-                            HorizontalAlignment="Right"/>
-
-               </Grid>
-
-            </GroupBox>
-
-            <Grid Grid.Column="2" Grid.Row="4" Grid.RowSpan="8">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition />
-                  <ColumnDefinition />
-               </Grid.ColumnDefinitions>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="*"/>
-                  <RowDefinition Height="*"/>
-                  <RowDefinition Height="0.5*"/>
-                  <RowDefinition Height="*"/>
-                  <RowDefinition Height="*"/>
-               </Grid.RowDefinitions>
-
-               <!--Parametri fori: 4 Parametri-->
-               <GroupBox Name="HolesGpBx" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" Grid.RowSpan="3" 
-                         Style="{DynamicResource OmagCut_GroupBox}">
-
-                  <Grid>
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="145*"/>
-                        <ColumnDefinition Width="23*"/>
-                        <ColumnDefinition Width="169*"/>
-                     </Grid.ColumnDefinitions>
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="0.5*"/>
-                        <RowDefinition Height="0.5*"/>
-                        <RowDefinition Height="0.5*"/>
-                        <RowDefinition Height="0.5*"/>
-                     </Grid.RowDefinitions>
-
-                     <TextBlock Name="HolesOffsetTxBl" Grid.Column="0" Grid.Row="0"
-                                Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="2" Margin="10,0,10,0"/>
-                     <EgtWPFLib:EgtTextBox Name="HolesOffsetTxBx" Grid.Column="2" Grid.Row="0" Margin="10,0,10,0"
-                                           Style="{DynamicResource OmagCut_CalculatorTextBox}" />
-
-                     <TextBlock Name="HolesOverlapTxBl" Grid.Column="0" Grid.Row="1"
-                                Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="2" Margin="10,0,10,0"/>
-                     <EgtWPFLib:EgtTextBox Name="HolesOverlapTxBx" Grid.Column="2" Grid.Row="1" Margin="10,0,10,0"
-                                           Style="{DynamicResource OmagCut_CalculatorTextBox}" />
-
-                     <TextBlock Name="HolesToleranceTxBl" Grid.Column="0" Grid.Row="2"
-                                Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="2" Margin="10,0,10,0"/>
-                     <EgtWPFLib:EgtTextBox Name="HolesToleranceTxBx" Grid.Column="2" Grid.Row="2" Margin="10,0,10,0"
-                                           Style="{DynamicResource OmagCut_CalculatorTextBox}" />
-
-                     <TextBlock Name="OneHoleInCornerTxBl" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="3"
-                                Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="10,0,10,0" />
-                     <CheckBox Name="OneHoleInCornerChBx" Grid.Column="2" Grid.Row="3" 
-                               Style="{DynamicResource OmagCut_CheckBox_Single}"
-                               HorizontalAlignment="Right" Margin="10,0,10,0"/>
-
-                  </Grid>
-
-               </GroupBox>
-
-               <!--Parametri Fresatura: 3 Parametri-->
-               <GroupBox Name="MillingsParamGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="2" Grid.RowSpan="2">
-                  <Grid Grid.Column="3" Grid.Row="2">
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="2*"/>
-                        <ColumnDefinition Width="2*"/>
-                     </Grid.ColumnDefinitions>
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="*"/>
-                     </Grid.RowDefinitions>
-
-                     <TextBlock Name="CornerCutsTxBl" Grid.Row="0" Grid.ColumnSpan="2"
-                                Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
-                     <CheckBox Name="CornerCutsChBx" Grid.Row="0" Grid.ColumnSpan="2" 
-                               Style="{DynamicResource OmagCut_CheckBox_Single}"
-                               HorizontalAlignment="Right" Margin="0,0,10,0"/>
-
-                     <TextBlock Name="InternalCutsTxBl" Grid.Row="1" Grid.ColumnSpan="2"
-                                Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="10,0,0,10" VerticalAlignment="Bottom" />
-                     <CheckBox Name="InternalCutsChBx" Grid.Row="1" Grid.ColumnSpan="2" 
-                               Style="{DynamicResource OmagCut_CheckBox_Single}"
-                               HorizontalAlignment="Right" Margin="0,0,10,0"/>
-
-                     <TextBlock Name="ShortTxBl" Grid.Column="0" Grid.Row="2"
-                                Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                     <EgtWPFLib:EgtTextBox Name="ShortTxBx" Grid.Column="1" Grid.Row="2" Margin="10,0,10,0"
-                                           Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-
-                  </Grid>
-
-               </GroupBox>
-
-               <!--Parametri rettifica tagli sottosquadra: 1 Parametro -->
-               <GroupBox Name="RectificationWJParamGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="2" >
-                  <Grid Grid.Column="3" Grid.Row="2">
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="2*"/>
-                        <ColumnDefinition Width="2*"/>
-                     </Grid.ColumnDefinitions>
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="*"/>
-                     </Grid.RowDefinitions>
-
-                     <TextBlock Name="EnableRectificationTxBl" Grid.Row="0" Grid.ColumnSpan="2"
-                                Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
-                     <CheckBox Name="EnableRectificationChBx" Grid.Row="0" Grid.ColumnSpan="2" 
-                               Style="{DynamicResource OmagCut_CheckBox_Single}"
-                               HorizontalAlignment="Right" Margin="0,0,10,0"/>
-
-                     <!--<TextBlock Name="OffsetRectificationTxBl" Grid.Row="1" Grid.Column="0" 
-                                  Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                       <EgtWPFLib:EgtTextBox Name="OffsetRectificationTxBx" Grid.Row="1" Grid.Column="1" Margin="10,0,10,0"
-                                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>-->
-
-                  </Grid>
-
-               </GroupBox>
-
-               <!--Parametri WaterJet: 5 Parametro (se questo GroupBox attivo allora nascondo Fori/Fresatura)-->
-               <GroupBox Name="WjsParamGpBx" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" Grid.RowSpan="4" 
-                         Style="{DynamicResource OmagCut_GroupBox}">
-                  <Grid Grid.Column="3" Grid.Row="2">
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="145*"/>
-                        <ColumnDefinition Width="23*"/>
-                        <ColumnDefinition Width="169*"/>
-                     </Grid.ColumnDefinitions>
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="0.5*"/>
-                        <RowDefinition Height="0.5*"/>
-                        <RowDefinition Height="0.5*"/>
-                        <RowDefinition Height="0.5*"/>
-                        <RowDefinition Height="0.5*"/>
-                     </Grid.RowDefinitions>
-
-                     <TextBlock Name="WjIntCutsTxBl" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="3"
-                                Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="10,0,10,0" />
-                     <CheckBox Name="WjIntCutsChBx" Grid.Column="2" Grid.Row="0" 
-                               Style="{DynamicResource OmagCut_CheckBox_Single}"
-                               HorizontalAlignment="Right" Margin="10,0,10,0"/>
-
-                     <TextBlock Name="HolesDiameterWJTxBl" Grid.Column="0" Grid.Row="1"
-                                Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="2" Margin="10,0,10,0"/>
-                     <EgtWPFLib:EgtTextBox Name="HolesDiameterWJTxBx" Grid.Column="2" Grid.Row="1" Margin="10,0,10,0"
-                                           Style="{DynamicResource OmagCut_CalculatorTextBox}" />
-
-                     <TextBlock Name="HolesOffsetWJTxBl" Grid.Column="0" Grid.Row="2"
-                                Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="2" Margin="10,0,10,0"/>
-                     <EgtWPFLib:EgtTextBox Name="HolesOffsetWJTxBx" Grid.Column="2" Grid.Row="2" Margin="10,0,10,0"
-                                           Style="{DynamicResource OmagCut_CalculatorTextBox}" />
-
-                     <TextBlock Name="MinRadiusWJTxBl" Grid.Column="0" Grid.Row="3"
-                                Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="2" Margin="10,0,10,0"/>
-                     <EgtWPFLib:EgtTextBox Name="MinRadiusWJTxBx" Grid.Column="2" Grid.Row="3" Margin="10,0,10,0"
-                                           Style="{DynamicResource OmagCut_CalculatorTextBox}" />
-
-                     <TextBlock Name="OneHoleInCornerWJTxBl" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="3"
-                                Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="10,0,10,0" />
-                     <CheckBox Name="OneHoleInCornerWJChBx" Grid.Column="2" Grid.Row="4" 
-                               Style="{DynamicResource OmagCut_CheckBox_Single}"
-                               HorizontalAlignment="Right" Margin="10,0,10,0"/>
-
-
-                  </Grid>
-               </GroupBox>
-
-            </Grid>
-
-            <!--Parametri Taglio diretto: 1 Parametro-->
-            <GroupBox Name="DirectCutsParamGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="2" Grid.Row="12" Grid.RowSpan="2">
-               <Grid>
-                  <TextBlock Name="FinalHomeTxBl"
-                             Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
-                  <CheckBox Name="FinalHomeChBx"
-                            Style="{DynamicResource OmagCut_CheckBox_Single}"
-                            HorizontalAlignment="Right" Margin="0,0,10,0"/>
-               </Grid>
-
-            </GroupBox>
-
-         </Grid>
-
-         <Grid Grid.RowSpan="3">
+         <Grid Grid.RowSpan="3" Margin="6,0,6,0">
             <Grid.RowDefinitions>
                <RowDefinition Height="1.75*"/>
                <RowDefinition Height="0.5*"/>
@@ -492,7 +244,7 @@
 
          </Grid>-->
 
-         <GroupBox Name="MaterialsGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="0"
+         <GroupBox Name="MaterialsGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="0" Margin="5,0,5,0"
                    Grid.Row="3" Grid.ColumnSpan="1" Grid.RowSpan="5">
 
             <Grid>
@@ -524,7 +276,7 @@
 
          </GroupBox>
 
-         <GroupBox Name="MachiningsGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="1"
+         <GroupBox Name="MachiningsGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="1" Margin="0,0,5,0"
                    Grid.Row="0" Grid.ColumnSpan="1" Grid.RowSpan="3">
 
             <ScrollViewer VerticalScrollBarVisibility="Visible" Visibility="Visible"
@@ -639,7 +391,7 @@
 
          </GroupBox>-->
 
-         <Grid Grid.Column="1" Grid.Row="3" Grid.RowSpan="3">
+         <Grid Grid.Column="1" Grid.Row="3" Grid.RowSpan="3" Margin="0,0,5,0" >
             <Grid.ColumnDefinitions>
                <ColumnDefinition />
                <ColumnDefinition />
@@ -651,36 +403,29 @@
                <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
 
-            <GroupBox Name="MachineParamGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" Grid.RowSpan="2">
-               <Grid Grid.Column="2" Grid.Row="1">
+            <GroupBox Name="MachineParamGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" Grid.RowSpan="4">
+               <Grid>
                   <Grid.ColumnDefinitions>
                      <ColumnDefinition Width="2*"/>
                      <ColumnDefinition Width="2*"/>
                   </Grid.ColumnDefinitions>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="2*"/>
+                     <RowDefinition Height="2*"/>
+                  </Grid.RowDefinitions>
 
                   <TextBlock Name="SafeZTxBl" Grid.Column="0"
                              Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
                   <EgtWPFLib:EgtTextBox Name="SafeZTxBx" Grid.Column="1" Margin="10,0,10,0"
                                         Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-               </Grid>
 
-            </GroupBox>
-
-            <Border Style="{DynamicResource OmagCut_NoNameGroupBorder}" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2" Grid.RowSpan="2">
-               <Grid >
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="2*"/>
-                     <ColumnDefinition Width="2*"/>
-                  </Grid.ColumnDefinitions>
-
-                  <TextBlock Name="AdditionalTableTxBl" Grid.Column="0"
+                  <TextBlock Name="AdditionalTableTxBl" Grid.Row="1"
                              Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
-                  <EgtWPFLib:EgtTextBox Name="AdditionalTableTxBx" Grid.Column="1" Margin="10,0,10,0"
+                  <EgtWPFLib:EgtTextBox Name="AdditionalTableTxBx" Grid.Column="1" Grid.Row="1" Margin="10,0,10,0"
                                         Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
                </Grid>
 
-            </Border>
-
+            </GroupBox>
          </Grid>
 
          <!--<GroupBox Name="DirectCutsParamGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="2" Grid.Row="8">
@@ -693,7 +438,8 @@
 
          </GroupBox>-->
 
-         <GroupBox Name="NestingParamGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="1" Grid.Row="6" Grid.RowSpan="3">
+         <GroupBox Name="NestingParamGpBx" Margin="0,0,5,0"
+                   Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="1" Grid.Row="6" Grid.RowSpan="3">
             <Grid Name="NestingGrid">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="2*"/>
@@ -736,7 +482,8 @@
 
          </GroupBox>
 
-         <GroupBox Name="AutoRawImageParamGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="3" Grid.Row="0" Grid.RowSpan="2">
+         <GroupBox Name="AutoRawImageParamGpBx" Margin="0,0,5,0"
+                   Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="3" Grid.Row="0" Grid.RowSpan="2">
             <Grid>
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="2*"/>
@@ -773,8 +520,9 @@
 
          </GroupBox>
 
-         <GroupBox Name="CutFredGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="3"
-                   Grid.Row="2" Grid.RowSpan="1">
+         <GroupBox Name="CutFredGpBx" Margin="0,0,5,0"
+                   Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="2"
+                   Grid.Row="0" Grid.RowSpan="1">
             <Grid>
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="2*"/>
@@ -798,8 +546,8 @@
          </GroupBox>
 
          <!--Incisioni-->
-         <GroupBox Name="TopMillGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="3"
-                   Grid.Row="3" Grid.RowSpan="3">
+         <GroupBox Name="TopMillGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="2" Margin="0,0,5,0"
+                   Grid.Row="1" Grid.RowSpan="3">
             <Grid>
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="2*"/>
@@ -831,8 +579,36 @@
 
          </GroupBox>
 
+         <GroupBox Name="FinalSawCutGpBx" Grid.Column="2" Grid.Row="4" Grid.RowSpan="2" Margin="0,0,5,0"
+                   Style="{DynamicResource OmagCut_GroupBox}">
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="2*"/>
+                  <ColumnDefinition Width="2*"/>
+               </Grid.ColumnDefinitions>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="0.5*"/>
+                  <RowDefinition Height="0.5*"/>
+               </Grid.RowDefinitions>
 
-         <Border  Name="SideAngCutProbeGpBx" Style="{DynamicResource OmagCut_NoNameGroupBorder}" Grid.Column="3" Grid.Row="6">
+               <TextBlock Name="EnableFinalSawCutTxBl" Grid.Column="0" Grid.Row="0"
+                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+               <CheckBox Name="EnableFinalSawCutChBx" Grid.Column="1" Grid.Row="0" Margin="10,0,10,0"
+                         Style="{StaticResource OmagCut_CheckBox_Single}" 
+                         HorizontalAlignment="Right"/>
+
+               <TextBlock Name="FinalDepthTxBl" Grid.Column="0" Grid.Row="1"
+                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+               <EgtWPFLib:EgtTextBox Name="FinalDepthTxBx" Grid.Column="1" Grid.Row="1" Margin="10,0,10,0"
+                                     Style="{DynamicResource OmagCut_CalculatorTextBox}" />
+
+
+
+            </Grid>
+         </GroupBox>
+
+         <GroupBox Name="SideAngCutProbeGpBx" Margin="0,0,5,0"
+                   Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="3" Grid.Row="2">
             <Grid >
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="2*"/>
@@ -846,9 +622,11 @@
                          HorizontalAlignment="Right" Margin="0,0,10,0"/>
             </Grid>
 
-         </Border>
+         </GroupBox>
 
-         <Border Name="WashingGpBx" Style="{DynamicResource OmagCut_NoNameGroupBorder}" Grid.Column="3" Grid.Row="7">
+         <GroupBox Name="WashingGpBx" Margin="0,0,5,0"
+                   Style="{DynamicResource OmagCut_GroupBox}" 
+                   Grid.Column="3" Grid.Row="3" Grid.RowSpan="2">
             <Grid >
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="2*"/>
@@ -862,10 +640,11 @@
                          HorizontalAlignment="Right" Margin="0,0,10,0"/>
             </Grid>
 
-         </Border>
+         </GroupBox>
 
          <!--Cornici-->
-         <GroupBox Name="FrameGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="3" Grid.Row="8">
+         <GroupBox Name="FrameGpBx" Margin="0,0,5,0"
+                   Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="3" Grid.Row="5" Grid.RowSpan="2">
             <Grid >
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="2*"/>
@@ -881,7 +660,20 @@
 
          </GroupBox>
 
-         <Grid Grid.Column="0" Grid.Row="8">
+         <!--Parametri Taglio diretto: 1 Parametro-->
+         <GroupBox Name="DirectCutsParamGpBx" Margin="0,0,5,0"
+                   Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="3" Grid.Row="7">
+            <Grid>
+               <TextBlock Name="FinalHomeTxBl"
+                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
+               <CheckBox Name="FinalHomeChBx"
+                         Style="{DynamicResource OmagCut_CheckBox_Single}"
+                         HorizontalAlignment="Right" Margin="0,0,10,0"/>
+            </Grid>
+
+         </GroupBox>
+
+         <Grid Grid.Column="0" Grid.Row="8" Margin="0,0,5,0">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="2.5*"/>
                <ColumnDefinition Width="2.5*"/>
diff --git a/Machine/AlarmsPageUC.xaml.vb b/Machine/AlarmsPageUC.xaml.vb
index f3ae7c9..f1558a7 100644
--- a/Machine/AlarmsPageUC.xaml.vb
+++ b/Machine/AlarmsPageUC.xaml.vb
@@ -62,45 +62,19 @@ Public Class AlarmsPageUC
       CurrCupWheelTxBl.Text = EgtMsg(91070)                              ' Scasso corrente
       CurrMillTxBl.Text = EgtMsg(90904)                                  ' Fresa corrente
       CurrWJetTxBl.Text = EgtMsg(90900)                                  ' Waterjet corrente
-      HolesOffsetTxBl.Text = EgtMsg(90909)                               ' Offset fori
-      HolesOverlapTxBl.Text = EgtMsg(90910)                              ' Sovrapp. fori
-      HolesToleranceTxBl.Text = EgtMsg(90911)                            ' Tolleranza fori
-      OneHoleInCornerTxBl.Text = EgtMsg(90926)                           ' Un solo foro in angolo
-      CutExtraLenTxBl.Text = EgtMsg(90906)                               ' Sicurezza tagli
-      AngleCutExtraLenTxBl.Text = EgtMsg(90907)                          ' Sicur. angoli
       CompleteCutsTxBl.Text = EgtMsg(90908)                              ' Rispetta i tagli completi
       SafeZTxBl.Text = EgtMsg(90905)                                     ' Z Sicura
       MaterialsGpBx.Header = EgtMsg(90913)                               ' Materiali
       NewMatBtn.Content = EgtMsg(90914)                                  ' Aggiungi
       RemoveMatBtn.Content = EgtMsg(90915)                               ' Rimuovi
       SetUpGpBx.Header = EgtMsg(90916)                                   ' Utensili correnti
-      HolesGpBx.Header = EgtMsg(90917)                                   ' Parametri fori
-      ExtArcMinRadTxBl.Text = EgtMsg(90918)                              ' Rmin archi est.
-      IntArcMaxSideAngTxBl.Text = EgtMsg(90924)                          ' Amax archi int.
-      PreCutExitTxBl.Text = EgtMsg(91065)                                ' PreTaglio uscite
       MachineParamGpBx.Header = EgtMsg(90919)                            ' Parametri macchina
-      SawGpBx.Header = EgtMsg(90925)                                     ' Parametri lama
       DirectCutsParamGpBx.Header = EgtMsg(90927)                         ' Tagli diretti
       FinalHomeTxBl.Text = EgtMsg(90928)                                 ' Home finale
-      MillingsParamGpBx.Header = EgtMsg(90929)                           ' Parametri fresature
-      CornerCutsTxBl.Text = EgtMsg(90944)                                ' Sempre sugli angoli
-      InternalCutsTxBl.Text = EgtMsg(90930)                              ' Sempre sugli interni
-      ShortTxBl.Text = EgtMsg(90949)                                     ' Accorciamento
-      TopMillGpBx.Header = EgtMsg( 91061)                                ' Parametri incisioni
+      TopMillGpBx.Header = EgtMsg(91061)                                ' Parametri incisioni
       TmEnableTxBl.Text = EgtMsg( 91062)                                 ' Con fresa
       TmDepthTxBl.Text = EgtMsg( 91063)                                  ' Profondità
       TmWidthTxBl.Text = EgtMsg( 91064)                                  ' Larghezza
-      WJsParamGpBx.Header = EgtMsg( 91058)                               ' Parametri waterjet
-      WjIntCutsTxBl.Text = EgtMsg(90930)                                 ' Sempre sugli interni
-      '-- INIZIO -- nuovi parametri per preforo lavello
-      HolesDiameterWJTxBl.Text = EgtMsg(91044)                           ' Diametro
-      HolesOffsetWJTxBl.Text = EgtMsg(91045)                             ' Offset
-      MinRadiusWJTxBl.Text = EgtMsg(91046)                               ' Raggio Minimo
-      OneHoleInCornerWJTxBl.Text = EgtMsg(90926)                         ' Un solo foro in angolo
-      '-- INIZIO -- nuovi parametro Rettifica tagli sottosquadra WJ
-      RectificationWJParamGpBx.Header = EgtMsg(91047)                    ' Rettifica
-      EnableRectificationTxBl.Text = EgtMsg(91048)                       ' Abilita (sottosquadra)
-      '--  FINE  -- nuovi parametro Rettifica tagli sottosquadra WJ
       NestingParamGpBx.Header = EgtMsg(90931)                            ' Nesting
       AlignTxBl.Text = EgtMsg(90932)                                     ' Allineato
       GhigliottinaTxBl.Text = EgtMsg(91066)                              ' Ghigliottina
@@ -113,8 +87,6 @@ Public Class AlarmsPageUC
       BackImageBtn.Content = EgtMsg(90938)                               ' Sfondo
       ThresholdTxBl.Text = EgtMsg(90939)                                 ' Soglia
       ToleranceTxBl.Text = EgtMsg(90940)                                 ' Tolleranza
-      WashingTxBl.Text = EgtMsg(90941)                                   ' Lavaggio
-      SideAngCutProbeTxBl.Text = EgtMsg(90950)                           ' Tastatura tagli inclinati
       CutFredGpBx.Header = EgtMsg(90946)                                 ' Tagli Feed inizio/fine
       CfrLenTxBl.Text = EgtMsg(90947)                                    ' Lunghezza
       CfrPercTxBl.Text = EgtMsg(90948)                                   ' Riduzione %
@@ -130,16 +102,20 @@ Public Class AlarmsPageUC
       FrameGpBx.Header = EgtMsg(91068)                                   ' Cornici
       FramePauseTxBl.Text = EgtMsg(91067)                                ' Inserisci pausa
       UseLaserOriginTxBl.Text = EgtMsg(91129)                            ' Usa laser per origine
+      SideAngCutProbeGpBx.Header = EgtMsg(90950)                         ' Tastatura
+      SideAngCutProbeTxBl.Text = EgtMsg(90950)                           ' Tastatura tagli inclinati
+      WashingGpBx.Header = EgtMsg(90941)                                 ' Lavaggio
+      WashingTxBl.Text = EgtMsg(90941)                                   ' Lavaggio
+      FinalSawCutGpBx.Header = EgtMsg(91254)                             ' Taglio Finale
+      EnableFinalSawCutTxBl.Text = EgtMsg(91255)                         ' Abilita
+      FinalDepthTxBl.Text = EgtMsg(91256)                                ' Ultimo Spessore
       AutoRawImageParamGpBx.Visibility = Windows.Visibility.Hidden
    End Sub
 
    Private Sub AlarmsPage_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
-
       If m_bFirst Then
-
          ' in assenza dell'uscita H1 nascondo i parametri lama
          If EgtGetHeadId("H1") = GDB_ID.NULL Then
-            SawGpBx.Visibility = Visibility.Hidden
             TopMillGpBx.Visibility = Visibility.Hidden
             CurrSawTxBl.Visibility = Visibility.Hidden
             CurrSawCmBx.Visibility = Visibility.Hidden
@@ -157,31 +133,18 @@ Public Class AlarmsPageUC
                CurrToolsGrid.RowDefinitions.Add(EndRow)
                SetUpGpBx.SetValue(Grid.RowSpanProperty, 1)
                ' Disattivo il gruppo dei parametri fori
-               HolesGpBx.Visibility = Windows.Visibility.Hidden
             Case CurrentMachine.MountedToolConfigs.SAWANDAUXTOOL
             'Non faccio alcunchè
             Case CurrentMachine.MountedToolConfigs.MANUALTOOLCHANGER, CurrentMachine.MountedToolConfigs.TOOLCHANGER, CurrentMachine.MountedToolConfigs.TOOLCHANGERWITHSAW
                'Da implementare
          End Select
 
-         ' Se non previste forature, disabilito relativo box
-         If Not m_CurrentMachine.bDrilling Then
-            HolesGpBx.Visibility = Visibility.Hidden
-         End If
-
          ' Se non previste fresature, disabilito relativo box e uso fresa con incisione
          If Not m_CurrentMachine.bMilling Then
-            MillingsParamGpBx.Visibility = Visibility.Hidden
             TmEnableChBx.IsEnabled = False
             TmEnableChBx.IsChecked = False
          End If
 
-         ' Se non previsti tagli waterjet, disabilito relativo box
-         If Not m_CurrentMachine.bWaterJetting Then
-            WjsParamGpBx.Visibility = Visibility.Hidden
-            RectificationWJParamGpBx.Visibility = Visibility.Hidden
-         End If
-
          ' Abilitazione box per contorni grezzo da foto
          If m_MainWindow.m_Camera.GetCalcContour() Then
             AutoRawImageParamGpBx.Visibility = Windows.Visibility.Visible
@@ -353,71 +316,12 @@ Public Class AlarmsPageUC
 
       ' Leggo offset fori
       Dim dVal As Double
-      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_HOLES_OFFSET, 0, m_MainWindow.GetMachIniFile())
-      EgtMdbSetGeneralParam(MCH_GP.EXTRARONDRIREG, dVal)
-      HolesOffsetTxBx.Text = LenToString(dVal, 2)
-      ' Leggo sovrapposizione fori
-      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_HOLES_OVERLAP, 0, m_MainWindow.GetMachIniFile())
-      HolesOverlapTxBx.Text = LenToString(dVal, 2)
-      ' Leggo tolleranza diametro fori
-      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_HOLES_DIAMTOLER, 0, m_MainWindow.GetMachIniFile())
-      EgtMdbSetGeneralParam(MCH_GP.HOLEDIAMTOLER, dVal)
-      HolesToleranceTxBx.Text = LenToString(dVal, 2)
-      ' Leggo un solo foro in corner
-      OneHoleInCornerChBx.IsChecked =
-             (GetPrivateProfileInt(S_MACH_NEST, K_MACH_ONEHOLE_INTCORNER, 0, m_MainWindow.GetMachIniFile()) <> 0)
-      ' Leggo sicurezza su tagli
-      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_SAFE_LEN_CUT, 0, m_MainWindow.GetMachIniFile())
-      EgtMdbSetGeneralParam(MCH_GP.EXTRALONCUTREG, dVal)
-      CutExtraLenTxBx.Text = LenToString(dVal, 2)
-      ' Leggo sicurezza su tagli in angoli interni
-      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_SAFE_LEN_INTCORNER, 0, m_MainWindow.GetMachIniFile())
-      AngleCutExtraLenTxBx.Text = LenToString(dVal, 2)
       ' Leggo distanza di sicurezza
       dVal = 0
       EgtMdbGetGeneralParam(MCH_GP.SAFEZ, dVal)
       SafeZTxBx.Text = LenToString(dVal, 2)
-      ' Leggo raggio minimo arco esterno
-      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_EXTARCMINRAD, 200, m_MainWindow.GetMachIniFile())
-      EgtMdbSetGeneralParam(MCH_GP.EXTSAWARCMINRAD, dVal)
-      ExtArcMinRadTxBx.Text = LenToString(dVal, 2)
-      ' Leggo se PreCutExit attivo (per taglio ceramico)
-      Dim nPreCutExit As Integer = GetPrivateProfileInt(S_MACH_NEST, K_MACH_PRECUTEXIT, -1, m_MainWindow.GetMachIniFile())
-      If nPreCutExit = -1 Then
-         PreCutExitTxBl.Visibility = Visibility.Hidden
-         PreCutExitChBx.Visibility = Visibility.Hidden
-      Else
-         PreCutExitChBx.IsChecked = ( nPreCutExit <> 0)
-      End If
-      ' Leggo angolo di fianco massimo arco interno
-      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_INTARCMAXSIDEANG, 45, m_MainWindow.GetMachIniFile())
-      EgtMdbSetGeneralParam(MCH_GP.INTSAWARCMAXSIDEANG, dVal)
-      IntArcMaxSideAngTxBx.Text = DoubleToString(dVal, 2)
       ' Salvo DB lavorazioni con aggiornamenti parametri generali
       EgtMdbSave()
-      ' Leggo lavorazione angoli con fresa
-      CornerCutsChBx.IsChecked =
-         (GetPrivateProfileInt(S_MACH_NEST, K_MACH_MILLING_ON_CORNERS, 1, m_MainWindow.GetMachIniFile()) <> 0)
-      ' Leggo lavorazione interni con fresa
-      InternalCutsChBx.IsChecked =
-         (GetPrivateProfileInt(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, 0, m_MainWindow.GetMachIniFile()) <> 0)
-      WjIntCutsChBx.IsChecked =
-         (GetPrivateProfileInt(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, 0, m_MainWindow.GetMachIniFile()) <> 0)
-      ' Lavorazione preforo lavello con WaterJet
-      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_HOLES_DIAMITERWJ, 0, m_MainWindow.GetMachIniFile())
-      HolesDiameterWJTxBx.Text = LenToString(dVal, 2)
-      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_HOLES_OFFSETWJ, 0, m_MainWindow.GetMachIniFile())
-      HolesOffsetWJTxBx.Text = LenToString(dVal, 2)
-      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MIN_RADIUSWJ, 0, m_MainWindow.GetMachIniFile())
-      MinRadiusWJTxBx.Text = LenToString(dVal, 2)
-      OneHoleInCornerWJChBx.IsChecked =
-         (GetPrivateProfileInt(S_MACH_NEST, K_MACH_DRILLINGWJ_ON_CORNERS, 1, m_MainWindow.GetMachIniFile()) <> 0)
-      ' leggo se attiva la rettifica degli angoli per WaterJet
-      EnableRectificationChBx.IsChecked =
-         (GetPrivateProfileInt(S_MACH_NEST, K_MACH_RECTIFICATION_ON_SUBSQUARE, 0, m_MainWindow.GetMachIniFile()) <> 0)
-      ' Leggo accorciamento angoli con fresa
-      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_MILLING_SHORTENING, 0, m_MainWindow.GetMachIniFile())
-      ShortTxBx.Text = LenToString(dVal, 2)
       ' Leggo flag abilitazione incisioni con fresa
       TmEnableChBx.IsChecked =
              (GetPrivateProfileInt(S_MACH_NEST, K_MACH_ENGRAVING_WITHMILL, 1, m_MainWindow.GetMachIniFile()) <> 0)
@@ -483,6 +387,8 @@ Public Class AlarmsPageUC
          UseLaserOriginChBx.IsChecked = (nUseLaserOrigin <> 0)
       End If
 
+      EnableFinalSawCutChBx.IsChecked = m_MainWindow.m_CurrentMachine.bEnableFinalSawCut
+      FinalDepthTxBx.Text = m_MainWindow.m_CurrentMachine.dFinalDepth
    End Sub
 
    ' aggiorna le text delle lavorazioni (la selezione avviene nella pagina del grezzo o dalla pagina del progetto corrente)
@@ -925,50 +831,6 @@ Public Class AlarmsPageUC
       m_MainWindow.m_MachinePageUC.MachinePageGrid.Children.Add(m_SetUpPage)
    End Sub
 
-   Private Sub HolesOffsetTxBx_EgtClosed(sender As Object, e As EventArgs) Handles HolesOffsetTxBx.EgtClosed
-      Dim dVal As Double = 0
-      StringToLen(HolesOffsetTxBx.Text, dVal)
-      WritePrivateProfileString(S_MACH_NEST, K_MACH_HOLES_OFFSET, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile())
-      EgtMdbSetGeneralParam(MCH_GP.EXTRARONDRIREG, dVal)
-      EgtMdbSave()
-   End Sub
-
-   Private Sub HolesOverlapTxBx_EgtClosed(sender As Object, e As EventArgs) Handles HolesOverlapTxBx.EgtClosed
-      Dim dVal As Double = 0
-      StringToLen(HolesOverlapTxBx.Text, dVal)
-      WritePrivateProfileString(S_MACH_NEST, K_MACH_HOLES_OVERLAP, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile())
-   End Sub
-
-   Private Sub HolesToleranceTxBx_EgtClosed(sender As Object, e As EventArgs) Handles HolesToleranceTxBx.EgtClosed
-      Dim dVal As Double = 0
-      StringToLen(HolesToleranceTxBx.Text, dVal)
-      WritePrivateProfileString(S_MACH_NEST, K_MACH_HOLES_DIAMTOLER, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile())
-      EgtMdbSetGeneralParam(MCH_GP.HOLEDIAMTOLER, dVal)
-      EgtMdbSave()
-   End Sub
-
-   Private Sub OneHoleInCornerChBx_Click(sender As Object, e As RoutedEventArgs) Handles OneHoleInCornerChBx.Click
-      If OneHoleInCornerChBx.IsChecked() Then
-         WritePrivateProfileString(S_MACH_NEST, K_MACH_ONEHOLE_INTCORNER, "1", m_MainWindow.GetMachIniFile())
-      Else
-         WritePrivateProfileString(S_MACH_NEST, K_MACH_ONEHOLE_INTCORNER, "0", m_MainWindow.GetMachIniFile())
-      End If
-   End Sub
-
-   Private Sub CutExtraLenTxBx_EgtClosed(sender As Object, e As EventArgs) Handles CutExtraLenTxBx.EgtClosed
-      Dim dVal As Double = 0
-      StringToLen(CutExtraLenTxBx.Text, dVal)
-      WritePrivateProfileString(S_MACH_NEST, K_MACH_SAFE_LEN_CUT, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile())
-      EgtMdbSetGeneralParam(MCH_GP.EXTRALONCUTREG, dVal)
-      EgtMdbSave()
-   End Sub
-
-   Private Sub AngleCutExtraLenTxBx_EgtClosed(sender As Object, e As EventArgs) Handles AngleCutExtraLenTxBx.EgtClosed
-      Dim dVal As Double = 0
-      StringToLen(AngleCutExtraLenTxBx.Text, dVal)
-      WritePrivateProfileString(S_MACH_NEST, K_MACH_SAFE_LEN_INTCORNER, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile())
-   End Sub
-
    Private Sub SafeZTxBx_EgtClosed(sender As Object, e As EventArgs) Handles SafeZTxBx.EgtClosed
       Dim dSafeZ As Double = 0
       StringToLen(SafeZTxBx.Text, dSafeZ)
@@ -976,30 +838,6 @@ Public Class AlarmsPageUC
       EgtMdbSave()
    End Sub
 
-   Private Sub ExtArcMinRadTxBx_EgtClosed(sender As Object, e As EventArgs) Handles ExtArcMinRadTxBx.EgtClosed
-      Dim dVal As Double = 0
-      StringToLen(ExtArcMinRadTxBx.Text, dVal)
-      WritePrivateProfileString(S_MACH_NEST, K_MACH_EXTARCMINRAD, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile())
-      EgtMdbSetGeneralParam(MCH_GP.EXTSAWARCMINRAD, dVal)
-      EgtMdbSave()
-   End Sub
-
-   Private Sub IntArcMaxSideAngTxBx_EgtClosed(sender As Object, e As EventArgs) Handles IntArcMaxSideAngTxBx.EgtClosed
-      Dim dVal As Double = 0
-      StringToDouble(IntArcMaxSideAngTxBx.Text, dVal)
-      WritePrivateProfileString(S_MACH_NEST, K_MACH_INTARCMAXSIDEANG, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile())
-      EgtMdbSetGeneralParam(MCH_GP.INTSAWARCMAXSIDEANG, dVal)
-      EgtMdbSave()
-   End Sub
-
-   Private Sub PreCutExitChBx_Click(sender As Object, e As RoutedEventArgs) Handles PreCutExitChBx.Click
-      If PreCutExitChBx.IsChecked Then
-         WritePrivateProfileString(S_MACH_NEST, K_MACH_PRECUTEXIT, "1", m_MainWindow.GetMachIniFile())
-      Else
-         WritePrivateProfileString(S_MACH_NEST, K_MACH_PRECUTEXIT, "0", m_MainWindow.GetMachIniFile())
-      End If
-   End Sub
-
    Private Sub CompleteCutsChBx_Click(sender As Object, e As RoutedEventArgs) Handles CompleteCutsChBx.Click
       Dim NestPage As NestPageUC = m_MainWindow.m_CadCutPageUC.m_NestPage
       If CompleteCutsChBx.IsChecked() Then
@@ -1025,74 +863,6 @@ Public Class AlarmsPageUC
       AdjustGhigliottinaTextOnAutomaticOrCompleteCuts()
    End Sub
 
-   Private Sub CornerCutsChBx_Click(sender As Object, e As RoutedEventArgs) Handles CornerCutsChBx.Click
-      If CornerCutsChBx.IsChecked() Then
-         WritePrivateProfileString(S_MACH_NEST, K_MACH_MILLING_ON_CORNERS, "1", m_MainWindow.GetMachIniFile())
-      Else
-         WritePrivateProfileString(S_MACH_NEST, K_MACH_MILLING_ON_CORNERS, "0", m_MainWindow.GetMachIniFile())
-      End If
-   End Sub
-
-   Private Sub ShortTxBx_EgtClosed(sender As Object, e As EventArgs) Handles ShortTxBx.EgtClosed
-      Dim dVal As Double = 0
-      StringToLen(ShortTxBx.Text, dVal)
-      WritePrivateProfileString(S_MACH_NEST, K_MACH_MILLING_SHORTENING, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile())
-   End Sub
-
-   Private Sub InternalCutsChBx_Click(sender As Object, e As RoutedEventArgs) Handles InternalCutsChBx.Click
-      If InternalCutsChBx.IsChecked() Then
-         WritePrivateProfileString(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, "1", m_MainWindow.GetMachIniFile())
-      Else
-         WritePrivateProfileString(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, "0", m_MainWindow.GetMachIniFile())
-      End If
-   End Sub
-
-   Private Sub WjIntCutsChBx_Click(sender As Object, e As RoutedEventArgs) Handles WjIntCutsChBx.Click
-      If WjIntCutsChBx.IsChecked() Then
-         WritePrivateProfileString(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, "1", m_MainWindow.GetMachIniFile())
-      Else
-         WritePrivateProfileString(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, "0", m_MainWindow.GetMachIniFile())
-      End If
-   End Sub
-
-   ' -- INIZIO -- nuovi parametri per prefori WaterJet
-   Private Sub HolesDiameterWJTxBx_Click(sender As Object, e As EventArgs) Handles HolesDiameterWJTxBx.EgtClosed
-      Dim dVal As Double = 0
-      StringToLen(HolesDiameterWJTxBx.Text, dVal)
-      WritePrivateProfileString(S_MACH_NEST, K_HOLES_DIAMITERWJ, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile())
-   End Sub
-
-   Private Sub HolesOffsetWJTxBx_Click(sender As Object, e As EventArgs) Handles HolesOffsetWJTxBx.EgtClosed
-      Dim dVal As Double = 0
-      StringToLen(HolesOffsetWJTxBx.Text, dVal)
-      WritePrivateProfileString(S_MACH_NEST, K_HOLES_OFFSETWJ, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile())
-   End Sub
-
-   Private Sub MinRadiusWJTxBx_Click(sender As Object, e As EventArgs) Handles MinRadiusWJTxBx.EgtClosed
-      Dim dVal As Double = 0
-      StringToLen(MinRadiusWJTxBx.Text, dVal)
-      WritePrivateProfileString(S_MACH_NEST, K_MIN_RADIUSWJ, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile())
-   End Sub
-
-   Private Sub OneHoleInCornerWJChBx_Click(sender As Object, e As EventArgs) Handles OneHoleInCornerWJChBx.Click
-      If OneHoleInCornerWJChBx.IsChecked() Then
-         WritePrivateProfileString(S_MACH_NEST, K_MACH_DRILLINGWJ_ON_CORNERS, "1", m_MainWindow.GetMachIniFile())
-      Else
-         WritePrivateProfileString(S_MACH_NEST, K_MACH_DRILLINGWJ_ON_CORNERS, "0", m_MainWindow.GetMachIniFile())
-      End If
-   End Sub
-   ' --   FINE   -- nuovi parametri per prefori WaterJet
-
-   ' -- INIZIO -- nuovi parametri per Rettifica angoli in sottosquadra WaterJet
-   Private Sub EnableRectificationChBx_Click(sender As Object, e As EventArgs) Handles EnableRectificationChBx.Click
-      If EnableRectificationChBx.IsChecked() Then
-         WritePrivateProfileString(S_MACH_NEST, K_MACH_RECTIFICATION_ON_SUBSQUARE, "1", m_MainWindow.GetMachIniFile)
-      Else
-         WritePrivateProfileString(S_MACH_NEST, K_MACH_RECTIFICATION_ON_SUBSQUARE, "0", m_MainWindow.GetMachIniFile)
-      End If
-   End Sub
-   ' --   FINE   -- nuovi parametri per Rettifica angoli in sottosquadra WaterJet
-
    Private Sub TmEnableChBx_Click(sender As Object, e As RoutedEventArgs) Handles TmEnableChBx.Click
       If TmEnableChBx.IsChecked() Then
          WritePrivateProfileString(S_MACH_NEST, K_MACH_ENGRAVING_WITHMILL, "1", m_MainWindow.GetMachIniFile())
@@ -1557,4 +1327,16 @@ Public Class AlarmsPageUC
       Return String.Empty
    End Function
 
+   Private Sub EnableFinalSawCutChBx_IsChecked() Handles EnableFinalSawCutChBx.Click
+      m_MainWindow.m_CurrentMachine.bEnableFinalSawCut = EnableFinalSawCutChBx.IsChecked
+      WritePrivateProfileString(S_MACH, K_ENABLEFINALSAWCUT, If(m_MainWindow.m_CurrentMachine.bEnableFinalSawCut, "1", "0"), m_MainWindow.GetMachIniFile())
+   End Sub
+
+   Private Sub FinalDepthTxBx_EgtClosed() Handles FinalDepthTxBx.EgtClosed
+      Dim dVal As Double = 0
+      StringToLen(FinalDepthTxBx.Text, dVal)
+      m_MainWindow.m_CurrentMachine.dFinalDepth = dVal
+      WritePrivateProfileString(S_MACH, K_FINALDEPTH, DoubleToString(m_MainWindow.m_CurrentMachine.dFinalDepth, 3), m_MainWindow.GetMachIniFile())
+   End Sub
+
 End Class
diff --git a/OmagCUTDarkDictionary.xaml b/OmagCUTDarkDictionary.xaml
index 51f49bf..e817db5 100644
--- a/OmagCUTDarkDictionary.xaml
+++ b/OmagCUTDarkDictionary.xaml
@@ -484,7 +484,7 @@
    </Style>
 
    <Style x:Key="OmagCut_CurrProjSummeryTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource OmagCut_LowerCaseCharacterTextBlock}">
-      <Setter Property="Foreground" Value="White"/>
+      <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
       <Setter Property="TextWrapping" Value="NoWrap"/>
       <Setter Property="Margin" Value="6,0,0,0"/>
    </Style>
@@ -639,10 +639,10 @@
    </Style>
 
    <Style x:Key="OmagCut_LowerCaseCharacterTextBlock" TargetType="{x:Type TextBlock}">
+      <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
       <Setter Property="TextWrapping" Value="Wrap"/>
       <Setter Property="FontSize" Value="{DynamicResource FontSize_LowerCaseCharacter}"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
    </Style>
 
    <DataTemplate x:Key="GroupBoxHeaderTemplate">
@@ -748,8 +748,80 @@
 
    <!--TextBlock per elementi delle ListBox-->
 
-   <Style x:Key="OmagCut_ListBoxTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource OmagCut_LowerCaseCharacterTextBlock}">
-      <Setter Property="TextWrapping" Value="NoWrap"/>
+   <Style x:Key="OmagCut_ListBoxTextBlock" TargetType="{x:Type TextBlock}">
+      <Setter Property="TextWrapping" Value="Wrap"/>
+      <Setter Property="FontSize" Value="{DynamicResource FontSize_LowerCaseCharacter}"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
+   </Style>
+
+   <!--DataTemplate testo ed immagine-->
+   <DataTemplate x:Key="DataTemplateItem">
+      <Grid >
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="1*"/>
+         </Grid.ColumnDefinitions>
+         <!--<Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Width="32" Margin="0,8,6,4" />-->
+         <Image Grid.Column="0" Source="{Binding PictureString}" Style="{DynamicResource OmagCut_ListBoxIcon}" />
+         <!--<TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" VerticalAlignment="Center" />-->
+         <TextBlock Grid.Column="1" Text="{Binding Name}" Style="{DynamicResource OmagCut_ListBoxTextBlock}" />
+      </Grid>
+   </DataTemplate>
+
+   <!-- ListBoxItem -->
+
+   <Style x:Key="ItemList" TargetType="{x:Type ListBoxItem}">
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="BorderBrush" Value="Transparent"/>
+      <Setter Property="Foreground" Value="White"/>
+      <Setter Property="BorderThickness" Value="2"/>
+      <Setter Property="Margin" Value="1,0,1,0"/>
+      <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+      <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+      <Setter Property="Padding" Value="2"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ListBoxItem}">
+               <Border x:Name="Bd"
+							  BorderBrush="{TemplateBinding BorderBrush}"
+							  BorderThickness="{TemplateBinding BorderThickness}"
+							  Background="{TemplateBinding Background}"
+							  Padding="{TemplateBinding Padding}"
+							  Margin="{TemplateBinding Margin}"
+							  SnapsToDevicePixels="true">
+                  <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+							               SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+							               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsSelected" Value="true">
+                     <Setter Property="Background" TargetName="Bd" Value="LightGray"/>
+                     <Setter Property="BorderBrush" TargetName="Bd" Value="White"/>
+                  </Trigger>
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="IsSelected" Value="false"/>
+                        <Condition Property="IsMouseOver" Value="true"/>
+                     </MultiTrigger.Conditions>
+                     <Setter Property="Foreground" Value="Black"/>
+                     <Setter Property="Background" TargetName="Bd" Value="LightGray"/>
+                     <Setter Property="BorderBrush" TargetName="Bd" Value="LightGray"/>
+                  </MultiTrigger>
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="IsSelected" Value="true"/>
+                        <Condition Property="Selector.IsSelectionActive" Value="false"/>
+                     </MultiTrigger.Conditions>
+                     <Setter Property="Background" TargetName="Bd" Value="LightGray"/>
+                     <Setter Property="BorderBrush" TargetName="Bd" Value="White"/>
+                  </MultiTrigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Foreground" Value="{StaticResource OmagCut_White}"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
    </Style>
 
 </ResourceDictionary>
diff --git a/OmagCUTDictionary.xaml b/OmagCUTDictionary.xaml
index fecb21c..5275ac2 100644
--- a/OmagCUTDictionary.xaml
+++ b/OmagCUTDictionary.xaml
@@ -1040,6 +1040,7 @@
 
    <!--TextBlock per elementi delle ListBox-->
    <Style x:Key="OmagCut_LowerCaseCharacterTextBlock" TargetType="{x:Type TextBlock}">
+      <Setter Property="Foreground" Value="{StaticResource Omag_Black}"/>
       <Setter Property="TextWrapping" Value="Wrap"/>
       <Setter Property="FontSize" Value="{DynamicResource FontSize_LowerCaseCharacter}"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
@@ -1047,6 +1048,8 @@
 
    <Style x:Key="OmagCut_ListBoxTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource OmagCut_LowerCaseCharacterTextBlock}">
       <Setter Property="TextWrapping" Value="NoWrap"/>
+      <Setter Property="FontSize" Value="{DynamicResource FontSize_LowerCaseCharacter}"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
    </Style>
 
    <Style x:Key="OmagCut_CurrProjSummeryTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource OmagCut_LowerCaseCharacterTextBlock}">
@@ -1116,9 +1119,10 @@
 
    <!-- ListBoxItem -->
 
-   <Style TargetType="{x:Type ListBoxItem}">
+   <Style x:Key="ItemList" TargetType="{x:Type ListBoxItem}">
       <Setter Property="Background" Value="Transparent"/>
       <Setter Property="BorderBrush" Value="Transparent"/>
+      <Setter Property="Foreground" Value="Black"/>
       <Setter Property="BorderThickness" Value="2"/>
       <Setter Property="Margin" Value="1,0,1,0"/>
       <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
diff --git a/Project/OpenPageUC.xaml b/Project/OpenPageUC.xaml
index e50b07c..c14dc80 100644
--- a/Project/OpenPageUC.xaml
+++ b/Project/OpenPageUC.xaml
@@ -36,7 +36,7 @@
             </Grid.ColumnDefinitions>
          </Grid>
 
-         <TextBlock Name="FilePathTxBl" Grid.Row="0" Foreground="White" 
+         <TextBlock Name="FilePathTxBl" Grid.Row="0" 
                     Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
 
          <Grid Grid.Row="1" Grid.RowSpan="2">
@@ -46,7 +46,8 @@
             </Grid.RowDefinitions>
             <ListBox Name="FileListBox"  
                      ItemTemplate="{DynamicResource DataTemplateItem}"
-                     ItemsSource="{Binding ItemList}"/>
+                     ItemsSource="{Binding ItemList}"
+                     ItemContainerStyle="{DynamicResource ItemList}"/>
 
             <Grid Grid.Row="1" Margin="0,0,8,0">
                <Grid.ColumnDefinitions>