diff --git a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb
index e2b16891..d5985fbd 100644
--- a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb	
+++ b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb	
@@ -38,5 +38,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("3.1.7.4")>
-<Assembly: AssemblyFileVersion("3.1.7.4")>
+<Assembly: AssemblyVersion("3.1.8.1")>
+<Assembly: AssemblyFileVersion("3.1.8.1")>
diff --git a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml
index f7d214d8..32139fba 100644
--- a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml
+++ b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml
@@ -38,12 +38,19 @@
                </Grid.ColumnDefinitions>
                <ComboBox ItemsSource="{Binding BTLDateTypeList}"
                          SelectedIndex="{Binding SelBTLDateType}"
-                         Style="{StaticResource BTLDateTypeList_ComboBox}"/>
+                         Height="22"
+                         MinWidth="55"
+                         Width="105"
+                         Margin="5"
+                         Style="{StaticResource Optmizer_ComboBox}"/>
                <StackPanel Grid.Column="1" 
                            Style="{StaticResource PartManager_StackPanel}">
                   <ComboBox ItemsSource="{Binding DayTypeList}"
                             SelectedIndex="{Binding SelDayType}"
-                            Style="{StaticResource DayTypeList_ComboBox}"/>
+                            Height="22"
+                            Width="105"
+                            Margin="0,0,2.5,0"
+                            Style="{StaticResource Optmizer_ComboBox}"/>
                   <StackPanel Visibility="{Binding Date_Visibility}"
                               Style="{StaticResource PartManager_StackPanel}">
                      <TextBlock Text="{Binding From_Msg}"
@@ -82,7 +89,9 @@
                              Style="{StaticResource Option_TextBlock}"/>
                   <ComboBox ItemsSource="{Binding RowQuantityList}"
                             SelectedIndex="{Binding SelRowQuantity}"
-                            Style="{StaticResource OpenProjectFileDialog_ComboBox}"/>
+                            Height="22"
+                            MinWidth="55"
+                            Style="{StaticResource Optmizer_ComboBox}"/>
                </StackPanel>
             </Grid>
          </Grid>
diff --git a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
index a072b249..91d08de3 100644
--- a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
+++ b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.7.2")]
-[assembly: AssemblyFileVersion("3.1.7.2")]
+[assembly: AssemblyVersion("3.1.8.1")]
+[assembly: AssemblyFileVersion("3.1.8.1")]
diff --git a/EgtBEAMWALL.Optimizer/AddFeatureWnd/AddFeatureWndV.xaml b/EgtBEAMWALL.Optimizer/AddFeatureWnd/AddFeatureWndV.xaml
index 5b7b72e2..4e09a59c 100644
--- a/EgtBEAMWALL.Optimizer/AddFeatureWnd/AddFeatureWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/AddFeatureWnd/AddFeatureWndV.xaml
@@ -18,12 +18,20 @@
          <RowDefinition Height="1*"/>
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
-      <Border Style="{StaticResource AddFeatureWnd_Border}">
+      <Border Background="{StaticResource Border.AddFeature.Background}"
+              CornerRadius="4,0,0,4"
+              Margin="0,2,0,2">
       <TextBlock Text="{Binding Process_Msg}"
-                 Style="{StaticResource List_TextBlock}"/>
+                 HorizontalAlignment="Center"
+                 VerticalAlignment="Center"
+                 FontSize="20"
+                 Margin="10,0,10,0"
+                 Style="{StaticResource ForegroundWhite_TextBlock}"/>
       </Border>
       <Border Grid.Row="1" 
-              Style="{StaticResource PRCList_Border}">
+              BorderBrush="{StaticResource Border.PRC.Border}"
+              CornerRadius="4,0,0,4"
+              Margin="2,2,0,2">
          <ListBox Grid.Row="1"
                   ItemsSource="{Binding PRCListView}"
                   SelectedItem="{Binding nSelPRC}"
@@ -34,23 +42,39 @@
                   <TextBlock Text="{Binding ghDesc}"
                              ToolTip="{Binding ghDesc}"
                              Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type ListBox}}}"
-                             Style="{StaticResource PRCList_TextBlock}"/>
+                             HorizontalAlignment="Center"
+                             VerticalAlignment="Center"
+                             TextAlignment="Justify"
+                             TextWrapping="Wrap"
+                             Margin="10,5,10,0"/>
                </DataTemplate>
             </ListBox.ItemTemplate>
          </ListBox>
       </Border>
       <Border Grid.Column="1"
-              Style="{StaticResource Custom_Border}">
+              Background="{StaticResource Border.Custom.Background}"
+              BorderThickness="0,2,0,2">
          <TextBlock Grid.Column="1"
                     Text="{Binding Custom_Msg}"
-                    Style="{StaticResource List_TextBlock}"/>
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="20"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundWhite_TextBlock}"/>
       </Border>
       <Border Grid.Row="1" 
               Grid.Column="1" 
-              Style="{StaticResource MacroCustomList_Border}">
+              BorderBrush="{StaticResource Border.MacroCustom.Border}"
+              BorderThickness="0,2,0,2"
+              CornerRadius="0">
          <ListBox ItemsSource="{Binding MacroCustomList}"
                   SelectedIndex="{Binding nSelMacroCustom}"
-                  Style="{StaticResource MacroCustom_ListBox}">
+                  Background="{StaticResource ListBox.MacroCustom.Background}"
+                  BorderThickness="0"
+                  Height="610"
+                  Width="980"
+                  Margin="5"
+                  ScrollViewer.HorizontalScrollBarVisibility="Disabled">
             <ListBox.ItemsPanel>
                <ItemsPanelTemplate>
                   <WrapPanel Orientation="Horizontal"
@@ -65,23 +89,37 @@
                         <RowDefinition Height="1*"/>
                      </Grid.RowDefinitions>
                      <TextBlock Text="{Binding sMacroName}"
-                                Style="{StaticResource Macro_TextBlock}"/>
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Top"
+                                FontSize="14"
+                                Margin="5"
+                                Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                      <Image Grid.Row="1" 
                             Source="{Binding sMacroDrawPath}"
-                            Style="{StaticResource Macro_Image}"/>
+                            Width="300"
+                            Margin="5,0,5,5"/>
                   </Grid>
                </DataTemplate>
             </ListBox.ItemTemplate>
          </ListBox>
       </Border>
       <Border Grid.Column="2" 
-              Style="{StaticResource Default_Border}">
+              Background="{StaticResource Border.Default.Background}"
+              CornerRadius="0,4,4,0"
+              Padding="0,10,0,10"
+              Margin="0,2,0,2">
          <TextBlock Text="{Binding Default_Msg}"
-                    Style="{StaticResource List_TextBlock}"/>
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="20"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundWhite_TextBlock}"/>
       </Border>
       <Border Grid.Row="1" 
               Grid.Column="2" 
-              Style="{StaticResource MacroDefaultList_Border}">
+              BorderBrush="{StaticResource Border.MacroDefault.Border}"
+              BorderThickness="0,2,2,2"
+              CornerRadius="0,4,4,0">
          <ListBox ItemsSource="{Binding MacroDefaultList}"
                   SelectedIndex="{Binding nSelMacroDefault}"
                   Style="{StaticResource MacroDefault_ListBox}"
@@ -89,7 +127,12 @@
             <ListBox.ItemTemplate>
                <DataTemplate>
                   <TextBlock Text="{Binding sMacroName}"
-                             Style="{StaticResource MacroDefault_TextBlock}"/>
+                             HorizontalAlignment="Left"
+                             VerticalAlignment="Top"
+                             TextAlignment="Justify"
+                             Width="239"
+                             Margin="2.5"
+                             Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                </DataTemplate>
             </ListBox.ItemTemplate>
          </ListBox>
@@ -97,7 +140,7 @@
       <UniformGrid Columns="2"
                    Grid.Row="2"
                    Grid.ColumnSpan="3"
-                   Style="{StaticResource AddFeatureWnd_UniformGrid}">
+                   Margin="5">
          <Button Content="{Binding OK_Msg}"
                  Command="{Binding Ok_Command}"
                  IsDefault="True"
diff --git a/EgtBEAMWALL.Optimizer/AddPartWnd/AddPartWndV.xaml b/EgtBEAMWALL.Optimizer/AddPartWnd/AddPartWndV.xaml
index 2cff6d5a..299ec9c7 100644
--- a/EgtBEAMWALL.Optimizer/AddPartWnd/AddPartWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/AddPartWnd/AddPartWndV.xaml
@@ -8,7 +8,7 @@
                                  Title="AddPartWndV"
                                  Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
 
-   <Grid Style="{StaticResource AddPartWndV_Grid}">
+   <Grid Margin="5,5,5,0">
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
@@ -26,7 +26,8 @@
                     Style="{StaticResource Option_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding sNAM}"
-                                Style="{StaticResource NAM_TextBox}"/>
+                                Width="200"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
       </Grid>
       <Grid Grid.Row="1"
             Margin="0,0,0,5">
@@ -40,13 +41,19 @@
                     Style="{StaticResource Option_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding nPDN}"
-                                Style="{StaticResource Dimension_TextBox}"/>
+                                VerticalContentAlignment="Center"
+                                Height="25"
+                                Width="50"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Grid.Column="2"
                     Text="Count"
                     Style="{StaticResource Option_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="3"
                                 Text="{Binding sCNT}"
-                                Style="{StaticResource Dimension_TextBox}"/>
+                                VerticalContentAlignment="Center"
+                                Height="25"
+                                Width="50"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
       </Grid>
       <Grid Grid.Row="2"
             Margin="0,0,0,5">
@@ -62,24 +69,33 @@
                     Style="{StaticResource Option_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding sW}"
-                                Style="{StaticResource Dimension_TextBox}"/>
+                                VerticalContentAlignment="Center"
+                                Height="25"
+                                Width="50"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Grid.Column="2"
                     Text="H"
                     Style="{StaticResource Option_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="3"
                                 Text="{Binding sH}"
-                                Style="{StaticResource Dimension_TextBox}"/>
+                                VerticalContentAlignment="Center"
+                                Height="25"
+                                Width="50"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Grid.Column="4"
                     Text="L"
                     Style="{StaticResource Option_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="5"
                                 Text="{Binding sL}"
-                                Style="{StaticResource Dimension_TextBox}"/>
+                                VerticalContentAlignment="Center"
+                                Height="25"
+                                Width="65"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
       </Grid>
 
       <UniformGrid Grid.Row="3"
                    Columns="2"
-                   Style="{StaticResource AddPartWnd_UniformGrid}">
+                   Margin="0,5,0,5">
          <Button Content="Ok"
                  Command="{Binding Ok_Command}"
                  IsDefault="True"
diff --git a/EgtBEAMWALL.Optimizer/AddRawPartWnd/AddRawPartWndV.xaml b/EgtBEAMWALL.Optimizer/AddRawPartWnd/AddRawPartWndV.xaml
index 006a5957..24aa4b68 100644
--- a/EgtBEAMWALL.Optimizer/AddRawPartWnd/AddRawPartWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/AddRawPartWnd/AddRawPartWndV.xaml
@@ -18,7 +18,8 @@
                 SelectedItem="{Binding SelDimension}"
                 DisplayMemberPath="sDimension"
                 Visibility="{Binding DimensionsList_Visibility}"
-                Style="{StaticResource AddRawPartWnd_ComboBox}"/>
+                Margin="0,0,0,5"
+                Style="{StaticResource Optmizer_ComboBox}"/>
       <ItemsControl Grid.Row="1"
                     ItemsSource="{Binding VariableList}">
          <ItemsControl.ItemTemplate>
@@ -32,7 +33,8 @@
                              Style="{StaticResource Option_TextBlock}"/>
                   <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                          Text="{Binding sValue}"
-                                         Style="{StaticResource Value_TextBox}"/>
+                                         Width="65"
+                                         Style="{StaticResource EgtOptmizer_TextBox}"/>
                </Grid>
             </DataTemplate>
          </ItemsControl.ItemTemplate>
@@ -44,7 +46,10 @@
                  Content="Ok"
                  Command="{Binding Ok_Command}"
                  IsDefault="True"
-                 Style="{StaticResource AddRawPartWnd_Button}"/>
+                 Height="30"
+                 Width="80"
+                 Margin="0,0,5,0"
+                 Style="{StaticResource Optimizer_Button}"/>
          <Button Grid.Column="3"
                  Content="Cancel"
                  IsCancel="True"
diff --git a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml
index 25902e6a..2ab62b86 100644
--- a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml
@@ -21,7 +21,13 @@
             <StackPanel Style="{StaticResource MachinePanel_StackPanel}">
                <ComboBox ItemsSource="{Binding StrategySetupList}" 
                          SelectedItem="{Binding SelStrategySetup, UpdateSourceTrigger=PropertyChanged}"
-                         Style="{StaticResource BTLDataWnd_ComboBox}">
+                         Foreground="{StaticResource BeamWall_Black}"
+                         HorizontalAlignment="Center"
+                         FontSize="15"
+                         Height="30"
+                         Width="160"
+                         Margin="0,10,0,10"
+                         Style="{StaticResource Optmizer_ComboBox}">
                   <ComboBox.ItemContainerStyle>
                      <Style TargetType="{x:Type ComboBoxItem}">
                         <EventSetter Event="PreviewMouseDown" Handler="ComboBoxItem_PreviewMouseDown"/>
@@ -29,7 +35,13 @@
                   </ComboBox.ItemContainerStyle>
                </ComboBox>
                <TextBlock Text="{Binding ErrText}"
-                          Style="{StaticResource ErrConfig_TextBlock}"/>
+                          Foreground="{StaticResource BeamWall_Red}"
+                          HorizontalAlignment="Center"
+                          VerticalAlignment="Center"
+                          TextAlignment="Justify"
+                          TextWrapping="Wrap"
+                          FontSize="13"
+                          Margin="10,0,0,0"/>
             </StackPanel>
             <Grid Grid.Row="1">
                <Grid.RowDefinitions>
@@ -44,16 +56,23 @@
                                              Tag="{Binding GeneralParametersList}"/>
                <UniformGrid Grid.Column="1"
                             Columns="2" 
-                            Style="{StaticResource BTLDataWnd_UniformGrid}">
+                            VerticalAlignment="Bottom"
+                            Margin="0,0,5,0">
                   <Button Command="{Binding Ok_Command}"
                           ToolTip="{Binding SaveAsToolTip}"
-                          Style="{StaticResource OKBTLDataWnd_Button}">
+                          Height="40"
+                          Width="40"
+                          Margin="0,0,5,5"
+                          Style="{StaticResource Optimizer_Button}">
                      <Image Source="{StaticResource Ok_Image}"
                             Style="{StaticResource BTLDataWnd_Image}"/>
                   </Button>
                   <Button Command="{Binding Cancel_Command}"
                           ToolTip="{Binding SaveAsToolTip}"
-                          Style="{StaticResource BTLDataWnd_Button}">
+                          Height="40"
+                          Width="40"
+                          Margin="0,0,0,5"
+                          Style="{StaticResource Optimizer_Button}">
                      <Image Source="{StaticResource Delete_Image}"
                             Style="{StaticResource BTLDataWnd_Image}"/>
                   </Button>
@@ -66,73 +85,127 @@
                       Columns="6" 
                       Rows="7">
             <TextBlock Text="{Binding PROJNUM_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                    Text="{Binding CurrBTLStructure.sPROJNUM, UpdateSourceTrigger=LostFocus}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Width="150"
+                                   Margin="5"
+                                   Style="{StaticResource EgtOptmizer_TextBox}"/>
             <TextBlock Text="{Binding PROJNAME_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                    Text="{Binding CurrBTLStructure.sPROJNAME, UpdateSourceTrigger=LostFocus}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Width="150"
+                                   Margin="5"
+                                   Style="{StaticResource EgtOptmizer_TextBox}"/>
             <TextBlock Text="{Binding PROJPART_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                    Text="{Binding CurrBTLStructure.sPROJPART, UpdateSourceTrigger=LostFocus}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Width="150"
+                                   Margin="5"
+                                   Style="{StaticResource EgtOptmizer_TextBox}"/>
             <TextBlock Text="{Binding PROJGUID_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                    Text="{Binding CurrBTLStructure.sPROJGUID, UpdateSourceTrigger=LostFocus}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Width="150" 
+                                   Margin="5"
+                                   Style="{StaticResource EgtOptmizer_TextBox}"/>
             <TextBlock Text="{Binding LISTNAME_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                    Text="{Binding CurrBTLStructure.sLISTNAME, UpdateSourceTrigger=LostFocus}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Width="150"
+                                   Margin="5"
+                                   Style="{StaticResource EgtOptmizer_TextBox}"/>
             <TextBlock Text="{Binding CUSTOMER_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                    Text="{Binding CurrBTLStructure.sCUSTOMER, UpdateSourceTrigger=LostFocus}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Width="150"
+                                   Margin="5"
+                                   Style="{StaticResource EgtOptmizer_TextBox}"/>
             <TextBlock Text="{Binding ARCHITECT_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                    Text="{Binding CurrBTLStructure.sARCHITECT, UpdateSourceTrigger=LostFocus}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Width="150"
+                                   Margin="5"
+                                   Style="{StaticResource EgtOptmizer_TextBox}"/>
             <TextBlock Text="{Binding EDITOR_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                    Text="{Binding CurrBTLStructure.sEDITOR, UpdateSourceTrigger=LostFocus}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Width="150"
+                                   Margin="5"
+                                   Style="{StaticResource EgtOptmizer_TextBox}"/>
             <TextBlock Text="{Binding DELIVDATE_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                    Text="{Binding sDELIVDATE, UpdateSourceTrigger=Explicit,
                                                   RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}}}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Width="150"
+                                   Margin="5"
+                                   Style="{StaticResource EgtOptmizer_TextBox}"/>
             <TextBlock Text="{Binding EXPDATE_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                    Text="{Binding CurrBTLStructure.sEXPDATE, UpdateSourceTrigger=LostFocus}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Width="150"
+                                   Margin="5"
+                                   Style="{StaticResource EgtOptmizer_TextBox}"/>
             <TextBlock Text="{Binding EXPTIME_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                    Text="{Binding CurrBTLStructure.sEXPTIME, UpdateSourceTrigger=LostFocus}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Width="150"
+                                   Margin="5"
+                                   Style="{StaticResource EgtOptmizer_TextBox}"/>
             <TextBlock Text="{Binding EXPRELEASE_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                    Text="{Binding CurrBTLStructure.sEXPRELEASE, UpdateSourceTrigger=LostFocus}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Width="150"
+                                   Margin="5"
+                                   Style="{StaticResource EgtOptmizer_TextBox}"/>
             <TextBlock Text="{Binding LANGUAGE_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                    Text="{Binding CurrBTLStructure.sLANGUAGE, UpdateSourceTrigger=LostFocus}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Width="150"
+                                   Margin="5"
+                                   Style="{StaticResource EgtOptmizer_TextBox}"/>
             <TextBlock Text="{Binding RANGE_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <ComboBox Grid.Column="1"
                       ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}},
                                             Path=Tag.ocRANGE,
@@ -140,9 +213,12 @@
                       SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}},
                                               Path=Tag.SelRANGE,
                                               Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                      Style="{StaticResource PartParam_ComboBox}"/>
+                      Height="22"
+                      Width="150"/>
             <TextBlock Text="{Binding PROCESSINGQUALITY_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <ComboBox Grid.Column="1"
                       ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}},
                                             Path=Tag.ocPROCESSINGQUALITY,
@@ -150,29 +226,48 @@
                       SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}},
                                               Path=Tag.SelPROCESSINGQUALITY,
                                               Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                      Style="{StaticResource PartParam_ComboBox}"/>
+                      Height="22"
+                      Width="150"/>
             <TextBlock Text="{Binding COMPUTERNAME_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                    Text="{Binding CurrBTLStructure.sCOMPUTERNAME, UpdateSourceTrigger=LostFocus}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Width="150"
+                                   Margin="5"
+                                   Style="{StaticResource EgtOptmizer_TextBox}"/>
             <TextBlock Text="{Binding USER_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                    Text="{Binding CurrBTLStructure.sUSER, UpdateSourceTrigger=LostFocus}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Width="150"
+                                   Margin="5"
+                                   Style="{StaticResource EgtOptmizer_TextBox}"/>
             <TextBlock Text="{Binding SRCFILE_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                    Text="{Binding CurrBTLStructure.sSRCFILE, UpdateSourceTrigger=LostFocus}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Width="150"
+                                   Margin="5"
+                                   Style="{StaticResource EgtOptmizer_TextBox}"/>
             <TextBlock Text="{Binding EXPFILE_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                    Text="{Binding CurrBTLStructure.sEXPFILE, UpdateSourceTrigger=LostFocus}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Width="150"
+                                   Margin="5"
+                                   Style="{StaticResource EgtOptmizer_TextBox}"/>
             <TextBlock Text="{Binding RECESS_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <ComboBox Grid.Column="1"
                       ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}},
                                             Path=Tag.ocRECESS,
@@ -180,12 +275,17 @@
                       SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}},
                                               Path=Tag.SelRECESS,
                                               Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                      Style="{StaticResource PartParam_ComboBox}"/>
+                      Height="22"
+                      Width="150"/>
             <TextBlock Text="{Binding USERATTRIBUTE_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                    Text="{Binding CurrBTLStructure.sUSERATTRIBUTE, UpdateSourceTrigger=LostFocus}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Width="150"
+                                   Margin="5"
+                                   Style="{StaticResource EgtOptmizer_TextBox}"/>
 
          </UniformGrid>
       </TabItem>
diff --git a/EgtBEAMWALL.Optimizer/BlockedWnd/BlockedWndV.xaml b/EgtBEAMWALL.Optimizer/BlockedWnd/BlockedWndV.xaml
index e2a774ac..1fb30f12 100644
--- a/EgtBEAMWALL.Optimizer/BlockedWnd/BlockedWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/BlockedWnd/BlockedWndV.xaml
@@ -19,7 +19,9 @@
       </Grid.RowDefinitions>
       <TextBlock Grid.Row="1"
                  Text="{Binding Msg_Text}"
-                 Style="{StaticResource Msg_TextBlock}"/>
+                 TextAlignment="Center"
+                 Margin="40,0,40,0"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <Grid Margin="5">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
diff --git a/EgtBEAMWALL.Optimizer/CALCPanel/CalcPanelV.xaml b/EgtBEAMWALL.Optimizer/CALCPanel/CalcPanelV.xaml
index fecac299..1284b580 100644
--- a/EgtBEAMWALL.Optimizer/CALCPanel/CalcPanelV.xaml
+++ b/EgtBEAMWALL.Optimizer/CALCPanel/CalcPanelV.xaml
@@ -27,7 +27,12 @@
       <Button Grid.Column="1"
               Content="OK"
               Command="{Binding Ok_Command}"
-              Style="{StaticResource CalcPanel_Button}"/>
+              FontWeight="Light"
+              FontSize="10"
+              Height="30"
+              Width="30"
+              Margin="5,2,5,2"
+              Style="{StaticResource Optimizer_Button}"/>
    </Grid>
 
 </StackPanel>
diff --git a/EgtBEAMWALL.Optimizer/ChangeMaterialWnd/ChangeMaterialWndV.xaml b/EgtBEAMWALL.Optimizer/ChangeMaterialWnd/ChangeMaterialWndV.xaml
index 93391c12..f58a9641 100644
--- a/EgtBEAMWALL.Optimizer/ChangeMaterialWnd/ChangeMaterialWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/ChangeMaterialWnd/ChangeMaterialWndV.xaml
@@ -28,8 +28,11 @@
                     Style="{StaticResource Option_TextBlock}"/>
          <ComboBox Grid.Column="1"
                    ItemsSource="{Binding ProjMaterialList}"
-                   SelectedItem="{Binding SelProjMaterial}"                   
-                   Style="{StaticResource ProjMaterial_ComboBox}"/>
+                   SelectedItem="{Binding SelProjMaterial}" 
+                   Height="24"
+                   MinWidth="55"
+                   Width="150"
+                   Margin="5,-2,0,5"/>
       </Grid>
       <Grid Grid.Row="1"
             HorizontalAlignment="Center"
@@ -43,7 +46,10 @@
          <ComboBox Grid.Column="1"
                    ItemsSource="{Binding WhMaterialList}"
                    SelectedItem="{Binding SelWhMaterial}"                   
-                   Style="{StaticResource ProjMaterial_ComboBox}"/>
+                   Height="24"
+                   MinWidth="55"
+                   Width="150"
+                   Margin="5,-2,0,5"/>
       </Grid>
 
       <Grid Grid.Row="2"
diff --git a/EgtBEAMWALL.Optimizer/ChangeParameterWnd/ChangeParameterWndV.xaml b/EgtBEAMWALL.Optimizer/ChangeParameterWnd/ChangeParameterWndV.xaml
index f690240e..30a11c5c 100644
--- a/EgtBEAMWALL.Optimizer/ChangeParameterWnd/ChangeParameterWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/ChangeParameterWnd/ChangeParameterWndV.xaml
@@ -32,7 +32,10 @@
                 ItemsSource="{Binding PRCList}"
                 SelectedItem="{Binding SelPRC}"
                 DisplayMemberPath="ghDesc"
-                Style="{StaticResource PRCList_ComboBox}"/>
+                HorizontalAlignment="Stretch"
+                Height="24"
+                MinWidth="55"
+                Margin="5,-2,0,5"/>
 
       <TextBlock Grid.Row="2"
                  Text="Parameter"
@@ -42,7 +45,10 @@
                 ItemsSource="{Binding ParamList}"
                 SelectedItem="{Binding SelParam}"
                 DisplayMemberPath="sNameAndDescription"
-                Style="{StaticResource PRCList_ComboBox}"/>
+                HorizontalAlignment="Stretch"
+                Height="24"
+                MinWidth="55"
+                Margin="5,-2,0,5"/>
 
       <TextBlock Grid.Row="4" 
                  Text="Actual value"
diff --git a/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationProgramV.xaml b/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationProgramV.xaml
index d928b011..6fb71aa7 100644
--- a/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationProgramV.xaml
+++ b/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationProgramV.xaml
@@ -16,7 +16,16 @@
       <TabControl Grid.RowSpan="2" 
                   Grid.ColumnSpan="2"
                   SelectedIndex="{Binding SelConfigSubPage}"
-                  Style="{StaticResource Optimizer_TabControl}">
+                  Background="{StaticResource TabControl.Optimizer.Background}"
+                  TabStripPlacement="Top"
+                  Margin="5,5,2.5,5">
+         <TabControl.Style>
+            <Style TargetType="{x:Type TabControl}">
+               <Style.Resources>
+                  <Style TargetType="{x:Type TabItem}" BasedOn="{StaticResource Optimizer_TabItem}"/>
+               </Style.Resources>
+            </Style>
+         </TabControl.Style>
          <TabItem>
             <TabItem.Header>
                <TextBlock Text="{Binding General_Msg}"
@@ -27,7 +36,11 @@
                   <EgtBEAMWALLCORE:General_ConfigurationPageV/>
                   <Button Command="{Binding SaveCommand}"
                           ToolTip="{Binding SaveToolTip}"
-                          Style="{StaticResource SaveConfig_Button}">
+                          VerticalAlignment="Top"
+                          Height="40"
+                          Width="40"
+                          Margin="10,15,10,10"
+                          Style="{StaticResource Optimizer_Button}">
                      <Image Source="{StaticResource Save_Image}"
                             Style="{StaticResource BTLDataWnd_Image}"/>
                   </Button>
diff --git a/EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj b/EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj
index fa7ca2fc..17d2c838 100644
--- a/EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj
+++ b/EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj
@@ -199,9 +199,6 @@
     <Compile Include="Panel\TopPanelV.xaml.vb">
       <DependentUpon>TopPanelV.xaml</DependentUpon>
     </Compile>
-    <Compile Include="PopUp\BTLPartListPopUpV.xaml.vb">
-      <DependentUpon>BTLPartListPopUpV.xaml</DependentUpon>
-    </Compile>
     <Compile Include="PopUp\RawPartListPopUpV.xaml.vb">
       <DependentUpon>RawPartListPopUpV.xaml</DependentUpon>
     </Compile>
@@ -694,10 +691,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="PopUp\BTLPartListPopUpV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="PopUp\RawPartListPopUpV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/EgtBEAMWALL.Optimizer/FeatureListManager/FeatureListManagerV.xaml b/EgtBEAMWALL.Optimizer/FeatureListManager/FeatureListManagerV.xaml
index a582fc15..a4809bab 100644
--- a/EgtBEAMWALL.Optimizer/FeatureListManager/FeatureListManagerV.xaml
+++ b/EgtBEAMWALL.Optimizer/FeatureListManager/FeatureListManagerV.xaml
@@ -7,19 +7,31 @@
    
    <Button Command="{Binding CopyFeature_Command}"
            ToolTip="{Binding CopyFeature_ToolTip}"
-           Style="{StaticResource LP_Button}">
+           FontWeight="Light"
+           Height="30"
+           Width="30"
+           Margin="2.5,2.5,2.5,2.5"
+           Style="{StaticResource Optimizer_Button}">
       <Image Source="{StaticResource CopyFeature_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button Command="{Binding AddFeature_Command}"
            ToolTip="{Binding AddFeature_ToolTip}"
-           Style="{StaticResource LP_Button}">
+           FontWeight="Light"
+           Height="30"
+           Width="30"
+           Margin="2.5,2.5,2.5,2.5"
+           Style="{StaticResource Optimizer_Button}">
       <Image Source="{StaticResource AddFeature_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button Command="{Binding RemoveFeature_Command}"
            ToolTip="{Binding RemoveFeature_ToolTip}"
-           Style="{StaticResource LP_Button}">
+           FontWeight="Light"
+           Height="30"
+           Width="30"
+           Margin="2.5,2.5,2.5,2.5"
+           Style="{StaticResource Optimizer_Button}">
       <Image Source="{StaticResource Remove_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
diff --git a/EgtBEAMWALL.Optimizer/FeatureManager/FeatureManagerV.xaml b/EgtBEAMWALL.Optimizer/FeatureManager/FeatureManagerV.xaml
index b43a436e..44c1f9f4 100644
--- a/EgtBEAMWALL.Optimizer/FeatureManager/FeatureManagerV.xaml
+++ b/EgtBEAMWALL.Optimizer/FeatureManager/FeatureManagerV.xaml
@@ -20,7 +20,7 @@
 
    <Expander Header="{Binding Face_Msg}"
              IsEnabled="{Binding FeatureManager_IsEnabled}"
-             Style="{StaticResource FeatureManager_Expander}">
+             Width="80">
       <ListBox ItemsSource="{Binding Tag.SIDEList, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
                SelectedItem="{Binding Tag.nSelSIDE, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
                IsEnabled="{Binding FeatureManager_IsEnabled}"
@@ -30,7 +30,7 @@
    <Expander Grid.Column="1"
              Header="{Binding Group_Msg}"
              IsEnabled="{Binding FeatureManager_IsEnabled}"
-             Style="{StaticResource FeatureManager_Expander}">
+             Width="80">
       <ListBox ItemsSource="{Binding Tag.GRPList, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
                SelectedItem="{Binding Tag.nSelGRP, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
                IsEnabled="{Binding FeatureManager_IsEnabled}"
@@ -48,16 +48,24 @@
                                          UpdateSourceTrigger=Explicit}"
                           IsEnabled="{Binding FeatureManager_IsEnabled}"
                           Visibility="{Binding Priority_Visibility}"
-                          Style="{StaticResource Dimension_TextBox}"/>
+                          VerticalAlignment="Center"
+                          Height="25"
+                          Style="{StaticResource EgtOptmizer_TextBox}"/>
    <TextBlock Grid.Column="4"
               Text="{Binding Tag.sName, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
-              Style="{StaticResource FeatureManager_TextBlock}"/>
+              HorizontalAlignment="Center"
+              VerticalAlignment="Top"
+              TextTrimming="CharacterEllipsis"
+              Margin="5,5,0,0"
+              Style="{StaticResource ForegroundCorduroy_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 Feature_ComboBox}"/>
+             Height="24"
+             MinWidth="55"
+             Margin="5,-2,0,5"/>
    <Button Grid.Column="6"
            Content="{Binding Edit_Msg}"
            Command="{Binding Tag.Edit_Command, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
@@ -78,7 +86,12 @@
            Command="{Binding MacroFeature_Command}"
            ToolTip="{Binding MacroFeature_ToolTip}"
            IsEnabled="{Binding MacroFeature_IsEnabled}"
-           Style="{StaticResource MacroFeaturen_Button}">
+           HorizontalAlignment="Right"
+           FontWeight="Light"
+           Height="30"
+           Width="30"
+           Margin="2.5,2.5,10,2.5"
+           Style="{StaticResource Optimizer_Button}">
       <Image Source="{StaticResource MacroFeature_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
diff --git a/EgtBEAMWALL.Optimizer/ForcedStrategyBTL/ForcedStrategyBTLV.xaml b/EgtBEAMWALL.Optimizer/ForcedStrategyBTL/ForcedStrategyBTLV.xaml
index 309badb1..afc013bf 100644
--- a/EgtBEAMWALL.Optimizer/ForcedStrategyBTL/ForcedStrategyBTLV.xaml
+++ b/EgtBEAMWALL.Optimizer/ForcedStrategyBTL/ForcedStrategyBTLV.xaml
@@ -9,7 +9,8 @@
          <ColumnDefinition Width="1*"/>
       </Grid.ColumnDefinitions>
       <Border Grid.RowSpan="2"
-              Style="{StaticResource ForcedStrategyBTL_Border}">
+              Margin="2,0,2,0"
+              Style="{StaticResource Optimizer_Border}">
          <ListBox ItemsSource="{Binding StrategyList}"
                   SelectedItem="{Binding SelStrategy}"
                   Style="{StaticResource ForcedStrategyBTL_ListBox}">
@@ -19,7 +20,9 @@
                      <RadioButton IsChecked="{Binding IsSelected, RelativeSource={RelativeSource AncestorType={x:Type ListBoxItem}}}"
                                   GroupName="ForcedStrategy"/>
                      <Image Source="{Binding sStrategyImagePath}"
-                            Style="{StaticResource ForcedStrategyBTL_Image}"/>
+                            Height="100"
+                            Width="100"
+                            Stretch="Uniform"/>
                      <TextBlock Text="{Binding sStrategyName}"
                                 Style="{StaticResource ForcedStrategy_TextBlock}"/>
                   </StackPanel>
@@ -29,10 +32,14 @@
       </Border>
       
       <GroupBox Grid.Column="1" 
-                Style="{StaticResource ForcedStrategyBTL_GroupBox}">
+                Style="{StaticResource ProjectParameters_GroupBox}">
          <GroupBox.Header>
             <TextBlock Text="{Binding SelStrategy.sStrategyName}" 
-                       Style="{StaticResource ForcedStrategyBTL_TextBlock}"/>
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"
+                       FontWeight="Bold"
+                       FontSize="13"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          </GroupBox.Header>
          <Optimizer:ParameterStrategyV Tag="{Binding SelStrategy}"/>
       </GroupBox>
diff --git a/EgtBEAMWALL.Optimizer/ForcedStrategyPanel/ForcedStrategyPanelV.xaml b/EgtBEAMWALL.Optimizer/ForcedStrategyPanel/ForcedStrategyPanelV.xaml
index 42170c7a..7e8a81cf 100644
--- a/EgtBEAMWALL.Optimizer/ForcedStrategyPanel/ForcedStrategyPanelV.xaml
+++ b/EgtBEAMWALL.Optimizer/ForcedStrategyPanel/ForcedStrategyPanelV.xaml
@@ -12,7 +12,8 @@
          <ColumnDefinition Width="1*"/>
       </Grid.ColumnDefinitions>
       <Border Grid.RowSpan="2"
-              Style="{StaticResource ForcedStrategyBTL_Border}">
+              Margin="2,0,2,0"
+              Style="{StaticResource Optimizer_Border}">
          <ListBox ItemsSource="{Binding StrategyList}"
                   SelectedItem="{Binding SelStrategy}"
                   Style="{StaticResource ForcedStrategyBTL_ListBox}">
@@ -22,7 +23,9 @@
                      <RadioButton IsChecked="{Binding IsSelected, RelativeSource={RelativeSource AncestorType={x:Type ListBoxItem}}}"
                                   GroupName="ForcedStrategy"/>
                      <Image Source="{Binding sStrategyImagePath}"
-                            Style="{StaticResource ForcedStrategyBTL_Image}"/>
+                            Height="100"
+                            Width="100"
+                            Stretch="Uniform"/>
                      <TextBlock Text="{Binding sStrategyName}"
                              Style="{StaticResource ForcedStrategy_TextBlock}"/>
                   </StackPanel>
@@ -32,10 +35,15 @@
       </Border>
       
       <GroupBox Grid.Column="1" 
-                Style="{StaticResource ForcedStrategyBTL_GroupBox}">
+                Margin="0,1,0,0"
+                Style="{StaticResource ProjectParameters_GroupBox}">
          <GroupBox.Header>
             <TextBlock Text="{Binding SelStrategy.sStrategyName}" 
-                       Style="{StaticResource ForcedStrategyBTL_TextBlock}"/>
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"
+                       FontWeight="Bold"
+                       FontSize="13"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          </GroupBox.Header>
          <OPTIMIZER:ParameterStrategyV Tag="{Binding SelStrategy}"/>
       </GroupBox>
diff --git a/EgtBEAMWALL.Optimizer/FreeContourInput/FreeContourInputV.xaml b/EgtBEAMWALL.Optimizer/FreeContourInput/FreeContourInputV.xaml
index 9b021d79..39d1d502 100644
--- a/EgtBEAMWALL.Optimizer/FreeContourInput/FreeContourInputV.xaml
+++ b/EgtBEAMWALL.Optimizer/FreeContourInput/FreeContourInputV.xaml
@@ -21,7 +21,9 @@
                  Style="{StaticResource Option_TextBlock}"/>
       <TextBox Text="{Binding Text, UpdateSourceTrigger=PropertyChanged}"
                Visibility="{Binding Text_Visibility}" 
-               Style="{StaticResource FreeContour_TextBox}">
+               HorizontalContentAlignment="Center"
+               Height="22"
+               Style="{StaticResource Optimizer_TextBox}">
          <TextBox.InputBindings>
             <KeyBinding Key="Enter" Command="{Binding Done_Command, UpdateSourceTrigger=PropertyChanged}"/>
             <KeyBinding Key="S" Modifiers="Control" Command="{Binding Show_Command}"/>
@@ -35,7 +37,8 @@
       <ComboBox ItemsSource="{Binding ComboItemsList}" 
                 SelectedIndex="{Binding ComboSelectedIndex}"
                 Visibility="{Binding Combo_Visibility}" 
-                Style="{StaticResource FreeContourInput_ComboBox}"/>
+                Margin="5,0,5,0"
+                Style="{StaticResource Optmizer_ComboBox}"/>
       <Grid Margin="5,0,5,0">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
diff --git a/EgtBEAMWALL.Optimizer/FreeContourManager/FreeContourManagerV.xaml b/EgtBEAMWALL.Optimizer/FreeContourManager/FreeContourManagerV.xaml
index 21d920e1..85c0b104 100644
--- a/EgtBEAMWALL.Optimizer/FreeContourManager/FreeContourManagerV.xaml
+++ b/EgtBEAMWALL.Optimizer/FreeContourManager/FreeContourManagerV.xaml
@@ -6,11 +6,17 @@
 
    <ComboBox ItemsSource="{Binding TypeList}"
              SelectedIndex="{Binding SelType, Delay=1}"
-             Style="{StaticResource ProdType_ComboBox}"/>
+             Height="22"
+             Width="160"
+             Margin="5,0,5,0"
+             Style="{StaticResource Optmizer_ComboBox}"/>
    <ComboBox ItemsSource="{Binding PathList}"
              SelectedIndex="{Binding SelPath}"
              Visibility="{Binding PathList_Visibility}"
-             Style="{StaticResource ProdPath_ComboBox}"/>
+             Height="22"
+             Width="100"
+             Margin="0,0,5,0"
+             Style="{StaticResource Optmizer_ComboBox}"/>
    <Button Command="{Binding Line2P_Command}"
            ToolTip="{Binding Line2P_ToolTip}"
            IsEnabled="{Binding Line2P_IsEnabled}"
diff --git a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyV.xaml b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyV.xaml
index 8b4407a3..5eb15b35 100644
--- a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyV.xaml
+++ b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyV.xaml
@@ -26,7 +26,12 @@
                   Margin="10">
          <Button Command="{Binding Ok_Command}"
                  ToolTip="{Binding SaveAsToolTip}"
-                 Style="{StaticResource SaveStrategy_Button}">
+                 HorizontalAlignment="Center"
+                 VerticalAlignment="Center"
+                 Height="40"
+                 Width="40"
+                 Margin="5,0,0,0"
+                 Style="{StaticResource Optimizer_Button}">
             <Image Source="{StaticResource Ok_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
diff --git a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersWnd.xaml b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersWnd.xaml
index bbffe018..bc680cfb 100644
--- a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersWnd.xaml
+++ b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersWnd.xaml
@@ -22,21 +22,32 @@
       <ComboBox Grid.ColumnSpan="2"
                 ItemsSource="{Binding StrategySetupList}" 
                 SelectedItem="{Binding SelStrategySetup, UpdateSourceTrigger=PropertyChanged}"
-                Style="{StaticResource BTLDataWnd_ComboBox}"/>
+                Foreground="{StaticResource BeamWall_Black}"
+                HorizontalAlignment="Center"
+                FontSize="15"
+                Height="30"
+                Width="160"
+                Margin="0,10,0,10"
+                Style="{StaticResource Optmizer_ComboBox}"/>
       <OPTIMIZER:ProjectParametersV Grid.Row="1" 
                                     Grid.RowSpan="2" 
                                     IsEnabled="{Binding GeneralParametersIsEnable}"/>
       <UniformGrid Grid.Row="1" 
                    Grid.Column="1"
                    Rows="2" 
-                   Style="{StaticResource BTLDataWnd_UniformGrid}">
+                   Margin="0,0,5,0">
          <CheckBox IsChecked="{Binding bSaveGeneralParameters, UpdateSourceTrigger=PropertyChanged}"
                    HorizontalAlignment="Center"
                    VerticalAlignment="Top"
                    Margin="10,10,0,0"/>
          <Button Command="{Binding Ok_Command}"
                  ToolTip="{Binding SaveAsToolTip}"
-                 Style="{StaticResource GeneralParametersWnd_Button}">
+                 HorizontalAlignment="Center"
+                 VerticalAlignment="Bottom"
+                 Height="40"
+                 Width="40"
+                 Margin="5,0,0,5"
+                 Style="{StaticResource Optimizer_Button}">
             <Image Source="{StaticResource Ok_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
diff --git a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/ProjectParametersV.xaml b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/ProjectParametersV.xaml
index 004d3c1a..7e9f996f 100644
--- a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/ProjectParametersV.xaml
+++ b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/ProjectParametersV.xaml
@@ -15,10 +15,14 @@
    <GroupBox Style="{StaticResource ProjectParameters_GroupBox}">
       <GroupBox.Header>
          <TextBlock Text="GENERAL PARAMETERS" 
-                    Style="{StaticResource ProjectParameters_TextBlock}"/>
+                    HorizontalAlignment="Left"
+                    FontWeight="Bold"
+                    TextWrapping="WrapWithOverflow"
+                    Style="{StaticResource DialogWindow_TextBlock}"/>
       </GroupBox.Header>
       <ItemsControl ItemsSource="{Binding Source={StaticResource GroupedParameters}}"
-                    Style="{StaticResource ParameterStrategy_ItemsControl}">
+                    Margin="5,10,0,0"
+                    Style="{StaticResource UsersControl_ItemsControl}">
          <ItemsControl.GroupStyle>
             <GroupStyle>
                <GroupStyle.Panel>
@@ -31,10 +35,15 @@
                      <Setter Property="Template">
                         <Setter.Value>
                            <ControlTemplate TargetType="{x:Type GroupItem}">
-                              <GroupBox Style="{StaticResource Item_GroupBox}">
+                              <GroupBox BorderThickness="1"
+                                        Margin="0,0,0,5" 
+                                        Style="{StaticResource ProjectParameters_GroupBox}">
                                  <GroupBox.Header>
                                     <TextBlock Text="{Binding Name}" 
-                                               Style="{StaticResource ProjectParameters_TextBlock}"/>
+                                               HorizontalAlignment="Left"
+                                               FontWeight="Bold"
+                                               TextWrapping="WrapWithOverflow"
+                                               Style="{StaticResource DialogWindow_TextBlock}"/>
                                  </GroupBox.Header>
                                  <ItemsPresenter />
                                  <GroupBox.Visibility>
@@ -54,9 +63,12 @@
             <DataTemplate DataType="{x:Type OPTIMIZER:BooleanGenericParameter}">
                <UniformGrid Columns="2" 
                             Visibility="{Binding bBooleanVisibility}"
-                            Style="{StaticResource ProjectParameters_UniformGrid}">
+                            Margin="2,2,2,5">
                   <TextBlock Text="{Binding sDescriptionShort}" 
-                             Style="{StaticResource ProjectParameters_TextBlock}"/>
+                             HorizontalAlignment="Left"
+                             FontWeight="Bold"
+                             TextWrapping="WrapWithOverflow"
+                             Style="{StaticResource DialogWindow_TextBlock}"/>
                   <CheckBox IsChecked="{Binding bValue, UpdateSourceTrigger=PropertyChanged}"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"/>
@@ -65,9 +77,12 @@
             <DataTemplate DataType="{x:Type OPTIMIZER:DoubleGenericParameter}">
                <UniformGrid Columns="2" 
                             Visibility="{Binding bDoubleVisibility}"
-                            Style="{StaticResource ProjectParameters_UniformGrid}">
+                            Margin="2,2,2,5">
                   <TextBlock Text="{Binding sDescriptionShort}" 
-                             Style="{StaticResource ProjectParameters_TextBlock}"/>
+                             HorizontalAlignment="Left"
+                             FontWeight="Bold"
+                             TextWrapping="WrapWithOverflow"
+                             Style="{StaticResource DialogWindow_TextBlock}"/>
                   <EgtWPFLib5:EgtTextBox2 Text="{Binding sValue, UpdateSourceTrigger=Explicit}"
                                           Style="{StaticResource ParameterList_TextBox2}"/>
                </UniformGrid>
@@ -75,22 +90,31 @@
             <DataTemplate DataType="{x:Type OPTIMIZER:ComboGenericParameter}">
                <UniformGrid Columns="2" 
                             Visibility="{Binding bComboBoxVisibility}"
-                            Style="{StaticResource ProjectParameters_UniformGrid}">
+                            Margin="2,2,2,5">
                   <TextBlock Text="{Binding sDescriptionShort}" 
-                             Style="{StaticResource ProjectParameters_TextBlock}"/>
+                             HorizontalAlignment="Left"
+                             FontWeight="Bold"
+                             TextWrapping="WrapWithOverflow"
+                             Style="{StaticResource DialogWindow_TextBlock}"/>
                   <ComboBox ItemsSource="{Binding ComboList}"
                             SelectedItem="{Binding SelValue}"
                             DisplayMemberPath="sValue"
-                            Style="{StaticResource ProjectParameters_ComboBox}">
+                            Foreground="{StaticResource BeamWall_Black}"
+                            Height="22"
+                            Width="150"
+                            Margin="0">
                   </ComboBox>
                </UniformGrid>
             </DataTemplate>
             <DataTemplate DataType="{x:Type OPTIMIZER:StringGenericParameter}">
                <UniformGrid Columns="2" 
                             Visibility="{Binding bStringVisibility}"
-                            Style="{StaticResource ProjectParameters_UniformGrid}">
+                            Margin="2,2,2,5">
                   <TextBlock Text="{Binding sDescriptionShort}" 
-                             Style="{StaticResource ProjectParameters_TextBlock}"/>
+                             HorizontalAlignment="Left"
+                             FontWeight="Bold"
+                             TextWrapping="WrapWithOverflow"
+                             Style="{StaticResource DialogWindow_TextBlock}"/>
                   <TextBox Text="{Binding sValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                            Style="{StaticResource ColorPicker_TextBox}"/>
                </UniformGrid>
@@ -98,10 +122,13 @@
             <DataTemplate DataType="{x:Type OPTIMIZER:ListGenericParameter}">
                <UniformGrid Columns="3" 
                             Visibility="{Binding bListBoxVisibility}"
-                            Style="{StaticResource ParamStrategy_UniformGrid}">
+                            Margin="5,2,5,0">
                   <TextBlock Text="{Binding sDescriptionShort}"
+                             HorizontalAlignment="Left"
                              VerticalAlignment="Top"
-                             Style="{StaticResource ParamStrategyDescription_TextBlock}"/>
+                             FontWeight="Normal"
+                             TextWrapping="WrapWithOverflow"
+                             Style="{StaticResource DialogWindow_TextBlock}"/>
                   <ToggleButton Grid.Column="1"
                                 ToolTip="{Binding OpenToolListToolTip}"
                                 IsChecked="{Binding OpenToolList_IsChecked}"
@@ -114,9 +141,13 @@
                             Style="{StaticResource BTLDataWnd_Image}"/>
                   </ToggleButton>
                   <Border Grid.Column="2" 
-                          Style="{StaticResource ProjectParamters_Border}">
-                     <ItemsControl ItemsSource="{Binding ToolList_View}"                                   
-                                   Style="{StaticResource AvailableToolList_ItemsControl}">
+                          Margin="2,5,2,0"
+                          Style="{StaticResource Optimizer_Border}">
+                     <ItemsControl ItemsSource="{Binding ToolList_View}"      
+                                   BorderThickness="0"
+                                   Height="200"
+                                   Width="180"
+                                   Style="{StaticResource UsersControl_ItemsControl}">
                         <ItemsControl.ItemTemplate>
                            <DataTemplate>
                               <StackPanel Orientation="Horizontal"
diff --git a/EgtBEAMWALL.Optimizer/InputPwdWnd/InputPwdWndV.xaml b/EgtBEAMWALL.Optimizer/InputPwdWnd/InputPwdWndV.xaml
index 4eebab44..a62c9075 100644
--- a/EgtBEAMWALL.Optimizer/InputPwdWnd/InputPwdWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/InputPwdWnd/InputPwdWndV.xaml
@@ -15,7 +15,10 @@
       </Grid.RowDefinitions>
 
       <TextBlock Text="{Binding PasswordMsg}"
-                 Style="{StaticResource PasswordMsg_TextBlock}"/>
+                 HorizontalAlignment="Center"
+                 VerticalAlignment="Top"
+                 Margin="0,0,0,5"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <PasswordBox Grid.Row="1"
                    x:Name="PwdBox"
                    PasswordChanged="PasswordBox_PasswordChanged"/>
diff --git a/EgtBEAMWALL.Optimizer/InstrumentPanel/InstrumentPanelV.xaml b/EgtBEAMWALL.Optimizer/InstrumentPanel/InstrumentPanelV.xaml
index 631a0125..95a5b92d 100644
--- a/EgtBEAMWALL.Optimizer/InstrumentPanel/InstrumentPanelV.xaml
+++ b/EgtBEAMWALL.Optimizer/InstrumentPanel/InstrumentPanelV.xaml
@@ -15,6 +15,11 @@
            Command="{Binding ChangeMaterial_Command}"
            Visibility="Collapsed"
            IsEnabled="{Binding InstrumentPanel_IsEnabled}"
-           Style="{StaticResource InstrumentPanel_Button}"/>
+           FontWeight="Light"
+           FontSize="12"
+           Height="30"
+           Width="30"
+           Margin="5,2,5,2"
+           Style="{StaticResource Optimizer_Button}"/>
    <!--Visibility="{Binding ChangeMaterial_Visibility}"-->
 </StackPanel>
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/BTLDataV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/BTLDataV.xaml
index 0f7d4f24..7946600e 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/BTLDataV.xaml
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/BTLDataV.xaml
@@ -6,88 +6,142 @@
    
    <UniformGrid Columns="6" 
                 Rows="7"
-                Style="{StaticResource AddFeatureWnd_UniformGrid}">
+                Margin="5">
 
       <TextBlock Text="{Binding PROJNUM_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+                 HorizontalAlignment="Center"
+                 Margin="10,0,10,0"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Grid.Column="1"
                              Text="{Binding Tag.sPROJNUM, UpdateSourceTrigger=Explicit,
                                             RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}" 
-                             Style="{StaticResource PartParam_TextBox}"/>
+                             Width="150"
+                             Margin="5"
+                             Style="{StaticResource EgtOptmizer_TextBox}"/>
       <TextBlock Text="{Binding PROJNAME_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+                 VerticalAlignment="Center"
+                 Margin="10,0,10,0"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Grid.Column="1"
                              Text="{Binding Tag.sPROJNAME, UpdateSourceTrigger=Explicit,
                                             RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
-                             Style="{StaticResource PartParam_TextBox}"/>
+                             Width="150"
+                             Margin="5"
+                             Style="{StaticResource EgtOptmizer_TextBox}"/>
       <TextBlock Text="{Binding PROJPART_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+                 VerticalAlignment="Center"
+                 Margin="10,0,10,0"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Grid.Column="1"
                              Text="{Binding Tag.sPROJPART, UpdateSourceTrigger=Explicit,
                                             RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
-                             Style="{StaticResource PartParam_TextBox}"/>
+                             Width="150"
+                             Margin="5"
+                             Style="{StaticResource EgtOptmizer_TextBox}"/>
       <TextBlock Text="{Binding PROJGUID_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+                 VerticalAlignment="Center"
+                 Margin="10,0,10,0"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Grid.Column="1"
                              Text="{Binding Tag.sPROJGUID, UpdateSourceTrigger=Explicit,
                                             RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
-                             Style="{StaticResource PartParam_TextBox}"/>
+                             Width="150"
+                             Margin="5"
+                             Style="{StaticResource EgtOptmizer_TextBox}"/>
       <TextBlock Text="{Binding LISTNAME_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+                 VerticalAlignment="Center"
+                 Margin="10,0,10,0"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Grid.Column="1"
                              Text="{Binding Tag.sLISTNAME, UpdateSourceTrigger=Explicit,
                                             RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
-                             Style="{StaticResource PartParam_TextBox}"/>
+                             Width="150"
+                             Margin="5"
+                             Style="{StaticResource EgtOptmizer_TextBox}"/>
       <TextBlock Text="{Binding CUSTOMER_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+                 VerticalAlignment="Center"
+                 Margin="10,0,10,0"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Grid.Column="1"
                              Text="{Binding Tag.sCUSTOMER, UpdateSourceTrigger=Explicit,
                                             RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
-                             Style="{StaticResource PartParam_TextBox}"/>
+                             Width="150"
+                             Margin="5"
+                             Style="{StaticResource EgtOptmizer_TextBox}"/>
       <TextBlock Text="{Binding ARCHITECT_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+                 VerticalAlignment="Center"
+                 Margin="10,0,10,0"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Grid.Column="1"
                              Text="{Binding Tag.sARCHITECT, UpdateSourceTrigger=Explicit,
                                             RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
-                             Style="{StaticResource PartParam_TextBox}"/>
+                             Width="150"
+                             Margin="5"
+                             Style="{StaticResource EgtOptmizer_TextBox}"/>
       <TextBlock Text="{Binding EDITOR_MSG}"
-              Style="{StaticResource PartParam_TextBlock}"/>
+                 VerticalAlignment="Center"
+                 Margin="10,0,10,0"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Grid.Column="1"
                              Text="{Binding Tag.sEDITOR, UpdateSourceTrigger=Explicit,
                                             RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
-                             Style="{StaticResource PartParam_TextBox}"/>
+                             Width="150"
+                             Margin="5"
+                             Style="{StaticResource EgtOptmizer_TextBox}"/>
       <TextBlock Text="{Binding DELIVDATE_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+                 VerticalAlignment="Center"
+                 Margin="10,0,10,0"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Grid.Column="1"
                              Text="{Binding Tag.sDELIVDATE, UpdateSourceTrigger=Explicit,
                                             RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
-                             Style="{StaticResource PartParam_TextBox}"/>
+                             Width="150"
+                             Margin="5"
+                             Style="{StaticResource EgtOptmizer_TextBox}"/>
       <TextBlock Text="{Binding EXPDATE_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+                 VerticalAlignment="Center"
+                 Margin="10,0,10,0"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Grid.Column="1"
                              Text="{Binding Tag.sEXPDATE, UpdateSourceTrigger=Explicit,
                                             RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
-                             Style="{StaticResource PartParam_TextBox}"/>
+                             Width="150"
+                             Margin="5"
+                             Style="{StaticResource EgtOptmizer_TextBox}"/>
       <TextBlock Text="{Binding EXPTIME_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+                 VerticalAlignment="Center"
+                 Margin="10,0,10,0"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Grid.Column="1"
                              Text="{Binding Tag.sEXPTIME, UpdateSourceTrigger=Explicit,
                                             RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
-                             Style="{StaticResource PartParam_TextBox}"/>
+                             Width="150"
+                             Margin="5"
+                             Style="{StaticResource EgtOptmizer_TextBox}"/>
       <TextBlock Text="{Binding EXPRELEASE_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+                 VerticalAlignment="Center"
+                 Margin="10,0,10,0"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Grid.Column="1"
                              Text="{Binding Tag.sEXPRELEASE, UpdateSourceTrigger=Explicit,
                                             RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
-                             Style="{StaticResource PartParam_TextBox}"/>
+                             Width="150"
+                             Margin="5"
+                             Style="{StaticResource EgtOptmizer_TextBox}"/>
       <TextBlock Text="{Binding LANGUAGE_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+                 VerticalAlignment="Center"
+                 Margin="10,0,10,0"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Grid.Column="1"
                              Text="{Binding Tag.sLANGUAGE, UpdateSourceTrigger=Explicit,
                                             RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
-                             Style="{StaticResource PartParam_TextBox}"/>
+                             Width="150"
+                             Margin="5"
+                             Style="{StaticResource EgtOptmizer_TextBox}"/>
       <TextBlock Text="{Binding RANGE_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+                 VerticalAlignment="Center"
+                 Margin="10,0,10,0"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <ComboBox Grid.Column="1"
                 ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}},
                                       Path=Tag.ocRANGE,
@@ -95,9 +149,12 @@
                 SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}},
                                         Path=Tag.SelRANGE,
                                         Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"                
-                Style="{StaticResource PartParam_ComboBox}"/>
+                Height="22"
+                Width="150"/>
       <TextBlock Text="{Binding PROCESSINGQUALITY_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+                 VerticalAlignment="Center"
+                 Margin="10,0,10,0"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <ComboBox Grid.Column="1"
                 ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}},
                                       Path=Tag.ocPROCESSINGQUALITY,
@@ -105,33 +162,52 @@
                 SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}},
                                         Path=Tag.SelPROCESSINGQUALITY,
                                         Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"                
-                Style="{StaticResource PartParam_ComboBox}"/>
+                Height="22"
+                Width="150"/>
       <TextBlock Text="{Binding COMPUTERNAME_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+                 VerticalAlignment="Center"
+                 Margin="10,0,10,0"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Grid.Column="1"
                              Text="{Binding Tag.sCOMPUTERNAME, UpdateSourceTrigger=Explicit,
                                             RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
-                             Style="{StaticResource PartParam_TextBox}"/>
+                             Width="150"
+                             Margin="5"
+                             Style="{StaticResource EgtOptmizer_TextBox}"/>
       <TextBlock Text="{Binding USER_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+                 VerticalAlignment="Center"
+                 Margin="10,0,10,0"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Grid.Column="1"
                              Text="{Binding Tag.sUSER, UpdateSourceTrigger=Explicit,
                                             RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
-                             Style="{StaticResource PartParam_TextBox}"/>
+                             Width="150"
+                             Margin="5"
+                             Style="{StaticResource EgtOptmizer_TextBox}"/>
       <TextBlock Text="{Binding SRCFILE_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+                 VerticalAlignment="Center"
+                 Margin="10,0,10,0"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Grid.Column="1" 
                              Text="{Binding Tag.sSRCFILE, UpdateSourceTrigger=Explicit,
                                             RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
-                             Style="{StaticResource PartParam_TextBox}"/>
+                             Width="150"
+                             Margin="5"
+                             Style="{StaticResource EgtOptmizer_TextBox}"/>
       <TextBlock Text="{Binding EXPFILE_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+                 VerticalAlignment="Center"
+                 Margin="10,0,10,0"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Grid.Column="1"
                              Text="{Binding Tag.sEXPFILE, UpdateSourceTrigger=Explicit,
                                             RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
-                             Style="{StaticResource PartParam_TextBox}"/>
+                             Width="150"
+                             Margin="5"
+                             Style="{StaticResource EgtOptmizer_TextBox}"/>
       <TextBlock Text="{Binding RECESS_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+                 VerticalAlignment="Center"
+                 Margin="10,0,10,0"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <ComboBox Grid.Column="1"
                 ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}},
                                       Path=Tag.ocRECESS,
@@ -139,13 +215,18 @@
                 SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}},
                                         Path=Tag.SelRECESS,
                                         Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"                
-                Style="{StaticResource PartParam_ComboBox}"/>
+                Height="22"
+                Width="150"/>
       <TextBlock Text="{Binding USERATTRIBUTE_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+                 VerticalAlignment="Center"
+                 Margin="10,0,10,0"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Grid.Column="1"
                              Text="{Binding Tag.sUSERATTRIBUTE, UpdateSourceTrigger=Explicit,
                                             RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
-                             Style="{StaticResource PartParam_TextBox}"/>
+                             Width="150"
+                             Margin="5"
+                             Style="{StaticResource EgtOptmizer_TextBox}"/>
 
    </UniformGrid>
    
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml
index bc0edd09..0d9a3317 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml
@@ -44,7 +44,11 @@
          <Button ToolTip="{Binding VerifyAll_ToolTip}"
                  Command="{Binding VerifyAll_Command}"
                  IsEnabled="{Binding VerifyAll_IsEnabled}"
-                 Style="{StaticResource Verify_Button}">
+                 VerticalAlignment="Top"
+                 Height="30"
+                 Width="30"
+                 Margin="2.5,3,2.5,3"
+                 Style="{StaticResource Optimizer_Button}">
             <Image Source="{StaticResource VerifyAll_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
@@ -52,7 +56,11 @@
                  ToolTip="{Binding VerifyAllFlipRot_ToolTip}"
                  Command="{Binding VerifyAllFlipRot_Command}"
                  IsEnabled="{Binding VerifyAll_IsEnabled}"
-                 Style="{StaticResource Verify_Button}">
+                 VerticalAlignment="Top"
+                 Height="30"
+                 Width="30"
+                 Margin="2.5,3,2.5,3"
+                 Style="{StaticResource Optimizer_Button}">
             <Image Source="{StaticResource VerifyAllR_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
@@ -60,7 +68,11 @@
                  Command="{Binding ResetCalc_Command}"
                  ToolTip="{Binding ResetCalc_ToolTip}"
                  IsEnabled="{Binding CALCPanel_IsEnabled}"
-                 Style="{StaticResource Verify_Button}">
+                 VerticalAlignment="Top"
+                 Height="30"
+                 Width="30"
+                 Margin="2.5,3,2.5,3"
+                 Style="{StaticResource Optimizer_Button}">
             <Image Source="{StaticResource ResetCalc_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
@@ -69,14 +81,25 @@
                  ToolTip="{Binding FilterAll_ToolTip}"
                  PreviewMouseDown="FilterAllBtn_PreviewMouseDown"
                  Click="FilterAllBtn_Click"
-                 Style="{StaticResource Verify_Button}">
+                 VerticalAlignment="Top"
+                 Height="30"
+                 Width="30"
+                 Margin="2.5,3,2.5,3"
+                 Style="{StaticResource Optimizer_Button}">
             <Image Source="{StaticResource AllFilter_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
          <Popup x:Name="FilterSectxMat_Popup"
                 PlacementTarget="{Binding ElementName=FilterAllBtn}"
-                Style="{StaticResource FilterSect_PopUp}">
-            <Border Style="{StaticResource Filtering_Border}">
+                AllowsTransparency="True"
+                PopupAnimation="Fade"
+                Placement="Bottom"
+                StaysOpen="False">
+            <Border Background="{StaticResource BeamWall_White}"
+                    BorderBrush="{StaticResource BeamWall_Silver}"
+                    BorderThickness="1"
+                    CornerRadius="3"
+                    SnapsToDevicePixels="True">
                <dxfui:CheckedListFilterElement Context="{Binding FilteringContext, ElementName=BTLPart_GridControl}" 
                                                FieldName="Section.sSectionXMaterial" 
                                                ShowCounts="True"/>
@@ -86,7 +109,7 @@
                             x:Name="searchControl"                            
                             ShowSearchPanelNavigationButtons="False"
                             ShowResultInfo="False"
-                            Style="{StaticResource SearchControlStyle}"/>
+                            Style="{StaticResource SearchControl_Style}"/>
       </Grid>
       <dxg:GridControl Grid.Row="1" 
                        x:Name="BTLPart_GridControl"
@@ -132,18 +155,19 @@
                            
                            ShowGridMenu="OnShowGridMenu"   
                                                       
-                           ColumnHeaderStyle="{StaticResource HeaderStyle}"
-                           ColumnHeaderImageStyle="{StaticResource HeaderImageStyle}"
+                           ColumnHeaderStyle="{StaticResource Header_Style}"
+                           ColumnHeaderImageStyle="{StaticResource HeaderImage_Style}"
                            
-                           RowStyle="{StaticResource RowStyle}"
+                           RowStyle="{StaticResource Row_Style}"
+                           CellStyle="{StaticResource Cell_Style}"
                            
-                           Style="{StaticResource TableViewStyle}"
+                           Style="{StaticResource TableView_Style}"
                            SearchControl="{Binding ElementName=searchControl}"
                            FocusedRowChanged="View_FocusedRowChanged">
                <dxg:TableView.GroupRowTemplate>
                   <DataTemplate>
-                     <Border Style="{StaticResource TableView_Border}">
-                        <Grid Style="{StaticResource TableView_Grid}">
+                     <Border Background="{StaticResource Grid.Static.ExpanderDown.Background}">
+                        <Grid VerticalAlignment="Center">
                            <Grid.ColumnDefinitions>
                               <ColumnDefinition Width="Auto"/>
                               <ColumnDefinition/>
@@ -153,7 +177,9 @@
                                                       Command="{Binding View.Commands.ChangeGroupExpanded}"
                                                       CommandParameter="{Binding RowHandle.Value}"/>
                            <TextBlock Grid.Column="1"
-                                      Style="{StaticResource BTLPartList_TextBlock}">
+                                      FontSize="14"
+                                      Margin="0,0,5,0"
+                                      Style="{StaticResource ForegroundWhite_TextBlock}">
                               <TextBlock.Text>
                                  <MultiBinding Converter="{StaticResource ProjIdToBtlFileName}">
                                     <Binding Path="GroupValue.Value"/>
@@ -168,21 +194,30 @@
                               <Button Command="{Binding Tag.Data_Command, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"
                                       CommandParameter="{Binding GroupValue.Value}"
                                       ToolTip="{Binding Tag.Data_ToolTip, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"
-                                      Style="{StaticResource BTLPartList_Button}">
+                                      Height="23.5"
+                                      Width="25"
+                                      Margin="5,0,0,0"
+                                      Style="{StaticResource Optimizer_Button}">
                                  <Image Source="{StaticResource Adjustment_Image}"
                                         Style="{StaticResource BTLDataWnd_Image}"/>
                               </Button>
                               <Button Command="{Binding Tag.AddPart_Command, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"
                                       CommandParameter="{Binding GroupValue.Value}"
                                       ToolTip="{Binding Tag.AddPart_ToolTip, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"
-                                      Style="{StaticResource BTLPartList_Button}">
+                                      Height="23.5"
+                                      Width="25"
+                                      Margin="5,0,0,0"
+                                      Style="{StaticResource Optimizer_Button}">
                                  <Image Source="{StaticResource AddPart_Image}"
                                         Style="{StaticResource BTLDataWnd_Image}"/>
                               </Button>
                               <Button ToolTip="{Binding Tag.ChangeParam_ToolTip, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"
                                       CommandParameter="{Binding GroupValue.Value}"
                                       Command="{Binding Tag.ChangeParameter_Command, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"
-                                      Style="{StaticResource BTLPartList_Button}">
+                                      Height="23.5"
+                                      Width="25"
+                                      Margin="5,0,0,0"
+                                      Style="{StaticResource Optimizer_Button}">
                                  <Image Source="{StaticResource ChangeParam_Image}"
                                         Style="{StaticResource BTLDataWnd_Image}"/>
                               </Button>
@@ -190,7 +225,10 @@
                               <Button Command="{Binding Tag.UpdateBTL_Command, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"
                                       CommandParameter="{Binding GroupValue.Value}"
                                       ToolTip="{Binding Tag.UpdateBTL_ToolTip, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"
-                                      Style="{StaticResource BTLPartList_Button}">
+                                      Height="23.5"
+                                      Width="25"
+                                      Margin="5,0,0,0"
+                                      Style="{StaticResource Optimizer_Button}">
                                  <Image Source="{StaticResource UpdateBTL_Image}"
                                         Style="{StaticResource BTLDataWnd_Image}"/>
                               </Button>
@@ -316,7 +354,20 @@
                                        <ColumnDefinition Width="Auto"/>
                                     </Grid.ColumnDefinitions>
                                     <TextBlock Text="{Binding nPRID}"
-                                               Style="{StaticResource Prod_TextBlock}"/>
+                                               TextAlignment="Justify"
+                                               TextTrimming="CharacterEllipsis">
+                                       <TextBlock.Style>
+                                          <Style TargetType="{x:Type TextBlock}">
+                                             <Style.Triggers>
+                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGridCell}}, Path=IsSelected}" Value="True">
+                                                   <Setter Property="FontWeight" Value="Bold"/>
+                                                   <Setter Property="Foreground" Value="{StaticResource TextBlock.Prod.Foreground}"/>
+                                                   <Setter Property="Background" Value="{StaticResource TextBlock.Prod.Background}"/>
+                                                </DataTrigger>
+                                             </Style.Triggers>
+                                          </Style>
+                                       </TextBlock.Style>
+                                    </TextBlock>
                                     <Grid Grid.Column="1">
                                        <Grid.ColumnDefinitions>
                                           <ColumnDefinition Width="1*"/>
@@ -333,17 +384,30 @@
                                           <TextBlock Grid.ColumnSpan="2"
                                                      Text="&#11119;"
                                                      Visibility="{Binding CALC_ROT_Visibility}"
-                                                     Style="{StaticResource CALC_ROTFeature_TextBlock}"/>
+                                                     Foreground="{StaticResource TextBlock.StrategyModify.Foreground}"
+                                                     HorizontalAlignment="Center"
+                                                     VerticalAlignment="Top"
+                                                     FontWeight="SemiBold"
+                                                     FontSize="10"
+                                                     Margin="-12,-2,1,0"/>
 
                                           <TextBlock Grid.Column="1"
                                                      Text="{Binding CALC_ERR_Letter}"
                                                      Foreground="{Binding CALC_ERR_Foreground}"
-                                                     Style="{StaticResource CALC_ERR_Letter_TextBlock}"/>
+                                                     TextAlignment="Center"
+                                                     FontWeight="Bold"
+                                                     FontSize="12"
+                                                     Margin="-1,-6,1,-3"
+                                                     Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                                        </Grid>
                                        <TextBlock Grid.Column="2"
                                                   Text="&#9999;"
                                                   Visibility="{Binding bStrategy_Visibility}"
-                                                  Style="{StaticResource bStrategy_TextBlock}"/>
+                                                  Foreground="{StaticResource TextBlock.StrategyModify.Foreground}"
+                                                  VerticalAlignment="Center"
+                                                  FontWeight="Normal"
+                                                  FontSize="8"
+                                                  Margin="-20,0,0,0"/>
                                     </Grid>
                                     <CheckBox Grid.Column="2"
                                               IsChecked="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
@@ -352,11 +416,27 @@
                                               Margin="0,0,5,0"/>
                                     <TextBlock Grid.Column="3"
                                                Text="{Binding sFeature_Name}"
-                                               Style="{StaticResource Prod_TextBlock}"/>
+                                                TextAlignment="Justify"
+                                                TextTrimming="CharacterEllipsis">
+                                       <TextBlock.Style>
+                                          <Style TargetType="{x:Type TextBlock}">
+                                             <Style.Triggers>
+                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGridCell}}, Path=IsSelected}" Value="True">
+                                                   <Setter Property="FontWeight" Value="Bold"/>
+                                                   <Setter Property="Foreground" Value="{StaticResource TextBlock.Prod.Foreground}"/>
+                                                   <Setter Property="Background" Value="{StaticResource TextBlock.Prod.Background}"/>
+                                                </DataTrigger>
+                                             </Style.Triggers>
+                                          </Style>
+                                       </TextBlock.Style>
+                                    </TextBlock>
                                     <Button Grid.Column="4" 
                                             Command="{Binding EditFeature_Command}"
                                             CommandParameter="{Binding}"
-                                            Style="{StaticResource EditFeature_Button}">
+                                            Height="15"
+                                            Width="15"
+                                            Margin="25,0,0,0"
+                                            Style="{StaticResource Optimizer_Button}">
                                        <Image Source="{StaticResource Edit_Image}"
                                               Style="{StaticResource BTLDataWnd_Image}"/>
                                     </Button>
@@ -369,14 +449,18 @@
                                     Orientation="Horizontal"
                                     Margin="0,2,0,0">
                            <TextBlock Text="STATUS:" 
-                                      Style="{StaticResource Status_TextBlock}"/>
+                                      HorizontalAlignment="Left"
+                                      Margin="0,0,10,0"
+                                      Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
 
                            <TextBlock Text="{Binding Tag.SelBTLPart.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"
                                       Visibility="{Binding Tag.SelBTLPart.CALC_MSG_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"
-                                      Style="{StaticResource SelBTLPart_TextBlock}"/>
+                                      HorizontalAlignment="Left"
+                                      Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
 
                            <TextBlock Text="{Binding Tag.SelBTLPart.SelBTLFeatureVM.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"
-                                      Style="{StaticResource SelBTLPart_TextBlock}"/>
+                                      HorizontalAlignment="Left"
+                                      Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                         </StackPanel>
                      </Grid>
                   </DataTemplate>
@@ -393,7 +477,7 @@
                          FilterPopupMode="CheckedList"
                          SortOrder="Ascending"
                          Header="{Binding PDN_Msg}"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="GlobalState"
                          Header=""
                          SortFieldName="nGlobalState"
@@ -410,10 +494,15 @@
                      </Grid.ColumnDefinitions>
                      <TextBlock Text="↓"
                                 Visibility="{Binding RowData.Row.CALC_FALL_Visibility}"
-                                Style="{StaticResource RawPartList_TextBlock}"/>
+                                Foreground="{StaticResource TextBlock.RawPartList.Foreground}"
+                                TextAlignment="Center"
+                                FontWeight="Bold"
+                                FontSize="20"
+                                Margin="0,-6,0,-2"/>
                      <Border Grid.Column="1"
                              Background="{Binding RowData.Row.Calc_BorderBrush}"
-                             Style="{StaticResource Calc_Border}"/>
+                             Height="20"
+                             Width="20"/>
                      <Grid Grid.Column="2"
                            HorizontalAlignment="Center">
                         <Grid.RowDefinitions>
@@ -422,17 +511,30 @@
                         </Grid.RowDefinitions>
                         <TextBlock Text="&#11119;"
                                    Visibility="{Binding RowData.Row.CALC_ROT_Visibility}"
-                                   Style="{StaticResource CALC_ROT_TextBlock}"/>
+                                   Foreground="{StaticResource TextBlock.StrategyModify.Foreground}"
+                                   HorizontalAlignment="Center"
+                                   VerticalAlignment="Top"
+                                   FontWeight="SemiBold"
+                                   FontSize="12"
+                                   Margin="1,-4,0,0"/>
 
                         <TextBlock Grid.Row="1"
                                    Text="{Binding RowData.Row.CALC_ERR_Letter}"
                                    Foreground="{Binding RowData.Row.CALC_ERR_Foreground}"
-                                   Style="{StaticResource CALC_ERR_TextBlock}"/>
+                                   TextAlignment="Center"
+                                   FontWeight="Bold"
+                                   FontSize="12"
+                                   Margin="-1,-6,1,-3"
+                                   Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                      </Grid>
                      <TextBlock Grid.Column="3"
                                 Text="&#9999;"
                                 Visibility="{Binding RowData.Row.StrategyModify_Visibility}"
-                                Style="{StaticResource StrategyModify_TextBlock}"/>
+                                Foreground="{StaticResource TextBlock.StrategyModify.Foreground}"
+                                VerticalAlignment="Center"
+                                FontWeight="Normal"
+                                FontSize="11"
+                                Margin="-2,0,0,0"/>
                   </Grid>
                </DataTemplate>
             </dxg:GridColumn.CellTemplate>
@@ -440,7 +542,7 @@
          <dxg:GridColumn FieldName="bDO" 
                          SortFieldName="bDO"
                          Header=""
-                         Style="{StaticResource ColumnInfoStyle}">
+                         Style="{StaticResource ColumnInfo_Style}">
             <dxg:GridColumn.HeaderTemplate>
                <DataTemplate>
                   <CheckBox IsChecked="{Binding Path=Tag.bDOALL, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"/>
@@ -449,7 +551,7 @@
             <dxg:GridColumn.CellTemplate>
                <DataTemplate>
                   <dxe:CheckEdit IsChecked="{Binding RowData.Row.bDO}"
-                                 Style="{StaticResource bDoCheckEditStyle}"/>
+                                 HorizontalAlignment="Center"/>
                </DataTemplate>
             </dxg:GridColumn.CellTemplate>
          </dxg:GridColumn>
@@ -458,50 +560,50 @@
                          SortFieldName="dW"
                          FilterPopupMode="Custom"
                          CustomColumnFilterPopupTemplate="{StaticResource SectMat_Filter}"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="sH" 
                          Header="{Binding H_Msg}"
                          SortFieldName="dH"
                          FilterPopupMode="Custom"
                          CustomColumnFilterPopupTemplate="{StaticResource SectMat_Filter}"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="sL" 
                          SortFieldName="dL"
                          Header="{Binding L_Msg}"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="sNAM"
                          Header="{Binding NAM_Msg}"
                          AllowSorting="False"
                          FilterPopupMode="CheckedList"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="sMATERIAL" 
                          Header="{Binding MAT_Msg}"
                          AllowSorting="False"
                          FilterPopupMode="Custom"
                          CustomColumnFilterPopupTemplate="{StaticResource SectMat_Filter}"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="sCNT" 
                          Header="{Binding CNT_Msg}"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="sADDED" 
                          Header="{Binding ADDED_Msg}"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="nINPROD" 
                          Header="{Binding INPROD_Msg}"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="nDONE" 
                          Header="{Binding DONE_Msg}"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="sGROUP" 
                          Header="{Binding GRP_Msg}"
                          AllowSorting="False"
                          FilterPopupMode="CheckedList"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="sSTOREY" 
                          Header="{Binding STOREY_Msg}"
                          AllowSorting="False"
                          FilterPopupMode="CheckedList"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="sROTATED" 
                          Header=""
                          AllowSorting="False"
@@ -509,7 +611,7 @@
                          Fixed="Right"
                          Image="{StaticResource HeaderRotate_Image}"
                          HeaderToolTip="{Binding ForwardRotation_ToolTip}"
-                         Style="{StaticResource ColumnButtonStyle}">
+                         Style="{StaticResource ColumnButton_Style}">
             <dxg:GridColumn.CellTemplate>
                <DataTemplate>
                   <Grid>
@@ -518,18 +620,26 @@
                         <ColumnDefinition Width="Auto"/>
                      </Grid.ColumnDefinitions>
                      <TextBlock Text="{Binding RowData.Row.sROTATED}"
-                                Style="{StaticResource Rotate_TextBlock}"/>
+                                VerticalAlignment="Center"
+                                TextAlignment="Center"
+                                Width="25"
+                                Margin="5,0,5,0"/>
                      <!--segnaposto per avere larghezza colonna-->
                      <TextBlock Text="888°"
                                 Visibility="Hidden"
-                                Style="{StaticResource Rotate_TextBlock}"/>
+                                VerticalAlignment="Center"
+                                TextAlignment="Center"
+                                Width="25"
+                                Margin="5,0,5,0"/>
                      <Button Grid.Column="1"
                              Command="{Binding RowData.Row.ForwardRotation_Command}"
                              ToolTip="{Binding RowData.Row.ForwardRotation_ToolTip}"
                              IsEnabled="{Binding RowData.Row.RotatePart_IsEnabled}"
                              PreviewMouseDown="Button_PreviewMouseDown">
                         <Image Source="{StaticResource Rotate_Image}"
-                               Style="{StaticResource PDF_Image}"/>
+                               Height="20"
+                               Width="20"
+                               Stretch="Uniform"/>
                      </Button>
                   </Grid>
                </DataTemplate>
@@ -541,11 +651,11 @@
                          AllowColumnFiltering="False"
                          Fixed="Right"
                          Image="{StaticResource HeaderInversion_Image}"
-                         Style="{StaticResource ColumnButtonStyle}">
+                         Style="{StaticResource ColumnButton_Style}">
             <dxg:GridColumn.CellTemplate>
                <DataTemplate>
                   <dxe:CheckEdit IsChecked="{Binding RowData.Row.IsInverted}"
-                                 Style="{StaticResource bDoCheckEditStyle}"/>
+                                 HorizontalAlignment="Center"/>
                </DataTemplate>
             </dxg:GridColumn.CellTemplate>
          </dxg:GridColumn>
@@ -556,14 +666,16 @@
                          Fixed="Right"
                          Image="{StaticResource HeaderVerify_Image}"
                          HeaderToolTip="{Binding Verify_ToolTip}"
-                         Style="{StaticResource ColumnButtonStyle}">
+                         Style="{StaticResource ColumnButton_Style}">
             <dxg:GridColumn.CellTemplate>
                <DataTemplate>
                   <Button IsEnabled="{Binding RowData.Row.Verify_IsEnabled}"
                           Command="{Binding RowData.Row.Verify_Command}"
                           ToolTip="{Binding RowData.Row.Verify_ToolTip}">
                      <Image Source="{StaticResource Verify_Image}"
-                            Style="{StaticResource PDF_Image}"/>
+                            Height="20"
+                            Width="20"
+                            Stretch="Uniform"/>
                   </Button>
                </DataTemplate>
             </dxg:GridColumn.CellTemplate>
@@ -575,14 +687,16 @@
                          Fixed="Right"
                          Image="{StaticResource HeaderAddToRawPart_Image}"
                          HeaderToolTip="{Binding AddToRawPart_ToolTip}"
-                         Style="{StaticResource ColumnButtonStyle}">
+                         Style="{StaticResource ColumnButton_Style}">
             <dxg:GridColumn.CellTemplate>
                <DataTemplate>
                   <Button IsEnabled="{Binding RowData.Row.BTLPartManager_IsEnabled}"
                           Command="{Binding RowData.Row.AddToRawPart_Command}"
                           ToolTip="{Binding RowData.Row.AddToRawPart_ToolTip}">
                      <Image Source="{StaticResource AddToRawPart_Image}"
-                            Style="{StaticResource PDF_Image}"/>
+                            Height="20"
+                            Width="20"
+                            Stretch="Uniform"/>
                   </Button>
                </DataTemplate>
             </dxg:GridColumn.CellTemplate>
@@ -594,12 +708,12 @@
                          Fixed="Right"
                          Image="{StaticResource HeaderSetting_Image}"
                          HeaderToolTip="{Binding Settings_Command_ToolTip}"
-                         Style="{StaticResource ColumnButtonStyle}">
+                         Style="{StaticResource ColumnButton_Style}">
             <dxg:GridColumn.CellTemplate>
                <DataTemplate>
                   <dx:DropDownButton Glyph="{StaticResource Setting_Image}"
                                      ToolTip="{Binding RowData.Row.Settings_Command_ToolTip}"
-                                     Style="{StaticResource DropDownButtonStyle}">
+                                     Style="{StaticResource DropDownButton_Style}">
                      <dx:DropDownButton.ArrowGlyph>
                         <DrawingImage/>
                      </dx:DropDownButton.ArrowGlyph>
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListV.xaml
index 92cc1a76..6575fafa 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListV.xaml
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListV.xaml
@@ -52,18 +52,18 @@
                         
                         PreviewMouseDown="FeatureVMList_TableView_PreviewMouseDown"
                         
-                        ColumnHeaderStyle="{StaticResource HeaderStyle}"
-                        ColumnHeaderImageStyle="{StaticResource HeaderImageStyle}"
+                        ColumnHeaderStyle="{StaticResource Header_Style}"
+                        ColumnHeaderImageStyle="{StaticResource HeaderImage_Style}"
                         
-                        RowStyle="{StaticResource RowStyle}"
+                        RowStyle="{StaticResource Row_Style}"
                         
-                        Style="{StaticResource TableViewStyle}"/>
+                        Style="{StaticResource TableView_Style}"/>
       </dxg:GridControl.View>
       <dxg:GridColumn FieldName="bDO" 
                       AllowSorting="False"
                       Header=""
                       Fixed="Left"
-                      Style="{StaticResource ColumnInfoStyle}">
+                      Style="{StaticResource ColumnInfo_Style}">
          <dxg:GridColumn.HeaderTemplate>
             <DataTemplate>
                <CheckBox IsChecked="{Binding Path=Tag.bDOALL, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureInPartInRawPartListV}}}"
@@ -74,7 +74,7 @@
             <DataTemplate>
                <dxe:CheckEdit IsChecked="{Binding RowData.Row.bDO}"
                               IsEnabled="{Binding RowData.Row.IsEnabled}"
-                              Style="{StaticResource bDoCheckEditStyle}"/>
+                              HorizontalAlignment="Center"/>
             </DataTemplate>
          </dxg:GridColumn.CellTemplate>
       </dxg:GridColumn>
@@ -90,7 +90,8 @@
                      <ColumnDefinition Width="12"/>
                   </Grid.ColumnDefinitions>
                   <Border Background="{Binding RowData.Row.Calc_Background}"
-                          Style="{StaticResource Calc_Border}"/>
+                          Height="20"
+                          Width="20"/>
                   <Grid Grid.Column="1"
                         HorizontalAlignment="Center">
                      <Grid.RowDefinitions>
@@ -99,11 +100,20 @@
                      </Grid.RowDefinitions>
                      <TextBlock Text="&#11119;"
                                 Visibility="{Binding RowData.Row.CALC_ROT_Visibility}"
-                                Style="{StaticResource CALC_ROT_TextBlock}"/>
+                                Foreground="{StaticResource TextBlock.StrategyModify.Foreground}"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Top"
+                                FontWeight="SemiBold"
+                                FontSize="12"
+                                Margin="1,-4,0,0"/>
                      <TextBlock Grid.Row="1"
                                 Text="{Binding RowData.Row.CALC_ERR_Letter}"
                                 Foreground="{Binding RowData.Row.CALC_ERR_Foreground}"
-                                Style="{StaticResource CALC_ERR_TextBlock}"/>
+                                TextAlignment="Center"
+                                FontWeight="Bold"
+                                FontSize="12"
+                                Margin="-1,-6,1,-3"
+                                Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                   </Grid>
                </Grid>
             </DataTemplate>
@@ -112,23 +122,25 @@
       <dxg:GridColumn FieldName="sDesc" 
                       AllowSorting="False"
                       Header="{Binding Description_Msg}"
-                      Style="{StaticResource ColumnInfoStyle}"/>
+                      Style="{StaticResource ColumnInfo_Style}"/>
       <dxg:GridColumn FieldName="sPriority" 
                       Header="{Binding Priority_Msg}"
-                      Style="{StaticResource ColumnInfoStyle}"/>
+                      Style="{StaticResource ColumnInfo_Style}"/>
       <dxg:GridColumn FieldName="Strategy"
                       AllowSorting="False"
                       Header=""
                       Image="{StaticResource HeaderEdit_Image}"
                       Fixed="Right"
-                      Style="{StaticResource ColumnButtonStyle}">
+                      Style="{StaticResource ColumnButton_Style}">
          <dxg:GridColumn.CellTemplate>
             <DataTemplate>
                <Button Command="{Binding RowData.Row.Strategy_Command}"
                        IsEnabled="{Binding RowData.Row.IsEnabled}"
                        ToolTip="{Binding RowData.Row.Strategy_ToolTip}">
                   <Image Source="{StaticResource Edit_Image}"
-                         Style="{StaticResource PDF_Image}"/>
+                         Height="20"
+                         Width="20"
+                         Stretch="Uniform"/>
                </Button>
             </DataTemplate>
          </dxg:GridColumn.CellTemplate>
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/PParameterListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/PParameterListV.xaml
index 846d4185..cadafed0 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/PParameterListV.xaml
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/PParameterListV.xaml
@@ -65,39 +65,39 @@
                            
                            PreviewMouseDown="PParameterList_TableView_PreviewMouseDown"
                                                       
-                           ColumnHeaderStyle="{StaticResource HeaderStyle}"
-                           ColumnHeaderImageStyle="{StaticResource HeaderImageStyle}"
+                           ColumnHeaderStyle="{StaticResource Header_Style}"
+                           ColumnHeaderImageStyle="{StaticResource HeaderImage_Style}"
                            
-                           RowStyle="{StaticResource RowStyle}" 
-                           CellStyle="{StaticResource CellStyle}"
+                           RowStyle="{StaticResource Row_Style}" 
+                           CellStyle="{StaticResource Cell_Style}"
                            
-                           Style="{StaticResource TableViewStyle}"/>
+                           Style="{StaticResource TableView_Style}"/>
          </dxg:GridControl.View>
          <dxg:GridColumn FieldName="bCustom" 
                          Header="{Binding Custom_Msg}"
                          Fixed="Left"
                          AllowEditing="False"
-                         Style="{StaticResource ColumnInfoStyle}">
+                         Style="{StaticResource ColumnInfo_Style}">
             <dxg:GridColumn.CellTemplate>
                <DataTemplate>
                   <dxe:CheckEdit IsChecked="{Binding RowData.Row.bCustom}"
-                                 Style="{StaticResource bDoCheckEditStyle}"/>
+                                 HorizontalAlignment="Center"/>
                </DataTemplate>
             </dxg:GridColumn.CellTemplate>
          </dxg:GridColumn>
          <dxg:GridColumn FieldName="sName" 
                          Header="{Binding NAM_Msg}"
                          AllowEditing="False"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="sDescription" 
                          Header="{Binding Description_Msg}"
                          AllowEditing="False"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="sValue" 
                          SortFieldName="dValue"                     
                          Header="{Binding Value_Msg}"
                          AllowColumnFiltering="False"
-                         Style="{StaticResource ColumnInfoStyle}">
+                         Style="{StaticResource ColumnInfo_Style}">
             <dxg:GridColumn.EditSettings>
                <dxe:TextEditSettings HorizontalContentAlignment="Center"/>
             </dxg:GridColumn.EditSettings>
@@ -107,18 +107,19 @@
                          Header="{Binding Min_Msg}"
                          AllowColumnFiltering="False"
                          AllowEditing="False"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="sMax"
                          SortFieldName="dMaxn"
                          Header="{Binding Max_Msg}"
                          AllowColumnFiltering="False"
                          AllowEditing="False"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
       </dxg:GridControl>
 
       <Image Grid.Column="1"
              Source="{Binding sCurrDraw}" 
-             Style="{StaticResource CurrDraw_Image}"/>
+             Width="250"
+             Margin="2.5"/>
 
       <StackPanel Grid.Row="1"
                   Grid.ColumnSpan="2"
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/PartParametersV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/PartParametersV.xaml
index a6926832..b0ea7cff 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/PartParametersV.xaml
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/PartParametersV.xaml
@@ -18,78 +18,122 @@
          <RowDefinition Height="1*"/>
       </Grid.RowDefinitions>
       <UniformGrid Columns="2" 
-                   Style="{StaticResource PartParameters_UniformGrid}">
+                   Margin="0,0,0,-45">
          <TextBlock Text="{Binding NAM_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding Tag.sNAM, UpdateSourceTrigger=Explicit,
                                                RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding COUNT_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding Tag.sCNT, UpdateSourceTrigger=Explicit,
                                                RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding ORDERNUM_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding Tag.nORDERNUM, UpdateSourceTrigger=Explicit,
                                                RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding PLANINGLEN_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding Tag.dPLANINGLEN, UpdateSourceTrigger=Explicit,
                                                RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding STARTOFFSET_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding Tag.dSTARTOFFSET, UpdateSourceTrigger=Explicit,
                                                RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding ENDOFFSET_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding Tag.dENDOFFSET, UpdateSourceTrigger=Explicit,
                                                RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding DESIGN_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding Tag.sDESIGN, UpdateSourceTrigger=Explicit,
                                                RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding GROUP_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding Tag.sGROUP, UpdateSourceTrigger=Explicit,
                                                RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding STOREY_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding Tag.sSTOREY, UpdateSourceTrigger=Explicit,
                                                RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding ANNOT_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding Tag.sANNOT, UpdateSourceTrigger=Explicit,
                                                RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding MATERIAL_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding Tag.sMATERIAL, UpdateSourceTrigger=Explicit,
                                                RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
       </UniformGrid>
 
       <GroupBox Grid.Row="1"
                 Style="{DynamicResource PartParam_GroupBox}">
-         <Grid Style="{StaticResource PartParameters_Grid}">
+         <Grid Margin="0,5,0,0">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="1*"/>
@@ -99,13 +143,16 @@
                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
             <TextBlock Text="{Binding COLOUR_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <Button Grid.Column="1" 
                     Background="{Binding Tag.PartColour, UpdateSourceTrigger=PropertyChanged,
                                          RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
                     Command="{Binding Tag.PartColour_Command, UpdateSourceTrigger=PropertyChanged,
                                       RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                    
-                    Style="{StaticResource PartParameters_Button}"/>
+                    Height="20"
+                    Width="100"/>
             <TextBlock Grid.Row="1"
                        Text="{Binding TRANSPARENCY_MSG}"                       
                        Style="{StaticResource PartParam_TextBlock}"/>
@@ -113,51 +160,79 @@
                                    Grid.Column="1"
                                    Text="{Binding Tag.nCOLA, UpdateSourceTrigger=Explicit,
                                                   RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                       
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Width="150"
+                                   Margin="5"
+                                   Style="{StaticResource EgtOptmizer_TextBox}"/>
          </Grid>
       </GroupBox>
 
       <UniformGrid Grid.Column="1" 
                    Columns="2"
-                   Style="{StaticResource PartParameters_UniformGrid}">
+                   Margin="0,0,0,-45">
          <TextBlock Text="{Binding TIMBERGRADE_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding Tag.sTIMBERGRADE, UpdateSourceTrigger=Explicit,
                                                RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding QUALITYGRADE_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding Tag.sQUALITYGRADE, UpdateSourceTrigger=Explicit,
                                                RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding PACKAGE_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding Tag.sPACKAGE, UpdateSourceTrigger=Explicit,
                                                RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding ASSEMBLYNUM_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding Tag.sASSEMBLYNUM, UpdateSourceTrigger=Explicit,
                                                RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding ELEMENTNUM_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding Tag.sELEMENTNUM, UpdateSourceTrigger=Explicit,
                                                RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding MODULENUM_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding Tag.sMODULENUM, UpdateSourceTrigger=Explicit,
                                                RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding PROCESSINGQUALITY_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <ComboBox Grid.Column="1"
                    ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                  Path=Tag.ocPROCESSINGQUALITY,
@@ -165,9 +240,12 @@
                    SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                            Path=Tag.SelPROCESSINGQUALITY,
                                            Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"                   
-                   Style="{StaticResource PartParam_ComboBox}"/>
+                   Height="22"
+                   Width="150"/>
          <TextBlock Text="{Binding RECESS_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <ComboBox Grid.Column="1"
                    ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                          Path=Tag.ocRECESS,
@@ -175,9 +253,12 @@
                    SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                            Path=Tag.SelRECESS,
                                            Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"                   
-                   Style="{StaticResource PartParam_ComboBox}"/>
+                   Height="22"
+                   Width="150"/>
          <TextBlock Text="{Binding STOREYTYPE_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <ComboBox Grid.Column="1"
                    ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                          Path=Tag.ocSTOREYTYPE,
@@ -185,25 +266,34 @@
                    SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                            Path=Tag.SelSTOREYTYPE,
                                            Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"                   
-                   Style="{StaticResource PartParam_ComboBox}"/>
+                   Height="22"
+                   Width="150"/>
          <TextBlock Text="{Binding LAYER_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding Tag.nLAYER, UpdateSourceTrigger=Explicit,
                                                RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding COMMENT_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding Tag.sCOMMENT, UpdateSourceTrigger=Explicit,
                                                RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
       </UniformGrid>
 
       <GroupBox Grid.Row="1" 
                 Grid.Column="1"
                 Style="{DynamicResource PartParam_GroupBox}">
-         <Grid Style="{StaticResource PartParameters_Grid}">
+         <Grid Margin="0,5,0,0">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="1*"/>
@@ -213,7 +303,9 @@
                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
             <TextBlock Text="{Binding REFSIDE_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <ComboBox Grid.Column="1"
                       ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                             Path=Tag.ocREFSIDE,
@@ -221,10 +313,13 @@
                       SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                               Path=Tag.SelREFSIDE,
                                               Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"                      
-                      Style="{StaticResource PartParam_ComboBox}"/>
+                      Height="22"
+                      Width="150"/>
             <TextBlock Grid.Row="1"
                        Text="{Binding REFSIDEALIGN_MSG}"                       
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <CheckBox Grid.Row="1"
                       Grid.Column="1"
                       IsChecked="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
@@ -270,14 +365,20 @@
                   <RowDefinition Height="1*"/>
                </Grid.RowDefinitions>
                <TextBlock Text="{Binding GRAINDIRECTION_MSG}"
-                          Style="{StaticResource PartParam_TextBlock}"/>
+                          VerticalAlignment="Center"
+                          Margin="10,0,10,0"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                       Text="{Binding Tag.GrainDirection, UpdateSourceTrigger=Explicit,
                                                      RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                      
-                                      Style="{StaticResource PartParam_TextBox}"/>
+                                      Width="150"
+                                      Margin="5"
+                                      Style="{StaticResource EgtOptmizer_TextBox}"/>
                <TextBlock Grid.Row="1"
                           Text="{Binding GRAINDIRALIGN_MSG}"                          
-                          Style="{StaticResource PartParam_TextBlock}"/>
+                          VerticalAlignment="Center"
+                          Margin="10,0,10,0"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <CheckBox Grid.Row="1"
                          Grid.Column="1"
                          IsChecked="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
@@ -292,7 +393,7 @@
                    Grid.RowSpan="2" 
                    Grid.ColumnSpan="2"
                    Style="{DynamicResource NoHeader_GroupBox}">
-            <Grid Style="{StaticResource PartParameters_Grid}">
+            <Grid Margin="0,5,0,0">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="1*"/>
@@ -302,7 +403,9 @@
                   <RowDefinition Height="1*"/>
                </Grid.RowDefinitions>
                <TextBlock Text="{Binding CAMBERSIDE_MSG}"
-                          Style="{StaticResource PartParam_TextBlock}"/>
+                          VerticalAlignment="Center"
+                          Margin="10,0,10,0"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <ComboBox Grid.Column="1"
                          ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                                Path=Tag.ocCAMBERSIDE,
@@ -310,22 +413,27 @@
                          SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                                  Path=Tag.SelCAMBERSIDE,
                                                  Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"                         
-                         Style="{StaticResource PartParam_ComboBox}"/>
+                         Height="22"
+                         Width="150"/>
                <TextBlock Grid.Row="1"
                           Text="{Binding CAMBERPARAMS_MSG}"                          
-                          Style="{StaticResource PartParam_TextBlock}"/>
+                          VerticalAlignment="Center"
+                          Margin="10,0,10,0"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <EgtWPFLib5:EgtTextBox Grid.Row="1"
                                       Grid.Column="1"
                                       Text="{Binding Tag.CamberParams, UpdateSourceTrigger=Explicit,
                                                      RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                      
-                                      Style="{StaticResource PartParam_TextBox}"/>
+                                      Width="150"
+                                      Margin="5"
+                                      Style="{StaticResource EgtOptmizer_TextBox}"/>
             </Grid>
          </GroupBox>
          <GroupBox Grid.Row="4" 
                    Grid.RowSpan="2" 
                    Grid.ColumnSpan="2"
                    Style="{DynamicResource NoHeader_GroupBox}">
-            <Grid Style="{StaticResource PartParameters_Grid}">
+            <Grid Margin="0,5,0,0">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="1*"/>
@@ -335,7 +443,9 @@
                   <RowDefinition Height="1*"/>
                </Grid.RowDefinitions>
                <TextBlock Text="{Binding REFSIDEFIXCLAMP_MSG}"
-                          Style="{StaticResource PartParam_TextBlock}"/>
+                          VerticalAlignment="Center"
+                          Margin="10,0,10,0"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <ComboBox Grid.Column="1"
                          ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                                Path=Tag.ocREFSIDEFIXCLAMP,
@@ -343,22 +453,27 @@
                          SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                                  Path=Tag.SelREFSIDEFIXCLAMP,
                                                  Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"                         
-                         Style="{StaticResource PartParam_ComboBox}"/>
+                         Height="22"
+                         Width="150"/>
                <TextBlock Grid.Row="1"
                           Text="{Binding PARTOFFSETPARAMS_MSG}"                          
-                          Style="{StaticResource PartParam_TextBlock}"/>
+                          VerticalAlignment="Center"
+                          Margin="10,0,10,0"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <EgtWPFLib5:EgtTextBox Grid.Row="1"
                                       Grid.Column="1"
                                       Text="{Binding Tag.PartOffsetParams, UpdateSourceTrigger=Explicit,
                                                      RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                      
-                                      Style="{StaticResource PartParam_TextBox}"/>
+                                      Width="150"
+                                      Margin="5"
+                                      Style="{StaticResource EgtOptmizer_TextBox}"/>
             </Grid>
          </GroupBox>
          <GroupBox Grid.Row="6" 
                    Grid.RowSpan="2" 
                    Grid.ColumnSpan="2"
                    Style="{DynamicResource NoHeader_GroupBox}">
-            <Grid Style="{StaticResource PartParameters_Grid}">
+            <Grid Margin="0,5,0,0">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="1*"/>
@@ -368,7 +483,9 @@
                   <RowDefinition Height="1*"/>
                </Grid.RowDefinitions>
                <TextBlock Text="{Binding MATERIALTYPEGRP_MSG}"
-                          Style="{StaticResource PartParam_TextBlock}"/>
+                          VerticalAlignment="Center"
+                          Margin="10,0,10,0"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <ComboBox Grid.Column="1"
                          ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                                Path=Tag.ocMATERIALTYPEGRP,
@@ -376,22 +493,27 @@
                          SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                                  Path=Tag.SelMATERIALTYPEGRP,
                                                  Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"                         
-                         Style="{StaticResource PartParam_ComboBox}"/>
+                         Height="22"
+                         Width="150"/>
                <TextBlock Grid.Row="1"
                           Text="{Binding MATERIALTYPESPEC_MSG}"                          
-                          Style="{StaticResource PartParam_TextBlock}"/>
+                          VerticalAlignment="Center"
+                          Margin="10,0,10,0"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <EgtWPFLib5:EgtTextBox Grid.Row="1"
                                       Grid.Column="1"
                                       Text="{Binding Tag.sMATERIALTYPESPEC, UpdateSourceTrigger=Explicit,
                                                      RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                      
-                                      Style="{StaticResource PartParam_TextBox}"/>
+                                      Width="150"
+                                      Margin="5"
+                                      Style="{StaticResource EgtOptmizer_TextBox}"/>
             </Grid>
          </GroupBox>
          <GroupBox Grid.Row="8" 
                    Grid.RowSpan="2" 
                    Grid.ColumnSpan="2"
                    Style="{DynamicResource NoHeader_GroupBox}">
-            <Grid Style="{StaticResource PartParameters_Grid}">
+            <Grid Margin="0,5,0,0">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="1*"/>
@@ -409,10 +531,13 @@
                          SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                                  Path=Tag.SelALIGNLOCATION,
                                                  Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"                         
-                         Style="{StaticResource PartParam_ComboBox}"/>
+                         Height="22"
+                         Width="150"/>
                <TextBlock Grid.Row="1"
                           Text="{Binding ALIGNENDTYPE_MSG}"                          
-                          Style="{StaticResource PartParam_TextBlock}"/>
+                          VerticalAlignment="Center"
+                          Margin="10,0,10,0"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <ComboBox Grid.Row="1"
                          Grid.Column="1"
                          ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
@@ -421,14 +546,16 @@
                          SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                                  Path=Tag.SelALIGNENDTYPE,
                                                  Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                         Style="{StaticResource PartParameters_ComboBox}"/>
+                         Height="22"
+                         Width="150"
+                         Margin="0,5"/>
             </Grid>
          </GroupBox>
          <GroupBox Grid.Row="10" 
                    Grid.RowSpan="4" 
                    Grid.ColumnSpan="2"
                    Style="{DynamicResource NoHeader_GroupBox}">
-            <Grid Style="{StaticResource PartParameters_Grid}">
+            <Grid Margin="0,5,0,0">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="1*"/>
@@ -440,7 +567,9 @@
                   <RowDefinition Height="1*"/>
                </Grid.RowDefinitions>
                <TextBlock Text="{Binding UID_MSG}"
-                          Style="{StaticResource PartParam_TextBlock}"/>
+                          VerticalAlignment="Center"
+                          Margin="10,0,10,0"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <ComboBox Grid.Column="1"
                          ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                                 Path=Tag.ocUID,
@@ -448,31 +577,44 @@
                          SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                                  Path=Tag.SelUID,
                                                  Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"                         
-                         Style="{StaticResource PartParam_ComboBox}"/>
+                         Height="22"
+                         Width="150"/>
                <TextBlock Grid.Row="1"
                           Text="{Binding TRANSFORIG_MSG}"                          
-                          Style="{StaticResource PartParam_TextBlock}"/>
+                          VerticalAlignment="Center"
+                          Margin="10,0,10,0"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <EgtWPFLib5:EgtTextBox Grid.Row="1"
                                       Grid.Column="1"
                                       Text="{Binding Tag.TransfOrig, UpdateSourceTrigger=Explicit,
                                                      RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                      
-                                      Style="{StaticResource PartParam_TextBox}"/>
+                                      Width="150"
+                                      Margin="5"
+                                      Style="{StaticResource EgtOptmizer_TextBox}"/>
                <TextBlock Grid.Row="2"
                           Text="{Binding TRANSFVERSX_MSG}"                          
-                          Style="{StaticResource PartParam_TextBlock}"/>
+                          VerticalAlignment="Center"
+                          Margin="10,0,10,0"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <EgtWPFLib5:EgtTextBox Grid.Row="2"
                                       Grid.Column="1"
                                       Text="{Binding Tag.TransfVersX, UpdateSourceTrigger=Explicit,
                                                      RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                      
-                                      Style="{StaticResource PartParam_TextBox}"/>
+                                      Width="150"
+                                      Margin="5"
+                                      Style="{StaticResource EgtOptmizer_TextBox}"/>
                <TextBlock Grid.Row="3"
                           Text="{Binding TRANSFVERSY_MSG}"                          
-                          Style="{StaticResource PartParam_TextBlock}"/>
+                          VerticalAlignment="Center"
+                          Margin="10,0,10,0"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <EgtWPFLib5:EgtTextBox Grid.Row="3"
                                       Grid.Column="1"
                                       Text="{Binding Tag.TransfVersY, UpdateSourceTrigger=Explicit,
                                                      RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                      
-                                      Style="{StaticResource PartParam_TextBox}"/>
+                                      Width="150"
+                                      Margin="5"
+                                      Style="{StaticResource EgtOptmizer_TextBox}"/>
             </Grid>
          </GroupBox>
       </Grid>
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml
index bab451c4..d23a0524 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml
@@ -54,13 +54,13 @@
 
                            ShowGridMenu="OnShowGridMenu"
 
-                           ColumnHeaderStyle="{StaticResource HeaderStyle}"
-                           ColumnHeaderImageStyle="{StaticResource HeaderImageStyle}"
+                           ColumnHeaderStyle="{StaticResource Header_Style}"
+                           ColumnHeaderImageStyle="{StaticResource HeaderImage_Style}"
                            
-                           RowStyle="{StaticResource RowStyle}"
-                           CellStyle="{StaticResource CellStyle}"
+                           RowStyle="{StaticResource Row_Style}"
+                           CellStyle="{StaticResource Cell_Style}"
                            
-                           Style="{StaticResource TableViewStyle}">
+                           Style="{StaticResource TableView_Style}">
             </dxg:TableView>
          </dxg:GridControl.View>
          <dxg:GridControl.TotalSummary>
@@ -106,13 +106,13 @@
                                     
                                     ShowGridMenu="OnShowGridMenu"
                                     
-                                    ColumnHeaderStyle="{StaticResource RawPartHeaderStyle}"
-                                    ColumnHeaderImageStyle="{StaticResource HeaderImageStyle}"
+                                    ColumnHeaderStyle="{StaticResource RawPartHeader_Style}"
+                                    ColumnHeaderImageStyle="{StaticResource HeaderImage_Style}"
                                     
-                                    RowStyle="{StaticResource RowStyle}"
-                                    CellStyle="{StaticResource CellStyle}"
+                                    RowStyle="{StaticResource Row_Style}"
+                                    CellStyle="{StaticResource Cell_Style}"
                                     
-                                    Style="{StaticResource TableViewStyle}">
+                                    Style="{StaticResource TableView_Style}">
                      </dxg:TableView>
 
                   </dxg:GridControl.View>
@@ -121,7 +121,7 @@
                                   Header="{Binding PDN_Msg}"
                                   Fixed="Left"
                                   AllowEditing="False"
-                                  Style="{StaticResource ColumnInfoStyle}"/>
+                                  Style="{StaticResource ColumnInfo_Style}"/>
                   <dxg:GridColumn FieldName="GlobalState"
                                   AllowSorting="False" 
                                   Header=""
@@ -138,10 +138,15 @@
                               </Grid.ColumnDefinitions>
                               <TextBlock Text="↓"
                                          Visibility="{Binding RowData.Row.CALC_FALL_Visibility}"
-                                         Style="{StaticResource RawPartList_TextBlock}"/>
+                                         Foreground="{StaticResource TextBlock.RawPartList.Foreground}"
+                                         TextAlignment="Center"
+                                         FontWeight="Bold"
+                                         FontSize="20"
+                                         Margin="0,-6,0,-2"/>
                               <Border Grid.Column="1"
                                       Background="{Binding RowData.Row.Calc_Background}"
-                                      Style="{StaticResource Calc_Border}"/>
+                                      Height="20"
+                                      Width="20"/>
                               <Grid Grid.Column="2"
                                     HorizontalAlignment="Center">
                                  <Grid.ColumnDefinitions>
@@ -150,11 +155,20 @@
                                  </Grid.ColumnDefinitions>
                                  <TextBlock Text="&#11119;"
                                             Visibility="{Binding RowData.Row.CALC_ROT_Visibility}"
-                                            Style="{StaticResource CALC_ROT_TextBlock}"/>
+                                            Foreground="{StaticResource TextBlock.StrategyModify.Foreground}"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Top"
+                                            FontWeight="SemiBold"
+                                            FontSize="12"
+                                            Margin="1,-4,0,0"/>
                                  <TextBlock Grid.Column="1"
                                             Text="{Binding RowData.Row.CALC_ERR_Letter}"
                                             Foreground="{Binding RowData.Row.CALC_ERR_Foreground}"
-                                            Style="{StaticResource CALC_ERR_TextBlock}"/>
+                                            TextAlignment="Center"
+                                            FontWeight="Bold"
+                                            FontSize="12"
+                                            Margin="-1,-6,1,-3"
+                                            Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                               </Grid>
                            </Grid>
                         </DataTemplate>
@@ -165,13 +179,13 @@
                                   AllowSorting="False" 
                                   FilterPopupMode="CheckedList"
                                   AllowEditing="False"
-                                  Style="{StaticResource ColumnInfoStyle}"/>
+                                  Style="{StaticResource ColumnInfo_Style}"/>
                   <dxg:GridColumn FieldName="sL"
                                   AllowSorting="False" 
                                   Header="{Binding L_Msg}"
                                   AllowColumnFiltering="False"
                                   AllowEditing="False"
-                                  Style="{StaticResource ColumnInfoStyle}"/>
+                                  Style="{StaticResource ColumnInfo_Style}"/>
                   <dxg:GridColumn FieldName="sROTATED" 
                                   Header=""
                                   Image="{StaticResource HeaderRotateRawPart_Image}"
@@ -180,7 +194,7 @@
                                   AllowSorting="False" 
                                   Fixed="Right"
                                   AllowEditing="False"
-                                  Style="{StaticResource ColumnButtonStyle}">
+                                  Style="{StaticResource ColumnButton_Style}">
                      <dxg:GridColumn.CellTemplate>
                         <DataTemplate>
                            <Grid>
@@ -189,17 +203,25 @@
                                  <ColumnDefinition Width="Auto"/>
                               </Grid.ColumnDefinitions>
                               <TextBlock Text="{Binding RowData.Row.sROT}"
-                                         Style="{StaticResource Rotate_TextBlock}"/>
+                                         VerticalAlignment="Center"
+                                         TextAlignment="Center"
+                                         Width="25"
+                                         Margin="5,0,5,0"/>
                               <!--segnaposto per avere larghezza colonna-->
                               <TextBlock Text="888°"
                                          Visibility="Hidden"
-                                         Style="{StaticResource Rotate_TextBlock}"/>
+                                         VerticalAlignment="Center"
+                                         TextAlignment="Center"
+                                         Width="25"
+                                         Margin="5,0,5,0"/>
                               <Button Grid.Column="1"
                                       Command="{Binding RowData.Row.ForwardRotation_Command}"
                                       IsEnabled="{Binding RowData.Row.ButtonIsEnabled}"
                                       ToolTip="{Binding RowData.Row.ForwardRotation_ToolTip}">
                                  <Image Source="{StaticResource Rotate_Image}"
-                                        Style="{StaticResource PDF_Image}"/>
+                                        Height="20"
+                                        Width="20"
+                                        Stretch="Uniform"/>
                               </Button>
                            </Grid>
                         </DataTemplate>
@@ -212,12 +234,12 @@
                                   Fixed="Right"
                                   AllowColumnFiltering="False"
                                   AllowEditing="False"
-                                  Style="{StaticResource ColumnButtonStyle}">
+                                  Style="{StaticResource ColumnButton_Style}">
                      <dxg:GridColumn.CellTemplate>
                         <DataTemplate>
                            <dxe:CheckEdit IsChecked="{Binding RowData.Row.bFLIP}"
                                           IsEnabled="{Binding RowData.Row.ButtonIsEnabled}"
-                                          Style="{StaticResource bDoCheckEditStyle}"/>
+                                          HorizontalAlignment="Center"/>
                         </DataTemplate>
                      </dxg:GridColumn.CellTemplate>
                   </dxg:GridColumn>
@@ -226,18 +248,18 @@
                                   Header="{Binding PosX_Msg}"
                                   AllowColumnFiltering="False"
                                   AllowEditing="False"
-                                  Style="{StaticResource ColumnInfoStyle}"/>
+                                  Style="{StaticResource ColumnInfo_Style}"/>
                   <dxg:GridColumn FieldName="sPOSY" 
                                   AllowSorting="False" 
                                   Header="{Binding PosY_Msg}"
                                   AllowColumnFiltering="False"
                                   AllowEditing="False"
-                                  Style="{StaticResource ColumnInfoStyle}"/>
+                                  Style="{StaticResource ColumnInfo_Style}"/>
                   <dxg:GridColumn FieldName="sOffset" 
                                   AllowSorting="False" 
                                   Header="{Binding Offset_Msg}"
                                   AllowColumnFiltering="False"
-                                  Style="{StaticResource ColumnInfoStyle}">
+                                  Style="{StaticResource ColumnInfo_Style}">
                      <dxg:GridColumn.EditSettings>
                         <dxe:TextEditSettings HorizontalContentAlignment="Center"/>
                      </dxg:GridColumn.EditSettings>
@@ -246,30 +268,32 @@
                                   AllowSorting="False" 
                                   Header="{Binding MAT_Msg}"
                                   AllowEditing="False"
-                                  Style="{StaticResource ColumnInfoStyle}"/>
+                                  Style="{StaticResource ColumnInfo_Style}"/>
                   <dxg:GridColumn FieldName="sGROUP" 
                                   Header="{Binding GRP_Msg}"
                                   AllowSorting="False"
                                   AllowEditing="False"
-                                  Style="{StaticResource ColumnInfoStyle}"/>
+                                  Style="{StaticResource ColumnInfo_Style}"/>
                   <dxg:GridColumn FieldName="sSTOREY" 
                                   Header="{Binding STOREY_Msg}"
                                   AllowSorting="False"
                                   AllowEditing="False"
-                                  Style="{StaticResource ColumnInfoStyle}"/>
+                                  Style="{StaticResource ColumnInfo_Style}"/>
                   <dxg:GridColumn FieldName="MoveUp"
                                   Header=""
                                   AllowSorting="False"
                                   Fixed="Right"
                                   AllowEditing="False"
-                                  Style="{StaticResource ColumnButtonStyle}">
+                                  Style="{StaticResource ColumnButton_Style}">
                      <dxg:GridColumn.CellTemplate>
                         <DataTemplate>
                            <Button Command="{Binding RowData.Row.MoveUpPart_Command}"
                                    IsEnabled="{Binding RowData.Row.ButtonIsEnabled}"
                                    ToolTip="{Binding RowData.Row.MoveUpPart_ToolTip}">
                               <Image Source="{StaticResource MoveUp_Image}"
-                                     Style="{StaticResource PDF_Image}"/>
+                                     Height="20"
+                                     Width="20"
+                                     Stretch="Uniform"/>
                            </Button>
                         </DataTemplate>
                      </dxg:GridColumn.CellTemplate>
@@ -279,14 +303,16 @@
                                   AllowSorting="False"
                                   Fixed="Right"
                                   AllowEditing="False"
-                                  Style="{StaticResource ColumnButtonStyle}">
+                                  Style="{StaticResource ColumnButton_Style}">
                      <dxg:GridColumn.CellTemplate>
                         <DataTemplate>
                            <Button Command="{Binding RowData.Row.MoveDownPart_Command}"
                                    IsEnabled="{Binding RowData.Row.ButtonIsEnabled}"
                                    ToolTip="{Binding RowData.Row.MoveDownPart_ToolTip}">
                               <Image Source="{StaticResource MoveDown_Image}"
-                                     Style="{StaticResource PDF_Image}"/>
+                                     Height="20"
+                                     Width="20"
+                                     Stretch="Uniform"/>
                            </Button>
                         </DataTemplate>
                      </dxg:GridColumn.CellTemplate>
@@ -296,14 +322,16 @@
                                   AllowSorting="False"
                                   Fixed="Right"
                                   AllowEditing="False"
-                                  Style="{StaticResource ColumnButtonStyle}">
+                                  Style="{StaticResource ColumnButton_Style}">
                      <dxg:GridColumn.CellTemplate>
                         <DataTemplate>
                            <Button Command="{Binding RowData.Row.RemovePart_Command}"
                                    IsEnabled="{Binding RowData.Row.ButtonIsEnabled}"
                                    ToolTip="{Binding RowData.Row.RemovePart_ToolTip}">
                               <Image Source="{StaticResource Remove_Image}"
-                                     Style="{StaticResource PDF_Image}"/>
+                                     Height="20"
+                                     Width="20"
+                                     Stretch="Uniform"/>
                            </Button>
                         </DataTemplate>
                      </dxg:GridColumn.CellTemplate>
@@ -317,7 +345,7 @@
                          SortFieldName="nName" 
                          Fixed="Left"
                          AllowEditing="False"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="GlobalState"
                          Header=""
                          SortFieldName="nGlobalState"
@@ -325,7 +353,7 @@
                          AllowEditing="False">
             <dxg:GridColumn.CellTemplate>
                <DataTemplate>
-                  <Grid Style="{StaticResource RawPartList_Grid}">
+                  <Grid Margin="5,0,-4,0">
                      <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="1*"/>
@@ -333,10 +361,15 @@
                      </Grid.ColumnDefinitions>
                      <TextBlock Text="↓"
                                 Visibility="{Binding RowData.Row.CALC_FALL_Visibility}"
-                                Style="{StaticResource RawPartList_TextBlock}"/>
+                                Foreground="{StaticResource TextBlock.RawPartList.Foreground}"
+                                TextAlignment="Center"
+                                FontWeight="Bold"
+                                FontSize="20"
+                                Margin="0,-6,0,-2"/>
                      <Border Grid.Column="1"
                              Background="{Binding RowData.Row.Calc_Background}"
-                             Style="{StaticResource Calc_Border}"/>
+                             Height="20"
+                             Width="20"/>
                      <Grid Grid.Column="2"
                            HorizontalAlignment="Center">
                         <Grid.RowDefinitions>
@@ -345,11 +378,18 @@
                         </Grid.RowDefinitions>
                         <TextBlock Text="&#11119;"
                                    Visibility="{Binding RowData.Row.CALC_ROT_Visibility}"
-                                   Style="{StaticResource CALC_ROT_TextBlock}"/>
+                                   Foreground="{StaticResource TextBlock.StrategyModify.Foreground}"
+                                   HorizontalAlignment="Center"
+                                   VerticalAlignment="Top"
+                                   FontWeight="SemiBold"
+                                   FontSize="12"
+                                   Margin="1,-4,0,0"/>
                         <TextBlock Grid.Row="1"
-                                    Text="{Binding RowData.Row.CALC_ERR_Letter}"
-                                    Foreground="{Binding RowData.Row.CALC_ERR_Foreground}"
-                                    Style="{StaticResource CALC_ERR_TextBlock}"/>
+                                   Text="{Binding RowData.Row.CALC_ERR_Letter}"
+                                   Foreground="{Binding RowData.Row.CALC_ERR_Foreground}"
+                                   VerticalAlignment="Bottom"
+                                   Margin="0,-4,0.5,0"
+                                   Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                      </Grid>
                   </Grid>
                </DataTemplate>
@@ -360,7 +400,7 @@
                          Binding="{Binding sStartCut, Mode=TwoWay}"
                          AllowSorting="False"
                          AllowColumnFiltering="False"
-                         Style="{StaticResource ColumnInfoStyle}">
+                         Style="{StaticResource ColumnInfo_Style}">
             <dxg:GridColumn.EditSettings>
                <dxe:TextEditSettings HorizontalContentAlignment="Center"/>
             </dxg:GridColumn.EditSettings>
@@ -371,20 +411,20 @@
                          SortFieldName="dW"
                          AllowColumnFiltering="False"
                          AllowEditing="False"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="sH" 
                          Header="{Binding H_Msg}"
                          Binding="{Binding sH}"
                          SortFieldName="dH"
                          AllowColumnFiltering="False"
                          AllowEditing="False"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="sL" 
                          Header="{Binding L_Msg}"
                          Binding="{Binding sL, Mode=TwoWay}"
                          SortFieldName="dL"
                          AllowColumnFiltering="False"
-                         Style="{StaticResource ColumnInfoStyle}">
+                         Style="{StaticResource ColumnInfo_Style}">
             <dxg:GridColumn.EditSettings>
                <dxe:TextEditSettings HorizontalContentAlignment="Center"/>
             </dxg:GridColumn.EditSettings>
@@ -395,28 +435,28 @@
                          AllowSorting="False"
                          AllowColumnFiltering="False"
                          AllowEditing="False"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="sMATERIAL" 
                          Header="{Binding Material_Msg}"
                          Binding="{Binding sMATERIAL}"
                          AllowSorting="False"
                          AllowColumnFiltering="False"
                          AllowEditing="False"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="sUsage" 
                          Header="{Binding Used_Msg}"
                          Binding="{Binding sUsage}"
                          AllowSorting="False"
                          AllowColumnFiltering="False"
                          AllowEditing="False"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="sWaste" 
                          Header="{Binding Waste_Msg}"
                          Binding="{Binding sWaste}"
                          AllowSorting="False"
                          AllowColumnFiltering="False"
                          AllowEditing="False"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="Verify"
                          Header=""
                          Image="{StaticResource HeaderVerify_Image}"
@@ -425,14 +465,16 @@
                          Fixed="Right"
                          AllowColumnFiltering="False"
                          AllowEditing="False"
-                         Style="{StaticResource ColumnButtonStyle}">
+                         Style="{StaticResource ColumnButton_Style}">
             <dxg:GridColumn.CellTemplate>
                <DataTemplate>
                   <Button IsEnabled="{Binding RowData.Row.ButtonIsEnabled}"
                           Command="{Binding RowData.Row.Verify_Command}"
                           ToolTip="{Binding RowData.Row.Verify_ToolTip}">
                      <Image Source="{StaticResource Verify_Image}"
-                            Style="{StaticResource PDF_Image}"/>
+                            Height="20"
+                            Width="20"
+                            Stretch="Uniform"/>
                   </Button>
                </DataTemplate>
             </dxg:GridColumn.CellTemplate>
@@ -445,14 +487,16 @@
                          AllowColumnFiltering="False"
                          Fixed="Right"
                          AllowEditing="False"
-                         Style="{StaticResource ColumnButtonStyle}">
+                         Style="{StaticResource ColumnButton_Style}">
             <dxg:GridColumn.CellTemplate>
                <DataTemplate>
                   <Button IsEnabled="{Binding RowData.Row.Simulate_IsEnabled}"
                           Command="{Binding RowData.Row.Simulate_Command}"
                           ToolTip="{Binding RowData.Row.Simulate_ToolTip}">
                      <Image Source="{StaticResource Simulate_Image}"
-                            Style="{StaticResource PDF_Image}"/>
+                            Height="20"
+                            Width="20"
+                            Stretch="Uniform"/>
                   </Button>
                </DataTemplate>
             </dxg:GridColumn.CellTemplate>
@@ -465,14 +509,16 @@
                          AllowColumnFiltering="False"
                          Fixed="Right"
                          AllowEditing="False"
-                         Style="{StaticResource ColumnButtonStyle}">
+                         Style="{StaticResource ColumnButton_Style}">
             <dxg:GridColumn.CellTemplate>
                <DataTemplate>
                   <Button IsEnabled="{Binding RowData.Row.ButtonIsEnabled}"
                           Command="{Binding RowData.Row.ProduceRawPart_Command}"
                           ToolTip="{Binding RowData.Row.ProduceRawPart_ToolTip}">
                      <Image Source="{StaticResource ProduceRawPart_Image}"
-                            Style="{StaticResource PDF_Image}"/>
+                            Height="20"
+                            Width="20"
+                            Stretch="Uniform"/>
                   </Button>
                </DataTemplate>
             </dxg:GridColumn.CellTemplate>
@@ -485,13 +531,13 @@
                          AllowColumnFiltering="False"
                          Fixed="Right"
                          AllowEditing="False"
-                         Style="{StaticResource ColumnButtonStyle}">
+                         Style="{StaticResource ColumnButton_Style}">
             <dxg:GridColumn.CellTemplate>
                <DataTemplate>
                   <dx:DropDownButton Glyph="{StaticResource Setting_Image}"
                                      IsEnabled="{Binding RowData.Row.ButtonIsEnabled}"
                                      ToolTip="{Binding RowData.Row.Settings_Command_ToolTip}"
-                                     Style="{StaticResource DropDownButtonStyle}">
+                                     Style="{StaticResource DropDownButton_Style}">
                      <dx:DropDownButton.ArrowGlyph>
                         <DrawingImage/>
                      </dx:DropDownButton.ArrowGlyph>
diff --git a/EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelV.xaml b/EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelV.xaml
index 9c1c5e29..e09deaec 100644
--- a/EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelV.xaml
+++ b/EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelV.xaml
@@ -4,7 +4,7 @@
       xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
       xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
       xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
-      Style="{StaticResource LeftPanel_Grid}">
+      Background="{StaticResource Optimizer.Background}">
 
    <Grid.RowDefinitions>
       <RowDefinition Height="Auto"/>
@@ -21,6 +21,6 @@
    <OPTIMIZER:BTLPartListV Grid.Row="1"
                            DataContext="{StaticResource PartListVM}"
                            Tag="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
-                           Margin="4,0,4,0"/>
+                           Margin="4,0,4,2.5"/>
 
 </Grid>
diff --git a/EgtBEAMWALL.Optimizer/MachinePanel/MachinePanelV.xaml b/EgtBEAMWALL.Optimizer/MachinePanel/MachinePanelV.xaml
index bb5e6e6c..39bee7f1 100644
--- a/EgtBEAMWALL.Optimizer/MachinePanel/MachinePanelV.xaml
+++ b/EgtBEAMWALL.Optimizer/MachinePanel/MachinePanelV.xaml
@@ -4,7 +4,7 @@
       xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
       xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
       IsEnabled="{Binding MachPanel_IsEnabled}"
-      Style="{StaticResource MachinePanel_Grid}">
+      Margin="0,10,0,10">
 
    <Grid.RowDefinitions>
       <RowDefinition Height="Auto"/>
@@ -21,7 +21,9 @@
          <RadioButton Content="{Binding StrategyManagerMsg}"
                       ToolTip="{Binding ParameterMachineMsg}"
                       IsChecked="{Binding StrategyManagerIsChecked}"
-                      Style="{StaticResource StrategyManager_ToggleButton}"/>
+                      Width="140"
+                      Margin="0,0,5,0"
+                      Style="{StaticResource MainMenu_ToggleButton}"/>
          <Button Content="{Binding ToolDBMsg}"
                  ToolTip="{Binding ToolDBToolTip}"
                  Command="{Binding ToolDbCommand}"
@@ -36,7 +38,9 @@
          <RadioButton Content="{Binding MachineParamsMsg}"
                       ToolTip="{Binding MachineParamsMsg}"
                       IsChecked="{Binding MachineParamsIsChecked}"
-                      Style="{StaticResource MachineParam_ToggleButton}"/>
+                      Width="150"
+                      Margin="5,0,10,0"
+                      Style="{StaticResource MainMenu_ToggleButton}"/>
       </StackPanel>
 
       <Grid Grid.Column="1"
@@ -49,10 +53,17 @@
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
          <TextBlock Text="{Binding CurrentMachineMsg}" 
-                    Style="{StaticResource CurrentMachine_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    FontSize="15"
+                    Margin="10,0,5,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <TextBlock Grid.Column="1"
                     Text="{Binding SelMachineName, UpdateSourceTrigger=PropertyChanged}" 
-                    Style="{StaticResource SelMachine_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    FontWeight="Bold"
+                    FontSize="20"
+                    Margin="10,0,5,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <Button Grid.Column="2"
                  ToolTip="{Binding ChooseMachine_ToolTip}"
                  Command="{Binding ChooseMachine_Command}"
@@ -75,14 +86,29 @@
             <Button Grid.Column="1"
                     Content="OK"
                     Command="{Binding Ok_Command}"
-                    Style="{StaticResource CalcPanel_Button}"/>
+                    FontWeight="Light"
+                    FontSize="10"
+                    Height="30"
+                    Width="30"
+                    Margin="5,2,5,2"
+                    Style="{StaticResource Optimizer_Button}"/>
          </Grid>
       </Grid>
    </Grid>
 
    <TabControl Grid.Row="1"
                SelectedIndex="{Binding nSelTab}"
-               Style="{StaticResource SelTab_TabControl}">
+               Background="{StaticResource TabControl.Optimizer.Background}"
+               BorderThickness="0"
+               TabStripPlacement="Top"
+               Margin="5,5,2.5,5">
+      <TabControl.Style>
+         <Style TargetType="{x:Type TabControl}">
+            <Style.Resources>
+               <Style TargetType="{x:Type TabItem}" BasedOn="{StaticResource Optimizer_TabItem}"/>
+            </Style.Resources>
+         </Style>
+      </TabControl.Style>
       <TabControl.ItemContainerStyle>
          <Style TargetType="{x:Type TabItem}">
             <Setter Property="Visibility" Value="Collapsed"/>
@@ -126,7 +152,8 @@
                                                Style="{StaticResource MachinePanel_TextBlock}"/>
                                     <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                                            Text="{Binding sValue, UpdateSourceTrigger=Explicit}"
-                                                           Style="{StaticResource Name_TextBox}"/>
+                                                           Width="60"
+                                                           Style="{StaticResource EgtOptmizer_TextBox}"/>
                                     <TextBlock Grid.Column="2"
                                                Text="{Binding sDescription}"
                                                ToolTip="{Binding sDescription}"
diff --git a/EgtBEAMWALL.Optimizer/MacroFeatureWnd/MacroFeatureWnd.xaml b/EgtBEAMWALL.Optimizer/MacroFeatureWnd/MacroFeatureWnd.xaml
index f3756f02..7306fb03 100644
--- a/EgtBEAMWALL.Optimizer/MacroFeatureWnd/MacroFeatureWnd.xaml
+++ b/EgtBEAMWALL.Optimizer/MacroFeatureWnd/MacroFeatureWnd.xaml
@@ -20,10 +20,12 @@
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
       <TextBlock Text="Feature"
-                 Style="{StaticResource Feature_TextBlock}"/>
+                 Margin="5"
+                 Style="{StaticResource Option_TextBlock}"/>
       <TextBlock Grid.Column="1"
-                 Text="{Binding sDescBTLFeature}"                 
-                 Style="{StaticResource DescBTLFeature_TextBlock}"/>
+                 Text="{Binding sDescBTLFeature}" 
+                 HorizontalAlignment="Left"
+                 Style="{StaticResource Option_TextBlock}"/>
       <CheckBox Grid.Column="2"
                 Content="Default Macro"
                 IsChecked="{Binding bIsCustomChecked}"
@@ -35,12 +37,14 @@
       <EgtWPFLib5:EgtTextBox Grid.Row="1"
                              Grid.Column="1"
                              Grid.ColumnSpan="2"
-                             Text="{Binding sFeatureName}"                             
-                             Style="{StaticResource FeatureName_TextBox}"/>
+                             Text="{Binding sFeatureName}"      
+                             Width="200"
+                             Margin="5"
+                             Style="{StaticResource EgtOptmizer_TextBox}"/>
       <UniformGrid Columns="2"
                    Grid.Row="2"
                    Grid.ColumnSpan="3"
-                   Style="{StaticResource AddFeatureWnd_UniformGrid}">
+                   Margin="5">
          <Button Content="Ok"
                  Command="{Binding Ok_Command}"
                  IsDefault="True"
diff --git a/EgtBEAMWALL.Optimizer/MainMenu/MainMenuV.xaml b/EgtBEAMWALL.Optimizer/MainMenu/MainMenuV.xaml
index 255ccad8..4811c696 100644
--- a/EgtBEAMWALL.Optimizer/MainMenu/MainMenuV.xaml
+++ b/EgtBEAMWALL.Optimizer/MainMenu/MainMenuV.xaml
@@ -74,7 +74,12 @@
                                  AllowsTransparency="True">
          <Button ToolTip="{Binding TicketManagerToolTip}"
                  Command="{Binding TicketManager_Command}"
-                 Style="{StaticResource SendFeedback_Button}">
+                 Background="{StaticResource Button.MainMenu.Background}"
+                 Foreground="{StaticResource BeamWall_White}"
+                 FontWeight="Normal"
+                 Height="30"
+                 Width="40"
+                 Style="{StaticResource Optimizer_Button}">
             <Image Source="{StaticResource TicketManager_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
@@ -85,9 +90,13 @@
    <RadioButton Grid.Column="4"
                 IsChecked="{Binding ConfigProgram_IsChecked}"
                 ToolTip="{Binding ConfigurationProgramToolTip}"
-                Style="{StaticResource ConfigProgram_ToggleButton}">
+                Background="{StaticResource ToggleButton.Static.Background}"
+                Width="40"
+                Style="{StaticResource MainMenu_ToggleButton}">
       <Image Source="{Binding sConfigurationImagePath}"
-             Style="{StaticResource ConfigProgram_Image}"/>
+             Height="40"
+             Stretch="Uniform"
+             Margin="0,-6,0,0"/>
    </RadioButton>
 
    <OPTIMIZER:UserAdminV Grid.Column="5"/>
diff --git a/EgtBEAMWALL.Optimizer/MainWindow/MainWindowV.xaml b/EgtBEAMWALL.Optimizer/MainWindow/MainWindowV.xaml
index c6a4030a..0597c79e 100644
--- a/EgtBEAMWALL.Optimizer/MainWindow/MainWindowV.xaml
+++ b/EgtBEAMWALL.Optimizer/MainWindow/MainWindowV.xaml
@@ -19,14 +19,15 @@
                             DockPanel.Dock="Bottom"/>
       <!--Progetto corrente-->
       <TabControl SelectedIndex="{Binding nSelTabPage}"
-                  Style="{StaticResource MainWindow_TabControl}">
+                  Padding="0"
+                  Margin="0,-4,0,0">
          <TabControl.ItemContainerStyle>
             <Style TargetType="{x:Type TabItem}">
                <Setter Property="Visibility" Value="Collapsed"/>
             </Style>
          </TabControl.ItemContainerStyle>
          <TabItem>
-            <OPTIMIZER:ProjectV x:Name="ProjectView" DataContext="{StaticResource ProjectVM}"/>
+            <OPTIMIZER:ProjectV DataContext="{StaticResource ProjectVM}"/>
          </TabItem>
          <TabItem>
             <OPTIMIZER:ConfigurationPageV DataContext="{DynamicResource ConfigurationPageVM}"/>
diff --git a/EgtBEAMWALL.Optimizer/MovePartInRawPartWnd/MovePartInRawPartWndV.xaml b/EgtBEAMWALL.Optimizer/MovePartInRawPartWnd/MovePartInRawPartWndV.xaml
index 1fb11fff..4bd82b79 100644
--- a/EgtBEAMWALL.Optimizer/MovePartInRawPartWnd/MovePartInRawPartWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/MovePartInRawPartWnd/MovePartInRawPartWndV.xaml
@@ -29,7 +29,10 @@
 
          <TextBlock Grid.ColumnSpan="2"
                     Text="{Binding MoveDirMsg}"
-                    Style="{StaticResource MoveDir_TextBlock}"/>
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Top"
+                    Margin="0,5"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
 
          <RadioButton Grid.Row="1"
                       IsChecked="{Binding LeftIsChecked}"
@@ -54,16 +57,19 @@
          </Grid.RowDefinitions>
 
          <TextBlock Text="{Binding MoveLenMsg}"
-                    Style="{StaticResource MoveDir_TextBlock}"/>
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Top"
+                    Margin="0,5"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Row="1"
                                 Text="{Binding sMoveLen}"
-                                Style="{StaticResource NAM_TextBox}"/>
+                                Width="200"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
       </Grid>
 
       <UniformGrid Grid.Row="3"
                    Columns="2"
-                   Style="{StaticResource Command_UniformGrid}">
-
+                   Margin="5,5,5,0">
          <Button Grid.Column="1"
                  Content="Ok"
                  Command="{Binding Ok_Command}"
diff --git a/EgtBEAMWALL.Optimizer/MultiCopyRawPartWnd/MultiCopyRawPartWndV.xaml b/EgtBEAMWALL.Optimizer/MultiCopyRawPartWnd/MultiCopyRawPartWndV.xaml
index d6aacdee..74dc27e1 100644
--- a/EgtBEAMWALL.Optimizer/MultiCopyRawPartWnd/MultiCopyRawPartWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/MultiCopyRawPartWnd/MultiCopyRawPartWndV.xaml
@@ -16,10 +16,12 @@
       </Grid.RowDefinitions>
 
       <TextBlock Text="{Binding ChooseQty_Msg}" 
-                 Style="{StaticResource MultiCopyRawPartWnd_TextBlock}"/>
+                 Margin="0,0,0,5"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Grid.Row="1"
                              Text="{Binding nQuantity}" 
-                             Style="{StaticResource MultiCopyRawPartWnd_TextBox}"/>
+                             Margin="0,0,0,5"
+                             Style="{StaticResource EgtOptmizer_TextBox}"/>
 
       <Grid Grid.Row="2" 
             Margin="0,0,0,5">
diff --git a/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb
index 25906098..6a6b8740 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("3.1.7.8")>
-<Assembly: AssemblyFileVersion("3.1.7.8")>
+<Assembly: AssemblyVersion("3.1.8.1")>
+<Assembly: AssemblyFileVersion("3.1.8.1")>
diff --git a/EgtBEAMWALL.Optimizer/NestingRunningWnd/NestingRunningWndV.xaml b/EgtBEAMWALL.Optimizer/NestingRunningWnd/NestingRunningWndV.xaml
index 1aec02af..e24f7336 100644
--- a/EgtBEAMWALL.Optimizer/NestingRunningWnd/NestingRunningWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/NestingRunningWnd/NestingRunningWndV.xaml
@@ -24,10 +24,12 @@
       </Grid.RowDefinitions>
       <TextBlock Grid.Row="1"
                  Text="{Binding Section_Msg}"
-                 Style="{StaticResource NestingRunningWndV_TextBlock}"/>
+                 TextAlignment="Center"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <TextBlock Grid.Row="2"
                  Text="{Binding Nesting_Msg}"
-                 Style="{StaticResource NestingRunningWndV_TextBlock}"/>
+                 TextAlignment="Center"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <ProgressBar Grid.Row="4"
                    Value="{Binding CurrProgress_Value}"
                    Style="{StaticResource NestingRunningWndV_ProgressBar}"/>
@@ -36,13 +38,16 @@
                    Style="{StaticResource NestingRunningWndV_ProgressBar}"/>
       <TextBlock Grid.Row="8"
                  Text="{Binding TotProgress_Msg}"
-                 Style="{StaticResource NestingRunningWndV_TextBlock}"/>
+                 TextAlignment="Center"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <Button Grid.Row="10" 
               Content="Cancel"
               IsDefault="False"
               IsCancel="True"
               Command="{Binding Cancel_Command}"
-              Style="{StaticResource NestingRunningWndV_Button}"/>
+              Height="30"
+              Width="70"
+              Style="{StaticResource Optimizer_Button}"/>
    </Grid>
 
 </EgtBEAMWALLCORE:OptimizerWindow>
diff --git a/EgtBEAMWALL.Optimizer/OptimizePanel/OptimizePanelV.xaml b/EgtBEAMWALL.Optimizer/OptimizePanel/OptimizePanelV.xaml
index da6d1cf8..da7f87b2 100644
--- a/EgtBEAMWALL.Optimizer/OptimizePanel/OptimizePanelV.xaml
+++ b/EgtBEAMWALL.Optimizer/OptimizePanel/OptimizePanelV.xaml
@@ -11,7 +11,7 @@
            Width="45"
            Height="45"
            Margin="0,5,0,5"
-           Style="{StaticResource ProdManagerNew_Button}"/>
+           Style="{StaticResource Optimizer_Button}"/>
 
    <Button Command="{Binding NewRawPart_Command}"
            ToolTip="{Binding NewRawPart_ToolTip}"
@@ -19,7 +19,7 @@
            Width="45"
            Height="45"
            Margin="0,0,0,5"
-           Style="{StaticResource ProdManagerNew_Button}">
+           Style="{StaticResource Optimizer_Button}">
       <Image Source="{StaticResource NewRawPart_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
@@ -29,7 +29,7 @@
            IsEnabled="{Binding Optimize_IsEnabled}"
            Width="45"
            Height="45"
-           Style="{StaticResource ProdManagerNew_Button}">
+           Style="{StaticResource Optimizer_Button}">
       <Image Source="{StaticResource Warehouse_Image}" 
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
diff --git a/EgtBEAMWALL.Optimizer/Panel/LeftPanelBottomV.xaml b/EgtBEAMWALL.Optimizer/Panel/LeftPanelBottomV.xaml
index a3586e5a..28ad2501 100644
--- a/EgtBEAMWALL.Optimizer/Panel/LeftPanelBottomV.xaml
+++ b/EgtBEAMWALL.Optimizer/Panel/LeftPanelBottomV.xaml
@@ -2,7 +2,7 @@
       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 Left_Grid}">
+      Margin="2,0,0,0">
    <Grid.RowDefinitions>
       <RowDefinition Height="Auto"/>
       <RowDefinition Height="1*"/>
diff --git a/EgtBEAMWALL.Optimizer/Panel/LeftPanelTopV.xaml b/EgtBEAMWALL.Optimizer/Panel/LeftPanelTopV.xaml
index a076e010..356af01e 100644
--- a/EgtBEAMWALL.Optimizer/Panel/LeftPanelTopV.xaml
+++ b/EgtBEAMWALL.Optimizer/Panel/LeftPanelTopV.xaml
@@ -2,7 +2,7 @@
       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 Left_Grid}">
+      Margin="2,0,0,0">
    <Grid.ColumnDefinitions>
       <ColumnDefinition Width="1*"/>
       <ColumnDefinition Width="Auto"/>
diff --git a/EgtBEAMWALL.Optimizer/Panel/RightPanelBottomV.xaml b/EgtBEAMWALL.Optimizer/Panel/RightPanelBottomV.xaml
index 9d7b4f6e..ce6e65b0 100644
--- a/EgtBEAMWALL.Optimizer/Panel/RightPanelBottomV.xaml
+++ b/EgtBEAMWALL.Optimizer/Panel/RightPanelBottomV.xaml
@@ -7,7 +7,8 @@
    </Grid.ColumnDefinitions>
    <TabControl Grid.RowSpan="2"
                SelectedIndex="{Binding SelFeatureManagerTab}"
-               Style="{StaticResource Feature_TabControl}">
+               BorderThickness="0"
+               Margin="0,-4,0,-2">
       <TabControl.ItemContainerStyle>
          <Style TargetType="{x:Type TabItem}">
             <Setter Property="Visibility" Value="Collapsed"/>
@@ -32,13 +33,16 @@
                         Width="250">
                <TextBlock Text="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RightPanelBottomV}}}"
                           Foreground="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.Calc_Background, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RightPanelBottomV}}}"
-                          Style="{StaticResource Message_TextBlock}"/>
+                          Margin="5,0,5,0"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <TextBlock Text="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.SelPart.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RightPanelBottomV}}}"
                           Foreground="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.SelPart.Calc_Background, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RightPanelBottomV}}}"
-                          Style="{StaticResource Message_TextBlock}"/>
+                          Margin="5,0,5,0"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <TextBlock Text="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RightPanelBottomV}}}"
                           Foreground="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM.Calc_Background, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RightPanelBottomV}}}"
-                          Style="{StaticResource Message_TextBlock}"/>
+                          Margin="5,0,5,0"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             </StackPanel>
          </Grid>
       </TabItem>
diff --git a/EgtBEAMWALL.Optimizer/Panel/RightPanelTopV.xaml b/EgtBEAMWALL.Optimizer/Panel/RightPanelTopV.xaml
index 70f4f711..b1bc2995 100644
--- a/EgtBEAMWALL.Optimizer/Panel/RightPanelTopV.xaml
+++ b/EgtBEAMWALL.Optimizer/Panel/RightPanelTopV.xaml
@@ -4,7 +4,9 @@
             xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
             SelectedIndex="{Binding SelManagerTab}"
             Visibility="{Binding DataContext.ManagerTabVisibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"
-            Style="{StaticResource Project_TabControl}">
+            Background="Transparent"
+            BorderThickness="0"
+            Margin="-9.5,-11,-9.5,-10"            >
    <TabControl.ItemContainerStyle>
       <Style TargetType="{x:Type TabItem}">
          <Setter Property="Visibility" Value="Collapsed"/>
@@ -35,10 +37,15 @@
 
             <Border Grid.ColumnSpan="2" 
                     Background="{StaticResource BeamWall_Glacier}" 
-                    Style="{StaticResource Project_Border}">
+                    Margin="10,5,10,5"
+                    Style="{StaticResource Optimizer_Border}">
                <TextBlock Grid.ColumnSpan="2" 
                           Text="{Binding BTLStructureVM.SelBTLPart.sNAM}" 
-                          Style="{StaticResource RightPanel_TextBlock}"/>
+                          HorizontalAlignment="Center"
+                          VerticalAlignment="Center"
+                          FontSize="14"
+                          Margin="5"
+                          Style="{StaticResource ForegroundWhite_TextBlock}"/>
             </Border>
             
             <OPTIMIZER:PartManagerV Grid.Row="1" 
@@ -46,7 +53,7 @@
                                     Tag="{Binding DataContext.BTLStructureVM.SelBTLPart, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RightPanelTopV}}}"/>
 
             <Grid Grid.Row="2" 
-                  Style="{StaticResource ProjectParamters_Grid}">
+                  Margin="5,4,0,2">
                <Grid.RowDefinitions>
                   <RowDefinition Height="Auto"/>
                   <RowDefinition Height="1*"/>
@@ -59,7 +66,13 @@
                          ItemsSource="{Binding StrategySetupList}"                                 
                          SelectedItem="{Binding SelStrategySetup, UpdateSourceTrigger=PropertyChanged}"
                          IsEnabled="{Binding GeneralParametersIsEnable}"
-                         Style="{StaticResource StrategySetup_ComboBox}">
+                         Foreground="{StaticResource BeamWall_Black}"
+                         HorizontalAlignment="Center"
+                         FontSize="15"
+                         Height="30"
+                         Width="160"
+                         Margin="0,0,0,15"
+                         Style="{StaticResource Optmizer_ComboBox}">
                   <ComboBox.ItemContainerStyle>
                      <Style TargetType="{x:Type ComboBoxItem}">
                         <EventSetter Event="PreviewMouseDown" Handler="ComboBoxItem_PreviewMouseDown"/>
@@ -81,7 +94,11 @@
             <Button Grid.Column="2" 
                     Command="{Binding Parameter_Command}"
                     ToolTip="{Binding Parameters_ToolTip}"
-                    Style="{StaticResource Parameter_Button}">
+                    FontWeight="Light"
+                    Height="30"
+                    Width="30"
+                    Margin="10"
+                    Style="{StaticResource Optimizer_Button}">
                <Image Source="{StaticResource Analyze_Image}"
                       Style="{StaticResource BTLDataWnd_Image}"/>
             </Button>
@@ -89,21 +106,30 @@
             <Image Grid.RowSpan="3"
                    Grid.Column="1" 
                    Source="{StaticResource Part_Image}" 
-                   Style="{StaticResource Piece_Image}"/>
+                   Stretch="Uniform"
+                   Margin="5"/>
 
             <UniformGrid Grid.Row="2"
                          Grid.Column="3"
                          Columns="2">
                <Button Command="{Binding Ok_Command}"
                        ToolTip="{Binding SaveAsToolTip}"
-                       Style="{StaticResource Back_Button}">
+                       VerticalAlignment="Bottom"
+                       Height="30"
+                       Width="30"
+                       Margin="5"
+                       Style="{StaticResource Optimizer_Button}">
                   <Image Source="{StaticResource Ok_Image}" 
                          Style="{StaticResource BTLDataWnd_Image}"/>
                </Button>
 
                <Button Command="{Binding Back_Command}"
                        ToolTip="{Binding Back_Msg}"
-                       Style="{StaticResource Back_Button}">
+                       VerticalAlignment="Bottom"
+                       Height="30"
+                       Width="30"
+                       Margin="5"
+                       Style="{StaticResource Optimizer_Button}">
                   <Image Source="{StaticResource Delete_Image}"
                          Style="{StaticResource BTLDataWnd_Image}"/>
                </Button>
diff --git a/EgtBEAMWALL.Optimizer/Panel/TopPanelV.xaml b/EgtBEAMWALL.Optimizer/Panel/TopPanelV.xaml
index b3a2ef23..c31f3097 100644
--- a/EgtBEAMWALL.Optimizer/Panel/TopPanelV.xaml
+++ b/EgtBEAMWALL.Optimizer/Panel/TopPanelV.xaml
@@ -2,7 +2,7 @@
       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 Project_Grid}">
+      Margin="2.5">
    <Grid.ColumnDefinitions>
       <ColumnDefinition Width="Auto"/>
       <ColumnDefinition Width="Auto"/>
@@ -10,7 +10,10 @@
       <ColumnDefinition Width="1*"/>
       <ColumnDefinition Width="Auto"/>
    </Grid.ColumnDefinitions>
-   <!--<Border Style="{StaticResource TopPanel_Border}">-->
+   <!--<Border Background="{StaticResource Border.TopPanel.Background}"
+               BorderBrush="{StaticResource Border.TopPanel.Border}"
+               BorderThickness="2"
+               CornerRadius="5">-->
    <OPTIMIZER:ProdManagerV DataContext="{DynamicResource ProdManagerVM}"/>
    <!--</Border>-->
 
@@ -30,7 +33,11 @@
    <Button Grid.Column="4"
            Command="{Binding Optimizer_Command}"
            ToolTip="{Binding Statistics_Msg}"
-           Style="{StaticResource Optmizer_Button}">
+           HorizontalAlignment="Right"
+           Height="30"
+           Width="30"
+           Margin="5,2,5,2"
+           Style="{StaticResource Optimizer_Button}">
       <Image Source="{StaticResource Statistics_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
diff --git a/EgtBEAMWALL.Optimizer/PartManager/PartManagerV.xaml b/EgtBEAMWALL.Optimizer/PartManager/PartManagerV.xaml
index 1d378dc2..d00da12f 100644
--- a/EgtBEAMWALL.Optimizer/PartManager/PartManagerV.xaml
+++ b/EgtBEAMWALL.Optimizer/PartManager/PartManagerV.xaml
@@ -22,41 +22,73 @@
    <StackPanel Orientation="Horizontal"
                Margin="10,5,10,5">
       <TextBlock Text="W" 
-                 Style="{StaticResource W_TextBlock}"/>
+                 HorizontalAlignment="Center"
+                 VerticalAlignment="Center"
+                 TextTrimming="CharacterEllipsis"
+                 Margin="0,0,5,0"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sW, 
                                             RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartManagerV}},
                                             UpdateSourceTrigger=Explicit}" 
-                             Style="{StaticResource EgtPartManager_TextBox}"/>
+                             ExplicitUpdateSource="EnterKeyPress"
+                             VerticalContentAlignment="Center"
+                             Height="25"
+                             Width="50"
+                             Style="{StaticResource EgtOptmizer_TextBox}"/>
    </StackPanel>
    <StackPanel Grid.Column="1" 
                Orientation="Horizontal"
                Margin="10,5,10,5">
       <TextBlock Text="H"
-                 Style="{StaticResource W_TextBlock}"/>
+                 HorizontalAlignment="Center"
+                 VerticalAlignment="Center"
+                 TextTrimming="CharacterEllipsis"
+                 Margin="0,0,5,0"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sH, 
                                             RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartManagerV}},
                                             UpdateSourceTrigger=Explicit}" 
-                             Style="{StaticResource EgtPartManager_TextBox}"/>
+                             ExplicitUpdateSource="EnterKeyPress"
+                             VerticalContentAlignment="Center"
+                             Height="25"
+                             Width="50"
+                             Style="{StaticResource EgtOptmizer_TextBox}"/>
    </StackPanel>
    <StackPanel Grid.Column="2" 
                Orientation="Horizontal"
                Margin="10,5,15,5">
       <TextBlock Text="L"
-                 Style="{StaticResource W_TextBlock}"/>
+                 HorizontalAlignment="Center"
+                 VerticalAlignment="Center"
+                 TextTrimming="CharacterEllipsis"
+                 Margin="0,0,5,0"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sL,
                                             RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartManagerV}},
                                             UpdateSourceTrigger=Explicit}" 
-                             Style="{StaticResource EgtPartManager_TextBox}"/>
+                             ExplicitUpdateSource="EnterKeyPress"                             
+                             VerticalContentAlignment="Center"
+                             Height="25"
+                             Width="60"
+                             Style="{StaticResource EgtOptmizer_TextBox}"/>
    </StackPanel>
    <StackPanel Grid.Row="1" 
                Orientation="Horizontal"
                Margin="10,5,10,5">
       <TextBlock Text="BTL Qty"
-                 Style="{StaticResource W_TextBlock}"/>
+                 HorizontalAlignment="Center"
+                 VerticalAlignment="Center"
+                 TextTrimming="CharacterEllipsis"
+                 Margin="0,0,5,0"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <TextBlock Text="{Binding Tag.sCNT,
                                 RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartManagerV}},
                                 UpdateSourceTrigger=Explicit}"
-                 Style="{StaticResource CNT_TextBlock}"/>
+                 HorizontalAlignment="Center"
+                 VerticalAlignment="Center"
+                 TextTrimming="CharacterEllipsis"
+                 Width="25"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
    </StackPanel>
    <StackPanel Grid.Row="1" 
                Grid.Column="1" 
@@ -64,11 +96,18 @@
                Orientation="Horizontal"
                Margin="10,5,10,5">
       <TextBlock Text="Added Qty"
-                 Style="{StaticResource W_TextBlock}"/>
+                 HorizontalAlignment="Center"
+                 VerticalAlignment="Center"
+                 TextTrimming="CharacterEllipsis"
+                 Margin="0,0,5,0"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sADDED,
                                             RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartManagerV}},
                                             UpdateSourceTrigger=Explicit}"
                              ExplicitUpdateSource="EnterKeyPress"
-                             Style="{StaticResource Qty_TextBox}"/>
+                             VerticalContentAlignment="Center"
+                             Height="25"
+                             Width="50"
+                             Style="{StaticResource EgtOptmizer_TextBox}"/>
    </StackPanel>
 </Grid>
diff --git a/EgtBEAMWALL.Optimizer/PartParametersWnd/PartParametersWndV.xaml b/EgtBEAMWALL.Optimizer/PartParametersWnd/PartParametersWndV.xaml
index 88fbcd1d..2d42b32f 100644
--- a/EgtBEAMWALL.Optimizer/PartParametersWnd/PartParametersWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/PartParametersWnd/PartParametersWndV.xaml
@@ -21,67 +21,111 @@
          <RowDefinition Height="1*"/>
       </Grid.RowDefinitions>
       <UniformGrid Columns="2"
-                   Style="{StaticResource PartParametersWnd_UniformGrid}">
+                   Margin="0,0,0,-45">
          <TextBlock Text="{Binding NAM_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding CurrPart.sNAM, UpdateSourceTrigger=LostFocus}"
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding COUNT_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding CurrPart.sCNT, UpdateSourceTrigger=LostFocus}"
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding ORDERNUM_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding CurrPart.nORDERNUM, UpdateSourceTrigger=LostFocus}"
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding PLANINGLEN_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding CurrPart.dPLANINGLEN, UpdateSourceTrigger=LostFocus}"
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding STARTOFFSET_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding CurrPart.dSTARTOFFSET, UpdateSourceTrigger=LostFocus}"
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding ENDOFFSET_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding CurrPart.dENDOFFSET, UpdateSourceTrigger=LostFocus}"
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding DESIGN_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding CurrPart.sDESIGN, UpdateSourceTrigger=LostFocus}"
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding GROUP_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding CurrPart.sGROUP, UpdateSourceTrigger=LostFocus}"
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding STOREY_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding CurrPart.sSTOREY, UpdateSourceTrigger=LostFocus}"
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding ANNOT_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding CurrPart.sANNOT, UpdateSourceTrigger=LostFocus}"
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding MATERIAL_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding CurrPart.sMATERIAL, UpdateSourceTrigger=LostFocus}"
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
       </UniformGrid>
 
       <GroupBox Grid.Row="1" 
                 Style="{DynamicResource PartParam_GroupBox}">
-         <Grid Style="{StaticResource PartParameters_Grid}">
+         <Grid Margin="0,5,0,0">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="1*"/>
@@ -91,58 +135,91 @@
                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
             <TextBlock Text="{Binding COLOUR_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <Button Grid.Column="1"
                     Background="{Binding Tag.PartColour, UpdateSourceTrigger=PropertyChanged,
                                          RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}}}"
                     Command="{Binding Tag.PartColour_Command, UpdateSourceTrigger=PropertyChanged,
                                       RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}}}"
-                    Style="{StaticResource PartParametersWnd_Button}"/>
+                    Height="20"
+                    Width="100"/>
             <TextBlock Grid.Row="1"
                        Text="{Binding TRANSPARENCY_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Row="1"
                                    Grid.Column="1"
                                    Text="{Binding CurrPart.nCOLA, UpdateSourceTrigger=LostFocus}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Width="150"
+                                   Margin="5"
+                                   Style="{StaticResource EgtOptmizer_TextBox}"/>
          </Grid>
       </GroupBox>
 
       <UniformGrid Grid.Column="1" 
                    Columns="2" 
-                   Style="{StaticResource PartParameters_UniformGrid}">
+                   Margin="0,0,0,-45">
          <TextBlock Text="{Binding TIMBERGRADE_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding CurrPart.sTIMBERGRADE, UpdateSourceTrigger=LostFocus}"
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding QUALITYGRADE_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding CurrPart.sQUALITYGRADE, UpdateSourceTrigger=LostFocus}"
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding PACKAGE_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding CurrPart.sPACKAGE, UpdateSourceTrigger=LostFocus}"
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding ASSEMBLYNUM_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding CurrPart.sASSEMBLYNUM, UpdateSourceTrigger=LostFocus}"
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding ELEMENTNUM_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding CurrPart.sELEMENTNUM, UpdateSourceTrigger=LostFocus}"
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding MODULENUM_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding CurrPart.sMODULENUM, UpdateSourceTrigger=LostFocus}"
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding PROCESSINGQUALITY_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <ComboBox Grid.Column="1"
                    ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}},
                                          Path=Tag.ocPROCESSINGQUALITY,
@@ -150,9 +227,12 @@
                    SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}},
                                            Path=Tag.SelPROCESSINGQUALITY,
                                            Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                   Style="{StaticResource PartParam_ComboBox}"/>
+                   Height="22"
+                   Width="150"/>
          <TextBlock Text="{Binding RECESS_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <ComboBox Grid.Column="1"
                    ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}},
                                          Path=Tag.ocRECESS,
@@ -160,9 +240,12 @@
                    SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}},
                                            Path=Tag.SelRECESS,
                                            Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                   Style="{StaticResource PartParam_ComboBox}"/>
+                   Height="22"
+                   Width="150"/>
          <TextBlock Text="{Binding STOREYTYPE_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <ComboBox Grid.Column="1"
                    ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}},
                                          Path=Tag.ocSTOREYTYPE,
@@ -170,23 +253,32 @@
                    SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}},
                                            Path=Tag.SelSTOREYTYPE,
                                            Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                   Style="{StaticResource PartParam_ComboBox}"/>
+                   Height="22"
+                   Width="150"/>
          <TextBlock Text="{Binding LAYER_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding CurrPart.nLAYER, UpdateSourceTrigger=LostFocus}"
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
          <TextBlock Text="{Binding COMMENT_MSG}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding CurrPart.sCOMMENT, UpdateSourceTrigger=LostFocus}"
-                                Style="{StaticResource PartParam_TextBox}"/>
+                                Width="150"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
       </UniformGrid>
 
       <GroupBox Grid.Row="1" 
                 Grid.Column="1" 
                 Style="{DynamicResource PartParam_GroupBox}">
-         <Grid Style="{StaticResource PartParameters_Grid}">
+         <Grid Margin="0,5,0,0">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="1*"/>
@@ -196,7 +288,9 @@
                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
             <TextBlock Text="{Binding REFSIDE_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <ComboBox Grid.Column="1"
                       ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}},
                                             Path=Tag.ocREFSIDE,
@@ -204,10 +298,13 @@
                       SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}},
                                               Path=Tag.SelREFSIDE,
                                               Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                      Style="{StaticResource PartParam_ComboBox}"/>
+                      Height="22"
+                      Width="150"/>
             <TextBlock Grid.Row="1"
                        Text="{Binding REFSIDEALIGN_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <CheckBox Grid.Row="1"
                       Grid.Column="1"
                       IsChecked="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}},
@@ -254,13 +351,19 @@
                   <RowDefinition Height="1*"/>
                </Grid.RowDefinitions>
                <TextBlock Text="{Binding GRAINDIRECTION_MSG}"
-                          Style="{StaticResource PartParam_TextBlock}"/>
+                          VerticalAlignment="Center"
+                          Margin="10,0,10,0"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                       Text="{Binding CurrPart.GrainDirection, UpdateSourceTrigger=LostFocus}"
-                                      Style="{StaticResource PartParam_TextBox}"/>
+                                      Width="150"
+                                      Margin="5"
+                                      Style="{StaticResource EgtOptmizer_TextBox}"/>
                <TextBlock Grid.Row="1"
                           Text="{Binding GRAINDIRALIGN_MSG}"
-                          Style="{StaticResource PartParam_TextBlock}"/>
+                          VerticalAlignment="Center"
+                          Margin="10,0,10,0"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <CheckBox Grid.Row="1"
                          Grid.Column="1"
                          IsChecked="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}},
@@ -275,7 +378,7 @@
                    Grid.RowSpan="2" 
                    Grid.ColumnSpan="2" 
                    Style="{DynamicResource NoHeader_GroupBox}">
-            <Grid Style="{StaticResource PartParameters_Grid}">
+            <Grid Margin="0,5,0,0">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="1*"/>
@@ -285,7 +388,9 @@
                   <RowDefinition Height="1*"/>
                </Grid.RowDefinitions>
                <TextBlock Text="{Binding CAMBERSIDE_MSG}"
-                          Style="{StaticResource PartParam_TextBlock}"/>
+                          VerticalAlignment="Center"
+                          Margin="10,0,10,0"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <ComboBox Grid.Column="1"
                          ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}},
                                                Path=Tag.ocCAMBERSIDE,
@@ -293,21 +398,26 @@
                          SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}},
                                                  Path=Tag.SelCAMBERSIDE,
                                                  Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                         Style="{StaticResource PartParam_ComboBox}"/>
+                         Height="22"
+                         Width="150"/>
                <TextBlock Grid.Row="1"
                           Text="{Binding CAMBERPARAMS_MSG}"
-                          Style="{StaticResource PartParam_TextBlock}"/>
+                          VerticalAlignment="Center"
+                          Margin="10,0,10,0"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <EgtWPFLib5:EgtTextBox Grid.Row="1"
                                       Grid.Column="1"
                                       Text="{Binding CurrPart.CamberParams, UpdateSourceTrigger=LostFocus}"
-                                      Style="{StaticResource PartParam_TextBox}"/>
+                                      Width="150"
+                                      Margin="5"
+                                      Style="{StaticResource EgtOptmizer_TextBox}"/>
             </Grid>
          </GroupBox>
          <GroupBox Grid.Row="4" 
                    Grid.RowSpan="2" 
                    Grid.ColumnSpan="2" 
                    Style="{DynamicResource NoHeader_GroupBox}">
-            <Grid Style="{StaticResource PartParameters_Grid}">
+            <Grid Margin="0,5,0,0">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="1*"/>
@@ -317,7 +427,9 @@
                   <RowDefinition Height="1*"/>
                </Grid.RowDefinitions>
                <TextBlock Text="{Binding REFSIDEFIXCLAMP_MSG}"
-                          Style="{StaticResource PartParam_TextBlock}"/>
+                          VerticalAlignment="Center"
+                          Margin="10,0,10,0"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <ComboBox Grid.Column="1"
                          ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}},
                                                Path=Tag.ocREFSIDEFIXCLAMP,
@@ -325,21 +437,26 @@
                          SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}},
                                                  Path=Tag.SelREFSIDEFIXCLAMP,
                                                  Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                         Style="{StaticResource PartParam_ComboBox}"/>
+                         Height="22"
+                         Width="150"/>
                <TextBlock Grid.Row="1"
                           Text="{Binding PARTOFFSETPARAMS_MSG}"
-                          Style="{StaticResource PartParam_TextBlock}"/>
+                          VerticalAlignment="Center"
+                          Margin="10,0,10,0"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <EgtWPFLib5:EgtTextBox Grid.Row="1"
                                       Grid.Column="1"
                                       Text="{Binding CurrPart.PartOffsetParams, UpdateSourceTrigger=LostFocus}"
-                                      Style="{StaticResource PartParam_TextBox}"/>
+                                      Width="150"
+                                      Margin="5"
+                                      Style="{StaticResource EgtOptmizer_TextBox}"/>
             </Grid>
          </GroupBox>
          <GroupBox Grid.Row="6" 
                    Grid.RowSpan="2" 
                    Grid.ColumnSpan="2" 
                    Style="{DynamicResource NoHeader_GroupBox}">
-            <Grid Style="{StaticResource PartParameters_Grid}">
+            <Grid Margin="0,5,0,0">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="1*"/>
@@ -349,7 +466,9 @@
                   <RowDefinition Height="1*"/>
                </Grid.RowDefinitions>
                <TextBlock Text="{Binding MATERIALTYPEGRP_MSG}"
-                          Style="{StaticResource PartParam_TextBlock}"/>
+                          VerticalAlignment="Center"
+                          Margin="10,0,10,0"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <ComboBox Grid.Column="1"
                          ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}},
                                                Path=Tag.ocMATERIALTYPEGRP,
@@ -357,21 +476,26 @@
                          SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}},
                                                  Path=Tag.SelMATERIALTYPEGRP,
                                                  Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                         Style="{StaticResource PartParam_ComboBox}"/>
+                         Height="22"
+                         Width="150"/>
                <TextBlock Grid.Row="1"
                           Text="{Binding MATERIALTYPESPEC_MSG}"
-                          Style="{StaticResource PartParam_TextBlock}"/>
+                          VerticalAlignment="Center"
+                          Margin="10,0,10,0"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <EgtWPFLib5:EgtTextBox Grid.Row="1"
                                       Grid.Column="1"
                                       Text="{Binding CurrPart.sMATERIALTYPESPEC, UpdateSourceTrigger=LostFocus}"
-                                      Style="{StaticResource PartParam_TextBox}"/>
+                                      Width="150"
+                                      Margin="5"
+                                      Style="{StaticResource EgtOptmizer_TextBox}"/>
             </Grid>
          </GroupBox>
          <GroupBox Grid.Row="8" 
                    Grid.RowSpan="2" 
                    Grid.ColumnSpan="2"
                    Style="{DynamicResource NoHeader_GroupBox}">
-            <Grid Style="{StaticResource PartParameters_Grid}">
+            <Grid Margin="0,5,0,0">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="1*"/>
@@ -381,7 +505,9 @@
                   <RowDefinition Height="1*"/>
                </Grid.RowDefinitions>
                <TextBlock Text="{Binding ALIGNLOCATION_MSG}"
-                          Style="{StaticResource PartParam_TextBlock}"/>
+                          VerticalAlignment="Center"
+                          Margin="10,0,10,0"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <ComboBox Grid.Column="1"
                          ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}},
                                                Path=Tag.ocALIGNLOCATION,
@@ -389,10 +515,13 @@
                          SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}},
                                                  Path=Tag.SelALIGNLOCATION,
                                                  Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                         Style="{StaticResource PartParam_ComboBox}"/>
+                         Height="22"
+                         Width="150"/>
                <TextBlock Grid.Row="1"
                           Text="{Binding ALIGNENDTYPE_MSG}"
-                          Style="{StaticResource PartParam_TextBlock}"/>
+                          VerticalAlignment="Center"
+                          Margin="10,0,10,0"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <ComboBox Grid.Row="1"
                          Grid.Column="1"
                          ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}},
@@ -401,14 +530,16 @@
                          SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}},
                                                  Path=Tag.SelALIGNENDTYPE,
                                                  Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                         Style="{StaticResource PartParameters_ComboBox}"/>
+                         Height="22"
+                         Width="150"
+                         Margin="0,5"/>
             </Grid>
          </GroupBox>
          <GroupBox Grid.Row="10" 
                    Grid.RowSpan="4" 
                    Grid.ColumnSpan="2" 
-                   Style="{DynamicResource NoHeader_GroupBox}">
-            <Grid Style="{StaticResource PartParameters_Grid}">
+                   Style="{StaticResource NoHeader_GroupBox}">
+            <Grid Margin="0,5,0,0">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="1*"/>
@@ -420,7 +551,9 @@
                   <RowDefinition Height="1*"/>
                </Grid.RowDefinitions>
                <TextBlock Text="{Binding UID_MSG}"
-                          Style="{StaticResource PartParam_TextBlock}"/>
+                          VerticalAlignment="Center"
+                          Margin="10,0,10,0"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <ComboBox Grid.Column="1"
                          ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}},
                                                Path=Tag.ocUID,
@@ -428,28 +561,41 @@
                          SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}},
                                                  Path=Tag.SelUID,
                                                  Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                         Style="{StaticResource PartParam_ComboBox}"/>
+                         Height="22"
+                         Width="150"/>
                <TextBlock Grid.Row="1"
                           Text="{Binding TRANSFORIG_MSG}"
-                          Style="{StaticResource PartParam_TextBlock}"/>
+                          VerticalAlignment="Center"
+                          Margin="10,0,10,0"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <EgtWPFLib5:EgtTextBox Grid.Row="1"
                                       Grid.Column="1"
                                       Text="{Binding CurrPart.TransfOrig, UpdateSourceTrigger=LostFocus}"
-                                      Style="{StaticResource PartParam_TextBox}"/>
+                                      Width="150"
+                                      Margin="5"
+                                      Style="{StaticResource EgtOptmizer_TextBox}"/>
                <TextBlock Grid.Row="2"
                           Text="{Binding TRANSFVERSX_MSG}"
-                          Style="{StaticResource PartParam_TextBlock}"/>
+                          VerticalAlignment="Center"
+                          Margin="10,0,10,0"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <EgtWPFLib5:EgtTextBox Grid.Row="2"
                                       Grid.Column="1"
                                       Text="{Binding CurrPart.TransfVersX, UpdateSourceTrigger=LostFocus}"
-                                      Style="{StaticResource PartParam_TextBox}"/>
+                                      Width="150"
+                                      Margin="5"
+                                      Style="{StaticResource EgtOptmizer_TextBox}"/>
                <TextBlock Grid.Row="3"
                           Text="{Binding TRANSFVERSY_MSG}"
-                          Style="{StaticResource PartParam_TextBlock}"/>
+                          VerticalAlignment="Center"
+                          Margin="10,0,10,0"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <EgtWPFLib5:EgtTextBox Grid.Row="3"
                                       Grid.Column="1"
                                       Text="{Binding CurrPart.TransfVersY, UpdateSourceTrigger=LostFocus}"
-                                      Style="{StaticResource PartParam_TextBox}"/>
+                                      Width="150"
+                                      Margin="5"
+                                      Style="{StaticResource EgtOptmizer_TextBox}"/>
             </Grid>
          </GroupBox>
 
diff --git a/EgtBEAMWALL.Optimizer/PdfViewer/PdfViewer.xaml b/EgtBEAMWALL.Optimizer/PdfViewer/PdfViewer.xaml
index 608ad27b..9eb025f8 100644
--- a/EgtBEAMWALL.Optimizer/PdfViewer/PdfViewer.xaml
+++ b/EgtBEAMWALL.Optimizer/PdfViewer/PdfViewer.xaml
@@ -1,8 +1,9 @@
 <UserControl x:Class="PdfViewer"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-   
-   <ScrollViewer Style="{StaticResource PDFViewer_ScrollViewer}">
+
+   <ScrollViewer Background="{StaticResource ScrollViewer.Static.Background}"
+                 PanningMode="Both">
       <ItemsControl x:Name="PagesContainer"/>
    </ScrollViewer>
    
diff --git a/EgtBEAMWALL.Optimizer/PopUp/BTLPartListPopUpV.xaml b/EgtBEAMWALL.Optimizer/PopUp/BTLPartListPopUpV.xaml
deleted file mode 100644
index 4e320f7f..00000000
--- a/EgtBEAMWALL.Optimizer/PopUp/BTLPartListPopUpV.xaml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Popup x:Class="BTLPartListPopUpV"
-       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 BTLPartList_PopUp}">
-   <Popup.Resources>
-      <OPTIMIZER:DataGridCellBorderThicknessConverter x:Key="DataGridCellBorderThicknessConverter"/>
-   </Popup.Resources>
-   <Popup.VerticalOffset>
-      <MultiBinding Converter="{StaticResource DataGridCellBorderThicknessConverter}">
-         <Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}"/>
-         <Binding Path="ActualWidth" ElementName="SettingsBtn"/>
-      </MultiBinding>
-   </Popup.VerticalOffset>
-   <OPTIMIZER:BTLPartManagerV/>
-</Popup>
diff --git a/EgtBEAMWALL.Optimizer/PopUp/BTLPartListPopUpV.xaml.vb b/EgtBEAMWALL.Optimizer/PopUp/BTLPartListPopUpV.xaml.vb
deleted file mode 100644
index a2bf54d8..00000000
--- a/EgtBEAMWALL.Optimizer/PopUp/BTLPartListPopUpV.xaml.vb
+++ /dev/null
@@ -1,3 +0,0 @@
-Public Class BTLPartListPopUpV
-
-End Class
diff --git a/EgtBEAMWALL.Optimizer/Project/ProjectV.xaml b/EgtBEAMWALL.Optimizer/Project/ProjectV.xaml
index c8bb442f..da08cec4 100644
--- a/EgtBEAMWALL.Optimizer/Project/ProjectV.xaml
+++ b/EgtBEAMWALL.Optimizer/Project/ProjectV.xaml
@@ -22,7 +22,10 @@
 
       <GridSplitter Grid.Column="1"
                     Grid.RowSpan="4"
-                    Style="{StaticResource Width_GridSplitter}"/>
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Stretch"
+                    Width="3"
+                    Style="{StaticResource GridSplitter_Style}"/>
 
       <OPTIMIZER:RightPanelTopV Grid.Row="1"
                                 Grid.Column="2"/>
@@ -36,7 +39,10 @@
 
       <GridSplitter Grid.Row="2"
                     Grid.ColumnSpan="3"
-                    Style="{StaticResource HeightBottom_GridSplitter}"/>
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Center"
+                    Height="5"
+                    Style="{StaticResource GridSplitter_Style}"/>
 
       <OPTIMIZER:RightPanelBottomV Grid.Row="3"
                                    Grid.Column="2"/>
diff --git a/EgtBEAMWALL.Optimizer/ProjectTypeWnd/ProjectTypeWndV.xaml b/EgtBEAMWALL.Optimizer/ProjectTypeWnd/ProjectTypeWndV.xaml
index a53dd808..c26df8c5 100644
--- a/EgtBEAMWALL.Optimizer/ProjectTypeWnd/ProjectTypeWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/ProjectTypeWnd/ProjectTypeWndV.xaml
@@ -10,7 +10,10 @@
 
    <StackPanel Margin="5,5,5,0">
       <Border Grid.Row="1"
-              Style="{StaticResource ProjectTypeWndV_Border}">
+              Background="{StaticResource Border.ProjectType.Background}"
+              BorderBrush="{StaticResource Border.ProjectType.Border}"
+              BorderThickness="1"
+              Margin="5">
          <Grid Margin="5">
             <Grid.RowDefinitions>
                <RowDefinition Height="Auto"/>
@@ -32,7 +35,7 @@
                           Text="{Binding ChooseMachine_Msg}"
                           Style="{StaticResource Option_TextBlock}"/>
                <Rectangle Grid.Row="1"
-                          Style="{StaticResource ProjectType_Rectangle}"/>
+                          Height="22"/>
                <ComboBox Grid.Row="2"
                          ItemsSource="{Binding MachineList}" 
                          DisplayMemberPath="Name" 
@@ -57,7 +60,7 @@
                           Text="{Binding ChooseType_Msg}"
                           Style="{StaticResource Option_TextBlock}"/>
                <Rectangle Grid.Row="1"
-                          Style="{StaticResource ProjectType_Rectangle}"/>
+                          Height="22"/>
                <ComboBox Grid.Row="2"
                          ItemsSource="{Binding TypeList}"
                          SelectedItem="{Binding nSelType}"
diff --git a/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerV.xaml b/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerV.xaml
index ca4b9768..571a6a6f 100644
--- a/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerV.xaml
+++ b/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerV.xaml
@@ -1,7 +1,7 @@
 <Grid x:Class="RawPartManagerV"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      DataContext="{DynamicResource RawPartManagerVM}">
+      DataContext="{StaticResource RawPartManagerVM}">
    <Grid.ColumnDefinitions>
       <ColumnDefinition Width="Auto"/>
       <ColumnDefinition Width="1*"/>
@@ -15,28 +15,44 @@
               ToolTip="{Binding ProduceAllRawPart_ToolTip}"
               IsEnabled="{Binding RawPartManagerIsEnabled}"
               Visibility="{Binding ProduceRawPart_Visibility}"
-              Style="{StaticResource LP_Button}">
+              FontWeight="Light"
+              Height="30"
+              Width="30"
+              Margin="2.5,2.5,2.5,2.5"
+              Style="{StaticResource Optimizer_Button}">
          <Image Source="{StaticResource ProduceAllRawPart_Image}"
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
       <Button ToolTip="{Binding VerifyAll_ToolTip}"
               Command="{Binding VerifyAll_Command}"
               IsEnabled="{Binding VerifyAll_IsEnabled}"
-              Style="{StaticResource LP_Button}">
+              FontWeight="Light"
+              Height="30"
+              Width="30"
+              Margin="2.5,2.5,2.5,2.5"
+              Style="{StaticResource Optimizer_Button}">
          <Image Source="{StaticResource VerifyAll_Image}"
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
       <Button Command="{Binding ResetCalc_Command}"
               ToolTip="{Binding ResetCalc_ToolTip}"
               IsEnabled="{Binding CALCPanel_IsEnabled}"
-              Style="{StaticResource LP_Button}">
+              FontWeight="Light"
+              Height="30"
+              Width="30"
+              Margin="2.5,2.5,2.5,2.5"
+              Style="{StaticResource Optimizer_Button}">
          <Image Source="{StaticResource ResetCalc_Image}"
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
       <Button Command="{Binding RemoveAllRawPart_Command}"
               ToolTip="{Binding RemoveAllRawPart_ToolTip}"
               IsEnabled="{Binding RawPartManagerIsEnabled}"
-              Style="{StaticResource LP_Button}">
+              FontWeight="Light"
+              Height="30"
+              Width="30"
+              Margin="2.5,2.5,2.5,2.5"
+              Style="{StaticResource Optimizer_Button}">
          <Image Source="{StaticResource Remove_Image}"
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
@@ -44,7 +60,11 @@
               ToolTip="{Binding MovePartInRawPart_ToolTip}"
               IsEnabled="{Binding RawPartManagerIsEnabled}"
               Visibility="{Binding MovePartInRawPart_Visibility}"
-              Style="{StaticResource LP_Button}">
+              FontWeight="Light"
+              Height="30"
+              Width="30"
+              Margin="2.5,2.5,2.5,2.5"
+              Style="{StaticResource Optimizer_Button}">
          <Image Source="{StaticResource MovePartInRawPart_Image}"
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
diff --git a/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerWndV.xaml b/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerWndV.xaml
index 9a4af3af..f89256ec 100644
--- a/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerWndV.xaml
@@ -2,7 +2,7 @@
       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 RawPartManagerWnd_Grid}">
+      Background="{StaticResource Grid.Static.Background}">
 
    <Grid.RowDefinitions>
       <RowDefinition Height="Auto"/>
@@ -17,6 +17,6 @@
    <OPTIMIZER:RawPartListV Grid.Row="1"
                            DataContext="{StaticResource RawPartListVM}"
                            Tag="{Binding Tag.MachGroupPanelVM, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RawPartManagerWndV}}}"
-                           Margin="0,0,2,0"/>
+                           Margin="2,0,2,2.5"/>
 
 </Grid>
diff --git a/EgtBEAMWALL.Optimizer/SaveAsStrategyWnd/SaveAsStrategyV.xaml b/EgtBEAMWALL.Optimizer/SaveAsStrategyWnd/SaveAsStrategyV.xaml
index 9474db3b..81dffd77 100644
--- a/EgtBEAMWALL.Optimizer/SaveAsStrategyWnd/SaveAsStrategyV.xaml
+++ b/EgtBEAMWALL.Optimizer/SaveAsStrategyWnd/SaveAsStrategyV.xaml
@@ -26,7 +26,8 @@
             <DataTemplate DataType="{x:Type OPTIMIZER:StrategySetup}">
                <StackPanel Style="{StaticResource PartManager_StackPanel}">
                   <TextBlock Text="•"
-                             Style="{StaticResource Pointer_TextBlock}"/>
+                             Margin="0,0,5,0"
+                             Style="{StaticResource DialogWindow_TextBlock}"/>
                   <TextBlock Text="{Binding sName}"
                              Style="{StaticResource DialogWindow_TextBlock}"/>
                </StackPanel>
@@ -34,20 +35,28 @@
          </ListBox.ItemTemplate>
       </ListBox>
       <Grid Grid.Row="1"
-            Style="{StaticResource SaveAsStrategy_Grid}">
+            Margin="5,0,5,10">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
          <TextBox Text="{Binding sFileNameCustomConfig, UpdateSourceTrigger=PropertyChanged}"
-                  Style="{StaticResource SaveAsStrategy_TextBox}"/>
+                  HorizontalContentAlignment="Left"
+                  Height="25"
+                  IsReadOnly="False"
+                  Style="{StaticResource Optimizer_TextBox}"/>
          <UniformGrid Grid.Column="2"
                       Columns="3">
             <Button Command="{Binding SaveAsCommand}"
                     ToolTip="{Binding NewToolTip}"
                     IsEnabled="{Binding bSaveAsIsEnable}"
                     Visibility="{Binding bOpen_Visibility}"
-                    Style="{StaticResource SaveStrategy_Button}">
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Height="40"
+                    Width="40"
+                    Margin="5,0,0,0"
+                    Style="{StaticResource Optimizer_Button}">
                <Image Source="{StaticResource Ok_Image}"
                       Style="{StaticResource BTLDataWnd_Image}"/>
             </Button>
@@ -55,13 +64,23 @@
                     ToolTip="{Binding SaveAsToolTip}"
                     IsEnabled="{Binding bSaveAsIsEnable}"
                     Visibility="{Binding bSave_Visibility}"
-                    Style="{StaticResource SaveStrategy_Button}">
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Height="40"
+                    Width="40"
+                    Margin="5,0,0,0"
+                    Style="{StaticResource Optimizer_Button}">
                <Image Source="{StaticResource Ok_Image}"
                       Style="{StaticResource BTLDataWnd_Image}"/>
             </Button>
             <Button Command="{Binding CloseCommand}"
                     ToolTip="{Binding SaveAsToolTip}"
-                    Style="{StaticResource SaveStrategy_Button}">
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Height="40"
+                    Width="40"
+                    Margin="5,0,0,0"
+                    Style="{StaticResource Optimizer_Button}">
                <Image Source="{StaticResource Delete_Image}"
                       Style="{StaticResource BTLDataWnd_Image}"/>
             </Button>
@@ -70,6 +89,11 @@
       <TextBlock Grid.Row="2"
                  Text="{Binding sErrorMsg}"
                  Visibility="{Binding ErrorMsgVisibility}"
-                 Style="{StaticResource ErrorMsg_TextBlock}"/>
+                 Foreground="{StaticResource TextBlock.Error.Foreground}"
+                 HorizontalAlignment="Center"
+                 VerticalAlignment="Center"
+                 FontWeight="Bold"
+                 FontSize="13"
+                 Margin="0,0,0,10"/>
    </Grid>
 </EgtBEAMWALLCORE:OptimizerWindow>
diff --git a/EgtBEAMWALL.Optimizer/SceneShowBulding/SceneBuildingV.xaml b/EgtBEAMWALL.Optimizer/SceneShowBulding/SceneBuildingV.xaml
index 95177a6c..cc49a3f1 100644
--- a/EgtBEAMWALL.Optimizer/SceneShowBulding/SceneBuildingV.xaml
+++ b/EgtBEAMWALL.Optimizer/SceneShowBulding/SceneBuildingV.xaml
@@ -13,7 +13,10 @@
       </Grid.ColumnDefinitions>
       <ItemsControl Grid.ColumnSpan="2" 
                     ItemsSource="{Binding ButtonBuildingList}"                     
-                    Style="{StaticResource SceneBuilding_ItemsControl}">
+                    BorderThickness="0"
+                    FontSize="14"
+                    Padding="0"
+                    Margin="0,5,5,5">
          <ItemsControl.ItemsPanel>
             <ItemsPanelTemplate>
                <StackPanel Orientation="Horizontal"/>
@@ -23,7 +26,9 @@
             <DataTemplate>
                <Button Content="{Binding sNameBTL}" 
                        Command="{Binding ChangeSceneCommand}"
-                       Style="{StaticResource NameBTL_Button}"/>
+                       Height="30"
+                       Margin="0,0,5,0"
+                       Style="{StaticResource Optimizer_Button}"/>
             </DataTemplate>
          </ItemsControl.ItemTemplate>
       </ItemsControl>
diff --git a/EgtBEAMWALL.Optimizer/SetUp/SetUpV.xaml b/EgtBEAMWALL.Optimizer/SetUp/SetUpV.xaml
index 4e5cef31..3a0851a2 100644
--- a/EgtBEAMWALL.Optimizer/SetUp/SetUpV.xaml
+++ b/EgtBEAMWALL.Optimizer/SetUp/SetUpV.xaml
@@ -26,7 +26,7 @@
             <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:FamilyToolItem}" 
                                       ItemsSource="{Binding Items}">
 
-               <Grid Style="{StaticResource SetUp_Grid}">
+               <Grid Height="20">
                   <Grid.ColumnDefinitions>
                      <ColumnDefinition Width="Auto"/>
                      <ColumnDefinition Width="1*"/>
@@ -34,10 +34,15 @@
                   </Grid.ColumnDefinitions>
 
                   <Image Source="{Binding PictureString}"
-                         Style="{StaticResource SetUp_Image}"/>
+                         Height="20"
+                         Width="20"
+                         Margin="0,0,5,0"/>
                   <TextBlock Grid.Column="1" 
                              Text="{Binding Name}"
-                             Style="{StaticResource SetUp_TextBlock}"/>
+                             VerticalAlignment="Center"
+                             FontSize="15"
+                             Margin="0,-2,5,0"
+                             Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                   <Ellipse Grid.Column="2" 
                            Fill="{Binding FamilyColor}"
                            Style="{StaticResource SetUp_Ellipse}"/>
@@ -47,7 +52,7 @@
 
             <DataTemplate DataType="{x:Type EgtWPFLib5:ToolItem}">
                <Grid ToolTip="{Binding ToolTipMsg}"
-                     Style="{StaticResource SetUp_Grid}">
+                     Height="20">
                   <Grid.ColumnDefinitions>
                      <ColumnDefinition Width="Auto"/>
                      <ColumnDefinition Width="1*"/>
@@ -56,7 +61,10 @@
 
                   <TextBlock Grid.Column="1" 
                              Text="{Binding Name}" 
-                             Style="{StaticResource SetUp_TextBlock}"/>
+                             VerticalAlignment="Center"
+                             FontSize="15"
+                             Margin="0,-2,5,0"
+                             Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                   <Ellipse Grid.Column="2"
                            Fill="{Binding ToolColor}"
                            Style="{StaticResource SetUp_Ellipse}"/>
@@ -69,14 +77,14 @@
       </TreeView>
 
 
-      <Grid Style="{StaticResource PositionGroup_Grid}">
+      <Grid Margin="5,0,0,5">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
 
          <Image Source="{Binding SetUpImage}"
-                Style="{StaticResource PositionGroup_Image}"/>
+                MaxWidth="300"/>
 
          <ItemsControl Grid.Column="1" 
                        ItemsSource="{Binding PositionGroupList}"
@@ -90,7 +98,7 @@
                <DataTemplate>
                   <ItemsControl Grid.Column="1" 
                                 ItemsSource="{Binding PositionList}" 
-                                Style="{StaticResource SetUp_ItemsControl}">
+                                Margin="0,0,20,0">
                      <ItemsControl.ItemsPanel>
                         <ItemsPanelTemplate>
                            <WrapPanel Style="{StaticResource Project_WrapPanel}"/>
@@ -98,7 +106,7 @@
                      </ItemsControl.ItemsPanel>
                      <ItemsControl.ItemTemplate>
                         <DataTemplate>
-                           <Grid Style="{StaticResource ExitTool_Grid}">
+                           <Grid Margin="5,5,15,5">
                               <Grid.ColumnDefinitions>
                                  <ColumnDefinition Width="30"/>
                                  <ColumnDefinition Width="1*"/>
@@ -106,7 +114,7 @@
                               <TextBlock Text="{Binding TcPos}"/>
                               <ItemsControl Grid.Column="1" 
                                             ItemsSource="{Binding ExitToolAssociationList}"
-                                            Style="{StaticResource ExitTool_ItemsControl}">
+                                            HorizontalAlignment="Left">
                                  <ItemsControl.ItemsPanel>
                                     <ItemsPanelTemplate>
                                        <UniformGrid Columns="1"/>
@@ -114,7 +122,7 @@
                                  </ItemsControl.ItemsPanel>
                                  <ItemsControl.ItemTemplate>
                                     <DataTemplate>
-                                       <Grid Style="{StaticResource ExitPar_Grid}">
+                                       <Grid Margin="10,0,0,5">
                                           <Grid.ColumnDefinitions>
                                              <ColumnDefinition Width="Auto"/>
                                              <ColumnDefinition Width="1*"/>
@@ -130,7 +138,18 @@
                                           <Border Grid.Column="1"
                                                   x:Name="ToolBorder"  
                                                   ToolTip="{Binding ToolTipMsg}"
-                                                  Style="{StaticResource SetUp_Border}">
+                                                  BorderBrush="{StaticResource Border.SetUp.Border}"
+                                                  BorderThickness="1"
+                                                  Visibility="Hidden">
+                                             <Border.Style>
+                                                <Style TargetType="{x:Type Border}">
+                                                   <Style.Triggers>
+                                                      <DataTrigger Binding="{Binding ElementName=ExitBtn, Path=IsChecked}" Value="True">
+                                                         <Setter Property="Visibility" Value="Visible"/>
+                                                      </DataTrigger>
+                                                   </Style.Triggers>
+                                                </Style>                                                
+                                             </Border.Style>
                                              <TextBlock  Text="{Binding Tool.Name}" Margin="3"/>
                                           </Border>
                                        </Grid>
diff --git a/EgtBEAMWALL.Optimizer/SplashScreen/SplashScreenV.xaml b/EgtBEAMWALL.Optimizer/SplashScreen/SplashScreenV.xaml
index e846f223..ccaba825 100644
--- a/EgtBEAMWALL.Optimizer/SplashScreen/SplashScreenV.xaml
+++ b/EgtBEAMWALL.Optimizer/SplashScreen/SplashScreenV.xaml
@@ -14,6 +14,10 @@
       <Image Source="{StaticResource SplashScreen_Image}" 
              Style="{StaticResource BTLDataWnd_Image}"/>
       <TextBlock x:Name="VersionTxBl"
-                 Style="{StaticResource SplashScreenV_TextBlock}"/>
+                 HorizontalAlignment="Center"
+                 FontWeight="Normal"
+                 FontSize="15"
+                 Margin="71,402,0,0"
+                 Style="{StaticResource ForegroundWhite_TextBlock}"/>
    </Grid>
 </Window>
diff --git a/EgtBEAMWALL.Optimizer/Statistics/OptimizerStatisticsV.xaml b/EgtBEAMWALL.Optimizer/Statistics/OptimizerStatisticsV.xaml
index deff8851..3276368a 100644
--- a/EgtBEAMWALL.Optimizer/Statistics/OptimizerStatisticsV.xaml
+++ b/EgtBEAMWALL.Optimizer/Statistics/OptimizerStatisticsV.xaml
@@ -62,52 +62,53 @@
                                     
                                     ShowGridMenu="OnShowGridMenu"        
                                     
-                                    ColumnHeaderStyle="{StaticResource HeaderStyle}"
-                                    ColumnHeaderImageStyle="{StaticResource HeaderImageStyle}"
+                                    ColumnHeaderStyle="{StaticResource Header_Style}"
+                                    ColumnHeaderImageStyle="{StaticResource HeaderImage_Style}"
                            
-                                    RowStyle="{StaticResource RowStyle}"
+                                    RowStyle="{StaticResource Row_Style}"
+                                    CellStyle="{StaticResource Cell_Style}"
                            
-                                    Style="{StaticResource TableViewStyle}"/>
+                                    Style="{StaticResource TableView_Style}"/>
                   </dxg:GridControl.View>
                   <dxg:GridColumn FieldName="Name" 
                                   SortFieldName="dName"
                                   Header="{Binding ID_Msg}"
                                   Fixed="Left"
-                                  Style="{StaticResource ColumnInfoStyle}"/>
+                                  Style="{StaticResource ColumnInfo_Style}"/>
                   <dxg:GridColumn FieldName="dW"
                                   Header="{Binding W_Msg}"
                                   Binding="{Binding dW}"
-                                  Style="{StaticResource ColumnInfoStyle}"/>
+                                  Style="{StaticResource ColumnInfo_Style}"/>
                   <dxg:GridColumn FieldName="dH"
                                   Header="{Binding H_Msg}"
                                   Binding="{Binding dH}"
-                                  Style="{StaticResource ColumnInfoStyle}"/>
+                                  Style="{StaticResource ColumnInfo_Style}"/>
                   <dxg:GridColumn FieldName="dL"
                                   Header="{Binding L_Msg}"
                                   Binding="{Binding dL}"
-                                  Style="{StaticResource ColumnInfoStyle}"/>
+                                  Style="{StaticResource ColumnInfo_Style}"/>
                   <dxg:GridColumn FieldName="sMATERIAL" 
                                   Header="{Binding MAT_Msg}"
                                   Binding="{Binding sMATERIAL}"
                                   AllowSorting="False"
                                   FilterPopupMode="Custom"
-                                  Style="{StaticResource ColumnInfoStyle}"/>
+                                  Style="{StaticResource ColumnInfo_Style}"/>
                   <dxg:GridColumn FieldName="sUsage"
                                   SortFieldName="dUsage"
                                   Header="{Binding Used_Msg}"
                                   Binding="{Binding sUsage}"
                                   AllowColumnFiltering="False"
-                                  Style="{StaticResource ColumnInfoStyle}"/>
+                                  Style="{StaticResource ColumnInfo_Style}"/>
                   <dxg:GridColumn FieldName="sWaste"
                                   SortFieldName="dWaste"
                                   Header="{Binding Waste_Msg}"
                                   Binding="{Binding sWaste}"
                                   AllowColumnFiltering="False"
-                                  Style="{StaticResource ColumnInfoStyle}"/>
+                                  Style="{StaticResource ColumnInfo_Style}"/>
                   <dxg:GridColumn FieldName="sUnitTime"
                                   Header="{Binding UNIT_TIME_Msg}"
                                   Binding="{Binding sUnitTime}"
-                                  Style="{StaticResource ColumnInfoStyle}"/>
+                                  Style="{StaticResource ColumnInfo_Style}"/>
                </dxg:GridControl>
             </TabItem.Content>
          </TabItem>
@@ -148,42 +149,42 @@
                                     
                                     ShowGridMenu="OnShowGridMenu2"
                                     
-                                    ColumnHeaderStyle="{StaticResource HeaderStyle}"
-                                    ColumnHeaderImageStyle="{StaticResource HeaderImageStyle}"
+                                    ColumnHeaderStyle="{StaticResource Header_Style}"
+                                    ColumnHeaderImageStyle="{StaticResource HeaderImage_Style}"
                            
-                                    RowStyle="{StaticResource RowStyle}"
+                                    RowStyle="{StaticResource Row_Style}"
                            
-                                    Style="{StaticResource TableViewStyle}"/>                        
+                                    Style="{StaticResource TableView_Style}"/>                        
                   </dxg:GridControl.View>
                   <dxg:GridColumn FieldName="sW"
                                   Header="{Binding W_Msg}"
                                   Binding="{Binding sW}"
-                                  Style="{StaticResource ColumnInfoStyle}"/>
+                                  Style="{StaticResource ColumnInfo_Style}"/>
                   <dxg:GridColumn FieldName="sH"
                                   Header="{Binding H_Msg}"
                                   Binding="{Binding sH}"
-                                  Style="{StaticResource ColumnInfoStyle}"/>
+                                  Style="{StaticResource ColumnInfo_Style}"/>
                   <dxg:GridColumn FieldName="sL"
                                   Header="{Binding L_Msg}"
                                   Binding="{Binding sL}"
-                                  Style="{StaticResource ColumnInfoStyle}"/>
+                                  Style="{StaticResource ColumnInfo_Style}"/>
                   <dxg:GridColumn FieldName="sMaterial" 
                                   Header="{Binding MAT_Msg}"
                                   Binding="{Binding sMaterial}"
                                   AllowSorting="False"
                                   FilterPopupMode="Custom"
-                                  Style="{StaticResource ColumnInfoStyle}"/>
+                                  Style="{StaticResource ColumnInfo_Style}"/>
                   <dxg:GridColumn FieldName="nQuantity"
                                   Header="{Binding QTY_Msg}"
                                   Binding="{Binding nQuantity}"
-                                  Style="{StaticResource ColumnInfoStyle}"/>
+                                  Style="{StaticResource ColumnInfo_Style}"/>
                </dxg:GridControl>
             </TabItem.Content>
          </TabItem>
       </TabControl>
 
       <Grid Grid.Row="1" 
-            Style="{StaticResource Statistics_Grid}">
+            Background="{StaticResource Grid.Statistics.Background}">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
@@ -193,69 +194,87 @@
                      Margin="10">
             <StackPanel Style="{StaticResource PartManager_StackPanel}">
                <TextBlock Text="{Binding TotMachGroups_Msg}"
-                          Style="{StaticResource Statistics_TextBlock}"/>
+                          Margin="10,5,5,5"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <TextBlock Text="{Binding Tag.MachGroupPanelVM.sTotMachGroups,
                                          RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:OptimizerStatisticsV}}}"
-                          Style="{StaticResource Statistics_TextBlock}"/>
+                          Margin="10,5,5,5"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             </StackPanel>
             <StackPanel Style="{StaticResource PartManager_StackPanel}">
                <TextBlock Text="{Binding BTLTotVolume_Msg}" 
-                          Style="{StaticResource Statistics_TextBlock}"/>
+                          Margin="10,5,5,5"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <TextBlock Text="{Binding Tag.MachGroupPanelVM.sTotVolume,
                                          RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:OptimizerStatisticsV}}}"
-                          Style="{StaticResource Statistics_TextBlock}"/>
+                          Margin="10,5,5,5"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             </StackPanel>
             <StackPanel Style="{StaticResource PartManager_StackPanel}">
                <TextBlock Text="{Binding BTLTotEstimatedTime_Msg}"
-                          Style="{StaticResource Statistics_TextBlock}"/>
+                          Margin="10,5,5,5"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <TextBlock Text="{Binding Tag.MachGroupPanelVM.sTotEstimatedTime,
                                          RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:OptimizerStatisticsV}}}"
-                          Style="{StaticResource Statistics_TextBlock}"/>
+                          Margin="10,5,5,5"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             </StackPanel>
             <StackPanel Style="{StaticResource PartManager_StackPanel}">
                <TextBlock Text="{Binding BTLTotTime_Msg}" 
-                          Style="{StaticResource Statistics_TextBlock}"/>
+                          Margin="10,5,5,5"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <TextBlock Text="{Binding Tag.MachGroupPanelVM.sTotTime,
                                          RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:OptimizerStatisticsV}}}"
-                          Style="{StaticResource Statistics_TextBlock}"/>
+                          Margin="10,5,5,5"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             </StackPanel>
             <StackPanel Style="{StaticResource PartManager_StackPanel}">
                <TextBlock Text="{Binding BTLRemainingTime_Msg}" 
-                          Style="{StaticResource Statistics_TextBlock}"/>
+                          Margin="10,5,5,5"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <TextBlock Text="{Binding Tag.MachGroupPanelVM.sRemainingTime,
                                          RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:OptimizerStatisticsV}}}"
-                          Style="{StaticResource Statistics_TextBlock}"/>
+                          Margin="10,5,5,5"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             </StackPanel>
          </StackPanel>
          <StackPanel Grid.Column="1"
                      Style="{StaticResource OptStatistics_StackPanel}">
             <StackPanel Style="{StaticResource PartManager_StackPanel}">
                <TextBlock Text="{Binding TotCNTParts_Msg}" 
-                          Style="{StaticResource Statistics_TextBlock}"/>
+                          Margin="10,5,5,5"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <TextBlock Text="{Binding Tag.BTLStructureVM.sTotCNTParts,
                                          RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:OptimizerStatisticsV}}}"
-                          Style="{StaticResource Statistics_TextBlock}"/>
+                          Margin="10,5,5,5"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             </StackPanel>
             <StackPanel Style="{StaticResource PartManager_StackPanel}">
                <TextBlock Text="{Binding TotADDEDParts_Msg}" 
-                          Style="{StaticResource Statistics_TextBlock}"/>
+                          Margin="10,5,5,5"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <TextBlock Text="{Binding Tag.BTLStructureVM.sTotADDEDParts,
                                          RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:OptimizerStatisticsV}}}"
-                          Style="{StaticResource Statistics_TextBlock}"/>
+                          Margin="10,5,5,5"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             </StackPanel>
             <StackPanel Style="{StaticResource PartManager_StackPanel}">
                <TextBlock Text="{Binding TotINPRODParts_Msg}" 
-                          Style="{StaticResource Statistics_TextBlock}"/>
+                          Margin="10,5,5,5"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <TextBlock Text="{Binding Tag.BTLStructureVM.sTotINPRODParts,
                                  RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:OptimizerStatisticsV}}}"
-                          Style="{StaticResource Statistics_TextBlock}"/>
+                          Margin="10,5,5,5"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             </StackPanel>
             <StackPanel Style="{StaticResource PartManager_StackPanel}">
                <TextBlock Text="{Binding TotDONEParts_Msg}"
-                          Style="{StaticResource Statistics_TextBlock}"/>
+                          Margin="10,5,5,5"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <TextBlock Text="{Binding Tag.BTLStructureVM.sTotDONEParts,
                                          RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:OptimizerStatisticsV}}}"
-                          Style="{StaticResource Statistics_TextBlock}"/>
+                          Margin="10,5,5,5"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             </StackPanel>
          </StackPanel>
          <StackPanel Grid.Column="2" 
@@ -267,17 +286,26 @@
                           Foreground="{StaticResource BeamWall_White}"
                           IsChecked="{Binding bRawPart_IsChecked}"
                           ToolTip="Materials"
-                          Style="{StaticResource Statistics_ToggleButton}">
-            </ToggleButton>
+                          Height="30"
+                          Width="30"
+                          Margin="0,10,10,5"/>
             <Button ToolTip="{Binding CopyToClipboard_Msg}"
                     x:Name="CopyToClipboardBtn"
-                    Style="{StaticResource Statistics_Button}">
+                    FontWeight="Light"
+                    Height="30"
+                    Width="30"
+                    Margin="0,5,10,5"
+                    Style="{StaticResource Optimizer_Button}">
                <Image Source="{StaticResource CopyToClipboard_Image}"
                       Style="{StaticResource BTLDataWnd_Image}"/>
             </Button>
             <Button ToolTip="{Binding PrintPDF_Msg}"
                     Command="{Binding PrintOptPDF_Command}"
-                    Style="{StaticResource Statistics_Button}">
+                    FontWeight="Light"
+                    Height="30"
+                    Width="30"
+                    Margin="0,5,10,5"
+                    Style="{StaticResource Optimizer_Button}">
                <Image Source="{StaticResource PrintPDF_Image}"
                       Style="{StaticResource BTLDataWnd_Image}"/>
             </Button>
diff --git a/EgtBEAMWALL.Optimizer/Statistics/PDFEditorV.xaml b/EgtBEAMWALL.Optimizer/Statistics/PDFEditorV.xaml
index 5f6d7ed2..4e5a712c 100644
--- a/EgtBEAMWALL.Optimizer/Statistics/PDFEditorV.xaml
+++ b/EgtBEAMWALL.Optimizer/Statistics/PDFEditorV.xaml
@@ -22,28 +22,57 @@
          <StackPanel Style="{StaticResource PDFList_StackPanel}">
             <Button ToolTip="PDF Viewer - Preview"
                     Command="{Binding CreatePreviewVis_Command}"
-                    Style="{StaticResource PDFPanel_Button}">
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    BorderThickness="1"
+                    Height="40"
+                    Width="120"
+                    Padding="1"
+                    Margin="5,0,5,5"
+                    Style="{StaticResource Optimizer_Button}">
                <Image Source="{StaticResource PDFEditor_Image}"
                       Style="{StaticResource BTLDataWnd_Image}"/>
             </Button>
             <Button ToolTip="PDF Viewer - Optimizer"
                     Command="{Binding CreatePreviewOtt_Command}"
-                    Style="{StaticResource PDFPanel_Button}">
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    BorderThickness="1"
+                    Height="40"
+                    Width="120"
+                    Padding="1"
+                    Margin="5,0,5,5"
+                    Style="{StaticResource Optimizer_Button}">
                <Image Source="{StaticResource PDFEditor_Image}"
                       Style="{StaticResource BTLDataWnd_Image}"/>
             </Button>
             <Button ToolTip="Close PDF Viewer"
                     Command="{Binding ClosePreview_Command}"
-                    Style="{StaticResource Close_Button}">
+                    Height="40"
+                    Width="50"
+                    Margin="2.5,-2,2.5,2.5"
+                    Style="{StaticResource Optimizer_Button}">
                <Image Source="{StaticResource Delete_Image}"
                       Style="{StaticResource BTLDataWnd_Image}"/>
             </Button>
          </StackPanel>
       </GroupBox>
       <ScrollViewer Grid.Row="1"
-                    Style="{StaticResource PDF_ScrollViewer}">
+                    CanContentScroll="True"
+                    HorizontalScrollBarVisibility="Hidden"
+                    VerticalScrollBarVisibility="Auto"
+                    Margin="2.5,2.5,2.5,2.5">
+         <ScrollViewer.Style>
+            <Style TargetType="{x:Type ScrollViewer}">
+               <Style.Resources>
+                  <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource Optimizer_ScrollBar}"/>
+               </Style.Resources>
+            </Style>
+         </ScrollViewer.Style>
          <ItemsControl ItemsSource="{Binding ExpanderList}"
-                       Style="{StaticResource ExpanderList_ItemsControl}">
+                       BorderThickness="0"
+                       Padding="0"
+                       Margin="0">
             <ItemsControl.ItemsPanel>
                <ItemsPanelTemplate>
                   <StackPanel Orientation="Vertical" 
@@ -53,13 +82,21 @@
             <ItemsControl.ItemTemplate>
                <DataTemplate>
                   <Expander Visibility="{Binding ExpanderVisibilty}" 
-                            Style="{StaticResource PDF_Expander}">
+                            IsExpanded="True"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Top"
+                            Margin="2.5">
                      <Expander.Header>
                         <TextBlock Text="{Binding sNameCategory}"
-                                   Style="{StaticResource Category_TextBlock}"/>
+                                   FontWeight="Bold"
+                                   FontSize="16"
+                                   Style="{StaticResource ForegroundWhite_TextBlock}"/>
                      </Expander.Header>
                      <ItemsControl ItemsSource="{Binding ExpanderElementList}"
-                                   Style="{StaticResource ExpanderElementList_ItemsControl}">
+                                   BorderThickness="0"
+                                   FontSize="14"
+                                   Padding="0"
+                                   Margin="0">
                         <ItemsControl.ItemsPanel>
                            <ItemsPanelTemplate>
                               <StackPanel Orientation="Vertical" 
@@ -159,11 +196,14 @@
                 Grid.RowSpan="2"
                 Style="{StaticResource PDFPreview_GroupBox}">
          <GroupBox.Header>
-            <StackPanel Style="{StaticResource PartManager_StackPanel}">
+            <StackPanel Orientation="Horizontal">
                <Image Source="{StaticResource PDFPreview_Image}" 
-                      Style="{StaticResource PDF_Image}"/>
+                      Height="20"
+                      Width="20"
+                      Stretch="Uniform"/>
                <TextBlock Text="PDF" 
-                          Style="{StaticResource PDF_TextBlock}"/>
+                          Margin="5,2,0,0"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             </StackPanel>
          </GroupBox.Header>
          <OPTIMIZER:PdfViewer PdfPath="{Binding WebAddress}" 
diff --git a/EgtBEAMWALL.Optimizer/Statistics/StatisticsV.xaml b/EgtBEAMWALL.Optimizer/Statistics/StatisticsV.xaml
index 50b40344..f7af06dc 100644
--- a/EgtBEAMWALL.Optimizer/Statistics/StatisticsV.xaml
+++ b/EgtBEAMWALL.Optimizer/Statistics/StatisticsV.xaml
@@ -52,78 +52,79 @@
                            
                            ShowGridMenu="OnShowGridMenu"                         
                                                       
-                           ColumnHeaderStyle="{StaticResource HeaderStyle}"
-                           ColumnHeaderImageStyle="{StaticResource HeaderImageStyle}"
+                           ColumnHeaderStyle="{StaticResource Header_Style}"
+                           ColumnHeaderImageStyle="{StaticResource HeaderImage_Style}"
                            
-                           RowStyle="{StaticResource RowStyle}"
+                           RowStyle="{StaticResource Row_Style}"
+                           CellStyle="{StaticResource Cell_Style}"
                            
-                           Style="{StaticResource TableViewStyle}"/>
+                           Style="{StaticResource TableView_Style}"/>
          </dxg:GridControl.View>
          <dxg:GridColumn FieldName="nPDN" 
                          Header="{Binding PDN_Msg}"
                          Fixed="Left"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="sW"
                          SortFieldName="dW"
                          Header="{Binding W_Msg}"
                          AllowColumnFiltering="False"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="sH"
                          SortFieldName="dH"
                          Header="{Binding H_Msg}"
                          AllowColumnFiltering="False"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="sL"
                          SortFieldName="dL"
                          Header="{Binding L_Msg}"
                          AllowColumnFiltering="False"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="sNAM"
                          Header="{Binding NAM_Msg}"
                          AllowSorting="False" 
                          FilterPopupMode="CheckedList"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="sMATERIAL" 
                          Header="{Binding MAT_Msg}"
                          AllowSorting="False"
                          FilterPopupMode="Custom"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="sCNT" 
                          Header="{Binding CNT_Msg}"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="sADDED" 
                          Header="{Binding ADDED_Msg}"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="nINPROD" 
                          Header="{Binding INPROD_Msg}"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="nDONE" 
                          Header="{Binding DONE_Msg}"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="sUnitVolume"
                          SortFieldName="dUnitVolume"
                          Header="{Binding UNIT_VOLUME_Msg}"
                          AllowColumnFiltering="False"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="sTotVolume"
                          SortFieldName="dTotVolume"
                          Header="{Binding TOT_VOLUME_Msg}"
                          AllowColumnFiltering="False"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="sUnitTime"
                          SortFieldName="dUnitTime"
                          Header="{Binding UNIT_TIME_Msg}"
                          AllowColumnFiltering="False"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
          <dxg:GridColumn FieldName="sTotTime"
                          SortFieldName="dTotTime"
                          Header="{Binding TOT_TIME_Msg}"
                          AllowColumnFiltering="False"
-                         Style="{StaticResource ColumnInfoStyle}"/>
+                         Style="{StaticResource ColumnInfo_Style}"/>
       </dxg:GridControl>
       
       <Grid Grid.Row="1" 
-            Style="{StaticResource Statistics_Grid}">
+            Background="{StaticResource Grid.Statistics.Background}">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="Auto"/>
@@ -133,37 +134,45 @@
                         Background="{StaticResource StackPanel.BTLTotParts.Background}"
                         Margin="10,10,0,0">
                <TextBlock Text="{Binding BTLTotParts_Msg}" 
-                          Style="{StaticResource Statistics_TextBlock}"/>
+                          Margin="10,5,5,5"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <TextBlock Text="{Binding Tag.sBTLTotParts,
                                          RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:StatisticsV}}}"
-                          Style="{StaticResource Statistics_TextBlock}"/>
+                          Margin="10,5,5,5"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             </StackPanel>
             <StackPanel Orientation="Horizontal"
                         Background="{StaticResource StackPanel.BTLTotTime.Background}"
                         Margin="10,-1,0,0">
                <TextBlock Text="{Binding BTLTotVolume_Msg}" 
-                          Style="{StaticResource Statistics_TextBlock}"/>
+                          Margin="10,5,5,5"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <TextBlock Text="{Binding Tag.sBTLTotVolume,
                                          RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:StatisticsV}}}"
-                          Style="{StaticResource Statistics_TextBlock}"/>
+                          Margin="10,5,5,5"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             </StackPanel>
             <StackPanel Orientation="Horizontal"
                         Background="{StaticResource StackPanel.BTLTotTime.Background}"
                         Margin="10,-1,0,0">
                <TextBlock Text="{Binding BTLTotTime_Msg}" 
-                          Style="{StaticResource Statistics_TextBlock}"/>
+                          Margin="10,5,5,5"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <TextBlock Text="{Binding Tag.sBTLTotTime,
                                          RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:StatisticsV}}}"
-                          Style="{StaticResource Statistics_TextBlock}"/>
+                          Margin="10,5,5,5"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             </StackPanel>
             <StackPanel Orientation="Horizontal"
                         Background="{StaticResource StackPanel.BTLRemainingTime.Background}"
                         Margin="10,-1,0,10">
                <TextBlock Text="{Binding BTLRemainingTime_Msg}"
-                          Style="{StaticResource Statistics_TextBlock}"/>
+                          Margin="10,5,5,5"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                <TextBlock Text="{Binding Tag.sBTLRemainingTime,
                                          RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:StatisticsV}}}"
-                          Style="{StaticResource Statistics_TextBlock}"/>
+                          Margin="10,5,5,5"
+                          Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             </StackPanel>
          </StackPanel>
          <StackPanel Grid.Column="1"
@@ -172,13 +181,21 @@
                      Margin="0,10,10,10">
          <Button ToolTip="{Binding CopyToClipboard_Msg}"
                  x:Name="CopyToClipboardBtn"
-                 Style="{StaticResource CopyToClipboard_Button}">
+                 FontWeight="Light"
+                 Height="30"
+                 Width="30"
+                 Margin="0,10,10,10"
+                 Style="{StaticResource Optimizer_Button}">
             <Image Source="{StaticResource CopyToClipboard_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
          <Button ToolTip="{Binding PrintPDF_Msg}"
                  Command="{Binding PrintPDF_Command}"
-                 Style="{StaticResource CopyToClipboard_Button}">
+                 FontWeight="Light"
+                 Height="30"
+                 Width="30"
+                 Margin="0,10,10,10"
+                 Style="{StaticResource Optimizer_Button}">
             <Image Source="{StaticResource PrintPDF_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
diff --git a/EgtBEAMWALL.Optimizer/StatisticsTimePanel/StatisticsTimePanelV.xaml b/EgtBEAMWALL.Optimizer/StatisticsTimePanel/StatisticsTimePanelV.xaml
index f0f792d9..0e7ede68 100644
--- a/EgtBEAMWALL.Optimizer/StatisticsTimePanel/StatisticsTimePanelV.xaml
+++ b/EgtBEAMWALL.Optimizer/StatisticsTimePanel/StatisticsTimePanelV.xaml
@@ -2,39 +2,79 @@
             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 PartManager_StackPanel}">
+            Orientation="Horizontal">
 
-   <Border Style="{StaticResource StatisticTimePanel_Border}">
+   <Border Background="{StaticResource Border.TopPanel.Background}"
+           BorderBrush="{StaticResource Border.TopPanel.Border}"
+           BorderThickness="2"
+           CornerRadius="5"
+           Margin="8,0,0,0">
       <StackPanel Orientation="Horizontal"
                   Margin="5">
          <Image Source="{StaticResource Clock_Image}"
                 Style="{StaticResource BTLDataWnd_Image}"/>
          <Border ToolTip="{Binding TotalTime_ToolTip}"
-                 Style="{StaticResource TotalTime_Border}">
+                 Background="{StaticResource Border.TotalTime.Background}"
+                 BorderBrush="{StaticResource Border.TotalTime.Border}"
+                 BorderThickness="2"
+                 VerticalAlignment="Center"
+                 CornerRadius="2"
+                 Padding="20,2,20,2"
+                 Margin="5,0,0,0">
             <TextBlock Text="{Binding Tag.BTLStructureVM.sBTLTotTime, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:StatisticsTimePanelV}}}"
-                       Style="{StaticResource StatisticTimePanel_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       FontSize="20"
+                       Style="{StaticResource ForegroundWhite_TextBlock}"/>
          </Border>
       </StackPanel>
    </Border>
-   <Border Style="{StaticResource StatisticsTimePanel_Border}">
+   <Border Background="{StaticResource Border.TopPanel.Background}"
+           BorderBrush="{StaticResource Border.TopPanel.Border}"
+           BorderThickness="2"
+           CornerRadius="5"
+           Margin="50,0,0,0">
       <StackPanel Orientation="Horizontal"
                   Margin="5">
          <Image Source="{StaticResource Clock_Image}"
                 Style="{StaticResource BTLDataWnd_Image}"/>
          <Border ToolTip="{Binding TotalTime_ToolTip}"
-                 Style="{StaticResource TotEstimatedTime_Border}">
+                 Background="{StaticResource Border.TotalTime.Background}"
+                 BorderBrush="{StaticResource Border.TotalTime.Border}"
+                 BorderThickness="2"
+                 VerticalAlignment="Center"
+                 CornerRadius="2"
+                 Padding="20,2,20,2"
+                 Margin="5,0,10,0">
             <TextBlock Text="{Binding Tag.MachGroupPanelVM.sTotEstimatedTime, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:StatisticsTimePanelV}}}"
-                       Style="{StaticResource StatisticTimePanel_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       FontSize="20"
+                       Style="{StaticResource ForegroundWhite_TextBlock}"/>
          </Border>
          <Border ToolTip="{Binding DoneTime_ToolTip}"
-                 Style="{StaticResource DoneTime_Border}">
+                 Background="{StaticResource Border.DoneTime.Background}"
+                 BorderBrush="{StaticResource Border.DoneTime.Border}"
+                 BorderThickness="2"
+                 VerticalAlignment="Center"
+                 CornerRadius="2"
+                 Padding="20,2,20,2"
+                 Margin="10,0,20,0">
             <TextBlock Text="{Binding Tag.MachGroupPanelVM.sDoneTime, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:StatisticsTimePanelV}}}"
-                       Style="{StaticResource StatisticTimePanel_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       FontSize="20"
+                       Style="{StaticResource ForegroundWhite_TextBlock}"/>
          </Border>
          <Border ToolTip="{Binding RemainingTime_ToolTip}"
-                 Style="{StaticResource RemainingTime_Border}">
+                 Background="{StaticResource Border.RemainingTime.Background}"
+                 BorderBrush="{StaticResource Border.RemainingTime.Border}"
+                 BorderThickness="2"
+                 VerticalAlignment="Center"
+                 CornerRadius="2"
+                 Padding="20,2,20,2"
+                 Margin="2,0,0,0">
             <TextBlock Text="{Binding Tag.MachGroupPanelVM.sRemainingTime, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:StatisticsTimePanelV}}}"
-                       Style="{StaticResource StatisticTimePanel_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       FontSize="20"
+                       Style="{StaticResource ForegroundWhite_TextBlock}"/>
          </Border>
       </StackPanel>
    </Border>
diff --git a/EgtBEAMWALL.Optimizer/StatisticsWnd/StatisticWndV.xaml b/EgtBEAMWALL.Optimizer/StatisticsWnd/StatisticWndV.xaml
index 0bf256e6..109207b6 100644
--- a/EgtBEAMWALL.Optimizer/StatisticsWnd/StatisticWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/StatisticsWnd/StatisticWndV.xaml
@@ -15,7 +15,17 @@
    <TabControl Name="Statistic_TabControl" 
                SelectedIndex="0"
                SelectionChanged="Statistic_TabControl_SelectionChanged"
-               Style="{StaticResource SelTab_TabControl}">
+               Background="{StaticResource TabControl.Optimizer.Background}"
+               BorderThickness="0"
+               TabStripPlacement="Top"
+               Margin="5,5,2.5,5">
+      <TabControl.Style>
+         <Style TargetType="{x:Type TabControl}">
+            <Style.Resources>
+               <Style TargetType="{x:Type TabItem}" BasedOn="{StaticResource Optimizer_TabItem}"/>
+            </Style.Resources>
+         </Style>
+      </TabControl.Style>
       <TabItem Header="STATISTICS">
          <OPTIMIZER:StatisticsV Tag="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:StatisticWndV}}}"/>
       </TabItem>
diff --git a/EgtBEAMWALL.Optimizer/StrategyManager/ParameterStrategyV.xaml b/EgtBEAMWALL.Optimizer/StrategyManager/ParameterStrategyV.xaml
index c759f906..623c65af 100644
--- a/EgtBEAMWALL.Optimizer/StrategyManager/ParameterStrategyV.xaml
+++ b/EgtBEAMWALL.Optimizer/StrategyManager/ParameterStrategyV.xaml
@@ -12,14 +12,17 @@
       </Grid.RowDefinitions>
       <ItemsControl ItemsSource="{Binding Tag.ParameterList,
                                           RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
-                    Style="{StaticResource ParameterStrategy_ItemsControl}">
+                    Margin="5,10,0,0"
+                    Style="{StaticResource UsersControl_ItemsControl}">
          <ItemsControl.Resources>
             <DataTemplate DataType="{x:Type OPTIMIZER:BooleanStrategyParameter}">
                <UniformGrid Columns="2"
                             Visibility="{Binding bBooleanVisibility}"
-                            Style="{StaticResource ParamStrategy_UniformGrid}">
+                            Margin="5,2,5,0">
                   <TextBlock Text="{Binding sDescriptionShort}" 
-                             Style="{StaticResource ParamStrategy_TextBlock}"/>
+                             HorizontalAlignment="Left"
+                             TextWrapping="WrapWithOverflow"
+                             Style="{StaticResource DialogWindow_TextBlock}"/>
                   <CheckBox IsChecked="{Binding bValue, UpdateSourceTrigger=PropertyChanged}"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"/>
@@ -28,9 +31,11 @@
             <DataTemplate DataType="{x:Type OPTIMIZER:DoubleStrategyParameter}">
                <UniformGrid Columns="2"
                             Visibility="{Binding bDoubleVisibility}"
-                            Style="{StaticResource ParamStrategy_UniformGrid}">
+                            Margin="5,2,5,0">
                   <TextBlock Text="{Binding sDescriptionShort}" 
-                             Style="{StaticResource ParamStrategy_TextBlock}"/>
+                             HorizontalAlignment="Left"
+                             TextWrapping="WrapWithOverflow"
+                             Style="{StaticResource DialogWindow_TextBlock}"/>
                   <EgtWPFLib5:EgtTextBox2 Text="{Binding sValue, UpdateSourceTrigger=Explicit}"
                                           Style="{StaticResource ParameterList_TextBox2}"/>
                </UniformGrid>
@@ -38,22 +43,29 @@
             <DataTemplate DataType="{x:Type OPTIMIZER:ComboStrategyParameter}">
                <UniformGrid Columns="2" 
                             Visibility="{Binding bComboBoxVisibility}"
-                            Style="{StaticResource ParamStrategy_UniformGrid}">
+                            Margin="5,2,5,0">
                   <TextBlock Text="{Binding sDescriptionShort}" 
-                             Style="{StaticResource ParamStrategy_TextBlock}"/>
+                             HorizontalAlignment="Left"
+                             TextWrapping="WrapWithOverflow"
+                             Style="{StaticResource DialogWindow_TextBlock}"/>
                   <ComboBox ItemsSource="{Binding ComboList}"
                             SelectedItem="{Binding SelValue}"
                             DisplayMemberPath="sValue"
-                            Style="{StaticResource ProjectParameters_ComboBox}">
+                            Foreground="{StaticResource BeamWall_Black}"
+                            Height="22"
+                            Width="150"
+                            Margin="0">
                   </ComboBox>
                </UniformGrid>
             </DataTemplate>
             <DataTemplate DataType="{x:Type OPTIMIZER:StringStrategyParameter}">
                <UniformGrid Columns="2" 
                             Visibility="{Binding bStringVisibility}"
-                            Style="{StaticResource ParamStrategy_UniformGrid}">
+                            Margin="5,2,5,0">
                   <TextBlock Text="{Binding sDescriptionShort}" 
-                             Style="{StaticResource ParamStrategy_TextBlock}"/>
+                             HorizontalAlignment="Left"
+                             TextWrapping="WrapWithOverflow"
+                             Style="{StaticResource DialogWindow_TextBlock}"/>
                   <TextBox Text="{Binding sValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                            Style="{StaticResource ColorPicker_TextBox}"/>
                </UniformGrid>
@@ -61,10 +73,13 @@
             <DataTemplate DataType="{x:Type OPTIMIZER:ListStrategyParameter}">
                <UniformGrid Columns="3" 
                             Visibility="{Binding bListBoxVisibility}"
-                            Style="{StaticResource ParamStrategy_UniformGrid}">
+                            Margin="5,2,5,0">
                   <TextBlock Text="{Binding sDescriptionShort}"
+                             HorizontalAlignment="Left"
                              VerticalAlignment="Top"
-                             Style="{StaticResource ParamStrategyDescription_TextBlock}"/>
+                             FontWeight="Normal"
+                             TextWrapping="WrapWithOverflow"
+                             Style="{StaticResource DialogWindow_TextBlock}"/>
                   <ToggleButton Grid.Column="1"
                                 ToolTip="{Binding OpenToolListToolTip}"
                                 IsChecked="{Binding OpenToolList_IsChecked}"
@@ -77,9 +92,13 @@
                             Style="{StaticResource BTLDataWnd_Image}"/>
                   </ToggleButton>
                   <Border Grid.Column="2" 
-                          Style="{StaticResource ProjectParamters_Border}">
+                          Margin="2,5,2,0"
+                          Style="{StaticResource Optimizer_Border}">
                      <ItemsControl ItemsSource="{Binding ToolList_View}"                                   
-                                   Style="{StaticResource AvailableToolList_ItemsControl}">
+                                   BorderThickness="0"
+                                   Height="200"
+                                   Width="180"
+                                   Style="{StaticResource UsersControl_ItemsControl}">
                         <ItemsControl.ItemTemplate>
                            <DataTemplate>
                               <StackPanel Orientation="Horizontal"
@@ -101,10 +120,15 @@
          </ItemsControl.Resources>
       </ItemsControl>
       <Button Grid.Row="1" 
-              VerticalAlignment="Bottom"
               Command="{Binding UpdateFeatureCommand}"
               Visibility="{Binding Update_Visibility}" 
-              Style="{StaticResource Update_Button}">
+              HorizontalAlignment="Left"
+              VerticalAlignment="Bottom"
+              Height="40"
+              Width="50"
+              FontSize="20"
+              Margin="5"
+              Style="{StaticResource Optimizer_Button}">
          <Image Source="{StaticResource Update_Image}"
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
diff --git a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerV.xaml b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerV.xaml
index eb2bf6d7..daf3d61e 100644
--- a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerV.xaml
+++ b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerV.xaml
@@ -2,6 +2,7 @@
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
+      xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
       xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
       xmlns:dxc="http://schemas.devexpress.com/winfx/2008/xaml/core"
       xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
@@ -24,14 +25,24 @@
          <ComboBox ItemsSource="{Binding StrategyTypeList}"
                    SelectedItem="{Binding SelStrategyType}"
                    Visibility="{Binding StrategyType_Visibility}"
-                   Style="{StaticResource StrategyManager_ComboBox}"/>
+                   Foreground="{StaticResource BeamWall_Black}"
+                   HorizontalAlignment="Center"
+                   FontSize="15"
+                   Height="30"
+                   Width="160"
+                   Margin="0,0,10,0"
+                   Style="{StaticResource Optmizer_ComboBox}"/>
          <CheckBox IsChecked="{Binding DefaultConfig_IsChecked}"
                    VerticalAlignment="Center"
                    Margin="5,0,5,0"/>
          <ComboBox ItemsSource="{Binding StrategySetupList}"
                    SelectedItem="{Binding SelStrategySetup}"
                    DisplayMemberPath="sName"
-                   Style="{StaticResource Strategy_ComboBox}"/>
+                   Foreground="{StaticResource BeamWall_Black}"
+                   FontSize="15"
+                   Height="30"
+                   Width="160"
+                   Style="{StaticResource Optmizer_ComboBox}"/>
          <Border BorderBrush="{StaticResource Border.TopPanel.Border}" 
                  CornerRadius="5" 
                  BorderThickness="1"
@@ -41,19 +52,28 @@
                         Margin="0,5,0,5">
                <Button Command="{Binding New_Command}"
                        ToolTip="{Binding NewToolTip}"
-                       Style="{StaticResource ConfigurationParameters_Button}">
+                       Height="25"
+                       Width="25"
+                       Margin="5,0,5,0"
+                       Style="{StaticResource Optimizer_Button}">
                   <Image Source="{StaticResource NewDocument_Image}"
                          Style="{StaticResource BTLDataWnd_Image}"/>
                </Button>
                <Button Command="{Binding OpenFileNameCustomConfigCommand}"
                        ToolTip="{Binding SaveAsToolTip}"
-                       Style="{StaticResource ConfigurationParameters_Button}">
+                       Height="25"
+                       Width="25"
+                       Margin="5,0,5,0"
+                       Style="{StaticResource Optimizer_Button}">
                   <Image Source="{StaticResource DisketteAs_Image}"
                          Style="{StaticResource BTLDataWnd_Image}"/>
                </Button>
                <Button Command="{Binding SaveCommand}"
                        ToolTip="{Binding SaveToolTip}"
-                       Style="{StaticResource ConfigurationParameters_Button}">
+                       Height="25"
+                       Width="25"
+                       Margin="5,0,5,0"
+                       Style="{StaticResource Optimizer_Button}">
                   <Image Source="{Binding SaveImage}"
                          Style="{StaticResource BTLDataWnd_Image}"/>
                </Button>
@@ -84,32 +104,37 @@
 
       <Border Grid.Row="1" 
               Grid.RowSpan="2"
-              Style="{StaticResource StrategyManager_Border}">
+              Margin="0,0,0,5"
+              Style="{StaticResource Optimizer_Border}">
 
          <TreeView Name="StrategyFeature_TreeView" 
-                      Height="{Binding ActualHeight, RelativeSource={RelativeSource AncestorType={x:Type RowDefinition}}}"
-                      ItemsSource="{Binding SelStrategySetup.StrategyFeatureList}"
-                      Style="{StaticResource StrategyManager_TreeView}">
+                   ItemsSource="{Binding SelStrategySetup.StrategyFeatureList}"
+                   Height="{Binding ActualHeight, RelativeSource={RelativeSource AncestorType={x:Type RowDefinition}}}"
+                   BorderThickness="0"
+                   ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                   ScrollViewer.VerticalScrollBarVisibility="Auto"
+                   dx:ThemeManager.ThemeName="None">
             <TreeView.Resources>
                <HierarchicalDataTemplate DataType="{x:Type OPTIMIZER:StrategyFeature}"
-                                            ItemsSource="{Binding TopologyList}">
+                                         ItemsSource="{Binding TopologyList}">
                   <CheckBox IsChecked="{Binding RelativeSource={RelativeSource AncestorType=TreeViewItem}, Path=IsExpanded}">
                      <CheckBox.Template>
                         <ControlTemplate>
                            <Border Background="{Binding Background, RelativeSource={RelativeSource AncestorType={x:Type TreeView}}}">
                               <StackPanel Style="{StaticResource PartManager_StackPanel}">
                                  <TextBlock Text="[" 
-                                               Style="{StaticResource DialogWindow_TextBlock}"/>
+                                            Style="{StaticResource DialogWindow_TextBlock}"/>
                                  <TextBlock Text="{Binding nGrp}" 
-                                               Style="{StaticResource DialogWindow_TextBlock}"/>
+                                            Style="{StaticResource DialogWindow_TextBlock}"/>
                                  <TextBlock Text="-" 
-                                               Style="{StaticResource DialogWindow_TextBlock}"/>
+                                            Style="{StaticResource DialogWindow_TextBlock}"/>
                                  <TextBlock Text="{Binding nPrcDesc}" 
-                                               Style="{StaticResource DialogWindow_TextBlock}"/>
+                                            Style="{StaticResource DialogWindow_TextBlock}"/>
                                  <TextBlock Text="]" 
-                                               Style="{StaticResource DialogWindow_TextBlock}"/>
+                                            Style="{StaticResource DialogWindow_TextBlock}"/>
                                  <TextBlock Text="{Binding sName}" 
-                                               Style="{StaticResource StrategyManager_TextBlock}"/>
+                                            Margin="5,0,0,0"
+                                            Style="{StaticResource DialogWindow_TextBlock}"/>
                               </StackPanel>
                            </Border>
                         </ControlTemplate>
@@ -117,8 +142,21 @@
                   </CheckBox>
                </HierarchicalDataTemplate>
                <DataTemplate DataType="{x:Type OPTIMIZER:Topology}">
-                  <TextBlock Text="{Binding sName}"
-                                Style="{StaticResource TreeView_TextBlock}"/>
+                  <TextBlock Text="{Binding sName}">
+                     <TextBlock.Style>
+                        <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DialogWindow_TextBlock}">
+                           <Style.Triggers>
+                              <DataTrigger Binding="{Binding IsSelected, RelativeSource={RelativeSource AncestorType=TreeViewItem}}" Value="True">
+                                 <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
+                                 <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}"/>
+                              </DataTrigger>
+                              <DataTrigger Binding="{Binding IsSelected, RelativeSource={RelativeSource AncestorType=TreeViewItem}}" Value="False">
+                                 <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+                              </DataTrigger>
+                           </Style.Triggers>
+                        </Style>
+                     </TextBlock.Style>
+                  </TextBlock>
                </DataTemplate>
             </TreeView.Resources>
             <TreeView.ItemContainerStyle>
@@ -145,19 +183,22 @@
             <RowDefinition Height="0.93*"/>
             <RowDefinition Height="1*"/>
          </Grid.RowDefinitions>
-         
+
          <GroupBox x:Name="GR"
                    Style="{StaticResource ProjectParameters_GroupBox}">
             <GroupBox.Header>
                <TextBlock Text="{Binding SelTreeItem.SelParamStrategy.sStrategyName}" 
-                          Style="{StaticResource StrategyName_TextBlock}"/>
+                          FontWeight="Bold"
+                          Style="{StaticResource DialogWindow_TextBlock}"/>
             </GroupBox.Header>
             <OPTIMIZER:ParameterStrategyV Tag="{Binding SelTreeItem.SelParamStrategy}"/>
          </GroupBox>
 
          <Border Grid.Row="1"
                  Height="{Binding ActualHeight, ElementName=GR}"
-                 Style="{StaticResource Name_Border}">
+                 VerticalAlignment="Top"
+                 Margin="2,2,2,0"
+                 Style="{StaticResource Optimizer_Border}">
             <Grid>
                <Grid.RowDefinitions>
                   <RowDefinition Height="Auto"/>
@@ -168,10 +209,13 @@
                   <!--<ColumnDefinition Width="1*"/>-->
                </Grid.ColumnDefinitions>
                <TextBlock Text="{Binding SelTreeItem.sName}" 
-                          Style="{StaticResource TreeItemName_TextBlock}"/>
+                          FontWeight="Bold"
+                          Margin="0,10,0,0"
+                          Style="{StaticResource DialogWindow_TextBlock}"/>
                <Image Grid.Row="1" 
                       Source="{Binding SelTreeItem.sImage}"
-                      Style="{StaticResource StrategyManager_Image}"/>
+                      Stretch="Uniform"
+                      Margin="5"/>
             </Grid>
          </Border>
       </Grid>
diff --git a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyProductionV.xaml b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyProductionV.xaml
index c1976ecb..7ed6c19b 100644
--- a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyProductionV.xaml
+++ b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyProductionV.xaml
@@ -5,7 +5,8 @@
           Style="{StaticResource StrategyProduction_GroupBox}">
    <GroupBox.Header>
       <TextBlock Text="{Binding StrategyProductionPath, UpdateSourceTrigger=PropertyChanged}" 
-                 Style="{StaticResource StrategyName_TextBlock}"/>
+                 FontWeight="Bold"
+                 Style="{StaticResource DialogWindow_TextBlock}"/>
    </GroupBox.Header>
 
    <Grid>
@@ -17,15 +18,21 @@
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="1*"/>
       </Grid.ColumnDefinitions>
-      <Border Style="{StaticResource ForcedStrategyBTL_Border}">
+      <Border Margin="2,0,2,0" 
+              Style="{StaticResource Optimizer_Border}">
          <ListBox ItemsSource="{Binding SelTreeItem.AvailableStrategyList}"
                   SelectedItem="{Binding SelTreeItem.SelAvailableStrategy}"
-                  Style="{StaticResource AvailableStrategy_ListBox}">
+                  IsSynchronizedWithCurrentItem="False"
+                  Height="Auto"
+                  Width="Auto"
+                  Style="{StaticResource NewAddFeature_ListBox}">
             <ListBox.Resources>
                <DataTemplate DataType="{x:Type OPTIMIZER:Strategy}">
                   <StackPanel Style="{StaticResource PartManager_StackPanel}">
                      <Image Source="{Binding sImageStrategy}"
-                            Style="{StaticResource StrategyProduction_Image}"/>
+                            Height="100"
+                            Width="100"
+                            Stretch="Uniform"/>
                      <TextBlock Text="{Binding sStrategyId}"
                                 Style="{StaticResource DialogWindow_TextBlock}"/>
                   </StackPanel>
@@ -38,7 +45,8 @@
                 Style="{StaticResource SelStrategyProduction_GroupBox}">
          <GroupBox.Header>
             <TextBlock Text="{Binding SelectedStrategyParamList.sStrategyId}" 
-                       Style="{StaticResource StrategyName_TextBlock}"/>
+                       FontWeight="Bold"
+                       Style="{StaticResource DialogWindow_TextBlock}"/>
          </GroupBox.Header>
          <OPTIMIZER:ParameterStrategyV/>
       </GroupBox>
diff --git a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyV.xaml b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyV.xaml
index 8322f629..6fba4069 100644
--- a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyV.xaml
+++ b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyV.xaml
@@ -3,17 +3,21 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
       Height="{Binding ActualHeight, ElementName=StrategyFeature_TreeView}"
-      Style="{StaticResource Strategy_Grid}">
+      VerticalAlignment="Top">
 
    <Grid.ColumnDefinitions>
       <ColumnDefinition Width="1*"/>
       <ColumnDefinition Width="Auto"/>
    </Grid.ColumnDefinitions>
 
-   <Border Style="{StaticResource ForcedStrategyBTL_Border}">
+   <Border Margin="2,0,2,0" 
+           Style="{StaticResource Optimizer_Border}">
       <ListBox ItemsSource="{Binding SelTreeItem.StrategyList_View}"
                SelectedItem="{Binding SelTreeItem.SelStrategy}"
-               Style="{StaticResource AvailableStrategy_ListBox}">
+               IsSynchronizedWithCurrentItem="False"
+               Height="Auto"
+               Width="Auto"
+               Style="{StaticResource NewAddFeature_ListBox}">
          <ListBox.Resources>
             <DataTemplate DataType="{x:Type OPTIMIZER:Strategy}">
                <StackPanel Style="{StaticResource PartManager_StackPanel}">
@@ -21,7 +25,9 @@
                             Click="CheckBox_Click"
                             Style="{StaticResource Alias_CheckBox}"/>
                   <Image Source="{Binding sStrategyImagePath}"
-                         Style="{StaticResource StrategyProduction_Image}"/>
+                         Height="100"
+                         Width="100"
+                         Stretch="Uniform"/>
                   <TextBlock Text="{Binding sStrategyName}"
                              Style="{StaticResource DialogWindow_TextBlock}"/>
                </StackPanel>
@@ -40,13 +46,21 @@
                VerticalAlignment="Center">
       <Button Command="{Binding MoveUpSelectedStrategyCommand}"
               IsEnabled="{Binding bMoveUp_IsEnabled}"
-              Style="{StaticResource Strategy_Button}">
+              Height="40"
+              Width="50"
+              FontSize="20"
+              Margin="5"
+              Style="{StaticResource Optimizer_Button}">
          <Image Source="{StaticResource MoveUp_Image}"
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
       <Button Command="{Binding MoveDownSelectedStrategyCommand}"
               IsEnabled="{Binding bMoveDown_IsEnabled}"
-              Style="{StaticResource Strategy_Button}">
+              Height="40"
+              Width="50"
+              FontSize="20"
+              Margin="5"
+              Style="{StaticResource Optimizer_Button}">
          <Image Source="{StaticResource MoveDown_Image}"
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
diff --git a/EgtBEAMWALL.Optimizer/StrategyManager/UserAdminV.xaml b/EgtBEAMWALL.Optimizer/StrategyManager/UserAdminV.xaml
index 32a7b90d..11c7d22b 100644
--- a/EgtBEAMWALL.Optimizer/StrategyManager/UserAdminV.xaml
+++ b/EgtBEAMWALL.Optimizer/StrategyManager/UserAdminV.xaml
@@ -1,7 +1,7 @@
 <Grid x:Class="UserAdminV"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      Style="{StaticResource UserAdmin_Grid}">
+      Background="{StaticResource Grid.UserAdmin.Background}">
    <Grid.ColumnDefinitions>
       <ColumnDefinition Width="Auto"/>
       <ColumnDefinition Width="1*"/>
@@ -9,15 +9,25 @@
       <ColumnDefinition Width="Auto"/>
    </Grid.ColumnDefinitions>
    <TextBlock Text="{Binding UserMsg}" 
+              Foreground="{StaticResource TextBlock.UserAdmin.Foreground}"
+              HorizontalAlignment="Left"
+              VerticalAlignment="Center"
               FontWeight="{Binding UserFontWeight}"
-              Style="{StaticResource UserAdmin_TextBlock}"/>
+              TextWrapping="WrapWithOverflow"
+              Margin="5,0,5,0"
+              Style="{StaticResource DialogWindow_TextBlock}"/>
    <ToggleButton Grid.Column="1"
                  IsChecked="{Binding UserAdmin_IsChecked}"
                  Style="{StaticResource Parameter_ToggleButton}"/>
    <TextBlock Grid.Column="2"
               Text="{Binding AdvanceMsg}" 
+              Foreground="{StaticResource TextBlock.UserAdmin.Foreground}"
+              HorizontalAlignment="Left"
+              VerticalAlignment="Center"
               FontWeight="{Binding AdminFontWeight}"
-              Style="{StaticResource UserAdmin_TextBlock}"/>
+              TextWrapping="WrapWithOverflow"
+              Margin="5,0,5,0"
+              Style="{StaticResource DialogWindow_TextBlock}"/>
    <ToggleButton Grid.Column="3"
                  IsChecked="{Binding UnlockAllIsChecked}"
                  Style="{StaticResource Unlock_ToggleButton}">
diff --git a/EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateBTLWndV.xaml b/EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateBTLWndV.xaml
index 1ae41c8f..f01f6ef2 100644
--- a/EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateBTLWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateBTLWndV.xaml
@@ -12,7 +12,9 @@
    <StackPanel Style="{StaticResource List_StackPanel}">
 
       <TextBlock Text="{Binding UpdateBTLWnd_Msg}" 
-                 Style="{StaticResource UpdateBTL_TextBlock}"/>
+                 Width="400"
+                 Margin="5"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
 
       <EgwWPFBaseLib:EgwDataGrid Width="400" MaxHeight="600"
                                  ItemsSource="{Binding BTLPartList}" 
@@ -52,7 +54,10 @@
                <DataGridTemplateColumn.CellTemplate>
                   <DataTemplate>
                      <Ellipse Visibility="{Binding Overwrite_Visibility}" 
-                              Style="{StaticResource UpdateBTL_Ellipse}"/>
+                              Fill="{StaticResource Ellipse.UpdateBTL.Fill}"
+                              HorizontalAlignment="Center"
+                              Height="5"
+                              Width="5"/>
                   </DataTemplate>
                </DataGridTemplateColumn.CellTemplate>
             </DataGridTemplateColumn>
diff --git a/EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateOrAppendWndV.xaml b/EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateOrAppendWndV.xaml
index f19306b7..c1578d17 100644
--- a/EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateOrAppendWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateOrAppendWndV.xaml
@@ -28,12 +28,14 @@
          <RadioButton Grid.Row="1"
                       Content="{Binding Update_Msg}"
                       IsChecked="{Binding UpdateIsChecked}"
-                      Style="{StaticResource UpdateOrAppendWnd_ToggleButton}"/>
+                      Height="30"
+                      Width="70"/>
          <RadioButton Grid.Row="1" 
                       Grid.Column="1"
                       Content="{Binding Append_Msg}"
                       IsChecked="{Binding AppendIsChecked}" 
-                      Style="{StaticResource UpdateOrAppendWnd_ToggleButton}"/>
+                      Height="30"
+                      Width="70"/>
       </Grid>
 
       <Grid Grid.Row="3"
diff --git a/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml b/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml
index a1d08b3b..bd5e3e9b 100644
--- a/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml
+++ b/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml
@@ -156,865 +156,8 @@
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!--#region TextBlock-->
-
-   <!--#region ForegroundWhite-->
-
-   <Style x:Key="List_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundWhite_TextBlock}">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="Margin" Value="10,0,10,0"/>
-      <Setter Property="FontSize" Value="20"/>
-   </Style>
-
-   <Style x:Key="Category_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundWhite_TextBlock}">
-      <Setter Property="FontSize" Value="16"/>
-      <Setter Property="FontWeight" Value="Bold"/>
-   </Style>
-
-   <Style x:Key="StatisticTimePanel_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundWhite_TextBlock}">
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="FontSize" Value="20"/>
-   </Style>
-
-   <Style x:Key="SplashScreenV_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundWhite_TextBlock}">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="FontSize" Value="15"/>
-      <Setter Property="FontWeight" Value="Normal"/>
-      <Setter Property="Margin" Value="71,402,0,0"/>
-   </Style>
-
-   <Style x:Key="BTLPartList_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundWhite_TextBlock}">
-      <Setter Property="FontSize" Value="14"/>
-      <Setter Property="Margin" Value="0,0,5,0"/>
-   </Style>
-
-   <Style x:Key="RightPanel_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundWhite_TextBlock}">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="Margin" Value="5"/>
-      <Setter Property="FontSize" Value="14"/>
-   </Style>
-
-   <!--#endregion ForegroundWhite-->
-
-   <!--#region PartManager-->
-
-   <Style x:Key="PartManager_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundCorduroy_TextBlock}">
-      <Setter Property="HorizontalAlignment" Value="Left"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
-   </Style>
-
-   <Style x:Key="W_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource PartManager_TextBlock}">
-      <Setter Property="Margin" Value="0,0,5,0"/>
-   </Style>
-
-   <!--#endregion PartManager-->
-
-   <!--#region ForegroundCorduroy-->
-
-   <Style x:Key="PartParam_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundCorduroy_TextBlock}">
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="Margin" Value="10,0,10,0"/>
-   </Style>
-
-   <Style x:Key="CNT_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundCorduroy_TextBlock}">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
-      <Setter Property="Width" Value="25"/>
-   </Style>
-
-   <Style x:Key="Macro_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundCorduroy_TextBlock}">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="VerticalAlignment" Value="Top"/>
-      <Setter Property="Margin" Value="5"/>
-      <Setter Property="FontSize" Value="14"/>
-   </Style>
-
-   <Style x:Key="MacroDefault_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundCorduroy_TextBlock}">
-      <Setter Property="HorizontalAlignment" Value="Left"/>
-      <Setter Property="VerticalAlignment" Value="Top"/>
-      <Setter Property="Margin" Value="2.5"/>
-      <Setter Property="Width" Value="239"/>
-      <Setter Property="TextAlignment" Value="Justify"/>
-   </Style>
-
-   <Style x:Key="FeatureManager_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundCorduroy_TextBlock}">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="VerticalAlignment" Value="Top"/>
-      <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
-      <Setter Property="Margin" Value="5,5,0,0"/>
-   </Style>
-
-   <Style x:Key="CALC_ERR_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundCorduroy_TextBlock}">
-      <Setter Property="TextAlignment" Value="Center"/>
-      <Setter Property="FontWeight" Value="Bold"/>
-      <Setter Property="FontSize" Value="12"/>
-      <Setter Property="Margin" Value="-1,-6,1,-3"/>
-   </Style>
-
-   <Style x:Key="PasswordMsg_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundCorduroy_TextBlock}">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="VerticalAlignment" Value="Top"/>
-      <Setter Property="Margin" Value="0,0,0,5"/>
-   </Style>
-
-   <!--#region FeatureInPartInRawPartList-->
-
-   <Style x:Key="CALC_ERR_Letter_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundCorduroy_TextBlock}">
-      <Setter Property="VerticalAlignment" Value="Bottom"/>
-      <Setter Property="Margin" Value="0,-4,0.5,0"/>
-   </Style>
-
-   <!--#endregion FeatureInPartInRawPartList-->
-
-   <Style x:Key="MoveDir_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundCorduroy_TextBlock}">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="VerticalAlignment" Value="Top"/>
-      <Setter Property="Margin" Value="0,5"/>
-   </Style>
-
-   <Style x:Key="NestingRunningWndV_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundCorduroy_TextBlock}">
-      <Setter Property="TextAlignment" Value="Center"/>
-   </Style>
-
-   <Style x:Key="WarehouseWndV_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundCorduroy_TextBlock}">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="Width" Value="70"/>
-      <Setter Property="Margin" Value="15,5"/>
-   </Style>
-
-   <Style x:Key="Msg_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundCorduroy_TextBlock}">
-      <Setter Property="TextAlignment" Value="Center"/>
-      <Setter Property="Margin" Value="40,0,40,0"/>
-   </Style>
-
-   <Style x:Key="ForcedStrategyBTL_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundCorduroy_TextBlock}">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="FontWeight" Value="Bold"/>
-      <Setter Property="FontSize" Value="13"/>
-   </Style>
-
-   <Style x:Key="Status_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundCorduroy_TextBlock}">
-      <Setter Property="HorizontalAlignment" Value="Left"/>
-      <Setter Property="Margin" Value="0,0,10,0"/>
-   </Style>
-
-   <Style x:Key="SelBTLPart_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundCorduroy_TextBlock}">
-      <Setter Property="HorizontalAlignment" Value="Left"/>
-   </Style>
-
-   <Style x:Key="CurrentMachine_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundCorduroy_TextBlock}">
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="FontSize" Value="15"/>
-      <Setter Property="Margin" Value="10,0,5,0"/>
-   </Style>
-
-   <Style x:Key="SelMachine_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundCorduroy_TextBlock}">
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="FontWeight" Value="Bold"/>
-      <Setter Property="FontSize" Value="20"/>
-      <Setter Property="Margin" Value="10,0,5,0"/>
-   </Style>
-
-   <Style x:Key="MultiCopyRawPartWnd_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundCorduroy_TextBlock}">
-      <Setter Property="Margin" Value="0,0,0,5"/>
-   </Style>
-
-   <Style x:Key="Message_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundCorduroy_TextBlock}">
-      <Setter Property="Margin" Value="5,0,5,0"/>
-   </Style>
-
-   <Style x:Key="SetUp_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundCorduroy_TextBlock}">
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="FontSize" Value="15"/>
-      <Setter Property="Margin" Value="0,-2,5,0"/>
-   </Style>
-
-   <Style x:Key="Statistics_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundCorduroy_TextBlock}">
-      <Setter Property="Margin" Value="10,5,5,5"/>
-   </Style>
-
-   <Style x:Key="PDF_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundCorduroy_TextBlock}">
-      <Setter Property="Margin" Value="5,2,0,0"/>
-   </Style>
-
-   <Style x:Key="UpdateBTL_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundCorduroy_TextBlock}">
-      <Setter Property="Width" Value="400"/>
-      <Setter Property="Margin" Value="5"/>
-   </Style>
-
-   <!--#endregion ForegroundCorduroy-->
-
-   <!--#region Option-->
-
-   <Style x:Key="Feature_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource Option_TextBlock}">
-      <Setter Property="Margin" Value="5"/>
-   </Style>
-
-   <Style x:Key="DescBTLFeature_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource Option_TextBlock}">
-      <Setter Property="HorizontalAlignment" Value="Left"/>
-   </Style>
-
-   <!--#endregion Option-->
-
-   <!--#region DialogWindow-->
-
-   <Style x:Key="Pointer_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DialogWindow_TextBlock}">
-      <Setter Property="Margin" Value="0,0,5,0"/>
-   </Style>
-
-   <Style x:Key="ParamStrategy_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DialogWindow_TextBlock}">
-      <Setter Property="HorizontalAlignment" Value="Left"/>
-      <Setter Property="TextWrapping" Value="WrapWithOverflow"/>
-   </Style>
-
-   <Style x:Key="StrategyManager_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DialogWindow_TextBlock}">
-      <Setter Property="Margin" Value="5,0,0,0"/>
-   </Style>
-
-   <Style x:Key="StrategyName_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DialogWindow_TextBlock}">
-      <Setter Property="FontWeight" Value="Bold"/>
-   </Style>
-
-   <Style x:Key="TreeItemName_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DialogWindow_TextBlock}">
-      <Setter Property="FontWeight" Value="Bold"/>
-      <Setter Property="Margin" Value="0,10,0,0"/>
-   </Style>
-
-   <Style x:Key="TreeView_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DialogWindow_TextBlock}">
-      <Style.Triggers>
-         <DataTrigger Binding="{Binding IsSelected, RelativeSource={RelativeSource AncestorType=TreeViewItem}}" Value="True">
-            <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
-            <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}"/>
-         </DataTrigger>
-         <DataTrigger Binding="{Binding IsSelected, RelativeSource={RelativeSource AncestorType=TreeViewItem}}" Value="False">
-            <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
-         </DataTrigger>
-      </Style.Triggers>
-   </Style>
-
-   <!--#endregion DialogWindow-->
-
-   <!--#region ProjectParameters-->
-
-   <Style x:Key="ProjectParameters_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ParamStrategy_TextBlock}">
-      <Setter Property="FontWeight" Value="Bold"/>
-   </Style>
-
-   <Style x:Key="ListProjectParameters_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ProjectParameters_TextBlock}">
-      <Setter Property="VerticalAlignment" Value="Top"/>
-   </Style>
-
-   <Style x:Key="ParamStrategyDescription_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ProjectParameters_TextBlock}">
-      <Setter Property="FontWeight" Value="Normal"/>
-   </Style>
-
-   <!--#endregion ProjectParameters-->
-
-   <!--#region ParamStrategy-->
-
-   <Style x:Key="UserAdmin_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ParamStrategy_TextBlock}">
-      <Setter Property="Foreground" Value="{DynamicResource TextBlock.UserAdmin.Foreground}"/>
-      <Setter Property="Margin" Value="5,0,5,0"/>
-   </Style>
-
-   <!--#endregion ParamStrategy-->
-
-   <!--#region StrategyModify-->
-
-   <Style x:Key="StrategyModify_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Foreground" Value="{DynamicResource TextBlock.StrategyModify.Foreground}"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="FontWeight" Value="Normal"/>
-      <Setter Property="FontSize" Value="11"/>
-      <Setter Property="Margin" Value="-2,0,0,0"/>
-   </Style>
-
-   <Style x:Key="bStrategy_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource StrategyModify_TextBlock}">
-      <Setter Property="FontSize" Value="8"/>
-      <Setter Property="Margin" Value="-20,0,0,0"/>
-   </Style>
-
-   <!--#endregion StrategyModify-->
-
-   <!--#region CALC_ROT-->
-
-   <Style x:Key="CALC_ROT_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Foreground" Value="{DynamicResource TextBlock.CALC_ROT.Foreground}"/>
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="VerticalAlignment" Value="Top"/>
-      <Setter Property="FontWeight" Value="SemiBold"/>
-      <Setter Property="FontSize" Value="12"/>
-      <Setter Property="Margin" Value="1,-4,0,0"/>
-   </Style>
-
-   <!--#region CALC_ROTFeature-->
-
-   <Style x:Key="CALC_ROTFeature_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource CALC_ROT_TextBlock}">
-      <Setter Property="FontSize" Value="10.5"/>
-      <Setter Property="Margin" Value="-12,-2,1,0"/>
-   </Style>
-
-   <Style x:Key="CALC_ROTFeatureRawPartList_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource CALC_ROTFeature_TextBlock}">
-      <Setter Property="Margin" Value="-5,-2,1,0"/>
-   </Style>
-
-   <!--#endregion CALC_ROTFeature-->
-
-   <!--#endregion CALC_ROT-->
-
-   <Style x:Key="Prod_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="TextAlignment" Value="Justify"/>
-      <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
-      <Style.Triggers>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGridCell}}, Path=IsSelected}" Value="True">
-            <Setter Property="FontWeight" Value="Bold"/>
-            <Setter Property="Foreground" Value="{DynamicResource TextBlock.Prod.Foreground}"/>
-            <Setter Property="Background" Value="{DynamicResource TextBlock.Prod.Background}"/>
-         </DataTrigger>
-      </Style.Triggers>
-   </Style>
-
-   <Style x:Key="Name_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="TextAlignment" Value="Center"/>
-      <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
-      <Setter Property="FontSize" Value="11"/>
-      <Style.Triggers>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGridCell}}, Path=IsSelected}" Value="True">
-            <Setter Property="FontWeight" Value="Bold"/>
-            <Setter Property="Foreground" Value="{DynamicResource TextBlock.Prod.Foreground}"/>
-            <Setter Property="Background" Value="{DynamicResource TextBlock.Prod.Background}"/>
-         </DataTrigger>
-      </Style.Triggers>
-   </Style>
-
-   <Style x:Key="RawPartList_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Foreground" Value="{DynamicResource TextBlock.RawPartList.Foreground}"/>
-      <Setter Property="TextAlignment" Value="Center"/>
-      <Setter Property="FontWeight" Value="Bold"/>
-      <Setter Property="FontSize" Value="20"/>
-      <Setter Property="Margin" Value="0,-6,0,-2"/>
-   </Style>
-
-   <Style x:Key="ErrorMsg_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Foreground" Value="{DynamicResource TextBlock.Error.Foreground}"/>
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="FontSize" Value="13"/>
-      <Setter Property="FontWeight" Value="Bold"/>
-      <Setter Property="Margin" Value="0,0,0,10"/>
-   </Style>
-
-   <Style x:Key="Rotate_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="TextAlignment" Value="Center"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="Width" Value="25"/>
-      <Setter Property="Margin" Value="5,0,5,0"/>
-   </Style>
-
-   <Style x:Key="ROT_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="TextAlignment" Value="Center"/>
-      <Setter Property="Margin" Value="2,3,0,2"/>
-   </Style>
-
-   <Style x:Key="PRCList_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="TextAlignment" Value="Justify"/>
-      <Setter Property="TextWrapping" Value="Wrap" />
-      <Setter Property="Margin" Value="10,5,10,0"/>
-   </Style>
-
-   <Style x:Key="ErrConfig_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Red}"/>
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="TextAlignment" Value="Justify"/>
-      <Setter Property="TextWrapping" Value="Wrap" />
-      <Setter Property="FontSize" Value="13"/>
-      <Setter Property="Margin" Value="10,0,0,0"/>
-   </Style>
-
-   <!--#endregion TextBlock-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region TextBox-->
-
-   <!--#region Optimizer-->
-
-   <Style x:Key="FreeContour_TextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource Optimizer_TextBox}">
-      <Setter Property="HorizontalContentAlignment" Value="Right"/>
-      <Setter Property="VerticalContentAlignment" Value="Center"/>
-      <Setter Property="Height" Value="22"/>
-   </Style>
-
-   <Style x:Key="Strategy_TextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource Optimizer_TextBox}">
-      <Setter Property="HorizontalContentAlignment" Value="Left"/>
-      <Setter Property="Height" Value="25"/>
-   </Style>
-
-   <!--#endregion Optmizer-->
-
-   <!--#region EgtOptimizer-->
-
-   <!--#region Dimension_TextBox-->
-
-   <Style x:Key="Dimension_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource EgtOptmizer_TextBox}">
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="Width" Value="55"/>
-   </Style>
-
-   <Style x:Key="EgtPartManager_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource Dimension_TextBox}">
-      <Setter Property="ExplicitUpdateSource" Value="EnterKeyPress"/>
-   </Style>
-
-   <!--#endregion Dimension_TextBox-->
-
-   <Style x:Key="Qty_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource EgtOptmizer_TextBox}">
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="Width" Value="40"/>
-   </Style>
-
-   <Style x:Key="SearchText_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource EgtOptmizer_TextBox}">
-      <Setter Property="VerticalAlignment" Value="Top"/>
-      <Setter Property="Margin" Value="0,2,0,0"/>
-   </Style>
-
-   <Style x:Key="NAM_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource EgtOptmizer_TextBox}">
-      <Setter Property="Width" Value="200"/>
-   </Style>
-
-   <Style x:Key="Value_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource EgtOptmizer_TextBox}">
-      <Setter Property="Width" Value="65"/>
-   </Style>
-
-   <Style x:Key="WarehouseWndV_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource EgtOptmizer_TextBox}">
-      <Setter Property="Width" Value="70"/>
-      <Setter Property="Margin" Value="15,5"/>
-   </Style>
-
-   <Style x:Key="New_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource EgtOptmizer_TextBox}">
-      <Setter Property="HorizontalAlignment" Value="Right"/>
-      <Setter Property="Width" Value="100"/>
-      <Setter Property="Margin" Value="5"/>
-   </Style>
-
-   <Style x:Key="Warehouse_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource EgtOptmizer_TextBox}">
-      <Setter Property="Width" Value="100"/>
-      <Setter Property="Margin" Value="5"/>
-   </Style>
-
-   <Style x:Key="PartParam_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource EgtOptmizer_TextBox}">
-      <Setter Property="Width" Value="150"/>
-      <Setter Property="Margin" Value="5"/>
-   </Style>
-
-   <Style x:Key="LeftPanel_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource EgtOptmizer_TextBox}">
-      <Setter Property="VerticalAlignment" Value="Top"/>
-      <Setter Property="TextAlignment" Value="Justify"/>
-      <Setter Property="Height" Value="25"/>
-      <Setter Property="Margin" Value="0,6,4,0"/>
-   </Style>
-
-   <Style x:Key="Name_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource EgtOptmizer_TextBox}">
-      <Setter Property="Width" Value="60"/>
-   </Style>
-
-   <Style x:Key="FeatureName_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource EgtOptmizer_TextBox}">
-      <Setter Property="Width" Value="200"/>
-      <Setter Property="Margin" Value="5"/>
-   </Style>
-
-   <Style x:Key="MultiCopyRawPartWnd_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource EgtOptmizer_TextBox}">
-      <Setter Property="Margin" Value="0,0,0,5"/>
-   </Style>
-
-   <!--#endregion EgtOptimizer-->
-
-   <Style x:Key="SaveAsStrategy_TextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource Strategy_TextBox}">
-      <Setter Property="IsReadOnly" Value="False"/>
-   </Style>
-
-   <!--#endregion TextBox-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region Button-->
-
-   <!--#region Optimizer-->
-
-   <Style x:Key="ProdManager_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
-      <Setter Property="FontWeight" Value="Light"/>
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="30"/>
-   </Style>
-
-   <!--#region ProdManager-->
-
-   <Style x:Key="ProdManagerNew_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="35"/>
-   </Style>
-
-   <Style x:Key="PrManagerNew_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ProdManagerNew_Button}">
-      <Setter Property="Background" Value="{DynamicResource Button.PrManagerNew.Background}"/>
-      <Setter Property="BorderThickness" Value="0"/>
-   </Style>
-
-   <Style x:Key="BTLProd_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource PrManagerNew_Button}">
-      <Setter Property="Width" Value="50"/>
-   </Style>
-
-   <Style x:Key="Show_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource PrManagerNew_Button}">
-      <Setter Property="Width" Value="15"/>
-      <Setter Property="Height" Value="30"/>
-   </Style>
-
-   <!--#endregion ProdManager-->
-
-   <Style x:Key="NestingRunningWndV_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="70"/>
-   </Style>
-
-   <Style x:Key="OKAddParam_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Margin" Value="0,0,2.5,0"/>
-   </Style>
-
-   <Style x:Key="CancelAddParam_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Margin" Value="2.5,0,0,0"/>
-   </Style>
-
-   <Style x:Key="WWnd_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
-      <Setter Property="Height" Value="20"/>
-      <Setter Property="Width" Value="20"/>
-   </Style>
-
-   <Style x:Key="WAutoWnd_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
-      <Setter Property="Height" Value="20"/>
-      <Setter Property="Margin" Value="20,0,0,0"/>
-   </Style>
-
-   <Style x:Key="RawPart_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
-      <Setter Property="Height" Value="18"/>
-      <Setter Property="Width" Value="25"/>
-      <Setter Property="Margin" Value="2.5,2.5,2.5,2.5"/>
-   </Style>
-
-   <Style x:Key="EditFeature_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
-      <Setter Property="Height" Value="15"/>
-      <Setter Property="Width" Value="15"/>
-      <Setter Property="Margin" Value="25,0,0,0"/>
-   </Style>
-
-   <Style x:Key="PDFPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
-      <Setter Property="Height" Value="40"/>
-      <Setter Property="Width" Value="120"/>
-      <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
-      <Setter Property="BorderThickness" Value="1"/>
-      <Setter Property="HorizontalContentAlignment" Value="Center"/>
-      <Setter Property="VerticalContentAlignment" Value="Center"/>
-      <Setter Property="Padding" Value="1"/>
-      <Setter Property="Margin" Value="5,0,5,5"/>
-   </Style>
-
-   <Style x:Key="Close_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_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="Strategy_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
-      <Setter Property="Height" Value="40"/>
-      <Setter Property="Width" Value="50"/>
-      <Setter Property="Margin" Value="5"/>
-      <Setter Property="FontSize" Value="20"/>
-   </Style>
-
-   <Style x:Key="Update_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Strategy_Button}">
-      <Setter Property="HorizontalAlignment" Value="Left"/>
-      <Setter Property="VerticalAlignment" Value="Top"/>
-   </Style>
-
-   <Style x:Key="SaveStrategy_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="Height" Value="40"/>
-      <Setter Property="Width" Value="40"/>
-      <Setter Property="Margin" Value="5,0,0,0"/>
-   </Style>
-
-   <Style x:Key="BTLPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
-      <Setter Property="Height" Value="20"/>
-      <Setter Property="Width" Value="25"/>
-      <Setter Property="Margin" Value="2,-2,2,-2"/>
-   </Style>
-
-   <Style x:Key="AddRawPartWnd_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="80"/>
-      <Setter Property="Margin" Value="0,0,5,0"/>
-   </Style>
-
-   <Style x:Key="BTLDataWnd_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
-      <Setter Property="VerticalAlignment" Value="Bottom"/>
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="Height" Value="40"/>
-      <Setter Property="Width" Value="40"/>
-      <Setter Property="Margin" Value="0,0,0,5"/>
-   </Style>
-
-   <Style x:Key="OKBTLDataWnd_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource BTLDataWnd_Button}">
-      <Setter Property="Margin" Value="0,0,5,5"/>
-   </Style>
-
-   <Style x:Key="GeneralParametersWnd_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
-      <Setter Property="VerticalAlignment" Value="Bottom"/>
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="Height" Value="40"/>
-      <Setter Property="Width" Value="40"/>
-      <Setter Property="Margin" Value="5,0,0,5"/>
-   </Style>
-
-   <Style x:Key="BTLPartList_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
-      <Setter Property="Height" Value="23.5"/>
-      <Setter Property="Width" Value="25"/>
-      <Setter Property="Margin" Value="5,0,0,0"/>
-   </Style>
-
-   <Style x:Key="FeatureInPartInRawPartList_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
-      <Setter Property="Height" Value="15"/>
-      <Setter Property="Width" Value="15"/>
-      <Setter Property="Margin" Value="0"/>
-   </Style>
-
-   <Style x:Key="Rotation_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
-      <Setter Property="Height" Value="18"/>
-      <Setter Property="Width" Value="25"/>
-      <Setter Property="Margin" Value="-5,0,5,0"/>
-   </Style>
-
-   <Style x:Key="Verify_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
-      <Setter Property="VerticalAlignment" Value="Top"/>
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="30"/>
-      <Setter Property="Margin" Value="2.5,3,2.5,3"/>
-   </Style>
-
-   <Style x:Key="NameBTL_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Margin" Value="0,0,5,0"/>
-   </Style>
-
-   <Style x:Key="SaveConfig_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
-      <Setter Property="VerticalAlignment" Value="Top"/>
-      <Setter Property="Height" Value="40"/>
-      <Setter Property="Width" Value="40"/>
-      <Setter Property="Margin" Value="10,15,10,10"/>
-   </Style>
-
-   <!--#endregion Optimizer-->
-
-   <!--#region ProdManager-->
-
-   <Style x:Key="CalcPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ProdManager_Button}">
-      <Setter Property="FontSize" Value="10"/>
-      <Setter Property="Margin" Value="5,2,5,2"/>
-   </Style>
-
-   <Style x:Key="Warehouse_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ProdManager_Button}">
-      <Setter Property="Margin" Value="5,2,5,2"/>
-   </Style>
-
-   <Style x:Key="Optimize_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ProdManager_Button}">
-      <Setter Property="FontSize" Value="12"/>
-      <Setter Property="Margin" Value="5,2,5,2"/>
-   </Style>
-
-   <Style x:Key="WarehouseWndV_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ProdManager_Button}">
-      <Setter Property="FontSize" Value="20"/>
-   </Style>
-
-   <Style x:Key="LP_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ProdManager_Button}">
-      <Setter Property="Margin" Value="2.5,2.5,2.5,2.5"/>
-   </Style>
-
-   <Style x:Key="DropDownButton_BarButtonItem" TargetType="{x:Type dxb:BarButtonItem}">
-      <Setter Property="Background" Value="{StaticResource ButtonBasic.Static.Background}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource ButtonBasic.Static.Border}"/>
-      <Setter Property="BorderThickness" Value="0.5"/>
-      <Setter Property="CornerRadius" Value="3"/>
-      <Setter Property="GlyphSize" Value="Medium"/>
-   </Style>
-   
-   <Style x:Key="MacroFeaturen_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ProdManager_Button}">
-      <Setter Property="HorizontalAlignment" Value="Right"/>
-      <Setter Property="Margin" Value="2.5,2.5,10,2.5"/>
-   </Style>
-
-   <Style x:Key="FeatureMan_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ProdManager_Button}">
-      <Setter Property="Margin" Value="2.5,2.5,10,2.5"/>
-   </Style>
-
-   <Style x:Key="InstrumentPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ProdManager_Button}">
-      <Setter Property="FontSize" Value="12"/>
-      <Setter Property="Margin" Value="5,2,5,2"/>
-   </Style>
-
-   <Style x:Key="Parameter_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ProdManager_Button}">
-      <Setter Property="Margin" Value="10"/>
-   </Style>
-
-   <Style x:Key="RawPartManager_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ProdManager_Button}">
-      <Setter Property="Margin" Value="5,1,0,1"/>
-   </Style>
-
-   <Style x:Key="Statistics_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ProdManager_Button}">
-      <Setter Property="Margin" Value="0,5,10,5"/>
-   </Style>
-
-   <Style x:Key="CopyToClipboard_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ProdManager_Button}">
-      <Setter Property="Margin" Value="0,10,10,10"/>
-   </Style>
-
-   <Style x:Key="CancelWarehouse_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ProdManager_Button}">
-      <Setter Property="Width" Value="60"/>
-   </Style>
-
-   <!--#endregion ProdManager-->
-
-   <!--#region ProdManagerNew-->
-
-   <Style x:Key="ProdManagerPopUp_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ProdManagerNew_Button}">
-      <Setter Property="Margin" Value="0,0,2.5,0"/>
-   </Style>
-
-   <!--#endregion ProdManagerNew-->
-
-   <!--#region MainMenu-->
-
-   <Style x:Key="SendFeedback_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource MainMenu_Button}">
-      <Setter Property="Width" Value="40"/>
-   </Style>
-
-   <!--#endregion MainMenu-->
-
-   <!--#region SaveStrategy-->
-
-   <Style x:Key="SaveAs_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource SaveStrategy_Button}">
-      <Setter Property="VerticalAlignment" Value="Bottom"/>
-      <Setter Property="Margin" Value="0,0,0,5"/>
-   </Style>
-
-   <!--#endregion SaveStrategy-->
-
-   <!--#region ToolBar-->
-
-   <Style x:Key="PartParametersWnd_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ToolBar_Button}">
-      <Setter Property="Width" Value="100"/>
-   </Style>
-
-   <!--#endregion ToolBar-->
-
-   <!--#region Rotation-->
-
-   <Style x:Key="Move_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Rotation_Button}">
-      <Setter Property="Margin" Value="0"/>
-   </Style>
-
-   <!--#endregion Rotation-->
-
-   <!--#region ToolBarViewPanel-->
-
-   <Style x:Key="Optmizer_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ToolBarViewPanel_Button}">
-      <Setter Property="HorizontalAlignment" Value="Right"/>
-   </Style>
-
-   <Style x:Key="Back_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ToolBarViewPanel_Button}">
-      <Setter Property="VerticalAlignment" Value="Bottom"/>
-      <Setter Property="Margin" Value="5"/>
-   </Style>
-
-   <!--#endregion ToolBarViewPanel-->
-
-   <!--#region ParameterMachine-->
-
-   <Style x:Key="ProjectParameters_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ParameterMachine_Button}">
-      <Setter Property="VerticalAlignment" Value="Top"/>
-      <Setter Property="Width" Value="50"/>
-      <Setter Property="Margin" Value="0,0,0,5"/>
-   </Style>
-
-   <!--#endregion ParameterMachine-->
-
-   <!--#region ProjectParameters-->
-
-   <Style x:Key="CloseProjectParameters_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ProjectParameters_Button}">
-      <Setter Property="Margin" Value="0"/>
-   </Style>
-
-   <!--#endregion ProjectParameters-->
-
-   <!--#region SaveOptionPanel-->
-
-   <Style x:Key="ConfigurationParameters_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource SaveOptionPanel_Button}">
-      <Setter Property="Margin" Value="5,0,5,0"/>
-   </Style>
-
-   <!--#endregion SaveOptionPanel-->
-
-   <Style x:Key="PartParameters_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-      <Setter Property="Height" Value="20"/>
-      <Setter Property="Width" Value="100"/>
-   </Style>
-
-   <!--#endregion Button-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
    <!--#region ToggleButton-->
 
-   <!--#region ToolBar-->
-
-   <Style x:Key="Statistics_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource ToolBar_ToggleButton}">
-      <Setter Property="Margin" Value="0,10,10,5"/>
-   </Style>
-
-   <!--#endregion ToolBar-->
-
-   <!--#region MainMenu-->
-
-   <Style x:Key="StrategyManager_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource MainMenu_ToggleButton}">
-      <Setter Property="Width" Value="140"/>
-      <Setter Property="Margin" Value="0,0,5,0"/>
-   </Style>
-
-   <Style x:Key="MachineParam_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource MainMenu_ToggleButton}">
-      <Setter Property="Width" Value="150"/>
-      <Setter Property="Margin" Value="5,0,10,0"/>
-   </Style>
-
-   <Style x:Key="ConfigProgram_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource MainMenu_ToggleButton}">
-      <Setter Property="Background" Value="{DynamicResource ToggleButton.Static.Background}"/>
-      <Setter Property="Width" Value="40"/>
-   </Style>
-
-   <!--#endregion MainMenu-->
-
-   <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="Parameter_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
       <Setter Property="Width" Value="60"/>
       <Setter Property="Height" Value="20"/>
@@ -1196,21 +339,6 @@
       </Style.Resources>
    </Style>
 
-   <Style x:Key="AvailableStrategy_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource NewAddFeature_ListBox}">
-      <Setter Property="IsSynchronizedWithCurrentItem" Value="False"/>
-      <Setter Property="Width" Value="Auto"/>
-      <Setter Property="Height" Value="Auto"/>
-   </Style>
-
-   <Style x:Key="MacroCustom_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
-      <Setter Property="Background" Value="{DynamicResource ListBox.MacroCustom.Background}"/>
-      <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"/>
-   </Style>
-
    <Style x:Key="MacroDefault_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
       <Setter Property="Background" Value="{DynamicResource ListBox.MacroDefault.Background}"/>
       <Setter Property="BorderThickness" Value="0"/>
@@ -1284,11 +412,6 @@
       </Setter>
    </Style>
 
-   <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>
-
    <Style x:Key="Strategy_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
       <Setter Property="Background" Value="{DynamicResource ListBox.Strategy.Background}"/>
       <Setter Property="BorderThickness" Value="0"/>
@@ -1419,6 +542,7 @@
       <Setter Property="ScrollViewer.CanContentScroll" Value="True"/>
       <Setter Property="VirtualizingPanel.IsVirtualizing" Value="True"/>
       <Setter Property="VirtualizingPanel.VirtualizationMode" Value="Recycling"/>
+      <Setter Property="dx:ThemeManager.ThemeName" Value="None"/>
       <Style.Resources>
          <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource Optimizer_ScrollBar}"/>
          <Style TargetType="{x:Type ListBoxItem}">
@@ -1455,175 +579,8 @@
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!--#region ComboBox-->
-
-   <!--#region Optmizer-->
-
-   <Style x:Key="ProdType_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource Optmizer_ComboBox}">
-      <Setter Property="Height" Value="22"/>
-      <Setter Property="Width" Value="160"/>
-      <Setter Property="Margin" Value="5,0,5,0"/>
-   </Style>
-
-   <Style x:Key="ProdPath_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource Optmizer_ComboBox}">
-      <Setter Property="Height" Value="22"/>
-      <Setter Property="Width" Value="100"/>
-      <Setter Property="Margin" Value="0,0,5,0"/>
-   </Style>
-
-   <Style x:Key="BTLDateTypeList_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource Optmizer_ComboBox}">
-      <Setter Property="Height" Value="22"/>
-      <Setter Property="MinWidth" Value="55"/>
-      <Setter Property="Width" Value="105"/>
-      <Setter Property="Margin" Value="5"/>
-   </Style>
-
-   <Style x:Key="DayTypeList_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource Optmizer_ComboBox}">
-      <Setter Property="Height" Value="22"/>
-      <Setter Property="Width" Value="105"/>
-      <Setter Property="Margin" Value="0,0,2.5,0"/>
-   </Style>
-
-   <Style x:Key="OpenProjectFileDialog_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource Optmizer_ComboBox}">
-      <Setter Property="Height" Value="22"/>
-      <Setter Property="MinWidth" Value="55"/>
-   </Style>
-
-   <Style x:Key="Warehouse_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource Optmizer_ComboBox}">
-      <Setter Property="Height" Value="22"/>
-      <Setter Property="Width" Value="100"/>
-   </Style>
-
-   <Style x:Key="Strategy_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource Optmizer_ComboBox}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Black}"/>
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="160"/>
-      <Setter Property="FontSize" Value="15"/>
-   </Style>
-
-   <Style x:Key="AddRawPartWnd_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource Optmizer_ComboBox}">
-      <Setter Property="Margin" Value="0,0,0,5"/>
-   </Style>
-
-   <Style x:Key="FreeContourInput_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource Optmizer_ComboBox}">
-      <Setter Property="Margin" Value="5,0,5,0"/>
-   </Style>
-
-   <!--#endregion Optmizer-->
-
-   <!--#region Strategy-->
-
-   <Style x:Key="StrategySetup_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource Strategy_ComboBox}">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="Margin" Value="0,0,0,15"/>
-   </Style>
-
-   <Style x:Key="BTLDataWnd_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource Strategy_ComboBox}">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="Margin" Value="0,10,0,10"/>
-   </Style>
-
-   <Style x:Key="StrategyManager_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource Strategy_ComboBox}">
-      <Setter Property="Margin" Value="0,0,10,0"/>
-   </Style>
-
-   <!--#endregion Strategy-->
-
-   <!--#region CalcPanel-->
-
-   <Style x:Key="ProjectParameters_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource CalcPanel_ComboBox}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Black}"/>
-      <Setter Property="Margin" Value="0"/>
-   </Style>
-
-   <!--#endregion CalcPanel-->
-
-   <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"/>
-   </Style>
-
-   <Style x:Key="PartParam_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
-      <Setter Property="Height" Value="22"/>
-      <Setter Property="Width" Value="150"/>
-   </Style>
-
-   <Style x:Key="ProjMaterial_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
-      <Setter Property="Height" Value="24"/>
-      <Setter Property="MinWidth" Value="55"/>
-      <Setter Property="Width" Value="150"/>
-      <Setter Property="Margin" Value="5,-2,0,5"/>
-   </Style>
-
-   <Style x:Key="PRCList_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
-      <Setter Property="HorizontalAlignment" Value="Stretch"/>
-      <Setter Property="Height" Value="24"/>
-      <Setter Property="MinWidth" Value="55"/>
-      <Setter Property="Margin" Value="5,-2,0,5"/>
-   </Style>
-
-   <Style x:Key="PartParameters_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
-      <Setter Property="Height" Value="22"/>
-      <Setter Property="Width" Value="150"/>
-      <Setter Property="Margin" Value="0,5"/>
-   </Style>
-
-   <!--#endregion ComboBox-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
    <!--#region ItemsControl-->
 
-   <!--#region ExpanderElementList-->
-
-   <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"/>
-      <Setter Property="FontSize" Value="14"/>
-   </Style>
-
-   <Style x:Key="SceneBuilding_ItemsControl" TargetType="{x:Type ItemsControl}" BasedOn="{StaticResource ExpanderElementList_ItemsControl}">
-      <Setter Property="Margin" Value="0,5,5,5"/>
-   </Style>
-
-   <!--#endregion ExpanderElementList-->
-
-   <!--#region UsersControl-->
-
-   <Style x:Key="ParameterStrategy_ItemsControl" TargetType="{x:Type ItemsControl}" BasedOn="{StaticResource UsersControl_ItemsControl}">
-      <Setter Property="Margin" Value="5,10,0,0"/>
-   </Style>
-
-   <Style x:Key="ProjectParameters_ItemsControl" TargetType="{x:Type ItemsControl}" BasedOn="{StaticResource UsersControl_ItemsControl}">
-      <Setter Property="Width" Value="180"/>
-      <Setter Property="Height" Value="95"/>
-      <Setter Property="BorderThickness" Value="0"/>
-   </Style>
-
-   <Style x:Key="AvailableToolList_ItemsControl" TargetType="{x:Type ItemsControl}" BasedOn="{StaticResource UsersControl_ItemsControl}">
-      <Setter Property="Width" Value="180"/>
-      <Setter Property="Height" Value="200"/>
-      <Setter Property="BorderThickness" Value="0"/>
-   </Style>
-
-   <!--#endregion UsersControl-->
-
-   <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="SetUp_ItemsControl" TargetType="{x:Type ItemsControl}" BasedOn="{StaticResource {x:Type ItemsControl}}">
-      <Setter Property="Margin" Value="0,0,20,0"/>
-   </Style>
-
-   <Style x:Key="ExitTool_ItemsControl" TargetType="{x:Type ItemsControl}" BasedOn="{StaticResource {x:Type ItemsControl}}">
-      <Setter Property="HorizontalAlignment" Value="Left"/>
-   </Style>
-
    <Style x:Key="HorizontalScrollViewer_ItemsControl" TargetType="{x:Type ItemsControl}">
       <Setter Property="ItemsPanel">
          <Setter.Value>
@@ -1855,144 +812,12 @@
 
    <!--#endregion TabItem-->
 
-   <!--#region TabControl-->
-
-   <!--#region Optmizer-->
-
-   <Style x:Key="Optimizer_TabControl" TargetType="{x:Type TabControl}">
-      <Setter Property="Background" Value="{DynamicResource TabControl.Optimizer.Background}"/>
-      <Setter Property="TabStripPlacement" Value="Top"/>
-      <Setter Property="Margin" Value="5,5,2.5,5"/>
-      <Style.Resources>
-         <Style TargetType="{x:Type TabItem}" BasedOn="{StaticResource Optimizer_TabItem}"/>
-      </Style.Resources>
-   </Style>
-
-   <Style x:Key="SelTab_TabControl" TargetType="{x:Type TabControl}" BasedOn="{StaticResource Optimizer_TabControl}">
-      <Setter Property="BorderThickness" Value="0"/>
-   </Style>
-
-   <!--#endregion Optmizer-->
-
-   <Style x:Key="Project_TabControl" TargetType="{x:Type TabControl}" BasedOn="{StaticResource {x:Type TabControl}}">
-      <Setter Property="BorderThickness" Value="0"/>
-      <Setter Property="Margin" Value="0,-3.8,0,-2"/>
-   </Style>
-
-   <Style x:Key="Feature_TabControl" TargetType="{x:Type TabControl}" BasedOn="{StaticResource {x:Type TabControl}}">
-      <Setter Property="BorderThickness" Value="0"/>
-      <Setter Property="Margin" Value="0,-4,0,-2"/>
-   </Style>
-
-   <Style x:Key="MainWindow_TabControl" TargetType="{x:Type TabControl}" BasedOn="{StaticResource {x:Type TabControl}}">
-      <Setter Property="Padding" Value="0"/>
-      <Setter Property="Margin" Value="0,-4,0,0"/>
-   </Style>
-
-   <!--#endregion TabControl-->
-
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!--#region Grid-->
-
-   <Style x:Key="PartParameters_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="Margin" Value="0,5,0,0"/>
-   </Style>
-
-   <Style x:Key="RawPartList_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="Margin" Value="5,0,-4,0"/>
-   </Style>
-
-   <Style x:Key="LeftPanel_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="Background" Value="{StaticResource Optimizer.Background}"/>
-   </Style>
-
-   <Style x:Key="Verify_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="Margin" Value="4,1,20,0"/>
-   </Style>
-
-   <Style x:Key="MachinePanel_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="Margin" Value="0,10,0,10"/>
-   </Style>
-
-   <Style x:Key="Project_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="Margin" Value="2.5"/>
-   </Style>
-
-   <Style x:Key="Left_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="Margin" Value="2,0,0,0"/>
-   </Style>
-
-   <Style x:Key="RawPartManagerWnd_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="Background" Value="{StaticResource Grid.Static.Background}"/>
-   </Style>
-
-   <Style x:Key="SaveAsStrategy_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="Margin" Value="5,0,5,10"/>
-   </Style>
-
-   <Style x:Key="SetUp_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="Height" Value="20"/>
-   </Style>
-
-   <Style x:Key="PositionGroup_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="Margin" Value="5,0,0,5"/>
-   </Style>
-
-   <Style x:Key="ExitTool_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="Margin" Value="5,5,15,5"/>
-   </Style>
-
-   <Style x:Key="ExitPar_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="Margin" Value="10,0,0,5"/>
-   </Style>
-
-   <Style x:Key="Statistics_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="Background" Value="{DynamicResource Grid.Statistics.Background}"/>
-   </Style>
-
-   <Style x:Key="Strategy_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="VerticalAlignment" Value="Top"/>
-   </Style>
-
-   <Style x:Key="UserAdmin_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="Background" Value="{DynamicResource Grid.UserAdmin.Background}"/>
-   </Style>
-
-   <Style x:Key="ProjectParamters_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="Margin" Value="5,4,0,2"/>
-   </Style>
-
-   <Style x:Key="AddPartWndV_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="Margin" Value="5,5,5,0"/>
-   </Style>
-
-   <Style x:Key="TableView_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="VerticalAlignment" Value="Center"/>
-   </Style>
-
-   <!--#endregion Grid-->
-
    <!--#region GridSplitter-->
 
-   <Style x:Key="Width_GridSplitter" TargetType="{x:Type GridSplitter}">
-      <Setter Property="Background" Value="{DynamicResource GridSplitter.Width.Background}"/>
-      <Setter Property="Width" Value="3"/>
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="VerticalAlignment" Value="Stretch"/>
-      <Setter Property="dx:ThemeManager.ThemeName" Value="None"/>
-   </Style>
-
-   <Style x:Key="Height_GridSplitter" TargetType="{x:Type GridSplitter}">
-      <Setter Property="Background" Value="{DynamicResource GridSplitter.Height.Background}"/>
-      <Setter Property="Height" Value="3"/>
-      <Setter Property="HorizontalAlignment" Value="Stretch"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="dx:ThemeManager.ThemeName" Value="None"/>
-   </Style>
-
-   <Style x:Key="HeightBottom_GridSplitter" TargetType="{x:Type GridSplitter}" BasedOn="{StaticResource Height_GridSplitter}">
-      <Setter Property="Height" Value="10"/>
+   <Style x:Key="GridSplitter_Style" TargetType="{x:Type GridSplitter}">
+      <Setter Property="Background" Value="{StaticResource GridSplitter.Width.Background}"/>
       <Setter Property="dx:ThemeManager.ThemeName" Value="None"/>
    </Style>
 
@@ -2000,50 +825,6 @@
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!--#region UniformGrid-->
-
-   <Style x:Key="AddFeatureWnd_UniformGrid" TargetType="{x:Type UniformGrid}">
-      <Setter Property="Margin" Value="5"/>
-   </Style>
-
-   <Style x:Key="AddPartWnd_UniformGrid" TargetType="{x:Type UniformGrid}">
-      <Setter Property="Margin" Value="0,5,0,5"/>
-   </Style>
-
-   <Style x:Key="BTLDataWnd_UniformGrid" TargetType="{x:Type UniformGrid}">
-      <Setter Property="Margin" Value="0,0,5,0"/>
-   </Style>
-
-   <Style x:Key="PartParameters_UniformGrid" TargetType="{x:Type UniformGrid}">
-      <Setter Property="Margin" Value="0,0,0,-45"/>
-   </Style>
-
-   <Style x:Key="LeftPanel_UniformGrid" TargetType="{x:Type UniformGrid}">
-      <Setter Property="Background" Value="{DynamicResource UniformGrid.LeftPanel.Background}"/>
-      <Setter Property="Height" Value="200"/>
-      <Setter Property="Margin" Value="0,10,10,10"/>
-   </Style>
-
-   <Style x:Key="Command_UniformGrid" TargetType="{x:Type UniformGrid}">
-      <Setter Property="Margin" Value="5,5,5,0"/>
-   </Style>
-
-   <Style x:Key="PartParametersWnd_UniformGrid" TargetType="{x:Type UniformGrid}">
-      <Setter Property="Margin" Value="0,0,0,-45"/>
-   </Style>
-
-   <Style x:Key="ParamStrategy_UniformGrid" TargetType="{x:Type UniformGrid}">
-      <Setter Property="Margin" Value="5,2,5,0"/>
-   </Style>
-
-   <Style x:Key="ProjectParameters_UniformGrid" TargetType="{x:Type UniformGrid}">
-      <Setter Property="Margin" Value="2,2,2,5"/>
-   </Style>
-
-   <!--#endregion UniformGrid-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
    <!--#region GroupBox-->
 
    <!--#region General-->
@@ -2139,382 +920,9 @@
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!--#region Expander-->
-
-   <Style x:Key="PDF_Expander" TargetType="{x:Type Expander}" BasedOn="{StaticResource {x:Type Expander}}">
-      <Setter Property="IsExpanded" Value="True"/>
-      <Setter Property="VerticalContentAlignment" Value="Top"/>
-      <Setter Property="HorizontalContentAlignment" Value="Left"/>
-      <Setter Property="Margin" Value="2.5"/>
-   </Style>
-
-   <Style x:Key="FeatureManager_Expander" TargetType="{x:Type Expander}" BasedOn="{StaticResource {x:Type Expander}}">
-      <Setter Property="Width" Value="80"/>
-   </Style>
-
-   <Style x:Key="BTLPartList_Expander" TargetType="{x:Type Expander}" BasedOn="{StaticResource {x:Type Expander}}">
-      <Setter Property="IsExpanded" Value="True"/>
-   </Style>
-
-   <Style x:Key="LeftPanel_Expander" TargetType="{x:Type Expander}" BasedOn="{StaticResource {x:Type Expander}}">
-      <Setter Property="Margin" Value="-2,0,0,0"/>
-   </Style>
-
-   <Style x:Key="Section_Expander" TargetType="{x:Type Expander}" BasedOn="{StaticResource {x:Type Expander}}">
-      <Setter Property="Width" Value="135"/>
-      <Setter Property="Margin" Value="0,4.5,5,0"/>
-   </Style>
-
-   <!--#endregion Expander-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region ScrollViewer-->
-
-   <Style x:Key="PDF_ScrollViewer" TargetType="{x:Type ScrollViewer}" BasedOn="{StaticResource {x:Type ScrollViewer}}">
-      <Setter Property="CanContentScroll" Value="True"/>
-      <Setter Property="VerticalScrollBarVisibility" Value="Auto"/>
-      <Setter Property="Margin" Value="2.5,2.5,2.5,2.5"/>
-      <Setter Property="HorizontalScrollBarVisibility" Value="Hidden"/>
-      <Style.Resources>
-         <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource Optimizer_ScrollBar}"/>
-      </Style.Resources>
-   </Style>
-
-   <Style x:Key="PDFViewer_ScrollViewer" TargetType="{x:Type ScrollViewer}" BasedOn="{StaticResource {x:Type ScrollViewer}}">
-      <Setter Property="Background" Value="{DynamicResource ScrollViewer.Static.Background}"/>
-      <Setter Property="PanningMode" Value="Both"/>
-   </Style>
-
-   <!--#endregion ScrollViewer-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region TreeView-->
-
-   <Style x:Key="StrategyManager_TreeView" TargetType="{x:Type TreeView}">
-      <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
-      <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-      <Setter Property="BorderThickness" Value="0"/>
-      <Setter Property="dx:ThemeManager.ThemeName" Value="None"/>
-   </Style>
-
-   <!--#endregion TreeView-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region ToolTip-->
-
-   <Style x:Key="PParameters_ToolTip" TargetType="{x:Type ToolTip}">
-      <Setter Property="Background" Value="{DynamicResource ToolTip.PParameters.Background}"/>
-      <Setter Property="Foreground" Value="{DynamicResource ToolTip.PParameters.Foreground}"/>
-   </Style>
-
-   <!--#endregion ToolTip-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region PopUp-->
-
-   <Style x:Key="BTLPartList_PopUp" TargetType="{x:Type Popup}">
-      <Setter Property="AllowsTransparency" Value="True"/>
-      <Setter Property="PopupAnimation" Value="None"/>
-      <Setter Property="Placement" Value="Right"/>
-      <Setter Property="StaysOpen" Value="False"/>
-   </Style>
-
-   <Style x:Key="Filter_PopUp" TargetType="{x:Type Popup}">
-      <Setter Property="AllowsTransparency" Value="True"/>
-      <Setter Property="PopupAnimation" Value="Scroll"/>
-      <Setter Property="StaysOpen" Value="False"/>
-   </Style>
-
-   <Style x:Key="FilterSect_PopUp" TargetType="{x:Type Popup}">
-      <Setter Property="AllowsTransparency" Value="True"/>
-      <Setter Property="PopupAnimation" Value="Fade"/>
-      <Setter Property="Placement" Value="Bottom"/>
-      <Setter Property="StaysOpen" Value="False"/>
-   </Style>
-
-   <!--#endregion PopUp-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region Border-->
-
-   <!--#region Optimizer-->
-
-   <Style x:Key="ForcedStrategyBTL_Border" TargetType="{x:Type Border}" BasedOn="{StaticResource Optimizer_Border}">
-      <Setter Property="Margin" Value="2,0,2,0"/>
-   </Style>
-
-   <Style x:Key="Project_Border" TargetType="{x:Type Border}" BasedOn="{StaticResource Optimizer_Border}">
-      <Setter Property="Margin" Value="10,5,10,5" />
-   </Style>
-
-   <Style x:Key="ProjectParamters_Border" TargetType="{x:Type Border}" BasedOn="{StaticResource Optimizer_Border}">
-      <Setter Property="Margin" Value="2,5,2,0"/>
-   </Style>
-
-   <Style x:Key="StrategyManager_Border" TargetType="{x:Type Border}" BasedOn="{StaticResource Optimizer_Border}">
-      <Setter Property="Margin" Value="0,0,0,5"/>
-   </Style>
-
-   <Style x:Key="Name_Border" TargetType="{x:Type Border}" BasedOn="{StaticResource Optimizer_Border}">
-      <Setter Property="VerticalAlignment" Value="Top"/>
-      <Setter Property="Margin" Value="2,2,2,0"/>
-   </Style>
-
-   <!--#endregion Optimizer-->
-
-   <!--#region TotalTime_Border-->
-
-   <Style x:Key="TotalTime_Border" TargetType="{x:Type Border}">
-      <Setter Property="Background" Value="{DynamicResource Border.TotalTime.Background}"/>
-      <Setter Property="BorderBrush" Value="{DynamicResource Border.TotalTime.Border}"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="BorderThickness" Value="2"/>
-      <Setter Property="Padding" Value="20,2,20,2"/>
-      <Setter Property="Margin" Value="5,0,0,0"/>
-      <Setter Property="CornerRadius" Value="2"/>
-   </Style>
-
-   <Style x:Key="TotEstimatedTime_Border" TargetType="{x:Type Border}" BasedOn="{StaticResource TotalTime_Border}">
-      <Setter Property="Margin" Value="5,0,10,0"/>
-   </Style>
-
-   <!--#endregion TotalTime_Border-->
-
-   <Style x:Key="DoneTime_Border" TargetType="{x:Type Border}">
-      <Setter Property="Background" Value="{DynamicResource Border.DoneTime.Background}"/>
-      <Setter Property="BorderBrush" Value="{DynamicResource Border.DoneTime.Border}"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="BorderThickness" Value="2"/>
-      <Setter Property="Padding" Value="20,2,20,2"/>
-      <Setter Property="Margin" Value="10,0,20,0"/>
-      <Setter Property="CornerRadius" Value="2"/>
-   </Style>
-
-   <Style x:Key="RemainingTime_Border" TargetType="{x:Type Border}">
-      <Setter Property="Background" Value="{DynamicResource Border.RemainingTime.Background}"/>
-      <Setter Property="BorderBrush" Value="{DynamicResource Border.RemainingTime.Border}"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="BorderThickness" Value="2"/>
-      <Setter Property="Padding" Value="20,2,20,2"/>
-      <Setter Property="Margin" Value="2,0,0,0"/>
-      <Setter Property="CornerRadius" Value="2"/>
-   </Style>
-
-   <Style x:Key="ProjectTypeWndV_Border" TargetType="{x:Type Border}">
-      <Setter Property="Background" Value="{DynamicResource Border.ProjectType.Background}"/>
-      <Setter Property="BorderBrush" Value="{DynamicResource Border.ProjectType.Border}"/>
-      <Setter Property="BorderThickness" Value="1"/>
-      <Setter Property="Margin" Value="5"/>
-   </Style>
-
-   <Style x:Key="AddFeatureWnd_Border" TargetType="{x:Type Border}">
-      <Setter Property="Background" Value="{DynamicResource Border.AddFeature.Background}"/>
-      <Setter Property="CornerRadius" Value="4,0,0,4"/>
-      <Setter Property="Margin" Value="0,2,0,2"/>
-   </Style>
-
-   <Style x:Key="PRCList_Border" TargetType="{x:Type Border}">
-      <Setter Property="BorderBrush" Value="{DynamicResource Border.PRC.Border}"/>
-      <Setter Property="CornerRadius" Value="4,0,0,4"/>
-      <Setter Property="BorderThickness" Value="2,2,0,2"/>
-   </Style>
-
-   <Style x:Key="Custom_Border" TargetType="{x:Type Border}">
-      <Setter Property="Background" Value="{DynamicResource Border.Custom.Background}"/>
-      <Setter Property="BorderThickness" Value="0,2,0,2"/>
-   </Style>
-
-   <Style x:Key="MacroCustomList_Border" TargetType="{x:Type Border}">
-      <Setter Property="BorderBrush" Value="{DynamicResource Border.MacroCustom.Border}"/>
-      <Setter Property="CornerRadius" Value="0"/>
-      <Setter Property="BorderThickness" Value="0,2,0,2"/>
-   </Style>
-
-   <Style x:Key="Default_Border" TargetType="{x:Type Border}">
-      <Setter Property="Background" Value="{DynamicResource Border.Default.Background}"/>
-      <Setter Property="CornerRadius" Value="0,4,4,0"/>
-      <Setter Property="Margin" Value="0,2,0,2"/>
-      <Setter Property="Padding" Value="0,10,0,10"/>
-   </Style>
-
-   <Style x:Key="MacroDefaultList_Border" TargetType="{x:Type Border}">
-      <Setter Property="BorderBrush" Value="{DynamicResource Border.MacroDefault.Border}"/>
-      <Setter Property="CornerRadius" Value="0,4,4,0"/>
-      <Setter Property="BorderThickness" Value="0,2,2,2"/>
-   </Style>
-
-   <Style x:Key="BTLPartManager_Border" TargetType="{x:Type Border}">
-      <Setter Property="Background" Value="{DynamicResource Border.BTLPartManager.Background}"/>
-      <Setter Property="BorderBrush" Value="{DynamicResource Border.BTLPartManager.Border}"/>
-      <Setter Property="CornerRadius" Value="5"/>
-      <Setter Property="BorderThickness" Value="0"/>
-   </Style>
-
-   <Style x:Key="SetUp_Border" TargetType="{x:Type Border}">
-      <Setter Property="BorderBrush" Value="{DynamicResource Border.SetUp.Border}"/>
-      <Setter Property="BorderThickness" Value="1"/>
-      <Setter Property="Visibility" Value="Hidden"/>
-      <Style.Triggers>
-         <DataTrigger Binding="{Binding ElementName=ExitBtn, Path=IsChecked}" Value="True">
-            <Setter Property="Visibility" Value="Visible"/>
-         </DataTrigger>
-      </Style.Triggers>
-   </Style>
-
-   <Style x:Key="TableView_Border" TargetType="{x:Type Border}">
-      <Setter Property="Background" Value="{StaticResource Grid.Static.ExpanderDown.Background}"/>
-   </Style>
-
-   <Style x:Key="Calc_Border" TargetType="{x:Type Border}">
-      <Setter Property="Height" Value="20"/>
-      <Setter Property="Width" Value="20"/>
-   </Style>
-
-   <Style x:Key="Filtering_Border" TargetType="{x:Type Border}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_White}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Silver}"/>
-      <Setter Property="BorderThickness" Value="1"/>
-      <Setter Property="CornerRadius" Value="3"/>
-      <Setter Property="SnapsToDevicePixels" Value="True"/>
-   </Style>
-
-   <!--#region TopPanel_Border-->
-
-   <Style x:Key="TopPanel_Border" TargetType="{x:Type Border}">
-      <Setter Property="Background" Value="{StaticResource Border.TopPanel.Background}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource Border.TopPanel.Border}"/>
-      <Setter Property="CornerRadius" Value="5"/>
-      <Setter Property="BorderThickness" Value="2"/>
-   </Style>
-
-   <Style x:Key="StatisticTimePanel_Border" TargetType="{x:Type Border}" BasedOn="{StaticResource TopPanel_Border}">
-      <Setter Property="Margin" Value="8,0,0,0"/>
-   </Style>
-
-   <Style x:Key="StatisticsTimePanel_Border" TargetType="{x:Type Border}" BasedOn="{StaticResource TopPanel_Border}">
-      <Setter Property="Margin" Value="50,0,0,0"/>
-   </Style>
-
-   <!--#endregion TopPanel_Border-->
-
-   <!--#endregion Border-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#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="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="ForcedStrategyBTL_Image" TargetType="{x:Type Image}">
-      <Setter Property="Width" Value="100"/>
-      <Setter Property="Height" Value="100"/>
-      <Setter Property="Stretch" Value="Uniform"/>
-   </Style>
-
-   <Style x:Key="BTLPartList_Image" TargetType="{x:Type Image}">
-      <Setter Property="Height" Value="20"/>
-      <Setter Property="Stretch" Value="Uniform"/>
-      <Setter Property="RenderOptions.BitmapScalingMode" Value="NearestNeighbor"/>
-      <Setter Property="SnapsToDevicePixels" Value="True"/>
-   </Style>
-
-   <Style x:Key="CurrDraw_Image" TargetType="{x:Type Image}">
-      <Setter Property="Width" Value="250"/>
-      <Setter Property="Margin" Value="2.5"/>
-   </Style>
-
-   <Style x:Key="ConfigProgram_Image" TargetType="{x:Type Image}">
-      <Setter Property="Stretch" Value="Uniform"/>
-      <Setter Property="Height" Value="40"/>
-      <Setter Property="Margin" Value="0,-6,0,0"/>
-   </Style>
-
-   <Style x:Key="Piece_Image" TargetType="{x:Type Image}">
-      <Setter Property="Stretch" Value="Uniform"/>
-      <Setter Property="Margin" Value="5"/>
-   </Style>
-
-   <Style x:Key="SetUp_Image" TargetType="{x:Type Image}">
-      <Setter Property="Height" Value="20"/>
-      <Setter Property="Width" Value="20"/>
-      <Setter Property="Margin" Value="0,0,5,0"/>
-   </Style>
-
-   <Style x:Key="PositionGroup_Image" TargetType="{x:Type Image}">
-      <Setter Property="MaxWidth" Value="300"/>
-   </Style>
-
-   <Style x:Key="PDF_Image" TargetType="{x:Type Image}">
-      <Setter Property="Stretch" Value="Uniform"/>
-      <Setter Property="Height" Value="20"/>
-      <Setter Property="Width" Value="20"/>
-   </Style>
-
-   <Style x:Key="StrategyManager_Image" TargetType="{x:Type Image}">
-      <Setter Property="Stretch" Value="Uniform"/>
-      <Setter Property="Margin" Value="5"/>
-   </Style>
-
-   <Style x:Key="StrategyProduction_Image" TargetType="{x:Type Image}">
-      <Setter Property="Stretch" Value="Uniform"/>
-      <Setter Property="Width" Value="100"/>
-      <Setter Property="Height" Value="100"/>
-   </Style>
-
-   <Style x:Key="BTL_Image" TargetType="{x:Type Image}">
-      <Setter Property="Stretch" Value="Fill"/>
-   </Style>
-
-   <!--#endregion Image-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region Ellipse-->
-
-   <!--#region FeatureInPartInRawPartList-->
-
-   <Style x:Key="CALC_ROT_Ellipse" TargetType="{x:Type Ellipse}" BasedOn="{StaticResource FeatureInPartInRawPartList_Ellipse}">
-      <Setter Property="VerticalAlignment" Value="Top"/>
-      <Setter Property="Margin" Value="2,1,-2,0"/>
-   </Style>
-
-   <Style x:Key="UpdateBTL_Ellipse" TargetType="{x:Type Ellipse}" BasedOn="{StaticResource FeatureInPartInRawPartList_Ellipse}">
-      <Setter Property="Fill" Value="{DynamicResource Ellipse.UpdateBTL.Fill}"/>
-   </Style>
-
-   <!--#endregion FeatureInPartInRawPartList-->
-
-   <!--#endregion Ellipse-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region Rectangle-->
-
-   <Style x:Key="ProjectType_Rectangle" TargetType="{x:Type Rectangle}">
-      <Setter Property="Height" Value="22"/>
-   </Style>
-
-   <!--#endregion Rectangle-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
    <!--#region DevExpress-->
 
-   <Style x:Key="TableViewStyle" TargetType="{x:Type dxg:TableView}">
+   <Style x:Key="TableView_Style" TargetType="{x:Type dxg:TableView}">
       <Setter Property="AlternationCount" Value="2"/>
       <Setter Property="AlternateRowBackground" Value="{StaticResource BeamWall_LinkWater}"/>
       <Setter Property="AutoWidth" Value="False"/>
@@ -2525,7 +933,7 @@
       <Setter Property="RowMinHeight" Value="28"/>
    </Style>
 
-   <Style x:Key="HeaderStyle" TargetType="{x:Type dxg:BaseGridHeader}">
+   <Style x:Key="Header_Style" TargetType="{x:Type dxg:BaseGridHeader}">
       <Setter Property="Background" Value="{StaticResource DataGridColumnHeader.Static.Main.Background}"/>
       <Setter Property="Foreground" Value="{StaticResource DataGridColumnHeader.Static.Main.Foreground}"/>
       <Setter Property="FontWeight" Value="Bold"/>
@@ -2535,7 +943,7 @@
       <!--<Setter Property="dxg:BaseGridColumnHeader.ShowFilterButtonOnHover" Value="False"/>-->
    </Style>
 
-   <Style x:Key="RawPartHeaderStyle" TargetType="{x:Type dxg:BaseGridHeader}">
+   <Style x:Key="RawPartHeader_Style" TargetType="{x:Type dxg:BaseGridHeader}">
       <Setter Property="Background" Value="{StaticResource DataGridColumnHeader.Static.RawPart.Background}"/>
       <Setter Property="Foreground" Value="{StaticResource DataGridColumnHeader.Static.RawPart.Foreground}"/>
       <Setter Property="FontWeight" Value="SemiBold"/>
@@ -2545,12 +953,12 @@
       <!--<Setter Property="dxg:BaseGridColumnHeader.ShowFilterButtonOnHover" Value="False"/>-->
    </Style>
 
-   <Style x:Key="HeaderImageStyle" TargetType="{x:Type Image}">
+   <Style x:Key="HeaderImage_Style" TargetType="{x:Type Image}">
       <Setter Property="Height" Value="20"/>
       <Setter Property="Stretch" Value="Uniform"/>
    </Style>
 
-   <Style x:Key="RowStyle" TargetType="{x:Type dxg:RowControl}">
+   <Style x:Key="Row_Style" TargetType="{x:Type dxg:RowControl}">
       <Setter Property="IsEnabled" Value="{Binding Row.IsRowEnabled}"/>
       <Style.Triggers>
          <Trigger Property="SelectionState" Value="Selected">
@@ -2568,7 +976,7 @@
       </Style.Triggers>
    </Style>
 
-   <Style x:Key="CellStyle" TargetType="{x:Type dxg:LightweightCellEditor}">
+   <Style x:Key="Cell_Style" TargetType="{x:Type dxg:LightweightCellEditor}">
       <Style.Triggers>
          <DataTrigger Binding="{Binding RowData.Row.nProduction_State}" Value="0">
             <Setter Property="Background" Value="{Binding RowData.Row.Background}"/>
@@ -2597,7 +1005,15 @@
       </Style.Triggers>
    </Style>
 
-   <Style x:Key="DropDownButtonStyle" TargetType="{x:Type dx:DropDownButton}">
+   <Style x:Key="DropDownButton_BarButtonItem" TargetType="{x:Type dxb:BarButtonItem}">
+      <Setter Property="Background" Value="{StaticResource ButtonBasic.Static.Background}"/>
+      <Setter Property="BorderBrush" Value="{StaticResource ButtonBasic.Static.Border}"/>
+      <Setter Property="BorderThickness" Value="0.5"/>
+      <Setter Property="CornerRadius" Value="3"/>
+      <Setter Property="GlyphSize" Value="Medium"/>
+   </Style>
+
+   <Style x:Key="DropDownButton_Style" TargetType="{x:Type dx:DropDownButton}">
       <Setter Property="Background" Value="{StaticResource ButtonBasic.Static.Background}"/>
       <Setter Property="BorderBrush" Value="{StaticResource ButtonBasic.Static.Border}"/>
       <Setter Property="GlyphHeight" Value="20"/>
@@ -2606,12 +1022,12 @@
       <Setter Property="CornerRadius" Value="3"/>
    </Style>
 
-   <Style x:Key="ColumnButtonStyle" TargetType="{x:Type dxg:GridColumn}">
+   <Style x:Key="ColumnButton_Style" TargetType="{x:Type dxg:GridColumn}">
       <Setter Property="ImageAlignment" Value="Center"/>
       <Setter Property="HorizontalHeaderContentAlignment" Value="Center"/>
    </Style>
 
-   <Style x:Key="ColumnInfoStyle" TargetType="{x:Type dxg:GridColumn}">
+   <Style x:Key="ColumnInfo_Style" TargetType="{x:Type dxg:GridColumn}">
       <Setter Property="HorizontalHeaderContentAlignment" Value="Center"/>
       <Setter Property="EditSettings">
          <Setter.Value>
@@ -2620,11 +1036,7 @@
       </Setter>
    </Style>
 
-   <Style x:Key="bDoCheckEditStyle" TargetType="{x:Type dxe:CheckEdit}">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-   </Style>
-
-   <Style x:Key="SearchControlStyle" TargetType="{x:Type dxe:SearchControl}">
+   <Style x:Key="SearchControl_Style" TargetType="{x:Type dxe:SearchControl}">
       <Setter Property="HorizontalAlignment" Value="Stretch"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="Width" Value="300"/>
@@ -2636,7 +1048,7 @@
       <Setter Property="FontWeight" Value="Bold"/>
    </Style>
 
-   <Style x:Key="ComboBoxEditStyle" TargetType="{x:Type dxe:ComboBoxEdit}">
+   <Style x:Key="ComboBoxEdit_Style" TargetType="{x:Type dxe:ComboBoxEdit}">
       <Setter Property="Background" Value="{StaticResource ComboBox.Static.Background}"/>
       <Setter Property="BorderBrush" Value="{StaticResource ComboBox.Static.Border}"/>
       <Setter Property="Foreground" Value="{StaticResource ComboBox.Static.Foreground}"/>
@@ -2646,13 +1058,6 @@
       <Setter Property="IsTextEditable" Value="False"/>
       <Setter Property="AllowDefaultButton" Value="True"/>
    </Style>
-
-   <Style x:Key="TreeViewControlStyle" TargetType="{x:Type dxg:TreeViewControl}">
-      <Setter Property="Foreground" Value="{StaticResource  TextBlock.Static.Second.Foreground}"/>
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="FontSize" Value="13"/>
-   </Style>
    
    <!--#endregion DevExpress-->
 
diff --git a/EgtBEAMWALL.Optimizer/WarehouseWnd/WarehouseWndV.xaml b/EgtBEAMWALL.Optimizer/WarehouseWnd/WarehouseWndV.xaml
index d376efc2..68b297b9 100644
--- a/EgtBEAMWALL.Optimizer/WarehouseWnd/WarehouseWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/WarehouseWnd/WarehouseWndV.xaml
@@ -55,7 +55,9 @@
 
          <TextBlock Text="{Binding CurrentS_Msg}"
                     Visibility="{Binding Basic_Visibility}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <ComboBox Grid.Column="1"
                    ItemsSource="{Binding Path=SParamList, 
                                          Mode=OneWay}"
@@ -63,47 +65,65 @@
                                           Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                    DisplayMemberPath="sValue"
                    Visibility="{Binding Basic_Visibility}"
-                   Style="{StaticResource Warehouse_ComboBox}"/>
+                   Height="22"
+                   Width="100"
+                   Style="{StaticResource Optmizer_ComboBox}"/>
 
          <TextBlock Grid.Row="1"
                     Text="{Binding StartOffset_Msg}"
                     Visibility="{Binding StartOffset_Visibility}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Row="1"
                                 Grid.Column="1"
                                 Text="{Binding dStartOffset, UpdateSourceTrigger=PropertyChanged}"
                                 Visibility="{Binding StartOffset_Visibility}"
-                                Style="{StaticResource Warehouse_TextBox}"/>
+                                Width="100"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
 
          <TextBlock Grid.Row="1"
                     Text="{Binding Kerf_Msg}"
                     Visibility="{Binding Kerf_Visibility}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Row="1"
                                 Grid.Column="1"
                                 Text="{Binding dKerf, UpdateSourceTrigger=PropertyChanged}"
                                 Visibility="{Binding Kerf_Visibility}"
-                                Style="{StaticResource Warehouse_TextBox}"/>
+                                Width="100"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
 
          <TextBlock Grid.Row="2"
                     Text="{Binding Offset_Msg}"
                     Visibility="{Binding Offset_Visibility}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Row="2"
                                 Grid.Column="1"
                                 Text="{Binding dOffset, Mode=TwoWay, UpdateSourceTrigger=LostFocus}"
                                 Visibility="{Binding Offset_Visibility}"
-                                Style="{StaticResource Warehouse_TextBox}"/>
+                                Width="100"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
 
          <TextBlock Grid.Row="3"
                     Text="{Binding Quantity_Msg}"
                     Visibility="{Binding Basic_Visibility}"
-                    Style="{StaticResource PartParam_TextBlock}"/>
+                    VerticalAlignment="Center"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Row="3"
                                 Grid.Column="1"
                                 Text="{Binding nQuantity, UpdateSourceTrigger=PropertyChanged}"
                                 Visibility="{Binding Basic_Visibility}"
-                                Style="{StaticResource Warehouse_TextBox}"/>
+                                Width="100"
+                                Margin="5"
+                                Style="{StaticResource EgtOptmizer_TextBox}"/>
 
          <GroupBox Grid.Row="3" 
                    Grid.ColumnSpan="3" 
@@ -129,23 +149,30 @@
                      <ColumnDefinition Width="1*"/>
                   </Grid.ColumnDefinitions>
                   <TextBlock Text="{Binding MinThickness_Msg}"
-                             Style="{StaticResource NestingRunningWndV_TextBlock}"/>
+                             TextAlignment="Center"
+                             Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                   <TextBlock Grid.Column="1"
                              Text="{Binding Value_Msg}"
-                             Style="{StaticResource NestingRunningWndV_TextBlock}"/>
+                             TextAlignment="Center"
+                             Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                   <TextBlock Grid.Column="2"
                              Text="{Binding MaxThickness_Msg}"
-                             Style="{StaticResource NestingRunningWndV_TextBlock}"/>
+                             TextAlignment="Center"
+                             Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                </Grid>
 
                <Button Content="+" 
                        Grid.Column="1"
                        Command="{Binding AddWhWallParam_Command}"
-                       Style="{StaticResource WWnd_Button}"/>
+                       Height="20"
+                       Width="20"
+                       Style="{StaticResource Optimizer_Button}"/>
                <Button Content="-" 
                        Grid.Column="2"
                        Command="{Binding RemoveWhWallParam_Command}"
-                       Style="{StaticResource WWnd_Button}"/>
+                       Height="20"
+                       Width="20"
+                       Style="{StaticResource Optimizer_Button}"/>
 
                <Grid Grid.Row="1">
                   <EgtWPFLib5:EgtScrollViewer Focusable="False"
@@ -161,13 +188,20 @@
                                     <ColumnDefinition Width="1*" />
                                  </Grid.ColumnDefinitions>
                                  <TextBlock Text="{Binding dMinThickness, Mode=OneWay}"
-                                            Style="{StaticResource WarehouseWndV_TextBlock}"/>
+                                            HorizontalAlignment="Center"
+                                            Width="70"
+                                            Margin="15,5"
+                                            Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                                  <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                                         Text="{Binding dOffset, UpdateSourceTrigger=Explicit}"
-                                                        Style="{StaticResource WarehouseWndV_TextBox}"/>
+                                                        Width="70"
+                                                        Margin="15,5"
+                                                        Style="{StaticResource EgtOptmizer_TextBox}"/>
                                  <EgtWPFLib5:EgtTextBox Grid.Column="2"
                                                         Text="{Binding dMaxThickness, UpdateSourceTrigger=Explicit}"
-                                                        Style="{StaticResource WarehouseWndV_TextBox}"/>
+                                                        Width="70"
+                                                        Margin="15,5"
+                                                        Style="{StaticResource EgtOptmizer_TextBox}"/>
                               </Grid>
                            </DataTemplate>
                         </ItemsControl.ItemTemplate>
@@ -185,7 +219,8 @@
          <ListBox ItemsSource="{Binding SParamList}" 
                   SelectedItem="{Binding SelSParam}"
                   DisplayMemberPath="sValue"
-                  Style="{StaticResource WarehouseWndV_ListBox}"/>
+                  MinHeight="40"
+                  Margin="5"/>
       </GroupBox>
 
       <GroupBox Grid.Row="1"
@@ -209,16 +244,22 @@
                <Button Grid.Column="2"
                        Content="+" 
                        Command="{Binding AddMediumParam_Command}"
-                       Style="{StaticResource WWnd_Button}"/>
+                       Height="20"
+                       Width="20"
+                       Style="{StaticResource Optimizer_Button}"/>
                <Button Grid.Column="3"
                        Content="-" 
                        Command="{Binding RemoveMediumParam_Command}"
-                       Style="{StaticResource WWnd_Button}"/>
+                       Height="20"
+                       Width="20"
+                       Style="{StaticResource Optimizer_Button}"/>
 
                <Button Grid.Column="4"
                        Content="AUTO" 
                        Command="{Binding AddAllParam_Command}"
-                       Style="{StaticResource WAutoWnd_Button}"/>
+                       Height="20"
+                       Margin="20,0,0,0"
+                       Style="{StaticResource Optimizer_Button}"/>
 
             </Grid>
             <!--<dxg:GridControl Grid.Row="1" 
@@ -262,7 +303,7 @@
                                           Height="{Binding ActualHeight, RelativeSource={RelativeSource AncestorType={x:Type dxe:ComboBoxEdit}}}"
                                           Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type dxe:ComboBoxEdit}}}"
                                           DisplayMember="sSectionXMaterial"
-                                          Style="{StaticResource ComboBoxEditStyle}"/>
+                                          Style="{StaticResource ComboBoxEdit_Style}"/>
                      </DataTemplate>
                   </dxg:GridColumn.CellTemplate>
                </dxg:GridColumn>
@@ -370,13 +411,23 @@
          <Button Grid.Row="1"
                  Content="+"
                  Command="{Binding AddParam_Command}"
-                 Style="{StaticResource WarehouseWndV_Button}"/>
+                 FontWeight="Light"
+                 FontSize="20"
+                 Height="30"
+                 Width="30"
+                 Margin="5,2,5,2"
+                 Style="{StaticResource Optimizer_Button}"/>
 
          <Button Grid.Row="1"
                  Grid.Column="1"
                  Content="-"  
                  Command="{Binding RemoveParam_Command}"
-                 Style="{StaticResource WarehouseWndV_Button}"/>
+                 FontWeight="Light"
+                 FontSize="20"
+                 Height="30"
+                 Width="30"
+                 Margin="5,2,5,2"
+                 Style="{StaticResource Optimizer_Button}"/>
       </Grid>
 
       <GroupBox Grid.Row="3"
@@ -393,10 +444,15 @@
                <ColumnDefinition Width="2*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Text="{Binding L_Msg}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                    Text="{Binding sNewL, UpdateSourceTrigger=PropertyChanged}"
-                                   Style="{StaticResource New_TextBox}"/>
+                                   HorizontalAlignment="Right"
+                                   Width="100"
+                                   Margin="5"
+                                   Style="{StaticResource EgtOptmizer_TextBox}"/>
             <Grid Grid.Row="1" 
                   Grid.ColumnSpan="2">
                <Grid.ColumnDefinitions>
@@ -405,12 +461,17 @@
                </Grid.ColumnDefinitions>
                <Button Content="{Binding OkAddParam_Msg}"
                        Command="{Binding OkAddParam_Command}"
-                       Style="{StaticResource OKAddParam_Button}"/>
+                       Height="30"
+                       Margin="0,0,2.5,0"
+                       Style="{StaticResource Optimizer_Button}"/>
 
                <Button Grid.Column="1"
                        Content="{Binding Cancel_Msg}"
                        Command="{Binding CancelAddParam_Command}"
-                       Style="{StaticResource ProdManager_Button}"/>
+                       FontWeight="Light"
+                       Height="30"
+                       Width="30"
+                       Style="{StaticResource Optimizer_Button}"/>
             </Grid>
          </Grid>
       </GroupBox>
@@ -430,17 +491,27 @@
                <ColumnDefinition Width="2*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Text="{Binding W_Msg}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                    Text="{Binding sNewW, UpdateSourceTrigger=PropertyChanged}"
-                                   Style="{StaticResource New_TextBox}"/>
+                                   HorizontalAlignment="Right"
+                                   Width="100"
+                                   Margin="5"
+                                   Style="{StaticResource EgtOptmizer_TextBox}"/>
             <TextBlock Grid.Row="1"
                        Text="{Binding L_Msg}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Row="1"
                                    Grid.Column="1"
                                    Text="{Binding sNewL, UpdateSourceTrigger=PropertyChanged}"
-                                   Style="{StaticResource New_TextBox}"/>
+                                   HorizontalAlignment="Right"
+                                   Width="100"
+                                   Margin="5"
+                                   Style="{StaticResource EgtOptmizer_TextBox}"/>
             <Grid Grid.Row="2" 
                   Grid.ColumnSpan="2">
                <Grid.ColumnDefinitions>
@@ -451,13 +522,18 @@
                <Button Grid.Column="0"
                        Content="{Binding OkAddParam_Msg}"
                        Command="{Binding OkAddParam_Command}"
-                       Style="{StaticResource OKAddParam_Button}"/>
+                       Height="30"
+                       Margin="0,0,2.5,0"
+                       Style="{StaticResource Optimizer_Button}"/>
 
                <Button Grid.Column="1"
                        Grid.ColumnSpan="2"
                        Content="{Binding Cancel_Msg}"                       
                        Command="{Binding CancelAddParam_Command}"
-                       Style="{StaticResource ProdManager_Button}"/>
+                       FontWeight="Light"
+                       Height="30"
+                       Width="30"
+                       Style="{StaticResource Optimizer_Button}"/>
             </Grid>
          </Grid>
       </GroupBox>
@@ -471,12 +547,16 @@
          </Grid.ColumnDefinitions>
          <Button Content="{Binding Save_Msg}"
                  Command="{Binding Save_Command}"
-                 Style="{StaticResource OKAddParam_Button}"/>
+                 Height="30"
+                 Margin="0,0,2.5,0"
+                 Style="{StaticResource Optimizer_Button}"/>
 
          <Button Grid.Column="1"
                  Content="{Binding Cancel_Msg}"
                  Command="{Binding Cancel_Command}"
-                 Style="{StaticResource NestingRunningWndV_Button}"/>
+                 Height="30"
+                 Width="70"
+                 Style="{StaticResource Optimizer_Button}"/>
       </Grid>
    </Grid>
 
diff --git a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb
index 90a1b31a..eddc2d85 100644
--- a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb	
+++ b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb	
@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("3.1.7.4")>
-<Assembly: AssemblyFileVersion("3.1.7.4")>
+<Assembly: AssemblyVersion("3.1.8.1")>
+<Assembly: AssemblyFileVersion("3.1.8.1")>