From bbf5d257beb7ca5170dcc78ac999cb45e4e1327b Mon Sep 17 00:00:00 2001
From: Nicola Pievani <nicola.pievani@egalware>
Date: Tue, 5 Nov 2024 10:11:52 +0100
Subject: [PATCH] Inizio creazione nuovo tema

---
 Application.xaml                  |  14 +-
 Application.xaml.vb               |  16 +
 EgtDOORCreator.vbproj             |   4 +
 EgtDOORCreatorDarkDictionary.xaml |  55 ++
 EgtDOORCreatorDictionary.xaml     | 818 +++++++++++++++---------------
 MainWindow/MainWindowV.xaml.vb    |   5 +
 MainWindow/MainWindowVM.vb        |  11 +
 SceneManager/SceneManagerV.xaml   |   2 +-
 8 files changed, 518 insertions(+), 407 deletions(-)
 create mode 100644 EgtDOORCreatorDarkDictionary.xaml

diff --git a/Application.xaml b/Application.xaml
index 12dcf9b..9893640 100644
--- a/Application.xaml
+++ b/Application.xaml
@@ -2,9 +2,19 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     ShutdownMode="OnMainWindowClose">
-   
+
     <Application.Resources>
-      <ResourceDictionary Source="EgtDOORCreatorDictionary.xaml"/>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary x:Name="ThemeDictionary">
+                    <ResourceDictionary.MergedDictionaries>
+                        <ResourceDictionary Source="EgtDOORCreatorDarkDictionary.xaml"/>
+                        <ResourceDictionary Source="EgtDOORCreatorDictionary.xaml"/>
+                    </ResourceDictionary.MergedDictionaries>
+                </ResourceDictionary>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+        
    </Application.Resources>
    
 </Application>
diff --git a/Application.xaml.vb b/Application.xaml.vb
index d15b2f6..3485136 100644
--- a/Application.xaml.vb
+++ b/Application.xaml.vb
@@ -20,4 +20,20 @@ Class Application
       'Me.MainWindow.Show()
    End Sub
 
+   Public Property ThemeDictionary As ResourceDictionary
+      ' You could probably get it via its name with some query logic as well.
+      Get
+         Return Resources.MergedDictionaries(0)
+      End Get
+      Set(value As ResourceDictionary)
+      End Set
+   End Property
+
+   Public Sub ChangeTheme(uri As Uri)
+      ThemeDictionary.MergedDictionaries.Clear()
+      Dim rd As ResourceDictionary = New ResourceDictionary()
+      rd.Source = uri
+      ThemeDictionary.MergedDictionaries.Add(rd) ' New ResourceDictionary()) ' Source:=uri))
+   End Sub
+
 End Class
diff --git a/EgtDOORCreator.vbproj b/EgtDOORCreator.vbproj
index efeab80..80a64ec 100644
--- a/EgtDOORCreator.vbproj
+++ b/EgtDOORCreator.vbproj
@@ -278,6 +278,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="EgtDOORCreatorDarkDictionary.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="EgtDOORCreatorDictionary.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/EgtDOORCreatorDarkDictionary.xaml b/EgtDOORCreatorDarkDictionary.xaml
new file mode 100644
index 0000000..106e9a7
--- /dev/null
+++ b/EgtDOORCreatorDarkDictionary.xaml
@@ -0,0 +1,55 @@
+<ResourceDictionary 
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+    xmlns:EgtDOORCreator="clr-namespace:EgtDOORCreator"
+    xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5">
+
+    <!--Importo EgtDictionary-->
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="EgtDOORCreatorDictionary.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <SolidColorBrush x:Key="EgaltechBlue1" Color="#4b0082" />
+    <SolidColorBrush x:Key="EgaltechBlue2" Color="#b4ff7d" />
+    <SolidColorBrush x:Key="EgaltechBlue3" Color="#4b0082" />
+    <SolidColorBrush x:Key="EgaltechBlue4" Color="#4b0082" />
+    <SolidColorBrush x:Key="EgaltechWhite" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="EgaltechGray" Color="#FF58585B" />
+    <SolidColorBrush x:Key="EgaltechLightGray" Color="LightGray" />
+
+    <Thickness x:Key="GroupBox_BorderThickness">0.5</Thickness>
+    
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+    <!-- Button Style -->
+
+    <SolidColorBrush x:Key="Button.Static.Background" Color="Transparent"/>
+    <SolidColorBrush x:Key="Button.Static.Border" Color="Transparent"/>
+    <SolidColorBrush x:Key="Button.MouseOver.Background" Color="#FFBEE6FD"/>
+    <SolidColorBrush x:Key="Button.MouseOver.Border" Color="#FF3C7FB1"/>
+    <SolidColorBrush x:Key="Button.Pressed.Background" Color="#FFC4E5F6"/>
+    <SolidColorBrush x:Key="Button.Pressed.Border" Color="#FF2C628B"/>
+    <SolidColorBrush x:Key="Button.Disabled.Background" Color="#FFF4F4F4"/>
+    <SolidColorBrush x:Key="Button.Disabled.Border" Color="#FFADB2B5"/>
+    <SolidColorBrush x:Key="Button.Disabled.Foreground" Color="Gold"/>
+    <SolidColorBrush x:Key="Button.Static.Foreground" Color="WhiteSmoke"/>
+
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+    <!-- EgtCustomWindow -->
+
+    <Style TargetType="{x:Type EgtWPFLib5:EgtCustomWindow}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
+        <Setter Property="TitleBarHeight" Value="32"/>
+        <Setter Property="Background" Value="#1f3864"/>
+        <Setter Property="TitleBarBrush" Value="{DynamicResource EgaltechBlue1}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource EgaltechBlue1}"/>
+    </Style>
+
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+    <Style TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="{DynamicResource EgaltechBlue2}"/>
+    </Style>
+
+</ResourceDictionary>
diff --git a/EgtDOORCreatorDictionary.xaml b/EgtDOORCreatorDictionary.xaml
index 6609fa5..7b463fd 100644
--- a/EgtDOORCreatorDictionary.xaml
+++ b/EgtDOORCreatorDictionary.xaml
@@ -5,208 +5,214 @@
    xmlns:EgtDOORCreator="clr-namespace:EgtDOORCreator"
    xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5">
 
-   <EgtDOORCreator:MainWindowVM x:Key="MainWindowVM"/>
-   <EgtDOORCreator:ProjectManagerVM x:Key="ProjectManagerVM"/>
-   <EgtDOORCreator:ProjectManagerHardwareVM x:Key="ProjectManagerHardwareVM"/>
-   <EgtDOORCreator:AssemblyManagerVM x:Key="AssemblyManagerVM"/>
-   <EgtDOORCreator:PartPageVM x:Key="PartPageVM"/>
-   <!--<EgtDOORCreator:CompoPanelVM x:Key="CompoPanelVM"/>-->
-   <EgtDOORCreator:SceneManagerVM x:Key="SceneManagerVM"/>
-   <EgtDOORCreator:StatusBarVM x:Key="StatusBarVM"/>
-   <EgtDOORCreator:AssemblyPageVM x:Key="AssemblyPageVM"/>
-   <EgtDOORCreator:HardwarePageVM x:Key="HardwarePageVM"/>
-   <EgtDOORCreator:DimensioningPanelVM x:Key="DimensioningPanelVM"/>
+    <EgtDOORCreator:MainWindowVM x:Key="MainWindowVM"/>
+    <EgtDOORCreator:ProjectManagerVM x:Key="ProjectManagerVM"/>
+    <EgtDOORCreator:ProjectManagerHardwareVM x:Key="ProjectManagerHardwareVM"/>
+    <EgtDOORCreator:AssemblyManagerVM x:Key="AssemblyManagerVM"/>
+    <EgtDOORCreator:PartPageVM x:Key="PartPageVM"/>
+    <!--<EgtDOORCreator:CompoPanelVM x:Key="CompoPanelVM"/>-->
+    <EgtDOORCreator:SceneManagerVM x:Key="SceneManagerVM"/>
+    <EgtDOORCreator:StatusBarVM x:Key="StatusBarVM"/>
+    <EgtDOORCreator:AssemblyPageVM x:Key="AssemblyPageVM"/>
+    <EgtDOORCreator:HardwarePageVM x:Key="HardwarePageVM"/>
+    <EgtDOORCreator:DimensioningPanelVM x:Key="DimensioningPanelVM"/>
 
-   <!--Colori predefiniti-->
-   <SolidColorBrush x:Key="EgaltechBlue1" Color="#FF4D84C4" />
-   <SolidColorBrush x:Key="EgaltechBlue2" Color="#FF7096CE" />
-   <SolidColorBrush x:Key="EgaltechBlue3" Color="#FF90ABD9" />
-   <SolidColorBrush x:Key="EgaltechBlue4" Color="#FFB2C3E4" />
-   <SolidColorBrush x:Key="EgaltechWhite" Color="#FFFFFFFF" />
-   <SolidColorBrush x:Key="EgaltechGray" Color="#FF58585B" />
-   <SolidColorBrush x:Key="EgaltechLightGray" Color="LightGray" />
+    <!--Colori predefiniti-->
+    <SolidColorBrush x:Key="EgaltechBlue1" Color="#FF4D84C4" />
+    <SolidColorBrush x:Key="EgaltechBlue2" Color="#FF7096CE" />
+    <SolidColorBrush x:Key="EgaltechBlue3" Color="#FF90ABD9" />
+    <SolidColorBrush x:Key="EgaltechBlue4" Color="#FFB2C3E4" />
+    <SolidColorBrush x:Key="EgaltechWhite" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="EgaltechGray" Color="#FF58585B" />
+    <SolidColorBrush x:Key="EgaltechLightGray" Color="LightGray" />
 
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
+    <Thickness x:Key="GroupBox_BorderThickness">0.7</Thickness>
+    
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <Style x:Key="DoorParamsItemsControlStyle" TargetType="{x:Type ItemsControl}">
-      <Setter Property="ItemsPanel">
-         <Setter.Value>
-            <ItemsPanelTemplate>
-               <WrapPanel Orientation="Vertical"/>
-            </ItemsPanelTemplate>
-         </Setter.Value>
-      </Setter>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type ItemsControl}">
-               <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Disabled" CanContentScroll="True">
-                  <ItemsPresenter/>
-               </ScrollViewer>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
+    <Style x:Key="DoorParamsItemsControlStyle" TargetType="{x:Type ItemsControl}">
+        <Setter Property="ItemsPanel">
+            <Setter.Value>
+                <ItemsPanelTemplate>
+                    <WrapPanel Orientation="Vertical"/>
+                </ItemsPanelTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ItemsControl}">
+                    <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Disabled" CanContentScroll="True">
+                        <ItemsPresenter/>
+                    </ScrollViewer>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!-- DoorListBox -->
+    <!-- DoorListBox -->
 
-   <SolidColorBrush x:Key="ScrollBar.Static.Background" Color="#F0F0F0"/>
-   <SolidColorBrush x:Key="ScrollBar.Static.Border" Color="#F0F0F0"/>
-   <SolidColorBrush x:Key="ScrollBar.Pressed.Glyph" Color="#FFFFFF"/>
-   <SolidColorBrush x:Key="ScrollBar.MouseOver.Glyph" Color="#000000"/>
-   <SolidColorBrush x:Key="ScrollBar.Disabled.Glyph" Color="#BFBFBF"/>
-   <SolidColorBrush x:Key="ScrollBar.Static.Glyph" Color="#606060"/>
-   <SolidColorBrush x:Key="ScrollBar.MouseOver.Background" Color="#DADADA"/>
-   <SolidColorBrush x:Key="ScrollBar.MouseOver.Border" Color="#DADADA"/>
-   <SolidColorBrush x:Key="ScrollBar.Pressed.Background" Color="#606060"/>
-   <SolidColorBrush x:Key="ScrollBar.Pressed.Border" Color="#606060"/>
-   <SolidColorBrush x:Key="ScrollBar.Disabled.Background" Color="#F0F0F0"/>
-   <SolidColorBrush x:Key="ScrollBar.Disabled.Border" Color="#F0F0F0"/>
-   <Style x:Key="CustomScrollBarButton" 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" CornerRadius="3" BorderBrush="{StaticResource ScrollBar.Static.Border}" BorderThickness="1" Background="{StaticResource ScrollBar.Static.Background}" 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="{StaticResource ScrollBar.MouseOver.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource ScrollBar.MouseOver.Border}"/>
-                  </Trigger>
-                  <Trigger Property="IsPressed" Value="true">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource ScrollBar.Pressed.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource ScrollBar.Pressed.Border}"/>
-                  </Trigger>
-                  <Trigger Property="IsEnabled" Value="false">
-                     <Setter Property="Opacity" TargetName="contentPresenter" Value="0.56"/>
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource ScrollBar.Disabled.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource ScrollBar.Disabled.Border}"/>
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
+    <SolidColorBrush x:Key="ScrollBar.Static.Background" Color="#F0F0F0"/>
+    <SolidColorBrush x:Key="ScrollBar.Static.Border" Color="#F0F0F0"/>
+    <SolidColorBrush x:Key="ScrollBar.Pressed.Glyph" Color="#FFFFFF"/>
+    <SolidColorBrush x:Key="ScrollBar.MouseOver.Glyph" Color="#000000"/>
+    <SolidColorBrush x:Key="ScrollBar.Disabled.Glyph" Color="#BFBFBF"/>
+    <SolidColorBrush x:Key="ScrollBar.Static.Glyph" Color="#606060"/>
+    <SolidColorBrush x:Key="ScrollBar.MouseOver.Background" Color="#DADADA"/>
+    <SolidColorBrush x:Key="ScrollBar.MouseOver.Border" Color="#DADADA"/>
+    <SolidColorBrush x:Key="ScrollBar.Pressed.Background" Color="#606060"/>
+    <SolidColorBrush x:Key="ScrollBar.Pressed.Border" Color="#606060"/>
+    <SolidColorBrush x:Key="ScrollBar.Disabled.Background" Color="#F0F0F0"/>
+    <SolidColorBrush x:Key="ScrollBar.Disabled.Border" Color="#F0F0F0"/>
+    <Style x:Key="CustomScrollBarButton" 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" CornerRadius="3" BorderBrush="{StaticResource ScrollBar.Static.Border}" BorderThickness="1" Background="{StaticResource ScrollBar.Static.Background}" 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="{StaticResource ScrollBar.MouseOver.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource ScrollBar.MouseOver.Border}"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="true">
+                            <Setter Property="Background" TargetName="border" Value="{StaticResource ScrollBar.Pressed.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource ScrollBar.Pressed.Border}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Opacity" TargetName="contentPresenter" Value="0.56"/>
+                            <Setter Property="Background" TargetName="border" Value="{StaticResource ScrollBar.Disabled.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource ScrollBar.Disabled.Border}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
-   <SolidColorBrush x:Key="ListBox.Static.Background" Color="#FFFFFFFF"/>
-   <SolidColorBrush x:Key="ListBox.Static.Border" Color="#FFABADB3"/>
-   <SolidColorBrush x:Key="ListBox.Disabled.Background" Color="#FFFFFFFF"/>
-   <SolidColorBrush x:Key="ListBox.Disabled.Border" Color="#FFD9D9D9"/>
-   <Style x:Key="DoorListBox" TargetType="{x:Type ListBox}">
-      <Setter Property="Background" Value="Transparent"/>
-      <Setter Property="BorderBrush" Value="Transparent"/>
-      <Setter Property="BorderThickness" Value="0"/>
-      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-      <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
-      <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden"/>
-      <Setter Property="ScrollViewer.CanContentScroll" Value="False"/>
-      <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
-      <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-      <Setter Property="VerticalContentAlignment" Value="Center"/>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type ListBox}">
-               <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="0" SnapsToDevicePixels="true">
-                  <EgtWPFLib5:EgtScrollViewer Focusable="false" Padding="{TemplateBinding Padding}" IsCustom="True" Orientation="Horizontal"
+    <SolidColorBrush x:Key="ListBox.Static.Background" Color="#FFFFFFFF"/>
+    <SolidColorBrush x:Key="ListBox.Static.Border" Color="#FFABADB3"/>
+    <SolidColorBrush x:Key="ListBox.Disabled.Background" Color="#FFFFFFFF"/>
+    <SolidColorBrush x:Key="ListBox.Disabled.Border" Color="#FFD9D9D9"/>
+    <Style x:Key="DoorListBox" TargetType="{x:Type ListBox}">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden"/>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="False"/>
+        <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ListBox}">
+                    <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="0" SnapsToDevicePixels="true">
+                        <EgtWPFLib5:EgtScrollViewer Focusable="false" Padding="{TemplateBinding Padding}" IsCustom="True" Orientation="Horizontal"
                      RepeatButtonDimension="20" RepeatButtonStyle="{StaticResource CustomScrollBarButton}">
-                     <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                  </EgtWPFLib5:EgtScrollViewer>
-               </Border>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsEnabled" Value="false">
-                     <Setter Property="Background" TargetName="Bd" Value="{StaticResource ListBox.Disabled.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource ListBox.Disabled.Border}"/>
-                  </Trigger>
-                  <MultiTrigger>
-                     <MultiTrigger.Conditions>
-                        <Condition Property="IsGrouping" Value="true"/>
-                        <!--<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false"/>-->
-                     </MultiTrigger.Conditions>
-                     <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
-                  </MultiTrigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
+                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </EgtWPFLib5:EgtScrollViewer>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Background" TargetName="Bd" Value="{StaticResource ListBox.Disabled.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource ListBox.Disabled.Border}"/>
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsGrouping" Value="true"/>
+                                <!--<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false"/>-->
+                            </MultiTrigger.Conditions>
+                            <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!-- FocusVisual -->
+    <!-- FocusVisual -->
 
-   <!-- FocusVisual standard-->
-   <Style x:Key="FocusVisual">
-      <Setter Property="Control.Template">
-         <Setter.Value>
-            <ControlTemplate>
-               <Rectangle Margin="2" SnapsToDevicePixels="true" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" StrokeThickness="1" StrokeDashArray="1 2"/>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
+    <!-- FocusVisual standard-->
+    <Style x:Key="FocusVisual">
+        <Setter Property="Control.Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Rectangle Margin="2" SnapsToDevicePixels="true" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" StrokeThickness="1" StrokeDashArray="1 2"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!-- Button Style -->
+    <!-- Button Style -->
 
-   <SolidColorBrush x:Key="Button.Static.Background" Color="#FFDDDDDD"/>
-   <SolidColorBrush x:Key="Button.Static.Border" Color="#FF707070"/>
-   <SolidColorBrush x:Key="Button.MouseOver.Background" Color="#FFBEE6FD"/>
-   <SolidColorBrush x:Key="Button.MouseOver.Border" Color="#FF3C7FB1"/>
-   <SolidColorBrush x:Key="Button.Pressed.Background" Color="#FFC4E5F6"/>
-   <SolidColorBrush x:Key="Button.Pressed.Border" Color="#FF2C628B"/>
-   <SolidColorBrush x:Key="Button.Disabled.Background" Color="#FFF4F4F4"/>
-   <SolidColorBrush x:Key="Button.Disabled.Border" Color="#FFADB2B5"/>
-   <SolidColorBrush x:Key="Button.Disabled.Foreground" Color="#FF838383"/>
-   
-   <Style TargetType="{x:Type Button}">
-      <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
-      <Setter Property="Background" Value="{StaticResource Button.Static.Background}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource Button.Static.Border}"/>
-      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-      <Setter Property="BorderThickness" Value="1"/>
-      <Setter Property="HorizontalContentAlignment" Value="Center"/>
-      <Setter Property="VerticalContentAlignment" Value="Center"/>
-      <Setter Property="Padding" Value="1"/>
-      <Setter Property="Margin" Value="1"/>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type Button}">
-               <Border x:Name="border" CornerRadius="3" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
-                  <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-               </Border>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsDefaulted" Value="true">
-                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
-                  </Trigger>
-                  <Trigger Property="IsMouseOver" Value="true">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.MouseOver.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
-                  </Trigger>
-                  <Trigger Property="IsPressed" Value="true">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Pressed.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
-                  </Trigger>
-                  <Trigger Property="IsEnabled" Value="false">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Disabled.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Disabled.Border}"/>
-                     <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource Button.Disabled.Foreground}"/>
-                     <Setter Property="OpacityMask" Value="#54707070"/>
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
+    <SolidColorBrush x:Key="Button.Static.Background" Color="#FFDDDDDD"/>
+    <SolidColorBrush x:Key="Button.Static.Border" Color="#FF707070"/>
+    <SolidColorBrush x:Key="Button.MouseOver.Background" Color="#FFBEE6FD"/>
+    <SolidColorBrush x:Key="Button.MouseOver.Border" Color="#FF3C7FB1"/>
+    <SolidColorBrush x:Key="Button.Pressed.Background" Color="#FFC4E5F6"/>
+    <SolidColorBrush x:Key="Button.Pressed.Border" Color="#FF2C628B"/>
+    <SolidColorBrush x:Key="Button.Disabled.Background" Color="#FFF4F4F4"/>
+    <SolidColorBrush x:Key="Button.Disabled.Border" Color="#FFADB2B5"/>
+    <SolidColorBrush x:Key="Button.Disabled.Foreground" Color="#FF838383"/>
+    <SolidColorBrush x:Key="Button.Static.Foreground" Color="#FF1c1c1c"/>
+    
+    <Style TargetType="{x:Type Button}">
+        <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
+        <!--<Setter Property="Background" Value="{StaticResource Button.Static.Background}"/>
+            <Setter Property="BorderBrush" Value="{StaticResource Button.Static.Border}"/>-->
+        <Setter Property="Background" Value="{DynamicResource Button.Static.Background}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource Button.Static.Border}"/>
+        <!--<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>-->
+        <Setter Property="Foreground" Value="{DynamicResource Button.Static.Foreground}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Padding" Value="1"/>
+        <Setter Property="Margin" Value="1"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Border x:Name="border" CornerRadius="3" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+                        <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsDefaulted" Value="true">
+                            <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter Property="Background" TargetName="border" Value="{StaticResource Button.MouseOver.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="true">
+                            <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Pressed.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Disabled.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Disabled.Border}"/>
+                            <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource Button.Disabled.Foreground}"/>
+                            <Setter Property="OpacityMask" Value="#54707070"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
     <!-- ______________________________________________________________________________________________________________________________________________ -->
 
@@ -219,133 +225,133 @@
 
     <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!-- DoorButton Style -->
+    <!-- DoorButton Style -->
 
-   <SolidColorBrush x:Key="DoorButton.Static.Background" Color="#FFD07606"/>
-   <SolidColorBrush x:Key="DoorButton.Static.Border" Color="#000000"/>
-   <SolidColorBrush x:Key="DoorButton.MouseOver.Border" Color="#FF3C7FB1"/>
+    <SolidColorBrush x:Key="DoorButton.Static.Background" Color="#FFD07606"/>
+    <SolidColorBrush x:Key="DoorButton.Static.Border" Color="#000000"/>
+    <SolidColorBrush x:Key="DoorButton.MouseOver.Border" Color="#FF3C7FB1"/>
 
-   <Style x:Key="DoorButton" TargetType="{x:Type Button}">
-      <Setter Property="Background" Value="{StaticResource DoorButton.Static.Background}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource DoorButton.Static.Border}"/>
-      <Setter Property="BorderThickness" Value="1"/>
-      <Setter Property="HorizontalContentAlignment" Value="Center"/>
-      <Setter Property="VerticalContentAlignment" Value="Center"/>
-      <Setter Property="Padding" Value="0"/>
-      <Setter Property="Margin" Value="0"/>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type Button}">
-               <Border x:Name="border" CornerRadius="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="IsMouseOver" Value="true">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource DoorButton.Static.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
+    <Style x:Key="DoorButton" TargetType="{x:Type Button}">
+        <Setter Property="Background" Value="{StaticResource DoorButton.Static.Background}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource DoorButton.Static.Border}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Border x:Name="border" CornerRadius="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="IsMouseOver" Value="true">
+                            <Setter Property="Background" TargetName="border" Value="{StaticResource DoorButton.Static.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
 
-   <!-- ToggleButton Style -->
+    <!-- ToggleButton Style -->
 
-   <Style TargetType="{x:Type ToggleButton}">
-      <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
-      <Setter Property="Background" Value="{StaticResource Button.Static.Background}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource Button.Static.Border}"/>
-      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-      <Setter Property="BorderThickness" Value="1"/>
-      <Setter Property="HorizontalContentAlignment" Value="Center"/>
-      <Setter Property="VerticalContentAlignment" Value="Center"/>
-      <Setter Property="Padding" Value="1"/>
-      <Setter Property="Margin" Value="1"/>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type ToggleButton}">
-               <Border x:Name="border" CornerRadius="3" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
-                  <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-               </Border>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="Button.IsDefaulted" Value="true">
-                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
-                  </Trigger>
-                  <Trigger Property="IsMouseOver" Value="true">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.MouseOver.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
-                  </Trigger>
-                  <Trigger Property="IsPressed" Value="true">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Pressed.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
-                  </Trigger>
-                  <Trigger Property="IsChecked" Value="true">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Pressed.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
-                  </Trigger>
-                  <Trigger Property="IsEnabled" Value="false">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Disabled.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Disabled.Border}"/>
-                     <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource Button.Disabled.Foreground}"/>
-                     <Setter Property="OpacityMask" Value="#54707070"/>
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
+    <Style TargetType="{x:Type ToggleButton}">
+        <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
+        <Setter Property="Background" Value="{StaticResource Button.Static.Background}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource Button.Static.Border}"/>
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Padding" Value="1"/>
+        <Setter Property="Margin" Value="1"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <Border x:Name="border" CornerRadius="3" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+                        <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="Button.IsDefaulted" Value="true">
+                            <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter Property="Background" TargetName="border" Value="{StaticResource Button.MouseOver.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="true">
+                            <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Pressed.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
+                        </Trigger>
+                        <Trigger Property="IsChecked" Value="true">
+                            <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Pressed.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Disabled.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Disabled.Border}"/>
+                            <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource Button.Disabled.Foreground}"/>
+                            <Setter Property="OpacityMask" Value="#54707070"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <Style x:Key="GridViewPanelRadioButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="30"/>
-   </Style>
+    <Style x:Key="GridViewPanelRadioButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+        <Setter Property="Height" Value="30"/>
+        <Setter Property="Width" Value="30"/>
+    </Style>
 
-   <Style x:Key="GridViewPanelButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="30"/>
-   </Style>
+    <Style x:Key="GridViewPanelButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Height" Value="30"/>
+        <Setter Property="Width" Value="30"/>
+    </Style>
 
-   <Style x:Key="GridViewPanelToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="30"/>
-   </Style>
+    <Style x:Key="GridViewPanelToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+        <Setter Property="Height" Value="30"/>
+        <Setter Property="Width" Value="30"/>
+    </Style>
 
-   <Style x:Key="EgtWPFLib5_InputButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="60"/>
-   </Style>
+    <Style x:Key="EgtWPFLib5_InputButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Height" Value="30"/>
+        <Setter Property="Width" Value="60"/>
+    </Style>
 
-   <Style x:Key="ModeButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
-      <Setter Property="Background" Value="{StaticResource EgaltechWhite}"/>
-      <Setter Property="Foreground" Value="{StaticResource EgaltechBlue1}"/>
-      <Setter Property="TextBlock.FontWeight" Value="Normal"/>
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="90"/>
-      <Style.Triggers>
-         <Trigger Property="IsChecked" Value="true">
-            <Setter Property="TextBlock.FontWeight" Value="ExtraBold"/>
-         </Trigger>
-      </Style.Triggers>
-   </Style>
+    <Style x:Key="ModeButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+        <Setter Property="Background" Value="{StaticResource EgaltechWhite}"/>
+        <Setter Property="Foreground" Value="{StaticResource EgaltechBlue1}"/>
+        <Setter Property="TextBlock.FontWeight" Value="Normal"/>
+        <Setter Property="Height" Value="30"/>
+        <Setter Property="Width" Value="90"/>
+        <Style.Triggers>
+            <Trigger Property="IsChecked" Value="true">
+                <Setter Property="TextBlock.FontWeight" Value="ExtraBold"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
 
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!-- TextBox Style -->
+    <!-- TextBox Style -->
 
-   <Style x:Key="DoorParamsTxBx" TargetType="{x:Type TextBox}">
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="Height" Value="22"/>
-   </Style>
+    <Style x:Key="DoorParamsTxBx" TargetType="{x:Type TextBox}">
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="Height" Value="22"/>
+    </Style>
 
     <Style x:Key="DimensioParameter" TargetType="{x:Type TextBox}">
-       <Setter Property="VerticalAlignment" Value="Stretch"/>
-       <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalAlignment" Value="Stretch"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Style.Triggers>
             <Trigger Property="Focusable" Value=" True"/>
             <Trigger Property="Validation.HasError" Value="True">
@@ -360,137 +366,141 @@
             </Style>
         </Style.Resources>
     </Style>
-    
-   <!-- TextBox -->
 
-   <Style TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
-      <Setter Property="Height" Value="22"/>
-      <Setter Property="VerticalContentAlignment" Value="Center"/>
-      <Setter Property="HorizontalContentAlignment" Value="Right"/>
-      <Setter Property="ExplicitUpdateSource" Value="EnterKeyPress"/>
-   </Style>
+    <!-- TextBox -->
 
-   <Style x:Key="ToolsTextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
-      <Setter Property="Margin" Value="0,0,5,0"/>
-   </Style>
+    <Style TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
+        <Setter Property="Height" Value="22"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Right"/>
+        <Setter Property="ExplicitUpdateSource" Value="EnterKeyPress"/>
+    </Style>
 
-   <Style x:Key="MachiningsTextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
-      <Setter Property="Margin" Value="0,0,0,10"/>
-   </Style>
+    <Style x:Key="ToolsTextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
+        <Setter Property="Margin" Value="0,0,5,0"/>
+    </Style>
 
-   <Style x:Key="MachiningsToolTextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
-      <Setter Property="Margin" Value="0,0,5,0"/>
-   </Style>
+    <Style x:Key="MachiningsTextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
+        <Setter Property="Margin" Value="0,0,0,10"/>
+    </Style>
 
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
+    <Style x:Key="MachiningsToolTextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
+        <Setter Property="Margin" Value="0,0,5,0"/>
+    </Style>
 
-   <!-- TextBlock Style -->
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <Style x:Key="DoorParamsTxBl" TargetType="{x:Type TextBlock}">
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="Height" Value="22"/>
-   </Style>
+    <!-- TextBlock Style -->
 
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
+    <Style x:Key="DoorParamsTxBl" TargetType="{x:Type TextBlock}">
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="Height" Value="22"/>
+    </Style>
 
-   <!-- ComboBox Style -->
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <Style x:Key="DoorParamsCmBx" TargetType="{x:Type ComboBox}">
-      <Setter Property="Height" Value="22"/>
-   </Style>
+    <!-- ComboBox Style -->
 
-   <Style x:Key="DoorEdgeParamsCmBx" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource DoorParamsCmBx}">
-      <Setter Property="ItemContainerStyle">
-         <Setter.Value>
-            <Style TargetType="ComboBoxItem">
-               <Setter Property="Visibility" Value="{Binding IsActive}" />
-            </Style>
-         </Setter.Value>
-      </Setter>
-      <Setter Property="ItemTemplate">
-         <Setter.Value>
-            <DataTemplate>
-               <TextBlock Text="{Binding Name}"/>
-            </DataTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
+    <Style x:Key="DoorParamsCmBx" TargetType="{x:Type ComboBox}">
+        <Setter Property="Height" Value="22"/>
+    </Style>
 
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-  
-   <!-- CheckBox Style -->
+    <Style x:Key="DoorEdgeParamsCmBx" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource DoorParamsCmBx}">
+        <Setter Property="ItemContainerStyle">
+            <Setter.Value>
+                <Style TargetType="ComboBoxItem">
+                    <Setter Property="Visibility" Value="{Binding IsActive}" />
+                </Style>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="ItemTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <TextBlock Text="{Binding Name}"/>
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
-   <Style x:Key="DoorParamsChBx" TargetType="{x:Type CheckBox}">
-      <Setter Property="Height" Value="15"/>
-      <Setter Property="Width" Value="15"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-   </Style>
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
+    <!-- CheckBox Style -->
 
-   <!-- EgtCustomWindow -->
+    <Style x:Key="DoorParamsChBx" TargetType="{x:Type CheckBox}">
+        <Setter Property="Height" Value="15"/>
+        <Setter Property="Width" Value="15"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="HorizontalAlignment" Value="Center"/>
+    </Style>
 
-   <Style TargetType="{x:Type EgtWPFLib5:EgtCustomWindow}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
-      <Setter Property="TitleBarHeight" Value="32"/>
-      <Setter Property="TitleBarBrush" Value="{StaticResource EgaltechBlue1}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource EgaltechBlue1}"/>
-   </Style>
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
+    <!-- EgtCustomWindow -->
 
-   <!-- HardwareExpander -->
+    <Style TargetType="{x:Type EgtWPFLib5:EgtCustomWindow}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
+        <Setter Property="TitleBarHeight" Value="32"/>
+        <Setter Property="TitleBarBrush" Value="{StaticResource EgaltechBlue1}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource EgaltechBlue1}"/>
+    </Style>
 
-   <Style x:Key="HardwareExpander" TargetType="Expander">
-      <Setter Property="IsExpanded" Value="True"/>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="Expander">
-               <Grid>
-                  <GroupBox>
-                     <GroupBox.Header>
-                        <CheckBox IsChecked="{Binding Path=IsExpanded, RelativeSource={RelativeSource AncestorType={x:Type Expander}}}"
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+    <!-- HardwareExpander -->
+
+    <Style x:Key="HardwareExpander" TargetType="Expander">
+        <Setter Property="IsExpanded" Value="True"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Expander">
+                    <Grid>
+                        <GroupBox>
+                            <GroupBox.Header>
+                                <CheckBox IsChecked="{Binding Path=IsExpanded, RelativeSource={RelativeSource AncestorType={x:Type Expander}}}"
                                   Content="{TemplateBinding Header}"/>
-                     </GroupBox.Header>
-                     <ContentControl Content="{TemplateBinding Content}"/>
-                  </GroupBox>
-               </Grid>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-      <Style.Triggers>
-         <Trigger Property="IsExpanded" Value="False">
-            <Setter Property="Template">
-               <Setter.Value>
-                  <ControlTemplate TargetType="Expander">
-                     <Border BorderBrush="#D5DFE5" BorderThickness="0.7" CornerRadius="3" Margin="1,1,1,0">
-                        <CheckBox IsChecked="{Binding Path=IsExpanded, RelativeSource={RelativeSource AncestorType={x:Type Expander}}}"
+                            </GroupBox.Header>
+                            <ContentControl Content="{TemplateBinding Content}"/>
+                        </GroupBox>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsExpanded" Value="False">
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="Expander">
+                            <Border BorderBrush="#D5DFE5" BorderThickness="{DynamicResource GroupBox_BorderThickness}" CornerRadius="3" Margin="1,1,1,0">
+                                <CheckBox IsChecked="{Binding Path=IsExpanded, RelativeSource={RelativeSource AncestorType={x:Type Expander}}}"
                                   Content="{TemplateBinding Header}"
                                   Margin="9,5,5,5"/>
-                     </Border>
-                  </ControlTemplate>
-               </Setter.Value>
-            </Setter>
-         </Trigger>
-      </Style.Triggers>
-   </Style>
-   
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
+                            </Border>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
 
-   <!-- EgtFloatingPanel -->
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <Style x:Key="ToolBar_EgtFloatingPanel" TargetType="{x:Type EgtFloating:EgtFloatingPanel}" BasedOn="{StaticResource {x:Type EgtFloating:EgtFloatingPanel}}">
-      <Setter Property="Background" Value="{StaticResource EgaltechBlue2}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource EgaltechBlue2}"/>
-   </Style>
+    <!-- EgtFloatingPanel -->
 
-   <Style x:Key="Option_EgtFloatingPanel" TargetType="{x:Type EgtFloating:EgtFloatingPanel}" BasedOn="{StaticResource {x:Type EgtFloating:EgtFloatingPanel}}">
-      <Setter Property="IsToolBar" Value="False"/>
-      <Setter Property="TitleBarOrientation" Value="Vertical"/>
-      <Setter Property="Background" Value="{StaticResource EgaltechBlue2}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource EgaltechBlue2}"/>
-   </Style>
+    <Style x:Key="ToolBar_EgtFloatingPanel" TargetType="{x:Type EgtFloating:EgtFloatingPanel}" BasedOn="{StaticResource {x:Type EgtFloating:EgtFloatingPanel}}">
+        <Setter Property="Background" Value="{StaticResource EgaltechBlue2}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource EgaltechBlue2}"/>
+    </Style>
 
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
+    <Style x:Key="Option_EgtFloatingPanel" TargetType="{x:Type EgtFloating:EgtFloatingPanel}" BasedOn="{StaticResource {x:Type EgtFloating:EgtFloatingPanel}}">
+        <Setter Property="IsToolBar" Value="False"/>
+        <Setter Property="TitleBarOrientation" Value="Vertical"/>
+        <Setter Property="Background" Value="{StaticResource EgaltechBlue2}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource EgaltechBlue2}"/>
+    </Style>
 
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+    <Style TargetType="GroupBox">
+        <Setter Property="BorderThickness" Value="{DynamicResource GroupBox_BorderThickness}"/>
+    </Style>
+    
 </ResourceDictionary>
diff --git a/MainWindow/MainWindowV.xaml.vb b/MainWindow/MainWindowV.xaml.vb
index 3cc422a..b0b6c16 100644
--- a/MainWindow/MainWindowV.xaml.vb
+++ b/MainWindow/MainWindowV.xaml.vb
@@ -20,6 +20,11 @@ Class MainWindowV
 
    End Sub
 
+   Private Sub MainWindowV_Init(sender As Object, e As EventArgs) Handles Me.Initialized
+      ' Carico il tema del programma
+      Map.refMainWindowVM.Themes_StartUp()
+   End Sub
+
    Private Sub MainWindowV_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
       ' Carico e imposto posizione finestra
       WinPosFromIniToWindow(S_GENERAL, K_WINPLACE, Me)
diff --git a/MainWindow/MainWindowVM.vb b/MainWindow/MainWindowVM.vb
index c0b6edb..ac1eeea 100644
--- a/MainWindow/MainWindowVM.vb
+++ b/MainWindow/MainWindowVM.vb
@@ -239,6 +239,17 @@ Public Class MainWindowVM
       End If
    End Sub
 
+   Public Sub Themes_StartUp()
+      Dim app As Application = CType(Application.Current, Application)
+      Dim nIndexTheme As Integer = 1
+      If nIndexTheme = 0 Then
+         app.ChangeTheme(New Uri("/EgtDOORCreator;component/EgtDOORCreatorDictionary.xaml", UriKind.Relative))
+      End If
+      If nIndexTheme = 1 Then
+         app.ChangeTheme(New Uri("/EgtDOORCreator;component/EgtDOORCreatorDarkDictionary.xaml", UriKind.Relative))
+      End If
+   End Sub
+
 #End Region    ' Methods
 
 #Region "Watcher"
diff --git a/SceneManager/SceneManagerV.xaml b/SceneManager/SceneManagerV.xaml
index baa5723..36d4bde 100644
--- a/SceneManager/SceneManagerV.xaml
+++ b/SceneManager/SceneManagerV.xaml
@@ -11,7 +11,7 @@
 
       <EgtFloating:EgtFloatingManager>
 
-         <EgtFloating:EgtFloatingTray x:Name="TOPTRAY" DockPanel.Dock="Top">
+         <EgtFloating:EgtFloatingTray x:Name="TOPTRAY" DockPanel.Dock="Top" Background="Transparent">
             <!--<EgtFloating:EgtFloatingPanel Name="ShowPanel" 
                IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
                <ContentPresenter Content="{Binding ShowPanel}"/>