diff --git a/EgtBEAMWALL.Core/ConfigurationPage/General_ConfigurationPageV.xaml b/EgtBEAMWALL.Core/ConfigurationPage/General_ConfigurationPageV.xaml
index 0d974ae6..8bf4239b 100644
--- a/EgtBEAMWALL.Core/ConfigurationPage/General_ConfigurationPageV.xaml
+++ b/EgtBEAMWALL.Core/ConfigurationPage/General_ConfigurationPageV.xaml
@@ -8,10 +8,6 @@
       <ColumnDefinition Width="1*"/>
       <ColumnDefinition Width="1*"/>
    </Grid.ColumnDefinitions>
-   <Grid.RowDefinitions>
-      <RowDefinition Height="1*"/>
-      <RowDefinition Height="1*"/>
-   </Grid.RowDefinitions>
    <StackPanel Style="{StaticResource List_StackPanel}">
       <GroupBox Header="{Binding CurrentLanguage_Msg}"
                 Style="{StaticResource Warehouse_GroupBox}">
@@ -58,7 +54,7 @@
          <CheckBox IsChecked="{Binding bPrintLabel_IsChecked}"
                    Style="{StaticResource General_CheckBox}"/>
       </UniformGrid>
-      <GroupBox Header="Backup And Restore"
+      <GroupBox Header="{Binding BackupRestore_Msg}"
                 Style="{StaticResource Optimizer_GroupBox}">
          <Grid>
             <Grid.RowDefinitions>
@@ -76,7 +72,7 @@
                          IsChecked="{Binding bExternalBackupActive}"
                          Style="{StaticResource PParameters_CheckBox}"/>
                <TextBlock Grid.Column="1"
-                          Text="External file path:"
+                          Text="{Binding External_Msg}"
                           Style="{StaticResource Ext_TextBlock}"/>
             </Grid>
             <Grid Grid.Row="1"
@@ -100,7 +96,7 @@
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="Auto"/>
                </Grid.ColumnDefinitions>
-               <TextBlock Text="Reminder Frequency"/>
+               <TextBlock Text="{Binding Remainder_Msg}"/>
                <ComboBox Grid.Column="1"
                          ItemsSource="{Binding ReminderList}"
                          SelectedItem="{Binding SelReminder}"
@@ -108,10 +104,10 @@
             </Grid>
             <StackPanel Grid.Row="3"
                         Style="{StaticResource PartManager_StackPanel}">
-               <Button Content="Backup"
+               <Button Content="{Binding Backup_Msg}"
                        Command="{Binding Backup_Command}"
                        Style="{StaticResource MovePartInRawPartWnd_Button}"/>
-               <Button Content="Restore"
+               <Button Content="{Binding Restore_Msg}"
                        Command="{Binding Restore_Command}"
                        Style="{StaticResource EgtWPFLib5_Button}"/>
             </StackPanel>
@@ -119,11 +115,24 @@
       </GroupBox>
       <UniformGrid Columns="2"
                    Style="{StaticResource GeneralConfiguration_UniformGrid}">
-         <TextBlock Text="Importa BTL con verifica" 
+         <TextBlock Text="{Binding Import_Msg}" 
                     Style="{StaticResource MMUnits_TextBlock}"/>
          <CheckBox IsChecked="{Binding bVerifyImportBTL_IsChecked}"
                    Style="{StaticResource General_CheckBox}"/>
       </UniformGrid>
+      <GroupBox Header="{Binding Tema_Msg}"
+                Style="{StaticResource Warehouse_GroupBox}">
+         <UniformGrid Rows="2"
+                      Style="{StaticResource General_UniformGrid}">
+            <ComboBox ItemsSource="{Binding Themes, Mode=OneWay}" 
+                      SelectedItem="{Binding SelectedTheme}"
+                      DisplayMemberPath="Name" 
+                      Style="{StaticResource General_ComboBox}"/>
+            <TextBlock Text="{Binding TemaAdvert_Msg}" 
+                       Style="{StaticResource General_TextBlock}"/>
+         </UniformGrid>
+      </GroupBox>
+
    </StackPanel>
 
 </Grid>
\ No newline at end of file
diff --git a/EgtBEAMWALL.Core/Constants/ConstGen.vb b/EgtBEAMWALL.Core/Constants/ConstGen.vb
index 2cea28d2..4eae8408 100644
--- a/EgtBEAMWALL.Core/Constants/ConstGen.vb
+++ b/EgtBEAMWALL.Core/Constants/ConstGen.vb
@@ -110,4 +110,7 @@ Public Module ConstGen
    Public Const CUSTOMERCONFIG_FILE As String = "CustomerConfig"
    ' File contenente i parametri generali
    Public Const GENERALPARAMETERS_FILE As String = "GeneralParameters"
+   ' Info per temi
+   Public Const THEMES_FOLDER As String = "Themes"
+   Public Const DICTIONARY_FILENAME As String = "Dictionary.xaml"
 End Module
diff --git a/EgtBEAMWALL.Core/Constants/ConstIni.vb b/EgtBEAMWALL.Core/Constants/ConstIni.vb
index 73710f59..da2933cb 100644
--- a/EgtBEAMWALL.Core/Constants/ConstIni.vb
+++ b/EgtBEAMWALL.Core/Constants/ConstIni.vb
@@ -135,4 +135,6 @@ Public Module ConstIni
    Public Const K_DEFAULTCONFIG As String = "DefaultConfiguration"
 
    Public Const K_VERIFYIMPORTBTL As String = "VerifyImportBTL"
+
+   Public Const K_THEMA As String = "Thema"
 End Module
diff --git a/EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj b/EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj
index 1ee93511..de6e0c47 100644
--- a/EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj
+++ b/EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj
@@ -183,6 +183,8 @@
       <DependentUpon>OpenProjectFileDialogV.xaml</DependentUpon>
     </Compile>
     <Compile Include="OptmizerWindow\OptimizerWindow.vb" />
+    <Compile Include="ThemesDataService\ThemesDataServiceM.vb" />
+    <Compile Include="ThemesDataService\ThemesDataServiceVM.vb" />
     <Compile Include="TitleBar\TitleBarV.xaml.vb">
       <DependentUpon>TitleBarV.xaml</DependentUpon>
     </Compile>
@@ -301,6 +303,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Themes\DefaultDictionary.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Themes\DarkDictionary.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Themes\Generic.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml b/EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml
index 5626a54f..6864d6fa 100644
--- a/EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml
+++ b/EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml
@@ -24,7 +24,7 @@
          </Grid.ColumnDefinitions>
          <Button Command="{Binding GoBack_Command}"
                  Style="{StaticResource RightPanel_Button}">
-            <Image Source="{StaticResource Restore_Image}"
+            <Image Source="{DynamicResource Restore_Image}"
                    Style="{StaticResource Button_Image}"/>
          </Button>
          <TextBlock Grid.Column="1"
@@ -33,7 +33,18 @@
          <ComboBox Grid.Column="2"
                    ItemsSource="{Binding ViewModeList}"
                    SelectedItem="{Binding SelViewMode}"
-                   Style="{StaticResource EgtManageDialog_ComboBox}"/>
+                   Style="{StaticResource EgtManageDialog_ComboBox}">
+            <ComboBox.ItemTemplate>
+               <DataTemplate>
+                  <StackPanel Style="{StaticResource PartManager_StackPanel}">
+                     <Image Source="{Binding Image}"
+                            Style="{StaticResource BTLDataWnd_Image}"/>
+                     <TextBlock Text="{Binding Name}"
+                                Style="{StaticResource ComboManageDialog_TextBlock}"/>
+                  </StackPanel>
+               </DataTemplate>
+            </ComboBox.ItemTemplate>
+         </ComboBox>
       </Grid>
       <Grid Grid.Row="1"
             Style="{StaticResource AddRawPartWnd_Grid}">
diff --git a/EgtBEAMWALL.Core/Themes/DarkDictionary.xaml b/EgtBEAMWALL.Core/Themes/DarkDictionary.xaml
new file mode 100644
index 00000000..1660e0a4
--- /dev/null
+++ b/EgtBEAMWALL.Core/Themes/DarkDictionary.xaml
@@ -0,0 +1,552 @@
+<ResourceDictionary 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:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
+                    xmlns:EgwWPFBaseLib="clr-namespace:EgwWPFBaseLib;assembly=EgwWPFBaseLib"
+                    xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                    xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5">
+
+   <ResourceDictionary.MergedDictionaries>
+      <ResourceDictionary Source="/EgtBEAMWALL.Core;component/Themes/Generic.xaml"/>
+   </ResourceDictionary.MergedDictionaries>
+
+   <!--#region Colori per EgtWPFLib5-->
+
+   <SolidColorBrush x:Key="TextBox.Static.Border" Color="{StaticResource BeamWall_Bombay_Color}"/>
+
+   <!--#endregion Colori per EgtWPFLib5-->
+
+   <!--#region Colori Button-->
+
+   <SolidColorBrush x:Key="ButtonBasic.Static.Background" Color="{StaticResource BeamWall_Alto_Color}"/>
+   <SolidColorBrush x:Key="ButtonBasic.Static.Border" Color="{StaticResource BeamWall_DoveGray_Color}"/>
+   <SolidColorBrush x:Key="ButtonBasic.MouseOver.Background" Color="{StaticResource BeamWall_FrenchPass_Color}"/>
+   <SolidColorBrush x:Key="ButtonBasic.MouseOver.Border" Color="{StaticResource BeamWall_BostonBlue_Color}"/>
+   <SolidColorBrush x:Key="ButtonBasic.Pressed.Background" Color="{StaticResource BeamWall_TropicalBlue_Color}"/>
+   <SolidColorBrush x:Key="ButtonBasic.Pressed.Border" Color="{StaticResource BeamWall_Calypso_Color}"/>
+   <SolidColorBrush x:Key="ButtonBasic.Disabled.Background" Color="{StaticResource BeamWall_WildSand_Color}"/>
+   <SolidColorBrush x:Key="ButtonBasic.Disabled.Border" Color="{StaticResource BeamWall_Bombay_Color}"/>
+   <SolidColorBrush x:Key="ButtonBasic.Disabled.Foreground" Color="{StaticResource BeamWall_Gray_Color}"/>
+
+   <SolidColorBrush x:Key="Button.Static.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="Button.Static.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="Button.Static.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+   <SolidColorBrush x:Key="Button.MouseOver.Background" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="Button.MouseOver.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="Button.Pressed.Background" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="Button.Pressed.Border" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="Button.Disabled.Background" Color="{StaticResource BeamWall_Glacier_Color}" Opacity="0.5"/>
+   <SolidColorBrush x:Key="Button.Disabled.Border" Color="{StaticResource BeamWall_Glacier_Color}" Opacity="0.5"/>
+   <SolidColorBrush x:Key="Button.Disabled.Foreground" Color="{StaticResource BeamWall_White_Color}" Opacity="0.5"/>
+
+   <SolidColorBrush x:Key="Button.TitleBar.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <LinearGradientBrush x:Key="Button.MainMenu.Background" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="{StaticResource BeamWall_Kashmir_Color}" Offset="0"/>
+      <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0.65"/>
+      <GradientStop Color="{StaticResource BeamWall_RegentStBlue_Color}" Offset="1"/>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="Button.MainMenu.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="Button.General.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="Button.PrManagerNew.Background" Color="Transparent"/>
+
+   <!--#endregion Colori Button-->
+
+   <!--#region Colori ScrollBar-->
+
+   <SolidColorBrush x:Key="ScrollBar.Static.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Static.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Static.Glyph" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Static.Thumb" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.MouseOver.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.MouseOver.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.MouseOver.Glyph" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.MouseOver.Thumb" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Pressed.Background" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Pressed.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Pressed.Thumb" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Pressed.Glyph" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Disabled.Background" Color="{StaticResource BeamWall_LinkWater_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Disabled.Border" Color="{StaticResource BeamWall_LinkWater_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Disabled.Glyph" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Button.Static.Background" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <!--#endregion Colori ScrollBar-->
+
+   <!--#region Colori ComboBox-->
+
+   <SolidColorBrush x:Key="ComboBox.Static.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Glyph" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Editable.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Editable.Border" Color="{StaticResource BeamWall_Bombay_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Editable.Button.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Editable.Button.Border" Color="Transparent"/>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Background" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Glyph" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Border" Color="{StaticResource BeamWall_Seagull_Color}"/>
+   <LinearGradientBrush x:Key="ComboBox.MouseOver.Editable.Button.Background" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="{StaticResource BeamWall_Selago_Color}" Offset="0.0"/>
+      <GradientStop Color="{StaticResource BeamWall_HawkesBlue_Color}" Offset="1.0"/>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Button.Border" Color="{StaticResource BeamWall_Seagull_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Background" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Border" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Glyph" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Border" Color="{StaticResource BeamWall_CornflowerBlue_Color}"/>
+   <LinearGradientBrush x:Key="ComboBox.Pressed.Editable.Button.Background" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="{StaticResource BeamWall_HawkesBlue_Color}" Offset="0.0"/>
+      <GradientStop Color="{StaticResource BeamWall_FrenchPass_Color}" Offset="1.0"/>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Button.Border" Color="{StaticResource BeamWall_CornflowerBlue_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Border" Color="{StaticResource BeamWall_Alto_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Glyph" Color="{StaticResource BeamWall_Silver_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Border" Color="{StaticResource BeamWall_Silver_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Button.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Button.Border" Color="Transparent"/>
+
+   <!--#endregion Colori ComboBox-->
+
+   <!--#region Colori Expander-->
+
+   <SolidColorBrush x:Key="Expander.Static.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="Expander.Static.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="Expander.Static.Border" Color="Transparent"/>
+   <SolidColorBrush x:Key="Expander.Static.Circle.Stroke" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="Expander.Static.Circle.Fill" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="Expander.Static.Arrow.Stroke" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="Expander.MouseOver.Circle.Stroke" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="Expander.MouseOver.Circle.Fill" Color="{StaticResource BeamWall_AliceBlue_Color}"/>
+   <SolidColorBrush x:Key="Expander.MouseOver.Arrow.Stroke" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="Expander.Pressed.Circle.Stroke" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="Expander.Pressed.Circle.Fill" Color="{StaticResource BeamWall_PattensBlue_Color}"/>
+   <SolidColorBrush x:Key="Expander.Pressed.Arrow.Stroke" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="Expander.Disabled.Circle.Stroke" Color="{StaticResource BeamWall_RegentStBlue_Color}" Opacity="0.5"/>
+   <SolidColorBrush x:Key="Expander.Disabled.Circle.Fill" Color="{StaticResource BeamWall_Mercury_Color}" Opacity="0.5"/>
+   <SolidColorBrush x:Key="Expander.Disabled.Arrow.Stroke" Color="{StaticResource BeamWall_RegentStBlue_Color}" Opacity="0.5"/>
+
+   <!--#endregion Colori Expander-->
+
+   <!--#region Colori ListBox-->
+
+   <SolidColorBrush x:Key="ListBox.Static.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ListBox.NewAddFeature.Background" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="ListBox.NewAddFeatureIsSelected.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="ListBox.NewAddFeatureIsSelected.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ListBox.NewAddFeatureNotSelected.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ListBox.NewAddFeatureNotSelected.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="ListBox.MacroCustom.Background" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="ListBox.MacroDefault.Background" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="ListBox.FeatureManager.Background" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="ListBox.LeftPanel.Background" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="ListBox.Strategy.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ListBox.StrategyIsSelected.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="ListBox.StrategyIsSelected.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ListBox.StrategyNoSelected.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ListBox.StrategyNoSelected.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="ListBox.BTLIsSelected.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="ListBox.BTLIsSelected.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ListBox.BTLNoSelected.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ListBox.BTLNoSelected.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="ListBox.ForcedStrategyBTL.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ListBox.ForcedStrategyBTLIsSelected.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="ListBox.ForcedStrategyBTLIsSelected.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ListBox.ForcedStrategyBTLNoSelected.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ListBox.ForcedStrategyBTLNoSelected.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="ListBox.BTLPartIsSelected.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="ListBox.BTLPartIsSelected.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ListBox.BTLPartNoSelected.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ListBox.BTLPartNoSelected.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="Item.MouseOver.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="Item.MouseOver.Border" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="Item.MouseOver.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="Item.SelectedActive.Background" Color="{StaticResource BeamWall_Keppel_Color}"/>
+   <SolidColorBrush x:Key="Item.SelectedActive.Border" Color="{StaticResource BeamWall_Keppel_Color}"/>
+   <SolidColorBrush x:Key="Item.SelectedActive.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="Item.SelectedInactive.Background" Color="#3DDADADA"/>
+   <SolidColorBrush x:Key="Item.SelectedInactive.Border" Color="{StaticResource BeamWall_Alto_Color}"/>
+
+   <!--#endregion Colori ListBox-->
+
+   <!--#region Colori TabItem-->
+
+   <LinearGradientBrush x:Key="TabItem.Static.Background" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0"/>
+      <GradientStop Color="{StaticResource BeamWall_RegentStBlue_Color}" Offset="0.85"/>
+      <GradientStop Color="{StaticResource BeamWall_LinkWater_Color}" Offset="1"/>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="TabItem.Static.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="TabItem.Static.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="TabItem.MouseOver.Background" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="TabItem.MouseOver.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <LinearGradientBrush x:Key="TabItem.Selected.Background" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="{StaticResource BeamWall_Kashmir_Color}" Offset="0"/>
+      <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0.85"/>
+      <GradientStop Color="{StaticResource BeamWall_RegentStBlue_Color}" Offset="1"/>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="TabItem.Selected.Border" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="TabItem.Disabled.Background" Color="{StaticResource BeamWall_Gallery_Color}"/>
+   <SolidColorBrush x:Key="TabItem.Disabled.Border" Color="{StaticResource BeamWall_Alto_Color}"/>
+
+   <!--#endregion Colori TabItem-->
+
+   <!--#region Colori TabControl-->
+
+   <SolidColorBrush x:Key="TabControl.Static.EgtManageDialog.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="TabControl.Static.EgtManageDialog.Border" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <LinearGradientBrush x:Key="TabControl.Static.Generic.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>
+
+   <LinearGradientBrush x:Key="TabControl.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.45"/>
+      <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
+   </LinearGradientBrush>
+
+   <!--#endregion Colori TabControl-->
+
+   <!--#region Colori ScrollViewer-->
+
+   <LinearGradientBrush x:Key="ScrollViewer.Static.Background" EndPoint="0.5,1" StartPoint="0.35,0">
+      <GradientStop Color="{StaticResource BeamWall_Silver_Color}" Offset="0"/>
+      <GradientStop Color="{StaticResource BeamWall_Alto_Color}" Offset="0.45"/>
+      <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="1"/>
+   </LinearGradientBrush>
+
+   <!--#endregion Colori ScrollViewer-->
+
+   <!--#region Colori Grid-->
+
+   <LinearGradientBrush x:Key="Grid.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.65"/>
+      <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="Grid.Static.ExpanderDown.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="Grid.Static.ExpanderUp.Background" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="Grid.Statistics.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
+
+   <SolidColorBrush x:Key="Grid.UserAdmin.Background" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+
+   <!--#endregion Colori Grid-->
+
+   <!--#region Colori GridSplitter-->
+
+   <SolidColorBrush x:Key="GridSplitter.Width.Background" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="GridSplitter.Height.Background" Color="Transparent"/>
+
+   <!--#endregion Colori GridSplitter-->
+
+   <!--#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>
+
+   <SolidColorBrush x:Key="TreeView.Static.EgtManageDialog.Background" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <!--#endregion Colori TreeView-->
+
+   <!--#region Colori TextBlock-->
+
+   <SolidColorBrush x:Key="TextBlock.Static.First.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="TextBlock.Static.Second.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+   <SolidColorBrush x:Key="TextBlock.Static.Third.Foreground" Color="{StaticResource BeamWall_DarkGray_Color}"/>
+   <SolidColorBrush x:Key="TextBlock.Static.Fouth.Foreground" Color="{StaticResource BeamWall_Black_Color}"/>
+
+   <SolidColorBrush x:Key="TextBlock.UserAdmin.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="TextBlock.StrategyModify.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="TextBlock.CALC_ROT.Foreground" Color="{StaticResource BeamWall_Blue_Color}"/>
+
+   <SolidColorBrush x:Key="TextBlock.Prod.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="TextBlock.Prod.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="TextBlock.RawPartList.Foreground" Color="{StaticResource BeamWall_Orange_Color}"/>
+
+   <SolidColorBrush x:Key="TextBlock.Error.Foreground" Color="{StaticResource BeamWall_Red_Color}"/>
+
+   <SolidColorBrush x:Key="TextBlock.AlternationIndex_0.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+   <SolidColorBrush x:Key="TextBlock.AlternationIndex_1.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+   <SolidColorBrush x:Key="TextBlock.AlternationIndexIsSelected.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <!--#endregion TextBlock-->
+
+   <!--#region Colori StackPanel-->
+
+   <SolidColorBrush x:Key="StackPanel.Static.Background" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="StackPanel.BTLTotParts.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="StackPanel.BTLTotTime.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="StackPanel.BTLRemainingTime.Background" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="StackPanel.RawPart.Background" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="StackPanel.Statistics.Background" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <!--#endregion Colori StackPanel-->
+
+   <!--#region Colori GroupBox-->
+
+   <SolidColorBrush x:Key="GroupBox.Static.Border" Color="{StaticResource BeamWall_Geyser_Color}"/>
+
+   <SolidColorBrush x:Key="GroupBox.Static.OpenProjec.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+
+   <SolidColorBrush x:Key="GroupBox.PDFPreview.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="GroupBox.MachinePanel.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <!--#endregion Colori GroupBox-->
+
+   <!--#region Colori Border-->
+
+   <SolidColorBrush x:Key="Border.Static.GroupBox.First.Border" Color="Transparent"/>
+   <SolidColorBrush x:Key="Border.Static.GroupBox.Second.Border" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="Border.Static.Optmizer.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+
+   <SolidColorBrush x:Key="Border.Static.EgtManageDialog.Border" Color="{StaticResource BeamWall_Alto_Color}"/>
+
+   <SolidColorBrush x:Key="Border.Static.TitleBar.Background" Color="{StaticResource BeamWall_Casper_Color}"/>
+   <SolidColorBrush x:Key="Border.Static.TitleBar.Border" Color="{StaticResource BeamWall_Casper_Color}"/>
+
+   <SolidColorBrush x:Key="Border.Static.AboutBoxV.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="Border.Static.AboutBox.Border" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="Border.ButtonTitleBar.Background" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="Border.EgwWindow.Border" Color="{StaticResource BeamWall_Alto_Color}"/>
+
+   <SolidColorBrush x:Key="Border.ControlTemplete.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="Border.ControlTemplete.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+
+   <LinearGradientBrush x:Key="Border.WithoutTitleBar.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>
+
+   <SolidColorBrush x:Key="Border.EgtHexItem.Border" Color="{StaticResource BeamWall_Gold_Color}"/>
+
+   <SolidColorBrush x:Key="Border.Parameter.Background" Color="{StaticResource BeamWall_Alto_Color}"/>
+   <SolidColorBrush x:Key="Border.Parameter.Border" Color="{StaticResource BeamWall_Gray_Color}"/>
+
+   <SolidColorBrush x:Key="Border.NewAddFeature.Border" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="Border.AlternationIndex.Border" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="Border.ItemContainer.Background" Color="{StaticResource BeamWall_LinkWater_Color}"/>
+   <SolidColorBrush x:Key="Border.ItemContainer.Border" Color="{StaticResource BeamWall_LinkWater_Color}"/>
+   <SolidColorBrush x:Key="Border.ItemContainerIsSelected.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="Border.ItemContainerIsSelected.Border" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+
+   <SolidColorBrush x:Key="Border.Strategy.Border" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="Border.BTL.Border" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="Border.ForcedStrategyBTL.Border" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="Border.BTLPart.Border" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="Border.TotalTime.Background" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="Border.TotalTime.Border" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+
+   <SolidColorBrush x:Key="Border.DoneTime.Background" Color="{StaticResource BeamWall_FruitSalad_Color}"/>
+   <SolidColorBrush x:Key="Border.DoneTime.Border" Color="{StaticResource BeamWall_FruitSalad_Color}"/>
+
+   <SolidColorBrush x:Key="Border.RemainingTime.Background" Color="{StaticResource BeamWall_FuelYellow_Color}"/>
+   <SolidColorBrush x:Key="Border.RemainingTime.Border" Color="{StaticResource BeamWall_FuelYellow_Color}"/>
+
+   <SolidColorBrush x:Key="Border.ProjectType.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="Border.ProjectType.Border" Color="{StaticResource BeamWall_DarkGray_Color}"/>
+
+   <SolidColorBrush x:Key="Border.AddFeature.Background" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+
+   <SolidColorBrush x:Key="Border.PRC.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+
+   <SolidColorBrush x:Key="Border.Custom.Background" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+
+   <SolidColorBrush x:Key="Border.MacroCustom.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+
+   <SolidColorBrush x:Key="Border.Default.Background" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+
+   <SolidColorBrush x:Key="Border.MacroDefault.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+
+   <SolidColorBrush x:Key="Border.BTLPartManager.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="Border.BTLPartManager.Border" Color="{StaticResource BeamWall_Teal_Color}"/>
+
+   <SolidColorBrush x:Key="Border.SetUp.Border" Color="{StaticResource BeamWall_Indigo_Color}"/>
+
+   <SolidColorBrush x:Key="Border.TopPanel.Background" Color="{StaticResource BeamWall_Alto_Color}"/>
+   <SolidColorBrush x:Key="Border.TopPanel.Border" Color="{StaticResource BeamWall_Gray_Color}"/>
+
+   <!--#endregion Colori Border-->
+
+   <!--#region Colori Rectangle-->
+
+   <SolidColorBrush x:Key="Rectangle.Static.Stroke" Color="{StaticResource BeamWall_Black_Color}"/>
+
+   <SolidColorBrush x:Key="Rectangle.EgtColorPicker.Stroke" Color="{StaticResource BeamWall_Black_Color}"/>
+
+   <!--#endregion Colori Rectangle-->
+
+   <!--#region Colori StatusBar-->
+
+   <SolidColorBrush x:Key="StatusBar.Static.Background" Color="{StaticResource BeamWall_Alto_Color}"/>
+
+   <!--#endregion Colori StatusBar-->
+
+   <!--#region Colori DatePicker-->
+
+   <SolidColorBrush x:Key="DatePicker.Static.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="DatePicker.Static.Border" Color="Transparent"/>
+   <SolidColorBrush x:Key="DatePickerTextBox.Static.Background" Color="Transparent"/>
+
+   <!--#endregion Colori DatePicker-->
+
+   <!--#region Colori Calendar-->
+
+   <LinearGradientBrush x:Key="Calendar.Static.Background" 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>
+
+   <LinearGradientBrush x:Key="Calendar.Static.Border" 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>
+
+   <!--#endregion Colori Calendar-->
+
+   <!--#region Colori DataGrid-->
+
+   <SolidColorBrush x:Key="DataGridColumnHeader.Static.Main.Background" Color="{StaticResource BeamWall_Teal_Color}"/>
+   <SolidColorBrush x:Key="DataGridColumnHeader.Static.Main.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="DataGridColumnHeader.Static.Feature.Background" Color="{StaticResource BeamWall_Keppel_Color}"/>
+   <SolidColorBrush x:Key="DataGridColumnHeader.Static.Feature.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="DataGridColumnHeader.Static.PParam.Background" Color="{StaticResource BeamWall_Downy_Color}"/>
+   <SolidColorBrush x:Key="DataGridColumnHeader.Static.PParam.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="DataGridColumnHeader.Static.RawPart.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="DataGridColumnHeader.Static.RawPart.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="DataGrid.Static.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="DataGrid.Static.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+   <SolidColorBrush x:Key="DataGrid.Static.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+
+   <SolidColorBrush x:Key="RowDataGrid.Static.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+   <SolidColorBrush x:Key="CellDataGrid.Static.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="RowDataGrid.Selected.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="RowDataGrid.Selected.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="RowDataGrid.Selected.Border" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+
+   <SolidColorBrush x:Key="CellDataGrid.Selected.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="CellDataGrid.Selected.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="CellDataGrid.Selected.Border" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+
+   <!--#endregion Colori DataGrid-->
+
+   <!--#region Colori OptimizerWindow-->
+
+   <LinearGradientBrush x:Key="OptimizerWindow.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>
+   <SolidColorBrush x:Key="OptimizerWindow.Static.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="OptimizerWindow.Static.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+
+   <!--#endregion Colori OtimizerWindow-->
+
+   <!--#region Colori EgtCustomWindow-->
+
+   <LinearGradientBrush x:Key="EgtCustomWindow.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>
+   <SolidColorBrush x:Key="EgtCustomWindow.Static.Border" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="EgtCustomWindow.Static.TitleBarBorder" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="EgtCustomWindow.Static.TitleBarForeground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <!--#endregion Colori EgtCustomWindow-->
+
+   <!--#region Colori EgtFloatingPanel-->
+
+   <SolidColorBrush x:Key="EgtFloatingPanel.Static.Background" Color="{StaticResource BeamWall_Gray_Color}"/>
+   <SolidColorBrush x:Key="EgtFloatingPanel.Static.Border" Color="{StaticResource BeamWall_Gray_Color}"/>
+
+   <!--#endregion Colori EgtFloatingPanel-->
+
+   <!--#region Colori EgtHexItem-->
+
+   <SolidColorBrush x:Key="EgtHexItem.Static.Background" Color="{StaticResource BeamWall_CornflowerBlue_Color}"/>
+   <SolidColorBrush x:Key="EgtHexItem.Static.Border" Color="{StaticResource BeamWall_Black_Color}"/>
+
+   <!--#endregion Colori EgtHexItem-->
+
+   <!--#region Colori Ellipse-->
+
+   <SolidColorBrush x:Key="Ellipse.Static.Fill" Color="{StaticResource BeamWall_Blue_Color}"/>
+
+   <SolidColorBrush x:Key="Ellipse.Parameter.Fill" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="Ellipse.ParameterIsChecked.Fill" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+
+   <SolidColorBrush x:Key="Ellipse.UpdateBTL.Fill" Color="{StaticResource BeamWall_Red_Color}"/>
+
+   <!--#endregion Colori Ellipse-->
+
+   <!--#region Colori ToggleButton-->
+
+   <SolidColorBrush x:Key="ToggleButton.Static.Background" Color="Transparent"/>
+
+   <!--#endregion Colori ToggleButton-->
+
+   <!--#region Colori UniformGrid-->
+
+   <SolidColorBrush x:Key="UniformGrid.LeftPanel.Background" Color="{DynamicResource BeamWall_LinkWater_Color}"/>
+
+   <!--#endregion UniformGrid-->
+
+   <!--#region Colori ToolTip-->
+
+   <SolidColorBrush x:Key="ToolTip.PParameters.Background" Color="{DynamicResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="ToolTip.PParameters.Foreground" Color="{DynamicResource BeamWall_White_Color}"/>
+
+   <!--#endregion Colori ToolTip-->
+
+</ResourceDictionary>
diff --git a/EgtBEAMWALL.Core/Themes/DefaultDictionary.xaml b/EgtBEAMWALL.Core/Themes/DefaultDictionary.xaml
new file mode 100644
index 00000000..c305b9be
--- /dev/null
+++ b/EgtBEAMWALL.Core/Themes/DefaultDictionary.xaml
@@ -0,0 +1,552 @@
+<ResourceDictionary 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:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
+                    xmlns:EgwWPFBaseLib="clr-namespace:EgwWPFBaseLib;assembly=EgwWPFBaseLib"
+                    xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                    xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5">
+
+   <ResourceDictionary.MergedDictionaries>
+      <ResourceDictionary Source="/EgtBEAMWALL.Core;component/Themes/Generic.xaml"/>
+   </ResourceDictionary.MergedDictionaries>
+
+   <!--#region Colori per EgtWPFLib5-->
+
+   <SolidColorBrush x:Key="TextBox.Static.Border" Color="{StaticResource BeamWall_Bombay_Color}"/>
+
+   <!--#endregion Colori per EgtWPFLib5-->
+
+   <!--#region Colori Button-->
+
+   <SolidColorBrush x:Key="ButtonBasic.Static.Background" Color="{StaticResource BeamWall_Alto_Color}"/>
+   <SolidColorBrush x:Key="ButtonBasic.Static.Border" Color="{StaticResource BeamWall_DoveGray_Color}"/>
+   <SolidColorBrush x:Key="ButtonBasic.MouseOver.Background" Color="{StaticResource BeamWall_FrenchPass_Color}"/>
+   <SolidColorBrush x:Key="ButtonBasic.MouseOver.Border" Color="{StaticResource BeamWall_BostonBlue_Color}"/>
+   <SolidColorBrush x:Key="ButtonBasic.Pressed.Background" Color="{StaticResource BeamWall_TropicalBlue_Color}"/>
+   <SolidColorBrush x:Key="ButtonBasic.Pressed.Border" Color="{StaticResource BeamWall_Calypso_Color}"/>
+   <SolidColorBrush x:Key="ButtonBasic.Disabled.Background" Color="{StaticResource BeamWall_WildSand_Color}"/>
+   <SolidColorBrush x:Key="ButtonBasic.Disabled.Border" Color="{StaticResource BeamWall_Bombay_Color}"/>
+   <SolidColorBrush x:Key="ButtonBasic.Disabled.Foreground" Color="{StaticResource BeamWall_Gray_Color}"/>
+
+   <SolidColorBrush x:Key="Button.Static.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="Button.Static.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="Button.Static.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+   <SolidColorBrush x:Key="Button.MouseOver.Background" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="Button.MouseOver.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="Button.Pressed.Background" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="Button.Pressed.Border" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="Button.Disabled.Background" Color="{StaticResource BeamWall_Glacier_Color}" Opacity="0.5"/>
+   <SolidColorBrush x:Key="Button.Disabled.Border" Color="{StaticResource BeamWall_Glacier_Color}" Opacity="0.5"/>
+   <SolidColorBrush x:Key="Button.Disabled.Foreground" Color="{StaticResource BeamWall_White_Color}" Opacity="0.5"/>
+
+   <SolidColorBrush x:Key="Button.TitleBar.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <LinearGradientBrush x:Key="Button.MainMenu.Background" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="{StaticResource BeamWall_Kashmir_Color}" Offset="0"/>
+      <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0.65"/>
+      <GradientStop Color="{StaticResource BeamWall_RegentStBlue_Color}" Offset="1"/>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="Button.MainMenu.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="Button.General.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="Button.PrManagerNew.Background" Color="Transparent"/>
+
+   <!--#endregion Colori Button-->
+
+   <!--#region Colori ScrollBar-->
+
+   <SolidColorBrush x:Key="ScrollBar.Static.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Static.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Static.Glyph" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Static.Thumb" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.MouseOver.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.MouseOver.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.MouseOver.Glyph" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.MouseOver.Thumb" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Pressed.Background" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Pressed.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Pressed.Thumb" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Pressed.Glyph" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Disabled.Background" Color="{StaticResource BeamWall_LinkWater_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Disabled.Border" Color="{StaticResource BeamWall_LinkWater_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Disabled.Glyph" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Button.Static.Background" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <!--#endregion Colori ScrollBar-->
+
+   <!--#region Colori ComboBox-->
+
+   <SolidColorBrush x:Key="ComboBox.Static.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Glyph" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Editable.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Editable.Border" Color="{StaticResource BeamWall_Bombay_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Editable.Button.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Editable.Button.Border" Color="Transparent"/>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Background" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Glyph" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Border" Color="{StaticResource BeamWall_Seagull_Color}"/>
+   <LinearGradientBrush x:Key="ComboBox.MouseOver.Editable.Button.Background" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="{StaticResource BeamWall_Selago_Color}" Offset="0.0"/>
+      <GradientStop Color="{StaticResource BeamWall_HawkesBlue_Color}" Offset="1.0"/>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Button.Border" Color="{StaticResource BeamWall_Seagull_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Background" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Border" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Glyph" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Border" Color="{StaticResource BeamWall_CornflowerBlue_Color}"/>
+   <LinearGradientBrush x:Key="ComboBox.Pressed.Editable.Button.Background" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="{StaticResource BeamWall_HawkesBlue_Color}" Offset="0.0"/>
+      <GradientStop Color="{StaticResource BeamWall_FrenchPass_Color}" Offset="1.0"/>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Button.Border" Color="{StaticResource BeamWall_CornflowerBlue_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Border" Color="{StaticResource BeamWall_Alto_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Glyph" Color="{StaticResource BeamWall_Silver_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Border" Color="{StaticResource BeamWall_Silver_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Button.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Button.Border" Color="Transparent"/>
+
+   <!--#endregion Colori ComboBox-->
+
+   <!--#region Colori Expander-->
+
+   <SolidColorBrush x:Key="Expander.Static.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="Expander.Static.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="Expander.Static.Border" Color="Transparent"/>
+   <SolidColorBrush x:Key="Expander.Static.Circle.Stroke" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="Expander.Static.Circle.Fill" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="Expander.Static.Arrow.Stroke" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="Expander.MouseOver.Circle.Stroke" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="Expander.MouseOver.Circle.Fill" Color="{StaticResource BeamWall_AliceBlue_Color}"/>
+   <SolidColorBrush x:Key="Expander.MouseOver.Arrow.Stroke" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="Expander.Pressed.Circle.Stroke" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="Expander.Pressed.Circle.Fill" Color="{StaticResource BeamWall_PattensBlue_Color}"/>
+   <SolidColorBrush x:Key="Expander.Pressed.Arrow.Stroke" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="Expander.Disabled.Circle.Stroke" Color="{StaticResource BeamWall_RegentStBlue_Color}" Opacity="0.5"/>
+   <SolidColorBrush x:Key="Expander.Disabled.Circle.Fill" Color="{StaticResource BeamWall_Mercury_Color}" Opacity="0.5"/>
+   <SolidColorBrush x:Key="Expander.Disabled.Arrow.Stroke" Color="{StaticResource BeamWall_RegentStBlue_Color}" Opacity="0.5"/>
+
+   <!--#endregion Colori Expander-->
+
+   <!--#region Colori ListBox-->
+
+   <SolidColorBrush x:Key="ListBox.Static.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ListBox.NewAddFeature.Background" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="ListBox.NewAddFeatureIsSelected.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="ListBox.NewAddFeatureIsSelected.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ListBox.NewAddFeatureNotSelected.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ListBox.NewAddFeatureNotSelected.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="ListBox.MacroCustom.Background" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="ListBox.MacroDefault.Background" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="ListBox.FeatureManager.Background" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="ListBox.LeftPanel.Background" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="ListBox.Strategy.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ListBox.StrategyIsSelected.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="ListBox.StrategyIsSelected.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ListBox.StrategyNoSelected.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ListBox.StrategyNoSelected.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="ListBox.BTLIsSelected.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="ListBox.BTLIsSelected.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ListBox.BTLNoSelected.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ListBox.BTLNoSelected.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="ListBox.ForcedStrategyBTL.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ListBox.ForcedStrategyBTLIsSelected.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="ListBox.ForcedStrategyBTLIsSelected.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ListBox.ForcedStrategyBTLNoSelected.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ListBox.ForcedStrategyBTLNoSelected.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="ListBox.BTLPartIsSelected.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="ListBox.BTLPartIsSelected.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ListBox.BTLPartNoSelected.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ListBox.BTLPartNoSelected.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="Item.MouseOver.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="Item.MouseOver.Border" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="Item.MouseOver.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="Item.SelectedActive.Background" Color="{StaticResource BeamWall_Keppel_Color}"/>
+   <SolidColorBrush x:Key="Item.SelectedActive.Border" Color="{StaticResource BeamWall_Keppel_Color}"/>
+   <SolidColorBrush x:Key="Item.SelectedActive.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="Item.SelectedInactive.Background" Color="#3DDADADA"/>
+   <SolidColorBrush x:Key="Item.SelectedInactive.Border" Color="{StaticResource BeamWall_Alto_Color}"/>
+
+   <!--#endregion Colori ListBox-->
+
+   <!--#region Colori TabItem-->
+
+   <LinearGradientBrush x:Key="TabItem.Static.Background" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0"/>
+      <GradientStop Color="{StaticResource BeamWall_RegentStBlue_Color}" Offset="0.85"/>
+      <GradientStop Color="{StaticResource BeamWall_LinkWater_Color}" Offset="1"/>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="TabItem.Static.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="TabItem.Static.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="TabItem.MouseOver.Background" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="TabItem.MouseOver.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <LinearGradientBrush x:Key="TabItem.Selected.Background" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="{StaticResource BeamWall_Kashmir_Color}" Offset="0"/>
+      <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0.85"/>
+      <GradientStop Color="{StaticResource BeamWall_RegentStBlue_Color}" Offset="1"/>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="TabItem.Selected.Border" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="TabItem.Disabled.Background" Color="{StaticResource BeamWall_Gallery_Color}"/>
+   <SolidColorBrush x:Key="TabItem.Disabled.Border" Color="{StaticResource BeamWall_Alto_Color}"/>
+
+   <!--#endregion Colori TabItem-->
+
+   <!--#region Colori TabControl-->
+
+   <SolidColorBrush x:Key="TabControl.Static.EgtManageDialog.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="TabControl.Static.EgtManageDialog.Border" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <LinearGradientBrush x:Key="TabControl.Static.Generic.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>
+
+   <LinearGradientBrush x:Key="TabControl.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.45"/>
+      <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
+   </LinearGradientBrush>
+
+   <!--#endregion Colori TabControl-->
+   
+   <!--#region Colori ScrollViewer-->
+
+   <LinearGradientBrush x:Key="ScrollViewer.Static.Background" EndPoint="0.5,1" StartPoint="0.35,0">
+      <GradientStop Color="{StaticResource BeamWall_Silver_Color}" Offset="0"/>
+      <GradientStop Color="{StaticResource BeamWall_Alto_Color}" Offset="0.45"/>
+      <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="1"/>
+   </LinearGradientBrush>
+
+   <!--#endregion Colori ScrollViewer-->
+
+   <!--#region Colori Grid-->
+
+   <LinearGradientBrush x:Key="Grid.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.65"/>
+      <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="Grid.Static.ExpanderDown.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="Grid.Static.ExpanderUp.Background" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="Grid.Statistics.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
+
+   <SolidColorBrush x:Key="Grid.UserAdmin.Background" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+
+   <!--#endregion Colori Grid-->
+
+   <!--#region Colori GridSplitter-->
+
+   <SolidColorBrush x:Key="GridSplitter.Width.Background" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="GridSplitter.Height.Background" Color="Transparent"/>
+
+   <!--#endregion Colori GridSplitter-->
+   
+   <!--#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>
+
+   <SolidColorBrush x:Key="TreeView.Static.EgtManageDialog.Background" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <!--#endregion Colori TreeView-->
+
+   <!--#region Colori TextBlock-->
+
+   <SolidColorBrush x:Key="TextBlock.Static.First.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="TextBlock.Static.Second.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+   <SolidColorBrush x:Key="TextBlock.Static.Third.Foreground" Color="{StaticResource BeamWall_DarkGray_Color}"/>
+   <SolidColorBrush x:Key="TextBlock.Static.Fouth.Foreground" Color="{StaticResource BeamWall_Black_Color}"/>
+
+   <SolidColorBrush x:Key="TextBlock.UserAdmin.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="TextBlock.StrategyModify.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="TextBlock.CALC_ROT.Foreground" Color="{StaticResource BeamWall_Blue_Color}"/>
+
+   <SolidColorBrush x:Key="TextBlock.Prod.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="TextBlock.Prod.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="TextBlock.RawPartList.Foreground" Color="{StaticResource BeamWall_Orange_Color}"/>
+
+   <SolidColorBrush x:Key="TextBlock.Error.Foreground" Color="{StaticResource BeamWall_Red_Color}"/>
+
+   <SolidColorBrush x:Key="TextBlock.AlternationIndex_0.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+   <SolidColorBrush x:Key="TextBlock.AlternationIndex_1.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+   <SolidColorBrush x:Key="TextBlock.AlternationIndexIsSelected.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <!--#endregion TextBlock-->
+
+   <!--#region Colori StackPanel-->
+
+   <SolidColorBrush x:Key="StackPanel.Static.Background" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="StackPanel.BTLTotParts.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="StackPanel.BTLTotTime.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="StackPanel.BTLRemainingTime.Background" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="StackPanel.RawPart.Background" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="StackPanel.Statistics.Background" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <!--#endregion Colori StackPanel-->
+   
+   <!--#region Colori GroupBox-->
+
+   <SolidColorBrush x:Key="GroupBox.Static.Border" Color="{StaticResource BeamWall_Geyser_Color}"/>
+   
+   <SolidColorBrush x:Key="GroupBox.Static.OpenProjec.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+
+   <SolidColorBrush x:Key="GroupBox.PDFPreview.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+   
+   <SolidColorBrush x:Key="GroupBox.MachinePanel.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <!--#endregion Colori GroupBox-->
+
+   <!--#region Colori Border-->
+
+   <SolidColorBrush x:Key="Border.Static.GroupBox.First.Border" Color="Transparent"/>
+   <SolidColorBrush x:Key="Border.Static.GroupBox.Second.Border" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="Border.Static.Optmizer.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+
+   <SolidColorBrush x:Key="Border.Static.EgtManageDialog.Border" Color="{StaticResource BeamWall_Alto_Color}"/>
+
+   <SolidColorBrush x:Key="Border.Static.TitleBar.Background" Color="{StaticResource BeamWall_Casper_Color}"/>
+   <SolidColorBrush x:Key="Border.Static.TitleBar.Border" Color="{StaticResource BeamWall_Casper_Color}"/>
+
+   <SolidColorBrush x:Key="Border.Static.AboutBoxV.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="Border.Static.AboutBox.Border" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="Border.ButtonTitleBar.Background" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="Border.EgwWindow.Border" Color="{StaticResource BeamWall_Alto_Color}"/>
+
+   <SolidColorBrush x:Key="Border.ControlTemplete.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="Border.ControlTemplete.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+
+   <LinearGradientBrush x:Key="Border.WithoutTitleBar.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>
+
+   <SolidColorBrush x:Key="Border.EgtHexItem.Border" Color="{StaticResource BeamWall_Gold_Color}"/>
+
+   <SolidColorBrush x:Key="Border.Parameter.Background" Color="{StaticResource BeamWall_Alto_Color}"/>
+   <SolidColorBrush x:Key="Border.Parameter.Border" Color="{StaticResource BeamWall_Gray_Color}"/>
+
+   <SolidColorBrush x:Key="Border.NewAddFeature.Border" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="Border.AlternationIndex.Border" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="Border.ItemContainer.Background" Color="{StaticResource BeamWall_LinkWater_Color}"/>
+   <SolidColorBrush x:Key="Border.ItemContainer.Border" Color="{StaticResource BeamWall_LinkWater_Color}"/>
+   <SolidColorBrush x:Key="Border.ItemContainerIsSelected.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="Border.ItemContainerIsSelected.Border" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+
+   <SolidColorBrush x:Key="Border.Strategy.Border" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="Border.BTL.Border" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="Border.ForcedStrategyBTL.Border" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="Border.BTLPart.Border" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="Border.TotalTime.Background" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="Border.TotalTime.Border" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+
+   <SolidColorBrush x:Key="Border.DoneTime.Background" Color="{StaticResource BeamWall_FruitSalad_Color}"/>
+   <SolidColorBrush x:Key="Border.DoneTime.Border" Color="{StaticResource BeamWall_FruitSalad_Color}"/>
+
+   <SolidColorBrush x:Key="Border.RemainingTime.Background" Color="{StaticResource BeamWall_FuelYellow_Color}"/>
+   <SolidColorBrush x:Key="Border.RemainingTime.Border" Color="{StaticResource BeamWall_FuelYellow_Color}"/>
+
+   <SolidColorBrush x:Key="Border.ProjectType.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="Border.ProjectType.Border" Color="{StaticResource BeamWall_DarkGray_Color}"/>
+
+   <SolidColorBrush x:Key="Border.AddFeature.Background" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+
+   <SolidColorBrush x:Key="Border.PRC.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+
+   <SolidColorBrush x:Key="Border.Custom.Background" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+
+   <SolidColorBrush x:Key="Border.MacroCustom.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+
+   <SolidColorBrush x:Key="Border.Default.Background" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+
+   <SolidColorBrush x:Key="Border.MacroDefault.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+
+   <SolidColorBrush x:Key="Border.BTLPartManager.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="Border.BTLPartManager.Border" Color="{StaticResource BeamWall_Teal_Color}"/>
+
+   <SolidColorBrush x:Key="Border.SetUp.Border" Color="{StaticResource BeamWall_Indigo_Color}"/>
+
+   <SolidColorBrush x:Key="Border.TopPanel.Background" Color="{StaticResource BeamWall_Alto_Color}"/>
+   <SolidColorBrush x:Key="Border.TopPanel.Border" Color="{StaticResource BeamWall_Gray_Color}"/>
+
+   <!--#endregion Colori Border-->
+
+   <!--#region Colori Rectangle-->
+
+   <SolidColorBrush x:Key="Rectangle.Static.Stroke" Color="{StaticResource BeamWall_Black_Color}"/>
+
+   <SolidColorBrush x:Key="Rectangle.EgtColorPicker.Stroke" Color="{StaticResource BeamWall_Black_Color}"/>
+
+   <!--#endregion Colori Rectangle-->
+
+   <!--#region Colori StatusBar-->
+
+   <SolidColorBrush x:Key="StatusBar.Static.Background" Color="{StaticResource BeamWall_Alto_Color}"/>
+
+   <!--#endregion Colori StatusBar-->
+
+   <!--#region Colori DatePicker-->
+
+   <SolidColorBrush x:Key="DatePicker.Static.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="DatePicker.Static.Border" Color="Transparent"/>
+   <SolidColorBrush x:Key="DatePickerTextBox.Static.Background" Color="Transparent"/>
+
+   <!--#endregion Colori DatePicker-->
+
+   <!--#region Colori Calendar-->
+
+   <LinearGradientBrush x:Key="Calendar.Static.Background" 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>
+
+   <LinearGradientBrush x:Key="Calendar.Static.Border" 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>
+
+   <!--#endregion Colori Calendar-->
+   
+   <!--#region Colori DataGrid-->
+
+   <SolidColorBrush x:Key="DataGridColumnHeader.Static.Main.Background" Color="{StaticResource BeamWall_Teal_Color}"/>
+   <SolidColorBrush x:Key="DataGridColumnHeader.Static.Main.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="DataGridColumnHeader.Static.Feature.Background" Color="{StaticResource BeamWall_Keppel_Color}"/>
+   <SolidColorBrush x:Key="DataGridColumnHeader.Static.Feature.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="DataGridColumnHeader.Static.PParam.Background" Color="{StaticResource BeamWall_Downy_Color}"/>
+   <SolidColorBrush x:Key="DataGridColumnHeader.Static.PParam.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="DataGridColumnHeader.Static.RawPart.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="DataGridColumnHeader.Static.RawPart.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="DataGrid.Static.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="DataGrid.Static.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+   <SolidColorBrush x:Key="DataGrid.Static.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+
+   <SolidColorBrush x:Key="RowDataGrid.Static.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+   <SolidColorBrush x:Key="CellDataGrid.Static.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="RowDataGrid.Selected.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="RowDataGrid.Selected.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="RowDataGrid.Selected.Border" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+
+   <SolidColorBrush x:Key="CellDataGrid.Selected.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="CellDataGrid.Selected.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="CellDataGrid.Selected.Border" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+
+   <!--#endregion Colori DataGrid-->
+   
+   <!--#region Colori OptimizerWindow-->
+   
+   <LinearGradientBrush x:Key="OptimizerWindow.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>
+   <SolidColorBrush x:Key="OptimizerWindow.Static.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="OptimizerWindow.Static.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   
+   <!--#endregion Colori OtimizerWindow-->
+   
+   <!--#region Colori EgtCustomWindow-->
+
+   <LinearGradientBrush x:Key="EgtCustomWindow.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>
+   <SolidColorBrush x:Key="EgtCustomWindow.Static.Border" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="EgtCustomWindow.Static.TitleBarBorder" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="EgtCustomWindow.Static.TitleBarForeground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <!--#endregion Colori EgtCustomWindow-->
+   
+   <!--#region Colori EgtFloatingPanel-->
+
+   <SolidColorBrush x:Key="EgtFloatingPanel.Static.Background" Color="{StaticResource BeamWall_Gray_Color}"/>
+   <SolidColorBrush x:Key="EgtFloatingPanel.Static.Border" Color="{StaticResource BeamWall_Gray_Color}"/>
+
+   <!--#endregion Colori EgtFloatingPanel-->
+
+   <!--#region Colori EgtHexItem-->
+
+   <SolidColorBrush x:Key="EgtHexItem.Static.Background" Color="{StaticResource BeamWall_CornflowerBlue_Color}"/>
+   <SolidColorBrush x:Key="EgtHexItem.Static.Border" Color="{StaticResource BeamWall_Black_Color}"/>
+
+   <!--#endregion Colori EgtHexItem-->
+
+   <!--#region Colori Ellipse-->
+
+   <SolidColorBrush x:Key="Ellipse.Static.Fill" Color="{StaticResource BeamWall_Blue_Color}"/>
+
+   <SolidColorBrush x:Key="Ellipse.Parameter.Fill" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="Ellipse.ParameterIsChecked.Fill" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+
+   <SolidColorBrush x:Key="Ellipse.UpdateBTL.Fill" Color="{StaticResource BeamWall_Red_Color}"/>
+
+   <!--#endregion Colori Ellipse-->
+   
+   <!--#region Colori ToggleButton-->
+
+   <SolidColorBrush x:Key="ToggleButton.Static.Background" Color="Transparent"/>
+
+   <!--#endregion Colori ToggleButton-->
+   
+   <!--#region Colori UniformGrid-->
+
+   <SolidColorBrush x:Key="UniformGrid.LeftPanel.Background" Color="{DynamicResource BeamWall_LinkWater_Color}"/>
+
+   <!--#endregion UniformGrid-->
+   
+   <!--#region Colori ToolTip-->
+
+   <SolidColorBrush x:Key="ToolTip.PParameters.Background" Color="{DynamicResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="ToolTip.PParameters.Foreground" Color="{DynamicResource BeamWall_White_Color}"/>
+
+   <!--#endregion Colori ToolTip-->
+   
+</ResourceDictionary>
diff --git a/EgtBEAMWALL.Core/Themes/Generic.xaml b/EgtBEAMWALL.Core/Themes/Generic.xaml
index ad53d2d4..e3383d30 100644
--- a/EgtBEAMWALL.Core/Themes/Generic.xaml
+++ b/EgtBEAMWALL.Core/Themes/Generic.xaml
@@ -235,179 +235,6 @@
 
    <!--#endregion Colori Nuova Grafica-->
 
-   <!--#region Colori per EgtWPFLib5-->
-
-   <SolidColorBrush x:Key="TextBox.Static.Border" Color="#FFABAdB3"/>
-
-   <!--#endregion Colori per EgtWPFLib5-->
-
-   <!--#region Colori Button-->
-
-   <SolidColorBrush x:Key="ButtonBasic.Static.Background" Color="{StaticResource BeamWall_Alto_Color}"/>
-   <SolidColorBrush x:Key="ButtonBasic.Static.Border" Color="{StaticResource BeamWall_DoveGray_Color}"/>
-   <SolidColorBrush x:Key="ButtonBasic.MouseOver.Background" Color="{StaticResource BeamWall_FrenchPass_Color}"/>
-   <SolidColorBrush x:Key="ButtonBasic.MouseOver.Border" Color="{StaticResource BeamWall_BostonBlue_Color}"/>
-   <SolidColorBrush x:Key="ButtonBasic.Pressed.Background" Color="{StaticResource BeamWall_TropicalBlue_Color}"/>
-   <SolidColorBrush x:Key="ButtonBasic.Pressed.Border" Color="{StaticResource BeamWall_Calypso_Color}"/>
-   <SolidColorBrush x:Key="ButtonBasic.Disabled.Background" Color="{StaticResource BeamWall_WildSand_Color}"/>
-   <SolidColorBrush x:Key="ButtonBasic.Disabled.Border" Color="{StaticResource BeamWall_Bombay_Color}"/>
-   <SolidColorBrush x:Key="ButtonBasic.Disabled.Foreground" Color="{StaticResource BeamWall_Gray_Color}"/>
-
-   <SolidColorBrush x:Key="Button.Static.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
-   <SolidColorBrush x:Key="Button.Static.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
-   <SolidColorBrush x:Key="Button.Static.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
-   <SolidColorBrush x:Key="Button.MouseOver.Background" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
-   <SolidColorBrush x:Key="Button.MouseOver.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
-   <SolidColorBrush x:Key="Button.Pressed.Background" Color="{StaticResource BeamWall_Kashmir_Color}"/>
-   <SolidColorBrush x:Key="Button.Pressed.Border" Color="{StaticResource BeamWall_Kashmir_Color}"/>
-   <SolidColorBrush x:Key="Button.Disabled.Background" Color="{StaticResource BeamWall_Glacier_Color}" Opacity="0.5"/>
-   <SolidColorBrush x:Key="Button.Disabled.Border" Color="{StaticResource BeamWall_Glacier_Color}" Opacity="0.5"/>
-   <SolidColorBrush x:Key="Button.Disabled.Foreground" Color="{StaticResource BeamWall_White_Color}" Opacity="0.5"/>
-
-   <!--#endregion Colori Button-->
-
-   <!--#region Colori ScrollBar-->
-
-   <SolidColorBrush x:Key="ScrollBar.Static.Background" Color="{StaticResource BeamWall_White_Color}"/>
-   <SolidColorBrush x:Key="ScrollBar.Static.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
-   <SolidColorBrush x:Key="ScrollBar.Static.Glyph" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
-   <SolidColorBrush x:Key="ScrollBar.Static.Thumb" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
-   <SolidColorBrush x:Key="ScrollBar.MouseOver.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
-   <SolidColorBrush x:Key="ScrollBar.MouseOver.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
-   <SolidColorBrush x:Key="ScrollBar.MouseOver.Glyph" Color="{StaticResource BeamWall_White_Color}"/>
-   <SolidColorBrush x:Key="ScrollBar.MouseOver.Thumb" Color="{StaticResource BeamWall_Glacier_Color}"/>
-   <SolidColorBrush x:Key="ScrollBar.Pressed.Background" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
-   <SolidColorBrush x:Key="ScrollBar.Pressed.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
-   <SolidColorBrush x:Key="ScrollBar.Pressed.Thumb" Color="{StaticResource BeamWall_Kashmir_Color}"/>
-   <SolidColorBrush x:Key="ScrollBar.Pressed.Glyph" Color="{StaticResource BeamWall_White_Color}"/>
-   <SolidColorBrush x:Key="ScrollBar.Disabled.Background" Color="{StaticResource BeamWall_LinkWater_Color}"/>
-   <SolidColorBrush x:Key="ScrollBar.Disabled.Border" Color="{StaticResource BeamWall_LinkWater_Color}"/>
-   <SolidColorBrush x:Key="ScrollBar.Disabled.Glyph" Color="{StaticResource BeamWall_Kashmir_Color}"/>
-   <SolidColorBrush x:Key="ScrollBar.Button.Static.Background" Color="{StaticResource BeamWall_White_Color}"/>
-
-   <!--#endregion Colori ScrollBar-->
-
-   <!--#region Colori ComboBox-->
-
-   <SolidColorBrush x:Key="ComboBox.Static.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.Static.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.Static.Glyph" Color="{StaticResource BeamWall_White_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.Static.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.Static.Editable.Background" Color="{StaticResource BeamWall_White_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.Static.Editable.Border" Color="{StaticResource BeamWall_Bombay_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.Static.Editable.Button.Background" Color="Transparent"/>
-   <SolidColorBrush x:Key="ComboBox.Static.Editable.Button.Border" Color="Transparent"/>
-   <SolidColorBrush x:Key="ComboBox.MouseOver.Background" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.MouseOver.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.MouseOver.Glyph" Color="{StaticResource BeamWall_White_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Background" Color="{StaticResource BeamWall_White_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Border" Color="{StaticResource BeamWall_Seagull_Color}"/>
-   <LinearGradientBrush x:Key="ComboBox.MouseOver.Editable.Button.Background" EndPoint="0,1" StartPoint="0,0">
-      <GradientStop Color="{StaticResource BeamWall_Selago_Color}" Offset="0.0"/>
-      <GradientStop Color="{StaticResource BeamWall_HawkesBlue_Color}" Offset="1.0"/>
-   </LinearGradientBrush>
-   <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Button.Border" Color="{StaticResource BeamWall_Seagull_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.Pressed.Background" Color="{StaticResource BeamWall_Kashmir_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.Pressed.Border" Color="{StaticResource BeamWall_Kashmir_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.Pressed.Glyph" Color="{StaticResource BeamWall_White_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Background" Color="{StaticResource BeamWall_White_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Border" Color="{StaticResource BeamWall_CornflowerBlue_Color}"/>
-   <LinearGradientBrush x:Key="ComboBox.Pressed.Editable.Button.Background" EndPoint="0,1" StartPoint="0,0">
-      <GradientStop Color="{StaticResource BeamWall_HawkesBlue_Color}" Offset="0.0"/>
-      <GradientStop Color="{StaticResource BeamWall_FrenchPass_Color}" Offset="1.0"/>
-   </LinearGradientBrush>
-   <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Button.Border" Color="{StaticResource BeamWall_CornflowerBlue_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.Disabled.Background" Color="{StaticResource BeamWall_White_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.Disabled.Border" Color="{StaticResource BeamWall_Alto_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.Disabled.Glyph" Color="{StaticResource BeamWall_Silver_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Background" Color="{StaticResource BeamWall_White_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Border" Color="{StaticResource BeamWall_Silver_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Button.Background" Color="Transparent"/>
-   <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Button.Border" Color="Transparent"/>
-
-   <!--#endregion Colori ComboBox-->
-
-   <!--#region Colori Expander-->
-
-   <SolidColorBrush x:Key="Expander.Static.Circle.Stroke" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
-   <SolidColorBrush x:Key="Expander.Static.Circle.Fill" Color="{StaticResource BeamWall_White_Color}"/>
-   <SolidColorBrush x:Key="Expander.Static.Arrow.Stroke" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
-   <SolidColorBrush x:Key="Expander.MouseOver.Circle.Stroke" Color="{StaticResource BeamWall_Kashmir_Color}"/>
-   <SolidColorBrush x:Key="Expander.MouseOver.Circle.Fill" Color="{StaticResource BeamWall_AliceBlue_Color}"/>
-   <SolidColorBrush x:Key="Expander.MouseOver.Arrow.Stroke" Color="{StaticResource BeamWall_Kashmir_Color}"/>
-   <SolidColorBrush x:Key="Expander.Pressed.Circle.Stroke" Color="{StaticResource BeamWall_Kashmir_Color}"/>
-   <SolidColorBrush x:Key="Expander.Pressed.Circle.Fill" Color="{StaticResource BeamWall_PattensBlue_Color}"/>
-   <SolidColorBrush x:Key="Expander.Pressed.Arrow.Stroke" Color="{StaticResource BeamWall_Kashmir_Color}"/>
-   <SolidColorBrush x:Key="Expander.Disabled.Circle.Stroke" Color="{StaticResource BeamWall_RegentStBlue_Color}" Opacity="0.5"/>
-   <SolidColorBrush x:Key="Expander.Disabled.Circle.Fill" Color="{StaticResource BeamWall_Mercury_Color}" Opacity="0.5"/>
-   <SolidColorBrush x:Key="Expander.Disabled.Arrow.Stroke" Color="{StaticResource BeamWall_RegentStBlue_Color}" Opacity="0.5"/>
-
-   <!--#endregion Colori Expander-->
-
-   <!--#region Colori ListBox-->
-
-   <SolidColorBrush x:Key="Item.MouseOver.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
-   <SolidColorBrush x:Key="Item.MouseOver.Border" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
-   <SolidColorBrush x:Key="Item.MouseOver.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
-   <SolidColorBrush x:Key="Item.SelectedActive.Background" Color="{StaticResource BeamWall_Keppel_Color}"/>
-   <SolidColorBrush x:Key="Item.SelectedActive.Border" Color="{StaticResource BeamWall_Keppel_Color}"/>
-   <SolidColorBrush x:Key="Item.SelectedActive.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
-   <SolidColorBrush x:Key="Item.SelectedInactive.Background" Color="#3DDADADA"/>
-   <SolidColorBrush x:Key="Item.SelectedInactive.Border" Color="{StaticResource BeamWall_Alto_Color}"/>
-
-   <!--#endregion Colori ListBox-->
-
-   <!--#region Colori TabItem-->
-
-   <LinearGradientBrush x:Key="TabItem.Static.Background" EndPoint="0.5,1" StartPoint="0.5,0">
-      <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0"/>
-      <GradientStop Color="{StaticResource BeamWall_RegentStBlue_Color}" Offset="0.85"/>
-      <GradientStop Color="{StaticResource BeamWall_LinkWater_Color}" Offset="1"/>
-   </LinearGradientBrush>
-   <SolidColorBrush x:Key="TabItem.Static.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
-   <SolidColorBrush x:Key="TabItem.MouseOver.Background" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
-   <SolidColorBrush x:Key="TabItem.MouseOver.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
-   <LinearGradientBrush x:Key="TabItem.Selected.Background" EndPoint="0.5,1" StartPoint="0.5,0">
-      <GradientStop Color="{StaticResource BeamWall_Kashmir_Color}" Offset="0"/>
-      <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0.85"/>
-      <GradientStop Color="{StaticResource BeamWall_RegentStBlue_Color}" Offset="1"/>
-   </LinearGradientBrush>
-   <SolidColorBrush x:Key="TabItem.Selected.Border" Color="{StaticResource BeamWall_Kashmir_Color}"/>
-   <SolidColorBrush x:Key="TabItem.Disabled.Background" Color="{StaticResource BeamWall_Gallery_Color}"/>
-   <SolidColorBrush x:Key="TabItem.Disabled.Border" Color="{StaticResource BeamWall_Alto_Color}"/>
-
-   <!--#endregion Colori TabItem-->
-
-   <!--#region Colori ScrollViewer-->
-
-   <LinearGradientBrush x:Key="ScrollViewer.Static.Background" EndPoint="0.5,1" StartPoint="0.35,0">
-      <GradientStop Color="{StaticResource BeamWall_Silver_Color}" Offset="0"/>
-      <GradientStop Color="{StaticResource BeamWall_Alto_Color}" Offset="0.45"/>
-      <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="1"/>
-   </LinearGradientBrush>
-
-   <!--#endregion Colori ScrollViewer-->
-
-   <!--#region Colori Grid-->
-
-   <LinearGradientBrush x:Key="Grid.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.65"/>
-      <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
-   </LinearGradientBrush>
-
-   <!--#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 Image-->
@@ -424,7 +251,11 @@
       <Setter Property="Control.Template">
          <Setter.Value>
             <ControlTemplate>
-               <Rectangle Margin="2" SnapsToDevicePixels="true" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" StrokeThickness="1" StrokeDashArray="1 2"/>
+               <Rectangle Margin="2" 
+                          SnapsToDevicePixels="true" 
+                          Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" 
+                          StrokeThickness="1" 
+                          StrokeDashArray="1 2"/>
             </ControlTemplate>
          </Setter.Value>
       </Setter>
@@ -439,7 +270,7 @@
    <!--#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="Foreground" Value="{DynamicResource TextBlock.Static.Second.Foreground}"/>
       <Setter Property="HorizontalAlignment" Value="Left"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="Margin" Value="5,0,5,0"/>
@@ -460,7 +291,7 @@
    <!--#region DialogWindow-->
 
    <Style x:Key="DialogWindow_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+      <Setter Property="Foreground" Value="{DynamicResource TextBlock.Static.Second.Foreground}"/>
       <Setter Property="HorizontalAlignment" Value="Center"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="FontSize" Value="13"/>
@@ -475,13 +306,18 @@
       <Setter Property="Margin" Value="5"/>
    </Style>
 
+   <Style x:Key="ComboManageDialog_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DialogWindow_TextBlock}">
+      <Setter Property="HorizontalAlignment" Value="Left"/>
+      <Setter Property="Margin" Value="10,0,0,0"/>
+   </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="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+      <Setter Property="Foreground" Value="{DynamicResource TextBlock.Static.Second.Foreground}"/>
       <Setter Property="Margin" Value="5,18,5,10"/>
    </Style>
 
@@ -508,7 +344,7 @@
    <!--#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="Foreground" Value="{DynamicResource TextBlock.Static.Second.Foreground}"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
    </Style>
 
@@ -535,12 +371,12 @@
    <!--#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="Foreground" Value="{DynamicResource TextBlock.Static.First.Foreground}"/>
       <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="Foreground" Value="{DynamicResource TextBlock.Static.Second.Foreground}"/>
       <Setter Property="TextWrapping" Value="Wrap"/>
    </Style>
 
@@ -549,20 +385,20 @@
    </Style>
 
    <Style x:Key="Option_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+      <Setter Property="Foreground" Value="{DynamicResource TextBlock.Static.Second.Foreground}"/>
       <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="Foreground" Value="{DynamicResource TextBlock.Static.Second.Foreground}"/>
       <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="Foreground" Value="{DynamicResource TextBlock.Static.Third.Foreground}"/>
       <Setter Property="Margin" Value="0,0,20,0"/>
    </Style>
 
@@ -571,18 +407,18 @@
    </Style>
 
    <Style x:Key="StatusBar_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Black}"/>
+      <Setter Property="Foreground" Value="{DynamicResource TextBlock.Static.Fouth.Foreground}"/>
       <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="Foreground" Value="{DynamicResource TextBlock.Static.Fouth.Foreground}"/>
       <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="Foreground" Value="{DynamicResource TextBlock.Static.Fouth.Foreground}"/>
       <Setter Property="Margin" Value="0,0,5,0"/>
    </Style>
 
@@ -625,7 +461,7 @@
    <!--#region AboutBox_TextBlock-->
    
    <Style x:Key="AboutBox_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+      <Setter Property="Foreground" Value="{DynamicResource TextBlock.Static.Second.Foreground}"/>
       <Setter Property="HorizontalAlignment" Value="Center"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="FontSize" Value="18"/>
@@ -716,7 +552,7 @@
    </Style>
 
    <Style x:Key="AboutBox_TextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+      <Setter Property="Foreground" Value="{DynamicResource TextBlock.Static.Second.Foreground}"/>
       <Setter Property="HorizontalAlignment" Value="Center"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="TextWrapping" Value="Wrap"/>
@@ -732,8 +568,8 @@
 
    <Style TargetType="{x:Type Button}">
       <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
-      <Setter Property="Background" Value="{StaticResource ButtonBasic.Static.Background}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource ButtonBasic.Static.Border}"/>
+      <Setter Property="Background" Value="{DynamicResource ButtonBasic.Static.Background}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource ButtonBasic.Static.Border}"/>
       <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
       <Setter Property="BorderThickness" Value="1"/>
       <Setter Property="HorizontalContentAlignment" Value="Center"/>
@@ -744,25 +580,35 @@
       <Setter Property="Template">
          <Setter.Value>
             <ControlTemplate TargetType="{x:Type Button}">
-               <Border x:Name="border" CornerRadius="3" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
-                  <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+               <Border x:Name="border" 
+                       CornerRadius="3" 
+                       BorderBrush="{TemplateBinding BorderBrush}" 
+                       BorderThickness="{TemplateBinding BorderThickness}" 
+                       Background="{TemplateBinding Background}" 
+                       SnapsToDevicePixels="true">
+                  <ContentPresenter x:Name="contentPresenter" 
+                                    Focusable="False" 
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" 
+                                    Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" 
+                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" 
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
                </Border>
                <ControlTemplate.Triggers>
                   <Trigger Property="IsDefaulted" Value="true">
                      <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
                   </Trigger>
                   <Trigger Property="IsMouseOver" Value="true">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource ButtonBasic.MouseOver.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource ButtonBasic.MouseOver.Border}"/>
+                     <Setter Property="Background" TargetName="border" Value="{DynamicResource ButtonBasic.MouseOver.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource ButtonBasic.MouseOver.Border}"/>
                   </Trigger>
                   <Trigger Property="IsPressed" Value="true">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource ButtonBasic.Pressed.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource ButtonBasic.Pressed.Border}"/>
+                     <Setter Property="Background" TargetName="border" Value="{DynamicResource ButtonBasic.Pressed.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource ButtonBasic.Pressed.Border}"/>
                   </Trigger>
                   <Trigger Property="IsEnabled" Value="false">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource ButtonBasic.Disabled.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource ButtonBasic.Disabled.Border}"/>
-                     <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource ButtonBasic.Disabled.Foreground}"/>
+                     <Setter Property="Background" TargetName="border" Value="{DynamicResource ButtonBasic.Disabled.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource ButtonBasic.Disabled.Border}"/>
+                     <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{DynamicResource ButtonBasic.Disabled.Foreground}"/>
                      <Setter Property="OpacityMask" Value="#54707070"/>
                   </Trigger>
                </ControlTemplate.Triggers>
@@ -817,9 +663,9 @@
    
    <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}"/>
-      <Setter Property="Foreground" Value="{StaticResource Button.Static.Foreground}"/>
+      <Setter Property="Background" Value="{DynamicResource ButtonBasic.Static.Background}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource Button.Static.Border}"/>
+      <Setter Property="Foreground" Value="{DynamicResource Button.Static.Foreground}"/>
       <Setter Property="BorderThickness" Value="1"/>
       <Setter Property="HorizontalContentAlignment" Value="Center"/>
       <Setter Property="VerticalContentAlignment" Value="Center"/>
@@ -828,25 +674,34 @@
       <Setter Property="Template">
          <Setter.Value>
             <ControlTemplate TargetType="{x:Type Button}">
-               <Border x:Name="border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true" CornerRadius="2">
-                  <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+               <Border x:Name="border" 
+                       Background="{TemplateBinding Background}" 
+                       BorderBrush="{TemplateBinding BorderBrush}"
+                       BorderThickness="{TemplateBinding BorderThickness}" 
+                       SnapsToDevicePixels="true" CornerRadius="2">
+                  <ContentPresenter x:Name="contentPresenter" 
+                                    Focusable="False" 
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" 
+                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" 
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
                </Border>
                <ControlTemplate.Triggers>
                   <Trigger Property="IsDefaulted" Value="true">
                      <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
                   </Trigger>
                   <Trigger Property="IsMouseOver" Value="true">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.MouseOver.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
+                     <Setter Property="Background" TargetName="border" Value="{DynamicResource Button.MouseOver.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource 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}"/>
+                     <Setter Property="Background" TargetName="border" Value="{DynamicResource Button.Pressed.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource 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="Background" TargetName="border" Value="{DynamicResource Button.Disabled.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource Button.Disabled.Border}"/>
+                     <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{DynamicResource Button.Disabled.Foreground}"/>
                   </Trigger>
                </ControlTemplate.Triggers>
             </ControlTemplate>
@@ -855,7 +710,7 @@
    </Style>
 
    <Style x:Key="Button.OptimizerWindow.TitleBar" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
+      <Setter Property="Foreground" Value="{DynamicResource Button.TitleBar.Foreground}" />
       <Setter Property="Padding" Value="0" />
       <Setter Property="WindowChrome.IsHitTestVisibleInChrome" Value="True" />
       <Setter Property="IsTabStop" Value="False" />
@@ -863,7 +718,7 @@
          <Setter.Value>
             <ControlTemplate TargetType="{x:Type Button}">
                <Border x:Name="border"
-					        Background="Transparent"
+					        Background="{DynamicResource Border.ButtonTitleBar.Background}"
 					        BorderThickness="0"
 					        SnapsToDevicePixels="true">
                   <ContentPresenter x:Name="contentPresenter"
@@ -934,23 +789,15 @@
    </Style>
 
    <Style x:Key="MainMenu_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
+      <Setter Property="Background" Value="{DynamicResource Button.MainMenu.Background}"/>
       <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
       <Setter Property="TextBlock.FontWeight" Value="Normal"/>
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="120"/>
-      <Setter Property="Background">
-         <Setter.Value>
-            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-               <GradientStop Color="{StaticResource BeamWall_Kashmir_Color}" Offset="0"/>
-               <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0.65"/>
-               <GradientStop Color="{StaticResource BeamWall_RegentStBlue_Color}" Offset="1"/>
-            </LinearGradientBrush>
-         </Setter.Value>
-      </Setter>
    </Style>
 
    <Style x:Key="General_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
+      <Setter Property="Foreground" Value="{DynamicResource Button.General.Foreground}"/>
       <Setter Property="Height" Value="20"/>
       <Setter Property="Width" Value="20"/>
       <Setter Property="Margin" Value="2.5,0,0,0"/>
@@ -998,8 +845,8 @@
 
    <Style TargetType="{x:Type ToggleButton}">
       <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
-      <Setter Property="Background" Value="{StaticResource ButtonBasic.Static.Background}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource Button.Static.Border}"/>
+      <Setter Property="Background" Value="{DynamicResource ButtonBasic.Static.Background}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource Button.Static.Border}"/>
       <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
       <Setter Property="BorderThickness" Value="1"/>
       <Setter Property="HorizontalContentAlignment" Value="Center"/>
@@ -1018,21 +865,21 @@
                      <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}"/>
+                     <Setter Property="Background" TargetName="border" Value="{DynamicResource Button.MouseOver.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource 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}"/>
+                     <Setter Property="Background" TargetName="border" Value="{DynamicResource Button.Pressed.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource Button.Pressed.Border}"/>
                   </Trigger>
                   <Trigger Property="IsChecked" Value="true">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource BeamWall_GoldenTainoi}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
+                     <Setter Property="Background" TargetName="border" Value="{DynamicResource BeamWall_GoldenTainoi}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource 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="Background" TargetName="border" Value="{DynamicResource Button.Disabled.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource Button.Disabled.Border}"/>
+                     <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{DynamicResource Button.Disabled.Foreground}"/>
                      <Setter Property="OpacityMask" Value="#54707070"/>
                   </Trigger>
                </ControlTemplate.Triggers>
@@ -1397,7 +1244,7 @@
    </Style>
 
    <Style x:Key="CustomerColor_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource EgtColorPicker_ListBox}">
-      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="Background" Value="{DynamicResource ListBox.Static.Background}"/>
    </Style>
 
    <!--#endregion EgtColorPicker-->
@@ -1412,9 +1259,9 @@
    
    <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}"/>
-      <Setter Property="Foreground" Value="{StaticResource ComboBox.Static.Foreground}"/>
+      <Setter Property="Background" Value="{DynamicResource ComboBox.Static.Background}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource ComboBox.Static.Border}"/>
+      <Setter Property="Foreground" Value="{DynamicResource ComboBox.Static.Foreground}"/>
       <Setter Property="BorderThickness" Value="1"/>
       <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
       <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
@@ -1554,9 +1401,9 @@
 
    <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="Foreground" Value="{DynamicResource TabItem.Static.Foreground}"/>
+      <Setter Property="Background" Value="{DynamicResource TabItem.Static.Background}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource TabItem.Static.Border}"/>
       <Setter Property="Margin" Value="0"/>
       <Setter Property="Padding" Value="6,2,6,2"/>
       <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
@@ -1566,7 +1413,7 @@
             <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 x:Name="innerBorder" Background="{DynamicResource TabItem.Selected.Background}" BorderBrush="{DynamicResource 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>
@@ -1576,8 +1423,8 @@
                         <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="Background" TargetName="mainBorder" Value="{DynamicResource TabItem.MouseOver.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{DynamicResource TabItem.MouseOver.Border}"/>
                      <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,0,1"/>
                      <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,0,1"/>
                   </MultiDataTrigger>
@@ -1586,8 +1433,8 @@
                         <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="Background" TargetName="mainBorder" Value="{DynamicResource TabItem.MouseOver.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{DynamicResource TabItem.MouseOver.Border}"/>
                      <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,0,1,1"/>
                      <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,0,1,1"/>
                   </MultiDataTrigger>
@@ -1596,8 +1443,8 @@
                         <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="Background" TargetName="mainBorder" Value="{DynamicResource TabItem.MouseOver.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{DynamicResource TabItem.MouseOver.Border}"/>
                      <Setter Property="BorderThickness" TargetName="innerBorder" Value="0,1,1,1"/>
                      <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,1,1,1"/>
                   </MultiDataTrigger>
@@ -1606,8 +1453,8 @@
                         <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="Background" TargetName="mainBorder" Value="{DynamicResource TabItem.MouseOver.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{DynamicResource TabItem.MouseOver.Border}"/>
                      <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,1,0"/>
                      <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,1,0"/>
                   </MultiDataTrigger>
@@ -1617,8 +1464,8 @@
                         <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="Background" TargetName="mainBorder" Value="{DynamicResource TabItem.Disabled.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{DynamicResource TabItem.Disabled.Border}"/>
                      <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,0,1"/>
                      <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,0,1"/>
                   </MultiDataTrigger>
@@ -1628,8 +1475,8 @@
                         <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="Background" TargetName="mainBorder" Value="{DynamicResource TabItem.Disabled.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{DynamicResource TabItem.Disabled.Border}"/>
                      <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,0,1,1"/>
                      <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,0,1,1"/>
                   </MultiDataTrigger>
@@ -1639,8 +1486,8 @@
                         <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="Background" TargetName="mainBorder" Value="{DynamicResource TabItem.Disabled.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{DynamicResource TabItem.Disabled.Border}"/>
                      <Setter Property="BorderThickness" TargetName="innerBorder" Value="0,1,1,1"/>
                      <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,1,1,1"/>
                   </MultiDataTrigger>
@@ -1650,8 +1497,8 @@
                         <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="Background" TargetName="mainBorder" Value="{DynamicResource TabItem.Disabled.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{DynamicResource TabItem.Disabled.Border}"/>
                      <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,1,0"/>
                      <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,1,0"/>
                   </MultiDataTrigger>
@@ -1742,25 +1589,17 @@
    <!--#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="Background" Value="{DynamicResource TabControl.Static.EgtManageDialog.Background}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource TabControl.Static.EgtManageDialog.Border}"/>
       <Setter Property="BorderThickness" Value="0"/>
    </Style>
 
    <!--#region Generic-->
 
    <Style x:Key="Generic_TabControl" TargetType="{x:Type TabControl}">
+      <Setter Property="Background" Value="{DynamicResource TabControl.Static.Generic.Background}"/>
       <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>
@@ -1840,7 +1679,7 @@
    <!--#endregion BTLPartManager-->
 
    <Style x:Key="OptStatistics_StackPanel" TargetType="{x:Type StackPanel}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_White}"/>
+      <Setter Property="Background" Value="{DynamicResource StackPanel.Static.Background}"/>
       <Setter Property="Margin" Value="-10,10,10,10"/>
    </Style>
 
@@ -1982,7 +1821,7 @@
    <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="BorderBrush" Value="{DynamicResource GroupBox.Static.Border}"/>
       <Setter Property="BorderThickness" Value="1"/>
       <Setter Property="Template">
          <Setter.Value>
@@ -2000,10 +1839,10 @@
                      <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="{DynamicResource Border.Static.GroupBox.First.Border}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="4" Grid.Column="0" CornerRadius="4" Grid.Row="1" Grid.RowSpan="3"/>
+                  <Border BorderBrush="{DynamicResource Border.Static.GroupBox.Second.Border}" 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 BorderBrush="{DynamicResource Border.Static.GroupBox.Second.Border}" 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">
@@ -2047,7 +1886,7 @@
    <!--#endregion Optimizer-->
    
    <Style x:Key="OpenProjectFile_GroupBox" TargetType="{x:Type GroupBox}">
-      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_RegentStBlue}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource GroupBox.Static.OpenProjec.Border}"/>
       <Setter Property="Margin" Value="5"/>
    </Style>
 
@@ -2062,7 +1901,7 @@
          <Setter.Value>
             <ControlTemplate>
                <Border>
-                  <Rectangle Margin="0" StrokeDashArray="1 2" Stroke="Black" SnapsToDevicePixels="true" StrokeThickness="1"/>
+                  <Rectangle Margin="0" StrokeDashArray="1 2" Stroke="{DynamicResource Rectangle.Static.Stroke}" SnapsToDevicePixels="true" StrokeThickness="1"/>
                </Border>
             </ControlTemplate>
          </Setter.Value>
@@ -2073,13 +1912,13 @@
          <Setter.Value>
             <ControlTemplate TargetType="{x:Type ToggleButton}">
                <Border Padding="{TemplateBinding Padding}">
-                  <Grid Background="{StaticResource BeamWall_Glacier}" Height="25" SnapsToDevicePixels="False">
+                  <Grid Background="{DynamicResource Grid.Static.ExpanderDown.Background}" Height="25" SnapsToDevicePixels="False">
                      <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="19"/>
                         <ColumnDefinition Width="*"/>
                      </Grid.ColumnDefinitions>
-                     <Rectangle x:Name="circle" Fill="{StaticResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="25" Stroke="{StaticResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
-                     <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" Stroke="{StaticResource Expander.Static.Arrow.Stroke}" SnapsToDevicePixels="false" StrokeThickness="2" VerticalAlignment="Center"/>
+                     <Rectangle x:Name="circle" Fill="{DynamicResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="25" Stroke="{DynamicResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
+                     <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" Stroke="{DynamicResource Expander.Static.Arrow.Stroke}" SnapsToDevicePixels="false" StrokeThickness="2" VerticalAlignment="Center"/>
                      <ContentPresenter Grid.Column="1" HorizontalAlignment="Center" RecognizesAccessKey="True" SnapsToDevicePixels="True" VerticalAlignment="Center"/>
                   </Grid>
                </Border>
@@ -2088,20 +1927,20 @@
                      <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
                   </Trigger>
                   <Trigger Property="IsMouseOver" Value="true">
-                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Stroke}"/>
-                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Fill}"/>
-                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}"/>
+                     <Setter Property="Stroke" TargetName="circle" Value="{DynamicResource Expander.MouseOver.Circle.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{DynamicResource Expander.MouseOver.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{DynamicResource Expander.MouseOver.Arrow.Stroke}"/>
                   </Trigger>
                   <Trigger Property="IsPressed" Value="true">
-                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Stroke}"/>
+                     <Setter Property="Stroke" TargetName="circle" Value="{DynamicResource Expander.Pressed.Circle.Stroke}"/>
                      <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
-                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Fill}"/>
-                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Pressed.Arrow.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{DynamicResource Expander.Pressed.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{DynamicResource Expander.Pressed.Arrow.Stroke}"/>
                   </Trigger>
                   <Trigger Property="IsEnabled" Value="false">
-                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Stroke}"/>
-                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Fill}"/>
-                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Disabled.Arrow.Stroke}"/>
+                     <Setter Property="Stroke" TargetName="circle" Value="{DynamicResource Expander.Disabled.Circle.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{DynamicResource Expander.Disabled.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{DynamicResource Expander.Disabled.Arrow.Stroke}"/>
                   </Trigger>
                </ControlTemplate.Triggers>
             </ControlTemplate>
@@ -2113,7 +1952,7 @@
          <Setter.Value>
             <ControlTemplate TargetType="{x:Type ToggleButton}">
                <Border Padding="{TemplateBinding Padding}">
-                  <Grid Background="Transparent" SnapsToDevicePixels="False">
+                  <Grid Background="{DynamicResource Grid.Static.ExpanderUp.Background}" SnapsToDevicePixels="False">
                      <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="19"/>
                         <ColumnDefinition Width="*"/>
@@ -2128,8 +1967,8 @@
                               </TransformGroup.Children>
                            </TransformGroup>
                         </Grid.LayoutTransform>
-                        <Ellipse x:Name="circle" Fill="{StaticResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="19" Stroke="{StaticResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
-                        <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" Stroke="{StaticResource Expander.Static.Arrow.Stroke}" SnapsToDevicePixels="false" StrokeThickness="2" VerticalAlignment="Center"/>
+                        <Ellipse x:Name="circle" Fill="{DynamicResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="19" Stroke="{DynamicResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
+                        <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" Stroke="{DynamicResource Expander.Static.Arrow.Stroke}" SnapsToDevicePixels="false" StrokeThickness="2" VerticalAlignment="Center"/>
                      </Grid>
                      <ContentPresenter Grid.Column="1" HorizontalAlignment="Left" Margin="4,0,0,0" RecognizesAccessKey="True" SnapsToDevicePixels="True" VerticalAlignment="Center"/>
                   </Grid>
@@ -2139,20 +1978,20 @@
                      <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
                   </Trigger>
                   <Trigger Property="IsMouseOver" Value="true">
-                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Stroke}"/>
-                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Fill}"/>
-                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}"/>
+                     <Setter Property="Stroke" TargetName="circle" Value="{DynamicResource Expander.MouseOver.Circle.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{DynamicResource Expander.MouseOver.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{DynamicResource Expander.MouseOver.Arrow.Stroke}"/>
                   </Trigger>
                   <Trigger Property="IsPressed" Value="true">
-                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Stroke}"/>
+                     <Setter Property="Stroke" TargetName="circle" Value="{DynamicResource Expander.Pressed.Circle.Stroke}"/>
                      <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
-                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Fill}"/>
-                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Pressed.Arrow.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{DynamicResource Expander.Pressed.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{DynamicResource Expander.Pressed.Arrow.Stroke}"/>
                   </Trigger>
                   <Trigger Property="IsEnabled" Value="false">
-                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Stroke}"/>
-                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Fill}"/>
-                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Disabled.Arrow.Stroke}"/>
+                     <Setter Property="Stroke" TargetName="circle" Value="{DynamicResource Expander.Disabled.Circle.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{DynamicResource Expander.Disabled.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{DynamicResource Expander.Disabled.Arrow.Stroke}"/>
                   </Trigger>
                </ControlTemplate.Triggers>
             </ControlTemplate>
@@ -2164,7 +2003,7 @@
          <Setter.Value>
             <ControlTemplate TargetType="{x:Type ToggleButton}">
                <Border Padding="{TemplateBinding Padding}">
-                  <Grid Background="Transparent" SnapsToDevicePixels="False">
+                  <Grid Background="{DynamicResource Grid.Static.ExpanderUp.Background}" SnapsToDevicePixels="False">
                      <Grid.RowDefinitions>
                         <RowDefinition Height="19"/>
                         <RowDefinition Height="*"/>
@@ -2179,8 +2018,8 @@
                               </TransformGroup.Children>
                            </TransformGroup>
                         </Grid.LayoutTransform>
-                        <Ellipse x:Name="circle" Fill="{StaticResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="19" Stroke="{StaticResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
-                        <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" Stroke="{StaticResource Expander.Static.Arrow.Stroke}" SnapsToDevicePixels="false" StrokeThickness="2" VerticalAlignment="Center"/>
+                        <Ellipse x:Name="circle" Fill="{DynamicResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="19" Stroke="{DynamicResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
+                        <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" Stroke="{DynamicResource Expander.Static.Arrow.Stroke}" SnapsToDevicePixels="false" StrokeThickness="2" VerticalAlignment="Center"/>
                      </Grid>
                      <ContentPresenter HorizontalAlignment="Center" Margin="0,4,0,0" RecognizesAccessKey="True" Grid.Row="1" SnapsToDevicePixels="True" VerticalAlignment="Top"/>
                   </Grid>
@@ -2190,20 +2029,20 @@
                      <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
                   </Trigger>
                   <Trigger Property="IsMouseOver" Value="true">
-                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Stroke}"/>
-                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Fill}"/>
-                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}"/>
+                     <Setter Property="Stroke" TargetName="circle" Value="{DynamicResource Expander.MouseOver.Circle.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{DynamicResource Expander.MouseOver.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{DynamicResource Expander.MouseOver.Arrow.Stroke}"/>
                   </Trigger>
                   <Trigger Property="IsPressed" Value="true">
-                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Stroke}"/>
+                     <Setter Property="Stroke" TargetName="circle" Value="{DynamicResource Expander.Pressed.Circle.Stroke}"/>
                      <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
-                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Fill}"/>
-                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Pressed.Arrow.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{DynamicResource Expander.Pressed.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{DynamicResource Expander.Pressed.Arrow.Stroke}"/>
                   </Trigger>
                   <Trigger Property="IsEnabled" Value="false">
-                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Stroke}"/>
-                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Fill}"/>
-                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Disabled.Arrow.Stroke}"/>
+                     <Setter Property="Stroke" TargetName="circle" Value="{DynamicResource Expander.Disabled.Circle.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{DynamicResource Expander.Disabled.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{DynamicResource Expander.Disabled.Arrow.Stroke}"/>
                   </Trigger>
                </ControlTemplate.Triggers>
             </ControlTemplate>
@@ -2215,7 +2054,7 @@
          <Setter.Value>
             <ControlTemplate TargetType="{x:Type ToggleButton}">
                <Border Padding="{TemplateBinding Padding}">
-                  <Grid Background="Transparent" SnapsToDevicePixels="False">
+                  <Grid Background="{DynamicResource Grid.Static.ExpanderUp.Background}" SnapsToDevicePixels="False">
                      <Grid.RowDefinitions>
                         <RowDefinition Height="19"/>
                         <RowDefinition Height="*"/>
@@ -2230,8 +2069,8 @@
                               </TransformGroup.Children>
                            </TransformGroup>
                         </Grid.LayoutTransform>
-                        <Ellipse x:Name="circle" Fill="{StaticResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="19" Stroke="{StaticResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
-                        <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" Stroke="{StaticResource Expander.Static.Arrow.Stroke}" SnapsToDevicePixels="false" StrokeThickness="2" VerticalAlignment="Center"/>
+                        <Ellipse x:Name="circle" Fill="{DynamicResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="19" Stroke="{DynamicResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
+                        <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" Stroke="{DynamicResource Expander.Static.Arrow.Stroke}" SnapsToDevicePixels="false" StrokeThickness="2" VerticalAlignment="Center"/>
                      </Grid>
                      <ContentPresenter HorizontalAlignment="Center" Margin="0,4,0,0" RecognizesAccessKey="True" Grid.Row="1" SnapsToDevicePixels="True" VerticalAlignment="Top"/>
                   </Grid>
@@ -2241,20 +2080,20 @@
                      <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
                   </Trigger>
                   <Trigger Property="IsMouseOver" Value="true">
-                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Stroke}"/>
-                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Fill}"/>
-                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}"/>
+                     <Setter Property="Stroke" TargetName="circle" Value="{DynamicResource Expander.MouseOver.Circle.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{DynamicResource Expander.MouseOver.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{DynamicResource Expander.MouseOver.Arrow.Stroke}"/>
                   </Trigger>
                   <Trigger Property="IsPressed" Value="true">
-                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Stroke}"/>
+                     <Setter Property="Stroke" TargetName="circle" Value="{DynamicResource Expander.Pressed.Circle.Stroke}"/>
                      <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
-                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Fill}"/>
-                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Pressed.Arrow.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{DynamicResource Expander.Pressed.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{DynamicResource Expander.Pressed.Arrow.Stroke}"/>
                   </Trigger>
                   <Trigger Property="IsEnabled" Value="false">
-                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Stroke}"/>
-                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Fill}"/>
-                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Disabled.Arrow.Stroke}"/>
+                     <Setter Property="Stroke" TargetName="circle" Value="{DynamicResource Expander.Disabled.Circle.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{DynamicResource Expander.Disabled.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{DynamicResource Expander.Disabled.Arrow.Stroke}"/>
                   </Trigger>
                </ControlTemplate.Triggers>
             </ControlTemplate>
@@ -2262,11 +2101,11 @@
       </Setter>
    </Style>
    <Style TargetType="{x:Type Expander}">
-      <Setter Property="Foreground" Value="{StaticResource  BeamWall_White}"/>
-      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="Foreground" Value="{DynamicResource  Expander.Static.Foreground}"/>
+      <Setter Property="Background" Value="{DynamicResource Expander.Static.Background}"/>
       <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
       <Setter Property="VerticalContentAlignment" Value="Stretch"/>
-      <Setter Property="BorderBrush" Value="Transparent"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource Expander.Static.Border}"/>
       <Setter Property="BorderThickness" Value="1"/>
       <Setter Property="Template">
          <Setter.Value>
@@ -2312,13 +2151,13 @@
    <!--#region TreeView-->
 
    <Style x:Key="EgtManageDialog_TreeView" TargetType="{x:Type TreeView}">
-      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_White}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource TreeView.Static.EgtManageDialog.Background}"/>
       <Setter Property="FontSize" Value="15"/>
       <Setter Property="Margin" Value="10"/>
    </Style>
 
    <Style x:Key="MachiningDB_TreeView" TargetType="{x:Type TreeView}">
-      <Setter Property="Background" Value="{StaticResource TreeView.Static.Background}"/>
+      <Setter Property="Background" Value="{DynamicResource TreeView.Static.Background}"/>
    </Style>
 
    <!--#endregion TreeView-->
@@ -2330,7 +2169,7 @@
    <!--#region Optimizer-->
    
    <Style x:Key="Optimizer_Border" TargetType="{x:Type Border}">
-      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Glacier}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource Border.Static.Optmizer.Border}"/>
       <Setter Property="CornerRadius" Value="4"/>
       <Setter Property="BorderThickness" Value="2"/>
    </Style>
@@ -2342,23 +2181,23 @@
    <!--#endregion Optimizer-->
 
    <Style x:Key="EgtManageDialog_Border" TargetType="{x:Type Border}">
-      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Alto}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource Border.Static.EgtManageDialog.Border}"/>
       <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="Background" Value="{DynamicResource Border.Static.TitleBar.Background}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource Border.Static.TitleBar.Border}"/>
       <Setter Property="BorderThickness" Value="0"/>
    </Style>
 
    <Style x:Key="AboutBoxV_Border" TargetType="{x:Type Border}">
-      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_RegentStBlue}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource Border.Static.AboutBoxV.Border}"/>
       <Setter Property="BorderThickness" Value="2"/>
    </Style>
 
    <Style x:Key="AboutBox_Border" TargetType="{x:Type Border}">
-      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_White}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource Border.Static.AboutBox.Border}"/>
    </Style>
 
    <!--#endregion Border-->
@@ -2368,7 +2207,7 @@
    <!--#region StatusBar-->
 
    <Style x:Key="StatusBar_StatusBar" TargetType="{x:Type StatusBar}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_Alto}"/>
+      <Setter Property="Background" Value="{DynamicResource StatusBar.Static.Background}"/>
    </Style>
 
    <!--#endregion StatusBar-->
@@ -2407,49 +2246,38 @@
    <!--#region DatePicker-->
 
    <Style x:Key="Filter_DatePicker" TargetType="{x:Type DatePicker}">
-      <Setter Property="Height" Value="25" />
-      <Setter Property="Width" Value="100" />
-      <Setter Property="BorderBrush" Value="Transparent"/>
-      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="Background" Value="{DynamicResource DatePicker.Static.Background}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource DatePicker.Static.Border}"/>
+      <Setter Property="Height" Value="25"/>
+      <Setter Property="Width" Value="100"/>
       <Style.Resources>
          <Style TargetType="{x:Type DatePickerTextBox}">
-            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="Background" Value="{DynamicResource DatePickerTextBox.Static.Background}"/>
          </Style>
       </Style.Resources>
    </Style>
 
+   <!--#endregion DatePicker-->
+   
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+   
+   <!--#region Calendar-->
+   
    <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="Background" Value="{DynamicResource Calendar.Static.Background}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource Calendar.Static.Border}"/>
       <Setter Property="BorderThickness" Value="1"/>
    </Style>
 
-   <!--#endregion DatePicker-->
+   <!--#endregion Calendar-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!--#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="Background" Value="{DynamicResource DataGridColumnHeader.Static.Main.Background}" />
+      <Setter Property="Foreground" Value="{DynamicResource DataGridColumnHeader.Static.Main.Foreground}" />
       <Setter Property="FontWeight" Value="Bold" />
       <Setter Property="FontSize" Value="15" />
       <Setter Property="HorizontalContentAlignment" Value="Center" />
@@ -2457,17 +2285,8 @@
    </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="Background" Value="{DynamicResource DataGridColumnHeader.Static.Feature.Background}" />
+      <Setter Property="Foreground" Value="{DynamicResource DataGridColumnHeader.Static.Feature.Foreground}" />
       <Setter Property="FontWeight" Value="Bold" />
       <Setter Property="FontSize" Value="15" />
       <Setter Property="HorizontalContentAlignment" Value="Center" />
@@ -2475,8 +2294,8 @@
    </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="Background" Value="{DynamicResource DataGridColumnHeader.Static.PParam.Background}" />
+      <Setter Property="Foreground" Value="{DynamicResource DataGridColumnHeader.Static.PParam.Foreground}" />
       <Setter Property="FontWeight" Value="Bold" />
       <Setter Property="FontSize" Value="15" />
       <Setter Property="HorizontalContentAlignment" Value="Center" />
@@ -2484,8 +2303,8 @@
    </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="Background" Value="{DynamicResource DataGridColumnHeader.Static.RawPart.Background}" />
+      <Setter Property="Foreground" Value="{DynamicResource DataGridColumnHeader.Static.RawPart.Foreground}" />
       <Setter Property="FontWeight" Value="SemiBold" />
       <Setter Property="FontSize" Value="11" />
       <Setter Property="HorizontalContentAlignment" Value="Center" />
@@ -2493,9 +2312,9 @@
    </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="Background" Value="{DynamicResource DataGrid.Static.Background}"/>
+      <Setter Property="Foreground" Value="{DynamicResource DataGrid.Static.Foreground}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource DataGrid.Static.Border}"/>
       <Setter Property="BorderThickness" Value="0,0,0,0"/>
       <Setter Property="RowDetailsVisibilityMode" Value="VisibleWhenSelected"/>
       <Setter Property="ScrollViewer.CanContentScroll" Value="True"/>
@@ -2568,61 +2387,44 @@
    </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>
+      <Setter Property="Foreground" Value="{DynamicResource RowDataGrid.Static.Foreground}" />
+      <Setter Property="SnapsToDevicePixels" Value="True"/>
       <Style.Triggers>
          <Trigger Property="IsSelected" Value="True">
-            <Setter Property="BorderBrush" Value="{StaticResource BeamWall_FountainBlue}" />
+            <Setter Property="Background" Value="{DynamicResource RowDataGrid.Selected.Background}" />
+            <Setter Property="Foreground" Value="{DynamicResource RowDataGrid.Selected.Foreground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource RowDataGrid.Selected.Border}" />
             <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="Foreground" Value="{DynamicResource CellDataGrid.Static.Foreground}" />
       <Setter Property="Height" Value="24"/>
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}" />
       <Setter Property="SnapsToDevicePixels" Value="True"/>
-      <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="Background" Value="{DynamicResource CellDataGrid.Selected.Background}" />
+            <Setter Property="Foreground" Value="{DynamicResource CellDataGrid.Selected.Foreground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource CellDataGrid.Selected.Border}" />
             <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_NewOpenProject" TargetType="{x:Type DataGridCell}">
+      <Setter Property="Foreground" Value="{DynamicResource CellDataGrid.Static.Foreground}" />
       <Setter Property="Height" Value="24"/>
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}" />
       <Setter Property="SnapsToDevicePixels" Value="True"/>
       <Setter Property="TextBlock.TextAlignment" Value="Left"/>
       <Setter Property="Margin" Value="10,0,0,0"/>
-      <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="Background" Value="{DynamicResource CellDataGrid.Selected.Background}" />
+            <Setter Property="Foreground" Value="{DynamicResource CellDataGrid.Selected.Foreground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource CellDataGrid.Selected.Border}" />
             <Setter Property="FontWeight" Value="Bold" />
-            <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
-            <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}" />
          </Trigger>
       </Style.Triggers>
    </Style>
@@ -2653,7 +2455,7 @@
 
    <ControlTemplate x:Key="OptimizerWindow.ControlTemplate.WithTitleBar" TargetType="{x:Type EgwWPFBaseLib:EgtWindow}">
       <Border BorderThickness="{TemplateBinding BorderThickness}"
-              BorderBrush="{StaticResource BeamWall_Alto}"
+              BorderBrush="{DynamicResource Border.EgwWindow.Border}"
               Background="{TemplateBinding Background}">
          <Grid>
             <Grid.RowDefinitions>
@@ -2672,8 +2474,8 @@
                <Border Grid.Column="0"
                        Grid.ColumnSpan="6"
                        BorderThickness="0"
-                       BorderBrush="{StaticResource BeamWall_Glacier}"
-                       Background="{StaticResource BeamWall_Glacier}"/>
+                       BorderBrush="{DynamicResource Border.ControlTemplete.Border}"
+                       Background="{DynamicResource Border.ControlTemplete.Background}"/>
                <Image Grid.Column="0"
 		                MinWidth="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
 		                Source="{TemplateBinding Icon}"/>
@@ -2740,31 +2542,17 @@
 
    <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>
+              BorderBrush="{DynamicResource Border.ControlTemplete.Border}"
+              Background="{DynamicResource Border.WithoutTitleBar.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="Background" Value="{DynamicResource OptimizerWindow.Static.Background}"/>
+      <Setter Property="Foreground" Value="{DynamicResource OptimizerWindow.Static.Foreground}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource OptimizerWindow.Static.Border}"/>
       <Setter Property="TitleBarHeight" Value="45"/>
       <Setter Property="BorderThickness" Value="0"/>
       <Setter Property="IsMinimizable" Value="True"/>
@@ -2815,20 +2603,12 @@
    <!--#region EgtCustomWindow-->
 
    <Style x:Key="OnlyProd_EgtCustomWindow" TargetType="{x:Type EgtWPFLib5:EgtCustomWindow}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
+      <Setter Property="Background" Value="{DynamicResource EgtCustomWindow.Static.Background}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource EgtCustomWindow.Static.Border}"/>
+      <Setter Property="TitleBarForeground" Value="{DynamicResource EgtCustomWindow.Static.TitleBarForeground}"/>
+      <Setter Property="TitleBarBrush" Value="{DynamicResource EgtCustomWindow.Static.TitleBarBorder}"/>
       <Setter Property="TitleBarHeight" Value="40"/>
-      <Setter Property="TitleBarBrush" Value="{StaticResource BeamWall_Glacier}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Kashmir}"/>
-      <Setter Property="TitleBarForeground" Value="{StaticResource BeamWall_White}"/>
       <Setter Property="ShowInTaskbar" Value="False"/>
-      <Setter Property="Background">
-         <Setter.Value>
-            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
-               <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
-               <GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.45"/>
-               <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
-            </LinearGradientBrush>
-         </Setter.Value>
-      </Setter>
    </Style>
 
    <!--#endregion EgtCustomWindow-->
@@ -2838,8 +2618,8 @@
    <!--#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}"/>
+      <Setter Property="Background" Value="{DynamicResource EgtFloatingPanel.Static.Background}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource EgtFloatingPanel.Static.Border}"/>
    </Style>
 
    <!--#endregion EgtFloatingPanel -->
@@ -2849,8 +2629,8 @@
    <!--#region EgtHexagon-->
 
    <Style x:Key="EgtHexItem" TargetType="{x:Type EgtWPFLib5:EgtHexItem}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_CornflowerBlue}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Black}"/>
+      <Setter Property="Background" Value="{DynamicResource EgtHexItem.Static.Background}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource EgtHexItem.Static.Border}"/>
       <Setter Property="BorderThickness" Value="1.5"/>
       <Setter Property="HorizontalContentAlignment" Value="Center"/>
       <Setter Property="VerticalContentAlignment" Value="Center"/>
@@ -2868,7 +2648,9 @@
 
                   <Grid Name="hexContent"                              
                         Background="{TemplateBinding Background}"
-                        Margin="{TemplateBinding BorderThickness}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                        Margin="{TemplateBinding BorderThickness}" 
+                        VerticalAlignment="Stretch" 
+                        HorizontalAlignment="Stretch">
                      <Grid.Clip>
                         <MultiBinding Converter="{StaticResource ClipConverter}">
                            <Binding Path="ActualWidth" ElementName="hexContent"/>
@@ -2887,7 +2669,7 @@
                </Grid>
                <ControlTemplate.Triggers>
                   <Trigger Property="IsSelected" Value="True">
-                     <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Gold}"/>
+                     <Setter Property="BorderBrush" Value="{DynamicResource Border.EgtHexItem.Border}"/>
                   </Trigger>
                </ControlTemplate.Triggers>
             </ControlTemplate>
@@ -2919,7 +2701,8 @@
                   <Border BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}" 
                           Background="{TemplateBinding Background}" 
-                          Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
+                          Padding="{TemplateBinding Padding}" 
+                          SnapsToDevicePixels="True">
                      <ScrollViewer Focusable="False" 
                                    HorizontalScrollBarVisibility="Auto"
                                    VerticalScrollBarVisibility="Auto"
@@ -2986,7 +2769,7 @@
    </Style>
 
    <Style x:Key="FeatureInPartInRawPartList_Ellipse" TargetType="{x:Type Ellipse}">
-      <Setter Property="Fill" Value="{StaticResource BeamWall_Blue}"/>
+      <Setter Property="Fill" Value="{DynamicResource Ellipse.Static.Fill}"/>
       <Setter Property="HorizontalAlignment" Value="Center"/>
       <Setter Property="Width" Value="5"/>
       <Setter Property="Height" Value="5"/>
@@ -2999,7 +2782,7 @@
    <!--#region Rectangle-->
 
    <Style x:Key="EgtColorPicker_Rectangle" TargetType="{x:Type Rectangle}">
-      <Setter Property="Stroke" Value="{StaticResource BeamWall_Black}"/>
+      <Setter Property="Stroke" Value="{DynamicResource Rectangle.EgtColorPicker.Stroke}"/>
       <Setter Property="StrokeThickness" Value="0.5"/>
       <Setter Property="Width" Value="20"/>
       <Setter Property="Height" Value="20"/>
diff --git a/EgtBEAMWALL.Core/ThemesDataService/ThemesDataServiceM.vb b/EgtBEAMWALL.Core/ThemesDataService/ThemesDataServiceM.vb
new file mode 100644
index 00000000..8ed0ee2e
--- /dev/null
+++ b/EgtBEAMWALL.Core/ThemesDataService/ThemesDataServiceM.vb
@@ -0,0 +1,11 @@
+Public Class ThemesDataServiceM
+
+#Region "FIELDS & PROPERTIES"
+
+   Public Property Name As String
+   Public Property Path As String
+   Public Property AssemblyName As String
+
+#End Region    ' Fields & Properties
+
+End Class
diff --git a/EgtBEAMWALL.Core/ThemesDataService/ThemesDataServiceVM.vb b/EgtBEAMWALL.Core/ThemesDataService/ThemesDataServiceVM.vb
new file mode 100644
index 00000000..4b0ee030
--- /dev/null
+++ b/EgtBEAMWALL.Core/ThemesDataService/ThemesDataServiceVM.vb
@@ -0,0 +1,101 @@
+Imports System.Collections.ObjectModel
+Imports System.IO
+Imports System.Resources
+Imports System.Windows
+Imports EgtUILib
+
+Public Class ThemesDataServiceVM
+
+#Region "FIELDS & PROPERTIES"
+
+   Private ReadOnly m_Themes As New ObservableCollection(Of ThemesDataServiceM)()
+
+#End Region    ' Fields & Properties
+
+#Region "CONSTRUCTOR"
+
+   Sub New()
+      ScanResources()
+      ScanDisk(THEMES_FOLDER)
+   End Sub
+
+#End Region    ' Constructor
+
+#Region "METHODS"
+
+   ''' <summary>
+   ''' Restiusce il nome derivato dalla cartella
+   ''' </summary>
+   ''' <param name="path"></param>
+   ''' <param name="pathChar"></param>
+   ''' <param name="fileEnding"></param>
+   ''' <returns></returns>
+   Private Function GetNameFromPath(ByVal path As String, ByVal Optional pathChar As Char = "/"c, ByVal Optional fileEnding As String = "Theme.xaml") As String
+      Dim name As String = path.Substring(path.LastIndexOf(pathChar) + 1)
+      name = name.Substring(0, name.Length - fileEnding.Length)
+      name = Char.ToUpper(name(0)) & If(name.Length > 1, name.Substring(1), "")
+      Return name
+   End Function
+
+   ''' <summary>
+   ''' Ricerca i file dizionario contente il tema
+   ''' </summary>
+   ''' <param name="fileEnding"></param>
+   Private Sub ScanResources(ByVal Optional fileEnding As String = DICTIONARY_FILENAME)
+      Dim assembly = System.Reflection.Assembly.GetExecutingAssembly()
+      Dim resourceNames = assembly.GetManifestResourceNames()
+
+      For Each resourceName In resourceNames
+         Dim [set] As New ResourceSet(assembly.GetManifestResourceStream(resourceName))
+
+         For Each item As DictionaryEntry In [set]
+            Dim fileName As String = item.Key.ToString()
+
+            If fileName.ToLower().EndsWith(fileEnding.ToLower()) Then
+               m_Themes.Add(New ThemesDataServiceM() With {
+                   .Name = GetNameFromPath(fileName),
+                   .Path = "pack://application:,,,/WpfTheme;component/" & fileName
+               })
+            End If
+         Next
+      Next
+   End Sub
+
+   ''' <summary>
+   ''' Ricerca  i temi presenti nel programma
+   ''' </summary>
+   ''' <param name="relativePath"></param>
+   Private Sub ScanDisk(ByVal relativePath As String)
+      If Directory.Exists(AppDomain.CurrentDomain.BaseDirectory & relativePath) Then
+         Dim themeFiles = Directory.GetFiles(AppDomain.CurrentDomain.BaseDirectory & relativePath, "*" & DICTIONARY_FILENAME, SearchOption.AllDirectories)
+
+         For Each fileName In themeFiles
+            m_Themes.Add(New ThemesDataServiceM() With {
+                .Name = GetNameFromPath(fileName, "\"c),
+                .Path = fileName
+            })
+         Next
+      End If
+   End Sub
+
+   ''' <summary>
+   ''' Funzione che permette di selezionare e applicare il tema
+   ''' </summary>
+   ''' <param name="theme"></param>
+   Public Sub SetTheme(ByVal theme As ThemesDataServiceM)
+      If theme Is Nothing Then
+         EgtOutLog("Error setting theme: Attempting to set theme to null.")
+         Return
+      End If
+
+      Try
+         Dim uri As New Uri($"pack://application:,,,/{theme.AssemblyName};component/{theme.Path}", UriKind.Absolute)
+         Application.Current.Resources.MergedDictionaries(1).Source = uri
+      Catch ex As Exception
+         EgtOutLog("Error setting theme: " & ex.Message)
+      End Try
+   End Sub
+
+#End Region    ' Methods
+
+End Class
diff --git a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
index 696dbec8..703f266b 100644
--- a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
+++ b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.2.6")]
-[assembly: AssemblyFileVersion("3.1.2.6")]
+[assembly: AssemblyVersion("3.1.3.3")]
+[assembly: AssemblyFileVersion("3.1.3.3")]
diff --git a/EgtBEAMWALL.Optimizer/Application.xaml b/EgtBEAMWALL.Optimizer/Application.xaml
index 247fedc9..cefb16fe 100644
--- a/EgtBEAMWALL.Optimizer/Application.xaml
+++ b/EgtBEAMWALL.Optimizer/Application.xaml
@@ -6,7 +6,8 @@
    <Application.Resources>
       <ResourceDictionary>
          <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="pack://application:,,,/EgtBEAMWALL.Core;component/Themes/Generic.xaml"/>
+            <ResourceDictionary Source="pack://application:,,,/EgtBEAMWALL.Core;component/Themes/DarkDictionary.xaml"/>
+            <ResourceDictionary Source="pack://application:,,,/EgtBEAMWALL.Core;component/Themes/DefaultDictionary.xaml"/>
             <ResourceDictionary Source="Utility/Dictionary.xaml"/>
          </ResourceDictionary.MergedDictionaries>
       </ResourceDictionary>
diff --git a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb
index 33572cdd..d5feed73 100644
--- a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb
+++ b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb
@@ -791,6 +791,35 @@ Public Class BTLDataWndVM
       Next
    End Sub
 
+   Private Sub SaveInfo()
+      EgtSetInfo(m_nBTLInfoLayerId, AI_SETUP, m_SelStrategySetup)
+      Dim sInfo As String = String.Empty
+      For Each GeneralParameter In GeneralParametersList
+         Select Case GeneralParameter.GetType()
+            Case GetType(BooleanGenericParameter)
+               EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, BooleanGenericParameter).bValue)
+               EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge & "_FORCED", DirectCast(GeneralParameter, BooleanGenericParameter).bIsBooleanModify)
+            Case GetType(DoubleGenericParameter)
+               EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, DoubleGenericParameter).sValue)
+               EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge & "_FORCED", DirectCast(GeneralParameter, DoubleGenericParameter).bIsDoubleModify)
+            Case GetType(ComboGenericParameter)
+               EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, ComboGenericParameter).SelValue.sValue)
+               EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge & "_FORCED", DirectCast(GeneralParameter, ComboGenericParameter).bIsComboBoxModify)
+            Case GetType(StringGenericParameter)
+               EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, StringGenericParameter).sValue)
+               EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge & "_FORCED", DirectCast(GeneralParameter, StringGenericParameter).bIsStringModify)
+            Case GetType(ListGenericParameter)
+               For Each Item As ToolParameter In DirectCast(GeneralParameter, ListGenericParameter).ListValue
+                  If Item.bIsActive Then
+                     sInfo &= Item.sUUID & "," & Item.sName & ";"
+                     EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, sInfo)
+                  End If
+               Next
+               EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge & "_FORCED", DirectCast(GeneralParameter, ListGenericParameter).bIsListModify)
+         End Select
+      Next
+   End Sub
+
 #End Region    ' METHODS
 
 #Region "COMMANDS"
@@ -814,9 +843,8 @@ Public Class BTLDataWndVM
          Else
             Return
          End If
-      Else
-         SaveInfoBTL(ProjectManagerVM.CurrProd.nType)
       End If
+      SaveInfo()
       Map.refLeftPanelVM.ResetCalc()
       Map.refSceneHostVM.SaveProject()
       RaiseEvent m_CloseWindow(True)
diff --git a/EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb b/EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb
index 8c5de7ca..0a4ce707 100644
--- a/EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb
+++ b/EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb
@@ -1329,13 +1329,6 @@ Public Class BTLStructureVM
       GetMainPrivateProfileString(S_GENERAL, K_LASTUPDATEDIR, "", sDir)
       If bWithDlg Then
          ' apro finestra scelta file
-         'Dim BTLDlg As New Microsoft.Win32.OpenFileDialog() With {
-         '      .DefaultExt = ".btl",
-         '      .Filter = "BTL (*.btl)|*.btl" &
-         '                "|BTLX (*.btlx)|*.btlx",
-         '      .InitialDirectory = If(Directory.Exists(sDir), sDir, ""),
-         '      .CheckFileExists = True,
-         '      .ValidateNames = True}
          Dim BTLDlg As New EgtBEAMWALL.Core.EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
             .Title = EgtMsg(61834),
             .Filter = "BTL (*.btl)|*.btl" &
diff --git a/EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb b/EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb
index 5c6e5eb8..d55a9dfb 100644
--- a/EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb
+++ b/EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb
@@ -596,9 +596,8 @@ Public Class CALCPanelVM
       EgtOutLog("Creato progetto " & CurrPart.nPartId)
       If Request.ExecEnvironment <> EXECENVIRONMENTS.NULL Then
          If Not MyExecProcessManager.ExecProcessManagerList.ContainsKey(Request.ExecEnvironment) Then
-            Dim sLogMsg As String = "Errore! Tentativo di avvio di una verifica su un ambiente non inizilizzato (EgtEngineGroup)!"
-            EgtOutLog(sLogMsg)
-            MessageBox.Show(sLogMsg, "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+            EgtOutLog(EgtMsg(62588))
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62588), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
          Else
             MyExecProcessManager.ExecProcessManagerList(Request.ExecEnvironment).ArgumentsEnqueue(Request)
          End If
@@ -649,9 +648,8 @@ Public Class CALCPanelVM
       EgtOutLog("Creato progetto " & CurrMachGroup.Id)
       If Request.ExecEnvironment <> EXECENVIRONMENTS.NULL Then
          If Not MyExecProcessManager.ExecProcessManagerList.ContainsKey(Request.ExecEnvironment) Then
-            Dim sLogMsg As String = "Errore! Tentativo di avvio di una verifica su un ambiente non inizilizzato (EgtEngineGroup)!"
-            EgtOutLog(sLogMsg)
-            MessageBox.Show(sLogMsg, "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+            EgtOutLog(EgtMsg(62588))
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62588), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
          Else
             MyExecProcessManager.ExecProcessManagerList(Request.ExecEnvironment).ArgumentsEnqueue(Request)
          End If
diff --git a/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageVM.vb b/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageVM.vb
index 30a92425..a5b5d4a0 100644
--- a/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageVM.vb
+++ b/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageVM.vb
@@ -1,6 +1,7 @@
 Imports System.Collections.ObjectModel
 Imports System.IO
 Imports System.IO.Compression
+Imports System.Reflection
 Imports EgtBEAMWALL.Core
 Imports EgtUILib
 Imports EgtWPFLib5
@@ -263,6 +264,39 @@ Public Class ConfigurationPageVM
       End Set
    End Property
 
+   Private ReadOnly m_ThemesDataService As New ThemesDataServiceVM()
+
+   Private m_Themes As New ObservableCollection(Of ThemesDataServiceM)
+   Public Property Themes As ObservableCollection(Of ThemesDataServiceM)
+      Get
+         Return m_Themes
+      End Get
+      Set(value As ObservableCollection(Of ThemesDataServiceM))
+         If Not m_Themes.Equals(value) Then
+            m_Themes = value
+         End If
+      End Set
+   End Property
+
+   Private m_SelectedThema As Integer = 0
+   Private m_SelectedTheme As ThemesDataServiceM
+   Public Property SelectedTheme As ThemesDataServiceM
+      Get
+         Return m_SelectedTheme
+      End Get
+      Set(value As ThemesDataServiceM)
+         m_ThemesDataService.SetTheme(value)
+         m_SelectedTheme = value
+         ' salvo in file ini la scelta del tema corrente
+         Dim IndexThema As Integer = Themes.IndexOf(m_SelectedTheme)
+         If IndexThema < 0 Then
+            IndexThema = 0
+         End If
+         WriteMainPrivateProfileString(S_GENERAL, K_THEMA, IndexThema.ToString())
+         m_SelectedThema = IndexThema
+      End Set
+   End Property
+
    ' Definizione comandi
    Private m_cmdSave As ICommand
    Private m_cmdChooseExternalBackupFolderPath As ICommand
@@ -489,6 +523,54 @@ Public Class ConfigurationPageVM
       End Get
    End Property
 
+   Public ReadOnly Property TemaAdvert_Msg As String
+      Get
+         Return EgtMsg(110008)   ' Il nuovo tema diventerà corrente quando verrà selezionato.
+      End Get
+   End Property
+
+   Public ReadOnly Property Tema_Msg As String
+      Get
+         Return EgtMsg(110009)   ' Tema
+      End Get
+   End Property
+
+   Public ReadOnly Property Import_Msg As String
+      Get
+         Return EgtMsg(63042)
+      End Get
+   End Property
+
+   Public ReadOnly Property Backup_Msg As String
+      Get
+         Return EgtMsg(63022)
+      End Get
+   End Property
+
+   Public ReadOnly Property Restore_Msg As String
+      Get
+         Return EgtMsg(63025)
+      End Get
+   End Property
+
+   Public ReadOnly Property Remainder_Msg As String
+      Get
+         Return EgtMsg(63043)
+      End Get
+   End Property
+
+   Public ReadOnly Property External_Msg As String
+      Get
+         Return EgtMsg(63044)
+      End Get
+   End Property
+
+   Public ReadOnly Property BackupRestore_Msg As String
+      Get
+         Return EgtMsg(63045)
+      End Get
+   End Property
+
 #End Region    ' Messages
 
 #End Region    ' Fields & Properties
@@ -536,6 +618,9 @@ Public Class ConfigurationPageVM
       SetMachine_Visibility(Visibility.Collapsed)
       ' Recupero flag per verificare se fare solo l'importazione del btl o anche la verifica
       m_bVerifyImportBTL_IsChecked = GetMainPrivateProfileInt(S_GENERAL, K_VERIFYIMPORTBTL, 0) <> 0
+      ' imposto il tema 
+      m_SelectedThema = GetMainPrivateProfileInt(S_GENERAL, K_THEMA, 0)
+      LoadThemes()
       NotifyPropertyChanged(NameOf(bExternalBackupActive))
    End Sub
 
@@ -569,6 +654,37 @@ Public Class ConfigurationPageVM
       Return False
    End Function
 
+   ''' <summary>
+   ''' Seleziona il tema se presente
+   ''' </summary>
+   ''' <param name="IndexThema"></param>
+   Public Sub SetThema(IndexThema As Integer)
+      If m_Themes.Count > 0 Then
+         m_ThemesDataService.SetTheme(m_Themes(IndexThema))
+      End If
+   End Sub
+
+   ''' <summary>
+   ''' Fuzione che carica i temi del dizionario
+   ''' </summary>
+   Private Sub LoadThemes()
+      ' Popolo la lista temi
+      m_Themes.Add(New ThemesDataServiceM() With {
+                   .Name = "Default",
+                   .Path = "Themes/DefaultDictionary.xaml",
+                   .AssemblyName = "EgtBEAMWALL.Core"
+                   })
+      m_Themes.Add(New ThemesDataServiceM() With {
+                   .Name = "Dark",
+                   .Path = "Themes/DarkDictionary.xaml",
+                   .AssemblyName = "EgtBEAMWALL.Core"
+                   })
+      ' Seleziono elemento in ComboBox
+      m_SelectedTheme = m_Themes(m_SelectedThema)
+      ' Attivo il tema letto sopra
+      SetThema(m_SelectedThema)
+   End Sub
+
 #End Region ' Methods
 
 #Region "COMMANDS"
diff --git a/EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj b/EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj
index 3a5f9d67..b1634edd 100644
--- a/EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj
+++ b/EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj
@@ -1192,6 +1192,30 @@
   <ItemGroup>
     <Resource Include="Resources\NewPage\clock.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\EgtDialog\Desktop.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\EgtDialog\Download.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\EgtDialog\Windows.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\EgtDialog\HardDrive.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\EgtDialog\Content.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\EgtDialog\Details.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\EgtDialog\List.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\EgtDialog\Tiles.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Aedifica\Aedifica.OptimizerR32.exe
diff --git a/EgtBEAMWALL.Optimizer/FeatureListManager/FeatureListManagerV.xaml b/EgtBEAMWALL.Optimizer/FeatureListManager/FeatureListManagerV.xaml
index d1354403..ffcc8e54 100644
--- a/EgtBEAMWALL.Optimizer/FeatureListManager/FeatureListManagerV.xaml
+++ b/EgtBEAMWALL.Optimizer/FeatureListManager/FeatureListManagerV.xaml
@@ -6,21 +6,18 @@
    
    <Button Command="{Binding CopyFeature_Command}"
            ToolTip="{Binding CopyFeature_ToolTip}"
-           IsEnabled="{Binding CopyFeature_IsEnabled}"
            Style="{StaticResource LP_Button}">
       <Image Source="{StaticResource CopyFeature_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button Command="{Binding AddFeature_Command}"
            ToolTip="{Binding AddFeature_ToolTip}"
-           IsEnabled="{Binding AddFeature_IsEnabled}"
            Style="{StaticResource LP_Button}">
       <Image Source="{StaticResource AddFeature_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button Command="{Binding RemoveFeature_Command}"
            ToolTip="{Binding RemoveFeature_ToolTip}"
-           IsEnabled="{Binding RemoveFeature_IsEnabled}"
            Style="{StaticResource LP_Button}">
       <Image Source="{StaticResource Remove_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
diff --git a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/JsonParametersHelper.vb b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/JsonParametersHelper.vb
index bb46d1a6..23453e88 100644
--- a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/JsonParametersHelper.vb
+++ b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/JsonParametersHelper.vb
@@ -79,16 +79,16 @@ Public Class JsonParametersHelper
       m_sName = ProjectParameters.sName
       m_sNameNge = ProjectParameters.sNameNge
       Select Case ProjectParameters.GetType()
-         'Case GetType(BooleanStrategyParameter)
-         '   m_sValue = If(DirectCast(ProjectParameters, BooleanStrategyParameter).bValue, "true", "false")
+         Case GetType(BooleanGenericParameter)
+            m_sValue = If(DirectCast(ProjectParameters, BooleanGenericParameter).bValue, "true", "false")
          Case GetType(DoubleGenericParameter)
             m_sValue = DirectCast(ProjectParameters, DoubleGenericParameter).sValue
          Case GetType(ComboGenericParameter)
             m_sValue = DirectCast(ProjectParameters, ComboGenericParameter).SelValue.sValue
-            'Case GetType(StringStrategyParameter)
-            '   m_sValue = DirectCast(ProjectParameters, StringStrategyParameter).sValue
-            'Case GetType(ListStrategyParameter)
-            '   m_sValue = DirectCast(ProjectParameters, ListStrategyParameter).SelValue.sName
+         Case GetType(StringGenericParameter)
+            m_sValue = DirectCast(ProjectParameters, StringGenericParameter).sValue
+         Case GetType(ListGenericParameter)
+            m_sValue = DirectCast(ProjectParameters, ListGenericParameter).SelValue.sName
       End Select
    End Sub
 
diff --git a/EgtBEAMWALL.Optimizer/InputPwdWnd/InputPwdWndVM.vb b/EgtBEAMWALL.Optimizer/InputPwdWnd/InputPwdWndVM.vb
index 027a6471..07b6bd7a 100644
--- a/EgtBEAMWALL.Optimizer/InputPwdWnd/InputPwdWndVM.vb
+++ b/EgtBEAMWALL.Optimizer/InputPwdWnd/InputPwdWndVM.vb
@@ -1,4 +1,5 @@
 Imports EgtWPFLib5
+Imports EgtUILib
 
 Public Class InputPwdWndVM
    Inherits VMBase
@@ -19,7 +20,7 @@ Public Class InputPwdWndVM
 
    Public ReadOnly Property PasswordMsg As String
       Get
-         Return "Inserire Password: "
+         Return EgtMsg(63046)
       End Get
    End Property
 
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListVM.vb b/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListVM.vb
index b183aeff..d5916cd4 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListVM.vb
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListVM.vb
@@ -1,6 +1,5 @@
 Imports System.Collections.ObjectModel
 Imports System.Globalization
-Imports System.IO
 Imports EgtBEAMWALL.Core
 Imports EgtUILib
 Imports EgtWPFLib5
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListVM.vb b/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListVM.vb
index e46e6ec0..ad13c556 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListVM.vb
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListVM.vb
@@ -2,7 +2,6 @@
 Imports EgtBEAMWALL.Core
 Imports EgtUILib
 Imports EgtWPFLib5
-Imports System.IO
 
 Public Class FeatureInPartInRawPartListVM
    Inherits VMBase
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/PParameterListVM.vb b/EgtBEAMWALL.Optimizer/ItemParamList/PParameterListVM.vb
index 57fd751f..17b33551 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/PParameterListVM.vb
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/PParameterListVM.vb
@@ -2,7 +2,6 @@
 Imports EgtBEAMWALL.Core
 Imports EgtUILib
 Imports EgtWPFLib5
-Imports System.IO
 
 Public Class PParameterListVM
    Inherits VMBase
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListVM.vb b/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListVM.vb
index 35d44376..00a4ef1d 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListVM.vb
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListVM.vb
@@ -1,7 +1,6 @@
 Imports System.Collections.ObjectModel
 Imports EgtBEAMWALL.Core
 Imports EgtUILib
-Imports System.IO
 Imports EgtWPFLib5
 
 Public Class RawPartListVM
diff --git a/EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb b/EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb
index 082c4e33..774859b5 100644
--- a/EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb
+++ b/EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb
@@ -588,12 +588,12 @@ Public Class MainMenuVM
                Dim ProdId As Integer
                Select Case Map.refMainMenuVM.SelPage
                   Case Pages.VIEW
-                     ProdId = ProjectManagerVM.CurrProj.nProdId
+                     ProdId = ProjectManagerVM.CurrProd.nProjIdList(0)
                   Case Pages.MACHINING, Pages.OPTIMIZERPAGE
                      ProdId = ProjectManagerVM.CurrProd.nProdId
                End Select
                If ProdId = 0 Then
-                  AddDirectoryToZip(archive, ProjectManagerVM.CurrProd.sProdDirPath, "Projs\" & ProjectManagerVM.CurrProj.nProjId.ToString("0000"))
+                  AddDirectoryToZip(archive, ProjectManagerVM.CurrProd.sProdDirPath, "Projs\" & ProjectManagerVM.CurrProd.nProjIdList(0).ToString("0000"))
                Else
                   ProjFileMList = DbControllers.m_ProjController.GetByProdAsc(ProdId)
 
@@ -654,10 +654,22 @@ Public Class MainMenuVM
          '   mailmessage.Attachments.Add(New System.Net.Mail.Attachment(Map.refMainWindowVM.MainWindowM.sTempDir & "\Feedback.zip"))
          'End If
 
+         'Dim client As New SmtpClient()
+
          'Dim filename As String = Map.refMainWindowVM.MainWindowM.sTempDir & "\mymessage.eml"
          'If Not IsNothing(filename) Then
          '   Configuration.SaveEml(mailmessage, filename)
-         '   Process.Start(filename)
+         '   Dim flags = BindingFlags.Instance Or BindingFlags.NonPublic
+         '   Dim method As MethodInfo = GetType(SmtpClient).GetMethod("SendInternal", flags)
+         '   If method Is Nothing Then
+         '      method = GetType(SmtpClient).GetMethod("SendMail", flags)
+         '   End If
+         '   If method Is Nothing Then
+         '      Throw New Exception("Metodo interno SendInternal/SendMail non trovato. Versione .NET non compatibile.")
+         '   End If
+         '   method.Invoke(client, New Object() {mailmessage, filename})
+         '   Process.Start(New ProcessStartInfo(filename) With {.UseShellExecute = True})
+         '   'Process.Start(filename)
          'Else
          '   MessageBox.Show("Errore creazione file .eml")
          'End If
diff --git a/EgtBEAMWALL.Optimizer/Resources/EgtDialog/Content.png b/EgtBEAMWALL.Optimizer/Resources/EgtDialog/Content.png
new file mode 100644
index 00000000..09721268
Binary files /dev/null and b/EgtBEAMWALL.Optimizer/Resources/EgtDialog/Content.png differ
diff --git a/EgtBEAMWALL.Optimizer/Resources/EgtDialog/Desktop.png b/EgtBEAMWALL.Optimizer/Resources/EgtDialog/Desktop.png
new file mode 100644
index 00000000..f415d857
Binary files /dev/null and b/EgtBEAMWALL.Optimizer/Resources/EgtDialog/Desktop.png differ
diff --git a/EgtBEAMWALL.Optimizer/Resources/EgtDialog/Details.png b/EgtBEAMWALL.Optimizer/Resources/EgtDialog/Details.png
new file mode 100644
index 00000000..66930d7a
Binary files /dev/null and b/EgtBEAMWALL.Optimizer/Resources/EgtDialog/Details.png differ
diff --git a/EgtBEAMWALL.Optimizer/Resources/EgtDialog/Download.png b/EgtBEAMWALL.Optimizer/Resources/EgtDialog/Download.png
new file mode 100644
index 00000000..cc230a6c
Binary files /dev/null and b/EgtBEAMWALL.Optimizer/Resources/EgtDialog/Download.png differ
diff --git a/EgtBEAMWALL.Optimizer/Resources/EgtDialog/HardDrive.png b/EgtBEAMWALL.Optimizer/Resources/EgtDialog/HardDrive.png
new file mode 100644
index 00000000..d95cdc9a
Binary files /dev/null and b/EgtBEAMWALL.Optimizer/Resources/EgtDialog/HardDrive.png differ
diff --git a/EgtBEAMWALL.Optimizer/Resources/EgtDialog/List.png b/EgtBEAMWALL.Optimizer/Resources/EgtDialog/List.png
new file mode 100644
index 00000000..ff162192
Binary files /dev/null and b/EgtBEAMWALL.Optimizer/Resources/EgtDialog/List.png differ
diff --git a/EgtBEAMWALL.Optimizer/Resources/EgtDialog/Tiles.png b/EgtBEAMWALL.Optimizer/Resources/EgtDialog/Tiles.png
new file mode 100644
index 00000000..3ea4d66a
Binary files /dev/null and b/EgtBEAMWALL.Optimizer/Resources/EgtDialog/Tiles.png differ
diff --git a/EgtBEAMWALL.Optimizer/Resources/EgtDialog/Windows.png b/EgtBEAMWALL.Optimizer/Resources/EgtDialog/Windows.png
new file mode 100644
index 00000000..a9da6c67
Binary files /dev/null and b/EgtBEAMWALL.Optimizer/Resources/EgtDialog/Windows.png differ
diff --git a/EgtBEAMWALL.Optimizer/Resources/SplashScreen/SplashScreen.png b/EgtBEAMWALL.Optimizer/Resources/SplashScreen/SplashScreen.png
index 072b5eed..5c5c842e 100644
Binary files a/EgtBEAMWALL.Optimizer/Resources/SplashScreen/SplashScreen.png and b/EgtBEAMWALL.Optimizer/Resources/SplashScreen/SplashScreen.png differ
diff --git a/EgtBEAMWALL.Optimizer/SplashScreen/SplashScreenV.xaml b/EgtBEAMWALL.Optimizer/SplashScreen/SplashScreenV.xaml
index 22649192..e846f223 100644
--- a/EgtBEAMWALL.Optimizer/SplashScreen/SplashScreenV.xaml
+++ b/EgtBEAMWALL.Optimizer/SplashScreen/SplashScreenV.xaml
@@ -11,10 +11,9 @@
         Width="1000">
    
     <Grid>
-      <Image Source="/Resources/SplashScreen/SplashScreen.png" 
+      <Image Source="{StaticResource SplashScreen_Image}" 
              Style="{StaticResource BTLDataWnd_Image}"/>
       <TextBlock x:Name="VersionTxBl"
-                 Margin="71,402,0,0"
                  Style="{StaticResource SplashScreenV_TextBlock}"/>
    </Grid>
 </Window>
diff --git a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb
index a4446ba6..3451a389 100644
--- a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb
+++ b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb
@@ -61,7 +61,7 @@ Public Class StrategyManagerVM
 
             Dim sDefaultConfigFile As String = String.Empty
             Dim sTrimDefaultConfig As String = String.Empty
-            If GetMainPrivateProfileString(S_STRATEGY, K_DEFAULTCONFIG, "", sDefaultConfigFile) <> 0 Then
+            If EgtUILib.GetPrivateProfileString(S_STRATEGY, K_DEFAULTCONFIG, "", sDefaultConfigFile, Map.refMainWindowVM.MainWindowM.sDefaultConfig) <> 0 Then
                sTrimDefaultConfig = System.IO.Path.GetFileNameWithoutExtension(sDefaultConfigFile)
                If sTrimDefaultConfig = m_SelStrategySetup.sName Then
                   SetDefaultConfig_IsChecked(True)
@@ -71,6 +71,7 @@ Public Class StrategyManagerVM
             End If
 
          End If
+         SetSaveImage(MODIFY_IMAGE)
          NotifyPropertyChanged(NameOf(SelStrategySetup))
       End Set
    End Property
@@ -81,6 +82,7 @@ Public Class StrategyManagerVM
          EgtUILib.WritePrivateProfileString(S_STRATEGY, K_DEFAULTCONFIG, m_SelStrategySetup.sName, Map.refMainWindowVM.MainWindowM.sDefaultConfig)
          m_SelStrategySetup.Read()
       End If
+      SetSaveImage(MODIFY_IMAGE)
       NotifyPropertyChanged(NameOf(SelStrategySetup))
    End Sub
 
@@ -201,6 +203,7 @@ Public Class StrategyManagerVM
          If m_bDefaultConfig_IsChecked Then
             EgtUILib.WritePrivateProfileString(S_STRATEGY, K_DEFAULTCONFIG, m_SelStrategySetup.sName, Map.refMainWindowVM.MainWindowM.sDefaultConfig)
          End If
+         SetSaveImage(MODIFY_IMAGE)
          NotifyPropertyChanged(NameOf(DefaultConfig_IsChecked))
       End Set
    End Property
@@ -728,7 +731,6 @@ Public Class StrategySetup
          JsonProjectParameters.Add(ParamItem.Serialize())
       Next
 
-      ' Unisco i quattro json in un solo file
       Dim CombinedJson = New With {.GENERAL = JsonProjectParameters,
                                    .FEATURE = JsonFromStrategyManager}
 
diff --git a/EgtBEAMWALL.Optimizer/Utility/Configuration.vb b/EgtBEAMWALL.Optimizer/Utility/Configuration.vb
index 4f53b164..c88d9747 100644
--- a/EgtBEAMWALL.Optimizer/Utility/Configuration.vb
+++ b/EgtBEAMWALL.Optimizer/Utility/Configuration.vb
@@ -57,41 +57,6 @@ Module Configuration
       End Try
    End Sub
 
-   'Public Sub CreatePrintPDF(ActivePage As Integer, bPreview As Boolean)
-   '   LoadingWndHelper.OpenLoadingWnd(ActiveIds.CREATINGPDF, 1, "Creating PDF", "", 100)
-   '   Try
-   '      Dim doc As FlowDocument = PDFFlowHelper.CreateStatReportFlow(ActivePage, bPreview)
-
-   '      Dim sFileName As String = ""
-   '      If ActivePage = Pages.VIEW AndAlso Not bPreview Then
-   '         sFileName = ProjectManagerVM.CurrProd.sProdDirPath & "\Statistics.pdf"
-   '      ElseIf ActivePage = Pages.VIEW AndAlso bPreview Then
-   '         sFileName = Map.refMainWindowVM.MainWindowM.sTempDir & "\Statistics.pdf"
-   '      ElseIf ActivePage = Pages.MACHINING AndAlso Not bPreview Then
-   '         sFileName = ProjectManagerVM.CurrProd.sProdDirPath & "\" & ProjectManagerVM.CurrProd.sProdId & " - Statistics.pdf"
-   '      ElseIf ActivePage = Pages.MACHINING AndAlso bPreview Then
-   '         sFileName = Map.refMainWindowVM.MainWindowM.sTempDir & "\Statistics.pdf"
-   '         PrevSelect()
-   '      End If
-
-   '      Dim server As New LocalPrintServer()
-   '      Dim queue As PrintQueue = server.GetPrintQueue("Microsoft Print to PDF")
-
-   '      Dim writer As XpsDocumentWriter = PrintQueue.CreateXpsDocumentWriter(queue)
-   '      Dim paginator As DocumentPaginator = CType(doc, IDocumentPaginatorSource).DocumentPaginator
-
-   '      writer.Write(paginator)
-
-   '      'If Not bPreview AndAlso System.IO.File.Exists(sFileName) Then
-   '      '   Process.Start(sFileName)
-   '      'End If
-   '   Catch ex As Exception
-   '      EgtOutLog("Error generating PDF from FlowDocument: " & ex.ToString())
-   '   Finally
-   '      LoadingWndHelper.CloseLoadingWnd(ActiveIds.CREATINGPDF)
-   '   End Try
-   'End Sub
-
    Private Sub PrevSelect()
       ' ripristino selezione precedente
       Dim nCurrMachGroupId As Integer = EgtGetCurrMachGroup()
diff --git a/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml b/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml
index 288c2c56..3056232a 100644
--- a/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml
+++ b/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml
@@ -125,7 +125,7 @@
    <BitmapImage x:Key="RenderingWF_Image" UriSource="/Resources/ShowPanel/RenderingWF.png"/>
    <BitmapImage x:Key="RenderingHL_Image" UriSource="/Resources/ShowPanel/RenderingHL.png"/>
    <BitmapImage x:Key="RenderingSH_Image" UriSource="/Resources/ShowPanel/RenderingSH.png"/>
-   <BitmapImage x:Key="SplashScreen_Image" UriSource="/Resources/NewPage/LogoProvaStrategy.png"/>
+   <BitmapImage x:Key="SplashScreen_Image" UriSource="/Resources/SplashScreen/SplashScreen.png"/>
    <BitmapImage x:Key="CopyToClipboard_Image" UriSource="/Resources/Statistics/CopyToClipboard.png"/>
    <BitmapImage x:Key="PrintPDF_Image" UriSource="/Resources/Statistics/PrintPDF.png"/>
    <BitmapImage x:Key="PDFEditor_Image" UriSource="/Resources/PDFEditor/PrintPDF.png"/>
@@ -174,7 +174,7 @@
       <Setter Property="HorizontalAlignment" Value="Center"/>
       <Setter Property="FontSize" Value="15"/>
       <Setter Property="FontWeight" Value="Normal"/>
-      <Setter Property="FontFamily" Value="/Resources/Fonts/#Roboto"/>
+      <Setter Property="Margin" Value="71,402,0,0"/>
    </Style>
 
    <Style x:Key="BTLPartList_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundWhite_TextBlock}">
@@ -414,7 +414,7 @@
    <!--#region ParamStrategy-->
 
    <Style x:Key="UserAdmin_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ParamStrategy_TextBlock}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
+      <Setter Property="Foreground" Value="{DynamicResource TextBlock.UserAdmin.Foreground}"/>
       <Setter Property="Margin" Value="5,0,5,0"/>
    </Style>
 
@@ -424,7 +424,7 @@
 
    <Style x:Key="StrategyModify_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
       <Setter Property="Text" Value="&#9999;"/>
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+      <Setter Property="Foreground" Value="{DynamicResource TextBlock.StrategyModify.Foreground}"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="FontWeight" Value="Normal"/>
       <Setter Property="FontSize" Value="11"/>
@@ -442,7 +442,7 @@
 
    <Style x:Key="CALC_ROT_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
       <Setter Property="Text" Value="&#11119;"/>
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Blue}"/>
+      <Setter Property="Foreground" Value="{DynamicResource TextBlock.CALC_ROT.Foreground}"/>
       <Setter Property="HorizontalAlignment" Value="Center"/>
       <Setter Property="VerticalAlignment" Value="Top"/>
       <Setter Property="FontWeight" Value="SemiBold"/>
@@ -475,8 +475,8 @@
       <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}"/>
+            <Setter Property="Foreground" Value="{DynamicResource TextBlock.Prod.Foreground}"/>
+            <Setter Property="Background" Value="{DynamicResource TextBlock.Prod.Background}"/>
          </DataTrigger>
       </Style.Triggers>
    </Style>
@@ -490,14 +490,14 @@
       <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}"/>
+            <Setter Property="Foreground" Value="{DynamicResource TextBlock.Prod.Foreground}"/>
+            <Setter Property="Background" Value="{DynamicResource TextBlock.Prod.Background}"/>
          </DataTrigger>
       </Style.Triggers>
    </Style>
 
    <Style x:Key="RawPartList_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Orange}"/>
+      <Setter Property="Foreground" Value="{DynamicResource TextBlock.RawPartList.Foreground}"/>
       <Setter Property="TextAlignment" Value="Center"/>
       <Setter Property="FontWeight" Value="Bold"/>
       <Setter Property="FontSize" Value="20"/>
@@ -505,7 +505,7 @@
    </Style>
 
    <Style x:Key="ErrorMsg_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Red}"/>
+      <Setter Property="Foreground" Value="{DynamicResource TextBlock.Error.Foreground}"/>
       <Setter Property="HorizontalAlignment" Value="Center"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="FontSize" Value="13"/>
@@ -654,7 +654,7 @@
    </Style>
 
    <Style x:Key="PrManagerNew_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ProdManagerNew_Button}">
-      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="Background" Value="{DynamicResource Button.PrManagerNew.Background}"/>
       <Setter Property="BorderThickness" Value="0"/>
    </Style>
 
@@ -974,7 +974,7 @@
    </Style>
 
    <Style x:Key="ConfigProgram_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource MainMenu_ToggleButton}">
-      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="Background" Value="{DynamicResource ToggleButton.Static.Background}"/>
       <Setter Property="Width" Value="40"/>
    </Style>
 
@@ -997,13 +997,13 @@
                   <!-- Background -->
                   <Border x:Name="BackgroundBorder"
                           CornerRadius="10"
-                          Background="{StaticResource BeamWall_Alto}"
-                          BorderBrush="{StaticResource BeamWall_Gray}"
+                          Background="{DynamicResource Border.Parameter.Background}"
+                          BorderBrush="{DynamicResource Border.Parameter.Border}"
                           BorderThickness="1"/>
                   <!-- Slider Circle -->
                   <Ellipse x:Name="Slider"
                            Width="12" Height="12"
-                           Fill="{StaticResource BeamWall_Glacier}"
+                           Fill="{DynamicResource Ellipse.Parameter.Fill}"
                            Margin="3"
                            HorizontalAlignment="Left"
                            VerticalAlignment="Center"/>
@@ -1011,7 +1011,7 @@
                <ControlTemplate.Triggers>
                   <Trigger Property="IsChecked" Value="True">
                      <Setter TargetName="Slider" Property="HorizontalAlignment" Value="Right"/>
-                     <Setter TargetName="Slider" Property="Fill" Value="{StaticResource BeamWall_Kashmir}"/>
+                     <Setter TargetName="Slider" Property="Fill" Value="{DynamicResource Ellipse.ParameterIsChecked.Fill}"/>
                   </Trigger>
                </ControlTemplate.Triggers>
             </ControlTemplate>
@@ -1026,29 +1026,39 @@
       <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 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}"/>
+                     <Setter Property="Background" TargetName="border" Value="{DynamicResource Button.MouseOver.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource 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}"/>
+                     <Setter Property="Background" TargetName="border" Value="{DynamicResource Button.Pressed.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource 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}"/>
+                     <Setter Property="Background" TargetName="border" Value="{DynamicResource ButtonBasic.Static.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource 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="Background" TargetName="border" Value="{DynamicResource Button.Disabled.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource Button.Disabled.Border}"/>
+                     <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{DynamicResource Button.Disabled.Foreground}"/>
                      <Setter Property="OpacityMask" Value="#54707070"/>
                   </Trigger>
                </ControlTemplate.Triggers>
@@ -1059,8 +1069,8 @@
 
    <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="Background" Value="{DynamicResource Button.Static.Background}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource Button.Static.Border}"/>
       <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
       <Setter Property="BorderThickness" Value="1"/>
       <Setter Property="HorizontalContentAlignment" Value="Center"/>
@@ -1072,29 +1082,40 @@
       <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 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}"/>
+                     <Setter Property="Background" TargetName="border" Value="{DynamicResource Button.MouseOver.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource 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}"/>
+                     <Setter Property="Background" TargetName="border" Value="{DynamicResource Button.Pressed.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource 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}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource 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="Background" TargetName="border" Value="{DynamicResource Button.Disabled.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource Button.Disabled.Border}"/>
+                     <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{DynamicResource Button.Disabled.Foreground}"/>
                      <Setter Property="OpacityMask" Value="#54707070"/>
                   </Trigger>
                </ControlTemplate.Triggers>
@@ -1110,7 +1131,7 @@
    <!--#region ListBox-->
 
    <Style x:Key="NewAddFeature_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
-      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="Background" Value="{DynamicResource ListBox.NewAddFeature.Background}"/>
       <Setter Property="BorderThickness" Value="0"/>
       <Setter Property="Height" Value="585"/>
       <Setter Property="Width" Value="260"/>
@@ -1122,7 +1143,7 @@
                <Setter.Value>
                   <ControlTemplate TargetType="ListBoxItem">
                      <Border Background="{TemplateBinding Background}"
-                             BorderBrush="Transparent"
+                             BorderBrush="{DynamicResource Border.NewAddFeature.Border}"
                              BorderThickness="1">
                         <ContentPresenter />
                      </Border>
@@ -1131,13 +1152,13 @@
             </Setter>
             <Style.Triggers>
                <Trigger Property="IsSelected" Value="True">
-                  <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}"/>
-                  <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
+                  <Setter Property="Background" Value="{DynamicResource ListBox.NewAddFeatureIsSelected.Background}"/>
+                  <Setter Property="Foreground" Value="{DynamicResource ListBox.NewAddFeatureIsSelected.Foreground}"/>
                   <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="Background" Value="{DynamicResource ListBox.NewAddFeatureNotSelected.Background}"/>
+                  <Setter Property="Foreground" Value="{DynamicResource ListBox.NewAddFeatureNotSelected.Foreground}"/>
                   <Setter Property="FontWeight" Value="Normal"/>
                </Trigger>
             </Style.Triggers>
@@ -1152,7 +1173,7 @@
    </Style>
 
    <Style x:Key="MacroCustom_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
-      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="Background" Value="{DynamicResource ListBox.MacroCustom.Background}"/>
       <Setter Property="BorderThickness" Value="0"/>
       <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
       <Setter Property="Height" Value="610"/>
@@ -1161,7 +1182,7 @@
    </Style>
 
    <Style x:Key="MacroDefault_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
-      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="Background" Value="{DynamicResource ListBox.MacroDefault.Background}"/>
       <Setter Property="BorderThickness" Value="0"/>
       <Setter Property="HorizontalAlignment" Value="Left"/>
       <Setter Property="Height" Value="585"/>
@@ -1174,7 +1195,7 @@
    </Style>
 
    <Style x:Key="FeatureManager_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
-      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="Background" Value="{DynamicResource ListBox.FeatureManager.Background}"/>
       <Setter Property="BorderThickness" Value="0"/>
       <Setter Property="HorizontalContentAlignment" Value="Center"/>
       <Setter Property="Height" Value="82"/>
@@ -1183,7 +1204,7 @@
    </Style>
 
    <Style x:Key="LeftPanel_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
-      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="Background" Value="{DynamicResource ListBox.LeftPanel.Background}"/>
       <Setter Property="BorderThickness" Value="0"/>
       <Setter Property="HorizontalContentAlignment" Value="Center"/>
       <Setter Property="Height" Value="150"/>
@@ -1200,29 +1221,29 @@
             <ControlTemplate TargetType="{x:Type ListBoxItem}">
                <Border Name="_itemContainer"
                        Padding="0"
-                       BorderBrush="Transparent"
+                       BorderBrush="{DynamicResource Border.AlternationIndex.Border}"
                        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.Foreground" Value="{DynamicResource TextBlock.AlternationIndex_0.Foreground}"/>
                      <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 TargetName="_itemContainer" Property="BorderBrush" Value="{DynamicResource Border.ItemContainer.Border}" />
+                     <Setter TargetName="_itemContainer" Property="Background" Value="{DynamicResource Border.ItemContainer.Background}" />
+                     <Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlock.AlternationIndex_1.Foreground}"/>
                      <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 TargetName="_itemContainer" Property="BorderBrush" Value="{DynamicResource Border.ItemContainerIsSelected.Border}" />
+                     <Setter TargetName="_itemContainer" Property="Background" Value="{DynamicResource Border.ItemContainerIsSelected.Background}" />
+                     <Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlock.AlternationIndexIsSelected.Foreground}"/>
                      <Setter Property="TextBlock.TextAlignment" Value="Center"/>
                      <Setter Property="FontWeight" Value="Bold"/>
                      <Setter Property="TextBlock.FontSize" Value="14"/>
@@ -1239,10 +1260,10 @@
    </Style>
 
    <Style x:Key="Strategy_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
+      <Setter Property="Background" Value="{DynamicResource ListBox.Strategy.Background}"/>
       <Setter Property="BorderThickness" Value="0"/>
       <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}">
@@ -1250,7 +1271,7 @@
                <Setter.Value>
                   <ControlTemplate TargetType="ListBoxItem">
                      <Border Background="{TemplateBinding Background}"
-                             BorderBrush="Transparent"
+                             BorderBrush="{DynamicResource Border.Strategy.Border}"
                              BorderThickness="1">
                         <ContentPresenter />
                      </Border>
@@ -1259,13 +1280,13 @@
             </Setter>
             <Style.Triggers>
                <Trigger Property="IsSelected" Value="True">
-                  <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}"/>
-                  <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
+                  <Setter Property="Background" Value="{DynamicResource ListBox.StrategyIsSelected.Background}"/>
+                  <Setter Property="Foreground" Value="{DynamicResource ListBox.StrategyIsSelected.Foreground}"/>
                   <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="Background" Value="{DynamicResource ListBox.StrategyNoSelected.Background}"/>
+                  <Setter Property="Foreground" Value="{DynamicResource ListBox.StrategyNoSelected.Foreground}"/>
                   <Setter Property="FontWeight" Value="Normal"/>
                </Trigger>
             </Style.Triggers>
@@ -1285,7 +1306,7 @@
                <Setter.Value>
                   <ControlTemplate TargetType="ListBoxItem">
                      <Border Background="{TemplateBinding Background}"
-                             BorderBrush="Transparent"
+                             BorderBrush="{DynamicResource Border.BTL.Border}"
                              BorderThickness="1">
                         <ContentPresenter />
                      </Border>
@@ -1294,14 +1315,14 @@
             </Setter>
             <Style.Triggers>
                <Trigger Property="IsSelected" Value="True">
-                  <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}"/>
-                  <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
+                  <Setter Property="Background" Value="{DynamicResource ListBox.BTLIsSelected.Background}"/>
+                  <Setter Property="Foreground" Value="{DynamicResource ListBox.BTLIsSelected.Foreground}"/>
                   <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="Background" Value="{DynamicResource ListBox.BTLNoSelected.Background}"/>
+                  <Setter Property="Foreground" Value="{DynamicResource ListBox.BTLNoSelected.Foreground}"/>
                   <Setter Property="FontWeight" Value="SemiBold"/>
                   <Setter Property="FontSize" Value="12"/>
                </Trigger>
@@ -1320,7 +1341,7 @@
    </Style>
 
    <Style x:Key="ForcedStrategyBTL_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
-      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="Background" Value="{DynamicResource ListBox.ForcedStrategyBTL.Background}"/>
       <Setter Property="IsSynchronizedWithCurrentItem" Value="True"/>
       <Setter Property="HorizontalAlignment" Value="Left"/>
       <Setter Property="BorderThickness" Value="0"/>
@@ -1334,7 +1355,7 @@
                <Setter.Value>
                   <ControlTemplate TargetType="ListBoxItem">
                      <Border Background="{TemplateBinding Background}"
-                             BorderBrush="Transparent"
+                             BorderBrush="{DynamicResource Border.ForcedStrategyBTL.Border}"
                              BorderThickness="1">
                         <ContentPresenter />
                      </Border>
@@ -1343,13 +1364,13 @@
             </Setter>
             <Style.Triggers>
                <Trigger Property="IsSelected" Value="True">
-                  <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}"/>
-                  <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
+                  <Setter Property="Background" Value="{DynamicResource ListBox.ForcedStrategyBTLIsSelected.Background}"/>
+                  <Setter Property="Foreground" Value="{DynamicResource ListBox.ForcedStrategyBTLIsSelected.Foreground}"/>
                   <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="Background" Value="{DynamicResource ListBox.ForcedStrategyBTLNoSelected.Background}"/>
+                  <Setter Property="Foreground" Value="{DynamicResource ListBox.ForcedStrategyBTLNoSelected.Foreground}"/>
                   <Setter Property="FontWeight" Value="Normal"/>
                </Trigger>
             </Style.Triggers>
@@ -1372,7 +1393,7 @@
                <Setter.Value>
                   <ControlTemplate TargetType="ListBoxItem">
                      <Border Background="{TemplateBinding Background}"
-                             BorderBrush="Transparent"
+                             BorderBrush="{DynamicResource Border.BTLPart.Border}"
                              BorderThickness="1">
                         <ContentPresenter />
                      </Border>
@@ -1381,14 +1402,14 @@
             </Setter>
             <Style.Triggers>
                <Trigger Property="IsSelected" Value="True">
-                  <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}"/>
-                  <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
+                  <Setter Property="Background" Value="{DynamicResource ListBox.BTLPartIsSelected.Background}"/>
+                  <Setter Property="Foreground" Value="{DynamicResource ListBox.BTLPartIsSelected.Foreground}"/>
                   <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="Background" Value="{DynamicResource ListBox.BTLPartNoSelected.Background}"/>
+                  <Setter Property="Foreground" Value="{DynamicResource ListBox.BTLPartNoSelected.Foreground}"/>
                   <Setter Property="FontWeight" Value="SemiBold"/>
                   <Setter Property="FontSize" Value="12"/>
                </Trigger>
@@ -1660,9 +1681,9 @@
 
    <Style x:Key="Feature_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="Foreground" Value="{DynamicResource TabItem.Static.Foreground}"/>
+      <Setter Property="Background" Value="{DynamicResource TabItem.Static.Background}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource TabItem.Static.Border}"/>
       <Setter Property="Margin" Value="0"/>
       <Setter Property="Padding" Value="6,2,6,2"/>
       <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
@@ -1671,10 +1692,29 @@
          <Setter.Value>
             <ControlTemplate TargetType="{x:Type TabItem}">
                <Grid x:Name="templateRoot" SnapsToDevicePixels="true">
-                  <Border x:Name="mainBorder" Visibility="Collapsed" 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 x:Name="mainBorder" 
+                          Visibility="Collapsed" 
+                          Background="{TemplateBinding Background}" 
+                          BorderBrush="{TemplateBinding BorderBrush}" 
+                          BorderThickness="1,1,1,0" 
+                          Margin="2,0" 
+                          CornerRadius="4,4,0,0">
+                     <Border x:Name="innerBorder" 
+                             Background="{DynamicResource TabItem.Selected.Background}" 
+                             BorderBrush="{DynamicResource TabItem.Selected.Border}" 
+                             BorderThickness="1,1,1,0" 
+                             Margin="-1" Opacity="0" 
+                             CornerRadius="4,4,0,0"/>
                   </Border>
-                  <ContentPresenter x:Name="contentPresenter" Visibility="Collapsed" 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}}}"/>
+                  <ContentPresenter x:Name="contentPresenter" 
+                                    Visibility="Collapsed" 
+                                    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>
@@ -1682,8 +1722,8 @@
                         <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="Background" TargetName="mainBorder" Value="{DynamicResource TabItem.MouseOver.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{DynamicResource TabItem.MouseOver.Border}"/>
                      <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,0,1"/>
                      <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,0,1"/>
                   </MultiDataTrigger>
@@ -1692,8 +1732,8 @@
                         <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="Background" TargetName="mainBorder" Value="{DynamicResource TabItem.MouseOver.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{DynamicResource TabItem.MouseOver.Border}"/>
                      <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,0,1,1"/>
                      <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,0,1,1"/>
                   </MultiDataTrigger>
@@ -1702,8 +1742,8 @@
                         <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="Background" TargetName="mainBorder" Value="{DynamicResource TabItem.MouseOver.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{DynamicResource TabItem.MouseOver.Border}"/>
                      <Setter Property="BorderThickness" TargetName="innerBorder" Value="0,1,1,1"/>
                      <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,1,1,1"/>
                   </MultiDataTrigger>
@@ -1712,8 +1752,8 @@
                         <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="Background" TargetName="mainBorder" Value="{DynamicResource TabItem.MouseOver.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{DynamicResource TabItem.MouseOver.Border}"/>
                      <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,1,0"/>
                      <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,1,0"/>
                   </MultiDataTrigger>
@@ -1723,8 +1763,8 @@
                         <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="Background" TargetName="mainBorder" Value="{DynamicResource TabItem.Disabled.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{DynamicResource TabItem.Disabled.Border}"/>
                      <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,0,1"/>
                      <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,0,1"/>
                   </MultiDataTrigger>
@@ -1734,8 +1774,8 @@
                         <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="Background" TargetName="mainBorder" Value="{DynamicResource TabItem.Disabled.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{DynamicResource TabItem.Disabled.Border}"/>
                      <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,0,1,1"/>
                      <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,0,1,1"/>
                   </MultiDataTrigger>
@@ -1745,8 +1785,8 @@
                         <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="Background" TargetName="mainBorder" Value="{DynamicResource TabItem.Disabled.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{DynamicResource TabItem.Disabled.Border}"/>
                      <Setter Property="BorderThickness" TargetName="innerBorder" Value="0,1,1,1"/>
                      <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,1,1,1"/>
                   </MultiDataTrigger>
@@ -1756,8 +1796,8 @@
                         <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="Background" TargetName="mainBorder" Value="{DynamicResource TabItem.Disabled.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{DynamicResource TabItem.Disabled.Border}"/>
                      <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,1,0"/>
                      <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,1,0"/>
                   </MultiDataTrigger>
@@ -1850,17 +1890,9 @@
    <!--#region Optmizer-->
 
    <Style x:Key="Optimizer_TabControl" TargetType="{x:Type TabControl}">
+      <Setter Property="Background" Value="{DynamicResource TabControl.Optimizer.Background}"/>
       <Setter Property="TabStripPlacement" Value="Top"/>
       <Setter Property="Margin" Value="5,5,2.5,5"/>
-      <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>
@@ -1970,17 +2002,17 @@
    </Style>
 
    <Style x:Key="BTLTotParts_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_White}"/>
+      <Setter Property="Background" Value="{DynamicResource StackPanel.BTLTotParts.Background}"/>
       <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="Background" Value="{DynamicResource StackPanel.BTLTotTime.Background}"/>
       <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="Background" Value="{DynamicResource StackPanel.BTLRemainingTime.Background}"/>
       <Setter Property="Margin" Value="10,-1,0,10"/>
    </Style>
 
@@ -2006,7 +2038,7 @@
    <!--#region OptStatistics-->
 
    <Style x:Key="RawPart_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource OptStatistics_StackPanel}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_White}"/>
+      <Setter Property="Background" Value="{DynamicResource StackPanel.RawPart.Background}"/>
       <Setter Property="Orientation" Value="Vertical"/>
       <Setter Property="Margin" Value="-10,10,10,10"/>
    </Style>
@@ -2026,7 +2058,7 @@
    </Style>
 
    <Style x:Key="Statistics_StackPanel" TargetType="{x:Type StackPanel}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_White}"/>
+      <Setter Property="Background" Value="{DynamicResource StackPanel.Statistics.Background}"/>
       <Setter Property="Margin" Value="10"/>
    </Style>
 
@@ -2164,7 +2196,7 @@
    </Style>
 
    <Style x:Key="Statistics_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_Glacier}"/>
+      <Setter Property="Background" Value="{DynamicResource Grid.Statistics.Background}"/>
    </Style>
 
    <Style x:Key="Strategy_Grid" TargetType="{x:Type Grid}">
@@ -2172,7 +2204,7 @@
    </Style>
 
    <Style x:Key="UserAdmin_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_Kashmir}"/>
+      <Setter Property="Background" Value="{DynamicResource Grid.UserAdmin.Background}"/>
    </Style>
 
    <Style x:Key="ProjectParamters_Grid" TargetType="{x:Type Grid}">
@@ -2188,14 +2220,14 @@
    <!--#region GridSplitter-->
 
    <Style x:Key="Width_GridSplitter" TargetType="{x:Type GridSplitter}">
-      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="Background" Value="{DynamicResource GridSplitter.Width.Background}"/>
       <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="Background" Value="{DynamicResource GridSplitter.Height.Background}"/>
       <Setter Property="Height" Value="3"/>
       <Setter Property="HorizontalAlignment" Value="Stretch"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
@@ -2228,7 +2260,7 @@
    </Style>
 
    <Style x:Key="LeftPanel_UniformGrid" TargetType="{x:Type UniformGrid}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_LinkWater}"/>
+      <Setter Property="Background" Value="{DynamicResource UniformGrid.LeftPanel.Background}"/>
       <Setter Property="Height" Value="200"/>
       <Setter Property="Margin" Value="0,10,10,10"/>
    </Style>
@@ -2296,13 +2328,13 @@
    <!--#endregion NoHeader-->
 
    <Style x:Key="PDFPreview_GroupBox" TargetType="{x:Type GroupBox}">
-      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+      <Setter Property="Foreground" Value="{DynamicResource GroupBox.PDFPreview.Foreground}"/>
       <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="Foreground" Value="{DynamicResource GroupBox.MachinePanel.Foreground}"/>
       <Setter Property="VerticalAlignment" Value="Top"/>
    </Style>
 
@@ -2353,7 +2385,7 @@
    </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="Background" Value="{DynamicResource ScrollViewer.Static.Background}"/>
       <Setter Property="PanningMode" Value="Both"/>
    </Style>
 
@@ -2376,8 +2408,8 @@
    <!--#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}"/>
+      <Setter Property="Background" Value="{DynamicResource ToolTip.PParameters.Background}"/>
+      <Setter Property="Foreground" Value="{DynamicResource ToolTip.PParameters.Foreground}"/>
    </Style>
 
    <!--#endregion ToolTip-->
@@ -2433,8 +2465,8 @@
    <!--#region TotalTime_Border-->
    
    <Style x:Key="TotalTime_Border" TargetType="{x:Type Border}">
-      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Kashmir}"/>
-      <Setter Property="Background" Value="{StaticResource BeamWall_Kashmir}"/>
+      <Setter Property="Background" Value="{DynamicResource Border.TotalTime.Background}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource Border.TotalTime.Border}"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="BorderThickness" Value="2"/>
       <Setter Property="Padding" Value="20,2,20,2"/>
@@ -2449,8 +2481,8 @@
    <!--#endregion TotalTime_Border-->
 
    <Style x:Key="DoneTime_Border" TargetType="{x:Type Border}">
-      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_FruitSalad}"/>
-      <Setter Property="Background" Value="{StaticResource BeamWall_FruitSalad}"/>
+      <Setter Property="Background" Value="{DynamicResource Border.DoneTime.Background}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource Border.DoneTime.Border}"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="BorderThickness" Value="2"/>
       <Setter Property="Padding" Value="20,2,20,2"/>
@@ -2459,8 +2491,8 @@
    </Style>
 
    <Style x:Key="RemainingTime_Border" TargetType="{x:Type Border}">
-      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_FuelYellow}"/>
-      <Setter Property="Background" Value="{StaticResource BeamWall_FuelYellow}"/>
+      <Setter Property="Background" Value="{DynamicResource Border.RemainingTime.Background}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource Border.RemainingTime.Border}"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="BorderThickness" Value="2"/>
       <Setter Property="Padding" Value="20,2,20,2"/>
@@ -2469,57 +2501,57 @@
    </Style>
 
    <Style x:Key="ProjectTypeWndV_Border" TargetType="{x:Type Border}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_White}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_DarkGray}"/>
+      <Setter Property="Background" Value="{DynamicResource Border.ProjectType.Background}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource Border.ProjectType.Border}"/>
       <Setter Property="BorderThickness" Value="1"/>
       <Setter Property="Margin" Value="5"/>
    </Style>
 
    <Style x:Key="AddFeatureWnd_Border" TargetType="{x:Type Border}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_Kashmir}"/>
+      <Setter Property="Background" Value="{DynamicResource Border.AddFeature.Background}"/>
       <Setter Property="CornerRadius" Value="4,0,0,4"/>
       <Setter Property="Margin" Value="0,2,0,2"/>
    </Style>
 
    <Style x:Key="PRCList_Border" TargetType="{x:Type Border}">
-      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Glacier}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource Border.PRC.Border}"/>
       <Setter Property="CornerRadius" Value="4,0,0,4"/>
       <Setter Property="BorderThickness" Value="2,2,0,2"/>
    </Style>
 
    <Style x:Key="Custom_Border" TargetType="{x:Type Border}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_Kashmir}"/>
+      <Setter Property="Background" Value="{DynamicResource Border.Custom.Background}"/>
       <Setter Property="BorderThickness" Value="0,2,0,2"/>
    </Style>
 
    <Style x:Key="MacroCustomList_Border" TargetType="{x:Type Border}">
-      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Glacier}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource Border.MacroCustom.Border}"/>
       <Setter Property="CornerRadius" Value="0"/>
       <Setter Property="BorderThickness" Value="0,2,0,2"/>
    </Style>
 
    <Style x:Key="Default_Border" TargetType="{x:Type Border}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_Kashmir}"/>
+      <Setter Property="Background" Value="{DynamicResource Border.Default.Background}"/>
       <Setter Property="CornerRadius" Value="0,4,4,0"/>
       <Setter Property="Margin" Value="0,2,0,2"/>
       <Setter Property="Padding" Value="0,10,0,10"/>
    </Style>
 
    <Style x:Key="MacroDefaultList_Border" TargetType="{x:Type Border}">
-      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Glacier}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource Border.MacroDefault.Border}"/>
       <Setter Property="CornerRadius" Value="0,4,4,0"/>
       <Setter Property="BorderThickness" Value="0,2,2,2"/>
    </Style>
 
    <Style x:Key="BTLPartManager_Border" TargetType="{x:Type Border}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Teal}"/>
+      <Setter Property="Background" Value="{DynamicResource Border.BTLPartManager.Background}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource Border.BTLPartManager.Border}"/>
       <Setter Property="CornerRadius" Value="5"/>
       <Setter Property="BorderThickness" Value="2"/>
    </Style>
 
    <Style x:Key="SetUp_Border" TargetType="{x:Type Border}">
-      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Indigo}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource Border.SetUp.Border}"/>
       <Setter Property="BorderThickness" Value="1"/>
       <Setter Property="Visibility" Value="Hidden"/>
       <Style.Triggers>
@@ -2532,8 +2564,8 @@
    <!--#region TopPanel_Border-->
    
    <Style x:Key="TopPanel_Border" TargetType="{x:Type Border}">
-      <Setter Property="Background" Value="{StaticResource BeamWall_Alto}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Gray}"/>
+      <Setter Property="Background" Value="{DynamicResource Border.TopPanel.Background}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource Border.TopPanel.Border}"/>
       <Setter Property="CornerRadius" Value="5"/>
       <Setter Property="BorderThickness" Value="2"/>
    </Style>
@@ -2639,7 +2671,7 @@
    </Style>
 
    <Style x:Key="UpdateBTL_Ellipse" TargetType="{x:Type Ellipse}" BasedOn="{StaticResource FeatureInPartInRawPartList_Ellipse}">
-      <Setter Property="Fill" Value="{StaticResource BeamWall_Red}"/>
+      <Setter Property="Fill" Value="{DynamicResource Ellipse.UpdateBTL.Fill}"/>
    </Style>
 
    <!--#endregion FeatureInPartInRawPartList-->
diff --git a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb
index a06235fb..a88f52ac 100644
--- a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb	
+++ b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb	
@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("3.1.2.6")>
-<Assembly: AssemblyFileVersion("3.1.2.6")>
+<Assembly: AssemblyVersion("3.1.3.3")>
+<Assembly: AssemblyFileVersion("3.1.3.3")>