diff --git a/CNCommunication.vb b/CNCommunication.vb
index 61993a1..95790ae 100644
--- a/CNCommunication.vb
+++ b/CNCommunication.vb
@@ -269,22 +269,42 @@ Public Class CNCommunication
          m_CN.SetCnDataVar(CN_generico.CnData.VacuumUp, sVal)
          GetPrivateProfileString(S_NCDATA, K_VACUUMDOWN, "", sVal, m_MainWindow.GetMachIniFile())
          m_CN.SetCnDataVar(CN_generico.CnData.VacuumDown, sVal)
+         GetPrivateProfileString(S_NCDATA, K_VACUUM2UP, "", sVal, m_MainWindow.GetMachIniFile())
+         m_CN.SetCnDataVar(CN_generico.CnData.Vacuum2Up, sVal)
+         GetPrivateProfileString(S_NCDATA, K_VACUUM2DOWN, "", sVal, m_MainWindow.GetMachIniFile())
+         m_CN.SetCnDataVar(CN_generico.CnData.Vacuum2Down, sVal)
          GetPrivateProfileString(S_NCDATA, K_VACUUM0, "", sVal, m_MainWindow.GetMachIniFile())
          m_CN.SetCnDataVar(CN_generico.CnData.Vacuum0, sVal)
          GetPrivateProfileString(S_NCDATA, K_VACUUM90, "", sVal, m_MainWindow.GetMachIniFile())
          m_CN.SetCnDataVar(CN_generico.CnData.Vacuum90, sVal)
-         GetPrivateProfileString(S_NCDATA, K_VACUU3STATE, "", sVal, m_MainWindow.GetMachIniFile())
+         GetPrivateProfileString(S_NCDATA, K_VACUUM1STATE, "", sVal, m_MainWindow.GetMachIniFile())
+         m_CN.SetCnDataVar(CN_generico.CnData.Vacuum1State, sVal)
+         GetPrivateProfileString(S_NCDATA, K_VACUUM2STATE, "", sVal, m_MainWindow.GetMachIniFile())
+         m_CN.SetCnDataVar(CN_generico.CnData.Vacuum2State, sVal)
+         GetPrivateProfileString(S_NCDATA, K_VACUUM3STATE, "", sVal, m_MainWindow.GetMachIniFile())
          m_CN.SetCnDataVar(CN_generico.CnData.Vacuum3State, sVal)
-         GetPrivateProfileString(S_NCDATA, K_VACUU4STATE, "", sVal, m_MainWindow.GetMachIniFile())
+         GetPrivateProfileString(S_NCDATA, K_VACUUM4STATE, "", sVal, m_MainWindow.GetMachIniFile())
          m_CN.SetCnDataVar(CN_generico.CnData.Vacuum4State, sVal)
-         GetPrivateProfileString(S_NCDATA, K_VACUU135STATE, "", sVal, m_MainWindow.GetMachIniFile())
+         GetPrivateProfileString(S_NCDATA, K_VACUUM5STATE, "", sVal, m_MainWindow.GetMachIniFile())
+         m_CN.SetCnDataVar(CN_generico.CnData.Vacuum5State, sVal)
+         GetPrivateProfileString(S_NCDATA, K_VACUUM6STATE, "", sVal, m_MainWindow.GetMachIniFile())
+         m_CN.SetCnDataVar(CN_generico.CnData.Vacuum6State, sVal)
+         GetPrivateProfileString(S_NCDATA, K_VACUUM135STATE, "", sVal, m_MainWindow.GetMachIniFile())
          m_CN.SetCnDataVar(CN_generico.CnData.Vacuum135State, sVal)
-         GetPrivateProfileString(S_NCDATA, K_VACUU246STATE, "", sVal, m_MainWindow.GetMachIniFile())
+         GetPrivateProfileString(S_NCDATA, K_VACUUM246STATE, "", sVal, m_MainWindow.GetMachIniFile())
          m_CN.SetCnDataVar(CN_generico.CnData.Vacuum246State, sVal)
          GetPrivateProfileString(S_NCDATA, K_OPENALLSTATE, "", sVal, m_MainWindow.GetMachIniFile())
          m_CN.SetCnDataVar(CN_generico.CnData.OpenAllState, sVal)
          GetPrivateProfileString(S_NCDATA, K_CLOSEALLSTATE, "", sVal, m_MainWindow.GetMachIniFile())
          m_CN.SetCnDataVar(CN_generico.CnData.CloseAllState, sVal)
+         GetPrivateProfileString(S_NCDATA, K_OPEN123STATE, "", sVal, m_MainWindow.GetMachIniFile())
+         m_CN.SetCnDataVar(CN_generico.CnData.Open123State, sVal)
+         GetPrivateProfileString(S_NCDATA, K_OPEN456STATE, "", sVal, m_MainWindow.GetMachIniFile())
+         m_CN.SetCnDataVar(CN_generico.CnData.Open456State, sVal)
+         GetPrivateProfileString(S_NCDATA, K_CLOSE123STATE, "", sVal, m_MainWindow.GetMachIniFile())
+         m_CN.SetCnDataVar(CN_generico.CnData.Close123State, sVal)
+         GetPrivateProfileString(S_NCDATA, K_CLOSE456STATE, "", sVal, m_MainWindow.GetMachIniFile())
+         m_CN.SetCnDataVar(CN_generico.CnData.Close456State, sVal)
          GetPrivateProfileString(S_NCDATA, K_BLOWSTATE, "", sVal, m_MainWindow.GetMachIniFile())
          m_CN.SetCnDataVar(CN_generico.CnData.BlowState, sVal)
          GetPrivateProfileString(S_NCDATA, K_VACUUMON, "", sVal, m_MainWindow.GetMachIniFile())
@@ -467,14 +487,24 @@ Public Class CNCommunication
             m_MainWindow.m_DirectCutPageUC.m_ControlsMachineButton.FiveAxisStateChanged(m_CN.Is_G24_active())
             m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.VacuumUpChanged(m_CN.bVacuumUp)
             m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.VacuumDownChanged(m_CN.bVacuumDown)
+            m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Vacuum2UpChanged(m_CN.bVacuum2Up)
+            m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Vacuum2DownChanged(m_CN.bVacuum2Down)
             m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Vacuum0Changed(m_CN.bVacuum0)
             m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Vacuum90Changed(m_CN.bVacuum90)
+            m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Vacuum1Changed(m_CN.bVacuum1State)
+            m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Vacuum2Changed(m_CN.bVacuum2State)
             m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Vacuum3Changed(m_CN.bVacuum3State)
             m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Vacuum4Changed(m_CN.bVacuum4State)
+            m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Vacuum5Changed(m_CN.bVacuum5State)
+            m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Vacuum6Changed(m_CN.bVacuum6State)
             m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Vacuum135Changed(m_CN.bVacuum135State)
             m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Vacuum246Changed(m_CN.bVacuum246State)
             m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.OpenAllChanged(m_CN.bOpenAllState)
             m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.CloseAllChanged(m_CN.bCloseAllState)
+            m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Open123Changed(m_CN.bOpen123State)
+            m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Open456Changed(m_CN.bOpen456State)
+            m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Close123Changed(m_CN.bClose123State)
+            m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Close456Changed(m_CN.bClose456State)
             m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.BlowChanged(m_CN.bBlowState)
             m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.VacuumOnChanged(m_CN.bVacuumOn)
             m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.VacuumOffChanged(m_CN.bVacuumOff)
diff --git a/CN_generico.vb b/CN_generico.vb
index 0836038..5c604b6 100644
--- a/CN_generico.vb
+++ b/CN_generico.vb
@@ -8,7 +8,7 @@ Public MustInherit Class CN_generico
    Public Const MAX_VAR As Short = 100
    Public Const MAX_VALUES As Short = 9          ' Max. index to read the data from the FXServer array
    Public Const MAX_TOOLS As Short = 100
-   Public Const NUM_DATA = 36                     ' Numero di dati del CN (Speed,Feed,...)
+   Public Const NUM_DATA = 46                     ' Numero di dati del CN (Speed,Feed,...)
    Public Enum CnData
       Mode = 0
       JogIncr = 1
@@ -34,18 +34,28 @@ Public MustInherit Class CN_generico
       LimitZ = 21
       VacuumUp = 22
       VacuumDown = 23
-      Vacuum3State = 24
-      Vacuum4State = 25
-      Vacuum135State = 26
-      Vacuum246State = 27
-      OpenAllState = 28
-      CloseAllState = 29
-      BlowState = 30
-      VacuumOn = 31
-      BypassState = 32
-      Vacuum0 = 33
-      Vacuum90 = 34
-      VacuumOff = 35
+      Vacuum2Up = 24
+      Vacuum2Down = 25
+      Vacuum1State = 26
+      Vacuum2State = 27
+      Vacuum3State = 28
+      Vacuum4State = 29
+      Vacuum5State = 30
+      Vacuum6State = 31
+      Vacuum135State = 32
+      Vacuum246State = 33
+      OpenAllState = 34
+      CloseAllState = 35
+      Open123State = 36
+      Open456State = 37
+      Close123State = 38
+      Close456State = 39
+      BlowState = 40
+      VacuumOn = 41
+      BypassState = 42
+      Vacuum0 = 43
+      Vacuum90 = 44
+      VacuumOff = 45
    End Enum
 
 #End Region
@@ -135,14 +145,24 @@ Public MustInherit Class CN_generico
    Public bPowerOvr As Double
    Public bVacuumUp As Boolean
    Public bVacuumDown As Boolean
+   Public bVacuum2Up As Boolean
+   Public bVacuum2Down As Boolean
    Public bVacuum0 As Boolean
    Public bVacuum90 As Boolean
+   Public bVacuum1State As Boolean
+   Public bVacuum2State As Boolean
    Public bVacuum3State As Boolean
    Public bVacuum4State As Boolean
+   Public bVacuum5State As Boolean
+   Public bVacuum6State As Boolean
    Public bVacuum135State As Boolean
    Public bVacuum246State As Boolean
    Public bOpenAllState As Boolean
    Public bCloseAllState As Boolean
+   Public bOpen123State As Boolean
+   Public bOpen456State As Boolean
+   Public bClose123State As Boolean
+   Public bClose456State As Boolean
    Public bBlowState As Boolean
    Public bVacuumOn As Boolean
    Public bVacuumOff As Boolean
diff --git a/ConstGen.vb b/ConstGen.vb
index 8d82eea..379ac97 100644
--- a/ConstGen.vb
+++ b/ConstGen.vb
@@ -63,8 +63,8 @@ Module ConstGen
 
    ' Sottodirettorio Machining dentro il quale trovare il file INI delle lucidature
    Public Const MACHININGS_DIR As String = "Machinings"
-   ' Nome file INI delle lucidature
-   Public Const KITS_FILE As String = "Kits"
+   ' Nome file Dati delle lucidature
+   Public Const KITS_FILE As String = "Kits.data"
 
    ' File dei pezzi rovinati
    Public Const CURR_RUINED_EPL As String = "RuinedParts.epl"
diff --git a/ConstMachIni.vb b/ConstMachIni.vb
index dcc25b4..f1630f9 100644
--- a/ConstMachIni.vb
+++ b/ConstMachIni.vb
@@ -68,14 +68,24 @@
    Public Const K_POWEROVR As String = "PowerOvr"
    Public Const K_VACUUMUP As String = "VacuumUp"
    Public Const K_VACUUMDOWN As String = "VacuumDown"
+   Public Const K_VACUUM2UP As String = "Vacuum2Up"
+   Public Const K_VACUUM2DOWN As String = "Vacuum2Down"
    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_VACUUM1STATE As String = "Vacuum1State"
+   Public Const K_VACUUM2STATE As String = "Vacuum2State"
+   Public Const K_VACUUM3STATE As String = "Vacuum3State"
+   Public Const K_VACUUM4STATE As String = "Vacuum4State"
+   Public Const K_VACUUM5STATE As String = "Vacuum5State"
+   Public Const K_VACUUM6STATE As String = "Vacuum6State"
+   Public Const K_VACUUM135STATE As String = "Vacuum135State"
+   Public Const K_VACUUM246STATE As String = "Vacuum246State"
    Public Const K_OPENALLSTATE As String = "OpenAllState"
    Public Const K_CLOSEALLSTATE As String = "CloseAllState"
+   Public Const K_OPEN123STATE As String = "Open123State"
+   Public Const K_OPEN456STATE As String = "Open456State"
+   Public Const K_CLOSE123STATE As String = "Close123State"
+   Public Const K_CLOSE456STATE As String = "Close456State"
    Public Const K_BLOWSTATE As String = "BlowState"
    Public Const K_VACUUMSTATE As String = "VacuumState"
    Public Const K_VACUUMON As String = "VacuumOn"
diff --git a/ControlsMachineButtonUC.xaml.vb b/ControlsMachineButtonUC.xaml.vb
index 6386fb7..6014047 100644
--- a/ControlsMachineButtonUC.xaml.vb
+++ b/ControlsMachineButtonUC.xaml.vb
@@ -44,14 +44,12 @@ Public Class ControlsMachineButtonUC
    Private Sub ControlsMachineButtonUC_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
       If m_bFirst Then
          m_DirectCutPage = m_MainWindow.m_DirectCutPageUC
-         'MachineButton.m_DirectCutPage = m_DirectCutPage
-         'MachineButton.m_CN = m_CN
          m_bFirst = False
 
          ' Lettura configurazione bottoni da Ini di macchina
          Dim m_nCount As Integer = 1
-         Dim bFoundedBtn As Boolean = True
-         While bFoundedBtn
+         Dim bFoundBtn As Boolean = True
+         While bFoundBtn
             Dim sNameBtn As String = K_BUTTON & (m_nCount).ToString()
             Dim sMachineButtonType As String = String.Empty
             Dim sTImageName As String = String.Empty
@@ -59,9 +57,8 @@ Public Class ControlsMachineButtonUC
             Dim sFImageName As String = String.Empty
             Dim sFLuaScriptName As String = String.Empty
             Dim sStateFlag As String = String.Empty
-            bFoundedBtn = GetPrivateProfileMachineButtons(S_CONTROLMACHBUTTONS, sNameBtn, sMachineButtonType, sTImageName, sTLuaScriptName, sFImageName, sFLuaScriptName, sStateFlag, m_MainWindow.GetMachIniFile())
-            If bFoundedBtn Then 'And
-               '(Not m_bOnlyLaser Or sButtonStateFlag = sNameBtn) Then
+            bFoundBtn = GetPrivateProfileMachineButtons(S_CONTROLMACHBUTTONS, sNameBtn, sMachineButtonType, sTImageName, sTLuaScriptName, sFImageName, sFLuaScriptName, sStateFlag, m_MainWindow.GetMachIniFile())
+            If bFoundBtn Then
                m_nCount += 1
                Dim ButtonToAdd As MachineButton = Nothing
                Select Case sMachineButtonType
diff --git a/DirectCutPageUC.xaml.vb b/DirectCutPageUC.xaml.vb
index 2782295..6c489cf 100644
--- a/DirectCutPageUC.xaml.vb
+++ b/DirectCutPageUC.xaml.vb
@@ -194,7 +194,6 @@ Public Class DirectCutPageUC
          m_ControlsMachineButton.SetValue(Grid.RowProperty, 1)
          m_NewMachineButtonsType = m_ControlsMachineButton.GetPrivateProfileMachineButtons(S_CONTROLMACHBUTTONS, "Button1", Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, m_MainWindow.GetMachIniFile())
          MachineButtonGrid.Children.Add(m_ControlsMachineButton)
-         'm_ControlsMachineButton = m_ControlsMachineButton 'NotifyPropertyChanged("ButtonList")
          If VacuumMachineBtn.IsChecked Then
             MachineButtonGrid.Children.Remove(m_VacuumMachineButton)
             VacuumMachineBtn.IsChecked = False
diff --git a/M_Num.vb b/M_Num.vb
index 638f5d2..994fff9 100644
--- a/M_Num.vb
+++ b/M_Num.vb
@@ -1027,29 +1027,49 @@ Namespace Num
                   bVacuumUp = CBool(values(n))
                Case CnData.VacuumDown     ' (23) Stato ventosa giu'
                   bVacuumDown = CBool(values(n))
-               Case CnData.Vacuum3State     ' (24) Stato ventosa 3
+               Case CnData.Vacuum2Up     ' (24) Stato ventosa2 su'
+                  bVacuum2Up = CBool(values(n))
+               Case CnData.Vacuum2Down     ' (25) Stato ventosa2 giu'
+                  bVacuum2Down = CBool(values(n))
+               Case CnData.Vacuum1State     ' (26) Stato ventosa 1
+                  bVacuum1State = CBool(values(n))
+               Case CnData.Vacuum2State     ' (27) Stato ventosa 2
+                  bVacuum2State = CBool(values(n))
+               Case CnData.Vacuum3State     ' (28) Stato ventosa 3
                   bVacuum3State = CBool(values(n))
-               Case CnData.Vacuum4State     ' (25) Stato ventosa 4
+               Case CnData.Vacuum4State     ' (29) Stato ventosa 4
                   bVacuum4State = CBool(values(n))
-               Case CnData.Vacuum135State     ' (26) Stato ventose 135
+               Case CnData.Vacuum5State     ' (30) Stato ventosa 5
+                  bVacuum5State = CBool(values(n))
+               Case CnData.Vacuum6State     ' (31) Stato ventosa 6
+                  bVacuum6State = CBool(values(n))
+               Case CnData.Vacuum135State     ' (32) Stato ventose 135
                   bVacuum135State = CBool(values(n))
-               Case CnData.Vacuum246State     ' (27) Stato ventose 246
+               Case CnData.Vacuum246State     ' (33) Stato ventose 246
                   bVacuum246State = CBool(values(n))
-               Case CnData.OpenAllState     ' (28) Stato apertura ventose
+               Case CnData.OpenAllState     ' (34) Stato apertura ventose
                   bOpenAllState = CBool(values(n))
-               Case CnData.CloseAllState     ' (29) Stato chiusura ventose
+               Case CnData.CloseAllState     ' (35) Stato chiusura ventose
                   bCloseAllState = CBool(values(n))
-               Case CnData.BlowState     ' (30) Stato soffio ventose
+               Case CnData.Open123State     ' (36) Stato apertura ventose
+                  bOpen123State = CBool(values(n))
+               Case CnData.Open456State     ' (37) Stato apertura ventose
+                  bOpen456State = CBool(values(n))
+               Case CnData.Close123State     ' (38) Stato chiusura ventose
+                  bClose123State = CBool(values(n))
+               Case CnData.Close456State     ' (39) Stato chiusura ventose
+                  bClose456State = CBool(values(n))
+               Case CnData.BlowState     ' (40) Stato soffio ventose
                   bBlowState = CBool(values(n))
-               Case CnData.VacuumOn     ' (31) Stato aspirazione ventose acceso
+               Case CnData.VacuumOn     ' (41) Stato aspirazione ventose acceso
                   bVacuumOn = CBool(values(n))
-               Case CnData.BypassState     ' (32) Stato bypass
+               Case CnData.BypassState     ' (42) Stato bypass
                   bBypassState = CBool(values(n))
-               Case CnData.Vacuum0     ' (33) Stato rotazione ventosa 0
+               Case CnData.Vacuum0     ' (43) Stato rotazione ventosa 0
                   bVacuum0 = CBool(values(n))
-               Case CnData.Vacuum90     ' (34) Stato rotazione ventosa 0
+               Case CnData.Vacuum90     ' (44) Stato rotazione ventosa 0
                   bVacuum90 = CBool(values(n))
-               Case CnData.VacuumOff     ' (35) Stato aspirazione ventose spento
+               Case CnData.VacuumOff     ' (45) Stato aspirazione ventose spento
                   bVacuumOff = CBool(values(n))
             End Select
          Next
diff --git a/MachinePageUC.xaml.vb b/MachinePageUC.xaml.vb
index 067d968..4fcb35d 100644
--- a/MachinePageUC.xaml.vb
+++ b/MachinePageUC.xaml.vb
@@ -46,7 +46,7 @@ Public Class MachinePageUC
       AlarmsBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 5)
       ToolsDBBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 6)
       MachiningDBBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 7)
-      PolishingsBtn.Content = EgtMsg(91091)
+      PolishingsBtn.Content = EgtMsg(91090)
       TestingPageBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 8)
       StatisticsBtn.Content = EgtMsg(90709)
 
@@ -54,15 +54,21 @@ Public Class MachinePageUC
       MachinePageGrid.Children.Add(m_AlarmsPageUC)
       m_ActiveMachinePage = MachinePages.Alarms
 
-      ' Se controllo numerico 0 disattivo la pagina macchina
+      ' Se lucidature non abilitate, disattivo la pagina DB lucidature
+      If Not m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.ENABLE_POLISHING) Then
+         PolishingsBtn.IsEnabled = False
+      End If
+
+      ' Se controllo numerico 0, disattivo la pagina macchina
       If GetPrivateProfileInt(S_NUMERICALCONTROL, K_TYPE, 0, m_MainWindow.GetMachIniFile()) = 0 Then
          TestingPageBtn.IsEnabled = False
       End If
 
-      ' Se statistiche 0 disattivo la pagina statistiche
+      ' Se statistiche 0, disattivo la pagina statistiche
       If GetPrivateProfileInt(S_STATISTICS, K_SHOWAREAS, 0, m_MainWindow.GetMachIniFile()) = 0 Then
          StatisticsBtn.Visibility = Visibility.Hidden
       End If
+
    End Sub
 
    Private Sub MachinePage_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
diff --git a/MainWindow.xaml.vb b/MainWindow.xaml.vb
index bd1e8a8..ff08255 100644
--- a/MainWindow.xaml.vb
+++ b/MainWindow.xaml.vb
@@ -51,7 +51,7 @@ Class MainWindow
    Private m_sToolMakersDir As String = String.Empty
    Private m_sIniFile As String = String.Empty
    Private m_sMachIniFile As String = String.Empty
-   Private m_sKitIniFile As String = String.Empty
+   Private m_sKitsFile As String = String.Empty
    Private m_sLogFile As String = String.Empty
    Private m_nDebug As Integer = 0
    Private m_sVersion As String = "1.1a1"
@@ -92,6 +92,7 @@ Class MainWindow
       IMPORT_SLABDXF = 32768
       CURVED_FRAME = 65536
       ENABLE_WJ = 131072
+      ENABLE_POLISHING = 262144
    End Enum
    ' Opzione nesting automatico
    Private m_bAutoNest As Boolean = False
@@ -210,8 +211,8 @@ Class MainWindow
       Return m_sMachIniFile
    End Function
 
-   Public Function GetKitIniFile() As String
-      Return m_sKitIniFile
+   Public Function GetKitsFile() As String
+      Return m_sKitsFile
    End Function
 
    Public Function GetLogFile() As String
@@ -288,7 +289,7 @@ Class MainWindow
       ' Impostazione path MachIni file
       m_sMachIniFile = m_sMachinesRoot & "\" & m_sCurrMachine & "\" & m_sCurrMachine & ".ini"
       ' Impostazione path KitIni file
-      m_sKitIniFile = m_sMachinesRoot & "\" & m_sCurrMachine & "\" & MACHININGS_DIR & "\" & KITS_FILE & ".ini"
+      m_sKitsFile = m_sMachinesRoot & "\" & m_sCurrMachine & "\" & MACHININGS_DIR & "\" & KITS_FILE
       ' Imposto tipo di chiave
 #If TRIAL Then
       EgtSetLockType(KEY_TYPE.ANY)
diff --git a/OmagCUT.vbproj b/OmagCUT.vbproj
index 695c50d..2619e2c 100644
--- a/OmagCUT.vbproj
+++ b/OmagCUT.vbproj
@@ -967,6 +967,9 @@
     <Resource Include="Resources\ZigZagX.png" />
     <Resource Include="Resources\ZigZagY.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Vacuum.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagCUT\OmagCUTR32.exe
diff --git a/OmagCUTDictionary.xaml b/OmagCUTDictionary.xaml
index 1467eac..fcfc6ae 100644
--- a/OmagCUTDictionary.xaml
+++ b/OmagCUTDictionary.xaml
@@ -152,7 +152,7 @@
     <BitmapImage x:Key="PlayImg" UriSource="Resources/Play.png"></BitmapImage>
     <BitmapImage x:Key="PlayStepImg" UriSource="Resources/PlayStep.png"></BitmapImage>
     <BitmapImage x:Key="StopImg" UriSource="Resources/Stop.png"></BitmapImage>
-    <BitmapImage x:Key="VacuumImg" UriSource="Resources/Manual.png"></BitmapImage>
+    <BitmapImage x:Key="VacuumImg" UriSource="Resources/Vacuum.png"></BitmapImage>
 
     <FontFamily x:Key="OmagCut_Font">./Resources/Fonts/#Century Gothic</FontFamily>
 
diff --git a/PolishingsPageUC.xaml b/PolishingsPageUC.xaml
index a6fa25a..235f29a 100644
--- a/PolishingsPageUC.xaml
+++ b/PolishingsPageUC.xaml
@@ -23,7 +23,7 @@
             </Grid.RowDefinitions>
 
             <GroupBox Name="KitsGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="0"
-            Grid.Row="0" Grid.ColumnSpan="1" Grid.RowSpan="1" BorderThickness="0">
+                Grid.Row="0" BorderThickness="0">
 
                 <Grid>
                     <Grid.RowDefinitions>
@@ -78,7 +78,7 @@
                     </Grid.RowDefinitions>
 
                     <GroupBox Name="KitMachsGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="0"
-            Grid.Row="0" Grid.ColumnSpan="1" Grid.RowSpan="8" BorderThickness="0">
+                        Grid.Row="0" Grid.ColumnSpan="1" Grid.RowSpan="8" BorderThickness="0">
 
                         <!-- Definizione della Grid dei parametri delle lavorazioni -->
                         <Grid Name="KitMachGrd" Grid.Column="1">
@@ -130,7 +130,7 @@
                             </ListBox>
 
                             <EgtWPFLib:EgtTextBox Name="KitMachNameTxBx" Grid.Row="1" Width="240" Visibility="Hidden"
-                  Style="{DynamicResource OmagCut_KeyboardTextBox}" />
+                     Style="{DynamicResource OmagCut_KeyboardTextBox}" />
 
                             <UniformGrid Grid.Row="13" Columns="4" Grid.ColumnSpan="4">
                                 <Button Name="NewKitMachBtn" Grid.Column="0"
@@ -147,8 +147,8 @@
 
                     </GroupBox>
 
-                    <GroupBox Name="KitMachParamsGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="1"
-            Grid.Row="0" Grid.ColumnSpan="3" Grid.RowSpan="8">
+                    <GroupBox Name="KitMachParamsGpBx" Style="{DynamicResource OmagCut_GroupBox}"
+                        Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Grid.RowSpan="8">
 
                         <!-- Definizione della Grid dei parametri delle lavorazioni -->
                         <Grid Name="KitMachParamGrd" Grid.Column="1">
@@ -178,9 +178,9 @@
                         <Image Source="Resources/ZigZagX.png" Stretch="Uniform"/>
                     </Border>
 
-                    <TextBlock Name="MotionTxBl" Grid.Row="0" Grid.Column="1" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="30,0"/>
-                    <TextBlock Name="RepeatTxBl" Grid.Row="0" Grid.Column="2" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="30,0"/>
-                    <TextBlock Name="StepTxBl" Grid.Row="0" Grid.Column="3" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="30,0"/>
+                    <TextBlock Name="MotionTxBl" Grid.Row="0" Grid.Column="1" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="30,0" HorizontalAlignment="Center"/>
+                    <TextBlock Name="RepeatTxBl" Grid.Row="0" Grid.Column="2" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="30,0" HorizontalAlignment="Center"/>
+                    <TextBlock Name="StepTxBl" Grid.Row="0" Grid.Column="3" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="30,0" HorizontalAlignment="Center"/>
 
                     <EgtWPFLib:EgtTextBox Name="ContourTxBx" Grid.Row="1" Grid.Column="2" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
                     <EgtWPFLib:EgtTextBox Name="ZigZagYTxBx" Grid.Row="2" Grid.Column="2" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
diff --git a/PolishingsPageUC.xaml.vb b/PolishingsPageUC.xaml.vb
index 044cad8..c788a9e 100644
--- a/PolishingsPageUC.xaml.vb
+++ b/PolishingsPageUC.xaml.vb
@@ -44,7 +44,7 @@ Public Class PolishingsPageUC
    Private Sub PolishingsPage_Initialized(sender As Object, e As EventArgs)
 
       ' Impostazione Path KitIni file
-      m_sKitIniFile = m_MainWindow.GetKitIniFile()
+      m_sKitIniFile = m_MainWindow.GetKitsFile()
 
       ' Imposto i messaggi letti dal file dei messaggi
       NewKitBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 16)
@@ -58,7 +58,6 @@ Public Class PolishingsPageUC
 
       KitsGpBx.Header = EgtMsg(91091)             ' Lucidature
       KitMachsGpBx.Header = EgtMsg(91096)         ' Lista utensili
-      KitMachParamsGpBx.Header = EgtMsg(91097)    ' Parametri utensile
       MotionTxBl.Text = EgtMsg(91092)
       RepeatTxBl.Text = EgtMsg(91093)
       StepTxBl.Text = EgtMsg(90787)
@@ -235,53 +234,53 @@ Public Class PolishingsPageUC
          nVal = KitMachsLstBx.Items(nKitMachIndex - 1).SelTool
          ' Se SelTool = -1 faccio sì che il valore di ToolUUID che scrivo sia "default" in modo che la ComboBox non abbia alcun elemento selezionato
          If (nVal < 0) Then
-            WritePrivateProfileString(S_KIT & nKitIndex.ToString("D2"), K_TOOL & nKitMachIndex.ToString("D2"), "default", m_MainWindow.GetKitIniFile())
+            WritePrivateProfileString(S_KIT & nKitIndex.ToString("D2"), K_TOOL & nKitMachIndex.ToString("D2"), "default", m_MainWindow.GetKitsFile())
          Else
             m_KitList(nKitIndex - 1).KitMachList(nKitMachIndex - 1).SelTool = nVal
             ' Per la scrittura utilizzo la lista degli UUID caricata nel metodo Loaded
-            WritePrivateProfileString(S_KIT & nKitIndex.ToString("D2"), K_TOOL & nKitMachIndex.ToString("D2"), ToolUuidList(nVal), m_MainWindow.GetKitIniFile())
+            WritePrivateProfileString(S_KIT & nKitIndex.ToString("D2"), K_TOOL & nKitMachIndex.ToString("D2"), ToolUuidList(nVal), m_MainWindow.GetKitsFile())
          End If
 
          ' Se SelTool = -1 faccio sì che il valore di ToolName che scrivo sia "default"
          If (nVal < 0) Then
-            WritePrivateProfileString(S_KIT & nKitIndex.ToString("D2"), K_TOOLNAME & nKitMachIndex.ToString("D2"), "default", m_MainWindow.GetKitIniFile())
+            WritePrivateProfileString(S_KIT & nKitIndex.ToString("D2"), K_TOOLNAME & nKitMachIndex.ToString("D2"), "default", m_MainWindow.GetKitsFile())
          Else
             m_KitList(nKitIndex - 1).KitMachList(nKitMachIndex - 1).sToolName = ToolList(nVal)
             ' Per la scrittura utilizzo la lista dei Tool caricata nel metodo Loaded
-            WritePrivateProfileString(S_KIT & nKitIndex.ToString("D2"), K_TOOLNAME & nKitMachIndex.ToString("D2"), ToolList(nVal), m_MainWindow.GetKitIniFile())
+            WritePrivateProfileString(S_KIT & nKitIndex.ToString("D2"), K_TOOLNAME & nKitMachIndex.ToString("D2"), ToolList(nVal), m_MainWindow.GetKitsFile())
          End If
 
          bVal = KitMachsLstBx.Items(nKitMachIndex - 1).bActive
          m_KitList(nKitIndex - 1).KitMachList(nKitMachIndex - 1).bActive = bVal
-         WritePrivateProfileString(S_KIT & nKitIndex.ToString("D2"), K_ACTIVE & nKitMachIndex.ToString("D2"), If(bVal, 1, 0), m_MainWindow.GetKitIniFile())
+         WritePrivateProfileString(S_KIT & nKitIndex.ToString("D2"), K_ACTIVE & nKitMachIndex.ToString("D2"), If(bVal, 1, 0), m_MainWindow.GetKitsFile())
 
          nVal = KitMachsLstBx.Items(nKitMachIndex - 1).nContour
          m_KitList(nKitIndex - 1).KitMachList(nKitMachIndex - 1).nContour = nVal
-         WritePrivateProfileString(S_KIT & nKitIndex.ToString("D2"), K_CONTOUR & nKitMachIndex.ToString("D2"), nVal, m_MainWindow.GetKitIniFile())
+         WritePrivateProfileString(S_KIT & nKitIndex.ToString("D2"), K_CONTOUR & nKitMachIndex.ToString("D2"), nVal, m_MainWindow.GetKitsFile())
 
          nVal = KitMachsLstBx.Items(nKitMachIndex - 1).nZigZagX
          m_KitList(nKitIndex - 1).KitMachList(nKitMachIndex - 1).nZigZagX = nVal
-         WritePrivateProfileString(S_KIT & nKitIndex.ToString("D2"), K_ZIGZAGX & nKitMachIndex.ToString("D2"), nVal, m_MainWindow.GetKitIniFile())
+         WritePrivateProfileString(S_KIT & nKitIndex.ToString("D2"), K_ZIGZAGX & nKitMachIndex.ToString("D2"), nVal, m_MainWindow.GetKitsFile())
 
          dVal = KitMachsLstBx.Items(nKitMachIndex - 1).dStepX
          m_KitList(nKitIndex - 1).KitMachList(nKitMachIndex - 1).dStepX = dVal
-         WritePrivateProfileString(S_KIT & nKitIndex.ToString("D2"), K_STEPX & nKitMachIndex.ToString("D2"), dVal, m_MainWindow.GetKitIniFile())
+         WritePrivateProfileString(S_KIT & nKitIndex.ToString("D2"), K_STEPX & nKitMachIndex.ToString("D2"), dVal, m_MainWindow.GetKitsFile())
 
          nVal = KitMachsLstBx.Items(nKitMachIndex - 1).nZigZagY
          m_KitList(nKitIndex - 1).KitMachList(nKitMachIndex - 1).nZigZagY = nVal
-         WritePrivateProfileString(S_KIT & nKitIndex.ToString("D2"), K_ZIGZAGY & nKitMachIndex.ToString("D2"), nVal, m_MainWindow.GetKitIniFile())
+         WritePrivateProfileString(S_KIT & nKitIndex.ToString("D2"), K_ZIGZAGY & nKitMachIndex.ToString("D2"), nVal, m_MainWindow.GetKitsFile())
 
          dVal = KitMachsLstBx.Items(nKitMachIndex - 1).dStepY
          m_KitList(nKitIndex - 1).KitMachList(nKitMachIndex - 1).dStepY = dVal
-         WritePrivateProfileString(S_KIT & nKitIndex.ToString("D2"), K_STEPY & nKitMachIndex.ToString("D2"), dVal, m_MainWindow.GetKitIniFile())
+         WritePrivateProfileString(S_KIT & nKitIndex.ToString("D2"), K_STEPY & nKitMachIndex.ToString("D2"), dVal, m_MainWindow.GetKitsFile())
 
          dVal = KitMachsLstBx.Items(nKitMachIndex - 1).dLiLen
          m_KitList(nKitIndex - 1).KitMachList(nKitMachIndex - 1).dLiLen = dVal
-         WritePrivateProfileString(S_KIT & nKitIndex.ToString("D2"), K_LILEN & nKitMachIndex.ToString("D2"), dVal, m_MainWindow.GetKitIniFile())
+         WritePrivateProfileString(S_KIT & nKitIndex.ToString("D2"), K_LILEN & nKitMachIndex.ToString("D2"), dVal, m_MainWindow.GetKitsFile())
 
          dVal = KitMachsLstBx.Items(nKitMachIndex - 1).dLiHeight
          m_KitList(nKitIndex - 1).KitMachList(nKitMachIndex - 1).dLiHeight = dVal
-         WritePrivateProfileString(S_KIT & nKitIndex.ToString("D2"), K_LIHEIGHT & nKitMachIndex.ToString("D2"), dVal, m_MainWindow.GetKitIniFile())
+         WritePrivateProfileString(S_KIT & nKitIndex.ToString("D2"), K_LIHEIGHT & nKitMachIndex.ToString("D2"), dVal, m_MainWindow.GetKitsFile())
 
          nKitMachIndex += 1
       Next
@@ -318,27 +317,27 @@ Public Class PolishingsPageUC
          ' Verifico che non sia il primo KitMach della lista
          If SelectedKitMach.nId > 1 Then
             ' Riscrivo i parametri del KitMach precedente con gli indici del KitMach selezionato
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_TOOL & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId - 2).sToolUUID, m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_TOOLNAME & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId - 2).sToolName, m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_ACTIVE & SelectedKitMach.nId.ToString("D2"), If(KitMachsLstBx.Items(SelectedKitMach.nId - 2).bActive, 1, 0), m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_CONTOUR & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId - 2).nContour, m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_ZIGZAGX & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId - 2).nZigZagY, m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_STEPX & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId - 2).dStepY, m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_ZIGZAGY & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId - 2).nZigZagX, m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_STEPY & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId - 2).dStepX, m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_LILEN & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId - 2).dLiLen, m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_LIHEIGHT & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId - 2).dLiHeight, m_MainWindow.GetKitIniFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_TOOL & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId - 2).sToolUUID, m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_TOOLNAME & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId - 2).sToolName, m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_ACTIVE & SelectedKitMach.nId.ToString("D2"), If(KitMachsLstBx.Items(SelectedKitMach.nId - 2).bActive, 1, 0), m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_CONTOUR & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId - 2).nContour, m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_ZIGZAGX & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId - 2).nZigZagY, m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_STEPX & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId - 2).dStepY, m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_ZIGZAGY & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId - 2).nZigZagX, m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_STEPY & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId - 2).dStepX, m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_LILEN & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId - 2).dLiLen, m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_LIHEIGHT & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId - 2).dLiHeight, m_MainWindow.GetKitsFile())
             ' Riscrivo i parametri del KitMach selezionato con gli indici del KitMach precedente
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_TOOL & (SelectedKitMach.nId - 1).ToString("D2"), SelectedKitMach.sToolUUID, m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_TOOLNAME & (SelectedKitMach.nId - 1).ToString("D2"), SelectedKitMach.sToolName, m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_ACTIVE & (SelectedKitMach.nId - 1).ToString("D2"), If(SelectedKitMach.bActive, 1, 0), m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_CONTOUR & (SelectedKitMach.nId - 1).ToString("D2"), SelectedKitMach.nContour, m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_ZIGZAGX & (SelectedKitMach.nId - 1).ToString("D2"), SelectedKitMach.nZigZagY, m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_STEPX & (SelectedKitMach.nId - 1).ToString("D2"), SelectedKitMach.dStepY, m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_ZIGZAGY & (SelectedKitMach.nId - 1).ToString("D2"), SelectedKitMach.nZigZagX, m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_STEPY & (SelectedKitMach.nId - 1).ToString("D2"), SelectedKitMach.dStepX, m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_LILEN & (SelectedKitMach.nId - 1).ToString("D2"), SelectedKitMach.dLiLen, m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_LIHEIGHT & (SelectedKitMach.nId - 1).ToString("D2"), SelectedKitMach.dLiHeight, m_MainWindow.GetKitIniFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_TOOL & (SelectedKitMach.nId - 1).ToString("D2"), SelectedKitMach.sToolUUID, m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_TOOLNAME & (SelectedKitMach.nId - 1).ToString("D2"), SelectedKitMach.sToolName, m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_ACTIVE & (SelectedKitMach.nId - 1).ToString("D2"), If(SelectedKitMach.bActive, 1, 0), m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_CONTOUR & (SelectedKitMach.nId - 1).ToString("D2"), SelectedKitMach.nContour, m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_ZIGZAGX & (SelectedKitMach.nId - 1).ToString("D2"), SelectedKitMach.nZigZagY, m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_STEPX & (SelectedKitMach.nId - 1).ToString("D2"), SelectedKitMach.dStepY, m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_ZIGZAGY & (SelectedKitMach.nId - 1).ToString("D2"), SelectedKitMach.nZigZagX, m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_STEPY & (SelectedKitMach.nId - 1).ToString("D2"), SelectedKitMach.dStepX, m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_LILEN & (SelectedKitMach.nId - 1).ToString("D2"), SelectedKitMach.dLiLen, m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_LIHEIGHT & (SelectedKitMach.nId - 1).ToString("D2"), SelectedKitMach.dLiHeight, m_MainWindow.GetKitsFile())
 
             m_PreviousSelectedKitIndex = KitsLstBx.SelectedItem.nId - 1
             ' Imposto la selezione sul KitMach che ora è stato spostato su di 1 posto
@@ -356,27 +355,27 @@ Public Class PolishingsPageUC
          ' Verifico che non sia l'ultimo KitMach della lista
          If SelectedKitMach.nId < KitMachsLstBx.Items.Count Then
             ' Riscrivo i parametri del KitMach seguente con gli indici del KitMach selezionato
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_TOOL & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId).sToolUUID, m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_TOOLNAME & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId).sToolName, m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_ACTIVE & SelectedKitMach.nId.ToString("D2"), If(KitMachsLstBx.Items(SelectedKitMach.nId).bActive, 1, 0), m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_CONTOUR & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId).nContour, m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_ZIGZAGX & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId).nZigZagY, m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_STEPX & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId).dStepY, m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_ZIGZAGY & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId).nZigZagX, m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_STEPY & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId).dStepX, m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_LILEN & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId).dLiLen, m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_LIHEIGHT & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId).dLiHeight, m_MainWindow.GetKitIniFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_TOOL & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId).sToolUUID, m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_TOOLNAME & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId).sToolName, m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_ACTIVE & SelectedKitMach.nId.ToString("D2"), If(KitMachsLstBx.Items(SelectedKitMach.nId).bActive, 1, 0), m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_CONTOUR & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId).nContour, m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_ZIGZAGX & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId).nZigZagY, m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_STEPX & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId).dStepY, m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_ZIGZAGY & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId).nZigZagX, m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_STEPY & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId).dStepX, m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_LILEN & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId).dLiLen, m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_LIHEIGHT & SelectedKitMach.nId.ToString("D2"), KitMachsLstBx.Items(SelectedKitMach.nId).dLiHeight, m_MainWindow.GetKitsFile())
             ' Riscrivo i parametri del KitMach selezionato con gli indici del KitMach seguente
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_TOOL & (SelectedKitMach.nId + 1).ToString("D2"), SelectedKitMach.sToolUUID, m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_TOOLNAME & (SelectedKitMach.nId + 1).ToString("D2"), SelectedKitMach.sToolName, m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_ACTIVE & (SelectedKitMach.nId + 1).ToString("D2"), If(SelectedKitMach.bActive, 1, 0), m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_CONTOUR & (SelectedKitMach.nId + 1).ToString("D2"), SelectedKitMach.nContour, m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_ZIGZAGX & (SelectedKitMach.nId + 1).ToString("D2"), SelectedKitMach.nZigZagY, m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_STEPX & (SelectedKitMach.nId + 1).ToString("D2"), SelectedKitMach.dStepY, m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_ZIGZAGY & (SelectedKitMach.nId + 1).ToString("D2"), SelectedKitMach.nZigZagX, m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_STEPY & (SelectedKitMach.nId + 1).ToString("D2"), SelectedKitMach.dStepX, m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_LILEN & (SelectedKitMach.nId + 1).ToString("D2"), SelectedKitMach.dLiLen, m_MainWindow.GetKitIniFile())
-            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_LIHEIGHT & (SelectedKitMach.nId + 1).ToString("D2"), SelectedKitMach.dLiHeight, m_MainWindow.GetKitIniFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_TOOL & (SelectedKitMach.nId + 1).ToString("D2"), SelectedKitMach.sToolUUID, m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_TOOLNAME & (SelectedKitMach.nId + 1).ToString("D2"), SelectedKitMach.sToolName, m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_ACTIVE & (SelectedKitMach.nId + 1).ToString("D2"), If(SelectedKitMach.bActive, 1, 0), m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_CONTOUR & (SelectedKitMach.nId + 1).ToString("D2"), SelectedKitMach.nContour, m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_ZIGZAGX & (SelectedKitMach.nId + 1).ToString("D2"), SelectedKitMach.nZigZagY, m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_STEPX & (SelectedKitMach.nId + 1).ToString("D2"), SelectedKitMach.dStepY, m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_ZIGZAGY & (SelectedKitMach.nId + 1).ToString("D2"), SelectedKitMach.nZigZagX, m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_STEPY & (SelectedKitMach.nId + 1).ToString("D2"), SelectedKitMach.dStepX, m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_LILEN & (SelectedKitMach.nId + 1).ToString("D2"), SelectedKitMach.dLiLen, m_MainWindow.GetKitsFile())
+            WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_LIHEIGHT & (SelectedKitMach.nId + 1).ToString("D2"), SelectedKitMach.dLiHeight, m_MainWindow.GetKitsFile())
 
             m_PreviousSelectedKitIndex = KitsLstBx.SelectedItem.nId - 1
             ' Imposto la selezione sul KitMach che ora è stato spostato giù di 1 posto
@@ -398,16 +397,16 @@ Public Class PolishingsPageUC
          Dim nNewKitMachIndex As Integer = m_KitMachList.Count + 1
 
          ' Scrivo subito i valori di default del nuovo KitMach nell'INI
-         WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_TOOL & nNewKitMachIndex.ToString("D2"), ToolUuidList(0), m_MainWindow.GetKitIniFile())
-         WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_TOOLNAME & nNewKitMachIndex.ToString("D2"), "default", m_MainWindow.GetKitIniFile())
-         WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_ACTIVE & nNewKitMachIndex.ToString("D2"), 0, m_MainWindow.GetKitIniFile())
-         WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_CONTOUR & nNewKitMachIndex.ToString("D2"), 0, m_MainWindow.GetKitIniFile())
-         WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_ZIGZAGX & nNewKitMachIndex.ToString("D2"), 0, m_MainWindow.GetKitIniFile())
-         WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_STEPX & nNewKitMachIndex.ToString("D2"), 0, m_MainWindow.GetKitIniFile())
-         WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_ZIGZAGY & nNewKitMachIndex.ToString("D2"), 0, m_MainWindow.GetKitIniFile())
-         WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_STEPY & nNewKitMachIndex.ToString("D2"), 0, m_MainWindow.GetKitIniFile())
-         WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_LILEN & nNewKitMachIndex.ToString("D2"), 0, m_MainWindow.GetKitIniFile())
-         WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_LIHEIGHT & nNewKitMachIndex.ToString("D2"), 0, m_MainWindow.GetKitIniFile())
+         WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_TOOL & nNewKitMachIndex.ToString("D2"), ToolUuidList(0), m_MainWindow.GetKitsFile())
+         WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_TOOLNAME & nNewKitMachIndex.ToString("D2"), "default", m_MainWindow.GetKitsFile())
+         WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_ACTIVE & nNewKitMachIndex.ToString("D2"), 0, m_MainWindow.GetKitsFile())
+         WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_CONTOUR & nNewKitMachIndex.ToString("D2"), 0, m_MainWindow.GetKitsFile())
+         WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_ZIGZAGX & nNewKitMachIndex.ToString("D2"), 0, m_MainWindow.GetKitsFile())
+         WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_STEPX & nNewKitMachIndex.ToString("D2"), 0, m_MainWindow.GetKitsFile())
+         WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_ZIGZAGY & nNewKitMachIndex.ToString("D2"), 0, m_MainWindow.GetKitsFile())
+         WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_STEPY & nNewKitMachIndex.ToString("D2"), 0, m_MainWindow.GetKitsFile())
+         WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_LILEN & nNewKitMachIndex.ToString("D2"), 0, m_MainWindow.GetKitsFile())
+         WritePrivateProfileString(S_KIT & m_KitList(KitsLstBx.SelectedIndex).nId.ToString("D2"), K_LIHEIGHT & nNewKitMachIndex.ToString("D2"), 0, m_MainWindow.GetKitsFile())
 
          m_PreviousSelectedKitIndex = KitsLstBx.SelectedItem.nId - 1
          LoadPage()
diff --git a/Resources/Vacuum.png b/Resources/Vacuum.png
new file mode 100644
index 0000000..fcf3639
Binary files /dev/null and b/Resources/Vacuum.png differ
diff --git a/SideAngle.vb b/SideAngle.vb
index 2f006ef..03c37da 100644
--- a/SideAngle.vb
+++ b/SideAngle.vb
@@ -62,17 +62,15 @@ Module SideAngle
             Return False
       End Select
 
-      ' Se curva chiusa va sicuramente bene
-      if EgtCurveIsClosed( CurrLine) Then Return True
+      ' Se curva chiusa va bene solo se loop esterno
+      if EgtCurveIsClosed( CurrLine) Then Return bOutLoop
 
       ' Delta angolare limite per tangenza
       Const DELTA_ANG_TG As Double = 5.0
       ' Verifico se curva precedente mi permette di inclinare
       Dim bLastOk As Boolean = False
       Select EgtGetType(LastLine)
-         Case GDB_TY.CRV_LINE
-            bLastOk = True
-         Case GDB_TY.CRV_ARC, GDB_TY.CRV_COMPO
+         Case GDB_TY.CRV_LINE, GDB_TY.CRV_ARC, GDB_TY.CRV_COMPO
             ' Ricavo direzione finale curva precedente
             Dim vtLastEnd As Vector3d
             EgtEndVector(LastLine, vtLastEnd)
@@ -90,9 +88,7 @@ Module SideAngle
       ' Verifico se curva successiva mi permette di inclinare
       Dim bNextOk As Boolean = False
       Select EgtGetType(NextLine)
-         Case GDB_TY.CRV_LINE
-            bNextOk = True
-         Case GDB_TY.CRV_ARC, GDB_TY.CRV_COMPO
+         Case GDB_TY.CRV_LINE, GDB_TY.CRV_ARC, GDB_TY.CRV_COMPO
             ' Ricavo direzione finale curva corrente
             Dim vtCurrEnd As Vector3d
             EgtEndVector(CurrLine, vtCurrEnd)
@@ -108,11 +104,7 @@ Module SideAngle
       End Select
 
       ' Se entrambe me lo permettono restituisco vero
-      If bLastOk And bNextOk Then
-         Return True
-      End If
-      Return False
-
+      Return ( bLastOk And bNextOk)
    End Function
 
    Private Function AdjustAsTrfParSides( PartId As Integer) As Boolean 
diff --git a/VacuumMachineButtonUC.xaml.vb b/VacuumMachineButtonUC.xaml.vb
index 3ecc07b..070df89 100644
--- a/VacuumMachineButtonUC.xaml.vb
+++ b/VacuumMachineButtonUC.xaml.vb
@@ -44,8 +44,6 @@ Public Class VacuumMachineButtonUC
    Private Sub ManualAxesMove_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
       If m_bFirst Then
          m_DirectCutPage = m_MainWindow.m_DirectCutPageUC
-         'MachineButton.m_DirectCutPage = m_DirectCutPage
-         'MachineButton.m_CN = m_CN
          m_bFirst = False
 
          ' Lettura configurazione bottoni da Ini di macchina
@@ -107,6 +105,30 @@ Public Class VacuumMachineButtonUC
       End If
    End Sub
 
+   Friend Sub Vacuum2UpChanged(Vacuum2UpState As Boolean)
+      Dim Vacuum2UpButton As TwoStateButton = Nothing
+      For Each MachineButton In m_ButtonList
+         If MachineButton.StateFlag = K_VACUUM2UP Then
+            Vacuum2UpButton = MachineButton
+         End If
+      Next
+      If Not IsNothing(Vacuum2UpButton) Then
+         Vacuum2UpButton.SetIsChecked(Vacuum2UpState)
+      End If
+   End Sub
+
+   Friend Sub Vacuum2DownChanged(Vacuum2DownState As Boolean)
+      Dim Vacuum2DownButton As TwoStateButton = Nothing
+      For Each MachineButton In m_ButtonList
+         If MachineButton.StateFlag = K_VACUUM2DOWN Then
+            Vacuum2DownButton = MachineButton
+         End If
+      Next
+      If Not IsNothing(Vacuum2DownButton) Then
+         Vacuum2DownButton.SetIsChecked(Vacuum2DownState)
+      End If
+   End Sub
+
    Friend Sub Vacuum0Changed(Vacuum0State As Boolean)
       Dim Vacuum0Button As TwoStateButton = Nothing
       For Each MachineButton In m_ButtonList
@@ -131,10 +153,34 @@ Public Class VacuumMachineButtonUC
       End If
    End Sub
 
+   Friend Sub Vacuum1Changed(Vacuum1State As Boolean)
+      Dim Vacuum1StateButton As TwoStateButton = Nothing
+      For Each MachineButton In m_ButtonList
+         If MachineButton.StateFlag = K_VACUUM1STATE Then
+            Vacuum1StateButton = MachineButton
+         End If
+      Next
+      If Not IsNothing(Vacuum1StateButton) Then
+         Vacuum1StateButton.SetIsChecked(Vacuum1State)
+      End If
+   End Sub
+
+   Friend Sub Vacuum2Changed(Vacuum2State As Boolean)
+      Dim Vacuum2StateButton As TwoStateButton = Nothing
+      For Each MachineButton In m_ButtonList
+         If MachineButton.StateFlag = K_VACUUM2STATE Then
+            Vacuum2StateButton = MachineButton
+         End If
+      Next
+      If Not IsNothing(Vacuum2StateButton) Then
+         Vacuum2StateButton.SetIsChecked(Vacuum2State)
+      End If
+   End Sub
+
    Friend Sub Vacuum3Changed(Vacuum3State As Boolean)
       Dim Vacuum3StateButton As TwoStateButton = Nothing
       For Each MachineButton In m_ButtonList
-         If MachineButton.StateFlag = K_VACUU3STATE Then
+         If MachineButton.StateFlag = K_VACUUM3STATE Then
             Vacuum3StateButton = MachineButton
          End If
       Next
@@ -146,7 +192,7 @@ Public Class VacuumMachineButtonUC
    Friend Sub Vacuum4Changed(Vacuum4State As Boolean)
       Dim Vacuum4StateButton As TwoStateButton = Nothing
       For Each MachineButton In m_ButtonList
-         If MachineButton.StateFlag = K_VACUU4STATE Then
+         If MachineButton.StateFlag = K_VACUUM4STATE Then
             Vacuum4StateButton = MachineButton
          End If
       Next
@@ -155,10 +201,34 @@ Public Class VacuumMachineButtonUC
       End If
    End Sub
 
+   Friend Sub Vacuum5Changed(Vacuum5State As Boolean)
+      Dim Vacuum5StateButton As TwoStateButton = Nothing
+      For Each MachineButton In m_ButtonList
+         If MachineButton.StateFlag = K_VACUUM5STATE Then
+            Vacuum5StateButton = MachineButton
+         End If
+      Next
+      If Not IsNothing(Vacuum5StateButton) Then
+         Vacuum5StateButton.SetIsChecked(Vacuum5State)
+      End If
+   End Sub
+
+   Friend Sub Vacuum6Changed(Vacuum6State As Boolean)
+      Dim Vacuum6StateButton As TwoStateButton = Nothing
+      For Each MachineButton In m_ButtonList
+         If MachineButton.StateFlag = K_VACUUM6STATE Then
+            Vacuum6StateButton = MachineButton
+         End If
+      Next
+      If Not IsNothing(Vacuum6StateButton) Then
+         Vacuum6StateButton.SetIsChecked(Vacuum6State)
+      End If
+   End Sub
+
    Friend Sub Vacuum135Changed(Vacuum135State As Boolean)
       Dim Vacuum135StateButton As TwoStateButton = Nothing
       For Each MachineButton In m_ButtonList
-         If MachineButton.StateFlag = K_VACUU135STATE Then
+         If MachineButton.StateFlag = K_VACUUM135STATE Then
             Vacuum135StateButton = MachineButton
          End If
       Next
@@ -170,7 +240,7 @@ Public Class VacuumMachineButtonUC
    Friend Sub Vacuum246Changed(Vacuum246State As Boolean)
       Dim Vacuum246StateButton As TwoStateButton = Nothing
       For Each MachineButton In m_ButtonList
-         If MachineButton.StateFlag = K_VACUU246STATE Then
+         If MachineButton.StateFlag = K_VACUUM246STATE Then
             Vacuum246StateButton = MachineButton
          End If
       Next
@@ -203,6 +273,54 @@ Public Class VacuumMachineButtonUC
       End If
    End Sub
 
+   Friend Sub Open123Changed(Open123State As Boolean)
+      Dim Open123StateButton As TwoStateButton = Nothing
+      For Each MachineButton In m_ButtonList
+         If MachineButton.StateFlag = K_OPEN123STATE Then
+            Open123StateButton = MachineButton
+         End If
+      Next
+      If Not IsNothing(Open123StateButton) Then
+         Open123StateButton.SetIsChecked(Open123State)
+      End If
+   End Sub
+
+   Friend Sub Open456Changed(Open456State As Boolean)
+      Dim Open456StateButton As TwoStateButton = Nothing
+      For Each MachineButton In m_ButtonList
+         If MachineButton.StateFlag = K_OPEN456STATE Then
+            Open456StateButton = MachineButton
+         End If
+      Next
+      If Not IsNothing(Open456StateButton) Then
+         Open456StateButton.SetIsChecked(Open456State)
+      End If
+   End Sub
+
+   Friend Sub Close123Changed(Close123State As Boolean)
+      Dim Close123StateButton As TwoStateButton = Nothing
+      For Each MachineButton In m_ButtonList
+         If MachineButton.StateFlag = K_CLOSE123STATE Then
+            Close123StateButton = MachineButton
+         End If
+      Next
+      If Not IsNothing(Close123StateButton) Then
+         Close123StateButton.SetIsChecked(Close123State)
+      End If
+   End Sub
+
+   Friend Sub Close456Changed(Close456State As Boolean)
+      Dim Close456StateButton As TwoStateButton = Nothing
+      For Each MachineButton In m_ButtonList
+         If MachineButton.StateFlag = K_CLOSE456STATE Then
+            Close456StateButton = MachineButton
+         End If
+      Next
+      If Not IsNothing(Close456StateButton) Then
+         Close456StateButton.SetIsChecked(Close456State)
+      End If
+   End Sub
+
    Friend Sub BlowChanged(BlowState As Boolean)
       Dim BlowStateButton As TwoStateButton = Nothing
       For Each MachineButton In m_ButtonList