diff --git a/MachinePanel/MyMachinePanelVM.vb b/MachinePanel/MyMachinePanelVM.vb
index dce43e5..2d240c4 100644
--- a/MachinePanel/MyMachinePanelVM.vb
+++ b/MachinePanel/MyMachinePanelVM.vb
@@ -149,7 +149,8 @@ Public Class MyMachinePanelVM
       ' Definisco lo stile della ComboBox
       ToolDbWindowVM.BackgroundCmBxTxBl = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
       ToolDbWindowVM.ForegroundCmBxTxBl = Brushes.White
-      ToolDbWindowVM.BorderThicknessCmBxTxBl = 1.0
+      ToolDbWindowVM.BorderBrushCmBxTxBl = Brushes.Black
+      ToolDbWindowVM.BorderThicknessCmBxTxBl = New Thickness(1)
       ToolDbWindowVM.VerticalContentAlignmentCmBxTxBl = "Center"
       ToolDbWindowVM.HeightCmBxTxBl = "25"
       ToolDbWindowVM.WidthCmBxTxBl = "Auto"
@@ -159,7 +160,7 @@ Public Class MyMachinePanelVM
       ToolDbWindowVM.BackgroundButton = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
       ToolDbWindowVM.ForegroundButton = Brushes.White
       ToolDbWindowVM.BorderBrushButton = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
-      ToolDbWindowVM.BorderThicknessButton = 1.0
+      ToolDbWindowVM.BorderThicknessButton = New Thickness(1)
 
       ''Definisco lo stile della DataGrid
       'ToolDbWindowVM.HeaderVisibility = DataGridHeadersVisibility.Column
@@ -230,11 +231,13 @@ Public Class MyMachinePanelVM
       MachDbWindowVM.ForegroundTxBlDisable = Brushes.White
       MachDbWindowVM.GeneralForeground = Brushes.White
       MachDbWindowVM.GeneralBackground = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      MachDbWindowVM.MyForegroundChColor = Brushes.White
 
       ' Definisco lo stile della ComboBox
       MachDbWindowVM.BackgroundCmBxTxBl = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
       MachDbWindowVM.ForegroundCmBxTxBl = Brushes.White
-      MachDbWindowVM.BorderThicknessCmBxTxBl = 1.0
+      MachDbWindowVM.BorderBrushCmBxTxBl = Brushes.Black
+      MachDbWindowVM.BorderThicknessCmBxTxBl = New Thickness(1)
       MachDbWindowVM.VerticalContentAlignmentCmBxTxBl = "Center"
       MachDbWindowVM.HeightCmBxTxBl = "25"
       MachDbWindowVM.WidthCmBxTxBl = "Auto"
@@ -244,28 +247,27 @@ Public Class MyMachinePanelVM
       MachDbWindowVM.BackgroundIsChecked = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
       MachDbWindowVM.ForegroundIsChecked = Brushes.White
       MachDbWindowVM.BorderBrushIsChecked = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
-      MachDbWindowVM.BorderThicknessIsChecked = 1.0
+      MachDbWindowVM.BorderThicknessIsChecked = New Thickness(1)
       MachDbWindowVM.OpacityIsChecked = 0.25
 
       'Definisco lo stile della DataGrid
-      'MachDbWindowVM.HeaderVisibility = DataGridHeadersVisibility.Column
-      'MachDbWindowVM.BackgroundDataGrid = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#484D55"), Brush)
-      'MachDbWindowVM.BackGroundHeader = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#484D55"), Brush)
-      'MachDbWindowVM.ForegroundHeader = Brushes.White
-      'MachDbWindowVM.BorderBrushHeader = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
-      'MachDbWindowVM.BorderThicknessHeader = 0.0
-      'MachDbWindowVM.FontWeightHeader = FontWeights.Bold
-      'MachDbWindowVM.BorderBrushDataGrid = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
-      'MachDbWindowVM.BackgroundDataGridRow = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
-      'MachDbWindowVM.ForegroundDataGridRow = Brushes.White
-      'MachDbWindowVM.BorderBrushDataGridRow = Brushes.DarkGray
-      'MachDbWindowVM.BorderThicknessDataGridRow = "0 0 0 1"
-      'MachDbWindowVM.BorderBrushDataGridCell = Brushes.DarkGray
-      'MachDbWindowVM.BorderThicknessDataGridCell = "0 0 1 0"
+      MachDbWindowVM.HeaderVisibility = DataGridHeadersVisibility.Column
+      MachDbWindowVM.BackgroundDataGrid = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#484D55"), Brush)
+      MachDbWindowVM.BackGroundHeader = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#484D55"), Brush)
+      MachDbWindowVM.ForegroundHeader = Brushes.White
+      MachDbWindowVM.BorderBrushHeader = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      MachDbWindowVM.BorderThicknessHeader = New Thickness(0)
+      MachDbWindowVM.FontWeightHeader = FontWeights.Bold
+      MachDbWindowVM.BorderBrushDataGrid = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      MachDbWindowVM.BackgroundDataGridRow = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      MachDbWindowVM.ForegroundDataGridRow = Brushes.White
+      MachDbWindowVM.BorderBrushDataGridRow = Brushes.DarkGray
+      MachDbWindowVM.BorderThicknessDataGridRow = New Thickness(0, 0, 0, 1)
+      MachDbWindowVM.BorderBrushDataGridCell = Brushes.DarkGray
+      MachDbWindowVM.BorderThicknessDataGridCell = New Thickness(0, 0, 1, 0)
 
       Dim MachDbWindowV As New MyMachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM)
 
-
       If EgtWPFLib5.MachiningTreeViewItem.m_MatType <> 0 Then
          MachDbWindowV.Height = 768
          MachDbWindowV.Width = 1024