diff --git a/MainWindow/MainWindowM.vb b/MainWindow/MainWindowM.vb
index 205930b..7538731 100644
--- a/MainWindow/MainWindowM.vb
+++ b/MainWindow/MainWindowM.vb
@@ -209,8 +209,8 @@ Public Class MainWindowM
       Dim bNetHwKey As Boolean = (GetMainPrivateProfileInt(S_GENERAL, K_NETKEY, 0) = 1)
       EgtSetNetHwKey(bNetHwKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2508, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2508, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2602, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2602, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.PHOTO_BASE)
       ' Inizializzazione generale di EgtInterface
diff --git a/MainWindow/MainWindowV.xaml b/MainWindow/MainWindowV.xaml
index 16179ac..fc95a48 100644
--- a/MainWindow/MainWindowV.xaml
+++ b/MainWindow/MainWindowV.xaml
@@ -6,6 +6,7 @@
    xmlns:EgtPHOTOLib="clr-namespace:EgtPHOTOLib;assembly=EgtPHOTOLib"
    DataContext="{StaticResource MainWindowVM}"
    Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+   TitleBarForeground="{StaticResource Omag_White}"                         
    Title="{Binding Title}" Icon="/Resources/OmagPHOTO.ico"
    MinHeight="600" MinWidth="800"
    AboutBoxCommand="{Binding AboutBoxCommand}" WindowStyle="None" ResizeMode="NoResize"
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 36e5937..6d39cab 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -59,5 +59,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.5.8.1")>
-<Assembly: AssemblyFileVersion("2.5.8.1")>
+<Assembly: AssemblyVersion("2.6.2.1")>
+<Assembly: AssemblyFileVersion("2.6.2.1")>
diff --git a/OptionWindow/OptionWindowV.xaml b/OptionWindow/OptionWindowV.xaml
index 4385906..fd0d22b 100644
--- a/OptionWindow/OptionWindowV.xaml
+++ b/OptionWindow/OptionWindowV.xaml
@@ -44,7 +44,7 @@
          <UniformGrid Columns="2">
             <TextBlock Text="{Binding ThicknessToleranceMsg}"/>
             <EgtWPFLib5:EgtTextBox Text="{Binding ThicknessTolerance}"
-                                   Margin="13,0,0,0"
+                                   Margin="36,0,0,0"
                                    TextAlignment="Right"/>
          </UniformGrid>
       </GroupBox>
@@ -58,7 +58,7 @@
                  <ColumnDefinition Width="3*"/>
                  <ColumnDefinition Width="1*"/>
              </Grid.ColumnDefinitions>
-             <TextBlock Text="{Binding LabelFileName}"/>
+             <TextBlock Text="{Binding LabelFileName}" VerticalAlignment="Center"/>
              <Button Content="{Binding BrowseMsg}" Grid.Column="1"
                   Command="{Binding BrowseCommand}"
                   Style="{StaticResource OptionPanel_TextButton}"
@@ -112,6 +112,9 @@
 
              <ListBox ItemsSource="{Binding MaterialList}"
                   SelectedItem="{Binding SelMaterial}"
+                  Background="{StaticResource Omag_Black}"
+                  Foreground="{StaticResource Omag_White}"
+                  BorderThickness="0"
                   Grid.RowSpan="2"
                   Margin="0,0,0,5"
                   Height="150"/>
diff --git a/Resources/DetailPage/Photo.png b/Resources/DetailPage/Photo.png
index 9fa4c5f..ab8e933 100644
Binary files a/Resources/DetailPage/Photo.png and b/Resources/DetailPage/Photo.png differ
diff --git a/Resources/DetailPage/Remove.png b/Resources/DetailPage/Remove.png
new file mode 100644
index 0000000..eefe7b7
Binary files /dev/null and b/Resources/DetailPage/Remove.png differ
diff --git a/Resources/TopCommandBar/Search.png b/Resources/TopCommandBar/Search.png
index 3a31f61..df41e5f 100644
Binary files a/Resources/TopCommandBar/Search.png and b/Resources/TopCommandBar/Search.png differ
diff --git a/TopCommandBar/TopCommandBarV.xaml b/TopCommandBar/TopCommandBarV.xaml
index b8f63d5..4e872a5 100644
--- a/TopCommandBar/TopCommandBarV.xaml
+++ b/TopCommandBar/TopCommandBarV.xaml
@@ -6,12 +6,14 @@
 
    <!--Barra superiore dei comandi-->
    <Button Command="{Binding NewCommand}"
-           ToolTip="{Binding NewToolTip}">
+           ToolTip="{Binding NewToolTip}"
+           Style="{StaticResource TopCmdBar_Button}">
       <Image Source="/Resources/TopCommandBar/New.png" Stretch="Uniform"/>
    </Button>
     <ToggleButton IsChecked="{Binding Search_IsChecked}"
                  IsEnabled="{Binding Search_IsEnabled}"
-                 ToolTip="{Binding SearchToolTip}">
+                 ToolTip="{Binding SearchToolTip}"
+                 Style="{StaticResource TopCmdBar_ToggleButton}">
       <Image Source="/Resources/TopCommandBar/Search.png" Stretch="Uniform"/>
    </ToggleButton>
    <!--<Button Command="{Binding OpenCommand}"
@@ -41,7 +43,8 @@
    </Button>-->
    <Button Command="{Binding OptionsCommand}"
            ToolTip="{Binding OptionsToolTip}"
-           IsEnabled="{Binding IsEnabled}">
+           IsEnabled="{Binding IsEnabled}"
+           Style="{StaticResource TopCmdBar_Button}">
       <Image Source="/Resources/TopCommandBar/Options.png" Stretch="Uniform"/>
    </Button>
    
diff --git a/Utility/Dictionary.xaml b/Utility/Dictionary.xaml
index e82f4fe..18fc1bc 100644
--- a/Utility/Dictionary.xaml
+++ b/Utility/Dictionary.xaml
@@ -6,462 +6,577 @@
     xmlns:EgtPHOTOLib="clr-namespace:EgtPHOTOLib;assembly=EgtPHOTOLib"
    xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5">
 
-   <!-- 
+    <!-- 
    Assign a Key to every Panel ViewModel to use 
    it in xaml file(ProjectView.xaml).
    -->
-   <OmagPHOTO:MainWindowVM x:Key="MainWindowVM"/>
-   <!--<OmagPHOTO:MySceneHostVM x:Key="MySceneHostVM"/>-->
-   <OmagPHOTO:TopCommandBarVM x:Key="TopCommandBarVM"/>
-   <EgtWPFLib5:StatusBarVM x:Key="StatusBarVM"/>
-   <EgtPHOTOLib:ProjectSlabVM x:Key="ProjectSlabVM"/>
-   <EgtPHOTOLib:OptionPanelSlabVM x:Key="OptionPanelSlabVM"/>
-   <EgtPHOTOLib:ListPageSlabVM x:Key="ListPageSlabVM"/>
-   <EgtPHOTOLib:DetailPageSlabVM x:Key="DetailPageSlabVM"/>
-   <EgtPHOTOLib:SearchPanelSlabVM x:Key="SearchPanelSlabVM"/>
-   <EgtPHOTOLib:MyInstrumentPanelSlabVM x:Key="MyInstrumentPanelSlabVM"/>    
-   <EgtWPFLib5:ShowPanelVM x:Key="ShowPanelVM"/>
-   <EgtWPFLib5:ViewPanelVM x:Key="ViewPanelVM"/>
+    <OmagPHOTO:MainWindowVM x:Key="MainWindowVM"/>
+    <!--<OmagPHOTO:MySceneHostVM x:Key="MySceneHostVM"/>-->
+    <OmagPHOTO:TopCommandBarVM x:Key="TopCommandBarVM"/>
+    <EgtWPFLib5:StatusBarVM x:Key="StatusBarVM"/>
+    <EgtPHOTOLib:ProjectSlabVM x:Key="ProjectSlabVM"/>
+    <EgtPHOTOLib:OptionPanelSlabVM x:Key="OptionPanelSlabVM"/>
+    <EgtPHOTOLib:ListPageSlabVM x:Key="ListPageSlabVM"/>
+    <EgtPHOTOLib:DetailPageSlabVM x:Key="DetailPageSlabVM"/>
+    <EgtPHOTOLib:SearchPanelSlabVM x:Key="SearchPanelSlabVM"/>
+    <EgtPHOTOLib:MyInstrumentPanelSlabVM x:Key="MyInstrumentPanelSlabVM"/>
+    <EgtWPFLib5:ShowPanelVM x:Key="ShowPanelVM"/>
+    <EgtWPFLib5:ViewPanelVM x:Key="ViewPanelVM"/>
 
     <!--Colori predefiniti-->
-   <SolidColorBrush x:Key="Omag_Blue" Color="#FF095CA8" />
-   <SolidColorBrush x:Key="Omag_Yellow" Color="#FFFFCE5B" />
-   <SolidColorBrush x:Key="Omag_Red" Color="Red" />
-   <SolidColorBrush x:Key="Omag_Green" Color="LawnGreen" />
-   <SolidColorBrush x:Key="Omag_VeryLightGray" Color="#FFF2F2F2" />
-   <SolidColorBrush x:Key="Omag_LightGray" Color="LightGray" />
-   <SolidColorBrush x:Key="Omag_Gray" Color="#FF9E9E9E" />
-   <SolidColorBrush x:Key="Omag_DarkGray" Color="#FF444444" />
-   <SolidColorBrush x:Key="Omag_White" Color="#FFFFFFFF" />
-   <SolidColorBrush x:Key="Omag_Black" Color="#FF000000" />
-   
-   <!--Colori per EgtWPFLib5-->
-   <SolidColorBrush x:Key="TextBox.Static.Border" Color="#FFABAdB3"/>
-   <!--Colori per TabHeader-->
-   <LinearGradientBrush x:Key="TabItem.Static.Background" EndPoint="0,1" StartPoint="0,0">
-      <GradientStop Color="#F0F0F0" Offset="0.0"/>
-      <GradientStop Color="#E5E5E5" Offset="1.0"/>
-   </LinearGradientBrush>
+    <SolidColorBrush x:Key="Omag_Blue" Color="#FF095CA8" />
+    <SolidColorBrush x:Key="Omag_Yellow_ORIG" Color="#FFFFCE5B" />
+    <SolidColorBrush x:Key="Omag_Yellow" Color="#FEBE00" />
+    <SolidColorBrush x:Key="Omag_Red" Color="Red" />
+    <SolidColorBrush x:Key="Omag_Green" Color="LawnGreen" />
+    <SolidColorBrush x:Key="Omag_VeryLightGray" Color="#FFF2F2F2" />
+    <SolidColorBrush x:Key="Omag_LightGray" Color="LightGray" />
+    <SolidColorBrush x:Key="Omag_Gray" Color="#FF9E9E9E" />
+    <SolidColorBrush x:Key="Omag_DarkGray" Color="#484D55" />
+    <SolidColorBrush x:Key="Omag_White" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="Omag_Black" Color="#1C1D22" />
 
-   <!--Risorsa che toglie le animazioni dai menù popup per evitare che i menù mru di scelta dei file rimangano aperti se il file è grosso -->
-   <!--o viene eseguito un lua che non aggiorna l'interfaccia-->
-   <PopupAnimation x:Key="{x:Static SystemParameters.MenuPopupAnimationKey}">None</PopupAnimation>
+    <Thickness x:Key="BorderBtn_Thickness">0</Thickness>
+    <Thickness x:Key="BorderGpBx_Thickness">0.25</Thickness>
+    <Thickness x:Key="BorderBrd_Thickness">0.5</Thickness>
 
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
+    <!--Colori per EgtWPFLib5-->
+    <!-- ____________________________________ EGT TEXTBOX ____________________________________  -->
+    <!--Definizione colori per UserControl EgtTextBox-->
+    <!--Colore dello sfondo del border quando è attiva la TextBox-->
+    <SolidColorBrush x:Key="BackgroundBorderEnableFText" Color="#FF444444" />
+    <!--Colore dello sfondo del border quando non è attiva la TextBox-->
+    <SolidColorBrush x:Key="BackgroundBorderEnableTText" Color="#FF000000" />
 
-   <!-- FocusVisual standard-->
-   <Style x:Key="FocusVisual">
-      <Setter Property="Control.Template">
-         <Setter.Value>
-            <ControlTemplate>
-               <Rectangle Margin="2" SnapsToDevicePixels="true" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" StrokeThickness="1" StrokeDashArray="1 2"/>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
+    <!--Colore del contorno quando il Mouse è sopra la TextBox-->
+    <LinearGradientBrush x:Key="BrushBorderIsMouseOverTText" EndPoint="0,20" MappingMode="Absolute" StartPoint="0,0">
+        <GradientStop Color="#1C1D22" Offset="0.05"/>
+        <GradientStop Color="#1C1D22" Offset="0.07"/>
+    </LinearGradientBrush>
 
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
+    <!--Colore del contorno quandodi default la TextBox-->
+    <LinearGradientBrush x:Key="BrushBorderIsMouseOverFText" EndPoint="0,20" MappingMode="Absolute" StartPoint="0,0">
+        <GradientStop Color="#484D55" Offset="0.07"/>
+        <GradientStop Color="#1C1D22" Offset="1"/>
+    </LinearGradientBrush>
 
-   <!-- Button Style -->
+    <!--Colore dello sfondo quando non è abilitata la TextBox-->
+    <SolidColorBrush x:Key="BackgroundTextBlockIsEnableFText" Color="#FF444444" />
+    <!--Colore dello sfondo quando è abilitata la TextBox-->
+    <SolidColorBrush x:Key="BackgroundTextBlockIsEnableTText" Color="#FF000000" />
+    <!--Colore della scritta quando non è selezioonata, ma è attiva la TextBox -->
+    <SolidColorBrush x:Key="ForegroundTextBlockIsEnableTText" Color="White" />
+    <!--Colore della scritta quando non è attiva la TextBox -->
+    <SolidColorBrush x:Key="ForegroundTextBlockIsEnableFText" Color="LightGray" />
+    <!--Colore della scritta quando seleziono la TextBox-->
+    <SolidColorBrush x:Key="ForegroundTextBoxText" Color="White" />
+    <!-- ____________________________________ EGT TEXTBOX ____________________________________  -->
 
-   <SolidColorBrush x:Key="Button.Static.Background" Color="#FFDDDDDD"/>
-   <SolidColorBrush x:Key="Button.Static.Border" Color="#FF707070"/>
-   <SolidColorBrush x:Key="Button.MouseOver.Background" Color="#FFBEE6FD"/>
-   <SolidColorBrush x:Key="Button.MouseOver.Border" Color="#FF3C7FB1"/>
-   <SolidColorBrush x:Key="Button.Pressed.Background" Color="#FFC4E5F6"/>
-   <SolidColorBrush x:Key="Button.Pressed.Border" Color="#FF2C628B"/>
-   <SolidColorBrush x:Key="Button.Disabled.Background" Color="#FFF4F4F4"/>
-   <SolidColorBrush x:Key="Button.Disabled.Border" Color="#FFADB2B5"/>
-   <SolidColorBrush x:Key="Button.Disabled.Foreground" Color="#FF838383"/>
-   <Style TargetType="{x:Type Button}">
-      <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
-      <Setter Property="Background" Value="{StaticResource Button.Static.Background}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource Button.Static.Border}"/>
-      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-      <Setter Property="BorderThickness" Value="1"/>
-      <Setter Property="HorizontalContentAlignment" Value="Center"/>
-      <Setter Property="VerticalContentAlignment" Value="Center"/>
-      <Setter Property="Padding" Value="1"/>
-      <Setter Property="Margin" Value="1"/>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type Button}">
-               <Border x:Name="border" CornerRadius="3" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
-                  <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-               </Border>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsDefaulted" Value="true">
-                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
-                  </Trigger>
-                  <Trigger Property="IsMouseOver" Value="true">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.MouseOver.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
-                  </Trigger>
-                  <Trigger Property="IsPressed" Value="true">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Pressed.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
-                  </Trigger>
-                  <Trigger Property="IsEnabled" Value="false">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Disabled.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Disabled.Border}"/>
-                     <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource Button.Disabled.Foreground}"/>
-                     <Setter Property="OpacityMask" Value="#54707070"/>
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
+    <!--Colori per TabHeader-->
+    <LinearGradientBrush x:Key="TabItem.Static.Background" EndPoint="0,1" StartPoint="0,0">
+        <GradientStop Color="#F0F0F0" Offset="0.0"/>
+        <GradientStop Color="#E5E5E5" Offset="1.0"/>
+    </LinearGradientBrush>
 
-   <!--Template che permette di andare a capo-->
-   <DataTemplate x:Key="WrapButton_DataTemplate">
-      <TextBlock TextWrapping="WrapWithOverflow" Text="{Binding}"/>
-   </DataTemplate>
+    <!--Risorsa che toglie le animazioni dai menù popup per evitare che i menù mru di scelta dei file rimangano aperti se il file è grosso -->
+    <!--o viene eseguito un lua che non aggiorna l'interfaccia-->
+    <PopupAnimation x:Key="{x:Static SystemParameters.MenuPopupAnimationKey}">None</PopupAnimation>
 
-   <Style x:Key="ToolBar_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="30"/>
-   </Style>
-   <Style x:Key="ToolBar_TextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="80"/>
-   </Style>
-   <Style x:Key="OptionPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-      <Setter Property="Height" Value="60"/>
-      <Setter Property="Width" Value="60"/>
-   </Style>
-   <Style x:Key="OptionPanel_TextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-      <Setter Property="Height" Value="30"/>
-   </Style>
-   <Style x:Key="OptionPanel_TextWrapButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-      <Setter Property="ContentTemplate" Value="{StaticResource WrapButton_DataTemplate}" />
-      <Setter Property="TextBlock.TextAlignment" Value="Center"/>
-      <Setter Property="Height" Value="45"/>
-   </Style>
-   <Style x:Key="OptionPanel_NestingButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-      <Setter Property="Height" Value="60"/>
-      <Setter Property="Width" Value="60"/>
-   </Style>
-   <Style x:Key="CompoWindow_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-      <Setter Property="Height" Value="40"/>
-   </Style>
-   <Style x:Key="EgtWPFLib5_InputButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="60"/>
-   </Style>
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
+    <!-- FocusVisual standard-->
+    <Style x:Key="FocusVisual">
+        <Setter Property="Control.Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Rectangle Margin="2" SnapsToDevicePixels="true" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" StrokeThickness="1" StrokeDashArray="1 2"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
-   <!-- ToggleButton Style -->
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <Style TargetType="{x:Type ToggleButton}">
-      <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
-      <Setter Property="Background" Value="{StaticResource Button.Static.Background}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource Button.Static.Border}"/>
-      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-      <Setter Property="BorderThickness" Value="1"/>
-      <Setter Property="HorizontalContentAlignment" Value="Center"/>
-      <Setter Property="VerticalContentAlignment" Value="Center"/>
-      <Setter Property="Padding" Value="1"/>
-      <Setter Property="Margin" Value="1"/>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type ToggleButton}">
-               <Border x:Name="border" CornerRadius="3" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
-                  <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-               </Border>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="Button.IsDefaulted" Value="true">
-                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
-                  </Trigger>
-                  <Trigger Property="IsMouseOver" Value="true">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.MouseOver.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
-                  </Trigger>
-                  <Trigger Property="IsPressed" Value="true">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Pressed.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
-                  </Trigger>
-                  <Trigger Property="IsChecked" Value="true">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource Omag_Yellow}"/> 
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
-                  </Trigger>
-                  <Trigger Property="IsEnabled" Value="false">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Disabled.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Disabled.Border}"/>
-                     <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource Button.Disabled.Foreground}"/>
-                     <Setter Property="OpacityMask" Value="#54707070"/>
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
+    <!-- Button Style -->
 
-   <Style x:Key="ToolBar_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="30"/>
-   </Style>
+    <SolidColorBrush x:Key="Button.Static.Background" Color="#FFDDDDDD"/>
+    <SolidColorBrush x:Key="Button.Static.Border" Color="#FF707070"/>
+    <SolidColorBrush x:Key="Button.MouseOver.Background" Color="#FFBEE6FD"/>
+    <SolidColorBrush x:Key="Button.MouseOver.Border" Color="#FF3C7FB1"/>
+    <SolidColorBrush x:Key="Button.Pressed.Background" Color="#FFC4E5F6"/>
+    <SolidColorBrush x:Key="Button.Pressed.Border" Color="#FF2C628B"/>
+    <SolidColorBrush x:Key="Button.Disabled.Background" Color="#FFF4F4F4"/>
+    <SolidColorBrush x:Key="Button.Disabled.Border" Color="#FFADB2B5"/>
+    <SolidColorBrush x:Key="Button.Disabled.Foreground" Color="#FF838383"/>
+    <Style TargetType="{x:Type Button}">
+        <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
+        <Setter Property="Background" Value="{StaticResource Button.Static.Background}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource Button.Static.Border}"/>
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+        <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Padding" Value="1"/>
+        <Setter Property="Margin" Value="1"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Border x:Name="border" CornerRadius="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+                        <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Background" Value="#FFF4F4F4"/>
+                            <Setter Property="BorderBrush" Value="#FFADB2B5"/>
+                            <Setter Property="TextElement.Foreground"  Value="#FF838383"/>
+                        </Trigger>
+                        <Trigger Property="ToggleButton.IsChecked" Value="True">
+                            <Setter Property="ToggleButton.BorderBrush" Value="{StaticResource Omag_Blue}" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="#008BFF"/>
+                            <Setter Property="BorderBrush" Value="#008BFF"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter Property="Background" Value="#E1B957"/>
+                            <Setter Property="BorderBrush" Value="#E1B957"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
-   <Style x:Key="ToolBar_TextToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="70"/>
-   </Style>
+    <Style x:Key="TopCmdBar_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Height" Value="30"/>
+        <Setter Property="Width" Value="30"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Border x:Name="border" CornerRadius="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+                        <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="OpacityMask" Value="#54707070"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter Property="Background" Value="#008BFF"/>
+                            <Setter Property="BorderBrush" Value="#008BFF"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
-   <Style x:Key="OptionPanel_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
-      <Setter Property="Height" Value="30"/>
-   </Style>
+    <!--Template che permette di andare a capo-->
+    <DataTemplate x:Key="WrapButton_DataTemplate">
+        <TextBlock TextWrapping="WrapWithOverflow" Text="{Binding}"/>
+    </DataTemplate>
 
-   <Style x:Key="OptionPanel_NestingToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
-      <Setter Property="Height" Value="60"/>
-      <Setter Property="Width" Value="60"/>
-   </Style>
+    <Style x:Key="ToolBar_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Height" Value="30"/>
+        <Setter Property="Width" Value="30"/>
+    </Style>
+    <Style x:Key="ToolBar_TextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Height" Value="30"/>
+        <Setter Property="Width" Value="80"/>
+        <Setter Property="Background" Value="{StaticResource Omag_Black}"/>
+        <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
+        <Setter Property="Foreground" Value="{StaticResource Omag_White}" />
+    </Style>
+    <Style x:Key="OptionPanel_ImgButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Height" Value="30"/>
+        <Setter Property="Width" Value="30"/>
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0"/>
+    </Style>
+    <Style x:Key="OptionPanel_TextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Height" Value="30"/>
+        <Setter Property="Width" Value="120"/>
+        <Setter Property="Background" Value="{StaticResource Omag_Black}"/>
+        <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
+        <Setter Property="Foreground" Value="{StaticResource Omag_White}" />
+    </Style>
+    <Style x:Key="OptionPanel_TextWrapButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="ContentTemplate" Value="{StaticResource WrapButton_DataTemplate}" />
+        <Setter Property="TextBlock.TextAlignment" Value="Center"/>
+        <Setter Property="Height" Value="45"/>
+    </Style>
+    <Style x:Key="OptionPanel_NestingButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Height" Value="60"/>
+        <Setter Property="Width" Value="60"/>
+    </Style>
+    <Style x:Key="CompoWindow_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Height" Value="40"/>
+    </Style>
+    <Style x:Key="EgtWPFLib5_InputButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Height" Value="30"/>
+        <Setter Property="Width" Value="60"/>
+    </Style>
 
-   <Style x:Key="CompoWindow_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
-      <Setter Property="Height" Value="40"/>
-   </Style>
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
+    <!-- ToggleButton Style -->
 
-   <!-- TextBlock -->
-   
-   <Style x:Key="ToolsTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Margin" Value="10,0,0,0"/>
-   </Style>
+    <!-- ToggleButton Style -->
 
-   <Style x:Key="MachiningsTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Margin" Value="10,0,0,0"/>
-   </Style>
+    <Style TargetType="{x:Type ToggleButton}">
+        <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
+        <Setter Property="Background" Value="#636974"/>
+        <Setter Property="BorderBrush" Value="#636974"/>
+        <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+        <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Padding" Value="1"/>
+        <Setter Property="Margin" Value="1"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <Border x:Name="border" CornerRadius="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+                        <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="Button.IsDefaulted" Value="true">
+                            <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter Property="Background" Value="#008BFF"/>
+                            <Setter Property="BorderBrush" Value="#008BFF"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="true">
+                            <Setter Property="Background" Value="#E1B957"/>
+                            <Setter Property="BorderBrush" Value="#E1B957"/>
+                        </Trigger>
+                        <Trigger Property="IsChecked" Value="true">
+                            <Setter Property="ToggleButton.Background" Value="{StaticResource Omag_Blue}" />
+                            <Setter Property="ToggleButton.BorderBrush" Value="{StaticResource Omag_Blue}" />
+                            <Setter Property="ToggleButton.Foreground" Value="{StaticResource Omag_Yellow}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <!--<Setter Property="ToggleButton.Background" Value="#FFF4F4F4"/>
+                            <Setter Property="ToggleButton.BorderBrush" Value="#FFADB2B5"/>
+                            <Setter Property="ToggleButton.Foreground" Value="#FF838383"/>-->
+                            <Setter Property="OpacityMask" Value="#54707070"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
-   <Style x:Key="MachiningsToolTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Margin" Value="10,5,0,0"/>
-   </Style>
+    <Style x:Key="TopCmdBar_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Height" Value="30"/>
+        <Setter Property="Width" Value="30"/>
+        <Setter Property="BorderThickness" Value=" 0"/>
+    </Style>
 
-   <Style x:Key="ValidationErrorTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="FontStyle" Value="Italic"/>
-      <Setter Property="TextWrapping" Value="Wrap"/>
-      <Setter Property="Foreground" Value="Red"/>
-      <Setter Property="HorizontalAlignment" Value="Right"/>
-      <Setter Property="Margin" Value="0,1"/>
-   </Style>
 
-   <Style x:Key="OptionTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="VerticalAlignment" Value="Center"/>
-   </Style>
+    <Style x:Key="ToolBar_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+        <Setter Property="Height" Value="30"/>
+        <Setter Property="Width" Value="30"/>
+    </Style>
 
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
+    <Style x:Key="ToolBar_TextToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+        <Setter Property="Height" Value="30"/>
+        <Setter Property="Width" Value="70"/>
+    </Style>
 
-   <!-- TextBox -->
+    <Style x:Key="OptionPanel_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+        <Setter Property="Height" Value="30"/>
+        <Setter Property="Width" Value="80"/>
+        <Setter Property="Background" Value="{StaticResource Omag_DarkGray}"/>
+        <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
+        <Setter Property="Foreground" Value="{StaticResource Omag_White}" />
+    </Style>
 
-   <Style TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
-      <Setter Property="Height" Value="22"/>
-      <Setter Property="VerticalContentAlignment" Value="Center"/>
-      <Setter Property="HorizontalContentAlignment" Value="Right"/>
-      <Setter Property="ExplicitUpdateSource" Value="EnterKeyPress"/>
-   </Style>
+    <Style x:Key="OptionPanel_NestingToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+        <Setter Property="Height" Value="60"/>
+        <Setter Property="Width" Value="60"/>
+    </Style>
 
-   <Style x:Key="ToolsTextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
-      <Setter Property="Margin" Value="0,0,5,0"/>
-   </Style>
+    <Style x:Key="CompoWindow_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+        <Setter Property="Height" Value="40"/>
+    </Style>
 
-   <Style x:Key="MachiningsTextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
-      <Setter Property="Margin" Value="0,0,0,10"/>
-   </Style>
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <Style x:Key="MachiningsToolTextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
-      <Setter Property="Margin" Value="0,0,5,0"/>
-   </Style>
+    <!-- TextBlock -->
 
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
+    <Style x:Key="ToolsTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+        <Setter Property="Margin" Value="10,0,0,0"/>
+    </Style>
 
-   <!-- MachGroup -->
+    <Style x:Key="MachiningsTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+        <Setter Property="Margin" Value="10,0,0,0"/>
+    </Style>
 
-   <SolidColorBrush x:Key="ScrollBar.Static.Background" Color="#F0F0F0"/>
-   <SolidColorBrush x:Key="ScrollBar.Static.Border" Color="#F0F0F0"/>
-   <SolidColorBrush x:Key="ScrollBar.Pressed.Glyph" Color="#FFFFFF"/>
-   <SolidColorBrush x:Key="ScrollBar.MouseOver.Glyph" Color="#000000"/>
-   <SolidColorBrush x:Key="ScrollBar.Disabled.Glyph" Color="#BFBFBF"/>
-   <SolidColorBrush x:Key="ScrollBar.Static.Glyph" Color="#606060"/>
-   <SolidColorBrush x:Key="ScrollBar.MouseOver.Background" Color="#DADADA"/>
-   <SolidColorBrush x:Key="ScrollBar.MouseOver.Border" Color="#DADADA"/>
-   <SolidColorBrush x:Key="ScrollBar.Pressed.Background" Color="#606060"/>
-   <SolidColorBrush x:Key="ScrollBar.Pressed.Border" Color="#606060"/>
-   <SolidColorBrush x:Key="ScrollBar.Disabled.Background" Color="#F0F0F0"/>
-   <SolidColorBrush x:Key="ScrollBar.Disabled.Border" Color="#F0F0F0"/>
-   <Style x:Key="CustomScrollBarButton" TargetType="{x:Type RepeatButton}">
-      <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
-      <Setter Property="BorderThickness" Value="1"/>
-      <Setter Property="HorizontalContentAlignment" Value="Center"/>
-      <Setter Property="VerticalContentAlignment" Value="Center"/>
-      <Setter Property="Padding" Value="1"/>
-      <Setter Property="Focusable" Value="false"/>
-      <Setter Property="IsTabStop" Value="false"/>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type RepeatButton}">
-               <Border x:Name="border" CornerRadius="3" BorderBrush="{StaticResource ScrollBar.Static.Border}" BorderThickness="1" Background="{StaticResource ScrollBar.Static.Background}" SnapsToDevicePixels="true">
-                  <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-               </Border>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsMouseOver" Value="true">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource ScrollBar.MouseOver.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource ScrollBar.MouseOver.Border}"/>
-                  </Trigger>
-                  <Trigger Property="IsPressed" Value="true">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource ScrollBar.Pressed.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource ScrollBar.Pressed.Border}"/>
-                  </Trigger>
-                  <Trigger Property="IsEnabled" Value="false">
-                     <Setter Property="Opacity" TargetName="contentPresenter" Value="0.56"/>
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource ScrollBar.Disabled.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource ScrollBar.Disabled.Border}"/>
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
+    <Style x:Key="MachiningsToolTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+        <Setter Property="Margin" Value="10,5,0,0"/>
+    </Style>
 
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
+    <Style x:Key="ValidationErrorTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+        <Setter Property="FontStyle" Value="Italic"/>
+        <Setter Property="TextWrapping" Value="Wrap"/>
+        <Setter Property="Foreground" Value="Red"/>
+        <Setter Property="HorizontalAlignment" Value="Right"/>
+        <Setter Property="Margin" Value="0,1"/>
+    </Style>
 
-   <!-- Border -->
+    <Style x:Key="OptionTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+        <Setter Property="VerticalAlignment" Value="Center"/>
+    </Style>
 
-   <Style x:Key="DefaultBorder" TargetType="{x:Type Border}">
-      <Setter Property="BorderBrush" Value="#D5DFE5"/>
-      <Setter Property="BorderThickness" Value="1"/>
-      <Setter Property="CornerRadius" Value="3"/>
-      <Setter Property="Padding" Value="3"/>
-      <Setter Property="Margin" Value="1"/>
-   </Style>
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <Style x:Key="Border" TargetType="{x:Type Border}">
-      <Setter Property="BorderThickness" Value="1"/>
-      <Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>
-      <Setter Property="CornerRadius" Value="3"/>
-      <Setter Property="Padding" Value="3"/>
-   </Style>
-   
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
+    <!-- TextBox -->
 
-   <!-- EgtCustomWindow -->
+    <Style TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
+        <Setter Property="Height" Value="22"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Right"/>
+        <Setter Property="ExplicitUpdateSource" Value="EnterKeyPress"/>
 
-   <Style TargetType="{x:Type EgtWPFLib5:EgtCustomWindow}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
+        <Setter Property="BackgroundBrdEnable" Value="{StaticResource Omag_Black}"/>
+        <Setter Property="BackgroundBrdDisable" Value="{StaticResource Omag_Black}"/>
+        <Setter Property="BorderBrushIsMouseOver" Value="{StaticResource Omag_Black}"/>
+        <Setter Property="BorderBrushIsFocused" Value="{StaticResource Omag_White}"/>
+        <Setter Property="GeneralBorderBrush" Value="{StaticResource BrushBorderIsMouseOverTText}"/>
+        <Setter Property="BackgroundTxBlDisable" Value="{StaticResource BrushBorderIsMouseOverTText}"/>
+        <Setter Property="ForegroundTxBlEnable" Value="{StaticResource Omag_White}"/>
+        <Setter Property="ForegroundTxBlDisable" Value="{StaticResource Omag_Gray}"/>
+        <Setter Property="GeneralForeground" Value="{StaticResource Omag_White}"/>
+        <Setter Property="GeneralBackground" Value="{StaticResource Omag_Black}"/>
+    </Style>
+
+    <Style x:Key="ToolsTextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
+        <Setter Property="Margin" Value="0,0,5,0"/>
+    </Style>
+
+    <Style x:Key="MachiningsTextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
+        <Setter Property="Margin" Value="0,0,0,10"/>
+    </Style>
+
+    <Style x:Key="MachiningsToolTextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
+        <Setter Property="Margin" Value="0,0,5,0"/>
+    </Style>
+
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+    <!-- MachGroup -->
+
+    <SolidColorBrush x:Key="ScrollBar.Static.Background" Color="#F0F0F0"/>
+    <SolidColorBrush x:Key="ScrollBar.Static.Border" Color="#F0F0F0"/>
+    <SolidColorBrush x:Key="ScrollBar.Pressed.Glyph" Color="#FFFFFF"/>
+    <SolidColorBrush x:Key="ScrollBar.MouseOver.Glyph" Color="#000000"/>
+    <SolidColorBrush x:Key="ScrollBar.Disabled.Glyph" Color="#BFBFBF"/>
+    <SolidColorBrush x:Key="ScrollBar.Static.Glyph" Color="#606060"/>
+    <SolidColorBrush x:Key="ScrollBar.MouseOver.Background" Color="#DADADA"/>
+    <SolidColorBrush x:Key="ScrollBar.MouseOver.Border" Color="#DADADA"/>
+    <SolidColorBrush x:Key="ScrollBar.Pressed.Background" Color="#606060"/>
+    <SolidColorBrush x:Key="ScrollBar.Pressed.Border" Color="#606060"/>
+    <SolidColorBrush x:Key="ScrollBar.Disabled.Background" Color="#F0F0F0"/>
+    <SolidColorBrush x:Key="ScrollBar.Disabled.Border" Color="#F0F0F0"/>
+    <Style x:Key="CustomScrollBarButton" TargetType="{x:Type RepeatButton}">
+        <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Padding" Value="1"/>
+        <Setter Property="Focusable" Value="false"/>
+        <Setter Property="IsTabStop" Value="false"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RepeatButton}">
+                    <Border x:Name="border" CornerRadius="3" BorderBrush="{StaticResource ScrollBar.Static.Border}" BorderThickness="1" Background="{StaticResource ScrollBar.Static.Background}" SnapsToDevicePixels="true">
+                        <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter Property="Background" TargetName="border" Value="{StaticResource ScrollBar.MouseOver.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource ScrollBar.MouseOver.Border}"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="true">
+                            <Setter Property="Background" TargetName="border" Value="{StaticResource ScrollBar.Pressed.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource ScrollBar.Pressed.Border}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Opacity" TargetName="contentPresenter" Value="0.56"/>
+                            <Setter Property="Background" TargetName="border" Value="{StaticResource ScrollBar.Disabled.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource ScrollBar.Disabled.Border}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+    <!-- Border -->
+
+    <Style x:Key="DefaultBorder" TargetType="{x:Type Border}">
+        <Setter Property="BorderBrush" Value="#D5DFE5"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="CornerRadius" Value="3"/>
+        <Setter Property="Padding" Value="3"/>
+        <Setter Property="Margin" Value="1"/>
+    </Style>
+
+    <Style x:Key="Border" TargetType="{x:Type Border}">
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>
+        <Setter Property="CornerRadius" Value="3"/>
+        <Setter Property="Padding" Value="3"/>
+    </Style>
+
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+    <!-- EgtCustomWindow -->
+
+    <!--<Style TargetType="{x:Type EgtWPFLib5:EgtCustomWindow}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
       <Setter Property="TitleBarHeight" Value="32"/>
       <Setter Property="TitleBarBrush" Value="{StaticResource Omag_LightGray}"/>
       <Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>
-   </Style>
+   </Style>-->
 
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!-- EgtFloatingPanel -->
-
-   <Style x:Key="ToolBar_EgtFloatingPanel" TargetType="{x:Type EgtFloating:EgtFloatingPanel}" BasedOn="{StaticResource {x:Type EgtFloating:EgtFloatingPanel}}">
-      <Setter Property="Background" Value="{StaticResource Omag_Gray}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>
+    <Style TargetType="{x:Type EgtWPFLib5:EgtCustomWindow}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
+        <Setter Property="TitleBarHeight" Value="32"/>
+        <!--<Setter Property="TitleBarBrush" Value="{StaticResource Omag_LightGray}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>-->
+        <Setter Property="Background" Value ="{StaticResource Omag_DarkGray}"/>
+        <Setter Property="TitleBarForeground" Value="{StaticResource Omag_White}" />
+        <Setter Property="TitleBarBrush" Value="{StaticResource Omag_DarkGray}" />
+        <Setter Property="BorderBrush" Value="Transparent" />
     </Style>
 
-   <Style x:Key="Option_EgtFloatingPanel" TargetType="{x:Type EgtFloating:EgtFloatingPanel}" BasedOn="{StaticResource {x:Type EgtFloating:EgtFloatingPanel}}">
-      <Setter Property="TitleBarOrientation" Value="Vertical"/>
-      <Setter Property="Background" Value="{StaticResource Omag_Gray}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>
+    <Style x:Key="MainWindowStyle"  TargetType="{x:Type EgtWPFLib5:EgtCustomWindow}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
+        <Setter Property="TitleBarHeight" Value="32"/>
+        <!--<Setter Property="TitleBarBrush" Value="{StaticResource Omag_LightGray}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>-->
+        <Setter Property="Background" Value ="{StaticResource Omag_DarkGray}"/>
+        <Setter Property="TitleBarForeground" Value="{StaticResource Omag_White}" />
+        <Setter Property="TitleBarBrush" Value="{StaticResource Omag_DarkGray}" />
+        <Setter Property="BorderBrush" Value="Transparent" />
     </Style>
 
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!-- CsvTreeViewItem DA CAMBIARE!! -->
+    <!-- EgtFloatingPanel -->
 
-   <SolidColorBrush x:Key="TreeViewItem.TreeArrow.Static.Checked.Fill" Color="#FF595959"/>
-   <SolidColorBrush x:Key="TreeViewItem.TreeArrow.Static.Checked.Stroke" Color="#FF262626"/>
-   <SolidColorBrush x:Key="TreeViewItem.TreeArrow.MouseOver.Stroke" Color="#FF1BBBFA"/>
-   <SolidColorBrush x:Key="TreeViewItem.TreeArrow.MouseOver.Fill" Color="Transparent"/>
-   <SolidColorBrush x:Key="TreeViewItem.TreeArrow.MouseOver.Checked.Stroke" Color="#FF262626"/>
-   <SolidColorBrush x:Key="TreeViewItem.TreeArrow.MouseOver.Checked.Fill" Color="#FF595959"/>
-   <PathGeometry x:Key="TreeArrow" Figures="M0,0 L0,6 L6,0 z"/>
-   <SolidColorBrush x:Key="TreeViewItem.TreeArrow.Static.Fill" Color="Transparent"/>
-   <SolidColorBrush x:Key="TreeViewItem.TreeArrow.Static.Stroke" Color="#FF989898"/>
-   <Style x:Key="ExpandCollapseToggleStyle" TargetType="{x:Type ToggleButton}">
-      <Setter Property="Focusable" Value="False"/>
-      <Setter Property="Width" Value="16"/>
-      <Setter Property="Height" Value="16"/>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type ToggleButton}">
-               <Border Background="Transparent" Height="16" Padding="5,5,5,5" Width="16">
-                  <Path x:Name="ExpandPath" Data="{StaticResource TreeArrow}" Fill="{StaticResource TreeViewItem.TreeArrow.Static.Fill}" Stroke="{StaticResource TreeViewItem.TreeArrow.Static.Stroke}">
-                     <Path.RenderTransform>
-                        <RotateTransform Angle="135" CenterY="3" CenterX="3"/>
-                     </Path.RenderTransform>
-                  </Path>
-               </Border>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsChecked" Value="True">
-                     <Setter Property="RenderTransform" TargetName="ExpandPath">
-                        <Setter.Value>
-                           <RotateTransform Angle="180" CenterY="3" CenterX="3"/>
-                        </Setter.Value>
-                     </Setter>
-                     <Setter Property="Fill" TargetName="ExpandPath" Value="{StaticResource TreeViewItem.TreeArrow.Static.Checked.Fill}"/>
-                     <Setter Property="Stroke" TargetName="ExpandPath" Value="{StaticResource TreeViewItem.TreeArrow.Static.Checked.Stroke}"/>
-                  </Trigger>
-                  <Trigger Property="IsMouseOver" Value="True">
-                     <Setter Property="Stroke" TargetName="ExpandPath" Value="{StaticResource TreeViewItem.TreeArrow.MouseOver.Stroke}"/>
-                     <Setter Property="Fill" TargetName="ExpandPath" Value="{StaticResource TreeViewItem.TreeArrow.MouseOver.Fill}"/>
-                  </Trigger>
-                  <MultiTrigger>
-                     <MultiTrigger.Conditions>
-                        <Condition Property="IsMouseOver" Value="True"/>
-                        <Condition Property="IsChecked" Value="True"/>
-                     </MultiTrigger.Conditions>
-                     <Setter Property="Stroke" TargetName="ExpandPath" Value="{StaticResource TreeViewItem.TreeArrow.MouseOver.Checked.Stroke}"/>
-                     <Setter Property="Fill" TargetName="ExpandPath" Value="{StaticResource TreeViewItem.TreeArrow.MouseOver.Checked.Fill}"/>
-                  </MultiTrigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
+    <Style x:Key="ToolBar_EgtFloatingPanel" TargetType="{x:Type EgtFloating:EgtFloatingPanel}" BasedOn="{StaticResource {x:Type EgtFloating:EgtFloatingPanel}}">
+        <Setter Property="Background" Value="{StaticResource Omag_Gray}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>
+    </Style>
 
-   <Style x:Key="CsvPartItemStyle" TargetType="{x:Type TreeViewItem}">
-      <Setter Property="IsSelected" Value="{Binding IsSelected}" />
-      <Setter Property="IsExpanded" Value="{Binding IsExpanded}" />
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type TreeViewItem}">
-               <Grid>
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition MinWidth="19" Width="Auto"/>
-                     <ColumnDefinition Width="Auto"/>
-                     <ColumnDefinition Width="*"/>
-                  </Grid.ColumnDefinitions>
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="Auto"/>
-                     <RowDefinition/>
-                  </Grid.RowDefinitions>
-                  <Border x:Name="ExpanderBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-                     <ToggleButton x:Name="Expander" ClickMode="Press" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ExpandCollapseToggleStyle}"/>
-                  </Border>
-                  <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.Column="1" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-                     <ContentPresenter x:Name="PART_Header" ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                  </Border>
-                  <ItemsPresenter x:Name="ItemsHost" Grid.ColumnSpan="2" Grid.Column="1" Grid.Row="1"/>
-               </Grid>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsExpanded" Value="false">
-                     <Setter Property="Visibility" TargetName="ItemsHost" Value="Collapsed"/>
-                  </Trigger>
-                  <Trigger Property="HasItems" Value="false">
-                     <Setter Property="Visibility" TargetName="Expander" Value="Hidden"/>
-                  </Trigger>
-                  <Trigger Property="IsSelected" Value="true">
-                     <Setter Property="Background" TargetName="Bd" Value="Transparent"/>
-                     <Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
-                     <Setter Property="BorderThickness" TargetName="Bd" Value="0,1,1,1"/>
-                     <Setter Property="Background" TargetName="ExpanderBorder" Value="Transparent"/>
-                     <Setter Property="BorderBrush" TargetName="ExpanderBorder" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
-                     <Setter Property="BorderThickness" TargetName="ExpanderBorder" Value="1,1,0,1"/>
-                     <!--<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}"/>-->
-                  </Trigger>
-                  <!--<MultiTrigger>
+    <Style x:Key="Option_EgtFloatingPanel" TargetType="{x:Type EgtFloating:EgtFloatingPanel}" BasedOn="{StaticResource {x:Type EgtFloating:EgtFloatingPanel}}">
+        <Setter Property="TitleBarOrientation" Value="Vertical"/>
+        <Setter Property="Background" Value="{StaticResource Omag_Gray}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>
+    </Style>
+
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+    <!-- CsvTreeViewItem DA CAMBIARE!! -->
+
+    <SolidColorBrush x:Key="TreeViewItem.TreeArrow.Static.Checked.Fill" Color="#FF595959"/>
+    <SolidColorBrush x:Key="TreeViewItem.TreeArrow.Static.Checked.Stroke" Color="#FF262626"/>
+    <SolidColorBrush x:Key="TreeViewItem.TreeArrow.MouseOver.Stroke" Color="#FF1BBBFA"/>
+    <SolidColorBrush x:Key="TreeViewItem.TreeArrow.MouseOver.Fill" Color="Transparent"/>
+    <SolidColorBrush x:Key="TreeViewItem.TreeArrow.MouseOver.Checked.Stroke" Color="#FF262626"/>
+    <SolidColorBrush x:Key="TreeViewItem.TreeArrow.MouseOver.Checked.Fill" Color="#FF595959"/>
+    <PathGeometry x:Key="TreeArrow" Figures="M0,0 L0,6 L6,0 z"/>
+    <SolidColorBrush x:Key="TreeViewItem.TreeArrow.Static.Fill" Color="Transparent"/>
+    <SolidColorBrush x:Key="TreeViewItem.TreeArrow.Static.Stroke" Color="#FF989898"/>
+    <Style x:Key="ExpandCollapseToggleStyle" TargetType="{x:Type ToggleButton}">
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="Width" Value="16"/>
+        <Setter Property="Height" Value="16"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <Border Background="Transparent" Height="16" Padding="5,5,5,5" Width="16">
+                        <Path x:Name="ExpandPath" Data="{StaticResource TreeArrow}" Fill="{StaticResource TreeViewItem.TreeArrow.Static.Fill}" Stroke="{StaticResource TreeViewItem.TreeArrow.Static.Stroke}">
+                            <Path.RenderTransform>
+                                <RotateTransform Angle="135" CenterY="3" CenterX="3"/>
+                            </Path.RenderTransform>
+                        </Path>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter Property="RenderTransform" TargetName="ExpandPath">
+                                <Setter.Value>
+                                    <RotateTransform Angle="180" CenterY="3" CenterX="3"/>
+                                </Setter.Value>
+                            </Setter>
+                            <Setter Property="Fill" TargetName="ExpandPath" Value="{StaticResource TreeViewItem.TreeArrow.Static.Checked.Fill}"/>
+                            <Setter Property="Stroke" TargetName="ExpandPath" Value="{StaticResource TreeViewItem.TreeArrow.Static.Checked.Stroke}"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Stroke" TargetName="ExpandPath" Value="{StaticResource TreeViewItem.TreeArrow.MouseOver.Stroke}"/>
+                            <Setter Property="Fill" TargetName="ExpandPath" Value="{StaticResource TreeViewItem.TreeArrow.MouseOver.Fill}"/>
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsMouseOver" Value="True"/>
+                                <Condition Property="IsChecked" Value="True"/>
+                            </MultiTrigger.Conditions>
+                            <Setter Property="Stroke" TargetName="ExpandPath" Value="{StaticResource TreeViewItem.TreeArrow.MouseOver.Checked.Stroke}"/>
+                            <Setter Property="Fill" TargetName="ExpandPath" Value="{StaticResource TreeViewItem.TreeArrow.MouseOver.Checked.Fill}"/>
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="CsvPartItemStyle" TargetType="{x:Type TreeViewItem}">
+        <Setter Property="IsSelected" Value="{Binding IsSelected}" />
+        <Setter Property="IsExpanded" Value="{Binding IsExpanded}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type TreeViewItem}">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition MinWidth="19" Width="Auto"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition/>
+                        </Grid.RowDefinitions>
+                        <Border x:Name="ExpanderBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+                            <ToggleButton x:Name="Expander" ClickMode="Press" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ExpandCollapseToggleStyle}"/>
+                        </Border>
+                        <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.Column="1" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+                            <ContentPresenter x:Name="PART_Header" ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </Border>
+                        <ItemsPresenter x:Name="ItemsHost" Grid.ColumnSpan="2" Grid.Column="1" Grid.Row="1"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsExpanded" Value="false">
+                            <Setter Property="Visibility" TargetName="ItemsHost" Value="Collapsed"/>
+                        </Trigger>
+                        <Trigger Property="HasItems" Value="false">
+                            <Setter Property="Visibility" TargetName="Expander" Value="Hidden"/>
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="true">
+                            <Setter Property="Background" TargetName="Bd" Value="Transparent"/>
+                            <Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                            <Setter Property="BorderThickness" TargetName="Bd" Value="0,1,1,1"/>
+                            <Setter Property="Background" TargetName="ExpanderBorder" Value="Transparent"/>
+                            <Setter Property="BorderBrush" TargetName="ExpanderBorder" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                            <Setter Property="BorderThickness" TargetName="ExpanderBorder" Value="1,1,0,1"/>
+                            <!--<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}"/>-->
+                        </Trigger>
+                        <!--<MultiTrigger>
                                  <MultiTrigger.Conditions>
                                     <Condition Property="IsSelected" Value="true"/>
                                     <Condition Property="IsSelectionActive" Value="false"/>
@@ -469,37 +584,180 @@
                                  <Setter Property="Background" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
                                  <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
                               </MultiTrigger>-->
-                  <Trigger Property="IsEnabled" Value="false">
-                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!-- ComboBox -->
+    <LinearGradientBrush x:Key="ButtonNormalBackground" EndPoint="0,1" StartPoint="0,0">
+        <GradientStop Color="#F3F3F3" Offset="0"/>
+        <GradientStop Color="#EBEBEB" Offset="0.5"/>
+        <GradientStop Color="#DDDDDD" Offset="0.5"/>
+        <GradientStop Color="#CDCDCD" Offset="1"/>
+    </LinearGradientBrush>
+    <SolidColorBrush x:Key="ButtonNormalBorder" Color="#FF707070"/>
+    <LinearGradientBrush x:Key="TextBoxBorder" EndPoint="0,20" MappingMode="Absolute" StartPoint="0,0">
+        <GradientStop Color="#ABADB3" Offset="0.05"/>
+        <GradientStop Color="#E2E3EA" Offset="0.07"/>
+        <GradientStop Color="#E3E9EF" Offset="1"/>
+    </LinearGradientBrush>
+    <Style x:Key="ComboBoxFocusVisual">
+        <Setter Property="Control.Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Rectangle Margin="4,4,21,4" StrokeDashArray="1 2" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" SnapsToDevicePixels="true" StrokeThickness="1"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Geometry x:Key="DownArrowGeometry">M 0 0 L 3.5 4 L 7 0 Z</Geometry>
+    <Style x:Key="ComboBoxReadonlyToggleButton" TargetType="{x:Type ToggleButton}">
+        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <Setter Property="IsTabStop" Value="false"/>
+        <Setter Property="Focusable" Value="false"/>
+        <Setter Property="ClickMode" Value="Press"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <Border x:Name="Chrome" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}">
+                        <Grid HorizontalAlignment="Right" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
+                            <Path x:Name="Arrow" Data="{StaticResource DownArrowGeometry}" Fill="White" HorizontalAlignment="Center" Margin="3,1,0,0" VerticalAlignment="Center"/>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Fill" TargetName="Arrow" Value="#AFAFAF"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
+        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <Setter Property="IsTabStop" Value="false"/>
+        <Setter Property="Focusable" Value="false"/>
+        <Setter Property="ClickMode" Value="Press"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <Border x:Name="Chrome" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" SnapsToDevicePixels="true" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
+                        <Path x:Name="Arrow" Data="{StaticResource DownArrowGeometry}" Fill="White" HorizontalAlignment="Center" Margin="0,1,0,0" VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Fill" TargetName="Arrow" Value="#AFAFAF"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
-   <Style x:Key="MachiningsComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
-      <Setter Property="Margin" Value="0,0,0,10"/>
-   </Style>
+    <Style TargetType="{x:Type ComboBox}">
+        <Setter Property="Background" Value="{StaticResource Omag_Black}"/>
+        <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Height" Value="25" />
+        <Setter Property="Width" Value="Auto" />
 
-   <Style x:Key="MachiningsToolComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
-      <Setter Property="Margin" Value="0,0,5,0"/>
-   </Style>
+        <Setter Property="FocusVisualStyle" Value="{StaticResource ComboBoxFocusVisual}"/>
+        <!--<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"/>-->
+        <!--<Setter Property="Background" Value="{StaticResource ButtonNormalBackground}"/>-->
+        <Setter Property="BorderBrush" Value="{StaticResource ButtonNormalBorder}"/>
+        <!--<Setter Property="BorderThickness" Value="1"/>-->
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="Padding" Value="4,3"/>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
+        <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ComboBox}">
+                    <Grid x:Name="MainGrid" SnapsToDevicePixels="true">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Width="0"/>
+                        </Grid.ColumnDefinitions>
+                        <Popup x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" Placement="Bottom" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Width="{Binding ActualWidth, ElementName=MainGrid}" >
+                            <Border x:Name="DropDownBorder" Background="{TemplateBinding Background}" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="{TemplateBinding BorderThickness}">
+                                <ScrollViewer x:Name="DropDownScrollViewer">
+                                    <Grid RenderOptions.ClearTypeHint="Enabled">
+                                        <Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
+                                            <Rectangle x:Name="OpaqueRect" Fill="{Binding Background, ElementName=DropDownBorder}" Height="{Binding ActualHeight, ElementName=DropDownBorder}" Width="{Binding ActualWidth, ElementName=DropDownBorder}"/>
+                                        </Canvas>
+                                        <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                    </Grid>
+                                </ScrollViewer>
+                            </Border>
+                        </Popup>
+                        <ToggleButton Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxReadonlyToggleButton}"/>
+                        <ContentPresenter ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" Content="{TemplateBinding SelectionBoxItem}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="false" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="HasItems" Value="false">
+                            <Setter Property="Height" TargetName="DropDownBorder" Value="95"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                            <Setter Property="Background" Value="#FFF4F4F4"/>
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsGrouping" Value="true"/>
+                            </MultiTrigger.Conditions>
+                            <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+                        </MultiTrigger>
+                        <Trigger Property="ScrollViewer.CanContentScroll" SourceName="DropDownScrollViewer" Value="false">
+                            <Setter Property="Canvas.Top" TargetName="OpaqueRect" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}"/>
+                            <Setter Property="Canvas.Left" TargetName="OpaqueRect" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
+    <Style x:Key="MachiningsComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
+        <Setter Property="Margin" Value="0,0,0,10"/>
+    </Style>
 
-   <!-- CheckBox -->
+    <Style x:Key="MachiningsToolComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
+        <Setter Property="Margin" Value="0,0,5,0"/>
+    </Style>
 
-   <Style x:Key="OptionCheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="HorizontalAlignment" Value="Right"/>
-      <Setter Property="Margin" Value="10,0,0,0"/>
-   </Style>
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
+    <!-- CheckBox -->
 
+    <Style x:Key="OptionCheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="HorizontalAlignment" Value="Right"/>
+        <Setter Property="Margin" Value="10,0,0,0"/>
+    </Style>
+
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+    <!-- GroupBox -->
+
+    <Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource {x:Type GroupBox}}">
+        <Setter Property="BorderThickness" Value="{StaticResource BorderGpBx_Thickness}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource Omag_White}"/>
+        <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
+        <Setter Property="Margin" Value="0,0,0,0"/>
+    </Style>
+
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
+    
+    
 </ResourceDictionary>