diff --git a/Constants/ConstGen.vb b/Constants/ConstGen.vb
index a42f7ea..0c173b2 100644
--- a/Constants/ConstGen.vb
+++ b/Constants/ConstGen.vb
@@ -11,6 +11,7 @@
    Public Const K_LOCKID As String = "LockId"
    Public Const K_KEY As String = "Key"
    Public Const K_NESTKEY As String = "NestKey"
+   Public Const K_LASTEXSTENSIONSAVE As String = "LastExstensionSave"
 
    ' File di log generale
    Public Const GENLOG_FILE_NAME As String = "EgtStone3D#.txt"
diff --git a/Constants/ConstIni.vb b/Constants/ConstIni.vb
index cea1ee9..26d65ee 100644
--- a/Constants/ConstIni.vb
+++ b/Constants/ConstIni.vb
@@ -11,6 +11,7 @@
    Public Const K_LASTNGEDIR As String = "LastNgeDir"
    Public Const K_LASTIMPDIR As String = "LastImpDir"
    Public Const K_CNCFLAG As String = "CncFlag"
+   Public Const K_TOPPANEL As String = "TopPanelThema"
 
    Public Const S_PRINTING3D As String = "3dPrinting"
    Public Const S_COLORS As String = "Colors"
diff --git a/EgtColorPicker/EgtColorPickerV.xaml b/EgtColorPicker/EgtColorPickerV.xaml
index 75f5f42..0594089 100644
--- a/EgtColorPicker/EgtColorPickerV.xaml
+++ b/EgtColorPicker/EgtColorPickerV.xaml
@@ -20,7 +20,7 @@
             <Grid.RowDefinitions>
                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
-            <TabControl>
+            <TabControl Style="{StaticResource TreeView_TC}">
                <TabItem Header="{Binding BasicColor_Msg}">
                   <Grid Style="{StaticResource EgtColorPicker_Grid}">
                      <Grid.RowDefinitions>
diff --git a/EgtManageFileDialog/EgtManageFileDialogV.xaml b/EgtManageFileDialog/EgtManageFileDialogV.xaml
index 5b6d413..c7f3e72 100644
--- a/EgtManageFileDialog/EgtManageFileDialogV.xaml
+++ b/EgtManageFileDialog/EgtManageFileDialogV.xaml
@@ -82,7 +82,8 @@
                         ItemsSource="{Binding SelTreeItem.FolderList, Mode=TwoWay}"
                         SelectedItem="{Binding ItemSelected, Mode=TwoWay}"
                         Margin="5,5,5,5"
-                        BorderBrush="{StaticResource EgalwareWhite}"
+                        BorderThickness="0"
+                        Background="{DynamicResource ListBox.Static.Background}"
                         IsSynchronizedWithCurrentItem="True">
                   <ListBox.Resources>
                      <DataTemplate x:Key="ListTemplateView" 
diff --git a/EgtStone3D.vbproj b/EgtStone3D.vbproj
index 26144dc..755fb7e 100644
--- a/EgtStone3D.vbproj
+++ b/EgtStone3D.vbproj
@@ -161,9 +161,18 @@
     </Compile>
     <Compile Include="ThemesDataService\ThemesDataServiceM.vb" />
     <Compile Include="ThemesDataService\ThemesDataServiceVM.vb" />
+    <Compile Include="TopPanel\TopPanel1V.xaml.vb">
+      <DependentUpon>TopPanel1V.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="TopPanel\TopPanelButton1V.xaml.vb">
+      <DependentUpon>TopPanelButton1V.xaml</DependentUpon>
+    </Compile>
     <Compile Include="TopPanel\TopPanelButtonV.xaml.vb">
       <DependentUpon>TopPanelButtonV.xaml</DependentUpon>
     </Compile>
+    <Compile Include="TopPanel\TopPanelHome1V.xaml.vb">
+      <DependentUpon>TopPanelHome1V.xaml</DependentUpon>
+    </Compile>
     <Compile Include="TopPanel\TopPanelHomeV.xaml.vb">
       <DependentUpon>TopPanelHomeV.xaml</DependentUpon>
     </Compile>
@@ -260,10 +269,22 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="TopPanel\TopPanel1V.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="TopPanel\TopPanelButton1V.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="TopPanel\TopPanelButtonV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="TopPanel\TopPanelHome1V.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="TopPanel\TopPanelHomeV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/MainWindow/MainWindowM.vb b/MainWindow/MainWindowM.vb
index f4380da..e226aa9 100644
--- a/MainWindow/MainWindowM.vb
+++ b/MainWindow/MainWindowM.vb
@@ -284,6 +284,9 @@ Public Class MainWindowM
       ' Leggo tema corrente
       Dim sThema As String = String.Empty
       GetMainPrivateProfileString(S_GENERAL, K_THEMA, "", sThema)
+      ' Leggo tema toppanel corrente
+      Dim sThemaTopPanel As String = String.Empty
+      GetMainPrivateProfileString(S_GENERAL, K_TOPPANEL, "", sThemaTopPanel)
       ' Impostazione direttorio delle risorse
       m_sResourcesDir = m_sDataRoot & "\" & RESOURCES_DIR
       ' Info su opzioni chiave
diff --git a/MainWindow/MainWindowVM.vb b/MainWindow/MainWindowVM.vb
index bc91366..87f70d9 100644
--- a/MainWindow/MainWindowVM.vb
+++ b/MainWindow/MainWindowVM.vb
@@ -41,10 +41,10 @@ Public Class MainWindowVM
       Map.BeginInit(Me)
       ' Creo Model della MainWindow
       m_MainWindowM = New MainWindowM
-      ' Creo Option
-      m_OptionWindowVM = New OptionWindowVM
       ' Creo SceneButton
       m_SceneButtonVM = New SceneButtonVM
+      ' Creo Option
+      m_OptionWindowVM = New OptionWindowVM
    End Sub
 
 #End Region    ' Constructor
diff --git a/OptionsWindow/OptionModule.vb b/OptionsWindow/OptionModule.vb
index a8573bf..bcc033b 100644
--- a/OptionsWindow/OptionModule.vb
+++ b/OptionsWindow/OptionModule.vb
@@ -38,6 +38,9 @@ Friend Module OptionModule
    ' selezione tema (default=0)
    Friend m_SelectedThema As Integer = 0
 
+   ' selezione tema toppanel (default=0)
+   Friend m_SelectedThemaTopPanel As Integer = 0
+
 #End Region    ' Fields & Properties
 
 #Region "METHODS"
@@ -54,7 +57,7 @@ Friend Module OptionModule
       End While
       If nIndex = 1 Then
          EgtOutLog("Error missing languages section in Config.ini")
-         MessageBox.Show("Error : missing languages informations", "EgtCAM5", MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtStone3D.EgtMessageBoxV.Show(Application.Current.MainWindow, "Error : missing languages informations", "EgtCAM5", MessageBoxButton.OK, MessageBoxImage.Error)
          End
       End If
       ' Inizializzo la lingua corrente
@@ -103,6 +106,8 @@ Friend Module OptionModule
       m_LineDistanceColor = DstLnColor
       ' imposto il tema 
       m_SelectedThema = GetMainPrivateProfileInt(S_GENERAL, K_THEMA, 0)
+      ' imposto il tema toppanel
+      m_SelectedThemaTopPanel = GetMainPrivateProfileInt(S_GENERAL, K_TOPPANEL, 0)
    End Sub
 
 #End Region    ' Methods
diff --git a/OptionsWindow/OptionWindowV.xaml b/OptionsWindow/OptionWindowV.xaml
index cb60b0d..b1bfa7c 100644
--- a/OptionsWindow/OptionWindowV.xaml
+++ b/OptionsWindow/OptionWindowV.xaml
@@ -8,6 +8,9 @@
                           Style="{StaticResource OptionWindowV_Window}">
 
    <Grid>
+      <Grid.Resources>
+         <EgtStone3D:SelectedComboConverter x:Key="SelectedComboConverter"/>
+      </Grid.Resources>
       <Grid.RowDefinitions>
          <RowDefinition Height="1*"/>
          <RowDefinition Height="Auto"/>
@@ -23,13 +26,17 @@
                   <RowDefinition Height="Auto"/>
                   <RowDefinition Height="Auto"/>
                   <RowDefinition Height="Auto"/>
+                  <RowDefinition Height="Auto"/>
                </Grid.RowDefinitions>
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="1*"/>
                </Grid.ColumnDefinitions>
-               <GroupBox Header="{Binding CurrentLanguageMsg}"
-                         Style="{StaticResource OptionWindow_GrBx}">
+               <GroupBox Style="{StaticResource OptionWindow_GrBx}">
+                  <GroupBox.Header>
+                     <TextBlock Text="{Binding CurrentLanguageMsg}"
+                                Style="{StaticResource OptionWindow_TxBl}"/>
+                  </GroupBox.Header>
                   <UniformGrid Rows="2" 
                                Style="{StaticResource OptionWindow_UniformGrid}">
                      <ComboBox DisplayMemberPath="Name"
@@ -40,9 +47,12 @@
                                 Style="{StaticResource OptionWindow_TxBl}"/>
                   </UniformGrid>
                </GroupBox>
-               <GroupBox Grid.Column="1" 
-                         Header="{Binding TemaMsg}"
+               <GroupBox Grid.Column="1"
                          Style="{StaticResource OptionWindow_GrBx}">
+                  <GroupBox.Header>
+                     <TextBlock Text="{Binding TemaMsg}"
+                                Style="{StaticResource OptionWindow_TxBl}"/>
+                  </GroupBox.Header>
                   <UniformGrid Rows="2" 
                                Style="{StaticResource OptionWindow_UniformGrid}">
                   <ComboBox DisplayMemberPath="Name"
@@ -57,13 +67,30 @@
                             Grid.ColumnSpan="2"
                             Columns="2"
                             Style="{StaticResource Background_UniformGrid}">
+                  <TextBlock Text="Scelta Top Panel" 
+                             Style="{StaticResource Background_TxBl}"/>
+                  <ComboBox ItemsSource="{Binding ListTopPanel, Mode=OneWay}"  
+                            SelectedItem="{Binding SelectedTopPanel}"
+                            Style="{StaticResource OptionWindow_CmBx}">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <TextBlock Text="{Binding Converter={StaticResource SelectedComboConverter}}"
+                                      Style="{StaticResource Background_TxBl}"/>
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
+               </UniformGrid>
+               <UniformGrid Grid.Row="2"
+                            Grid.ColumnSpan="2"
+                            Columns="2"
+                            Style="{StaticResource Background_UniformGrid}">
                   <TextBlock Text="{Binding TopSceneBackgroundMsg}" 
                              Style="{StaticResource Background_TxBl}"/>
                   <Button Background="{Binding TopSceneBackground}"
                           Command="{Binding TopSceneBackground_Command}"
                           Style="{StaticResource EgtWPFLib5_InputButton}"/>
                </UniformGrid>
-               <UniformGrid Grid.Row="2"
+               <UniformGrid Grid.Row="3"
                             Grid.ColumnSpan="2"
                             Columns="2"
                             Style="{StaticResource SceneBackground_UniformGrid}">
@@ -73,7 +100,7 @@
                           Command="{Binding BotSceneBackground_Command}"
                           Style="{StaticResource EgtWPFLib5_InputButton}"/>
                </UniformGrid>
-               <UniformGrid Grid.Row="3"
+               <UniformGrid Grid.Row="4"
                             Grid.ColumnSpan="2"
                             Columns="2"
                             Style="{StaticResource SceneBackground_UniformGrid}">
@@ -83,7 +110,7 @@
                           Command="{Binding GridColor_Command}"
                           Style="{StaticResource EgtWPFLib5_InputButton}"/>
                </UniformGrid>
-               <Grid Grid.Row="4"
+               <Grid Grid.Row="5"
                      Grid.RowSpan="2"
                      Grid.ColumnSpan="2">
                   <Grid.ColumnDefinitions>
@@ -108,7 +135,7 @@
                             Style="{StaticResource ColorLine_ChBx}"/>
                </Grid>
 
-               <Grid Grid.Row="6"
+               <Grid Grid.Row="7"
                      Grid.ColumnSpan="2"
                      Style="{StaticResource Licence_Grid}">
                   <Button Content="{Binding UpdateLicenceMsg}" 
diff --git a/OptionsWindow/OptionWindowVM.vb b/OptionsWindow/OptionWindowVM.vb
index 61b5678..4a760a6 100644
--- a/OptionsWindow/OptionWindowVM.vb
+++ b/OptionsWindow/OptionWindowVM.vb
@@ -2,6 +2,7 @@
 Imports EgtUILib
 Imports EgtWPFLib5
 Imports System.IO
+Imports System.Drawing
 
 Public Class OptionWindowVM
    Inherits VMBase
@@ -28,30 +29,30 @@ Public Class OptionWindowVM
       End Set
    End Property
 
-   Public ReadOnly Property TopSceneBackground As Brush
+   Public ReadOnly Property TopSceneBackground As System.Windows.Media.Brush
       Get
-         Return New SolidColorBrush(Color.FromArgb(CByte(255),
-                                                   CByte(OptionModule.m_TopSceneBackground.R),
-                                                   CByte(OptionModule.m_TopSceneBackground.G),
-                                                   CByte(OptionModule.m_TopSceneBackground.B)))
+         Return New SolidColorBrush(System.Windows.Media.Color.FromArgb(CByte(255),
+                                                                        CByte(OptionModule.m_TopSceneBackground.R),
+                                                                        CByte(OptionModule.m_TopSceneBackground.G),
+                                                                        CByte(OptionModule.m_TopSceneBackground.B)))
       End Get
    End Property
 
-   Public ReadOnly Property BotSceneBackground As Brush
+   Public ReadOnly Property BotSceneBackground As System.Windows.Media.Brush
       Get
-         Return New SolidColorBrush(Color.FromArgb(CByte(255),
-                                                   CByte(OptionModule.m_BotSceneBackground.R),
-                                                   CByte(OptionModule.m_BotSceneBackground.G),
-                                                   CByte(OptionModule.m_BotSceneBackground.B)))
+         Return New SolidColorBrush(System.Windows.Media.Color.FromArgb(CByte(255),
+                                                                        CByte(OptionModule.m_BotSceneBackground.R),
+                                                                        CByte(OptionModule.m_BotSceneBackground.G),
+                                                                        CByte(OptionModule.m_BotSceneBackground.B)))
       End Get
    End Property
 
-   Public ReadOnly Property GridColor As Brush
+   Public ReadOnly Property GridColor As System.Windows.Media.Brush
       Get
-         Return New SolidColorBrush(Color.FromArgb(CByte(255),
-                                                   CByte(OptionModule.m_GridColor.R),
-                                                   CByte(OptionModule.m_GridColor.G),
-                                                   CByte(OptionModule.m_GridColor.B)))
+         Return New SolidColorBrush(System.Windows.Media.Color.FromArgb(CByte(255),
+                                                                        CByte(OptionModule.m_GridColor.R),
+                                                                        CByte(OptionModule.m_GridColor.G),
+                                                                        CByte(OptionModule.m_GridColor.B)))
       End Get
    End Property
 
@@ -102,11 +103,34 @@ Public Class OptionWindowVM
          If IndexThema < 0 Then
             IndexThema = 0
          End If
-         WriteMainPrivateProfileString(S_GENERAL, K_THEMA, IndexThema.ToString)
+         WriteMainPrivateProfileString(S_GENERAL, K_THEMA, IndexThema.ToString())
          m_SelectedThema = IndexThema
       End Set
    End Property
 
+   Private m_ListTopPanel As New ObservableCollection(Of Integer)({0, 1})
+   Public Property ListTopPanel As ObservableCollection(Of Integer)
+      Get
+         Return m_ListTopPanel
+      End Get
+      Set(value As ObservableCollection(Of Integer))
+         m_ListTopPanel = value
+      End Set
+   End Property
+
+   Private m_SelectedTopPanel As Integer = 0
+   Public Property SelectedTopPanel As Integer
+      Get
+         Return m_SelectedTopPanel
+      End Get
+      Set(value As Integer)
+         m_SelectedTopPanel = value
+         Map.refSceneButtonVM.SetSelTopPanel(value)
+         WriteMainPrivateProfileString(S_GENERAL, K_TOPPANEL, m_SelectedTopPanel.ToString())
+         m_SelectedThemaTopPanel = m_SelectedTopPanel
+      End Set
+   End Property
+
    ' Definizione comandi
    Private m_cmdTopSceneBackground As ICommand
    Private m_cmdBotSceneBackground As ICommand
@@ -194,20 +218,8 @@ Public Class OptionWindowVM
 #Region "CONSTRUCTOR"
 
    Sub New()
-      ' Popolo la lista temi
-      m_Themes.Add(New ThemesDataServiceM() With {
-                   .Name = "Default",
-                   .Path = "Utility/EgtStone3DDictionary.xaml"
-                   })
-      m_Themes.Add(New ThemesDataServiceM() With {
-                   .Name = "Dark",
-                   .Path = "Utility/EgtStone3DDarkDictionary.xaml"
-                   })
-      ' Seleziono elemento in ComboBox
-      m_SelectedTheme = m_Themes(OptionModule.m_SelectedThema)
-      ' Attivo il tema letto sopra
-      SetThema(OptionModule.m_SelectedThema)
-
+      LoadThemes()
+      LoadTopPanelThemes()
    End Sub
 
 #End Region    ' Constructor
@@ -261,6 +273,35 @@ Public Class OptionWindowVM
       End If
    End Sub
 
+   ''' <summary>
+   ''' Funzione che carica i temi del top panel
+   ''' </summary>
+   Private Sub LoadTopPanelThemes()
+      ' Seleziono elemento in ComboBox
+      m_SelectedTopPanel = m_ListTopPanel(OptionModule.m_SelectedThemaTopPanel)
+      ' Attivo il tema toppanel letto sopra
+      If Not IsNothing(Map.refSceneButtonVM) Then Map.refSceneButtonVM.SetSelTopPanel(OptionModule.m_SelectedThemaTopPanel)
+   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 = "Utility/EgtStone3DDictionary.xaml"
+                   })
+      m_Themes.Add(New ThemesDataServiceM() With {
+                   .Name = "Dark",
+                   .Path = "Utility/EgtStone3DDarkDictionary.xaml"
+                   })
+      ' Seleziono elemento in ComboBox
+      m_SelectedTheme = m_Themes(OptionModule.m_SelectedThema)
+      ' Attivo il tema letto sopra
+      SetThema(OptionModule.m_SelectedThema)
+   End Sub
+
 #End Region    ' Methods
 
 #Region "COMMANDS"
@@ -399,3 +440,34 @@ Public Class OptionWindowVM
 #End Region    ' Commands
 
 End Class
+
+Public Class SelectedComboConverter
+   Implements IValueConverter
+
+   ''' <summary>
+   ''' Permette la conversione del tema del top panel selezionato in testo
+   ''' </summary>
+   ''' <param name="value"></param>
+   ''' <param name="targetType"></param>
+   ''' <param name="parameter"></param>
+   ''' <param name="culture"></param>
+   ''' <returns></returns>
+   Public Function Convert(value As Object, targetType As Type, parameter As Object, culture As System.Globalization.CultureInfo) As Object Implements IValueConverter.Convert
+      If TypeOf value Is Integer Then
+         Select Case value
+            Case 0
+               Return "Top Panel"
+            Case 1
+               Return "Top Panel 1"
+            Case Else
+               Return Nothing
+         End Select
+      Else
+         Return Nothing
+      End If
+   End Function
+
+   Public Function ConvertBack(value As Object, targetType As Type, parameter As Object, culture As System.Globalization.CultureInfo) As Object Implements IValueConverter.ConvertBack
+      Throw New NotImplementedException()
+   End Function
+End Class
diff --git a/Rotate/RotateVM.vb b/Rotate/RotateVM.vb
index 613f509..51e7dd4 100644
--- a/Rotate/RotateVM.vb
+++ b/Rotate/RotateVM.vb
@@ -5,33 +5,6 @@ Public Class RotateVM
 
 #Region "FIELDS & PROPERTIES"
 
-#Region "Messages"
-
-   Public ReadOnly Property TopBar_Msg0 As String
-      Get
-         Return EgtMsg(110024)
-      End Get
-   End Property
-
-   Public ReadOnly Property TopBar_Msg1 As String
-      Get
-         Return EgtMsg(110005)
-      End Get
-   End Property
-   Public ReadOnly Property TopBar_Msg2 As String
-      Get
-         Return EgtMsg(110022)
-      End Get
-   End Property
-
-   Public ReadOnly Property Testo_Msg As String
-      Get
-         Return EgtMsg(110006)
-      End Get
-   End Property
-
-#End Region    ' Messages
-
    Private m_MsgList As New List(Of String)({TopBar_Msg0, TopBar_Msg1, TopBar_Msg2})
    Public ReadOnly Property MsgList As List(Of String)
       Get
@@ -64,6 +37,33 @@ Public Class RotateVM
       End Set
    End Property
 
+#Region "Messages"
+
+   Public ReadOnly Property TopBar_Msg0 As String
+      Get
+         Return EgtMsg(110024)
+      End Get
+   End Property
+
+   Public ReadOnly Property TopBar_Msg1 As String
+      Get
+         Return EgtMsg(110005)
+      End Get
+   End Property
+   Public ReadOnly Property TopBar_Msg2 As String
+      Get
+         Return EgtMsg(110022)
+      End Get
+   End Property
+
+   Public ReadOnly Property Testo_Msg As String
+      Get
+         Return EgtMsg(110006)
+      End Get
+   End Property
+
+#End Region    ' Messages
+
 #End Region    ' Fields & Properties
 
 #Region "CONSTRUCTOR"
diff --git a/SVG/SVGV.xaml.vb b/SVG/SVGV.xaml.vb
index 4dbdb11..fc01c3b 100644
--- a/SVG/SVGV.xaml.vb
+++ b/SVG/SVGV.xaml.vb
@@ -1,6 +1,4 @@
-Imports EgtWPFLib5
-
-Public Class SVGV
+Public Class SVGV
 
 #Region "FIELDS & PROPERTIES"
 
diff --git a/SceneButton/SceneButtonV.xaml b/SceneButton/SceneButtonV.xaml
index 432332d..6f8fb07 100644
--- a/SceneButton/SceneButtonV.xaml
+++ b/SceneButton/SceneButtonV.xaml
@@ -1,10 +1,24 @@
-<DockPanel x:Class="SceneButtonV" 
-           xmlns:EgtStone3D="clr-namespace:EgtStone3D"
+<DockPanel x:Class="SceneButtonV"
            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-           xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+           xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+           xmlns:EgtStone3D="clr-namespace:EgtStone3D"
+           xmlns:EgtWPF5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
 
    <Grid DockPanel.Dock="Top">
-      <EgtStone3D:TopPanelV DataContext="{StaticResource TopPanelVM}"/>
+      <TabControl SelectedIndex="{Binding SelTopPanel}"
+                  Style="{StaticResource TopPanel_TabControl}">
+         <TabControl.ItemContainerStyle>
+            <Style TargetType="{x:Type TabItem}">
+               <Setter Property="Visibility" Value="Collapsed"/>
+            </Style>
+         </TabControl.ItemContainerStyle>
+         <TabItem Header="TOP_PANEL">
+            <EgtStone3D:TopPanelV DataContext="{StaticResource TopPanelVM}"/>
+         </TabItem>
+         <TabItem Header="TOP_PANEL1">
+            <EgtStone3D:TopPanel1V DataContext="{StaticResource TopPanelVM}"/>
+         </TabItem>
+      </TabControl>
    </Grid>
 
    <!--TOP-->
@@ -92,7 +106,7 @@
    </ItemsControl>
 
    <!--RIGHT-->
-   <ItemsControl ItemsSource="{Binding RightListBtn}" 
+   <ItemsControl ItemsSource="{Binding RightListBtn}"
                  Style="{StaticResource RightList_ItemsControl}">
       <ItemsControl.ItemsPanel>
          <ItemsPanelTemplate>
diff --git a/SceneButton/SceneButtonVM.vb b/SceneButton/SceneButtonVM.vb
index 8219aeb..7bacaf5 100644
--- a/SceneButton/SceneButtonVM.vb
+++ b/SceneButton/SceneButtonVM.vb
@@ -8,6 +8,7 @@ Public Class SceneButtonVM
 
    Public Shared m_nIndexList As Integer = 0
    Public Shared m_nIndexList_1 As Integer = 0
+   Public Shared m_nIndexList_2 As Integer = 0
 
    Private m_TopListBtn As New List(Of SceneBtn)
    Public Property TopListBtn As List(Of SceneBtn)
@@ -69,6 +70,25 @@ Public Class SceneButtonVM
       End Set
    End Property
 
+   Friend Enum TopPanel As Integer
+      TOP_PANEL = 0
+      TOP_PANEL_1 = 1
+   End Enum
+
+   Private m_SelSelTopPanel As TopPanel = TopPanel.TOP_PANEL
+   Public Property SelTopPanel As Integer
+      Get
+         Return m_SelSelTopPanel
+      End Get
+      Set(value As Integer)
+         m_SelSelTopPanel = value
+      End Set
+   End Property
+   Friend Sub SetSelTopPanel(TopOtion As TopPanel)
+      m_SelSelTopPanel = TopOtion
+      NotifyPropertyChanged(NameOf(SelTopPanel))
+   End Sub
+
 #End Region ' Fields & Properties
 
 #Region "CONSTRUCTOR"
diff --git a/SceneHost/MySceneHostVM.vb b/SceneHost/MySceneHostVM.vb
index 5f9fdf7..d2262a7 100644
--- a/SceneHost/MySceneHostVM.vb
+++ b/SceneHost/MySceneHostVM.vb
@@ -55,14 +55,14 @@ Public Class MySceneHostVM
          ' Box di avviso chiave mancante : "Chiave non presente. \n Inserirla e riavviare il programma."  "Errore"
          Dim sText As String = EgtMsg(10102) & vbCrLf & EgtMsg(10103)
          Dim sTitle As String = EgtMsg(10101)
-         MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtStone3D.EgtMessageBoxV.Show(Application.Current.MainWindow, sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
          ' Altrimenti manca la licenza
       Else
          EgtOutLog("Problems with Licence")
          ' Box di avviso licenza con problemi : "Programma senza licenza. \n Caricala e riavvia il programma."  "Errore"
          Dim sText As String = EgtMsg(10105) & vbCrLf & EgtMsg(10106)
          Dim sTitle As String = EgtMsg(10101)
-         If MessageBox.Show(sText, sTitle, MessageBoxButton.OKCancel, MessageBoxImage.Error) = MessageBoxResult.OK Then
+         If EgtStone3D.EgtMessageBoxV.Show(Application.Current.MainWindow, sText, sTitle, MessageBoxButton.OKCancel, MessageBoxImage.Error) = MessageBoxResult.OK Then
             ' Apro dialogo per richiesta file licenza
             Dim LicDlg As New EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
                .Title = EgtMsg(110026),
@@ -73,7 +73,7 @@ Public Class MySceneHostVM
             If LicDlg.ShowDialog() = Windows.Forms.DialogResult.OK Then
                ' Recupero il direttorio del file
                'Dim sDir As String = Path.GetDirectoryName(LicDlg.FileName)
-               Dim sDir As String = LicDlg.FileName
+               Dim sDir As String = Path.GetDirectoryName(LicDlg.FileName)
                ' Se il file non è già nel direttorio di configurazione lo copio
                If Not String.Equals(Path.GetFullPath(sDir), Path.GetFullPath(Map.refMainWindowVM.MainWindowM.sConfigDir), StringComparison.OrdinalIgnoreCase) Then
                   Try
@@ -148,9 +148,9 @@ Public Class MySceneHostVM
       Dim nMinLineSStep As Integer = GetMainPrivateProfileInt(S_GRID, K_MINLINESSTEP, 1)
       Dim nMajLineSStep As Integer = GetMainPrivateProfileInt(S_GRID, K_MAJLINESSTEP, 10)
       Dim nExtSStep As Integer = GetMainPrivateProfileInt(S_GRID, K_EXTSSTEP, 50)
-      Dim MinLnColor As Color3d = New Color3d(160, 160, 160)
+      Dim MinLnColor As New Color3d(160, 160, 160)
       GetMainPrivateProfileColor(S_GRID, K_MINLNCOLOR, MinLnColor)
-      Dim MajLnColor As Color3d = New Color3d(160, 160, 160)
+      Dim MajLnColor As New Color3d(160, 160, 160)
       GetMainPrivateProfileColor(S_GRID, K_MAJLNCOLOR, MajLnColor)
       EgtSetGridFrame(Frame3d.GLOB)
       If bMmUnits Then
@@ -176,8 +176,6 @@ Public Class MySceneHostVM
       EgtSetTextureMaxLinPixels(nTxrMaxLinPix)
       ' tipo snap point
       MainScene.SetSnapPointType(SP.PT_GRID)
-      ' nascondo input box
-      'Map.refFreeContourInputVM.ResetInputBox()
    End Sub
 
    Public Overrides Function OpenProject(sFilePath As String) As Boolean
@@ -218,7 +216,7 @@ Public Class MySceneHostVM
       If String.IsNullOrWhiteSpace(sCurrFile) Or EgtGetFileType(sCurrFile) <> FT.NGE Then
          bOk = SaveAsProject()
       Else
-         If Path.GetExtension(sCurrFile) = ".nge" Then
+         If Path.GetExtension(sCurrFile) = ".wme" Then
             EgtSetCurrFilePath(sCurrFile)
          Else
             EgtSetCurrFilePath(sCurrFile)
@@ -251,7 +249,7 @@ Public Class MySceneHostVM
       End If
       Dim sFilterIndex As String = String.Empty
       If String.IsNullOrWhiteSpace(sFilterIndex) Then
-         GetMainPrivateProfileString(S_GENERAL, "LastExstensionSave", "1", sFilterIndex)
+         GetMainPrivateProfileString(S_GENERAL, K_LASTEXSTENSIONSAVE, "1", sFilterIndex)
       End If
       Dim nFilterIndex As Integer = 1
       If IsNumeric(sFilterIndex) Then
@@ -264,7 +262,7 @@ Public Class MySceneHostVM
                    "|vme files (*.vme)|*.vme",
          .FilterIndex = nFilterIndex,
          .FileName = sFile,
-         .InitialDirectory = "C:\EgtData\EgtStone3D\Temp",
+         .InitialDirectory = sDir,
          .ValidateNames = False,
          .OverwritePrompt = True,
          .Mode = 1
diff --git a/SceneHost/SceneHostV.xaml.vb b/SceneHost/SceneHostV.xaml.vb
index 2612558..01c6695 100644
--- a/SceneHost/SceneHostV.xaml.vb
+++ b/SceneHost/SceneHostV.xaml.vb
@@ -92,7 +92,7 @@ Public Class SceneHostV
 
       'debug
       'EgtOpenFile("D:\\Temp\\marmo\\Vein3D\\piano_PREassemlbaggio.vme")
-      EgtOpenFile("D:\\Temp\\marmo\\Vein3D\\prima paretina.nge")
+      'EgtOpenFile("D:\\Temp\\marmo\\Vein3D\\prima paretina.nge")
       'EgtOpenFile("D:\\Temp\\marmo\\Vein3D\\FOO.nge")
       'debug
 
diff --git a/TopPanel/TopPanel1V.xaml b/TopPanel/TopPanel1V.xaml
new file mode 100644
index 0000000..417be2c
--- /dev/null
+++ b/TopPanel/TopPanel1V.xaml
@@ -0,0 +1,48 @@
+<TabControl x:Class="TopPanel1V"
+            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+            xmlns:EgtStone3D="clr-namespace:EgtStone3D"
+            xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+            SelectedIndex="{Binding SelTopOption}"
+            Style="{StaticResource TopPanel_TabControl}">
+   <TabControl.ItemContainerStyle>
+      <Style TargetType="{x:Type TabItem}">
+         <Setter Property="Visibility" Value="Collapsed"/>
+      </Style>
+   </TabControl.ItemContainerStyle>
+   
+   <TabItem Header="{Binding HomeTab_Msg}">
+      <Grid Style="{StaticResource TopPanel_Grid}">
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+         </Grid.RowDefinitions>
+         <EgtStone3D:TopPanelHome1V DataContext="{StaticResource TopPanelVM}"/>
+         <Separator Grid.Row="1" 
+                    Style="{StaticResource TopPanel1_Separator}"/>
+         <ItemsControl Grid.Row="2" 
+                       ItemsSource="{Binding TopPanelListGroupBtn}">
+            <ItemsControl.ItemsPanel>
+               <ItemsPanelTemplate>
+                  <WrapPanel Orientation="Horizontal"/>
+               </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+            <ItemsControl.Resources>
+               <DataTemplate DataType="{x:Type EgtStone3D:GroupSceneBtn}">
+                  <EgtStone3D:TopPanelButton1V/>
+               </DataTemplate>
+            </ItemsControl.Resources>
+         </ItemsControl>
+      </Grid>
+   </TabItem>
+   <TabItem Header="{Binding Parametrico_Msg}">
+      <Grid Style="{StaticResource TopPanel_Grid}">
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+         </Grid.RowDefinitions>
+      </Grid>
+   </TabItem>
+   
+</TabControl>
diff --git a/TopPanel/TopPanel1V.xaml.vb b/TopPanel/TopPanel1V.xaml.vb
new file mode 100644
index 0000000..011f643
--- /dev/null
+++ b/TopPanel/TopPanel1V.xaml.vb
@@ -0,0 +1,3 @@
+Public Class TopPanel1V
+
+End Class
diff --git a/TopPanel/TopPanelButton1V.xaml b/TopPanel/TopPanelButton1V.xaml
new file mode 100644
index 0000000..ddd7bec
--- /dev/null
+++ b/TopPanel/TopPanelButton1V.xaml
@@ -0,0 +1,36 @@
+<Grid x:Class="TopPanelButton1V"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:EgtStone3D="clr-namespace:EgtStone3D" 
+      Style="{StaticResource TopPanelButton_Grid}">
+   <Grid.RowDefinitions>
+      <RowDefinition Height="Auto"/>
+   </Grid.RowDefinitions>
+
+   <ItemsControl ItemsSource="{Binding TopPanelListBtn}"
+                 Style="{DynamicResource TopList_ItemsControl}">
+      <ItemsControl.ItemsPanel>
+         <ItemsPanelTemplate>
+            <WrapPanel Orientation="Horizontal"/>
+         </ItemsPanelTemplate>
+      </ItemsControl.ItemsPanel>
+      <ItemsControl.Resources>
+         <DataTemplate DataType="{x:Type EgtStone3D:_Button}">
+            <Button ToolTip="{Binding Name}"
+                    IsEnabled="{Binding IsEnabled}"
+                    Command="{Binding CmdBtn}"
+                    Style="{DynamicResource SceneButton}">
+               <EgtStone3D:SVGV FileSource="{Binding Img}"/>
+            </Button>
+         </DataTemplate>
+         <DataTemplate DataType="{x:Type EgtStone3D:_ToggleButton}">
+            <ToggleButton Command="{Binding CmdBtn}" 
+                          IsChecked="{Binding IsChecked}" 
+                          Style="{DynamicResource SceneToggleButton}">
+               <EgtStone3D:SVGV FileSource="{Binding Img}"/>
+            </ToggleButton>
+         </DataTemplate>
+      </ItemsControl.Resources>
+   </ItemsControl>
+
+</Grid>
diff --git a/TopPanel/TopPanelButton1V.xaml.vb b/TopPanel/TopPanelButton1V.xaml.vb
new file mode 100644
index 0000000..3cb98ab
--- /dev/null
+++ b/TopPanel/TopPanelButton1V.xaml.vb
@@ -0,0 +1,24 @@
+Public Class TopPanelButton1V
+
+#Region "FIELDS & PROPERTIES"
+
+   Private m_SceneButtonVM As SceneButtonVM
+
+#End Region    ' Fields & Properties
+
+#Region "CONSTRUCTOR"
+
+   Sub New()
+
+      ' La chiamata è richiesta dalla finestra di progettazione.
+      InitializeComponent()
+
+      ' Aggiungere le eventuali istruzioni di inizializzazione dopo la chiamata a InitializeComponent().
+      m_SceneButtonVM = Map.refSceneButtonVM
+      Me.DataContext = m_SceneButtonVM.TopPanelListGroupBtn(SceneButtonVM.m_nIndexList_2)
+      SceneButtonVM.m_nIndexList_2 += 1
+   End Sub
+
+#End Region    ' Constructor
+
+End Class
diff --git a/TopPanel/TopPanelButtonV.xaml b/TopPanel/TopPanelButtonV.xaml
index fa417af..4181550 100644
--- a/TopPanel/TopPanelButtonV.xaml
+++ b/TopPanel/TopPanelButtonV.xaml
@@ -2,8 +2,8 @@
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:EgtStone3D="clr-namespace:EgtStone3D" 
-      Margin="15,-10,0,0"
-      x:Name="TopPanelButtonGrid">
+      x:Name="TopPanelButtonGrid"
+      Style="{StaticResource TopPanelButton_Grid}">
    <Grid.Resources>
       <EgtStone3D:SplitConverter x:Key="SplitConverter"/>
    </Grid.Resources>
@@ -14,11 +14,11 @@
    <TextBlock Name="IndexTopList" Visibility="Collapsed"/>
 
    <ItemsControl ItemsSource="{Binding TopPanelListBtn}"
-                 Style="{DynamicResource TopList_ItemsControl}">
+                 Style="{DynamicResource TopPanelButton_ItemsControl}">
       <ItemsControl.ItemsPanel>
          <ItemsPanelTemplate>
-            <WrapPanel Orientation="Horizontal"
-                       Width="{Binding ActualWidth,ElementName=TopPanelButtonGrid, Converter={StaticResource SplitConverter},ConverterParameter={x:Reference IndexTopList}}"/>
+            <WrapPanel Width="{Binding ActualWidth,ElementName=TopPanelButtonGrid, Converter={StaticResource SplitConverter},ConverterParameter={x:Reference IndexTopList}}"
+                       Style="{StaticResource TopPanel_WrapPanel}"/>
          </ItemsPanelTemplate>
       </ItemsControl.ItemsPanel>
       <ItemsControl.Resources>
@@ -27,7 +27,6 @@
                     IsEnabled="{Binding IsEnabled}"
                     Command="{Binding CmdBtn}"
                     Style="{DynamicResource SceneButton}">
-               <!--<Image Source="{Binding Img}"/>-->
                <EgtStone3D:SVGV FileSource="{Binding Img}"/>
             </Button>
          </DataTemplate>
@@ -35,7 +34,6 @@
             <ToggleButton Command="{Binding CmdBtn}" 
                           IsChecked="{Binding IsChecked}" 
                           Style="{DynamicResource SceneToggleButton}">
-               <!--<Image Source="{Binding Img}"/>-->
                <EgtStone3D:SVGV FileSource="{Binding Img}"/>
             </ToggleButton>
          </DataTemplate>
diff --git a/TopPanel/TopPanelHome1V.xaml b/TopPanel/TopPanelHome1V.xaml
new file mode 100644
index 0000000..bb058e6
--- /dev/null
+++ b/TopPanel/TopPanelHome1V.xaml
@@ -0,0 +1,46 @@
+<Grid x:Class="TopPanelHome1V"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+   <Grid.ColumnDefinitions>
+      <ColumnDefinition Width="Auto"/>
+      <ColumnDefinition Width="Auto"/>
+      <ColumnDefinition Width="Auto"/>
+      <ColumnDefinition Width="Auto"/>
+      <ColumnDefinition Width="Auto"/>
+      <ColumnDefinition Width="Auto"/>
+      <ColumnDefinition Width="Auto"/>
+      <ColumnDefinition Width="Auto"/>
+      <ColumnDefinition Width="Auto"/>
+   </Grid.ColumnDefinitions>
+   <Button Command="{Binding NewFileCmd}"
+           Style="{DynamicResource ProjManager1_Btn}">
+      <Image Source="/Resources/ProjManager/newfile.png"
+             Stretch="Uniform"/>
+   </Button>
+   <Button Grid.Column="1"
+           Command="{Binding SaveFileCmd}"
+           Style="{DynamicResource TopPanel1_Btn}">
+      <Image Source="/Resources/ProjManager/save.png"
+             Stretch="Uniform"/>
+   </Button>
+   <Button Grid.Column="2"
+           IsEnabled="True"
+           Command="{Binding SaveAsCommand}"
+           Style="{DynamicResource TopPanel1_Btn}">
+      <Image Source="/Resources/ProjManager/saveas.png"
+             Stretch="Uniform"/>
+   </Button>
+   <Button Grid.Column="3"
+           Command="{Binding OpenFileCmd}"
+           Tag="{Binding}"
+           Style="{DynamicResource TopPanel1_Btn}">
+      <Image Source="/Resources/ProjManager/folder.png"
+             Stretch="Uniform"/>
+   </Button>
+   <Button Grid.Column="4"
+           Command="{Binding OptionsCommand}"
+           Style="{DynamicResource TopPanel1_Btn}">
+      <Image Source="/Resources/ProjManager/settings.png"
+             Stretch="Uniform"/>
+   </Button>
+</Grid>
diff --git a/TopPanel/TopPanelHome1V.xaml.vb b/TopPanel/TopPanelHome1V.xaml.vb
new file mode 100644
index 0000000..a8becc7
--- /dev/null
+++ b/TopPanel/TopPanelHome1V.xaml.vb
@@ -0,0 +1,3 @@
+Public Class TopPanelHome1V
+
+End Class
diff --git a/TopPanel/TopPanelListV.xaml b/TopPanel/TopPanelListV.xaml
index 5c8ee43..63a7495 100644
--- a/TopPanel/TopPanelListV.xaml
+++ b/TopPanel/TopPanelListV.xaml
@@ -13,7 +13,7 @@
       <ColumnDefinition Width="Auto"/>
    </Grid.ColumnDefinitions>
    <Button Command="{Binding NewFileCmd}"
-           Style="{DynamicResource TopPanel_Btn}">
+           Style="{DynamicResource TopPanelList_Btn}">
       <StackPanel Style="{StaticResource TopPanel_StackPanel}">
          <Image Source="/Resources/TopPanelList/autopair.png"
                 Style="{StaticResource TopPanel_Image}"/>
@@ -21,11 +21,11 @@
                     Style="{StaticResource TopPanel_TxBl}"/>
       </StackPanel>
    </Button>
-   <Line Grid.Column="1"
-               Style="{StaticResource TopPanel_Line}"/>
+   <Separator Grid.Column="1" 
+              Style="{StaticResource TopPanel_Separator}"/>
    <Button Grid.Column="2"
            Command="{Binding SaveFileCmd}"
-           Style="{DynamicResource TopPanel_Btn}">
+           Style="{DynamicResource TopPanelList_Btn}">
       <StackPanel Style="{StaticResource TopPanel_StackPanel}">
          <Image Source="/Resources/TopPanelList/avoid intersection.png"
                 Style="{StaticResource TopPanel_Image}"/>
@@ -33,12 +33,12 @@
                     Style="{StaticResource TopPanel_TxBl}"/>
       </StackPanel>
    </Button>
-   <Line Grid.Column="3"
-               Style="{StaticResource TopPanel_Line}"/>
+   <Separator Grid.Column="3" 
+              Style="{StaticResource TopPanel_Separator}"/>
    <Button Grid.Column="4"
            IsEnabled="True"
            Command="{Binding SaveAsCommand}"
-           Style="{DynamicResource TopPanel_Btn}">
+           Style="{DynamicResource TopPanelList_Btn}">
       <StackPanel Style="{StaticResource TopPanel_StackPanel}">
          <Image Source="/Resources/TopPanelList/explode.png"
                 Style="{StaticResource TopPanel_Image}"/>
diff --git a/TopPanel/TopPanelV.xaml b/TopPanel/TopPanelV.xaml
index 83c4671..73d2be9 100644
--- a/TopPanel/TopPanelV.xaml
+++ b/TopPanel/TopPanelV.xaml
@@ -3,6 +3,7 @@
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:EgtStone3D="clr-namespace:EgtStone3D"
             xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
             SelectedIndex="{Binding SelTopOption}"
             Style="{StaticResource TopPanel_TabControl}">
    <TabControl.ItemContainerStyle>
@@ -24,60 +25,55 @@
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
          <EgtStone3D:TopPanelHomeV DataContext="{StaticResource TopPanelVM}"/>
-         <Line Grid.Column="1"
-               Style="{StaticResource TopPanel_Line}"/>
+         <Separator Grid.Column="1" 
+                    Style="{StaticResource TopPanel_Separator}"/>
          <EgtStone3D:TopPanelViewV Grid.Column="2" DataContext="{StaticResource TopPanelVM}"/>
-         <Line Grid.Column="3"
-               Style="{StaticResource TopPanel_Line}"/>
+         <Separator Grid.Column="3" 
+                    Style="{StaticResource TopPanel_Separator}"/>
          <EgtStone3D:TopPanelViewProspectiveV Grid.Column="4" DataContext="{StaticResource TopPanelVM}"/>
-         <Line Grid.Column="5"
-               Style="{StaticResource TopPanel_Line}"/>
-
+         <Separator Grid.Column="5" 
+                    Style="{StaticResource TopPanel_Separator}"/>
          <ItemsControl Grid.Column="6" 
                        ItemsSource="{Binding TopPanelListGroupBtn}">
             <ItemsControl.ItemsPanel>
                <ItemsPanelTemplate>
-                  <WrapPanel Orientation="Horizontal"/>
+                  <WrapPanel Style="{StaticResource TopPanel_WrapPanel}"
+                             Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtMainWindow}}}"/>
                </ItemsPanelTemplate>
             </ItemsControl.ItemsPanel>
             <ItemsControl.Resources>
                <DataTemplate DataType="{x:Type EgtStone3D:GroupSceneBtn}">
-                  <StackPanel Orientation="Horizontal">
+                  <StackPanel Style="{StaticResource SceneButtonH_StackPanel}">
                      <EgtStone3D:TopPanelButtonV/>
-                     <Line Style="{StaticResource TopPanel_Line}"/>
+                     <Separator Style="{StaticResource TopPanel_Separator}"/>
                   </StackPanel>
                </DataTemplate>
             </ItemsControl.Resources>
          </ItemsControl>
-         
          <EgtStone3D:TopPanelListV Grid.Column="7"/>
       </Grid>
    </TabItem>
    <TabItem Header="{Binding Parametrico_Msg}">
       <Grid Style="{StaticResource TopPanel_Grid}">
          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
          <ItemsControl ItemsSource="{Binding TopPanelListGroupBtn}">
             <ItemsControl.ItemsPanel>
                <ItemsPanelTemplate>
-                  <WrapPanel Orientation="Horizontal"/>
+                  <WrapPanel Style="{StaticResource TopPanel_WrapPanel}"
+                             Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtMainWindow}}}"/>
                </ItemsPanelTemplate>
             </ItemsControl.ItemsPanel>
             <ItemsControl.Resources>
                <DataTemplate DataType="{x:Type EgtStone3D:GroupSceneBtn}">
-                  <StackPanel Orientation="Horizontal">
+                  <StackPanel Style="{StaticResource SceneButtonH_StackPanel}">
                      <EgtStone3D:TopPanelListButton_1V/>
-                     <Line Style="{StaticResource TopPanel_Line}"/>
+                     <Separator Style="{StaticResource TopPanel_Separator}"/>
                   </StackPanel>
                </DataTemplate>
             </ItemsControl.Resources>
          </ItemsControl>
-
       </Grid>
    </TabItem>
-
 </TabControl>
diff --git a/TopPanel/TopPanelVM.vb b/TopPanel/TopPanelVM.vb
index f728b0d..217c8f1 100644
--- a/TopPanel/TopPanelVM.vb
+++ b/TopPanel/TopPanelVM.vb
@@ -119,11 +119,16 @@ Public Class TopPanelVM
       End Get
    End Property
 
+   Private m_FileSourceSVG As String = String.Empty
    Public ReadOnly Property FileSourceSVG As String
       Get
-         Return Map.refMainWindowVM.MainWindowM.sResourcesDir & "\test.svg"
+         Return m_FileSourceSVG
       End Get
    End Property
+   Friend Sub SetFileSourceSVG(sfileSourceSVG As String)
+      m_FileSourceSVG = sfileSourceSVG
+      NotifyPropertyChanged(NameOf(FileSourceSVG))
+   End Sub
 
    Public ReadOnly Property TopPanelListGroupBtn As List(Of GroupSceneBtn)
       Get
@@ -190,6 +195,7 @@ Public Class TopPanelVM
       ' Impostazioni MruLists
       m_MruFiles.Init(S_MRUFILES, 8)
       m_MruImportFiles.Init(S_MRUIMPORTFILES, 8)
+      SetFileSourceSVG(Map.refMainWindowVM.MainWindowM.sResourcesDir & "\test.svg")
    End Sub
 
 #End Region    ' Constructor
@@ -259,22 +265,7 @@ Public Class TopPanelVM
    End Property
 
    Private Sub OpenFile()
-      Dim OpenFileDialog As New EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
-         .Title = EgtMsg(110015),
-         .Filter = "nge files (*.nge)|*.nge" &
-                   "|vme files (*.vme)|*.vme",
-         .FileName = "New.vme",
-         .FilterIndex = 2,
-         .InitialDirectory = "C:\EgtData\EgtStone3D\Temp",
-         .Mode = 1
-      }
-
-      If Not OpenFileDialog.ShowDialog() = Windows.Forms.DialogResult.OK Then Return
-      If String.IsNullOrEmpty(OpenFileDialog.FileName) Then Return
-
-      Dim sFilePath As String = OpenFileDialog.FileName
-      EgtOpenFile(sFilePath)
-      'OpenProject("")
+      OpenProject("")
       SolidManagerM.CreatePartSolid()
       EgtDraw()
    End Sub
diff --git a/TopPanel/TopPanelViewV.xaml b/TopPanel/TopPanelViewV.xaml
index 5eba305..70a4628 100644
--- a/TopPanel/TopPanelViewV.xaml
+++ b/TopPanel/TopPanelViewV.xaml
@@ -1,11 +1,11 @@
 <Grid x:Class="TopPanelViewV"
-            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:EgtStone3D="clr-namespace:EgtStone3D">
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:EgtStone3D="clr-namespace:EgtStone3D">
 
    <Button Name="View"
            Command="{Binding ShowPopUpCommand}"
-           Style="{StaticResource TopPanel_Btn}">
+           Style="{StaticResource TopPanelList_Btn}">
       <StackPanel Style="{StaticResource TopPanel_StackPanel}">
          <Image Source="/Resources/TopPanel/vista.png"
                 Style="{StaticResource TopPanel_Image}"/>
diff --git a/Utility/EgtStone3DDarkDictionary.xaml b/Utility/EgtStone3DDarkDictionary.xaml
index 8e8ca6b..ec5678c 100644
--- a/Utility/EgtStone3DDarkDictionary.xaml
+++ b/Utility/EgtStone3DDarkDictionary.xaml
@@ -42,26 +42,27 @@
 
    <!--#region BorderColor-->
 
-   <SolidColorBrush x:Key="Border.Static.Background" Color="{StaticResource EgtStone3D_Calypso_Color}"/>
-   <SolidColorBrush x:Key="Border.Static.BorderBrush" Color="{StaticResource EgalwareWhite_Color}"/>
+   <SolidColorBrush x:Key="Border.Static.Background" Color="{StaticResource EgtStone3D_BostonBlue_Color}"/>
+   <SolidColorBrush x:Key="Border.Static.BorderBrush" Color="{StaticResource EgtStone3D_Black_Color}"/>
 
    <!--#endregion BorderColor-->
 
    <!--#region TextBlockColor-->
 
-   <SolidColorBrush x:Key="TextBlock.Static.Foreground" Color="{StaticResource EgtStone3D_Black_Color}"/>
+   <SolidColorBrush x:Key="TextBlock.Static.Foreground" Color="{StaticResource EgalwareWhite_Color}"/>
 
    <!--#endregion TextBlockColor-->
 
    <!--#region TextBoxColor-->
 
    <SolidColorBrush x:Key="TextBox.Static.Foreground" Color="{StaticResource EgalwareGray_Color}"/>
+   <SolidColorBrush x:Key="BaseTextBox.Static.Foreground" Color="{StaticResource EgalwareWhite_Color}"/>
 
    <!--#endregion TextBoxColor-->
 
    <!--#region EgtCustomWindowColor-->
 
-   <SolidColorBrush x:Key="EgtCustomWindow.Static.Background" Color="{StaticResource EgtStone3D_Calypso_Color}"/>
+   <SolidColorBrush x:Key="EgtCustomWindow.Static.Background" Color="{StaticResource EgtStone3D_BostonBlue_Color}"/>
    <SolidColorBrush x:Key="EgtCustomWindow.Static.Border" Color="{StaticResource EgtStone3D_Black_Color}"/>
 
    <SolidColorBrush x:Key="Border_EgtCustomWindow.Static.Border" Color="{StaticResource EgalwareGray_Color}"/>
@@ -81,25 +82,29 @@
 
    <!--#region TabControlColor-->
 
-   <SolidColorBrush x:Key="TabControlTreeView.Static.Backgroung" Color="{StaticResource EgalwareWhite_Color}"/>
    <SolidColorBrush x:Key="TabControl.Static.Backgroung" Color="{StaticResource EgtStone3D_CornflowerBlue_Color}"/>
+   <SolidColorBrush x:Key="TabControlTreeView.Static.Backgroung" Color="{StaticResource EgalwareWhite_Color}"/>
 
    <!--#endregion TabControlColor-->
 
    <!--#region TabItemColor-->
 
    <LinearGradientBrush x:Key="TabItem.Static.Background" EndPoint="0,1" StartPoint="0,0">
-      <GradientStop Color="{StaticResource EgtStone3D_Gallery_Color}" Offset="0.0"/>
-      <GradientStop Color="{StaticResource EgtStone3D_Mercury_Color}" Offset="1.0"/>
+      <GradientStop Color="{StaticResource EgtStone3D_Calypso_Color}" Offset="0.0"/>
+      <GradientStop Color="{StaticResource EgtStone3D_CornflowerBlue_Color}" Offset="1.0"/>
    </LinearGradientBrush>
-   <SolidColorBrush x:Key="TabItem.Static.Border" Color="{StaticResource EgtStone3D_SilverChalice_Color}"/>
+   <SolidColorBrush x:Key="TabItem.Static.Foreground" Color="{StaticResource EgalwareWhite_Color}"/>
+   <SolidColorBrush x:Key="TabItem.Static.Border" Color="{StaticResource EgtStone3D_BostonBlue_Color}"/>
    <LinearGradientBrush x:Key="TabItem.MouseOver.Background" EndPoint="0,1" StartPoint="0,0">
       <GradientStop Color="{StaticResource EgtStone3D_Selago_Color}" Offset="0.0"/>
       <GradientStop Color="{StaticResource EgtStone3D_HawkesBlue_Color}" Offset="1.0"/>
    </LinearGradientBrush>
    <SolidColorBrush x:Key="TabItem.MouseOver.Border" Color="{StaticResource EgtStone3D_Seagull_Color}"/>
-   <SolidColorBrush x:Key="TabItem.Selected.Background" Color="{StaticResource EgalwareWhite_Color}"/>
-   <SolidColorBrush x:Key="TabItem.Selected.Border" Color="{StaticResource EgtStone3D_SilverChalice_Color}"/>
+   <LinearGradientBrush x:Key="TabItem.Selected.Background" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="{StaticResource EgtStone3D_Calypso_Color}" Offset="0.0"/>
+      <GradientStop Color="{StaticResource EgtStone3D_CornflowerBlue_Color}" Offset="1.0"/>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="TabItem.Selected.Border" Color="{StaticResource EgtStone3D_BostonBlue_Color}"/>
    <SolidColorBrush x:Key="TabItem.Disabled.Background" Color="{StaticResource EgtStone3D_Gallery_Color}"/>
    <SolidColorBrush x:Key="TabItem.Disabled.Border" Color="{StaticResource EgtStone3D_Alto_Color}"/>
 
@@ -217,50 +222,83 @@
 
    <!--#region ComboBoxColor-->
 
-   <SolidColorBrush x:Key="ComboBox.Static.Background" Color="{StaticResource EgalwareWhite_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.Static.Border" Color="{StaticResource EgtStone3D_SilverChalice_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.Static.Foreground" Color="{StaticResource EgalwareGray_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.Static.Editable.Background" Color="{StaticResource EgalwareWhite_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.Static.Editable.Border" Color="{StaticResource EgtStone3D_Bombay_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.Static.Editable.Button.Background" Color="{StaticResource EgalwareTransparent_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.Static.Editable.Button.Border" Color="{StaticResource EgalwareTransparent_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.MouseOver.Glyph" Color="{StaticResource EgtStone3D_Black_Color}"/>
+   <SolidColorBrush x:Key="TextBox.Static.Background" Color="{StaticResource EgalwareWhite_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Background" Color="{StaticResource EgtStone3D_Calypso_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Border" Color="{StaticResource EgtStone3D_Calypso_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Foreground" Color="{StaticResource EgalwareWhite_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Glyph" Color="{StaticResource EgalwareWhite_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Editable.Background" Color="{StaticResource EgtStone3D_Calypso_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Editable.Border" Color="{StaticResource EgtStone3D_Calypso_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Editable.Button.Background" Color="{StaticResource EgtStone3D_Calypso_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Editable.Button.Border" Color="{StaticResource EgtStone3D_Calypso_Color}"/>
    <LinearGradientBrush x:Key="ComboBox.MouseOver.Background" EndPoint="0,1" StartPoint="0,0">
-      <GradientStop Color="{StaticResource EgtStone3D_Selago_Color}" Offset="0.0"/>
-      <GradientStop Color="{StaticResource EgtStone3D_HawkesBlue_Color}" Offset="1.0"/>
+      <GradientStop Color="{StaticResource EgtStone3D_Calypso_Color}" Offset="0.0"/>
+      <GradientStop Color="{StaticResource EgtStone3D_CornflowerBlue_Color}" Offset="1.0"/>
    </LinearGradientBrush>
-   <SolidColorBrush x:Key="ComboBox.MouseOver.Border" Color="{StaticResource EgtStone3D_Seagull_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Background" Color="{StaticResource EgalwareWhite_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Border" Color="{StaticResource EgtStone3D_Seagull_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Border" Color="{StaticResource EgtStone3D_Calypso_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Glyph" Color="{StaticResource EgalwareWhite_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Background" Color="{StaticResource EgtStone3D_Calypso_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Border" Color="{StaticResource EgtStone3D_Calypso_Color}"/>
    <LinearGradientBrush x:Key="ComboBox.MouseOver.Editable.Button.Background" EndPoint="0,1" StartPoint="0,0">
-      <GradientStop Color="{StaticResource EgtStone3D_Selago_Color}" Offset="0.0"/>
-      <GradientStop Color="{StaticResource EgtStone3D_HawkesBlue_Color}" Offset="1.0"/>
+      <GradientStop Color="{StaticResource EgtStone3D_Calypso_Color}" Offset="0.0"/>
+      <GradientStop Color="{StaticResource EgtStone3D_CornflowerBlue_Color}" Offset="1.0"/>
    </LinearGradientBrush>
-   <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Button.Border" Color="{StaticResource EgtStone3D_Seagull_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.Pressed.Glyph" Color="{StaticResource EgtStone3D_Black_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Button.Border" Color="{StaticResource EgtStone3D_Calypso_Color}"/>
    <LinearGradientBrush x:Key="ComboBox.Pressed.Background" EndPoint="0,1" StartPoint="0,0">
-      <GradientStop Color="{StaticResource EgtStone3D_HawkesBlue_Color}" Offset="0.0"/>
-      <GradientStop Color="{StaticResource EgtStone3D_FrenchPass_Color}" Offset="1.0"/>
+      <GradientStop Color="{StaticResource EgtStone3D_Calypso_Color}" Offset="0.0"/>
+      <GradientStop Color="{StaticResource EgtStone3D_Seagull_Color}" Offset="1.0"/>
    </LinearGradientBrush>
-   <SolidColorBrush x:Key="ComboBox.Pressed.Border" Color="{StaticResource EgtStone3D_CornflowerBlue_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Background" Color="{StaticResource EgalwareWhite_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Border" Color="{StaticResource EgtStone3D_CornflowerBlue_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Border" Color="{StaticResource EgtStone3D_Calypso_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Glyph" Color="{StaticResource EgtStone3D_Black_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Background" Color="{StaticResource EgtStone3D_Calypso_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Border" Color="{StaticResource EgtStone3D_Calypso_Color}"/>
    <LinearGradientBrush x:Key="ComboBox.Pressed.Editable.Button.Background" EndPoint="0,1" StartPoint="0,0">
-      <GradientStop Color="{StaticResource EgtStone3D_HawkesBlue_Color}" Offset="0.0"/>
-      <GradientStop Color="{StaticResource EgtStone3D_FrenchPass_Color}" Offset="1.0"/>
+      <GradientStop Color="{StaticResource EgtStone3D_Calypso_Color}" Offset="0.0"/>
+      <GradientStop Color="{StaticResource EgtStone3D_Seagull_Color}" Offset="1.0"/>
    </LinearGradientBrush>
    <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Button.Border" Color="{StaticResource EgtStone3D_CornflowerBlue_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.Disabled.Glyph" Color="{StaticResource EgtStone3D_Silver_Color}"/>
    <SolidColorBrush x:Key="ComboBox.Disabled.Background" Color="{StaticResource EgtStone3D_Gallery_Color}"/>
    <SolidColorBrush x:Key="ComboBox.Disabled.Border" Color="{StaticResource EgtStone3D_Alto_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Glyph" Color="{StaticResource EgtStone3D_Silver_Color}"/>
    <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Background" Color="{StaticResource EgalwareWhite_Color}"/>
    <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Border" Color="{StaticResource EgtStone3D_Silver_Color}"/>
    <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Button.Background" Color="{StaticResource EgalwareTransparent_Color}"/>
    <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Button.Border" Color="{StaticResource EgalwareTransparent_Color}"/>
-   <SolidColorBrush x:Key="ComboBox.Static.Glyph" Color="#FF606060"/>
-
-   <SolidColorBrush x:Key="TextBox.Static.Background" Color="{StaticResource EgalwareWhite_Color}"/>
 
    <!--#endregion ComboBoxColor-->
 
+   <!--#region TreeViewColor-->
+
+   <SolidColorBrush x:Key="TreeView.Static.Background" Color="{StaticResource EgalwareTransparent_Color}"/>
+   <SolidColorBrush x:Key="TreeView.Static.Foreground" Color="{StaticResource EgalwareWhite_Color}"/>
+
+   <!--#endregion TreeViewColor-->
+
+   <!--#region ListBoxColor-->
+
+   <SolidColorBrush x:Key="ListBox.Static.Background" Color="{StaticResource EgtStone3D_BostonBlue_Color}"/>
+
+   <!--#endregion ListBoxRegion-->
+
+   <!--#region ScrollBarColor-->
+
+   <SolidColorBrush x:Key="ScrollBar.Static.Background" Color="{StaticResource EgtStone3D_BostonBlue_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Static.Border" Color="{StaticResource EgalwareTransparent_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Static.Glyph" Color="{StaticResource EgalwareWhite_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Static.Thumb" Color="{StaticResource EgtStone3D_Calypso_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.MouseOver.Background" Color="{StaticResource EgtStone3D_Alto_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.MouseOver.Border" Color="{StaticResource EgtStone3D_Seagull_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.MouseOver.Glyph" Color="{StaticResource EgtStone3D_Calypso_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.MouseOver.Thumb" Color="{StaticResource EgtStone3D_Seagull_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Pressed.Background" Color="{StaticResource EgalwareTransparent_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Pressed.Border" Color="{StaticResource EgalwareScorpion_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Pressed.Thumb" Color="{StaticResource EgtStone3D_Calypso_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Pressed.Glyph" Color="{StaticResource EgalwareWhite_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Disabled.Background" Color="{StaticResource EgtStone3D_BostonBlue_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Disabled.Border" Color="{StaticResource EgalwareTransparent_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Disabled.Glyph" Color="{StaticResource EgtStone3D_Calypso_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Button.Static.Background" Color="{StaticResource EgalwareWhite_Color}"/>
+
+   <!--#endregion ScrollBarColor-->
+
 </ResourceDictionary>
diff --git a/Utility/EgtStone3DDefaultStyle.xaml b/Utility/EgtStone3DDefaultStyle.xaml
index b5c785c..33c54dd 100644
--- a/Utility/EgtStone3DDefaultStyle.xaml
+++ b/Utility/EgtStone3DDefaultStyle.xaml
@@ -11,14 +11,11 @@
    it in xaml file(ProjectView.xaml).
    -->
 
-   <EgtStone3D:MainWindowVM x:Key="MainWindowVM"/>
-   <EgtStone3D:MySceneHostVM x:Key="MySceneHostVM"/>
    <EgtStone3D:SecondaryWindowVM x:Key="SecondaryWindowVM"/>
    <EgtStone3D:ProjManagerVM x:Key="ProjManagerVM"/>
    <EgtStone3D:TopPanelVM x:Key="TopPanelVM"/>
    <EgtStone3D:ViewPanelVM x:Key="ViewPanelVM"/>
    <EgtStone3D:ViewPanelProspectiveVM x:Key="ViewPanelProspectiveVM"/>
-   <EgtStone3D:SVGVM x:Key="SVGVM"/>
    <EgtStone3D:SceneButtonVM x:Key="SceneButtonVM"/>
 
    <!--#endregion-->
@@ -58,6 +55,7 @@
    <SolidColorBrush x:Key="EgtStone3D_CornflowerBlue" Color="#569DE5"/>
    <SolidColorBrush x:Key="EgtStone3D_Silver" Color="#BFBFBF"/>
    <SolidColorBrush x:Key="EgtStone3D_Gold" Color="#FFD700"/>
+   <SolidColorBrush x:Key="EgtStone3D_Scorpion" Color="#606060"/>
 
    <Color x:Key="EgalwareTransparent_Color">Transparent</Color>
    <Color x:Key="EgalwareBlue1_Color">#4D84C4</Color>
@@ -92,6 +90,7 @@
    <Color x:Key="EgtStone3D_CornflowerBlue_Color">#569DE5</Color>
    <Color x:Key="EgtStone3D_Silver_Color">#BFBFBF</Color>
    <Color x:Key="EgtStone3D_Gold_Color">#FFD700</Color>
+   <Color x:Key="EgalwareScorpion_Color">#606060</Color>
 
    <!--#endregion Colori Predefiniti-->
 
@@ -210,39 +209,13 @@
    </Style>
 
    <!--Button generico-->
-   <Style x:Key="SceneButton" TargetType="{x:Type Button}">
-      <Setter Property="BorderThickness" Value="1"/>
+   <Style x:Key="SceneButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Background" Value="{StaticResource EgalwareTransparent}"/>
+      <Setter Property="BorderThickness" Value="0"/>
       <Setter Property="Margin" Value="1"/>
       <Setter Property="Padding" Value="5"/>
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="30"/>
-      <Setter Property="HorizontalContentAlignment" Value="Center"/>
-      <Setter Property="VerticalContentAlignment" Value="Center"/>
-      <Setter Property="TextBlock.TextAlignment" Value="Center"/>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="Button">
-               <Border TextBlock.Foreground="{DynamicResource Border_Button.Static.Foreground}"
-                       x:Name="Border"
-                       CornerRadius="2"
-                       BorderThickness="0"
-                       BorderBrush="{StaticResource EgalwareTransparent}"
-                       Background="DarkOrange"
-                       Opacity="0.9">
-                  <ContentPresenter Margin="2"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    RecognizesAccessKey="True"/>
-               </Border>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsDefault" Value="true">
-                     <Setter Property="Background" Value="{DynamicResource Border_Button.Default.Background}"/>
-                  </Trigger>
-               </ControlTemplate.Triggers>
-
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
    </Style>
 
    <ControlTemplate x:Key="Button.HalfRoundButton" TargetType="{x:Type Button}">
@@ -319,17 +292,37 @@
       <Setter Property="Margin" Value="20,0,2.5,0"/>
    </Style>
 
+   <Style x:Key="TopPanel1_Btn" TargetType="{x:Type Button}" BasedOn="{StaticResource Proj_Btn}">
+      <Setter Property="ContextMenuService.Placement" Value="Bottom"/>
+      <Setter Property="Height" Value="35"/>
+      <Setter Property="Width" Value="35"/>
+      <Setter Property="Margin" Value="20,0,2.5,0"/>
+   </Style>
+
+   <Style x:Key="TopPanelList_Btn" TargetType="{x:Type Button}" BasedOn="{StaticResource Proj_Btn}">
+      <Setter Property="ContextMenuService.Placement" Value="Bottom"/>
+      <Setter Property="Height" Value="70"/>
+      <Setter Property="Width" Value="70"/>
+      <Setter Property="Margin" Value="0"/>
+   </Style>
+
    <Style x:Key="ProjManager_Btn" TargetType="{x:Type Button}" BasedOn="{StaticResource Proj_Btn}">
       <Setter Property="Height" Value="70"/>
       <Setter Property="Width" Value="70"/>
       <Setter Property="Margin" Value="2.5,0,2.5,0"/>
    </Style>
 
+   <Style x:Key="ProjManager1_Btn" TargetType="{x:Type Button}" BasedOn="{StaticResource Proj_Btn}">
+      <Setter Property="Height" Value="35"/>
+      <Setter Property="Width" Value="35"/>
+      <Setter Property="Margin" Value="2.5,0,2.5,0"/>
+   </Style>
+
    <Style x:Key="TopPanelProspective_Btn" TargetType="{x:Type Button}" BasedOn="{StaticResource Proj_Btn}">
       <Setter Property="ContextMenuService.Placement" Value="Bottom"/>
       <Setter Property="Height" Value="70"/>
       <Setter Property="Width" Value="110"/>
-      <Setter Property="Margin" Value="20,0,2.5,0"/>
+      <Setter Property="Margin" Value="0"/>
    </Style>
 
    <Style x:Key="GoBack_Btn" TargetType="{x:Type Button}" BasedOn="{StaticResource Proj_Btn}">
@@ -412,41 +405,51 @@
       </Setter>
    </Style>
 
-   <Style x:Key="SceneToggleButton" TargetType="{x:Type ToggleButton}">
+   <Style x:Key="ProjManager_ToogleButton" TargetType="{x:Type ToggleButton}">
+      <Setter Property="FocusVisualStyle" Value="{DynamicResource FocusVisual}"/>
+      <Setter Property="Background" Value="{DynamicResource Button.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="Margin" Value="1"/>
-      <Setter Property="Padding" Value="5"/>
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="30"/>
       <Setter Property="HorizontalContentAlignment" Value="Center"/>
       <Setter Property="VerticalContentAlignment" Value="Center"/>
-      <Setter Property="TextBlock.TextAlignment" Value="Center"/>
-      <!--<Style.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="#EDC637"/>
-            </Trigger>
-            <Trigger Property="IsMouseOver" Value="False">
-                <Setter Property="Background" Value="#EDC637"/>
-            </Trigger>
-            <Trigger Property="IsPressed" Value="True">
-                <Setter Property="Background" Value="#988A56"/>
-            </Trigger>
-            <Trigger Property="IsChecked" Value="True">
-                <Setter Property="Background" Value="#988A56"/>
-            </Trigger>
-            <Trigger Property="IsChecked" Value="True">
-                <Setter Property="Background" Value="#988A56"/>
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="Background" Value="#FFF4F4F4"/>
-                <Setter Property="BorderBrush" Value="#FFADB2B5"/>
-                <Setter Property="TextElement.Foreground"  Value="#FF838383"/>
-                <Setter Property="OpacityMask" Value="#C3C3C3"/>
-            </Trigger>
-        </Style.Triggers>-->
+      <Setter Property="Padding" Value="1"/>
+      <Setter Property="Margin" Value="1"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ToggleButton}">
+               <Border x:Name="border" CornerRadius="3,3,0,0" 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="{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="{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="{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="{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>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
    </Style>
 
-   <Style x:Key="Home_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource General_ToogleButton}">
+   <Style x:Key="Home_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource ProjManager_ToogleButton}">
       <Setter Property="Height" Value="24"/>
       <Setter Property="Width" Value="64"/>
       <Setter Property="IsChecked" Value="True"/>
@@ -459,7 +462,7 @@
       </Style.Triggers>
    </Style>
 
-   <Style x:Key="Parametrico_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource General_ToogleButton}">
+   <Style x:Key="Parametrico_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource ProjManager_ToogleButton}">
       <Setter Property="Height" Value="24"/>
       <Setter Property="Width" Value="100"/>
       <Setter Property="BorderThickness" Value="0"/>
@@ -470,6 +473,16 @@
          </Trigger>
       </Style.Triggers>
    </Style>
+
+   <Style x:Key="SceneToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource General_ToogleButton}">
+      <Setter Property="Background" Value="{StaticResource EgalwareTransparent}"/>
+      <Setter Property="BorderBrush" Value="{StaticResource EgalwareTransparent}"/>
+      <Setter Property="BorderThickness" Value="0"/>
+      <Setter Property="Margin" Value="1"/>
+      <Setter Property="Padding" Value="5"/>
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="30"/>
+   </Style>
    
    <!--#endregion ToogleButtonStyle-->
 
@@ -834,7 +847,7 @@
 
    <Style x:Key="OptionWindowV_Window" TargetType="{x:Type EgtWPFLib5:EgtMainWindow}" BasedOn="{StaticResource Dialog_Window}">
       <Setter Property="Width" Value="430"/>
-      <Setter Property="Height" Value="450"/>
+      <Setter Property="Height" Value="500"/>
       <Setter Property="MinWidth" Value="400"/>
       <Setter Property="MinHeight" Value="382"/>
    </Style>
@@ -995,15 +1008,18 @@
    </Style>
 
    <Style x:Key="OptionWindow_TxBl" TargetType="{x:Type TextBlock}">
+      <Setter Property="Foreground" Value="{DynamicResource TextBlock.Static.Foreground}"/>
       <Setter Property="TextAlignment" Value="Center"/>
       <Setter Property="TextWrapping" Value="Wrap"/>
    </Style>
    
    <Style x:Key="Background_TxBl" TargetType="{x:Type TextBlock}">
+      <Setter Property="Foreground" Value="{DynamicResource TextBlock.Static.Foreground}"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
    </Style>
 
    <Style x:Key="ColorLine_TxBl" TargetType="{x:Type TextBlock}">
+      <Setter Property="Foreground" Value="{DynamicResource TextBlock.Static.Foreground}"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="Margin" Value="5,5,0,5"/>
    </Style>
@@ -1055,7 +1071,8 @@
    <!--#region TextBoxStyle-->
 
    <Style x:Key="BaseTextBox" TargetType="{x:Type TextBox}">
-      <Setter Property="Foreground" Value="Gray"/>
+      <Setter Property="Background" Value="{StaticResource EgalwareTransparent}"/>
+      <Setter Property="Foreground" Value="{DynamicResource BaseTextBox.Static.Foreground}"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="VerticalContentAlignment" Value="Center"/>
       <Setter Property="TextAlignment" Value="Right"/>
@@ -1128,9 +1145,9 @@
          <Setter.Value>
             <ControlTemplate TargetType="{x:Type ToggleButton}">
                <Border x:Name="templateRoot"
-                       BorderBrush="{StaticResource ComboBox.Static.Border}"
+                       BorderBrush="{DynamicResource ComboBox.Static.Border}"
                        BorderThickness="{TemplateBinding BorderThickness}"
-                       Background="{StaticResource ComboBox.Static.Background}"
+                       Background="{DynamicResource ComboBox.Static.Background}"
                        CornerRadius="4"
                        SnapsToDevicePixels="true">
                   <Border x:Name="splitBorder"
@@ -1156,73 +1173,73 @@
                         <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="false"/>
                         <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="true"/>
                      </MultiDataTrigger.Conditions>
-                     <Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.Static.Editable.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.Static.Editable.Border}"/>
-                     <Setter Property="Background" TargetName="splitBorder" Value="{StaticResource ComboBox.Static.Editable.Button.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="splitBorder" Value="{StaticResource ComboBox.Static.Editable.Button.Border}"/>
+                     <Setter Property="Background" TargetName="templateRoot" Value="{DynamicResource ComboBox.Static.Editable.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource ComboBox.Static.Editable.Border}"/>
+                     <Setter Property="Background" TargetName="splitBorder" Value="{DynamicResource ComboBox.Static.Editable.Button.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="splitBorder" Value="{DynamicResource ComboBox.Static.Editable.Button.Border}"/>
                   </MultiDataTrigger>
                   <Trigger Property="IsMouseOver" Value="true">
-                     <Setter Property="Fill" TargetName="arrow" Value="{StaticResource ComboBox.MouseOver.Glyph}"/>
+                     <Setter Property="Fill" TargetName="arrow" Value="{DynamicResource ComboBox.MouseOver.Glyph}"/>
                   </Trigger>
                   <MultiDataTrigger>
                      <MultiDataTrigger.Conditions>
                         <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true"/>
                         <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="false"/>
                      </MultiDataTrigger.Conditions>
-                     <Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.MouseOver.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.MouseOver.Border}"/>
+                     <Setter Property="Background" TargetName="templateRoot" Value="{DynamicResource ComboBox.MouseOver.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource ComboBox.MouseOver.Border}"/>
                   </MultiDataTrigger>
                   <MultiDataTrigger>
                      <MultiDataTrigger.Conditions>
                         <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true"/>
                         <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="true"/>
                      </MultiDataTrigger.Conditions>
-                     <Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.MouseOver.Editable.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.MouseOver.Editable.Border}"/>
-                     <Setter Property="Background" TargetName="splitBorder" Value="{StaticResource ComboBox.MouseOver.Editable.Button.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="splitBorder" Value="{StaticResource ComboBox.MouseOver.Editable.Button.Border}"/>
+                     <Setter Property="Background" TargetName="templateRoot" Value="{DynamicResource ComboBox.MouseOver.Editable.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource ComboBox.MouseOver.Editable.Border}"/>
+                     <Setter Property="Background" TargetName="splitBorder" Value="{DynamicResource ComboBox.MouseOver.Editable.Button.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="splitBorder" Value="{DynamicResource ComboBox.MouseOver.Editable.Button.Border}"/>
                   </MultiDataTrigger>
                   <Trigger Property="IsPressed" Value="true">
-                     <Setter Property="Fill" TargetName="arrow" Value="{StaticResource ComboBox.Pressed.Glyph}"/>
+                     <Setter Property="Fill" TargetName="arrow" Value="{DynamicResource ComboBox.Pressed.Glyph}"/>
                   </Trigger>
                   <MultiDataTrigger>
                      <MultiDataTrigger.Conditions>
                         <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="true"/>
                         <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="false"/>
                      </MultiDataTrigger.Conditions>
-                     <Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.Pressed.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.Pressed.Border}"/>
+                     <Setter Property="Background" TargetName="templateRoot" Value="{DynamicResource ComboBox.Pressed.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource ComboBox.Pressed.Border}"/>
                   </MultiDataTrigger>
                   <MultiDataTrigger>
                      <MultiDataTrigger.Conditions>
                         <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="true"/>
                         <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="true"/>
                      </MultiDataTrigger.Conditions>
-                     <Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.Pressed.Editable.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.Pressed.Editable.Border}"/>
-                     <Setter Property="Background" TargetName="splitBorder" Value="{StaticResource ComboBox.Pressed.Editable.Button.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="splitBorder" Value="{StaticResource ComboBox.Pressed.Editable.Button.Border}"/>
+                     <Setter Property="Background" TargetName="templateRoot" Value="{DynamicResource ComboBox.Pressed.Editable.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource ComboBox.Pressed.Editable.Border}"/>
+                     <Setter Property="Background" TargetName="splitBorder" Value="{DynamicResource ComboBox.Pressed.Editable.Button.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="splitBorder" Value="{DynamicResource ComboBox.Pressed.Editable.Button.Border}"/>
                   </MultiDataTrigger>
                   <Trigger Property="IsEnabled" Value="false">
-                     <Setter Property="Fill" TargetName="arrow" Value="{StaticResource ComboBox.Disabled.Glyph}"/>
+                     <Setter Property="Fill" TargetName="arrow" Value="{DynamicResource ComboBox.Disabled.Glyph}"/>
                   </Trigger>
                   <MultiDataTrigger>
                      <MultiDataTrigger.Conditions>
                         <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false"/>
                         <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="false"/>
                      </MultiDataTrigger.Conditions>
-                     <Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.Disabled.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.Disabled.Border}"/>
+                     <Setter Property="Background" TargetName="templateRoot" Value="{DynamicResource ComboBox.Disabled.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource ComboBox.Disabled.Border}"/>
                   </MultiDataTrigger>
                   <MultiDataTrigger>
                      <MultiDataTrigger.Conditions>
                         <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false"/>
                         <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="true"/>
                      </MultiDataTrigger.Conditions>
-                     <Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.Disabled.Editable.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.Disabled.Editable.Border}"/>
-                     <Setter Property="Background" TargetName="splitBorder" Value="{StaticResource ComboBox.Disabled.Editable.Button.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="splitBorder" Value="{StaticResource ComboBox.Disabled.Editable.Button.Border}"/>
+                     <Setter Property="Background" TargetName="templateRoot" Value="{DynamicResource ComboBox.Disabled.Editable.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource ComboBox.Disabled.Editable.Border}"/>
+                     <Setter Property="Background" TargetName="splitBorder" Value="{DynamicResource ComboBox.Disabled.Editable.Button.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="splitBorder" Value="{DynamicResource ComboBox.Disabled.Editable.Button.Border}"/>
                   </MultiDataTrigger>
                </ControlTemplate.Triggers>
             </ControlTemplate>
@@ -1245,9 +1262,9 @@
             <Border x:Name="dropDownBorder"
                     MaxHeight="{TemplateBinding MaxDropDownHeight}"
                     MinWidth="{Binding ActualWidth, ElementName=templateRoot}"
-                    BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" 
+                    BorderBrush="{DynamicResource ComboBox.Static.Border}" 
                     BorderThickness="1"
-                    Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}">
+                    Background="{DynamicResource ComboBox.Static.Background}">
                <ScrollViewer x:Name="DropDownScrollViewer">
                   <Grid x:Name="grid" 
                         RenderOptions.ClearTypeHint="Enabled">
@@ -1368,7 +1385,7 @@
                        IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
                        Style="{StaticResource ComboBoxToggleButton}"/>
          <Border x:Name="border"
-                 Background="{StaticResource TextBox.Static.Background}"
+                 Background="{DynamicResource TextBox.Static.Background}"
                  Margin="{TemplateBinding BorderThickness}">
             <TextBox x:Name="PART_EditableTextBox"
                      HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -1403,9 +1420,9 @@
    </ControlTemplate>
    <Style 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="0"/>
       <Setter Property="FontFamily" Value="/Resources/Fonts/#Roboto"/>
       <Setter Property="FontWeight" Value="Normal"/>
@@ -1436,7 +1453,7 @@
       <Setter Property="HorizontalAlignment" Value="Right"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="IsSynchronizedWithCurrentItem" Value="True"/>
-      <Setter Property="BorderBrush" Value="{StaticResource ComboBox.Static.Border}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource ComboBox.Static.Border}"/>
       <Setter Property="BorderThickness" Value="1"/>
       <Setter Property="Width" Value="200"/>
       <Setter Property="Height" Value="28"/>
@@ -1534,6 +1551,12 @@
       <Setter Property="Margin" Value="5,10,0,0"/>
    </Style>
 
+   <Style x:Key="TopPanelButton_ItemsControl" TargetType="{x:Type ItemsControl}">
+      <Setter Property="DockPanel.Dock" Value="Top"/>
+      <Setter Property="HorizontalAlignment" Value="Left"/>
+      <Setter Property="Margin" Value="-10,10,0,0"/>
+   </Style>
+
    <Style x:Key="BottomList_ItemsControl" TargetType="{x:Type ItemsControl}">
       <Setter Property="DockPanel.Dock" Value="Bottom"/>
       <Setter Property="HorizontalAlignment" Value="Right"/>
@@ -1626,6 +1649,10 @@
       <Setter Property="Margin" Value="20"/>
    </Style>
 
+   <Style x:Key="TopPanelButton_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="Margin" Value="15,-10,0,0"/>
+   </Style>
+   
    <!--#endregion GridStyle-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
@@ -1889,16 +1916,21 @@
       <Setter Property="Background" Value="{DynamicResource TabControl.Static.Backgroung}"/>
       <Setter Property="BorderThickness" Value="0"/>
       <Setter Property="Height" Value="103"/>
-      <Setter Property="Margin" Value="0,-2.5,0,0"/>
+      <Setter Property="Margin" Value="0,-1.52,0,0"/>
    </Style>
 
    <Style x:Key="TreeView_TC" TargetType="{x:Type TabControl}">
-      <Setter Property="Background" Value="{DynamicResource TabControlTreeView.Static.Backgroung}"/>
+      <Setter Property="Background" Value="{DynamicResource EgalwareTransparent}"/>
       <Setter Property="BorderThickness" Value="0"/>
    </Style>
 
    <Style x:Key="OprtionWindow_TC" TargetType="{x:Type TabControl}">
+      <Setter Property="Background" Value="{StaticResource EgalwareTransparent}"/>
+      <Setter Property="BorderThickness" Value="0"/>
       <Setter Property="Margin" Value="5,5,5,5"/>
+      <Style.Resources>
+         <Style TargetType="{x:Type TabItem}" BasedOn="{StaticResource {x:Type TabItem}}"/>
+      </Style.Resources>
    </Style>
 
    <!--#endregion TabControlStyle-->
@@ -1907,9 +1939,9 @@
 
    <Style TargetType="{x:Type TabItem}">
       <Setter Property="FocusVisualStyle" Value="{StaticResource TabItem_FocusVisual}"/>
-      <Setter Property="Foreground" Value="Black"/>
-      <Setter Property="Background" Value="{StaticResource TabItem.Static.Background}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource TabItem.Static.Border}"/>
+      <Setter Property="Background" Value="{DynamicResource TabItem.Static.Background}"/>
+      <Setter Property="Foreground" Value="{DynamicResource TabItem.Static.Foreground}"/>
+      <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"/>
@@ -1925,8 +1957,8 @@
                           BorderThickness="1,1,1,0" Margin="0">
                      <Border x:Name="innerBorder" 
                              CornerRadius="4,4,0,0"
-                             Background="{StaticResource TabItem.Selected.Background}" 
-                             BorderBrush="{StaticResource TabItem.Selected.Border}"
+                             Background="{DynamicResource TabItem.Selected.Background}" 
+                             BorderBrush="{DynamicResource TabItem.Selected.Border}"
                              BorderThickness="1,1,1,0" 
                              Margin="-1" 
                              Opacity="0"/>
@@ -1939,8 +1971,8 @@
                         <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource 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>
@@ -1949,8 +1981,8 @@
                         <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource 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>
@@ -1959,8 +1991,8 @@
                         <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource 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>
@@ -1969,8 +2001,8 @@
                         <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource 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>
@@ -1980,8 +2012,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>
@@ -1991,8 +2023,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>
@@ -2002,8 +2034,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>
@@ -2013,8 +2045,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>
@@ -2107,11 +2139,13 @@
    <!--#region ListBoxStyle-->
 
    <Style x:Key="BasicColors_ListBox" TargetType="{x:Type ListBox}">
+      <Setter Property="Background" Value="{StaticResource EgalwareTransparent}"/>
       <Setter Property="HorizontalAlignment" Value="Center"/>
       <Setter Property="BorderThickness" Value="0"/>
    </Style>
 
    <Style x:Key="BasicColorsTheme_ListBox" TargetType="{x:Type ListBox}">
+      <Setter Property="Background" Value="{StaticResource EgalwareTransparent}"/>
       <Setter Property="BorderThickness" Value="0"/>
    </Style>
 
@@ -2186,8 +2220,9 @@
    <!--#region TreeViewStyle-->
 
    <Style x:Key="FileTree_TV" TargetType="{x:Type TreeView}">
-      <Setter Property="Foreground" Value="{StaticResource EgalwareGray}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource EgalwareWhite}"/>
+      <Setter Property="Background" Value="{DynamicResource TreeView.Static.Background}"/>
+      <Setter Property="Foreground" Value="{DynamicResource TreeView.Static.Foreground}"/>
+      <Setter Property="BorderThickness" Value="0"/>
       <Setter Property="FontSize" Value="15"/>
       <Setter Property="Margin" Value="10"/>
    </Style>
@@ -2223,7 +2258,7 @@
    <!--#region GroupBoxStyle-->
 
    <Style x:Key="OptionWindow_GrBx" TargetType="{x:Type GroupBox}">
-      <Setter Property="Margin" Value="0,0,0,5"/>
+      <Setter Property="Margin" Value="0,0,2.5,5"/>
    </Style>
    
    <!--#endregion GroupBoxStyle-->
@@ -2246,7 +2281,7 @@
    </Style>
 
    <!-- TopLevelHeader -->
-   <ControlTemplate x:Key="{x:Static MenuItem.TopLevelHeaderTemplateKey}" TargetType="MenuItem">
+   <ControlTemplate x:Key="{x:Static MenuItem.TopLevelHeaderTemplateKey}" TargetType="{x:Type MenuItem}">
       <Border Name="Border">
          <Grid>
             <ContentPresenter Margin="6,3,6,3" 
@@ -2288,7 +2323,7 @@
    </ControlTemplate>
 
    <!-- TopLevelItem -->
-   <ControlTemplate x:Key="{x:Static MenuItem.TopLevelItemTemplateKey}" TargetType="MenuItem">
+   <ControlTemplate x:Key="{x:Static MenuItem.TopLevelItemTemplateKey}" TargetType="{x:Type MenuItem}">
       <Border Name="Border">
          <Grid>
             <ContentPresenter Margin="6,3,6,3" 
@@ -2480,5 +2515,317 @@
    <!--#endregion UserControlStyle-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region ScrollBarStyle-->
    
+   <Style x:Key="RepeatButtonTransparent" TargetType="{x:Type RepeatButton}">
+      <Setter Property="OverridesDefaultStyle" Value="true"/>
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="Focusable" Value="false"/>
+      <Setter Property="IsTabStop" Value="false"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type RepeatButton}">
+               <Rectangle Fill="{TemplateBinding Background}" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}"/>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   <Style x:Key="ScrollBarButton" TargetType="{x:Type RepeatButton}">
+      <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
+      <Setter Property="BorderThickness" Value="1"/>
+      <Setter Property="HorizontalContentAlignment" Value="Center"/>
+      <Setter Property="VerticalContentAlignment" Value="Center"/>
+      <Setter Property="Padding" Value="1"/>
+      <Setter Property="Focusable" Value="false"/>
+      <Setter Property="IsTabStop" Value="false"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type RepeatButton}">
+               <Border x:Name="border" 
+                       Background="{DynamicResource ScrollBar.Button.Static.Background}" 
+                       BorderBrush="{DynamicResource ScrollBar.Static.Border}" 
+                       BorderThickness="1" 
+                       SnapsToDevicePixels="true">
+                  <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" Value="true">
+                     <Setter Property="Background" TargetName="border" Value="{DynamicResource ScrollBar.MouseOver.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource ScrollBar.MouseOver.Border}"/>
+                  </Trigger>
+                  <Trigger Property="IsPressed" Value="true">
+                     <Setter Property="Background" TargetName="border" Value="{DynamicResource ScrollBar.Pressed.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource ScrollBar.Pressed.Border}"/>
+                  </Trigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Opacity" TargetName="contentPresenter" Value="0.56"/>
+                     <Setter Property="Background" TargetName="border" Value="{DynamicResource ScrollBar.Disabled.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource ScrollBar.Disabled.Border}"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   <Style x:Key="ScrollBarThumbVertical" TargetType="{x:Type Thumb}">
+      <Setter Property="OverridesDefaultStyle" Value="true"/>
+      <Setter Property="IsTabStop" Value="false"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Thumb}">
+               <Rectangle x:Name="rectangle" Fill="{DynamicResource ScrollBar.Static.Thumb}" Height="{TemplateBinding Height}" SnapsToDevicePixels="True" Width="{TemplateBinding Width}"/>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" Value="true">
+                     <Setter Property="Fill" TargetName="rectangle" Value="{DynamicResource ScrollBar.MouseOver.Thumb}"/>
+                  </Trigger>
+                  <Trigger Property="IsDragging" Value="true">
+                     <Setter Property="Fill" TargetName="rectangle" Value="{DynamicResource ScrollBar.Pressed.Thumb}"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   <Style x:Key="ScrollBarThumbHorizontal" TargetType="{x:Type Thumb}">
+      <Setter Property="OverridesDefaultStyle" Value="true"/>
+      <Setter Property="IsTabStop" Value="false"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Thumb}">
+               <Rectangle x:Name="rectangle" Fill="{DynamicResource ScrollBar.Static.Thumb}" Height="{TemplateBinding Height}" SnapsToDevicePixels="True" Width="{TemplateBinding Width}"/>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" Value="true">
+                     <Setter Property="Fill" TargetName="rectangle" Value="{DynamicResource ScrollBar.MouseOver.Thumb}"/>
+                  </Trigger>
+                  <Trigger Property="IsDragging" Value="true">
+                     <Setter Property="Fill" TargetName="rectangle" Value="{DynamicResource ScrollBar.Pressed.Thumb}"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   <Style TargetType="{x:Type ScrollBar}">
+      <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false"/>
+      <Setter Property="Stylus.IsFlicksEnabled" Value="false"/>
+      <Setter Property="Background" Value="{DynamicResource ScrollBar.Static.Background}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource ScrollBar.Static.Border}"/>
+      <Setter Property="BorderThickness" Value="1,0"/>
+      <Setter Property="Width" Value="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}"/>
+      <Setter Property="MinWidth" Value="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ScrollBar}">
+               <Grid x:Name="Bg" SnapsToDevicePixels="true">
+                  <Grid.RowDefinitions>
+                     <RowDefinition MaxHeight="{DynamicResource {x:Static SystemParameters.VerticalScrollBarButtonHeightKey}}"/>
+                     <RowDefinition Height="0.00001*"/>
+                     <RowDefinition MaxHeight="{DynamicResource {x:Static SystemParameters.VerticalScrollBarButtonHeightKey}}"/>
+                  </Grid.RowDefinitions>
+                  <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Grid.Row="1"/>
+                  <RepeatButton x:Name="PART_LineUpButton" Command="{x:Static ScrollBar.LineUpCommand}" IsEnabled="{TemplateBinding IsMouseOver}" Style="{StaticResource ScrollBarButton}">
+                     <Path x:Name="ArrowTop" 
+                           Data="M 0,4 C0,4 0,6 0,6 0,6 3.5,2.5 3.5,2.5 3.5,2.5 7,6 7,6 7,6 7,4 7,4 7,4 3.5,0.5 3.5,0.5 3.5,0.5 0,4 0,4 z" 
+                           Fill="{DynamicResource ScrollBar.Static.Glyph}" 
+                           Margin="3,4,3,3" Stretch="Uniform"/>
+                  </RepeatButton>
+                  <Track x:Name="PART_Track" IsDirectionReversed="true" IsEnabled="{TemplateBinding IsMouseOver}" Grid.Row="1">
+                     <Track.DecreaseRepeatButton>
+                        <RepeatButton Command="{x:Static ScrollBar.PageUpCommand}" Style="{StaticResource RepeatButtonTransparent}"/>
+                     </Track.DecreaseRepeatButton>
+                     <Track.IncreaseRepeatButton>
+                        <RepeatButton Command="{x:Static ScrollBar.PageDownCommand}" Style="{StaticResource RepeatButtonTransparent}"/>
+                     </Track.IncreaseRepeatButton>
+                     <Track.Thumb>
+                        <Thumb Style="{StaticResource ScrollBarThumbVertical}"/>
+                     </Track.Thumb>
+                  </Track>
+                  <RepeatButton x:Name="PART_LineDownButton" Command="{x:Static ScrollBar.LineDownCommand}" IsEnabled="{TemplateBinding IsMouseOver}" Grid.Row="2" Style="{StaticResource ScrollBarButton}">
+                     <Path x:Name="ArrowBottom" Data="M 0,2.5 C0,2.5 0,0.5 0,0.5 0,0.5 3.5,4 3.5,4 3.5,4 7,0.5 7,0.5 7,0.5 7,2.5 7,2.5 7,2.5 3.5,6 3.5,6 3.5,6 0,2.5 0,2.5 z" Fill="{StaticResource ScrollBar.Static.Glyph}" Margin="3,4,3,3" Stretch="Uniform"/>
+                  </RepeatButton>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsMouseOver, ElementName=PART_LineDownButton}" Value="true"/>
+                        <Condition Binding="{Binding IsPressed, ElementName=PART_LineDownButton}" Value="true"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Fill" TargetName="ArrowBottom" Value="{DynamicResource ScrollBar.Pressed.Glyph}"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsMouseOver, ElementName=PART_LineUpButton}" Value="true"/>
+                        <Condition Binding="{Binding IsPressed, ElementName=PART_LineUpButton}" Value="true"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Fill" TargetName="ArrowTop" Value="{DynamicResource ScrollBar.Pressed.Glyph}"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsMouseOver, ElementName=PART_LineDownButton}" Value="true"/>
+                        <Condition Binding="{Binding IsPressed, ElementName=PART_LineDownButton}" Value="false"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Fill" TargetName="ArrowBottom" Value="{DynamicResource ScrollBar.MouseOver.Glyph}"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsMouseOver, ElementName=PART_LineUpButton}" Value="true"/>
+                        <Condition Binding="{Binding IsPressed, ElementName=PART_LineUpButton}" Value="false"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Fill" TargetName="ArrowTop" Value="{DynamicResource ScrollBar.MouseOver.Glyph}"/>
+                  </MultiDataTrigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Fill" TargetName="ArrowTop" Value="{DynamicResource ScrollBar.Disabled.Glyph}"/>
+                     <Setter Property="Fill" TargetName="ArrowBottom" Value="{DynamicResource ScrollBar.Disabled.Glyph}"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+      <Style.Triggers>
+         <Trigger Property="Orientation" Value="Horizontal">
+            <Setter Property="Width" Value="Auto"/>
+            <Setter Property="MinWidth" Value="0"/>
+            <Setter Property="Height" Value="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarHeightKey}}"/>
+            <Setter Property="MinHeight" Value="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarHeightKey}}"/>
+            <Setter Property="BorderThickness" Value="0,1"/>
+            <Setter Property="Template">
+               <Setter.Value>
+                  <ControlTemplate TargetType="{x:Type ScrollBar}">
+                     <Grid x:Name="Bg" SnapsToDevicePixels="true">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition MaxWidth="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarButtonWidthKey}}"/>
+                           <ColumnDefinition Width="0.00001*"/>
+                           <ColumnDefinition MaxWidth="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarButtonWidthKey}}"/>
+                        </Grid.ColumnDefinitions>
+                        <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Grid.Column="1"/>
+                        <RepeatButton x:Name="PART_LineLeftButton" Command="{x:Static ScrollBar.LineLeftCommand}" IsEnabled="{TemplateBinding IsMouseOver}" Style="{StaticResource ScrollBarButton}">
+                           <Path x:Name="ArrowLeft" 
+                                 Data="M 3.18,7 C3.18,7 5,7 5,7 5,7 1.81,3.5 1.81,3.5 1.81,3.5 5,0 5,0 5,0 3.18,0 3.18,0 3.18,0 0,3.5 0,3.5 0,3.5 3.18,7 3.18,7 z" 
+                                 Fill="{DynamicResource ScrollBar.Static.Glyph}" 
+                                 Margin="3" 
+                                 Stretch="Uniform"/>
+                        </RepeatButton>
+                        <Track x:Name="PART_Track" Grid.Column="1" IsEnabled="{TemplateBinding IsMouseOver}">
+                           <Track.DecreaseRepeatButton>
+                              <RepeatButton Command="{x:Static ScrollBar.PageLeftCommand}" Style="{StaticResource RepeatButtonTransparent}"/>
+                           </Track.DecreaseRepeatButton>
+                           <Track.IncreaseRepeatButton>
+                              <RepeatButton Command="{x:Static ScrollBar.PageRightCommand}" Style="{StaticResource RepeatButtonTransparent}"/>
+                           </Track.IncreaseRepeatButton>
+                           <Track.Thumb>
+                              <Thumb Style="{StaticResource ScrollBarThumbHorizontal}"/>
+                           </Track.Thumb>
+                        </Track>
+                        <RepeatButton x:Name="PART_LineRightButton" Command="{x:Static ScrollBar.LineRightCommand}" Grid.Column="2" IsEnabled="{TemplateBinding IsMouseOver}" Style="{StaticResource ScrollBarButton}">
+                           <Path x:Name="ArrowRight" 
+                                 Data="M 1.81,7 C1.81,7 0,7 0,7 0,7 3.18,3.5 3.18,3.5 3.18,3.5 0,0 0,0 0,0 1.81,0 1.81,0 1.81,0 5,3.5 5,3.5 5,3.5 1.81,7 1.81,7 z" 
+                                 Fill="{DynamicResource ScrollBar.Static.Glyph}" 
+                                 Margin="3" 
+                                 Stretch="Uniform"/>
+                        </RepeatButton>
+                     </Grid>
+                     <ControlTemplate.Triggers>
+                        <MultiDataTrigger>
+                           <MultiDataTrigger.Conditions>
+                              <Condition Binding="{Binding IsMouseOver, ElementName=PART_LineRightButton}" Value="true"/>
+                              <Condition Binding="{Binding IsPressed, ElementName=PART_LineRightButton}" Value="true"/>
+                           </MultiDataTrigger.Conditions>
+                           <Setter Property="Fill" TargetName="ArrowRight" Value="{DynamicResource ScrollBar.Pressed.Glyph}"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                           <MultiDataTrigger.Conditions>
+                              <Condition Binding="{Binding IsMouseOver, ElementName=PART_LineLeftButton}" Value="true"/>
+                              <Condition Binding="{Binding IsPressed, ElementName=PART_LineLeftButton}" Value="true"/>
+                           </MultiDataTrigger.Conditions>
+                           <Setter Property="Fill" TargetName="ArrowLeft" Value="{DynamicResource ScrollBar.Pressed.Glyph}"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                           <MultiDataTrigger.Conditions>
+                              <Condition Binding="{Binding IsMouseOver, ElementName=PART_LineRightButton}" Value="true"/>
+                              <Condition Binding="{Binding IsPressed, ElementName=PART_LineRightButton}" Value="false"/>
+                           </MultiDataTrigger.Conditions>
+                           <Setter Property="Fill" TargetName="ArrowRight" Value="{DynamicResource ScrollBar.MouseOver.Glyph}"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                           <MultiDataTrigger.Conditions>
+                              <Condition Binding="{Binding IsMouseOver, ElementName=PART_LineLeftButton}" Value="true"/>
+                              <Condition Binding="{Binding IsPressed, ElementName=PART_LineLeftButton}" Value="false"/>
+                           </MultiDataTrigger.Conditions>
+                           <Setter Property="Fill" TargetName="ArrowLeft" Value="{DynamicResource ScrollBar.MouseOver.Glyph}"/>
+                        </MultiDataTrigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                           <Setter Property="Fill" TargetName="ArrowLeft" Value="{DynamicResource ScrollBar.Disabled.Glyph}"/>
+                           <Setter Property="Fill" TargetName="ArrowRight" Value="{DynamicResource ScrollBar.Disabled.Glyph}"/>
+                        </Trigger>
+                     </ControlTemplate.Triggers>
+                  </ControlTemplate>
+               </Setter.Value>
+            </Setter>
+         </Trigger>
+      </Style.Triggers>
+   </Style>
+
+   <Style TargetType="{x:Type ScrollViewer}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ScrollViewer}">
+               <Grid>
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition/>
+                     <ColumnDefinition Width="Auto"/>
+                  </Grid.ColumnDefinitions>
+                  <Grid.RowDefinitions>
+                     <RowDefinition/>
+                     <RowDefinition Height="Auto"/>
+                  </Grid.RowDefinitions>
+                  <ScrollContentPresenter Grid.Column="0"/>
+                  <ScrollBar x:Name="PART_VerticalScrollBar" Grid.Row="0" Grid.Column="1" Value="{TemplateBinding VerticalOffset}" Maximum="{TemplateBinding ScrollableHeight}" ViewportSize="{TemplateBinding ViewportHeight}" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"/>
+                  <ScrollBar x:Name="PART_HorizontalScrollBar" Orientation="Horizontal" Grid.Row="1" Grid.Column="0" Value="{TemplateBinding HorizontalOffset}" Maximum="{TemplateBinding ScrollableWidth}" ViewportSize="{TemplateBinding ViewportWidth}" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"/>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   
+   <!--#endregion ScrollBarStyle-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region SeparatorStyle-->
+
+   <Style x:Key="TopPanel_Separator" TargetType="{x:Type Separator}">
+      <Setter Property="HorizontalAlignment" Value="Left"/>
+      <Setter Property="VerticalAlignment" Value="Top"/>
+      <Setter Property="Height" Value="100"/>
+      <Setter Property="Width" Value="100"/>
+      <Setter Property="RenderTransformOrigin" Value="0.5,0.5"/>
+      <Setter Property="Margin" Value="-30,0,-30,0"/>
+      <Setter Property="RenderTransform">
+         <Setter.Value>
+            <TransformGroup>
+               <RotateTransform Angle="90"/>
+            </TransformGroup>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="TopPanel1_Separator" TargetType="{x:Type Separator}">
+      <Setter Property="Margin" Value="0,10,0,5"/>
+   </Style>
+   
+   <!--#endregion SeparatorStyle-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region WrapPanelStyle-->
+   
+   <Style x:Key="TopPanel_WrapPanel" TargetType="{x:Type WrapPanel}">
+      <Setter Property="Orientation" Value="Horizontal"/>
+   </Style>
+
+   <!--#endregion WrapPanelStyle-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
 </ResourceDictionary>
diff --git a/Utility/EgtStone3DDictionary.xaml b/Utility/EgtStone3DDictionary.xaml
index b53ea9a..6b7e2ce 100644
--- a/Utility/EgtStone3DDictionary.xaml
+++ b/Utility/EgtStone3DDictionary.xaml
@@ -56,6 +56,7 @@
    <!--#region TextBoxColor-->
 
    <SolidColorBrush x:Key="TextBox.Static.Foreground" Color="{StaticResource EgalwareGray_Color}"/>
+   <SolidColorBrush x:Key="BaseTextBox.Static.Foreground" Color="{StaticResource EgalwareGray_Color}"/>
 
    <!--#endregion TextBoxColor-->
 
@@ -89,17 +90,21 @@
    <!--#region TabItemColor-->
 
    <LinearGradientBrush x:Key="TabItem.Static.Background" EndPoint="0,1" StartPoint="0,0">
-      <GradientStop Color="{StaticResource EgtStone3D_Gallery_Color}" Offset="0.0"/>
-      <GradientStop Color="{StaticResource EgtStone3D_Mercury_Color}" Offset="1.0"/>
+      <GradientStop Color="{StaticResource EgalwareWhite_Color}" Offset="0.0"/>
+      <GradientStop Color="{StaticResource EgalwareWhite_Color}" Offset="1.0"/>
    </LinearGradientBrush>
-   <SolidColorBrush x:Key="TabItem.Static.Border" Color="{StaticResource EgtStone3D_SilverChalice_Color}"/>
+   <SolidColorBrush x:Key="TabItem.Static.Foreground" Color="{StaticResource EgtStone3D_Black_Color}"/>
+   <SolidColorBrush x:Key="TabItem.Static.Border" Color="{StaticResource EgalwareWhite_Color}"/>
    <LinearGradientBrush x:Key="TabItem.MouseOver.Background" EndPoint="0,1" StartPoint="0,0">
       <GradientStop Color="{StaticResource EgtStone3D_Selago_Color}" Offset="0.0"/>
       <GradientStop Color="{StaticResource EgtStone3D_HawkesBlue_Color}" Offset="1.0"/>
    </LinearGradientBrush>
    <SolidColorBrush x:Key="TabItem.MouseOver.Border" Color="{StaticResource EgtStone3D_Seagull_Color}"/>
-   <SolidColorBrush x:Key="TabItem.Selected.Background" Color="{StaticResource EgalwareWhite_Color}"/>
-   <SolidColorBrush x:Key="TabItem.Selected.Border" Color="{StaticResource EgtStone3D_SilverChalice_Color}"/>
+   <LinearGradientBrush x:Key="TabItem.Selected.Background" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="{StaticResource EgalwareWhite_Color}" Offset="0.0"/>
+      <GradientStop Color="{StaticResource EgalwareWhite_Color}" Offset="1.0"/>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="TabItem.Selected.Border" Color="{StaticResource EgalwareWhite_Color}"/>
    <SolidColorBrush x:Key="TabItem.Disabled.Background" Color="{StaticResource EgtStone3D_Gallery_Color}"/>
    <SolidColorBrush x:Key="TabItem.Disabled.Border" Color="{StaticResource EgtStone3D_Alto_Color}"/>
 
@@ -219,6 +224,7 @@
 
    <SolidColorBrush x:Key="ComboBox.Static.Background" Color="{StaticResource EgalwareWhite_Color}"/>
    <SolidColorBrush x:Key="ComboBox.Static.Border" Color="{StaticResource EgtStone3D_SilverChalice_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Foreground" Color="{StaticResource EgtStone3D_Black_Color}"/>
    <SolidColorBrush x:Key="ComboBox.Static.Editable.Background" Color="{StaticResource EgalwareWhite_Color}"/>
    <SolidColorBrush x:Key="ComboBox.Static.Editable.Border" Color="{StaticResource EgtStone3D_Bombay_Color}"/>
    <SolidColorBrush x:Key="ComboBox.Static.Editable.Button.Background" Color="{StaticResource EgalwareTransparent_Color}"/>
@@ -261,5 +267,39 @@
    <SolidColorBrush x:Key="TextBox.Static.Background" Color="{StaticResource EgalwareWhite_Color}"/>
 
    <!--#endregion ComboBoxColor-->
+   
+   <!--#region TreeViewColor-->
+
+   <SolidColorBrush x:Key="TreeView.Static.Background" Color="{StaticResource EgalwareTransparent_Color}"/>
+   <SolidColorBrush x:Key="TreeView.Static.Foreground" Color="{StaticResource EgalwareGray}"/>
+
+   <!--#endregion TreeViewColor-->
+   
+   <!--#region ListBoxColor-->
+
+   <SolidColorBrush x:Key="ListBox.Static.Background" Color="{StaticResource EgalwareTransparent_Color}"/>
+
+   <!--#endregion ListBoxRegion-->
+   
+   <!--#region ScrollBarColor-->
+
+   <SolidColorBrush x:Key="ScrollBar.Static.Background" Color="{StaticResource EgtStone3D_Gallery_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Static.Border" Color="{StaticResource EgtStone3D_Gallery_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Static.Glyph" Color="{StaticResource EgalwareScorpion_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Static.Thumb" Color="{StaticResource EgtStone3D_Silver_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.MouseOver.Background" Color="{StaticResource EgtStone3D_Alto_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.MouseOver.Border" Color="{StaticResource EgtStone3D_Alto_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.MouseOver.Glyph" Color="{StaticResource EgtStone3D_Black_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.MouseOver.Thumb" Color="{StaticResource EgtStone3D_SilverChalice_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Pressed.Background" Color="{StaticResource EgalwareScorpion_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Pressed.Border" Color="{StaticResource EgalwareScorpion_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Pressed.Thumb" Color="{StaticResource EgalwareScorpion_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Pressed.Glyph" Color="{StaticResource EgtStone3D_Black_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Disabled.Background" Color="{StaticResource EgtStone3D_Gallery_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Disabled.Border" Color="{StaticResource EgtStone3D_Gallery_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Disabled.Glyph" Color="{StaticResource EgtStone3D_Silver_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Button.Static.Background" Color="{StaticResource EgalwareWhite_Color}"/>
+
+   <!--#endregion ScrollBarColor-->
 
 </ResourceDictionary>