diff --git a/EgtBEAMWALL.Core/BeamMachiningsWindow/BeamMachiningsWindowV.xaml b/EgtBEAMWALL.Core/BeamMachiningsWindow/BeamMachiningsWindowV.xaml
index b5bab563..a11a82b5 100644
--- a/EgtBEAMWALL.Core/BeamMachiningsWindow/BeamMachiningsWindowV.xaml
+++ b/EgtBEAMWALL.Core/BeamMachiningsWindow/BeamMachiningsWindowV.xaml
@@ -1,15 +1,14 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="BeamMachiningsWindowV"
-                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
-                            Title="{Binding Title}"
-                            WindowStyle="None" ResizeMode="NoResize"
-                            Width="500" Height="450"
-                            IsResizable="False"
-                            IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
-                            CloseCommand="{Binding Close_Command,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
-                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
+<EgtBEAMWALLCORE:OptimizerWindow x:Class="BeamMachiningsWindowV"
+                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
+                                 WindowStyle="None"
+                                 Width="500" Height="450"
+                                 WindowStartupLocation="CenterOwner" 
+                                 ShowInTaskbar="False"
+                                 Title="{Binding Title}"
+                                 Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
    
    <Grid Margin="5,5,5,0">
       <Grid.RowDefinitions>
@@ -68,14 +67,14 @@
                <DataGridCheckBoxColumn x:Key="colON" Binding="{Binding OnPar, UpdateSourceTrigger=PropertyChanged}"
                                        CellStyle="{StaticResource DataGridCheckBoxColumn_Style}">
                   <DataGridCheckBoxColumn.Header>
-                     <TextBlock Text="{Binding Path=DataContext.OnHdr,RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"/>
+                     <TextBlock Text="{Binding Path=DataContext.OnHdr,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}"/>
                   </DataGridCheckBoxColumn.Header>
                </DataGridCheckBoxColumn>
 
                <!--Colonna Name-->
                <DataGridTemplateColumn x:Key="colNAME">
                   <DataGridTemplateColumn.Header>
-                     <TextBlock Text="{Binding Path=DataContext.NameHdr,RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"/>
+                     <TextBlock Text="{Binding Path=DataContext.NameHdr,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}"/>
                   </DataGridTemplateColumn.Header>
                   <DataGridTemplateColumn.CellEditingTemplate>
                      <DataTemplate>
@@ -96,7 +95,7 @@
                <!--Colonna Style-->
                <DataGridTemplateColumn x:Key="colTYPE">
                   <DataGridTemplateColumn.Header>
-                     <TextBlock Text="{Binding Path=DataContext.TypeHdr,RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"/>
+                     <TextBlock Text="{Binding Path=DataContext.TypeHdr,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}"/>
                   </DataGridTemplateColumn.Header>
                   <DataGridTemplateColumn.CellEditingTemplate>
                      <DataTemplate>
@@ -158,4 +157,4 @@
       </Grid>
 
    </Grid>
-</EgtWPFLib5:EgtCustomWindow>
+</EgtBEAMWALLCORE:OptimizerWindow>
diff --git a/EgtBEAMWALL.Core/BeamMachiningsWindow/BeamMachiningsWindowV.xaml.vb b/EgtBEAMWALL.Core/BeamMachiningsWindow/BeamMachiningsWindowV.xaml.vb
index e6ac89ee..4fded533 100644
--- a/EgtBEAMWALL.Core/BeamMachiningsWindow/BeamMachiningsWindowV.xaml.vb
+++ b/EgtBEAMWALL.Core/BeamMachiningsWindow/BeamMachiningsWindowV.xaml.vb
@@ -3,7 +3,6 @@
    Private WithEvents m_BeamMachiningsWindowVM As MyBeamMachiningsWindowVM
 
    Sub New(Owner As System.Windows.Window, BeamMachiningsWindowVM As MyBeamMachiningsWindowVM)
-      MyBase.New(Owner)
       ' This call is required by the designer.
       InitializeComponent()
       Me.DataContext = BeamMachiningsWindowVM
diff --git a/EgtBEAMWALL.Core/ConfigurationPage/General_ConfigurationPageV.xaml b/EgtBEAMWALL.Core/ConfigurationPage/General_ConfigurationPageV.xaml
index 2966e522..0d974ae6 100644
--- a/EgtBEAMWALL.Core/ConfigurationPage/General_ConfigurationPageV.xaml
+++ b/EgtBEAMWALL.Core/ConfigurationPage/General_ConfigurationPageV.xaml
@@ -12,37 +12,38 @@
       <RowDefinition Height="1*"/>
       <RowDefinition Height="1*"/>
    </Grid.RowDefinitions>
-   <StackPanel Margin="5,5,5,0">
+   <StackPanel Style="{StaticResource List_StackPanel}">
       <GroupBox Header="{Binding CurrentLanguage_Msg}"
-                Margin="0,0,0,5"
-                Foreground="{StaticResource BeamWall_Corduroy}">
-         <UniformGrid Rows="2" Margin="3,3,3,3">
-            <ComboBox ItemsSource="{Binding LanguageList, Mode=OneWay}" Height="25"
-                      DisplayMemberPath="Name" SelectedItem="{Binding SelectedLanguage}"
-                      Margin="0,0,0,5" Style="{StaticResource OnlyProd_ComboBox}" />
-            <TextBlock Text="{Binding LanguageAdvert_Msg}" TextWrapping="Wrap"
-                       TextAlignment="Center"/>
+                Style="{StaticResource Warehouse_GroupBox}">
+         <UniformGrid Rows="2"
+                      Style="{StaticResource General_UniformGrid}">
+            <ComboBox ItemsSource="{Binding LanguageList, Mode=OneWay}" 
+                      SelectedItem="{Binding SelectedLanguage}"
+                      DisplayMemberPath="Name" 
+                      Style="{StaticResource General_ComboBox}"/>
+            <TextBlock Text="{Binding LanguageAdvert_Msg}" 
+                       Style="{StaticResource General_TextBlock}"/>
          </UniformGrid>
       </GroupBox>
       <UniformGrid Columns="2"
-                   Margin="0,0,0,5">
-         <TextBlock Text="{Binding MMUnits_Msg}" VerticalAlignment="Center" Foreground="{StaticResource BeamWall_Corduroy}"/>
+                   Style="{StaticResource AddRawPartWnd_UniformGrid}">
+         <TextBlock Text="{Binding MMUnits_Msg}" 
+                    Style="{StaticResource MMUnits_TextBlock}"/>
          <ComboBox ItemsSource="{Binding UnitMeasureList, Mode=OneWay}"
-                   SelectedIndex="{Binding SelMeasureUnit}" Height="25"
-                   Margin="0,5,0,0" Style="{StaticResource OnlyProd_ComboBox}" />
+                   SelectedIndex="{Binding SelMeasureUnit}" 
+                   Style="{StaticResource UnitMeasureList_ComboBox}"/>
       </UniformGrid>
       <GroupBox Header="{Binding Nesting_Msg}"
-                Margin="0,0,0,5"
-                Foreground="{StaticResource BeamWall_Corduroy}">
+                Style="{StaticResource Warehouse_GroupBox}">
          <StackPanel>
             <UniformGrid Columns="2"
-                         Margin="0,0,0,5">
+                         Style="{StaticResource AddRawPartWnd_UniformGrid}">
                <TextBlock Text="{Binding SectionTime_Msg}"/>
                <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                       Text="{Binding SectionTime, UpdateSourceTrigger=Explicit}"/>
             </UniformGrid>
             <UniformGrid Columns="2"
-                         Margin="0,0,0,5">
+                         Style="{StaticResource AddRawPartWnd_UniformGrid}">
                <TextBlock Grid.Row="1" Text="{Binding PartTime_Msg}"/>
                <EgtWPFLib5:EgtTextBox Grid.Row="1" 
                                       Grid.Column="1"
@@ -51,13 +52,14 @@
          </StackPanel>
       </GroupBox>
       <UniformGrid Columns="2"
-                   Margin="0,0,0,5">
-         <TextBlock Text="{Binding PrintLabel_Msg}" VerticalAlignment="Center" Foreground="{StaticResource BeamWall_Corduroy}"/>
+                   Style="{StaticResource AddRawPartWnd_UniformGrid}">
+         <TextBlock Text="{Binding PrintLabel_Msg}"
+                    Style="{StaticResource MMUnits_TextBlock}"/>
          <CheckBox IsChecked="{Binding bPrintLabel_IsChecked}"
-                   Margin="0,5,0,0"/>
+                   Style="{StaticResource General_CheckBox}"/>
       </UniformGrid>
       <GroupBox Header="Backup And Restore"
-                Foreground="{StaticResource BeamWall_Corduroy}">
+                Style="{StaticResource Optimizer_GroupBox}">
          <Grid>
             <Grid.RowDefinitions>
                <RowDefinition Height="Auto"/>
@@ -65,36 +67,33 @@
                <RowDefinition Height="Auto"/>
                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
-            <Grid Margin="0,2,0,5">
+            <Grid Style="{StaticResource General_Grid}">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="Auto"/>
                   <ColumnDefinition Width="1*"/>
                </Grid.ColumnDefinitions>
                <CheckBox x:Name="ExternalBackup_CheckBox"
                          IsChecked="{Binding bExternalBackupActive}"
-                         VerticalAlignment="Center"/>
+                         Style="{StaticResource PParameters_CheckBox}"/>
                <TextBlock Grid.Column="1"
                           Text="External file path:"
-                          VerticalAlignment="Center"/>
+                          Style="{StaticResource Ext_TextBlock}"/>
             </Grid>
             <Grid Grid.Row="1"
-                  Margin="0,2,0,5">
+                  Style="{StaticResource General_Grid}">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="Auto"/>
                </Grid.ColumnDefinitions>
                <TextBox Text="{Binding ExternalBackupFolderPath}"
                         IsEnabled="{Binding IsChecked, ElementName=ExternalBackup_CheckBox}"
-                        Margin="0,0,2.5,0"/>
+                        Style="{StaticResource General_TextBox}"/>
                <Button Grid.Column="1"
                        Content="..."
                        Foreground="{StaticResource BeamWall_White}"
-                       Width="20"
-                       Height="20"
                        Command="{Binding ChooseExternalBackupFolderPath_Command}"
                        IsEnabled="{Binding IsChecked, ElementName=ExternalBackup_CheckBox}"
-                       Margin="2.5,0,0,0"
-                       Style="{StaticResource EgtWPFLib5_Button}"/>
+                       Style="{StaticResource General_Button}"/>
             </Grid>
             <Grid Grid.Row="2">
                <Grid.ColumnDefinitions>
@@ -105,14 +104,13 @@
                <ComboBox Grid.Column="1"
                          ItemsSource="{Binding ReminderList}"
                          SelectedItem="{Binding SelReminder}"
-                         Margin="0,0,0,5" Style="{StaticResource OnlyProd_ComboBox}" />
+                         Style="{StaticResource GeneralConfiguration_ComboBox}" />
             </Grid>
             <StackPanel Grid.Row="3"
-                        Orientation="Horizontal">
+                        Style="{StaticResource PartManager_StackPanel}">
                <Button Content="Backup"
                        Command="{Binding Backup_Command}"
-                       Style="{StaticResource EgtWPFLib5_Button}"
-                       Margin="0,0,5,0"/>
+                       Style="{StaticResource MovePartInRawPartWnd_Button}"/>
                <Button Content="Restore"
                        Command="{Binding Restore_Command}"
                        Style="{StaticResource EgtWPFLib5_Button}"/>
@@ -120,10 +118,11 @@
          </Grid>
       </GroupBox>
       <UniformGrid Columns="2"
-                   Margin="0,5,0,0">
-         <TextBlock Text="Importa BTL con verifica" VerticalAlignment="Center" Foreground="{StaticResource BeamWall_Corduroy}"/>
+                   Style="{StaticResource GeneralConfiguration_UniformGrid}">
+         <TextBlock Text="Importa BTL con verifica" 
+                    Style="{StaticResource MMUnits_TextBlock}"/>
          <CheckBox IsChecked="{Binding bVerifyImportBTL_IsChecked}"
-                   Margin="0,5,0,0"/>
+                   Style="{StaticResource General_CheckBox}"/>
       </UniformGrid>
    </StackPanel>
 
diff --git a/EgtBEAMWALL.Core/ConfigurationPage/Machine_ConfigurationPageV.xaml b/EgtBEAMWALL.Core/ConfigurationPage/Machine_ConfigurationPageV.xaml
index 877e5a97..ec293fbb 100644
--- a/EgtBEAMWALL.Core/ConfigurationPage/Machine_ConfigurationPageV.xaml
+++ b/EgtBEAMWALL.Core/ConfigurationPage/Machine_ConfigurationPageV.xaml
@@ -14,30 +14,36 @@
    </Grid.RowDefinitions>
 
    <StackPanel Orientation="Horizontal">
-      <GroupBox Style="{StaticResource NoHeader_GroupBox}" Padding="5,10,5,5">
+      <GroupBox Style="{StaticResource MachineConfiguration_GroupBox}">
          <EgtBEAMWALLCORE:MachinePanelV DataContext="{Binding MachinePanelVM}" VerticalAlignment="Center"/>
       </GroupBox>
    </StackPanel>
 
-   <StackPanel Grid.Row="1" Orientation="Horizontal" Visibility="{Binding MachineParameter_Visibility}">
+   <StackPanel Grid.Row="1"
+               Visibility="{Binding MachineParameter_Visibility}"
+               Style="{StaticResource PartManager_StackPanel}">
       <ItemsControl ItemsSource="{Binding ConfigMachTableList}">
          <ItemsControl.ItemsPanel>
             <ItemsPanelTemplate>
-               <StackPanel x:Name="GroupStackPanel" Orientation="Horizontal"/>
+               <StackPanel x:Name="GroupStackPanel"
+                           Style="{StaticResource PartManager_StackPanel}"/>
             </ItemsPanelTemplate>
          </ItemsControl.ItemsPanel>
          <ItemsControl.ItemTemplate>
             <DataTemplate>
-               <GroupBox Header="{Binding sName}" Width="Auto" VerticalAlignment="Top" Height="Auto" Foreground="{StaticResource BeamWall_Corduroy}">
-                  <ItemsControl Name="MachParamsItemsControl" ItemsSource="{Binding MachParamList}" Margin="0,5,0,0">
+               <GroupBox Header="{Binding sName}" 
+                         Style="{StaticResource MachineParam_GroupBox}">
+                  <ItemsControl Name="MachParamsItemsControl" 
+                                ItemsSource="{Binding MachParamList}" 
+                                Style="{StaticResource MachinePanel_ItemsControl}">
                      <ItemsControl.ItemsPanel>
                         <ItemsPanelTemplate>
-                           <WrapPanel Orientation="Vertical"/>
+                           <WrapPanel Style="{StaticResource Project_WrapPanel}"/>
                         </ItemsPanelTemplate>
                      </ItemsControl.ItemsPanel>
                      <ItemsControl.ItemTemplate>
                         <DataTemplate>
-                           <Grid Margin="0,0,5,5">
+                           <Grid Style="{StaticResource MachParam_Grid}">
                               <Grid.ColumnDefinitions>
                                  <ColumnDefinition Width="*" />
                                  <ColumnDefinition Width="*" />
@@ -45,18 +51,14 @@
                               </Grid.ColumnDefinitions>
                               <TextBlock Text="{Binding sName}"
                                          ToolTip="{Binding sName}"
-                                         TextWrapping="WrapWithOverflow"
-                                         Width="150"
-                                         Style="{StaticResource MachParam_TextBlock}"/>
+                                         Style="{StaticResource MachinePanel_TextBlock}"/>
                               <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                                      Text="{Binding sValue, UpdateSourceTrigger=Explicit}"
-                                                     Width="60"/>
+                                                     Style="{StaticResource MachineConfiguration_TextBox}"/>
                               <TextBlock Grid.Column="2"
                                          Text="{Binding sDescription}"
                                          ToolTip="{Binding sDescription}"
-                                         TextWrapping="WrapWithOverflow"
-                                         Width="148"
-                                         Style="{StaticResource MachParam_TextBlock}"/>
+                                         Style="{StaticResource Description_TextBlock}"/>
                            </Grid>
                         </DataTemplate>
                      </ItemsControl.ItemTemplate>
@@ -72,7 +74,8 @@
            ToolTip="{Binding SaveToolTip}"
            Visibility="{Binding Machine_Visibility}"
            Style="{StaticResource SaveMachinePanel_Button}">
-      <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
+      <Image Source="/Resources/ProjectManager/Save.png"
+             Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
 
 </Grid>
diff --git a/EgtBEAMWALL.Core/EgtColorPicker/EgtColorPickerV.xaml b/EgtBEAMWALL.Core/EgtColorPicker/EgtColorPickerV.xaml
index 1f9d9795..c3cf971e 100644
--- a/EgtBEAMWALL.Core/EgtColorPicker/EgtColorPickerV.xaml
+++ b/EgtBEAMWALL.Core/EgtColorPicker/EgtColorPickerV.xaml
@@ -1,268 +1,218 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="EgtColorPickerV"
-                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            Title="{Binding sTitle}"
-                            WindowStartupLocation="CenterOwner"
-                            SizeToContent="WidthAndHeight"
-                            WindowStyle="None" ResizeMode="NoResize"
-                            IsMinimizable="False" ShowInTaskbar="False"
-                            Width="750" Height="450"
-                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
-   
-   <Grid Margin="5,5,5,0">
-   <Grid.RowDefinitions>
-      <RowDefinition Height="1*"/>
-      <RowDefinition Height="Auto"/>
-   </Grid.RowDefinitions>
-   <Grid Margin="5,5,5,0">
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="1*"/>
-         <ColumnDefinition Width="1*"/>
-      </Grid.ColumnDefinitions>
-      <Grid Margin="5,5,5,0">
-         <Grid.RowDefinitions>
-            <RowDefinition Height="1*"/>
-         </Grid.RowDefinitions>
-         <TabControl>
-            <TabItem Header="{Binding BasicColor_Msg}">
-               <Grid HorizontalAlignment="Center"
-                        VerticalAlignment="Center">
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="Auto"/>
-                     <RowDefinition Height="1*"/>
-                  </Grid.RowDefinitions>
-                  <ListBox ItemsSource="{Binding BasicColors}"
-                              SelectedItem="{Binding SelColor}"
-                              HorizontalAlignment="Center"
-                              BorderThickness="0">
-                     <ListBox.ItemsPanel>
-                        <ItemsPanelTemplate>
-                           <UniformGrid Columns="13"/>
-                        </ItemsPanelTemplate>
-                     </ListBox.ItemsPanel>
-                     <ListBox.ItemTemplate>
-                        <DataTemplate>
-                           <Rectangle Width="20"
-                                      Height="20"
-                                      Margin="2"
-                                      Stroke="Black" 
-                                      StrokeThickness="0.5"
-                                      Fill="{Binding Fill}"/>
-                        </DataTemplate>
-                     </ListBox.ItemTemplate>
-                     <ListBox.ItemContainerStyle>
-                        <Style TargetType="ListBoxItem">
-                           <Setter Property="Margin" Value="0"/>
-                           <Setter Property="Padding" Value="0"/>
-                        </Style>
-                     </ListBox.ItemContainerStyle>
-                  </ListBox>
-               </Grid>
-            </TabItem>
-            <TabItem Header="{Binding ColorPicker_Msg}">
-               <TabItem.Resources>
-                  <Style TargetType="{x:Type EgtWPFLib5:EgtHexItem}" BasedOn="{StaticResource EgtHexItem}">
-                     <Setter Property="BorderThickness" Value="1.5"/>
-                     <Setter Property="BorderBrush" Value="White"/>
-                  </Style>
-               </TabItem.Resources>
-               <EgtWPFLib5:EgtHexList ItemsSource="{Binding HexList}"
-                                         SelectedItem="{Binding sHexSelColor}"
-                                         Orientation="Vertical" 
-                                         Margin="2.5"
-                                         RowCount="13" 
-                                         ColumnCount="13"
-                                         Height="300"
-                                         Width="350"
-                                         Style="{StaticResource EgtHexList}">
-                  <EgtWPFLib5:EgtHexList.ItemTemplate>
-                     <DataTemplate/>
-                  </EgtWPFLib5:EgtHexList.ItemTemplate>
-                  <EgtWPFLib5:EgtHexList.ItemContainerStyle>
-                     <Style TargetType="EgtWPFLib5:EgtHexItem" BasedOn="{StaticResource EgtHexItem}">
-                        <Setter Property="Grid.Row" Value="{Binding nRow}"/>
-                        <Setter Property="Grid.Column" Value="{Binding nColumn}"/>
-                        <Setter Property="Background" Value="{Binding Background}"/>
-                     </Style>
-                  </EgtWPFLib5:EgtHexList.ItemContainerStyle>
-               </EgtWPFLib5:EgtHexList>
-            </TabItem>
-            <TabItem Header="{Binding ColorPickerTheme_Msg}">
-               <Grid HorizontalAlignment="Center"
-                        VerticalAlignment="Center">
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="Auto"/>
-                     <RowDefinition Height="1*"/>
-                  </Grid.RowDefinitions>
-                  <ListBox ItemsSource="{Binding BasicColorsTheme}"
-                              SelectedItem="{Binding SelColorTheme}"
-                              BorderThickness="0">
-                     <ListBox.ItemsPanel>
-                        <ItemsPanelTemplate>
-                           <UniformGrid Columns="13"/>
-                        </ItemsPanelTemplate>
-                     </ListBox.ItemsPanel>
-                     <ListBox.ItemTemplate>
-                        <DataTemplate>
-                           <Rectangle Width="20"
-                                         Height="20"
-                                         Margin="2"
-                                         Stroke="Black" 
-                                         StrokeThickness="0.5"
-                                         Fill="{Binding Fill}"/>
-                        </DataTemplate>
-                     </ListBox.ItemTemplate>
-                     <ListBox.ItemContainerStyle>
-                        <Style TargetType="ListBoxItem">
-                           <Setter Property="Margin" Value="0"/>
-                           <Setter Property="Padding" Value="0"/>
-                        </Style>
-                     </ListBox.ItemContainerStyle>
-                  </ListBox>
-               </Grid>
-            </TabItem>
-         </TabControl>
-      </Grid>
-      <Grid Grid.Column="1"
-               Margin="5,0,0,0">
-         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-         </Grid.RowDefinitions>
-         <TextBlock Text="{Binding CustomColor_Msg}"
-                       Margin="5,18,5,10"
-                       Style="{StaticResource DialogWindow_TextBlock}"/>
-         <Grid Grid.Row="1">
+<EgtBEAMWALLCORE:OptimizerWindow x:Class="EgtColorPickerV"
+                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
+                                 Title="{Binding sTitle}"
+                                 WindowStartupLocation="CenterOwner"
+                                 SizeToContent="WidthAndHeight"
+                                 ShowInTaskbar="False"
+                                 Width="750" Height="450"
+                                 Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
+
+   <Grid Style="{StaticResource AddRawPartWnd_Grid}">
+      <Grid.RowDefinitions>
+         <RowDefinition Height="1*"/>
+         <RowDefinition Height="Auto"/>
+      </Grid.RowDefinitions>
+      <Grid Style="{StaticResource AddRawPartWnd_Grid}">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+         </Grid.ColumnDefinitions>
+         <Grid Style="{StaticResource AddRawPartWnd_Grid}">
             <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
-            <ListBox ItemsSource="{Binding CustomColors}"
-                        SelectedItem="{Binding SelCustomColor}"
-                        HorizontalAlignment="Center"
-                        Background="Transparent"
-                        BorderThickness="0">
-               <ListBox.ItemsPanel>
-                  <ItemsPanelTemplate>
-                     <UniformGrid Columns="13"/>
-                  </ItemsPanelTemplate>
-               </ListBox.ItemsPanel>
-               <ListBox.ItemTemplate>
-                  <DataTemplate>
-                     <Rectangle Width="20"
-                                   Height="20"
-                                   Margin="2"
-                                   Stroke="Black" 
-                                   StrokeThickness="0.5"
-                                   Fill="{Binding Fill}"/>
-                  </DataTemplate>
-               </ListBox.ItemTemplate>
-               <ListBox.ItemContainerStyle>
-                  <Style TargetType="ListBoxItem">
-                     <Setter Property="Margin" Value="0"/>
-                     <Setter Property="Padding" Value="0"/>
-                  </Style>
-               </ListBox.ItemContainerStyle>
-            </ListBox>
+            <TabControl>
+               <TabItem Header="{Binding BasicColor_Msg}">
+                  <Grid Style="{StaticResource EgtColorPicker_Grid}">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="1*"/>
+                     </Grid.RowDefinitions>
+                     <ListBox ItemsSource="{Binding BasicColors}"
+                              SelectedItem="{Binding SelColor}"
+                              Style="{StaticResource EgtColorPicker_ListBox}">
+                        <ListBox.ItemsPanel>
+                           <ItemsPanelTemplate>
+                              <UniformGrid Columns="13"/>
+                           </ItemsPanelTemplate>
+                        </ListBox.ItemsPanel>
+                        <ListBox.ItemTemplate>
+                           <DataTemplate>
+                              <Rectangle Fill="{Binding Fill}"
+                                         Style="{StaticResource EgtColorPicker_Rectangle}"/>
+                           </DataTemplate>
+                        </ListBox.ItemTemplate>
+                        <ListBox.ItemContainerStyle>
+                           <Style TargetType="ListBoxItem">
+                              <Setter Property="Margin" Value="0"/>
+                              <Setter Property="Padding" Value="0"/>
+                           </Style>
+                        </ListBox.ItemContainerStyle>
+                     </ListBox>
+                  </Grid>
+               </TabItem>
+               <TabItem Header="{Binding ColorPicker_Msg}">
+                  <TabItem.Resources>
+                     <Style TargetType="{x:Type EgtWPFLib5:EgtHexItem}" BasedOn="{StaticResource EgtHexItem}">
+                        <Setter Property="BorderThickness" Value="1.5"/>
+                        <Setter Property="BorderBrush" Value="{StaticResource BeamWall_White}"/>
+                     </Style>
+                  </TabItem.Resources>
+                  <EgtWPFLib5:EgtHexList ItemsSource="{Binding HexList}"
+                                         SelectedItem="{Binding sHexSelColor}"
+                                         Style="{StaticResource EgtHexList}">
+                     <EgtWPFLib5:EgtHexList.ItemTemplate>
+                        <DataTemplate/>
+                     </EgtWPFLib5:EgtHexList.ItemTemplate>
+                     <EgtWPFLib5:EgtHexList.ItemContainerStyle>
+                        <Style TargetType="{x:Type EgtWPFLib5:EgtHexItem}" BasedOn="{StaticResource EgtHexItem}">
+                           <Setter Property="Grid.Row" Value="{Binding nRow}"/>
+                           <Setter Property="Grid.Column" Value="{Binding nColumn}"/>
+                           <Setter Property="Background" Value="{Binding Background}"/>
+                        </Style>
+                     </EgtWPFLib5:EgtHexList.ItemContainerStyle>
+                  </EgtWPFLib5:EgtHexList>
+               </TabItem>
+               <TabItem Header="{Binding ColorPickerTheme_Msg}">
+                  <Grid Style="{StaticResource EgtColorPicker_Grid}">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="1*"/>
+                     </Grid.RowDefinitions>
+                     <ListBox ItemsSource="{Binding BasicColorsTheme}"
+                              SelectedItem="{Binding SelColorTheme}"
+                              Style="{StaticResource BasicColor_ListBox}">
+                        <ListBox.ItemsPanel>
+                           <ItemsPanelTemplate>
+                              <UniformGrid Columns="13"/>
+                           </ItemsPanelTemplate>
+                        </ListBox.ItemsPanel>
+                        <ListBox.ItemTemplate>
+                           <DataTemplate>
+                              <Rectangle Fill="{Binding Fill}"
+                                         Style="{StaticResource EgtColorPicker_Rectangle}"/>
+                           </DataTemplate>
+                        </ListBox.ItemTemplate>
+                        <ListBox.ItemContainerStyle>
+                           <Style TargetType="ListBoxItem">
+                              <Setter Property="Margin" Value="0"/>
+                              <Setter Property="Padding" Value="0"/>
+                           </Style>
+                        </ListBox.ItemContainerStyle>
+                     </ListBox>
+                  </Grid>
+               </TabItem>
+            </TabControl>
          </Grid>
-         <Grid Grid.Row="2"
-                  Margin="0,20,0,0">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid Margin="0,10,5,0"
-                     HorizontalAlignment="Left">
+         <Grid Grid.Column="1"
+               Style="{StaticResource CustomerColor_Grid}">
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto"/>
+               <RowDefinition Height="Auto"/>
+               <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+            <TextBlock Text="{Binding CustomColor_Msg}"
+                       Style="{StaticResource EgtColorPicker_TextBlock}"/>
+            <Grid Grid.Row="1">
                <Grid.RowDefinitions>
-                  <RowDefinition Height="1*" />
-                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto"/>
+                  <RowDefinition Height="1*"/>
                </Grid.RowDefinitions>
-               <Rectangle Width="100" 
-                             Height="70" 
-                             Stroke="Black" 
-                             StrokeThickness="0.5"
-                             Fill="{Binding CurrColor}"/>
-               <Button x:Name="SaveColor"
-                          Grid.Row="1"
-                          Margin="0,10,0,0"
-                          Content="{Binding AddCColor_Msg}"
-                          Command="{Binding SaveColor_Command}"  
-                          Style="{StaticResource LeftPanel_TextButton}"/>
+               <ListBox ItemsSource="{Binding CustomColors}"
+                        SelectedItem="{Binding SelCustomColor}"
+                        Style="{StaticResource CustomerColor_ListBox}">
+                  <ListBox.ItemsPanel>
+                     <ItemsPanelTemplate>
+                        <UniformGrid Columns="13"/>
+                     </ItemsPanelTemplate>
+                  </ListBox.ItemsPanel>
+                  <ListBox.ItemTemplate>
+                     <DataTemplate>
+                        <Rectangle Fill="{Binding Fill}"
+                                   Style="{StaticResource EgtColorPicker_Rectangle}"/>
+                     </DataTemplate>
+                  </ListBox.ItemTemplate>
+                  <ListBox.ItemContainerStyle>
+                     <Style TargetType="ListBoxItem">
+                        <Setter Property="Margin" Value="0"/>
+                        <Setter Property="Padding" Value="0"/>
+                     </Style>
+                  </ListBox.ItemContainerStyle>
+               </ListBox>
             </Grid>
-            <Grid Grid.Column="1">
+            <Grid Grid.Row="2"
+                  Style="{StaticResource CurrColor_Grid}">
                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="1*"/>
+                  <ColumnDefinition Width="Auto"/>
                   <ColumnDefinition Width="1*"/>
                </Grid.ColumnDefinitions>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="1*"/>
-                  <RowDefinition Height="1*"/>
-                  <RowDefinition Height="1*"/>
-                  <RowDefinition Height="1*"/>
-               </Grid.RowDefinitions>
-               <TextBlock Text="{Binding Red_Msg}"
-                             Margin="0,10,5,0"
-                             HorizontalAlignment="Right"
-                             Style="{StaticResource DialogWindow_TextBlock}"/>
-               <TextBox Grid.Column="1" 
-                           HorizontalAlignment="Right"
-                           Margin="0,5,5,0"
-                           IsReadOnly="False"
+               <Grid Style="{StaticResource AddColor_Grid}">
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="1*"/>
+                     <RowDefinition Height="Auto"/>
+                  </Grid.RowDefinitions>
+                  <Rectangle Fill="{Binding CurrColor}"
+                             Style="{StaticResource CurrColor_Rectangle}"/>
+                  <Button Grid.Row="1"
+                          x:Name="SaveColor"                          
+                          Content="{Binding AddCColor_Msg}"
+                          Command="{Binding SaveColor_Command}"  
+                          Style="{StaticResource EgtColorPicker_TextButton}"/>
+               </Grid>
+               <Grid Grid.Column="1">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="1*"/>
+                     <ColumnDefinition Width="1*"/>
+                  </Grid.ColumnDefinitions>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="1*"/>
+                     <RowDefinition Height="1*"/>
+                     <RowDefinition Height="1*"/>
+                     <RowDefinition Height="1*"/>
+                  </Grid.RowDefinitions>
+                  <TextBlock Text="{Binding Red_Msg}"
+                             Style="{StaticResource RedColor_TextBlock}"/>
+                  <TextBox Grid.Column="1" 
                            Text="{Binding Red, UpdateSourceTrigger=PropertyChanged}"
-                           Style="{StaticResource ColorPicker_TextBox}"/>
-               <TextBlock Grid.Row="1"
+                           Style="{StaticResource RedColor_TextBox}"/>
+                  <TextBlock Grid.Row="1"
                              Text="{Binding Green_Msg}"
-                             Margin="5,5,5,0"
-                             HorizontalAlignment="Right"
-                             Style="{StaticResource DialogWindow_TextBlock}"/>
-               <TextBox Grid.Column="1"
+                             Style="{StaticResource GreenColor_TextBlock}"/>
+                  <TextBox Grid.Column="1"
                            Grid.Row="1"
-                           HorizontalAlignment="Right"
-                           Margin="5,5,5,0"
-                           IsReadOnly="False"
                            Text="{Binding Green, UpdateSourceTrigger=PropertyChanged}"
-                           Style="{StaticResource ColorPicker_TextBox}"/>
-               <TextBlock Grid.Row="2"
+                           Style="{StaticResource GreenColor_TextBox}"/>
+                  <TextBlock Grid.Row="2"
                              Text="{Binding Blu_Msg}"
-                             Margin="5,5,5,0"
-                             HorizontalAlignment="Right"
-                             Style="{StaticResource DialogWindow_TextBlock}"/>
-               <TextBox Grid.Column="1"
-                           Grid.Row="2"
-                           HorizontalAlignment="Right"
-                           Margin="5,5,5,0"
-                           IsReadOnly="False"
+                             Style="{StaticResource GreenColor_TextBlock}"/>
+                  <TextBox Grid.Row="2"
+                           Grid.Column="1"
                            Text="{Binding Blue, UpdateSourceTrigger=PropertyChanged}"
-                           Style="{StaticResource ColorPicker_TextBox}"/>
-               <TextBlock Grid.Row="3"
+                           Style="{StaticResource GreenColor_TextBox}"/>
+                  <TextBlock Grid.Row="3"
                              Text="{Binding Hexadecimal_Msg}"
-                             Margin="5,5,5,0"
-                             HorizontalAlignment="Right"
-                             Style="{StaticResource DialogWindow_TextBlock}"/>
-               <TextBox Grid.Column="1"
-                           Grid.Row="3"
-                           HorizontalAlignment="Right"
-                           Margin="5,5,5,0"
+                             Style="{StaticResource GreenColor_TextBlock}"/>
+                  <TextBox Grid.Row="3"
+                           Grid.Column="1"                           
                            Text="{Binding Hexadecimal}"
-                           Style="{StaticResource ColorPicker_TextBox}"/>
+                           Style="{StaticResource GreenColor_TextBox}"/>
+               </Grid>
             </Grid>
          </Grid>
       </Grid>
-   </Grid>
-   <UniformGrid Grid.Row="2"  
+      <UniformGrid Grid.Row="2"  
                    Rows="1"
-                   Margin="10,10,10,0">
-      <Button IsDefault="True"
+                   Style="{StaticResource EgtColorPicker_UniformGrid}">
+         <Button IsDefault="True"
                  Content="OK"
                  Command="{Binding Ok_Command}"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource RightPanel_HalfRound_Button}"/>
-      <Button Content="Cancel"
+                 Style="{StaticResource EgtColorPicker_HalfRound_Button}"/>
+         <Button Content="Cancel"
                  Command="{Binding Cancel_Command}"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource RightPanel_HalfRound_Button}"/>
-   </UniformGrid>
+                 Style="{StaticResource EgtColorPicker_HalfRound_Button}"/>
+      </UniformGrid>
    </Grid>
-</EgtWPFLib5:EgtCustomWindow>
+</EgtBEAMWALLCORE:OptimizerWindow>
diff --git a/EgtBEAMWALL.Core/EgtColorPicker/EgtColorPickerV.xaml.vb b/EgtBEAMWALL.Core/EgtColorPicker/EgtColorPickerV.xaml.vb
index 3137d429..3332f430 100644
--- a/EgtBEAMWALL.Core/EgtColorPicker/EgtColorPickerV.xaml.vb
+++ b/EgtBEAMWALL.Core/EgtColorPicker/EgtColorPickerV.xaml.vb
@@ -35,7 +35,6 @@ Public Class EgtColorPickerV
 #Region "CONTRUCTORS"
 
    Sub New(Owner As Window, EtgColorPickerVM As EgtColorPickerVM)
-      MyBase.New(Owner)
       InitializeComponent()
       Me.DataContext = EtgColorPickerVM
       ' Assegno al riferimento locale al VM il VM preso dal DataContext
diff --git a/EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml b/EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml
index 446f5290..b5d0693e 100644
--- a/EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml
+++ b/EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml
@@ -1,22 +1,22 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="EgtManageFileDialogV"
-                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            Title="{Binding sTitle}"
-                            WindowStartupLocation="CenterOwner"
-                            WindowStyle="None" ResizeMode="NoResize" 
-                            IsMinimizable="False" ShowInTaskbar="False"
-                            Height="500" Width="800"
-                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
-   
-   <Grid Margin="5,5,5,0">
+<EgtBEAMWALLCORE:OptimizerWindow x:Class="EgtManageFileDialogV"
+                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
+                                 Title="{Binding sTitle}"
+                                 WindowStartupLocation="CenterOwner"
+                                 ShowInTaskbar="False"
+                                 Height="500" Width="800"
+                                 Style="{StaticResource OptimizerWindow.Dialog}">
+
+   <Grid Style="{StaticResource AddRawPartWnd_Grid}">
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="1*"/>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
-      <Grid Margin="5,5,5,0">
+      <Grid Style="{StaticResource AddRawPartWnd_Grid}">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="1*"/>
@@ -28,44 +28,35 @@
                    Style="{StaticResource Button_Image}"/>
          </Button>
          <TextBlock Grid.Column="1"
-                    Margin="5"
                     Text="{Binding sSelPath}"
-                    HorizontalAlignment="Left"
-                    Style="{StaticResource DialogWindow_TextBlock}"/>
+                    Style="{StaticResource EgtManageDialog_TextBlock}"/>
          <ComboBox Grid.Column="2"
-                   HorizontalAlignment="Right"
-                   IsSynchronizedWithCurrentItem="True"
                    ItemsSource="{Binding ViewModeList}"
                    SelectedItem="{Binding SelViewMode}"
-                   Margin="2.5,5,2.5,5"
-                   Style="{StaticResource RightPanel_ComboBox}"/>
+                   Style="{StaticResource EgtManageDialog_ComboBox}"/>
       </Grid>
       <Grid Grid.Row="1"
-            Margin="5,5,5,0">
+            Style="{StaticResource AddRawPartWnd_Grid}">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="4*"/>
          </Grid.ColumnDefinitions>
          <TreeView x:Name="FileTree" 
                    ItemsSource="{Binding RootList}"                   
-                   Margin="10"
-                   FontSize="15"
-                   BorderBrush="White">
+                   Style="{StaticResource EgtManageDialog_TreeView}">
             <TreeView.Resources>
                <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:EgtFolder}" 
                                          ItemsSource="{Binding TreeItemList_View}">
-                  <StackPanel Orientation="Horizontal">
+                  <StackPanel Style="{StaticResource PartManager_StackPanel}">
                      <Image Source="{Binding sIconSource}"
-                            Height="15"
                             Style="{StaticResource Button_Image}"/>
                      <TextBlock Text="{Binding sName}"
                                 Style="{StaticResource DialogWindow_TextBlock}"/>
                   </StackPanel>
                </HierarchicalDataTemplate>
                <DataTemplate DataType="{x:Type EgtWPFLib5:EgtItem}">
-                  <StackPanel Orientation="Horizontal">
+                  <StackPanel Style="{StaticResource PartManager_StackPanel}">
                      <Image Source="{Binding sIconSource}"
-                            Height="15"
                             Style="{StaticResource Button_Image}"/>
                      <TextBlock Text="{Binding sName}"
                                 Style="{StaticResource DialogWindow_TextBlock}"/>
@@ -80,34 +71,27 @@
             </TreeView.ItemContainerStyle>
          </TreeView>
          <TabControl Grid.Column="1"
-                     Background="Transparent"
-                     BorderBrush="White"
-                     BorderThickness="0"
-                     SelectedIndex="{Binding nSelTab}">
+                     SelectedIndex="{Binding nSelTab}"
+                     Style="{StaticResource EgtManageDialog_TabControl}">
             <TabControl.ItemContainerStyle>
                <Style TargetType="{x:Type TabItem}">
                   <Setter Property="Visibility" Value="Collapsed"/>
                </Style>
             </TabControl.ItemContainerStyle>
             <TabItem Header="LISTBOX">
-               <ListBox x:Name="FileList" 
-                        Grid.Row="1"
-                        Margin="5,5,5,5"
-                        BorderBrush="White"
-                        IsSynchronizedWithCurrentItem="True"
+               <ListBox Grid.Row="1"
+                        x:Name="FileList"                         
                         ItemsSource="{Binding SelTreeItem.FolderList, Mode=TwoWay}"
                         SelectedItem="{Binding ItemSelected, Mode=TwoWay}">
                   <ListBox.Resources>
                      <DataTemplate x:Key="ListTemplateView" 
                                    DataType="{x:Type EgtWPFLib5:EgtDirectory}">
-                        <Grid Margin="5,5,5,0"
-                              Height="20">
+                        <Grid Style="{StaticResource EgtManageDialog_Grid}">
                            <Grid.ColumnDefinitions>
                               <ColumnDefinition Width="Auto"/>
                               <ColumnDefinition Width="Auto"/>
                            </Grid.ColumnDefinitions>
                            <Image Source="{Binding sIconSource}"
-                                  Height="15"
                                   Style="{StaticResource Button_Image}"/>
                            <TextBlock Grid.Column="1"
                                       Text="{Binding sName}"
@@ -116,9 +100,7 @@
                      </DataTemplate>
                      <DataTemplate x:Key="TilesTemplateView"
                                    DataType="{x:Type EgtWPFLib5:EgtDirectory}">
-                        <Grid Margin="5,5,5,0"
-                              Height="50"
-                              Width="250">
+                        <Grid Style="{StaticResource EgtDirectory_Grid}">
                            <Grid.ColumnDefinitions>
                               <ColumnDefinition Width="Auto"/>
                               <ColumnDefinition Width="1*"/>
@@ -127,26 +109,19 @@
                                   Style="{StaticResource Button_Image}"/>
                            <UniformGrid Grid.Column="1"
                                         Rows="3"
-                                        Margin="2.5,0,2.5,5">
-                              <TextBlock TextAlignment="Left"
-                                         Text="{Binding sName}"
-                                         HorizontalAlignment="Left"
-                                         Style="{StaticResource DialogWindow_TextBlock}"/>
-                              <TextBlock TextAlignment="Left"
-                                         Text="{Binding ghTypeItem}"
-                                         HorizontalAlignment="Left"
-                                         Style="{StaticResource DialogWindow_TextBlock}"/>
-                              <TextBlock TextAlignment="Left"
-                                         Text="{Binding sDimension}"
-                                         HorizontalAlignment="Left"
-                                         Style="{StaticResource DialogWindow_TextBlock}"/>
+                                        Style="{StaticResource EgtManageDialog_UniformGrid}">
+                              <TextBlock Text="{Binding sName}"
+                                         Style="{StaticResource Info_TextBlock}"/>
+                              <TextBlock Text="{Binding ghTypeItem}"
+                                         Style="{StaticResource Info_TextBlock}"/>
+                              <TextBlock Text="{Binding sDimension}"
+                                         Style="{StaticResource Info_TextBlock}"/>
                            </UniformGrid>
                         </Grid>
                      </DataTemplate>
                      <DataTemplate x:Key="ContentTemplateView"
                                    DataType="{x:Type EgtWPFLib5:EgtDirectory}">
-                        <Grid Margin="5,5,5,0"
-                              Height="50">
+                        <Grid Style="{StaticResource ContentTemplate_Grid}">
                            <Grid.RowDefinitions>
                               <RowDefinition Height="1*"/>
                               <RowDefinition Height="Auto"/>
@@ -161,32 +136,23 @@
                                      Style="{StaticResource Button_Image}"/>
                               <UniformGrid Grid.Column="1"
                                            Rows="2"
-                                           Margin="2.5,0,2.5,5">
-                                 <TextBlock TextAlignment="Left"
-                                            HorizontalAlignment="Left"
-                                            Text="{Binding sName}"
-                                            Style="{StaticResource DialogWindow_TextBlock}"/>
-                                 <TextBlock TextAlignment="Left"
-                                            HorizontalAlignment="Left"
-                                            Text="{Binding ghTypeItem}"
-                                            Style="{StaticResource DialogWindow_TextBlock}"/>
+                                           Style="{StaticResource EgtManageDialog_UniformGrid}">
+                                 <TextBlock Text="{Binding sName}"
+                                            Style="{StaticResource Info_TextBlock}"/>
+                                 <TextBlock Text="{Binding ghTypeItem}"
+                                            Style="{StaticResource Info_TextBlock}"/>
                               </UniformGrid>
                               <UniformGrid Grid.Column="2"
                                            Rows="2"
-                                           Margin="2.5,0,2.5,5">
-                                 <TextBlock TextAlignment="Left"
-                                            HorizontalAlignment="Left"
-                                            Text="{Binding sLastModifyDate}"
-                                            Style="{StaticResource DialogWindow_TextBlock}"/>
-                                 <TextBlock TextAlignment="Left"
-                                            HorizontalAlignment="Left"
-                                            Text="{Binding sDimension}"
-                                            Style="{StaticResource DialogWindow_TextBlock}"/>
+                                           Style="{StaticResource EgtManageDialog_UniformGrid}">
+                                 <TextBlock Text="{Binding sLastModifyDate}"
+                                            Style="{StaticResource Info_TextBlock}"/>
+                                 <TextBlock Text="{Binding sDimension}"
+                                            Style="{StaticResource Info_TextBlock}"/>
                               </UniformGrid>
                            </Grid>
                            <Border Grid.Row="1"
-                                   BorderThickness="1"
-                                   BorderBrush="LightGray"/>
+                                   Style="{StaticResource EgtManageDialog_Border}"/>
                         </Grid>
                      </DataTemplate>
                   </ListBox.Resources>
@@ -196,13 +162,13 @@
                            <ContentControl.Style>
                               <Style TargetType="{x:Type ContentControl}">
                                  <Style.Triggers>
-                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}" Value="0">
+                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}" Value="0">
                                        <Setter Property="ContentTemplate" Value="{StaticResource ListTemplateView}" />
                                     </DataTrigger>
-                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}" Value="1">
+                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}" Value="1">
                                        <Setter Property="ContentTemplate" Value="{StaticResource TilesTemplateView}" />
                                     </DataTrigger>
-                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}" Value="2">
+                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}" Value="2">
                                        <Setter Property="ContentTemplate" Value="{StaticResource ContentTemplateView}" />
                                     </DataTrigger>
                                  </Style.Triggers>
@@ -219,40 +185,42 @@
                   </ListBox.ItemContainerStyle>
                   <ListBox.Style>
                      <Style TargetType="{x:Type ListBox}">
+                        <Setter Property="BorderBrush" Value="{StaticResource BeamWall_White}"/>
+                        <Setter Property="IsSynchronizedWithCurrentItem" Value="True"/>
+                        <Setter Property="Margin" Value="5"/>
                         <Style.Triggers>
-                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"
+                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}"
                                         Value="0">
                               <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
                               <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled"/>
                               <Setter Property="ItemsPanel">
                                  <Setter.Value>
                                     <ItemsPanelTemplate>
-                                       <WrapPanel Orientation="Vertical"/>
+                                       <WrapPanel Style="{StaticResource Project_WrapPanel}"/>
                                     </ItemsPanelTemplate>
                                  </Setter.Value>
                               </Setter>
                            </DataTrigger>
-                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"
+                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}"
                                         Value="1">
                               <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
                               <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
                               <Setter Property="ItemsPanel">
                                  <Setter.Value>
                                     <ItemsPanelTemplate>
-                                       <WrapPanel Orientation="Horizontal"/>
+                                       <WrapPanel Style="{StaticResource ProjectH_WrapPanel}"/>
                                     </ItemsPanelTemplate>
                                  </Setter.Value>
                               </Setter>
                            </DataTrigger>
-                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"
+                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}"
                                         Value="2">
                               <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
                               <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
                               <Setter Property="ItemsPanel">
                                  <Setter.Value>
                                     <ItemsPanelTemplate>
-                                       <StackPanel Orientation="Vertical"
-                                                   HorizontalAlignment="Stretch"/>
+                                       <StackPanel Style="{StaticResource EgtManageDialog_StackPanel}"/>
                                     </ItemsPanelTemplate>
                                  </Setter.Value>
                               </Setter>
@@ -278,11 +246,11 @@
                      <Style TargetType="{x:Type DataGridColumnHeader}">
                         <Setter Property="Background" Value="{StaticResource BeamWall_Teal}"/>
                         <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
+                        <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Gray}"/>
                         <Setter Property="HorizontalContentAlignment" Value="Center"/>
                         <Setter Property="FontWeight" Value="Bold"/>
                         <Setter Property="FontSize" Value="15"/>
                         <Setter Property="Padding" Value="1"/>
-                        <Setter Property="BorderBrush" Value="{StaticResource Omag_DarkGray}"/>
                         <Setter Property="BorderThickness" Value="0,0,1,1"/>
                      </Style>
                   </DataGrid.ColumnHeaderStyle>
@@ -291,7 +259,7 @@
                         <DataGridTemplateColumn.HeaderTemplate>
                            <DataTemplate>
                               <TextBlock Text="{Binding DataContext.Name_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         HorizontalAlignment="Left"/>
+                                         Style="{StaticResource Name_TextBlock}"/>
                            </DataTemplate>
                         </DataGridTemplateColumn.HeaderTemplate>
                         <DataGridTemplateColumn.CellTemplate>
@@ -302,115 +270,80 @@
                                     <ColumnDefinition Width="1*"/>
                                  </Grid.ColumnDefinitions>
                                  <Image Source="{Binding sIconSource}"
-                                        Margin="2.5,0,2.5,0"
-                                        Style="{StaticResource Button_Image}"/>
+                                        Style="{StaticResource Source_Image}"/>
                                  <TextBlock Grid.Column="1"
                                             Text="{Binding sName}"
-                                            VerticalAlignment="Center"
-                                            Margin="2.5,0,0,0"/>
+                                            Style="{StaticResource NameImage_TextBlock}"/>
                               </Grid>
                            </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
                      </DataGridTemplateColumn>
                      <DataGridTextColumn Binding="{Binding sLastModifyDate}"
-                                         Width="2*">
+                                         Width="2*"
+                                         ElementStyle="{StaticResource DataGrid_TextBlock}">
                         <DataGridTextColumn.HeaderTemplate>
                            <DataTemplate>
                               <TextBlock Text="{Binding DataContext.LastModify_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         HorizontalAlignment="Left"/>
+                                         Style="{StaticResource Name_TextBlock}"/>
                            </DataTemplate>
                         </DataGridTextColumn.HeaderTemplate>
-                        <DataGridTextColumn.ElementStyle>
-                           <Style TargetType="TextBlock">
-                              <Setter Property="HorizontalAlignment" Value="Left"/>
-                              <Setter Property="VerticalAlignment" Value="Center"/>
-                              <Setter Property="TextAlignment" Value="Left"/>
-                              <Setter Property="Padding" Value="12,6,12,6"/>
-                           </Style>
-                        </DataGridTextColumn.ElementStyle>
                      </DataGridTextColumn>
                      <DataGridTextColumn Binding="{Binding ghTypeItem}"
-                                         Width="1*">
+                                         Width="1*"
+                                         ElementStyle="{StaticResource DataGrid_TextBlock}">
                         <DataGridTextColumn.HeaderTemplate>
                            <DataTemplate>
                               <TextBlock Text="{Binding DataContext.Type_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         HorizontalAlignment="Left"/>
+                                         Style="{StaticResource Name_TextBlock}"/>
                            </DataTemplate>
                         </DataGridTextColumn.HeaderTemplate>
-                        <DataGridTextColumn.ElementStyle>
-                           <Style TargetType="TextBlock">
-                              <Setter Property="HorizontalAlignment" Value="Left"/>
-                              <Setter Property="VerticalAlignment" Value="Center"/>
-                              <Setter Property="TextAlignment" Value="Left"/>
-                              <Setter Property="Padding" Value="12,6,12,6"/>
-                           </Style>
-                        </DataGridTextColumn.ElementStyle>
                      </DataGridTextColumn>
                      <DataGridTextColumn Binding="{Binding sDimension}"
-                                         Width="1*">
+                                         Width="1*"
+                                         ElementStyle="{StaticResource DataGridR_TextBlock}">
                         <DataGridTextColumn.HeaderTemplate>
                            <DataTemplate>
                               <TextBlock Text="{Binding DataContext.Dimension_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         HorizontalAlignment="Left"/>
+                                         Style="{StaticResource Name_TextBlock}"/>
                            </DataTemplate>
                         </DataGridTextColumn.HeaderTemplate>
-                        <DataGridTextColumn.ElementStyle>
-                           <Style TargetType="TextBlock">
-                              <Setter Property="HorizontalAlignment" Value="Right"/>
-                              <Setter Property="VerticalAlignment" Value="Center"/>
-                              <Setter Property="TextAlignment" Value="Right"/>
-                              <Setter Property="Padding" Value="12,6,12,6"/>
-                           </Style>
-                        </DataGridTextColumn.ElementStyle>
                      </DataGridTextColumn>
                   </DataGrid.Columns>
                   <DataGrid.InputBindings>
-                     <MouseBinding MouseAction="LeftDoubleClick" Command="{Binding DataContext.DoubleClick_Command, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"/>
+                     <MouseBinding MouseAction="LeftDoubleClick" Command="{Binding DataContext.DoubleClick_Command, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}"/>
                   </DataGrid.InputBindings>
                </DataGrid>
             </TabItem>
          </TabControl>
       </Grid>
       <Grid Grid.Row="2" 
-            Margin="5,5,5,0">
+            Style="{StaticResource AddRawPartWnd_Grid}">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
-         <TextBlock Margin="5,5,5,5"
-                    Text="{Binding FileName_Msg}"
-                    HorizontalAlignment="Right"
-                    Style="{StaticResource DialogWindow_TextBlock}"/>
+         <TextBlock Text="{Binding FileName_Msg}"
+                    Style="{StaticResource FileName_TextBlock}"/>
          <TextBox Grid.Column="1"
-                  Margin="2.5,2.5,2.5,5"
-                  TextAlignment="Left"
-                  HorizontalAlignment="Stretch"
                   Text="{Binding sSaveFileName, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-                  Style="{StaticResource ParameterList_TextBox}"/>
+                  Style="{StaticResource SaveFileName_TextBox}"/>
          <ComboBox Grid.Column="2"
-                   IsSynchronizedWithCurrentItem="True"
                    ItemsSource="{Binding FilterList}"
                    SelectedItem="{Binding SelFilter, Mode=OneWayToSource}"
                    DisplayMemberPath="sNameExstension"
-                   HorizontalAlignment="Right"
-                   Margin="10,2.5,2.5,5"
-                   Style="{StaticResource RightPanel_ComboBox}"/>
+                   Style="{StaticResource FilterList_ComboBox}"/>
       </Grid>
       <UniformGrid Grid.Row="3"  
                    Rows="1"
-                   Margin="2.5,0,2.5,0">
+                   Style="{StaticResource Command_UniformGrid}">
          <Button IsDefault="True"
                  Content="OK"
                  Command="{Binding Ok_Command}"
-                 HorizontalAlignment="Right"
-                 Margin="15,0,2.5,0"
-                 Style="{StaticResource RightPanel_HalfRound_Button}"/>
+                 Style="{StaticResource EgtManageDialogOK_HalfRound_Button}"/>
          <Button Content="Cancel"
                  Command="{Binding Cancel_Command}"
-                 HorizontalAlignment="Left"
-                 Margin="2.5,0,0,0"
-                 Style="{StaticResource RightPanel_HalfRound_Button}"/>
+                 Style="{StaticResource EgtManageDialogCancel_HalfRound_Button}"/>
       </UniformGrid>
    </Grid>
-</EgtWPFLib5:EgtCustomWindow>
+</EgtBEAMWALLCORE:OptimizerWindow>
diff --git a/EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml.vb b/EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml.vb
index 748fd983..b48bbfee 100644
--- a/EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml.vb
+++ b/EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml.vb
@@ -108,7 +108,6 @@ Public Class EgtManageFileDialogV
 #Region "CONTRUCTORS"
 
    Sub New(Owner As System.Windows.Window, EgtManageFileDialogVM As EgtManageFileDialogVM)
-      MyBase.New(Owner)
       InitializeComponent()
       Me.DataContext = EgtManageFileDialogVM
       ' Assegno al riferimento locale al VM il VM preso dal DataContext
diff --git a/EgtBEAMWALL.Core/EgtMessageBox/EgtMessageBoxV.xaml b/EgtBEAMWALL.Core/EgtMessageBox/EgtMessageBoxV.xaml
index 22c8a1dc..f5b1226d 100644
--- a/EgtBEAMWALL.Core/EgtMessageBox/EgtMessageBoxV.xaml
+++ b/EgtBEAMWALL.Core/EgtMessageBox/EgtMessageBoxV.xaml
@@ -1,34 +1,32 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="EgtMessageBoxV"
-                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            Title="{Binding sTitle}"
-                            SizeToContent="WidthAndHeight"
-                            WindowStartupLocation="CenterOwner"
-                            WindowStyle="None" ResizeMode="NoResize" 
-                            IsMinimizable="False" ShowInTaskbar="False"
-                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
-   
-   <Grid Margin="2.5,2.5,2.5,0">
+<EgtBEAMWALLCORE:OptimizerWindow x:Class="EgtMessageBoxV"
+                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
+                                 Title="{Binding sTitle}"
+                                 SizeToContent="WidthAndHeight"
+                                 WindowStartupLocation="CenterOwner"
+                                 ShowInTaskbar="False"
+                                 Style="{StaticResource OptimizerWindow.Dialog}">
+
+   <Grid Style="{StaticResource EgtMessageBox_Grid}">
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
-      <Grid Margin="20,20,20,20">
+      <Grid Style="{StaticResource MessageBox_Grid}">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
-         <Image Source="{Binding sIconSource}"
-                Margin="0,0,0,0"/>
+         <Image Source="{Binding sIconSource}"/>
          <TextBlock Grid.Column="1"
                     Text="{Binding sMessage}"
-                    Margin="5,0,5,0"
-                    Style="{StaticResource DialogWindow_TextBlock}"/>
+                    Style="{StaticResource EgtMessageBox_TextBlock}"/>
       </Grid>
       <ItemsControl Grid.Row="1"
                     ItemsSource="{Binding ButtonList}"
-                    HorizontalAlignment="Center">
+                    Style="{StaticResource EgtMessageBox_ItemsControl}">
          <ItemsControl.ItemsPanel>
             <ItemsPanelTemplate>
                <UniformGrid Rows="1"/>
@@ -39,11 +37,9 @@
                <Button IsDefault="{Binding bIsDefault}"
                        Content="{Binding sMessage}"
                        Command="{Binding Command_Command}"
-                       Margin="2.5,0,2.5,0"
-                       Style="{StaticResource RightPanel_HalfRound_Button}"/>
+                       Style="{StaticResource EgtColorPicker_HalfRound_Button}"/>
             </DataTemplate>
          </ItemsControl.ItemTemplate>
-
       </ItemsControl>
    </Grid>
-</EgtWPFLib5:EgtCustomWindow>
+</EgtBEAMWALLCORE:OptimizerWindow>
diff --git a/EgtBEAMWALL.Core/EgtMessageBox/EgtMessageBoxV.xaml.vb b/EgtBEAMWALL.Core/EgtMessageBox/EgtMessageBoxV.xaml.vb
index cecba5e5..0559a30a 100644
--- a/EgtBEAMWALL.Core/EgtMessageBox/EgtMessageBoxV.xaml.vb
+++ b/EgtBEAMWALL.Core/EgtMessageBox/EgtMessageBoxV.xaml.vb
@@ -14,7 +14,6 @@ Public Class EgtMessageBoxV
 #Region "CONTRUCTORS"
 
    Sub New(Owner As Window, EgtMessageBoxVM As EgtMessageBoxVM)
-      MyBase.New(Owner)
       ' This call is required by the designer.
       InitializeComponent()
       Me.DataContext = EgtMessageBoxVM
diff --git a/EgtBEAMWALL.Core/LoadingWnd/LoadingWndHelper.vb b/EgtBEAMWALL.Core/LoadingWnd/LoadingWndHelper.vb
index b3e310db..eb10063b 100644
--- a/EgtBEAMWALL.Core/LoadingWnd/LoadingWndHelper.vb
+++ b/EgtBEAMWALL.Core/LoadingWnd/LoadingWndHelper.vb
@@ -1,4 +1,5 @@
 Imports System.Threading
+Imports System.Threading.Tasks
 Imports System.Windows.Threading
 
 Public Module LoadingWndHelper
diff --git a/EgtBEAMWALL.Core/LoadingWnd/LoadingWndV.xaml b/EgtBEAMWALL.Core/LoadingWnd/LoadingWndV.xaml
index 9b052ba6..48421474 100644
--- a/EgtBEAMWALL.Core/LoadingWnd/LoadingWndV.xaml
+++ b/EgtBEAMWALL.Core/LoadingWnd/LoadingWndV.xaml
@@ -8,7 +8,7 @@
                             ResizeMode="NoResize" WindowStyle="None"
                             IsClosable="False" IsMinimizable="False"
                             WindowStartupLocation="Manual" ShowInTaskbar="False">
-   
+
    <Grid>
       <Grid.RowDefinitions>
          <RowDefinition Height="1*"/>
@@ -23,33 +23,27 @@
       </Grid.RowDefinitions>
       <TextBlock Grid.Row="1"
                  Text="{Binding TotText_Msg}"
-                 TextAlignment="Center"/>
+                 Style="{StaticResource MessageBox_TextBlock}"/>
       <TextBlock Grid.Row="2"
                  Text="{Binding StepText_Msg}"
-                 TextAlignment="Center"
-                 Visibility="{Binding StepText_Visibility}"/>
+                 Visibility="{Binding StepText_Visibility}"
+                 Style="{StaticResource MessageBox_TextBlock}"/>
       <Grid Grid.Row="3"
             Visibility="{Binding StepProgress_Visibility}">
          <Grid.RowDefinitions>
             <RowDefinition Height="1*"/>
             <RowDefinition Height="1*"/>
          </Grid.RowDefinitions>
-         <Grid Height="20"/>
+         <Grid Style="{StaticResource EgtManageDialog_Grid}"/>
          <ProgressBar Grid.Row="1"
-                   Minimum="0"
-                   Maximum="100"
-                   Value="{Binding StepProgress_Value}"
-                   Height="20"
-                   Margin="40,0,40,0"/>
+                      Value="{Binding StepProgress_Value}"
+                      Style="{StaticResource NestingRunningWndV_ProgressBar}"/>
       </Grid>
       <ProgressBar Grid.Row="5"
-                   Minimum="0"
-                   Maximum="100"
                    Value="{Binding TotProgress_Value}"
-                   Height="20"
-                   Margin="40,0,40,0"/>
+                   Style="{StaticResource NestingRunningWndV_ProgressBar}"/>
       <TextBlock Grid.Row="7"
                  Text="{Binding TotProgress_Msg}"
-                 TextAlignment="Center"/>
+                 Style="{StaticResource MessageBox_TextBlock}"/>
    </Grid>
 </EgtWPFLib5:EgtCustomWindow>
diff --git a/EgtBEAMWALL.Core/MachinePanel/MachinePanelV.xaml b/EgtBEAMWALL.Core/MachinePanel/MachinePanelV.xaml
index 4d234e39..a0b92782 100644
--- a/EgtBEAMWALL.Core/MachinePanel/MachinePanelV.xaml
+++ b/EgtBEAMWALL.Core/MachinePanel/MachinePanelV.xaml
@@ -8,22 +8,21 @@
       <ColumnDefinition Width="1*"/>
    </Grid.ColumnDefinitions>
 
-   <Grid Margin="0,0,5,0">
+   <Grid Style="{StaticResource CalcPanel_Grid}">
       <Grid.ColumnDefinitions>
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="1*"/>
       </Grid.ColumnDefinitions>
       <TextBlock Text="Macchina corrente" 
-                 VerticalAlignment="Center"  
-                 Margin="0,0,5,0"
-                 Foreground="{StaticResource BeamWall_Corduroy}"/>
+                 Style="{StaticResource CurrMach_TextBlock}"/>
       <!--Combobox per selezionare la macchina corrente-->
       <ComboBox Grid.Column="1"
                 ItemsSource="{Binding Path=MachineList}" DisplayMemberPath="Name"
                 SelectedItem="{Binding Path=SelectedMachine}" SelectedValuePath="Name"
                 Style="{StaticResource CalcPanel_ComboBox}"/>
    </Grid>
-   <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Center">
+   <StackPanel Grid.Column="1" 
+               Style="{StaticResource MachinePanel_StackPanel}">
       <Button Content="{Binding ToolDBMsg}"
               ToolTip="{Binding ToolDBToolTip}"
               Command="{Binding ToolDbCommand}"
@@ -36,7 +35,7 @@
       <Button Content="{Binding ParameterMachineMsg}"
               ToolTip="{Binding ParameterMachineMsg}"
               Command="{Binding ParameterMachine_Command}"
-              Style="{StaticResource ParameterMachine_Button}" Width="140"/>
+              Style="{StaticResource ParameterMachine_Button}"/>
    </StackPanel>
 
 </Grid>
diff --git a/EgtBEAMWALL.Core/MachiningDbWindow/MachiningDbWindowV.xaml b/EgtBEAMWALL.Core/MachiningDbWindow/MachiningDbWindowV.xaml
index 38338bba..6fa126bf 100644
--- a/EgtBEAMWALL.Core/MachiningDbWindow/MachiningDbWindowV.xaml
+++ b/EgtBEAMWALL.Core/MachiningDbWindow/MachiningDbWindowV.xaml
@@ -1,24 +1,23 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="MachiningDbWindowV"
-                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            Title="{Binding Title}"
-                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
-                            IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
-                            CloseCommand="{Binding CloseMachiningsDbCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
-                            CloseCommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
-                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
+<EgtBEAMWALLCORE:OptimizerWindow x:Class="MachiningDbWindowV"
+                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
+                                 Title="{Binding Title}"
+                                 TitleBarHeight="30"
+                                 WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
+                                 Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
 
-   <EgtWPFLib5:EgtCustomWindow.InputBindings>
+   <EgtBEAMWALLCORE:OptimizerWindow.InputBindings>
       <KeyBinding Key="Escape" Command="{Binding ReloadMachiningCommand}"
                   CommandParameter="{Binding Path=SelectedItem,ElementName=MachiningsTreeView}"/>
-   </EgtWPFLib5:EgtCustomWindow.InputBindings>
+   </EgtBEAMWALLCORE:OptimizerWindow.InputBindings>
 
-   <EgtWPFLib5:EgtCustomWindow.Resources>
+   <EgtBEAMWALLCORE:OptimizerWindow.Resources>
       <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
       <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
-   </EgtWPFLib5:EgtCustomWindow.Resources>
+   </EgtBEAMWALLCORE:OptimizerWindow.Resources>
 
    <Grid>
       <Grid.ColumnDefinitions>
@@ -34,37 +33,28 @@
             <RowDefinition Height="Auto"/>
          </Grid.RowDefinitions>
 
-         <UniformGrid Grid.Row="0" Columns="3">
-            <Button Content="{Binding NewMsg}" Command="{Binding NewCommand}"
+         <UniformGrid Columns="3">
+            <Button Content="{Binding NewMsg}"
+                    Command="{Binding NewCommand}"
                     CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
-                    IsEnabled="{Binding IsEnabledNewBtn, Mode=OneWay}" Height="30"
-                    Style="{StaticResource RightPanel_HalfRound_Button}"/>
-            <Button Content="{Binding SaveMsg}" Command="{Binding SaveCommand}"
+                    IsEnabled="{Binding IsEnabledNewBtn, Mode=OneWay}"
+                    Style="{StaticResource MachiningDB_Button}"/>
+            <Button Content="{Binding SaveMsg}" 
+                    Command="{Binding SaveCommand}"
                     CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
-                    IsEnabled="{Binding IsEnabledSaveBtn, Mode=OneWay}" Height="30"
-                    Style="{StaticResource RightPanel_HalfRound_Button}"/>
-            <Button Content="{Binding RemoveMsg}" Command="{Binding RemoveCommand}"
+                    IsEnabled="{Binding IsEnabledSaveBtn, Mode=OneWay}"
+                    Style="{StaticResource MachiningDB_Button}"/>
+            <Button Content="{Binding RemoveMsg}" 
+                    Command="{Binding RemoveCommand}"
                     CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
-                    IsEnabled="{Binding IsEnabledRemoveBtn, Mode=OneWay}" Height="30"
-                    Style="{StaticResource RightPanel_HalfRound_Button}"/>
+                    IsEnabled="{Binding IsEnabledRemoveBtn, Mode=OneWay}"
+                    Style="{StaticResource MachiningDB_Button}"/>
          </UniformGrid>
 
-         <TreeView Name="MachiningsTreeView" Grid.Row="1"
-                   ItemsSource="{Binding Path=MachiningsList}">
-            <TreeView.Style>
-               <Style TargetType="{x:Type TreeView}">
-                  <Setter Property="Background">
-                     <Setter.Value>
-                        <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
-                           <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
-                           <GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.45"/>
-                           <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
-                        </LinearGradientBrush>
-                     </Setter.Value>
-                  </Setter>
-               </Style>
-            </TreeView.Style>
-
+         <TreeView Grid.Row="1"
+                   Name="MachiningsTreeView"
+                   ItemsSource="{Binding Path=MachiningsList}"
+                   Style="{StaticResource MachiningDB_TreeView}">
             <TreeView.ItemContainerStyle>
                <Style TargetType="{x:Type TreeViewItem}">
                   <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
@@ -72,57 +62,63 @@
                   <Setter Property="IsEnabled" Value="{Binding IsEnabled, Mode=TwoWay}" />
                </Style>
             </TreeView.ItemContainerStyle>
-
             <TreeView.Resources>
-               <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:FamilyMachiningTreeViewItem}" ItemsSource="{Binding Items}">
-
-                  <Grid Height="20">
+               <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:FamilyMachiningTreeViewItem}" 
+                                         ItemsSource="{Binding Items}">
+                  <Grid Style="{StaticResource MachiningDB_Grid}">
                      <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="1*"/>
                         <ColumnDefinition Width="Auto"/>
                      </Grid.ColumnDefinitions>
-
-                     <Image Grid.Column="0" Source="{Binding PictureString}" Height="20" Width="20" Margin="0,0,5,0" />
-                     <TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="0,-2,5,0" VerticalAlignment="Center" />
-                     <Ellipse Grid.Column="2" Height="10" Width="10" Fill="{Binding FamilyColor}" />
-
+                     <Image Source="{Binding PictureString}" 
+                            Style="{StaticResource MachiningDB_Image}"/>
+                     <TextBlock Grid.Column="1" 
+                                Text="{Binding Name}" 
+                                Style="{StaticResource MachiningDB_TextBlock}"/>
+                     <Ellipse Grid.Column="2" 
+                              Fill="{Binding FamilyColor}"
+                              Style="{StaticResource SetUp_Ellipse}"/>
                   </Grid>
-
                </HierarchicalDataTemplate>
-
                <DataTemplate DataType="{x:Type EgtWPFLib5:MachiningTreeViewItem}">
-                  <Grid Height="20">
+                  <Grid Style="{StaticResource MachiningDB_Grid}">
                      <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="1*"/>
                         <ColumnDefinition Width="Auto"/>
                      </Grid.ColumnDefinitions>
-
-                     <!--<Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Margin="0,8,6,4" />-->
-                     <TextBlock Grid.Column="1" Text="{Binding NamePar}" FontSize="15" Margin="0,-2,5,0" VerticalAlignment="Center" />
-                     <Ellipse Grid.Column="2" Height="10" Width="10" Fill="{Binding ToolColor}" />
-
+                     <TextBlock Grid.Column="1" 
+                                Text="{Binding NamePar}" 
+                                Style="{StaticResource MachiningDB_TextBlock}"/>
+                     <Ellipse Grid.Column="2" 
+                              Fill="{Binding ToolColor}"
+                              Style="{StaticResource SetUp_Ellipse}"/>
                   </Grid>
                </DataTemplate>
             </TreeView.Resources>
-
          </TreeView>
 
-         <UniformGrid Grid.Row="2" Columns="3">
-            <Button Content="{Binding ImportMsg}" Command="{Binding ImportCommand}" Height="30"
-                    Style="{StaticResource RightPanel_HalfRound_Button}"/>
-            <Button Content="{Binding ExportMsg}" Command="{Binding ExportCommand}" Height="30"
-                    Style="{StaticResource RightPanel_HalfRound_Button}"/>
-            <Button Content="{Binding ResetMsg}" Command="{Binding ReloadMachiningCommand}" 
-                    CommandParameter="{Binding Path=SelectedItem,ElementName=MachiningsTreeView}" Height="30"
-                    Style="{StaticResource RightPanel_HalfRound_Button}"/>
+         <UniformGrid Grid.Row="2" 
+                      Columns="3">
+            <Button Content="{Binding ImportMsg}" 
+                    Command="{Binding ImportCommand}"
+                    Style="{StaticResource MachiningDB_Button}"/>
+            <Button Content="{Binding ExportMsg}" 
+                    Command="{Binding ExportCommand}"
+                    Style="{StaticResource MachiningDB_Button}"/>
+            <Button Content="{Binding ResetMsg}" 
+                    Command="{Binding ReloadMachiningCommand}" 
+                    CommandParameter="{Binding Path=SelectedItem,ElementName=MachiningsTreeView}"
+                    Style="{StaticResource MachiningDB_Button}"/>
          </UniformGrid>
 
       </Grid>
 
-      <ContentControl Content="{Binding Path=ParamPageV}" Grid.Column="1" Grid.ColumnSpan="2"/>
+      <ContentControl Grid.Column="1" 
+                      Grid.ColumnSpan="2"
+                      Content="{Binding Path=ParamPageV}"/>
 
    </Grid>
 
-</EgtWPFLib5:EgtCustomWindow>
+</EgtBEAMWALLCORE:OptimizerWindow>
diff --git a/EgtBEAMWALL.Core/MachiningDbWindow/MachiningDbWindowV.xaml.vb b/EgtBEAMWALL.Core/MachiningDbWindow/MachiningDbWindowV.xaml.vb
index 01aa69ef..a2bcac13 100644
--- a/EgtBEAMWALL.Core/MachiningDbWindow/MachiningDbWindowV.xaml.vb
+++ b/EgtBEAMWALL.Core/MachiningDbWindow/MachiningDbWindowV.xaml.vb
@@ -6,7 +6,6 @@ Public Class MachiningDbWindowV
    Private WithEvents m_MachiningDbWindowVM As MachiningDbWindowVM
 
    Sub New(Owner As System.Windows.Window, MachiningDbWindowVM As MachiningDbWindowVM)
-      MyBase.New(Owner)
       ' This call is required by the designer.
       InitializeComponent()
       Me.DataContext = MachiningDbWindowVM
diff --git a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb
index 35e1ecb7..7397bab2 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("2.7.11.7")>
-<Assembly: AssemblyFileVersion("2.7.11.8")>
+<Assembly: AssemblyVersion("2.7.11.9")>
+<Assembly: AssemblyFileVersion("2.7.11.9")>
diff --git a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml
index 2760dcad..011b2df0 100644
--- a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml
+++ b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml
@@ -1,19 +1,18 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="NewOpenProjectFileDialogV"
-                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
-                            Title="{Binding Title}"
-                            Style="{StaticResource OnlyProd_EgtCustomWindow}"
-                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="True"
-                            IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
-                            IsClosable="False"
-                            MinHeight="500" MinWidth="500"
-                            DataContext="{Binding RelativeSource={RelativeSource Self}}">
+<EgtBEAMWALLCORE:OptimizerWindow x:Class="NewOpenProjectFileDialogV"
+                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
+                                 Title="{Binding Title}"
+                                 ResizeMode="NoResize" TitleBarHeight="30" IsResizable="True"
+                                  WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
+                                 MinHeight="500" MinWidth="500"
+                                 DataContext="{Binding RelativeSource={RelativeSource Self}}"
+                                 Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
 
-   <EgtWPFLib5:EgtCustomWindow.Resources>
+   <EgtBEAMWALLCORE:OptimizerWindow.Resources>
       <EgtWPFLib5:FileNameConverter x:Key="FileNameConverter"/>
-   </EgtWPFLib5:EgtCustomWindow.Resources>
+   </EgtBEAMWALLCORE:OptimizerWindow.Resources>
 
    <Grid>
       <Grid.RowDefinitions>
@@ -24,7 +23,7 @@
 
       <GroupBox Header="{Binding Filters_Msg}"
                 Visibility="{Binding Filters_Visibility}"
-                Margin="5">
+                Style="{StaticResource NewOpenProjectFile_GroupBox}">
          <Grid>
             <Grid.RowDefinitions>
                <RowDefinition Height="Auto"/>
@@ -40,30 +39,28 @@
                          SelectedIndex="{Binding SelBTLDateType}"
                          Style="{StaticResource BTLDateTypeList_ComboBox}"/>
                <StackPanel Grid.Column="1" 
-                           Orientation="Horizontal">
+                           Style="{StaticResource PartManager_StackPanel}">
                   <ComboBox ItemsSource="{Binding DayTypeList}"
                             SelectedIndex="{Binding SelDayType}"
                             Style="{StaticResource DayTypeList_ComboBox}"/>
-                  <StackPanel Orientation="Horizontal" 
-                              Visibility="{Binding Date_Visibility}">
+                  <StackPanel Visibility="{Binding Date_Visibility}"
+                              Style="{StaticResource PartManager_StackPanel}">
                      <TextBlock Text="{Binding From_Msg}"
-                                Style="{StaticResource Filter_TextBlock}"
-                                Foreground="{StaticResource BeamWall_Corduroy}"/>
-                     <DatePicker SelectedDate="{Binding dtStartDate}"
-                                 Style="{StaticResource Filter_DatePicker}"
-                                 CalendarStyle="{StaticResource Filter_Calendar}"/>
+                                Style="{StaticResource Filter_TextBlock}"/>
+                     <DatePicker SelectedDate="{Binding dtStartDate}"                                 
+                                 CalendarStyle="{StaticResource Filter_Calendar}"
+                                 Style="{StaticResource Filter_DatePicker}"/>
                      <TextBlock Text="{Binding To_Msg}"
-                                Style="{StaticResource Filter_TextBlock}"
-                                Foreground="{StaticResource BeamWall_Corduroy}"/>
-                     <DatePicker SelectedDate="{Binding dtEndDate}"
-                                 Style="{StaticResource Filter_DatePicker}"
-                                 CalendarStyle="{StaticResource Filter_Calendar}"/>
+                                Style="{StaticResource Filter_TextBlock}"/>
+                     <DatePicker SelectedDate="{Binding dtEndDate}"                                 
+                                 CalendarStyle="{StaticResource Filter_Calendar}"
+                                 Style="{StaticResource Filter_DatePicker}"/>
                   </StackPanel>
                </StackPanel>
                <CheckBox Grid.Column="2"
                          IsChecked="{Binding bViewArchived}"
                          Content="{Binding ViewArchived_Msg}"
-                         VerticalAlignment="Center"/>
+                         Style="{StaticResource PParameters_CheckBox}"/>
             </Grid>
             <Grid Grid.Row="1">
                <Grid.ColumnDefinitions>
@@ -73,18 +70,15 @@
                </Grid.ColumnDefinitions>
                <ComboBox ItemsSource="{Binding FilterTypeList}"
                          SelectedItem="{Binding SelFilterType}"
-                         Width="105"
-                         Margin="5"
-                         Style="{StaticResource CalcPanel_ComboBox}"/>
+                         Style="{StaticResource NewOpenProjectFile_ComboBox}"/>
                <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                       Text="{Binding SearchText}"
                                       Visibility="{Binding SearchText_Visibility}"
                                       Style="{StaticResource NewSearchText_TextBox}"/>
                <StackPanel Grid.Column="2" 
-                           Orientation="Horizontal">
+                           Style="{StaticResource PartManager_StackPanel}">
                   <TextBlock Text="{Binding Rows_Msg}"
-                             Style="{StaticResource Option_TextBlock}"
-                             Foreground="{StaticResource BeamWall_Corduroy}"/>
+                             Style="{StaticResource Option_TextBlock}"/>
                   <ComboBox ItemsSource="{Binding RowQuantityList}"
                             SelectedIndex="{Binding SelRowQuantity}"
                             Style="{StaticResource OpenProjectFileDialog_ComboBox}"/>
@@ -93,7 +87,8 @@
          </Grid>
       </GroupBox>
 
-      <Border Grid.Row="1" Style="{StaticResource Optimizer_Border}" Margin="1"/>
+      <Border Grid.Row="1" 
+              Style="{StaticResource NewOpenProjectFileDialog_Border}"/>
 
       <EgtBEAMWALLCORE:EgtDataGrid Grid.Row="1"
                                    x:Name="MainDataGrid"
@@ -184,12 +179,11 @@
                               <RowDefinition Height="1"/>
                               <RowDefinition Height="1*"/>
                            </Grid.RowDefinitions>
-                           <Grid Grid.Row="0"
-                                 Grid.ColumnSpan="2"
+                           <Grid Grid.ColumnSpan="2"
                                  Style="{StaticResource Gray_Grid}"/>
                            <Grid Grid.Column="1"
                                  Grid.Row="1"
-                                 Margin="2">
+                                 Style="{StaticResource NewOpenProjectFile_Grid}">
                               <Grid.ColumnDefinitions>
                                  <ColumnDefinition Width="Auto"/>
                                  <ColumnDefinition Width="1*"/>
@@ -207,8 +201,8 @@
                               <TextBlock Grid.Row="1"
                                          Text="{Binding Path=DataContext.ListName_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"
                                          Style="{StaticResource OpenWnd_TextBlock}"/>
-                              <TextBlock Grid.Column="1"
-                                         Grid.Row="1"
+                              <TextBlock Grid.Row="1"
+                                         Grid.Column="1"                                         
                                          Text="{Binding sListName}"/>
                               <TextBlock Grid.Column="2"
                                          Text="{Binding Path=DataContext.ExportDate_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"
@@ -224,9 +218,11 @@
          </DataGrid.RowDetailsTemplate>
       </EgtBEAMWALLCORE:EgtDataGrid>
 
-      <UniformGrid Columns="4" Grid.Row="2" 
-                   Margin="0,0,0,5">
-         <Button IsDefault="True" Name="OpenBtn"
+      <UniformGrid Grid.Row="2"
+                   Columns="4" 
+                   Style="{StaticResource AddRawPartWnd_UniformGrid}">
+         <Button Name="OpenBtn"
+                 IsDefault="True"
                  Content="{Binding Open_Msg}" 
                  Style="{DynamicResource EgtWPFLib5_Button}"/>
          <Button Content="{Binding Archive_Msg}"
@@ -244,4 +240,4 @@
 
    </Grid>
 
-</EgtWPFLib5:EgtCustomWindow>
+</EgtBEAMWALLCORE:OptimizerWindow>
diff --git a/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml b/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml
index a8d4486e..d50d368d 100644
--- a/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml
+++ b/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml
@@ -1,18 +1,18 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="OpenProjectFileDialogV"
-                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
-                            Title="{Binding Title}"
-                            Style="{StaticResource OnlyProd_EgtCustomWindow}"
-                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="True"
-                            IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
-                            MinHeight="500" MinWidth="500"
-                            DataContext="{Binding RelativeSource={RelativeSource Self}}">
+<EgtBEAMWALLCORE:OptimizerWindow x:Class="OpenProjectFileDialogV"
+                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
+                                 Title="{Binding Title}"
+                                 ResizeMode="NoResize" TitleBarHeight="30"
+                                 WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
+                                 MinHeight="500" MinWidth="500"
+                                 DataContext="{Binding RelativeSource={RelativeSource Self}}"
+                                 Style="{StaticResource OptimizerWindow.Dialog}">
 
-   <EgtWPFLib5:EgtCustomWindow.Resources>
+   <EgtBEAMWALLCORE:OptimizerWindow.Resources>
       <EgtWPFLib5:FileNameConverter x:Key="FileNameConverter"/>
-   </EgtWPFLib5:EgtCustomWindow.Resources>
+   </EgtBEAMWALLCORE:OptimizerWindow.Resources>
 
    <Grid>
       <Grid.RowDefinitions>
@@ -22,9 +22,8 @@
       </Grid.RowDefinitions>
 
       <GroupBox Header="Filters"
-                Margin="5"
                 Visibility="{Binding Filters_Visibility}"
-                BorderBrush="{StaticResource BeamWall_RegentStBlue}">
+                Style="{StaticResource OpenProjectFile_GroupBox}">
          <Grid>
             <Grid.RowDefinitions>
                <RowDefinition Height="Auto"/>
@@ -37,28 +36,24 @@
                </Grid.ColumnDefinitions>
                <ComboBox ItemsSource="{Binding BTLDateTypeList}"
                          SelectedIndex="{Binding SelBTLDateType}"
-                         Width="105"
-                         Margin="5"
-                         Style="{StaticResource CalcPanel_ComboBox}"/>
-               <StackPanel Grid.Column="1" Orientation="Horizontal">
+                         Style="{StaticResource NewOpenProjectFile_ComboBox}"/>
+               <StackPanel Grid.Column="1" 
+                           Style="{StaticResource PartManager_StackPanel}">
                   <ComboBox ItemsSource="{Binding DayTypeList}"
                             SelectedIndex="{Binding SelDayType}"
-                            Width="105"
-                            Margin="0,0,2.5,0"
-                            Style="{StaticResource CalcPanel_ComboBox}"/>
-                  <StackPanel Orientation="Horizontal" Visibility="{Binding Date_Visibility}">
+                            Style="{StaticResource OpenProjectFile_ComboBox}"/>
+                  <StackPanel Visibility="{Binding Date_Visibility}"
+                              Style="{StaticResource PartManager_StackPanel}">
                      <TextBlock Text="{Binding From_Msg}"
-                                Style="{StaticResource Filter_TextBlock}"
-                                Foreground="{StaticResource BeamWall_Corduroy}"/>
-                     <DatePicker SelectedDate="{Binding dtStartDate}"
-                                 Style="{StaticResource Filter_DatePicker}"
-                                 CalendarStyle="{StaticResource Filter_Calendar}"/>
+                                Style="{StaticResource Filter_TextBlock}"/>
+                     <DatePicker SelectedDate="{Binding dtStartDate}"                                 
+                                 CalendarStyle="{StaticResource Filter_Calendar}"
+                                 Style="{StaticResource Filter_DatePicker}"/>
                      <TextBlock Text="{Binding To_Msg}"
-                                Style="{StaticResource Filter_TextBlock}"
-                                Foreground="{StaticResource BeamWall_Corduroy}"/>
-                     <DatePicker SelectedDate="{Binding dtEndDate}"
-                                 Style="{StaticResource Filter_DatePicker}"
-                                 CalendarStyle="{StaticResource Filter_Calendar}"/>
+                                Style="{StaticResource Filter_TextBlock}"/>
+                     <DatePicker SelectedDate="{Binding dtEndDate}"                                 
+                                 CalendarStyle="{StaticResource Filter_Calendar}"
+                                 Style="{StaticResource Filter_DatePicker}"/>
                   </StackPanel>
                </StackPanel>
             </Grid>
@@ -70,29 +65,25 @@
                </Grid.ColumnDefinitions>
                <ComboBox ItemsSource="{Binding FilterTypeList}"
                          SelectedItem="{Binding SelFilterType}"
-                         Width="105"
-                         Margin="5"
-                         Style="{StaticResource CalcPanel_ComboBox}"/>
+                         Style="{StaticResource NewOpenProjectFile_ComboBox}"/>
                <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                       Text="{Binding SearchText}"
-                                      Margin="5"
                                       Visibility="{Binding SearchText_Visibility}"
                                       Style="{StaticResource NewSearchText_TextBox}"/>
                <StackPanel Grid.Column="2" 
-                           Orientation="Horizontal">
+                           Style="{StaticResource PartManager_StackPanel}">
                   <TextBlock Text="Rows"
-                             Style="{StaticResource Option_TextBlock}"
-                             Foreground="{StaticResource BeamWall_Corduroy}"/>
+                             Style="{StaticResource Option_TextBlock}"/>
                   <ComboBox ItemsSource="{Binding RowQuantityList}"
                             SelectedIndex="{Binding SelRowQuantity}"
-                            Width="55"
-                            Style="{StaticResource CalcPanel_ComboBox}"/>
+                            Style="{StaticResource RowQTY_ComboBox}"/>
                </StackPanel>
             </Grid>
          </Grid>
       </GroupBox>
 
-      <Border Grid.Row="1" Style="{StaticResource Optimizer_Border}" Margin="1"/>
+      <Border Grid.Row="1" 
+              Style="{StaticResource NewOpenProjectFileDialog_Border}"/>
 
       <EgtBEAMWALLCORE:EgtDataGrid Grid.Row="1"
                                    ItemsSource="{Binding ProjectList}" 
@@ -181,8 +172,11 @@
          </DataGrid.Resources>
       </EgtBEAMWALLCORE:EgtDataGrid>
 
-      <UniformGrid Columns="3" Grid.Row="2" Margin="0,0,0,5">
-         <Button IsDefault="True" Name="OpenBtn"
+      <UniformGrid Grid.Row="2"
+                   Columns="3"  
+                   Style="{StaticResource AddRawPartWnd_UniformGrid}">
+         <Button Name="OpenBtn"
+                 IsDefault="True"
                  Content="{Binding Open_Msg}" 
                  Style="{DynamicResource EgtWPFLib5_Button}"/>
          <Button Content="{Binding Delete_Msg}"
@@ -195,4 +189,4 @@
 
    </Grid>
 
-</EgtWPFLib5:EgtCustomWindow>
+</EgtBEAMWALLCORE:OptimizerWindow>
diff --git a/EgtBEAMWALL.Core/Themes/Generic.xaml b/EgtBEAMWALL.Core/Themes/Generic.xaml
index 36cffe85..e55c44ac 100644
--- a/EgtBEAMWALL.Core/Themes/Generic.xaml
+++ b/EgtBEAMWALL.Core/Themes/Generic.xaml
@@ -215,6 +215,10 @@
    <Color x:Key="BeamWall_Geyser_Color" R="213" G="223" B="229" A="255"/>
    <SolidColorBrush x:Key="BeamWall_Geyser" Color="{StaticResource BeamWall_Geyser_Color}" />
 
+   <!--#AFC5D6-->
+   <Color x:Key="BeamWall_Casper_Color" R="175" G="197" B="214" A="255"/>
+   <SolidColorBrush x:Key="BeamWall_Casper" Color="{StaticResource BeamWall_Casper_Color}" />
+
    <LinearGradientBrush x:Key="Optimizer.Background" EndPoint="0.5,1" StartPoint="0.35,0">
       <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
       <GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.65"/>
@@ -386,6 +390,16 @@
 
    <!--#endregion Colori Grid-->
 
+   <!--#region Colori TreeView-->
+
+   <LinearGradientBrush x:Key="TreeView.Static.Background" EndPoint="0.5,1" StartPoint="0.35,0">
+      <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
+      <GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.45"/>
+      <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
+   </LinearGradientBrush>
+
+   <!--#endregion Colori TreeView-->
+
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!--#region FocusVisual standard-->
@@ -404,6 +418,274 @@
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
+   <!--#region TextBlock-->
+
+   <!--#region MachParam-->
+
+   <Style x:Key="MachParam_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+      <Setter Property="HorizontalAlignment" Value="Left"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
+      <Setter Property="Margin" Value="5,0,5,0"/>
+   </Style>
+
+   <Style x:Key="MachinePanel_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource MachParam_TextBlock}">
+      <Setter Property="TextWrapping" Value="WrapWithOverflow"/>
+      <Setter Property="Width" Value="150"/>
+   </Style>
+
+   <Style x:Key="Description_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource MachParam_TextBlock}">
+      <Setter Property="TextWrapping" Value="WrapWithOverflow"/>
+      <Setter Property="Width" Value="148"/>
+   </Style>
+
+   <!--#endregion MachParam-->
+
+   <!--#region DialogWindow-->
+
+   <Style x:Key="DialogWindow_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
+      <Setter Property="FontSize" Value="13"/>
+   </Style>
+
+   <Style x:Key="EgtMessageBox_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DialogWindow_TextBlock}">
+      <Setter Property="Margin" Value="5,0,5,0"/>
+   </Style>
+
+   <Style x:Key="EgtManageDialog_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DialogWindow_TextBlock}">
+      <Setter Property="HorizontalAlignment" Value="Left"/>
+      <Setter Property="Margin" Value="5"/>
+   </Style>
+
+   <Style x:Key="Info_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DialogWindow_TextBlock}">
+      <Setter Property="HorizontalAlignment" Value="Left"/>
+      <Setter Property="TextAlignment" Value="Left"/>
+   </Style>
+
+   <Style x:Key="EgtColorPicker_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DialogWindow_TextBlock}">
+      <Setter Property="Margin" Value="5,18,5,10"/>
+   </Style>
+
+   <Style x:Key="FileName_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DialogWindow_TextBlock}">
+      <Setter Property="HorizontalAlignment" Value="Right"/>
+      <Setter Property="Margin" Value="5"/>
+   </Style>
+
+   <!--#region RedColor-->
+
+   <Style x:Key="RedColor_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DialogWindow_TextBlock}">
+      <Setter Property="HorizontalAlignment" Value="Right"/>
+      <Setter Property="Margin" Value="0,10,5,0"/>
+   </Style>
+
+   <Style x:Key="GreenColor_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource RedColor_TextBlock}">
+      <Setter Property="Margin" Value="5,5,5,0"/>
+   </Style>
+
+   <!--#endregion RedColor-->
+
+   <!--#endregion DialogWindow-->
+
+   <!--#region MMUnits-->
+
+   <Style x:Key="MMUnits_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
+   </Style>
+
+   <Style x:Key="CurrMach_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource MMUnits_TextBlock}">
+      <Setter Property="Margin" Value="0,0,5,0"/>
+   </Style>
+
+   <!--#endregion MMUnits-->
+
+   <!--#region DataGrid-->
+
+   <Style x:Key="DataGrid_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="HorizontalAlignment" Value="Left"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
+      <Setter Property="TextAlignment" Value="Left"/>
+      <Setter Property="Padding" Value="12,6,12,6"/>
+   </Style>
+
+   <Style x:Key="DataGridR_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DataGrid_TextBlock}">
+      <Setter Property="HorizontalAlignment" Value="Right"/>
+      <Setter Property="TextAlignment" Value="Right"/>
+   </Style>
+
+   <!--#endregion DataGrid-->
+
+   <Style x:Key="ForegroundWhite_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
+      <Setter Property="TextWrapping" Value="Wrap"/>
+   </Style>
+
+   <Style x:Key="ForegroundCorduroy_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+      <Setter Property="TextWrapping" Value="Wrap"/>
+   </Style>
+
+   <Style x:Key="MessageBox_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundCorduroy_TextBlock}">
+      <Setter Property="TextAlignment" Value="Center"/>
+   </Style>
+
+   <Style x:Key="Option_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
+      <Setter Property="Margin" Value="10,5,10,0"/>
+   </Style>
+
+   <Style x:Key="Filter_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
+      <Setter Property="Margin" Value="2.5,0,2.5,0"/>
+   </Style>
+
+   <Style x:Key="OpenWnd_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_DarkGray}"/>
+      <Setter Property="Margin" Value="0,0,20,0"/>
+   </Style>
+
+   <Style x:Key="ConfigurationProgram_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="FontSize" Value="15"/>
+   </Style>
+
+   <Style x:Key="StatusBar_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_Black}"/>
+      <Setter Property="TextAlignment" Value="Right"/>
+      <Setter Property="Width" Value="250"/>
+   </Style>
+
+   <Style x:Key="Measure_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_Black}"/>
+      <Setter Property="Width" Value="35"/>
+   </Style>
+
+   <Style x:Key="CurrMachine_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_Black}"/>
+      <Setter Property="Margin" Value="0,0,5,0"/>
+   </Style>
+
+   <Style x:Key="General_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="TextAlignment" Value="Center"/>
+      <Setter Property="TextWrapping" Value="Wrap"/>
+   </Style>
+
+   <Style x:Key="Ext_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="VerticalAlignment" Value="Center"/>
+   </Style>
+
+   <Style x:Key="Name_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="HorizontalAlignment" Value="Left"/>
+   </Style>
+
+   <Style x:Key="NameImage_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="VerticalAlignment" Value="Center"/>
+      <Setter Property="Margin" Value="2.5,0,0,0"/>
+   </Style>
+
+   <Style x:Key="MachiningDB_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="VerticalAlignment" Value="Center"/>
+      <Setter Property="FontSize" Value="15"/>
+      <Setter Property="Margin" Value="0,-2,5,0"/>
+   </Style>
+
+   <Style x:Key="TitleBar_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
+      <Setter Property="FontSize" Value="14"/>
+      <Setter Property="Margin" Value="4 0 0 0"/>
+      <Style.Triggers>
+         <DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource AncestorType=Window}}" Value="False">
+            <Setter Property="Foreground" Value="{DynamicResource WindowTitleBarInactiveText}" />
+         </DataTrigger>
+      </Style.Triggers>
+   </Style>
+
+   <!--#endregion TextBlock-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region TextBox-->
+
+   <!--#region EgtWPFLib5-->
+
+   <Style x:Key="EgtOptmizer_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
+      <Setter Property="TextWrapping" Value="Wrap"/>
+   </Style>
+
+   <Style x:Key="NewSearchText_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
+      <Setter Property="Margin" Value="5"/>
+      <Setter Property="TextWrapping" Value="Wrap"/>
+   </Style>
+
+   <Style x:Key="MachineConfiguration_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
+      <Setter Property="Width" Value="60"/>
+   </Style>
+
+   <!--#endregion EgtWPFLib5-->
+
+   <!--#region ParameterLis-->
+
+   <Style x:Key="ParameterList_TextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
+      <Setter Property="HorizontalAlignment" Value="Stretch"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
+      <Setter Property="VerticalContentAlignment" Value="Center"/>
+      <Setter Property="TextAlignment" Value="Right"/>
+      <Setter Property="Height" Value="22"/>
+      <Setter Property="FontWeight" Value="Normal"/>
+      <Setter Property="FontSize" Value="12"/>
+   </Style>
+
+   <Style x:Key="SaveFileName_TextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource ParameterList_TextBox}">
+      <Setter Property="TextAlignment" Value="Left"/>
+      <Setter Property="Margin" Value="2.5,2.5,2.5,5"/>
+   </Style>
+
+   <!--#endregion ParameterLis-->
+
+   <!--#region ColorPicker-->
+
+   <Style x:Key="ColorPicker_TextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
+      <Setter Property="HorizontalAlignment" Value="Stretch"/>
+      <Setter Property="VerticalContentAlignment" Value="Center"/>
+      <Setter Property="TextAlignment" Value="Center"/>
+      <Setter Property="Width" Value="65"/>
+   </Style>
+
+   <!--#region RedColor-->
+
+   <Style x:Key="RedColor_TextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource ColorPicker_TextBox}">
+      <Setter Property="HorizontalAlignment" Value="Right"/>
+      <Setter Property="IsReadOnly" Value="False"/>
+      <Setter Property="Margin" Value="0,5,5,0"/>
+   </Style>
+
+   <Style x:Key="GreenColor_TextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource RedColor_TextBox}">
+      <Setter Property="Margin" Value="5,5,5,0"/>
+   </Style>
+
+   <!--#endregion RedColor-->
+
+   <!--#endregion ColorPicker-->
+
+   <Style x:Key="Optimizer_TextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
+      <Setter Property="VerticalContentAlignment" Value="Center"/>
+      <Setter Property="Width" Value="200"/>
+      <Setter Property="Margin" Value="5,0,5,0"/>
+      <Setter Property="TextWrapping" Value="Wrap"/>
+   </Style>
+
+   <Style x:Key="General_TextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
+      <Setter Property="Margin" Value="0,0,2.5,0"/>
+   </Style>
+
+   <!--#endregion TextBox-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
    <!--#region Button-->
 
    <Style TargetType="{x:Type Button}">
@@ -447,6 +729,38 @@
       </Setter>
    </Style>
 
+   <!--#region LeftPanel-->
+   
+   <Style x:Key="LeftPanel_TextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="30"/>
+   </Style>
+
+   <Style x:Key="EgtColorPicker_TextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource LeftPanel_TextButton}">
+      <Setter Property="Margin" Value="0,10,0,0"/>
+   </Style>
+
+   <!--#endregion LeftPanel-->
+
+   <Style x:Key="ToolBar_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="20"/>
+      <Setter Property="Width" Value="20"/>
+   </Style>
+
+   <Style x:Key="Mach_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="30"/>
+   </Style>
+
+   <Style x:Key="LeftPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="30"/>
+      <Setter Property="Margin" Value="2.5,2.5,2.5,2.5"/>
+   </Style>
+
+   <Style x:Key="SnapPoint_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Width" Value="80"/>
+   </Style>
+
    <Style x:Key="RightPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="BorderBrush" Value="Transparent"/>
       <Setter Property="Height" Value="24"/>
@@ -457,11 +771,9 @@
       <Setter Property="Margin" Value="2.5,0,5,0"/>
    </Style>
 
-   <Style x:Key="LeftPanel_TextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-      <Setter Property="Height" Value="30"/>
-   </Style>
-
-   <Style x:Key="OnlyProd_Button" TargetType="{x:Type Button}">
+   <!--#region Optimizer-->
+   
+   <Style x:Key="Optimizer_Button" TargetType="{x:Type Button}">
       <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
       <Setter Property="Background" Value="{StaticResource ButtonBasic.Static.Background}"/>
       <Setter Property="BorderBrush" Value="{StaticResource Button.Static.Border}"/>
@@ -500,7 +812,7 @@
       </Setter>
    </Style>
 
-   <Style x:Key="Button.OptimizerWindow.TitleBar" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
+   <Style x:Key="Button.OptimizerWindow.TitleBar" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
       <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
       <Setter Property="Padding" Value="0" />
       <Setter Property="WindowChrome.IsHitTestVisibleInChrome" Value="True" />
@@ -532,30 +844,38 @@
       </Setter>
    </Style>
 
-   <Style x:Key="ToolBarViewPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
+   <Style x:Key="ToolBarViewPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="30"/>
       <Setter Property="Margin" Value="5,2,5,2"/>
    </Style>
 
-   <Style x:Key="GeneralConfiguration_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
+   <Style x:Key="GeneralConfiguration_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="80"/>
       <Setter Property="Margin" Value="5,0,5,0"/>
    </Style>
 
-   <Style x:Key="ParameterMachine_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
+   <Style x:Key="ParameterMachine_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
       <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="120"/>
+      <Setter Property="Width" Value="140"/>
       <Setter Property="Margin" Value="5,0,0,0"/>
    </Style>
 
-   <Style x:Key="EgtWPFLib5_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
+   <!--#region EgtWPFLib5-->
+   
+   <Style x:Key="EgtWPFLib5_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="80"/>
    </Style>
+   
+   <Style x:Key="MovePartInRawPartWnd_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource EgtWPFLib5_Button}">
+      <Setter Property="Margin" Value="0,0,5,0"/>
+   </Style>
 
-   <Style x:Key="SaveOptionPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
+   <!--#endregion EgtWPFLib5-->
+
+   <Style x:Key="SaveOptionPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
       <Setter Property="Height" Value="25"/>
       <Setter Property="Width" Value="25"/>
       <Setter Property="Margin" Value="5,0,0,0"/>
@@ -563,7 +883,7 @@
       <Setter Property="HorizontalAlignment" Value="Center"/>
    </Style>
 
-   <Style x:Key="SaveMachinePanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
+   <Style x:Key="SaveMachinePanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
       <Setter Property="Height" Value="50"/>
       <Setter Property="Width" Value="50"/>
       <Setter Property="Margin" Value="50"/>
@@ -571,13 +891,7 @@
       <Setter Property="HorizontalAlignment" Value="Right"/>
    </Style>
 
-   <Style x:Key="RightPanel_HalfRound_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
-      <Setter Property="Height" Value="24"/>
-      <Setter Property="Width" Value="64"/>
-      <Setter Property="BorderThickness" Value="1,1,1,0"/>
-   </Style>
-
-   <Style x:Key="MainMenu_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
+   <Style x:Key="MainMenu_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
       <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
       <Setter Property="TextBlock.FontWeight" Value="Normal"/>
       <Setter Property="Height" Value="30"/>
@@ -593,293 +907,44 @@
       </Setter>
    </Style>
 
-   <Style x:Key="ToolBar_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+   <Style x:Key="General_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
       <Setter Property="Height" Value="20"/>
       <Setter Property="Width" Value="20"/>
+      <Setter Property="Margin" Value="2.5,0,0,0"/>
    </Style>
 
-   <Style x:Key="Mach_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="30"/>
+   <!--#region RightPanel_HalfRound-->
+   
+   <Style x:Key="RightPanel_HalfRound_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
+      <Setter Property="Height" Value="24"/>
+      <Setter Property="Width" Value="64"/>
+      <Setter Property="BorderThickness" Value="1,1,1,0"/>
    </Style>
 
-   <Style x:Key="LeftPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="30"/>
-      <Setter Property="Margin" Value="2.5,2.5,2.5,2.5"/>
-   </Style>
-
-   <Style x:Key="SnapPoint_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-      <Setter Property="Width" Value="80"/>
-   </Style>
-
-   <!--#endregion Button-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region TextBlock-->
-
-   <Style x:Key="Option_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="Margin" Value="10,5,10,0"/>
-   </Style>
-
-   <Style x:Key="MachParam_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
-      <Setter Property="HorizontalAlignment" Value="Left"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="Margin" Value="5,0,5,0"/>
-   </Style>
-
-   <Style x:Key="Filter_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
+   <Style x:Key="EgtColorPicker_HalfRound_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource RightPanel_HalfRound_Button}">
       <Setter Property="Margin" Value="2.5,0,2.5,0"/>
    </Style>
 
-   <Style x:Key="OpenWnd_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_DarkGray}"/>
-      <Setter Property="Margin" Value="0,0,20,0"/>
+   <Style x:Key="EgtManageDialogOK_HalfRound_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource RightPanel_HalfRound_Button}">
+      <Setter Property="HorizontalAlignment" Value="Right"/>
+      <Setter Property="Margin" Value="15,0,2.5,0"/>
    </Style>
 
-   <Style x:Key="DialogWindow_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="FontSize" Value="13"/>
+   <Style x:Key="MachiningDB_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource RightPanel_HalfRound_Button}">
+      <Setter Property="Height" Value="30"/>
    </Style>
 
-   <Style x:Key="ConfigurationProgram_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="FontSize" Value="15"/>
+   <Style x:Key="EgtManageDialogCancel_HalfRound_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource RightPanel_HalfRound_Button}">
+      <Setter Property="HorizontalAlignment" Value="Left"/>
+      <Setter Property="Margin" Value="2.5,0,0,0"/>
    </Style>
 
-   <Style x:Key="StatusBar_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Black}"/>
-      <Setter Property="TextAlignment" Value="Right"/>
-      <Setter Property="Width" Value="250"/>
-   </Style>
+   <!--#endregion RightPanel_HalfRound-->
+      
+   <!--#endregion Optimizer-->
 
-   <Style x:Key="Measure_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Black}"/>
-      <Setter Property="Width" Value="35"/>
-   </Style>
-
-   <Style x:Key="CurrMachine_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Black}"/>
-      <Setter Property="Margin" Value="0,0,5,0"/>
-   </Style>
-
-   <!--#endregion TextBlock-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region TextBox-->
-
-   <Style x:Key="NewSearchText_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
-      <Setter Property="Margin" Value="5"/>
-      <Setter Property="TextWrapping" Value="Wrap"/>
-   </Style>
-
-   <Style x:Key="ParameterList_TextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
-      <Setter Property="HorizontalAlignment" Value="Stretch"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="VerticalContentAlignment" Value="Center"/>
-      <Setter Property="TextAlignment" Value="Right"/>
-      <Setter Property="Height" Value="22"/>
-      <Setter Property="FontWeight" Value="Normal"/>
-      <Setter Property="FontSize" Value="12"/>
-   </Style>
-
-   <Style x:Key="ColorPicker_TextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
-      <Setter Property="VerticalContentAlignment" Value="Center"/>
-      <Setter Property="TextAlignment" Value="Center"/>
-      <Setter Property="HorizontalAlignment" Value="Stretch"/>
-      <Setter Property="Width" Value="65"/>
-   </Style>
-
-   <!--#endregion TextBox-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region EgtWindow-->
-
-   <Grid x:Key="OptimizerWindow.Path.Maximize">
-      <Path Width="46"
-			   Height="32"
-			   Data="M 18.5,12.5 H 25.5 V 19.5 H 18.5 Z M 20.5,12.5 V 10.5 H 27.5 V 17.5 H 25.5"
-			   Stroke="{Binding Path=Foreground,
-			                    RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
-			   StrokeThickness="1" />
-   </Grid>
-
-   <Grid x:Key="OptimizerWindow.Path.Normal">
-      <Path Width="46"
-			   Height="32"
-			   Data="M 18.5,10.5 H 27.5 V 19.5 H 18.5 Z"
-			   Stroke="{Binding Path=Foreground,
-			                    RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
-			   StrokeThickness="1" />
-   </Grid>
-
-   <ControlTemplate x:Key="OptimizerWindow.ControlTemplate.WithTitleBar" TargetType="{x:Type EgwWPFBaseLib:EgtWindow}">
-      <Border BorderThickness="{TemplateBinding BorderThickness}"
-              BorderBrush="{StaticResource BeamWall_Alto}"
-              Background="{TemplateBinding Background}">
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="{Binding TitleBarHeight, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-            <Grid>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="*" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-               </Grid.ColumnDefinitions>
-               <Border Grid.Column="0"
-                       Grid.ColumnSpan="6"
-                       BorderThickness="0"
-                       BorderBrush="{StaticResource BeamWall_Glacier}"
-                       Background="{StaticResource BeamWall_Glacier}"/>
-               <Image Grid.Column="0"
-		                MinWidth="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
-		                Source="{TemplateBinding Icon}"/>
-               <ContentControl Grid.Column="1"
-                               Content="{TemplateBinding TitlePanel}"/>
-               <TextBlock Grid.Column="2"
-		                    Margin="4 0 0 0"
-		                    VerticalAlignment="Center"
-                          HorizontalAlignment="Center"
-		                    FontSize="14"
-		                    Text="{TemplateBinding Title}">
-                  <TextBlock.Style>
-                     <Style TargetType="TextBlock">
-                        <Style.Triggers>
-                           <DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource AncestorType=Window}}" Value="False">
-                              <Setter Property="Foreground" Value="{DynamicResource WindowTitleBarInactiveText}" />
-                           </DataTrigger>
-                        </Style.Triggers>
-                     </Style>
-                  </TextBlock.Style>
-               </TextBlock>
-               <Button Grid.Column="3"
-                       Name="PART_MinimizeBtn"
-		                 RenderOptions.EdgeMode="Aliased"
-		                 Style="{StaticResource Button.OptimizerWindow.TitleBar}">
-                  <Path Width="46"
-			               Height="32"
-			               Data="M 18,15 H 28"
-			               Stroke="{Binding Path=Foreground,
-							                    RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
-			               StrokeThickness="1" />
-               </Button>
-               <Button Grid.Column="4"
-                       Name="PART_MaximizeRestoreBtn">
-                  <Button.Style>
-                     <Style TargetType="Button" BasedOn="{StaticResource Button.OptimizerWindow.TitleBar}">
-                        <Style.Triggers>
-                           <DataTrigger Binding="{Binding WindowState, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}" Value="Maximized">
-                              <Setter Property="Content" Value="{StaticResource OptimizerWindow.Path.Maximize}" />
-                           </DataTrigger>
-                           <DataTrigger Binding="{Binding WindowState, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}" Value="Normal">
-                              <Setter Property="Content" Value="{StaticResource OptimizerWindow.Path.Normal}" />
-                           </DataTrigger>
-                        </Style.Triggers>
-                     </Style>
-                  </Button.Style>
-               </Button>
-               <Button Grid.Column="5"
-                       Name="PART_CloseBtn"
-		                 Style="{StaticResource Button.OptimizerWindow.TitleBar}">
-                  <Path Width="46"
-			               Height="32"
-			               Data="M 18,11 27,20 M 18,20 27,11"
-			               Stroke="{Binding Path=Foreground,
-			               				     RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
-			               StrokeThickness="1" />
-               </Button>
-            </Grid>
-            <ContentPresenter Grid.Row="1" 
-                              Content="{TemplateBinding Content}"/>
-         </Grid>
-      </Border>
-   </ControlTemplate>
-
-   <ControlTemplate x:Key="OptimizerWindow.ControlTemplate.WithoutTitleBar" TargetType="{x:Type EgwWPFBaseLib:EgtWindow}">
-      <Border BorderThickness="{TemplateBinding BorderThickness}"
-              BorderBrush="{StaticResource BeamWall_Glacier}">
-         <Border.Background>
-            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
-               <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
-               <GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.45"/>
-               <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
-            </LinearGradientBrush>
-         </Border.Background>
-         <ContentPresenter Grid.Row="1" 
-                           Content="{TemplateBinding Content}"/>
-      </Border>
-   </ControlTemplate>
-
-   <Style TargetType="{x:Type EgtBEAMWALLCORE:OptimizerWindow}" BasedOn="{StaticResource {x:Type EgwWPFBaseLib:EgtWindow}}">
-      <Setter Property="Background">
-         <Setter.Value>
-            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
-               <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
-               <GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.45"/>
-               <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
-            </LinearGradientBrush>
-         </Setter.Value>
-      </Setter>
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Glacier}"/>
-      <Setter Property="TitleBarHeight" Value="45"/>
-      <Setter Property="BorderThickness" Value="0"/>
-      <Setter Property="IsMinimizable" Value="True"/>
-      <Setter Property="Icon" Value="pack://application:,,,/EgtBEAMWALL.Core;component/Resources/EgalwareLogo.ico"/>
-      <Setter Property="WindowChrome.WindowChrome">
-         <Setter.Value>
-            <WindowChrome CaptionHeight="{Binding TitleBarHeight, RelativeSource={RelativeSource AncestorType={x:Type EgwWPFBaseLib:EgtWindow}}}" 
-                          GlassFrameThickness="0"
-                          CornerRadius="0"
-                          ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}"/>
-         </Setter.Value>
-      </Setter>
-      <Setter Property="Template" Value="{StaticResource OptimizerWindow.ControlTemplate.WithTitleBar}"/>
-      <Style.Triggers>
-         <Trigger Property="WindowStyle" Value="None">
-            <Setter Property="Template" Value="{StaticResource OptimizerWindow.ControlTemplate.WithoutTitleBar}"/>
-         </Trigger>
-         <Trigger Property="WindowState" Value="Maximized">
-            <Setter Property="BorderThickness" Value="7"/>
-            <Setter Property="Template" Value="{StaticResource OptimizerWindow.ControlTemplate.WithTitleBar}"/>
-         </Trigger>
-         <MultiTrigger>
-            <MultiTrigger.Conditions>
-               <Condition Property="WindowState" Value="Maximized"/>
-               <Condition Property="WindowStyle" Value="None"/>
-            </MultiTrigger.Conditions>
-            <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Template" Value="{StaticResource OptimizerWindow.ControlTemplate.WithoutTitleBar}"/>
-         </MultiTrigger>
-      </Style.Triggers>
-   </Style>
-
-   <Style x:Key="OptimizerWindow.Dialog" TargetType="{x:Type EgtBEAMWALLCORE:OptimizerWindow}">
-      <Setter Property="IsMinimizable" Value="False"/>
-      <Setter Property="IsResizable" Value="False"/>
-   </Style>
-
-   <Style x:Key="OptimizerWindow.Dialog.NoClose" TargetType="{x:Type EgtBEAMWALLCORE:OptimizerWindow}">
-      <Setter Property="IsMinimizable" Value="False"/>
-      <Setter Property="IsResizable" Value="False"/>
-      <Setter Property="IsClosable" Value="False"/>
-   </Style>
-
-   <!--#endregion EgtWindow-->
+   <!--#endregion Button-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
@@ -1055,7 +1120,7 @@
          </Setter.Value>
       </Setter>
    </Style>
-   <Style x:Key="OnlyProd_ScrollBar" TargetType="{x:Type ScrollBar}">
+   <Style x:Key="Optimizer_ScrollBar" TargetType="{x:Type ScrollBar}">
       <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false"/>
       <Setter Property="Stylus.IsFlicksEnabled" Value="false"/>
       <Setter Property="Background" Value="{StaticResource ScrollBar.Static.Background}"/>
@@ -1220,9 +1285,86 @@
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
+   <!--#region ListBox-->
+
+   <Style TargetType="{x:Type ListBoxItem}">
+      <Setter Property="SnapsToDevicePixels" Value="True"/>
+      <Setter Property="Padding" Value="4,1"/>
+      <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+      <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="BorderBrush" Value="Transparent"/>
+      <Setter Property="BorderThickness" Value="1"/>
+      <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ListBoxItem}">
+               <Border x:Name="Bd" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+                  <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="IsMouseOver" Value="True"/>
+                     </MultiTrigger.Conditions>
+                     <Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.MouseOver.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.MouseOver.Border}"/>
+                     <Setter Property="Foreground" Value="{StaticResource Item.MouseOver.Foreground}"/>
+                     <Setter Property="FontWeight" Value="Bold" />
+                  </MultiTrigger>
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="Selector.IsSelectionActive" Value="False"/>
+                        <Condition Property="IsSelected" Value="True"/>
+                     </MultiTrigger.Conditions>
+                     <Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.SelectedInactive.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.SelectedInactive.Border}"/>
+                  </MultiTrigger>
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="Selector.IsSelectionActive" Value="True"/>
+                        <Condition Property="IsSelected" Value="True"/>
+                     </MultiTrigger.Conditions>
+                     <Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.SelectedActive.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.SelectedActive.Border}"/>
+                     <Setter Property="Foreground" Value="{StaticResource Item.SelectedActive.Foreground}"/>
+                     <Setter Property="FontWeight" Value="Bold" />
+                  </MultiTrigger>
+                  <Trigger Property="IsEnabled" Value="False">
+                     <Setter Property="TextElement.Foreground" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="BasicColor_ListBox" TargetType="{x:Type ListBox}">
+      <Setter Property="BorderThickness" Value="0"/>
+   </Style>
+
+   <!--#region EgtColorPicker-->
+   
+   <Style x:Key="EgtColorPicker_ListBox" TargetType="{x:Type ListBox}">
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="BorderThickness" Value="0"/>
+   </Style>
+
+   <Style x:Key="CustomerColor_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource EgtColorPicker_ListBox}">
+      <Setter Property="Background" Value="Transparent"/>
+   </Style>
+
+   <!--#endregion EgtColorPicker-->
+
+   <!--#endregion ListBox-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
    <!--#region ComboBox-->
 
-   <Style x:Key="OnlyProd_ComboBox" TargetType="{x:Type ComboBox}">
+   <!--#region Optimizer-->
+   
+   <Style x:Key="Optmizer_ComboBox" TargetType="{x:Type ComboBox}">
       <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
       <Setter Property="Background" Value="{StaticResource ComboBox.Static.Background}"/>
       <Setter Property="BorderBrush" Value="{StaticResource ComboBox.Static.Border}"/>
@@ -1235,228 +1377,635 @@
       <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
       <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
       <Style.Resources>
-         <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource OnlyProd_ScrollBar}"/>
+         <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource Optimizer_ScrollBar}"/>
       </Style.Resources>
    </Style>
 
-   <Style x:Key="CalcPanel_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource OnlyProd_ComboBox}">
+   <Style x:Key="CalcPanel_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource Optmizer_ComboBox}">
       <Setter Property="Height" Value="22"/>
       <Setter Property="Width" Value="150"/>
    </Style>
 
+   <Style x:Key="GeneralConfiguration_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource Optmizer_ComboBox}">
+      <Setter Property="Margin" Value="0,0,0,5"/>
+   </Style>
+
+   <Style x:Key="RowQTY_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource Optmizer_ComboBox}">
+      <Setter Property="Width" Value="55"/>
+   </Style>
+
+   <!--#region General-->
+   
+   <Style x:Key="General_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource Optmizer_ComboBox}">
+      <Setter Property="Height" Value="25"/>
+      <Setter Property="Margin" Value="0,0,0,5"/>
+   </Style>
+
+   <Style x:Key="UnitMeasureList_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource General_ComboBox}">
+      <Setter Property="Margin" Value="0,5,0,0"/>
+   </Style>
+
+   <!--#region NewOpenProjectFile-->
+   
+   <Style x:Key="NewOpenProjectFile_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource General_ComboBox}">
+      <Setter Property="Width" Value="105"/>
+      <Setter Property="Margin" Value="5"/>
+   </Style>
+
+   <Style x:Key="OpenProjectFile_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource NewOpenProjectFile_ComboBox}">
+      <Setter Property="Margin" Value="0,0,2.5,0"/>
+   </Style>
+
+   <!--#endregion NewOpenProjectFile-->
+   
+   <!--#endregion General-->
+   
+   <!--#endregion Optimizer-->
+
+   <!--#region RightPanel-->
+   
    <Style x:Key="RightPanel_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
+      <Setter Property="HorizontalAlignment" Value="Left"/>
       <Setter Property="BorderThickness" Value="1"/>
       <Setter Property="Height" Value="25"/>
-      <Setter Property="HorizontalAlignment" Value="Left"/>
       <Setter Property="Width" Value="200"/>
    </Style>
 
+   <!--#region EgtManageDialog-->
+   
+   <Style x:Key="EgtManageDialog_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource RightPanel_ComboBox}">
+      <Setter Property="HorizontalAlignment" Value="Right"/>
+      <Setter Property="IsSynchronizedWithCurrentItem" Value="True"/>
+      <Setter Property="Margin" Value="2.5,5,2.5,5"/>
+   </Style>
+
+   <Style x:Key="FilterList_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource EgtManageDialog_ComboBox}">
+      <Setter Property="Margin" Value="10,2.5,2.5,5"/>
+   </Style>
+
+   <!--#endregion EgtManageDialog-->
+
+   <!--#endregion RightPanel-->
+
    <!--#endregion ComboBox-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!--#region DataGrid-->
+   <!--#region CheckBox-->
 
-   <Style x:Key="Main_DataGridColumnHeader" TargetType="{x:Type DataGridColumnHeader}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_Teal}" />
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
-      <Setter Property="FontWeight" Value="Bold" />
-      <Setter Property="FontSize" Value="15" />
-      <Setter Property="HorizontalContentAlignment" Value="Center" />
-      <Setter Property="Padding" Value="0,2,0,2" />
+   <Style x:Key="General_CheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
+      <Setter Property="Margin" Value="0,5,0,0"/>
    </Style>
 
-   <Style x:Key="Feature_DataGridColumnHeader" TargetType="{x:Type DataGridColumnHeader}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_Keppel}" />
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
-      <Setter Property="FontWeight" Value="Bold" />
-      <Setter Property="FontSize" Value="15" />
-      <Setter Property="HorizontalContentAlignment" Value="Center" />
-      <Setter Property="Padding" Value="0,2,0,2" />
+   <Style x:Key="PParameters_CheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
+      <Setter Property="VerticalAlignment" Value="Center"/>
    </Style>
 
-   <Style x:Key="PartInRawPart_DataGridColumnHeader" TargetType="{x:Type DataGridColumnHeader}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_Jaffa}" />
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
-      <Setter Property="FontWeight" Value="Bold" />
-      <Setter Property="FontSize" Value="15" />
-      <Setter Property="HorizontalContentAlignment" Value="Center" />
-      <Setter Property="Padding" Value="0,2,0,2" />
+   <Style x:Key="Alias_CheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
+      <Setter Property="HorizontalAlignment" Value="Center"/>
    </Style>
 
-   <Style x:Key="PParam_DataGridColumnHeader" TargetType="{x:Type DataGridColumnHeader}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_Downy}" />
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
-      <Setter Property="FontWeight" Value="Bold" />
-      <Setter Property="FontSize" Value="15" />
-      <Setter Property="HorizontalContentAlignment" Value="Center" />
-      <Setter Property="Padding" Value="0,2,0,2" />
+   <!--#endregion CheckBox-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region ItemsControl-->
+
+   <Style x:Key="ProjFileList_ItemsControl" TargetType="{x:Type ItemsControl}" BasedOn="{StaticResource {x:Type ItemsControl}}">
+      <Setter Property="Margin" Value="0,-1,0,0"/>
+      <Setter Property="Padding" Value="0"/>
+      <Setter Property="BorderThickness" Value="0"/>
    </Style>
 
-   <Style x:Key="RawPart_DataGridColumnHeader" TargetType="{x:Type DataGridColumnHeader}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_Teal}" />
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
-      <Setter Property="FontWeight" Value="SemiBold" />
-      <Setter Property="FontSize" Value="11" />
-      <Setter Property="HorizontalContentAlignment" Value="Center" />
-      <Setter Property="Padding" Value="0,2,0,2" />
+   <Style x:Key="MachinePanel_ItemsControl" TargetType="{x:Type ItemsControl}" BasedOn="{StaticResource {x:Type ItemsControl}}">
+      <Setter Property="Margin" Value="0,5,0,0"/>
    </Style>
 
-   <Style x:Key="Optimizer_DataGrid" TargetType="{x:Type DataGrid}">
-      <Setter Property="Background" Value="Transparent"/>
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Glacier}"/>
-      <Setter Property="BorderThickness" Value="0,0,0,0"/>
-      <Setter Property="RowDetailsVisibilityMode" Value="VisibleWhenSelected"/>
-      <Setter Property="ScrollViewer.CanContentScroll" Value="True"/>
-      <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
-      <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-      <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
-      <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-      <Setter Property="HeadersVisibility" Value="Column" />
-      <Setter Property="TextBlock.TextAlignment" Value="Center"/>
-      <Setter Property="HorizontalContentAlignment" Value="Center"/>
-      <Setter Property="VerticalContentAlignment" Value="Center"/>
-      <Setter Property="CanUserAddRows" Value="False"/>
-      <Setter Property="CanUserResizeRows" Value="False"/>
-      <Setter Property="AutoGenerateColumns" Value="False"/>
-      <Setter Property="VirtualizingPanel.IsVirtualizing" Value="True"/>
-      <Setter Property="VirtualizingPanel.VirtualizationMode" Value="Recycling"/>
-      <Setter Property="EnableColumnVirtualization" Value="True"/>
-      <Setter Property="EnableRowVirtualization" Value="True"/>
-      <Setter Property="VirtualizingStackPanel.ScrollUnit" Value="Pixel"/>
-      <Setter Property="RowHeight" Value="24"/>
+   <Style x:Key="EgtMessageBox_ItemsControl" TargetType="{x:Type ItemsControl}" BasedOn="{StaticResource {x:Type ItemsControl}}">
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+   </Style>
+
+   <Style x:Key="UsersControl_ItemsControl" TargetType="{x:Type ItemsControl}" BasedOn="{StaticResource {x:Type ItemsControl}}">
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_Black}"/>
       <Setter Property="Template">
          <Setter.Value>
-            <ControlTemplate TargetType="{x:Type DataGrid}">
-               <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
-                  <ScrollViewer x:Name="DG_ScrollViewer" Focusable="false">
-                     <ScrollViewer.Template>
-                        <ControlTemplate TargetType="{x:Type ScrollViewer}">
-                           <Grid>
-                              <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="Auto"/>
-                                 <ColumnDefinition Width="*"/>
-                                 <ColumnDefinition Width="Auto"/>
-                              </Grid.ColumnDefinitions>
-                              <Grid.RowDefinitions>
-                                 <RowDefinition Height="Auto"/>
-                                 <RowDefinition Height="*"/>
-                                 <RowDefinition Height="Auto"/>
-                              </Grid.RowDefinitions>
-                              <Button Command="{x:Static DataGrid.SelectAllCommand}" Focusable="false" Style="{DynamicResource {ComponentResourceKey ResourceId=DataGridSelectAllButtonStyle, TypeInTargetAssembly={x:Type DataGrid}}}" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.All}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-                              <DataGridColumnHeadersPresenter x:Name="PART_ColumnHeadersPresenter" Grid.Column="1" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Column}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-                              <ScrollContentPresenter x:Name="PART_ScrollContentPresenter" CanContentScroll="{TemplateBinding CanContentScroll}" Grid.ColumnSpan="2" Grid.Row="1"/>
-                              <ScrollBar x:Name="PART_VerticalScrollBar" Grid.Column="2" Maximum="{TemplateBinding ScrollableHeight}" Orientation="Vertical" Grid.Row="1" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource Mode=TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"/>
-                              <Grid Grid.Column="1" Grid.Row="2">
-                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="{Binding NonFrozenColumnsViewportHorizontalOffset, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-                                    <ColumnDefinition Width="*"/>
-                                 </Grid.ColumnDefinitions>
-                                 <ScrollBar x:Name="PART_HorizontalScrollBar" Grid.Column="1" Maximum="{TemplateBinding ScrollableWidth}" Orientation="Horizontal" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource Mode=TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"/>
-                              </Grid>
-                           </Grid>
-                        </ControlTemplate>
-                     </ScrollViewer.Template>
+            <ControlTemplate TargetType="{x:Type ItemsControl}">
+               <Border SnapsToDevicePixels="true" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}">
+                  <ScrollViewer VerticalScrollBarVisibility="Visible">
                      <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
                   </ScrollViewer>
                </Border>
             </ControlTemplate>
          </Setter.Value>
       </Setter>
-      <Style.Triggers>
-         <MultiTrigger>
-            <MultiTrigger.Conditions>
-               <Condition Property="IsGrouping" Value="true"/>
-               <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false"/>
-            </MultiTrigger.Conditions>
-            <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
-         </MultiTrigger>
-      </Style.Triggers>
-      <Style.Resources>
-         <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource OnlyProd_ScrollBar}"/>
-      </Style.Resources>
    </Style>
 
-   <Style x:Key="RowDataGrid_CustomHighLight" TargetType="{x:Type DataGridRow}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}" />
-      <Style.Resources>
-         <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Transparent" />
-         <SolidColorBrush x:Key="{x:Static SystemColors.HighlightTextBrushKey}" Color="Black" />
-         <SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightBrushKey}" Color="Transparent" />
-         <SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightTextBrushKey}" Color="Black" />
-      </Style.Resources>
-      <Style.Triggers>
-         <Trigger Property="IsSelected" Value="True">
-            <Setter Property="BorderBrush" Value="{StaticResource BeamWall_FountainBlue}" />
-            <Setter Property="FontWeight" Value="Bold" />
-            <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
-            <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}" />
-         </Trigger>
-      </Style.Triggers>
-   </Style>
-
-   <Style x:Key="CellDataGrid_CustomHighLight" TargetType="{x:Type DataGridCell}">
-      <Setter Property="Height" Value="24"/>
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}" />
-      <Style.Resources>
-         <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Transparent" />
-         <SolidColorBrush x:Key="{x:Static SystemColors.HighlightTextBrushKey}" Color="Black" />
-         <SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightBrushKey}" Color="Transparent" />
-         <SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightTextBrushKey}" Color="Black" />
-      </Style.Resources>
-      <Style.Triggers>
-         <Trigger Property="IsSelected" Value="True">
-            <Setter Property="BorderBrush" Value="{StaticResource BeamWall_FountainBlue}" />
-            <Setter Property="FontWeight" Value="Bold" />
-            <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
-            <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}" />
-         </Trigger>
-      </Style.Triggers>
-   </Style>
-
-   <!--#endregion DataGrid-->
+   <!--#endregion ItemsControl-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!--#region DatePicker-->
+   <!--#region TabItem-->
 
-   <Style x:Key="Filter_DatePicker" TargetType="{x:Type DatePicker}">
-      <Setter Property="Height" Value="25" />
-      <Setter Property="Width" Value="100" />
-      <Setter Property="BorderBrush" Value="Transparent"/>
-      <Setter Property="Background" Value="Transparent"/>
-      <Style.Resources>
-         <Style TargetType="{x:Type DatePickerTextBox}">
-            <Setter Property="Background" Value="Transparent"/>
-         </Style>
-      </Style.Resources>
+   <Style x:Key="Optimizer_TabItem" TargetType="{x:Type TabItem}">
+      <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
+      <Setter Property="Background" Value="{StaticResource TabItem.Static.Background}"/>
+      <Setter Property="BorderBrush" Value="{StaticResource TabItem.Static.Border}"/>
+      <Setter Property="Margin" Value="0"/>
+      <Setter Property="Padding" Value="6,2,6,2"/>
+      <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+      <Setter Property="VerticalContentAlignment" Value="Stretch"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type TabItem}">
+               <Grid x:Name="templateRoot" SnapsToDevicePixels="true">
+                  <Border x:Name="mainBorder" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1,1,1,0" Margin="2,0" CornerRadius="4,4,0,0">
+                     <Border x:Name="innerBorder" Background="{StaticResource TabItem.Selected.Background}" BorderBrush="{StaticResource TabItem.Selected.Border}" BorderThickness="1,1,1,0" Margin="-1" Opacity="0" CornerRadius="4,4,0,0"/>
+                  </Border>
+                  <ContentPresenter x:Name="contentPresenter" ContentSource="Header" Focusable="False" HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Mode=Self}}" Value="true"/>
+                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Left"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Border}"/>
+                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,0,1"/>
+                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,0,1"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Mode=Self}}" Value="true"/>
+                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Bottom"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Border}"/>
+                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,0,1,1"/>
+                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,0,1,1"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Mode=Self}}" Value="true"/>
+                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Right"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Border}"/>
+                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="0,1,1,1"/>
+                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,1,1,1"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Mode=Self}}" Value="true"/>
+                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Top"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Border}"/>
+                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,1,0"/>
+                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,1,0"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Mode=Self}}" Value="false"/>
+                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Left"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Opacity" TargetName="contentPresenter" Value="0.56"/>
+                     <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Border}"/>
+                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,0,1"/>
+                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,0,1"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Mode=Self}}" Value="false"/>
+                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Bottom"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Opacity" TargetName="contentPresenter" Value="0.56"/>
+                     <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Border}"/>
+                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,0,1,1"/>
+                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,0,1,1"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Mode=Self}}" Value="false"/>
+                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Right"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Opacity" TargetName="contentPresenter" Value="0.56"/>
+                     <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Border}"/>
+                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="0,1,1,1"/>
+                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,1,1,1"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Mode=Self}}" Value="false"/>
+                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Top"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Opacity" TargetName="contentPresenter" Value="0.56"/>
+                     <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Border}"/>
+                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,1,0"/>
+                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,1,0"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Mode=Self}}" Value="false"/>
+                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Left"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,0,1"/>
+                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,0,1"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Mode=Self}}" Value="true"/>
+                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Left"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Panel.ZIndex" Value="1"/>
+                     <Setter Property="Margin" Value="-2,-2,0,-2"/>
+                     <Setter Property="Opacity" TargetName="innerBorder" Value="1"/>
+                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,0,1"/>
+                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,0,1"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Mode=Self}}" Value="false"/>
+                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Bottom"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,0,1,1"/>
+                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,0,1,1"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Mode=Self}}" Value="true"/>
+                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Bottom"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Panel.ZIndex" Value="1"/>
+                     <Setter Property="Margin" Value="-2,0,-2,-2"/>
+                     <Setter Property="Opacity" TargetName="innerBorder" Value="1"/>
+                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,0,1,1"/>
+                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,0,1,1"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Mode=Self}}" Value="false"/>
+                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Right"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="0,1,1,1"/>
+                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,1,1,1"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Mode=Self}}" Value="true"/>
+                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Right"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Panel.ZIndex" Value="1"/>
+                     <Setter Property="Margin" Value="0,-2,-2,-2"/>
+                     <Setter Property="Opacity" TargetName="innerBorder" Value="1"/>
+                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="0,1,1,1"/>
+                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,1,1,1"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Mode=Self}}" Value="false"/>
+                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Top"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,1,0"/>
+                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,1,0"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Mode=Self}}" Value="true"/>
+                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Top"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Panel.ZIndex" Value="1"/>
+                     <Setter Property="Margin" Value="-2,-2,-2,0"/>
+                     <Setter Property="Opacity" TargetName="innerBorder" Value="1"/>
+                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,1,0"/>
+                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,1,0"/>
+                  </MultiDataTrigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
    </Style>
 
-   <Style x:Key="Filter_Calendar" TargetType="{x:Type Calendar}">
+   <!--#endregion TabItem-->
+
+   <!--#region TabControl-->
+
+   <Style x:Key="EgtManageDialog_TabControl" TargetType="{x:Type TabControl}">
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_White}"/>
+      <Setter Property="BorderThickness" Value="0"/>
+   </Style>
+
+   <!--#region Generic-->
+
+   <Style x:Key="Generic_TabControl" TargetType="{x:Type TabControl}">
+      <Setter Property="TabStripPlacement" Value="Top"/>
+      <Setter Property="Margin" Value="5,5,2.5,5"/>
       <Setter Property="Background">
          <Setter.Value>
             <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
-               <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0"/>
-               <GradientStop Color="{StaticResource BeamWall_LinkWater_Color}" Offset="0.16"/>
+               <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
+               <GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.45"/>
                <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
             </LinearGradientBrush>
          </Setter.Value>
       </Setter>
-      <Setter Property="BorderBrush">
-         <Setter.Value>
-            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
-               <GradientStop Color="{StaticResource BeamWall_LinkWater_Color}" Offset="0"/>
-               <GradientStop Color="{StaticResource BeamWall_RegentStBlue_Color}" Offset="0.45"/>
-               <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0.75"/>
-               <GradientStop Color="{StaticResource BeamWall_Kashmir_Color}" Offset="1"/>
-            </LinearGradientBrush>
-         </Setter.Value>
-      </Setter>
-      <Setter Property="BorderThickness" Value="1"/>
+      <Style.Resources>
+         <Style TargetType="{x:Type TabItem}" BasedOn="{StaticResource Optimizer_TabItem}"/>
+      </Style.Resources>
    </Style>
 
-   <!--#endregion DatePicker-->
+   <Style x:Key="OnlyHeaders_TabControl" TargetType="{x:Type TabControl}" BasedOn="{StaticResource Generic_TabControl}">
+      <Setter Property="OverridesDefaultStyle" Value="True" />
+      <Setter Property="SnapsToDevicePixels" Value="True" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type TabControl}">
+               <Grid KeyboardNavigation.TabNavigation="Local">
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="Auto"/>
+                     <RowDefinition Height="*"/>
+                  </Grid.RowDefinitions>
+                  <TabPanel Name="HeaderPanel"
+                            Grid.Row="0"
+                            Panel.ZIndex="1" 
+                            Margin="0,0,4,-1" 
+                            IsItemsHost="True"
+                            KeyboardNavigation.TabIndex="1"
+                            Background="Transparent" />
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsEnabled" Value="False">
+                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!--#endregion Generic-->
+
+   <!--#endregion TabControl-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region StackPanel-->
+
+   <!--#region PartManager-->
+   
+   <Style x:Key="PartManager_StackPanel" TargetType="{x:Type StackPanel}">
+      <Setter Property="Orientation" Value="Horizontal"/>
+   </Style>
+
+   <Style x:Key="ConfigurationProgram_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
+      <Setter Property="Margin" Value="5"/>
+   </Style>
+
+   <Style x:Key="MachinePanel_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+   </Style>
+
+   <Style x:Key="PDFList_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
+      <Setter Property="Margin" Value="5,5,5,0"/>
+   </Style>
+
+   <!--#endregion PartManager-->
+
+   <!--#region BTLPartManager-->
+   
+   <Style x:Key="BTLPartManager_StackPanel" TargetType="{x:Type StackPanel}">
+      <Setter Property="Orientation" Value="Vertical"/>
+   </Style>
+
+   <Style x:Key="EgtManageDialog_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource BTLPartManager_StackPanel}">
+      <Setter Property="HorizontalAlignment" Value="Stretch"/>
+   </Style>
+
+   <Style x:Key="List_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource BTLPartManager_StackPanel}">
+      <Setter Property="Margin" Value="5,5,5,0"/>
+   </Style>
+
+   <!--#endregion BTLPartManager-->
+
+   <Style x:Key="OptStatistics_StackPanel" TargetType="{x:Type StackPanel}">
+      <Setter Property="Background" Value="{StaticResource BeamWall_White}"/>
+      <Setter Property="Margin" Value="-10,10,10,10"/>
+   </Style>
+
+   <!--#endregion StackPanel-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region WrapPanel-->
+
+   <Style x:Key="Project_WrapPanel" TargetType="{x:Type WrapPanel}">
+      <Setter Property="Orientation" Value="Vertical"/>
+   </Style>
+
+   <Style x:Key="ProjectH_WrapPanel" TargetType="{x:Type WrapPanel}">
+      <Setter Property="Orientation" Value="Horizontal"/>
+   </Style>
+
+   <!--#endregion WrapPanel-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region Grid-->
+
+   <Style x:Key="ProjFileList_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="TextBlock.FontSize" Value="12"/>
+      <Setter Property="TextBlock.FontWeight" Value="Normal"/>
+   </Style>
+
+   <Style x:Key="Gray_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="Background" Value="{StaticResource BeamWall_Gray}"/>
+      <Setter Property="Margin" Value="40,0,40,0"/>
+   </Style>
+
+   <Style x:Key="General_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="Margin" Value="0,2,0,5"/>
+   </Style>
+
+   <Style x:Key="MachParam_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="Margin" Value="0,0,5,5"/>
+   </Style>
+   
+   <Style x:Key="EgtColorPicker_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
+   </Style>
+
+   <Style x:Key="CustomerColor_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="Margin" Value="5,0,0,0"/>
+   </Style>
+
+   <Style x:Key="CurrColor_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="Margin" Value="0,20,0,0"/>
+   </Style>
+
+   <Style x:Key="AddColor_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="HorizontalAlignment" Value="Left"/>
+      <Setter Property="Margin" Value="0,10,5,0"/>
+   </Style>
+
+   <Style x:Key="EgtMessageBox_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="Margin" Value="2.5,2.5,2.5,0"/>
+   </Style>
+
+   <Style x:Key="MessageBox_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="Margin" Value="20"/>
+   </Style>
+
+   <Style x:Key="CalcPanel_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="Margin" Value="0,0,5,0"/>
+   </Style>
+
+   <Style x:Key="MachiningDB_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="Height" Value="20"/>
+   </Style>
+
+   <Style x:Key="NewOpenProjectFile_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="Margin" Value="2"/>
+   </Style>
+
+   <!--#region AddRawPartWnd-->
+
+   <Style x:Key="AddRawPartWnd_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="Margin" Value="5,5,5,0"/>
+   </Style>
+
+   <Style x:Key="EgtManageDialog_Grid" TargetType="{x:Type Grid}" BasedOn="{StaticResource AddRawPartWnd_Grid}">
+      <Setter Property="Height" Value="20"/>
+   </Style>
+
+   <Style x:Key="ContentTemplate_Grid" TargetType="{x:Type Grid}" BasedOn="{StaticResource AddRawPartWnd_Grid}">
+      <Setter Property="Height" Value="50"/>
+   </Style>
+
+   <Style x:Key="EgtDirectory_Grid" TargetType="{x:Type Grid}" BasedOn="{StaticResource AddRawPartWnd_Grid}">
+      <Setter Property="Width" Value="250"/>
+      <Setter Property="Height" Value="50"/>
+   </Style>
+
+   <!--#endregion AddRawPartWnd-->
+
+   <!--#endregion Grid-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region UniformGrid-->
+
+   <Style x:Key="General_UniformGrid" TargetType="{x:Type UniformGrid}">
+      <Setter Property="Margin" Value="3"/>
+   </Style>
+
+   <Style x:Key="AddRawPartWnd_UniformGrid" TargetType="{x:Type UniformGrid}">
+      <Setter Property="Margin" Value="0,0,0,5"/>
+   </Style>
+
+   <Style x:Key="GeneralConfiguration_UniformGrid" TargetType="{x:Type UniformGrid}">
+      <Setter Property="Margin" Value="0,5,0,0"/>
+   </Style>
+
+   <Style x:Key="EgtColorPicker_UniformGrid" TargetType="{x:Type UniformGrid}">
+      <Setter Property="Margin" Value="10,10,10,0"/>
+   </Style>
+
+   <Style x:Key="EgtManageDialog_UniformGrid" TargetType="{x:Type UniformGrid}">
+      <Setter Property="Margin" Value="2.5,0,2.5,5"/>
+   </Style>
+
+   <Style x:Key="Command_UniformGrid" TargetType="{x:Type UniformGrid}">
+      <Setter Property="Margin" Value="2.5,0,2.5,0"/>
+   </Style>
+
+   <!--#endregion UniformGrid-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region GroupBox-->
+
+   <!--#region NoHeader-->
+   
+   <Style x:Key="NoHeader_GroupBox" TargetType="{x:Type GroupBox}">
+      <Setter Property="Margin" Value="1.5,3,3,0"/>
+      <Setter Property="Padding" Value="5,5,0,0"/>
+      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Geyser}"/>
+      <Setter Property="BorderThickness" Value="1"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type GroupBox}">
+               <Grid SnapsToDevicePixels="True">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="6"/>
+                     <ColumnDefinition Width="Auto"/>
+                     <ColumnDefinition Width="*"/>
+                     <ColumnDefinition Width="6"/>
+                  </Grid.ColumnDefinitions>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="Auto"/>
+                     <RowDefinition Height="Auto"/>
+                     <RowDefinition Height="*"/>
+                     <RowDefinition Height="6"/>
+                  </Grid.RowDefinitions>
+                  <Border BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="4" Grid.Column="0" CornerRadius="4" Grid.Row="1" Grid.RowSpan="3"/>
+                  <Border BorderBrush="{StaticResource BeamWall_White}" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="4" CornerRadius="4" Grid.Row="1" Grid.RowSpan="3">
+                     <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="3">
+                        <Border BorderBrush="{StaticResource BeamWall_White}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2"/>
+                     </Border>
+                  </Border>
+                  <Border x:Name="Header" Grid.Column="1" Padding="3,1,3,0" Grid.Row="0" Grid.RowSpan="2">
+                     <ContentPresenter ContentTemplate="{TemplateBinding HeaderTemplate}" Content="{TemplateBinding Header}" ContentStringFormat="{TemplateBinding HeaderStringFormat}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                  </Border>
+                  <ContentPresenter Grid.ColumnSpan="2" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="1" ContentStringFormat="{TemplateBinding ContentStringFormat}" Margin="{TemplateBinding Padding}" Grid.Row="2" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="MachineConfiguration_GroupBox" TargetType="{x:Type GroupBox}" BasedOn="{StaticResource NoHeader_GroupBox}">
+      <Setter Property="Padding" Value="5,10,5,5"/>
+   </Style>
+
+   <!--#endregion NoHeader-->
+
+   <!--#region Optimizer-->
+   
+   <Style x:Key="Optimizer_GroupBox" TargetType="{x:Type GroupBox}">
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+   </Style>
+
+   <Style x:Key="General_GroupBox" TargetType="{x:Type GroupBox}" BasedOn="{StaticResource Optimizer_GroupBox}">
+      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Glacier}"/>
+   </Style>
+
+   <Style x:Key="Warehouse_GroupBox" TargetType="{x:Type GroupBox}" BasedOn="{StaticResource Optimizer_GroupBox}">
+      <Setter Property="Margin" Value="0,0,0,5"/>
+   </Style>
+
+   <Style x:Key="MachineParam_GroupBox" TargetType="{x:Type GroupBox}" BasedOn="{StaticResource Optimizer_GroupBox}">
+      <Setter Property="VerticalAlignment" Value="Top"/>
+   </Style>
+
+   <Style x:Key="NewOpenProjectFile_GroupBox" TargetType="{x:Type GroupBox}" BasedOn="{StaticResource Optimizer_GroupBox}">
+      <Setter Property="Margin" Value="5"/>
+   </Style>
+
+   <!--#endregion Optimizer-->
+   
+   <Style x:Key="OpenProjectFile_GroupBox" TargetType="{x:Type GroupBox}">
+      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_RegentStBlue}"/>
+      <Setter Property="Margin" Value="5"/>
+   </Style>
+
+   <!--#endregion GroupBox-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
@@ -1714,61 +2263,78 @@
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!--#region ListBox-->
+   <!--#region TreeView-->
 
-   <Style TargetType="{x:Type ListBoxItem}">
-      <Setter Property="SnapsToDevicePixels" Value="True"/>
-      <Setter Property="Padding" Value="4,1"/>
-      <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
-      <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
-      <Setter Property="Background" Value="Transparent"/>
-      <Setter Property="BorderBrush" Value="Transparent"/>
-      <Setter Property="BorderThickness" Value="1"/>
-      <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type ListBoxItem}">
-               <Border x:Name="Bd" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-                  <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-               </Border>
-               <ControlTemplate.Triggers>
-                  <MultiTrigger>
-                     <MultiTrigger.Conditions>
-                        <Condition Property="IsMouseOver" Value="True"/>
-                     </MultiTrigger.Conditions>
-                     <Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.MouseOver.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.MouseOver.Border}"/>
-                     <Setter Property="Foreground" Value="{StaticResource Item.MouseOver.Foreground}"/>
-                     <Setter Property="FontWeight" Value="Bold" />
-                  </MultiTrigger>
-                  <MultiTrigger>
-                     <MultiTrigger.Conditions>
-                        <Condition Property="Selector.IsSelectionActive" Value="False"/>
-                        <Condition Property="IsSelected" Value="True"/>
-                     </MultiTrigger.Conditions>
-                     <Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.SelectedInactive.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.SelectedInactive.Border}"/>
-                  </MultiTrigger>
-                  <MultiTrigger>
-                     <MultiTrigger.Conditions>
-                        <Condition Property="Selector.IsSelectionActive" Value="True"/>
-                        <Condition Property="IsSelected" Value="True"/>
-                     </MultiTrigger.Conditions>
-                     <Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.SelectedActive.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.SelectedActive.Border}"/>
-                     <Setter Property="Foreground" Value="{StaticResource Item.SelectedActive.Foreground}"/>
-                     <Setter Property="FontWeight" Value="Bold" />
-                  </MultiTrigger>
-                  <Trigger Property="IsEnabled" Value="False">
-                     <Setter Property="TextElement.Foreground" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
+   <Style x:Key="EgtManageDialog_TreeView" TargetType="{x:Type TreeView}">
+      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_White}"/>
+      <Setter Property="FontSize" Value="15"/>
+      <Setter Property="Margin" Value="10"/>
    </Style>
 
-   <!--#endregion ListBox-->
+   <Style x:Key="MachiningDB_TreeView" TargetType="{x:Type TreeView}">
+      <Setter Property="Background" Value="{StaticResource TreeView.Static.Background}"/>
+   </Style>
+
+   <!--#endregion TreeView-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region Border-->
+
+   <!--#region Optimizer-->
+   
+   <Style x:Key="Optimizer_Border" TargetType="{x:Type Border}">
+      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Glacier}"/>
+      <Setter Property="CornerRadius" Value="4"/>
+      <Setter Property="BorderThickness" Value="2"/>
+   </Style>
+
+   <Style x:Key="NewOpenProjectFileDialog_Border" TargetType="{x:Type Border}" BasedOn="{StaticResource Optimizer_Border}">
+      <Setter Property="Margin" Value="1"/>
+   </Style>
+
+   <!--#endregion Optimizer-->
+
+   <Style x:Key="EgtManageDialog_Border" TargetType="{x:Type Border}">
+      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Alto}"/>
+      <Setter Property="BorderThickness" Value="1"/>
+   </Style>
+
+   <Style x:Key="TitleBar_Border" TargetType="{x:Type Border}">
+      <Setter Property="Background" Value="{StaticResource BeamWall_Casper}"/>
+      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Casper}"/>
+      <Setter Property="BorderThickness" Value="0"/>
+   </Style>
+
+   <!--#endregion Border-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region StatusBar-->
+
+   <Style x:Key="StatusBar_StatusBar" TargetType="{x:Type StatusBar}">
+      <Setter Property="Background" Value="{StaticResource BeamWall_Alto}"/>
+   </Style>
+
+   <!--#endregion StatusBar-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region ProgressBar-->
+
+   <Style x:Key="StatusBar_ProgressBar" TargetType="{x:Type ProgressBar}">
+      <Setter Property="Width" Value="150"/>
+      <Setter Property="Height" Value="20"/>
+   </Style>
+
+   <Style x:Key="NestingRunningWndV_ProgressBar" TargetType="{x:Type ProgressBar}">
+      <Setter Property="Minimum" Value="0"/>
+      <Setter Property="Maximum" Value="100"/>
+      <Setter Property="Height" Value="20"/>
+      <Setter Property="Margin" Value="40,0,40,0"/>
+   </Style>
+
+   <!--#endregion ProgressBar-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
@@ -1783,15 +2349,389 @@
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!--#region Border-->
+   <!--#region DatePicker-->
 
-   <Style x:Key="Optimizer_Border" TargetType="{x:Type Border}">
-      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Glacier}"/>
-      <Setter Property="CornerRadius" Value="4"/>
-      <Setter Property="BorderThickness" Value="2"/>
+   <Style x:Key="Filter_DatePicker" TargetType="{x:Type DatePicker}">
+      <Setter Property="Height" Value="25" />
+      <Setter Property="Width" Value="100" />
+      <Setter Property="BorderBrush" Value="Transparent"/>
+      <Setter Property="Background" Value="Transparent"/>
+      <Style.Resources>
+         <Style TargetType="{x:Type DatePickerTextBox}">
+            <Setter Property="Background" Value="Transparent"/>
+         </Style>
+      </Style.Resources>
    </Style>
 
-   <!--#endregion Border-->
+   <Style x:Key="Filter_Calendar" TargetType="{x:Type Calendar}">
+      <Setter Property="Background">
+         <Setter.Value>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
+               <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0"/>
+               <GradientStop Color="{StaticResource BeamWall_LinkWater_Color}" Offset="0.16"/>
+               <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
+            </LinearGradientBrush>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="BorderBrush">
+         <Setter.Value>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
+               <GradientStop Color="{StaticResource BeamWall_LinkWater_Color}" Offset="0"/>
+               <GradientStop Color="{StaticResource BeamWall_RegentStBlue_Color}" Offset="0.45"/>
+               <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0.75"/>
+               <GradientStop Color="{StaticResource BeamWall_Kashmir_Color}" Offset="1"/>
+            </LinearGradientBrush>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="BorderThickness" Value="1"/>
+   </Style>
+
+   <!--#endregion DatePicker-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region DataGrid-->
+
+   <Style x:Key="Main_DataGridColumnHeader" TargetType="{x:Type DataGridColumnHeader}">
+      <Setter Property="Background" Value="{StaticResource BeamWall_Teal}" />
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
+      <Setter Property="FontWeight" Value="Bold" />
+      <Setter Property="FontSize" Value="15" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="Padding" Value="0,2,0,2" />
+   </Style>
+
+   <Style x:Key="Feature_DataGridColumnHeader" TargetType="{x:Type DataGridColumnHeader}">
+      <Setter Property="Background" Value="{StaticResource BeamWall_Keppel}" />
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
+      <Setter Property="FontWeight" Value="Bold" />
+      <Setter Property="FontSize" Value="15" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="Padding" Value="0,2,0,2" />
+   </Style>
+
+   <Style x:Key="PartInRawPart_DataGridColumnHeader" TargetType="{x:Type DataGridColumnHeader}">
+      <Setter Property="Background" Value="{StaticResource BeamWall_Jaffa}" />
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
+      <Setter Property="FontWeight" Value="Bold" />
+      <Setter Property="FontSize" Value="15" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="Padding" Value="0,2,0,2" />
+   </Style>
+
+   <Style x:Key="PParam_DataGridColumnHeader" TargetType="{x:Type DataGridColumnHeader}">
+      <Setter Property="Background" Value="{StaticResource BeamWall_Downy}" />
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
+      <Setter Property="FontWeight" Value="Bold" />
+      <Setter Property="FontSize" Value="15" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="Padding" Value="0,2,0,2" />
+   </Style>
+
+   <Style x:Key="RawPart_DataGridColumnHeader" TargetType="{x:Type DataGridColumnHeader}">
+      <Setter Property="Background" Value="{StaticResource BeamWall_White}" />
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}" />
+      <Setter Property="FontWeight" Value="SemiBold" />
+      <Setter Property="FontSize" Value="11" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="Padding" Value="0,2,0,2" />
+   </Style>
+
+   <Style x:Key="Optimizer_DataGrid" TargetType="{x:Type DataGrid}">
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Glacier}"/>
+      <Setter Property="BorderThickness" Value="0,0,0,0"/>
+      <Setter Property="RowDetailsVisibilityMode" Value="VisibleWhenSelected"/>
+      <Setter Property="ScrollViewer.CanContentScroll" Value="True"/>
+      <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
+      <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
+      <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
+      <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+      <Setter Property="HeadersVisibility" Value="Column" />
+      <Setter Property="TextBlock.TextAlignment" Value="Center"/>
+      <Setter Property="HorizontalContentAlignment" Value="Center"/>
+      <Setter Property="VerticalContentAlignment" Value="Center"/>
+      <Setter Property="CanUserAddRows" Value="False"/>
+      <Setter Property="CanUserResizeRows" Value="False"/>
+      <Setter Property="AutoGenerateColumns" Value="False"/>
+      <Setter Property="VirtualizingPanel.IsVirtualizing" Value="True"/>
+      <Setter Property="VirtualizingPanel.VirtualizationMode" Value="Recycling"/>
+      <Setter Property="EnableColumnVirtualization" Value="True"/>
+      <Setter Property="EnableRowVirtualization" Value="True"/>
+      <Setter Property="VirtualizingStackPanel.ScrollUnit" Value="Pixel"/>
+      <Setter Property="RowHeight" Value="24"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type DataGrid}">
+               <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
+                  <ScrollViewer x:Name="DG_ScrollViewer" Focusable="false">
+                     <ScrollViewer.Template>
+                        <ControlTemplate TargetType="{x:Type ScrollViewer}">
+                           <Grid>
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="Auto"/>
+                                 <ColumnDefinition Width="*"/>
+                                 <ColumnDefinition Width="Auto"/>
+                              </Grid.ColumnDefinitions>
+                              <Grid.RowDefinitions>
+                                 <RowDefinition Height="Auto"/>
+                                 <RowDefinition Height="*"/>
+                                 <RowDefinition Height="Auto"/>
+                              </Grid.RowDefinitions>
+                              <Button Command="{x:Static DataGrid.SelectAllCommand}" Focusable="false" Style="{DynamicResource {ComponentResourceKey ResourceId=DataGridSelectAllButtonStyle, TypeInTargetAssembly={x:Type DataGrid}}}" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.All}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                              <DataGridColumnHeadersPresenter x:Name="PART_ColumnHeadersPresenter" Grid.Column="1" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Column}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                              <ScrollContentPresenter x:Name="PART_ScrollContentPresenter" CanContentScroll="{TemplateBinding CanContentScroll}" Grid.ColumnSpan="2" Grid.Row="1"/>
+                              <ScrollBar x:Name="PART_VerticalScrollBar" Grid.Column="2" Maximum="{TemplateBinding ScrollableHeight}" Orientation="Vertical" Grid.Row="1" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource Mode=TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"/>
+                              <Grid Grid.Column="1" Grid.Row="2">
+                                 <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="{Binding NonFrozenColumnsViewportHorizontalOffset, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                                    <ColumnDefinition Width="*"/>
+                                 </Grid.ColumnDefinitions>
+                                 <ScrollBar x:Name="PART_HorizontalScrollBar" Grid.Column="1" Maximum="{TemplateBinding ScrollableWidth}" Orientation="Horizontal" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource Mode=TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"/>
+                              </Grid>
+                           </Grid>
+                        </ControlTemplate>
+                     </ScrollViewer.Template>
+                     <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                  </ScrollViewer>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+      <Style.Triggers>
+         <MultiTrigger>
+            <MultiTrigger.Conditions>
+               <Condition Property="IsGrouping" Value="true"/>
+               <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false"/>
+            </MultiTrigger.Conditions>
+            <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+         </MultiTrigger>
+      </Style.Triggers>
+      <Style.Resources>
+         <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource Optimizer_ScrollBar}"/>
+      </Style.Resources>
+   </Style>
+
+   <Style x:Key="RowDataGrid_CustomHighLight" TargetType="{x:Type DataGridRow}">
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}" />
+      <Style.Resources>
+         <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Transparent" />
+         <SolidColorBrush x:Key="{x:Static SystemColors.HighlightTextBrushKey}" Color="Black" />
+         <SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightBrushKey}" Color="Transparent" />
+         <SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightTextBrushKey}" Color="Black" />
+      </Style.Resources>
+      <Style.Triggers>
+         <Trigger Property="IsSelected" Value="True">
+            <Setter Property="BorderBrush" Value="{StaticResource BeamWall_FountainBlue}" />
+            <Setter Property="FontWeight" Value="Bold" />
+            <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
+            <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}" />
+         </Trigger>
+      </Style.Triggers>
+   </Style>
+
+   <Style x:Key="CellDataGrid_CustomHighLight" TargetType="{x:Type DataGridCell}">
+      <Setter Property="Height" Value="24"/>
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}" />
+      <Style.Resources>
+         <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Transparent" />
+         <SolidColorBrush x:Key="{x:Static SystemColors.HighlightTextBrushKey}" Color="Black" />
+         <SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightBrushKey}" Color="Transparent" />
+         <SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightTextBrushKey}" Color="Black" />
+      </Style.Resources>
+      <Style.Triggers>
+         <Trigger Property="IsSelected" Value="True">
+            <Setter Property="BorderBrush" Value="{StaticResource BeamWall_FountainBlue}" />
+            <Setter Property="FontWeight" Value="Bold" />
+            <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
+            <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}" />
+         </Trigger>
+      </Style.Triggers>
+   </Style>
+
+   <!--#endregion DataGrid-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region EgtWindow-->
+
+   <Grid x:Key="OptimizerWindow.Path.Maximize">
+      <Path Width="46"
+			   Height="32"
+			   Data="M 18.5,12.5 H 25.5 V 19.5 H 18.5 Z M 20.5,12.5 V 10.5 H 27.5 V 17.5 H 25.5"
+			   Stroke="{Binding Path=Foreground,
+			                    RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+			   StrokeThickness="1" />
+   </Grid>
+
+   <Grid x:Key="OptimizerWindow.Path.Normal">
+      <Path Width="46"
+			   Height="32"
+			   Data="M 18.5,10.5 H 27.5 V 19.5 H 18.5 Z"
+			   Stroke="{Binding Path=Foreground,
+			                    RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+			   StrokeThickness="1" />
+   </Grid>
+
+   <ControlTemplate x:Key="OptimizerWindow.ControlTemplate.WithTitleBar" TargetType="{x:Type EgwWPFBaseLib:EgtWindow}">
+      <Border BorderThickness="{TemplateBinding BorderThickness}"
+              BorderBrush="{StaticResource BeamWall_Alto}"
+              Background="{TemplateBinding Background}">
+         <Grid>
+            <Grid.RowDefinitions>
+               <RowDefinition Height="{Binding TitleBarHeight, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}"/>
+               <RowDefinition Height="1*"/>
+            </Grid.RowDefinitions>
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="*" />
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="Auto" />
+               </Grid.ColumnDefinitions>
+               <Border Grid.Column="0"
+                       Grid.ColumnSpan="6"
+                       BorderThickness="0"
+                       BorderBrush="{StaticResource BeamWall_Glacier}"
+                       Background="{StaticResource BeamWall_Glacier}"/>
+               <Image Grid.Column="0"
+		                MinWidth="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
+		                Source="{TemplateBinding Icon}"/>
+               <ContentControl Grid.Column="1"
+                               Content="{TemplateBinding TitlePanel}"/>
+               <TextBlock Grid.Column="2"
+		                    Margin="4 0 0 0"
+		                    VerticalAlignment="Center"
+                          HorizontalAlignment="Center"
+		                    FontSize="14"
+		                    Text="{TemplateBinding Title}">
+                  <TextBlock.Style>
+                     <Style TargetType="TextBlock">
+                        <Style.Triggers>
+                           <DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource AncestorType=Window}}" Value="False">
+                              <Setter Property="Foreground" Value="{DynamicResource WindowTitleBarInactiveText}" />
+                           </DataTrigger>
+                        </Style.Triggers>
+                     </Style>
+                  </TextBlock.Style>
+               </TextBlock>
+               <Button Grid.Column="3"
+                       Name="PART_MinimizeBtn"
+		                 RenderOptions.EdgeMode="Aliased"
+		                 Style="{StaticResource Button.OptimizerWindow.TitleBar}">
+                  <Path Width="46"
+			               Height="32"
+			               Data="M 18,15 H 28"
+			               Stroke="{Binding Path=Foreground,
+							                    RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+			               StrokeThickness="1" />
+               </Button>
+               <Button Grid.Column="4"
+                       Name="PART_MaximizeRestoreBtn">
+                  <Button.Style>
+                     <Style TargetType="Button" BasedOn="{StaticResource Button.OptimizerWindow.TitleBar}">
+                        <Style.Triggers>
+                           <DataTrigger Binding="{Binding WindowState, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}" Value="Maximized">
+                              <Setter Property="Content" Value="{StaticResource OptimizerWindow.Path.Maximize}" />
+                           </DataTrigger>
+                           <DataTrigger Binding="{Binding WindowState, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}" Value="Normal">
+                              <Setter Property="Content" Value="{StaticResource OptimizerWindow.Path.Normal}" />
+                           </DataTrigger>
+                        </Style.Triggers>
+                     </Style>
+                  </Button.Style>
+               </Button>
+               <Button Grid.Column="5"
+                       Name="PART_CloseBtn"
+		                 Style="{StaticResource Button.OptimizerWindow.TitleBar}">
+                  <Path Width="46"
+			               Height="32"
+			               Data="M 18,11 27,20 M 18,20 27,11"
+			               Stroke="{Binding Path=Foreground,
+			               				     RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+			               StrokeThickness="1" />
+               </Button>
+            </Grid>
+            <ContentPresenter Grid.Row="1" 
+                              Content="{TemplateBinding Content}"/>
+         </Grid>
+      </Border>
+   </ControlTemplate>
+
+   <ControlTemplate x:Key="OptimizerWindow.ControlTemplate.WithoutTitleBar" TargetType="{x:Type EgwWPFBaseLib:EgtWindow}">
+      <Border BorderThickness="{TemplateBinding BorderThickness}"
+              BorderBrush="{StaticResource BeamWall_Glacier}">
+         <Border.Background>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
+               <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
+               <GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.45"/>
+               <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
+            </LinearGradientBrush>
+         </Border.Background>
+         <ContentPresenter Grid.Row="1" 
+                           Content="{TemplateBinding Content}"/>
+      </Border>
+   </ControlTemplate>
+
+   <Style TargetType="{x:Type EgtBEAMWALLCORE:OptimizerWindow}" BasedOn="{StaticResource {x:Type EgwWPFBaseLib:EgtWindow}}">
+      <Setter Property="Background">
+         <Setter.Value>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
+               <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
+               <GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.45"/>
+               <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
+            </LinearGradientBrush>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
+      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Glacier}"/>
+      <Setter Property="TitleBarHeight" Value="45"/>
+      <Setter Property="BorderThickness" Value="0"/>
+      <Setter Property="IsMinimizable" Value="True"/>
+      <Setter Property="Icon" Value="pack://application:,,,/EgtBEAMWALL.Core;component/Resources/EgalwareLogo.ico"/>
+      <Setter Property="WindowChrome.WindowChrome">
+         <Setter.Value>
+            <WindowChrome CaptionHeight="{Binding TitleBarHeight, RelativeSource={RelativeSource AncestorType={x:Type EgwWPFBaseLib:EgtWindow}}}" 
+                          GlassFrameThickness="0"
+                          CornerRadius="0"
+                          ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}"/>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="Template" Value="{StaticResource OptimizerWindow.ControlTemplate.WithTitleBar}"/>
+      <Style.Triggers>
+         <Trigger Property="WindowStyle" Value="None">
+            <Setter Property="Template" Value="{StaticResource OptimizerWindow.ControlTemplate.WithoutTitleBar}"/>
+         </Trigger>
+         <Trigger Property="WindowState" Value="Maximized">
+            <Setter Property="BorderThickness" Value="7"/>
+            <Setter Property="Template" Value="{StaticResource OptimizerWindow.ControlTemplate.WithTitleBar}"/>
+         </Trigger>
+         <MultiTrigger>
+            <MultiTrigger.Conditions>
+               <Condition Property="WindowState" Value="Maximized"/>
+               <Condition Property="WindowStyle" Value="None"/>
+            </MultiTrigger.Conditions>
+            <Setter Property="BorderThickness" Value="0"/>
+            <Setter Property="Template" Value="{StaticResource OptimizerWindow.ControlTemplate.WithoutTitleBar}"/>
+         </MultiTrigger>
+      </Style.Triggers>
+   </Style>
+
+   <Style x:Key="OptimizerWindow.Dialog" TargetType="{x:Type EgtBEAMWALLCORE:OptimizerWindow}">
+      <Setter Property="IsMinimizable" Value="False"/>
+      <Setter Property="IsResizable" Value="False"/>
+   </Style>
+
+   <Style x:Key="OptimizerWindow.Dialog.NoClose" TargetType="{x:Type EgtBEAMWALLCORE:OptimizerWindow}">
+      <Setter Property="IsMinimizable" Value="False"/>
+      <Setter Property="IsResizable" Value="False"/>
+      <Setter Property="IsClosable" Value="False"/>
+   </Style>
+
+   <!--#endregion EgtWindow-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
@@ -1818,305 +2758,14 @@
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!--#region TabItem-->
+   <!--#region EgtFloatingPanel -->
 
-   <Style x:Key="OnlyProd_TabItem" TargetType="{x:Type TabItem}">
-      <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
-      <Setter Property="Background" Value="{StaticResource TabItem.Static.Background}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource TabItem.Static.Border}"/>
-      <Setter Property="Margin" Value="0"/>
-      <Setter Property="Padding" Value="6,2,6,2"/>
-      <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-      <Setter Property="VerticalContentAlignment" Value="Stretch"/>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type TabItem}">
-               <Grid x:Name="templateRoot" SnapsToDevicePixels="true">
-                  <Border x:Name="mainBorder" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1,1,1,0" Margin="2,0" CornerRadius="4,4,0,0">
-                     <Border x:Name="innerBorder" Background="{StaticResource TabItem.Selected.Background}" BorderBrush="{StaticResource TabItem.Selected.Border}" BorderThickness="1,1,1,0" Margin="-1" Opacity="0" CornerRadius="4,4,0,0"/>
-                  </Border>
-                  <ContentPresenter x:Name="contentPresenter" ContentSource="Header" Focusable="False" HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
-               </Grid>
-               <ControlTemplate.Triggers>
-                  <MultiDataTrigger>
-                     <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Mode=Self}}" Value="true"/>
-                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Left"/>
-                     </MultiDataTrigger.Conditions>
-                     <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Border}"/>
-                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,0,1"/>
-                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,0,1"/>
-                  </MultiDataTrigger>
-                  <MultiDataTrigger>
-                     <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Mode=Self}}" Value="true"/>
-                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Bottom"/>
-                     </MultiDataTrigger.Conditions>
-                     <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Border}"/>
-                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,0,1,1"/>
-                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,0,1,1"/>
-                  </MultiDataTrigger>
-                  <MultiDataTrigger>
-                     <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Mode=Self}}" Value="true"/>
-                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Right"/>
-                     </MultiDataTrigger.Conditions>
-                     <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Border}"/>
-                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="0,1,1,1"/>
-                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,1,1,1"/>
-                  </MultiDataTrigger>
-                  <MultiDataTrigger>
-                     <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Mode=Self}}" Value="true"/>
-                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Top"/>
-                     </MultiDataTrigger.Conditions>
-                     <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Border}"/>
-                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,1,0"/>
-                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,1,0"/>
-                  </MultiDataTrigger>
-                  <MultiDataTrigger>
-                     <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Mode=Self}}" Value="false"/>
-                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Left"/>
-                     </MultiDataTrigger.Conditions>
-                     <Setter Property="Opacity" TargetName="contentPresenter" Value="0.56"/>
-                     <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Border}"/>
-                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,0,1"/>
-                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,0,1"/>
-                  </MultiDataTrigger>
-                  <MultiDataTrigger>
-                     <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Mode=Self}}" Value="false"/>
-                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Bottom"/>
-                     </MultiDataTrigger.Conditions>
-                     <Setter Property="Opacity" TargetName="contentPresenter" Value="0.56"/>
-                     <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Border}"/>
-                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,0,1,1"/>
-                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,0,1,1"/>
-                  </MultiDataTrigger>
-                  <MultiDataTrigger>
-                     <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Mode=Self}}" Value="false"/>
-                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Right"/>
-                     </MultiDataTrigger.Conditions>
-                     <Setter Property="Opacity" TargetName="contentPresenter" Value="0.56"/>
-                     <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Border}"/>
-                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="0,1,1,1"/>
-                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,1,1,1"/>
-                  </MultiDataTrigger>
-                  <MultiDataTrigger>
-                     <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Mode=Self}}" Value="false"/>
-                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Top"/>
-                     </MultiDataTrigger.Conditions>
-                     <Setter Property="Opacity" TargetName="contentPresenter" Value="0.56"/>
-                     <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Border}"/>
-                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,1,0"/>
-                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,1,0"/>
-                  </MultiDataTrigger>
-                  <MultiDataTrigger>
-                     <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Mode=Self}}" Value="false"/>
-                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Left"/>
-                     </MultiDataTrigger.Conditions>
-                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,0,1"/>
-                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,0,1"/>
-                  </MultiDataTrigger>
-                  <MultiDataTrigger>
-                     <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Mode=Self}}" Value="true"/>
-                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Left"/>
-                     </MultiDataTrigger.Conditions>
-                     <Setter Property="Panel.ZIndex" Value="1"/>
-                     <Setter Property="Margin" Value="-2,-2,0,-2"/>
-                     <Setter Property="Opacity" TargetName="innerBorder" Value="1"/>
-                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,0,1"/>
-                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,0,1"/>
-                  </MultiDataTrigger>
-                  <MultiDataTrigger>
-                     <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Mode=Self}}" Value="false"/>
-                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Bottom"/>
-                     </MultiDataTrigger.Conditions>
-                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,0,1,1"/>
-                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,0,1,1"/>
-                  </MultiDataTrigger>
-                  <MultiDataTrigger>
-                     <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Mode=Self}}" Value="true"/>
-                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Bottom"/>
-                     </MultiDataTrigger.Conditions>
-                     <Setter Property="Panel.ZIndex" Value="1"/>
-                     <Setter Property="Margin" Value="-2,0,-2,-2"/>
-                     <Setter Property="Opacity" TargetName="innerBorder" Value="1"/>
-                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,0,1,1"/>
-                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,0,1,1"/>
-                  </MultiDataTrigger>
-                  <MultiDataTrigger>
-                     <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Mode=Self}}" Value="false"/>
-                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Right"/>
-                     </MultiDataTrigger.Conditions>
-                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="0,1,1,1"/>
-                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,1,1,1"/>
-                  </MultiDataTrigger>
-                  <MultiDataTrigger>
-                     <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Mode=Self}}" Value="true"/>
-                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Right"/>
-                     </MultiDataTrigger.Conditions>
-                     <Setter Property="Panel.ZIndex" Value="1"/>
-                     <Setter Property="Margin" Value="0,-2,-2,-2"/>
-                     <Setter Property="Opacity" TargetName="innerBorder" Value="1"/>
-                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="0,1,1,1"/>
-                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,1,1,1"/>
-                  </MultiDataTrigger>
-                  <MultiDataTrigger>
-                     <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Mode=Self}}" Value="false"/>
-                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Top"/>
-                     </MultiDataTrigger.Conditions>
-                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,1,0"/>
-                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,1,0"/>
-                  </MultiDataTrigger>
-                  <MultiDataTrigger>
-                     <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Mode=Self}}" Value="true"/>
-                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Top"/>
-                     </MultiDataTrigger.Conditions>
-                     <Setter Property="Panel.ZIndex" Value="1"/>
-                     <Setter Property="Margin" Value="-2,-2,-2,0"/>
-                     <Setter Property="Opacity" TargetName="innerBorder" Value="1"/>
-                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,1,0"/>
-                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,1,0"/>
-                  </MultiDataTrigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <!--#endregion TabItem-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region TabControl-->
-
-   <Style x:Key="Generic_TabControl" TargetType="{x:Type TabControl}">
-      <Setter Property="TabStripPlacement" Value="Top"/>
-      <Setter Property="Margin" Value="5,5,2.5,5"/>
-      <Setter Property="Background">
-         <Setter.Value>
-            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
-               <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
-               <GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.45"/>
-               <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
-            </LinearGradientBrush>
-         </Setter.Value>
-      </Setter>
-      <Style.Resources>
-         <Style TargetType="{x:Type TabItem}" BasedOn="{StaticResource OnlyProd_TabItem}"/>
-      </Style.Resources>
-   </Style>
-
-   <Style x:Key="OnlyHeaders_TabControl" TargetType="{x:Type TabControl}" BasedOn="{StaticResource Generic_TabControl}">
-      <Setter Property="OverridesDefaultStyle" Value="True" />
-      <Setter Property="SnapsToDevicePixels" Value="True" />
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type TabControl}">
-               <Grid KeyboardNavigation.TabNavigation="Local">
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="Auto"/>
-                     <RowDefinition Height="*"/>
-                  </Grid.RowDefinitions>
-                  <TabPanel Name="HeaderPanel"
-                            Grid.Row="0"
-                            Panel.ZIndex="1" 
-                            Margin="0,0,4,-1" 
-                            IsItemsHost="True"
-                            KeyboardNavigation.TabIndex="1"
-                            Background="Transparent" />
-               </Grid>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsEnabled" Value="False">
-                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <!--#endregion TabControl-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region Image-->
-
-   <Style x:Key="BTLDataWnd_Image" TargetType="{x:Type Image}">
-      <Setter Property="Stretch" Value="Uniform"/>
-   </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="Lock_Image" TargetType="{x:Type Image}">
-      <Setter Property="Source" Value="/Resources/PartManager/Locked.png" />
-      <Setter Property="Height" Value="15"/>
-      <Setter Property="Stretch" Value="Uniform"/>
-      <Style.Triggers>
-         <DataTrigger Binding="{Binding IsEnabled,RelativeSource={RelativeSource self}}" Value="False">
-            <Setter Property="Source" Value="/Resources/PartManager/Unlocked.png"/>
-         </DataTrigger>
-      </Style.Triggers>
-   </Style>
-
-   <Style x:Key="Button_Image" TargetType="{x:Type Image}">
-      <Setter Property="Stretch" Value="Uniform" />
-   </Style>
-
-   <!--#endregion Image-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region ItemsControl-->
-
-   <Style x:Key="ProjFileList_ItemsControl" TargetType="{x:Type ItemsControl}" BasedOn="{StaticResource {x:Type ItemsControl}}">
-      <Setter Property="Margin" Value="0,-1,0,0"/>
-      <Setter Property="Padding" Value="0"/>
-      <Setter Property="BorderThickness" Value="0"/>
-   </Style>
-
-   <!--#endregion ItemsControl-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region Grid-->
-
-   <Style x:Key="ProjFileList_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="TextBlock.FontSize" Value="12"/>
-      <Setter Property="TextBlock.FontWeight" Value="Normal"/>
-   </Style>
-
-   <Style x:Key="Gray_Grid" TargetType="{x:Type Grid}">
+   <Style x:Key="ToolBar_EgtFloatingPanel" TargetType="{x:Type EgtFloating:EgtFloatingPanel}" BasedOn="{StaticResource {x:Type EgtFloating:EgtFloatingPanel}}">
       <Setter Property="Background" Value="{StaticResource BeamWall_Gray}"/>
-      <Setter Property="Margin" Value="40,0,40,0"/>
+      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Gray}"/>
    </Style>
 
-   <!--#endregion Grid-->
+   <!--#endregion EgtFloatingPanel -->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
@@ -2130,7 +2779,7 @@
       <Setter Property="VerticalContentAlignment" Value="Center"/>
       <Setter Property="Template">
          <Setter.Value>
-            <ControlTemplate TargetType="EgtWPFLib5:EgtHexItem">
+            <ControlTemplate TargetType="{x:Type EgtWPFLib5:EgtHexItem}">
                <Grid Name="hexBorder" Background="{TemplateBinding BorderBrush}">
                   <Grid.Clip>
                      <MultiBinding Converter="{StaticResource ClipConverter}">
@@ -2171,6 +2820,12 @@
 
    <!--HexList-->
    <Style x:Key="EgtHexList" TargetType="{x:Type EgtWPFLib5:EgtHexList}">
+      <Setter Property="Orientation" Value="Vertical"/>
+      <Setter Property="RowCount" Value="13"/>
+      <Setter Property="ColumnCount" Value="13"/>
+      <Setter Property="Width" Value="350"/>
+      <Setter Property="Height" Value="300"/>
+      <Setter Property="Margin" Value="2.5"/>
       <Setter Property="ItemsPanel">
          <Setter.Value>
             <ItemsPanelTemplate>
@@ -2180,7 +2835,6 @@
             </ItemsPanelTemplate>
          </Setter.Value>
       </Setter>
-
       <Setter Property="Template">
          <Setter.Value>
             <ControlTemplate TargetType="{x:Type EgtWPFLib5:EgtHexList}">
@@ -2206,115 +2860,82 @@
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!--#region GroupBox-->
+   <!--#region Image-->
 
-   <Style x:Key="NoHeader_GroupBox" TargetType="{x:Type GroupBox}">
-      <Setter Property="Margin" Value="1.5,3,3,0"/>
-      <Setter Property="Padding" Value="5,5,0,0"/>
-      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Geyser}"/>
-      <Setter Property="BorderThickness" Value="1"/>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type GroupBox}">
-               <Grid SnapsToDevicePixels="True">
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="6"/>
-                     <ColumnDefinition Width="Auto"/>
-                     <ColumnDefinition Width="*"/>
-                     <ColumnDefinition Width="6"/>
-                  </Grid.ColumnDefinitions>
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="Auto"/>
-                     <RowDefinition Height="Auto"/>
-                     <RowDefinition Height="*"/>
-                     <RowDefinition Height="6"/>
-                  </Grid.RowDefinitions>
-                  <Border BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="4" Grid.Column="0" CornerRadius="4" Grid.Row="1" Grid.RowSpan="3"/>
-                  <Border BorderBrush="{StaticResource BeamWall_White}" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="4" CornerRadius="4" Grid.Row="1" Grid.RowSpan="3">
-                     <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="3">
-                        <Border BorderBrush="{StaticResource BeamWall_White}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2"/>
-                     </Border>
-                  </Border>
-                  <Border x:Name="Header" Grid.Column="1" Padding="3,1,3,0" Grid.Row="0" Grid.RowSpan="2">
-                     <ContentPresenter ContentTemplate="{TemplateBinding HeaderTemplate}" Content="{TemplateBinding Header}" ContentStringFormat="{TemplateBinding HeaderStringFormat}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                  </Border>
-                  <ContentPresenter Grid.ColumnSpan="2" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="1" ContentStringFormat="{TemplateBinding ContentStringFormat}" Margin="{TemplateBinding Padding}" Grid.Row="2" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-               </Grid>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
+   <Style x:Key="BTLDataWnd_Image" TargetType="{x:Type Image}">
+      <Setter Property="Stretch" Value="Uniform"/>
    </Style>
 
-   <Style x:Key="General_GroupBox" TargetType="{x:Type GroupBox}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Glacier}"/>
+   <Style x:Key="Button_Image" TargetType="{x:Type Image}" BasedOn="{StaticResource BTLDataWnd_Image}">
+      <Setter Property="Height" Value="15"/>
    </Style>
 
-   <!--#endregion GroupBox-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region EgtFloatingPanel -->
-
-   <Style x:Key="ToolBar_EgtFloatingPanel" TargetType="{x:Type EgtFloating:EgtFloatingPanel}" BasedOn="{StaticResource {x:Type EgtFloating:EgtFloatingPanel}}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_Gray}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Gray}"/>
+   <Style x:Key="Source_Image" TargetType="{x:Type Image}" BasedOn="{StaticResource Button_Image}">
+      <Setter Property="Margin" Value="2.5,0,2.5,0"/>
    </Style>
 
-   <!--#endregion EgtFloatingPanel -->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region StackPanel-->
-
-   <Style x:Key="PartManager_StackPanel" TargetType="{x:Type StackPanel}">
-      <Setter Property="Orientation" Value="Horizontal"/>
+   <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="ConfigurationProgram_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
-      <Setter Property="Margin" Value="5"/>
+   <Style x:Key="Lock_Image" TargetType="{x:Type Image}">
+      <Setter Property="Source" Value="/Resources/PartManager/Locked.png"/>
+      <Setter Property="Height" Value="15"/>
+      <Setter Property="Stretch" Value="Uniform"/>
+      <Style.Triggers>
+         <DataTrigger Binding="{Binding IsEnabled,RelativeSource={RelativeSource self}}" Value="False">
+            <Setter Property="Source" Value="/Resources/PartManager/Unlocked.png"/>
+         </DataTrigger>
+      </Style.Triggers>
    </Style>
 
-   <Style x:Key="BTLPartManager_StackPanel" TargetType="{x:Type StackPanel}">
-      <Setter Property="Orientation" Value="Vertical"/>
-   </Style>
-
-   <!--#endregion StackPanel-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region WrapPanel-->
-
-   <Style x:Key="Project_WrapPanel" TargetType="{x:Type WrapPanel}">
-      <Setter Property="Orientation" Value="Vertical"/>
-   </Style>
-
-   <Style x:Key="ProjectH_WrapPanel" TargetType="{x:Type WrapPanel}">
-      <Setter Property="Orientation" Value="Horizontal"/>
-   </Style>
-
-   <!--#endregion WrapPanel-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region StatusBar-->
-
-   <Style x:Key="StatusBar_StatusBar" TargetType="{x:Type StatusBar}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_Alto}"/>
-   </Style>
-
-   <!--#endregion StatusBar-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region ProgressBar-->
-
-   <Style x:Key="StatusBar_ProgressBar" TargetType="{x:Type ProgressBar}">
-      <Setter Property="Width" Value="150"/>
+   <Style x:Key="MachiningDB_Image" TargetType="{x:Type Image}">
+      <Setter Property="Width" Value="20"/>
       <Setter Property="Height" Value="20"/>
+      <Setter Property="Margin" Value="0,0,5,0"/>
    </Style>
 
-   <!--#endregion ProgressBar-->
+   <!--#endregion Image-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region Ellipse-->
+
+   <Style x:Key="SetUp_Ellipse" TargetType="{x:Type Ellipse}">
+      <Setter Property="Width" Value="10"/>
+      <Setter Property="Height" Value="10"/>
+   </Style>
+
+   <Style x:Key="FeatureInPartInRawPartList_Ellipse" TargetType="{x:Type Ellipse}">
+      <Setter Property="Fill" Value="{StaticResource BeamWall_Blue}"/>
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="Width" Value="5"/>
+      <Setter Property="Height" Value="5"/>
+   </Style>
+
+   <!--#endregion Ellipse-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region Rectangle-->
+
+   <Style x:Key="EgtColorPicker_Rectangle" TargetType="{x:Type Rectangle}">
+      <Setter Property="Stroke" Value="{StaticResource BeamWall_Black}"/>
+      <Setter Property="StrokeThickness" Value="0.5"/>
+      <Setter Property="Width" Value="20"/>
+      <Setter Property="Height" Value="20"/>
+      <Setter Property="Margin" Value="2"/>
+   </Style>
+
+   <Style x:Key="CurrColor_Rectangle" TargetType="{x:Type Rectangle}" BasedOn="{StaticResource EgtColorPicker_Rectangle}">
+      <Setter Property="Width" Value="100"/>
+      <Setter Property="Height" Value="70"/>
+      <Setter Property="Margin" Value="0"/>
+   </Style>
+
+   <!--#endregion Rectangle-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
diff --git a/EgtBEAMWALL.Core/TitleBar/TitleBarV.xaml b/EgtBEAMWALL.Core/TitleBar/TitleBarV.xaml
index 061ea907..80f83bed 100644
--- a/EgtBEAMWALL.Core/TitleBar/TitleBarV.xaml
+++ b/EgtBEAMWALL.Core/TitleBar/TitleBarV.xaml
@@ -9,30 +9,12 @@
       <ColumnDefinition Width="Auto" />
       <ColumnDefinition Width="Auto" />
    </Grid.ColumnDefinitions>
-   <Border Grid.Column="0"
-           Grid.ColumnSpan="6"
-           BorderThickness="0"
-           BorderBrush="{StaticResource Effector_Blue}"
-           Background="{StaticResource Effector_Blue}"/>
-   <Image Grid.Column="0"
-		    MinWidth="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
+   <Border Grid.ColumnSpan="6"
+           Style="{StaticResource TitleBar_Border}"/>
+   <Image MinWidth="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
 		    Source="/Resources/EgalwareLogo.ico"/>
    <ContentControl Grid.Column="1"/>
    <TextBlock Grid.Column="2"
-		              Margin="4 0 0 0"
-		              VerticalAlignment="Center"
-                    HorizontalAlignment="Center"
-		              FontSize="14"
-		              Text="{Binding sTitle}">
-      <TextBlock.Style>
-         <Style TargetType="TextBlock">
-            <Style.Triggers>
-               <DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource AncestorType=Window}}" Value="False">
-                  <Setter Property="Foreground" Value="{DynamicResource WindowTitleBarInactiveText}" />
-               </DataTrigger>
-            </Style.Triggers>
-         </Style>
-      </TextBlock.Style>
-   </TextBlock>
-
+		        Text="{Binding sTitle}"
+              Style="{StaticResource TitleBar_TextBlock}"/>
 </Grid>
diff --git a/EgtBEAMWALL.Core/ViewPanel/ViewPanelV.xaml b/EgtBEAMWALL.Core/ViewPanel/ViewPanelV.xaml
index 8ee1e95b..76185725 100644
--- a/EgtBEAMWALL.Core/ViewPanel/ViewPanelV.xaml
+++ b/EgtBEAMWALL.Core/ViewPanel/ViewPanelV.xaml
@@ -1,44 +1,49 @@
-<EgtFloating:EgtFloatingPanel x:Class="ViewPanelV"
-                              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                              xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
-                              IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
-                              IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}">
+<StackPanel x:Class="ViewPanelV"
+            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+            Style="{StaticResource BTLPartManager_StackPanel}">
 
    <Button ToolTip="{Binding ZoomAllToolTip}"
            Style="{StaticResource Mach_Button}"
            Command="{Binding ZoomAllCommand}">
-      <Image Source="/Resources/ViewPanel/ZoomAll.png" Stretch="Uniform"/>
+      <Image Source="/Resources/ViewPanel/ZoomAll.png"
+             Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromTopToolTip}"
            Style="{StaticResource Mach_Button}"
            Command="{Binding TopViewCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromTOP.png" Stretch="Uniform"/>
+      <Image Source="/Resources/ViewPanel/LookFromTOP.png"
+             Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromFrontToolTip}"
            Style="{StaticResource Mach_Button}"
            Command="{Binding FrontViewCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromFRONT.png" Stretch="Uniform"/>
+      <Image Source="/Resources/ViewPanel/LookFromFRONT.png"
+             Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromRightToolTip}"
            Style="{StaticResource Mach_Button}"
            Command="{Binding RightViewCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromRIGHT.png" Stretch="Uniform"/>
+      <Image Source="/Resources/ViewPanel/LookFromRIGHT.png"
+             Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromBackToolTip}"
            Style="{StaticResource Mach_Button}"
            Command="{Binding BackViewCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromBACK.png" Stretch="Uniform"/>
+      <Image Source="/Resources/ViewPanel/LookFromBACK.png"
+             Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromLeftToolTip}"
            Style="{StaticResource Mach_Button}"
            Command="{Binding LeftViewCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromLEFT.png" Stretch="Uniform"/>
+      <Image Source="/Resources/ViewPanel/LookFromLEFT.png"
+             Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromIso_SWToolTip}"
            Style="{StaticResource Mach_Button}"
            Command="{Binding IsoViewSWCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromISO_SW.png" Stretch="Uniform"/>
+      <Image Source="/Resources/ViewPanel/LookFromISO_SW.png"
+             Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
 
-</EgtFloating:EgtFloatingPanel>
+</StackPanel>
diff --git a/EgtBEAMWALL.Optimizer/AddFeatureWnd/AddFeatureWndV.xaml b/EgtBEAMWALL.Optimizer/AddFeatureWnd/AddFeatureWndV.xaml
index e444db12..317c1dfd 100644
--- a/EgtBEAMWALL.Optimizer/AddFeatureWnd/AddFeatureWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/AddFeatureWnd/AddFeatureWndV.xaml
@@ -4,7 +4,6 @@
                                  xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
                                  SizeToContent="WidthAndHeight"
                                  WindowStartupLocation="CenterOwner"
-                                 WindowStyle="None"
                                  Title="AddProcess"
                                  Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
 
diff --git a/EgtBEAMWALL.Optimizer/AddRawPartWnd/AddRawPartWndV.xaml b/EgtBEAMWALL.Optimizer/AddRawPartWnd/AddRawPartWndV.xaml
index 6d1e80e2..91871520 100644
--- a/EgtBEAMWALL.Optimizer/AddRawPartWnd/AddRawPartWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/AddRawPartWnd/AddRawPartWndV.xaml
@@ -5,7 +5,6 @@
                                  xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
                                  SizeToContent="WidthAndHeight"
                                  WindowStartupLocation="CenterOwner"
-                                 WindowStyle="None"
                                  Title="AddRawPartWnd"
                                  Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
    
diff --git a/EgtBEAMWALL.Optimizer/AddSectionXMaterialWnd/AddSectionXMaterialWndV.xaml b/EgtBEAMWALL.Optimizer/AddSectionXMaterialWnd/AddSectionXMaterialWndV.xaml
index ab156727..65fd88ae 100644
--- a/EgtBEAMWALL.Optimizer/AddSectionXMaterialWnd/AddSectionXMaterialWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/AddSectionXMaterialWnd/AddSectionXMaterialWndV.xaml
@@ -5,7 +5,6 @@
                                  xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
                                  SizeToContent="WidthAndHeight"
                                  WindowStartupLocation="CenterOwner"
-                                 WindowStyle="None"
                                  Title="AddSectionXMaterial"
                                  Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
    
diff --git a/EgtBEAMWALL.Optimizer/BlockedWnd/BlockedWndV.xaml b/EgtBEAMWALL.Optimizer/BlockedWnd/BlockedWndV.xaml
index 5236efbb..12969f5e 100644
--- a/EgtBEAMWALL.Optimizer/BlockedWnd/BlockedWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/BlockedWnd/BlockedWndV.xaml
@@ -4,7 +4,6 @@
                                  xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
                                  Title="{Binding Title}" 
                                  WindowStartupLocation="CenterOwner"
-                                 WindowStyle="None"
                                  Height="200" Width="400"
                                  Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
 
diff --git a/EgtBEAMWALL.Optimizer/ChangeParameterWnd/ChangeParameterWndV.xaml b/EgtBEAMWALL.Optimizer/ChangeParameterWnd/ChangeParameterWndV.xaml
index db30c101..cb359eac 100644
--- a/EgtBEAMWALL.Optimizer/ChangeParameterWnd/ChangeParameterWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/ChangeParameterWnd/ChangeParameterWndV.xaml
@@ -5,7 +5,6 @@
                                  xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
                                  SizeToContent="Height"
                                  WindowStartupLocation="CenterOwner"
-                                 WindowStyle="None"
                                  Width="300"
                                  Title="ChangeParameterWnd"
                                  Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
diff --git a/EgtBEAMWALL.Optimizer/InputPwdWnd/InputPwdWndV.xaml b/EgtBEAMWALL.Optimizer/InputPwdWnd/InputPwdWndV.xaml
index 238948be..bb33e80c 100644
--- a/EgtBEAMWALL.Optimizer/InputPwdWnd/InputPwdWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/InputPwdWnd/InputPwdWndV.xaml
@@ -4,7 +4,6 @@
                                  xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
                                  SizeToContent="WidthAndHeight"
                                  WindowStartupLocation="CenterOwner"
-                                 WindowStyle="None"
                                  Title="InputPwdWndV"
                                  Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
 
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml
index ca0fabfc..a488a23b 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml
@@ -359,7 +359,7 @@
                                  </Grid.ColumnDefinitions>
                                  <TextBlock Text="↓"
                                             Visibility="{Binding CALC_FALL_Visibility}"
-                                            Style="{StaticResource CALC_FALL_TextBlock}"/>
+                                            Style="{StaticResource RawPartList_TextBlock}"/>
                                  <Border Grid.Column="1"
                                          Width="{Binding ActualHeight, RelativeSource={RelativeSource self}}"                                                                   
                                          Background="{Binding Calc_Background}"/>
diff --git a/EgtBEAMWALL.Optimizer/MachinePanel/MachinePanelVM.vb b/EgtBEAMWALL.Optimizer/MachinePanel/MachinePanelVM.vb
index 7ab903f9..7c6a93b4 100644
--- a/EgtBEAMWALL.Optimizer/MachinePanel/MachinePanelVM.vb
+++ b/EgtBEAMWALL.Optimizer/MachinePanel/MachinePanelVM.vb
@@ -287,44 +287,6 @@ Public Class MachinePanelVM
       End If
    End Sub
 
-   Friend Function BeamMachDb() As Boolean
-      ' Assegno le path
-      Dim sBaseDir As String = m_sMachinesRoot & "\" & m_SelectedMachine.Name & "\" & "Beam"
-      ' verifico se ci sono i file ini
-      Dim sMachTypePath As String = sBaseDir & "\MachiningTypes.ini"
-      Dim sTabTemplPath As String = sBaseDir & "\BeamTableTemplate.ini"
-      If File.Exists(sMachTypePath) AndAlso File.Exists(sTabTemplPath) Then
-         ' apro finestra di gestione lavorazioni travi
-         Dim sTitle = EgtMsg(9000)               'Tabelle delle lavorazioni delle travi
-         Dim BeamMchsWinVM As New MyBeamMachiningsWindowVM(sTitle, sBaseDir, sMachTypePath, sTabTemplPath)
-         Dim BeamMchsWinV As New BeamMachiningsWindowV(Application.Current.MainWindow, BeamMchsWinVM)
-         BeamMchsWinV.ShowDialog()
-      Else
-         ' Impossibile aprire l'Editor delle lavorazioni delle travi.<br/>Mancano i file di configurazione. - Errore
-         MessageBox.Show(EgtMsg(9009), EgtMsg(9008), MessageBoxButton.OK, MessageBoxImage.Stop)
-      End If
-      Return True
-   End Function
-
-   Friend Function WallMachDb() As Boolean
-      ' Assegno le path
-      Dim sBaseDir As String = m_sMachinesRoot & "\" & m_SelectedMachine.Name & "\" & "Wall"
-      ' verifico se ci sono i file ini
-      Dim sMachTypePath As String = sBaseDir & "\MachiningTypes.ini"
-      Dim sTabTemplPath As String = sBaseDir & "\WallTableTemplate.ini"
-      If File.Exists(sMachTypePath) AndAlso File.Exists(sTabTemplPath) Then
-         ' apro finestra di gestione lavorazioni pareti
-         Dim sTitle = EgtMsg(9010)               'Tabelle delle lavorazioni delle pareti
-         Dim WallMchsWinVM As New MyBeamMachiningsWindowVM(sTitle, sBaseDir, sMachTypePath, sTabTemplPath, False)
-         Dim WallMchsWinV As New BeamMachiningsWindowV(Application.Current.MainWindow, WallMchsWinVM)
-         WallMchsWinV.ShowDialog()
-      Else
-         ' Impossibile aprire l'Editor delle lavorazioni delle pareti.<br/>Mancano i file di configurazione. - Errore
-         MessageBox.Show(EgtMsg(9011), EgtMsg(9008), MessageBoxButton.OK, MessageBoxImage.Stop)
-      End If
-      Return True
-   End Function
-
    Public Overrides Sub ToolDb(ByVal param As Object)
       SetSelTab(ConfigTabs.EMPTY)
       If Not VerifyMachinesDir(m_sMachinesRoot) Then Return
diff --git a/EgtBEAMWALL.Optimizer/MacroFeatureWnd/MacroFeatureWnd.xaml b/EgtBEAMWALL.Optimizer/MacroFeatureWnd/MacroFeatureWnd.xaml
index 74ddcf29..89996077 100644
--- a/EgtBEAMWALL.Optimizer/MacroFeatureWnd/MacroFeatureWnd.xaml
+++ b/EgtBEAMWALL.Optimizer/MacroFeatureWnd/MacroFeatureWnd.xaml
@@ -5,7 +5,6 @@
                                  xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
                                  SizeToContent="WidthAndHeight"
                                  WindowStartupLocation="CenterOwner"
-                                 WindowStyle="None" 
                                  Title="NewMacroFeature"
                                  Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
    
diff --git a/EgtBEAMWALL.Optimizer/MovePartInRawPartWnd/MovePartInRawPartWndV.xaml b/EgtBEAMWALL.Optimizer/MovePartInRawPartWnd/MovePartInRawPartWndV.xaml
index 75db5b0f..8341a63d 100644
--- a/EgtBEAMWALL.Optimizer/MovePartInRawPartWnd/MovePartInRawPartWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/MovePartInRawPartWnd/MovePartInRawPartWndV.xaml
@@ -5,7 +5,6 @@
                                  xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
                                  SizeToContent="WidthAndHeight"
                                  WindowStartupLocation="CenterOwner"
-                                 WindowStyle="None"
                                  Title="MovePartInRawPartWndV"
                                  Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
 
diff --git a/EgtBEAMWALL.Optimizer/MultiCopyRawPartWnd/MultiCopyRawPartWndV.xaml b/EgtBEAMWALL.Optimizer/MultiCopyRawPartWnd/MultiCopyRawPartWndV.xaml
index bafd492e..9c77876a 100644
--- a/EgtBEAMWALL.Optimizer/MultiCopyRawPartWnd/MultiCopyRawPartWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/MultiCopyRawPartWnd/MultiCopyRawPartWndV.xaml
@@ -5,7 +5,6 @@
                                  xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
                                  SizeToContent="WidthAndHeight"
                                  WindowStartupLocation="CenterOwner"
-                                 WindowStyle="None"
                                  Title="MultiCopyRawPart"
                                  Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
 
diff --git a/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb
index cb1ca41a..3eeef474 100644
--- a/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb	
+++ b/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb	
@@ -67,5 +67,5 @@ Imports System.Windows
 '      Revision
 '
 
-<Assembly: AssemblyVersion("2.7.11.8")>
-<Assembly: AssemblyFileVersion("2.7.11.8")>
+<Assembly: AssemblyVersion("2.7.11.9")>
+<Assembly: AssemblyFileVersion("2.7.11.9")>
diff --git a/EgtBEAMWALL.Optimizer/Project/ProjectV.xaml b/EgtBEAMWALL.Optimizer/Project/ProjectV.xaml
index 447c2864..8481ff90 100644
--- a/EgtBEAMWALL.Optimizer/Project/ProjectV.xaml
+++ b/EgtBEAMWALL.Optimizer/Project/ProjectV.xaml
@@ -117,7 +117,7 @@
                                           Tag="{Binding DataContext.BTLStructureVM.SelBTLPart, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"/>
 
                   <Grid Grid.Row="2" 
-                        Style="{StaticResource FeatureManager_Grid}">
+                        Style="{StaticResource ProjectParamters_Grid}">
                      <Grid.RowDefinitions>
                         <RowDefinition Height="Auto"/>
                         <RowDefinition Height="1*"/>
diff --git a/EgtBEAMWALL.Optimizer/ProjectTypeWnd/ProjectTypeWndV.xaml b/EgtBEAMWALL.Optimizer/ProjectTypeWnd/ProjectTypeWndV.xaml
index 1ef53d7a..f07e26ee 100644
--- a/EgtBEAMWALL.Optimizer/ProjectTypeWnd/ProjectTypeWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/ProjectTypeWnd/ProjectTypeWndV.xaml
@@ -3,7 +3,6 @@
                                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                                  xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
                                  SizeToContent="WidthAndHeight"
-                                 WindowStyle="None" 
                                  MinWidth="500"
                                  WindowStartupLocation="CenterOwner"
                                  Title="ProjectType"
diff --git a/EgtBEAMWALL.Optimizer/SaveAsStrategyWnd/SaveAsStrategyV.xaml b/EgtBEAMWALL.Optimizer/SaveAsStrategyWnd/SaveAsStrategyV.xaml
index 10e6aaaa..04644829 100644
--- a/EgtBEAMWALL.Optimizer/SaveAsStrategyWnd/SaveAsStrategyV.xaml
+++ b/EgtBEAMWALL.Optimizer/SaveAsStrategyWnd/SaveAsStrategyV.xaml
@@ -5,7 +5,6 @@
                                  xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
                                  SizeToContent="WidthAndHeight"
                                  WindowStartupLocation="CenterOwner"
-                                 WindowStyle="None"
                                  MinWidth="350"
                                  MinHeight="170"
                                  Title="SaveAsStrategy"
diff --git a/EgtBEAMWALL.Optimizer/Statistics/OptimizerStatisticsV.xaml b/EgtBEAMWALL.Optimizer/Statistics/OptimizerStatisticsV.xaml
index 1b9915ae..8bd18609 100644
--- a/EgtBEAMWALL.Optimizer/Statistics/OptimizerStatisticsV.xaml
+++ b/EgtBEAMWALL.Optimizer/Statistics/OptimizerStatisticsV.xaml
@@ -259,7 +259,6 @@
                           IsChecked="{Binding bRawPart_IsChecked}"
                           ToolTip="Materials"
                           Style="{StaticResource Statistics_ToggleButton}">
-               <!--<Image Source="/Resources/Statistics/CopyToClipboard.png" Stretch="Uniform"/>-->
             </ToggleButton>
             <Button ToolTip="{Binding CopyToClipboard_Msg}"
                     x:Name="CopyToClipboardBtn"
diff --git a/EgtBEAMWALL.Optimizer/Statistics/PDFEditorV.xaml b/EgtBEAMWALL.Optimizer/Statistics/PDFEditorV.xaml
index 73296b81..68bd34ba 100644
--- a/EgtBEAMWALL.Optimizer/Statistics/PDFEditorV.xaml
+++ b/EgtBEAMWALL.Optimizer/Statistics/PDFEditorV.xaml
@@ -17,7 +17,7 @@
       </Grid.ColumnDefinitions>
       <GroupBox Header="PDF Preview"
                 Style="{StaticResource PDFPreview_GroupBox}">
-         <StackPanel Style="{StaticResource List_StackPanel}">
+         <StackPanel Style="{StaticResource PDFList_StackPanel}">
             <Button ToolTip="PDF Viewer - Preview"
                     Command="{Binding CreatePreviewVis_Command}"
                     Style="{StaticResource PDFPanel_Button}">
diff --git a/EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateBTLWndV.xaml b/EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateBTLWndV.xaml
index 4848257f..ee04bceb 100644
--- a/EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateBTLWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateBTLWndV.xaml
@@ -6,7 +6,6 @@
                                  xmlns:EgwWPFBaseLib="clr-namespace:EgwWPFBaseLib;assembly=EgwWPFBaseLib"
                                  SizeToContent="WidthAndHeight"
                                  WindowStartupLocation="CenterOwner"
-                                 WindowStyle="None"
                                  Title="UpdateBTLWnd"
                                  Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
    
diff --git a/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml b/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml
index d720d4c9..26775eba 100644
--- a/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml
+++ b/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml
@@ -52,252 +52,210 @@
 
    <!--#region TextBlock-->
 
-   <Style x:Key="List_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
+   <!--#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="PartParam_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="Margin" Value="10,0,10,0"/>
-   </Style>
-
-   <Style x:Key="Category_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
+   <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="PartManager_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+   <Style x:Key="SplashScreenV_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundWhite_TextBlock}">
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="FontSize" Value="14"/>
+      <Setter Property="FontWeight" Value="Bold"/>
+      <Setter Property="FontFamily" Value="/Resources/Fonts/#Roboto"/>
+      <Setter Property="Margin" Value="591,140,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="ROT_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundWhite_TextBlock}">
+      <Setter Property="TextAlignment" Value="Center"/>
+      <Setter Property="Margin" Value="2,3,0,2"/>
+   </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"/>
-      <Setter Property="TextWrapping" Value="Wrap"/>
    </Style>
 
    <Style x:Key="W_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource PartManager_TextBlock}">
       <Setter Property="Margin" Value="0,0,5,0"/>
    </Style>
 
-   <Style x:Key="CNT_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+   <!--#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="TextWrapping" Value="Wrap"/>
       <Setter Property="Width" Value="25"/>
    </Style>
 
-   <Style x:Key="Prod_TextBlock" TargetType="{x:Type TextBlock}">
-      <Setter Property="TextAlignment" Value="Center"/>
-      <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
-      <Setter Property="TextWrapping" Value="Wrap"/>
-      <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 BeamWall_White}"/>
-            <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}"/>
-         </DataTrigger>
-      </Style.Triggers>
-   </Style>
-
-   <Style x:Key="StatisticTimePanel_TextBlock" TargetType="{x:Type TextBlock}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
-      <Setter Property="FontSize" Value="20"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="TextWrapping" Value="Wrap"/>
-   </Style>
-
-   <Style x:Key="Macro_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+   <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"/>
-      <Setter Property="TextWrapping" Value="Wrap"/>
    </Style>
 
-   <Style x:Key="MacroDefault_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+   <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="TextWrapping" Value="Wrap"/>
       <Setter Property="TextAlignment" Value="Justify"/>
    </Style>
 
-   <Style x:Key="FeatureManager_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+   <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="TextWrapping" Value="Wrap"/>
       <Setter Property="Margin" Value="5,5,0,0"/>
    </Style>
 
-   <Style x:Key="CALC_ERR_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+   <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="2,-6,1,-3"/>
    </Style>
 
-   <Style x:Key="PasswordMsg_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+   <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>
 
-   <Style x:Key="FeatureInPartInRawPartList_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+   <Style x:Key="FeatureInPartInRawPartList_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="-2,-6,0,-2"/>
    </Style>
 
-   <Style x:Key="RawPartList_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Aqua}"/>
-      <Setter Property="TextAlignment" Value="Center"/>
-      <Setter Property="FontWeight" Value="Bold"/>
-      <Setter Property="FontSize" Value="12"/>
-      <Setter Property="Margin" Value="0,-6,0,-2"/>
-   </Style>
-
-   <Style x:Key="MoveDir_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+   <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 {x:Type TextBlock}}">
+   <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 {x:Type TextBlock}}">
+   <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="SplashScreenV_TextBlock" TargetType="{x:Type TextBlock}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="FontSize" Value="14"/>
-      <Setter Property="FontWeight" Value="Bold"/>
-      <Setter Property="TextWrapping" Value="Wrap"/>
-      <Setter Property="FontFamily" Value="/Resources/Fonts/#Roboto"/>
-      <Setter Property="Margin" Value="591,140,0,0"/>
-   </Style>
-
-   <Style x:Key="PRCList_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+   <Style x:Key="PRCList_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundCorduroy_TextBlock}">
       <Setter Property="HorizontalAlignment" Value="Center"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="TextAlignment" Value="Justify"/>
       <Setter Property="Margin" Value="10,5,10,0"/>
    </Style>
 
-   <Style x:Key="Msg_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+   <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 {x:Type TextBlock}}">
+   <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="BTLPartList_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="FontSize" Value="14"/>
-      <Setter Property="Margin" Value="0,0,5,0"/>
-   </Style>
-
-   <Style x:Key="Rotate_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="TextAlignment" Value="Center"/>
-      <Setter Property="Margin" Value="2,0,2,0"/>
-   </Style>
-
-   <Style x:Key="Name_TextBlock" TargetType="{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="TextWrapping" Value="Wrap"/>
-      <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="{StaticResource BeamWall_White}"/>
-            <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}"/>
-         </DataTrigger>
-      </Style.Triggers>
-   </Style>
-
-   <Style x:Key="Status_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+   <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 {x:Type TextBlock}}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+   <Style x:Key="SelBTLPart_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundCorduroy_TextBlock}">
       <Setter Property="HorizontalAlignment" Value="Left"/>
    </Style>
 
-   <Style x:Key="CALC_FALL_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Aqua}"/>
+   <Style x:Key="CALC_ERRRawPartList_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="0,-6,0,-2"/>
    </Style>
 
-   <Style x:Key="CALC_ERRRawPartList_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="TextAlignment" Value="Center"/>
-      <Setter Property="FontWeight" Value="Bold"/>
-      <Setter Property="FontSize" Value="12"/>
-      <Setter Property="Margin" Value="0,-6,0,-2"/>
-   </Style>
-
-   <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="CurrentMachine_TextBlock" TargetType="{x:Type TextBlock}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+   <Style x:Key="CurrentMachine_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundCorduroy_TextBlock}">
       <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="TextWrapping" Value="Wrap"/>
       <Setter Property="FontSize" Value="20"/>
       <Setter Property="Margin" Value="10,0,5,0"/>
    </Style>
 
-   <Style x:Key="SelMachine_TextBlock" TargetType="{x:Type TextBlock}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+   <Style x:Key="SelMachine_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundCorduroy_TextBlock}">
       <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="TextWrapping" Value="Wrap"/>
       <Setter Property="FontWeight" Value="Bold"/>
       <Setter Property="FontSize" Value="20"/>
       <Setter Property="Margin" Value="10,0,5,0"/>
    </Style>
 
-   <Style x:Key="MachinePanel_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource MachParam_TextBlock}">
-      <Setter Property="TextWrapping" Value="WrapWithOverflow"/>
-      <Setter Property="Width" Value="150"/>
+   <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="Description_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource MachParam_TextBlock}">
-      <Setter Property="TextWrapping" Value="WrapWithOverflow"/>
-      <Setter Property="Width" Value="148"/>
+   <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>
@@ -306,62 +264,19 @@
       <Setter Property="HorizontalAlignment" Value="Left"/>
    </Style>
 
-   <Style x:Key="MultiCopyRawPartWnd_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Margin" Value="0,0,0,5"/>
-   </Style>
-
-   <Style x:Key="Message_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Margin" Value="5,0,5,0"/>
-   </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="ErrorMsg_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="FontSize" Value="13"/>
-      <Setter Property="FontWeight" Value="Bold"/>
-      <Setter Property="Margin" Value="0,0,0,10"/>
-   </Style>
-
-   <Style x:Key="SetUp_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type 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 {x:Type TextBlock}}">
-      <Setter Property="Margin" Value="10,5,5,5"/>
-   </Style>
-
-   <Style x:Key="PDF_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Margin" Value="5,2,0,0"/>
-   </Style>
-
-   <Style x:Key="UpdateBTL_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
-      <Setter Property="TextWrapping" Value="Wrap"/>
-      <Setter Property="Width" Value="400"/>
-      <Setter Property="Margin" Value="5"/>
-   </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="ProjectParameters_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ParamStrategy_TextBlock}">
-      <Setter Property="FontWeight" Value="Bold"/>
-   </Style>
-
-   <Style x:Key="UserAdmin_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ParamStrategy_TextBlock}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
-      <Setter Property="Margin" Value="5,0,5,0"/>
-   </Style>
-
    <Style x:Key="StrategyManager_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DialogWindow_TextBlock}">
       <Setter Property="Margin" Value="5,0,0,0"/>
    </Style>
@@ -375,6 +290,14 @@
       <Setter Property="Margin" Value="0,10,0,0"/>
    </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>
@@ -382,43 +305,1153 @@
    <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="{StaticResource BeamWall_White}"/>
+      <Setter Property="Margin" Value="5,0,5,0"/>
+   </Style>
+
+   <!--#endregion ParamStrategy-->
+
+   <Style x:Key="Prod_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="TextAlignment" Value="Center"/>
+      <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="{StaticResource BeamWall_White}"/>
+            <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}"/>
+         </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="{StaticResource BeamWall_White}"/>
+            <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}"/>
+         </DataTrigger>
+      </Style.Triggers>
+   </Style>
+
+   <Style x:Key="RawPartList_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_Aqua}"/>
+      <Setter Property="TextAlignment" Value="Center"/>
+      <Setter Property="FontWeight" Value="Bold"/>
+      <Setter Property="FontSize" Value="12"/>
+      <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="{StaticResource BeamWall_Red}"/>
+      <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="Margin" Value="2,0,2,0"/>
+   </Style>
+
    <!--#endregion TextBlock-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!--#region GridSplitter-->
+   <!--#region TextBox-->
 
-   <Style x:Key="Width_GridSplitter" TargetType="{x:Type GridSplitter}">
-      <Setter Property="Background" Value="Transparent"/>
-      <Setter Property="Width" Value="3"/>
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="VerticalAlignment" Value="Stretch"/>
+   <!--#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="Height_GridSplitter" TargetType="{x:Type GridSplitter}">
-      <Setter Property="Background" Value="Transparent"/>
-      <Setter Property="Height" Value="3"/>
-      <Setter Property="HorizontalAlignment" Value="Stretch"/>
+   <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-->
+   
+   <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="HeightBottom_GridSplitter" TargetType="{x:Type GridSplitter}" BasedOn="{StaticResource Height_GridSplitter}">
-      <Setter Property="Height" Value="10"/>
+   <Style x:Key="Qty_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource EgtOptmizer_TextBox}">
+      <Setter Property="Width" Value="40"/>
    </Style>
 
-   <!--#endregion GridSplitter-->
+   <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 ToolTip-->
+   <!--#region Button-->
 
-   <Style x:Key="PParameters_ToolTip" TargetType="{x:Type ToolTip}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_Glacier}"/>
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
+   <!--#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>
 
-   <!--#endregion ToolTip-->
+   <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="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="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="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="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,2.5,2.5,2.5"/>
+   </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>
+
+   <!--#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="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="10"/>
+   </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="10,0,10,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,50,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="Transparent"/>
+      <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"/>
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ToggleButton}">
+               <Grid>
+                  <!-- Background -->
+                  <Border x:Name="BackgroundBorder"
+                          CornerRadius="10"
+                          Background="{StaticResource BeamWall_Alto}"
+                          BorderBrush="{StaticResource BeamWall_Gray}"
+                          BorderThickness="1"/>
+                  <!-- Slider Circle -->
+                  <Ellipse x:Name="Slider"
+                           Width="12" Height="12"
+                           Fill="{StaticResource BeamWall_Glacier}"
+                           Margin="3"
+                           HorizontalAlignment="Left"
+                           VerticalAlignment="Center"/>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsChecked" Value="True">
+                     <Setter TargetName="Slider" Property="HorizontalAlignment" Value="Right"/>
+                     <Setter TargetName="Slider" Property="Fill" Value="{StaticResource BeamWall_Kashmir}"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="Unlock_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+      <Setter Property="Height" Value="20"/>
+      <Setter Property="Width" Value="20"/>
+      <Setter Property="Margin" Value="0,0,10,0"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ToggleButton}">
+               <Border x:Name="border" CornerRadius="3" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+                  <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="Button.IsDefaulted" Value="true">
+                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                  </Trigger>
+                  <Trigger Property="IsMouseOver" Value="true">
+                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.MouseOver.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
+                  </Trigger>
+                  <Trigger Property="IsPressed" Value="true">
+                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Pressed.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
+                  </Trigger>
+                  <Trigger Property="IsChecked" Value="true">
+                     <Setter Property="Background" TargetName="border" Value="{StaticResource ButtonBasic.Static.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
+                  </Trigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Disabled.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Disabled.Border}"/>
+                     <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource Button.Disabled.Foreground}"/>
+                     <Setter Property="OpacityMask" Value="#54707070"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="EgtCAM5_SetUpToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+      <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
+      <Setter Property="Background" Value="{StaticResource Button.Static.Background}"/>
+      <Setter Property="BorderBrush" Value="{StaticResource Button.Static.Border}"/>
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+      <Setter Property="BorderThickness" Value="1"/>
+      <Setter Property="HorizontalContentAlignment" Value="Center"/>
+      <Setter Property="VerticalContentAlignment" Value="Center"/>
+      <Setter Property="Width" Value="25"/>
+      <Setter Property="Height" Value="25"/>
+      <Setter Property="Padding" Value="1"/>
+      <Setter Property="Margin" Value="0,0,5,0"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ToggleButton}">
+               <Border x:Name="border" CornerRadius="3" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+                  <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="Button.IsDefaulted" Value="true">
+                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                  </Trigger>
+                  <Trigger Property="IsMouseOver" Value="true">
+                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.MouseOver.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
+                  </Trigger>
+                  <Trigger Property="IsPressed" Value="true">
+                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Pressed.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
+                  </Trigger>
+                  <Trigger Property="IsChecked" Value="true">
+                     <Setter Property="Background" TargetName="border" Value="{Binding ExitBtnBackgroundCol}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
+                  </Trigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Disabled.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Disabled.Border}"/>
+                     <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource Button.Disabled.Foreground}"/>
+                     <Setter Property="OpacityMask" Value="#54707070"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!--#endregion ToggleButton-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region ListBox-->
+
+   <Style x:Key="NewAddFeature_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="BorderThickness" Value="0"/>
+      <Setter Property="Height" Value="585"/>
+      <Setter Property="Width" Value="260"/>
+      <Setter Property="Margin" Value="5"/>
+      <Style.Resources>
+         <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource Optimizer_ScrollBar}"/>
+         <Style TargetType="{x:Type ListBoxItem}">
+            <Setter Property="Template">
+               <Setter.Value>
+                  <ControlTemplate TargetType="ListBoxItem">
+                     <Border Background="{TemplateBinding Background}"
+                             BorderBrush="Transparent"
+                             BorderThickness="1">
+                        <ContentPresenter />
+                     </Border>
+                  </ControlTemplate>
+               </Setter.Value>
+            </Setter>
+            <Style.Triggers>
+               <Trigger Property="IsSelected" Value="True">
+                  <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}"/>
+                  <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
+                  <Setter Property="FontWeight" Value="Bold"/>
+               </Trigger>
+               <Trigger Property="IsSelected" Value="False">
+                  <Setter Property="Background" Value="Transparent"/>
+                  <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+                  <Setter Property="FontWeight" Value="Normal"/>
+               </Trigger>
+            </Style.Triggers>
+         </Style>
+      </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="Transparent"/>
+      <Setter Property="BorderThickness" Value="0"/>
+      <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
+      <Setter Property="Height" Value="610"/>
+      <Setter Property="Width" Value="980"/>
+      <Setter Property="Margin" Value="5"/>
+   </Style>
+
+   <Style x:Key="MacroDefault_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="BorderThickness" Value="0"/>
+      <Setter Property="HorizontalAlignment" Value="Left"/>
+      <Setter Property="Height" Value="585"/>
+      <Setter Property="Width" Value="250"/>
+      <Setter Property="Margin" Value="5"/>
+      <Setter Property="AlternationCount" Value="2"/>
+      <Style.Resources>
+         <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource Optimizer_ScrollBar}"/>
+      </Style.Resources>
+   </Style>
+
+   <Style x:Key="FeatureManager_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="BorderThickness" Value="0"/>
+      <Setter Property="HorizontalContentAlignment" Value="Center"/>
+      <Setter Property="Height" Value="82"/>
+      <Setter Property="Width" Value="80"/>
+      <Setter Property="AlternationCount" Value="2"/>
+   </Style>
+
+   <Style x:Key="LeftPanel_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="BorderThickness" Value="0"/>
+      <Setter Property="HorizontalContentAlignment" Value="Center"/>
+      <Setter Property="Height" Value="150"/>
+      <Setter Property="Width" Value="130"/>
+      <Setter Property="AlternationCount" Value="2"/>
+      <Style.Resources>
+         <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource Optimizer_ScrollBar}"/>
+      </Style.Resources>
+   </Style>
+
+   <Style x:Key="AlternationIndex_ListBoxItem" TargetType="{x:Type ListBoxItem}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ListBoxItem}">
+               <Border Name="_itemContainer"
+                       Padding="0"
+                       BorderBrush="Transparent"
+                       BorderThickness="1"
+                       SnapsToDevicePixels="True">
+                  <ContentPresenter />
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="ItemsControl.AlternationIndex" Value="0">
+                     <Setter Property="TextBlock.Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+                     <Setter Property="TextBlock.TextAlignment" Value="Center"/>
+                     <Setter Property="TextBlock.FontSize" Value="13"/>
+                  </Trigger>
+                  <Trigger Property="ItemsControl.AlternationIndex" Value="1">
+                     <Setter Property="Foreground" Value="{StaticResource BeamWall_LinkWater}" />
+                     <Setter TargetName="_itemContainer" Property="BorderBrush" Value="{StaticResource BeamWall_LinkWater}" />
+                     <Setter TargetName="_itemContainer" Property="Background" Value="{StaticResource BeamWall_LinkWater}" />
+                     <Setter Property="TextBlock.Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+                     <Setter Property="TextBlock.TextAlignment" Value="Center"/>
+                     <Setter Property="TextBlock.FontSize" Value="13"/>
+                  </Trigger>
+                  <Trigger Property="IsSelected" Value="True">
+                     <Setter TargetName="_itemContainer" Property="BorderBrush" Value="{StaticResource BeamWall_FountainBlue}" />
+                     <Setter TargetName="_itemContainer" Property="Background" Value="{StaticResource BeamWall_FountainBlue}" />
+                     <Setter Property="TextBlock.Foreground" Value="{StaticResource BeamWall_White}"/>
+                     <Setter Property="TextBlock.TextAlignment" Value="Center"/>
+                     <Setter Property="FontWeight" Value="Bold"/>
+                     <Setter Property="TextBlock.FontSize" Value="14"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </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="BorderThickness" Value="0"/>
+      <Setter Property="Margin" Value="10"/>
+      <Setter Property="FontSize" Value="12"/>
+      <Setter Property="Background" Value="Transparent"/>
+      <Style.Resources>
+         <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource Optimizer_ScrollBar}"/>
+         <Style TargetType="{x:Type ListBoxItem}">
+            <Setter Property="Template">
+               <Setter.Value>
+                  <ControlTemplate TargetType="ListBoxItem">
+                     <Border Background="{TemplateBinding Background}"
+                             BorderBrush="Transparent"
+                             BorderThickness="1">
+                        <ContentPresenter />
+                     </Border>
+                  </ControlTemplate>
+               </Setter.Value>
+            </Setter>
+            <Style.Triggers>
+               <Trigger Property="IsSelected" Value="True">
+                  <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}"/>
+                  <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
+                  <Setter Property="FontWeight" Value="Bold"/>
+               </Trigger>
+               <Trigger Property="IsSelected" Value="False">
+                  <Setter Property="Background" Value="Transparent"/>
+                  <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+                  <Setter Property="FontWeight" Value="Normal"/>
+               </Trigger>
+            </Style.Triggers>
+         </Style>
+      </Style.Resources>
+   </Style>
+
+   <Style x:Key="BTL_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
+      <Setter Property="BorderThickness" Value="0"/>
+      <Setter Property="HorizontalAlignment" Value="Left"/>
+      <Setter Property="SelectionMode" Value="Single"/>
+      <Setter Property="IsSynchronizedWithCurrentItem" Value="True"/>
+      <Style.Resources>
+         <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource Optimizer_ScrollBar}"/>
+         <Style TargetType="{x:Type ListBoxItem}">
+            <Setter Property="Template">
+               <Setter.Value>
+                  <ControlTemplate TargetType="ListBoxItem">
+                     <Border Background="{TemplateBinding Background}"
+                             BorderBrush="Transparent"
+                             BorderThickness="1">
+                        <ContentPresenter />
+                     </Border>
+                  </ControlTemplate>
+               </Setter.Value>
+            </Setter>
+            <Style.Triggers>
+               <Trigger Property="IsSelected" Value="True">
+                  <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}"/>
+                  <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
+                  <Setter Property="FontWeight" Value="Bold"/>
+                  <Setter Property="FontSize" Value="12"/>
+               </Trigger>
+               <Trigger Property="IsSelected" Value="False">
+                  <Setter Property="Background" Value="Transparent"/>
+                  <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+                  <Setter Property="FontWeight" Value="SemiBold"/>
+                  <Setter Property="FontSize" Value="12"/>
+               </Trigger>
+            </Style.Triggers>
+         </Style>
+      </Style.Resources>
+   </Style>
+
+   <Style x:Key="ListBox_PDF" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="BorderThickness" Value="0"/>
+      <Setter Property="Padding" Value="0"/>
+      <Setter Property="Margin" Value="0"/>
+      <Setter Property="VerticalContentAlignment" Value="Top"/>
+      <Setter Property="HorizontalContentAlignment" Value="Left"/>
+   </Style>
+
+   <Style x:Key="ForcedStrategyBTL_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="IsSynchronizedWithCurrentItem" Value="True"/>
+      <Setter Property="HorizontalAlignment" Value="Left"/>
+      <Setter Property="BorderThickness" Value="0"/>
+      <Setter Property="Height" Value="585"/>
+      <Setter Property="Width" Value="260"/>
+      <Setter Property="Margin" Value="5"/>
+      <Style.Resources>
+         <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource Optimizer_ScrollBar}"/>
+         <Style TargetType="{x:Type ListBoxItem}">
+            <Setter Property="Template">
+               <Setter.Value>
+                  <ControlTemplate TargetType="ListBoxItem">
+                     <Border Background="{TemplateBinding Background}"
+                             BorderBrush="Transparent"
+                             BorderThickness="1">
+                        <ContentPresenter />
+                     </Border>
+                  </ControlTemplate>
+               </Setter.Value>
+            </Setter>
+            <Style.Triggers>
+               <Trigger Property="IsSelected" Value="True">
+                  <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}"/>
+                  <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
+                  <Setter Property="FontWeight" Value="Bold"/>
+               </Trigger>
+               <Trigger Property="IsSelected" Value="False">
+                  <Setter Property="Background" Value="Transparent"/>
+                  <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+                  <Setter Property="FontWeight" Value="Normal"/>
+               </Trigger>
+            </Style.Triggers>
+         </Style>
+      </Style.Resources>
+   </Style>
+
+   <Style x:Key="BTLPartList_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
+      <Setter Property="BorderThickness" Value="0"/>
+      <Setter Property="HorizontalAlignment" Value="Left"/>
+      <Setter Property="SelectionMode" Value="Single"/>
+      <Setter Property="IsSynchronizedWithCurrentItem" Value="True"/>
+      <Setter Property="Grid.IsSharedSizeScope" Value="True"/>
+      <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
+      <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
+      <Style.Resources>
+         <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource Optimizer_ScrollBar}"/>
+         <Style TargetType="{x:Type ListBoxItem}">
+            <Setter Property="Template">
+               <Setter.Value>
+                  <ControlTemplate TargetType="ListBoxItem">
+                     <Border Background="{TemplateBinding Background}"
+                             BorderBrush="Transparent"
+                             BorderThickness="1">
+                        <ContentPresenter />
+                     </Border>
+                  </ControlTemplate>
+               </Setter.Value>
+            </Setter>
+            <Style.Triggers>
+               <Trigger Property="IsSelected" Value="True">
+                  <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}"/>
+                  <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
+                  <Setter Property="FontWeight" Value="Bold"/>
+                  <Setter Property="FontSize" Value="12"/>
+               </Trigger>
+               <Trigger Property="IsSelected" Value="False">
+                  <Setter Property="Background" Value="Transparent"/>
+                  <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+                  <Setter Property="FontWeight" Value="SemiBold"/>
+                  <Setter Property="FontSize" Value="12"/>
+               </Trigger>
+            </Style.Triggers>
+         </Style>
+      </Style.Resources>
+   </Style>
+
+   <!--#endregion ListBox-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#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 CheckBox-->
+
+   <!--#region PParameters-->
+   
+   <Style x:Key="FreeContourInput_CheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource PParameters_CheckBox}">
+      <Setter Property="VerticalAlignment" Value="Center"/>
+      <Setter Property="Margin" Value="5,0,5,0"/>
+   </Style>
+
+   <!--#endregion PParameters-->
+
+   <!--#region Alias-->
+   
+   <Style x:Key="FeatureInPartInRawPartList_CheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource Alias_CheckBox}">
+      <Setter Property="VerticalAlignment" Value="Center"/>
+   </Style>
+
+   <Style x:Key="BTLDataWnd_CheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource Alias_CheckBox}">
+      <Setter Property="VerticalAlignment" Value="Top"/>
+      <Setter Property="Margin" Value="10,10,0,0"/>
+   </Style>
+
+   <Style x:Key="BTLPartList_CheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource Alias_CheckBox}">
+      <Setter Property="VerticalAlignment" Value="Center"/>
+      <Setter Property="Margin" Value="0,0,5,0"/>
+   </Style>
+
+   <Style x:Key="PartParameters_CheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource Alias_CheckBox}">
+      <Setter Property="VerticalAlignment" Value="Center"/>
+      <Setter Property="Margin" Value="0,5"/>
+   </Style>
+
+   <Style x:Key="Project_CheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource Alias_CheckBox}">
+      <Setter Property="VerticalAlignment" Value="Top"/>
+      <Setter Property="Margin" Value="5,0,0,0"/>
+   </Style>
+
+   <!--#endregion Alias-->
+
+   <Style x:Key="Option_CheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
+      <Setter Property="HorizontalAlignment" Value="Right"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
+      <Setter Property="Margin" Value="10,5,10,0"/>
+   </Style>
+
+   <Style x:Key="DefaultMacro_CheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
+      <Setter Property="Margin" Value="0,6,5,0"/>
+   </Style>
+
+   <!--#endregion CheckBox-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#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>
+            <ItemsPanelTemplate>
+               <WrapPanel Orientation="Vertical"/>
+            </ItemsPanelTemplate>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ItemsControl}">
+               <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Disabled">
+                  <ItemsPresenter/>
+               </ScrollViewer>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   
+   <!--#endregion ItemsControl-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region UserControl-->
+
+   <Style x:Key="FreeContourInput_UserControl" TargetType="{x:Type UserControl}">
+      <Setter Property="Height" Value="32"/>
+   </Style>
+
+   <!--#endregion UserControl-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
@@ -611,501 +1644,563 @@
 
    <!--#endregion TabItem-->
 
+   <!--#region TabControl-->
+
+   <!--#region Optmizer-->
+
+   <Style x:Key="Optimizer_TabControl" TargetType="{x:Type TabControl}">
+      <Setter Property="TabStripPlacement" Value="Top"/>
+      <Setter Property="Margin" Value="5,5,2.5,5"/>
+      <Setter Property="Background">
+         <Setter.Value>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
+               <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
+               <GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.45"/>
+               <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
+            </LinearGradientBrush>
+         </Setter.Value>
+      </Setter>
+      <Style.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>
+
+
+   <!--#endregion TabControl-->
+
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!--#region Button-->
+   <!--#region StackPanel-->
 
-   <Style x:Key="ProdManager_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="30"/>
+   <!--#region BTLPartManager-->
+   
+   <Style x:Key="FeatureListManager_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource BTLPartManager_StackPanel}">
+      <Setter Property="HorizontalAlignment" Value="Left"/>
    </Style>
 
-   <Style x:Key="CalcPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ProdManager_Button}">
-      <Setter Property="FontSize" Value="10"/>
-      <Setter Property="FontWeight" Value="Light"/>
-      <Setter Property="Margin" Value="5,2,5,2"/>
+   <Style x:Key="PDF_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource BTLPartManager_StackPanel}">
+      <Setter Property="Margin" Value="0"/>
    </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="FontWeight" Value="Light"/>
-      <Setter Property="Margin" Value="5,2,5,2"/>
-   </Style>
-
-   <Style x:Key="WarehouseWndV_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ProdManager_Button}">
-      <Setter Property="FontWeight" Value="Light"/>
-      <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="MacroFeaturen_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ProdManager_Button}">
+   <Style x:Key="Button_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource BTLPartManager_StackPanel}">
+      <Setter Property="VerticalAlignment" Value="Center"/>
       <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="ProdManagerNew_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="35"/>
-   </Style>
-
-   <Style x:Key="ProdManagerPopUp_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ProdManagerNew_Button}">
-      <Setter Property="Margin" Value="0,0,2.5,0"/>
-   </Style>
-
-   <Style x:Key="NestingRunningWndV_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="70"/>
-   </Style>
-
-   <Style x:Key="OKAddParam_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_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 OnlyProd_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 OnlyProd_Button}">
-      <Setter Property="Height" Value="20"/>
-      <Setter Property="Width" Value="20"/>
+   <Style x:Key="Message_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource BTLPartManager_StackPanel}">
+      <Setter Property="Width" Value="250"/>
    </Style>
 
-   <Style x:Key="RawPart_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
-      <Setter Property="Height" Value="18"/>
-      <Setter Property="Width" Value="25"/>
-      <Setter Property="Margin" Value="2.5,2.5,2.5,2.5"/>
+   <Style x:Key="CopyToClipBoard_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource BTLPartManager_StackPanel}">
+      <Setter Property="Background" Value="{StaticResource BeamWall_White}"/>
+      <Setter Property="Margin" Value="0,10,10,10"/>
    </Style>
 
-   <Style x:Key="EditFeature_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_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 OnlyProd_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 OnlyProd_Button}">
-      <Setter Property="Height" Value="40"/>
-      <Setter Property="Width" Value="50"/>
-      <Setter Property="Margin" Value="2.5,-2,2.5,2.5"/>
-   </Style>
-
-   <Style x:Key="SendFeedback_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource MainMenu_Button}">
-      <Setter Property="Width" Value="40"/>
-   </Style>
-   
-   <Style x:Key="Strategy_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_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="SaveStrategy_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_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="SaveAs_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource SaveStrategy_Button}">
-      <Setter Property="VerticalAlignment" Value="Bottom"/>
-      <Setter Property="Margin" Value="0,0,0,5"/>
-   </Style>
-
-   <Style x:Key="BTLPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_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 OnlyProd_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 OnlyProd_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="GeneralParametersWnd_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_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="PartParametersWnd_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ToolBar_Button}">
-      <Setter Property="Width" Value="100"/>
-   </Style>
-
-   <Style x:Key="BTLPartList_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_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 OnlyProd_Button}">
-      <Setter Property="Height" Value="15"/>
-      <Setter Property="Width" Value="15"/>
-      <Setter Property="Margin" Value="0"/>
-   </Style>
-
-   <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>
-
-   <Style x:Key="Rotation_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
-      <Setter Property="Height" Value="18"/>
-      <Setter Property="Width" Value="25"/>
-      <Setter Property="Margin" Value="-5,0,5,0"/>
-   </Style>
-
-   <Style x:Key="Move_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Rotation_Button}">
-      <Setter Property="Margin" Value="0"/>
-   </Style>
-
-   <Style x:Key="Verify_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
-      <Setter Property="VerticalAlignment" Value="Top"/>
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="30"/>
-      <Setter Property="Margin" Value="2.5,2.5,2.5,2.5"/>
-   </Style>
-
-   <Style x:Key="NameBTL_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Margin" Value="0,0,5,0"/>
-   </Style>
-
-   <Style x:Key="MovePartInRawPartWnd_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource EgtWPFLib5_Button}">
-      <Setter Property="Margin" Value="0,0,5,0"/>
-   </Style>
-
-   <Style x:Key="Optmizer_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ToolBarViewPanel_Button}">
+   <Style x:Key="ProjectParameters_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource BTLPartManager_StackPanel}">
       <Setter Property="HorizontalAlignment" Value="Right"/>
+      <Setter Property="Margin" Value="0,7,5,0"/>
    </Style>
 
-   <Style x:Key="Back_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ToolBarViewPanel_Button}">
-      <Setter Property="VerticalAlignment" Value="Bottom"/>
+   <Style x:Key="Strategy_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource BTLPartManager_StackPanel}">
+      <Setter Property="VerticalAlignment" Value="Center"/>
+   </Style>
+
+   <!--#endregion BTLPartManager-->
+
+   <!--#region PartManager-->
+   
+   <Style x:Key="PDFEditor_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
+      <Setter Property="Margin" Value="0,-0.5,0,5"/>
+   </Style>
+
+   <Style x:Key="RawPartManager_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
+      <Setter Property="HorizontalAlignment" Value="Right"/>
+      <Setter Property="Margin" Value="0,1,5,1"/>
+   </Style>
+
+   <Style x:Key="FreeContourInput_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
+      <Style.Triggers>
+         <DataTrigger Binding="{Binding FocusTextBox}" Value="True">
+            <Setter Property="FocusManager.FocusedElement" Value="{Binding ElementName=PropertySearch}"/>
+         </DataTrigger>
+      </Style.Triggers>
+   </Style>
+
+   <Style x:Key="GeneralParametersStrategy_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
+      <Setter Property="HorizontalAlignment" Value="Right"/>
       <Setter Property="Margin" Value="10"/>
    </Style>
 
-   <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>
-
-   <Style x:Key="CloseProjectParameters_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ProjectParameters_Button}">
-      <Setter Property="Margin" Value="0"/>
-   </Style>
-
-   <Style x:Key="ConfigurationParameters_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource SaveOptionPanel_Button}">
-      <Setter Property="Margin" Value="10,0,10,0"/>
-   </Style>
-   
-   <!--#endregion Button-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region ToggleButton-->
-
-   <Style x:Key="Statistics_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource ToolBar_ToggleButton}">
-      <Setter Property="Margin" Value="0,10,10,5"/>
-   </Style>
-
-   <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="StrategyManager_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource MainMenu_ToggleButton}">
-      <Setter Property="Width" Value="140"/>
-      <Setter Property="Margin" Value="0,0,50,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="Transparent"/>
-      <Setter Property="Width" Value="40"/>
-   </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"/>
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type ToggleButton}">
-               <Grid>
-                  <!-- Background -->
-                  <Border x:Name="BackgroundBorder"
-                          CornerRadius="10"
-                          Background="{StaticResource BeamWall_Alto}"
-                          BorderBrush="{StaticResource BeamWall_Gray}"
-                          BorderThickness="1"/>
-                  <!-- Slider Circle -->
-                  <Ellipse x:Name="Slider"
-                           Width="12" Height="12"
-                           Fill="{StaticResource BeamWall_Glacier}"
-                           Margin="3"
-                           HorizontalAlignment="Left"
-                           VerticalAlignment="Center"/>
-               </Grid>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsChecked" Value="True">
-                     <Setter TargetName="Slider" Property="HorizontalAlignment" Value="Right"/>
-                     <Setter TargetName="Slider" Property="Fill" Value="{StaticResource BeamWall_Kashmir}"/>
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <Style x:Key="Unlock_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
-      <Setter Property="Height" Value="20"/>
-      <Setter Property="Width" Value="20"/>
-      <Setter Property="Margin" Value="0,0,10,0"/>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type ToggleButton}">
-               <Border x:Name="border" CornerRadius="3" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
-                  <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-               </Border>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="Button.IsDefaulted" Value="true">
-                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
-                  </Trigger>
-                  <Trigger Property="IsMouseOver" Value="true">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.MouseOver.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
-                  </Trigger>
-                  <Trigger Property="IsPressed" Value="true">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Pressed.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
-                  </Trigger>
-                  <Trigger Property="IsChecked" Value="true">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource ButtonBasic.Static.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
-                  </Trigger>
-                  <Trigger Property="IsEnabled" Value="false">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Disabled.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Disabled.Border}"/>
-                     <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource Button.Disabled.Foreground}"/>
-                     <Setter Property="OpacityMask" Value="#54707070"/>
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <Style x:Key="EgtCAM5_SetUpToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
-      <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
-      <Setter Property="Background" Value="{StaticResource Button.Static.Background}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource Button.Static.Border}"/>
-      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-      <Setter Property="BorderThickness" Value="1"/>
-      <Setter Property="HorizontalContentAlignment" Value="Center"/>
-      <Setter Property="VerticalContentAlignment" Value="Center"/>
-      <Setter Property="Width" Value="25"/>
-      <Setter Property="Height" Value="25"/>
-      <Setter Property="Padding" Value="1"/>
-      <Setter Property="Margin" Value="0,0,5,0"/>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type ToggleButton}">
-               <Border x:Name="border" CornerRadius="3" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
-                  <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-               </Border>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="Button.IsDefaulted" Value="true">
-                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
-                  </Trigger>
-                  <Trigger Property="IsMouseOver" Value="true">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.MouseOver.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
-                  </Trigger>
-                  <Trigger Property="IsPressed" Value="true">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Pressed.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
-                  </Trigger>
-                  <Trigger Property="IsChecked" Value="true">
-                     <Setter Property="Background" TargetName="border" Value="{Binding ExitBtnBackgroundCol}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
-                  </Trigger>
-                  <Trigger Property="IsEnabled" Value="false">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Disabled.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Disabled.Border}"/>
-                     <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource Button.Disabled.Foreground}"/>
-                     <Setter Property="OpacityMask" Value="#54707070"/>
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-   
-   <!--#endregion ToggleButton-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region TextBox-->
-
-   <Style x:Key="FreeContour_TextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
-      <Setter Property="Height" Value="22"/>
-      <Setter Property="VerticalContentAlignment" Value="Center"/>
-      <Setter Property="HorizontalContentAlignment" Value="Right"/>
-      <Setter Property="Width" Value="200"/>
-      <Setter Property="Margin" Value="5,0,5,0"/>
-      <Setter Property="TextWrapping" Value="Wrap"/>
-   </Style>
-
-   <Style x:Key="Strategy_TextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
-      <Setter Property="Height" Value="25"/>
-      <Setter Property="VerticalContentAlignment" Value="Center"/>
-      <Setter Property="HorizontalContentAlignment" Value="Left"/>
-      <Setter Property="Width" Value="200"/>
-      <Setter Property="Margin" Value="5,0,5,0"/>
-      <Setter Property="TextWrapping" Value="Wrap"/>
-   </Style>
-
-   <Style x:Key="SaveAsStrategy_TextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource Strategy_TextBox}">
-      <Setter Property="IsReadOnly" Value="False"/>
-   </Style>
-
-   <Style x:Key="Dimension_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
-      <Setter Property="Width" Value="55"/>
-      <Setter Property="TextWrapping" Value="Wrap"/>
-   </Style>
-
-   <Style x:Key="Qty_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
-      <Setter Property="Width" Value="40"/>
-      <Setter Property="TextWrapping" Value="Wrap"/>
-   </Style>
-
-   <Style x:Key="SearchText_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
-      <Setter Property="VerticalAlignment" Value="Top"/>
+   <Style x:Key="BTLPartList_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
       <Setter Property="Margin" Value="0,2,0,0"/>
    </Style>
 
-   <Style x:Key="NAM_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
-      <Setter Property="Width" Value="200"/>
-      <Setter Property="TextWrapping" Value="Wrap"/>
-   </Style>
-
-   <Style x:Key="Value_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
-      <Setter Property="Width" Value="65"/>
-      <Setter Property="TextWrapping" Value="Wrap"/>
-   </Style>
-
-   <Style x:Key="WarehouseWndV_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
-      <Setter Property="Width" Value="70"/>
-      <Setter Property="TextWrapping" Value="Wrap"/>
-      <Setter Property="Margin" Value="15,5"/>
-   </Style>
-
-   <Style x:Key="New_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
-      <Setter Property="Width" Value="100"/>
-      <Setter Property="Margin" Value="5"/>
-      <Setter Property="TextWrapping" Value="Wrap"/>
+   <Style x:Key="PParameters_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
       <Setter Property="HorizontalAlignment" Value="Right"/>
    </Style>
 
-   <Style x:Key="Warehouse_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
-      <Setter Property="Width" Value="100"/>
-      <Setter Property="Margin" Value="5"/>
-      <Setter Property="TextWrapping" Value="Wrap"/>
+   <Style x:Key="PartManagers_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
+      <Setter Property="Margin" Value="10,5,10,5"/>
    </Style>
 
-   <Style x:Key="PartParam_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
-      <Setter Property="Width" Value="150"/>
-      <Setter Property="Margin" Value="5"/>
+   <Style x:Key="PartManagerL_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
+      <Setter Property="Margin" Value="10,5,15,5"/>
    </Style>
 
-   <Style x:Key="LeftPanel_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
-      <Setter Property="VerticalAlignment" Value="Top"/>
-      <Setter Property="TextAlignment" Value="Justify"/>
-      <Setter Property="Height" Value="25"/>
-      <Setter Property="Margin" Value="0,6,4,0"/>
+   <Style x:Key="BTLTotParts_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
+      <Setter Property="Background" Value="{StaticResource BeamWall_White}"/>
+      <Setter Property="Margin" Value="10,10,0,0"/>
    </Style>
 
-   <Style x:Key="Name_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
-      <Setter Property="Width" Value="60"/>
+   <Style x:Key="BTLTotTime_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
+      <Setter Property="Background" Value="{StaticResource BeamWall_White}"/>
+      <Setter Property="Margin" Value="10,-1,0,0"/>
    </Style>
 
-   <Style x:Key="FeatureName_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
-      <Setter Property="Width" Value="200"/>
-      <Setter Property="Margin" Value="5"/>
+   <Style x:Key="BTLRemainingTime_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
+      <Setter Property="Background" Value="{StaticResource BeamWall_White}"/>
+      <Setter Property="Margin" Value="10,-1,0,10"/>
    </Style>
 
-   <Style x:Key="MultiCopyRawPartWnd_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
+   <Style x:Key="StrategyManager_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="Margin" Value="0,5,0,5"/>
+   </Style>
+
+   <!--#endregion PartManager-->
+   
+   <!--#region OptStatistics-->
+   
+   <Style x:Key="RawPart_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource OptStatistics_StackPanel}">
+      <Setter Property="Background" Value="{StaticResource BeamWall_White}"/>
+      <Setter Property="Orientation" Value="Vertical"/>
+      <Setter Property="Margin" Value="-10,10,10,10"/>
+   </Style>
+
+   <!--#endregion OptStatistics-->
+
+   <Style x:Key="AddSectionXMaterialWnd_StackPanel" TargetType="{x:Type StackPanel}">
+      <Setter Property="Margin" Value="5,5,5,0"/>
+   </Style>
+
+   <Style x:Key="Statistics_StackPanel" TargetType="{x:Type StackPanel}">
+      <Setter Property="Background" Value="{StaticResource BeamWall_White}"/>
+      <Setter Property="Margin" Value="10"/>
+   </Style>
+
+   <!--#endregion StackPanel-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region WrapPanel-->
+
+   <!--#region Project-->
+   
+   <Style x:Key="Bottom_WrapPanel" TargetType="{x:Type WrapPanel}" BasedOn="{StaticResource Project_WrapPanel}">
+      <Setter Property="Margin" Value="0,2,2,0"/>
+   </Style>
+
+   <!--#endregion Project-->
+
+   <!--#region ProjectH-->
+   
+   <Style x:Key="MacroCustom_WrapPanel" TargetType="{x:Type WrapPanel}" BasedOn="{StaticResource ProjectH_WrapPanel}">
+      <Setter Property="IsItemsHost" Value="True"/>
+   </Style>
+
+   <!--#endregion ProjectH-->
+   
+   <!--#endregion WrapPanel-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region Grid-->
+
+   <Style x:Key="PartManager_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="HorizontalAlignment" Value="Left"/>
+      <Setter Property="Margin" Value="10,10,0,10"/>
+   </Style>
+
+   <Style x:Key="AddPart_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="HorizontalAlignment" Value="Center"/>
       <Setter Property="Margin" Value="0,0,0,5"/>
    </Style>
 
-   <!--#endregion TextBox-->
+   <Style x:Key="GlobalState_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="Margin" Value="2,0,0,0"/>
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+   </Style>
+
+   <Style x:Key="ProjectType_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="Margin" Value="15"/>
+   </Style>
+
+   <Style x:Key="AddPartWnd_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="Margin" Value="0,0,0,5"/>
+   </Style>
+
+   <Style x:Key="BlockedWnd_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="Margin" Value="5"/>
+   </Style>
+
+   <Style x:Key="ChangeMaterialWnd_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="Margin" Value="0,0,0,5"/>
+   </Style>
+
+   <Style x:Key="FeatureManager_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="Margin" Value="30,4,0,2"/>
+   </Style>
+
+   <Style x:Key="FreeContourInput_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="Margin" Value="5,0,5,0"/>
+   </Style>
+
+   <Style x:Key="GeneralParametersWnd_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="Margin" Value="10"/>
+   </Style>
+
+   <Style x:Key="BTLPartList_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="Margin" Value="0,0,50,0"/>
+   </Style>
+
+   <Style x:Key="FeatureInPartInRawPartList_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+   </Style>
+
+   <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="{StaticResource BeamWall_Glacier}"/>
+   </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="{StaticResource BeamWall_Kashmir}"/>
+   </Style>
+
+   <Style x:Key="ProjectParamters_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="Margin" Value="5,4,0,2"/>
+   </Style>
+   
+   <!--#endregion Grid-->
+
+   <!--#region GridSplitter-->
+
+   <Style x:Key="Width_GridSplitter" TargetType="{x:Type GridSplitter}">
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="Width" Value="3"/>
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="VerticalAlignment" Value="Stretch"/>
+   </Style>
+
+   <Style x:Key="Height_GridSplitter" TargetType="{x:Type GridSplitter}">
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="Height" Value="3"/>
+      <Setter Property="HorizontalAlignment" Value="Stretch"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
+   </Style>
+
+   <Style x:Key="HeightBottom_GridSplitter" TargetType="{x:Type GridSplitter}" BasedOn="{StaticResource Height_GridSplitter}">
+      <Setter Property="Height" Value="10"/>
+   </Style>
+
+   <!--#endregion GridSplitter-->
+   
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#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="{StaticResource BeamWall_LinkWater}"/>
+      <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-->
+   
+   <Style x:Key="ForcedStrategyBTL_GroupBox" TargetType="{x:Type GroupBox}" BasedOn="{StaticResource General_GroupBox}">
+      <Setter Property="BorderThickness" Value="2"/>
+      <Setter Property="Margin" Value="0,-5,0,0"/>
+   </Style>
+
+   <Style x:Key="ProjectParameters_GroupBox" TargetType="{x:Type GroupBox}" BasedOn="{StaticResource General_GroupBox}">
+      <Setter Property="BorderThickness" Value="2"/>
+      <Setter Property="Margin" Value="0,-11,0,0"/>
+   </Style>
+
+   <Style x:Key="Item_GroupBox" TargetType="{x:Type GroupBox}" BasedOn="{StaticResource General_GroupBox}">
+      <Setter Property="BorderThickness" Value="1"/>
+      <Setter Property="Margin" Value="0,5,0,0"/>
+   </Style>
+
+   <Style x:Key="StrategyProduction_GroupBox" TargetType="{x:Type GroupBox}" BasedOn="{StaticResource General_GroupBox}">
+      <Setter Property="BorderThickness" Value="1"/>
+   </Style>
+
+   <!--#endregion General-->
+
+   <!--#region StrategyProduction-->
+   
+   <Style x:Key="SelStrategyProduction_GroupBox" TargetType="{x:Type GroupBox}" BasedOn="{StaticResource StrategyProduction_GroupBox}">
+      <Setter Property="BorderThickness" Value="2"/>
+      <Setter Property="Margin" Value="0,-10,0,0"/>
+   </Style>
+
+   <!--#endregion StrategyProduction-->
+
+   <!--#region NoHeader-->
+   
+   <Style x:Key="PartParam_GroupBox" TargetType="{x:Type GroupBox}" BasedOn="{StaticResource NoHeader_GroupBox}">
+      <Setter Property="Margin" Value="0,55"/>
+   </Style>
+
+   <!--#endregion NoHeader-->
+
+   <Style x:Key="PDFPreview_GroupBox" TargetType="{x:Type GroupBox}">
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+      <Setter Property="Margin" Value="2.5"/>
+      <Setter Property="Width" Value="Auto"/>
+   </Style>
+
+   <Style x:Key="MachinePanel_GroupBox" TargetType="{x:Type GroupBox}">
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+      <Setter Property="VerticalAlignment" Value="Top"/>
+   </Style>
+
+   <!--#endregion GroupBox-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#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"/>
+      <Setter Property="HorizontalAlignment" Value="Left"/>
+   </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="{StaticResource 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"/>
+   </Style>
+
+   <!--#endregion TreeView-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region ToolTip-->
+
+   <Style x:Key="PParameters_ToolTip" TargetType="{x:Type ToolTip}">
+      <Setter Property="Background" Value="{StaticResource BeamWall_Glacier}"/>
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
+   </Style>
+
+   <!--#endregion ToolTip-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region 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>
+
+   <!--#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-->
+
    <Style x:Key="TotalTime_Border" TargetType="{x:Type Border}">
       <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Kashmir}"/>
       <Setter Property="Background" Value="{StaticResource BeamWall_Kashmir}"/>
@@ -1186,14 +2281,6 @@
       <Setter Property="BorderThickness" Value="2"/>
    </Style>
 
-   <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="SetUp_Border" TargetType="{x:Type Border}">
       <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Indigo}"/>
       <Setter Property="BorderThickness" Value="1"/>
@@ -1204,225 +2291,11 @@
          </DataTrigger>
       </Style.Triggers>
    </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 Border-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!--#region ComboBox-->
-
-   <Style x:Key="ProdType_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource OnlyProd_ComboBox}">
-      <Setter Property="Height" Value="22"/>
-      <Setter Property="Width" Value="160"/>
-      <Setter Property="Margin" Value="5,0,5,0"/>
-   </Style>
-
-   <Style x:Key="ProdPath_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource OnlyProd_ComboBox}">
-      <Setter Property="Height" Value="22"/>
-      <Setter Property="Width" Value="100"/>
-      <Setter Property="Margin" Value="0,0,5,0"/>
-   </Style>
-
-   <Style x:Key="BTLDateTypeList_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource OnlyProd_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 OnlyProd_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 OnlyProd_ComboBox}">
-      <Setter Property="Height" Value="22"/>
-      <Setter Property="MinWidth" Value="55"/>
-   </Style>
-
-   <Style x:Key="Warehouse_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource OnlyProd_ComboBox}">
-      <Setter Property="Height" Value="22"/>
-      <Setter Property="Width" Value="100"/>
-   </Style>
-
-   <Style x:Key="Strategy_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource OnlyProd_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="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>
-
-   <Style x:Key="AddRawPartWnd_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource OnlyProd_ComboBox}">
-      <Setter Property="Margin" Value="0,0,0,5"/>
-   </Style>
-
-   <Style x:Key="FreeContourInput_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource OnlyProd_ComboBox}">
-      <Setter Property="Margin" Value="5,0,5,0"/>
-   </Style>
-
-   <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>
-
-   <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 ComboBox-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region CheckBox-->
-
-   <Style x:Key="FreeContourInput_CheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="Margin" Value="5,0,5,0"/>
-   </Style>
-
-   <Style x:Key="FeatureInPartInRawPartList_CheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-   </Style>
-
-   <Style x:Key="Option_CheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="HorizontalAlignment" Value="Right"/>
-      <Setter Property="Margin" Value="10,5,10,0"/>
-   </Style>
-
-   <Style x:Key="Alias_CheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-   </Style>
-
-   <Style x:Key="BTLDataWnd_CheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
-      <Setter Property="VerticalAlignment" Value="Top"/>
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="Margin" Value="10,10,0,0"/>
-   </Style>
-
-   <Style x:Key="BTLPartList_CheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="Margin" Value="0,0,5,0"/>
-   </Style>
-
-   <Style x:Key="PartParameters_CheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="Margin" Value="0,5"/>
-   </Style>
-
-   <Style x:Key="PParameters_CheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
-      <Setter Property="VerticalAlignment" Value="Center"/>
-   </Style>
-
-   <Style x:Key="DefaultMacro_CheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
-      <Setter Property="Margin" Value="0,6,5,0"/>
-   </Style>
-
-   <Style x:Key="Project_CheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
-      <Setter Property="VerticalAlignment" Value="Top"/>
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="Margin" Value="5,0,0,0"/>
-   </Style>
-
-   <!--#endregion CheckBox-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region TabControl-->
-
-   <Style x:Key="Optimizer_TabControl" TargetType="{x:Type TabControl}">
-      <Setter Property="TabStripPlacement" Value="Top"/>
-      <Setter Property="Margin" Value="5,5,2.5,5"/>
-      <Setter Property="Background">
-         <Setter.Value>
-            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
-               <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
-               <GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.45"/>
-               <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
-            </LinearGradientBrush>
-         </Setter.Value>
-      </Setter>
-      <Style.Resources>
-         <Style TargetType="{x:Type TabItem}" BasedOn="{StaticResource OnlyProd_TabItem}"/>
-      </Style.Resources>
-   </Style>
-
-   <Style x:Key="SelTab_TabControl" TargetType="{x:Type TabControl}" BasedOn="{StaticResource Optimizer_TabControl}">
-      <Setter Property="BorderThickness" Value="0"/>
-   </Style>
-
-   <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>
-
-   <!--#endregion TabControl-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
    <!--#region Image-->
 
    <Style x:Key="Macro_Image" TargetType="{x:Type Image}">
@@ -1494,663 +2367,10 @@
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!--#region ItemsControl-->
-
-   <Style x:Key="ExpanderList_ItemsControl" TargetType="{x:Type ItemsControl}" BasedOn="{StaticResource {x:Type ItemsControl}}">
-      <Setter Property="BorderThickness" Value="0"/>
-      <Setter Property="Margin" Value="0"/>
-      <Setter Property="Padding" Value="0"/>
-   </Style>
-
-   <Style x:Key="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>
-
-   <Style x:Key="MachinePanel_ItemsControl" TargetType="{x:Type ItemsControl}" BasedOn="{StaticResource {x:Type ItemsControl}}">
-      <Setter Property="Margin" Value="0,5,0,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>
-            <ItemsPanelTemplate>
-               <WrapPanel Orientation="Vertical"/>
-            </ItemsPanelTemplate>
-         </Setter.Value>
-      </Setter>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type ItemsControl}">
-               <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Disabled">
-                  <ItemsPresenter/>
-               </ScrollViewer>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <Style x:Key="UsersControl_ItemsControl" TargetType="{x:Type ItemsControl}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Black}"/>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type ItemsControl}">
-               <Border SnapsToDevicePixels="true" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}">
-                  <ScrollViewer VerticalScrollBarVisibility="Visible">
-                     <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                  </ScrollViewer>
-               </Border>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <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 ItemsControl-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region StackPanel-->
-
-   <Style x:Key="FeatureListManager_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource BTLPartManager_StackPanel}">
-      <Setter Property="HorizontalAlignment" Value="Left"/>
-   </Style>
-
-   <Style x:Key="PDF_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource BTLPartManager_StackPanel}">
-      <Setter Property="Margin" Value="0"/>
-   </Style>
-
-   <Style x:Key="Button_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource BTLPartManager_StackPanel}">
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="HorizontalAlignment" Value="Right"/>
-      <Setter Property="Margin" Value="2.5,0,0,0"/>
-   </Style>
-
-   <Style x:Key="Message_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource BTLPartManager_StackPanel}">
-      <Setter Property="Width" Value="250"/>
-   </Style>
-
-   <Style x:Key="CopyToClipBoard_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource BTLPartManager_StackPanel}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_White}"/>
-      <Setter Property="Margin" Value="0,10,10,10"/>
-   </Style>
-
-   <Style x:Key="ProjectParameters_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource BTLPartManager_StackPanel}">
-      <Setter Property="HorizontalAlignment" Value="Right"/>
-      <Setter Property="Margin" Value="0,7,5,0"/>
-   </Style>
-
-   <Style x:Key="Strategy_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource BTLPartManager_StackPanel}">
-      <Setter Property="VerticalAlignment" Value="Center"/>
-   </Style>
-
-   <Style x:Key="PDFEditor_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
-      <Setter Property="Margin" Value="0,-0.5,0,5"/>
-   </Style>
-
-   <Style x:Key="RawPartManager_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
-      <Setter Property="HorizontalAlignment" Value="Right"/>
-      <Setter Property="Margin" Value="0,1,5,1"/>
-   </Style>
-
-   <Style x:Key="List_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
-      <Setter Property="Margin" Value="5,5,5,0"/>
-   </Style>
-
-   <Style x:Key="FreeContourInput_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
-      <Style.Triggers>
-         <DataTrigger Binding="{Binding FocusTextBox}" Value="True">
-            <Setter Property="FocusManager.FocusedElement" Value="{Binding ElementName=PropertySearch}"/>
-         </DataTrigger>
-      </Style.Triggers>
-   </Style>
-
-   <Style x:Key="GeneralParametersStrategy_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
-      <Setter Property="HorizontalAlignment" Value="Right"/>
-      <Setter Property="Margin" Value="10"/>
-   </Style>
-
-   <Style x:Key="BTLPartList_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
-      <Setter Property="Margin" Value="0,2,0,0"/>
-   </Style>
-
-   <Style x:Key="PParameters_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
-      <Setter Property="HorizontalAlignment" Value="Right"/>
-   </Style>
-
-   <Style x:Key="PartManagers_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
-      <Setter Property="Margin" Value="10,5,10,5"/>
-   </Style>
-
-   <Style x:Key="PartManagerL_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
-      <Setter Property="Margin" Value="10,5,15,5"/>
-   </Style>
-
-   <Style x:Key="BTLTotParts_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_White}"/>
-      <Setter Property="Margin" Value="10,10,0,0"/>
-   </Style>
-
-   <Style x:Key="BTLTotTime_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_White}"/>
-      <Setter Property="Margin" Value="10,-1,0,0"/>
-   </Style>
-
-   <Style x:Key="BTLRemainingTime_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_White}"/>
-      <Setter Property="Margin" Value="10,-1,0,10"/>
-   </Style>
-
-   <Style x:Key="StrategyManager_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="Margin" Value="0,5,0,5"/>
-   </Style>
-
-   <Style x:Key="AddSectionXMaterialWnd_StackPanel" TargetType="{x:Type StackPanel}">
-      <Setter Property="Margin" Value="5,5,5,0"/>
-   </Style>
-
-   <Style x:Key="Statistics_StackPanel" TargetType="{x:Type StackPanel}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_White}"/>
-      <Setter Property="Margin" Value="10"/>
-   </Style>
-
-   <Style x:Key="OptStatistics_StackPanel" TargetType="{x:Type StackPanel}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_White}"/>
-      <Setter Property="Margin" Value="-10,10,10,10"/>
-   </Style>
-
-   <Style x:Key="RawPart_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource OptStatistics_StackPanel}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_White}"/>
-      <Setter Property="Orientation" Value="Vertical"/>
-      <Setter Property="Margin" Value="-10,10,10,10"/>
-   </Style>
-
-   <!--#endregion StackPanel-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region ListBox-->
-
-   <Style x:Key="NewAddFeature_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
-      <Setter Property="Background" Value="Transparent"/>
-      <Setter Property="BorderThickness" Value="0"/>
-      <Setter Property="Height" Value="585"/>
-      <Setter Property="Width" Value="260"/>
-      <Setter Property="Margin" Value="5"/>
-      <Style.Resources>
-         <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource OnlyProd_ScrollBar}"/>
-         <Style TargetType="{x:Type ListBoxItem}">
-            <Setter Property="Template">
-               <Setter.Value>
-                  <ControlTemplate TargetType="ListBoxItem">
-                     <Border Background="{TemplateBinding Background}"
-                             BorderBrush="Transparent"
-                             BorderThickness="1">
-                        <ContentPresenter />
-                     </Border>
-                  </ControlTemplate>
-               </Setter.Value>
-            </Setter>
-            <Style.Triggers>
-               <Trigger Property="IsSelected" Value="True">
-                  <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}"/>
-                  <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
-                  <Setter Property="FontWeight" Value="Bold"/>
-               </Trigger>
-               <Trigger Property="IsSelected" Value="False">
-                  <Setter Property="Background" Value="Transparent"/>
-                  <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
-                  <Setter Property="FontWeight" Value="Normal"/>
-               </Trigger>
-            </Style.Triggers>
-         </Style>
-      </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="Transparent"/>
-      <Setter Property="BorderThickness" Value="0"/>
-      <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
-      <Setter Property="Height" Value="610"/>
-      <Setter Property="Width" Value="980"/>
-      <Setter Property="Margin" Value="5"/>
-   </Style>
-
-   <Style x:Key="MacroDefault_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
-      <Setter Property="Background" Value="Transparent"/>
-      <Setter Property="BorderThickness" Value="0"/>
-      <Setter Property="HorizontalAlignment" Value="Left"/>
-      <Setter Property="Height" Value="585"/>
-      <Setter Property="Width" Value="250"/>
-      <Setter Property="Margin" Value="5"/>
-      <Setter Property="AlternationCount" Value="2"/>
-      <Style.Resources>
-         <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource OnlyProd_ScrollBar}"/>
-      </Style.Resources>
-   </Style>
-
-   <Style x:Key="FeatureManager_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
-      <Setter Property="Background" Value="Transparent"/>
-      <Setter Property="BorderThickness" Value="0"/>
-      <Setter Property="HorizontalContentAlignment" Value="Center"/>
-      <Setter Property="Height" Value="82"/>
-      <Setter Property="Width" Value="80"/>
-      <Setter Property="AlternationCount" Value="2"/>
-   </Style>
-
-   <Style x:Key="LeftPanel_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
-      <Setter Property="Background" Value="Transparent"/>
-      <Setter Property="BorderThickness" Value="0"/>
-      <Setter Property="HorizontalContentAlignment" Value="Center"/>
-      <Setter Property="Height" Value="150"/>
-      <Setter Property="Width" Value="130"/>
-      <Setter Property="AlternationCount" Value="2"/>
-      <Style.Resources>
-         <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource OnlyProd_ScrollBar}"/>
-      </Style.Resources>
-   </Style>
-
-   <Style x:Key="AlternationIndex_ListBoxItem" TargetType="{x:Type ListBoxItem}">
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type ListBoxItem}">
-               <Border Name="_itemContainer"
-                       Padding="0"
-                       BorderBrush="Transparent"
-                       BorderThickness="1"
-                       SnapsToDevicePixels="True">
-                  <ContentPresenter />
-               </Border>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="ItemsControl.AlternationIndex" Value="0">
-                     <Setter Property="TextBlock.Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
-                     <Setter Property="TextBlock.TextAlignment" Value="Center"/>
-                     <Setter Property="TextBlock.FontSize" Value="13"/>
-                  </Trigger>
-                  <Trigger Property="ItemsControl.AlternationIndex" Value="1">
-                     <Setter Property="Foreground" Value="{StaticResource BeamWall_LinkWater}" />
-                     <Setter TargetName="_itemContainer" Property="BorderBrush" Value="{StaticResource BeamWall_LinkWater}" />
-                     <Setter TargetName="_itemContainer" Property="Background" Value="{StaticResource BeamWall_LinkWater}" />
-                     <Setter Property="TextBlock.Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
-                     <Setter Property="TextBlock.TextAlignment" Value="Center"/>
-                     <Setter Property="TextBlock.FontSize" Value="13"/>
-                  </Trigger>
-                  <Trigger Property="IsSelected" Value="True">
-                     <Setter TargetName="_itemContainer" Property="BorderBrush" Value="{StaticResource BeamWall_FountainBlue}" />
-                     <Setter TargetName="_itemContainer" Property="Background" Value="{StaticResource BeamWall_FountainBlue}" />
-                     <Setter Property="TextBlock.Foreground" Value="{StaticResource BeamWall_White}"/>
-                     <Setter Property="TextBlock.TextAlignment" Value="Center"/>
-                     <Setter Property="FontWeight" Value="Bold"/>
-                     <Setter Property="TextBlock.FontSize" Value="14"/>
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </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="BorderThickness" Value="0"/>
-      <Setter Property="Margin" Value="10"/>
-      <Setter Property="FontSize" Value="12"/>
-      <Setter Property="Background" Value="Transparent"/>
-      <Style.Resources>
-         <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource OnlyProd_ScrollBar}"/>
-         <Style TargetType="{x:Type ListBoxItem}">
-            <Setter Property="Template">
-               <Setter.Value>
-                  <ControlTemplate TargetType="ListBoxItem">
-                     <Border Background="{TemplateBinding Background}"
-                             BorderBrush="Transparent"
-                             BorderThickness="1">
-                        <ContentPresenter />
-                     </Border>
-                  </ControlTemplate>
-               </Setter.Value>
-            </Setter>
-            <Style.Triggers>
-               <Trigger Property="IsSelected" Value="True">
-                  <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}"/>
-                  <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
-                  <Setter Property="FontWeight" Value="Bold"/>
-               </Trigger>
-               <Trigger Property="IsSelected" Value="False">
-                  <Setter Property="Background" Value="Transparent"/>
-                  <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
-                  <Setter Property="FontWeight" Value="Normal"/>
-               </Trigger>
-            </Style.Triggers>
-         </Style>
-      </Style.Resources>
-   </Style>
-
-   <Style x:Key="BTL_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
-      <Setter Property="BorderThickness" Value="0"/>
-      <Setter Property="HorizontalAlignment" Value="Left"/>
-      <Setter Property="SelectionMode" Value="Single"/>
-      <Setter Property="IsSynchronizedWithCurrentItem" Value="True"/>
-      <Style.Resources>
-         <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource OnlyProd_ScrollBar}"/>
-         <Style TargetType="{x:Type ListBoxItem}">
-            <Setter Property="Template">
-               <Setter.Value>
-                  <ControlTemplate TargetType="ListBoxItem">
-                     <Border Background="{TemplateBinding Background}"
-                             BorderBrush="Transparent"
-                             BorderThickness="1">
-                        <ContentPresenter />
-                     </Border>
-                  </ControlTemplate>
-               </Setter.Value>
-            </Setter>
-            <Style.Triggers>
-               <Trigger Property="IsSelected" Value="True">
-                  <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}"/>
-                  <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
-                  <Setter Property="FontWeight" Value="Bold"/>
-                  <Setter Property="FontSize" Value="12"/>
-               </Trigger>
-               <Trigger Property="IsSelected" Value="False">
-                  <Setter Property="Background" Value="Transparent"/>
-                  <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
-                  <Setter Property="FontWeight" Value="SemiBold"/>
-                  <Setter Property="FontSize" Value="12"/>
-               </Trigger>
-            </Style.Triggers>
-         </Style>
-      </Style.Resources>
-   </Style>
-
-   <Style x:Key="ListBox_PDF" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
-      <Setter Property="Background" Value="Transparent"/>
-      <Setter Property="BorderThickness" Value="0"/>
-      <Setter Property="Padding" Value="0"/>
-      <Setter Property="Margin" Value="0"/>
-      <Setter Property="VerticalContentAlignment" Value="Top"/>
-      <Setter Property="HorizontalContentAlignment" Value="Left"/>
-   </Style>
-
-   <Style x:Key="ForcedStrategyBTL_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
-      <Setter Property="IsSynchronizedWithCurrentItem" Value="True"/>
-      <Setter Property="Background" Value="Transparent"/>
-      <Setter Property="HorizontalAlignment" Value="Left"/>
-      <Setter Property="BorderThickness" Value="0"/>
-      <Setter Property="Height" Value="585"/>
-      <Setter Property="Width" Value="260"/>
-      <Setter Property="Margin" Value="5"/>
-      <Style.Resources>
-         <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource OnlyProd_ScrollBar}"/>
-         <Style TargetType="{x:Type ListBoxItem}">
-            <Setter Property="Template">
-               <Setter.Value>
-                  <ControlTemplate TargetType="ListBoxItem">
-                     <Border Background="{TemplateBinding Background}"
-                             BorderBrush="Transparent"
-                             BorderThickness="1">
-                        <ContentPresenter />
-                     </Border>
-                  </ControlTemplate>
-               </Setter.Value>
-            </Setter>
-            <Style.Triggers>
-               <Trigger Property="IsSelected" Value="True">
-                  <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}"/>
-                  <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
-                  <Setter Property="FontWeight" Value="Bold"/>
-               </Trigger>
-               <Trigger Property="IsSelected" Value="False">
-                  <Setter Property="Background" Value="Transparent"/>
-                  <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
-                  <Setter Property="FontWeight" Value="Normal"/>
-               </Trigger>
-            </Style.Triggers>
-         </Style>
-      </Style.Resources>
-   </Style>
-
-   <Style x:Key="BTLPartList_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
-      <Setter Property="BorderThickness" Value="0"/>
-      <Setter Property="HorizontalAlignment" Value="Left"/>
-      <Setter Property="SelectionMode" Value="Single"/>
-      <Setter Property="IsSynchronizedWithCurrentItem" Value="True"/>
-      <Setter Property="Grid.IsSharedSizeScope" Value="True"/>
-      <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
-      <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-      <Style.Resources>
-         <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource OnlyProd_ScrollBar}"/>
-         <Style TargetType="{x:Type ListBoxItem}">
-            <Setter Property="Template">
-               <Setter.Value>
-                  <ControlTemplate TargetType="ListBoxItem">
-                     <Border Background="{TemplateBinding Background}"
-                             BorderBrush="Transparent"
-                             BorderThickness="1">
-                        <ContentPresenter />
-                     </Border>
-                  </ControlTemplate>
-               </Setter.Value>
-            </Setter>
-            <Style.Triggers>
-               <Trigger Property="IsSelected" Value="True">
-                  <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}"/>
-                  <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
-                  <Setter Property="FontWeight" Value="Bold"/>
-                  <Setter Property="FontSize" Value="12"/>
-               </Trigger>
-               <Trigger Property="IsSelected" Value="False">
-                  <Setter Property="Background" Value="Transparent"/>
-                  <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
-                  <Setter Property="FontWeight" Value="SemiBold"/>
-                  <Setter Property="FontSize" Value="12"/>
-               </Trigger>
-            </Style.Triggers>
-         </Style>
-      </Style.Resources>
-   </Style>
-
-   <!--#endregion ListBox-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region WrapPanel-->
-
-   <Style x:Key="Bottom_WrapPanel" TargetType="{x:Type WrapPanel}" BasedOn="{StaticResource Project_WrapPanel}">
-      <Setter Property="Margin" Value="0,2,2,0"/>
-   </Style>
-
-   <Style x:Key="MacroCustom_WrapPanel" TargetType="{x:Type WrapPanel}" BasedOn="{StaticResource ProjectH_WrapPanel}">
-      <Setter Property="IsItemsHost" Value="True"/>
-   </Style>
-
-   <!--#endregion WrapPanel-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region Grid-->
-
-   <Style x:Key="PartManager_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="HorizontalAlignment" Value="Left"/>
-      <Setter Property="Margin" Value="10,10,0,10"/>
-   </Style>
-
-   <Style x:Key="AddPart_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="Margin" Value="0,0,0,5"/>
-   </Style>
-
-   <Style x:Key="GlobalState_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="Margin" Value="2,0,0,0"/>
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-   </Style>
-
-   <Style x:Key="ProjectType_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="Margin" Value="15"/>
-   </Style>
-
-   <Style x:Key="AddPartWnd_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="Margin" Value="0,0,0,5"/>
-   </Style>
-
-   <Style x:Key="AddRawPartWnd_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="Margin" Value="5,5,5,0"/>
-   </Style>
-
-   <Style x:Key="BlockedWnd_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="Margin" Value="5"/>
-   </Style>
-
-   <Style x:Key="CalcPanel_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="Margin" Value="0,0,5,0"/>
-   </Style>
-
-   <Style x:Key="ChangeMaterialWnd_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="Margin" Value="0,0,0,5"/>
-   </Style>
-
-   <Style x:Key="FeatureManager_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="Margin" Value="30,4,0,2"/>
-   </Style>
-
-   <Style x:Key="FreeContourInput_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="Margin" Value="5,0,5,0"/>
-   </Style>
-
-   <Style x:Key="GeneralParametersWnd_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="Margin" Value="10"/>
-   </Style>
-
-   <Style x:Key="BTLPartList_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="Margin" Value="0,0,50,0"/>
-   </Style>
-
-   <Style x:Key="FeatureInPartInRawPartList_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-   </Style>
-
-   <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="MachParam_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="Margin" Value="0,0,5,5"/>
-   </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="{StaticResource BeamWall_Glacier}"/>
-   </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="{StaticResource BeamWall_Kashmir}"/>
-   </Style>
-
-   <!--#endregion Grid-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
    <!--#region Ellipse-->
 
-   <Style x:Key="FeatureInPartInRawPartList_Ellipse" TargetType="{x:Type Ellipse}">
-      <Setter Property="Fill" Value="{StaticResource BeamWall_Blue}"/>
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="Width" Value="5"/>
-      <Setter Property="Height" Value="5"/>
-   </Style>
-
+   <!--#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"/>
@@ -2160,207 +2380,12 @@
       <Setter Property="Fill" Value="{StaticResource BeamWall_Red}"/>
    </Style>
 
-   <Style x:Key="SetUp_Ellipse" TargetType="{x:Type Ellipse}">
-      <Setter Property="Width" Value="10"/>
-      <Setter Property="Height" Value="10"/>
-   </Style>
+   <!--#endregion FeatureInPartInRawPartList-->
 
    <!--#endregion Ellipse-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!--#region ProgressBar-->
-
-   <Style x:Key="NestingRunningWndV_ProgressBar" TargetType="{x:Type ProgressBar}">
-      <Setter Property="Minimum" Value="0"/>
-      <Setter Property="Maximum" Value="100"/>
-      <Setter Property="Height" Value="20"/>
-      <Setter Property="Margin" Value="40,0,40,0"/>
-   </Style>
-
-   <!--#endregion ProgressBar-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#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 OnlyProd_ScrollBar}"/>
-      </Style.Resources>
-   </Style>
-
-   <Style x:Key="PDFViewer_ScrollViewer" TargetType="{x:Type ScrollViewer}" BasedOn="{StaticResource {x:Type ScrollViewer}}">
-      <Setter Property="Background" Value="{StaticResource ScrollViewer.Static.Background}"/>
-      <Setter Property="PanningMode" Value="Both"/>
-   </Style>
-
-   <!--#endregion ScrollViewer-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region GroupBox-->
-
-   <Style x:Key="PDFPreview_GroupBox" TargetType="{x:Type GroupBox}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
-      <Setter Property="Margin" Value="2.5"/>
-      <Setter Property="Width" Value="Auto"/>
-   </Style>
-
-   <Style x:Key="MachinePanel_GroupBox" TargetType="{x:Type GroupBox}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
-      <Setter Property="VerticalAlignment" Value="Top"/>
-   </Style>
-
-   <Style x:Key="Warehouse_GroupBox" TargetType="{x:Type GroupBox}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
-      <Setter Property="Margin" Value="0,0,0,5"/>
-   </Style>
-
-   <Style x:Key="ForcedStrategyBTL_GroupBox" TargetType="{x:Type GroupBox}" BasedOn="{StaticResource General_GroupBox}">
-      <Setter Property="BorderThickness" Value="2"/>
-      <Setter Property="Margin" Value="0,-5,0,0"/>
-   </Style>
-
-   <Style x:Key="ProjectParameters_GroupBox" TargetType="{x:Type GroupBox}" BasedOn="{StaticResource General_GroupBox}">
-      <Setter Property="BorderThickness" Value="2"/>
-      <Setter Property="Margin" Value="0,-11,0,0"/>
-   </Style>
-
-   <Style x:Key="Item_GroupBox" TargetType="{x:Type GroupBox}" BasedOn="{StaticResource General_GroupBox}">
-      <Setter Property="BorderThickness" Value="1"/>
-      <Setter Property="Margin" Value="0,5,0,0"/>
-   </Style>
-
-   <Style x:Key="StrategyProduction_GroupBox" TargetType="{x:Type GroupBox}" BasedOn="{StaticResource General_GroupBox}">
-      <Setter Property="BorderThickness" Value="1"/>
-   </Style>
-
-   <Style x:Key="SelStrategyProduction_GroupBox" TargetType="{x:Type GroupBox}" BasedOn="{StaticResource StrategyProduction_GroupBox}">
-      <Setter Property="BorderThickness" Value="2"/>
-      <Setter Property="Margin" Value="0,-10,0,0"/>
-   </Style>
-
-   <Style x:Key="PartParam_GroupBox" TargetType="{x:Type GroupBox}" BasedOn="{StaticResource NoHeader_GroupBox}">
-      <Setter Property="Margin" Value="0,55"/>
-   </Style>
-
-   <!--#endregion GroupBox-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#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"/>
-      <Setter Property="HorizontalAlignment" Value="Left"/>
-   </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 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="AddRawPartWnd_UniformGrid" TargetType="{x:Type UniformGrid}">
-      <Setter Property="Margin" Value="0,0,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="{StaticResource BeamWall_LinkWater}"/>
-      <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 UserControl-->
-
-   <Style x:Key="FreeContourInput_UserControl" TargetType="{x:Type UserControl}">
-      <Setter Property="Height" Value="32"/>
-   </Style>
-
-   <!--#endregion UserControl-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#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>
-
-
-   <!--#endregion PopUp-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
    <!--#region Rectangle-->
 
    <Style x:Key="ProjectType_Rectangle" TargetType="{x:Type Rectangle}">
@@ -2371,16 +2396,4 @@
    
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!--#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"/>
-   </Style>
-   
-   <!--#endregion TreeView-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
 </ResourceDictionary>
diff --git a/EgtBEAMWALL.Optimizer/WarehouseWnd/WarehouseWndV.xaml b/EgtBEAMWALL.Optimizer/WarehouseWnd/WarehouseWndV.xaml
index c516e7e0..befd43f8 100644
--- a/EgtBEAMWALL.Optimizer/WarehouseWnd/WarehouseWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/WarehouseWnd/WarehouseWndV.xaml
@@ -235,7 +235,7 @@
                         </DataTemplate>
                      </DataGridComboBoxColumn.HeaderTemplate>
                      <DataGridComboBoxColumn.ElementStyle>
-                        <Style TargetType="{x:Type ComboBox}" BasedOn="{StaticResource OnlyProd_ComboBox}">
+                        <Style TargetType="{x:Type ComboBox}" BasedOn="{StaticResource Optmizer_ComboBox}">
                            <Setter Property="ItemsSource" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type OPTIMIZER:WarehouseWndV}}, Path=DataContext.SectionXMaterialList}"/>
                            <Setter Property="SelectedItem" Value="{Binding SectXMat, UpdateSourceTrigger=PropertyChanged}" />
                            <Setter Property="Height" Value="{Binding ActualHeight, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}"/>
@@ -243,7 +243,7 @@
                         </Style>
                      </DataGridComboBoxColumn.ElementStyle>
                      <DataGridComboBoxColumn.EditingElementStyle>
-                        <Style TargetType="{x:Type ComboBox}" BasedOn="{StaticResource OnlyProd_ComboBox}">
+                        <Style TargetType="{x:Type ComboBox}" BasedOn="{StaticResource Optmizer_ComboBox}">
                            <Setter Property="ItemsSource" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type OPTIMIZER:WarehouseWndV}}, Path=DataContext.SectionXMaterialList}"/>
                            <Setter Property="SelectedItem" Value="{Binding SectXMat, UpdateSourceTrigger=PropertyChanged}" />
                            <Setter Property="Height" Value="{Binding ActualHeight, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}"/>
diff --git a/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj b/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj
index 803a502a..7a1982bd 100644
--- a/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj
+++ b/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj
@@ -94,6 +94,9 @@
     <Reference Include="EgwProxy.LiMan, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\EgwProxy.LiMan.1.0.2408.718\lib\EgwProxy.LiMan.dll</HintPath>
     </Reference>
+    <Reference Include="EgwWPFBaseLib, Version=2.7.11.4, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\EgwWPFBaseLib.2.7.11-beta.4\lib\EgwWPFBaseLib.dll</HintPath>
+    </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
diff --git a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowV.xaml b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowV.xaml
index 75410934..ef1ce340 100644
--- a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowV.xaml
+++ b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowV.xaml
@@ -1,18 +1,14 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="MainWindowV"
-                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            xmlns:EgtBEAMWALLSUPERVISOR="clr-namespace:EgtBEAMWALL.Supervisor"
-                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            DataContext="{StaticResource MainWindowVM}"
-                            Style="{StaticResource OnlyProd_EgtCustomWindow}"
-                            Title="{Binding Title}" Icon="/Resources/EgtBEAMWALL.ico"
-                            MinHeight="600" MinWidth="800"
-                            ShowInTaskbar="True"
-                            AboutBoxCommand="{Binding AboutBox_Command}"
-                            CloseCommand="{Binding CloseApplication_Command,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
-   <EgtWPFLib5:EgtCustomWindow.TitlePanel>
+<EgtBEAMWALLCORE:OptimizerWindow x:Class="MainWindowV"
+                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                                 xmlns:EgtBEAMWALLSUPERVISOR="clr-namespace:EgtBEAMWALL.Supervisor"
+                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
+                                 MinHeight="600" MinWidth="800"
+                                 ShowInTaskbar="True"
+                                 Title="{Binding Title}">
+   <EgtBEAMWALLCORE:OptimizerWindow.TitlePanel>
       <EgtBEAMWALLSUPERVISOR:MainMenuV DataContext="{StaticResource MainMenuVM}"/>
-   </EgtWPFLib5:EgtCustomWindow.TitlePanel>
+   </EgtBEAMWALLCORE:OptimizerWindow.TitlePanel>
 
    <!--Pannello principale -->
    <DockPanel>
@@ -29,7 +25,7 @@
             </Style>
          </TabControl.ItemContainerStyle>
          <TabItem>
-            <ContentControl Content="{Binding ProjectContent}"/>
+            <EgtBEAMWALLSUPERVISOR:ProjectV DataContext="{StaticResource ProjectVM}"/>
          </TabItem>
          <TabItem>
             <EgtBEAMWALLSUPERVISOR:InputsPageV DataContext="{StaticResource InputsPageVM}"/>
@@ -38,9 +34,9 @@
             <EgtBEAMWALLSUPERVISOR:OutputsPageV DataContext="{StaticResource OutputsPageVM}"/>
          </TabItem>
          <TabItem>
-            <ContentControl Content="{Binding ConfigurationPageContent}"/>
+            <EgtBEAMWALLSUPERVISOR:ConfigurationPageV DataContext="{StaticResource ConfigurationPageVM}"/>
          </TabItem>
       </TabControl>
 
    </DockPanel>
-</EgtWPFLib5:EgtCustomWindow>
+</EgtBEAMWALLCORE:OptimizerWindow>
diff --git a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowV.xaml.vb b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowV.xaml.vb
index de752894..7922066c 100644
--- a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowV.xaml.vb
+++ b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowV.xaml.vb
@@ -8,14 +8,19 @@ Public Class MainWindowV
 #Region "CONSTRUCTOR"
 
    Sub New()
+      m_MainWindowVM = New MainWindowVM
       ' Funzione che interpreta l'xaml
       InitializeComponent()
       ' Assegno al riferimento locale al VM il VM preso dal DataContext
-      m_MainWindowVM = DirectCast(Me.DataContext, MainWindowVM)
-      AddHandler Me.Loaded, AddressOf MainWindowV_Loaded
+      Me.DataContext = m_MainWindowVM
+      'm_MainWindowVM = DirectCast(Me.DataContext, MainWindowVM)
+      'AddHandler Me.Loaded, AddressOf MainWindowV_Loaded
       AddHandler Me.ContentRendered, AddressOf MainWindowV_ContentRendered
       AddHandler Me.Closing, AddressOf MainWindowV_Closing
       AddHandler Me.KeyDown, AddressOf MainWindowV_KeyDown
+      Me.SetPlacementAppName(S_GENERAL)
+      Me.SetPlacementKeyName(K_WINPLACE)
+      Me.SetPlacementFileName(IniFile.m_sIniFile)
    End Sub
 
 #End Region    ' CONSTRUCTOR
diff --git a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb
index b53b7fbb..a929fa6a 100644
--- a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb
+++ b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb
@@ -41,18 +41,6 @@ Public Class MainWindowVM
       End Set
    End Property
 
-   Public ReadOnly Property ProjectContent As Object
-      Get
-         Return New ProjectV()
-      End Get
-   End Property
-
-   Public ReadOnly Property ConfigurationPageContent As Object
-      Get
-         Return New ConfigurationPageV()
-      End Get
-   End Property
-
    ' Definizione comandi
    Private m_cmdAboutBox As ICommand
    Private m_cmdCloseApplication As ICommand
diff --git a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb
index 0f1c9ebe..81d412c5 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("2.7.11.8")>
-<Assembly: AssemblyFileVersion("2.7.11.8")>
+<Assembly: AssemblyVersion("2.7.11.9")>
+<Assembly: AssemblyFileVersion("2.7.11.9")>
diff --git a/EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml b/EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml
index 7341e48e..82c861a5 100644
--- a/EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml
+++ b/EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml
@@ -85,17 +85,184 @@
    
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!--#region EgtCustomWindow -->
+   <!--#region Button-->
 
-   <Style TargetType="{x:Type EgtWPFLib5:EgtCustomWindow}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
-      <Setter Property="TitleBarHeight" Value="32"/>
-      <Setter Property="TitleBarBrush" Value="{StaticResource Omag_LightGray}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>
-      <Setter Property="TitleBarForeground" Value="{StaticResource Omag_Black}"/>
-      <Setter Property="ShowInTaskbar" Value="False"/>
+   <Style x:Key="MachCommandMessagePanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource EgtWPFLib5_Button}">
+      <Setter Property="Margin" Value="10,0,10,2"/>
    </Style>
 
-   <!--#endregion EgtCustomWindow -->
+   <Style x:Key="DeleteAlarms_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource MachCommandMessagePanel_Button}">
+      <Setter Property="Width" Value="120"/>
+   </Style>
+
+   <Style x:Key="MachineLog_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Mach_Button}">
+      <Setter Property="Margin" Value="2.5,0,5,0"/>
+   </Style>
+
+   <Style x:Key="MDIPage_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ToolBar_Button}">
+      <Setter Property="Margin" Value="2.5,0,5,0"/>
+   </Style>
+
+   <Style x:Key="SupervisorManager_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ToolBarViewPanel_Button}">
+      <Setter Property="ContextMenuService.Placement" Value="Bottom"/>
+   </Style>
+
+   <!--#endregion Button-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region ToggleButton-->
+
+   <Style x:Key="CalcPanel_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource ToolBar_ToggleButton}">
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
+   </Style>
+
+   <!--#endregion ToggleButton-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region ComboBox-->
+
+   <Style x:Key="MachineLog_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource CalcPanel_ComboBox}">
+      <Setter Property="Width" Value="70"/>
+      <Setter Property="Margin" Value="0,0,2.5,0"/>
+   </Style>
+
+   <!--#endregion ComboBox-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region ItemsControl-->
+
+   <Style x:Key="AxesPanel_ItemsControl" TargetType="{x:Type ItemsControl}" BasedOn="{StaticResource {x:Type ItemsControl}}">
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+      <Setter Property="TextBlock.TextAlignment" Value="Center"/>
+   </Style>
+
+   <!--#endregion ItemsControl-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region TabControl-->
+
+   <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>
+
+   <Style x:Key="Project_TabControl" TargetType="{x:Type TabControl}" BasedOn="{StaticResource {x:Type TabControl}}">
+      <Setter Property="TabStripPlacement" Value="Right"/>
+      <Setter Property="BorderThickness" Value="0"/>
+      <Setter Property="Padding" Value="0"/>
+      <Setter Property="Margin" Value="0"/>
+   </Style>
+
+   <!--#endregion TabControl-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region StackPanel-->
+
+   <Style x:Key="LeftPanel_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
+      <Setter Property="HorizontalAlignment" Value="Right"/>
+      <Setter Property="Margin" Value="0,3,5,2"/>
+   </Style>
+
+   <Style x:Key="MachineLog_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
+      <Setter Property="Height" Value="30"/>
+   </Style>
+
+   <!--#endregion StackPanel-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region WrapPanel-->
+
+   <Style x:Key="ProjectSupervisor_WrapPanel" TargetType="{x:Type WrapPanel}">
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+   </Style>
+
+   <!--#endregion WrapPanel-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region GridSplitter-->
+
+   <Style x:Key="Height_GridSplitter" TargetType="{x:Type GridSplitter}">
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="Height" Value="3"/>
+      <Setter Property="HorizontalAlignment" Value="Stretch"/>
+      <Setter Property="ResizeDirection" Value="Rows"/>
+      <Setter Property="ResizeBehavior" Value="PreviousAndNext"/>
+   </Style>
+
+   <Style x:Key="Width_GridSplitter" TargetType="{x:Type GridSplitter}">
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="Width" Value="3"/>
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="VerticalAlignment" Value="Stretch"/>
+   </Style>
+
+   <!--#endregion GridSplitter-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region UniformGrid-->
+
+   <Style x:Key="LeftPanel_UniformGrid" TargetType="{x:Type UniformGrid}">
+      <Setter Property="TextBlock.TextAlignment" Value="Center"/>
+      <Setter Property="Margin" Value="0,10,0,5"/>
+   </Style>
+
+   <!--#endregion UniformGrid-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region Expander-->
+
+   <Style x:Key="LeftPanel_Expander" TargetType="{x:Type Expander}" BasedOn="{StaticResource {x:Type Expander}}">
+      <Setter Property="Margin" Value="0,15,0,2"/>
+   </Style>
+
+   <!--#endregion Expander-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region Border-->
+
+   <Style x:Key="LeftPanel_Border" TargetType="{x:Type Border}" BasedOn="{StaticResource Optimizer_Border}">
+      <Setter Property="Margin" Value="0,0,2.5,0"/>
+   </Style>
+
+   <Style x:Key="Project_Border" TargetType="{x:Type Border}" BasedOn="{StaticResource Optimizer_Border}">
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="Margin" Value="0.5,2,1,2"/>
+   </Style>
+
+   <!--#endregion Border-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region ProgressBar-->
+
+   <Style x:Key="WaitngWnd_ProgressBar" TargetType="{x:Type ProgressBar}">
+      <Setter Property="Height" Value="20"/>
+      <Setter Property="Minimum" Value="0"/>
+      <Setter Property="Maximum" Value="20"/>
+      <Setter Property="Margin" Value="40,0,40,0"/>
+   </Style>
+
+   <!--#endregion ProgressBar-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region DatePicker-->
+
+   <Style x:Key="Log_DatePicker" TargetType="{x:Type DatePicker}">
+      <Setter Property="Height" Value="22"/>
+   </Style>
+
+   <!--#endregion DatePicker-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
    
@@ -138,176 +305,8 @@
 
    <!--#endregion DataGridRow/DataGridCell-->
 
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region DatePicker-->
-
-   <Style x:Key="Log_DatePicker" TargetType="{x:Type DatePicker}">
-      <Setter Property="Height" Value="22"/>
-   </Style>
-
-   <!--#endregion DatePicker-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region ItemsControl-->
-
-   <Style x:Key="AxesPanel_ItemsControl" TargetType="{x:Type ItemsControl}" BasedOn="{StaticResource {x:Type ItemsControl}}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
-      <Setter Property="TextBlock.TextAlignment" Value="Center"/>
-   </Style>
-
-   <!--#endregion ItemsControl-->
-
    <!-- ______________________________________________________________________________________________________________________________________________ -->
    
-   <!--#region ToggleButton-->
-
-   <Style x:Key="CalcPanel_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource ToolBar_ToggleButton}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
-   </Style>
-
-   <!--#endregion ToggleButton-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region UniformGrid-->
-
-   <Style x:Key="LeftPanel_UniformGrid" TargetType="{x:Type UniformGrid}">
-      <Setter Property="TextBlock.TextAlignment" Value="Center"/>
-      <Setter Property="Margin" Value="0,10,0,5"/>
-   </Style>
-
-   <!--#endregion UniformGrid-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region Expander-->
-
-   <Style x:Key="LeftPanel_Expander" TargetType="{x:Type Expander}" BasedOn="{StaticResource {x:Type Expander}}">
-      <Setter Property="Margin" Value="0,15,0,2"/>
-   </Style>
-
-   <!--#endregion Expander-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region Border-->
-
-   <Style x:Key="LeftPanel_Border" TargetType="{x:Type Border}" BasedOn="{StaticResource Optimizer_Border}">
-      <Setter Property="Margin" Value="0,0,2.5,0"/>
-   </Style>
-
-   <Style x:Key="Project_Border" TargetType="{x:Type Border}" BasedOn="{StaticResource Optimizer_Border}">
-      <Setter Property="Background" Value="Transparent"/>
-      <Setter Property="Margin" Value="0.5,2,1,2"/>
-   </Style>
-
-   <!--#endregion Border-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region StackPanel-->
-
-   <Style x:Key="LeftPanel_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
-      <Setter Property="HorizontalAlignment" Value="Right"/>
-      <Setter Property="Margin" Value="0,3,5,2"/>
-   </Style>
-
-   <Style x:Key="MachineLog_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
-      <Setter Property="Height" Value="30"/>
-   </Style>
-
-   <!--#endregion StackPanel-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region GridSplitter-->
-
-   <Style x:Key="Height_GridSplitter" TargetType="{x:Type GridSplitter}">
-      <Setter Property="Background" Value="Transparent"/>
-      <Setter Property="Height" Value="3"/>
-      <Setter Property="HorizontalAlignment" Value="Stretch"/>
-      <Setter Property="ResizeDirection" Value="Rows"/>
-      <Setter Property="ResizeBehavior" Value="PreviousAndNext"/>
-   </Style>
-
-   <Style x:Key="Width_GridSplitter" TargetType="{x:Type GridSplitter}">
-      <Setter Property="Background" Value="Transparent"/>
-      <Setter Property="Width" Value="3"/>
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="VerticalAlignment" Value="Stretch"/>
-   </Style>
-
-   <!--#endregion GridSplitter-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region Button-->
-
-   <Style x:Key="MachCommandMessagePanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource EgtWPFLib5_Button}">
-      <Setter Property="Margin" Value="10,0,10,2"/>
-   </Style>
-
-   <Style x:Key="DeleteAlarms_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource MachCommandMessagePanel_Button}">
-      <Setter Property="Width" Value="120"/>
-   </Style>
-
-   <Style x:Key="MachineLog_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Mach_Button}">
-      <Setter Property="Margin" Value="2.5,0,5,0"/>
-   </Style>
-
-   <Style x:Key="MDIPage_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ToolBar_Button}">
-      <Setter Property="Margin" Value="2.5,0,5,0"/>
-   </Style>
-
-   <Style x:Key="SupervisorManager_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ToolBarViewPanel_Button}">
-      <Setter Property="ContextMenuService.Placement" Value="Bottom"/>
-   </Style>
-
-   <!--#endregion Button-->
-   
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region ComboBox-->
-
-   <Style x:Key="MachineLog_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource CalcPanel_ComboBox}">
-      <Setter Property="Width" Value="70"/>
-      <Setter Property="Margin" Value="0,0,2.5,0"/>
-   </Style>
-
-   <!--#endregion ComboBox-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region TabControl-->
-
-   <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>
-
-   <Style x:Key="Project_TabControl" TargetType="{x:Type TabControl}" BasedOn="{StaticResource {x:Type TabControl}}">
-      <Setter Property="TabStripPlacement" Value="Right"/>
-      <Setter Property="BorderThickness" Value="0"/>
-      <Setter Property="Padding" Value="0"/>
-      <Setter Property="Margin" Value="0"/>
-   </Style>
-
-   <!--#endregion TabControl-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-   <!--#region WrapPanel-->
-
-   <Style x:Key="ProjectSupervisor_WrapPanel" TargetType="{x:Type WrapPanel}">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-   </Style>
-
-   <!--#endregion WrapPanel-->
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
    <!--#region DataGrid-->
    
    <Style x:Key="VariableList_DataGrid" TargetType="{x:Type DataGrid}" BasedOn="{StaticResource {x:Type DataGrid}}">
@@ -318,17 +317,4 @@
    
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!--#region ProgressBar-->
-
-   <Style x:Key="WaitngWnd_ProgressBar" TargetType="{x:Type ProgressBar}">
-      <Setter Property="Height" Value="20"/>
-      <Setter Property="Minimum" Value="0"/>
-      <Setter Property="Maximum" Value="20"/>
-      <Setter Property="Margin" Value="40,0,40,0"/>
-   </Style>
-   
-   <!--#endregion ProgressBar-->
-   
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
 </ResourceDictionary>
diff --git a/EgtBEAMWALL.Supervisor/WaitingWnd/WaitingWndV.xaml b/EgtBEAMWALL.Supervisor/WaitingWnd/WaitingWndV.xaml
index 1eb07b4b..f329b0b1 100644
--- a/EgtBEAMWALL.Supervisor/WaitingWnd/WaitingWndV.xaml
+++ b/EgtBEAMWALL.Supervisor/WaitingWnd/WaitingWndV.xaml
@@ -1,11 +1,10 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="WaitingWndV"
-                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Supervisor"
-                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
-                            Title="{Binding Title}" WindowStartupLocation="CenterOwner"
-                            Height="200" Width="400">
+<EgtBEAMWALLCORE:OptimizerWindow x:Class="WaitingWndV"
+                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
+                                 WindowStartupLocation="CenterOwner"
+                                 Height="200" Width="400"
+                                 Title="{Binding Title}">
 
    <Grid>
       <Grid.RowDefinitions>
@@ -30,4 +29,4 @@
               Command="{Binding Cancel_Command}"
               Style="{StaticResource EgtWPFLib5_InputButton}"/>
    </Grid>
-</EgtWPFLib5:EgtCustomWindow>
+</EgtBEAMWALLCORE:OptimizerWindow>
diff --git a/EgtBEAMWALL.Supervisor/WaitingWnd/WaitingWndV.xaml.vb b/EgtBEAMWALL.Supervisor/WaitingWnd/WaitingWndV.xaml.vb
index 47e4271a..ddcbca26 100644
--- a/EgtBEAMWALL.Supervisor/WaitingWnd/WaitingWndV.xaml.vb
+++ b/EgtBEAMWALL.Supervisor/WaitingWnd/WaitingWndV.xaml.vb
@@ -3,7 +3,6 @@
    Private WithEvents m_WaitingWndVM As WaitingWndVM
 
    Sub New(Owner As Window, WaitingWndVM As WaitingWndVM)
-      MyBase.New(Owner)
       ' This call is required by the designer.
       InitializeComponent()
       Me.DataContext = WaitingWndVM
diff --git a/EgtBEAMWALL.Supervisor/packages.config b/EgtBEAMWALL.Supervisor/packages.config
index 009cc1ec..cc8a79a8 100644
--- a/EgtBEAMWALL.Supervisor/packages.config
+++ b/EgtBEAMWALL.Supervisor/packages.config
@@ -4,6 +4,7 @@
   <package id="Csv" version="1.0.31" targetFramework="net472" />
   <package id="DotNetZip" version="1.16.0" targetFramework="net472" />
   <package id="EgwProxy.LiMan" version="1.0.2408.718" targetFramework="net472" />
+  <package id="EgwWPFBaseLib" version="2.7.11-beta.4" targetFramework="net472" />
   <package id="EntityFramework" version="6.4.4" targetFramework="net452" />
   <package id="FluentFTP" version="19.2.2" targetFramework="net472" />
   <package id="Google.Protobuf" version="3.21.9" targetFramework="net472" />
diff --git a/ExtLibs/EgtUILib.dll b/ExtLibs/EgtUILib.dll
index 3c716487..01bccb12 100644
Binary files a/ExtLibs/EgtUILib.dll and b/ExtLibs/EgtUILib.dll differ
diff --git a/ExtLibs/EgtWPFLib5.dll b/ExtLibs/EgtWPFLib5.dll
index 603644a1..ef5731ec 100644
Binary files a/ExtLibs/EgtWPFLib5.dll and b/ExtLibs/EgtWPFLib5.dll differ