diff --git a/EgtBEAMWALL.Core/BeamMachiningsWindow/BeamMachiningsWindowV.xaml b/EgtBEAMWALL.Core/BeamMachiningsWindow/BeamMachiningsWindowV.xaml
index d366983f..f2f5e00f 100644
--- a/EgtBEAMWALL.Core/BeamMachiningsWindow/BeamMachiningsWindowV.xaml
+++ b/EgtBEAMWALL.Core/BeamMachiningsWindow/BeamMachiningsWindowV.xaml
@@ -22,9 +22,9 @@
                   SelectedItem="{Binding SelMachining}"
                   IsSynchronizedWithCurrentItem="True"
                   Margin="5,0,5,0"
-                  Style="{StaticResource OnlyProdTabControl_OnlyHeaders}"/>
+                  Style="{StaticResource OnlyHeaders_TabControl}"/>
 
-      <Border Grid.Row="1" Margin="0,1,0,2" Style="{StaticResource OnlyProdPage_Border}">
+      <Border Grid.Row="1" Margin="0,1,0,2" Style="{StaticResource Optimizer_Border}">
 
          <EgtBEAMWALLCORE:EgtDataGrid Grid.Row="1"
                                       ItemsSource="{Binding TableRowList}"
@@ -41,7 +41,7 @@
                                       AlternationCount="2"
                                       ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
                                       CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
-                                      Style="{StaticResource DataGrid_OnlyProd}">
+                                      Style="{StaticResource Optimizer_DataGrid}">
 
             <DataGrid.RowStyle>
                <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
@@ -133,27 +133,27 @@
                  Command="{Binding MoveRowUp_Command}"
                  Grid.Column="0"
                  Margin="0,0,2.5,0"
-                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
          <Button Content="\/"
                  Command="{Binding MoveRowDown_Command}"
                  Grid.Column="1"
                  Margin="2.5,0,2.5,0"
-                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
          <Button Content="{Binding AddRowMsg}"
                  Command="{Binding AddRow_Command}"
                  Grid.Column="2"
                  Margin="2.5,0,2.5,0"
-                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
          <Button Content="{Binding DeleteRowMsg}"
                  Command="{Binding DeleteRow_Command}"
                  Grid.Column="3"
                  Margin="2.5,0,2.5,0"
-                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
          <Button Content="{Binding SaveMsg}"
                  Command="{Binding Save_Command}"
                  Grid.Column="4"
                  Margin="2.5,0,0,0"
-                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
 
       </Grid>
 
diff --git a/EgtBEAMWALL.Core/ConfigurationPage/General_ConfigurationPageV.xaml b/EgtBEAMWALL.Core/ConfigurationPage/General_ConfigurationPageV.xaml
index f1fea801..53e0492f 100644
--- a/EgtBEAMWALL.Core/ConfigurationPage/General_ConfigurationPageV.xaml
+++ b/EgtBEAMWALL.Core/ConfigurationPage/General_ConfigurationPageV.xaml
@@ -94,7 +94,7 @@
                        Command="{Binding ChooseExternalBackupFolderPath_Command}"
                        IsEnabled="{Binding IsChecked, ElementName=ExternalBackup_CheckBox}"
                        Margin="2.5,0,0,0"
-                       Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+                       Style="{StaticResource EgtWPFLib5_InputButton}"/>
             </Grid>
             <Grid Grid.Row="2">
                <Grid.ColumnDefinitions>
@@ -111,11 +111,11 @@
                         Orientation="Horizontal">
                <Button Content="Backup"
                        Command="{Binding Backup_Command}"
-                       Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"
+                       Style="{StaticResource EgtWPFLib5_InputButton}"
                        Margin="0,0,5,0"/>
                <Button Content="Restore"
                        Command="{Binding Restore_Command}"
-                       Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+                       Style="{StaticResource EgtWPFLib5_InputButton}"/>
             </StackPanel>
          </Grid>
       </GroupBox>
diff --git a/EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml b/EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml
index 4ba4ddb6..713beb39 100644
--- a/EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml
+++ b/EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml
@@ -273,7 +273,7 @@
                          SelectedItem="{Binding ItemSelected}"
                          RowStyle="{StaticResource RowDataGrid_CustomHighLight}"
                          CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
-                         Style="{StaticResource DataGrid_OnlyProd}">
+                         Style="{StaticResource Optimizer_DataGrid}">
                   <DataGrid.ColumnHeaderStyle>
                      <Style TargetType="{x:Type DataGridColumnHeader}">
                         <Setter Property="Background" Value="{StaticResource BeamWall_Teal}"/>
diff --git a/EgtBEAMWALL.Core/MachinePanel/MachinePanelV.xaml b/EgtBEAMWALL.Core/MachinePanel/MachinePanelV.xaml
index 5f2ce1bf..4d234e39 100644
--- a/EgtBEAMWALL.Core/MachinePanel/MachinePanelV.xaml
+++ b/EgtBEAMWALL.Core/MachinePanel/MachinePanelV.xaml
@@ -21,22 +21,22 @@
       <ComboBox Grid.Column="1"
                 ItemsSource="{Binding Path=MachineList}" DisplayMemberPath="Name"
                 SelectedItem="{Binding Path=SelectedMachine}" SelectedValuePath="Name"
-                Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
+                Style="{StaticResource CalcPanel_ComboBox}"/>
    </Grid>
    <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Center">
       <Button Content="{Binding ToolDBMsg}"
               ToolTip="{Binding ToolDBToolTip}"
               Command="{Binding ToolDbCommand}"
-              Style="{StaticResource GeneralConfigurationToolBar_TextButton}"/>
+              Style="{StaticResource GeneralConfiguration_Button}"/>
       <Button Content="{Binding SetUpMsg}"
               Command="{Binding SetUpCommand}" 
               ToolTip="{Binding SetUpToolTip}"
-              Style="{StaticResource GeneralConfigurationToolBar_TextButton}"
+              Style="{StaticResource GeneralConfiguration_Button}"
               Visibility="{Binding SetUp_Visibility}"/>
       <Button Content="{Binding ParameterMachineMsg}"
               ToolTip="{Binding ParameterMachineMsg}"
               Command="{Binding ParameterMachine_Command}"
-              Style="{StaticResource MachineToolBar_ParameterMachineButton}" Width="140"/>
+              Style="{StaticResource ParameterMachine_Button}" Width="140"/>
    </StackPanel>
 
 </Grid>
diff --git a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml
index 4014c8bb..30fade54 100644
--- a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml
+++ b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml
@@ -75,7 +75,7 @@
                          SelectedItem="{Binding SelFilterType}"
                          Width="105"
                          Margin="5"
-                         Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
+                         Style="{StaticResource CalcPanel_ComboBox}"/>
                <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                       Text="{Binding SearchText}"
                                       Visibility="{Binding SearchText_Visibility}"
@@ -87,13 +87,13 @@
                              Foreground="{StaticResource BeamWall_Corduroy}"/>
                   <ComboBox ItemsSource="{Binding RowQuantityList}"
                             SelectedIndex="{Binding SelRowQuantity}"
-                            Style="{StaticResource OnyProd_FeatureComboBox}"/>
+                            Style="{StaticResource OpenProjectFileDialog_ComboBox}"/>
                </StackPanel>
             </Grid>
          </Grid>
       </GroupBox>
 
-      <Border Grid.Row="1" Style="{StaticResource OnlyProdPage_Border}" Margin="1"/>
+      <Border Grid.Row="1" Style="{StaticResource Optimizer_Border}" Margin="1"/>
 
       <EgtBEAMWALLCORE:EgtDataGrid Grid.Row="1"
                                    x:Name="MainDataGrid"
@@ -107,7 +107,7 @@
                                    AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
                                    AlternationCount="2"
                                    ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
-                                   Style="{StaticResource DataGrid_OnlyProd}"
+                                   Style="{StaticResource Optimizer_DataGrid}"
                                    CellStyle="{StaticResource CellDataGrid_CustomHighLight}">
          <DataGrid.Resources>
             <!-- ProdId -->
@@ -129,9 +129,9 @@
                      <TextBlock Text="{Binding Path=DataContext.Name_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"/>
                      <ToggleButton Grid.Column="1"
                                    IsChecked="{Binding Path=DataContext.bIsEditNameActive,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"
-                                   Style="{StaticResource ToolBar_SmallToggleButton}">
+                                   Style="{StaticResource Small_ToggleButton}">
                         <Image Source="\Resources\CalcPanel\Edit.png"
-                               Style="{StaticResource LockImage}"/>
+                               Style="{StaticResource Lock_Image}"/>
                      </ToggleButton>
                   </Grid>
                </DataGridTextColumn.Header>
@@ -228,18 +228,18 @@
                    Margin="0,0,0,5">
          <Button IsDefault="True" Name="OpenBtn"
                  Content="{Binding Open_Msg}" 
-                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
+                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
          <Button Content="{Binding Archive_Msg}"
                  Command="{Binding Archive_Command}"
                  IsEnabled="{Binding bArchived_IsEnabled}"
-                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
+                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
          <Button Content="{Binding Delete_Msg}"
                  Command="{Binding Delete_Command}"
                  IsEnabled="{Binding bDelete_IsEnabled}"
-                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
+                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
          <Button Command="{Binding Cancel_Command}"
                  Content="{Binding Cancel_Msg}" 
-                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
+                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
       </UniformGrid>
 
    </Grid>
diff --git a/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml b/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml
index 064f04ee..a5605d48 100644
--- a/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml
+++ b/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml
@@ -39,13 +39,13 @@
                          SelectedIndex="{Binding SelBTLDateType}"
                          Width="105"
                          Margin="5"
-                         Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
+                         Style="{StaticResource CalcPanel_ComboBox}"/>
                <StackPanel Grid.Column="1" Orientation="Horizontal">
                   <ComboBox ItemsSource="{Binding DayTypeList}"
                             SelectedIndex="{Binding SelDayType}"
                             Width="105"
                             Margin="0,0,2.5,0"
-                            Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
+                            Style="{StaticResource CalcPanel_ComboBox}"/>
                   <StackPanel Orientation="Horizontal" Visibility="{Binding Date_Visibility}">
                      <TextBlock Text="{Binding From_Msg}"
                                 Style="{StaticResource Filter_TextBlock}"
@@ -72,7 +72,7 @@
                          SelectedItem="{Binding SelFilterType}"
                          Width="105"
                          Margin="5"
-                         Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
+                         Style="{StaticResource CalcPanel_ComboBox}"/>
                <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                       Text="{Binding SearchText}"
                                       Margin="5"
@@ -86,13 +86,13 @@
                   <ComboBox ItemsSource="{Binding RowQuantityList}"
                             SelectedIndex="{Binding SelRowQuantity}"
                             Width="55"
-                            Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
+                            Style="{StaticResource CalcPanel_ComboBox}"/>
                </StackPanel>
             </Grid>
          </Grid>
       </GroupBox>
 
-      <Border Grid.Row="1" Style="{StaticResource OnlyProdPage_Border}" Margin="1"/>
+      <Border Grid.Row="1" Style="{StaticResource Optimizer_Border}" Margin="1"/>
 
       <EgtBEAMWALLCORE:EgtDataGrid Grid.Row="1"
                                    ItemsSource="{Binding ProjectList}" 
@@ -103,7 +103,7 @@
                                    AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
                                    AlternationCount="2"
                                    ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
-                                   Style="{StaticResource DataGrid_OnlyProd}"
+                                   Style="{StaticResource Optimizer_DataGrid}"
                                    CellStyle="{StaticResource CellDataGrid_CustomHighLight}">
          <DataGrid.RowStyle>
             <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
@@ -184,13 +184,13 @@
       <UniformGrid Columns="3" Grid.Row="2" Margin="0,0,0,5">
          <Button IsDefault="True" Name="OpenBtn"
                  Content="{Binding Open_Msg}" 
-                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
+                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
          <Button Content="{Binding Delete_Msg}"
                  Command="{Binding Delete_Command}"
-                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
+                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
          <Button IsCancel="True"
                  Content="{Binding Cancel_Msg}" 
-                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
+                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
       </UniformGrid>
 
    </Grid>
diff --git a/EgtBEAMWALL.Core/Themes/Generic.xaml b/EgtBEAMWALL.Core/Themes/Generic.xaml
index 61a44386..ab1554cc 100644
--- a/EgtBEAMWALL.Core/Themes/Generic.xaml
+++ b/EgtBEAMWALL.Core/Themes/Generic.xaml
@@ -2,7 +2,8 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:sys="clr-namespace:System;assembly=mscorlib"
                     xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
-                    xmlns:EgwWPFBaseLib="clr-namespace:EgwWPFBaseLib;assembly=EgwWPFBaseLib">
+                    xmlns:EgwWPFBaseLib="clr-namespace:EgwWPFBaseLib;assembly=EgwWPFBaseLib"
+                    xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
 
    <EgwWPFBaseLib:CaptionHeightConverter x:Key="CaptionHeightConverter"/>
 
@@ -27,6 +28,10 @@
    <Color x:Key="BeamWall_DarkGray_Color" R="68" G="68" B="68" A="255"/>
    <SolidColorBrush x:Key="BeamWall_DarkGray" Color="{StaticResource BeamWall_DarkGray_Color}" />
 
+   <!--#00FFFF-->
+   <Color x:Key="BeamWall_Aqua_Color" R="0" G="255" B="255" A="255"/>
+   <SolidColorBrush x:Key="BeamWall_Aqua" Color="{StaticResource BeamWall_Aqua_Color}" />
+
    <!--#endregion Colori Predefiniti-->
 
    <!--#region Colori Nuova Grafica-->
@@ -171,6 +176,18 @@
    <Color x:Key="BeamWall_Gray_Color" R="131" G="131" B="131" A="255"/>
    <SolidColorBrush x:Key="BeamWall_Gray" Color="{StaticResource BeamWall_Gray_Color}" />
 
+   <!--#F3F9FF-->
+   <Color x:Key="BeamWall_AliceBlue_Color" R="243" G="249" B="255" A="255"/>
+   <SolidColorBrush x:Key="BeamWall_AliceBlue" Color="{StaticResource BeamWall_AliceBlue_Color}" />
+
+   <!--#D9ECFF-->
+   <Color x:Key="BeamWall_PattensBlue_Color" R="217" G="236" B="255" A="255"/>
+   <SolidColorBrush x:Key="BeamWall_PattensBlue" Color="{StaticResource BeamWall_PattensBlue_Color}" />
+
+   <!--#F0F0F0-->
+   <Color x:Key="BeamWall_Gallery_Color" R="240" G="240" B="240" A="255"/>
+   <SolidColorBrush x:Key="BeamWall_Gallery" Color="{StaticResource BeamWall_Gallery_Color}" />
+
    <!--#endregion Colori Nuova Grafica-->
 
    <!--#region Colori per EgtWPFLib5-->
@@ -274,6 +291,57 @@
 
    <!--#endregion Colori ComboBox-->
    
+   <!--#region Colori Expander-->
+
+   <SolidColorBrush x:Key="Expander.Static.Circle.Stroke" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="Expander.Static.Circle.Fill" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="Expander.Static.Arrow.Stroke" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="Expander.MouseOver.Circle.Stroke" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="Expander.MouseOver.Circle.Fill" Color="{StaticResource BeamWall_AliceBlue_Color}"/>
+   <SolidColorBrush x:Key="Expander.MouseOver.Arrow.Stroke" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="Expander.Pressed.Circle.Stroke" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="Expander.Pressed.Circle.Fill" Color="{StaticResource BeamWall_PattensBlue_Color}"/>
+   <SolidColorBrush x:Key="Expander.Pressed.Arrow.Stroke" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="Expander.Disabled.Circle.Stroke" Color="{StaticResource BeamWall_RegentStBlue_Color}" Opacity="0.5"/>
+   <SolidColorBrush x:Key="Expander.Disabled.Circle.Fill" Color="{StaticResource BeamWall_Mercury_Color}" Opacity="0.5"/>
+   <SolidColorBrush x:Key="Expander.Disabled.Arrow.Stroke" Color="{StaticResource BeamWall_RegentStBlue_Color}" Opacity="0.5"/>
+
+   <!--#endregion Colori Expander-->
+   
+   <!--#region Colori ListBox-->
+
+   <SolidColorBrush x:Key="Item.MouseOver.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="Item.MouseOver.Border" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="Item.MouseOver.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="Item.SelectedActive.Background" Color="{StaticResource BeamWall_Keppel_Color}"/>
+   <SolidColorBrush x:Key="Item.SelectedActive.Border" Color="{StaticResource BeamWall_Keppel_Color}"/>
+   <SolidColorBrush x:Key="Item.SelectedActive.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="Item.SelectedInactive.Background" Color="#3DDADADA"/>
+   <SolidColorBrush x:Key="Item.SelectedInactive.Border" Color="{StaticResource BeamWall_Alto_Color}"/>
+
+   <!--#endregion Colori ListBox-->
+   
+   <!--#region Colori TabItem-->
+
+   <LinearGradientBrush x:Key="TabItem.Static.Background" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0"/>
+      <GradientStop Color="{StaticResource BeamWall_RegentStBlue_Color}" Offset="0.85"/>
+      <GradientStop Color="{StaticResource BeamWall_LinkWater_Color}" Offset="1"/>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="TabItem.Static.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="TabItem.MouseOver.Background" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="TabItem.MouseOver.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <LinearGradientBrush x:Key="TabItem.Selected.Background" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="{StaticResource BeamWall_Kashmir_Color}" Offset="0"/>
+      <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0.85"/>
+      <GradientStop Color="{StaticResource BeamWall_RegentStBlue_Color}" Offset="1"/>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="TabItem.Selected.Border" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="TabItem.Disabled.Background" Color="{StaticResource BeamWall_Gallery_Color}"/>
+   <SolidColorBrush x:Key="TabItem.Disabled.Border" Color="{StaticResource BeamWall_Alto_Color}"/>
+
+   <!--#endregion Colori TabItem-->
+   
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!--#region FocusVisual standard-->
@@ -406,6 +474,45 @@
       </Setter>
    </Style>
 
+   <Style x:Key="ToolBarViewPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="30"/>
+      <Setter Property="Margin" Value="5,2,5,2"/>
+   </Style>
+
+   <Style x:Key="GeneralConfiguration_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="80"/>
+      <Setter Property="Margin" Value="5,0,5,0"/>
+   </Style>
+
+   <Style x:Key="ParameterMachine_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="120"/>
+      <Setter Property="Margin" Value="5,0,0,0"/>
+   </Style>
+
+   <Style x:Key="EgtWPFLib5_InputButton" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="80"/>
+   </Style>
+
+   <Style x:Key="SaveOptionPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_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>
+
+   <Style x:Key="SaveMachinePanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_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>
+
    <!--#endregion Button-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
@@ -437,10 +544,26 @@
       <Setter Property="Margin" Value="0,0,20,0"/>
    </Style>
 
+   <Style x:Key="ToolBar_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="30"/>
+   </Style>
+
    <!--#endregion TextBlock-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
+   <!--#region TextBox-->
+
+   <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>
+
+   <!--#endregion TextBox-->
+   
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
    <!--#region EgtWindow-->
 
    <Grid x:Key="OptimizerWindow.Path.Maximize">
@@ -669,6 +792,12 @@
       </Setter>
    </Style>
 
+   <Style x:Key="Small_ToggleButton" 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>
+
    <!--#endregion ToggleButton Style-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
@@ -943,6 +1072,661 @@
       </Style.Resources>
    </Style>
 
+   <Style x:Key="CalcPanel_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource OnlyProd_ComboBox}">
+      <Setter Property="Height" Value="22"/>
+      <Setter Property="Width" Value="150"/>
+   </Style>
+
    <!--#endregion ComboBox-->
-   
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region DataGrid-->
+
+   <Style x:Key="Main_DataGridColumnHeader" TargetType="{x:Type DataGridColumnHeader}">
+      <Setter Property="Background" Value="{StaticResource BeamWall_Teal}" />
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
+      <Setter Property="FontWeight" Value="Bold" />
+      <Setter Property="FontSize" Value="15" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="Padding" Value="0,2,0,2" />
+   </Style>
+
+   <Style x:Key="Feature_DataGridColumnHeader" TargetType="{x:Type DataGridColumnHeader}">
+      <Setter Property="Background" Value="{StaticResource BeamWall_Keppel}" />
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
+      <Setter Property="FontWeight" Value="Bold" />
+      <Setter Property="FontSize" Value="15" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="Padding" Value="0,2,0,2" />
+   </Style>
+
+   <Style x:Key="PartInRawPart_DataGridColumnHeader" TargetType="{x:Type DataGridColumnHeader}">
+      <Setter Property="Background" Value="{StaticResource BeamWall_Jaffa}" />
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
+      <Setter Property="FontWeight" Value="Bold" />
+      <Setter Property="FontSize" Value="15" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="Padding" Value="0,2,0,2" />
+   </Style>
+
+   <Style x:Key="PParam_DataGridColumnHeader" TargetType="{x:Type DataGridColumnHeader}">
+      <Setter Property="Background" Value="{StaticResource BeamWall_Downy}" />
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
+      <Setter Property="FontWeight" Value="Bold" />
+      <Setter Property="FontSize" Value="15" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="Padding" Value="0,2,0,2" />
+   </Style>
+
+   <Style x:Key="RawPart_DataGridColumnHeader" TargetType="{x:Type DataGridColumnHeader}">
+      <Setter Property="Background" Value="{StaticResource BeamWall_White}" />
+      <Setter Property="FontWeight" Value="SemiBold" />
+      <Setter Property="FontSize" Value="11" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="Padding" Value="0,2,0,2" />
+   </Style>
+
+   <Style x:Key="Optimizer_DataGrid" TargetType="{x:Type DataGrid}">
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+      <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.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="VirtualizingPanel.IsVirtualizing" Value="True"/>
+      <Setter Property="VirtualizingPanel.VirtualizationMode" Value="Recycling"/>
+      <Setter Property="EnableColumnVirtualization" Value="True"/>
+      <Setter Property="EnableRowVirtualization" Value="True"/>
+      <Setter Property="VirtualizingStackPanel.ScrollUnit" Value="Pixel"/>
+      <Setter Property="RowHeight" Value="24"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type DataGrid}">
+               <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
+                  <ScrollViewer x:Name="DG_ScrollViewer" Focusable="false">
+                     <ScrollViewer.Template>
+                        <ControlTemplate TargetType="{x:Type ScrollViewer}">
+                           <Grid>
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="Auto"/>
+                                 <ColumnDefinition Width="*"/>
+                                 <ColumnDefinition Width="Auto"/>
+                              </Grid.ColumnDefinitions>
+                              <Grid.RowDefinitions>
+                                 <RowDefinition Height="Auto"/>
+                                 <RowDefinition Height="*"/>
+                                 <RowDefinition Height="Auto"/>
+                              </Grid.RowDefinitions>
+                              <Button Command="{x:Static DataGrid.SelectAllCommand}" Focusable="false" Style="{DynamicResource {ComponentResourceKey ResourceId=DataGridSelectAllButtonStyle, TypeInTargetAssembly={x:Type DataGrid}}}" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.All}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                              <DataGridColumnHeadersPresenter x:Name="PART_ColumnHeadersPresenter" Grid.Column="1" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Column}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                              <ScrollContentPresenter x:Name="PART_ScrollContentPresenter" CanContentScroll="{TemplateBinding CanContentScroll}" Grid.ColumnSpan="2" Grid.Row="1"/>
+                              <ScrollBar x:Name="PART_VerticalScrollBar" Grid.Column="2" Maximum="{TemplateBinding ScrollableHeight}" Orientation="Vertical" Grid.Row="1" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource Mode=TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"/>
+                              <Grid Grid.Column="1" Grid.Row="2">
+                                 <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="{Binding NonFrozenColumnsViewportHorizontalOffset, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                                    <ColumnDefinition Width="*"/>
+                                 </Grid.ColumnDefinitions>
+                                 <ScrollBar x:Name="PART_HorizontalScrollBar" Grid.Column="1" Maximum="{TemplateBinding ScrollableWidth}" Orientation="Horizontal" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource Mode=TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"/>
+                              </Grid>
+                           </Grid>
+                        </ControlTemplate>
+                     </ScrollViewer.Template>
+                     <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                  </ScrollViewer>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+      <Style.Triggers>
+         <MultiTrigger>
+            <MultiTrigger.Conditions>
+               <Condition Property="IsGrouping" Value="true"/>
+               <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false"/>
+            </MultiTrigger.Conditions>
+            <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+         </MultiTrigger>
+      </Style.Triggers>
+      <Style.Resources>
+         <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource OnlyProd_ScrollBar}"/>
+      </Style.Resources>
+   </Style>
+
+   <Style x:Key="RowDataGrid_CustomHighLight" TargetType="{x:Type DataGridRow}">
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}" />
+      <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.Triggers>
+         <Trigger Property="IsSelected" Value="True">
+            <Setter Property="BorderBrush" Value="{StaticResource BeamWall_FountainBlue}" />
+            <Setter Property="FontWeight" Value="Bold" />
+            <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
+            <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}" />
+         </Trigger>
+      </Style.Triggers>
+   </Style>
+
+   <Style x:Key="CellDataGrid_CustomHighLight" TargetType="{x:Type DataGridCell}">
+      <Setter Property="Height" Value="24"/>
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}" />
+      <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.Triggers>
+         <Trigger Property="IsSelected" Value="True">
+            <Setter Property="BorderBrush" Value="{StaticResource BeamWall_FountainBlue}" />
+            <Setter Property="FontWeight" Value="Bold" />
+            <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
+            <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}" />
+         </Trigger>
+      </Style.Triggers>
+   </Style>
+
+   <!--#endregion DataGrid-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region DatePicker-->
+
+   <Style x:Key="Filter_DatePicker" TargetType="{x:Type DatePicker}">
+      <Setter Property="Height" Value="25" />
+      <Setter Property="Width" Value="100" />
+      <Setter Property="BorderBrush" Value="Transparent"/>
+      <Setter Property="Background" Value="Transparent"/>
+      <Style.Resources>
+         <Style TargetType="{x:Type DatePickerTextBox}">
+            <Setter Property="Background" Value="Transparent"/>
+         </Style>
+      </Style.Resources>
+   </Style>
+
+   <Style x:Key="Filter_Calendar" TargetType="{x:Type Calendar}">
+      <Setter Property="Background">
+         <Setter.Value>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
+               <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0"/>
+               <GradientStop Color="{StaticResource BeamWall_LinkWater_Color}" Offset="0.16"/>
+               <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
+            </LinearGradientBrush>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="BorderBrush">
+         <Setter.Value>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
+               <GradientStop Color="{StaticResource BeamWall_LinkWater_Color}" Offset="0"/>
+               <GradientStop Color="{StaticResource BeamWall_RegentStBlue_Color}" Offset="0.45"/>
+               <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0.75"/>
+               <GradientStop Color="{StaticResource BeamWall_Kashmir_Color}" Offset="1"/>
+            </LinearGradientBrush>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="BorderThickness" Value="1"/>
+   </Style>
+
+   <!--#endregion DatePicker-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region Expander-->
+
+   <Style x:Key="ExpanderHeaderFocusVisual">
+      <Setter Property="Control.Template">
+         <Setter.Value>
+            <ControlTemplate>
+               <Border>
+                  <Rectangle Margin="0" StrokeDashArray="1 2" Stroke="Black" SnapsToDevicePixels="true" StrokeThickness="1"/>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   <Style x:Key="ExpanderDownHeaderStyle" TargetType="{x:Type ToggleButton}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ToggleButton}">
+               <Border Padding="{TemplateBinding Padding}">
+                  <Grid Background="{StaticResource BeamWall_Glacier}" Height="25" SnapsToDevicePixels="False">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="19"/>
+                        <ColumnDefinition Width="*"/>
+                     </Grid.ColumnDefinitions>
+                     <Rectangle x:Name="circle" Fill="{StaticResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="25" Stroke="{StaticResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
+                     <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" Stroke="{StaticResource Expander.Static.Arrow.Stroke}" SnapsToDevicePixels="false" StrokeThickness="2" VerticalAlignment="Center"/>
+                     <ContentPresenter Grid.Column="1" HorizontalAlignment="Center" RecognizesAccessKey="True" SnapsToDevicePixels="True" VerticalAlignment="Center"/>
+                  </Grid>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsChecked" Value="true">
+                     <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
+                  </Trigger>
+                  <Trigger Property="IsMouseOver" Value="true">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}"/>
+                  </Trigger>
+                  <Trigger Property="IsPressed" Value="true">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Stroke}"/>
+                     <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Pressed.Arrow.Stroke}"/>
+                  </Trigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Disabled.Arrow.Stroke}"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   <Style x:Key="ExpanderUpHeaderStyle" TargetType="{x:Type ToggleButton}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ToggleButton}">
+               <Border Padding="{TemplateBinding Padding}">
+                  <Grid Background="Transparent" SnapsToDevicePixels="False">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="19"/>
+                        <ColumnDefinition Width="*"/>
+                     </Grid.ColumnDefinitions>
+                     <Grid>
+                        <Grid.LayoutTransform>
+                           <TransformGroup>
+                              <TransformGroup.Children>
+                                 <TransformCollection>
+                                    <RotateTransform Angle="180"/>
+                                 </TransformCollection>
+                              </TransformGroup.Children>
+                           </TransformGroup>
+                        </Grid.LayoutTransform>
+                        <Ellipse x:Name="circle" Fill="{StaticResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="19" Stroke="{StaticResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
+                        <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" Stroke="{StaticResource Expander.Static.Arrow.Stroke}" SnapsToDevicePixels="false" StrokeThickness="2" VerticalAlignment="Center"/>
+                     </Grid>
+                     <ContentPresenter Grid.Column="1" HorizontalAlignment="Left" Margin="4,0,0,0" RecognizesAccessKey="True" SnapsToDevicePixels="True" VerticalAlignment="Center"/>
+                  </Grid>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsChecked" Value="true">
+                     <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
+                  </Trigger>
+                  <Trigger Property="IsMouseOver" Value="true">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}"/>
+                  </Trigger>
+                  <Trigger Property="IsPressed" Value="true">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Stroke}"/>
+                     <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Pressed.Arrow.Stroke}"/>
+                  </Trigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Disabled.Arrow.Stroke}"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   <Style x:Key="ExpanderLeftHeaderStyle" TargetType="{x:Type ToggleButton}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ToggleButton}">
+               <Border Padding="{TemplateBinding Padding}">
+                  <Grid Background="Transparent" SnapsToDevicePixels="False">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="19"/>
+                        <RowDefinition Height="*"/>
+                     </Grid.RowDefinitions>
+                     <Grid>
+                        <Grid.LayoutTransform>
+                           <TransformGroup>
+                              <TransformGroup.Children>
+                                 <TransformCollection>
+                                    <RotateTransform Angle="90"/>
+                                 </TransformCollection>
+                              </TransformGroup.Children>
+                           </TransformGroup>
+                        </Grid.LayoutTransform>
+                        <Ellipse x:Name="circle" Fill="{StaticResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="19" Stroke="{StaticResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
+                        <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" Stroke="{StaticResource Expander.Static.Arrow.Stroke}" SnapsToDevicePixels="false" StrokeThickness="2" VerticalAlignment="Center"/>
+                     </Grid>
+                     <ContentPresenter HorizontalAlignment="Center" Margin="0,4,0,0" RecognizesAccessKey="True" Grid.Row="1" SnapsToDevicePixels="True" VerticalAlignment="Top"/>
+                  </Grid>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsChecked" Value="true">
+                     <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
+                  </Trigger>
+                  <Trigger Property="IsMouseOver" Value="true">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}"/>
+                  </Trigger>
+                  <Trigger Property="IsPressed" Value="true">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Stroke}"/>
+                     <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Pressed.Arrow.Stroke}"/>
+                  </Trigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Disabled.Arrow.Stroke}"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   <Style x:Key="ExpanderRightHeaderStyle" TargetType="{x:Type ToggleButton}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ToggleButton}">
+               <Border Padding="{TemplateBinding Padding}">
+                  <Grid Background="Transparent" SnapsToDevicePixels="False">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="19"/>
+                        <RowDefinition Height="*"/>
+                     </Grid.RowDefinitions>
+                     <Grid>
+                        <Grid.LayoutTransform>
+                           <TransformGroup>
+                              <TransformGroup.Children>
+                                 <TransformCollection>
+                                    <RotateTransform Angle="-90"/>
+                                 </TransformCollection>
+                              </TransformGroup.Children>
+                           </TransformGroup>
+                        </Grid.LayoutTransform>
+                        <Ellipse x:Name="circle" Fill="{StaticResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="19" Stroke="{StaticResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
+                        <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" Stroke="{StaticResource Expander.Static.Arrow.Stroke}" SnapsToDevicePixels="false" StrokeThickness="2" VerticalAlignment="Center"/>
+                     </Grid>
+                     <ContentPresenter HorizontalAlignment="Center" Margin="0,4,0,0" RecognizesAccessKey="True" Grid.Row="1" SnapsToDevicePixels="True" VerticalAlignment="Top"/>
+                  </Grid>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsChecked" Value="true">
+                     <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
+                  </Trigger>
+                  <Trigger Property="IsMouseOver" Value="true">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}"/>
+                  </Trigger>
+                  <Trigger Property="IsPressed" Value="true">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Stroke}"/>
+                     <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Pressed.Arrow.Stroke}"/>
+                  </Trigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Disabled.Arrow.Stroke}"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   <Style TargetType="{x:Type Expander}">
+      <Setter Property="Foreground" Value="{StaticResource  BeamWall_White}"/>
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+      <Setter Property="VerticalContentAlignment" Value="Stretch"/>
+      <Setter Property="BorderBrush" Value="Transparent"/>
+      <Setter Property="BorderThickness" Value="1"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Expander}">
+               <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="3" SnapsToDevicePixels="true">
+                  <DockPanel>
+                     <ToggleButton x:Name="HeaderSite" ContentTemplate="{TemplateBinding HeaderTemplate}" Content="{TemplateBinding Header}" ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}" DockPanel.Dock="Top" FontStretch="{TemplateBinding FontStretch}" Foreground="{TemplateBinding Foreground}" FocusVisualStyle="{StaticResource ExpanderHeaderFocusVisual}" FontStyle="{TemplateBinding FontStyle}" FontFamily="{TemplateBinding FontFamily}" FontWeight="{TemplateBinding FontWeight}" FontSize="{TemplateBinding FontSize}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource Mode=TemplatedParent}}" Margin="1" MinWidth="0" MinHeight="0" Padding="{TemplateBinding Padding}" Style="{StaticResource ExpanderDownHeaderStyle}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                     <ContentPresenter x:Name="ExpandSite" DockPanel.Dock="Bottom" Focusable="false" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Visibility="Collapsed"/>
+                  </DockPanel>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsExpanded" Value="true">
+                     <Setter Property="Visibility" TargetName="ExpandSite" Value="Visible"/>
+                  </Trigger>
+                  <Trigger Property="ExpandDirection" Value="Right">
+                     <Setter Property="DockPanel.Dock" TargetName="ExpandSite" Value="Right"/>
+                     <Setter Property="DockPanel.Dock" TargetName="HeaderSite" Value="Left"/>
+                     <Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource ExpanderRightHeaderStyle}"/>
+                  </Trigger>
+                  <Trigger Property="ExpandDirection" Value="Up">
+                     <Setter Property="DockPanel.Dock" TargetName="ExpandSite" Value="Top"/>
+                     <Setter Property="DockPanel.Dock" TargetName="HeaderSite" Value="Bottom"/>
+                     <Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource ExpanderUpHeaderStyle}"/>
+                  </Trigger>
+                  <Trigger Property="ExpandDirection" Value="Left">
+                     <Setter Property="DockPanel.Dock" TargetName="ExpandSite" Value="Left"/>
+                     <Setter Property="DockPanel.Dock" TargetName="HeaderSite" Value="Right"/>
+                     <Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource ExpanderLeftHeaderStyle}"/>
+                  </Trigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!--#endregion Expander-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region ListBox-->
+
+   <Style TargetType="{x:Type ListBoxItem}">
+      <Setter Property="SnapsToDevicePixels" Value="True"/>
+      <Setter Property="Padding" Value="4,1"/>
+      <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+      <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="BorderBrush" Value="Transparent"/>
+      <Setter Property="BorderThickness" Value="1"/>
+      <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ListBoxItem}">
+               <Border x:Name="Bd" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+                  <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="IsMouseOver" Value="True"/>
+                     </MultiTrigger.Conditions>
+                     <Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.MouseOver.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.MouseOver.Border}"/>
+                     <Setter Property="Foreground" Value="{StaticResource Item.MouseOver.Foreground}"/>
+                     <Setter Property="FontWeight" Value="Bold" />
+                  </MultiTrigger>
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="Selector.IsSelectionActive" Value="False"/>
+                        <Condition Property="IsSelected" Value="True"/>
+                     </MultiTrigger.Conditions>
+                     <Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.SelectedInactive.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.SelectedInactive.Border}"/>
+                  </MultiTrigger>
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="Selector.IsSelectionActive" Value="True"/>
+                        <Condition Property="IsSelected" Value="True"/>
+                     </MultiTrigger.Conditions>
+                     <Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.SelectedActive.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.SelectedActive.Border}"/>
+                     <Setter Property="Foreground" Value="{StaticResource Item.SelectedActive.Foreground}"/>
+                     <Setter Property="FontWeight" Value="Bold" />
+                  </MultiTrigger>
+                  <Trigger Property="IsEnabled" Value="False">
+                     <Setter Property="TextElement.Foreground" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!--#endregion ListBox-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region PasswordBox-->
+
+   <Style TargetType="{x:Type PasswordBox}">
+      <Setter Property="HorizontalContentAlignment" Value="Right"/>
+      <Setter Property="Margin" Value="0,0,0,5"/>
+   </Style>
+
+   <!--#endregion PasswordBox-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region Border-->
+
+   <Style x:Key="Optimizer_Border" TargetType="{x:Type Border}">
+      <Setter Property="CornerRadius" Value="4"/>
+      <Setter Property="BorderThickness" Value="2"/>
+      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Glacier}"/>
+   </Style>
+
+   <!--#endregion Border-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region EgtCustomWindow-->
+
+   <Style x:Key="OnlyProd_EgtCustomWindow" TargetType="{x:Type EgtWPFLib5:EgtCustomWindow}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
+      <Setter Property="TitleBarHeight" Value="40"/>
+      <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"/>
+      <Setter Property="Background">
+         <Setter.Value>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
+               <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
+               <GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.45"/>
+               <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
+            </LinearGradientBrush>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!--#endregion EgtCustomWindow-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region TabControl-->
+
+   <Style x:Key="OnlyHeaders_TabControl" TargetType="{x:Type TabControl}" BasedOn="{StaticResource OnlyProd_TabControl}">
+      <Setter Property="OverridesDefaultStyle" Value="True" />
+      <Setter Property="SnapsToDevicePixels" Value="True" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type TabControl}">
+               <Grid KeyboardNavigation.TabNavigation="Local">
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="Auto"/>
+                     <RowDefinition Height="*"/>
+                  </Grid.RowDefinitions>
+                  <TabPanel Name="HeaderPanel"
+                            Grid.Row="0"
+                            Panel.ZIndex="1" 
+                            Margin="0,0,4,-1" 
+                            IsItemsHost="True"
+                            KeyboardNavigation.TabIndex="1"
+                            Background="Transparent" />
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsEnabled" Value="False">
+                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!--#endregion TabControl-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region Image-->
+
+   <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>
+
+   <Style x:Key="Lock_Image" TargetType="{x:Type Image}">
+      <Setter Property="Source" Value="/Resources/PartManager/Locked.png" />
+      <Setter Property="Height" Value="15"/>
+      <Setter Property="Stretch" Value="Uniform"/>
+      <Style.Triggers>
+         <DataTrigger Binding="{Binding IsEnabled,RelativeSource={RelativeSource self}}" Value="False">
+            <Setter Property="Source" Value="/Resources/PartManager/Unlocked.png"/>
+         </DataTrigger>
+      </Style.Triggers>
+   </Style>
+
+   <!--#endregion Image-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region ItemsControl-->
+
+   <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>
+
+   <!--#endregion ItemsControl-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region Grid-->
+
+   <Style x:Key="ProjFileList_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="TextBlock.FontSize" Value="12"/>
+      <Setter Property="TextBlock.FontWeight" Value="Normal"/>
+   </Style>
+
+   <Style x:Key="Gray_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="Background" Value="{StaticResource BeamWall_Gray}"/>
+      <Setter Property="Margin" Value="40,0,40,0"/>
+   </Style>
+
+   <!--#endregion Grid-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
 </ResourceDictionary>
diff --git a/EgtBEAMWALL.Optimizer/AddFeatureWnd/AddFeatureWndV.xaml b/EgtBEAMWALL.Optimizer/AddFeatureWnd/AddFeatureWndV.xaml
index ebb76613..17854ad2 100644
--- a/EgtBEAMWALL.Optimizer/AddFeatureWnd/AddFeatureWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/AddFeatureWnd/AddFeatureWndV.xaml
@@ -24,7 +24,7 @@
                  Style="{StaticResource ListTextBlock}"/>
       </Border>
       <Border Grid.Row="1" 
-              Style="{StaticResource OnlyProdPage_Border}"
+              Style="{StaticResource Optimizer_Border}"
               CornerRadius="4,0,0,4"
               BorderThickness="2,2,0,2">
          <ListBox Grid.Row="1"
@@ -50,7 +50,7 @@
       </Border>
       <Border Grid.Row="1" 
               Grid.Column="1" 
-              Style="{StaticResource OnlyProdPage_Border}"
+              Style="{StaticResource Optimizer_Border}"
               CornerRadius="0"
               BorderThickness="0,2,0,2">
          <ListBox ItemsSource="{Binding MacroCustomList}"
@@ -85,7 +85,7 @@
       </Border>
       <Border Grid.Row="1" 
               Grid.Column="2" 
-              Style="{StaticResource OnlyProdPage_Border}"
+              Style="{StaticResource Optimizer_Border}"
               CornerRadius="0,4,4,0"
               BorderThickness="0,2,2,2">
          <ListBox ItemsSource="{Binding MacroDefaultList}"
@@ -108,10 +108,10 @@
          <Button Content="{Binding OK_Msg}"
                  Command="{Binding Ok_Command}"
                  IsDefault="True"
-                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
          <Button Content="{Binding Cancel_Msg}"
                  IsCancel="True"
-                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
       </UniformGrid>
    </Grid>
 </EgtBEAMWALLCORE:OptimizerWindow>
diff --git a/EgtBEAMWALL.Optimizer/AddPartWnd/AddPartWndV.xaml b/EgtBEAMWALL.Optimizer/AddPartWnd/AddPartWndV.xaml
index ef308d77..c7612d0b 100644
--- a/EgtBEAMWALL.Optimizer/AddPartWnd/AddPartWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/AddPartWnd/AddPartWndV.xaml
@@ -16,7 +16,7 @@
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
 
-      <Grid Style="{StaticResource OnlyProdAddPart_Grid}">
+      <Grid Style="{StaticResource AddPart_Grid}">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="Auto"/>
@@ -82,10 +82,10 @@
          <Button Content="Ok"
                  Command="{Binding Ok_Command}"
                  IsDefault="True"
-                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
          <Button Content="Cancel"
                  IsCancel="True"
-                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
       </UniformGrid>
    </Grid>
 </EgtBEAMWALLCORE:OptimizerWindow>
diff --git a/EgtBEAMWALL.Optimizer/AddRawPartWnd/AddRawPartWndV.xaml b/EgtBEAMWALL.Optimizer/AddRawPartWnd/AddRawPartWndV.xaml
index e13e1389..65e48b8b 100644
--- a/EgtBEAMWALL.Optimizer/AddRawPartWnd/AddRawPartWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/AddRawPartWnd/AddRawPartWndV.xaml
@@ -46,12 +46,12 @@
                  Content="Ok"
                  Command="{Binding Ok_Command}"
                  IsDefault="True"
-                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"
+                 Style="{StaticResource EgtWPFLib5_InputButton}"
                  Margin="0,0,5,0"/>
          <Button Grid.Column="3"
                  Content="Cancel"
                  IsCancel="True"
-                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
       </UniformGrid>
    </Grid>
 
diff --git a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml
index 40c2877d..1f0a06de 100644
--- a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml
@@ -35,7 +35,7 @@
                <UniformGrid Rows="2" Grid.Column="1" Margin="0,0,5,0">
                   <CheckBox IsChecked="{Binding bSaveGeneralParameters, UpdateSourceTrigger=PropertyChanged}" 
                             Margin="10,10,0,0" VerticalAlignment="Top" HorizontalAlignment="Center"
-                            Style="{StaticResource OnlyProdFeatureInPartInRawPartList_CheckBox}"/>
+                            Style="{StaticResource FeatureInPartInRawPartList_CheckBox}"/>
                   <Button Command="{Binding Ok_Command}" VerticalAlignment="Bottom" Margin="0,0,0,5"
                           ToolTip="{Binding SaveAsToolTip}"
                           Style="{StaticResource SaveStrategy_Button}">
diff --git a/EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerV.xaml b/EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerV.xaml
index 09d89e11..a9ff7411 100644
--- a/EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerV.xaml
+++ b/EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerV.xaml
@@ -8,40 +8,40 @@
         Background="{StaticResource BeamWall_FountainBlue}">
 
    <StackPanel Orientation="Horizontal"
-               Style="{StaticResource OnlyProdBTLPartManager_StackPanel}">
+               Style="{StaticResource BTLPartManager_StackPanel}">
       <Button Command="{Binding CopyPart_Command}"
               Click="ClosePopUp_Click"
               ToolTip="{Binding CopyPart_ToolTip}"
               IsEnabled="{Binding CopyPart_IsEnabled}"
-              Style="{StaticResource OnlyProdLeftPanel_Button}">
+              Style="{StaticResource LP_Button}">
          <Image Source="/Resources/LeftPanel/CopyPart.png" Stretch="Uniform"/>
       </Button>
       <Button Command="{Binding RemovePart_Command}"
               Click="ClosePopUp_Click"
               ToolTip="{Binding RemovePart_ToolTip}"
               IsEnabled="{Binding RemovePart_IsEnabled}"
-              Style="{StaticResource OnlyProdLeftPanel_Button}">
+              Style="{StaticResource LP_Button}">
          <Image Source="/Resources/NewPage/Remove.png" Stretch="Uniform"/>
       </Button>
       <Button ToolTip="{Binding Simulate_ToolTip}"
               Click="ClosePopUp_Click"
               Command="{Binding Simulate_Command}"
               IsEnabled="{Binding Simulate_IsEnabled}"
-              Style="{StaticResource OnlyProdLeftPanel_Button}">
+              Style="{StaticResource LP_Button}">
          <Image Source="/Resources/CALCPanel/Simulate.png" Stretch="Uniform"/>
       </Button>
       <Button ToolTip="{Binding Edit_ToolTip}"
               Click="ClosePopUp_Click"
               Command="{Binding Edit_Command}"
               IsEnabled="{Binding Edit_IsEnabled}"
-              Style="{StaticResource OnlyProdLeftPanel_Button}">
+              Style="{StaticResource LP_Button}">
          <Image Source="/Resources/CALCPanel/Edit.png" Stretch="Uniform"/>
       </Button>
       <Button Command="{Binding ResetCalc_Command}"
               Click="ClosePopUp_Click"
               ToolTip="{Binding ResetCalc_ToolTip}"
               IsEnabled="{Binding CALCPanel_IsEnabled}"
-              Style="{StaticResource OnlyProdLeftPanel_Button}">
+              Style="{StaticResource LP_Button}">
          <Image Source="/Resources/CALCPanel/ResetCalc.png" Stretch="Uniform"/>
       </Button>
    </StackPanel>
diff --git a/EgtBEAMWALL.Optimizer/BTLViewModel/BTLPartVM.vb b/EgtBEAMWALL.Optimizer/BTLViewModel/BTLPartVM.vb
index 4490b9b6..617feda0 100644
--- a/EgtBEAMWALL.Optimizer/BTLViewModel/BTLPartVM.vb
+++ b/EgtBEAMWALL.Optimizer/BTLViewModel/BTLPartVM.vb
@@ -1560,11 +1560,6 @@ Public Class BTLPartVM
             Else
                Map.refFeatureManagerVM.SetVariant_Visibility(Visibility.Collapsed)
             End If
-            ' Forzo strategia
-            'Map.refForcedStrategyBTLVM.Init(m_SelBTLFeatureVM.BTLFeatureM)
-            Map.refForcedStrategyPanelVM.Init(m_SelBTLFeatureVM.BTLFeatureM)
-            'Else
-            '   EgtDeselectAll()
          End If
          If Not IsNothing(Map.refFeatureListManagerVM) Then Map.refFeatureListManagerVM.FeatureSelectionChanged()
          EgtDraw()
diff --git a/EgtBEAMWALL.Optimizer/CALCPanel/CalcPanelV.xaml b/EgtBEAMWALL.Optimizer/CALCPanel/CalcPanelV.xaml
index 99d7bc20..77b2828c 100644
--- a/EgtBEAMWALL.Optimizer/CALCPanel/CalcPanelV.xaml
+++ b/EgtBEAMWALL.Optimizer/CALCPanel/CalcPanelV.xaml
@@ -1,7 +1,7 @@
 <StackPanel x:Class="CalcPanelV"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            Style="{StaticResource OnlyProdPartManager_StackPanel}">
+            Style="{StaticResource PartManager_StackPanel}">
    
    <Button ToolTip="{Binding ChooseMachine_ToolTip}"
            Command="{Binding ChooseMachine_Command}"
@@ -22,11 +22,11 @@
                 DisplayMemberPath="Name"
                 SelectedItem="{Binding Path=SelectedMachine}" 
                 SelectedValuePath="Name"
-                Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
+                Style="{StaticResource CalcPanel_ComboBox}"/>
       <Button Grid.Column="1"
               Content="OK"
               Command="{Binding Ok_Command}"
-              Style="{StaticResource ToolBarOnlyProdCalcPanel_Button}"/>
+              Style="{StaticResource CalcPanel_Button}"/>
    </Grid>
 
 </StackPanel>
diff --git a/EgtBEAMWALL.Optimizer/ChangeMaterialWnd/ChangeMaterialWndV.xaml b/EgtBEAMWALL.Optimizer/ChangeMaterialWnd/ChangeMaterialWndV.xaml
index d607eaca..c3278f73 100644
--- a/EgtBEAMWALL.Optimizer/ChangeMaterialWnd/ChangeMaterialWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/ChangeMaterialWnd/ChangeMaterialWndV.xaml
@@ -31,7 +31,7 @@
                    SelectedItem="{Binding SelProjMaterial}"
                    Grid.Column="1"
                    Width="150"
-                   Style="{StaticResource FeatureComboBox}"/>
+                   Style="{StaticResource Feature_ComboBox}"/>
       </Grid>
       <Grid HorizontalAlignment="Center"
             Grid.Row="1"
@@ -46,7 +46,7 @@
                    SelectedItem="{Binding SelWhMaterial}"
                    Grid.Column="1"
                    Width="150"
-                   Style="{StaticResource FeatureComboBox}"/>
+                   Style="{StaticResource Feature_ComboBox}"/>
       </Grid>
 
       <Grid Grid.Row="2"
diff --git a/EgtBEAMWALL.Optimizer/ChangeParameterWnd/ChangeParameterWndV.xaml b/EgtBEAMWALL.Optimizer/ChangeParameterWnd/ChangeParameterWndV.xaml
index 35c516e6..c8a26564 100644
--- a/EgtBEAMWALL.Optimizer/ChangeParameterWnd/ChangeParameterWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/ChangeParameterWnd/ChangeParameterWndV.xaml
@@ -34,7 +34,7 @@
                 SelectedItem="{Binding SelPRC}"
                 DisplayMemberPath="ghDesc"
                 HorizontalAlignment="Stretch"
-                Style="{StaticResource FeatureComboBox}"/>
+                Style="{StaticResource Feature_ComboBox}"/>
 
       <TextBlock Grid.Row="2"
                  Text="Parameter"
@@ -44,7 +44,7 @@
                 SelectedItem="{Binding SelParam}"
                 DisplayMemberPath="sNameAndDescription"
                 HorizontalAlignment="Stretch"
-                Style="{StaticResource FeatureComboBox}"/>
+                Style="{StaticResource Feature_ComboBox}"/>
 
       <TextBlock Grid.Row="4" 
                  Text="Actual value"
diff --git a/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationProgramV.xaml b/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationProgramV.xaml
index 67202fb9..77221ef9 100644
--- a/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationProgramV.xaml
+++ b/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationProgramV.xaml
@@ -15,7 +15,7 @@
       </Grid.RowDefinitions>
       <TabControl Grid.RowSpan="2" Grid.ColumnSpan="2"
                   SelectedIndex="{Binding SelConfigSubPage}"
-                  Style="{StaticResource OnlyProd_TabControl}">
+                  Style="{StaticResource Optimizer_TabControl}">
          <TabItem>
             <TabItem.Header>
                <StackPanel Orientation="Horizontal" Margin="5">
diff --git a/EgtBEAMWALL.Optimizer/FeatureListManager/FeatureListManagerV.xaml b/EgtBEAMWALL.Optimizer/FeatureListManager/FeatureListManagerV.xaml
index f6ec3ffb..0741f698 100644
--- a/EgtBEAMWALL.Optimizer/FeatureListManager/FeatureListManagerV.xaml
+++ b/EgtBEAMWALL.Optimizer/FeatureListManager/FeatureListManagerV.xaml
@@ -2,24 +2,24 @@
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             DataContext="{StaticResource FeatureListManagerVM}"
-            Style="{StaticResource OnlyProdFeatureListManager_StackPanel}">
+            Style="{StaticResource FeatureListManager_StackPanel}">
    
    <Button Command="{Binding CopyFeature_Command}"
            ToolTip="{Binding CopyFeature_ToolTip}"
            IsEnabled="{Binding CopyFeature_IsEnabled}"
-           Style="{StaticResource OnlyProdLeftPanel_Button}">
+           Style="{StaticResource LP_Button}">
       <Image Source="/Resources/LeftPanel/CopyFeature.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding AddFeature_Command}"
            ToolTip="{Binding AddFeature_ToolTip}"
            IsEnabled="{Binding AddFeature_IsEnabled}"
-           Style="{StaticResource OnlyProdLeftPanel_Button}">
+           Style="{StaticResource LP_Button}">
       <Image Source="/Resources/LeftPanel/AddFeature.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding RemoveFeature_Command}"
            ToolTip="{Binding RemoveFeature_ToolTip}"
            IsEnabled="{Binding RemoveFeature_IsEnabled}"
-           Style="{StaticResource OnlyProdLeftPanel_Button}">
+           Style="{StaticResource LP_Button}">
       <Image Source="/Resources/NewPage/Remove.png" Stretch="Uniform"/>
    </Button>
 
diff --git a/EgtBEAMWALL.Optimizer/FeatureManager/FeatureManagerV.xaml b/EgtBEAMWALL.Optimizer/FeatureManager/FeatureManagerV.xaml
index 4a0c6f7a..bb47bc08 100644
--- a/EgtBEAMWALL.Optimizer/FeatureManager/FeatureManagerV.xaml
+++ b/EgtBEAMWALL.Optimizer/FeatureManager/FeatureManagerV.xaml
@@ -51,34 +51,34 @@
                           Style="{StaticResource Dimension_TextBox}"/>
    <TextBlock Grid.Column="4"
               Text="{Binding Tag.sName, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
-              Style="{StaticResource OnlyProdFeatureManager_OnlyProd}"/>
+              Style="{StaticResource FeatureManager_TextBlock}"/>
    <ComboBox Grid.Column="5"
              ItemsSource="{Binding Tag.VARIANTList, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
              SelectedItem="{Binding Tag.nSelVARIANT, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
              IsEnabled="{Binding FeatureManager_IsEnabled}"
              Visibility="{Binding Variant_Visibility}"
-             Style="{StaticResource FeatureComboBox}"/>
+             Style="{StaticResource Feature_ComboBox}"/>
    <Button Grid.Column="6"
            Content="{Binding Edit_Msg}"
            Command="{Binding Tag.Edit_Command, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
            Visibility="{Binding Tag.Edit_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
            IsEnabled="{Binding Edit_IsEnabled}"
-           Style="{StaticResource GeneralConfigurationToolBar_TextButton}"/>
+           Style="{StaticResource GeneralConfiguration_Button}"/>
    <Button Grid.Column="7"
            Content="{Binding Save_Msg}"
            Command="{Binding Tag.Save_Command, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
            Visibility="{Binding Tag.SaveCancel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
-           Style="{StaticResource GeneralConfigurationToolBar_TextButton}"/>
+           Style="{StaticResource GeneralConfiguration_Button}"/>
    <Button Grid.Column="8"
            Content="{Binding Cancel_Msg}"
            Command="{Binding Tag.Cancel_Command, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
            Visibility="{Binding Tag.SaveCancel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
-           Style="{StaticResource GeneralConfigurationToolBar_TextButton}"/>
+           Style="{StaticResource GeneralConfiguration_Button}"/>
    <Button Grid.Column="9" HorizontalAlignment="Right"
            Command="{Binding MacroFeature_Command}"
            ToolTip="{Binding MacroFeature_ToolTip}"
            IsEnabled="{Binding MacroFeature_IsEnabled}"
-           Style="{StaticResource OnlyProdFeatureMan_Button}">
+           Style="{StaticResource FeatureMan_Button}">
       <Image Source="/Resources/LeftPanel/MacroFeature.png" Stretch="Uniform"/>
    </Button>
 
diff --git a/EgtBEAMWALL.Optimizer/ForcedStrategyBTL/ForcedStrategyBTLV.xaml b/EgtBEAMWALL.Optimizer/ForcedStrategyBTL/ForcedStrategyBTLV.xaml
index 02fdef53..64e62ff8 100644
--- a/EgtBEAMWALL.Optimizer/ForcedStrategyBTL/ForcedStrategyBTLV.xaml
+++ b/EgtBEAMWALL.Optimizer/ForcedStrategyBTL/ForcedStrategyBTLV.xaml
@@ -10,7 +10,7 @@
       </Grid.ColumnDefinitions>
       <Border Margin="2,0,2,0" 
               Grid.RowSpan="2"
-              Style="{StaticResource OnlyProdPage_Border}">
+              Style="{StaticResource Optimizer_Border}">
          <ListBox ItemsSource="{Binding StrategyList}"
                   SelectedItem="{Binding SelStrategy}"
                   IsSynchronizedWithCurrentItem="True"
diff --git a/EgtBEAMWALL.Optimizer/ForcedStrategyPanel/ForcedStrategyPanelV.xaml b/EgtBEAMWALL.Optimizer/ForcedStrategyPanel/ForcedStrategyPanelV.xaml
index a7ef35c8..3fc51750 100644
--- a/EgtBEAMWALL.Optimizer/ForcedStrategyPanel/ForcedStrategyPanelV.xaml
+++ b/EgtBEAMWALL.Optimizer/ForcedStrategyPanel/ForcedStrategyPanelV.xaml
@@ -13,7 +13,7 @@
       </Grid.ColumnDefinitions>
       <Border Grid.RowSpan="2"
               Margin="2,0,2,0" 
-              Style="{StaticResource OnlyProdPage_Border}">
+              Style="{StaticResource Optimizer_Border}">
          <ListBox ItemsSource="{Binding StrategyList}"
                   SelectedItem="{Binding SelStrategy}"
                   Height="Auto"
@@ -57,7 +57,7 @@
       <StackPanel Grid.Row="2"
                   Grid.ColumnSpan="2"
                   HorizontalAlignment="Right"
-                  Style="{StaticResource OnlyProdPartManager_StackPanel}">
+                  Style="{StaticResource PartManager_StackPanel}">
          <Button Command="{Binding Ok_Command}"
                  ToolTip="{Binding Ok_Msg}"
                  Style="{StaticResource ToolBarViewPanel_Button}">
diff --git a/EgtBEAMWALL.Optimizer/FreeContourInput/FreeContourInputV.xaml b/EgtBEAMWALL.Optimizer/FreeContourInput/FreeContourInputV.xaml
index 015a7840..c061dab9 100644
--- a/EgtBEAMWALL.Optimizer/FreeContourInput/FreeContourInputV.xaml
+++ b/EgtBEAMWALL.Optimizer/FreeContourInput/FreeContourInputV.xaml
@@ -42,12 +42,12 @@
          <Button Command="{Binding Show_Command}" 
                  Visibility="{Binding ShowBtn_Visibility}"
                  Content="{Binding ShowMsg}" 
-                 Style="{StaticResource GeneralConfigurationToolBar_TextButton}"/>
+                 Style="{StaticResource GeneralConfiguration_Button}"/>
          <Button Grid.Column="1"
                  Command="{Binding Done_Command}" 
                  Visibility="{Binding DoneBtn_Visibility}"
                  Content="{Binding OkMsg}" 
-                 Style="{StaticResource GeneralConfigurationToolBar_TextButton}"/>
+                 Style="{StaticResource GeneralConfiguration_Button}"/>
       </Grid>
    </StackPanel>
 </UserControl>
diff --git a/EgtBEAMWALL.Optimizer/FreeContourManager/FreeContourManagerV.xaml b/EgtBEAMWALL.Optimizer/FreeContourManager/FreeContourManagerV.xaml
index e4738aeb..4b3f6264 100644
--- a/EgtBEAMWALL.Optimizer/FreeContourManager/FreeContourManagerV.xaml
+++ b/EgtBEAMWALL.Optimizer/FreeContourManager/FreeContourManagerV.xaml
@@ -1,15 +1,15 @@
 <StackPanel x:Class="FreeContourManagerV"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            Style="{StaticResource OnlyProdBTLPartManager_StackPanel}">
+            Style="{StaticResource BTLPartManager_StackPanel}">
 
    <ComboBox ItemsSource="{Binding TypeList}"
              SelectedIndex="{Binding SelType, Delay=1}"
-             Style="{StaticResource OnlyProdType_ComboBox}"/>
+             Style="{StaticResource ProdType_ComboBox}"/>
    <ComboBox ItemsSource="{Binding PathList}"
              SelectedIndex="{Binding SelPath}"
              Visibility="{Binding PathList_Visibility}"
-             Style="{StaticResource OnlyProdPath_ComboBox}"/>
+             Style="{StaticResource ProdPath_ComboBox}"/>
    <Button Command="{Binding Line2P_Command}"
            ToolTip="{Binding Line2P_ToolTip}"
            IsEnabled="{Binding Line2P_IsEnabled}"
diff --git a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersWnd.xaml b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersWnd.xaml
index ce101447..51b301da 100644
--- a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersWnd.xaml
+++ b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersWnd.xaml
@@ -27,7 +27,7 @@
       <UniformGrid Rows="2" Grid.Row="1" Grid.Column="1" Margin="0,0,5,0">
          <CheckBox IsChecked="{Binding bSaveGeneralParameters, UpdateSourceTrigger=PropertyChanged}"
                    VerticalAlignment="Top" HorizontalAlignment="Center" Margin="10,10,0,0"
-                   Style="{StaticResource OnlyProdFeatureInPartInRawPartList_CheckBox}"/>
+                   Style="{StaticResource FeatureInPartInRawPartList_CheckBox}"/>
          <Button Command="{Binding Ok_Command}" VerticalAlignment="Bottom" Margin="5,0,0,5"
                  ToolTip="{Binding SaveAsToolTip}"
                  Style="{StaticResource SaveStrategy_Button}">
diff --git a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/ProjectParametersV.xaml b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/ProjectParametersV.xaml
index 80de1e97..17a95ee2 100644
--- a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/ProjectParametersV.xaml
+++ b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/ProjectParametersV.xaml
@@ -69,7 +69,7 @@
                              TextWrapping="WrapWithOverflow"
                              Style="{StaticResource DialogWindow_TextBlock}"/>
                   <CheckBox IsChecked="{Binding bValue, UpdateSourceTrigger=PropertyChanged}"
-                            Style="{StaticResource OnlyProdFeatureInPartInRawPartList_CheckBox}"/>
+                            Style="{StaticResource FeatureInPartInRawPartList_CheckBox}"/>
                </UniformGrid>
             </DataTemplate>
             <DataTemplate DataType="{x:Type OPTIMIZER:DoubleGenericParameter}">
@@ -97,7 +97,7 @@
                             DisplayMemberPath="sValue"
                             Margin="0"
                             Foreground="Black"
-                            Style="{StaticResource OnlyProdCalcPanel_ComboBox}">
+                            Style="{StaticResource CalcPanel_ComboBox}">
                   </ComboBox>
                </UniformGrid>
             </DataTemplate>
@@ -137,7 +137,7 @@
                                 ToolTip="{Binding OpenToolListToolTip}"
                                 IsEnabled="{Binding OpenToolListIsEnable}"
                                 Command="{Binding OpenToolListCommand}"
-                                Style="{StaticResource MachineToolBar_ParameterMachineButton}">
+                                Style="{StaticResource ParameterMachine_Button}">
                            <Image Source="/Resources/NewPage/+.png" Stretch="Uniform"/>
                         </Button>
                         <Button VerticalAlignment="Top"
@@ -146,12 +146,12 @@
                                 ToolTip="{Binding DeselectAllToolTip}"
                                 IsEnabled="{Binding ActiveToolListIsEnable}"
                                 Command="{Binding DeselectAllCommand}"
-                                Style="{StaticResource MachineToolBar_ParameterMachineButton}">
+                                Style="{StaticResource ParameterMachine_Button}">
                            <Image Source="/Resources/NewPage/deselectall.png" Stretch="Uniform"/>
                         </Button>
                      </StackPanel>
                      <Border Margin="2,0,2,0" 
-                             Style="{StaticResource OnlyProdPage_Border}">
+                             Style="{StaticResource Optimizer_Border}">
                         <ItemsControl ItemsSource="{Binding ActiveToolList_View}"
                                       BorderThickness="0"
                                       Height="95"
@@ -160,7 +160,7 @@
                                       Style="{StaticResource UsersControlStyle}">
                            <ItemsControl.ItemTemplate>
                               <DataTemplate>
-                                 <StackPanel Style="{StaticResource StackPanel_List}">
+                                 <StackPanel Style="{StaticResource List_StackPanel}">
                                     <CheckBox IsChecked="{Binding bIsActive, UpdateSourceTrigger=PropertyChanged}"
                                                Style="{StaticResource FreeContourInput_CheckBox}"/>
                                     <TextBlock Text="{Binding sName}"
@@ -178,7 +178,7 @@
                                 Margin="0,0,0,5"
                                 ToolTip="{Binding CloseToolListToolTip}"
                                 Command="{Binding CloseToolListCommand}"
-                                Style="{StaticResource MachineToolBar_ParameterMachineButton}">
+                                Style="{StaticResource ParameterMachine_Button}">
                            <Image Source="/Resources/PDFEditor/Delete.png" Stretch="Uniform"/>
                         </Button>
                         <Button VerticalAlignment="Top"
@@ -187,12 +187,12 @@
                                 ToolTip="{Binding SelectAllToolTip}"
                                 IsEnabled="{Binding AvailableToolListIsEnable}"
                                 Command="{Binding SelectAllCommand}"
-                                Style="{StaticResource MachineToolBar_ParameterMachineButton}">
+                                Style="{StaticResource ParameterMachine_Button}">
                            <Image Source="/Resources/NewPage/selectall.png" Stretch="Uniform"/>
                         </Button>
                      </StackPanel>
                      <Border Margin="2,5,2,0" 
-                             Style="{StaticResource OnlyProdPage_Border}">
+                             Style="{StaticResource Optimizer_Border}">
                         <ItemsControl ItemsSource="{Binding AvailableToolList_View}"                                   
                                       BorderThickness="0"
                                       Height="200"
@@ -201,7 +201,7 @@
                                       Style="{StaticResource UsersControlStyle}">
                            <ItemsControl.ItemTemplate>
                               <DataTemplate>
-                                 <StackPanel Style="{StaticResource StackPanel_List}">
+                                 <StackPanel Style="{StaticResource List_StackPanel}">
                                     <CheckBox IsChecked="{Binding bIsActive, UpdateSourceTrigger=PropertyChanged}"
                                               Style="{StaticResource FreeContourInput_CheckBox}"/>
                                     <TextBlock Text="{Binding sName}"
diff --git a/EgtBEAMWALL.Optimizer/InputPwdWnd/InputPwdWndV.xaml b/EgtBEAMWALL.Optimizer/InputPwdWnd/InputPwdWndV.xaml
index ed9d115b..f225e942 100644
--- a/EgtBEAMWALL.Optimizer/InputPwdWnd/InputPwdWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/InputPwdWnd/InputPwdWndV.xaml
@@ -35,11 +35,11 @@
                  Content="Ok"
                  Command="{Binding Ok_Command}"
                  IsDefault="True"
-                 Style="{StaticResource GeneralConfigurationToolBar_TextButton}"/>
+                 Style="{StaticResource GeneralConfiguration_Button}"/>
          <Button Grid.Column="3"
                  Content="Cancel"
                  IsCancel="True"
-                 Style="{StaticResource GeneralConfigurationToolBar_TextButton}"/>
+                 Style="{StaticResource GeneralConfiguration_Button}"/>
       </Grid>
    </Grid>
 </EgtBEAMWALLCORE:OptimizerWindow>
diff --git a/EgtBEAMWALL.Optimizer/InstrumentPanel/InstrumentPanelV.xaml b/EgtBEAMWALL.Optimizer/InstrumentPanel/InstrumentPanelV.xaml
index 4dd847d2..a4ad9b1f 100644
--- a/EgtBEAMWALL.Optimizer/InstrumentPanel/InstrumentPanelV.xaml
+++ b/EgtBEAMWALL.Optimizer/InstrumentPanel/InstrumentPanelV.xaml
@@ -1,11 +1,11 @@
 <StackPanel x:Class="InstrumentPanelV"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            Style="{StaticResource OnlyProdBTLPartManager_StackPanel}">
+            Style="{StaticResource BTLPartManager_StackPanel}">
 
    <ToggleButton ToolTip="{Binding GetDistToolTip}"
                  IsChecked="{Binding GetDistIsChecked}"
-                 Style="{StaticResource ToolBarOnlyProdPage_ToggleButton}">
+                 Style="{StaticResource ToolBar_ToggleButton}">
       <Image Source="/Resources/InstrumentPanel/GetDist.png" Stretch="Uniform"/>
    </ToggleButton>
 
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml
index fabf7f7a..d4061701 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml
@@ -35,7 +35,7 @@
                                 VirtualizingPanel.CacheLengthUnit="Pixel"
                                 RowBackground="{StaticResource BeamWall_BLackSqueeze}"
                                 ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
-                                Style="{StaticResource DataGrid_OnlyProd}">
+                                Style="{StaticResource Optimizer_DataGrid}">
       <DataGrid.InputBindings>
          <KeyBinding Key="Delete" Command="{Binding Tag.DeletePart_Command,
                                                     RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}" />
@@ -60,21 +60,21 @@
                                             CommandParameter="{Binding Path=Name}"
                                             ToolTip="{Binding Tag.Data_ToolTip, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
                                             Height="23.5" Width="25" Margin="5,0,0,0" 
-                                            Style="{StaticResource OnlyProdLeftPanel_Button}">
+                                            Style="{StaticResource LP_Button}">
                                        <Image Source="/Resources/NewPage/adjustment.png" Stretch="Uniform"/>
                                     </Button>
                                     <Button Command="{Binding Tag.AddPart_Command, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
                                             CommandParameter="{Binding Path=Name}"
                                             ToolTip="{Binding Tag.AddPart_ToolTip, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
                                             Height="23.5" Width="25" Margin="5,0,0,0" 
-                                            Style="{StaticResource OnlyProdLeftPanel_Button}">
+                                            Style="{StaticResource LP_Button}">
                                        <Image Source="/Resources/LeftPanel/AddPart.png" Stretch="Uniform"/>
                                     </Button>
                                     <Button Command="{Binding Tag.UpdateBTL_Command, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
                                             CommandParameter="{Binding Path=Name}"
                                             ToolTip="{Binding Tag.UpdateBTL_ToolTip, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
                                             Height="23.5" Width="25" Margin="5,0,0,0" 
-                                            Style="{StaticResource OnlyProdLeftPanel_Button}">
+                                            Style="{StaticResource LP_Button}">
                                        <Image Source="/Resources/ProjectManager/UpdateBTL.png" Stretch="Uniform"/>
                                     </Button>
                                  </StackPanel>
@@ -136,7 +136,7 @@
                      </Grid.ColumnDefinitions>
                      <TextBlock Text="↓"
                                 Visibility="{Binding CALC_FALL_Visibility}"
-                                Style="{StaticResource OnlyProdRawPartList_TextBlock}"/>
+                                Style="{StaticResource RawPartList_TextBlock}"/>
                      <Border Grid.Column="1"
                              Width="{Binding ActualHeight, RelativeSource={RelativeSource self}}"
                              Background="{Binding Calc_BorderBrush}">
@@ -450,7 +450,7 @@
                                  <TextBlock Grid.Row="1"
                                             Text="{Binding CALC_ERR_Letter}"
                                             Foreground="{Binding CALC_ERR_Foreground}"
-                                            Style="{StaticResource OnlyProdFeatureInPartInRawPartList_TextBlock}"/>
+                                            Style="{StaticResource FeatureInPartInRawPartList_TextBlock}"/>
                               </Grid>
                            </Grid>
                            <CheckBox Grid.Column="2"
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListV.xaml
index 844ff417..4083cc85 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListV.xaml
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListV.xaml
@@ -16,7 +16,7 @@
                               AlternationCount="2"
                               ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
                               CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
-                              Style="{StaticResource DataGrid_OnlyProd}">
+                              Style="{StaticResource Optimizer_DataGrid}">
 
       <DataGrid.InputBindings>
          <KeyBinding Key="Delete" Command="{Binding Tag.SelFeatureVM.DeleteFeature_Command,
@@ -27,13 +27,13 @@
             <DataGridTemplateColumn.HeaderTemplate>
                <DataTemplate>
                   <CheckBox IsChecked="{Binding Path=Tag.bDOALL, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureInPartInRawPartListV}}}"
-                            Style="{StaticResource OnlyProdFeatureInPartInRawPartList_CheckBox}"/>
+                            Style="{StaticResource FeatureInPartInRawPartList_CheckBox}"/>
                </DataTemplate>
             </DataGridTemplateColumn.HeaderTemplate>
             <DataGridTemplateColumn.CellTemplate>
                <DataTemplate>
                   <CheckBox IsChecked="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
-                            Style="{StaticResource OnlyProdFeatureInPartInRawPartList_CheckBox}"/>
+                            Style="{StaticResource FeatureInPartInRawPartList_CheckBox}"/>
                </DataTemplate>
             </DataGridTemplateColumn.CellTemplate>
          </DataGridTemplateColumn>
@@ -59,7 +59,7 @@
                         <TextBlock Grid.Row="1"
                                    Text="{Binding CALC_ERR_Letter}"
                                    Foreground="{Binding CALC_ERR_Foreground}"
-                                   Style="{StaticResource OnlyProdFeatureInPartInRawPartList_TextBlock}"/>
+                                   Style="{StaticResource FeatureInPartInRawPartList_TextBlock}"/>
                      </Grid>
                   </Grid>
                </DataTemplate>
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/PParameterListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/PParameterListV.xaml
index 077f41a9..e02088ab 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/PParameterListV.xaml
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/PParameterListV.xaml
@@ -24,7 +24,7 @@
                                  AlternationCount="2"
                                  ColumnHeaderStyle="{StaticResource PParam_DataGridColumnHeader}"
                                  CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
-                                 Style="{StaticResource DataGrid_OnlyProd}">
+                                 Style="{StaticResource Optimizer_DataGrid}">
          <DataGrid.RowStyle>
             <Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
                <EventSetter Event="PreviewMouseDown" Handler="PParameterList_PreviewMouseDown"/>
@@ -71,7 +71,7 @@
                               <TextBlock Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}"
                                          Style="{StaticResource Prod_TextBlock}">
                                  <TextBlock.ToolTip>
-                                    <ToolTip Style="{StaticResource OnlyProd_ToolTip}">
+                                    <ToolTip Style="{StaticResource PParameters_ToolTip}">
                                        <ToolTip.Content>
                                           <TextBlock Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}"
                                                      Style="{StaticResource Prod_TextBlock}"/>
@@ -133,7 +133,7 @@
       <StackPanel Grid.Row="1"
                   Grid.ColumnSpan="2"
                   HorizontalAlignment="Right"
-                  Style="{StaticResource OnlyProdPartManager_StackPanel}">
+                  Style="{StaticResource PartManager_StackPanel}">
          <Button Command="{Binding Ok_Command}"
                  ToolTip="{Binding Ok_Msg}"
                  Style="{StaticResource ToolBarViewPanel_Button}">
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml
index 7567b5fb..2d7a62f5 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml
@@ -18,7 +18,7 @@
                               ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
                               CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
                               RowBackground="{StaticResource BeamWall_BLackSqueeze}"
-                              Style="{StaticResource DataGrid_OnlyProd}">
+                              Style="{StaticResource Optimizer_DataGrid}">
       <DataGrid.RowStyle>
          <Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
             <Setter Property="Background" Value="{Binding Background}"/>
@@ -59,7 +59,7 @@
                      </Grid.ColumnDefinitions>
                      <TextBlock Text="↓"
                                 Visibility="{Binding CALC_FALL_Visibility}"
-                                Style="{StaticResource OnlyProdRawPartList_TextBlock}"/>
+                                Style="{StaticResource RawPartList_TextBlock}"/>
                      <Border Grid.Column="1"
                              Width="{Binding ActualHeight, RelativeSource={RelativeSource self}}"
                              Background="{Binding Calc_Background}"/>
@@ -74,7 +74,7 @@
                         <TextBlock Grid.Row="1"
                                    Text="{Binding CALC_ERR_Letter}"
                                    Foreground="{Binding CALC_ERR_Foreground}"
-                                   Style="{StaticResource OnlyProdFeatureInPartInRawPartList_TextBlock}"/>
+                                   Style="{StaticResource FeatureInPartInRawPartList_TextBlock}"/>
                      </Grid>
                   </Grid>
                </DataTemplate>
@@ -250,19 +250,19 @@
                      <Popup AllowsTransparency="True" 
                             PopupAnimation="Scroll" 
                             StaysOpen="False">
-                        <StackPanel Style="{StaticResource OnlyProdBTLPartManager_StackPanel}">
+                        <StackPanel Style="{StaticResource BTLPartManager_StackPanel}">
                            <!--COPY - Copia-->
                            <Button Command="{Binding CopyRawPart_Command}"
                                    ToolTip="{Binding CopyRawPart_ToolTip}"
                                    Click="ClosePopUp_Click"
-                                   Style="{StaticResource OnlyProdLeftPanel_Button}">
+                                   Style="{StaticResource LP_Button}">
                               <Image Source="/Resources/TopPanel/CopyRawPart.png" Stretch="Uniform"/>
                            </Button>
                            <!--DELETE - Elimina-->
                            <Button Command="{Binding RemoveRawPart_Command}"
                                    ToolTip="{Binding RemoveRawPart_ToolTip}"
                                    Click="ClosePopUp_Click"
-                                   Style="{StaticResource OnlyProdLeftPanel_Button}">
+                                   Style="{StaticResource LP_Button}">
                               <Image Source="/Resources/NewPage/Remove.png" Stretch="Uniform"/>
                            </Button>
                            <!--CAM - CAM-->
@@ -275,14 +275,14 @@
                            <Button Command="{Binding ReOrderPart_Command}"
                                    ToolTip="{Binding ReOrderPart_ToolTip}"
                                    Click="ClosePopUp_Click"
-                                   Style="{StaticResource OnlyProdLeftPanel_Button}">
+                                   Style="{StaticResource LP_Button}">
                               <Image Source="/Resources/TopPanel/ReOrderPart.png" Stretch="Uniform"/>
                            </Button>
                            <!--RESET - Reset-->
                            <Button Command="{Binding ResetCalc_Command}"
                                    ToolTip="{Binding ResetCalc_ToolTip}"
                                    Click="ClosePopUp_Click"
-                                   Style="{StaticResource OnlyProdLeftPanel_Button}">
+                                   Style="{StaticResource LP_Button}">
                               <Image Source="/Resources/CALCPanel/ResetCalc.png" Stretch="Uniform"/>
                            </Button>
                         </StackPanel>
@@ -315,7 +315,7 @@
                                           ScrollViewer.HorizontalScrollBarVisibility="Hidden"
                                           Width="860"
                                           CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
-                                          Style="{StaticResource DataGrid_OnlyProd}">
+                                          Style="{StaticResource Optimizer_DataGrid}">
                   <DataGrid.RowStyle>
                      <Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
                         <Setter Property="Background" Value="{Binding Background}"/>
diff --git a/EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelV.xaml b/EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelV.xaml
index 694663ca..b1466a1f 100644
--- a/EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelV.xaml
+++ b/EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelV.xaml
@@ -19,7 +19,7 @@
       <ColumnDefinition Width="1*"/>
    </Grid.ColumnDefinitions>
 
-   <Border Grid.RowSpan="2" Grid.ColumnSpan="2" Style="{StaticResource OnlyProdPage_Border}"/>
+   <Border Grid.RowSpan="2" Grid.ColumnSpan="2" Style="{StaticResource Optimizer_Border}"/>
 
    <Grid Margin="4,1,20,0">
       <Grid.ColumnDefinitions>
@@ -35,21 +35,21 @@
       <Button ToolTip="{Binding VerifyAll_ToolTip}" VerticalAlignment="Top"
               Command="{Binding VerifyAll_Command}"
               IsEnabled="{Binding VerifyAll_IsEnabled}"
-              Style="{StaticResource OnlyProdLeftPanel_Button}">
+              Style="{StaticResource LP_Button}">
          <Image Source="/Resources/CALCPanel/VerifyAll.png" Stretch="Uniform"/>
       </Button>
       <Button Grid.Column="1"
               Command="{Binding ResetCalc_Command}" VerticalAlignment="Top"
               ToolTip="{Binding ResetCalc_ToolTip}"
               IsEnabled="{Binding CALCPanel_IsEnabled}"
-              Style="{StaticResource OnlyProdLeftPanel_Button}">
+              Style="{StaticResource LP_Button}">
          <Image Source="/Resources/CALCPanel/ResetCalc.png" Stretch="Uniform"/>
       </Button>
       <Button Grid.Column="2"
               Name="FilterAllBtn" VerticalAlignment="Top"
               ToolTip="{Binding FilterAll_ToolTip}"
               Command="{Binding ShowPopUpFilterBtnCommand}"
-              Style="{StaticResource OnlyProdLeftPanel_Button}">
+              Style="{StaticResource LP_Button}">
          <Image Source="/Resources/LeftPanel/All_Filter.png" Stretch="Uniform"/>
       </Button>
       <Popup IsOpen="{Binding IsFilterBtnOpen}"
@@ -64,7 +64,7 @@
                <ListBox ItemsSource="{Binding Tag.SectionList, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
                         SelectedItem="{Binding Tag.SelSection, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
                         DisplayMemberPath="sSectionXMaterial"
-                        Style="{StaticResource OnlyProdLeftPanel_ListBox}"
+                        Style="{StaticResource LeftPanel_ListBox}"
                         ItemContainerStyle="{StaticResource AlternationIndex_ListBoxItem}"/>
             </Expander>
             <Expander Grid.Column="1" 
@@ -72,7 +72,7 @@
                       Margin="-2,0,0,0">
                <ListBox ItemsSource="{Binding Tag.GroupList, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
                         SelectedItem="{Binding Tag.SelGroup, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
-                        Style="{StaticResource OnlyProdLeftPanel_ListBox}"
+                        Style="{StaticResource LeftPanel_ListBox}"
                         ItemContainerStyle="{StaticResource AlternationIndex_ListBoxItem}"/>
             </Expander>
             <Expander Grid.Column="2" 
@@ -80,7 +80,7 @@
                       Margin="-2,0,0,0">
                <ListBox ItemsSource="{Binding Tag.SubGroupList, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
                         SelectedItem="{Binding Tag.SelSubGroup, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
-                        Style="{StaticResource OnlyProdLeftPanel_ListBox}"
+                        Style="{StaticResource LeftPanel_ListBox}"
                         ItemContainerStyle="{StaticResource AlternationIndex_ListBoxItem}"/>
             </Expander>
             <Expander Grid.Column="3" 
@@ -88,7 +88,7 @@
                       Margin="-2,0,0,0">
                <ListBox ItemsSource="{Binding Tag.SearchParamList, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
                         SelectedItem="{Binding Tag.SelSearchParam, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"             
-                        Style="{StaticResource OnlyProdLeftPanel_ListBox}"
+                        Style="{StaticResource LeftPanel_ListBox}"
                         ItemContainerStyle="{StaticResource AlternationIndex_ListBoxItem}"/>
             </Expander>
             <Expander Grid.Column="4" 
@@ -106,7 +106,7 @@
          <ListBox ItemsSource="{Binding Tag.SectionList, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
                   SelectedItem="{Binding Tag.SelSection, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
                   DisplayMemberPath="sSectionXMaterial"
-                  Style="{StaticResource OnlyProdLeftPanel_ListBox}"
+                  Style="{StaticResource LeftPanel_ListBox}"
                   ItemContainerStyle="{StaticResource AlternationIndex_ListBoxItem}"/>
       </Expander>
       <EgtWPFLib5:EgtTextBox Grid.Column="4"
@@ -119,14 +119,14 @@
               Command="{Binding RotateAll_Command}"
               ToolTip="{Binding RotateAll_ToolTip}"
               IsEnabled="{Binding RotateAll_IsEnabled}"
-              Style="{StaticResource OnlyProdLeftPanel_Button}">
+              Style="{StaticResource LP_Button}">
          <Image Source="/Resources/NewPage/Rotate.png" Stretch="Uniform"/>
       </Button>
       <Button Grid.Column="6" Visibility="Collapsed"
               Command="{Binding InvertAll_Command}"
               ToolTip="{Binding InvertAll_ToolTip}"
               IsEnabled="{Binding RotateAll_IsEnabled}"
-              Style="{StaticResource OnlyProdLeftPanel_Button}">
+              Style="{StaticResource LP_Button}">
          <Image Source="/Resources/NewPage/Inversion.png" Stretch="Uniform"/>
       </Button>
       <Button Grid.Column="7" Visibility="Collapsed"
@@ -134,7 +134,7 @@
               ToolTip="{Binding MultipleModify_ToolTip}"
               IsEnabled="{Binding RotateAll_IsEnabled}"
               HorizontalAlignment="Right"
-              Style="{StaticResource OnlyProdLeftPanel_Button}">
+              Style="{StaticResource LP_Button}">
          <Image Source="/Resources/CALCPanel/Edit.png" Stretch="Uniform"/>
       </Button>
    </Grid>
diff --git a/EgtBEAMWALL.Optimizer/MachinePanel/MachinePanelV.xaml b/EgtBEAMWALL.Optimizer/MachinePanel/MachinePanelV.xaml
index f7d74a3a..d3f56377 100644
--- a/EgtBEAMWALL.Optimizer/MachinePanel/MachinePanelV.xaml
+++ b/EgtBEAMWALL.Optimizer/MachinePanel/MachinePanelV.xaml
@@ -27,14 +27,14 @@
          <TextBlock Text="{Binding CurrentMachineMsg}" 
                     Margin="10,0,5,0"
                     Foreground="{StaticResource BeamWall_Corduroy}"
-                    Style="{StaticResource OnlyProdStatisticTimePanel_TextBlock}"/>
+                    Style="{StaticResource StatisticTimePanel_TextBlock}"/>
          <TextBlock Grid.Column="1"
                     Text="{Binding SelMachineName, UpdateSourceTrigger=PropertyChanged}" 
                     VerticalAlignment="Center"  
                     FontWeight="Bold"
                     Margin="10,0,5,0"
                     Foreground="{StaticResource BeamWall_Corduroy}"
-                    Style="{StaticResource OnlyProdStatisticTimePanel_TextBlock}"/>
+                    Style="{StaticResource StatisticTimePanel_TextBlock}"/>
          <Button Grid.Column="2"
                  ToolTip="{Binding ChooseMachine_ToolTip}"
                  Command="{Binding ChooseMachine_Command}"
@@ -50,11 +50,11 @@
             <ComboBox x:Name="SelMachineCombo"
                       ItemsSource="{Binding Path=MachineList}" DisplayMemberPath="Name"
                       SelectedItem="{Binding Path=SelectedMachine}" SelectedValuePath="Name"
-                      Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
+                      Style="{StaticResource CalcPanel_ComboBox}"/>
             <Button Grid.Column="1"
                     Content="OK"
                     Command="{Binding Ok_Command}"
-                    Style="{StaticResource ToolBarOnlyProdCalcPanel_Button}"/>
+                    Style="{StaticResource CalcPanel_Button}"/>
          </Grid>
       </Grid>
       <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
@@ -62,30 +62,30 @@
                       ToolTip="{Binding ParameterMachineMsg}"
                       IsChecked="{Binding StrategyManagerIsChecked}"
                       Margin="0,0,50,0"
-                      Style="{StaticResource OnlyProdMainMenu_ToggleButton}" Width="140"/>
+                      Style="{StaticResource MainMenu_ToggleButton}" Width="140"/>
          <Button Content="{Binding ToolDBMsg}"
                  ToolTip="{Binding ToolDBToolTip}"
                  Command="{Binding ToolDbCommand}"
                  Click="Button_Click"
-                 Style="{StaticResource GeneralConfigurationToolBar_TextButton}"/>
+                 Style="{StaticResource GeneralConfiguration_Button}"/>
          <Button Content="{Binding SetUpMsg}"
                  Command="{Binding SetUpCommand}" 
                  Click="Button_Click"
                  ToolTip="{Binding SetUpToolTip}"
-                 Style="{StaticResource GeneralConfigurationToolBar_TextButton}"
+                 Style="{StaticResource GeneralConfiguration_Button}"
                  Visibility="{Binding SetUp_Visibility}"/>
          <RadioButton Content="{Binding MachineParamsMsg}"
                       ToolTip="{Binding MachineParamsMsg}"
                       IsChecked="{Binding MachineParamsIsChecked}"
                       Margin="5,0,10,0"
-                      Style="{StaticResource OnlyProdMainMenu_ToggleButton}" Width="155"/>
+                      Style="{StaticResource MainMenu_ToggleButton}" Width="155"/>
       </StackPanel>
    </Grid>
 
    <TabControl Grid.Row="1"
                BorderThickness="0"
                SelectedIndex="{Binding nSelTab}"
-               Style="{StaticResource OnlyProd_TabControl}">
+               Style="{StaticResource Optimizer_TabControl}">
       <TabControl.ItemContainerStyle>
          <Style TargetType="{x:Type TabItem}">
             <Setter Property="Visibility" Value="Collapsed"/>
diff --git a/EgtBEAMWALL.Optimizer/MacroFeatureWnd/MacroFeatureWnd.xaml b/EgtBEAMWALL.Optimizer/MacroFeatureWnd/MacroFeatureWnd.xaml
index 6387bc2f..2d705d55 100644
--- a/EgtBEAMWALL.Optimizer/MacroFeatureWnd/MacroFeatureWnd.xaml
+++ b/EgtBEAMWALL.Optimizer/MacroFeatureWnd/MacroFeatureWnd.xaml
@@ -47,10 +47,10 @@
          <Button Content="Ok"
                  Command="{Binding Ok_Command}"
                  IsDefault="True"
-                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
          <Button Content="Cancel"
                  IsCancel="True"
-                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
       </UniformGrid>
    </Grid>
 </EgtBEAMWALLCORE:OptimizerWindow>
diff --git a/EgtBEAMWALL.Optimizer/MainMenu/MainMenuV.xaml b/EgtBEAMWALL.Optimizer/MainMenu/MainMenuV.xaml
index 3c591b4f..81ae0061 100644
--- a/EgtBEAMWALL.Optimizer/MainMenu/MainMenuV.xaml
+++ b/EgtBEAMWALL.Optimizer/MainMenu/MainMenuV.xaml
@@ -19,24 +19,24 @@
 
    <RadioButton Content="{Binding OnlyProdPage_Msg}"
                 IsChecked="{Binding OnlyProdPage_IsChecked}"
-                Style="{StaticResource OnlyProdMainMenu_ToggleButton}"
+                Style="{StaticResource MainMenu_ToggleButton}"
                 Width="120"/>
 
    <RadioButton Grid.Column="1"
                 Content="{Binding Configuration_Msg}"
                 IsChecked="{Binding Config_IsChecked}"
-                Style="{StaticResource OnlyProdMainMenu_ToggleButton}"/>
+                Style="{StaticResource MainMenu_ToggleButton}"/>
 
    <Button Grid.Column="2"
            Content="{Binding Supervisor_Msg}"
            Command="{Binding Supervisor_Command}"
            Visibility="{Binding Supervisor_Visibility}"
-           Style="{StaticResource OnlyProdMainMenu_Button}"/>
+           Style="{StaticResource MainMenu_Button}"/>
 
    <Button Grid.Column="3"
            Command="{Binding SendFeedbackCommand}"
            ToolTip="{Binding SendFeedbackToolTip}"
-           Style="{StaticResource OnlyProdMainMenu_Button}"
+           Style="{StaticResource MainMenu_Button}"
            IsEnabled="{Binding SendFeedbackIsEnabled}"
            Width="40">
       <Image Source="/Resources/MainMenu/Send.png" Stretch="Uniform"/>
@@ -47,7 +47,7 @@
                 ToolTip="{Binding ConfigurationProgramToolTip}"
                 Width="40"
                 Background="Transparent"
-                Style="{StaticResource OnlyProdMainMenu_ToggleButton}">
+                Style="{StaticResource MainMenu_ToggleButton}">
       <Image Source="{Binding sConfigurationImagePath}" Height="40" Margin="0,-6,0,0" Stretch="Uniform"/>
    </RadioButton>
 
diff --git a/EgtBEAMWALL.Optimizer/MovePartInRawPartWnd/MovePartInRawPartWndV.xaml b/EgtBEAMWALL.Optimizer/MovePartInRawPartWnd/MovePartInRawPartWndV.xaml
index bd75d10b..5af78957 100644
--- a/EgtBEAMWALL.Optimizer/MovePartInRawPartWnd/MovePartInRawPartWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/MovePartInRawPartWnd/MovePartInRawPartWndV.xaml
@@ -17,7 +17,7 @@
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
 
-      <Grid Style="{StaticResource OnlyProdAddPart_Grid}">
+      <Grid Style="{StaticResource AddPart_Grid}">
          <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
@@ -33,12 +33,12 @@
 
          <RadioButton Grid.Row="1" Grid.Column="0"
                       IsChecked="{Binding LeftIsChecked}"
-                      Style="{StaticResource OnlyProdToolBar_ToggleButton}">
+                      Style="{StaticResource ToolBar_ToggleButton}">
             <Image Source="/Resources/MovePartInRawPart/MoveLeftParts.png" Stretch="Uniform"/>
          </RadioButton>
          <RadioButton Grid.Row="1" Grid.Column="1"
                       IsChecked="{Binding RightIsChecked}" 
-                      Style="{StaticResource OnlyProdToolBar_ToggleButton}">
+                      Style="{StaticResource ToolBar_ToggleButton}">
             <Image Source="/Resources/MovePartInRawPart/MoveRightParts.png" Stretch="Uniform"/>
          </RadioButton>
       </Grid>
@@ -66,11 +66,11 @@
                  Command="{Binding Ok_Command}"
                  IsDefault="True"
                  Margin="0,0,5,0"
-                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
          <Button Grid.Column="3"
                  Content="Cancel"
                  IsCancel="True"
-                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
       </UniformGrid>
    </Grid>
 </EgtBEAMWALLCORE:OptimizerWindow>
\ No newline at end of file
diff --git a/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb
index fdfed442..2e5a83b5 100644
--- a/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb	
+++ b/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb	
@@ -67,5 +67,5 @@ Imports System.Windows
 '      Revision
 '
 
-<Assembly: AssemblyVersion("2.7.11.4")>
-<Assembly: AssemblyFileVersion("2.7.11.4")>
+<Assembly: AssemblyVersion("2.7.11.5")>
+<Assembly: AssemblyFileVersion("2.7.11.5")>
diff --git a/EgtBEAMWALL.Optimizer/NestingRunningWnd/NestingRunningWndV.xaml b/EgtBEAMWALL.Optimizer/NestingRunningWnd/NestingRunningWndV.xaml
index a78912c2..14ce37c7 100644
--- a/EgtBEAMWALL.Optimizer/NestingRunningWnd/NestingRunningWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/NestingRunningWnd/NestingRunningWndV.xaml
@@ -24,10 +24,10 @@
       </Grid.RowDefinitions>
       <TextBlock Grid.Row="1"
                  Text="{Binding Section_Msg}"
-                 Style="{StaticResource OnlyProdNestingRunningWndV_TextBlock}"/>
+                 Style="{StaticResource NestingRunningWndV_TextBlock}"/>
       <TextBlock Grid.Row="2"
                  Text="{Binding Nesting_Msg}"
-                 Style="{StaticResource OnlyProdNestingRunningWndV_TextBlock}"/>
+                 Style="{StaticResource NestingRunningWndV_TextBlock}"/>
       <ProgressBar Grid.Row="4"
                    Value="{Binding CurrProgress_Value}"
                    Style="{StaticResource OnlyProdNestingRunningWndV_ProgressBar}"/>
@@ -36,13 +36,13 @@
                    Style="{StaticResource OnlyProdNestingRunningWndV_ProgressBar}"/>
       <TextBlock Grid.Row="8"
                  Text="{Binding TotProgress_Msg}"
-                 Style="{StaticResource OnlyProdNestingRunningWndV_TextBlock}"/>
+                 Style="{StaticResource NestingRunningWndV_TextBlock}"/>
       <Button Grid.Row="10" 
               Content="Cancel"
               IsDefault="False"
               IsCancel="True"
               Command="{Binding Cancel_Command}"
-              Style="{StaticResource OnlyProdNestingRunningWndV_Button}"/>
+              Style="{StaticResource NestingRunningWndV_Button}"/>
    </Grid>
 
 </EgtBEAMWALLCORE:OptimizerWindow>
diff --git a/EgtBEAMWALL.Optimizer/OptimizePanel/OptimizePanelV.xaml b/EgtBEAMWALL.Optimizer/OptimizePanel/OptimizePanelV.xaml
index 9fc98034..9e92ac94 100644
--- a/EgtBEAMWALL.Optimizer/OptimizePanel/OptimizePanelV.xaml
+++ b/EgtBEAMWALL.Optimizer/OptimizePanel/OptimizePanelV.xaml
@@ -1,16 +1,16 @@
 <StackPanel x:Class="OptimizePanelV"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            Style="{StaticResource OnlyProdBTLPartManager_StackPanel}">
+            Style="{StaticResource BTLPartManager_StackPanel}">
 
    <Button Content="{Binding Optimize_Msg}"
            Command="{Binding Optimize_Command}"
            IsEnabled="{Binding Optimize_IsEnabled}"
-           Style="{StaticResource ToolBarOptimize_Button}"/>
+           Style="{StaticResource Optimize_Button}"/>
 
    <Button ToolTip="{Binding Warehouse_ToolTip}"
            Command="{Binding Warehouse_Command}"
-           Style="{StaticResource ToolBarWarehouse_Button}">
+           Style="{StaticResource Warehouse_Button}">
       <Image Source="/Resources/OptimizePanel/Warehouse.png" Stretch="Uniform"/>
    </Button>
    
diff --git a/EgtBEAMWALL.Optimizer/PartManager/PartManagerV.xaml b/EgtBEAMWALL.Optimizer/PartManager/PartManagerV.xaml
index 2aa4e46c..e1f29765 100644
--- a/EgtBEAMWALL.Optimizer/PartManager/PartManagerV.xaml
+++ b/EgtBEAMWALL.Optimizer/PartManager/PartManagerV.xaml
@@ -4,7 +4,7 @@
       xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
       xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
       IsEnabled="{Binding PartManager_IsEnabled}"
-      Style="{StaticResource OnlyProdPartManager_Grid}">
+      Style="{StaticResource PartManager_Grid}">
 
    <Grid.RowDefinitions>
       <RowDefinition Height="0.2*"/>
@@ -15,7 +15,7 @@
       <ColumnDefinition Width="Auto"/>
       <ColumnDefinition Width="Auto"/>
    </Grid.ColumnDefinitions>
-   <Border Grid.RowSpan="2" Grid.ColumnSpan="3" Style="{StaticResource OnlyProdPage_Border}"/>
+   <Border Grid.RowSpan="2" Grid.ColumnSpan="3" Style="{StaticResource Optimizer_Border}"/>
    <StackPanel Margin="10,5,10,5" Orientation="Horizontal">
       <TextBlock Text="W" Margin="0,0,5,0"
                  Style="{StaticResource PartManager_TextBlock}"/>
diff --git a/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerV.xaml b/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerV.xaml
index 6f9fdc89..0849f68e 100644
--- a/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerV.xaml
+++ b/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerV.xaml
@@ -2,12 +2,12 @@
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             IsEnabled="{Binding OnlyProdManager_IsEnabled}"
-            Style="{StaticResource OnlyProdPartManager_StackPanel}">
+            Style="{StaticResource PartManager_StackPanel}">
 
    <!--Barra superiore dei comandi-->
    <Button Command="{Binding ShowPopUpStartBtnCommand}"
            Name="StartBtn" Margin="0,0,2.5,0"
-           Style="{StaticResource ToolBarOnlyProdManagerNew_Button}">
+           Style="{StaticResource ProdManagerNew_Button}">
       <Image Source="/Resources/NewPage/play.png" Stretch="Uniform"/>
    </Button>
    <Popup IsOpen="{Binding IsStartBtnOpen}"
@@ -18,14 +18,14 @@
       <StackPanel Orientation="Vertical">
          <Button Command="{Binding New_Command}"
                  ToolTip="{Binding NewToolTip}"
-                 Style="{StaticResource ToolBarOnlyProdManagerNew_Button}">
+                 Style="{StaticResource ProdManagerNew_Button}">
             <Image Source="/Resources/ProjectManager/New.png" Stretch="Uniform"/>
          </Button>
          <Button Command="{Binding OpenCommand}"
                  ToolTip="{Binding OpenToolTip}"
                  ContextMenuService.Placement="Bottom"
                  Tag="{Binding}"
-                 Style="{StaticResource ToolBarOnlyProdManager_Button}">
+                 Style="{StaticResource ProdManager_Button}">
             <Button.ContextMenu>
                <ContextMenu ItemsSource="{Binding MruFileNames}">
                   <ContextMenu.Resources>
@@ -41,12 +41,12 @@
          </Button>
          <Button Command="{Binding ImportBTL_Command}"
                  ToolTip="{Binding ImportBTL_ToolTip}"
-                 Style="{StaticResource ToolBarOnlyProdManager_Button}">
+                 Style="{StaticResource ProdManager_Button}">
             <Image Source="/Resources/ProjectManager/ImportBTL.png" Stretch="Uniform"/>
          </Button>
          <Button Command="{Binding ImportProject_Command}"
                  ToolTip="{Binding ImportProject_ToolTip}"
-                 Style="{StaticResource ToolBarOnlyProdManager_Button}">
+                 Style="{StaticResource ProdManager_Button}">
             <Image Source="/Resources/ProjectManager/ImportProject.png" Stretch="Uniform"/>
          </Button>
       </StackPanel>
@@ -54,7 +54,7 @@
 
    <Button Command="{Binding ShowPopUpSaveBtnCommand}"
            Name="SaveBtn" Margin="0,0,2.5,0"
-           Style="{StaticResource ToolBarOnlyProdManagerNew_Button}">
+           Style="{StaticResource ProdManagerNew_Button}">
       <Image Source="/Resources/NewPage/diskette.png" Stretch="Uniform"/>
    </Button>
    <Popup IsOpen="{Binding IsSaveBtnOpen}"
@@ -65,12 +65,12 @@
       <StackPanel Orientation="Vertical">
          <Button Command="{Binding SaveCommand}"
               ToolTip="{Binding SaveToolTip}"
-              Style="{StaticResource ToolBarOnlyProdManager_Button}">
+              Style="{StaticResource ProdManager_Button}">
             <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
          </Button>
          <Button Command="{Binding ExportProject_Command}"
               ToolTip="{Binding ExportProject_ToolTip}"
-              Style="{StaticResource ToolBarOnlyProdManager_Button}">
+              Style="{StaticResource ProdManager_Button}">
             <Image Source="/Resources/ProjectManager/ExportProject.png" Stretch="Uniform"/>
          </Button>
       </StackPanel>
@@ -78,7 +78,7 @@
 
    <Button Command="{Binding ShowPopUpBtlBtnCommand}"
            Name="BtlBtn"
-           Style="{StaticResource ToolBarOnlyProdManagerNew_Button}">
+           Style="{StaticResource ProdManagerNew_Button}">
       <Image Source="/Resources/NewPage/add.png" Stretch="Uniform"/>
    </Button>
    <Popup IsOpen="{Binding IsBtlBtnOpen}"
@@ -90,7 +90,7 @@
          <Button Command="{Binding AddProj_Command}"
               ToolTip="{Binding AddProj_ToolTip}"
               Visibility="{Binding AddProj_Visibility}"
-              Style="{StaticResource ToolBarOnlyProdManager_Button}">
+              Style="{StaticResource ProdManager_Button}">
             <Image Source="/Resources/ProjectManager/AddProj.png" Stretch="Uniform"/>
          </Button>
       </StackPanel>
diff --git a/EgtBEAMWALL.Optimizer/Project/ProjectV.xaml b/EgtBEAMWALL.Optimizer/Project/ProjectV.xaml
index 5a18bd3c..0546b9b5 100644
--- a/EgtBEAMWALL.Optimizer/Project/ProjectV.xaml
+++ b/EgtBEAMWALL.Optimizer/Project/ProjectV.xaml
@@ -108,7 +108,7 @@
                      <ColumnDefinition Width="Auto"/>
                   </Grid.ColumnDefinitions>
 
-                  <Border Grid.RowSpan="3" Grid.ColumnSpan="3" Style="{StaticResource OnlyProdPage_Border}"/>
+                  <Border Grid.RowSpan="3" Grid.ColumnSpan="3" Style="{StaticResource Optimizer_Border}"/>
 
                   <OPTIMIZER:PartManagerV Grid.Row="1" DataContext="{StaticResource PartManagerVM}"
                                           Tag="{Binding DataContext.BTLStructureVM.SelBTLPart, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"/>
@@ -131,7 +131,7 @@
                      <UniformGrid Rows="2" Grid.Row="1" Grid.Column="1" Margin="0,0,5,0">
                         <CheckBox IsChecked="{Binding bSaveGeneralParameters, UpdateSourceTrigger=PropertyChanged}" 
                                   Margin="5,0,0,0" VerticalAlignment="Top" HorizontalAlignment="Center"
-                                  Style="{StaticResource OnlyProdFeatureInPartInRawPartList_CheckBox}"/>
+                                  Style="{StaticResource FeatureInPartInRawPartList_CheckBox}"/>
                         <Button Command="{Binding Ok_Command}" VerticalAlignment="Bottom" Margin="0,0,0,5"
                                 ToolTip="{Binding SaveAsToolTip}"
                                 Style="{StaticResource SaveStrategy_Button}">
@@ -140,7 +140,7 @@
                      </UniformGrid>
                   </Grid>
 
-                  <Border Grid.ColumnSpan="2" Margin="10,5,10,5" Background="{StaticResource BeamWall_Glacier}" Style="{StaticResource OnlyProdPage_Border}">
+                  <Border Grid.ColumnSpan="2" Margin="10,5,10,5" Background="{StaticResource BeamWall_Glacier}" Style="{StaticResource Optimizer_Border}">
                      <TextBlock Grid.ColumnSpan="2" 
                                 Text="{Binding BTLStructureVM.SelBTLPart.sNAM}" 
                                 VerticalAlignment="Center"
@@ -151,7 +151,7 @@
                   <Button Grid.Column="2" 
                           Command="{Binding Parameter_Command}"
                           ToolTip="{Binding Parameters_ToolTip}" Margin="10"
-                          Style="{StaticResource OnlyProdLeftPanel_Button}">
+                          Style="{StaticResource LP_Button}">
                      <Image Source="/Resources/InstrumentPanel/Analyze.png" Stretch="Uniform"/>
                   </Button>
 
@@ -183,7 +183,7 @@
                      <RowDefinition Height="1*"/>
                   </Grid.RowDefinitions>
 
-                  <Border Grid.RowSpan="2" Grid.ColumnSpan="2" Style="{StaticResource OnlyProdPage_Border}"/>
+                  <Border Grid.RowSpan="2" Grid.ColumnSpan="2" Style="{StaticResource Optimizer_Border}"/>
 
                   <OPTIMIZER:FeatureManagerV DataContext="{StaticResource FeatureManagerVM}"
                                              Tag="{Binding DataContext.BTLStructureVM.SelBTLPart.SelBTLFeatureVM, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"/>
@@ -230,7 +230,7 @@
                      <ColumnDefinition Width="1*"/>
                      <ColumnDefinition Width="Auto"/>
                   </Grid.ColumnDefinitions>
-                  <Border Grid.ColumnSpan="3" Style="{StaticResource OnlyProdPage_Border}"
+                  <Border Grid.ColumnSpan="3" Style="{StaticResource Optimizer_Border}"
                           Visibility="{Binding DataContext.FeatureList_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"/>
                   <OPTIMIZER:FeatureInPartInRawPartListV DataContext="{StaticResource FeatureInPartInRawPartListVM}" Margin="5"
                                                          Tag="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.SelPart, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"
@@ -265,11 +265,11 @@
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
 
-         <Border Grid.ColumnSpan="2" Style="{StaticResource OnlyProdPage_Border}"/>
+         <Border Grid.ColumnSpan="2" Style="{StaticResource Optimizer_Border}"/>
 
          <WrapPanel Grid.Column="1" Margin="0,2,2,0"
                     Width="{Binding ActualWidth, ElementName=TOPTRAY}"
-                    Style="{StaticResource OnlyProdProject_WrapPanel}">
+                    Style="{StaticResource Project_WrapPanel}">
             <OPTIMIZER:InstrumentPanelV DataContext="{StaticResource InstrumentPanelVM}"/>
             <OPTIMIZER:ShowPanelV DataContext="{StaticResource ShowPanelVM}"/>
             <OPTIMIZER:ShowBeamPanelV DataContext="{StaticResource ShowBeamPanelVM}"
diff --git a/EgtBEAMWALL.Optimizer/ProjectTypeWnd/ProjectTypeWndV.xaml b/EgtBEAMWALL.Optimizer/ProjectTypeWnd/ProjectTypeWndV.xaml
index d789febb..e8facf3f 100644
--- a/EgtBEAMWALL.Optimizer/ProjectTypeWnd/ProjectTypeWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/ProjectTypeWnd/ProjectTypeWndV.xaml
@@ -11,7 +11,7 @@
 
    <StackPanel Margin="5,5,5,0">
       <Border Grid.Row="1"
-              Style="{StaticResource OnlyProdProjectTypeWndV_Border}">
+              Style="{StaticResource ProjectTypeWndV_Border}">
          <Grid Margin="5">
             <Grid.RowDefinitions>
                <RowDefinition Height="Auto"/>
@@ -20,7 +20,7 @@
             </Grid.RowDefinitions>
 
             <Grid Grid.Row="0"
-                  Style="{StaticResource OnlyProdProjectType_Grid}">
+                  Style="{StaticResource ProjectType_Grid}">
                <Grid.RowDefinitions>
                   <RowDefinition Height="Auto"/>
                   <RowDefinition Height="1*"/>
@@ -40,12 +40,12 @@
                          DisplayMemberPath="Name" 
                          SelectedItem="{Binding SelMachine}" 
                          SelectedValuePath="Name" 
-                         Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
+                         Style="{StaticResource CalcPanel_ComboBox}"/>
             </Grid>
 
             <Grid Grid.Row="1"
                   Visibility="{Binding IsBoth_Visibility}"
-                  Style="{StaticResource OnlyProdProjectType_Grid}">
+                  Style="{StaticResource ProjectType_Grid}">
                <Grid.RowDefinitions>
                   <RowDefinition Height="Auto"/>
                   <RowDefinition Height="1*"/>
@@ -63,7 +63,7 @@
                <ComboBox Grid.Row="2"
                          ItemsSource="{Binding TypeList}"
                          SelectedItem="{Binding nSelType}"
-                         Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
+                         Style="{StaticResource CalcPanel_ComboBox}"/>
             </Grid>
 
             <Grid Grid.Row="2" 
@@ -79,11 +79,11 @@
                        Content="Ok"
                        Command="{Binding Ok_Command}"
                        IsDefault="True"
-                       Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+                       Style="{StaticResource EgtWPFLib5_InputButton}"/>
                <Button Grid.Column="3"
                        Content="Cancel"
                        IsCancel="True"
-                       Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+                       Style="{StaticResource EgtWPFLib5_InputButton}"/>
             </Grid>
 
          </Grid>
diff --git a/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerV.xaml b/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerV.xaml
index 61cdad0b..a5c59ef2 100644
--- a/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerV.xaml
+++ b/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerV.xaml
@@ -11,41 +11,41 @@
            ToolTip="{Binding NewRawPart_ToolTip}"
            IsEnabled="{Binding BTLPartManager_IsEnabled}"
            Margin="5,1,0,1"
-           Style="{StaticResource OnlyProdLeftPanel_Button}">
+           Style="{StaticResource LP_Button}">
       <Image Source="/Resources/LeftPanel/NewRawPart.png" Stretch="Uniform"/>
    </Button>
    <StackPanel Grid.Column="1" 
-               Style="{StaticResource OnlyProdRawPartManagerAll_StackPanel}">
+               Style="{StaticResource RawPartManager_StackPanel}">
       <Button Command="{Binding ProduceAllRawPart_Command}"
               ToolTip="{Binding ProduceAllRawPart_ToolTip}"
               IsEnabled="{Binding RawPartManagerIsEnabled}"
               Visibility="{Binding ProduceRawPart_Visibility}"
-              Style="{StaticResource OnlyProdLeftPanel_Button}">
+              Style="{StaticResource LP_Button}">
          <Image Source="/Resources/TopPanel/ProduceAllRawPart.png" Stretch="Uniform"/>
       </Button>
       <Button ToolTip="{Binding VerifyAll_ToolTip}"
               Command="{Binding VerifyAll_Command}"
               IsEnabled="{Binding VerifyAll_IsEnabled}"
-              Style="{StaticResource OnlyProdLeftPanel_Button}">
+              Style="{StaticResource LP_Button}">
          <Image Source="/Resources/CALCPanel/VerifyAll.png" Stretch="Uniform"/>
       </Button>
       <Button Command="{Binding ResetCalc_Command}"
               ToolTip="{Binding ResetCalc_ToolTip}"
               IsEnabled="{Binding CALCPanel_IsEnabled}"
-              Style="{StaticResource OnlyProdLeftPanel_Button}">
+              Style="{StaticResource LP_Button}">
          <Image Source="/Resources/CALCPanel/ResetCalc.png" Stretch="Uniform"/>
       </Button>
       <Button Command="{Binding RemoveAllRawPart_Command}"
               ToolTip="{Binding RemoveAllRawPart_ToolTip}"
               IsEnabled="{Binding RawPartManagerIsEnabled}"
-              Style="{StaticResource OnlyProdLeftPanel_Button}">
+              Style="{StaticResource LP_Button}">
          <Image Source="/Resources/NewPage/Remove.png" Stretch="Uniform"/>
       </Button>
       <Button Command="{Binding MovePartInRawPart_Command}"
               ToolTip="{Binding MovePartInRawPart_ToolTip}"
               IsEnabled="{Binding RawPartManagerIsEnabled}"
               Visibility="{Binding MovePartInRawPart_Visibility}"
-              Style="{StaticResource OnlyProdLeftPanel_Button}">
+              Style="{StaticResource LP_Button}">
          <Image Source="/Resources/TopPanel/MovePartInRawPart.png" Stretch="Uniform"/>
       </Button>
    </StackPanel>
diff --git a/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerWndV.xaml b/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerWndV.xaml
index e7744a7c..c4bf6c96 100644
--- a/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerWndV.xaml
@@ -15,7 +15,7 @@
       <RowDefinition Height="1*"/>
    </Grid.RowDefinitions>
 
-   <Border Grid.RowSpan="2" Style="{StaticResource OnlyProdPage_Border}"/>
+   <Border Grid.RowSpan="2" Style="{StaticResource Optimizer_Border}"/>
 
    <OPTIMIZER:RawPartManagerV/>
 
diff --git a/EgtBEAMWALL.Optimizer/SceneShowBulding/SceneBuildingV.xaml b/EgtBEAMWALL.Optimizer/SceneShowBulding/SceneBuildingV.xaml
index e1533902..c769acb2 100644
--- a/EgtBEAMWALL.Optimizer/SceneShowBulding/SceneBuildingV.xaml
+++ b/EgtBEAMWALL.Optimizer/SceneShowBulding/SceneBuildingV.xaml
@@ -14,7 +14,7 @@
       <ItemsControl Grid.ColumnSpan="2" 
                     ItemsSource="{Binding ButtonBuildingList}"                     
                     Margin="0,5,5,5"
-                    Style="{StaticResource ItemsControl_ExpanderElementList}">
+                    Style="{StaticResource ExpanderElementList_ItemsControl}">
          <ItemsControl.ItemsPanel>
             <ItemsPanelTemplate>
                <StackPanel Orientation="Horizontal"/>
@@ -32,7 +32,7 @@
 
       <WrapPanel Grid.Row="1" Grid.Column="1" Margin="0,2,2,0"
                  Width="{Binding ActualWidth, ElementName=TOPTRAY}"
-                 Style="{StaticResource OnlyProdProject_WrapPanel}">
+                 Style="{StaticResource Project_WrapPanel}">
          <OPTIMIZER:ViewPanelV DataContext="{StaticResource ViewPanelShowBuildingVM}"/>
       </WrapPanel>
 
diff --git a/EgtBEAMWALL.Optimizer/ShowBeamPanel/ShowBeamPanelV.xaml b/EgtBEAMWALL.Optimizer/ShowBeamPanel/ShowBeamPanelV.xaml
index 61e2b9f5..db16bd39 100644
--- a/EgtBEAMWALL.Optimizer/ShowBeamPanel/ShowBeamPanelV.xaml
+++ b/EgtBEAMWALL.Optimizer/ShowBeamPanel/ShowBeamPanelV.xaml
@@ -1,7 +1,7 @@
 <StackPanel x:Class="ShowBeamPanelV"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            Style="{StaticResource OnlyProdBTLPartManager_StackPanel}">
+            Style="{StaticResource BTLPartManager_StackPanel}">
 
    <Button Command="{Binding ShowAll_Command}"
            IsEnabled="{Binding ShowAll_IsEnabled}"
@@ -13,12 +13,12 @@
    <ToggleButton IsChecked="{Binding ShowSolid_IsChecked}"
                  IsEnabled="{Binding ShowSolid_IsEnabled}"
                  ToolTip="{Binding ShowSolid_ToolTip}"
-                 Style="{StaticResource ToolBarOnlyProdPage_ToggleButton}">
+                 Style="{StaticResource ToolBar_ToggleButton}">
       <Image Source="/Resources/ShowBeamPanel/ShowSolid.png" Stretch="Uniform"/>
    </ToggleButton>
    <ToggleButton IsChecked="{Binding ShowBuilding_IsChecked}"
                  ToolTip="{Binding ShowBuilding_ToolTip}"
-                 Style="{StaticResource ToolBarOnlyProdPage_ToggleButton}">
+                 Style="{StaticResource ToolBar_ToggleButton}">
       <Image Source="/Resources/ShowBeamPanel/ShowBuilding.png" Stretch="Uniform"/>
    </ToggleButton>
 
diff --git a/EgtBEAMWALL.Optimizer/ShowPanel/ShowPanelV.xaml b/EgtBEAMWALL.Optimizer/ShowPanel/ShowPanelV.xaml
index 783c5880..65e3ddcd 100644
--- a/EgtBEAMWALL.Optimizer/ShowPanel/ShowPanelV.xaml
+++ b/EgtBEAMWALL.Optimizer/ShowPanel/ShowPanelV.xaml
@@ -1,21 +1,21 @@
 <StackPanel x:Class="ShowPanelV"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            Style="{StaticResource OnlyProdBTLPartManager_StackPanel}">
+            Style="{StaticResource BTLPartManager_StackPanel}">
 
    <RadioButton ToolTip="{Binding RenderingWFToolTip}"
                 IsChecked="{Binding WireframeIsChecked}"
-                Style="{StaticResource ToolBarOnlyProdPage_ToggleButton}">
+                Style="{StaticResource ToolBar_ToggleButton}">
       <Image Source="/Resources/ShowPanel/RenderingWF.png" Stretch="Uniform"/>
    </RadioButton>
    <RadioButton ToolTip="{Binding RenderingHLToolTip}"
                 IsChecked="{Binding HiddenLineIsChecked}"
-                Style="{StaticResource ToolBarOnlyProdPage_ToggleButton}">
+                Style="{StaticResource ToolBar_ToggleButton}">
       <Image Source="/Resources/ShowPanel/RenderingHL.png" Stretch="Uniform"/>
    </RadioButton>
    <RadioButton ToolTip="{Binding RenderingSHToolTip}"
                 IsChecked="{Binding ShadingIsChecked}"
-                Style="{StaticResource ToolBarOnlyProdPage_ToggleButton}">
+                Style="{StaticResource ToolBar_ToggleButton}">
       <Image Source="/Resources/ShowPanel/RenderingSH.png" Stretch="Uniform"/>
    </RadioButton>
 
diff --git a/EgtBEAMWALL.Optimizer/SpecialPanel/SpecialPanelV.xaml b/EgtBEAMWALL.Optimizer/SpecialPanel/SpecialPanelV.xaml
index 7ca7b666..49051ff7 100644
--- a/EgtBEAMWALL.Optimizer/SpecialPanel/SpecialPanelV.xaml
+++ b/EgtBEAMWALL.Optimizer/SpecialPanel/SpecialPanelV.xaml
@@ -1,7 +1,7 @@
 <StackPanel x:Class="SpecialPanelV"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            Style="{StaticResource OnlyProdPartManager_StackPanel}">
+            Style="{StaticResource PartManager_StackPanel}">
    
    <ItemsControl ItemsSource="{Binding ButtonList}">
       <ItemsControl.ItemsPanel>
diff --git a/EgtBEAMWALL.Optimizer/SplashScreen/SplashScreenV.xaml b/EgtBEAMWALL.Optimizer/SplashScreen/SplashScreenV.xaml
index 2a363a8a..058801ef 100644
--- a/EgtBEAMWALL.Optimizer/SplashScreen/SplashScreenV.xaml
+++ b/EgtBEAMWALL.Optimizer/SplashScreen/SplashScreenV.xaml
@@ -14,6 +14,6 @@
       <Image Source="/Resources/NewPage/LogoProvaStrategy.png" 
              Stretch="Uniform"/>
       <TextBlock x:Name="VersionTxBl"
-                 Style="{StaticResource SplashScreenV_TxBl}"/>
+                 Style="{StaticResource SplashScreenV_TextBlock}"/>
    </Grid>
 </Window>
diff --git a/EgtBEAMWALL.Optimizer/Statistics/OptimizerStatisticsV.xaml b/EgtBEAMWALL.Optimizer/Statistics/OptimizerStatisticsV.xaml
index 0cb5f849..63db71d6 100644
--- a/EgtBEAMWALL.Optimizer/Statistics/OptimizerStatisticsV.xaml
+++ b/EgtBEAMWALL.Optimizer/Statistics/OptimizerStatisticsV.xaml
@@ -34,7 +34,7 @@
                                           ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
                                           CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
                                           RowStyle="{StaticResource RowDataGrid_CustomHighLight}"
-                                          Style="{StaticResource DataGrid_OnlyProd}">
+                                          Style="{StaticResource Optimizer_DataGrid}">
                   <DataGrid.Resources>
                      <!--Id - Nome-->
                      <DataGridTextColumn x:Key="colNAME" Binding="{Binding Name}" SortMemberPath="nName">
@@ -127,7 +127,7 @@
                                           ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
                                           CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
                                           RowStyle="{StaticResource RowDataGrid_CustomHighLight}"
-                                          Style="{StaticResource DataGrid_OnlyProd}">
+                                          Style="{StaticResource Optimizer_DataGrid}">
                   <DataGrid.Resources>
                      <!--W - Larghezza-->
                      <DataGridTextColumn x:Key="colW" Binding="{Binding sW}">
@@ -246,7 +246,7 @@
                           Foreground="{StaticResource BeamWall_White}"
                           IsChecked="{Binding bRawPart_IsChecked}"
                           ToolTip="Materials"
-                          Style="{StaticResource OnlyProdToolBar_ToggleButton}"
+                          Style="{StaticResource ToolBar_ToggleButton}"
                           Margin="0,10,10,5">
                <!--<Image Source="/Resources/Statistics/CopyToClipboard.png" Stretch="Uniform"/>-->
             </ToggleButton>
diff --git a/EgtBEAMWALL.Optimizer/Statistics/PDFEditorV.xaml b/EgtBEAMWALL.Optimizer/Statistics/PDFEditorV.xaml
index 20ac940f..f1625543 100644
--- a/EgtBEAMWALL.Optimizer/Statistics/PDFEditorV.xaml
+++ b/EgtBEAMWALL.Optimizer/Statistics/PDFEditorV.xaml
@@ -18,20 +18,20 @@
       <GroupBox Header="PDF Preview"
                 Style="{StaticResource GroupBox_PDFPreview}"
                 Foreground="{StaticResource BeamWall_Corduroy}">
-         <StackPanel Style="{StaticResource StackPanel_List}">
+         <StackPanel Style="{StaticResource List_StackPanel}">
             <Button ToolTip="PDF Viewer - Preview"
                     Command="{Binding CreatePreviewVis_Command}"
-                    Style="{StaticResource OnlyProdPDFPanel_Button}">
+                    Style="{StaticResource PDFPanel_Button}">
                <Image Source="/Resources/PDFEditor/PrintPDF.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="PDF Viewer - Optimizer"
                     Command="{Binding CreatePreviewOtt_Command}"
-                    Style="{StaticResource OnlyProdPDFPanel_Button}">
+                    Style="{StaticResource PDFPanel_Button}">
                <Image Source="/Resources/PDFEditor/PrintPDF.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="Close PDF Viewer"
                     Command="{Binding ClosePreview_Command}"
-                    Style="{StaticResource OnlyProdClose_Button}">
+                    Style="{StaticResource Close_Button}">
                <Image Source="/Resources/PDFEditor/Delete.png" Stretch="Uniform"/>
             </Button>
          </StackPanel>
@@ -39,10 +39,10 @@
       <ScrollViewer Grid.Row="1"
                     Style="{StaticResource OnlyProd_ScrollViewer}">
          <ItemsControl ItemsSource="{Binding ExpanderList}"
-                       Style="{StaticResource ItemsControl_ExpanderList}">
+                       Style="{StaticResource ExpanderList_ItemsControl}">
             <ItemsControl.ItemsPanel>
                <ItemsPanelTemplate>
-                  <StackPanel Style="{StaticResource StackPanel}"/>
+                  <StackPanel Style="{StaticResource PDF_StackPanel}"/>
                </ItemsPanelTemplate>
             </ItemsControl.ItemsPanel>
             <ItemsControl.ItemTemplate>
@@ -54,17 +54,17 @@
                                    Foreground="{StaticResource BeamWall_White}"/>
                      </Expander.Header>
                      <ItemsControl ItemsSource="{Binding ExpanderElementList}"
-                                   Style="{StaticResource ItemsControl_ExpanderElementList}">
+                                   Style="{StaticResource ExpanderElementList_ItemsControl}">
                         <ItemsControl.ItemsPanel>
                            <ItemsPanelTemplate>
-                              <StackPanel Style="{StaticResource StackPanel}"/>
+                              <StackPanel Style="{StaticResource PDF_StackPanel}"/>
                            </ItemsPanelTemplate>
                         </ItemsControl.ItemsPanel>
                         <ItemsControl.Resources>
                            <DataTemplate DataType="{x:Type OPTIMIZER:ExpanderElement}">
-                              <StackPanel Style="{StaticResource StackPanel_List}">
+                              <StackPanel Style="{StaticResource List_StackPanel}">
                                  <CheckBox IsChecked="{Binding bParameter_IsChecked, UpdateSourceTrigger=PropertyChanged}"
-                                           Style="{StaticResource OptionCheckBox}"/>
+                                           Style="{StaticResource Option_CheckBox}"/>
                                  <TextBlock Text="{Binding sNameParameter}"
                                             Style="{StaticResource OptionTextBlock}"
                                             Foreground="{StaticResource BeamWall_Corduroy}"/>
@@ -86,9 +86,9 @@
                                           ItemContainerStyle="{StaticResource AlternationIndex_ListBoxItem}">
                                     <ListBox.ItemTemplate>
                                        <DataTemplate>
-                                          <StackPanel Style="{StaticResource StackPanel_List}" Margin="0,-0.5,0,5">
+                                          <StackPanel Style="{StaticResource List_StackPanel}" Margin="0,-0.5,0,5">
                                              <CheckBox IsChecked="{Binding bIsChecked}" 
-                                                       Style="{StaticResource OptionCheckBox}"/>
+                                                       Style="{StaticResource Option_CheckBox}"/>
                                              <TextBlock Text="{Binding Name, Converter={StaticResource ColumnNameConverter}}"
                                                         Style="{StaticResource OptionTextBlock}"/>
                                           </StackPanel>
@@ -98,23 +98,23 @@
                                  <UniformGrid Grid.Row="1"
                                               Rows="2"
                                               Visibility="{Binding vRawPartVisibility}">
-                                    <StackPanel Style="{StaticResource StackPanel_List}">
+                                    <StackPanel Style="{StaticResource List_StackPanel}">
                                        <CheckBox IsChecked="{Binding bSection_IsChecked}" 
-                                                 Style="{StaticResource OptionCheckBox}"/>
+                                                 Style="{StaticResource Option_CheckBox}"/>
                                        <TextBlock Text="{Binding Section_Msg}"
                                                   Style="{StaticResource OptionTextBlock}"
                                                   Foreground="{StaticResource BeamWall_Corduroy}"/>
                                     </StackPanel>
-                                    <StackPanel Style="{StaticResource StackPanel_List}">
+                                    <StackPanel Style="{StaticResource List_StackPanel}">
                                        <CheckBox IsChecked="{Binding bImage_IsChecked}" 
-                                                 Style="{StaticResource OptionCheckBox}"/>
+                                                 Style="{StaticResource Option_CheckBox}"/>
                                        <TextBlock Text="{Binding Image_Msg}"
                                                   Style="{StaticResource OptionTextBlock}"
                                                   Foreground="{StaticResource BeamWall_Corduroy}"/>
                                     </StackPanel>
                                  </UniformGrid>
                                  <StackPanel Grid.Column="1"
-                                             Style="{StaticResource StackPanel_Button}">
+                                             Style="{StaticResource Button_StackPanel}">
                                     <Button Command="{Binding MoveUpOrder_Command}"
                                             Style="{StaticResource LeftPanel_Button}">
                                        <Image Source="/Resources/PDFEditor/MoveUp.png" Stretch="Uniform"/>
diff --git a/EgtBEAMWALL.Optimizer/Statistics/StatisticsV.xaml b/EgtBEAMWALL.Optimizer/Statistics/StatisticsV.xaml
index b5a02af9..ffe85b16 100644
--- a/EgtBEAMWALL.Optimizer/Statistics/StatisticsV.xaml
+++ b/EgtBEAMWALL.Optimizer/Statistics/StatisticsV.xaml
@@ -25,7 +25,7 @@
                                  ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
                                  CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
                                  RowStyle="{StaticResource RowDataGrid_CustomHighLight}"
-                                 Style="{StaticResource DataGrid_OnlyProd}">
+                                 Style="{StaticResource Optimizer_DataGrid}">
          <DataGrid.Resources>
             <!--PDN - Nome-->
             <DataGridTextColumn x:Key="colPDN" Binding="{Binding nPDN}">
diff --git a/EgtBEAMWALL.Optimizer/StatisticsTimePanel/StatisticsTimePanelV.xaml b/EgtBEAMWALL.Optimizer/StatisticsTimePanel/StatisticsTimePanelV.xaml
index a93f0c60..32fc65b4 100644
--- a/EgtBEAMWALL.Optimizer/StatisticsTimePanel/StatisticsTimePanelV.xaml
+++ b/EgtBEAMWALL.Optimizer/StatisticsTimePanel/StatisticsTimePanelV.xaml
@@ -2,31 +2,31 @@
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
-            Style="{StaticResource OnlyProdPartManager_StackPanel}">
+            Style="{StaticResource PartManager_StackPanel}">
    
    <Border ToolTip="{Binding TotalTime_ToolTip}"
            Visibility="{Binding ViewPage_Visibility}"
-           Style="{StaticResource OnlyProdTotalTimeOTT_Border}">
+           Style="{StaticResource TotalTime_Border}">
       <TextBlock Text="{Binding Tag.BTLStructureVM.sBTLTotTime, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:StatisticsTimePanelV}}}"
-                 Style="{StaticResource OnlyProdStatisticTimePanel_TextBlock}"/>
+                 Style="{StaticResource StatisticTimePanel_TextBlock}"/>
    </Border>
    <Border ToolTip="{Binding TotalTime_ToolTip}"
            Visibility="{Binding MachiningPage_Visibility}"
-           Style="{StaticResource OnlyProdTotalTimeOTT_Border}">
+           Style="{StaticResource TotalTime_Border}">
       <TextBlock Text="{Binding Tag.MachGroupPanelVM.sTotEstimatedTime, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:StatisticsTimePanelV}}}"
-                 Style="{StaticResource OnlyProdStatisticTimePanel_TextBlock}"/>
+                 Style="{StaticResource StatisticTimePanel_TextBlock}"/>
    </Border>
    <Border ToolTip="{Binding DoneTime_ToolTip}"
            Visibility="{Binding MachiningPage_Visibility}"
-           Style="{StaticResource OnlyProdDoneTime_Border}">
+           Style="{StaticResource DoneTime_Border}">
       <TextBlock Text="{Binding Tag.MachGroupPanelVM.sDoneTime, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:StatisticsTimePanelV}}}"
-                 Style="{StaticResource OnlyProdStatisticTimePanel_TextBlock}"/>
+                 Style="{StaticResource StatisticTimePanel_TextBlock}"/>
    </Border>
    <Border ToolTip="{Binding RemainingTime_ToolTip}"
            Visibility="{Binding MachiningPage_Visibility}"
-           Style="{StaticResource OnlyProdRemainingTime_Border}">
+           Style="{StaticResource RemainingTime_Border}">
       <TextBlock Text="{Binding Tag.MachGroupPanelVM.sRemainingTime, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:StatisticsTimePanelV}}}"
-                 Style="{StaticResource OnlyProdStatisticTimePanel_TextBlock}"/>
+                 Style="{StaticResource StatisticTimePanel_TextBlock}"/>
    </Border>
 
 </StackPanel>
diff --git a/EgtBEAMWALL.Optimizer/StatusBar/StatusBarV.xaml b/EgtBEAMWALL.Optimizer/StatusBar/StatusBarV.xaml
index 2dd2c626..b3cd75f9 100644
--- a/EgtBEAMWALL.Optimizer/StatusBar/StatusBarV.xaml
+++ b/EgtBEAMWALL.Optimizer/StatusBar/StatusBarV.xaml
@@ -46,7 +46,6 @@
       <Button Content="{Binding SnapPointType}"
               Background="{Binding SnapPointType_Background}"/>
    </StatusBarItem>
-   <!--Style="{StaticResource SnapPointType_Button}"-->
 
    <!--Indica la posizione del mouse quando è sulla scena-->
    <StatusBarItem Grid.Column="4">
diff --git a/EgtBEAMWALL.Optimizer/StrategyManager/ParameterStrategyV.xaml b/EgtBEAMWALL.Optimizer/StrategyManager/ParameterStrategyV.xaml
index d1079f8e..a4254d2a 100644
--- a/EgtBEAMWALL.Optimizer/StrategyManager/ParameterStrategyV.xaml
+++ b/EgtBEAMWALL.Optimizer/StrategyManager/ParameterStrategyV.xaml
@@ -19,7 +19,7 @@
                           TextWrapping="WrapWithOverflow"
                           Style="{StaticResource DialogWindow_TextBlock}"/>
                <CheckBox IsChecked="{Binding bValue, UpdateSourceTrigger=PropertyChanged}"
-                         Style="{StaticResource OnlyProdFeatureInPartInRawPartList_CheckBox}"/>
+                         Style="{StaticResource FeatureInPartInRawPartList_CheckBox}"/>
             </UniformGrid>
          </DataTemplate>
          <DataTemplate DataType="{x:Type OPTIMIZER:DoubleStrategyParameter}">
@@ -47,7 +47,7 @@
                          DisplayMemberPath="sValue"
                          Margin="0"
                          Foreground="Black"
-                         Style="{StaticResource OnlyProdCalcPanel_ComboBox}">
+                         Style="{StaticResource CalcPanel_ComboBox}">
                </ComboBox>
             </UniformGrid>
          </DataTemplate>
@@ -87,7 +87,7 @@
                              ToolTip="{Binding OpenToolListToolTip}"
                              IsEnabled="{Binding OpenToolListIsEnable}"
                              Command="{Binding OpenToolListCommand}"
-                             Style="{StaticResource MachineToolBar_ParameterMachineButton}">
+                             Style="{StaticResource ParameterMachine_Button}">
                         <Image Source="/Resources/NewPage/+.png" Stretch="Uniform"/>
                      </Button>
                      <Button VerticalAlignment="Top"
@@ -96,12 +96,12 @@
                              ToolTip="{Binding DeselectAllToolTip}"
                              IsEnabled="{Binding ActiveToolListIsEnable}"
                              Command="{Binding DeselectAllCommand}"
-                             Style="{StaticResource MachineToolBar_ParameterMachineButton}">
+                             Style="{StaticResource ParameterMachine_Button}">
                         <Image Source="/Resources/NewPage/deselectall.png" Stretch="Uniform"/>
                      </Button>
                   </StackPanel>
                   <Border Margin="2,0,2,0" 
-                          Style="{StaticResource OnlyProdPage_Border}">
+                          Style="{StaticResource Optimizer_Border}">
                      <ItemsControl ItemsSource="{Binding ActiveToolList_View}"
                                    BorderThickness="0"
                                    Height="95"
@@ -110,7 +110,7 @@
                                    Style="{StaticResource UsersControlStyle}">
                         <ItemsControl.ItemTemplate>
                            <DataTemplate>
-                              <StackPanel Style="{StaticResource StackPanel_List}">
+                              <StackPanel Style="{StaticResource List_StackPanel}">
                                  <CheckBox IsChecked="{Binding bIsActive, UpdateSourceTrigger=PropertyChanged}"
                                            Style="{StaticResource FreeContourInput_CheckBox}"/>
                                  <TextBlock Text="{Binding sName}"
@@ -128,7 +128,7 @@
                              Margin="0,0,0,5"
                              ToolTip="{Binding CloseToolListToolTip}"
                              Command="{Binding CloseToolListCommand}"
-                             Style="{StaticResource MachineToolBar_ParameterMachineButton}">
+                             Style="{StaticResource ParameterMachine_Button}">
                         <Image Source="/Resources/PDFEditor/Delete.png" Stretch="Uniform"/>
                      </Button>
                      <Button VerticalAlignment="Top"
@@ -137,12 +137,12 @@
                              ToolTip="{Binding SelectAllToolTip}"
                              IsEnabled="{Binding AvailableToolListIsEnable}"
                              Command="{Binding SelectAllCommand}"
-                             Style="{StaticResource MachineToolBar_ParameterMachineButton}">
+                             Style="{StaticResource ParameterMachine_Button}">
                         <Image Source="/Resources/NewPage/selectall.png" Stretch="Uniform"/>
                      </Button>
                   </StackPanel>
                   <Border Margin="2,5,2,0" 
-                          Style="{StaticResource OnlyProdPage_Border}">
+                          Style="{StaticResource Optimizer_Border}">
                      <ItemsControl ItemsSource="{Binding AvailableToolList_View}"                                   
                                    BorderThickness="0"
                                    Height="200"
@@ -151,7 +151,7 @@
                                    Style="{StaticResource UsersControlStyle}">
                         <ItemsControl.ItemTemplate>
                            <DataTemplate>
-                              <StackPanel Style="{StaticResource StackPanel_List}">
+                              <StackPanel Style="{StaticResource List_StackPanel}">
                                  <CheckBox IsChecked="{Binding bIsActive, UpdateSourceTrigger=PropertyChanged}"
                                            Style="{StaticResource FreeContourInput_CheckBox}"/>
                                  <TextBlock Text="{Binding sName}"
diff --git a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerV.xaml b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerV.xaml
index 2a2a4305..efb50ea5 100644
--- a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerV.xaml
+++ b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerV.xaml
@@ -68,7 +68,7 @@
 
       <Border Grid.RowSpan="2"
               Margin="0,0,0,5"
-              Style="{StaticResource OnlyProdPage_Border}">
+              Style="{StaticResource Optimizer_Border}">
          <TreeView Name="StrategyFeature_TreeView" 
                    BorderThickness="0"
                    Width="Auto"
@@ -83,7 +83,7 @@
                      <CheckBox.Template>
                         <ControlTemplate>
                            <Border Background="{Binding Background, RelativeSource={RelativeSource AncestorType={x:Type TreeView}}}">
-                              <StackPanel Style="{StaticResource OnlyProdPartManager_StackPanel}">
+                              <StackPanel Style="{StaticResource PartManager_StackPanel}">
                                  <TextBlock Text="[" Style="{StaticResource DialogWindow_TextBlock}"/>
                                  <TextBlock Text="{Binding nGrp}" Style="{StaticResource DialogWindow_TextBlock}"/>
                                  <TextBlock Text="-" Style="{StaticResource DialogWindow_TextBlock}"/>
@@ -139,7 +139,7 @@
                  Margin="2,2,2,0" 
                  VerticalAlignment="Top"
                  Height="{Binding ActualHeight, ElementName=GR}"
-                 Style="{StaticResource OnlyProdPage_Border}">
+                 Style="{StaticResource Optimizer_Border}">
             <Grid>
                <Grid.RowDefinitions>
                   <RowDefinition Height="Auto"/>
diff --git a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyProductionV.xaml b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyProductionV.xaml
index a31f1a98..da22e006 100644
--- a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyProductionV.xaml
+++ b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyProductionV.xaml
@@ -21,7 +21,7 @@
          <ColumnDefinition Width="1*"/>
       </Grid.ColumnDefinitions>
       <Border Margin="2,0,2,0" 
-           Style="{StaticResource OnlyProdPage_Border}">
+           Style="{StaticResource Optimizer_Border}">
          <ListBox ItemsSource="{Binding SelTreeItem.AvailableStrategyList}"
                SelectedItem="{Binding SelTreeItem.SelAvailableStrategy}"
                Width="Auto"
@@ -64,7 +64,7 @@
       <StackPanel Grid.Row="2"
                   Grid.ColumnSpan="2"
                   HorizontalAlignment="Right"
-                  Style="{StaticResource OnlyProdPartManager_StackPanel}">
+                  Style="{StaticResource PartManager_StackPanel}">
          <Button Command="{Binding Ok_Command}"
                  ToolTip="{Binding Ok_Msg}"
                  Style="{StaticResource ToolBarViewPanel_Button}">
diff --git a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyV.xaml b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyV.xaml
index ccabb58d..08646b78 100644
--- a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyV.xaml
+++ b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyV.xaml
@@ -13,7 +13,7 @@
    </Grid.ColumnDefinitions>
 
    <Border Margin="2,0,2,0" 
-           Style="{StaticResource OnlyProdPage_Border}">
+           Style="{StaticResource Optimizer_Border}">
       <ListBox ItemsSource="{Binding SelTreeItem.AvailableStrategyList_View}"
                SelectedItem="{Binding SelTreeItem.SelAvailableStrategy}"
                IsSynchronizedWithCurrentItem="False"               
@@ -53,7 +53,7 @@
 
    <Border Grid.Column="2"
            Margin="2,0,2,0"
-           Style="{StaticResource OnlyProdPage_Border}">
+           Style="{StaticResource Optimizer_Border}">
       <ListBox ItemsSource="{Binding SelTreeItem.ActiveStrategyList_View}"
                SelectedItem="{Binding SelTreeItem.SelActiveStrategy}"
                IsSynchronizedWithCurrentItem="False"
diff --git a/EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateBTLWndV.xaml b/EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateBTLWndV.xaml
index 6bfd0bb8..09d59389 100644
--- a/EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateBTLWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateBTLWndV.xaml
@@ -27,7 +27,7 @@
                                  SelectionMode="Single"
                                  ScrollViewer.CanContentScroll="False" 
                                  Margin="5"
-                                 Style="{StaticResource DataGrid_OnlyProd}"
+                                 Style="{StaticResource Optimizer_DataGrid}"
                                  CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
                                  RowStyle="{StaticResource RowDataGrid_CustomHighLight}">
          <DataGrid.Resources>
@@ -89,12 +89,12 @@
                  Command="{Binding Ok_Command}"
                  IsDefault="True"
                  Grid.Column="1"
-                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
          <Button Content="{Binding Cancel_Msg}"
                  Command="{Binding Cancel_Command}"
                  IsCancel="True"
                  Grid.Column="3"
-                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
       </Grid>
 
    </StackPanel>
diff --git a/EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateOrAppendWndV.xaml b/EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateOrAppendWndV.xaml
index 2a19c47d..4a112847 100644
--- a/EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateOrAppendWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateOrAppendWndV.xaml
@@ -28,12 +28,12 @@
 
          <RadioButton Content="{Binding Update_Msg}"
                       IsChecked="{Binding UpdateIsChecked}"
-                      Style="{StaticResource OnlyProdToolBar_TextToggleButton}"
+                      Style="{StaticResource UpdateOrAppendWnd_ToggleButton}"
                       Grid.Row="1" Grid.Column="0">
          </RadioButton>
          <RadioButton Content="{Binding Append_Msg}"
                       IsChecked="{Binding AppendIsChecked}" 
-                      Style="{StaticResource OnlyProdToolBar_TextToggleButton}"
+                      Style="{StaticResource UpdateOrAppendWnd_ToggleButton}"
                       Grid.Row="1" Grid.Column="1">
          </RadioButton>
       </Grid>
@@ -52,11 +52,11 @@
                  Command="{Binding Ok_Command}"
                  IsDefault="True"
                  Grid.Column="1"
-                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
          <Button Content="{Binding Cancel_Msg}"
                  IsCancel="True"
                  Grid.Column="3"
-                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
       </Grid>
    </Grid>
 </EgtBEAMWALLCORE:OptimizerWindow>
diff --git a/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml b/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml
index cbcbdc56..fdf27aec 100644
--- a/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml
+++ b/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml
@@ -49,8 +49,6 @@
 
    <!--#endregion Panel ViewModel-->
 
-
-
    <!--#region Colori per TabHeader-->
 
    <!--<LinearGradientBrush x:Key="TabItem.Static.Background" EndPoint="0,1" StartPoint="0,0">
@@ -64,8 +62,6 @@
   
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!--#region GRAFICA GENERALE-->
-
    <!--#region TextBlock-->
    
    <Style x:Key="ListTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
@@ -118,31 +114,13 @@
       </Style.Triggers>
    </Style>
 
-   <Style x:Key="OnlyProdStatisticTimePanel_TextBlock" TargetType="{x:Type TextBlock}">
+   <Style x:Key="StatisticTimePanel_TextBlock" TargetType="{x:Type TextBlock}">
       <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
       <Setter Property="FontSize" Value="20"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="TextWrapping" Value="Wrap"/>
    </Style>
 
-   <Style x:Key="OnlyProdInverted_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
-      <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
-      <Setter Property="TextAlignment" Value="Center"/>
-      <Setter Property="Width" Value="60"/>
-      <Setter Property="TextWrapping" Value="Wrap"/>
-   </Style>
-
-   <Style x:Key="OnlyProdUnitTime_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
-      <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
-      <Setter Property="TextWrapping" Value="Wrap"/>
-   </Style>
-
    <Style x:Key="Macro_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
       <Setter Property="HorizontalAlignment" Value="Center"/>
       <Setter Property="VerticalAlignment" Value="Top"/>
@@ -159,35 +137,13 @@
       <Setter Property="TextWrapping" Value="Wrap"/>
    </Style>
 
-   <Style x:Key="Machine_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="VerticalAlignment" Value="Top"/>
-      <Setter Property="Margin" Value="10,5,10,0"/>
-      <Setter Property="Height" Value="25"/>
-      <Setter Property="TextWrapping" Value="Wrap"/>
-   </Style>
-
-   <Style x:Key="OnlyProdFeatureManager_OnlyProd" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="VerticalAlignment" Value="Top"/>
+   <Style x:Key="FeatureManager_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
       <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="VerticalAlignment" Value="Top"/>
       <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
-      <Setter Property="Margin" Value="5,5,0,0"/>
       <Setter Property="TextWrapping" Value="Wrap"/>
-   </Style>
-
-   <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>
-
-   <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"/>
+      <Setter Property="Margin" Value="5,5,0,0"/>
    </Style>
 
    <Style x:Key="CALC_ERR_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
@@ -203,16 +159,16 @@
       <Setter Property="Margin" Value="0,0,0,5"/>
    </Style>
 
-   <Style x:Key="OnlyProdFeatureInPartInRawPartList_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+   <Style x:Key="FeatureInPartInRawPartList_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,0,-2"/>
    </Style>
 
-   <Style x:Key="OnlyProdRawPartList_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+   <Style x:Key="RawPartList_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_Aqua}"/>
       <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"/>
@@ -224,22 +180,17 @@
       <Setter Property="Margin" Value="0,5"/>
    </Style>
 
-   <Style x:Key="OnlyProdNestingRunningWndV_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+   <Style x:Key="NestingRunningWndV_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
       <Setter Property="TextAlignment" Value="Center"/>
    </Style>
 
-   <Style x:Key="OnlyProdWarehouseWndV_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+   <Style x:Key="WarehouseWndV_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>
 
-   <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>
-
-   <Style x:Key="SplashScreenV_TxBl" TargetType="{x:Type TextBlock}">
+   <Style x:Key="SplashScreenV_TextBlock" TargetType="{x:Type TextBlock}">
       <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
       <Setter Property="HorizontalAlignment" Value="Center"/>
       <Setter Property="FontSize" Value="14"/>
@@ -249,511 +200,9 @@
       <Setter Property="Margin" Value="591,140,0,0"/>
    </Style>
 
-   <!--#region DataGrid-->
+   <!--#endregion TextBlock-->
 
-   <Style x:Key="Main_DataGridColumnHeader" TargetType="{x:Type DataGridColumnHeader}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_Teal}" />
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
-      <Setter Property="FontWeight" Value="Bold" />
-      <Setter Property="FontSize" Value="15" />
-      <Setter Property="HorizontalContentAlignment" Value="Center" />
-      <Setter Property="Padding" Value="0,2,0,2" />
-   </Style>
-
-   <Style x:Key="Feature_DataGridColumnHeader" TargetType="{x:Type DataGridColumnHeader}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_Keppel}" />
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
-      <Setter Property="FontWeight" Value="Bold" />
-      <Setter Property="FontSize" Value="15" />
-      <Setter Property="HorizontalContentAlignment" Value="Center" />
-      <Setter Property="Padding" Value="0,2,0,2" />
-   </Style>
-
-   <Style x:Key="PartInRawPart_DataGridColumnHeader" TargetType="{x:Type DataGridColumnHeader}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_Jaffa}" />
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
-      <Setter Property="FontWeight" Value="Bold" />
-      <Setter Property="FontSize" Value="15" />
-      <Setter Property="HorizontalContentAlignment" Value="Center" />
-      <Setter Property="Padding" Value="0,2,0,2" />
-   </Style>
-
-   <Style x:Key="PParam_DataGridColumnHeader" TargetType="{x:Type DataGridColumnHeader}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_Downy}" />
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
-      <Setter Property="FontWeight" Value="Bold" />
-      <Setter Property="FontSize" Value="15" />
-      <Setter Property="HorizontalContentAlignment" Value="Center" />
-      <Setter Property="Padding" Value="0,2,0,2" />
-   </Style>
-
-   <Style x:Key="RawPart_DataGridColumnHeader" TargetType="{x:Type DataGridColumnHeader}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_White}" />
-      <!--<Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />-->
-      <Setter Property="FontWeight" Value="SemiBold" />
-      <Setter Property="FontSize" Value="11" />
-      <Setter Property="HorizontalContentAlignment" Value="Center" />
-      <Setter Property="Padding" Value="0,2,0,2" />
-   </Style>
-
-   <Style x:Key="DataGrid_OnlyProd" TargetType="{x:Type DataGrid}">
-      <Setter Property="Background" Value="Transparent"/>
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
-      <!--#FF688CAF-->
-      <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.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="VirtualizingPanel.IsVirtualizing" Value="True"/>
-      <Setter Property="VirtualizingPanel.VirtualizationMode" Value="Recycling"/>
-      <Setter Property="EnableColumnVirtualization" Value="True"/>
-      <Setter Property="EnableRowVirtualization" Value="True"/>
-      <Setter Property="VirtualizingStackPanel.ScrollUnit" Value="Pixel"/>
-      <Setter Property="RowHeight" Value="24"/>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type DataGrid}">
-               <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
-                  <ScrollViewer x:Name="DG_ScrollViewer" Focusable="false">
-                     <ScrollViewer.Template>
-                        <ControlTemplate TargetType="{x:Type ScrollViewer}">
-                           <Grid>
-                              <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="Auto"/>
-                                 <ColumnDefinition Width="*"/>
-                                 <ColumnDefinition Width="Auto"/>
-                              </Grid.ColumnDefinitions>
-                              <Grid.RowDefinitions>
-                                 <RowDefinition Height="Auto"/>
-                                 <RowDefinition Height="*"/>
-                                 <RowDefinition Height="Auto"/>
-                              </Grid.RowDefinitions>
-                              <Button Command="{x:Static DataGrid.SelectAllCommand}" Focusable="false" Style="{DynamicResource {ComponentResourceKey ResourceId=DataGridSelectAllButtonStyle, TypeInTargetAssembly={x:Type DataGrid}}}" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.All}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-                              <DataGridColumnHeadersPresenter x:Name="PART_ColumnHeadersPresenter" Grid.Column="1" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Column}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-                              <ScrollContentPresenter x:Name="PART_ScrollContentPresenter" CanContentScroll="{TemplateBinding CanContentScroll}" Grid.ColumnSpan="2" Grid.Row="1"/>
-                              <ScrollBar x:Name="PART_VerticalScrollBar" Grid.Column="2" Maximum="{TemplateBinding ScrollableHeight}" Orientation="Vertical" Grid.Row="1" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource Mode=TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"/>
-                              <Grid Grid.Column="1" Grid.Row="2">
-                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="{Binding NonFrozenColumnsViewportHorizontalOffset, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-                                    <ColumnDefinition Width="*"/>
-                                 </Grid.ColumnDefinitions>
-                                 <ScrollBar x:Name="PART_HorizontalScrollBar" Grid.Column="1" Maximum="{TemplateBinding ScrollableWidth}" Orientation="Horizontal" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource Mode=TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"/>
-                              </Grid>
-                           </Grid>
-                        </ControlTemplate>
-                     </ScrollViewer.Template>
-                     <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                  </ScrollViewer>
-               </Border>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-      <Style.Triggers>
-         <MultiTrigger>
-            <MultiTrigger.Conditions>
-               <Condition Property="IsGrouping" Value="true"/>
-               <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false"/>
-            </MultiTrigger.Conditions>
-            <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
-         </MultiTrigger>
-      </Style.Triggers>
-      <Style.Resources>
-         <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource OnlyProd_ScrollBar}"/>
-      </Style.Resources>
-   </Style>
-
-   <!--#endregion DataGrid-->
-
-   <!--#region DatePicker-->
-
-   <Style x:Key="Filter_DatePicker" TargetType="{x:Type DatePicker}">
-      <Setter Property="Height" Value="25" />
-      <Setter Property="Width" Value="100" />
-      <Setter Property="BorderBrush" Value="Transparent"/>
-      <Setter Property="Background" Value="Transparent"/>
-      <Style.Resources>
-         <Style TargetType="{x:Type DatePickerTextBox}">
-            <Setter Property="Background" Value="Transparent"/>
-         </Style>
-      </Style.Resources>
-   </Style>
-
-   <Style x:Key="Filter_Calendar" TargetType="{x:Type Calendar}">
-      <Setter Property="Background">
-         <Setter.Value>
-            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
-               <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0"/>
-               <GradientStop Color="{StaticResource BeamWall_LinkWater_Color}" Offset="0.16"/>
-               <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
-            </LinearGradientBrush>
-         </Setter.Value>
-      </Setter>
-      <Setter Property="BorderBrush">
-         <Setter.Value>
-            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
-               <GradientStop Color="{StaticResource BeamWall_LinkWater_Color}" Offset="0"/>
-               <GradientStop Color="{StaticResource BeamWall_RegentStBlue_Color}" Offset="0.45"/>
-               <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0.75"/>
-               <GradientStop Color="{StaticResource BeamWall_Kashmir_Color}" Offset="1"/>
-            </LinearGradientBrush>
-         </Setter.Value>
-      </Setter>
-      <Setter Property="BorderThickness" Value="1"/>
-   </Style>
-
-   <!--#endregion DatePicker-->
-
-   <!--#region Expander-->
-
-   <!--#333333-->
-   <SolidColorBrush x:Key="Expander.Static.Circle.Stroke" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
-   <SolidColorBrush x:Key="Expander.Static.Circle.Fill" Color="#FFFFFF"/>
-   <!--#333333-->
-   <SolidColorBrush x:Key="Expander.Static.Arrow.Stroke" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
-   <!--#5593FF-->
-   <SolidColorBrush x:Key="Expander.MouseOver.Circle.Stroke" Color="{StaticResource BeamWall_Kashmir_Color}"/>
-   <SolidColorBrush x:Key="Expander.MouseOver.Circle.Fill" Color="#F3F9FF"/>
-   <!--#000000-->
-   <SolidColorBrush x:Key="Expander.MouseOver.Arrow.Stroke" Color="{StaticResource BeamWall_Kashmir_Color}"/>
-   <!--#3C77DD-->
-   <SolidColorBrush x:Key="Expander.Pressed.Circle.Stroke" Color="{StaticResource BeamWall_Kashmir_Color}"/>
-   <SolidColorBrush x:Key="Expander.Pressed.Circle.Fill" Color="#D9ECFF"/>
-   <!--#000000-->
-   <SolidColorBrush x:Key="Expander.Pressed.Arrow.Stroke" Color="{StaticResource BeamWall_Kashmir_Color}"/>
-   <!--#BCBCBC-->
-   <SolidColorBrush x:Key="Expander.Disabled.Circle.Stroke" Color="{StaticResource BeamWall_RegentStBlue_Color}" Opacity="0.5"/>
-   <SolidColorBrush x:Key="Expander.Disabled.Circle.Fill" Color="#E6E6E6" Opacity="0.5"/>
-   <!--#707070-->
-   <SolidColorBrush x:Key="Expander.Disabled.Arrow.Stroke" Color="{StaticResource BeamWall_RegentStBlue_Color}" Opacity="0.5"/>
-   <Style x:Key="ExpanderHeaderFocusVisual">
-      <Setter Property="Control.Template">
-         <Setter.Value>
-            <ControlTemplate>
-               <Border>
-                  <Rectangle Margin="0" StrokeDashArray="1 2" Stroke="Black" SnapsToDevicePixels="true" StrokeThickness="1"/>
-               </Border>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-   <Style x:Key="ExpanderDownHeaderStyle" TargetType="{x:Type ToggleButton}">
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type ToggleButton}">
-               <Border Padding="{TemplateBinding Padding}">
-                  <Grid Background="{StaticResource BeamWall_Glacier}" Height="25" SnapsToDevicePixels="False">
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="19"/>
-                        <ColumnDefinition Width="*"/>
-                     </Grid.ColumnDefinitions>
-                     <Rectangle x:Name="circle" Fill="{StaticResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="25" Stroke="{StaticResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
-                     <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" Stroke="{StaticResource Expander.Static.Arrow.Stroke}" SnapsToDevicePixels="false" StrokeThickness="2" VerticalAlignment="Center"/>
-                     <ContentPresenter Grid.Column="1" HorizontalAlignment="Center" RecognizesAccessKey="True" SnapsToDevicePixels="True" VerticalAlignment="Center"/>
-                  </Grid>
-               </Border>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsChecked" Value="true">
-                     <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
-                  </Trigger>
-                  <Trigger Property="IsMouseOver" Value="true">
-                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Stroke}"/>
-                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Fill}"/>
-                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}"/>
-                  </Trigger>
-                  <Trigger Property="IsPressed" Value="true">
-                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Stroke}"/>
-                     <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
-                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Fill}"/>
-                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Pressed.Arrow.Stroke}"/>
-                  </Trigger>
-                  <Trigger Property="IsEnabled" Value="false">
-                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Stroke}"/>
-                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Fill}"/>
-                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Disabled.Arrow.Stroke}"/>
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-   <Style x:Key="ExpanderUpHeaderStyle" TargetType="{x:Type ToggleButton}">
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type ToggleButton}">
-               <Border Padding="{TemplateBinding Padding}">
-                  <Grid Background="Transparent" SnapsToDevicePixels="False">
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="19"/>
-                        <ColumnDefinition Width="*"/>
-                     </Grid.ColumnDefinitions>
-                     <Grid>
-                        <Grid.LayoutTransform>
-                           <TransformGroup>
-                              <TransformGroup.Children>
-                                 <TransformCollection>
-                                    <RotateTransform Angle="180"/>
-                                 </TransformCollection>
-                              </TransformGroup.Children>
-                           </TransformGroup>
-                        </Grid.LayoutTransform>
-                        <Ellipse x:Name="circle" Fill="{StaticResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="19" Stroke="{StaticResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
-                        <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" Stroke="{StaticResource Expander.Static.Arrow.Stroke}" SnapsToDevicePixels="false" StrokeThickness="2" VerticalAlignment="Center"/>
-                     </Grid>
-                     <ContentPresenter Grid.Column="1" HorizontalAlignment="Left" Margin="4,0,0,0" RecognizesAccessKey="True" SnapsToDevicePixels="True" VerticalAlignment="Center"/>
-                  </Grid>
-               </Border>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsChecked" Value="true">
-                     <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
-                  </Trigger>
-                  <Trigger Property="IsMouseOver" Value="true">
-                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Stroke}"/>
-                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Fill}"/>
-                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}"/>
-                  </Trigger>
-                  <Trigger Property="IsPressed" Value="true">
-                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Stroke}"/>
-                     <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
-                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Fill}"/>
-                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Pressed.Arrow.Stroke}"/>
-                  </Trigger>
-                  <Trigger Property="IsEnabled" Value="false">
-                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Stroke}"/>
-                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Fill}"/>
-                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Disabled.Arrow.Stroke}"/>
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-   <Style x:Key="ExpanderLeftHeaderStyle" TargetType="{x:Type ToggleButton}">
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type ToggleButton}">
-               <Border Padding="{TemplateBinding Padding}">
-                  <Grid Background="Transparent" SnapsToDevicePixels="False">
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="19"/>
-                        <RowDefinition Height="*"/>
-                     </Grid.RowDefinitions>
-                     <Grid>
-                        <Grid.LayoutTransform>
-                           <TransformGroup>
-                              <TransformGroup.Children>
-                                 <TransformCollection>
-                                    <RotateTransform Angle="90"/>
-                                 </TransformCollection>
-                              </TransformGroup.Children>
-                           </TransformGroup>
-                        </Grid.LayoutTransform>
-                        <Ellipse x:Name="circle" Fill="{StaticResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="19" Stroke="{StaticResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
-                        <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" Stroke="{StaticResource Expander.Static.Arrow.Stroke}" SnapsToDevicePixels="false" StrokeThickness="2" VerticalAlignment="Center"/>
-                     </Grid>
-                     <ContentPresenter HorizontalAlignment="Center" Margin="0,4,0,0" RecognizesAccessKey="True" Grid.Row="1" SnapsToDevicePixels="True" VerticalAlignment="Top"/>
-                  </Grid>
-               </Border>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsChecked" Value="true">
-                     <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
-                  </Trigger>
-                  <Trigger Property="IsMouseOver" Value="true">
-                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Stroke}"/>
-                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Fill}"/>
-                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}"/>
-                  </Trigger>
-                  <Trigger Property="IsPressed" Value="true">
-                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Stroke}"/>
-                     <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
-                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Fill}"/>
-                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Pressed.Arrow.Stroke}"/>
-                  </Trigger>
-                  <Trigger Property="IsEnabled" Value="false">
-                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Stroke}"/>
-                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Fill}"/>
-                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Disabled.Arrow.Stroke}"/>
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-   <Style x:Key="ExpanderRightHeaderStyle" TargetType="{x:Type ToggleButton}">
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type ToggleButton}">
-               <Border Padding="{TemplateBinding Padding}">
-                  <Grid Background="Transparent" SnapsToDevicePixels="False">
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="19"/>
-                        <RowDefinition Height="*"/>
-                     </Grid.RowDefinitions>
-                     <Grid>
-                        <Grid.LayoutTransform>
-                           <TransformGroup>
-                              <TransformGroup.Children>
-                                 <TransformCollection>
-                                    <RotateTransform Angle="-90"/>
-                                 </TransformCollection>
-                              </TransformGroup.Children>
-                           </TransformGroup>
-                        </Grid.LayoutTransform>
-                        <Ellipse x:Name="circle" Fill="{StaticResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="19" Stroke="{StaticResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
-                        <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" Stroke="{StaticResource Expander.Static.Arrow.Stroke}" SnapsToDevicePixels="false" StrokeThickness="2" VerticalAlignment="Center"/>
-                     </Grid>
-                     <ContentPresenter HorizontalAlignment="Center" Margin="0,4,0,0" RecognizesAccessKey="True" Grid.Row="1" SnapsToDevicePixels="True" VerticalAlignment="Top"/>
-                  </Grid>
-               </Border>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsChecked" Value="true">
-                     <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
-                  </Trigger>
-                  <Trigger Property="IsMouseOver" Value="true">
-                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Stroke}"/>
-                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Fill}"/>
-                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}"/>
-                  </Trigger>
-                  <Trigger Property="IsPressed" Value="true">
-                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Stroke}"/>
-                     <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
-                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Fill}"/>
-                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Pressed.Arrow.Stroke}"/>
-                  </Trigger>
-                  <Trigger Property="IsEnabled" Value="false">
-                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Stroke}"/>
-                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Fill}"/>
-                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Disabled.Arrow.Stroke}"/>
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-   <Style TargetType="{x:Type Expander}">
-      <Setter Property="Foreground" Value="{StaticResource  BeamWall_White}"/>
-      <Setter Property="Background" Value="Transparent"/>
-      <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-      <Setter Property="VerticalContentAlignment" Value="Stretch"/>
-      <Setter Property="BorderBrush" Value="Transparent"/>
-      <Setter Property="BorderThickness" Value="1"/>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type Expander}">
-               <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="3" SnapsToDevicePixels="true">
-                  <DockPanel>
-                     <ToggleButton x:Name="HeaderSite" ContentTemplate="{TemplateBinding HeaderTemplate}" Content="{TemplateBinding Header}" ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}" DockPanel.Dock="Top" FontStretch="{TemplateBinding FontStretch}" Foreground="{TemplateBinding Foreground}" FocusVisualStyle="{StaticResource ExpanderHeaderFocusVisual}" FontStyle="{TemplateBinding FontStyle}" FontFamily="{TemplateBinding FontFamily}" FontWeight="{TemplateBinding FontWeight}" FontSize="{TemplateBinding FontSize}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource Mode=TemplatedParent}}" Margin="1" MinWidth="0" MinHeight="0" Padding="{TemplateBinding Padding}" Style="{StaticResource ExpanderDownHeaderStyle}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                     <ContentPresenter x:Name="ExpandSite" DockPanel.Dock="Bottom" Focusable="false" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Visibility="Collapsed"/>
-                  </DockPanel>
-               </Border>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsExpanded" Value="true">
-                     <Setter Property="Visibility" TargetName="ExpandSite" Value="Visible"/>
-                  </Trigger>
-                  <Trigger Property="ExpandDirection" Value="Right">
-                     <Setter Property="DockPanel.Dock" TargetName="ExpandSite" Value="Right"/>
-                     <Setter Property="DockPanel.Dock" TargetName="HeaderSite" Value="Left"/>
-                     <Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource ExpanderRightHeaderStyle}"/>
-                  </Trigger>
-                  <Trigger Property="ExpandDirection" Value="Up">
-                     <Setter Property="DockPanel.Dock" TargetName="ExpandSite" Value="Top"/>
-                     <Setter Property="DockPanel.Dock" TargetName="HeaderSite" Value="Bottom"/>
-                     <Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource ExpanderUpHeaderStyle}"/>
-                  </Trigger>
-                  <Trigger Property="ExpandDirection" Value="Left">
-                     <Setter Property="DockPanel.Dock" TargetName="ExpandSite" Value="Left"/>
-                     <Setter Property="DockPanel.Dock" TargetName="HeaderSite" Value="Right"/>
-                     <Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource ExpanderLeftHeaderStyle}"/>
-                  </Trigger>
-                  <Trigger Property="IsEnabled" Value="false">
-                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <!--#endregion Expander-->
-
-   <!--#region ListBox-->
-
-   <!--#1F26A0DA-->
-   <SolidColorBrush x:Key="Item.MouseOver.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
-   <!--#a826A0Da-->
-   <SolidColorBrush x:Key="Item.MouseOver.Border" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
-   <!--#000000-->
-   <SolidColorBrush x:Key="Item.MouseOver.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
-   <!--#3D26A0DA-->
-   <SolidColorBrush x:Key="Item.SelectedActive.Background" Color="{StaticResource BeamWall_Keppel_Color}"/>
-   <!--#FF26A0DA-->
-   <SolidColorBrush x:Key="Item.SelectedActive.Border" Color="{StaticResource BeamWall_Keppel_Color}"/>
-   <SolidColorBrush x:Key="Item.SelectedActive.Foreground" Color="White"/>
-   <SolidColorBrush x:Key="Item.SelectedInactive.Background" Color="#3DDADADA"/>
-   <SolidColorBrush x:Key="Item.SelectedInactive.Border" Color="#FFDADADA"/>
-   <Style TargetType="{x:Type ListBoxItem}">
-      <Setter Property="SnapsToDevicePixels" Value="True"/>
-      <Setter Property="Padding" Value="4,1"/>
-      <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
-      <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
-      <Setter Property="Background" Value="Transparent"/>
-      <Setter Property="BorderBrush" Value="Transparent"/>
-      <Setter Property="BorderThickness" Value="1"/>
-      <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type ListBoxItem}">
-               <Border x:Name="Bd" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-                  <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-               </Border>
-               <ControlTemplate.Triggers>
-                  <MultiTrigger>
-                     <MultiTrigger.Conditions>
-                        <Condition Property="IsMouseOver" Value="True"/>
-                     </MultiTrigger.Conditions>
-                     <Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.MouseOver.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.MouseOver.Border}"/>
-                     <Setter Property="Foreground" Value="{StaticResource Item.MouseOver.Foreground}"/>
-                     <Setter Property="FontWeight" Value="Bold" />
-                  </MultiTrigger>
-                  <MultiTrigger>
-                     <MultiTrigger.Conditions>
-                        <Condition Property="Selector.IsSelectionActive" Value="False"/>
-                        <Condition Property="IsSelected" Value="True"/>
-                     </MultiTrigger.Conditions>
-                     <Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.SelectedInactive.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.SelectedInactive.Border}"/>
-                  </MultiTrigger>
-                  <MultiTrigger>
-                     <MultiTrigger.Conditions>
-                        <Condition Property="Selector.IsSelectionActive" Value="True"/>
-                        <Condition Property="IsSelected" Value="True"/>
-                     </MultiTrigger.Conditions>
-                     <Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.SelectedActive.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.SelectedActive.Border}"/>
-                     <Setter Property="Foreground" Value="{StaticResource Item.SelectedActive.Foreground}"/>
-                     <Setter Property="FontWeight" Value="Bold" />
-                  </MultiTrigger>
-                  <Trigger Property="IsEnabled" Value="False">
-                     <Setter Property="TextElement.Foreground" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <!--#endregion ListBox-->
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!--#region GridSplitter-->
 
@@ -773,58 +222,23 @@
 
    <!--#endregion GridSplitter-->
 
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
    <!--#region ToolTip-->
 
-   <Style x:Key="OnlyProd_ToolTip" TargetType="{x:Type ToolTip}">
+   <Style x:Key="PParameters_ToolTip" TargetType="{x:Type ToolTip}">
       <Setter Property="Background" Value="{StaticResource BeamWall_Glacier}"/>
       <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
    </Style>
 
    <!--#endregion ToolTip-->
 
-   <!--#region PasswordBox-->
-
-   <Style TargetType="{x:Type PasswordBox}">
-      <Setter Property="HorizontalContentAlignment" Value="Right"/>
-      <Setter Property="Margin" Value="0,0,0,5"/>
-   </Style>
-
-   <!--#endregion PasswordBox-->
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!--#region TabItem Style-->
 
-   <!--<LinearGradientBrush x:Key="TabItem.Static.Background" EndPoint="0,1" StartPoint="0,0">
-         <GradientStop Color="#F0F0F0" Offset="0.0"/>
-         <GradientStop Color="#E5E5E5" Offset="1.0"/>
-      </LinearGradientBrush>-->
-   <LinearGradientBrush x:Key="TabItem.Static.Background" EndPoint="0.5,1" StartPoint="0.5,0">
-      <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0"/>
-      <GradientStop Color="{StaticResource BeamWall_RegentStBlue_Color}" Offset="0.85"/>
-      <GradientStop Color="{StaticResource BeamWall_LinkWater_Color}" Offset="1"/>
-   </LinearGradientBrush>
-   <!--#ACACAC-->
-   <SolidColorBrush x:Key="TabItem.Static.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
-   <!--<LinearGradientBrush x:Key="TabItem.MouseOver.Background" EndPoint="0,1" StartPoint="0,0">
-         <GradientStop Color="#ECF4FC" Offset="0.0"/>
-         <GradientStop Color="#DCECFC" Offset="1.0"/>
-      </LinearGradientBrush>-->
-   <SolidColorBrush x:Key="TabItem.MouseOver.Background" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
-   <!--#7EB4EA-->
-   <SolidColorBrush x:Key="TabItem.MouseOver.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
-   <!--#FFFFFF-->
-   <!--<SolidColorBrush x:Key="TabItem.Selected.Background" Color="{StaticResource BeamWall_Kashmir_Color}"/>-->
-   <LinearGradientBrush x:Key="TabItem.Selected.Background" EndPoint="0.5,1" StartPoint="0.5,0">
-      <GradientStop Color="{StaticResource BeamWall_Kashmir_Color}" Offset="0"/>
-      <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0.85"/>
-      <GradientStop Color="{StaticResource BeamWall_RegentStBlue_Color}" Offset="1"/>
-   </LinearGradientBrush>
-   <!--#ACACAC-->
-   <SolidColorBrush x:Key="TabItem.Selected.Border" Color="{StaticResource BeamWall_Kashmir_Color}"/>
-   <SolidColorBrush x:Key="TabItem.Disabled.Background" Color="#F0F0F0"/>
-   <SolidColorBrush x:Key="TabItem.Disabled.Border" Color="#D9D9D9"/>
    <Style x:Key="OnlyProd_TabItem" TargetType="{x:Type TabItem}">
       <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
-      <!--Black-->
       <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
       <Setter Property="Background" Value="{StaticResource TabItem.Static.Background}"/>
       <Setter Property="BorderBrush" Value="{StaticResource TabItem.Static.Border}"/>
@@ -1010,7 +424,6 @@
 
    <Style x:Key="Feature_TabItem" TargetType="{x:Type TabItem}">
       <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
-      <!--Black-->
       <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
       <Setter Property="Background" Value="{StaticResource TabItem.Static.Background}"/>
       <Setter Property="BorderBrush" Value="{StaticResource TabItem.Static.Border}"/>
@@ -1196,6 +609,8 @@
 
    <!--#endregion Tab Item-->
 
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
    <!--#region ItemControl-->
 
    <Style x:Key="UsersControlStyle" TargetType="{x:Type ItemsControl}">
@@ -1213,37 +628,21 @@
    </Style>
    <!--#endregion ItemControl-->
 
-   <!--#endregion GRAFICA GENERALE-->
-
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!--#region GRAFICA NUOVA PAGINA-->
-
    <!--#region Button Style-->
 
-   <Style x:Key="ToolBarOnlyProdManager_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
+   <Style x:Key="ProdManager_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="30"/>
    </Style>
 
-   <Style x:Key="ToolBarOnlyProdManagerNew_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
+   <Style x:Key="ProdManagerNew_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="35"/>
    </Style>
 
-   <Style x:Key="ToolBarOnlyProdManagerGoToSupervisor_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="30"/>
-      <Setter Property="Margin" Value="10,2.5,220,2.5"/>
-   </Style>
-
-   <Style x:Key="ToolBarViewPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="30"/>
-      <Setter Property="Margin" Value="5,2,5,2"/>
-   </Style>
-
-   <Style x:Key="ToolBarOnlyProdCalcPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
+   <Style x:Key="CalcPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="30"/>
       <Setter Property="FontSize" Value="10"/>
@@ -1251,13 +650,13 @@
       <Setter Property="Margin" Value="5,2,5,2"/>
    </Style>
 
-   <Style x:Key="ToolBarWarehouse_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
+   <Style x:Key="Warehouse_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="30"/>
       <Setter Property="Margin" Value="5,2,5,2"/>
    </Style>
 
-   <Style x:Key="ToolBarOptimize_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
+   <Style x:Key="Optimize_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="30"/>
       <Setter Property="FontSize" Value="12"/>
@@ -1265,41 +664,12 @@
       <Setter Property="Margin" Value="5,2,5,2"/>
    </Style>
 
-   <Style x:Key="OnlyProdToolBar_SmallButton" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
-      <Setter Property="Height" Value="20"/>
-      <Setter Property="Width" Value="20"/>
-      <Setter Property="Margin" Value="35,0,0,0"/>
-   </Style>
-
-   <Style x:Key="OnlyProdToolBarInverted_SmallButton" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
-      <Setter Property="Height" Value="20"/>
-      <Setter Property="Width" Value="20"/>
-      <Setter Property="Margin" Value="0,0,40,0"/>
-   </Style>
-
-   <Style x:Key="GeneralConfigurationToolBar_TextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="80"/>
-      <Setter Property="Margin" Value="5,0,5,0"/>
-   </Style>
-
-   <Style x:Key="MachineToolBar_ParameterMachineButton" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="120"/>
-      <Setter Property="Margin" Value="5,0,0,0"/>
-   </Style>
-
-   <Style x:Key="SnapPointType_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
-      <Setter Property="Width" Value="100"/>
-   </Style>
-
-   <Style x:Key="OnlyProdNestingRunningWndV_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
+   <Style x:Key="NestingRunningWndV_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="70"/>
    </Style>
 
-   <Style x:Key="OnlyProdWarehouseWndV_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
+   <Style x:Key="WarehouseWndV_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="30"/>
       <Setter Property="FontWeight" Value="Light"/>
@@ -1321,39 +691,18 @@
       <Setter Property="Width" Value="30"/>
    </Style>
 
-   <Style x:Key="OnlyProdEgtWPFLib5_InputButton" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="80"/>
-   </Style>
-
-   <Style x:Key="OnlyProdWWnd_SmallButton" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
+   <Style x:Key="WWnd_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
       <Setter Property="Height" Value="20"/>
       <Setter Property="Width" Value="20"/>
    </Style>
 
-   <Style x:Key="SaveOptionPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_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>
-
-   <Style x:Key="SaveMachinePanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_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>
-
-   <Style x:Key="OnlyProdLeftPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
+   <Style x:Key="LP_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
       <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="OnlyProdFeatureMan_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
+   <Style x:Key="FeatureMan_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="30"/>
       <Setter Property="Margin" Value="2.5,2.5,10,2.5"/>
@@ -1371,13 +720,10 @@
       <Setter Property="Margin" Value="25,0,0,0"/>
    </Style>
 
-   <Style x:Key="OnlyProdPDFPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
+   <Style x:Key="PDFPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
       <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="BorderThickness" Value="1"/>
       <Setter Property="HorizontalContentAlignment" Value="Center"/>
       <Setter Property="VerticalContentAlignment" Value="Center"/>
@@ -1385,13 +731,13 @@
       <Setter Property="Margin" Value="5,0,5,5"/>
    </Style>
 
-   <Style x:Key="OnlyProdClose_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
+   <Style x:Key="Close_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
       <Setter Property="Height" Value="40"/>
       <Setter Property="Width" Value="50"/>
       <Setter Property="Margin" Value="2.5,-2,2.5,2.5"/>
    </Style>
 
-   <Style x:Key="OnlyProdMainMenu_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
+   <Style x:Key="MainMenu_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
       <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
       <Setter Property="TextBlock.FontWeight" Value="Normal"/>
       <Setter Property="Height" Value="30"/>
@@ -1423,7 +769,6 @@
    </Style>
 
    <Style x:Key="BTLPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
-      <!--<Setter Property="Background" Value="Transparent"/>-->
       <Setter Property="Height" Value="20"/>
       <Setter Property="Width" Value="25"/>
       <Setter Property="Margin" Value="2,-2,2,-2"/>
@@ -1435,31 +780,6 @@
       <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}}">
-      <Setter Property="Height" Value="40"/>
-      <Setter Property="Width" Value="50"/>
-      <Setter Property="Margin" Value="2.5,-2,2.5,2.5"/>
-   </Style>
-
-   <Style x:Key="PDFPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-      <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="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="EgtWPFLib5_InputButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="80"/>
-   </Style>
-
    <Style x:Key="ToolBar_SmallButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Height" Value="20"/>
       <Setter Property="Width" Value="20"/>
@@ -1467,26 +787,22 @@
    
    <!--#endregion Button Style-->
 
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
    <!--#region ToggleButton Style-->
 
-   <Style x:Key="ToolBarOnlyProdPage_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+   <Style x:Key="ToolBar_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>
 
-   <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>
-
-   <Style x:Key="OnlyProdToolBar_TextToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+   <Style x:Key="UpdateOrAppendWnd_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="70"/>
    </Style>
 
-   <Style x:Key="OnlyProdMainMenu_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+   <Style x:Key="MainMenu_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
       <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
       <Setter Property="TextBlock.FontWeight" Value="Normal"/>
       <Setter Property="FontSize" Value="15"/>
@@ -1534,7 +850,6 @@
                </Grid>
                <ControlTemplate.Triggers>
                   <Trigger Property="IsChecked" Value="True">
-                     <!--<Setter TargetName="BackgroundBorder" Property="Background" Value="MediumSeaGreen"/>-->
                      <Setter TargetName="Slider" Property="HorizontalAlignment" Value="Right"/>
                      <Setter TargetName="Slider" Property="Fill" Value="{StaticResource BeamWall_Kashmir}"/>
                   </Trigger>
@@ -1582,14 +897,10 @@
       </Setter>
    </Style>
 
-   <Style x:Key="BTLPanel_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
-      <Setter Property="Height" Value="20"/>
-      <Setter Property="Width" Value="25"/>
-      <Setter Property="Margin" Value="2,-2,2,-2"/>
-   </Style>
-
    <!--#endregion ToggleButton Style-->
 
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
    <!--#region TextBox-->
 
    <Style x:Key="Dimension_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
@@ -1626,7 +937,7 @@
       <Setter Property="TextWrapping" Value="Wrap"/>
    </Style>
 
-   <Style x:Key="OnlyProdWarehouseWndV_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
+   <Style x:Key="WarehouseWndV_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"/>
@@ -1639,11 +950,6 @@
       <Setter Property="HorizontalAlignment" Value="Right"/>
    </Style>
 
-   <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>
-
    <Style x:Key="Strategy_TextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
       <Setter Property="Height" Value="25"/>
       <Setter Property="VerticalContentAlignment" Value="Center"/>
@@ -1666,15 +972,11 @@
    
    <!--#endregion TextBox-->
 
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
    <!--#region Border-->
 
-   <Style x:Key="OnlyProdPage_Border" TargetType="{x:Type Border}">
-      <Setter Property="CornerRadius" Value="4"/>
-      <Setter Property="BorderThickness" Value="2"/>
-      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Glacier}"/>
-   </Style>
-
-   <Style x:Key="OnlyProdTotalTimeOTT_Border" TargetType="{x:Type Border}">
+   <Style x:Key="TotalTime_Border" TargetType="{x:Type Border}">
       <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Kashmir}"/>
       <Setter Property="Background" Value="{StaticResource BeamWall_Kashmir}"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
@@ -1684,7 +986,7 @@
       <Setter Property="CornerRadius" Value="2"/>
    </Style>
 
-   <Style x:Key="OnlyProdDoneTime_Border" TargetType="{x:Type Border}">
+   <Style x:Key="DoneTime_Border" TargetType="{x:Type Border}">
       <Setter Property="BorderBrush" Value="{StaticResource BeamWall_FruitSalad}"/>
       <Setter Property="Background" Value="{StaticResource BeamWall_FruitSalad}"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
@@ -1694,7 +996,7 @@
       <Setter Property="CornerRadius" Value="2"/>
    </Style>
 
-   <Style x:Key="OnlyProdRemainingTime_Border" TargetType="{x:Type Border}">
+   <Style x:Key="RemainingTime_Border" TargetType="{x:Type Border}">
       <Setter Property="BorderBrush" Value="{StaticResource BeamWall_FuelYellow}"/>
       <Setter Property="Background" Value="{StaticResource BeamWall_FuelYellow}"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
@@ -1704,92 +1006,31 @@
       <Setter Property="CornerRadius" Value="2"/>
    </Style>
 
-   <Style x:Key="OnlyProdQty_Border" TargetType="{x:Type Border}">
+   <Style x:Key="ProjectTypeWndV_Border" TargetType="{x:Type Border}">
       <Setter Property="Background" Value="{StaticResource BeamWall_White}"/>
-      <Setter Property="Margin" Value="15,20,25,0"/>
-   </Style>
-
-   <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>
-
-   <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>
-
-   <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>
-
-   <Style x:Key="OnlyProdQParameterList_Border" TargetType="{x:Type Border}">
-      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Glacier}"/>
-      <Setter Property="Margin" Value="1,0,0,0"/>
-      <Setter Property="BorderThickness" Value="2"/>
-      <Setter Property="CornerRadius" Value="4"/>
-   </Style>
-
-   <Style x:Key="CALC_FALL_Border" TargetType="{x:Type Border}">
-      <Setter Property="BorderThickness" Value="2"/>
-      <Setter Property="Padding" Value="1"/>
-   </Style>
-
-   <Style x:Key="OnlyProdProjectTypeWndV_Border" TargetType="{x:Type Border}">
+      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_DarkGray}"/>
       <Setter Property="BorderThickness" Value="1"/>
-      <Setter Property="BorderBrush" Value="DarkGray"/>
-      <Setter Property="Background" Value="{StaticResource BeamWall_White}"/>
       <Setter Property="Margin" Value="5"/>
    </Style>
 
    <!--#endregion Border-->
 
-   <!--#region EgtCustomWindow-->
-
-   <Style x:Key="OnlyProd_EgtCustomWindow" TargetType="{x:Type EgtWPFLib5:EgtCustomWindow}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
-      <Setter Property="TitleBarHeight" Value="40"/>
-      <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"/>
-      <Setter Property="Background">
-         <Setter.Value>
-            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
-               <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
-               <GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.45"/>
-               <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
-            </LinearGradientBrush>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <!--#endregion EgtCustomWindow-->
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!--#region ComboBox-->
 
-   <Style x:Key="OnlyProdCalcPanel_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource OnlyProd_ComboBox}">
-      <Setter Property="Height" Value="22"/>
-      <Setter Property="Width" Value="150"/>
-   </Style>
-
-   <Style x:Key="OnlyProdType_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource OnlyProd_ComboBox}">
+   <Style x:Key="ProdType_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource OnlyProd_ComboBox}">
       <Setter Property="Height" Value="22"/>
       <Setter Property="Width" Value="160"/>
       <Setter Property="Margin" Value="5,0,5,0"/>
    </Style>
 
-   <Style x:Key="OnlyProdPath_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource OnlyProd_ComboBox}">
+   <Style x:Key="ProdPath_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource OnlyProd_ComboBox}">
       <Setter Property="Height" Value="22"/>
       <Setter Property="Width" Value="100"/>
       <Setter Property="Margin" Value="0,0,5,0"/>
    </Style>
 
-   <Style x:Key="OnlyProdOptimizePanel_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource OnlyProd_ComboBox}">
-      <Setter Property="Height" Value="22"/>
-      <Setter Property="Width" Value="85"/>
-   </Style>
-
    <Style x:Key="BTLDateTypeList_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource OnlyProd_ComboBox}">
       <Setter Property="Height" Value="22"/>
       <Setter Property="MinWidth" Value="55"/>
@@ -1803,12 +1044,12 @@
       <Setter Property="Margin" Value="0,0,2.5,0"/>
    </Style>
 
-   <Style x:Key="OnyProd_FeatureComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource OnlyProd_ComboBox}">
+   <Style x:Key="OpenProjectFileDialog_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource OnlyProd_ComboBox}">
       <Setter Property="Height" Value="22"/>
       <Setter Property="MinWidth" Value="55"/>
    </Style>
 
-   <Style x:Key="OnlyProdWarehouse_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource OnlyProd_ComboBox}">
+   <Style x:Key="Warehouse_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource OnlyProd_ComboBox}">
       <Setter Property="Height" Value="22"/>
       <Setter Property="Width" Value="100"/>
    </Style>
@@ -1820,7 +1061,7 @@
       <Setter Property="FontSize" Value="15"/>
    </Style>
 
-   <Style x:Key="FeatureComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
+   <Style x:Key="Feature_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
       <Setter Property="Height" Value="24"/>
       <Setter Property="MinWidth" Value="55"/>
       <Setter Property="Margin" Value="5,-2,0,5"/>
@@ -1833,6 +1074,8 @@
    
    <!--#endregion ComboBox-->
 
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
    <!--#region CheckBox-->
 
    <Style x:Key="FreeContourInput_CheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
@@ -1840,12 +1083,12 @@
       <Setter Property="Margin" Value="5,0,5,0"/>
    </Style>
 
-   <Style x:Key="OnlyProdFeatureInPartInRawPartList_CheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
+   <Style x:Key="FeatureInPartInRawPartList_CheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="HorizontalAlignment" Value="Center"/>
    </Style>
 
-   <Style x:Key="OptionCheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
+   <Style x:Key="Option_CheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="HorizontalAlignment" Value="Right"/>
       <Setter Property="Margin" Value="10,5,10,0"/>
@@ -1853,9 +1096,11 @@
 
    <!--#endregion CheckBox-->
 
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
    <!--#region TabControl-->
 
-   <Style x:Key="OnlyProd_TabControl" TargetType="{x:Type TabControl}">
+   <Style x:Key="Optimizer_TabControl" TargetType="{x:Type TabControl}">
       <Setter Property="TabStripPlacement" Value="Top"/>
       <Setter Property="Margin" Value="5,5,2.5,5"/>
       <Setter Property="Background">
@@ -1872,169 +1117,36 @@
       </Style.Resources>
    </Style>
 
-   <Style x:Key="OnlyProdTabControl_OnlyHeaders"  TargetType="{x:Type TabControl}" BasedOn="{StaticResource OnlyProd_TabControl}">
-      <Setter Property="OverridesDefaultStyle" Value="True" />
-      <Setter Property="SnapsToDevicePixels" Value="True" />
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type TabControl}">
-               <Grid KeyboardNavigation.TabNavigation="Local">
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="Auto"/>
-                     <RowDefinition Height="*"/>
-                  </Grid.RowDefinitions>
-                  <TabPanel Name="HeaderPanel"
-                            Grid.Row="0"
-                            Panel.ZIndex="1" 
-                            Margin="0,0,4,-1" 
-                            IsItemsHost="True"
-                            KeyboardNavigation.TabIndex="1"
-                            Background="Transparent" />
-               </Grid>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsEnabled" Value="False">
-                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
    <!--#endregion TabControl-->
 
-   <!--#region Image-->
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <Style x:Key="UnitTime_Image" TargetType="{x:Type Image}">
-      <Setter Property="Height" Value="15"/>
-      <Setter Property="Stretch" Value="Uniform"/>
-   </Style>
+   <!--#region Image-->
 
    <Style x:Key="Macro_Image" TargetType="{x:Type Image}">
       <Setter Property="Width" Value="300"/>
       <Setter Property="Margin" Value="5,0,5,5"/>
    </Style>
 
-   <Style x:Key="OnlyProdFeatureList_Image" TargetType="{x:Type Image}">
-      <Setter Property="Stretch" Value="Uniform"/>
-      <Setter Property="Margin" Value="2.5"/>
-   </Style>
-
    <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>
-
-   <Style x:Key="LockImage" TargetType="{x:Type Image}">
-      <Setter Property="Source" Value="/Resources/PartManager/Locked.png" />
-      <Setter Property="Height" Value="15"/>
-      <Setter Property="Stretch" Value="Uniform"/>
-      <Style.Triggers>
-         <DataTrigger Binding="{Binding IsEnabled,RelativeSource={RelativeSource self}}" Value="False">
-            <Setter Property="Source" Value="/Resources/PartManager/Unlocked.png"/>
-         </DataTrigger>
-      </Style.Triggers>
-   </Style>
    
    <!--#endregion Image-->
 
-   <!--#region DataGridRow/DataGridCell-->
-
-   <Style x:Key="RowDataGrid_CustomHighLight" TargetType="{x:Type DataGridRow}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}" />
-      <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.Triggers>
-         <Trigger Property="IsSelected" Value="True">
-            <Setter Property="BorderBrush" Value="{StaticResource BeamWall_FountainBlue}" />
-            <Setter Property="FontWeight" Value="Bold" />
-            <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
-            <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}" />
-         </Trigger>
-      </Style.Triggers>
-   </Style>
-
-   <Style x:Key="CellDataGrid_CustomHighLight" TargetType="{x:Type DataGridCell}">
-      <Setter Property="Height" Value="24"/>
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}" />
-      <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.Triggers>
-         <Trigger Property="IsSelected" Value="True">
-            <Setter Property="BorderBrush" Value="{StaticResource BeamWall_FountainBlue}" />
-            <Setter Property="FontWeight" Value="Bold" />
-            <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
-            <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}" />
-         </Trigger>
-      </Style.Triggers>
-   </Style>
-
-   <Style x:Key="RowDataGrid_CustomHighLight_PartList" TargetType="{x:Type DataGridRow}">
-      <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.Triggers>
-         <Trigger Property="IsSelected" Value="True">
-            <Setter Property="BorderBrush" Value="{StaticResource BeamWall_YellowOrange}" />
-            <Setter Property="FontWeight" Value="Bold" />
-            <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
-            <Setter Property="Background" Value="{StaticResource BeamWall_YellowOrange}" />
-         </Trigger>
-      </Style.Triggers>
-   </Style>
-
-   <Style x:Key="CellDataGrid_CustomHighLight_PartList" TargetType="{x:Type DataGridCell}">
-      <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" />
-         <SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightBrushKey}" Color="Transparent" />
-         <SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightTextBrushKey}" Color="Black" />
-      </Style.Resources>
-      <Style.Triggers>
-         <Trigger Property="IsSelected" Value="True">
-            <Setter Property="BorderBrush" Value="{StaticResource BeamWall_YellowOrange}" />
-            <Setter Property="FontWeight" Value="Bold" />
-            <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
-            <Setter Property="Background" Value="{StaticResource BeamWall_YellowOrange}" />
-         </Trigger>
-      </Style.Triggers>
-   </Style>
-
-   <!--#endregion DataGridRow/DataGridCell-->
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!--#region ItemsControl-->
 
-   <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>
-
-   <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>
-
-   <Style x:Key="ItemsControl_ExpanderList" TargetType="{x:Type ItemsControl}" BasedOn="{StaticResource {x:Type ItemsControl}}">
+   <Style x:Key="ExpanderList_ItemsControl" 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>
 
-   <Style x:Key="ItemsControl_ExpanderElementList" TargetType="{x:Type ItemsControl}" BasedOn="{StaticResource {x:Type ItemsControl}}">
+   <Style x:Key="ExpanderElementList_ItemsControl" TargetType="{x:Type ItemsControl}" BasedOn="{StaticResource {x:Type ItemsControl}}">
       <Setter Property="BorderThickness" Value="0"/>
       <Setter Property="Margin" Value="0"/>
       <Setter Property="Padding" Value="0"/>
@@ -2043,53 +1155,40 @@
 
    <!--#endregion ItemsControl-->
 
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
    <!--#region StackPanel-->
 
-   <Style x:Key="OnlyProdBTLPartManager_StackPanel" TargetType="{x:Type StackPanel}">
+   <Style x:Key="BTLPartManager_StackPanel" TargetType="{x:Type StackPanel}">
       <Setter Property="Orientation" Value="Vertical"/>
    </Style>
 
-   <Style x:Key="OnlyProdPartManager_StackPanel" TargetType="{x:Type StackPanel}">
+   <Style x:Key="PartManager_StackPanel" TargetType="{x:Type StackPanel}">
       <Setter Property="Orientation" Value="Horizontal"/>
    </Style>
 
-   <Style x:Key="OnlyProdFeatureListManager_StackPanel" TargetType="{x:Type StackPanel}">
+   <Style x:Key="FeatureListManager_StackPanel" TargetType="{x:Type StackPanel}">
       <Setter Property="Orientation" Value="Vertical"/>
       <Setter Property="HorizontalAlignment" Value="Left"/>
-      <!--<Setter Property="Margin" Value="0,1,19,1"/>
-      <Setter Property="Height" Value="40"/>-->
    </Style>
 
-   <Style x:Key="OnlyProdRawPartManager_StackPanel" TargetType="{x:Type StackPanel}">
-      <Setter Property="Orientation" Value="Horizontal"/>
-      <Setter Property="HorizontalAlignment" Value="Left"/>
-      <Setter Property="Margin" Value="5,1,0,1"/>
-   </Style>
-
-   <Style x:Key="OnlyProdRawPartManagerAll_StackPanel" TargetType="{x:Type StackPanel}">
+   <Style x:Key="RawPartManager_StackPanel" TargetType="{x:Type StackPanel}">
       <Setter Property="Orientation" Value="Horizontal"/>
       <Setter Property="HorizontalAlignment" Value="Right"/>
       <Setter Property="Margin" Value="0,1,5,1"/>
    </Style>
 
-
-   <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>
-
-   <Style x:Key="StackPanel_List" TargetType="{x:Type StackPanel}">
+   <Style x:Key="List_StackPanel" TargetType="{x:Type StackPanel}">
       <Setter Property="Orientation" Value="Horizontal"/>
       <Setter Property="Margin" Value="5,5,5,0"/>
    </Style>
 
-   <Style x:Key="StackPanel" TargetType="{x:Type StackPanel}">
+   <Style x:Key="PDF_StackPanel" TargetType="{x:Type StackPanel}">
       <Setter Property="Orientation" Value="Vertical"/>
       <Setter Property="Margin" Value="0"/>
    </Style>
 
-   <Style x:Key="StackPanel_Button" TargetType="{x:Type StackPanel}">
+   <Style x:Key="Button_StackPanel" TargetType="{x:Type StackPanel}">
       <Setter Property="Orientation" Value="Vertical"/>
       <Setter Property="Margin" Value="2.5,0,0,0"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
@@ -2098,15 +1197,16 @@
 
    <!--#endregion StackPanel-->
 
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
    <!--#region ListBox-->
 
    <Style x:Key="NewAddFeature_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
+      <Setter Property="Background" Value="Transparent"/>
       <Setter Property="BorderThickness" Value="0"/>
       <Setter Property="Height" Value="585"/>
       <Setter Property="Width" Value="260"/>
       <Setter Property="Margin" Value="5"/>
-      <Setter Property="Background" Value="Transparent"/>
-      <!--<Setter Property="AlternationCount" Value="2"/>-->
       <Style.Resources>
          <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource OnlyProd_ScrollBar}"/>
          <Style TargetType="{x:Type ListBoxItem}">
@@ -2172,21 +1272,21 @@
    </Style>
 
    <Style x:Key="MacroCustom_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
+      <Setter Property="Background" Value="Transparent"/>
       <Setter Property="BorderThickness" Value="0"/>
       <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
       <Setter Property="Height" Value="610"/>
       <Setter Property="Width" Value="980"/>
       <Setter Property="Margin" Value="5"/>
-      <Setter Property="Background" Value="Transparent"/>
    </Style>
 
    <Style x:Key="MacroDefault_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
+      <Setter Property="Background" Value="Transparent"/>
       <Setter Property="BorderThickness" Value="0"/>
       <Setter Property="HorizontalAlignment" Value="Left"/>
       <Setter Property="Height" Value="585"/>
       <Setter Property="Width" Value="250"/>
       <Setter Property="Margin" Value="5"/>
-      <Setter Property="Background" Value="Transparent"/>
       <Setter Property="AlternationCount" Value="2"/>
       <Style.Resources>
          <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource OnlyProd_ScrollBar}"/>
@@ -2194,15 +1294,15 @@
    </Style>
 
    <Style x:Key="FeatureManager_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
+      <Setter Property="Background" Value="Transparent"/>
       <Setter Property="BorderThickness" Value="0"/>
       <Setter Property="HorizontalContentAlignment" Value="Center"/>
       <Setter Property="Height" Value="82"/>
       <Setter Property="Width" Value="80"/>
-      <Setter Property="Background" Value="Transparent"/>
       <Setter Property="AlternationCount" Value="2"/>
    </Style>
 
-   <Style x:Key="OnlyProdLeftPanel_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
+   <Style x:Key="LeftPanel_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
       <Setter Property="Background" Value="Transparent"/>
       <Setter Property="BorderThickness" Value="0"/>
       <Setter Property="HorizontalContentAlignment" Value="Center"/>
@@ -2253,7 +1353,7 @@
       </Setter>
    </Style>
 
-   <Style x:Key="OnlyProdWarehouseWndV_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
+   <Style x:Key="WarehouseWndV_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
       <Setter Property="Margin" Value="5"/>
       <Setter Property="MinHeight" Value="40"/>
    </Style>
@@ -2331,19 +1431,21 @@
    </Style>
 
    <Style x:Key="ListBox_PDF" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
+      <Setter Property="Background" Value="Transparent"/>
       <Setter Property="BorderThickness" Value="0"/>
       <Setter Property="Padding" Value="0"/>
       <Setter Property="Margin" Value="0"/>
       <Setter Property="VerticalContentAlignment" Value="Top"/>
       <Setter Property="HorizontalContentAlignment" Value="Left"/>
-      <Setter Property="Background" Value="Transparent"/>
    </Style>
    
    <!--#endregion ListBox-->
 
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
    <!--#region WrapPanel-->
 
-   <Style x:Key="OnlyProdProject_WrapPanel" TargetType="{x:Type WrapPanel}">
+   <Style x:Key="Project_WrapPanel" TargetType="{x:Type WrapPanel}">
       <Setter Property="Orientation" Value="Vertical"/>
    </Style>
 
@@ -2354,16 +1456,16 @@
 
    <!--#endregion WrapPanel-->
 
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
    <!--#region Grid-->
 
-   <Style x:Key="OnlyProdPartManager_Grid" TargetType="{x:Type Grid}">
-      <!--<Setter Property="Background" Value="{StaticResource BeamWall_White}"/>-->
-      <!--<Setter Property="Height" Value="70"/>-->
+   <Style x:Key="PartManager_Grid" TargetType="{x:Type Grid}">
       <Setter Property="HorizontalAlignment" Value="Left"/>
       <Setter Property="Margin" Value="10,10,0,10"/>
    </Style>
 
-   <Style x:Key="OnlyProdAddPart_Grid" TargetType="{x:Type Grid}">
+   <Style x:Key="AddPart_Grid" TargetType="{x:Type Grid}">
       <Setter Property="HorizontalAlignment" Value="Center"/>
       <Setter Property="Margin" Value="0,0,0,5"/>
    </Style>
@@ -2373,23 +1475,15 @@
       <Setter Property="HorizontalAlignment" Value="Center"/>
    </Style>
 
-   <Style x:Key="OnlyProdProjectType_Grid" TargetType="{x:Type Grid}">
+   <Style x:Key="ProjectType_Grid" TargetType="{x:Type Grid}">
       <Setter Property="HorizontalAlignment" Value="Center"/>
       <Setter Property="Margin" Value="15"/>
    </Style>
 
-   <Style x:Key="ProjFileList_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="TextBlock.FontSize" Value="12"/>
-      <Setter Property="TextBlock.FontWeight" Value="Normal"/>
-   </Style>
-
-   <Style x:Key="Gray_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="Background" Value="Gray"/>
-      <Setter Property="Margin" Value="40,0,40,0"/>
-   </Style>
-
    <!--#endregion Grid-->
 
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
    <!--#region Ellipse-->
 
    <Style x:Key="CALC_ROT_Ellipse" TargetType="{x:Type Ellipse}">
@@ -2462,7 +1556,6 @@
 
    <!--#endregion Expander-->
 
-   <!--#endregion GRAFICA NUOVA PAGINA-->
 
    <!--#region Finestre Egt-->
 
diff --git a/EgtBEAMWALL.Optimizer/ViewPanel/ViewPanelV.xaml b/EgtBEAMWALL.Optimizer/ViewPanel/ViewPanelV.xaml
index 25fec0a9..7f317dd9 100644
--- a/EgtBEAMWALL.Optimizer/ViewPanel/ViewPanelV.xaml
+++ b/EgtBEAMWALL.Optimizer/ViewPanel/ViewPanelV.xaml
@@ -1,7 +1,7 @@
 <StackPanel x:Class="ViewPanelV"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            Style="{StaticResource OnlyProdBTLPartManager_StackPanel}">
+            Style="{StaticResource BTLPartManager_StackPanel}">
 
    <Button ToolTip="{Binding ZoomAllToolTip}"
            Command="{Binding ZoomAllCommand}"
diff --git a/EgtBEAMWALL.Optimizer/WarehouseWnd/WarehouseWndV.xaml b/EgtBEAMWALL.Optimizer/WarehouseWnd/WarehouseWndV.xaml
index b88d2420..90e6e3dd 100644
--- a/EgtBEAMWALL.Optimizer/WarehouseWnd/WarehouseWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/WarehouseWnd/WarehouseWndV.xaml
@@ -46,7 +46,7 @@
          <TextBlock Grid.Row="0"
                     Text="{Binding CurrentS_Msg}"
                     Visibility="{Binding Basic_Visibility}"
-                    Style="{StaticResource OnlyProdPartParam_TextBlock}"/>
+                    Style="{StaticResource PartParam_TextBlock}"/>
          <ComboBox Grid.Row="0"
                    Grid.Column="1"
                    ItemsSource="{Binding Path=SParamList, 
@@ -55,12 +55,12 @@
                                           Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                    DisplayMemberPath="sValue"
                    Visibility="{Binding Basic_Visibility}"
-                   Style="{StaticResource OnlyProdWarehouse_ComboBox}"/>
+                   Style="{StaticResource Warehouse_ComboBox}"/>
 
          <TextBlock Grid.Row="1"
                     Text="{Binding StartOffset_Msg}"
                     Visibility="{Binding StartOffset_Visibility}"
-                    Style="{StaticResource OnlyProdPartParam_TextBlock}"/>
+                    Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Row="1"
                                 Grid.Column="1"
                                 Text="{Binding dStartOffset, UpdateSourceTrigger=PropertyChanged}"
@@ -124,23 +124,23 @@
                   </Grid.ColumnDefinitions>
                   <TextBlock Grid.Column="0"
                              Text="{Binding MinThickness_Msg}"
-                             Style="{StaticResource OnlyProdNestingRunningWndV_TextBlock}"/>
+                             Style="{StaticResource NestingRunningWndV_TextBlock}"/>
                   <TextBlock Grid.Column="1"
                              Text="{Binding Value_Msg}"
-                             Style="{StaticResource OnlyProdNestingRunningWndV_TextBlock}"/>
+                             Style="{StaticResource NestingRunningWndV_TextBlock}"/>
                   <TextBlock Grid.Column="2"
                              Text="{Binding MaxThickness_Msg}"
-                             Style="{StaticResource OnlyProdNestingRunningWndV_TextBlock}"/>
+                             Style="{StaticResource NestingRunningWndV_TextBlock}"/>
                </Grid>
 
                <Button Content="+" 
                        Grid.Column="1"
                        Command="{Binding AddWhWallParam_Command}"
-                       Style="{StaticResource OnlyProdWWnd_SmallButton}"/>
+                       Style="{StaticResource WWnd_Button}"/>
                <Button Content="-" 
                        Grid.Column="2"
                        Command="{Binding RemoveWhWallParam_Command}"
-                       Style="{StaticResource OnlyProdWWnd_SmallButton}"/>
+                       Style="{StaticResource WWnd_Button}"/>
 
                <Grid Grid.Row="1" 
                      Grid.Column="0">
@@ -156,13 +156,13 @@
                                  </Grid.ColumnDefinitions>
                                  <TextBlock Grid.Column="0"
                                             Text="{Binding dMinThickness, Mode=OneWay}"
-                                            Style="{StaticResource OnlyProdWarehouseWndV_TextBlock}"/>
+                                            Style="{StaticResource WarehouseWndV_TextBlock}"/>
                                  <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                                         Text="{Binding dOffset, UpdateSourceTrigger=Explicit}"
-                                                        Style="{StaticResource OnlyProdWarehouseWndV_TextBox}"/>
+                                                        Style="{StaticResource WarehouseWndV_TextBox}"/>
                                  <EgtWPFLib5:EgtTextBox Grid.Column="2"
                                                         Text="{Binding dMaxThickness, UpdateSourceTrigger=Explicit}"
-                                                        Style="{StaticResource OnlyProdWarehouseWndV_TextBox}"/>
+                                                        Style="{StaticResource WarehouseWndV_TextBox}"/>
                               </Grid>
                            </DataTemplate>
                         </ItemsControl.ItemTemplate>
@@ -182,7 +182,7 @@
          <ListBox ItemsSource="{Binding SParamList}" 
                   SelectedItem="{Binding SelSParam}"
                   DisplayMemberPath="sValue"
-                  Style="{StaticResource OnlyProdWarehouseWndV_ListBox}"/>
+                  Style="{StaticResource WarehouseWndV_ListBox}"/>
       </GroupBox>
 
       <GroupBox Grid.Row="1" 
@@ -197,7 +197,7 @@
                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
             <Grid Grid.Row="0"
-                  Style="{StaticResource OnlyProdAddPart_Grid}">
+                  Style="{StaticResource AddPart_Grid}">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="1*"/>
@@ -207,11 +207,11 @@
                <Button Grid.Column="2"
                        Content="+" 
                        Command="{Binding AddMediumParam_Command}"
-                       Style="{StaticResource OnlyProdWWnd_SmallButton}"/>
+                       Style="{StaticResource WWnd_Button}"/>
                <Button Grid.Column="3"
                        Content="-" 
                        Command="{Binding RemoveMediumParam_Command}"
-                       Style="{StaticResource OnlyProdWWnd_SmallButton}"/>
+                       Style="{StaticResource WWnd_Button}"/>
             </Grid>
             <EgwWPFBaseLib:EgwDataGrid Grid.Row="1"
                                        ItemsSource="{Binding SParamList}" 
@@ -221,7 +221,7 @@
                                        AlternationCount="2"
                                        ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
                                        ColumnLayouts="{Binding SParamColumns}"
-                                       Style="{StaticResource DataGrid_OnlyProd}"
+                                       Style="{StaticResource Optimizer_DataGrid}"
                                        CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
                                        RowStyle="{StaticResource RowDataGrid_CustomHighLight}">
                <DataGrid.Resources>
@@ -291,7 +291,7 @@
 
       <Grid Grid.Row="2" 
             Visibility="{Binding AddRemoveBtns_Visibility}"
-            Style="{StaticResource OnlyProdAddPart_Grid}">
+            Style="{StaticResource AddPart_Grid}">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
@@ -305,14 +305,14 @@
                  Grid.Column="0"
                  Content="+"
                  Command="{Binding AddParam_Command}"
-                 Style="{StaticResource OnlyProdWarehouseWndV_Button}">
+                 Style="{StaticResource WarehouseWndV_Button}">
          </Button>
 
          <Button Grid.Row="1"
                  Grid.Column="1"
                  Content="-"  
                  Command="{Binding RemoveParam_Command}"
-                 Style="{StaticResource OnlyProdWarehouseWndV_Button}">
+                 Style="{StaticResource WarehouseWndV_Button}">
          </Button>
       </Grid>
 
@@ -405,7 +405,7 @@
       </GroupBox>
 
       <Grid Grid.Row="4"
-            Style="{StaticResource OnlyProdAddPart_Grid}">
+            Style="{StaticResource AddPart_Grid}">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>