diff --git a/EgtBEAMWALL.Core/ConfigurationPage/General_ConfigurationPageV.xaml b/EgtBEAMWALL.Core/ConfigurationPage/General_ConfigurationPageV.xaml
index cb1967d0..3fe2ca1b 100644
--- a/EgtBEAMWALL.Core/ConfigurationPage/General_ConfigurationPageV.xaml
+++ b/EgtBEAMWALL.Core/ConfigurationPage/General_ConfigurationPageV.xaml
@@ -18,7 +18,8 @@
          <UniformGrid Rows="2" Margin="3,3,3,3">
             <ComboBox ItemsSource="{Binding LanguageList, Mode=OneWay}" Height="25"
                       DisplayMemberPath="Name" SelectedItem="{Binding SelectedLanguage}"
-                      Margin="0,0,0,5"/>
+                      Margin="0,0,0,5"
+                      Style="{x:Null}"/>
             <TextBlock Text="{Binding LanguageAdvert_Msg}" TextWrapping="Wrap"
                        TextAlignment="Center"/>
          </UniformGrid>
@@ -28,7 +29,8 @@
          <TextBlock Text="{Binding MMUnits_Msg}" VerticalAlignment="Center"/>
          <ComboBox ItemsSource="{Binding UnitMeasureList, Mode=OneWay}"
                    SelectedIndex="{Binding SelMeasureUnit}" Height="25"
-                   Margin="0,5,0,0"/>
+                   Margin="0,5,0,0"
+                   Style="{x:Null}"/>
       </UniformGrid>
       <GroupBox Header="{Binding Nesting_Msg}"
                 Margin="0,0,0,5">
@@ -100,7 +102,8 @@
                <TextBlock Text="Reminder Frequency"/>
                <ComboBox Grid.Column="1"
                          ItemsSource="{Binding ReminderList}"
-                         SelectedItem="{Binding SelReminder}"/>
+                         SelectedItem="{Binding SelReminder}"
+                         Style="{x:Null}"/>
             </Grid>
             <StackPanel Grid.Row="3"
                         Orientation="Horizontal">
diff --git a/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdGeneral_ConfigurationPageV.xaml b/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdGeneral_ConfigurationPageV.xaml
index 232999c8..baf692af 100644
--- a/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdGeneral_ConfigurationPageV.xaml
+++ b/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdGeneral_ConfigurationPageV.xaml
@@ -107,7 +107,7 @@
                         Orientation="Horizontal">
                <Button Content="Backup"
                        Command="{Binding Backup_Command}"
-                       Style="{StaticResource ToolBar_TextButton}"/>
+                       Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
                <Button Content="Restore"
                        Command="{Binding Restore_Command}"
                        Style="{StaticResource GeneralConfigurationToolBar_TextButton}"/>
diff --git a/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdMachine_ConfigurationPageV.xaml b/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdMachine_ConfigurationPageV.xaml
index 5d3ed6ee..465c9c41 100644
--- a/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdMachine_ConfigurationPageV.xaml
+++ b/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdMachine_ConfigurationPageV.xaml
@@ -72,7 +72,7 @@
            Grid.Row="1"
            ToolTip="{Binding SaveToolTip}"
            Visibility="{Binding Machine_Visibility}"
-           Style="{StaticResource MachinePanel_Button}">
+           Style="{StaticResource SaveMachinePanel_Button}">
       <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
    </Button>
 
diff --git a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/OnlyProdNewOpenProjectFileDialogV.xaml b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/OnlyProdNewOpenProjectFileDialogV.xaml
index db78187f..6ba1061d 100644
--- a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/OnlyProdNewOpenProjectFileDialogV.xaml
+++ b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/OnlyProdNewOpenProjectFileDialogV.xaml
@@ -23,8 +23,8 @@
       </Grid.RowDefinitions>
 
       <GroupBox Header="{Binding Filters_Msg}"
-                Margin="5"
-                Visibility="{Binding Filters_Visibility}">
+                Visibility="{Binding Filters_Visibility}"
+                Style="{StaticResource Filters_GroupBox}">
          <Grid>
             <Grid.RowDefinitions>
                <RowDefinition Height="Auto"/>
@@ -38,16 +38,14 @@
                </Grid.ColumnDefinitions>
                <ComboBox ItemsSource="{Binding BTLDateTypeList}"
                          SelectedIndex="{Binding SelBTLDateType}"
-                         Width="105"
-                         Margin="5"
-                         Style="{StaticResource FeatureComboBox}"/>
-               <StackPanel Grid.Column="1" Orientation="Horizontal">
+                         Style="{StaticResource BTLDateTypeList_ComboBox}"/>
+               <StackPanel Grid.Column="1" 
+                           Style="{StaticResource Configuration_StackPanel}">
                   <ComboBox ItemsSource="{Binding DayTypeList}"
                             SelectedIndex="{Binding SelDayType}"
-                            Width="105"
-                            Margin="0,0,2.5,0"
-                            Style="{StaticResource PartParam_ComboBox}"/>
-                  <StackPanel Orientation="Horizontal" Visibility="{Binding Date_Visibility}">
+                            Style="{StaticResource DayTypeList_ComboBox}"/>
+                  <StackPanel Orientation="Horizontal" 
+                              Visibility="{Binding Date_Visibility}">
                      <TextBlock Text="{Binding From_Msg}"
                                 Style="{StaticResource Filter_TextBlock}"/>
                      <DatePicker SelectedDate="{Binding dtStartDate}"
@@ -61,7 +59,7 @@
                <CheckBox Grid.Column="2"
                          IsChecked="{Binding bViewArchived}"
                          Content="{Binding ViewArchived_Msg}"
-                         VerticalAlignment="Center"/>
+                         Style="{StaticResource OnlyProdBTLPartList_CheckBox}"/>
             </Grid>
             <Grid Grid.Row="1">
                <Grid.ColumnDefinitions>
@@ -71,20 +69,18 @@
                </Grid.ColumnDefinitions>
                <ComboBox ItemsSource="{Binding FilterTypeList}"
                          SelectedItem="{Binding SelFilterType}"
-                         Width="105"
-                         Margin="5"
-                         Style="{StaticResource FeatureComboBox}"/>
+                         Style="{StaticResource BTLDateTypeList_ComboBox}"/>
                <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                       Text="{Binding SearchText}"
-                                      Margin="5"
-                                      Visibility="{Binding SearchText_Visibility}"/>
+                                      Visibility="{Binding SearchText_Visibility}"
+                                      Style="{StaticResource NewSearchText_TextBox}"/>
                <StackPanel Grid.Column="2" 
-                           Orientation="Horizontal">
+                           Style="{StaticResource Configuration_StackPanel}">
                   <TextBlock Text="{Binding Rows_Msg}"
-                             Style="{StaticResource OptionTextBlock}"/>
+                             Style="{StaticResource Option_TextBlock}"/>
                   <ComboBox ItemsSource="{Binding RowQuantityList}"
                             SelectedIndex="{Binding SelRowQuantity}"
-                            Style="{StaticResource FeatureComboBox}"/>
+                            Style="{StaticResource OnyProd_FeatureComboBox}"/>
                </StackPanel>
             </Grid>
          </Grid>
@@ -124,7 +120,6 @@
                      </Grid.ColumnDefinitions>
                      <TextBlock Text="{Binding Path=DataContext.Name_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"/>
                      <ToggleButton Grid.Column="1"
-                                   Margin="5,0,0,0"
                                    IsChecked="{Binding Path=DataContext.bIsEditNameActive,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"
                                    Style="{StaticResource ToolBar_SmallToggleButton}">
                         <Image Source="\Resources\CalcPanel\Edit.png"
@@ -151,9 +146,7 @@
                   <DataTemplate>
                      <Image Source="\Resources\OpenProjectFileDialog\Archived.png"
                             Visibility="{Binding Archived_Visibility}"
-                            Height="15"
-                            Width="15"
-                            Stretch="UniformToFill"/>
+                            Style="{StaticResource Archived_Image}"/>
                   </DataTemplate>
                </DataGridTemplateColumn.CellTemplate>
                <DataGridTemplateColumn.Header>
@@ -171,13 +164,10 @@
          <DataGrid.RowDetailsTemplate>
             <DataTemplate>
                <ItemsControl ItemsSource="{Binding ProjFileList}"
-                             BorderThickness="0"
-                             Margin="0,-1,0,0"
-                             Padding="0">
+                             Style="{StaticResource ProjFileList_ItemsControl}">
                   <ItemsControl.ItemTemplate>
                      <DataTemplate>
-                        <Grid TextBlock.FontSize="12"
-                              TextBlock.FontWeight="Normal">
+                        <Grid Style="{StaticResource ProjFileList_Grid}">
                            <Grid.ColumnDefinitions>
                               <ColumnDefinition Width="{Binding Path=DataContext.ProdColumns[0].ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"/>
                               <ColumnDefinition Width="1*"/>
@@ -188,11 +178,10 @@
                            </Grid.RowDefinitions>
                            <Grid Grid.Row="0"
                                  Grid.ColumnSpan="2"
-                                 Background="Gray"
-                                 Margin="40,0,40,0"/>
+                                 Style="{StaticResource Gray_Grid}"/>
                            <Grid Grid.Column="1"
                                  Grid.Row="1"
-                                 Margin="2">
+                                 Style="{StaticResource OnlyProdNewOpenProjectFileDialog_Grid}">
                               <Grid.ColumnDefinitions>
                                  <ColumnDefinition Width="Auto"/>
                                  <ColumnDefinition Width="1*"/>
@@ -227,7 +216,8 @@
          </DataGrid.RowDetailsTemplate>
       </EgtBEAMWALL:EgtDataGrid>
 
-      <UniformGrid Columns="4" Grid.Row="2" Margin="0,0,0,5">
+      <UniformGrid Columns="4" Grid.Row="2" 
+                   Style="{StaticResource OnlyProdNewOpenProjectFileDialog_UniformGrid}">
          <Button IsDefault="True" Name="OpenBtn"
                  Content="{Binding Open_Msg}" 
                  Style="{DynamicResource EgtWPFLib5_InputButton}"/>
diff --git a/EgtBEAMWALL.Core/OpenProjectFileDialog/OnlyProdOpenProjectFileDialogV.xaml b/EgtBEAMWALL.Core/OpenProjectFileDialog/OnlyProdOpenProjectFileDialogV.xaml
index 6423ec27..8f922853 100644
--- a/EgtBEAMWALL.Core/OpenProjectFileDialog/OnlyProdOpenProjectFileDialogV.xaml
+++ b/EgtBEAMWALL.Core/OpenProjectFileDialog/OnlyProdOpenProjectFileDialogV.xaml
@@ -44,7 +44,7 @@
                             SelectedIndex="{Binding SelDayType}"
                             Width="105"
                             Margin="0,0,2.5,0"
-                            Style="{StaticResource PartParam_ComboBox}"/>
+                            Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
                   <StackPanel Orientation="Horizontal" Visibility="{Binding Date_Visibility}">
                      <TextBlock Text="{Binding From_Msg}"
                                 Style="{StaticResource Filter_TextBlock}"/>
@@ -75,7 +75,7 @@
                <StackPanel Grid.Column="2" 
                            Orientation="Horizontal">
                   <TextBlock Text="Rows"
-                             Style="{StaticResource OptionTextBlock}"/>
+                             Style="{StaticResource Option_TextBlock}"/>
                   <ComboBox ItemsSource="{Binding RowQuantityList}"
                             SelectedIndex="{Binding SelRowQuantity}"
                             Style="{StaticResource FeatureComboBox}"/>
diff --git a/EgtBEAMWALL.Supervisor/ItemParamList/PartInRawPartListV.xaml b/EgtBEAMWALL.Supervisor/ItemParamList/PartInRawPartListV.xaml
index 26271fae..1314e076 100644
--- a/EgtBEAMWALL.Supervisor/ItemParamList/PartInRawPartListV.xaml
+++ b/EgtBEAMWALL.Supervisor/ItemParamList/PartInRawPartListV.xaml
@@ -171,7 +171,7 @@
 
       </DataGrid.Resources>
       <DataGrid.RowStyle>
-         <Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
+         <Style TargetType="DataGridRow" BasedOn="{StaticResource StaticRowDataGrid_CustomHighLight}">
             <Setter Property="Background" Value="{Binding Production_Background}"/>
          </Style>
       </DataGrid.RowStyle>
diff --git a/EgtBEAMWALL.Supervisor/ItemParamList/RawPartListV.xaml b/EgtBEAMWALL.Supervisor/ItemParamList/RawPartListV.xaml
index f205ead4..44b16954 100644
--- a/EgtBEAMWALL.Supervisor/ItemParamList/RawPartListV.xaml
+++ b/EgtBEAMWALL.Supervisor/ItemParamList/RawPartListV.xaml
@@ -114,7 +114,7 @@
          </DataGridTextColumn>
       </DataGrid.Resources>
       <DataGrid.RowStyle>
-         <Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
+         <Style TargetType="DataGridRow" BasedOn="{StaticResource StaticRowDataGrid_CustomHighLight}">
             <Setter Property="Background" Value="{Binding Production_Background}"/>
             <EventSetter Event="PreviewMouseDown" Handler="RawPartRow_PreviewMouseDown"/>
          </Style>
diff --git a/EgtBEAMWALL.ViewerOptimizer/AddFeatureWnd/NewAddFeatureWndV.xaml b/EgtBEAMWALL.ViewerOptimizer/AddFeatureWnd/NewAddFeatureWndV.xaml
index 4a711831..04293e06 100644
--- a/EgtBEAMWALL.ViewerOptimizer/AddFeatureWnd/NewAddFeatureWndV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/AddFeatureWnd/NewAddFeatureWndV.xaml
@@ -2,14 +2,14 @@
                             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
                             WindowStyle="None" ResizeMode="NoResize"
                             SizeToContent="WidthAndHeight"
                             WindowStartupLocation="CenterOwner"
                             IsClosable="False"
                             IsMinimizable="False"
                             IsResizable="False"
-                            Title="AddProcess">
+                            Title="AddProcess"
+                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
    
    <Grid Style="{StaticResource NewAddFeature_Grid}">
       <Grid.ColumnDefinitions>
@@ -90,10 +90,10 @@
          <Button Content="Ok"
                  Command="{Binding Ok_Command}"
                  IsDefault="True"
-                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
+                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
          <Button Content="Cancel"
                  IsCancel="True"
-                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
+                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
       </UniformGrid>
    </Grid>
 </EgtWPFLib5:EgtCustomWindow>
diff --git a/EgtBEAMWALL.ViewerOptimizer/AddPartWnd/OnlyProdAddPartWndV.xaml b/EgtBEAMWALL.ViewerOptimizer/AddPartWnd/OnlyProdAddPartWndV.xaml
index 3a081935..f3f7e857 100644
--- a/EgtBEAMWALL.ViewerOptimizer/AddPartWnd/OnlyProdAddPartWndV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/AddPartWnd/OnlyProdAddPartWndV.xaml
@@ -2,38 +2,36 @@
                             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
                             WindowStyle="None" ResizeMode="NoResize"
                             SizeToContent="WidthAndHeight"
                             WindowStartupLocation="CenterOwner"
                             IsClosable="False"
                             IsMinimizable="False"
                             IsResizable="False"
-                            Title="AddPartWndV">
-   <Grid Margin="5,5,5,0">
+                            Title="AddPartWndV"
+                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
+   
+   <Grid Style="{StaticResource OnlyProdWarehouse_Grid}">
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
-         <!--<RowDefinition Height="Auto"/>-->
       </Grid.RowDefinitions>
 
-      <Grid HorizontalAlignment="Center"
-            Margin="0,0,0,5">
+      <Grid Style="{StaticResource OnlyProdAddPart_Grid}">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
          <TextBlock Text="Name"
                     Style="{StaticResource OptionTextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Text="{Binding sNAM}"
-                                Grid.Column="1"
-                                Width="200"/>
+         <EgtWPFLib5:EgtTextBox Grid.Column="1"
+                                Text="{Binding sNAM}"
+                                Style="{StaticResource NAM_TextBox}"/>
       </Grid>
       <Grid Grid.Row="1"
-            Margin="0,0,0,5">
+            Style="{StaticResource OnlyProdAddPartWnd_Grid}">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="Auto"/>
@@ -42,18 +40,18 @@
          </Grid.ColumnDefinitions>
          <TextBlock Text="Prod Number"
                     Style="{StaticResource OptionTextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Text="{Binding nPDN}"
-                                Grid.Column="1"
-                                Width="45"/>
-         <TextBlock Text="Count"
-                    Grid.Column="2"
+         <EgtWPFLib5:EgtTextBox Grid.Column="1"
+                                Text="{Binding nPDN}"
+                                Style="{StaticResource Dimension_TextBox}"/>
+         <TextBlock Grid.Column="2"
+                    Text="Count"
                     Style="{StaticResource OptionTextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Text="{Binding sCNT}"
-                                Grid.Column="3"
-                                Width="45"/>
+         <EgtWPFLib5:EgtTextBox Grid.Column="3"
+                                Text="{Binding sCNT}"
+                                Style="{StaticResource Dimension_TextBox}"/>
       </Grid>
       <Grid Grid.Row="2"
-            Margin="0,0,0,5">
+            Style="{StaticResource OnlyProdAddPartWnd_Grid}">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="Auto"/>
@@ -64,25 +62,25 @@
          </Grid.ColumnDefinitions>
          <TextBlock Text="W"
                     Style="{StaticResource OptionTextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Text="{Binding sW}"
-                                Grid.Column="1"
-                                Width="45"/>
-         <TextBlock Text="H"
-                    Grid.Column="2"
+         <EgtWPFLib5:EgtTextBox Grid.Column="1"
+                                Text="{Binding sW}"
+                                Style="{StaticResource Dimension_TextBox}"/>
+         <TextBlock Grid.Column="2"
+                    Text="H"
                     Style="{StaticResource OptionTextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Text="{Binding sH}"
-                                Grid.Column="3"
-                                Width="45"/>
-         <TextBlock Text="L"
-                    Grid.Column="4"
+         <EgtWPFLib5:EgtTextBox Grid.Column="3"
+                                Text="{Binding sH}"
+                                Style="{StaticResource Dimension_TextBox}"/>
+         <TextBlock Grid.Column="4"
+                    Text="L"
                     Style="{StaticResource OptionTextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Text="{Binding sL}"
-                                Grid.Column="5"
-                                Width="45"/>
+         <EgtWPFLib5:EgtTextBox Grid.Column="5"
+                                Text="{Binding sL}"
+                                Style="{StaticResource Dimension_TextBox}"/>
       </Grid>
 
       <Grid Grid.Row="3"
-            Margin="0,0,0,5">
+            Style="{StaticResource OnlyProdAddPartWnd_Grid}">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="Auto"/>
@@ -90,15 +88,15 @@
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
-         <Button Content="Ok"
+         <Button Grid.Column="1"
+                 Content="Ok"
                  Command="{Binding Ok_Command}"
                  IsDefault="True"
-                 Grid.Column="1"
-                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
-         <Button Content="Cancel"
+                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+         <Button Grid.Column="3"
+                 Content="Cancel"
                  IsCancel="True"
-                 Grid.Column="3"
-                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
+                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
       </Grid>
    </Grid>
 </EgtWPFLib5:EgtCustomWindow>
diff --git a/EgtBEAMWALL.ViewerOptimizer/AddRawPartWnd/OnlyProdAddRawPartWndV.xaml b/EgtBEAMWALL.ViewerOptimizer/AddRawPartWnd/OnlyProdAddRawPartWndV.xaml
index 51decf35..abbe2b69 100644
--- a/EgtBEAMWALL.ViewerOptimizer/AddRawPartWnd/OnlyProdAddRawPartWndV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/AddRawPartWnd/OnlyProdAddRawPartWndV.xaml
@@ -2,16 +2,15 @@
                             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
                             WindowStyle="None" ResizeMode="NoResize"
                             SizeToContent="WidthAndHeight"
                             WindowStartupLocation="CenterOwner"
                             IsClosable="False"
                             IsMinimizable="False"
                             IsResizable="False"
-                            Title="AddRawPartWnd">
-   <Grid Margin="5,5,5,0">
+                            Title="AddRawPartWnd"
+                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
+   <Grid Style="{StaticResource OnlyProdWarehouse_Grid}">
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
@@ -21,12 +20,12 @@
                 SelectedItem="{Binding SelDimension}"
                 DisplayMemberPath="sDimension"
                 Visibility="{Binding DimensionsList_Visibility}"
-                Margin="0,0,0,5"/>
-      <ItemsControl ItemsSource="{Binding VariableList}"
-                    Grid.Row="1">
+                Style="{StaticResource GeneralConfiguration_ComboBox}"/>
+      <ItemsControl Grid.Row="1"
+                    ItemsSource="{Binding VariableList}">
          <ItemsControl.ItemTemplate>
             <DataTemplate>
-               <Grid Margin="0,0,0,5">
+               <Grid Style="{StaticResource OnlyProdAddPartWnd_Grid}">
                   <Grid.ColumnDefinitions>
                      <ColumnDefinition Width="1*"/>
                      <ColumnDefinition Width="Auto"/>
@@ -34,15 +33,15 @@
 
                   <TextBlock Text="{Binding sMsg}"
                              Style="{StaticResource OptionTextBlock}"/>
-                  <EgtWPFLib5:EgtTextBox Text="{Binding sValue}"
-                                         Grid.Column="1"
-                                         Width="65"/>
+                  <EgtWPFLib5:EgtTextBox Grid.Column="1"
+                                         Text="{Binding sValue}"
+                                         Style="{StaticResource Value_TextBox}"/>
                </Grid>
             </DataTemplate>
          </ItemsControl.ItemTemplate>
       </ItemsControl>
       <Grid Grid.Row="2"
-            Margin="0,0,0,5">
+            Style="{StaticResource OnlyProdAddPartWnd_Grid}">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="Auto"/>
@@ -50,15 +49,15 @@
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
-         <Button Content="Ok"
+         <Button Grid.Column="1"
+                 Content="Ok"
                  Command="{Binding Ok_Command}"
                  IsDefault="True"
-                 Grid.Column="1"
-                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
-         <Button Content="Cancel"
+                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+         <Button Grid.Column="3"
+                 Content="Cancel"
                  IsCancel="True"
-                 Grid.Column="3"
-                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
+                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
       </Grid>
    </Grid>
 
diff --git a/EgtBEAMWALL.ViewerOptimizer/BTLPartList/OnlyProdBTLPartListV.xaml b/EgtBEAMWALL.ViewerOptimizer/BTLPartList/OnlyProdBTLPartListV.xaml
index 9eb91ac6..4966c2ce 100644
--- a/EgtBEAMWALL.ViewerOptimizer/BTLPartList/OnlyProdBTLPartListV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/BTLPartList/OnlyProdBTLPartListV.xaml
@@ -9,13 +9,7 @@
    <EgtBEAMWALLCORE:EgtDataGrid x:Name="BTLPart_DataGrid"
                                 ItemsSource="{Binding Tag.BTLPartVMList,
                                                       RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdBTLPartListV}}}"
-                                CanUserAddRows="False"
-                                AutoGenerateColumns="False"
-                                CanUserResizeRows="False"
                                 SelectionMode="Extended"
-                                ScrollViewer.CanContentScroll="True" 
-                                ScrollViewer.VerticalScrollBarVisibility="Auto"
-                                ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                 PreviewMouseDown="DataGrid_PreviewMouseDown"
                                 PreviewMouseUp="DataGrid_PreviewMouseUp"
                                 PreviewMouseMove="DataGrid_PreviewMouseMove"
@@ -69,30 +63,24 @@
                                  SortMemberPath="nGlobalState">
             <DataGridTemplateColumn.CellTemplate>
                <DataTemplate>
-                  <Grid Margin="2,0,0,0" HorizontalAlignment="Center">
+                  <Grid Style="{StaticResource GlobalState_Grid}">
                      <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="25"/>
                         <ColumnDefinition Width="Auto"/>
                      </Grid.ColumnDefinitions>
                      <TextBlock Text="↓"
-                                Foreground="Blue"
-                                TextAlignment="Center"
-                                FontWeight="Bold"
-                                FontSize="18"
-                                Margin="-1,-6,1,-3"
-                                Visibility="{Binding CALC_FALL_Visibility}"/>
+                                Visibility="{Binding CALC_FALL_Visibility}"
+                                Style="{StaticResource CALC_FALL_TextBlock}"/>
                      <Border Grid.Column="1"
                              BorderBrush="{Binding Calc_BorderBrush}"
-                             BorderThickness="2"
-                             Padding="1">
+                             Style="{StaticResource CALC_FALL_Border}">
                         <ItemsControl ItemsSource="{Binding BTLFeatureVMList_View}"
-                                      Margin="0"
-                                      Padding="0">
+                                      Style="{StaticResource CALC_FALL_ItemsControl}">
                            <ItemsControl.ItemsPanel>
                               <ItemsPanelTemplate>
                                  <UniformGrid Columns="6" Rows="5"
-                                              Margin="0"/>
+                                              Style="{StaticResource CALC_FALL_UniformGrid}"/>
                               </ItemsPanelTemplate>
                            </ItemsControl.ItemsPanel>
                            <ItemsControl.ItemTemplate>
@@ -103,7 +91,7 @@
                         </ItemsControl>
                      </Border>
                      <Grid Grid.Column="2"
-                           HorizontalAlignment="Center">
+                           Style="{StaticResource CALC_ROT_Grid}">
                         <Grid.ColumnDefinitions>
                            <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
@@ -111,20 +99,12 @@
                            <RowDefinition Height="1*"/>
                            <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
-                        <Ellipse Width="5"
-                                 Height="5"
-                                 Fill="Red"
-                                 Visibility="{Binding CALC_ROT_Visibility}"
-                                 HorizontalAlignment="Center"
-                                 VerticalAlignment="Top"
-                                 Margin="2,1,-2,0"/>
+                        <Ellipse Visibility="{Binding CALC_ROT_Visibility}"
+                                 Style="{StaticResource CALC_ROT_Ellipse}"/>
                         <TextBlock Grid.Row="1"
                                    Text="{Binding CALC_ERR_Letter}"
                                    Foreground="{Binding CALC_ERR_Foreground}"
-                                   TextAlignment="Center"
-                                   FontWeight="Bold"
-                                   FontSize="12"
-                                   Margin="2,-6,-2,-3"/>
+                                   Style="{StaticResource CALC_ERR_TextBlock}"/>
                      </Grid>
                   </Grid>
                </DataTemplate>
@@ -135,13 +115,13 @@
             <DataGridTemplateColumn.HeaderTemplate>
                <DataTemplate>
                   <CheckBox IsChecked="{Binding Path=Tag.bDOALL, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdBTLPartListV}}}"
-                            HorizontalAlignment="Center"/>
+                            Style="{StaticResource OnlyProdBTLPartList_CheckBox}"/>
                </DataTemplate>
             </DataGridTemplateColumn.HeaderTemplate>
             <DataGridTemplateColumn.CellTemplate>
                <DataTemplate>
                   <CheckBox IsChecked="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
-                            HorizontalAlignment="Center"/>
+                            Style="{StaticResource OnlyProdBTLPartList_CheckBox}"/>
                </DataTemplate>
             </DataGridTemplateColumn.CellTemplate>
          </DataGridTemplateColumn>
diff --git a/EgtBEAMWALL.ViewerOptimizer/BTLPartManager/OnlyProdBTLPartManagerV.xaml b/EgtBEAMWALL.ViewerOptimizer/BTLPartManager/OnlyProdBTLPartManagerV.xaml
index a479f94f..a703fb1e 100644
--- a/EgtBEAMWALL.ViewerOptimizer/BTLPartManager/OnlyProdBTLPartManagerV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/BTLPartManager/OnlyProdBTLPartManagerV.xaml
@@ -8,70 +8,70 @@
            Visibility="{Binding MachiningPage_Visibility}"
            ToolTip="{Binding NewRawPart_ToolTip}"
            IsEnabled="{Binding BTLPartManager_IsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
+           Style="{StaticResource OnlyProdLeftPanel_Button}">
       <Image Source="/Resources/LeftPanel/NewRawPart.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding NewRawPartLast_Command}"
            Visibility="{Binding MachiningPage_Visibility}"
            ToolTip="{Binding NewRawPartLast_ToolTip}"
            IsEnabled="{Binding BTLPartManager_IsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
+           Style="{StaticResource OnlyProdLeftPanel_Button}">
       <Image Source="/Resources/LeftPanel/NewRawPartAuto.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding AddToRawPart_Command}"
            Visibility="{Binding MachiningPage_Visibility}"
            ToolTip="{Binding AddToRawPart_ToolTip}"
            IsEnabled="{Binding BTLPartManager_IsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
+           Style="{StaticResource OnlyProdLeftPanel_Button}">
       <Image Source="/Resources/LeftPanel/AddToRawPart.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding CopyPart_Command}"
            Visibility="{Binding ViewPage_Visibility}"
            ToolTip="{Binding CopyPart_ToolTip}"
            IsEnabled="{Binding CopyPart_IsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
+           Style="{StaticResource OnlyProdLeftPanel_Button}">
       <Image Source="/Resources/LeftPanel/CopyPart.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding AddPart_Command}"
            Visibility="{Binding ViewPage_Visibility}"
            ToolTip="{Binding AddPart_ToolTip}"
            IsEnabled="{Binding BTLPartManager_IsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
+           Style="{StaticResource OnlyProdLeftPanel_Button}">
       <Image Source="/Resources/LeftPanel/AddPart.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding RemovePart_Command}"
            Visibility="{Binding ViewPage_Visibility}"
            ToolTip="{Binding RemovePart_ToolTip}"
            IsEnabled="{Binding RemovePart_IsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
+           Style="{StaticResource OnlyProdLeftPanel_Button}">
       <Image Source="/Resources/LeftPanel/RemovePart.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding Invert_Command}"
            Visibility="{Binding ViewPage_Visibility}"
            ToolTip="{Binding InvertSx_ToolTip}"
            IsEnabled="{Binding RotatePart_IsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
+           Style="{StaticResource OnlyProdLeftPanel_Button}">
       <Image Source="/Resources/PartManager/LeftInvert.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding Invert_Command}"
            Visibility="{Binding ViewPage_Visibility}"
            ToolTip="{Binding InvertDx_ToolTip}"
            IsEnabled="{Binding RotatePart_IsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
+           Style="{StaticResource OnlyProdLeftPanel_Button}">
       <Image Source="/Resources/PartManager/RightInvert.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding BackRotation_Command}"
            Visibility="{Binding ViewPage_Visibility}"
            ToolTip="{Binding BackRotation_ToolTip}"
            IsEnabled="{Binding RotatePart_IsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
+           Style="{StaticResource OnlyProdLeftPanel_Button}">
       <Image Source="/Resources/PartManager/LeftRotate.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding ForwardRotation_Command}"
            Visibility="{Binding ViewPage_Visibility}"
            ToolTip="{Binding ForwardRotation_ToolTip}"
            IsEnabled="{Binding RotatePart_IsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
+           Style="{StaticResource OnlyProdLeftPanel_Button}">
       <Image Source="/Resources/PartManager/RightRotate.png" Stretch="Uniform"/>
    </Button>
 
diff --git a/EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/OnlyProdConfigurationPageV.xaml b/EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/OnlyProdConfigurationPageV.xaml
index 727690dd..8c762873 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/OnlyProdConfigurationPageV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/OnlyProdConfigurationPageV.xaml
@@ -23,7 +23,7 @@
                   <Button Command="{Binding SaveCommand}"
                           ToolTip="{Binding SaveToolTip}"
                           Visibility="{Binding General_Visibility}"
-                          Style="{StaticResource OptionPanel_Button}">
+                          Style="{StaticResource SaveOptionPanel_Button}">
                      <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
                   </Button>
                </StackPanel>
@@ -40,7 +40,7 @@
                   <Button Command="{Binding SaveCommand}"
                           ToolTip="{Binding SaveToolTip}"
                           Visibility="{Binding ParameterQ_Visibility}"
-                          Style="{StaticResource OptionPanel_Button}">
+                          Style="{StaticResource SaveOptionPanel_Button}">
                      <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
                   </Button>
                </StackPanel>
@@ -68,7 +68,7 @@
                   <Button Command="{Binding SaveCommand}"
                           ToolTip="{Binding SaveToolTip}"
                           Visibility="{Binding PDFEditor_Visibility}"
-                          Style="{StaticResource OptionPanel_Button}">
+                          Style="{StaticResource SaveOptionPanel_Button}">
                      <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
                   </Button>
                </StackPanel>
diff --git a/EgtBEAMWALL.ViewerOptimizer/FeatureListManager/OnlyProdFeatureListManagerV.xaml b/EgtBEAMWALL.ViewerOptimizer/FeatureListManager/OnlyProdFeatureListManagerV.xaml
index 6009e2cc..ffc7386d 100644
--- a/EgtBEAMWALL.ViewerOptimizer/FeatureListManager/OnlyProdFeatureListManagerV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/FeatureListManager/OnlyProdFeatureListManagerV.xaml
@@ -8,28 +8,28 @@
            Visibility="{Binding ViewPage_Visibility}"
            ToolTip="{Binding CopyFeature_ToolTip}"
            IsEnabled="{Binding CopyFeature_IsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
+           Style="{StaticResource OnlyProdLeftPanel_Button}">
       <Image Source="/Resources/LeftPanel/CopyFeature.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding MacroFeature_Command}"
            Visibility="{Binding ViewPage_Visibility}"
            ToolTip="{Binding MacroFeature_ToolTip}"
            IsEnabled="{Binding MacroFeature_IsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
+           Style="{StaticResource OnlyProdLeftPanel_Button}">
       <Image Source="/Resources/LeftPanel/MacroFeature.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding AddFeature_Command}"
            Visibility="{Binding ViewPage_Visibility}"
            ToolTip="{Binding AddFeature_ToolTip}"
            IsEnabled="{Binding AddFeature_IsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
+           Style="{StaticResource OnlyProdLeftPanel_Button}">
       <Image Source="/Resources/LeftPanel/AddFeature.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding RemoveFeature_Command}"
            Visibility="{Binding ViewPage_Visibility}"
            ToolTip="{Binding RemoveFeature_ToolTip}"
            IsEnabled="{Binding RemoveFeature_IsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
+           Style="{StaticResource OnlyProdLeftPanel_Button}">
       <Image Source="/Resources/LeftPanel/RemoveFeature.png" Stretch="Uniform"/>
    </Button>
 
diff --git a/EgtBEAMWALL.ViewerOptimizer/FreeContourInput/FreeContourInputV.xaml b/EgtBEAMWALL.ViewerOptimizer/FreeContourInput/FreeContourInputV.xaml
index d31388a3..89ac3839 100644
--- a/EgtBEAMWALL.ViewerOptimizer/FreeContourInput/FreeContourInputV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/FreeContourInput/FreeContourInputV.xaml
@@ -30,7 +30,7 @@
                 Visibility="{Binding Check_Visibility}" Margin="5,0,5,0"
                 VerticalAlignment="Center"/>
       <ComboBox ItemsSource="{Binding ComboItemsList}" SelectedIndex="{Binding ComboSelectedIndex}"
-                   Visibility="{Binding Combo_Visibility}" Margin="5,0,5,0"/>
+                   Visibility="{Binding Combo_Visibility}" Style="{StaticResource ComboItemsList_ComboBox}"/>
       <Grid Margin="5,0,5,0">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
diff --git a/EgtBEAMWALL.ViewerOptimizer/InputPwdWnd/OnlyProdInputPwdWndV.xaml b/EgtBEAMWALL.ViewerOptimizer/InputPwdWnd/OnlyProdInputPwdWndV.xaml
index eaef1273..5f1196ca 100644
--- a/EgtBEAMWALL.ViewerOptimizer/InputPwdWnd/OnlyProdInputPwdWndV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/InputPwdWnd/OnlyProdInputPwdWndV.xaml
@@ -2,33 +2,30 @@
                             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
                             WindowStyle="None" ResizeMode="NoResize"
                             SizeToContent="WidthAndHeight"
                             WindowStartupLocation="CenterOwner"
                             IsClosable="False"
                             IsMinimizable="False"
                             IsResizable="False"
-                            Title="InputPwdWndV">
-   <Grid Margin="5,5,5,0">
+                            Title="InputPwdWndV"
+                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
+   
+   <Grid Style="{StaticResource OnlyProdWarehouse_Grid}">
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
 
-      <TextBlock Text="{Binding PasswordMsg}"
-                 Style="{StaticResource OptionTextBlock}"
-                 Grid.Row="0"
-                 Margin="0,0,0,5"/>
-      <PasswordBox PasswordChanged="PasswordBox_PasswordChanged"
-                   HorizontalContentAlignment="Right"
-                   Grid.Row="1"
-                   Margin="0,0,0,5"/>
+      <TextBlock Grid.Row="0"
+                 Text="{Binding PasswordMsg}"
+                 Style="{StaticResource PasswordMsg_TextBlock}"/>
+      <PasswordBox Grid.Row="1"
+                   PasswordChanged="PasswordBox_PasswordChanged"/>
 
       <Grid Grid.Row="2"
-            Margin="0,0,0,5">
+            Style="{StaticResource OnlyProdAddPartWnd_Grid}">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="Auto"/>
@@ -36,14 +33,14 @@
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
-         <Button Content="Ok"
+         <Button Grid.Column="1"
+                 Content="Ok"
                  Command="{Binding Ok_Command}"
                  IsDefault="True"
-                 Grid.Column="1"
                  Style="{StaticResource GeneralConfigurationToolBar_TextButton}"/>
-         <Button Content="Cancel"
+         <Button Grid.Column="3"
+                 Content="Cancel"
                  IsCancel="True"
-                 Grid.Column="3"
                  Style="{StaticResource GeneralConfigurationToolBar_TextButton}"/>
       </Grid>
    </Grid>
diff --git a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/BTLPartListV.xaml b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/BTLPartListV.xaml
index 799603b8..c4d57fcd 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/BTLPartListV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/BTLPartListV.xaml
@@ -20,6 +20,10 @@
                                 PreviewMouseUp="DataGrid_PreviewMouseUp"
                                 PreviewMouseMove="DataGrid_PreviewMouseMove"
                                 Margin="0,0,0,5"
+                                ColumnHeaderBackground="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
+                                ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
+                                ColumnHeaderFontWeight="Normal"
+                                ColumnHeaderPadding="0,2,0,2"
                                 EgtBEAMWALL:MultiSelectorBehaviours.SynchronizedSelectedItems="{Binding Tag.SelBTLParts,
                                                                                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"
                                 BindingColumns="{Binding PartColumns}"
diff --git a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/FeatureInPartInRawPartListV.xaml b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/FeatureInPartInRawPartListV.xaml
index 699c8757..fc4d9344 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/FeatureInPartInRawPartListV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/FeatureInPartInRawPartListV.xaml
@@ -10,20 +10,24 @@
          <RowDefinition Height="30"/>
       </Grid.RowDefinitions>-->
    <EgtBEAMWALLCORE:EgtDataGrid ItemsSource="{Binding Tag.FeatureVMList,
-                                                      RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureInPartInRawPartListV}}}"
-                                 SelectedItem="{Binding Tag.SelFeatureVM,
-                                                        RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureInPartInRawPartListV}}}"
-                                 CanUserAddRows="False"
-                                 AutoGenerateColumns="False"
-                                 CanUserResizeRows="False"
-                                 SelectionMode="Single"
-                                 ScrollViewer.CanContentScroll="True" 
-                                 ScrollViewer.VerticalScrollBarVisibility="Auto"
-                                 ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                                 Margin="0,0,0,5"
-                                 BindingColumns="{Binding FeatureInPartInRawPartColumns}"
-                                 BeginningEdit="FeatureInPartInRawPartList_BeginningEdit"
-                                 Style="{StaticResource DataGrid_CustomHighLight}">
+                                                     RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureInPartInRawPartListV}}}"
+                                SelectedItem="{Binding Tag.SelFeatureVM,
+                                                       RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureInPartInRawPartListV}}}"
+                                CanUserAddRows="False"
+                                AutoGenerateColumns="False"
+                                CanUserResizeRows="False"
+                                SelectionMode="Single"
+                                ScrollViewer.CanContentScroll="True" 
+                                ScrollViewer.VerticalScrollBarVisibility="Auto"
+                                ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                                Margin="0,0,0,5"
+                                ColumnHeaderBackground="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
+                                ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
+                                ColumnHeaderFontWeight="Normal"
+                                ColumnHeaderPadding="0,2,0,2"
+                                BindingColumns="{Binding FeatureInPartInRawPartColumns}"
+                                BeginningEdit="FeatureInPartInRawPartList_BeginningEdit"
+                                Style="{StaticResource DataGrid_CustomHighLight}">
       <DataGrid.InputBindings>
          <KeyBinding Key="Delete" Command="{Binding Tag.SelFeatureVM.DeleteFeature_Command,
                                                     RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureInPartInRawPartListV}}}"/>
diff --git a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/FeatureListV.xaml b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/FeatureListV.xaml
index 682f9e7e..7f4d6368 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/FeatureListV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/FeatureListV.xaml
@@ -16,6 +16,10 @@
                                 ScrollViewer.VerticalScrollBarVisibility="Auto"
                                 ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                 Margin="0,0,0,5"
+                                ColumnHeaderBackground="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
+                                ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
+                                ColumnHeaderFontWeight="Normal"
+                                ColumnHeaderPadding="0,2,0,2"
                                 IsEnabled="{Binding FeatureList_IsEnabled}"
                                 BindingColumns="{Binding FeatureColumns}"
                                 Style="{StaticResource DataGrid_CustomHighLight}">
@@ -109,7 +113,7 @@
                                                     RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureListV}}}" />
       </DataGrid.InputBindings>
       <DataGrid.RowStyle>
-         <Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
+         <Style TargetType="DataGridRow" BasedOn="{StaticResource StaticRowDataGrid_CustomHighLight}">
             <Setter Property="ContextMenu" Value="{StaticResource RowMenu}" />
             <EventSetter Event="PreviewMouseDown" Handler="FeatureList_PreviewMouseDown"/>
          </Style>
diff --git a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdFeatureInPartInRawPartListV.xaml b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdFeatureInPartInRawPartListV.xaml
index fe4827d6..3fd16e87 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdFeatureInPartInRawPartListV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdFeatureInPartInRawPartListV.xaml
@@ -8,13 +8,7 @@
                                                       RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureInPartInRawPartListV}}}"
                                 SelectedItem="{Binding Tag.SelFeatureVM,
                                                        RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureInPartInRawPartListV}}}"
-                                CanUserAddRows="False"
-                                AutoGenerateColumns="False"
-                                CanUserResizeRows="False"
                                 SelectionMode="Single"
-                                ScrollViewer.CanContentScroll="True" 
-                                ScrollViewer.VerticalScrollBarVisibility="Auto"
-                                ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                 Margin="0,0,0,5"
                                 BindingColumns="{Binding FeatureInPartInRawPartColumns}"
                                 BeginningEdit="FeatureInPartInRawPartList_BeginningEdit"
@@ -38,15 +32,13 @@
             <DataGridTemplateColumn.HeaderTemplate>
                <DataTemplate>
                   <CheckBox IsChecked="{Binding Path=Tag.bDOALL, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureInPartInRawPartListV}}}"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"/>
+                            Style="{StaticResource OnlyProdFeatureInPartInRawPartList_CheckBox}"/>
                </DataTemplate>
             </DataGridTemplateColumn.HeaderTemplate>
             <DataGridTemplateColumn.CellTemplate>
                <DataTemplate>
                   <CheckBox IsChecked="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"/>
+                            Style="{StaticResource OnlyProdFeatureInPartInRawPartList_CheckBox}"/>
                </DataTemplate>
             </DataGridTemplateColumn.CellTemplate>
          </DataGridTemplateColumn>
@@ -62,23 +54,17 @@
                      <Border Width="{Binding ActualHeight, RelativeSource={RelativeSource self}}"
                              Background="{Binding Calc_Background}"/>
                      <Grid Grid.Column="1"
-                           HorizontalAlignment="Center">
+                           Style="{StaticResource CALC_ROT_Grid}">
                         <Grid.RowDefinitions>
                            <RowDefinition Height="1*"/>
                            <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
-                        <Ellipse Width="5"
-                                 Height="5"
-                                 Fill="Red"
-                                 Visibility="{Binding CALC_ROT_Visibility}"
-                                 HorizontalAlignment="Center"/>
+                        <Ellipse Visibility="{Binding CALC_ROT_Visibility}"
+                                 Style="{StaticResource OnlyProdFeatureInPartInRawPartList_Ellipse}"/>
                         <TextBlock Grid.Row="1"
                                    Text="{Binding CALC_ERR_Letter}"
                                    Foreground="{Binding CALC_ERR_Foreground}"
-                                   TextAlignment="Center"
-                                   FontWeight="Bold"
-                                   FontSize="12"
-                                   Margin="0,-6,0,-2"/>
+                                   Style="{StaticResource OnlyProdFeatureInPartInRawPartList_TextBlock}"/>
                      </Grid>
                   </Grid>
                </DataTemplate>
diff --git a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdFeatureListV.xaml b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdFeatureListV.xaml
index ec78d158..a44321bc 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdFeatureListV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdFeatureListV.xaml
@@ -6,13 +6,7 @@
 
    <EgtBEAMWALLCORE:EgtDataGrid ItemsSource="{Binding Tag.BTLFeatureVMList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureListV}}}"
                                 SelectedItem="{Binding Tag.SelBTLFeatureVM, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureListV}}}"
-                                CanUserAddRows="False"
-                                AutoGenerateColumns="False"
-                                CanUserResizeRows="False"
                                 SelectionMode="Single"
-                                ScrollViewer.CanContentScroll="True" 
-                                ScrollViewer.VerticalScrollBarVisibility="Auto"
-                                ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                 Margin="0,0,0,5"
                                 IsEnabled="{Binding FeatureList_IsEnabled}"
                                 BindingColumns="{Binding FeatureColumns}"
@@ -33,13 +27,13 @@
             <DataGridTemplateColumn.HeaderTemplate>
                <DataTemplate>
                   <CheckBox IsChecked="{Binding Path=Tag.bDOALL, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureListV}}}"
-                            HorizontalAlignment="Center"/>
+                            Style="{StaticResource OnlyProdBTLPartList_CheckBox}"/>
                </DataTemplate>
             </DataGridTemplateColumn.HeaderTemplate>
             <DataGridTemplateColumn.CellTemplate>
                <DataTemplate>
                   <CheckBox IsChecked="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
-                            HorizontalAlignment="Center"/>
+                            Style="{StaticResource OnlyProdBTLPartList_CheckBox}"/>
                </DataTemplate>
             </DataGridTemplateColumn.CellTemplate>
          </DataGridTemplateColumn>
@@ -54,24 +48,16 @@
                      </Grid.ColumnDefinitions>
                      <Border Width="{Binding ActualHeight, RelativeSource={RelativeSource self}}"
                              Background="{Binding Calc_Background}"/>
-                     <!--Width="{Binding ActualHeigth, Source=Self}"/>-->
                      <Grid Grid.Column="1">
                         <Grid.RowDefinitions>
                            <RowDefinition Height="1*"/>
                            <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
-                        <Ellipse Width="5"
-                                 Height="5"
-                                 Fill="Red"
-                                 Visibility="{Binding CALC_ROT_Visibility}"
-                                 HorizontalAlignment="Center"/>
+                        <Ellipse Visibility="{Binding CALC_ROT_Visibility}"
+                                 Style="{StaticResource OnlyProdFeatureInPartInRawPartList_Ellipse}"/>
                         <TextBlock Grid.Row="1"
                                    Text="{Binding CALC_ERR_Letter}"
-                                   Foreground="{Binding CALC_ERR_Foreground}"
-                                   TextAlignment="Center"
-                                   FontWeight="Bold"
-                                   FontSize="12"
-                                   Margin="0,-6,0,-2"/>
+                                   Style="{StaticResource OnlyProdFeatureInPartInRawPartList_TextBlock}"/>
                      </Grid>
                   </Grid>
                </DataTemplate>
@@ -97,8 +83,7 @@
                                        <StackPanel Orientation="Vertical">
                                           <TextBlock Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}"/>
                                           <Image Source="{Binding sDrawPath}" 
-                                                 Stretch="Uniform"
-                                                 Margin="2.5"/>
+                                                 Style="{StaticResource OnlyProdFeatureList_Image}"/>
                                        </StackPanel>
                                     </ToolTip.Content>
                                  </ToolTip>
@@ -111,7 +96,7 @@
             </DataGridTextColumn.CellStyle>
          </DataGridTextColumn>
          <!-- Menu' tasto destro -->
-         <ContextMenu x:Key="RowMenu" ItemsSource="{Binding MenuList}" >
+         <ContextMenu x:Key="RowMenu" ItemsSource="{Binding MenuList}">
             <ContextMenu.ItemContainerStyle>
                <Style TargetType="MenuItem">
                   <Setter Property="Command" Value="{Binding MenuItem_Command}"/>
diff --git a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdPParameterListV.xaml b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdPParameterListV.xaml
index 51ead55c..5e1b0ac0 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdPParameterListV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdPParameterListV.xaml
@@ -4,13 +4,8 @@
              xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer" 
              xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core">
 
-   <EgtBEAMWALLCORE:EgtDataGrid AutoGenerateColumns="False"
-                                CanUserDeleteRows="False"
-                                CanUserResizeRows="False"
+   <EgtBEAMWALLCORE:EgtDataGrid CanUserDeleteRows="False"
                                 SelectionMode="Single"
-                                ScrollViewer.CanContentScroll="True" 
-                                ScrollViewer.VerticalScrollBarVisibility="Auto"
-                                ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                 Margin="0,0,0,5"
                                 ItemsSource="{Binding Tag.PBTLParamVMList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPParameterListV}}}"
                                 SelectedItem="{Binding Tag.SelPBTLParam, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPParameterListV}}}"
@@ -45,7 +40,7 @@
                <DataTemplate>
                   <CheckBox IsChecked="{Binding bCustom, UpdateSourceTrigger=PropertyChanged}"
                             Visibility="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
-                            HorizontalAlignment="Center"/>
+                            Style="{StaticResource OnlyProdBTLPartList_CheckBox}"/>
                </DataTemplate>
             </DataGridTemplateColumn.CellTemplate>
          </DataGridTemplateColumn>
@@ -77,8 +72,7 @@
                                        <StackPanel Orientation="Vertical">
                                           <TextBlock Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}"/>
                                           <Image Source="{Binding sDrawPath}" 
-                                                 Stretch="Uniform"
-                                                 Margin="2.5"/>
+                                                 Style="{StaticResource OnlyProdFeatureList_Image}"/>
                                        </StackPanel>
                                     </ToolTip.Content>
                                  </ToolTip>
diff --git a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdPartInRawPartListV.xaml b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdPartInRawPartListV.xaml
index d0504be0..ef8dc66d 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdPartInRawPartListV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdPartInRawPartListV.xaml
@@ -8,15 +8,9 @@
                                                       RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}"
                                 SelectedItem="{Binding Tag.SelPart,
                                                        RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}"
-                                AutoGenerateColumns="False"
-                                CanUserAddRows="False"
                                 CanUserDeleteRows="False"
-                                CanUserResizeRows="False"
                                 CanUserSortColumns="False"
                                 SelectionMode="Single"
-                                ScrollViewer.CanContentScroll="True" 
-                                ScrollViewer.VerticalScrollBarVisibility="Auto"
-                                ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                 Margin="2.5,0,0,5"
                                 BindingColumns="{Binding PartInRawPartColumns}"
                                 BeginningEdit="PartInRawPartList_BeginningEdit"
diff --git a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdQParameterListProdV.xaml b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdQParameterListProdV.xaml
index f213e904..72f695a4 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdQParameterListProdV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdQParameterListProdV.xaml
@@ -3,13 +3,9 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer" 
              xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core">
-   <EgtBEAMWALLCORE:EgtDataGrid AutoGenerateColumns="False"
-                                CanUserDeleteRows="False"
-                                CanUserResizeRows="False"
+   
+   <EgtBEAMWALLCORE:EgtDataGrid CanUserDeleteRows="False"
                                 SelectionMode="Single"
-                                ScrollViewer.CanContentScroll="True" 
-                                ScrollViewer.VerticalScrollBarVisibility="Auto"
-                                ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                 Margin="0,0,0,5"
                                 ItemsSource="{Binding Tag.QBTLParamVMList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdQParameterListProdV}}}"
                                 SelectedItem="{Binding Tag.SelQBTLParam, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdQParameterListProdV}}}"
@@ -46,7 +42,7 @@
                <DataTemplate>
                   <CheckBox IsChecked="{Binding bCustom, UpdateSourceTrigger=PropertyChanged}"
                             Visibility="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
-                            HorizontalAlignment="Center"/>
+                            Style="{StaticResource OnlyProdBTLPartList_CheckBox}"/>
                </DataTemplate>
             </DataGridTemplateColumn.CellTemplate>
          </DataGridTemplateColumn>
@@ -71,17 +67,14 @@
                      <Setter.Value>
                         <ControlTemplate TargetType="{x:Type DataGridCell}">
                            <TextBlock Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}" 
-                                      TextTrimming="CharacterEllipsis"
-                                      Margin="4,0,0,0"
-                                      Style="{StaticResource OnlyProdPartList_TextBlock}">
+                                      Style="{StaticResource OnlyProdQParameterListProd_TextBlock}">
                               <TextBlock.ToolTip>
                                  <ToolTip>
                                     <ToolTip.Content>
-                                       <StackPanel Orientation="Vertical">
+                                       <StackPanel Style="{StaticResource OnlyProdQParameterListProd_StackPanel}">
                                           <TextBlock Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}"/>
                                           <Image Source="{Binding sDrawPath}" 
-                                                 Stretch="Uniform"
-                                                 Margin="2.5"/>
+                                                 Style="{StaticResource OnlyProdFeatureList_Image}"/>
                                        </StackPanel>
                                     </ToolTip.Content>
                                  </ToolTip>
diff --git a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdQParameterListV.xaml b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdQParameterListV.xaml
index 29a90a28..90915af6 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdQParameterListV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdQParameterListV.xaml
@@ -4,13 +4,8 @@
              xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer" 
              xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core">
 
-   <EgtBEAMWALLCORE:EgtDataGrid AutoGenerateColumns="False"
-                                CanUserDeleteRows="False"
-                                CanUserResizeRows="False"
+   <EgtBEAMWALLCORE:EgtDataGrid CanUserDeleteRows="False"
                                 SelectionMode="Single"
-                                ScrollViewer.CanContentScroll="True" 
-                                ScrollViewer.VerticalScrollBarVisibility="Auto"
-                                ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                 Margin="0,0,0,5"
                                 ItemsSource="{Binding Tag.QBTLParamVMList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdQParameterListV}}}"
                                 SelectedItem="{Binding Tag.SelQBTLParam, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdQParameterListV}}}"
@@ -47,7 +42,7 @@
                <DataTemplate>
                   <CheckBox IsChecked="{Binding bCustom, UpdateSourceTrigger=PropertyChanged}"
                             Visibility="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
-                            HorizontalAlignment="Center"/>
+                            Style="{StaticResource OnlyProdBTLPartList_CheckBox}"/>
                </DataTemplate>
             </DataGridTemplateColumn.CellTemplate>
          </DataGridTemplateColumn>
@@ -72,17 +67,14 @@
                      <Setter.Value>
                         <ControlTemplate TargetType="{x:Type DataGridCell}">
                            <TextBlock Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}" 
-                                      TextTrimming="CharacterEllipsis"
-                                      Margin="4,0,0,0"
-                                      Style="{StaticResource OnlyProd_TextBlock}">
+                                      Style="{StaticResource OnlyProdQParameterListProd_TextBlock}">
                               <TextBlock.ToolTip>
                                  <ToolTip>
                                     <ToolTip.Content>
                                        <StackPanel Orientation="Vertical">
                                           <TextBlock Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}"/>
                                           <Image Source="{Binding sDrawPath}" 
-                                                 Stretch="Uniform"
-                                                 Margin="2.5"/>
+                                                 Style="{StaticResource OnlyProdFeatureList_Image}"/>
                                        </StackPanel>
                                     </ToolTip.Content>
                                  </ToolTip>
diff --git a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdRawPartListV.xaml b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdRawPartListV.xaml
index 88c4aabf..1ae5b0dc 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdRawPartListV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdRawPartListV.xaml
@@ -8,13 +8,8 @@
                                                       RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdRawPartListV}}}"
                                 SelectedItem="{Binding Tag.SelectedMachGroup,
                                                        RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdRawPartListV}}}"
-                                AutoGenerateColumns="False"
                                 CanUserDeleteRows="False"
-                                CanUserResizeRows="False"
                                 SelectionMode="Single"
-                                ScrollViewer.CanContentScroll="True" 
-                                ScrollViewer.VerticalScrollBarVisibility="Auto"
-                                ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                 Margin="2.5,0,0,5"
                                 BindingColumns="{Binding RawPartColumns}"
                                 BeginningEdit="RawPartList_BeginningEdit"
@@ -60,33 +55,23 @@
                         <ColumnDefinition Width="10"/>
                      </Grid.ColumnDefinitions>
                      <TextBlock Text="↓"
-                                Foreground="Aqua"
-                                TextAlignment="Center"
-                                FontWeight="Bold"
-                                FontSize="12"
-                                Margin="0,-6,0,-2"
-                                Visibility="{Binding CALC_FALL_Visibility}"/>
-                     <Border Width="{Binding ActualHeight, RelativeSource={RelativeSource self}}"
-                             Grid.Column="1"
+                                Visibility="{Binding CALC_FALL_Visibility}"
+                                Style="{StaticResource OnlyProdRawPartList_TextBlock}"/>
+                     <Border Grid.Column="1"
+                             Width="{Binding ActualHeight, RelativeSource={RelativeSource self}}"
                              Background="{Binding Calc_Background}"/>
                      <Grid Grid.Column="2"
-                           HorizontalAlignment="Center">
+                           Style="{StaticResource CALC_ROT_Grid}">
                         <Grid.RowDefinitions>
                            <RowDefinition Height="1*"/>
                            <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
-                        <Ellipse Width="5"
-                                 Height="5"
-                                 Fill="Red"
-                                 Visibility="{Binding CALC_ROT_Visibility}"
-                                 HorizontalAlignment="Center"/>
+                        <Ellipse Visibility="{Binding CALC_ROT_Visibility}"
+                                 Style="{StaticResource OnlyProdFeatureInPartInRawPartList_Ellipse}"/>
                         <TextBlock Grid.Row="1"
                                    Text="{Binding CALC_ERR_Letter}"
                                    Foreground="{Binding CALC_ERR_Foreground}"
-                                   TextAlignment="Center"
-                                   FontWeight="Bold"
-                                   FontSize="12"
-                                   Margin="0,-6,0,-2"/>
+                                   Style="{StaticResource OnlyProdFeatureInPartInRawPartList_TextBlock}"/>
                      </Grid>
                   </Grid>
                </DataTemplate>
diff --git a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/PParameterListV.xaml b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/PParameterListV.xaml
index 664743f7..219f83cf 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/PParameterListV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/PParameterListV.xaml
@@ -12,13 +12,17 @@
                                 ScrollViewer.VerticalScrollBarVisibility="Auto"
                                 ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                 Margin="0,0,0,5"
+                                ColumnHeaderBackground="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
+                                ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
+                                ColumnHeaderFontWeight="Normal"
+                                ColumnHeaderPadding="0,2,0,2"
                                 ItemsSource="{Binding Tag.PBTLParamVMList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PParameterListV}}}"
                                 SelectedItem="{Binding Tag.SelPBTLParam, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PParameterListV}}}"
                                 IsEnabled="{Binding PParameterList_IsEnabled}"    
                                 BindingColumns="{Binding PParameterListColumns}"
                                 Style="{StaticResource DataGrid_CustomHighLight}">
       <DataGrid.RowStyle>
-         <Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
+         <Style TargetType="DataGridRow" BasedOn="{StaticResource StaticRowDataGrid_CustomHighLight}">
             <EventSetter Event="PreviewMouseDown" Handler="PParameterList_PreviewMouseDown"/>
          </Style>
       </DataGrid.RowStyle>
diff --git a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/PartInRawPartListV.xaml b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/PartInRawPartListV.xaml
index 0c21667d..c223b21f 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/PartInRawPartListV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/PartInRawPartListV.xaml
@@ -18,6 +18,10 @@
                                 ScrollViewer.VerticalScrollBarVisibility="Auto"
                                 ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                 Margin="0,0,0,5"
+                                ColumnHeaderBackground="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
+                                ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
+                                ColumnHeaderFontWeight="Normal"
+                                ColumnHeaderPadding="0,2,0,2"
                                 BindingColumns="{Binding PartInRawPartColumns}"
                                 BeginningEdit="PartInRawPartList_BeginningEdit"
                                 Style="{StaticResource DataGrid_CustomHighLight}">
@@ -222,7 +226,7 @@
                                                     RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartInRawPartListV}}}" />
       </DataGrid.InputBindings>
       <DataGrid.RowStyle>
-         <Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
+         <Style TargetType="DataGridRow" BasedOn="{StaticResource StaticRowDataGrid_CustomHighLight}">
             <Setter Property="Background" Value="{Binding Background}"/>
             <EventSetter Event="PreviewMouseDown" Handler="PartInRawPartRow_PreviewMouseDown"/>
          </Style>
diff --git a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/QParameterListV.xaml b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/QParameterListV.xaml
index 918f843c..cda6729d 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/QParameterListV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/QParameterListV.xaml
@@ -12,6 +12,10 @@
                                 ScrollViewer.VerticalScrollBarVisibility="Auto"
                                 ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                 Margin="0,0,0,5"
+                                ColumnHeaderBackground="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
+                                ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
+                                ColumnHeaderFontWeight="Normal"
+                                ColumnHeaderPadding="0,2,0,2"
                                 ItemsSource="{Binding Tag.QBTLParamVMList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:QParameterListV}}}"
                                 SelectedItem="{Binding Tag.SelQBTLParam, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:QParameterListV}}}"
                                 BeginningEdit="QParameterList_BeginningEdit"
@@ -20,7 +24,7 @@
                                 Style="{StaticResource DataGrid_CustomHighLight}">
 
       <DataGrid.RowStyle>
-         <Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
+         <Style TargetType="DataGridRow" BasedOn="{StaticResource StaticRowDataGrid_CustomHighLight}">
             <EventSetter Event="PreviewMouseDown" Handler="QParameterList_PreviewMouseDown"/>
          </Style>
       </DataGrid.RowStyle>
diff --git a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/RawPartListV.xaml b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/RawPartListV.xaml
index fe915ba8..5b891547 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/RawPartListV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/RawPartListV.xaml
@@ -16,6 +16,10 @@
                                 ScrollViewer.VerticalScrollBarVisibility="Auto"
                                 ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                 Margin="0,0,0,5"
+                                ColumnHeaderBackground="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
+                                ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
+                                ColumnHeaderFontWeight="Normal"
+                                ColumnHeaderPadding="0,2,0,2"
                                 BindingColumns="{Binding RawPartColumns}"
                                 BeginningEdit="RawPartList_BeginningEdit"
                                 Style="{StaticResource DataGrid_CustomHighLight}">
@@ -172,7 +176,7 @@
                                                     RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:RawPartListV}}}"/>
       </DataGrid.InputBindings>
       <DataGrid.RowStyle>
-         <Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
+         <Style TargetType="DataGridRow" BasedOn="{StaticResource StaticRowDataGrid_CustomHighLight}">
             <Setter Property="Background" Value="{Binding Background}"/>
             <EventSetter Event="PreviewMouseDown" Handler="RawPartRow_PreviewMouseDown"/>
          </Style>
diff --git a/EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelV.xaml b/EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelV.xaml
index 17302d1f..c67c6799 100644
--- a/EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelV.xaml
@@ -13,7 +13,7 @@
    <GroupBox Header="{Binding SearchFilter_Msg}"
              IsEnabled="{Binding SearchFilter_IsEnabled}"
              Margin="3,1,3,3">
-      <Expander>
+      <Expander Style="{x:Null}">
          <Expander.Header>
             <Grid HorizontalAlignment="{Binding HorizontalAlignment, RelativeSource={RelativeSource AncestorType=ContentPresenter}, Mode=OneWayToSource}">
                <Grid.ColumnDefinitions>
@@ -25,7 +25,8 @@
                <ComboBox ItemsSource="{Binding Tag.SectionList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:LeftPanelV}}}"
                          SelectedItem="{Binding Tag.SelSection, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:LeftPanelV}}}"
                          DisplayMemberPath="sSectionXMaterial"
-                         Grid.Column="1"/>
+                         Grid.Column="1"
+                         Style="{x:Null}"/>
             </Grid>
          </Expander.Header>
          <Grid Margin="1,0,1,0">
@@ -46,7 +47,8 @@
             <ComboBox ItemsSource="{Binding Tag.GroupList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:LeftPanelV}}}"
                       SelectedItem="{Binding Tag.SelGroup, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:LeftPanelV}}}"
                       Grid.Column="2"
-                      Margin="0,2,0,2"/>
+                      Margin="0,2,0,2"
+                      Style="{x:Null}"/>
             <TextBlock Text="{Binding SubGroup_Msg}"
                        Grid.Row="1"
                        Grid.ColumnSpan="2"
@@ -55,7 +57,8 @@
                       SelectedItem="{Binding Tag.SelSubGroup, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:LeftPanelV}}}"
                       Grid.Column="2"
                       Grid.Row="1"
-                      Margin="0,2,0,2"/>
+                      Margin="0,2,0,2"
+                      Style="{x:Null}"/>
             <TextBlock Text="{Binding ParType_Msg}"
                        Grid.Row="2"
                        Grid.ColumnSpan="2"
@@ -64,7 +67,8 @@
                       SelectedItem="{Binding Tag.SelSearchParam, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:LeftPanelV}}}"
                       Grid.Column="2"
                       Grid.Row="2"
-                      Margin="0,2,0,2"/>
+                      Margin="0,2,0,2"
+                      Style="{x:Null}"/>
             <TextBlock Text="{Binding ParValue_Msg}"
                        Grid.Row="3"
                        Grid.ColumnSpan="2"
diff --git a/EgtBEAMWALL.ViewerOptimizer/LeftPanel/OnlyProdLeftPanelV.xaml b/EgtBEAMWALL.ViewerOptimizer/LeftPanel/OnlyProdLeftPanelV.xaml
index c39132c8..4a9dd023 100644
--- a/EgtBEAMWALL.ViewerOptimizer/LeftPanel/OnlyProdLeftPanelV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/LeftPanel/OnlyProdLeftPanelV.xaml
@@ -58,14 +58,14 @@
                  ToolTip="{Binding Data_ToolTip}"
                  IsEnabled="{Binding Data_IsEnabled}"
                  Visibility="{Binding InstrumentButton_Visibilty}"
-                 Style="{StaticResource LeftPanel_Button}">
+                 Style="{StaticResource OnlyProdLeftPanel_Button}">
             <Image Source="/Resources/InstrumentPanel/Analyze.png" Stretch="Uniform"/>
          </Button>
          <Button Command="{Binding Parameter_Command}"
                  ToolTip="{Binding Parameters_ToolTip}"
                  IsEnabled="{Binding Parameters_IsEnabled}"
                  Visibility="{Binding InstrumentButton_Visibilty}"
-                 Style="{StaticResource LeftPanel_Button}">
+                 Style="{StaticResource OnlyProdLeftPanel_Button}">
             <Image Source="/Resources/InstrumentPanel/Analyze.png" Stretch="Uniform"/>
          </Button>
       </StackPanel>
diff --git a/EgtBEAMWALL.ViewerOptimizer/MovePartInRawPartWnd/OnlyProdMovePartInRawPartWndV.xaml b/EgtBEAMWALL.ViewerOptimizer/MovePartInRawPartWnd/OnlyProdMovePartInRawPartWndV.xaml
index 4578b729..57e3d73f 100644
--- a/EgtBEAMWALL.ViewerOptimizer/MovePartInRawPartWnd/OnlyProdMovePartInRawPartWndV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/MovePartInRawPartWnd/OnlyProdMovePartInRawPartWndV.xaml
@@ -2,16 +2,16 @@
                             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
                             WindowStyle="None" ResizeMode="NoResize"
                             SizeToContent="WidthAndHeight"
                             WindowStartupLocation="CenterOwner"
                             IsClosable="False"
                             IsMinimizable="False"
                             IsResizable="False"
-                            Title="MovePartInRawPartWndV">
-   <Grid Margin="5,5,5,0">
+                            Title="MovePartInRawPartWndV"
+                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
+   
+   <Grid Style="{StaticResource OnlyProdWarehouse_Grid}">
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
@@ -19,8 +19,7 @@
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
 
-      <Grid HorizontalAlignment="Center"
-            Margin="0,0,0,5">
+      <Grid Style="{StaticResource OnlyProdAddPart_Grid}">
          <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
@@ -30,41 +29,38 @@
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
 
-         <TextBlock Text="{Binding MoveDirMsg}"
-                    Style="{StaticResource OptionTextBlock}"
-                    Grid.ColumnSpan="2"
-                    Margin="0,5"/>
+         <TextBlock Grid.ColumnSpan="2"
+                    Text="{Binding MoveDirMsg}"
+                    Style="{StaticResource MoveDir_TextBlock}"/>
 
-         <RadioButton IsChecked="{Binding LeftIsChecked}"
-                      Style="{StaticResource ToolBar_ToggleButton}"
-                      Grid.Row="1" Grid.Column="0">
+         <RadioButton Grid.Row="1" Grid.Column="0"
+                      IsChecked="{Binding LeftIsChecked}"
+                      Style="{StaticResource OnlyProdToolBar_ToggleButton}">
             <Image Source="/Resources/MovePartInRawPart/MoveLeftParts.png" Stretch="Uniform"/>
          </RadioButton>
-         <RadioButton IsChecked="{Binding RightIsChecked}" 
-                      Style="{StaticResource ToolBar_ToggleButton}"
-                      Grid.Row="1" Grid.Column="1">
+         <RadioButton Grid.Row="1" Grid.Column="1"
+                      IsChecked="{Binding RightIsChecked}" 
+                      Style="{StaticResource OnlyProdToolBar_ToggleButton}">
             <Image Source="/Resources/MovePartInRawPart/MoveRightParts.png" Stretch="Uniform"/>
          </RadioButton>
       </Grid>
 
       <Grid Grid.Row="1"
-            Margin="0,0,0,5">
+            Style="{StaticResource OnlyProdWarehouse_Grid}">
          <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
          </Grid.RowDefinitions>
 
          <TextBlock Text="{Binding MoveLenMsg}"
-                    Style="{StaticResource OptionTextBlock}"
-                    HorizontalAlignment="Center"
-                    Margin="0,5"/>
-         <EgtWPFLib5:EgtTextBox Text="{Binding sMoveLen}"
-                                Grid.Row="1"
-                                Width="200"/>
+                    Style="{StaticResource MoveDir_TextBlock}"/>
+         <EgtWPFLib5:EgtTextBox Grid.Row="1"
+                                Text="{Binding sMoveLen}"
+                                Style="{StaticResource NAM_TextBox}"/>
       </Grid>
 
       <Grid Grid.Row="3"
-            Margin="0,0,0,5">
+            Style="{StaticResource OnlyProdWarehouse_Grid}">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="Auto"/>
@@ -73,14 +69,14 @@
             <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
 
-         <Button Content="Ok"
+         <Button Grid.Column="1"
+                 Content="Ok"
                  Command="{Binding Ok_Command}"
                  IsDefault="True"
-                 Grid.Column="1"
                  Style="{StaticResource EgtWPFLib5_InputButton}"/>
-         <Button Content="Cancel"
+         <Button Grid.Column="3"
+                 Content="Cancel"
                  IsCancel="True"
-                 Grid.Column="3"
                  Style="{StaticResource EgtWPFLib5_InputButton}"/>
       </Grid>
    </Grid>
diff --git a/EgtBEAMWALL.ViewerOptimizer/NestingRunningWnd/OnlyProdNestingRunningWndV.xaml b/EgtBEAMWALL.ViewerOptimizer/NestingRunningWnd/OnlyProdNestingRunningWndV.xaml
index b95aafc6..ec569272 100644
--- a/EgtBEAMWALL.ViewerOptimizer/NestingRunningWnd/OnlyProdNestingRunningWndV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/NestingRunningWnd/OnlyProdNestingRunningWndV.xaml
@@ -24,31 +24,25 @@
       </Grid.RowDefinitions>
       <TextBlock Grid.Row="1"
                  Text="{Binding Section_Msg}"
-                 TextAlignment="Center"/>
+                 Style="{StaticResource OnlyProdNestingRunningWndV_TextBlock}"/>
       <TextBlock Grid.Row="2"
                  Text="{Binding Nesting_Msg}"
-                 TextAlignment="Center"/>
+                 Style="{StaticResource OnlyProdNestingRunningWndV_TextBlock}"/>
       <ProgressBar Grid.Row="4"
-                   Minimum="0"
-                   Maximum="100"
                    Value="{Binding CurrProgress_Value}"
-                   Height="20"
-                   Margin="40,0,40,0"/>
+                   Style="{StaticResource OnlyProdNestingRunningWndV_ProgressBar}"/>
       <ProgressBar Grid.Row="6"
-                   Minimum="0"
-                   Maximum="100"
                    Value="{Binding TotProgress_Value}"
-                   Height="20"
-                   Margin="40,0,40,0"/>
+                   Style="{StaticResource OnlyProdNestingRunningWndV_ProgressBar}"/>
       <TextBlock Grid.Row="8"
                  Text="{Binding TotProgress_Msg}"
-                 TextAlignment="Center"/>
-      <Button Grid.Row="10" Content="Cancel"
+                 Style="{StaticResource OnlyProdNestingRunningWndV_TextBlock}"/>
+      <Button Grid.Row="10" 
+              Content="Cancel"
               IsDefault="False"
               IsCancel="True"
-              Width="70"
-              Style="{StaticResource ToolBar_Button}"
-              Command="{Binding Cancel_Command}"/>
+              Command="{Binding Cancel_Command}"
+              Style="{StaticResource OnlyProdNestingRunningWndV_Button}"/>
    </Grid>
 
 </EgtWPFLib5:EgtCustomWindow>
diff --git a/EgtBEAMWALL.ViewerOptimizer/OptimizePanel/OptimizePanelV.xaml b/EgtBEAMWALL.ViewerOptimizer/OptimizePanel/OptimizePanelV.xaml
index 178062ca..fe93138c 100644
--- a/EgtBEAMWALL.ViewerOptimizer/OptimizePanel/OptimizePanelV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/OptimizePanel/OptimizePanelV.xaml
@@ -7,17 +7,13 @@
 
    <ComboBox ItemsSource="{Binding PartTypeList}"
              SelectedItem="{Binding SelPartType}"
-             Height="22"
-             Width="85"
-             Margin="5,0,2.5,0"
-             Visibility="{Binding Optimize_Visibility}"/>
+             Visibility="{Binding Optimize_Visibility}"
+             Style="{StaticResource Optimize_ComboBox}"/>
 
    <ComboBox ItemsSource="{Binding OriginTypeList}"
              SelectedItem="{Binding SelOriginType}"
-             Height="22"
-             Width="85"
-             Margin="2.5,0,5,0"
-             Visibility="{Binding OriginType_Visibility}"/>
+             Visibility="{Binding OriginType_Visibility}"
+             Style="{StaticResource Optimize_ComboBox}"/>
    <CheckBox Content="{Binding LongDrillArea_Msg}"
              IsChecked="{Binding bLDIntersOther}"
              FlowDirection="RightToLeft"
diff --git a/EgtBEAMWALL.ViewerOptimizer/PartInRawPartManager/OnlyProdPartInRawPartManagerV.xaml b/EgtBEAMWALL.ViewerOptimizer/PartInRawPartManager/OnlyProdPartInRawPartManagerV.xaml
index a2f739ce..e5d6b1b7 100644
--- a/EgtBEAMWALL.ViewerOptimizer/PartInRawPartManager/OnlyProdPartInRawPartManagerV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/PartInRawPartManager/OnlyProdPartInRawPartManagerV.xaml
@@ -8,27 +8,27 @@
            Visibility="{Binding MovePart_Visibility}"
            ToolTip="{Binding ReOrderPart_ToolTip}"
            IsEnabled="{Binding PartInRawPartManager_IsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
+           Style="{StaticResource OnlyProdLeftPanel_Button}">
       <Image Source="/Resources/TopPanel/ReOrderPart.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding MoveUpPart_Command}"
            Visibility="{Binding MovePart_Visibility}"
            ToolTip="{Binding MoveUpPart_ToolTip}"
            IsEnabled="{Binding PartInRawPartManager_IsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
+           Style="{StaticResource OnlyProdLeftPanel_Button}">
       <Image Source="/Resources/TopPanel/MoveUpPart.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding MoveDownPart_Command}"
            Visibility="{Binding MovePart_Visibility}"
            ToolTip="{Binding MoveDownPart_ToolTip}"
            IsEnabled="{Binding PartInRawPartManager_IsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
+           Style="{StaticResource OnlyProdLeftPanel_Button}">
       <Image Source="/Resources/TopPanel/MoveDownPart.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding RemovePart_Command}"
            ToolTip="{Binding RemovePart_ToolTip}"
            IsEnabled="{Binding PartInRawPartManager_IsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
+           Style="{StaticResource OnlyProdLeftPanel_Button}">
       <Image Source="/Resources/TopPanel/RemovePart.png" Stretch="Uniform"/>
    </Button>
 </StackPanel>
diff --git a/EgtBEAMWALL.ViewerOptimizer/PartManager/PartManagerV.xaml b/EgtBEAMWALL.ViewerOptimizer/PartManager/PartManagerV.xaml
index c4ffce69..2780a652 100644
--- a/EgtBEAMWALL.ViewerOptimizer/PartManager/PartManagerV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/PartManager/PartManagerV.xaml
@@ -36,7 +36,9 @@
                                             UpdateSourceTrigger=Explicit}" Width="65"/>
       <TextBlock Text="Inverti"
                  Style="{StaticResource OptionTextBlock}"
-                 Margin="10,0,0,0"/>
+                 TextAlignment="Center"
+                 VerticalAlignment="Center"
+                 Margin="10,0,0,3"/>
       <Image IsEnabled="{Binding Tag.bLockInversion,
                                  RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartManagerV}}}"
              Height="15"
@@ -54,6 +56,7 @@
                                 RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartManagerV}}}"
                  TextAlignment="Center"
                  Width="25"
+                 Margin="10,7,10,0"
                  Style="{StaticResource OptionTextBlock}"/>
       <Button Command="{Binding Tag.Invert_Command,
                                 RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartManagerV}}}"
@@ -63,7 +66,9 @@
       </Button>
       <TextBlock Text="Ruota"
                  Style="{StaticResource OptionTextBlock}"
-                 Margin="10,0,0,0"/>
+                 VerticalAlignment="Center"
+                 TextAlignment="Center"
+                 Margin="10,0,0,3"/>
       <Image IsEnabled="{Binding Tag.bLockRotation,
                                  RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartManagerV}}}"
              Height="15"
@@ -80,6 +85,7 @@
       <TextBlock Text="{Binding Tag.sROTATED,
                                 RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartManagerV}}}"
                  TextAlignment="Center"
+                 Margin="10,7,10,0"
                  Width="25"
                  Style="{StaticResource OptionTextBlock}"/>
       <Button Command="{Binding Tag.ForwardRotation_Command,
diff --git a/EgtBEAMWALL.ViewerOptimizer/ProjectTypeWnd/OnlyProdProjectTypeWndV.xaml b/EgtBEAMWALL.ViewerOptimizer/ProjectTypeWnd/OnlyProdProjectTypeWndV.xaml
index 7ffa1fcf..6217c8d5 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ProjectTypeWnd/OnlyProdProjectTypeWndV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/ProjectTypeWnd/OnlyProdProjectTypeWndV.xaml
@@ -2,8 +2,6 @@
                             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
                             WindowStyle="None" ResizeMode="NoResize"
                             SizeToContent="WidthAndHeight"
                             MinWidth="500"
@@ -11,24 +9,21 @@
                             IsClosable="False"
                             IsMinimizable="False"
                             IsResizable="False"
-                            Title="ProjectType">
-   
-   <StackPanel Margin="5,5,5,0">
+                            Title="ProjectType"
+                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
+
+   <StackPanel Style="{StaticResource OnlyProdProjectTypeWndV_StackPanel}">
       <Border Grid.Row="1"
-              BorderThickness="1"
-              BorderBrush="DarkGray"
-              Background="White"
-              Margin="5">
-         <Grid Margin="5">
+              Style="{StaticResource OnlyProdProjectTypeWndV_Border}">
+         <Grid Style="{StaticResource NewAddFeature_Grid}">
             <Grid.RowDefinitions>
                <RowDefinition Height="Auto"/>
                <RowDefinition Height="1*"/>
                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
 
-            <Grid HorizontalAlignment="Center"
-                  Grid.Row="0"
-                  Margin="15">
+            <Grid Grid.Row="0"
+                  Style="{StaticResource OnlyProdProjectType_Grid}">
                <Grid.RowDefinitions>
                   <RowDefinition Height="Auto"/>
                   <RowDefinition Height="1*"/>
@@ -37,20 +32,23 @@
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="Auto"/>
                </Grid.ColumnDefinitions>
-               <TextBlock Text="{Binding ChooseMachine_Msg}"
-                          Style="{StaticResource OptionTextBlock}"
-                          Grid.Row="0" Grid.ColumnSpan="2"/>
-               <Rectangle Height="22" Grid.Row="1"/>
-               <ComboBox ItemsSource="{Binding MachineList}" DisplayMemberPath="Name" 
-                         SelectedItem="{Binding SelMachine}" SelectedValuePath="Name" 
-                         Grid.Row="2"
-                         Style="{StaticResource BtlData_ComboBox}"/>
+               <TextBlock Grid.Row="0" 
+                          Grid.ColumnSpan="2"
+                          Text="{Binding ChooseMachine_Msg}"
+                          Style="{StaticResource OptionTextBlock}"/>
+               <Rectangle Grid.Row="1"
+                          Style="{StaticResource OnlyProdProjectTypeWndV_Rectangle}"/>
+               <ComboBox Grid.Row="2"
+                         ItemsSource="{Binding MachineList}" 
+                         DisplayMemberPath="Name" 
+                         SelectedItem="{Binding SelMachine}" 
+                         SelectedValuePath="Name" 
+                         Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
             </Grid>
 
-            <Grid HorizontalAlignment="Center"
-                  Grid.Row="1"
-                  Margin="15"
-                  Visibility="{Binding IsBoth_Visibility}">
+            <Grid Grid.Row="1"
+                  Visibility="{Binding IsBoth_Visibility}"
+                  Style="{StaticResource OnlyProdProjectType_Grid}">
                <Grid.RowDefinitions>
                   <RowDefinition Height="Auto"/>
                   <RowDefinition Height="1*"/>
@@ -59,17 +57,20 @@
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="Auto"/>
                </Grid.ColumnDefinitions>
-               <TextBlock Text="{Binding ChooseType_Msg}"
-                          Style="{StaticResource OptionTextBlock}"
-                          Grid.Row="0" Grid.ColumnSpan="2"/>
-               <Rectangle Height="22" Grid.Row="1"/>
-               <ComboBox ItemsSource="{Binding TypeList}"
+               <TextBlock Grid.Row="0" 
+                          Grid.ColumnSpan="2"
+                          Text="{Binding ChooseType_Msg}"
+                          Style="{StaticResource OptionTextBlock}"/>
+               <Rectangle Grid.Row="1"
+                          Style="{StaticResource OnlyProdProjectTypeWndV_Rectangle}"/>
+               <ComboBox Grid.Row="2"
+                         ItemsSource="{Binding TypeList}"
                          SelectedItem="{Binding nSelType}"
-                         Grid.Row="2"
-                         Style="{StaticResource BtlData_ComboBox}"/>
+                         Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
             </Grid>
 
-            <Grid Grid.Row="2" Margin="5">
+            <Grid Grid.Row="2" 
+                  Style="{StaticResource NewAddFeature_Grid}">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="Auto"/>
@@ -77,15 +78,15 @@
                   <ColumnDefinition Width="Auto"/>
                   <ColumnDefinition Width="1*"/>
                </Grid.ColumnDefinitions>
-               <Button Content="Ok"
+               <Button Grid.Column="1"
+                       Content="Ok"
                        Command="{Binding Ok_Command}"
                        IsDefault="True"
-                       Grid.Column="1"
-                       Style="{StaticResource EgtWPFLib5_InputButton}"/>
-               <Button Content="Cancel"
+                       Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+               <Button Grid.Column="3"
+                       Content="Cancel"
                        IsCancel="True"
-                       Grid.Column="3"
-                       Style="{StaticResource EgtWPFLib5_InputButton}"/>
+                       Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
             </Grid>
 
          </Grid>
diff --git a/EgtBEAMWALL.ViewerOptimizer/RawPartManager/OnlyProdRawPartManagerV.xaml b/EgtBEAMWALL.ViewerOptimizer/RawPartManager/OnlyProdRawPartManagerV.xaml
index ca4eafce..a04f962b 100644
--- a/EgtBEAMWALL.ViewerOptimizer/RawPartManager/OnlyProdRawPartManagerV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/RawPartManager/OnlyProdRawPartManagerV.xaml
@@ -8,39 +8,39 @@
            ToolTip="{Binding ProduceRawPart_ToolTip}"
            IsEnabled="{Binding RawPartManagerIsEnabled}"
            Visibility="{Binding ProduceRawPart_Visibility}"
-           Style="{StaticResource LeftPanel_Button}">
+           Style="{StaticResource OnlyProdLeftPanel_Button}">
       <Image Source="/Resources/TopPanel/ProduceRawPart.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding ProduceAllRawPart_Command}"
            ToolTip="{Binding ProduceAllRawPart_ToolTip}"
            IsEnabled="{Binding RawPartManagerIsEnabled}"
            Visibility="{Binding ProduceRawPart_Visibility}"
-           Style="{StaticResource LeftPanel_Button}">
+           Style="{StaticResource OnlyProdLeftPanel_Button}">
       <Image Source="/Resources/TopPanel/ProduceAllRawPart.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding CopyRawPart_Command}"
            ToolTip="{Binding CopyRawPart_ToolTip}"
            IsEnabled="{Binding RawPartManagerIsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
+           Style="{StaticResource OnlyProdLeftPanel_Button}">
       <Image Source="/Resources/TopPanel/CopyRawPart.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding RemoveRawPart_Command}"
            ToolTip="{Binding RemoveRawPart_ToolTip}"
            IsEnabled="{Binding RawPartManagerIsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
+           Style="{StaticResource OnlyProdLeftPanel_Button}">
       <Image Source="/Resources/TopPanel/RemoveRawPart.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding RemoveAllRawPart_Command}"
            ToolTip="{Binding RemoveAllRawPart_ToolTip}"
            IsEnabled="{Binding RawPartManagerIsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
+           Style="{StaticResource OnlyProdLeftPanel_Button}">
       <Image Source="/Resources/TopPanel/RemoveAllRawPart.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding MovePartInRawPart_Command}"
            ToolTip="{Binding MovePartInRawPart_ToolTip}"
            IsEnabled="{Binding RawPartManagerIsEnabled}"
            Visibility="{Binding MovePartInRawPart_Visibility}"
-           Style="{StaticResource LeftPanel_Button}">
+           Style="{StaticResource OnlyProdLeftPanel_Button}">
       <Image Source="/Resources/TopPanel/MovePartInRawPart.png" Stretch="Uniform"/>
    </Button>
 
diff --git a/EgtBEAMWALL.ViewerOptimizer/ShowPanel/ShowPanelV.xaml b/EgtBEAMWALL.ViewerOptimizer/ShowPanel/ShowPanelV.xaml
index 34d13116..ba139101 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ShowPanel/ShowPanelV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/ShowPanel/ShowPanelV.xaml
@@ -6,17 +6,17 @@
                               IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}">
 
    <RadioButton ToolTip="{Binding RenderingWFToolTip}"
-                Style="{StaticResource ToolBar_ToggleButton}"
+                Style="{StaticResource Radio_ToggleButton}"
                 IsChecked="{Binding WireframeIsChecked}">
       <Image Source="/Resources/ShowPanel/RenderingWF.png" Stretch="Uniform"/>
    </RadioButton>
    <RadioButton ToolTip="{Binding RenderingHLToolTip}"
-                Style="{StaticResource ToolBar_ToggleButton}"
+                Style="{StaticResource Radio_ToggleButton}"
                 IsChecked="{Binding HiddenLineIsChecked}">
       <Image Source="/Resources/ShowPanel/RenderingHL.png" Stretch="Uniform"/>
    </RadioButton>
    <RadioButton ToolTip="{Binding RenderingSHToolTip}"
-                Style="{StaticResource ToolBar_ToggleButton}"
+                Style="{StaticResource Radio_ToggleButton}"
                 IsChecked="{Binding ShadingIsChecked}">
       <Image Source="/Resources/ShowPanel/RenderingSH.png" Stretch="Uniform"/>
    </RadioButton>
diff --git a/EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdOptimizerStatisticsV.xaml b/EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdOptimizerStatisticsV.xaml
index 3f540164..7040c94b 100644
--- a/EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdOptimizerStatisticsV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdOptimizerStatisticsV.xaml
@@ -227,19 +227,19 @@
                        Grid.Column="2"
                        IsChecked="{Binding bRawPart_IsChecked}"
                        ToolTip="Materials"
-                       Style="{StaticResource ToolBar_ToggleButton}">
+                       Style="{StaticResource OnlyProdToolBar_ToggleButton}">
             <!--<Image Source="/Resources/Statistics/CopyToClipboard.png" Stretch="Uniform"/>-->
          </ToggleButton>
          <Button Grid.Column="3"
                  ToolTip="{Binding CopyToClipboard_Msg}"
                  x:Name="CopyToClipboardBtn"
-                 Style="{StaticResource ToolBar_Button}">
+                 Style="{StaticResource CopyToClipboard_ToolBar_Button}">
             <Image Source="/Resources/Statistics/CopyToClipboard.png" Stretch="Uniform"/>
          </Button>
          <Button Grid.Column="4"
                  ToolTip="{Binding PrintPDF_Msg}"
                  Command="{Binding PrintPDF_Command}"
-                 Style="{StaticResource ToolBar_Button}">
+                 Style="{StaticResource CopyToClipboard_ToolBar_Button}">
             <Image Source="/Resources/Statistics/PrintPDF.png" Stretch="Uniform"/>
          </Button>
       </Grid>
diff --git a/EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdStatisticsV.xaml b/EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdStatisticsV.xaml
index 81bd4e8c..7f42f7c5 100644
--- a/EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdStatisticsV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdStatisticsV.xaml
@@ -169,13 +169,13 @@
          <Button Grid.Column="1"
                  ToolTip="{Binding CopyToClipboard_Msg}"
                  x:Name="CopyToClipboardBtn"
-                 Style="{StaticResource ToolBar_Button}">
+                 Style="{StaticResource CopyToClipboard_ToolBar_Button}">
             <Image Source="/Resources/Statistics/CopyToClipboard.png" Stretch="Uniform"/>
          </Button>
          <Button Grid.Column="2"
                  ToolTip="{Binding PrintPDF_Msg}"
                  Command="{Binding PrintPDF_Command}"
-                 Style="{StaticResource ToolBar_Button}">
+                 Style="{StaticResource CopyToClipboard_ToolBar_Button}">
             <Image Source="/Resources/Statistics/PrintPDF.png" Stretch="Uniform"/>
          </Button>
       </Grid>
diff --git a/EgtBEAMWALL.ViewerOptimizer/UpdateBTLWnd/OnlyProdUpdateBTLWndV.xaml b/EgtBEAMWALL.ViewerOptimizer/UpdateBTLWnd/OnlyProdUpdateBTLWndV.xaml
index a1633eb5..27d88183 100644
--- a/EgtBEAMWALL.ViewerOptimizer/UpdateBTLWnd/OnlyProdUpdateBTLWndV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/UpdateBTLWnd/OnlyProdUpdateBTLWndV.xaml
@@ -91,12 +91,12 @@
                  Command="{Binding Ok_Command}"
                  IsDefault="True"
                  Grid.Column="1"
-                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
+                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
          <Button Content="{Binding Cancel_Msg}"
                  Command="{Binding Cancel_Command}"
                  IsCancel="True"
                  Grid.Column="3"
-                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
+                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
       </Grid>
 
    </StackPanel>
diff --git a/EgtBEAMWALL.ViewerOptimizer/UpdateBTLWnd/OnlyProdUpdateOrAppendWndV.xaml b/EgtBEAMWALL.ViewerOptimizer/UpdateBTLWnd/OnlyProdUpdateOrAppendWndV.xaml
index 5a0b42ae..7e520833 100644
--- a/EgtBEAMWALL.ViewerOptimizer/UpdateBTLWnd/OnlyProdUpdateOrAppendWndV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/UpdateBTLWnd/OnlyProdUpdateOrAppendWndV.xaml
@@ -56,11 +56,11 @@
                  Command="{Binding Ok_Command}"
                  IsDefault="True"
                  Grid.Column="1"
-                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
+                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
          <Button Content="{Binding Cancel_Msg}"
                  IsCancel="True"
                  Grid.Column="3"
-                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
+                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
       </Grid>
    </Grid>
 </EgtWPFLib5:EgtCustomWindow>
diff --git a/EgtBEAMWALL.ViewerOptimizer/Utility/Dictionary.xaml b/EgtBEAMWALL.ViewerOptimizer/Utility/Dictionary.xaml
index ee242a14..019971d9 100644
--- a/EgtBEAMWALL.ViewerOptimizer/Utility/Dictionary.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/Utility/Dictionary.xaml
@@ -236,88 +236,135 @@
       <TextBlock TextWrapping="WrapWithOverflow" Text="{Binding}"/>
    </DataTemplate>
 
-   <Style x:Key="ToolBar_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+   <!-- Stile utilizzato nella classe:
+             - CalcPanelV per Button Verify_Command, VerifyAll_Command, ResetCalc_Command, Simulate_Command, Edit_Command, ChooseMachine_Command, OK
+             - FreeContourManagerV per Button Line2P_Command, Delete_Command, ModifyCurve_Command, AddPointCurve_Command, RemovePointCurve_Command, ChangeStart_Command, InvertCurve_Command, Move_Command, Rotate_Command, TextAngle_Command 
+             - InstrumentPanelV per Button ChangeParameter_Command, ChangeMaterial_Command 
+             - NestingRunningWndV per Button Cancel_Command 
+             - OptimizePanelV per Button Optimize_Command, CalcRotFlip_Command, UnlockFlip_Command, UnlockRot_Command, Warehouse_Command 
+             - ProdManagerV per Button OpenCommand, SaveCommand, AddProj_Command, GoToProj_Command, GoToSupervisor_Command 
+             - ProjManagerV per Button New_Command, OpenCommand, SaveCommand, ImportBTL_Command, UpdateBTL_Command, ExportProject_Command, ImportProject_Command, GoToProd_Command
+             - ShowBeamPanelV per Button ShowAll_Command 
+             - StatisticsV per Button CopyToClipboard_Msg, PrintPDF_Command 
+             - ViewPanelV per Button ZoomAllCommand, TopViewCommand, FrontViewCommand, RightViewCommand, BackViewCommand, LeftViewCommand, IsoViewSWCommand
+             - WarehouseWndV per Button +, - 
+             - OptimizerStatisticsV per Button CopyToClipboardBtn, PrintPDF_Command -->
+   
+   <Style x:Key="ToolBar_Button" TargetType="{x:Type Button}" BasedOn="{x:Null}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="30"/>
    </Style>
-   <Style x:Key="ToolBar_SmallButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+
+   <!-- Stile utilizzato nella classe:
+             - MDIPageV per Button SendMDI_Command
+             - PartParametersV per Button PartColour_Command
+             - PartManagerV per Button Invert_Command, BackRotation_Command, ForwardRotation_Command
+             - PartParametersWnd per Button PartColour_Command
+             - WarehouseWnd per Button +, - -->
+   
+   <Style x:Key="ToolBar_SmallButton" TargetType="{x:Type Button}" BasedOn="{x:Null}">
       <Setter Property="Height" Value="20"/>
       <Setter Property="Width" Value="20"/>
    </Style>
-   <Style x:Key="ToolBar_OnlyProdSmallButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-      <Setter Property="Height" Value="20"/>
-      <Setter Property="Width" Value="20"/>
-   </Style>
-   <Style x:Key="ToolBar_TextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+
+   <!-- Stile utilizzato nella classe:
+             - General_ConfigurationPageV per Button Backup, Restore
+             - MachinePanelV per Button ToolDbCommand
+             - MachCommandMessagePanelV per Button Connect_Command, Start_Command, Stop_Command, Reset_Command, SetPoint_Command, DeleteAlarms_Command -->
+
+   <Style x:Key="ToolBar_TextButton" TargetType="{x:Type Button}" BasedOn="{x:Null}">
       <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}}">
+
+   <!-- Stile utilizzato nella classe:
+             - ConfigurationPageV per Button SaveCommand -->
+
+   <Style x:Key="OptionPanel_Button" TargetType="{x:Type Button}" BasedOn="{x:Null}">
       <Setter Property="Height" Value="25"/>
       <Setter Property="Width" Value="25"/>
       <Setter Property="Margin" Value="5,0,0,0"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="HorizontalAlignment" Value="Center"/>
    </Style>
-   <Style x:Key="MachinePanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+
+   <!-- Stile utilizzato nella classe:
+             - Machine_ConfigurationPageV per Button SaveCommand -->
+
+   <Style x:Key="MachinePanel_Button" TargetType="{x:Type Button}" BasedOn="{x:Null}">
       <Setter Property="Height" Value="50"/>
       <Setter Property="Width" Value="50"/>
       <Setter Property="Margin" Value="50"/>
       <Setter Property="VerticalAlignment" Value="Bottom"/>
       <Setter Property="HorizontalAlignment" Value="Right"/>
    </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}}">
+
+   <!-- Stile utilizzato nella classe:
+             - AddFeatureWndV per Button Ok, Cancel
+             - AddPartWndV per Button Ok, Cancel
+             - AddRawPartWndV per Button Ok, Cancel
+             - AddSectionXMaterialWndV per Button Ok, Cancel
+             - BlockedWndV per Button Ok, Cancel
+             - ChangeMaterialWndV per Button Ok, Cancel 
+             - ChangeParameterWndV per Button Ok, Cancel
+             - FeatureManagerV per Button Ok, Cancel
+             - FreeContourInputV per Button Ok, Cancel
+             - InputPwdWndV per Button Ok, Cancel
+             - MacroFeatureWndV per Button Ok, Cancel
+             - MovePartInRawPartWndV per Button Ok, Cancel
+             - MultiCopyRawPartWndV per Button Ok, Cancel
+             - ProjectTypeWndV per Button Ok, Cancel
+             - UpdateBTLWndV per Button Ok, Cancel
+             - UpdateOrAppendWndV per Button Ok, Cancel -->
+
+   <Style x:Key="EgtWPFLib5_InputButton" TargetType="{x:Type Button}" BasedOn="{x:Null}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="80"/>
    </Style>
 
-   <Style x:Key="LeftPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+   <!-- Stile utilizzato nella classe:
+             - PDFEditorV per Button MoveUpOrder_Command, MoveDownOrder_Command
+             - BTLPartManagerV per Button NewRawPart_Command, NewRawPartLast_Command, AddToRawPart_Command, CopyPart_Command, AddPart_Command, RemovePart_Command, Invert_Command, BackRotation_Command 
+             - FeatureListManagerV per Button CopyFeature_Command, MacroFeature_Command, AddFeature_Command, RemoveFeature_Command
+             - PartInRawPartManagerV per Button ReOrderPart_Command, MoveUpPart_Command, MoveDownPart_Command, RemovePart_Command
+             - RawPartManagerV per Button ProduceRawPart_Command, ProduceAllRawPart_Command, CopyRawPart_Command, RemoveRawPart_Command, RemoveAllRawPart_Command, MovePartInRawPart_Command -->
+
+   <Style x:Key="LeftPanel_Button" TargetType="{x:Type Button}" BasedOn="{x:Null}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="30"/>
       <Setter Property="Margin" Value="2.5,2.5,2.5,2.5"/>
    </Style>
 
-   <Style x:Key="Close_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+   <!-- Stile utilizzato nella classe:
+             - PDFEditorV per Button ClosePreview_Command -->
+
+   <Style x:Key="Close_Button" TargetType="{x:Type Button}" BasedOn="{x:Null}">
       <Setter Property="Height" Value="40"/>
       <Setter Property="Width" Value="50"/>
       <Setter Property="Margin" Value="2.5,2.5,2.5,2.5"/>
    </Style>
 
-   <Style x:Key="PDFPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+   <!-- Stile utilizzato nella classe:
+             - PDFEditorV per Button CreatePreviewVis_Command, CreatePreviewOtt_Command -->
+
+   <Style x:Key="PDFPanel_Button" TargetType="{x:Type Button}" BasedOn="{x:Null}">
       <Setter Property="Height" Value="40"/>
       <Setter Property="Width" Value="120"/>
       <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="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="0,0,0,5"/>
    </Style>
-   
-   <Style x:Key="ToolBar_ParameterMachineButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="120"/>
-   </Style>
 
    <!-- Button Style New Page -->
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdManagerV per Button OpenCommand, SaveCommand, AddProjCommand, ImportBTLCommand, UpdateBTLCommand, ExportProjectCommand, ImportProjectCommand -->
    
    <Style x:Key="ToolBarOnlyProdManager_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Height" Value="30"/>
@@ -325,36 +372,57 @@
       <Setter Property="Margin" Value="10,2.5,2.5,2.5"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdManagerV per Button NewCommand -->
+
    <Style x:Key="ToolBarOnlyProdManagerNew_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="30"/>
       <Setter Property="Margin" Value="120,2.5,2.5,2.5"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdManagerV per Button GoToSupervisorCommand -->
+
    <Style x:Key="ToolBarOnlyProdManagerGoToSupervisor_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="30"/>
       <Setter Property="Margin" Value="10,2.5,220,2.5"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdShowBeamPanelV per Button ShowAll_Command -->
+
    <Style x:Key="ToolBarOnlyProdPage_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="30"/>
       <Setter Property="Margin" Value="5,2,5,2"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdCalcPanelV per Button Verify_Command, VerifyAll_Command, ResetCalc_Command, Simulate_Command, Edit_Command, ChooseMachine_Command 
+             - OnlyProdFreeContourManagerV per Button Line2P_Command, Delete_Command, ModifyCurve_Command, AddPointCurve_Command, RemovePointCurve_Command, ChangeStart_Command, InvertCurve_Command, Move_Command, Rotate_Command, TextAngle_Command
+             - OnlyProdInstrumentPanelV per Button ChangeParameter_Command, Visualization_Command, Optimizer_Command
+             - OnlyProdViewPanelV per Button ZoomAllCommand, TopViewCommand, FrontViewCommand, RightViewCommand, BackViewCommand, LeftViewCommand, IsoViewSWCommand -->
+   
    <Style x:Key="ToolBarViewPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="30"/>
       <Setter Property="Margin" Value="5,2,5,2"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdInstrumentPanelV per Button ChangeMaterial_Command -->
+
    <Style x:Key="ToolBarViewPanelMAT_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="40"/>
       <Setter Property="Margin" Value="5,2,5,2"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdCalcPanelV per Button Ok_Command -->
+
    <Style x:Key="ToolBarOnlyProdCalcPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="30"/>
@@ -363,12 +431,18 @@
       <Setter Property="Margin" Value="5,2,5,2"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdOptimizePanelV per Button Warehouse_Command -->
+
    <Style x:Key="ToolBarWarehouse_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="30"/>
       <Setter Property="Margin" Value="0,0,0,5"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdOptimizePanelV per Button Optimize_Command -->
+
    <Style x:Key="ToolBarOptimize_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="70"/>
@@ -377,53 +451,180 @@
       <Setter Property="Margin" Value="0,0,0,20"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdPartManagerV per Button Invert_Command -->
+
    <Style x:Key="OnlyProdToolBar_SmallButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Height" Value="20"/>
       <Setter Property="Width" Value="20"/>
       <Setter Property="Margin" Value="35,0,0,0"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdPartManagerV per Button Invert_Command -->
+
    <Style x:Key="OnlyProdToolBarInverted_SmallButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Height" Value="20"/>
       <Setter Property="Width" Value="20"/>
       <Setter Property="Margin" Value="0,0,40,0"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdPartManagerV per Button BackRotation_Command -->
+
    <Style x:Key="OnlyProdToolBarBackRotation_SmallButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Height" Value="20"/>
       <Setter Property="Width" Value="20"/>
       <Setter Property="Margin" Value="35,0,0,0"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdPartManagerV per Button FowardRotation_Command -->
+
    <Style x:Key="OnlyProdToolBarFowardRotation_SmallButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Height" Value="20"/>
       <Setter Property="Width" Value="20"/>
       <Setter Property="Margin" Value="0,0,40,0"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdGeneral_ConfigurationPageV per Button Restore_Command 
+             - MachinePanelV per Button MachDbCommand, SetUpCommand 
+             - OnlyProdFeatureManagerV per Button Edit_Command, Save_Command, Cancel_Command 
+             - OnlyProdFreeContourInputV per Button Show_Command, Done_Command
+             - OnlyProdInputPwdWndV per Button Ok_Command, Cancel -->
+
    <Style x:Key="GeneralConfigurationToolBar_TextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="80"/>
       <Setter Property="Margin" Value="5,0,0,0"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - MachinePanelV per Button BeamTable_Command, WallTable_Command -->
+
    <Style x:Key="MachineToolBar_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="30"/>
       <Setter Property="Margin" Value="5,0,0,0"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - MachinePanelV per Button ParameterMachine_Command -->
+
    <Style x:Key="MachineToolBar_ParameterMachineButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="120"/>
       <Setter Property="Margin" Value="5,0,0,0"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - StatusBarV per Button SnapPointType -->
+
    <Style x:Key="SnapPointType_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
       <Setter Property="Width" Value="100"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdNestingRunningWndV per Button Cancel -->
+
+   <Style x:Key="OnlyProdNestingRunningWndV_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="70"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdWarehouseWndV per Button AddParam, RemoveParam -->
+
+   <Style x:Key="OnlyProdWarehouseWndV_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="30"/>
+      <Setter Property="FontWeight" Value="Light"/>
+      <Setter Property="FontSize" Value="20"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdWarehouseWndV per Button OK AddParam -->
+
+   <Style x:Key="OKAddParam_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Margin" Value="0,0,2.5,0"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdWarehouseWndV per Button Cancel AddParam -->
+
+   <Style x:Key="CancelAddParam_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Margin" Value="2.5,0,0,0"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdOptimizerStatisticsV per Button CopyToClipboard_Msg, PrintPDF
+             - OnlyProdStatisticsV per Button CopyToClipboard_Msg, PrintPDF -->
+
+   <Style x:Key="CopyToClipboard_ToolBar_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="30"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdAddRawPartWndV per Button Ok, Cancel
+             - OnlyProdProjectTypeWndV per Button Ok, Cancel
+             - OnlyProdUpdateBTLWndV per Button Ok, Cancel
+             - OnlyProdUpdateOrAppendWndV per Button Ok, Cancel 
+             - NewAddFeatureWndV per Button Ok, Cancel 
+             - OnlyProdAddPartWndV per Button Ok, Cancel
+             - OnlyProdGeneral_ConfigurationPageV per Button Backup -->
+
+   <Style x:Key="OnlyProdEgtWPFLib5_InputButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="80"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdWarehouseWndV per Button +, - -->
+
+   <Style x:Key="OnlyProdWWnd_SmallButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="20"/>
+      <Setter Property="Width" Value="20"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdConfigurationPageV per Button SaveCommand -->
+
+   <Style x:Key="SaveOptionPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="25"/>
+      <Setter Property="Width" Value="25"/>
+      <Setter Property="Margin" Value="5,0,0,0"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdMachine_ConfigurationPageV per Button SaveCommand -->
+
+   <Style x:Key="SaveMachinePanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="50"/>
+      <Setter Property="Width" Value="50"/>
+      <Setter Property="Margin" Value="50"/>
+      <Setter Property="VerticalAlignment" Value="Bottom"/>
+      <Setter Property="HorizontalAlignment" Value="Right"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdBTLPartManagerV per Button NewRawPart_Command, NewRawPartLast_Command, AddToRawPart_Command, CopyPart_Command, AddPart_Command, RemovePart_Command, Invert_Command, BackRotation_Command 
+             - OnlyProdFeatureListManagerV per Button CopyFeature_Command, MacroFeature_Command, AddFeature_Command, RemoveFeature_Command
+             - OnlyProdLeftPanelV per Button Data_Command, Parameter_Command
+             - OnlyProdPartInRawPartManagerV per Button ReOrderPart_Command, MoveUpPart_Command, MoveDownPart_Command, RemovePart_Command
+             - OnlyProdRawPartManagerV per Button ProduceRawPart_Command, ProduceAllRawPart_Command, CopyRawPart_Command, RemoveRawPart_Command, RemoveAllRawPart_Command, MovePartInRawPart_Command -->
+
+   <Style x:Key="OnlyProdLeftPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="30"/>
+      <Setter Property="Margin" Value="2.5,2.5,2.5,2.5"/>
+   </Style>
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
@@ -474,48 +675,67 @@
       </Setter>
    </Style>
 
-   <Style x:Key="ToolBar_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+   <!-- Stile utilizzato nella classe:
+             - InstrumentPanelV per ToggleButton GetDistIsChecked, Statistics_IsChecked 
+             - MovePartInRawPartWndV per ToogleButton LeftIsChecked, RightIsChecked
+             - ShowBeamPanelV per ToogleButton ShowSolid_IsChecked, ShowBuilding_IsChecked 
+             - OptimizerStatisticsV per ToogleButton bRawPart_IsChecked -->
+
+   <Style x:Key="ToolBar_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{x:Null}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="30"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdInstrumentPanelV per RadioButton WireframeIsChecked, HiddenLineIsChecked, ShadingIsChecked -->
+
+   <Style x:Key="Radio_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="30"/>
+      <Setter Property="Background" Value="#E0E0E0"/>
+      <Setter Property="BorderThickness" Value="0"/>
+      <Style.Resources>
+         <Style TargetType="Border">
+            <Setter Property="CornerRadius" Value="0"/>
+         </Style>
+      </Style.Resources>
+   </Style>
+
    <!-- ToggleButton Style New Page -->
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdInstrumentPanelV per ToogleButton GetDistIsChecked, Statistics_IsChecked -->
+   
    <Style x:Key="ToolBarOnlyProdPage_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="30"/>
       <Setter Property="Margin" Value="5,2,5,2"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdNewOpenProjectFileDialogV per ToogleButton bIsEditNameActive -->
+
    <Style x:Key="ToolBar_SmallToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
       <Setter Property="Height" Value="20"/>
       <Setter Property="Width" Value="20"/>
+      <Setter Property="Margin" Value="5,0,0,0"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdUpdateOrAppendWndV per RadioButton UpdateIsChecked, AppendIsChecked -->
+
    <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="OptionPanel_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
-      <Setter Property="Height" Value="30"/>
-   </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="CompoWindow_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
-      <Setter Property="Height" Value="40"/>
-   </Style>
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdMainMenuV per RadioButton OnlyProdPage_IsChecked, Config_IsChecked -->
 
    <Style x:Key="MainMenu_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
       <Setter Property="Background" Value="{StaticResource Omag_White}"/>
       <Setter Property="Foreground" Value="{StaticResource Omag_DarkGray}"/>
       <Setter Property="TextBlock.FontWeight" Value="Normal"/>
-      <!--<Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="90"/>-->
       <Style.Triggers>
          <Trigger Property="IsChecked" Value="true">
             <Setter Property="TextBlock.FontWeight" Value="ExtraBold"/>
@@ -523,6 +743,9 @@
       </Style.Triggers>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdMainMenuV per Button Supervisor_Command, SendFeedbackCommand -->
+
    <Style x:Key="MainMenu_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Background" Value="{StaticResource Omag_White}"/>
       <Setter Property="Foreground" Value="{StaticResource Omag_DarkGray}"/>
@@ -531,34 +754,14 @@
       <Setter Property="Width" Value="90"/>
    </Style>
 
-   <Style x:Key="Option_ColorButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-      <Setter Property="Padding" Value="5"/>
-      <Setter Property="HorizontalContentAlignment" Value="Center"/>
-      <Setter Property="VerticalContentAlignment" Value="Center"/>
-      <Setter Property="TextBlock.TextAlignment" Value="Center"/>
-      <Style.Triggers>
-         <Trigger Property="IsMouseOver" Value="True">
-            <Setter Property="Background" Value="#FFB8C3CD"/>
-         </Trigger>
-         <Trigger Property="IsPressed" Value="True">
-            <Setter Property="OpacityMask" Value="#33FF0000"/>
-         </Trigger>
-         <Trigger Property="ToggleButton.IsChecked" Value="True">
-            <Setter Property="Background" Value="Transparent"/>
-         </Trigger>
-         <Trigger Property="IsEnabled" Value="False">
-            <Setter Property="Background" Value="#FFF4F4F4"/>
-            <Setter Property="BorderBrush" Value="#FFADB2B5"/>
-            <Setter Property="TextElement.Foreground"  Value="#FF838383"/>
-         </Trigger>
-      </Style.Triggers>
-   </Style>
-
    <Style x:Key="DrawPanelButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="30"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdSpecialPanelV per Button LuaExecCommand -->
+
    <Style x:Key="DrawPanelButtonOnlyProd" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="30"/>
@@ -569,32 +772,41 @@
 
    <!-- TextBlock -->
 
-   <Style x:Key="ToolsTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Margin" Value="10,0,0,0"/>
-   </Style>
-
-   <Style x:Key="MachiningsTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Margin" Value="10,0,0,0"/>
-   </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>
-
+   <!-- Stile utilizzato nella classe:
+             - NewOpenProjectFileDialogV per TextBlock Rows_Msg
+             - OpenProjectFileDialogV per TextBlock Rows_Msg
+             - AddFeatureWndV per TextBlock Process, Macro
+             - NewAddFeatureWndV per TextBlock ghDesc 
+             - AddPartWndV per TextBlock Name, Prod Number, Count, W, H, L
+             - OnlyProdAddPartWndV per TextBlock Name, Prod Number, Count, W, H, L
+             - AddRawPartWndV per TextBlock sMsg
+             - OnlyProdAddRawPartWndV per TextBlock sMsg
+             - ChangeMaterialWndV per TextBlock ProjMaterial_Msg, WjMaterial_Msg
+             - ChangeParameterWndV per TextBlock Process, Parameter, Actual Value, New Value
+             - ConfigurationPageV per TextBlock General_Msg, ParameterQ_Msg, PDFEditor_Msg 
+             - OnlyProdConfigurationPageV per TextBlock General_Msg, ParameterQ_Msg, PDFEditor_Msg
+             - FeatureManagerV per TextBlock Face_Msg, Group_Msg, Priority_Msg, sName
+             - OnlyProdFeatureManagerV per TextBlock Priority_Msg 
+             - FreeContourInputV per TextBlock Message 
+             - OnlyProdFreeContourInputV per TextBlock Message
+             - InputPwdWndV per TextBlock PasswordMsg
+             - MacroFeatureWndV per TextBlock Feature, Name 
+             - NewMacroFeatureWnd per TextBlock Feature, Name, sDescBTLFeature
+             - MovePartInRawPartWndV per TextBlock MoveDir, MoveLen
+             - PartManagerV per TextBlock BTL Qty, sCNT, Added Qty, sADDED, W, sW, H, sH, L, sL, Inverti, sINVERTED, Ruota, sROTATED, sNAM, sUnitTime
+             - OnlyProdProjectTypeWndV per TextBlock ChooseMachine_Msg, ChooseType_Msg
+             - ProjectTypeWndV per TextBlock ChooseMachine_Msg, ChooseType_Msg
+             - PDFEditor per TextBlock sNameParameter, Name, Section_Msg, Image_Msg -->
+      
    <Style x:Key="OptionTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
       <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="VerticalAlignment" Value="Top"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="Margin" Value="10,5,10,0"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - NewAddFeatureWndV per TextBlock Process_Msg, Custom_Msg, Default_Msg -->
+      
    <Style x:Key="ListTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
       <Setter Property="HorizontalAlignment" Value="Center"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
@@ -602,35 +814,73 @@
       <Setter Property="FontSize" Value="20"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - Machine_ConfigurationPageV per TextBlock sName, sDescription
+             - OnlyProdMachine_ConfigurationPageV per TextBlock sName, sDescription -->
+
    <Style x:Key="MachParamTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
       <Setter Property="HorizontalAlignment" Value="Left"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="Margin" Value="5,0,5,0"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - BTLDataWndV per TextBlock PROJNUM_MSG, PROJNAME_MSG, PROJPART_MSG, PROJGUID_MSG, LISTNAME_MSG, CUSTOMER_MSG, ARCHITECT_MSG, EDITOR_MSG, DELIVDATE_MSG, EXPDATE_MSG, EXPTIME_MSG, EXPRELEASE_MSG, LANGUAGE_MSG, RANGE_MSG, PROCESSINGQUALITY_MSG, COMPUTERNAME_MSG, USER_MSG, SRCFILE_MSG, EXPFILE_MSG, RECESS_MSG, USERATTRIBUTE_MSG
+             - BTLDataV per TextBlock PROJNUM_MSG, PROJNAME_MSG, PROJPART_MSG, PROJGUID_MSG, LISTNAME_MSG, CUSTOMER_MSG, ARCHITECT_MSG, EDITOR_MSG, DELIVDATE_MSG, EXPDATE_MSG, EXPTIME_MSG, EXPRELEASE_MSG, LANGUAGE_MSG, RANGE_MSG, PROCESSINGQUALITY_MSG, COMPUTERNAME_MSG, USER_MSG, SRCFILE_MSG, EXPFILE_MSG, RECESS_MSG, USERATTRIBUTE_MSG
+             - PartParametersV per TextBlock NAM_MSG, COUNT_MSG, ORDERNUM_MSG, PLANINGLEN_MSG, STARTOFFSET_MSG, ENDOFFSET_MSG, DESIGN_MSG, GROUP_MSG, STOREY_MSG, ANNOT_MSG, MATERIAL_MSG, COLOUR_MSG, TRANSPARENCY_MSG, TIMBERGRADE_MSG, QUALITYGRADE_MSG, PACKAGE_MSG, ASSEMBLYNUM_MSG, ELEMENTNUM_MSG, MODULENUM_MSG, PROCESSINGQUALITY_MSG, RECESS_MSG, STOREYTYPE_MSG, LAYER_MSG, COMMENT_MSG, REFSIDE_MSG, REFSIDEALIGN_MSG, GRAINDIRECTION_MSG, GRAINDIRALIGN_MSG, CAMBERSIDE_MSG, CAMBERPARAMS_MSG, REFSIDEFIXCLAMP_MSG, PARTOFFSETPARAMS_MSG, MATERIALTYPEGRP_MSG, MATERIALTYPESPEC_MSG, ALIGNLOCATION_MSG, ALIGNENDTYPE_MSG, UID_MSG, TRANSFORIG_MSG, TRANSFVERSX_MSG, TRANSFVERSY_MSG 
+             - PartParametersWndV per TextBlock NAM_MSG, COUNT_MSG, ORDERNUM_MSG, PLANINGLEN_MSG, STARTOFFSET_MSG, ENDOFFSET_MSG, DESIGN_MSG, GROUP_MSG, STOREY_MSG, ANNOT_MSG, MATERIAL_MSG, COLOUR_MSG, TRANSPARENCY_MSG, TIMBERGRADE_MSG, QUALITYGRADE_MSG, PACKAGE_MSG, ASSEMBLYNUM_MSG, ELEMENTNUM_MSG, MODULENUM_MSG, PROCESSINGQUALITY_MSG, RECESS_MSG, STOREYTYPE_MSG, LAYER_MSG, COMMENT_MSG, REFSIDE_MSG, REFSIDEALIGN_MSG, GRAINDIRECTION_MSG, GRAINDIRALIGN_MSG, CAMBERSIDE_MSG, CAMBERPARAMS_MSG, REFSIDEFIXCLAMP_MSG, PARTOFFSETPARAMS_MSG, MATERIALTYPEGRP_MSG, MATERIALTYPESPEC_MSG, ALIGNLOCATION_MSG, ALIGNENDTYPE_MSG, UID_MSG, TRANSFORIG_MSG, TRANSFVERSX_MSG, TRANSFVERSY_MSG 
+             - OnlyProdWarehouseWndV per TextBlock Kerf_Msg, Offset_Msg, Quantity_Msg, L_Msg, W_Msg 
+             - WarehouseWndV per TextBlock CurrentS_Msg, StartOffset_Msg, Kerf_Msg, Offset_Msg, Quantity_Msg, L_Msg, W_Msg -->
+
    <Style x:Key="PartParam_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="Margin" Value="10,0,10,0"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - PDFEditorV per TextBlock sNameCategory -->
+      
    <Style x:Key="Category_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
       <Setter Property="Foreground" Value="DarkBlue"/>
       <Setter Property="FontSize" Value="16"/>
       <Setter Property="FontWeight" Value="Bold"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - NewOpenProjectFileDialogV per TextBlock From_Msg, To_Msg
+             - OnlyProdNewOpenProjectFileDialogV per TextBlock From_Msg, To_Msg
+             - OnlyProdOpenProjectFileDialogV per TextBlock From_Msg, To_Msg
+             - OpenProjectFileDialogV per TextBlock From_Msg, To_Msg -->
+
    <Style x:Key="Filter_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="Margin" Value="2.5,0,2.5,0"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - NewOpenProjectFileDialogV per TextBlock BTLFileName_Msg, ListName_Msg, ExportDate_Msg
+             - OnlyProdNewOpenProjectFileDialogV per TextBlock BTLFileName_Msg, ListName_Msg, ExportDate_Msg -->
+
    <Style x:Key="OpenWnd_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
       <Setter Property="Foreground" Value="DarkGray"/>
       <Setter Property="Margin" Value="0,0,20,0"/>
    </Style>
 
    <!-- TextBlock New Page -->
-  
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdNewOpenProjectFileDialogV per TextBlock Rows_Msg 
+             - OnlyProdOpenProjectFileDialogV per TextBlock Rows_Msg -->
+
+   <Style x:Key="Option_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
+      <Setter Property="Margin" Value="10,5,10,0"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdPartManagerV per TextBlock BTL Qty, Added Qty, W, H, L, bLockRotation, sNAM -->
+   
    <Style x:Key="OptionTextBlock_OnlyProd" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
       <Setter Property="HorizontalAlignment" Value="Center"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
@@ -638,6 +888,9 @@
       <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
       <Setter Property="TextWrapping" Value="Wrap"/>
    </Style>
+   
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdPartManagerV per TextBlock sCNT -->
 
    <Style x:Key="OnlyProdCNT_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
       <Setter Property="HorizontalAlignment" Value="Center"/>
@@ -648,6 +901,9 @@
       <Setter Property="TextWrapping" Value="Wrap"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdPartManagerV per TextBlock bLockInversion -->
+
    <Style x:Key="OnlyProdInversion_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
       <Setter Property="HorizontalAlignment" Value="Center"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
@@ -657,6 +913,10 @@
       <Setter Property="TextWrapping" Value="Wrap"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdFeatureListV per TextBlock Descrizione
+             - OnlyProdPParameterListV per TextBlock Descrizione -->
+
    <Style x:Key="OnlyProd_TextBlock" TargetType="{x:Type TextBlock}">
       <Setter Property="TextAlignment" Value="Center"/>
       <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
@@ -670,10 +930,15 @@
       </Style.Triggers>
    </Style>
 
-   <Style x:Key="OnlyProdPartList_TextBlock" TargetType="{x:Type TextBlock}">
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdQParameterListProdV per TextBlock Descrizione
+             - OnlyProdQParameterListV per TextBlock Descrizione -->
+
+   <Style x:Key="OnlyProdQParameterListProd_TextBlock" TargetType="{x:Type TextBlock}">
       <Setter Property="TextAlignment" Value="Center"/>
       <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
       <Setter Property="TextWrapping" Value="Wrap"/>
+      <Setter Property="Margin" Value="4,0,0,0"/>
       <Style.Triggers>
          <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGridCell}}, Path=IsSelected}" Value="True">
             <Setter Property="FontWeight" Value="Bold" />
@@ -683,10 +948,8 @@
       </Style.Triggers>
    </Style>
 
-   <Style x:Key="New_TextBlock" TargetType="{x:Type TextBlock}">
-      <Setter Property="TextAlignment" Value="Center"/>
-      <Setter Property="TextWrapping" Value="Wrap"/>
-   </Style>
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdStatisticsTimePanelV per TextBlock sBTLTotTime, sTotEstimatedTime, sDoneTime, sRemainingTime -->
 
    <Style x:Key="OnlyProdStatisticTimePanel_TextBlock" TargetType="{x:Type TextBlock}">
       <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
@@ -695,6 +958,9 @@
       <Setter Property="TextWrapping" Value="Wrap"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdPartManagerV per TextBlock sINVERTED, sROTATED -->
+
    <Style x:Key="OnlyProdInverted_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
       <Setter Property="HorizontalAlignment" Value="Center"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
@@ -705,6 +971,9 @@
       <Setter Property="TextWrapping" Value="Wrap"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdPartManagerV per TextBlock UnitTime -->
+
    <Style x:Key="OnlyProdUnitTime_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
       <Setter Property="HorizontalAlignment" Value="Center"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
@@ -713,12 +982,8 @@
       <Setter Property="TextWrapping" Value="Wrap"/>
    </Style>
 
-   <Style x:Key="NewAddFeature_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="HorizontalAlignment" Value="Left"/>
-      <Setter Property="VerticalAlignment" Value="Top"/>
-      <Setter Property="Margin" Value="10,5,10,0"/>
-      <Setter Property="TextWrapping" Value="Wrap"/>
-   </Style>
+   <!-- Stile utilizzato nella classe:
+             - NewAddFeatureWndV per TextBlock MacroName -->
 
    <Style x:Key="Macro_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
       <Setter Property="HorizontalAlignment" Value="Center"/>
@@ -728,6 +993,9 @@
       <Setter Property="TextWrapping" Value="Wrap"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - NewAddFeatureWndV per TextBlock MacroDefault -->
+
    <Style x:Key="MacroDefault_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
       <Setter Property="HorizontalAlignment" Value="Left"/>
       <Setter Property="VerticalAlignment" Value="Top"/>
@@ -736,6 +1004,9 @@
       <Setter Property="TextWrapping" Value="Wrap"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdConfigurationPageV per TextBlock Machine -->
+
    <Style x:Key="Machine_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
       <Setter Property="HorizontalAlignment" Value="Center"/>
       <Setter Property="VerticalAlignment" Value="Top"/>
@@ -744,15 +1015,115 @@
       <Setter Property="TextWrapping" Value="Wrap"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdFeatureManagerV per TextBlock sName -->
+
    <Style x:Key="OnlyProdFeatureManager_OnlyProd" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
       <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
+      <Setter Property="VerticalAlignment" Value="Top"/>
       <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
       <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
-      <Setter Property="Margin" Value="5,0,0,0"/>
+      <Setter Property="Margin" Value="5,5,0,0"/>
       <Setter Property="TextWrapping" Value="Wrap"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdWarehouseWndV per TextBlock CurrentS_Msg, StartOffset_Msg -->
+
+   <Style x:Key="OnlyProdPartParam_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="VerticalAlignment" Value="Center"/>
+      <Setter Property="Margin" Value="10,0,10,0"/>
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdBTLPartListV per TextBlock CALC_FALL -->
+
+   <Style x:Key="CALC_FALL_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="TextAlignment" Value="Center"/>
+      <Setter Property="Foreground" Value="Blue"/>
+      <Setter Property="FontWeight" Value="Bold"/>
+      <Setter Property="FontSize" Value="18"/>
+      <Setter Property="Margin" Value="-1,-6,1,-3"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdBTLPartListV per TextBlock CALC_ERR -->
+
+   <Style x:Key="CALC_ERR_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="TextAlignment" Value="Center"/>
+      <Setter Property="FontWeight" Value="Bold"/>
+      <Setter Property="FontSize" Value="12"/>
+      <Setter Property="Margin" Value="2,-6,-2,-3"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdInputPwdWndV per TextBlock PasswordMsg -->
+
+   <Style x:Key="PasswordMsg_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="VerticalAlignment" Value="Top"/>
+      <Setter Property="Margin" Value="0,0,0,5"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdFeatureInPartInRawPartListV per Ellipse CALC_ERR
+             - OnlyProdFeatureListV per Ellipse CALC_ERR
+             - OnlyProdRawPartListV per Ellipse CALC_ERR -->
+   
+   <Style x:Key="OnlyProdFeatureInPartInRawPartList_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="TextAlignment" Value="Center"/>
+      <Setter Property="FontWeight" Value="Bold"/>
+      <Setter Property="FontSize" Value="12"/>
+      <Setter Property="Margin" Value="0,-6,0,-2"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdRawPartListV per TextBlock CALC_FALL -->
+   
+   <Style x:Key="OnlyProdRawPartList_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="TextAlignment" Value="Center"/>
+      <Setter Property="Foreground" Value="Aqua"/>
+      <Setter Property="FontWeight" Value="Bold"/>
+      <Setter Property="FontSize" Value="12"/>
+      <Setter Property="Margin" Value="0,-6,0,-2"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdMovePartInRawPartWndV per TextBlock MoveDirMsg, MoveLenMsg -->
+   
+   <Style x:Key="MoveDir_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="VerticalAlignment" Value="Top"/>
+      <Setter Property="Margin" Value="0,5"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdNestingRunningWndV per TextBlock Section_Msg, Nesting_Msg, TotProgress_Msg 
+             - OnlyProdWarehouseWndV per TextBlock MinThickness_Msg, Value_Msg, MaxThickness_Msg -->
+
+   <Style x:Key="OnlyProdNestingRunningWndV_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="TextAlignment" Value="Center"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdWarehouseWndV per TextBlock dMinThickness -->
+
+   <Style x:Key="OnlyProdWarehouseWndV_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="Width" Value="70"/>
+      <Setter Property="Margin" Value="15,5"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdMovePartInRawPartWndV per ToogleButton LeftIsChecked, RightIsChecked
+             - OnlyProdOptimizerStatisticsV per ToogleButton bRawPart_IsChecked -->
+
+   <Style x:Key="OnlyProdToolBar_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="30"/>
+   </Style>
+
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!-- TextBox -->
@@ -792,17 +1163,28 @@
    </Style>
 
    <!-- TextBox New Page -->
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdAddPartWndV per EgtTextBox nPDN, sCNT, sW, sH, sL
+             - OnlyProdFeatureManagerV per EgtTextBox sPriority 
+             - OnlyProdPartManagerV per EgtTextBox sW, sH, sL -->
    
    <Style x:Key="Dimension_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
       <Setter Property="Width" Value="45"/>
       <Setter Property="TextWrapping" Value="Wrap"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe: 
+             - OnlyProdPartManagerV per EgtTextBox sADDED -->
+
    <Style x:Key="Qty_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
       <Setter Property="Width" Value="40"/>
       <Setter Property="TextWrapping" Value="Wrap"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe: 
+             - OnlyProdFreeContourInputV per TextBox Text -->
+
    <Style x:Key="FreeContour_TextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
       <Setter Property="Height" Value="22"/>
       <Setter Property="VerticalContentAlignment" Value="Center"/>
@@ -812,8 +1194,56 @@
       <Setter Property="TextWrapping" Value="Wrap"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe: 
+             - OnlyProdLeftPanelV per TextBox SearchText -->
+
    <Style x:Key="SearchText_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
       <Setter Property="Margin" Value="0,2,0,0"/>
+      <Setter Property="VerticalAlignment" Value="Top"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdAddPartWndV per EgtTextBox sNAM
+             - OnlyProdMovePartInRawPartWndV per EgtTextBox MoveLen -->
+   
+   <Style x:Key="NAM_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
+      <Setter Property="Width" Value="200"/>
+      <Setter Property="TextWrapping" Value="Wrap"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdAddRawPartWndV per EgtTextBox sValue -->
+
+   <Style x:Key="Value_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
+      <Setter Property="Width" Value="65"/>
+      <Setter Property="TextWrapping" Value="Wrap"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdWarehouseWndV per EgtTextBox dOffset, dMaxThickness -->
+
+   <Style x:Key="OnlyProdWarehouseWndV_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
+      <Setter Property="Width" Value="70"/>
+      <Setter Property="TextWrapping" Value="Wrap"/>
+      <Setter Property="Margin" Value="15,5"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdWarehouseWndV per EgtTextBox sNewL, sNewW -->
+
+   <Style x:Key="New_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
+      <Setter Property="Width" Value="100"/>
+      <Setter Property="Margin" Value="5"/>
+      <Setter Property="TextWrapping" Value="Wrap"/>
+      <Setter Property="HorizontalAlignment" Value="Right"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdNewOpenProjectFileDialogV per EgtTextBox SearchText -->
+
+   <Style x:Key="NewSearchText_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
+      <Setter Property="Margin" Value="5"/>
+      <Setter Property="TextWrapping" Value="Wrap"/>
    </Style>
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
@@ -849,7 +1279,7 @@
    <!--#F0F0F0-->
    <SolidColorBrush x:Key="ScrollBar.Disabled.Border" Color="{StaticResource BeamWall_LinkWater_Color}"/>
    <!--#BFBFBF-->
-   <SolidColorBrush x:Key="ScrollBar.Disabled.Glyph" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Disabled.Glyph" Color="{StaticResource BeamWall_Kashmir_Color}"/>
    <SolidColorBrush x:Key="ScrollBar.Button.Static.Background" Color="{StaticResource BeamWall_White_Color}"/>
    <Style x:Key="RepeatButtonTransparent" TargetType="{x:Type RepeatButton}">
       <Setter Property="OverridesDefaultStyle" Value="true"/>
@@ -935,7 +1365,7 @@
          </Setter.Value>
       </Setter>
    </Style>
-   <Style TargetType="{x:Type ScrollBar}">
+   <Style x:Name="OnlyProd_ScrollBar" TargetType="{x:Type ScrollBar}">
       <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false"/>
       <Setter Property="Stylus.IsFlicksEnabled" Value="false"/>
       <Setter Property="Background" Value="{StaticResource ScrollBar.Static.Background}"/>
@@ -1117,6 +1547,12 @@
 
    <!-- Border New Page -->
    
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdLeftPanelV
+             - PartInRawPartManagerWndV 
+             - RawPartManagerWndV 
+             - ProjWndV -->
+
    <Style x:Key="OnlyProdPage_Border" TargetType="{x:Type Border}">
       <Setter Property="Grid.RowSpan" Value="2"/>
       <Setter Property="CornerRadius" Value="4"/>
@@ -1124,6 +1560,9 @@
       <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Glacier}"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdProjectV -->
+
    <Style x:Key="OnlyProdOptimizerPanel_Border" TargetType="{x:Type Border}">
       <Setter Property="CornerRadius" Value="4"/>
       <Setter Property="BorderThickness" Value="4"/>
@@ -1133,12 +1572,19 @@
       <Setter Property="Margin" Value="2,0,2,0"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - ProdWndV
+             - ProjWndV -->
+   
    <Style x:Key="OnlyProdProj_Border" TargetType="{x:Type Border}">
       <Setter Property="CornerRadius" Value="4"/>
       <Setter Property="BorderThickness" Value="2"/>
       <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Glacier}"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdStatisticsTimePanelV -->
+
    <Style x:Key="OnlyProdTotalTimeST_Border" TargetType="{x:Type Border}">
       <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Kashmir}"/>
       <Setter Property="Background" Value="{StaticResource BeamWall_Kashmir}"/>
@@ -1148,6 +1594,9 @@
       <Setter Property="Margin" Value="2"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdStatisticsTimePanelV -->
+
    <Style x:Key="OnlyProdTotalTimeOTT_Border" TargetType="{x:Type Border}">
       <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Kashmir}"/>
       <Setter Property="Background" Value="{StaticResource BeamWall_Kashmir}"/>
@@ -1157,6 +1606,9 @@
       <Setter Property="Margin" Value="2,2,20,2"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdStatisticsTimePanelV -->
+
    <Style x:Key="OnlyProdDoneTime_Border" TargetType="{x:Type Border}">
       <Setter Property="BorderBrush" Value="{StaticResource BeamWall_FruitSalad}"/>
       <Setter Property="Background" Value="{StaticResource BeamWall_FruitSalad}"/>
@@ -1166,6 +1618,9 @@
       <Setter Property="Margin" Value="2,2,20,2"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdStatisticsTimePanelV -->
+
    <Style x:Key="OnlyProdRemainingTime_Border" TargetType="{x:Type Border}">
       <Setter Property="BorderBrush" Value="{StaticResource BeamWall_FuelYellow}"/>
       <Setter Property="Background" Value="{StaticResource BeamWall_FuelYellow}"/>
@@ -1175,26 +1630,41 @@
       <Setter Property="Margin" Value="2"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdPartManagerV -->
+
    <Style x:Key="OnlyProdQty_Border" TargetType="{x:Type Border}">
       <Setter Property="Background" Value="{StaticResource BeamWall_White}"/>
       <Setter Property="Margin" Value="15,20,25,0"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdPartManagerV -->
+
    <Style x:Key="OnlyProdDimension_Border" TargetType="{x:Type Border}">
       <Setter Property="Background" Value="{StaticResource BeamWall_White}"/>
       <Setter Property="Margin" Value="10,20,30,0"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdPartManagerV -->
+
    <Style x:Key="OnlyProdCommand_Border" TargetType="{x:Type Border}">
       <Setter Property="Background" Value="{StaticResource BeamWall_White}"/>
       <Setter Property="Margin" Value="15,10,-180,20"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdPartManagerV -->
+
    <Style x:Key="OnlyProdUnitTime_Border" TargetType="{x:Type Border}">
       <Setter Property="Background" Value="{StaticResource BeamWall_White}"/>
       <Setter Property="Margin" Value="200,10,30,20"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - ProdWnd -->
+
    <Style x:Key="OnlyProdQParameterList_Border" TargetType="{x:Type Border}">
       <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Glacier}"/>
       <Setter Property="Margin" Value="1,0,0,0"/>
@@ -1202,6 +1672,24 @@
       <Setter Property="CornerRadius" Value="4"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdBTLPartListV -->
+
+   <Style x:Key="CALC_FALL_Border" TargetType="{x:Type Border}">
+      <Setter Property="BorderThickness" Value="2"/>
+      <Setter Property="Padding" Value="1"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdProjectTypeWndV per Border -->
+   
+   <Style x:Key="OnlyProdProjectTypeWndV_Border" TargetType="{x:Type Border}">
+      <Setter Property="BorderThickness" Value="1"/>
+      <Setter Property="BorderBrush" Value="DarkGray"/>
+      <Setter Property="Background" Value="{StaticResource BeamWall_White}"/>
+      <Setter Property="Margin" Value="5"/>
+   </Style>
+
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!-- EgtCustomWindow -->
@@ -1214,6 +1702,25 @@
       <Setter Property="ShowInTaskbar" Value="False"/>
    </Style>
 
+   <!-- EgtCustomWindow New Page -->
+
+   <!-- Stile utilizzato nella classe:
+             - NewAddFeatureWndV per EgtCustomWindow
+             - OnlyProdAddPartWndV per EgtCustomWindow
+             - OnlyProdAddRawPartWndV per EgtCustomWindow
+             - OnlyProdMovePartInRawPartWndV per EgtCustomWindow
+             - OnlyProdProjectTypeWndV per EgtCustomWindow
+             - OnlyProdInputPwdWndV per EgtCustomWindow -->
+
+   <Style x:Key="OnlyProd_EgtCustomWindow" TargetType="{x:Type EgtWPFLib5:EgtCustomWindow}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
+      <Setter Property="TitleBarHeight" Value="32"/>
+      <Setter Property="TitleBarBrush" Value="{StaticResource BeamWall_Glacier}"/>
+      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Kashmir}"/>
+      <Setter Property="TitleBarForeground" Value="{StaticResource BeamWall_White}"/>
+      <Setter Property="ShowInTaskbar" Value="False"/>
+   </Style>
+
+
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!-- EgtFloatingPanel -->
@@ -1223,23 +1730,31 @@
       <Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>
    </Style>
 
+   <!-- EgtFloatingPanel New Page -->
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdCalcPanelV per EgtFloatingPanel
+             - OnlyProdFreeContourManagerV per EgtFloatingPanel
+             - OnlyProdInstrumentPanelV per EgtFloatingPanel
+             - OnlyProdManagerV per EgtFloatingPanel
+             - OnlyProdShowBeamPanelV per EgtFloatingPanel
+             - OnlyProdSpecialPanelV per EgtFloatingPanel
+             - OnlyProdStatisticsTimePanelV per EgtFloatingPanel
+             - OnlyProdViewPanelV per EgtFloatingPanel -->
+   
    <Style x:Key="ToolBar_EgtFloatingPanel_OnlyProd" TargetType="{x:Type EgtFloating:EgtFloatingPanel}" BasedOn="{StaticResource {x:Type EgtFloating:EgtFloatingPanel}}">
       <Setter Property="Background" Value="Transparent"/>
       <Setter Property="BorderBrush" Value="Transparent"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdManagerV per EgtFloatingPanel -->
+
    <Style x:Key="ToolBar_EgtFloatingPanel_OnlyProdManager" TargetType="{x:Type EgtFloating:EgtFloatingPanel}" BasedOn="{StaticResource {x:Type EgtFloating:EgtFloatingPanel}}">
       <Setter Property="Background" Value="{StaticResource BeamWall_White}"/>
       <Setter Property="BorderBrush" Value="{StaticResource BeamWall_White}"/>
    </Style>
 
-   <Style x:Key="Option_EgtFloatingPanel" TargetType="{x:Type EgtFloating:EgtFloatingPanel}" BasedOn="{StaticResource {x:Type EgtFloating:EgtFloatingPanel}}">
-      <Setter Property="IsToolBar" Value="False"/>
-      <Setter Property="TitleBarOrientation" Value="Vertical"/>
-      <Setter Property="Background" Value="{StaticResource Omag_Gray}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>
-   </Style>
-
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!-- CsvTreeViewItem DA CAMBIARE!! -->
@@ -1356,34 +1871,65 @@
 
    <!-- ComboBox -->
 
-   <Style x:Key="MachiningsComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
-      <Setter Property="Margin" Value="0,0,0,10"/>
-   </Style>
+   <!-- Stile utilizzato nella classe:
+             - AddFeatureWndV per ComboBox PRCList, MacroCustomList
+             - ChangeMaterialWndV per ComboBox ProjMaterialList, WhMaterialList 
+             - ChangeParameterWndV per ComboBox PRCList, ParamList 
+             - FeatureManagerV per ComboBox SIDEList, GRPList 
+             - MacroFeatureWndV per ComboBox FeatureList -->
 
-   <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="FeatureComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
+   <Style x:Key="FeatureComboBox" TargetType="{x:Type ComboBox}" BasedOn="{x:Null}">
       <Setter Property="Height" Value="22"/>
       <Setter Property="MinWidth" Value="55"/>
    </Style>
 
-   <Style x:Key="PartParam_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
+   <!-- Stile utilizzato nella classe:
+             - OptimizePanelV per ComboBox PartTypeList, OriginTypeList -->
+
+   <Style x:Key="Optimize_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{x:Null}">
+      <Setter Property="Height" Value="22"/>
+      <Setter Property="Width" Value="85"/>
+      <Setter Property="Margin" Value="5,0,2.5,0"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - BTLDataWndV per ComboBox ocRANGE, ocPROCESSINGQUALITY, SelRECESS
+             - BTLDataV per ComboBox ocRANGE, ocPROCESSINGQUALITY, SelRECESS
+             - ProjectTypeWndV per ComboBox MachineList, TypeList
+             - PartParametersV per ComboBox ocPROCESSINGQUALITY, SelRECESS, ocSTOREYTYPE, ocREFSIDE bGRAINDIRALIGN, ocCAMBERSIDE, ocREFSIDEFIXCLAMP, ocMATERIALTYPEGRP, ocALIGNLOCATION, ocALIGNENDTYPE, SelUID
+             - PartParametersWndV per ComboBox ocPROCESSINGQUALITY, SelRECESS, ocSTOREYTYPE, ocREFSIDE bGRAINDIRALIGN, ocCAMBERSIDE, ocREFSIDEFIXCLAMP, ocMATERIALTYPEGRP, ocALIGNLOCATION, ocALIGNENDTYPE, SelUID -->
+
+   <Style x:Key="PartParam_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{x:Null}">
       <Setter Property="Height" Value="22"/>
       <Setter Property="Width" Value="150"/>
    </Style>
 
-   <Style x:Key="BtlData_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
+   <!-- Stile utilizzato nella classe:
+             - BTLDataWndV per ComboBox ocRANGE, ocPROCESSINGQUALITY, SelRECESS
+             - BTLDataV per ComboBox ocRANGE, ocPROCESSINGQUALITY, SelRECESS
+             - OnlyProdProjectTypeWndV per ComboBox MachineList, TypeList
+             - ProjectTypeWndV per ComboBox MachineList, TypeList -->
+
+   <Style x:Key="BtlData_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{x:Null}">
       <Setter Property="Height" Value="22"/>
       <Setter Property="Width" Value="150"/>
    </Style>
 
-   <Style x:Key="Warehouse_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
+   <!-- Stile utilizzato nella classe:
+             - WarehouseWndV per ComboBox SParamList -->
+   
+   <Style x:Key="Warehouse_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{x:Null}">
       <Setter Property="Height" Value="22"/>
       <Setter Property="Width" Value="100"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - FreeContourInputV per ComboBox ComboItemsList -->
+
+   <Style x:Key="ComboItemsList_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{x:Null}">
+      <Setter Property="Margin" Value="5,0,5,0"/>
+   </Style>
+
    <SolidColorBrush x:Key="TextBox.Static.Background" Color="#FFFFFFFF"/>
    <Style x:Key="ComboBoxEditableTextBox" TargetType="{x:Type TextBox}">
       <Setter Property="OverridesDefaultStyle" Value="true"/>
@@ -1667,42 +2213,101 @@
       </Style.Triggers>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdCalcPanelV per ComboBox MachineList
+             - OnlyProdOpenProjectFileDialogV per ComboBox DayTypeList
+             - OnlyProdProjectTypeWndV per ComboBox MachineList, TypeList -->
+   
    <Style x:Key="OnlyProdCalcPanel_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
       <Setter Property="Height" Value="22"/>
       <Setter Property="Width" Value="150"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdFreeContourManagerV per ComboBox TypeList -->
+   
    <Style x:Key="OnlyProdType_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
       <Setter Property="Height" Value="22"/>
       <Setter Property="Width" Value="160"/>
       <Setter Property="Margin" Value="5,0,5,0"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdFreeContourManagerV per ComboBox PathList -->
+   
    <Style x:Key="OnlyProdPath_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
       <Setter Property="Height" Value="22"/>
       <Setter Property="Width" Value="100"/>
       <Setter Property="Margin" Value="0,0,5,0"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdOptimizePanelV per ComboBox PartTypeList -->
+
    <Style x:Key="OnlyProdOptimizePanel_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
       <Setter Property="Height" Value="22"/>
       <Setter Property="Width" Value="85"/>
       <Setter Property="Margin" Value="5,5,2.5,20"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdFreeContourInputV per ComboBox ComboItemsList -->
+   
    <Style x:Key="FreeContourInput_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
       <Setter Property="Margin" Value="5,0,5,0"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdGeneral_ConfigurationPageV per ComboBox ReminderList
+             - OnlyProdAddRawPartWndV per ComboBox DimensionsList -->
+
    <Style x:Key="GeneralConfiguration_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
       <Setter Property="Margin" Value="0,0,0,5"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdNewOpenProjectFileDialogV per ComboBox BTLDateTypeList, FilterTypeList -->
+
+   <Style x:Key="BTLDateTypeList_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
+      <Setter Property="Height" Value="22"/>
+      <Setter Property="MinWidth" Value="55"/>
+      <Setter Property="Width" Value="105"/>
+      <Setter Property="Margin" Value="5"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdNewOpenProjectFileDialogV per ComboBox DayTypeList -->
+
+   <Style x:Key="DayTypeList_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
+      <Setter Property="Height" Value="22"/>
+      <Setter Property="Width" Value="105"/>
+      <Setter Property="Margin" Value="0,0,2.5,0"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdNewOpenProjectFileDialogV per ComboBox RowQuantityList -->
+
+   <Style x:Key="OnyProd_FeatureComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
+      <Setter Property="Height" Value="22"/>
+      <Setter Property="MinWidth" Value="55"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdWarehouseWndV per ComboBox SParamList -->
+
+   <Style x:Key="OnlyProdWarehouse_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
+      <Setter Property="Height" Value="22"/>
+      <Setter Property="Width" Value="100"/>
+   </Style>
+
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!-- CheckBox -->
 
-   <Style x:Key="OptionCheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
+   <!-- Stile utilizzato nella classe:
+             - PDFEditorV per CheckBox bParameter_IsChecked, bIsChecked, bSection_IsChecked, bImage_IsChecked -->
+
+   <Style x:Key="OptionCheckBox" TargetType="{x:Type CheckBox}" BasedOn="{x:Null}">
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="HorizontalAlignment" Value="Right"/>
       <Setter Property="Margin" Value="10,0,0,0"/>
@@ -1710,11 +2315,35 @@
 
    <!-- CheckBox New Page -->
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdFreeContourInput per CheckBox -->
+   
    <Style x:Key="FreeContourInput_CheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="Margin" Value="5,0,5,0"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdBTLPartListV per CheckBox
+             - OnlyProdFeatureListV per CheckBox
+             - OnlyProdPParameterListV per CheckBox 
+             - OnlyProdQParameterListProdV per CheckBox 
+             - OnlyProdQParameterListV per CheckBox 
+             - OnlyProdWarehouseWndV per CheckBox 
+             - OnlyProdNewOpenProjectFileDialogV per CheckBox -->
+
+   <Style x:Key="OnlyProdBTLPartList_CheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
+      <Setter Property="VerticalAlignment" Value="Center"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdFeatureInPartInRawPartListV per CheckBox -->
+   
+   <Style x:Key="OnlyProdFeatureInPartInRawPartList_CheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
+      <Setter Property="VerticalAlignment" Value="Center"/>
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+   </Style>
+
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!-- GroupBox -->
@@ -1766,16 +2395,35 @@
       </Setter>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - PDFEditorV per GroupBox -->
+   
    <Style x:Key="GroupBox_PDFPreview" TargetType="{x:Type GroupBox}">
       <Setter Property="Margin" Value="2.5"/>
       <Setter Property="Width" Value="Auto"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdWarehouseWndV per GroupBox MediumWall -->
+   
+   <Style x:Key="OnlyProdWarehouseWndV_GroupBox" TargetType="{x:Type GroupBox}" BasedOn="{StaticResource {x:Type GroupBox}}">
+      <Setter Property="Margin" Value="0,0,0,5"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdNewOpenProjectFileDialogV per GroupBox Filters -->
+
+   <Style x:Key="Filters_GroupBox" TargetType="{x:Type GroupBox}" BasedOn="{StaticResource {x:Type GroupBox}}">
+      <Setter Property="Margin" Value="5"/>
+   </Style>
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!-- TabControl that have only Headers and no Pages -->
 
+   <!-- Stile utilizzato nella classe:
+             - BeamMachiningsWindowV per TabControl MachiningList -->
+
    <Style x:Key="TabControl_OnlyHeaders"  TargetType="{x:Type TabControl}">
       <Setter Property="OverridesDefaultStyle" Value="True" />
       <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -1807,6 +2455,9 @@
 
    <!-- TabControl New Page -->
 
+   <!-- Stile utilizzato nella classe:
+             - ProjWnd per TabControl -->
+
    <Style x:Key="OnlyProd_TabControl" TargetType="{x:Type TabControl}">
       <Setter Property="TabStripPlacement" Value="Left"/>
       <Setter Property="Margin" Value="5,5,2.5,5"/>
@@ -1816,6 +2467,10 @@
 
    <!-- TabControl that have only Headers and no Pages -->
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdPartManagerV per Image bLockRotation, bLockInversion
+             - PartManagerV per Image bLockRotation, bLockInversion-->
+
    <Style x:Key="LockImage" TargetType="{x:Type Image}">
       <Setter Property="Source" Value="/Resources/PartManager/Locked.png" />
       <Setter Property="Height" Value="15"/>
@@ -1827,20 +2482,59 @@
       </Style.Triggers>
    </Style>
 
+   <!-- Image New Page -->
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdPartManagerV per Image Clock -->
+
    <Style x:Key="UnitTime_Image" TargetType="{x:Type Image}">
       <Setter Property="Height" Value="15"/>
       <Setter Property="Stretch" Value="Uniform"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - NewAddFeatureWndV per Image Macro -->
+
    <Style x:Key="Macro_Image" TargetType="{x:Type Image}">
       <Setter Property="Width" Value="300"/>
       <Setter Property="Margin" Value="5,0,5,5"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdFeatureListV per Image DrawPath
+             - OnlyProdPParameterListV per Image DrawPath
+             - OnlyProdQParameterListProdV per Image DrawPath 
+             - OnlyProdQParameterListV per Image DrawPath -->
+
+   <Style x:Key="OnlyProdFeatureList_Image" TargetType="{x:Type Image}">
+      <Setter Property="Stretch" Value="Uniform"/>
+      <Setter Property="Margin" Value="2.5"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdNewOpenProjectFileDialogV per Image Archived -->
+
+   <Style x:Key="Archived_Image" TargetType="{x:Type Image}">
+      <Setter Property="Width" Value="15"/>
+      <Setter Property="Height" Value="15"/>
+      <Setter Property="Stretch" Value="UniformToFill"/>
+   </Style>
+
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!-- Custom SelectedItem colors for DataGrid -->
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdBTLPartListV per EgtDataGrid
+             - OnlyProdFeatureInPartInRawPartListV per EgtDataGrid
+             - OnlyProdFeatureListV per EgtDataGrid
+             - OnlyProdPartInRawPartListV per EgtDataGrid
+             - OnlyProdPParameterListV per EgtDataGrid
+             - OnlyProdQParameterListProdV per EgtDataGrid
+             - OnlyProdQParameterListV per EgtDataGrid
+             - OnlyProdRawPartListV per EgtDataGrid
+             - OnlyProdWarehouseWndV per EgtDataGrid -->
+
    <Style x:Key="DataGrid_OnlyProd" TargetType="{x:Type DataGrid}">
       <Setter Property="Background" Value="Transparent"/>
       <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
@@ -1848,13 +2542,18 @@
       <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Glacier}"/>
       <Setter Property="BorderThickness" Value="0,0,0,0"/>
       <Setter Property="RowDetailsVisibilityMode" Value="VisibleWhenSelected"/>
-      <Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
+      <Setter Property="ScrollViewer.CanContentScroll" Value="True"/>
       <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
+      <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
+      <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
       <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
       <Setter Property="HeadersVisibility" Value="Column" />
       <Setter Property="TextBlock.TextAlignment" Value="Center"/>
       <Setter Property="HorizontalContentAlignment" Value="Center"/>
       <Setter Property="VerticalContentAlignment" Value="Center"/>
+      <Setter Property="CanUserAddRows" Value="False"/>
+      <Setter Property="CanUserResizeRows" Value="False"/>
+      <Setter Property="AutoGenerateColumns" Value="False"/>
       <Setter Property="Template">
          <Setter.Value>
             <ControlTemplate TargetType="{x:Type DataGrid}">
@@ -1902,8 +2601,17 @@
             <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
          </MultiTrigger>
       </Style.Triggers>
+      <Style.Resources>
+         <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource OnlyProd_ScrollBar}"/>
+      </Style.Resources>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdBTLPartListV per DataGridRow
+             - OnlyProdFeatureListV per DataGridRow
+             - OnlyProdPParameterListV per DataGridRow
+             - OnlyProdQParameterListProdV per DataGridRow
+             - OnlyProdQParameterListV per DataGridRow -->
 
    <Style x:Key="RowDataGrid_CustomHighLight" TargetType="{x:Type DataGridRow}">
       <Style.Resources>
@@ -1922,8 +2630,15 @@
       </Style.Triggers>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdBTLPartListV per DataGridCell
+             - OnlyProdFeatureListV per DataGridCell
+             - OnlyProdPParameterListV per DataGridCell
+             - OnlyProdQParameterListProdV per DataGridCell
+             - OnlyProdQParameterListV per DataGridCell -->
+
    <Style x:Key="CellDataGrid_CustomHighLight" TargetType="{x:Type DataGridCell}">
-      <Setter Property="Height" Value="23" />
+      <Setter Property="Height" Value="23"/>
       <Style.Resources>
          <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Transparent" />
          <SolidColorBrush x:Key="{x:Static SystemColors.HighlightTextBrushKey}" Color="Black" />
@@ -1940,6 +2655,10 @@
       </Style.Triggers>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdPartInRawPartListV per DataGridRow
+             - OnlyProdRawPartListV per DataGridRow -->
+
    <Style x:Key="RowDataGrid_CustomHighLight_PartList" TargetType="{x:Type DataGridRow}">
       <Style.Resources>
          <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Transparent" />
@@ -1957,6 +2676,12 @@
       </Style.Triggers>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdPartInRawPartListV per DataGridCell
+             - OnlyProdRawPartListV per DataGridCell
+             - OnlyProdFeatureInPartInRawPartListV per DataGridCell 
+             - OnlyProdQParameterListProdV per DataGridCell -->
+   
    <Style x:Key="CellDataGrid_CustomHighLight_PartList" TargetType="{x:Type DataGridCell}">
       <Setter Property="Height" Value="23" />
       <Style.Resources>
@@ -1975,6 +2700,44 @@
       </Style.Triggers>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - PartInRawPartListV per DataGridRow
+             - RawPartListV per DataGridRow
+             - FeatureListV per DataGridRow
+             - PartInRawPartListV per DataGridRow  
+             - PParameterListV per DataGridRow
+             - QParameterListV per DataGridRow
+             - RawPartListV per DataGridRow -->
+
+   <Style x:Key="StaticRowDataGrid_CustomHighLight" TargetType="{x:Type DataGridRow}">
+      <Setter Property="BorderBrush" Value="LightGray" />
+      <Style.Triggers>
+         <Trigger Property="IsSelected" Value="True">
+            <Setter Property="BorderThickness" Value="2,2,2,2" />
+            <Setter Property="BorderBrush" Value="Cyan" />
+            <Setter Property="Padding" Value="0,0,0,0" />
+            <Setter Property="Margin" Value="-2,0,-2,0" />
+            <Setter Property="FontWeight" Value="Bold" />
+            <Setter Property="Foreground" Value="Blue" />
+         </Trigger>
+      </Style.Triggers>
+      <Style.Resources>
+         <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Transparent" />
+         <SolidColorBrush x:Key="{x:Static SystemColors.HighlightTextBrushKey}" Color="Black" />
+         <SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightBrushKey}" Color="Transparent" />
+         <SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightTextBrushKey}" Color="Black" />
+      </Style.Resources>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - BTLPartListV per DataGrid BTLPart_DataGrid
+             - FeatureInPartInRawPartListV
+             - FeatureListV 
+             - PartInRawPartListV
+             - PParameterListV 
+             - QParameterListV
+             - RawPartListV-->
+
    <Style x:Key="DataGrid_CustomHighLight" TargetType="{x:Type DataGrid}">
       <Style.Resources>
          <Style TargetType="{x:Type DataGridCell}">
@@ -1993,7 +2756,8 @@
                </Trigger>
             </Style.Triggers>
          </Style>
-         <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource RowDataGrid_CustomHighLight}"/>
+         <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource StaticRowDataGrid_CustomHighLight}"/>
+         <Style TargetType="{x:Type ScrollBar}" BasedOn="{x:Null}"/>
       </Style.Resources>
    </Style>
 
@@ -2027,6 +2791,12 @@
    
    <!-- DatePicker -->
 
+   <!-- Stile utilizzato nella classe:
+             - NewOpenProjectFileDialogV per DataPicker dtStartDate, dtEndDate
+             - OnlyProdNewOpenProjectFileDialogV per DataPicker dtStartDate, dtEndDate
+             - OnlyProdOpenProjectFileDialogV per DataPicker dtStartDate, dtEndDate
+             - OpenProjectFileDialogV per DataPicker dtStartDate, dtEndDate -->
+
    <Style x:Key="Filter_DatePicker" TargetType="{x:Type DatePicker}">
       <Setter Property="Height" Value="22" />
       <Setter Property="Width" Value="100" />
@@ -2036,12 +2806,18 @@
 
    <!-- ItemsControl -->
 
+   <!-- Stile utilizzato nella classe:
+             - PDFEditorV per ItemsControl ExpanderList -->
+
    <Style x:Key="ItemsControl_ExpanderList" TargetType="{x:Type ItemsControl}" BasedOn="{StaticResource {x:Type ItemsControl}}">
       <Setter Property="BorderThickness" Value="0"/>
       <Setter Property="Margin" Value="0"/>
       <Setter Property="Padding" Value="0"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - PDFEditorV per ItemsControl ExpanderElementList -->
+
    <Style x:Key="ItemsControl_ExpanderElementList" TargetType="{x:Type ItemsControl}" BasedOn="{StaticResource {x:Type ItemsControl}}">
       <Setter Property="BorderThickness" Value="0"/>
       <Setter Property="Margin" Value="0"/>
@@ -2049,6 +2825,25 @@
       <Setter Property="FontSize" Value="14"/>
    </Style>
 
+   <!-- ItemsControl New Page -->
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdBTLPartListV per ItemsControl BTLFeatureVMList -->
+
+   <Style x:Key="CALC_FALL_ItemsControl" TargetType="{x:Type ItemsControl}" BasedOn="{StaticResource {x:Type ItemsControl}}">
+      <Setter Property="Margin" Value="0"/>
+      <Setter Property="Padding" Value="0"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdNewOpenProjectFileDialogV per ItemsControl ProjFileList -->
+
+   <Style x:Key="ProjFileList_ItemsControl" TargetType="{x:Type ItemsControl}" BasedOn="{StaticResource {x:Type ItemsControl}}">
+      <Setter Property="Margin" Value="0,-1,0,0"/>
+      <Setter Property="Padding" Value="0"/>
+      <Setter Property="BorderThickness" Value="0"/>
+   </Style>
+
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!-- StackPanel -->
@@ -2058,11 +2853,17 @@
       <Setter Property="Margin" Value="0"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - PDFEditorV per StackPanel -->
+
    <Style x:Key="StackPanel_List" TargetType="{x:Type StackPanel}">
       <Setter Property="Orientation" Value="Horizontal"/>
       <Setter Property="Margin" Value="5,5,5,0"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - PDFEditorV per StackPanel -->
+
    <Style x:Key="StackPanel_Button" TargetType="{x:Type StackPanel}">
       <Setter Property="Orientation" Value="Vertical"/>
       <Setter Property="Margin" Value="2.5,0,0,0"/>
@@ -2071,6 +2872,9 @@
    </Style>
 
    <!-- StackPanel New Page -->
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdOptimizePanelV per StackPanel -->
    
    <Style x:Key="OptmizePanel_StackPanel" TargetType="{x:Type StackPanel}">
       <Setter Property="Orientation" Value="Vertical"/>
@@ -2078,12 +2882,18 @@
       <Setter Property="VerticalAlignment" Value="Center"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdBTLPartManagerV per StackPanel -->
+   
    <Style x:Key="OnlyProdBTLPartManager_StackPanel" TargetType="{x:Type StackPanel}">
       <Setter Property="Orientation" Value="Horizontal"/>
       <Setter Property="HorizontalAlignment" Value="Right"/>
       <Setter Property="Margin" Value="0,1,30,1"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdFeatureListManagerV per StackPanel -->
+
    <Style x:Key="OnlyProdFeatureListManager_StackPanel" TargetType="{x:Type StackPanel}">
       <Setter Property="Orientation" Value="Horizontal"/>
       <Setter Property="HorizontalAlignment" Value="Right"/>
@@ -2091,26 +2901,54 @@
       <Setter Property="Height" Value="40"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdRawPartManagerV per StackPanel 
+             - OnlyProdPartInRawPartManagerV per StackPanel -->
+   
    <Style x:Key="OnlyProdRawPartManager_StackPanel" TargetType="{x:Type StackPanel}">
       <Setter Property="Orientation" Value="Horizontal"/>
       <Setter Property="HorizontalAlignment" Value="Left"/>
       <Setter Property="Margin" Value="30,1,0,1"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdConfigurationV per StackPanel 
+             - OnlyProdNewOpenProjectFileDialogV per StackPanel -->
+   
    <Style x:Key="Configuration_StackPanel" TargetType="{x:Type StackPanel}">
       <Setter Property="Orientation" Value="Horizontal"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdLeftPanelV per StackPanel -->
+
    <Style x:Key="OnlyProdLeftPanel_StackPanel" TargetType="{x:Type StackPanel}">
       <Setter Property="Orientation" Value="Horizontal"/>
       <Setter Property="HorizontalAlignment" Value="Left"/>
       <Setter Property="Margin" Value="10,1,0,1"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdQParameterListProdV per StackPanel -->
+
+   <Style x:Key="OnlyProdQParameterListProd_StackPanel" TargetType="{x:Type StackPanel}">
+      <Setter Property="Orientation" Value="Vertical"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdProjectTypeWndV per StackPanel -->
+
+   <Style x:Key="OnlyProdProjectTypeWndV_StackPanel" TargetType="{x:Type StackPanel}">
+      <Setter Property="Margin" Value="5,5,5,0"/>
+   </Style>
+
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!-- Expander -->
 
+   <!-- Stile utilizzato nella classe:
+             - PDFEditorV per Expander -->
+
    <Style x:Key="Expander_PDF" TargetType="{x:Type Expander}">
       <Setter Property="IsExpanded" Value="True"/>
       <Setter Property="VerticalContentAlignment" Value="Top"/>
@@ -2386,10 +3224,16 @@
       </Setter>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdLeftPanelV per Expander Group_Msg, SubGroup_Msg, ParType_Msg, ParValue_Msg -->
+   
    <Style x:Key="OnlyProdLeftPanel_Expander" TargetType="{x:Type Expander}" BasedOn="{StaticResource {x:Type Expander}}">
       <Setter Property="Margin" Value="-2,0,0,0"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdFeatureManagerV per Expander Face_Msg, Group_Msg -->
+
    <Style x:Key="OnlyProdFeatureManager_Expander" TargetType="{x:Type Expander}" BasedOn="{StaticResource {x:Type Expander}}">
       <Setter Property="Width" Value="80"/>
    </Style>
@@ -2398,7 +3242,10 @@
 
    <!-- ListBox -->
 
-   <Style x:Key="ListBox_PDF" TargetType="{x:Type ListBox}">
+   <!-- Stile utilizzato nella classe:
+             - PDFEditorV per ListBox -->
+
+   <Style x:Key="ListBox_PDF" TargetType="{x:Type ListBox}" BasedOn="{x:Null}">
       <Setter Property="BorderThickness" Value="0"/>
       <Setter Property="Padding" Value="0"/>
       <Setter Property="Margin" Value="0"/>
@@ -2471,12 +3318,9 @@
       </Setter>
    </Style>
 
-   <Style x:Key="OnlyProdLeftPanel_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
-      <Setter Property="BorderThickness" Value="0"/>
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="Height" Value="200"/>
-   </Style>
-
+   <!-- Stile utilizzato nella classe:
+             - NewAddFeatureWndV per List PRCListView -->
+   
    <Style x:Key="NewAddFeature_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
       <Setter Property="BorderThickness" Value="0"/>
       <Setter Property="HorizontalAlignment" Value="Left"/>
@@ -2506,6 +3350,9 @@
       </Style.Resources>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - NewAddFeatureWndV per List MacroCustomList -->
+
    <Style x:Key="MacroCustom_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
       <Setter Property="BorderThickness" Value="0"/>
       <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
@@ -2514,6 +3361,9 @@
       <Setter Property="Margin" Value="5"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - NewAddFeatureWndV per List MacroDefaultList -->
+
    <Style x:Key="MacroDefault_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
       <Setter Property="BorderThickness" Value="0"/>
       <Setter Property="HorizontalAlignment" Value="Left"/>
@@ -2544,6 +3394,9 @@
       </Style.Resources>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdFeatureManagerV per List SIDEList, GRPList -->
+
    <Style x:Key="FeatureManager_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
       <Setter Property="BorderThickness" Value="0"/>
       <Setter Property="HorizontalContentAlignment" Value="Center"/>
@@ -2551,16 +3404,42 @@
       <Setter Property="Width" Value="80"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdLeftPanelV per List SectionList, GroupList, SubGroupList, SearchParamList -->
+
+   <Style x:Key="OnlyProdLeftPanel_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
+      <Setter Property="BorderThickness" Value="0"/>
+      <Setter Property="HorizontalContentAlignment" Value="Center"/>
+      <Setter Property="Height" Value="200"/>
+      <Setter Property="Width" Value="130"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdWarehouseWndV per ListBox SParamList -->
+
+   <Style x:Key="OnlyProdWarehouseWndV_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
+      <Setter Property="Margin" Value="5"/>
+      <Setter Property="MinHeight" Value="40"/>
+   </Style>
+
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!-- GridSplitter -->
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdProjectV 
+             - ProdWndV 
+             - ProjWnd -->
+
    <Style x:Key="Width_GridSplitter" TargetType="{x:Type GridSplitter}">
       <Setter Property="Width" Value="3"/>
       <Setter Property="HorizontalAlignment" Value="Center"/>
       <Setter Property="VerticalAlignment" Value="Stretch"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdProjectV -->
+
    <Style x:Key="Height_GridSplitter" TargetType="{x:Type GridSplitter}">
       <Setter Property="Height" Value="3"/>
       <Setter Property="HorizontalAlignment" Value="Stretch"/>
@@ -2571,6 +3450,9 @@
 
    <!-- WrapPanel -->
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdProjectV -->
+
    <Style x:Key="OnlyProdProject_WrapPanel" TargetType="{x:Type WrapPanel}">
       <Setter Property="Orientation" Value="Horizontal"/>
       <Setter Property="HorizontalAlignment" Value="Center"/>
@@ -2578,6 +3460,9 @@
       <Setter Property="Grid.ColumnSpan" Value="2"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - NewAddFeatureWndV -->
+
    <Style x:Key="MacroCustom_WrapPanel" TargetType="{x:Type WrapPanel}">
       <Setter Property="Orientation" Value="Horizontal"/>
       <Setter Property="IsItemsHost" Value="True"/>
@@ -2587,58 +3472,255 @@
 
    <!-- Grid -->
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdFreeContourInputV -->
+
    <Style x:Key="FreeContourInput_Grid" TargetType="{x:Type Grid}">
       <Setter Property="Margin" Value="5,0,5,0"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdPartManagerV -->
+
    <Style x:Key="OnlyProdPartManager_Grid" TargetType="{x:Type Grid}">
       <Setter Property="Background" Value="{StaticResource BeamWall_Glacier}"/>
       <Setter Property="Height" Value="120"/>
       <Setter Property="Margin" Value="0,10,0,40"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - NewAddFeatureWndV per Grid
+             - OnlyProdProjectTypeWndV per Grid -->
+   
    <Style x:Key="NewAddFeature_Grid" TargetType="{x:Type Grid}">
       <Setter Property="Margin" Value="5"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdFeatureManagerV -->
+
    <Style x:Key="OnlyProdFeatureManager_Grid" TargetType="{x:Type Grid}">
       <Setter Property="Margin" Value="30,4,0,2"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdPartManagerV -->
+
    <Style x:Key="OnlyProdUnitTime_Grid" TargetType="{x:Type Grid}">
       <Setter Property="Margin" Value="0,0,5,0"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdAddPartWndV 
+             - OnlyProdAddRawPartWndV 
+             - OnlyProdInputPwdWndV 
+             - OnlyProdMovePartInRawPartWndV
+             - OnlyProdWarehouseWndV -->
+
+   <Style x:Key="OnlyProdWarehouse_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="Margin" Value="5,5,5,0"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdAddPartWndV 
+             - OnlyProdMovePartInRawPartWndV 
+             - OnlyProdWarehouseWndV -->
+
+   <Style x:Key="OnlyProdAddPart_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="Margin" Value="0,0,0,5"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdAddPartWndV 
+             - OnlyProdAddRawPartWndV 
+             - OnlyProdInputPwdWndV -->
+
+   <Style x:Key="OnlyProdAddPartWnd_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="Margin" Value="0,0,0,5"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdBTLPartListV -->
+
+   <Style x:Key="GlobalState_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="Margin" Value="2,0,0,0"/>
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdBTLPartListV per griglia in validità pezzo 
+             - OnlyProdFeatureInPartInRawPartListV per griglia validità feature 
+             - OnlyProdRawPartListV per griglia in validità pezzo -->
+   
+   <Style x:Key="CALC_ROT_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdProjectTypeWndV -->
+
+   <Style x:Key="OnlyProdProjectType_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="Margin" Value="15"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdNewOpenProjectFileDialogV -->
+
+   <Style x:Key="ProjFileList_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="TextBlock.FontSize" Value="12"/>
+      <Setter Property="TextBlock.FontWeight" Value="Normal"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdNewOpenProjectFileDialogV -->
+
+   <Style x:Key="Gray_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="Background" Value="Gray"/>
+      <Setter Property="Margin" Value="40,0,40,0"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdNewOpenProjectFileDialogV -->
+
+   <Style x:Key="OnlyProdNewOpenProjectFileDialog_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="Margin" Value="2"/>
+   </Style>
+
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!-- UniformGrid -->
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdLeftPanelV -->
+
    <Style x:Key="OnlyProdLeftPanel_UniformGrid" TargetType="{x:Type UniformGrid}">
       <Setter Property="Margin" Value="0,10,0,10"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdPartManagerV -->
+
    <Style x:Key="OnlyProdQty_UniformGrid" TargetType="{x:Type UniformGrid}">
       <Setter Property="Margin" Value="10,0,15,0"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdPartManagerV -->
+
    <Style x:Key="OnlyProdDimension_UniformGrid" TargetType="{x:Type UniformGrid}">
       <Setter Property="Margin" Value="0,5,20,5"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdPartManagerV -->
+
    <Style x:Key="OnlyProdCommand_UniformGrid" TargetType="{x:Type UniformGrid}">
       <Setter Property="Margin" Value="0,0,-200,0"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - NewAddFeatureWndV -->
+
    <Style x:Key="NewAddFeature_UniformGrid" TargetType="{x:Type UniformGrid}">
       <Setter Property="Margin" Value="5"/>
    </Style>
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdBTLPartListV -->
+
+   <Style x:Key="CALC_FALL_UniformGrid" TargetType="{x:Type UniformGrid}">
+      <Setter Property="Margin" Value="0"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdNewOpenProjectFileDialogV -->
+
+   <Style x:Key="OnlyProdNewOpenProjectFileDialog_UniformGrid" TargetType="{x:Type UniformGrid}">
+      <Setter Property="Margin" Value="0,0,0,5"/>
+   </Style>
+
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!-- UserControl -->
 
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdFreeContourInputV -->
+
    <Style x:Key="OnlyProdFreeContour_UserControl" TargetType="{x:Type UserControl}">
       <Setter Property="Height" Value="32"/>
    </Style>
 
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!-- ToolTip -->
+
+   <Style TargetType="{x:Type ToolTip}">
+      <Setter Property="Background" Value="{StaticResource BeamWall_Glacier}"/>
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
+   </Style>
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!-- Ellipse -->
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdBTLPartListV per Ellipse CALC_ROT -->
+   
+   <Style x:Key="CALC_ROT_Ellipse" TargetType="{x:Type Ellipse}">
+      <Setter Property="Fill" Value="{StaticResource Omag_Red}"/>
+      <Setter Property="Width" Value="5"/>
+      <Setter Property="Height" Value="5"/>
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="VerticalAlignment" Value="Top"/>
+      <Setter Property="Margin" Value="2,1,-2,0"/>
+   </Style>
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdFeatureInPartInRawPartListV per Ellipse CALC_ROT
+             - OnlyProdFeatureListV per Ellipse CALC_ROT
+             - OnlyProdRawPartListV per Ellipse CALC_ROT -->
+   
+   <Style x:Key="OnlyProdFeatureInPartInRawPartList_Ellipse" TargetType="{x:Type Ellipse}">
+      <Setter Property="Fill" Value="{StaticResource Omag_Red}"/>
+      <Setter Property="Width" Value="5"/>
+      <Setter Property="Height" Value="5"/>
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+   </Style>
+   
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!-- PasswordBox -->
+
+   <Style TargetType="{x:Type PasswordBox}">
+      <Setter Property="HorizontalContentAlignment" Value="Right"/>
+      <Setter Property="Margin" Value="0,0,0,5"/>
+   </Style>
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!-- ProgressBar -->
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdNestingRunningWndV per ProgressBar CurrProgress_Value, TotProgress_Value -->
+
+   <Style x:Key="OnlyProdNestingRunningWndV_ProgressBar" TargetType="{x:Type ProgressBar}">
+      <Setter Property="Minimum" Value="0"/>
+      <Setter Property="Maximum" Value="100"/>
+      <Setter Property="Height" Value="20"/>
+      <Setter Property="Margin" Value="40,0,40,0"/>
+   </Style>
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!-- ProgressBar -->
+
+   <!-- Stile utilizzato nella classe:
+             - OnlyProdProjectTypeWndV per Rectangle -->
+
+   <Style x:Key="OnlyProdProjectTypeWndV_Rectangle" TargetType="{x:Type Rectangle}">
+      <Setter Property="Height" Value="22"/>
+   </Style>
+
 </ResourceDictionary>
diff --git a/EgtBEAMWALL.ViewerOptimizer/WarehouseWnd/OnlyProdWarehouseWndV.xaml b/EgtBEAMWALL.ViewerOptimizer/WarehouseWnd/OnlyProdWarehouseWndV.xaml
index 2712e9fe..020bd8cc 100644
--- a/EgtBEAMWALL.ViewerOptimizer/WarehouseWnd/OnlyProdWarehouseWndV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/WarehouseWnd/OnlyProdWarehouseWndV.xaml
@@ -19,7 +19,7 @@
                             Title="WarehouseWndV"
                             Name="WarehouseWndV">
 
-   <Grid Margin="5,5,5,0">
+   <Grid Style="{StaticResource OnlyProdWarehouse_Grid}">
       <Grid.ColumnDefinitions>
          <ColumnDefinition Width="1*"/>
       </Grid.ColumnDefinitions>
@@ -44,65 +44,67 @@
             <RowDefinition Height="1*"/>
          </Grid.RowDefinitions>
 
-         <TextBlock Text="{Binding CurrentS_Msg}"
-                    Grid.Row="0"
-                    Style="{StaticResource PartParam_TextBlock}"
-                    Visibility="{Binding Basic_Visibility}"/>
-         <ComboBox ItemsSource="{Binding Path=SParamList, 
+         <TextBlock Grid.Row="0"
+                    Text="{Binding CurrentS_Msg}"
+                    Visibility="{Binding Basic_Visibility}"
+                    Style="{StaticResource OnlyProdPartParam_TextBlock}"/>
+         <ComboBox Grid.Row="0"
+                   Grid.Column="1"
+                   ItemsSource="{Binding Path=SParamList, 
                                          Mode=OneWay}"
                    SelectedItem="{Binding Path=SelCurrentS, 
                                           Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                    DisplayMemberPath="sValue"
-                   Grid.Row="0"
-                   Grid.Column="1"
-                   Style="{StaticResource Warehouse_ComboBox}"
-                   Visibility="{Binding Basic_Visibility}"/>
+                   Visibility="{Binding Basic_Visibility}"
+                   Style="{StaticResource OnlyProdWarehouse_ComboBox}"/>
 
-         <TextBlock Text="{Binding StartOffset_Msg}"
-                    Grid.Row="1"
-                    Style="{StaticResource PartParam_TextBlock}"
-                    Visibility="{Binding StartOffset_Visibility}"/>
-         <EgtWPFLib5:EgtTextBox Text="{Binding dStartOffset, UpdateSourceTrigger=PropertyChanged}"
-                                Grid.Row="1"
+         <TextBlock Grid.Row="1"
+                    Text="{Binding StartOffset_Msg}"
+                    Visibility="{Binding StartOffset_Visibility}"
+                    Style="{StaticResource OnlyProdPartParam_TextBlock}"/>
+         <EgtWPFLib5:EgtTextBox Grid.Row="1"
                                 Grid.Column="1"
-                                Style="{StaticResource Warehouse_TextBox}"
-                                Visibility="{Binding StartOffset_Visibility}"/>
+                                Text="{Binding dStartOffset, UpdateSourceTrigger=PropertyChanged}"
+                                Visibility="{Binding StartOffset_Visibility}"
+                                Style="{StaticResource Warehouse_TextBox}"/>
 
-         <TextBlock Text="{Binding Kerf_Msg}"
-                    Grid.Row="1"
-                    Style="{StaticResource PartParam_TextBlock}"
-                    Visibility="{Binding Kerf_Visibility}"/>
-         <EgtWPFLib5:EgtTextBox Text="{Binding dKerf, UpdateSourceTrigger=PropertyChanged}"
-                                Grid.Row="1"
+         <TextBlock Grid.Row="1"
+                    Text="{Binding Kerf_Msg}"
+                    Visibility="{Binding Kerf_Visibility}"
+                    Style="{StaticResource PartParam_TextBlock}"/>
+         <EgtWPFLib5:EgtTextBox Grid.Row="1"
                                 Grid.Column="1"
-                                Style="{StaticResource Warehouse_TextBox}"
-                                Visibility="{Binding Kerf_Visibility}"/>
+                                Text="{Binding dKerf, UpdateSourceTrigger=PropertyChanged}"
+                                Visibility="{Binding Kerf_Visibility}"
+                                Style="{StaticResource Warehouse_TextBox}"/>
 
-         <TextBlock Text="{Binding Offset_Msg}"
-                    Grid.Row="2"
-                    Style="{StaticResource PartParam_TextBlock}"
-                    Visibility="{Binding Offset_Visibility}"/>
-         <EgtWPFLib5:EgtTextBox Text="{Binding dOffset, Mode=TwoWay, UpdateSourceTrigger=LostFocus}"
-                                Grid.Row="2"
+         <TextBlock Grid.Row="2"
+                    Text="{Binding Offset_Msg}"
+                    Visibility="{Binding Offset_Visibility}"
+                    Style="{StaticResource PartParam_TextBlock}"/>
+         <EgtWPFLib5:EgtTextBox Grid.Row="2"
                                 Grid.Column="1"
-                                Style="{StaticResource Warehouse_TextBox}"
-                                Visibility="{Binding Offset_Visibility}"/>
+                                Text="{Binding dOffset, Mode=TwoWay, UpdateSourceTrigger=LostFocus}"
+                                Visibility="{Binding Offset_Visibility}"
+                                Style="{StaticResource Warehouse_TextBox}"/>
 
-         <TextBlock Text="{Binding Quantity_Msg}"
-                    Grid.Row="3"
-                    Style="{StaticResource PartParam_TextBlock}"
-                    Visibility="{Binding Basic_Visibility}"/>
-         <EgtWPFLib5:EgtTextBox Text="{Binding nQuantity, UpdateSourceTrigger=PropertyChanged}"
-                                Grid.Row="3"
+         <TextBlock Grid.Row="3"
+                    Text="{Binding Quantity_Msg}"
+                    Visibility="{Binding Basic_Visibility}"
+                    Style="{StaticResource PartParam_TextBlock}"/>
+         <EgtWPFLib5:EgtTextBox Grid.Row="3"
                                 Grid.Column="1"
-                                Style="{StaticResource Warehouse_TextBox}"
-                                Visibility="{Binding Basic_Visibility}"/>
+                                Text="{Binding nQuantity, UpdateSourceTrigger=PropertyChanged}"
+                                Visibility="{Binding Basic_Visibility}"
+                                Style="{StaticResource Warehouse_TextBox}"/>
 
-         <GroupBox Grid.Row="3" Grid.ColumnSpan="3"
-                   Margin="0,0,0,5" 
+         <GroupBox Grid.Row="3" 
+                   Grid.ColumnSpan="3"
                    Header="{Binding Offset_Msg}"
-                   Visibility="{Binding MediumWall_Visibility}">
-            <Grid Grid.Row="3" Grid.ColumnSpan="3">
+                   Visibility="{Binding MediumWall_Visibility}"
+                   Style="{StaticResource OnlyProdWarehouseWndV_GroupBox}">
+            <Grid Grid.Row="3" 
+                  Grid.ColumnSpan="3">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="Auto"/>
@@ -113,33 +115,35 @@
                   <RowDefinition Height="1*"/>
                </Grid.RowDefinitions>
 
-               <Grid Grid.Row="0" Grid.Column="0">
+               <Grid Grid.Row="0" 
+                     Grid.Column="0">
                   <Grid.ColumnDefinitions>
                      <ColumnDefinition Width="1*"/>
                      <ColumnDefinition Width="1*"/>
                      <ColumnDefinition Width="1*"/>
                   </Grid.ColumnDefinitions>
-                  <TextBlock Text="{Binding MinThickness_Msg}"
-                             Grid.Column="0"
-                             HorizontalAlignment="Center"/>
-                  <TextBlock Text="{Binding Value_Msg}"
-                             Grid.Column="1"
-                             HorizontalAlignment="Center"/>
-                  <TextBlock Text="{Binding MaxThickness_Msg}"
-                             Grid.Column="2"
-                             HorizontalAlignment="Center"/>
+                  <TextBlock Grid.Column="0"
+                             Text="{Binding MinThickness_Msg}"
+                             Style="{StaticResource OnlyProdNestingRunningWndV_TextBlock}"/>
+                  <TextBlock Grid.Column="1"
+                             Text="{Binding Value_Msg}"
+                             Style="{StaticResource OnlyProdNestingRunningWndV_TextBlock}"/>
+                  <TextBlock Grid.Column="2"
+                             Text="{Binding MaxThickness_Msg}"
+                             Style="{StaticResource OnlyProdNestingRunningWndV_TextBlock}"/>
                </Grid>
 
                <Button Content="+" 
                        Grid.Column="1"
                        Command="{Binding AddWhWallParam_Command}"
-                       Style="{StaticResource ToolBar_SmallButton}"/>
+                       Style="{StaticResource OnlyProdWWnd_SmallButton}"/>
                <Button Content="-" 
                        Grid.Column="2"
                        Command="{Binding RemoveWhWallParam_Command}"
-                       Style="{StaticResource ToolBar_SmallButton}"/>
+                       Style="{StaticResource OnlyProdWWnd_SmallButton}"/>
 
-               <Grid Grid.Row="1" Grid.Column="0">
+               <Grid Grid.Row="1" 
+                     Grid.Column="0">
                   <EgtWPFLib5:EgtScrollViewer Focusable="False" MaxHeight="200" VerticalScrollBarVisibility="Auto">
                      <ItemsControl ItemsSource="{Binding WhWallParamList}">
                         <ItemsControl.ItemTemplate>
@@ -150,19 +154,15 @@
                                     <ColumnDefinition Width="1*" />
                                     <ColumnDefinition Width="1*" />
                                  </Grid.ColumnDefinitions>
-                                 <TextBlock Text="{Binding dMinThickness, Mode=OneWay}"
-                                            Grid.Column="0"
-                                            Width="70"
-                                            Margin="15,5"
-                                            HorizontalAlignment="Center"/>
-                                 <EgtWPFLib5:EgtTextBox Text="{Binding dOffset, UpdateSourceTrigger=Explicit}"
-                                                        Grid.Column="1"
-                                                        Width="70"
-                                                        Margin="15,5"/>
-                                 <EgtWPFLib5:EgtTextBox Text="{Binding dMaxThickness, UpdateSourceTrigger=Explicit}"
-                                                        Grid.Column="2"
-                                                        Width="70"
-                                                        Margin="15,5"/>
+                                 <TextBlock Grid.Column="0"
+                                            Text="{Binding dMinThickness, Mode=OneWay}"
+                                            Style="{StaticResource OnlyProdWarehouseWndV_TextBlock}"/>
+                                 <EgtWPFLib5:EgtTextBox Grid.Column="1"
+                                                        Text="{Binding dOffset, UpdateSourceTrigger=Explicit}"
+                                                        Style="{StaticResource OnlyProdWarehouseWndV_TextBox}"/>
+                                 <EgtWPFLib5:EgtTextBox Grid.Column="2"
+                                                        Text="{Binding dMaxThickness, UpdateSourceTrigger=Explicit}"
+                                                        Style="{StaticResource OnlyProdWarehouseWndV_TextBox}"/>
                               </Grid>
                            </DataTemplate>
                         </ItemsControl.ItemTemplate>
@@ -171,50 +171,50 @@
                </Grid>
             </Grid>
          </GroupBox>
-
       </Grid>
 
-      <GroupBox Header="{Binding SParams_Msg}" Grid.Row="1" Grid.Column="0" Margin="0,0,0,5" Visibility="{Binding Basic_Visibility}">
+      <GroupBox Grid.Row="1" 
+                Grid.Column="0"
+                Header="{Binding SParams_Msg}" 
+                Visibility="{Binding Basic_Visibility}"
+                Style="{StaticResource OnlyProdWarehouseWndV_GroupBox}">
          <ListBox ItemsSource="{Binding SParamList}" 
                   SelectedItem="{Binding SelSParam}"
                   DisplayMemberPath="sValue"
-                  Margin="5"
-                  MinHeight="40"/>
+                  Style="{StaticResource OnlyProdWarehouseWndV_ListBox}"/>
       </GroupBox>
 
-      <GroupBox Header="{Binding SParams_Msg}" Grid.Row="1" Grid.Column="0" Margin="0,0,0,5" Visibility="{Binding Medium_Visibility}">
+      <GroupBox Grid.Row="1" 
+                Grid.Column="0"
+                Header="{Binding SParams_Msg}"
+                Visibility="{Binding Medium_Visibility}"
+                Style="{StaticResource OnlyProdWarehouseWndV_GroupBox}">
          <Grid>
             <Grid.RowDefinitions>
                <RowDefinition Height="Auto"/>
                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
             <Grid Grid.Row="0"
-                  Margin="0,0,0,5">
+                  Style="{StaticResource OnlyProdAddPart_Grid}">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="Auto"/>
                   <ColumnDefinition Width="Auto"/>
                </Grid.ColumnDefinitions>
-               <Button Content="+" 
-                       Grid.Column="2"
+               <Button Grid.Column="2"
+                       Content="+" 
                        Command="{Binding AddMediumParam_Command}"
-                       Style="{StaticResource ToolBar_SmallButton}"/>
-               <Button Content="-" 
-                       Grid.Column="3"
+                       Style="{StaticResource OnlyProdWWnd_SmallButton}"/>
+               <Button Grid.Column="3"
+                       Content="-" 
                        Command="{Binding RemoveMediumParam_Command}"
-                       Style="{StaticResource ToolBar_SmallButton}"/>
+                       Style="{StaticResource OnlyProdWWnd_SmallButton}"/>
             </Grid>
             <EgtBEAMWALLCORE:EgtDataGrid Grid.Row="1"
                                          ItemsSource="{Binding SParamList}" 
                                          SelectedItem="{Binding SelSParam}"
-                                         CanUserAddRows="False"
-                                         AutoGenerateColumns="False"
-                                         CanUserResizeRows="False"
                                          SelectionMode="Single"
-                                         ScrollViewer.CanContentScroll="True" 
-                                         ScrollViewer.VerticalScrollBarVisibility="Auto"
-                                         ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                          AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
                                          AlternationCount="2"
                                          ColumnHeaderBackground="{StaticResource BeamWall_Teal}"
@@ -233,7 +233,7 @@
                      <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
                            <CheckBox IsChecked="{Binding bActive, UpdateSourceTrigger=PropertyChanged}"
-                                     VerticalAlignment="Center"/>
+                                     Style="{StaticResource OnlyProdBTLPartList_CheckBox}"/>
                         </DataTemplate>
                      </DataGridTemplateColumn.CellTemplate>
                   </DataGridTemplateColumn>
@@ -292,7 +292,9 @@
          </Grid>
       </GroupBox>
 
-      <Grid Grid.Row="2" Margin="0,0,0,5" Visibility="{Binding AddRemoveBtns_Visibility}">
+      <Grid Grid.Row="2" 
+            Visibility="{Binding AddRemoveBtns_Visibility}"
+            Style="{StaticResource OnlyProdAddPart_Grid}">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
@@ -302,26 +304,25 @@
             <RowDefinition Height="1*"/>
             <RowDefinition Height="1*"/>
          </Grid.RowDefinitions>
-         <Button Content="+"
-                 FontSize="20"
-                 FontWeight="Light"
-                 Grid.Row="1"
+         <Button Grid.Row="1"
                  Grid.Column="0"
-                 Style="{StaticResource ToolBar_Button}"
-                 Command="{Binding AddParam_Command}">
+                 Content="+"
+                 Command="{Binding AddParam_Command}"
+                 Style="{StaticResource OnlyProdWarehouseWndV_Button}">
          </Button>
 
-         <Button Content="-"
-                 FontSize="20"
-                 FontWeight="Light"
-                 Grid.Row="1"
+         <Button Grid.Row="1"
                  Grid.Column="1"
-                 Style="{StaticResource ToolBar_Button}"
-                 Command="{Binding RemoveParam_Command}">
+                 Content="-"  
+                 Command="{Binding RemoveParam_Command}"
+                 Style="{StaticResource OnlyProdWarehouseWndV_Button}">
          </Button>
       </Grid>
 
-      <GroupBox Header="{Binding NewParam_Msg}" Margin="0,0,0,5"  Grid.Row="3" Visibility="{Binding NewBeamParam_Visibility}">
+      <GroupBox Grid.Row="3"
+                Header="{Binding NewParam_Msg}" 
+                Visibility="{Binding NewBeamParam_Visibility}"
+                Style="{StaticResource OnlyProdWarehouseWndV_GroupBox}">
          <Grid>
             <Grid.RowDefinitions>
                <RowDefinition Height="1*"/>
@@ -333,33 +334,34 @@
             </Grid.ColumnDefinitions>
             <TextBlock Text="{Binding L_Msg}"
                        Style="{StaticResource PartParam_TextBlock}"/>
-            <EgtWPFLib5:EgtTextBox Text="{Binding sNewL, UpdateSourceTrigger=PropertyChanged}"
-                                   Grid.Column="1"
-                                   HorizontalAlignment="Right"
-                                   Style="{StaticResource Warehouse_TextBox}"/>
-            <Grid Grid.Row="1" Grid.ColumnSpan="2">
+            <EgtWPFLib5:EgtTextBox Grid.Column="1"
+                                   Text="{Binding sNewL, UpdateSourceTrigger=PropertyChanged}"
+                                   Style="{StaticResource New_TextBox}"/>
+            <Grid Grid.Row="1" 
+                  Grid.ColumnSpan="2">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="1*"/>
                </Grid.ColumnDefinitions>
-               <Button Content="{Binding OkAddParam_Msg}"
-                       Grid.Column="0"
-                       Height="30"
-                       Margin="0,0,2.5,0"
-                       Command="{Binding OkAddParam_Command}">
+               <Button Grid.Column="0"
+                       Content="{Binding OkAddParam_Msg}"
+                       Command="{Binding OkAddParam_Command}"
+                       Style="{StaticResource OKAddParam_Button}">
                </Button>
-               <Button Content="{Binding Cancel_Msg}"
-                       Grid.Column="1"
-                       Height="30"
-                       Margin="2.5,0,0,0"
-                       Command="{Binding CancelAddParam_Command}">
+               <Button Grid.Column="1"
+                       Content="{Binding Cancel_Msg}"
+                       Command="{Binding CancelAddParam_Command}"
+                       Style="{StaticResource CancelAddParam_Button}">
                </Button>
             </Grid>
          </Grid>
       </GroupBox>
 
-      <GroupBox Header="{Binding NewParam_Msg}" Margin="0,0,0,5" Grid.Row="3" Visibility="{Binding NewWallParam_Visibility}">
-         <Grid >
+      <GroupBox Grid.Row="3"
+                Header="{Binding NewParam_Msg}" 
+                Visibility="{Binding NewWallParam_Visibility}"
+                Style="{StaticResource OnlyProdWarehouseWndV_GroupBox}">
+         <Grid>
             <Grid.RowDefinitions>
                <RowDefinition Height="1*"/>
                <RowDefinition Height="1*"/>
@@ -371,57 +373,53 @@
             </Grid.ColumnDefinitions>
             <TextBlock Text="{Binding W_Msg}"
                        Style="{StaticResource PartParam_TextBlock}"/>
-            <EgtWPFLib5:EgtTextBox Text="{Binding sNewW, UpdateSourceTrigger=PropertyChanged}"
-                                   Grid.Column="1"
-                                   HorizontalAlignment="Right"
-                                   Style="{StaticResource Warehouse_TextBox}"/>
-            <TextBlock Text="{Binding L_Msg}"
-                       Grid.Row="1"
+            <EgtWPFLib5:EgtTextBox Grid.Column="1"
+                                   Text="{Binding sNewW, UpdateSourceTrigger=PropertyChanged}"
+                                   Style="{StaticResource New_TextBox}"/>
+            <TextBlock Grid.Row="1"
+                       Text="{Binding L_Msg}"
                        Style="{StaticResource PartParam_TextBlock}"/>
-            <EgtWPFLib5:EgtTextBox Text="{Binding sNewL, UpdateSourceTrigger=PropertyChanged}"
-                                   Grid.Row="1"
+            <EgtWPFLib5:EgtTextBox Grid.Row="1"
                                    Grid.Column="1"
-                                   HorizontalAlignment="Right"
-                                   Style="{StaticResource Warehouse_TextBox}"/>
-            <Grid Grid.Row="2" Grid.ColumnSpan="2">
+                                   Text="{Binding sNewL, UpdateSourceTrigger=PropertyChanged}"
+                                   Style="{StaticResource New_TextBox}"/>
+            <Grid Grid.Row="2" 
+                  Grid.ColumnSpan="2">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="368*"/>
                   <ColumnDefinition Width="117*"/>
                   <ColumnDefinition Width="251*"/>
                </Grid.ColumnDefinitions>
-               <Button Content="{Binding OkAddParam_Msg}"
-                       Grid.Column="0"
-                       Height="30"
-                       Margin="0,0,2,0"
-                       Command="{Binding OkAddParam_Command}">
+               <Button Grid.Column="0"
+                       Content="{Binding OkAddParam_Msg}"
+                       Command="{Binding OkAddParam_Command}"
+                       Style="{StaticResource OKAddParam_Button}">
                </Button>
-               <Button Content="{Binding Cancel_Msg}"
-                       Grid.Column="1"
-                       Height="30"
-                       Margin="2,0,0,0"
-                       Command="{Binding CancelAddParam_Command}" Grid.ColumnSpan="2">
+               <Button Grid.Column="1"
+                       Grid.ColumnSpan="2"
+                       Content="{Binding Cancel_Msg}"                       
+                       Command="{Binding CancelAddParam_Command}"
+                       Style="{StaticResource CancelAddParam_Button}">
                </Button>
             </Grid>
          </Grid>
       </GroupBox>
 
       <Grid Grid.Row="4"
-            Margin="0,0,0,5">
+            Style="{StaticResource OnlyProdAddPart_Grid}">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
-         <Button Content="{Binding Save_Msg}"
-                 Grid.Column="0"
-                 Height="30"
-                 Margin="0,0,2.5,0"
-                 Command="{Binding Save_Command}">
+         <Button Grid.Column="0"
+                 Content="{Binding Save_Msg}"
+                 Command="{Binding Save_Command}"
+                 Style="{StaticResource OKAddParam_Button}">
          </Button>
-         <Button Content="{Binding Cancel_Msg}"
-                 Grid.Column="1"
-                 Height="30"
-                 Margin="2.5,0,0,0"
-                 Command="{Binding Cancel_Command}">
+         <Button Grid.Column="1"
+                 Content="{Binding Cancel_Msg}"
+                 Command="{Binding Cancel_Command}"
+                 Style="{StaticResource CancelAddParam_Button}">
          </Button>
       </Grid>
 
diff --git a/EgtBEAMWALL.ViewerOptimizer/WarehouseWnd/WarehouseWndV.xaml b/EgtBEAMWALL.ViewerOptimizer/WarehouseWnd/WarehouseWndV.xaml
index a87228b3..326ecacc 100644
--- a/EgtBEAMWALL.ViewerOptimizer/WarehouseWnd/WarehouseWndV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/WarehouseWnd/WarehouseWndV.xaml
@@ -206,16 +206,20 @@
                        Style="{StaticResource ToolBar_SmallButton}"/>
             </Grid>
             <EgtBEAMWALLCORE:EgtDataGrid Grid.Row="1"
-                                       ItemsSource="{Binding SParamList}" 
-                                       SelectedItem="{Binding SelSParam}"
-                                       CanUserAddRows="False"
-                                       AutoGenerateColumns="False"
-                                       CanUserResizeRows="False"
-                                       SelectionMode="Single"
-                                       ScrollViewer.CanContentScroll="True" 
-                                       ScrollViewer.VerticalScrollBarVisibility="Auto"
-                                       ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                                       BindingColumns="{Binding SParamColumns}">
+                                         ItemsSource="{Binding SParamList}" 
+                                         SelectedItem="{Binding SelSParam}"
+                                         CanUserAddRows="False"
+                                         AutoGenerateColumns="False"
+                                         CanUserResizeRows="False"
+                                         SelectionMode="Single"
+                                         ScrollViewer.CanContentScroll="True" 
+                                         ScrollViewer.VerticalScrollBarVisibility="Auto"
+                                         ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                                         ColumnHeaderBackground="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
+                                         ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
+                                         ColumnHeaderFontWeight="Normal"
+                                         ColumnHeaderPadding="0,2,0,2"
+                                         BindingColumns="{Binding SParamColumns}">
                <DataGrid.Resources>
                   <!-- Active -->
                   <DataGridTemplateColumn x:Key="colACTIVE" >