diff --git a/BrightSharp.Ui.Tests/App.xaml b/BrightSharp.Ui.Tests/App.xaml
index 7cdf935..9b82342 100644
--- a/BrightSharp.Ui.Tests/App.xaml
+++ b/BrightSharp.Ui.Tests/App.xaml
@@ -1,8 +1,6 @@
 <Application x:Class="BrightSharp.Ui.Tests.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:sys="clr-namespace:System;assembly=mscorlib"
-             xmlns:local="clr-namespace:BrightSharp.Ui.Tests"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
         <ResourceDictionary>
diff --git a/BrightSharp.Ui.Tests/BrightSharp.Ui.Tests.csproj b/BrightSharp.Ui.Tests/BrightSharp.Ui.Tests.csproj
index 397c086..32ee8a6 100644
--- a/BrightSharp.Ui.Tests/BrightSharp.Ui.Tests.csproj
+++ b/BrightSharp.Ui.Tests/BrightSharp.Ui.Tests.csproj
@@ -38,8 +38,10 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="PresentationFramework.Aero2" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Core" />
@@ -58,6 +60,12 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="TestPage2.xaml.cs">
+      <DependentUpon>TestPage2.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="TestPage.xaml.cs">
+      <DependentUpon>TestPage.xaml</DependentUpon>
+    </Compile>
     <Page Include="CustomWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -70,6 +78,7 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="BrushesMapList.cs" />
     <Compile Include="CustomWindow.xaml.cs">
       <DependentUpon>CustomWindow.xaml</DependentUpon>
     </Compile>
@@ -78,6 +87,14 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Page Include="TestPage2.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="TestPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/BrightSharp.Ui.Tests/BrushesMapList.cs b/BrightSharp.Ui.Tests/BrushesMapList.cs
new file mode 100644
index 0000000..671aee8
--- /dev/null
+++ b/BrightSharp.Ui.Tests/BrushesMapList.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using System.Windows.Media;
+
+namespace BrightSharp.Ui.Tests
+{
+    public class BrushesMapList : Dictionary<string, object>
+    {
+        public BrushesMapList() {
+            var dic = Application.Current.Resources.MergedDictionaries.First();
+            foreach (string key in dic.Keys.OfType<string>().OrderBy(x => x)) {
+                var value = Application.Current.TryFindResource(key);
+                if (value != null) {
+                    bool isBorder = key.Contains("Border");
+                    if (value is Color col) {
+                        Add(key, new { Type = "C", Brush = new SolidColorBrush(col), IsBorder = isBorder });
+                    }
+                    else if (value is Brush br) {
+                        Add(key, new { Type = "Br", Brush = br, IsBorder = isBorder });
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/BrightSharp.Ui.Tests/CustomWindow.xaml b/BrightSharp.Ui.Tests/CustomWindow.xaml
index ddfefec..2932427 100644
--- a/BrightSharp.Ui.Tests/CustomWindow.xaml
+++ b/BrightSharp.Ui.Tests/CustomWindow.xaml
@@ -4,18 +4,78 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:bs="http://schemas.brightsharp.com/developer"
+        xmlns:conv="http://schemas.brightsharp.com/developer"
         xmlns:local="clr-namespace:BrightSharp.Ui.Tests"
+        xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
         mc:Ignorable="d" ResizeMode="CanResizeWithGrip"
-        WindowStyle="ToolWindow"
-        Height="640" Width="1000" Style="{DynamicResource BrightSharpWindowStyle}">
+        WindowStyle="ToolWindow" Title="Brushes Explorer"
+        Height="800" Width="600" Style="{DynamicResource BrightSharpWindowStyle}">
+    <Window.Resources>
+        <local:BrushesMapList x:Key="Brushes" />
+
+        <BooleanToVisibilityConverter x:Key="btvc" />
+        <conv:InverseBooleanToVisibilityConverter x:Key="ibtvc" />
+    </Window.Resources>
     <bs:MarkupExtensionProperties.Header>
         <Grid>
-            <TextBlock>Custom WINDOW (BrightSharpWindowStyle)</TextBlock>
+            <TextBlock>Brushes Explorer</TextBlock>
         </Grid>
     </bs:MarkupExtensionProperties.Header>
-    <Window.Resources>
-    </Window.Resources>
-    <Label>
-        TEST (Dev) WINDOW STYLE (CONTENT)
-    </Label>
+    <Grid>
+        <ScrollViewer VerticalScrollBarVisibility="Disabled" HorizontalScrollBarVisibility="Auto">
+            <ItemsControl ItemsSource="{Binding Source={StaticResource Brushes}}">
+                <ItemsControl.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <WrapPanel Orientation="Vertical" />
+                    </ItemsPanelTemplate>
+                </ItemsControl.ItemsPanel>
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <Grid HorizontalAlignment="Left" Margin="0,1">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition />
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+                            <Rectangle Stroke="#444" StrokeThickness="1"  Width="80" Height="24">
+                                <Rectangle.Fill>
+                                    <DrawingBrush TileMode="Tile" Viewport="0,0,30,30" 
+                                      ViewportUnits="Absolute">
+                                        <DrawingBrush.Drawing>
+                                            <GeometryDrawing Brush="#BDBDBD" 
+                    Geometry="M5,5 L0,5 0,10 5,10 5,5 10,5 10,0 5,0 Z"/>
+                                        </DrawingBrush.Drawing>
+                                    </DrawingBrush>
+                                </Rectangle.Fill>
+                            </Rectangle>
+                            <Rectangle Stroke="#444" StrokeThickness="1" Fill="{Binding Path=Value.Brush}" Visibility="{Binding Path=Value.IsBorder, Converter={StaticResource ibtvc}}" >
+                                <Rectangle.ToolTip>
+                                    <StackPanel Orientation="Horizontal">
+                                        <Rectangle Margin="5" Fill="{Binding Path=Value.Brush}" Width="250" Height="50" Visibility="{Binding Path=Value.IsBorder, Converter={StaticResource ibtvc}}" />
+                                        
+                                    </StackPanel>
+                                </Rectangle.ToolTip>
+                            </Rectangle>
+                            <Rectangle Fill="#4444" StrokeThickness="2" Margin="3" Stroke="{Binding Path=Value.Brush}" Visibility="{Binding Path=Value.IsBorder, Converter={StaticResource btvc}}" >
+                                <Rectangle.ToolTip>
+                                    <StackPanel Orientation="Horizontal">
+                                        <Rectangle Margin="5" Stroke="{Binding Path=Value.Brush}" Width="250" Height="50" Visibility="{Binding Path=Value.IsBorder, Converter={StaticResource btvc}}" />
+                                    </StackPanel>
+                                </Rectangle.ToolTip>
+                            </Rectangle>
+
+                            
+
+                            <TextBlock IsHitTestVisible="False" Margin="2,2,0,0" Foreground="{DynamicResource WindowBackgroundBrush}" VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding Path=Value.Type}" />
+                            <TextBlock IsHitTestVisible="False" VerticalAlignment="Center" Foreground="{DynamicResource OnWindowForegroundBrush}" HorizontalAlignment="Center" Text="{Binding Path=Value.Type}" />
+                            <TextBox VerticalContentAlignment="Center" Grid.Column="1" Text="{Binding Path=Key, Mode=OneTime}" BorderThickness="0" Background="Transparent">
+                                <i:Interaction.Behaviors>
+                                    <bs:SelectAllTextOnFocusBehavior />
+                                </i:Interaction.Behaviors>
+                            </TextBox>
+                        </Grid>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+        </ScrollViewer>
+    </Grid>
 </Window>
diff --git a/BrightSharp.Ui.Tests/ListViewItemModel.cs b/BrightSharp.Ui.Tests/ListViewItemModel.cs
index dd61d08..cb33eb0 100644
--- a/BrightSharp.Ui.Tests/ListViewItemModel.cs
+++ b/BrightSharp.Ui.Tests/ListViewItemModel.cs
@@ -1,10 +1,10 @@
-using BrightSharp.Mvvm;
-using System;
+using System;
 using System.ComponentModel;
+using System.Runtime.CompilerServices;
 
 namespace BrightSharp.Ui.Tests
 {
-    public class CustomerViewModel : ObservableObject
+    public class CustomerViewModel : INotifyPropertyChanged
     {
         static Random rnd = new Random();
         private string _customerId;
@@ -19,6 +19,9 @@ namespace BrightSharp.Ui.Tests
         private string _phone;
         private string _fax;
         private string _color;
+        private int? _numberProperty;
+
+        public event PropertyChangedEventHandler PropertyChanged;
 
         public CustomerViewModel()
         {
@@ -30,57 +33,58 @@ namespace BrightSharp.Ui.Tests
         public string CustomerID
         {
             get { return _customerId; }
-            set { _customerId = value; RaisePropertyChanged(nameof(CustomerID)); }
+            set { _customerId = value; RaisePropertyChanged(); }
         }
 
+
         public string CompanyName
         {
             get { return _companyName; }
-            set { _companyName = value; RaisePropertyChanged(nameof(CompanyName)); }
+            set { _companyName = value; RaisePropertyChanged(); }
         }
 
         public string ContactNameCN
         {
             get { return _contactName; }
-            set { _contactName = value; RaisePropertyChanged(nameof(ContactNameCN)); }
+            set { _contactName = value; RaisePropertyChanged(); }
         }
 
         public string ContactTitle
         {
             get { return _contactTitle; }
-            set { _contactTitle = value; RaisePropertyChanged(nameof(ContactTitle)); }
+            set { _contactTitle = value; RaisePropertyChanged(); }
         }
         [Category("Location")]
         public string Address
         {
             get { return _address; }
-            set { _address = value; RaisePropertyChanged(nameof(Address)); }
+            set { _address = value; RaisePropertyChanged(); }
         }
         [Category("Location")]
         public string City
         {
             get { return _city; }
-            set { _city = value; RaisePropertyChanged(nameof(City)); }
+            set { _city = value; RaisePropertyChanged(); }
         }
         [Category("Location")]
         public string Region
         {
             get { return _region; }
-            set { _region = value; RaisePropertyChanged(nameof(Region)); }
+            set { _region = value; RaisePropertyChanged(); }
         }
         [Category("Contact Information")]
         [Description("Postal code for Customer")]
         public string PostalCode
         {
             get { return _postalCode; }
-            set { _postalCode = value; RaisePropertyChanged(nameof(PostalCode)); }
+            set { _postalCode = value; RaisePropertyChanged(); }
         }
         [Category("Location")]
         [Description("Country for Customer")]
         public string Country
         {
             get { return _country; }
-            set { _country = value; RaisePropertyChanged(nameof(Country)); }
+            set { _country = value; RaisePropertyChanged(); }
         }
 
         [Category("Contact Information")]
@@ -88,7 +92,7 @@ namespace BrightSharp.Ui.Tests
         public string Phone
         {
             get { return _phone; }
-            set { _phone = value; RaisePropertyChanged(nameof(Phone)); }
+            set { _phone = value; RaisePropertyChanged(); }
         }
 
         [Category("Contact Information")]
@@ -96,16 +100,21 @@ namespace BrightSharp.Ui.Tests
         public string Fax
         {
             get { return _fax; }
-            set { _fax = value; RaisePropertyChanged(nameof(Fax)); }
+            set { _fax = value; RaisePropertyChanged(); }
         }
         [Category("Appearance")]
         public string Color
         {
             get { return _color; }
-            set { _color = value; RaisePropertyChanged(nameof(Color)); }
+            set { _color = value; RaisePropertyChanged(); }
+        }
+
+        public int? NumberProperty
+        {
+            get { return _numberProperty; }
+            set { _numberProperty = value; RaisePropertyChanged(); }
         }
 
-		public int NumberProperty { get; set; }
         public double DoubleNumberProperty { get; set; }
 
 
@@ -117,5 +126,12 @@ namespace BrightSharp.Ui.Tests
         [Description("Indicates that Customer is has active state or it absent")]
         [DisplayName("Is Active Or Not Exists")]
         public bool? IsActiveOrEmpty { get; set; }
+
+
+
+
+        private void RaisePropertyChanged([CallerMemberName]string memeberName = null) {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(memeberName));
+        }
     }
 }
diff --git a/BrightSharp.Ui.Tests/MainWindow.xaml b/BrightSharp.Ui.Tests/MainWindow.xaml
index 76f2ba5..be00ae4 100644
--- a/BrightSharp.Ui.Tests/MainWindow.xaml
+++ b/BrightSharp.Ui.Tests/MainWindow.xaml
@@ -2,18 +2,16 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:BrightSharp.Ui.Tests"
         xmlns:viewModel="clr-namespace:BrightSharp.Ui.Tests"
-        Style="{DynamicResource BrightSharpWindowStyle}"
-        ResizeMode="CanResizeWithGrip"
         xmlns:ex="http://schemas.brightsharp.com/developer"
         xmlns:bsDiag="http://schemas.brightsharp.com/diagrams"
+        Style="{DynamicResource BrightSharpWindowStyle}"
+        ResizeMode="CanResizeWithGrip"
         x:Class="BrightSharp.Ui.Tests.MainWindow"
-        mc:Ignorable="d" Background="{DynamicResource WindowBackgroundBrush}"
+        mc:Ignorable="d"
         ex:MarkupExtensionProperties.HeaderHorizontalAlignment="Center"
-        Title="BrightSharp.Ui.Tests" Height="750" Width="1600">
+        Title="BrightSharp.Ui.Tests" Height="750" Width="1900">
     <Window.Resources>
-        <ex:StringHelpConverter x:Key="StringHelpConverter" />
         <x:Array x:Key="coll" Type="{x:Type viewModel:CustomerViewModel}">
             <viewModel:CustomerViewModel CustomerID="ALFKI" CompanyName="Alfreds Futterkiste" ContactNameCN="Maria Anders" ContactTitle="Sales Representative" Address="Obere Str. 57" City="Berlin" PostalCode="12209" Country="Germany" Phone="030-0074321" Fax="030-0076545" />
             <viewModel:CustomerViewModel CustomerID="ANATR" CompanyName="Ana Trujillo Emparedados y helados" ContactNameCN="Ana Trujillo" ContactTitle="Owner" Address="Avda. de la Constitución 2222" City="México D.F." PostalCode="05021" Country="Mexico" Phone="(5) 555-4729" Fax="(5) 555-3745" />
@@ -26,35 +24,73 @@
         </x:Array>
         <CollectionViewSource Source="{StaticResource coll}" x:Key="coll1" />
         <CollectionViewSource Source="{StaticResource coll}" x:Key="coll2" />
+
     </Window.Resources>
+    <ex:MarkupExtensionProperties.Header>
+        <StackPanel Orientation="Horizontal">
+            <Label Foreground="Red">❖</Label>
+            <Label Foreground="White">BrightSharp.Toolkit Presentation ver.2</Label>
+            <Label Foreground="Blue">❖</Label>
+        </StackPanel>
+    </ex:MarkupExtensionProperties.Header>
     <Grid>
+
         <Grid Margin="2" ClipToBounds="True">
             <bsDiag:ZoomControl x:Name="zc" UseAnimation="True" ClipToBounds="False">
+                <ContentControl Style="{StaticResource DesignerItemStyle}" 
+                    Canvas.Left="1600" Canvas.Top="20" Width="300">
+                    <GroupBox Style="{StaticResource ExpandrStyleGroupBox}">
+                        <GroupBox.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Label>Extended Frame</Label>
+                            </StackPanel>
+                        </GroupBox.Header>
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition  Height="auto"/>
+                                <RowDefinition />
+                            </Grid.RowDefinitions>
+                            <Slider Minimum="20" Maximum="50" Value="35" x:Name="FrameHeightSlider" />
+                            <Frame Source="TestPage.xaml" Style="{DynamicResource DevLabFrameStyle}" Grid.Row="1"
+                                   ex:MarkupExtensionProperties.HeaderHeight="{Binding ElementName=FrameHeightSlider, Path=Value}"
+                                   >
+                                <ex:MarkupExtensionProperties.Header>
+                                    <Label VerticalContentAlignment="Center">
+                                        Additional Header Content
+                                    </Label>
+                                </ex:MarkupExtensionProperties.Header>
+
+                            </Frame>
+                        </Grid>
+                    </GroupBox>
+                </ContentControl>
                 <ContentControl Style="{StaticResource DesignerItemStyle}" 
                     Canvas.Left="10" Canvas.Top="20" Width="330">
-                    <GroupBox Header="Common">
+                    <GroupBox Header="Common" Background="{DynamicResource GradientWindowBackgroundBrush}">
                         <Grid>
                             <Button IsDefault="True" Content="Change Theme" Click="Button_Click" HorizontalAlignment="Left" Width="108" Height="32" VerticalAlignment="Top" Margin="10,10,0,0"/>
+                            <Button ex:MarkupExtensionProperties.CornerRadius="25" FocusVisualStyle="{DynamicResource ButtonEllipseFocusVisual}" Content="Round" HorizontalAlignment="Left" Width="50" Height="50" VerticalAlignment="Top" Margin="10,84,0,0"/>
+                            <ToggleButton IsChecked="True" ex:MarkupExtensionProperties.CornerRadius="25" FocusVisualStyle="{DynamicResource ButtonEllipseFocusVisual}" Content="Round" HorizontalAlignment="Left" Width="50" Height="50" VerticalAlignment="Top" Margin="70,84,0,0"/>
                             <ToggleButton Content="Toggle" HorizontalAlignment="Left" Width="108" Height="32" VerticalAlignment="Top" Margin="10,47,0,0"/>
-                            <CheckBox Margin="10,84,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Content="CheckBox" IsThreeState="True" IsChecked="{x:Null}"/>
-                            <CheckBox IsThreeState="True" ex:MarkupExtensionProperties.Docking="Right" Margin="10,105,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Content="CheckBox Right Allign"/>
+                            <CheckBox Margin="10,140,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Content="CheckBox" IsThreeState="True" IsChecked="{x:Null}"/>
+                            <CheckBox IsThreeState="True" ex:MarkupExtensionProperties.Docking="Right" Margin="10,161,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Content="CheckBox Right Allign"/>
                             <CheckBox HorizontalContentAlignment="Center" IsThreeState="True" ex:MarkupExtensionProperties.Docking="Top" Margin="151,35,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Width="137" Content="CheckBox Top Allign"/>
-                            <RadioButton IsChecked="True" Margin="10,130,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Content="RadioButton"/>
-                            <RadioButton Margin="10,151,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Content="RadioButton"/>
+                            <RadioButton IsChecked="True" Margin="10,183,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Content="RadioButton"/>
+                            <RadioButton Margin="10,204,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Content="RadioButton"/>
                             <TextBox x:Name="tb" Canvas.Left="10" Canvas.Top="269" Margin="151,10,10,0" VerticalAlignment="Top" />
                             <TabControl BorderThickness="1" Margin="151,72,10,0" Height="122" VerticalAlignment="Top">
-                                <TabItem Header="Tab1" />
-                                <TabItem Header="Tab2" />
-                                <TabItem Header="Tab3" />
+                                <TabItem Header="Tab1"/>
+                                <TabItem Header="Tab2"/>
+                                <TabItem Header="Tab3"/>
                             </TabControl>
-                            <CheckBox HorizontalAlignment="Left" Style="{StaticResource SwitchCheckBoxStyle}" VerticalAlignment="Top" Margin="37,204,0,0" Content="SwitchCheckBoxStyle" Width="213" RenderTransformOrigin="0.5,0.5" Height="Auto" />
-                            <TextBox Margin="35,236,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Width="246">
+                            <CheckBox HorizontalAlignment="Left" Style="{StaticResource SwitchCheckBoxStyle}" VerticalAlignment="Top" Margin="40,275,0,0" Content="SwitchCheckBoxStyle" Width="213" RenderTransformOrigin="0.5,0.5" Height="Auto" />
+                            <TextBox Margin="40,304,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Width="246" Padding="3">
                                 <ex:MarkupExtensionProperties.LeadingElement>L.El.</ex:MarkupExtensionProperties.LeadingElement>
                                 <ex:MarkupExtensionProperties.TrailingElement>T.El.</ex:MarkupExtensionProperties.TrailingElement>
                                 <ex:MarkupExtensionProperties.Header>Watermark</ex:MarkupExtensionProperties.Header>
                             </TextBox>
-                            <Button Content="Test Custom Window" Margin="93,266,0,0" HorizontalAlignment="Left" Width="134" Height="25" VerticalAlignment="Top" Click="Button_Click_ShowCustomWindow"></Button>
-                            <Calendar Margin="10,295,10,0" VerticalAlignment="Top" Loaded="Calendar_Loaded">
+                            <Button Content="Brushes Explorer" Margin="97,416,0,0" HorizontalAlignment="Left" Width="134" Height="25" VerticalAlignment="Top" Click="Button_Click_ShowCustomWindow"/>
+                            <Calendar Margin="10,441,10,0" VerticalAlignment="Top" Loaded="Calendar_Loaded">
                                 <ex:MarkupExtensionProperties.TrailingElement>
                                     <TextBlock HorizontalAlignment="Center" Foreground="DarkRed"><Run Text="Trailing Region"/></TextBlock>
                                 </ex:MarkupExtensionProperties.TrailingElement>
@@ -62,7 +98,7 @@
                                     <TextBlock HorizontalAlignment="Center" Foreground="DarkBlue"><Run Text="Leading Region"/></TextBlock>
                                 </ex:MarkupExtensionProperties.LeadingElement>
                             </Calendar>
-                            <ComboBox IsEditable="True" Margin="10,172,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" SelectedIndex="0" Width="136">
+                            <ComboBox IsEditable="True" Margin="10,225,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" SelectedIndex="0" Width="136">
                                 <ComboBoxItem Content="Item 1"/>
                                 <ComboBoxItem Content="Item 2"/>
                                 <ComboBoxItem Content="Item 3"/>
@@ -70,6 +106,54 @@
                                 <ComboBoxItem Content="Item 4"/>
                                 <ComboBoxItem Content="Item 5"/>
                             </ComboBox>
+                            <ComboBox ItemsSource="{Binding Source={StaticResource coll1}}" TextSearch.TextPath="ContactNameCN" IsEditable="True" Margin="10,250,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" SelectedIndex="0" Width="136">
+                                <ex:MarkupExtensionProperties.LeadingElement>
+                                    <ToolBar Style="{DynamicResource FlatToolBar}" Margin="0,2" ex:MarkupExtensionProperties.CornerRadius="3,3,0,0">
+                                        <Button Content="Press me" />
+                                        <Button Content="Press me" />
+                                    </ToolBar>
+                                </ex:MarkupExtensionProperties.LeadingElement>
+                                <ex:MarkupExtensionProperties.TrailingElement>
+                                    <Button HorizontalAlignment="Left" Content="Trailing"/>
+                                </ex:MarkupExtensionProperties.TrailingElement>
+                                <ComboBox.ItemTemplate>
+                                    <DataTemplate>
+                                        <Border BorderThickness="0,0,0,1" BorderBrush="{DynamicResource SolidBorderBrush}" MinWidth="140">
+                                            <StackPanel>
+                                                <TextBlock Text="{Binding ContactNameCN}" FontWeight="DemiBold" />
+                                                <Label Background="White" BorderBrush="Black" BorderThickness="1" Padding="3,0" Margin="0,-14,3,0" HorizontalAlignment="Right">
+                                                    <Label.ToolTip>
+                                                        <StackPanel>
+                                                            <TextBlock Text="{Binding ContactNameCN}" FontWeight="DemiBold" />
+                                                            <TextBlock Text="{Binding Address}" FontStyle="Italic" />
+                                                            <TextBlock Text="{Binding City}" />
+                                                            <TextBlock Text="{Binding CompanyName}" />
+                                                            <TextBlock Text="{Binding ContactTitle}" />
+                                                            <TextBlock Text="{Binding Phone}" />
+                                                        </StackPanel>
+                                                    </Label.ToolTip>
+                                                    <TextBlock Foreground="Black"><Run Text="i"/></TextBlock>
+                                                </Label>
+
+                                                <TextBlock Text="{Binding Address}" FontStyle="Italic" MaxWidth="130" TextTrimming="CharacterEllipsis" HorizontalAlignment="Left" ToolTip="{Binding Address}" />
+                                            </StackPanel>
+                                        </Border>
+                                    </DataTemplate>
+                                </ComboBox.ItemTemplate>
+                            </ComboBox>
+                            <Button Style="{DynamicResource GlassButtonStyle}" Content="GlassButton" HorizontalAlignment="Left" Width="70" Height="70" VerticalAlignment="Top" Margin="161,199,0,0"/>
+                            <Button Style="{DynamicResource GlassButtonStyle}" Content="Style" HorizontalAlignment="Left" Width="50" Height="50" VerticalAlignment="Top" Margin="248,209,0,0" Background="#FFFF6868"/>
+                            <TextBox Padding="3" Margin="40,332,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Width="246"
+                                     Text="{Binding Source={StaticResource coll}, Path=[0].NumberProperty, UpdateSourceTrigger=PropertyChanged}">
+                                <ex:MarkupExtensionProperties.LeadingElement>LD</ex:MarkupExtensionProperties.LeadingElement>
+                                <ex:MarkupExtensionProperties.TrailingElement>TR</ex:MarkupExtensionProperties.TrailingElement>
+                                <ex:MarkupExtensionProperties.Header>Check Validation Style (Number)</ex:MarkupExtensionProperties.Header>
+                            </TextBox>
+                            <PasswordBox Padding="3" Margin="40,375,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Width="246">
+                                <ex:MarkupExtensionProperties.LeadingElement>Password</ex:MarkupExtensionProperties.LeadingElement>
+                                <ex:MarkupExtensionProperties.TrailingElement>***</ex:MarkupExtensionProperties.TrailingElement>
+                                <ex:MarkupExtensionProperties.Header>Enter your password :)</ex:MarkupExtensionProperties.Header>
+                            </PasswordBox>
                         </Grid>
                     </GroupBox>
                 </ContentControl>
@@ -104,13 +188,29 @@
                                     </MenuItem>
                                 </Menu>
                                 <ToolBar ToolBar.OverflowMode="Never">
-                                    <Button Content="EXEC" />
-                                    <Button Content="View" />
+                                    <Button Content="BUTTON" />
+                                    <ToggleButton Margin="5,0,0,0" Content="TBUTTON" />
+                                    <Separator />
+                                    <Menu Background="Transparent" Foreground="{DynamicResource UiForegroundBrush}">
+                                        <MenuItem Header="Menu ▼">
+                                            <MenuItem Header="MenuItem1"/>
+                                            <MenuItem Header="MenuItem2"/>
+                                        </MenuItem>
+                                    </Menu>
+                                    <TextBox Margin="5,0,0,0" Width="60" />
+                                    <ComboBox Margin="5,0,0,0" Width="60" SelectedIndex="0">
+                                        <ComboBoxItem>1 Combobox Item</ComboBoxItem>
+                                        <ComboBoxItem>2 Combobox Item</ComboBoxItem>
+                                    </ComboBox>
+                                    <Separator />
+                                    <RadioButton Content="R1" IsChecked="True" />
+                                    <RadioButton Content="R2" />
+                                    <RadioButton Content="R3" />
                                 </ToolBar>
                             </StackPanel>
                             <ListView ItemsSource="{Binding Source={StaticResource coll1}}" SelectedIndex="5" Margin="2,54,10,190">
                                 <ListView.View>
-                                    <GridView>
+                                    <GridView >
                                         <GridViewColumn Header="Customer" Width="100" DisplayMemberBinding="{Binding CustomerID}" />
                                         <GridViewColumn Header="Company" Width="180" DisplayMemberBinding="{Binding CompanyName}" />
                                         <GridViewColumn Header="Country" Width="100" DisplayMemberBinding="{Binding Country}" />
@@ -123,11 +223,18 @@
                                 <ListBoxItem Content="789"/>
                             </ListBox>
                             <TreeView Margin="204,0,10,10" Height="175" VerticalAlignment="Bottom">
-                                <TreeViewItem Header="1">
-                                    <TreeViewItem Header="12">
-                                        <TreeViewItem Header="123"/>
-                                        <TreeViewItem Header="123"/>
-                                        <TreeViewItem Header="123"/>
+                                <TreeViewItem IsExpanded="True" Header="First" Foreground="Black" Background="AliceBlue">
+                                    <TreeViewItem Header="F-12" IsExpanded="True" Background="Pink">
+                                        <TreeViewItem Header="F-123" />
+                                        <TreeViewItem Header="F-123" IsSelected="True" />
+                                        <TreeViewItem Header="F-123" />
+                                    </TreeViewItem>
+                                </TreeViewItem>
+                                <TreeViewItem Header="Second">
+                                    <TreeViewItem Header="S-12" ex:MarkupExtensionProperties.SpecialWidth="50">
+                                        <TreeViewItem Header="S-123"/>
+                                        <TreeViewItem Header="S-123"/>
+                                        <TreeViewItem Header="S-123"/>
                                     </TreeViewItem>
                                 </TreeViewItem>
                             </TreeView>
@@ -137,7 +244,7 @@
                 <ContentControl Style="{StaticResource DesignerItemStyle}" bsDiag:VisualExtensions.CanRotate="False"
                     Padding="2,27,2,2"
                     Canvas.Left="850"
-                    Canvas.Top="20" Width="733" Height="475">
+                    Canvas.Top="20" Width="700" Height="450">
                     <GroupBox Margin="0,-25,0,0" Style="{StaticResource ExpandrStyleGroupBox}" >
                         <GroupBox.Header>
                             <Label Content="Xaml RichTextBox (CanRotate=false)"/>
@@ -150,6 +257,8 @@
                                 <Paragraph TextAlignment="Justify">
                                     <Run Text="Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum."/>
                                     <Run Text=" "/>
+                                    <Run Text=" "/>
+                                    <Run Text=" "/>
                                     <Figure HorizontalAnchor="ColumnRight" Width="205">
                                         <BlockUIContainer>
                                             <Image UseLayoutRounding="True" d:DesignUseLayoutRounding="True">
@@ -160,6 +269,8 @@
                                         </BlockUIContainer>
                                     </Figure>
                                     <Run Text=" "/>
+                                    <Run Text=" "/>
+                                    <Run Text=" "/>
                                     <Figure HorizontalAnchor="ColumnRight" Width="230">
                                         <BlockUIContainer>
                                             <Image UseLayoutRounding="True" d:DesignUseLayoutRounding="True">
@@ -201,7 +312,7 @@
                     Padding="2,27,2,2"
                     Canvas.Left="350"
                     Canvas.Top="550">
-                    <Expander Margin="0,-25,0,0">
+                    <Expander Margin="0,-25,0,0" IsExpanded="True">
                         <Expander.Header>
                             <Label Background="Transparent" Content="Grid (MaxWidth,MaxHeight)"/>
                         </Expander.Header>
@@ -209,26 +320,25 @@
                     </Expander>
                 </ContentControl>
 
-                <ContentControl  Width="294" Height="133" Background="Pink" Canvas.Left="1050" Canvas.Top="550" Style="{StaticResource DesignerItemStyle}">
+                <ContentControl  Width="294" Height="133" Background="{DynamicResource LightBrush}" Canvas.Left="850" Canvas.Top="550" Style="{StaticResource DesignerItemStyle}">
                     <Border>
                         <StackPanel>
-                            <TextBlock FontStyle="Italic">(Some elements hidden by LODZoom extension)</TextBlock>
+                            <TextBlock FontStyle="Italic"><Run Text="(Some elements hidden by LODZoom extension)"/></TextBlock>
                             <Separator />
-                            <TextBlock TextWrapping="Wrap" bsDiag:VisualExtensions.LODZoom=" A1-5">1. Element use LODZoom Functionality A1-5</TextBlock>
-                            <TextBlock TextWrapping="Wrap" bsDiag:VisualExtensions.LODZoom="A -5.1">2. Element use LODZoom Functionality A -5.1</TextBlock>
-                            <TextBlock TextWrapping="Wrap" bsDiag:VisualExtensions.LODZoom="a 2-8.3">3. Element use LODZoom Functionality a 2-8.3</TextBlock>
-                            <TextBlock TextWrapping="Wrap" bsDiag:VisualExtensions.LODZoom="a 1.5-">4. Element use LODZoom Functionality a 1.5-</TextBlock>
-                            <TextBlock TextWrapping="Wrap" bsDiag:VisualExtensions.LODZoom="1-5">5. Element use LODZoom Functionality 1-5</TextBlock>
+                            <TextBlock TextWrapping="Wrap" bsDiag:VisualExtensions.LODZoom=" A1-5"><Run Text="1. Element use LODZoom Functionality A1-5"/></TextBlock>
+                            <TextBlock TextWrapping="Wrap" bsDiag:VisualExtensions.LODZoom="A -5.1"><Run Text="2. Element use LODZoom Functionality A -5.1"/></TextBlock>
+                            <TextBlock TextWrapping="Wrap" bsDiag:VisualExtensions.LODZoom="a 2-8.3"><Run Text="3. Element use LODZoom Functionality a 2-8.3"/></TextBlock>
+                            <TextBlock TextWrapping="Wrap" bsDiag:VisualExtensions.LODZoom="a 1.5-"><Run Text="4. Element use LODZoom Functionality a 1.5-"/></TextBlock>
+                            <TextBlock TextWrapping="Wrap" bsDiag:VisualExtensions.LODZoom="1-5"><Run Text="5. Element use LODZoom Functionality 1-5"/></TextBlock>
                         </StackPanel>
                     </Border>
 
                 </ContentControl>
 
             </bsDiag:ZoomControl>
-            <CheckBox VerticalAlignment="Bottom" HorizontalAlignment="Left" Margin="0,0,0,20" IsChecked="{Binding ElementName=zc, Path=UseAnimation}">UseAnimation</CheckBox>
-            <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Left">
-                <Run>RenderZoom: </Run><Run Text="{Binding ElementName=zc, Path=RenderZoom}" />
-            </TextBlock>
+            <Label VerticalAlignment="Bottom" HorizontalAlignment="Left" Margin="0,0,0,40">Middle Mouse Button To Pan. Hold Ctrl to force zoom.</Label>
+            <CheckBox VerticalAlignment="Bottom" HorizontalAlignment="Left" Margin="0,0,0,20" IsChecked="{Binding UseAnimation, ElementName=zc}" Content="UseAnimation"/>
+            <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Left"><Run Text="RenderZoom:"/><Run Text="{Binding RenderZoom, ElementName=zc, StringFormat={}  {0:N2}}" /></TextBlock>
         </Grid>
 
 
diff --git a/BrightSharp.Ui.Tests/MainWindow.xaml.cs b/BrightSharp.Ui.Tests/MainWindow.xaml.cs
index a282ab4..f3b372f 100644
--- a/BrightSharp.Ui.Tests/MainWindow.xaml.cs
+++ b/BrightSharp.Ui.Tests/MainWindow.xaml.cs
@@ -1,6 +1,7 @@
 using BrightSharp.Converters;
 using Diagrams;
 using System;
+using System.Text.RegularExpressions;
 using System.Windows;
 using System.Windows.Controls;
 
@@ -15,6 +16,7 @@ namespace BrightSharp.Ui.Tests
         {
             InitializeComponent();
             SelectionBehavior.Attach(innerCanvas);
+            //ThemeManager.Theme = ColorThemes.DarkBlue;
             tb.Text = ThemeManager.Theme.ToString();
         }
 
@@ -46,11 +48,11 @@ namespace BrightSharp.Ui.Tests
         private void DataGrid_AutoGeneratedColumns(object sender, EventArgs e)
         {
             var dg = (DataGrid)sender;
-            var stringHelper = new StringHelpConverter();
             foreach (var col in dg.Columns)
             {
-                col.Header = stringHelper.Convert(col.Header, null, "SpaceBetweenCaps", null);
+                col.Header = Regex.Replace(col.Header.ToString(), "([a-z])([A-Z])", "$1 $2");
             }
         }
+        
     }
 }
diff --git a/BrightSharp.Ui.Tests/TestPage.xaml b/BrightSharp.Ui.Tests/TestPage.xaml
new file mode 100644
index 0000000..6c6de29
--- /dev/null
+++ b/BrightSharp.Ui.Tests/TestPage.xaml
@@ -0,0 +1,22 @@
+<Page x:Class="BrightSharp.Ui.Tests.TestPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:local="clr-namespace:BrightSharp.Ui.Tests"
+      mc:Ignorable="d" 
+      d:DesignHeight="300" d:DesignWidth="300"
+      Title="TestPage">
+
+    <Grid>
+        <StackPanel>
+            <Label>
+                Hello World!
+            </Label>
+            <TextBlock>
+                <Hyperlink NavigateUri="TestPage2.xaml">Go to TestPage2</Hyperlink>
+            </TextBlock>
+        </StackPanel>
+        
+    </Grid>
+</Page>
diff --git a/BrightSharp.Ui.Tests/TestPage.xaml.cs b/BrightSharp.Ui.Tests/TestPage.xaml.cs
new file mode 100644
index 0000000..f2fb7b6
--- /dev/null
+++ b/BrightSharp.Ui.Tests/TestPage.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BrightSharp.Ui.Tests
+{
+    /// <summary>
+    /// Interaction logic for TestPage.xaml
+    /// </summary>
+    public partial class TestPage : Page
+    {
+        public TestPage()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BrightSharp.Ui.Tests/TestPage2.xaml b/BrightSharp.Ui.Tests/TestPage2.xaml
new file mode 100644
index 0000000..c159b4b
--- /dev/null
+++ b/BrightSharp.Ui.Tests/TestPage2.xaml
@@ -0,0 +1,16 @@
+<Page x:Class="BrightSharp.Ui.Tests.TestPage2"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:local="clr-namespace:BrightSharp.Ui.Tests"
+      mc:Ignorable="d" 
+      d:DesignHeight="300" d:DesignWidth="300"
+      Title="TestPage">
+
+    <Grid>
+        <Label>
+            Hello World From Test 2!!!
+        </Label>
+    </Grid>
+</Page>
diff --git a/BrightSharp.Ui.Tests/TestPage2.xaml.cs b/BrightSharp.Ui.Tests/TestPage2.xaml.cs
new file mode 100644
index 0000000..675e4a5
--- /dev/null
+++ b/BrightSharp.Ui.Tests/TestPage2.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BrightSharp.Ui.Tests
+{
+    /// <summary>
+    /// Interaction logic for TestPage.xaml
+    /// </summary>
+    public partial class TestPage2 : Page
+    {
+        public TestPage2()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BrightSharp.Ui.Tests/how_to_find_us.png b/BrightSharp.Ui.Tests/how_to_find_us.png
deleted file mode 100644
index ae8d1ab..0000000
Binary files a/BrightSharp.Ui.Tests/how_to_find_us.png and /dev/null differ
diff --git a/BrightSharp.sln b/BrightSharp.sln
index dc19e5b..50795ba 100644
--- a/BrightSharp.sln
+++ b/BrightSharp.sln
@@ -1,12 +1,34 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26730.10
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrightSharp", "BrightSharp\BrightSharp.csproj", "{ACC3C556-F8E4-4F2A-A23D-8E8749679A1B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrightSharp.Ui.Tests", "BrightSharp.Ui.Tests\BrightSharp.Ui.Tests.csproj", "{0D6E1828-8D07-4701-B98A-65DBF1604D3F}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Subitems", "Subitems", "{D7917F1F-55F7-440E-82BF-1F5ADE0AAD3C}"
+	ProjectSection(SolutionItems) = preProject
+		docs\logo-small.png = docs\logo-small.png
+		README.md = README.md
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{21BBA955-8560-43B2-8ED7-275861A2DF11}"
+	ProjectSection(SolutionItems) = preProject
+		docs\BrushesList.png = docs\BrushesList.png
+		docs\classic-theme.png = docs\classic-theme.png
+		docs\htmleditor.png = docs\htmleditor.png
+		docs\logo.png = docs\logo.png
+		docs\help\zoomcontrol.md = docs\help\zoomcontrol.md
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Help", "Help", "{8097BF6E-FB5B-4DF3-BB75-DCA1A7313D33}"
+	ProjectSection(SolutionItems) = preProject
+		docs\help\apply-themes.md = docs\help\apply-themes.md
+		docs\help\brushes.md = docs\help\brushes.md
+		docs\help\htmleditor.md = docs\help\htmleditor.md
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -25,4 +47,11 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{21BBA955-8560-43B2-8ED7-275861A2DF11} = {D7917F1F-55F7-440E-82BF-1F5ADE0AAD3C}
+		{8097BF6E-FB5B-4DF3-BB75-DCA1A7313D33} = {21BBA955-8560-43B2-8ED7-275861A2DF11}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {8F1E742F-10FA-44EA-999B-66B79F991220}
+	EndGlobalSection
 EndGlobal
diff --git a/BrightSharp/BrightSharp.csproj b/BrightSharp/BrightSharp.csproj
index fd09df4..9d17933 100644
--- a/BrightSharp/BrightSharp.csproj
+++ b/BrightSharp/BrightSharp.csproj
@@ -56,7 +56,6 @@
     <Compile Include="Commands\AsyncCommand.cs" />
     <Compile Include="Commands\RelayCommand.cs" />
     <Compile Include="Converters\InverseBooleanToVisibilityConverter.cs" />
-    <Compile Include="Converters\StringHelpConverter.cs" />
     <Compile Include="Diagrams\Adorners\ResizeRotateAdorner.cs" />
     <Compile Include="Diagrams\Adorners\ResizeRotateChrome.cs" />
     <Compile Include="Diagrams\Adorners\SizeAdorner.cs" />
@@ -68,7 +67,6 @@
     <Compile Include="Diagrams\Thumbs\ResizeThumb.cs" />
     <Compile Include="Diagrams\Thumbs\RotateThumb.cs" />
     <Compile Include="Extensions\WpfExtensions.cs" />
-    <Compile Include="Mvvm\ViewModelBase.cs" />
     <Compile Include="ThemeManager.cs" />
     <Compile Include="ZoomControl.cs">
       <SubType>Code</SubType>
diff --git a/BrightSharp/Converters/StringHelpConverter.cs b/BrightSharp/Converters/StringHelpConverter.cs
deleted file mode 100644
index fd0dff9..0000000
--- a/BrightSharp/Converters/StringHelpConverter.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Globalization;
-using System.Text.RegularExpressions;
-using System.Windows.Data;
-
-namespace BrightSharp.Converters
-{
-    public class StringHelpConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (parameter is string && value is string)
-            {
-                var parStr = (string)parameter;
-                switch (parStr)
-                {
-                    case "SpaceBetweenCaps":
-                        var src = (value ?? string.Empty).ToString();
-                        return Regex.Replace(src, "([a-z])([A-Z])", "$1 $2");
-                    default:
-                        break;
-                }
-            }
-            return value;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/BrightSharp/Diagrams/SelectionBehavior.cs b/BrightSharp/Diagrams/SelectionBehavior.cs
index 85e6844..4f132e0 100644
--- a/BrightSharp/Diagrams/SelectionBehavior.cs
+++ b/BrightSharp/Diagrams/SelectionBehavior.cs
@@ -20,7 +20,7 @@ namespace Diagrams
                 {
                     if (e.Source is DependencyObject)
                     {
-                        var clickedElement = ((DependencyObject)e.OriginalSource).Ancestors<ContentControl>().FirstOrDefault(el => el.Style == designerStyle && WpfExtensions.GetItemsPanel(el.GetParent(true)) == fe);
+                        var clickedElement = ((DependencyObject)e.OriginalSource).GetAncestors<ContentControl>().FirstOrDefault(el => el.Style == designerStyle && WpfExtensions.GetItemsPanel(el.GetParent(true)) == fe);
                         if (clickedElement == null)
                         {
                             foreach (DependencyObject item in fePanel.Children)
@@ -49,7 +49,7 @@ namespace Diagrams
                 {
                     if (e.Source is DependencyObject)
                     {
-                        var clickedElement = ((DependencyObject)e.Source).Ancestors<ContentControl>().FirstOrDefault(el => el.Style == designerStyle && el.Parent == fe);
+                        var clickedElement = ((DependencyObject)e.Source).GetAncestors<ContentControl>().FirstOrDefault(el => el.Style == designerStyle && el.Parent == fe);
                         if (clickedElement == null)
                         {
                             foreach (DependencyObject item in feItemsControl.Items)
diff --git a/BrightSharp/Diagrams/Thumbs/MoveThumb.cs b/BrightSharp/Diagrams/Thumbs/MoveThumb.cs
index 0883790..3351067 100644
--- a/BrightSharp/Diagrams/Thumbs/MoveThumb.cs
+++ b/BrightSharp/Diagrams/Thumbs/MoveThumb.cs
@@ -1,8 +1,8 @@
-using System.ComponentModel;
+using System;
+using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
-using System.Windows.Input;
 using System.Windows.Media;
 
 namespace Diagrams
@@ -12,32 +12,35 @@ namespace Diagrams
     {
         private RotateTransform rotateTransform;
         private ContentControl designerItem;
+        private static int? zIndex = null;
 
-        public MoveThumb()
-        {
-            DragStarted += new DragStartedEventHandler(this.MoveThumb_DragStarted);
-            DragDelta += new DragDeltaEventHandler(this.MoveThumb_DragDelta);
+        public MoveThumb() {
+            DragStarted += MoveThumb_DragStarted;
+            DragDelta += MoveThumb_DragDelta;
+            DragCompleted += MoveThumb_DragCompleted;
         }
 
+        private void MoveThumb_DragCompleted(object sender, DragCompletedEventArgs e) {
+            //TODO Need think about ZIndex changes
+        }
 
-        private void MoveThumb_DragStarted(object sender, DragStartedEventArgs e)
-        {
+        private void MoveThumb_DragStarted(object sender, DragStartedEventArgs e) {
             this.designerItem = DataContext as ContentControl;
 
-            if (this.designerItem != null)
-            {
+            if (this.designerItem != null) {
                 this.rotateTransform = this.designerItem.RenderTransform as RotateTransform;
+                if (designerItem.GetBindingExpression(Panel.ZIndexProperty) == null) {
+                    zIndex = Math.Max(zIndex ?? 0, Panel.GetZIndex(designerItem));
+                    Panel.SetZIndex(designerItem, zIndex.Value + 1);
+                }
             }
         }
 
-        private void MoveThumb_DragDelta(object sender, DragDeltaEventArgs e)
-        {
-            if (this.designerItem != null)
-            {
+        private void MoveThumb_DragDelta(object sender, DragDeltaEventArgs e) {
+            if (this.designerItem != null) {
                 Point dragDelta = new Point(e.HorizontalChange, e.VerticalChange);
 
-                if (this.rotateTransform != null)
-                {
+                if (this.rotateTransform != null) {
                     dragDelta = this.rotateTransform.Transform(dragDelta);
                 }
                 if (double.IsNaN(Canvas.GetLeft(this.designerItem))) Canvas.SetLeft(this.designerItem, 0);
@@ -45,6 +48,8 @@ namespace Diagrams
 
                 Canvas.SetLeft(this.designerItem, Canvas.GetLeft(this.designerItem) + dragDelta.X);
                 Canvas.SetTop(this.designerItem, Canvas.GetTop(this.designerItem) + dragDelta.Y);
+
+
             }
         }
     }
diff --git a/BrightSharp/Extensions/WpfExtensions.cs b/BrightSharp/Extensions/WpfExtensions.cs
index 2f7e069..9e0f579 100644
--- a/BrightSharp/Extensions/WpfExtensions.cs
+++ b/BrightSharp/Extensions/WpfExtensions.cs
@@ -9,6 +9,12 @@ namespace BrightSharp.Extensions
 {
     public static class WpfExtensions
     {
+        /// <summary>
+        /// Returns Parent item of DependencyObject
+        /// </summary>
+        /// <param name="obj">Child object</param>
+        /// <param name="useLogicalTree">Prefer LogicalTree when need.</param>
+        /// <returns>Found item</returns>
         public static DependencyObject GetParent(this DependencyObject obj, bool useLogicalTree = false)
         {
             if (!useLogicalTree && (obj is Visual || obj is Visual3D))
@@ -16,7 +22,8 @@ namespace BrightSharp.Extensions
             else
                 return LogicalTreeHelper.GetParent(obj);
         }
-        public static IEnumerable<T> Ancestors<T>(this DependencyObject obj, bool useLogicalTree = false) where T : DependencyObject
+
+        public static IEnumerable<T> GetAncestors<T>(this DependencyObject obj, bool useLogicalTree = false) where T : DependencyObject
         {
             if (obj == null) yield break;
 
@@ -30,7 +37,7 @@ namespace BrightSharp.Extensions
                 yield return x as T;
             else
                 yield break;
-            foreach (var item in Ancestors<T>(x, useLogicalTree))
+            foreach (var item in GetAncestors<T>(x, useLogicalTree))
             {
                 yield return item;
             }
@@ -38,34 +45,97 @@ namespace BrightSharp.Extensions
 
         public static T FindAncestor<T>(this DependencyObject obj) where T : DependencyObject
         {
-            return Ancestors<T>(obj).FirstOrDefault();
+            return GetAncestors<T>(obj).FirstOrDefault();
         }
+
+        /// <summary>
+        /// Try find ItemsPanel of ItemsControl
+        /// </summary>
+        /// <param name="itemsControl">Where to search</param>
+        /// <returns>Panel of ItemsControl</returns>
         public static Panel GetItemsPanel(DependencyObject itemsControl)
         {
             if (itemsControl is Panel) return (Panel)itemsControl;
-            ItemsPresenter itemsPresenter = GetVisualChild<ItemsPresenter>(itemsControl);
+            ItemsPresenter itemsPresenter = FindVisualChildren<ItemsPresenter>(itemsControl).FirstOrDefault();
+            if (itemsPresenter == null) return null;
             var itemsPanel = VisualTreeHelper.GetChild(itemsPresenter, 0) as Panel;
             return itemsPanel;
         }
-        public static T GetVisualChild<T>(DependencyObject parent) where T : Visual
-        {
-            T child = default(T);
 
-            int numVisuals = VisualTreeHelper.GetChildrenCount(parent);
-            for (int i = 0; i < numVisuals; i++)
-            {
-                Visual v = (Visual)VisualTreeHelper.GetChild(parent, i);
-                child = v as T;
-                if (child == null)
-                {
-                    child = GetVisualChild<T>(v);
+        /// <summary>
+        /// Check if object is valid (no errors found in logical children)
+        /// </summary>
+        /// <param name="obj">Object to search</param>
+        /// <returns>True if no errors found</returns>
+        public static bool IsValid(this DependencyObject obj) {
+            if (obj == null) return true;
+            if (Validation.GetHasError(obj)) return false;
+            foreach (var child in LogicalTreeHelper.GetChildren(obj).OfType<DependencyObject>()) {
+                if (child == null) continue;
+                if (child is UIElement ui) {
+                    if (!ui.IsVisible || !ui.IsEnabled) continue;
                 }
-                if (child != null)
-                {
-                    break;
+                if (!IsValid(child)) return false;
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// Search all textboxes to update invalid with UpdateSource(). For ex. when need update validation messages.
+        /// </summary>
+        /// <param name="obj">Object where to search TextBoxes</param>
+        public static void UpdateSources(this DependencyObject obj) {
+            if (obj == null) return;
+            if (Validation.GetHasError(obj)) {
+                //TODO Any types?
+                if (obj is TextBox tb) tb.GetBindingExpression(TextBox.TextProperty)?.UpdateSource();
+            }
+            foreach (var item in FindLogicalChildren<DependencyObject>(obj)) {
+                UpdateSources(item);
+            }
+        }
+
+        /// <summary>
+        /// Find all visual children of type T
+        /// </summary>
+        /// <typeparam name="T">Type to search</typeparam>
+        /// <param name="depObj">Object where to search</param>
+        /// <returns>Enumerator for items</returns>
+        public static IEnumerable<T> FindVisualChildren<T>(this DependencyObject depObj) where T : DependencyObject {
+            if (depObj != null && (depObj is Visual || depObj is Visual3D)) {
+                for (int i = 0; i < VisualTreeHelper.GetChildrenCount(depObj); i++) {
+                    DependencyObject child = VisualTreeHelper.GetChild(depObj, i);
+                    if (child != null && child is T) {
+                        yield return (T)child;
+                    }
+
+                    foreach (T childOfChild in FindVisualChildren<T>(child)) {
+                        yield return childOfChild;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Find all logical children of type T
+        /// </summary>
+        /// <typeparam name="T">Type to search</typeparam>
+        /// <param name="depObj">Object where to search</param>
+        /// <returns>Enumerator for items</returns>
+        public static IEnumerable<T> FindLogicalChildren<T>(this DependencyObject depObj) where T : DependencyObject {
+            if (depObj != null) {
+                foreach (object rawChild in LogicalTreeHelper.GetChildren(depObj)) {
+                    if (rawChild is DependencyObject child) {
+                        if (child is T) {
+                            yield return (T)child;
+                        }
+
+                        foreach (T childOfChild in FindLogicalChildren<T>(child)) {
+                            yield return childOfChild;
+                        }
+                    }
                 }
             }
-            return child;
         }
     }
 
diff --git a/BrightSharp/Generic.xaml b/BrightSharp/Generic.xaml
index f1dcfe3..1bce5d4 100644
--- a/BrightSharp/Generic.xaml
+++ b/BrightSharp/Generic.xaml
@@ -2,14 +2,23 @@
                     x:ClassModifier="internal"
                     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:bs="clr-namespace:BrightSharp.Extensions"
                     xmlns:conv="clr-namespace:BrightSharp.Converters"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                    xmlns:diag="clr-namespace:Diagrams"
-                    xmlns:local="clr-namespace:BrightSharp">
+                    xmlns:bs="clr-namespace:BrightSharp.Extensions"
+                    xmlns:diag="clr-namespace:Diagrams">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="Diagrams/Resources/DesignerItem.xaml" />
     </ResourceDictionary.MergedDictionaries>
+
+    <!--Converters-->
+
+    <conv:ThicknessConverter x:Key="ThickConv" />
+    <JournalEntryUnifiedViewConverter x:Key="JournalEntryUnifiedViewConverter" />
+    <BorderGapMaskConverter x:Key="BorderGapMaskConverter" />
+    <BooleanToVisibilityConverter x:Key="btvc" />
+    <conv:InverseBooleanToVisibilityConverter x:Key="ibtvc" />
+
+    <!--Radiuses-->
+
     <CornerRadius x:Key="DefaultRadiusSmall">1</CornerRadius>
     <CornerRadius x:Key="DefaultRadiusNormal">3</CornerRadius>
 
@@ -28,7 +37,6 @@
         <GradientStop Color="#FFECF5FF" Offset="0.8"/>
         <GradientStop Color="#FFECF5FF" Offset="0.2"/>
     </LinearGradientBrush>
-
     <LinearGradientBrush x:Key="NormalBrush" StartPoint="0,0" EndPoint="0,1">
         <GradientStop Color="#FFF" Offset="0.0"/>
         <GradientStop Color="#CCC" Offset="1.0"/>
@@ -41,7 +49,6 @@
             </GradientStopCollection>
         </GradientBrush.GradientStops>
     </LinearGradientBrush>
-
     <LinearGradientBrush x:Key="ProgressBarIndeterminateRootBrush" EndPoint="0.5,1" StartPoint="0.5,0">
         <GradientStop Color="#F6BCD5FF" Offset="0.046" />
         <GradientStop Color="#96D4E4FF" Offset="0.18" />
@@ -59,8 +66,6 @@
         <GradientStop Color="#006EA4FD" Offset="0.475" />
         <GradientStop Color="#FFBCD5FF" Offset="0.899" />
     </LinearGradientBrush>
-
-
     <LinearGradientBrush x:Key="NormalProgressBrush" StartPoint="0,0" EndPoint="0,1">
         <GradientBrush.GradientStops>
             <GradientStopCollection>
@@ -85,7 +90,6 @@
             </GradientStopCollection>
         </LinearGradientBrush.GradientStops>
     </LinearGradientBrush>
-
     <LinearGradientBrush x:Key="NormalBorderBrush" StartPoint="0,0" EndPoint="0,1">
         <GradientBrush.GradientStops>
             <GradientStopCollection>
@@ -94,8 +98,6 @@
             </GradientStopCollection>
         </GradientBrush.GradientStops>
     </LinearGradientBrush>
-
-
     <LinearGradientBrush x:Key="HorizontalNormalBorderBrush" StartPoint="0,0" EndPoint="1,0">
         <GradientBrush.GradientStops>
             <GradientStopCollection>
@@ -104,12 +106,9 @@
             </GradientStopCollection>
         </GradientBrush.GradientStops>
     </LinearGradientBrush>
-
     <SolidColorBrush x:Key="TopLevelMenuBackgroundHover" Color="Pink" />
 
     <!-- Light Brush -->
-
-
     <LinearGradientBrush x:Key="HorizontalLightBrush" StartPoint="0,0" EndPoint="1,0">
         <GradientBrush.GradientStops>
             <GradientStopCollection>
@@ -120,7 +119,6 @@
     </LinearGradientBrush>
 
     <!-- Dark Brush -->
-
     <LinearGradientBrush x:Key="DarkBrush" StartPoint="0,0" EndPoint="0,1">
         <GradientBrush.GradientStops>
             <GradientStopCollection>
@@ -129,7 +127,6 @@
             </GradientStopCollection>
         </GradientBrush.GradientStops>
     </LinearGradientBrush>
-
     <LinearGradientBrush x:Key="VerticalDarkBrush" StartPoint="0,0" EndPoint="1,0">
         <GradientBrush.GradientStops>
             <GradientStopCollection>
@@ -138,8 +135,8 @@
             </GradientStopCollection>
         </GradientBrush.GradientStops>
     </LinearGradientBrush>
-    <!-- Pressed Brush -->
 
+    <!-- Pressed Brush -->
     <LinearGradientBrush x:Key="PressedBrush" StartPoint="0,0" EndPoint="0,1">
         <GradientBrush.GradientStops>
             <GradientStopCollection>
@@ -150,7 +147,6 @@
             </GradientStopCollection>
         </GradientBrush.GradientStops>
     </LinearGradientBrush>
-
     <LinearGradientBrush x:Key="TogglePressedBrush" StartPoint="0,0" EndPoint="0,1">
         <GradientBrush.GradientStops>
             <GradientStopCollection>
@@ -161,7 +157,6 @@
             </GradientStopCollection>
         </GradientBrush.GradientStops>
     </LinearGradientBrush>
-
     <LinearGradientBrush x:Key="VerticalPressedBrush" StartPoint="0,0" EndPoint="1,0">
         <GradientBrush.GradientStops>
             <GradientStopCollection>
@@ -172,7 +167,6 @@
             </GradientStopCollection>
         </GradientBrush.GradientStops>
     </LinearGradientBrush>
-
     <LinearGradientBrush x:Key="PressedBorderBrush" StartPoint="0,0" EndPoint="0,1">
         <GradientBrush.GradientStops>
             <GradientStopCollection>
@@ -183,7 +177,6 @@
     </LinearGradientBrush>
 
     <!-- Defaulted Brush -->
-
     <LinearGradientBrush x:Key="DefaultedBorderBrush" StartPoint="0,0" EndPoint="0,1">
         <GradientBrush.GradientStops>
             <GradientStopCollection>
@@ -194,16 +187,13 @@
     </LinearGradientBrush>
 
     <!-- Disabled Brush -->
-
     <SolidColorBrush x:Key="DisabledBorderBrush" Color="#AAA" />
 
     <!-- Border Brushes -->
-
     <SolidColorBrush x:Key="SolidBorderBrush" Color="#888" />
     <SolidColorBrush x:Key="LightBorderBrush" Color="#AAA" />
 
     <!-- Miscellaneous Brushes -->
-
     <LinearGradientBrush x:Key="ScrollBarPageButtonVertBrush" StartPoint="0,0" EndPoint="1,0">
         <GradientStopCollection>
             <GradientStop Offset="0" Color="#FFD3DBFF" />
@@ -220,8 +210,6 @@
             <GradientStop Offset="1" Color="#FFD3DBFF" />
         </GradientStopCollection>
     </LinearGradientBrush>
-
-
     <LinearGradientBrush x:Key="TabItemSelectedBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
         <GradientBrush.GradientStops>
             <GradientStopCollection>
@@ -232,27 +220,20 @@
             </GradientStopCollection>
         </GradientBrush.GradientStops>
     </LinearGradientBrush>
-
     <SolidColorBrush x:Key="MainMenuForegroundBrush" Color="Black"/>
 
-
     <!--Color STYLED Brush-->
-
+    <Color x:Key="WindowBackgroundHoverColor">#FFF</Color>
     <LinearGradientBrush x:Key="WindowBackgroundBrush">
         <GradientStop Color="#EEE" />
     </LinearGradientBrush>
-    <Color x:Key="WindowBackgroundHoverColor">#FFF</Color>
-
     <SolidColorBrush x:Key="SelectedBackgroundBrush" Color="#FFC0C9E4" />
     <SolidColorBrush x:Key="GlyphBrush" Color="#444" />
     <SolidColorBrush x:Key="LightColorBrush" Color="#DDD" />
-
     <Color x:Key="OnWindowForegroundColor">Black</Color>
     <SolidColorBrush x:Key="OnWindowForegroundBrush" Color="{DynamicResource OnWindowForegroundColor}" />
     <SolidColorBrush x:Key="DisabledForegroundBrush" Color="#FF4D4D4D" />
     <SolidColorBrush x:Key="DisabledBackgroundBrush" Color="#EEE" />
-
-
     <LinearGradientBrush x:Key="LightBrush" StartPoint="0,0" EndPoint="0,1">
         <GradientBrush.GradientStops>
             <GradientStopCollection>
@@ -261,32 +242,58 @@
             </GradientStopCollection>
         </GradientBrush.GradientStops>
     </LinearGradientBrush>
-
     <SolidColorBrush x:Key="ScrollBarBackgroundBrush" Color="#F0F0F0" />
-    <SolidColorBrush x:Key="SynWindowBackgroundBrush" Color="#FFE4E4E4" />
-
     <SolidColorBrush x:Key="HighLightForegroundBrush" Color="#FF500000" />
-
     <Color x:Key="UiForegroundColor">Black</Color>
     <SolidColorBrush x:Key="UiForegroundBrush" Color="{DynamicResource UiForegroundColor}" />
-
-    <Color x:Key="SelectedBackgroundColor">#E7E9FC</Color>
+    <Color x:Key="SelectedBackgroundColor">#DEE4FF</Color>
     <Color x:Key="SelectedUnfocusedColor">#FFB6B6B6</Color>
     <Color x:Key="ControlLightColor">#FFFFFFFF</Color>
     <Color x:Key="ControlMediumColor">#FFC5C5C5</Color>
     <Color x:Key="ControlDarkColor">#FF6B6B6B</Color>
-
-    <Color x:Key="ControlMouseOverColor">#FFA5A7BA</Color>
+    <Color x:Key="ControlMouseOverColor">#FFDADCEC</Color>
     <Color x:Key="ControlPressedColor">#FF47909B</Color>
+    <Color x:Key="BorderLightColor">#D6D6D6</Color>
+    <Color x:Key="BorderMediumColor">#E6E6E6</Color>
 
 
+    <!--Window Brushes-->
+
+    <LinearGradientBrush x:Key="GradientWindowBackgroundBrush" EndPoint="1,1" StartPoint="0,0">
+        <GradientStop Color="#FFAFBAD6" Offset="0"/>
+        <GradientStop Color="White" Offset="1"/>
+        <GradientStop Color="#FFD1E3FF" Offset="0.766"/>
+        <GradientStop Color="#FFE2E8F8" Offset="0.238"/>
+    </LinearGradientBrush>
+
+    <LinearGradientBrush x:Key="WindowHeaderBrush" EndPoint="0,1">
+        <GradientStop Color="#EFD3D3" />
+        <GradientStop Color="#FFB5BBC6" Offset="0.2" />
+        <GradientStop Color="#FFDDDDF7" Offset="0.8" />
+        <GradientStop Color="#FF93B1CE" Offset="1" />
+    </LinearGradientBrush>
+
+    <LinearGradientBrush x:Key="WindowHeaderInactiveBrush" EndPoint="0,1">
+        <GradientStop Color="#A5A5A5" />
+        <GradientStop Color="#FF616161" Offset="0.2" />
+        <GradientStop Color="#FF5C5C5C" Offset="0.8" />
+        <GradientStop Color="#FFBEC5CB" Offset="1" />
+    </LinearGradientBrush>
+
+    <LinearGradientBrush x:Key="WindowBorderBrush" EndPoint="0,1" StartPoint="0,0">
+        <GradientStop Color="#FF898989" Offset="0"/>
+        <GradientStop Color="#FF898989" Offset="1"/>
+        <GradientStop Color="LightGray" Offset="0.841"/>
+        <GradientStop Color="#FFCBCBCB" Offset="0.23"/>
+    </LinearGradientBrush>
+
+    <LinearGradientBrush x:Key="WindowInnerBorderBrush" StartPoint="0,0" EndPoint="0,1">
+        <GradientStop Color="#F0F0F0" Offset="1" />
+        <GradientStop Color="White" />
+    </LinearGradientBrush>
 
 
-
-
-    <conv:ThicknessConverter x:Key="ThickConv" />
-    <JournalEntryUnifiedViewConverter x:Key="JournalEntryUnifiedViewConverter" />
-    <BorderGapMaskConverter x:Key="BorderGapMaskConverter" />
+    <!--STYLES-->
 
     <ContextMenu x:Key="DecoTextBoxContextMenu">
         <MenuItem Command="ApplicationCommands.Copy">
@@ -454,6 +461,7 @@
             </Setter.Value>
         </Setter>
     </Style>
+
     <Style x:Key="{x:Static ToolBar.ButtonStyleKey}" TargetType="Button">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Width" Value="Auto" />
@@ -657,7 +665,8 @@
                                 <VisualState x:Name="Active"/>
                                 <VisualState x:Name="Inactive">
                                     <Storyboard>
-                                        <ColorAnimation Duration="0" To="{DynamicResource UiForegroundColor}" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="NormalText"/>
+                                        <DoubleAnimation Duration="0" To="0" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="NormalText"/>
+                                        <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="NormalTextOver"/>
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>
@@ -669,7 +678,8 @@
                                 <VisualState x:Name="Today">
                                     <Storyboard>
                                         <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="TodayBackground"/>
-                                        <ColorAnimation Duration="0" To="{DynamicResource UiForegroundColor}" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="NormalText"/>
+                                        <DoubleAnimation Duration="0" To="0" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="NormalText"/>
+                                        <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="NormalTextOver"/>
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>
@@ -680,7 +690,7 @@
                                 <VisualState x:Name="NormalDay"/>
                                 <VisualState x:Name="BlackoutDay">
                                     <Storyboard>
-                                        <DoubleAnimation Duration="0" To="0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="Blackout"/>
+                                        <DoubleAnimation Duration="0" To="0.4" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="Blackout"/>
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>
@@ -689,7 +699,9 @@
                         <Rectangle x:Name="SelectedBackground" Fill="{DynamicResource PressedBrush}" Stroke="{DynamicResource PressedBorderBrush}" Opacity="0" RadiusY="1" RadiusX="1"/>
                         <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}"/>
                         <Rectangle x:Name="HighlightBackground" Fill="{DynamicResource PressedBrush}" Opacity="0" RadiusY="1" RadiusX="1"/>
+                        <ContentPresenter TextBlock.Foreground="{DynamicResource UiForegroundBrush}" x:Name="NormalTextOver" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="5,1" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Opacity="0"/>
                         <ContentPresenter TextBlock.Foreground="{TemplateBinding Foreground}" x:Name="NormalText" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="5,1" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+
                         <Path x:Name="Blackout" Data="M8.1772461,11.029181L10.433105,11.029181 11.700684,12.801641 12.973633,11.029181 15.191895,11.029181 12.844727,13.999395 15.21875,17.060919 12.962891,17.060919 11.673828,15.256231 10.352539,17.060919 8.1396484,17.060919 10.519043,14.042364z" Fill="Black" HorizontalAlignment="Stretch" Margin="3" Opacity="0" RenderTransformOrigin="0.5,0.5" Stretch="Fill" VerticalAlignment="Stretch"/>
                         <Rectangle x:Name="DayButtonFocusVisual" IsHitTestVisible="False" RadiusY="1" RadiusX="1" Stroke="{DynamicResource NormalBorderBrush}" Visibility="Collapsed"/>
                     </Grid>
@@ -729,7 +741,8 @@
                                                     <VisualState x:Name="Normal"/>
                                                     <VisualState x:Name="MouseOver">
                                                         <Storyboard>
-                                                            <ColorAnimation Duration="0" To="{DynamicResource UiForegroundColor}" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="buttonContent"/>
+                                                            <DoubleAnimation Duration="0" To="0" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="buttonContent"/>
+                                                            <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="buttonContentOver"/>
                                                         </Storyboard>
                                                     </VisualState>
                                                     <VisualState x:Name="Disabled">
@@ -739,6 +752,7 @@
                                                     </VisualState>
                                                 </VisualStateGroup>
                                             </VisualStateManager.VisualStateGroups>
+                                            <ContentPresenter x:Name="buttonContentOver" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" TextElement.Foreground="{DynamicResource UiForegroundBrush}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="1,4,1,9" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Opacity="0" />
                                             <ContentPresenter x:Name="buttonContent" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" TextElement.Foreground="{DynamicResource OnWindowForegroundBrush}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="1,4,1,9" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
                                         </Grid>
                                     </ControlTemplate>
@@ -972,7 +986,8 @@
                                 <VisualState x:Name="Active"/>
                                 <VisualState x:Name="Inactive">
                                     <Storyboard>
-                                        <ColorAnimation Duration="0" To="{DynamicResource UiForegroundColor}" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="NormalText"/>
+                                        <DoubleAnimation Duration="0" To="0" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="NormalText"/>
+                                        <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="NormalTextOver"/>
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>
@@ -1006,6 +1021,7 @@
                         </VisualStateManager.VisualStateGroups>
                         <Rectangle x:Name="SelectedBackground" Fill="{TemplateBinding Background}" Opacity="0" RadiusY="1" RadiusX="1"/>
                         <Rectangle x:Name="Background" Fill="{TemplateBinding Background}" Opacity="0" RadiusY="1" RadiusX="1" Stroke="{TemplateBinding BorderBrush}"/>
+                        <ContentPresenter x:Name="NormalTextOver" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" TextElement.Foreground="{DynamicResource UiForegroundBrush}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="1,0,1,1" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Opacity="0"/>
                         <ContentPresenter x:Name="NormalText" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" TextElement.Foreground="{TemplateBinding Foreground}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="1,0,1,1" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
                         <Rectangle x:Name="CalendarButtonFocusVisual" IsHitTestVisible="False" RadiusY="1" RadiusX="1" Stroke="{TemplateBinding BorderBrush}" Visibility="Collapsed"/>
                     </Grid>
@@ -1296,7 +1312,7 @@
             <Border
     			x:Name="Border" 
     			Grid.ColumnSpan="2"
-    			CornerRadius="2"
+    			CornerRadius="{TemplateBinding bs:MarkupExtensionProperties.CornerRadius}"
     			Background="{DynamicResource NormalBrush}"
     			BorderBrush="{TemplateBinding BorderBrush}"
     			BorderThickness="{TemplateBinding BorderThickness}" />
@@ -1341,6 +1357,7 @@
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
         <Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
         <Setter Property="bs:MarkupExtensionProperties.SpecialWidth" Value="20" />
+        <Setter Property="bs:MarkupExtensionProperties.CornerRadius" Value="2" />
         <Setter Property="Background" Value="{DynamicResource WindowBackgroundBrush}" />
         <Setter Property="MinWidth" Value="50"/>
         <Setter Property="MinHeight" Value="20"/>
@@ -1350,7 +1367,7 @@
                 <ControlTemplate TargetType="{x:Type ComboBox}">
                     <Grid>
                         <ToggleButton Name="ToggleButton" 
-              Template="{DynamicResource ComboBoxToggleButton}" 
+              Template="{DynamicResource ComboBoxToggleButton}" bs:MarkupExtensionProperties.CornerRadius="{TemplateBinding bs:MarkupExtensionProperties.CornerRadius}"
               VerticalAlignment="Stretch" Focusable="false" Background="{TemplateBinding Background}" 
               BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"
               IsChecked="{Binding Path=IsDropDownOpen,Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent}}"
@@ -1371,27 +1388,19 @@
               Margin="0,0,23,0" bs:MarkupExtensionProperties.SpecialBrush="Transparent" 
               Foreground="{DynamicResource UiForegroundBrush}"
               IsReadOnly="{TemplateBinding IsReadOnly}"/>
-                        <Popup
-              Name="Popup"
-              Placement="Bottom"
-              IsOpen="{TemplateBinding IsDropDownOpen}"
-              AllowsTransparency="True" 
-              Focusable="False"
-              PopupAnimation="Slide">
-                            <Grid 
-                Name="DropDown"
-                SnapsToDevicePixels="True"                
-                MinWidth="{TemplateBinding ActualWidth}"
-                MaxHeight="{TemplateBinding MaxDropDownHeight}">
-                                <Border 
-                  x:Name="DropDownBorder"
-                  Background="{TemplateBinding Background}"
-                  BorderThickness="1"
-                  BorderBrush="{DynamicResource SolidBorderBrush}"/>
-                                <ScrollViewer Margin="3,5" SnapsToDevicePixels="True">
-                                    <ItemsPresenter KeyboardNavigation.DirectionalNavigation="Contained">
-                                    </ItemsPresenter>
+                        <Popup Name="Popup" Placement="Bottom" IsOpen="{TemplateBinding IsDropDownOpen}" AllowsTransparency="True" Focusable="False" PopupAnimation="Slide">
+                            <Grid Name="DropDown" SnapsToDevicePixels="True" MinWidth="{TemplateBinding ActualWidth}" MaxHeight="{TemplateBinding MaxDropDownHeight}">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition />
+                                    <RowDefinition Height="Auto" />
+                                </Grid.RowDefinitions>
+                                <Border Grid.RowSpan="3" x:Name="DropDownBorder" Background="{TemplateBinding Background}" BorderThickness="1" BorderBrush="{DynamicResource SolidBorderBrush}"/>
+                                <ContentPresenter Content="{TemplateBinding bs:MarkupExtensionProperties.LeadingElement}" />
+                                <ScrollViewer Grid.Row="1" Margin="3" SnapsToDevicePixels="True">
+                                    <ItemsPresenter KeyboardNavigation.DirectionalNavigation="Contained" />
                                 </ScrollViewer>
+                                <ContentPresenter Grid.Row="2" Content="{TemplateBinding bs:MarkupExtensionProperties.TrailingElement}" />
                             </Grid>
                         </Popup>
                     </Grid>
@@ -1409,7 +1418,7 @@
                             <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
                         </Trigger>
                         <Trigger SourceName="Popup" Property="Popup.AllowsTransparency" Value="true">
-                            <Setter TargetName="DropDownBorder" Property="CornerRadius" Value="3"/>
+                            <Setter TargetName="DropDownBorder" Property="CornerRadius" Value="2"/>
                             <Setter TargetName="DropDownBorder" Property="Margin" Value="0,2,0,0"/>
                         </Trigger>
                         <Trigger Property="IsEditable" Value="true">
@@ -1469,15 +1478,12 @@
         <Setter Property="Foreground" Value="{DynamicResource OnWindowForegroundBrush}" />
     </Style>
     <Style TargetType="DataGridColumnHeader">
-        <Style.Resources>
-            <conv:StringHelpConverter x:Key="StringHelper" />
-        </Style.Resources>
         <Setter Property="Foreground" Value="{DynamicResource UiForegroundBrush}" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="SeparatorBrush" Value="{DynamicResource NormalBorderBrush}" />
-        <Setter Property="Background" Value="{DynamicResource LightBrush}" />
+        <Setter Property="Background" Value="{DynamicResource NormalBrush}" />
         <Setter Property="Padding" Value="4" />
 
         <Setter Property="Template">
@@ -1485,10 +1491,21 @@
                 <ControlTemplate TargetType="DataGridColumnHeader">
                     <Grid>
 
-                        <Rectangle x:Name="BackgroundRectangle" Stretch="Fill" Fill="#FF1F3B53" Grid.ColumnSpan="2" />
+                        <!--<Rectangle x:Name="BackgroundRectangle" Stretch="Fill" Fill="#FF1F3B53" Grid.ColumnSpan="2" />-->
 
-                        <Border x:Name="BackgroundGradient" Grid.ColumnSpan="2" BorderBrush="{TemplateBinding SeparatorBrush}" BorderThickness="0,0,1,0" Background="{DynamicResource NormalBrush}"/>
-                        <Border x:Name="BackgroundOver" Opacity="0" Grid.ColumnSpan="2" BorderBrush="{TemplateBinding SeparatorBrush}" BorderThickness="0,0,1,0">
+                        <Border x:Name="BackgroundGradient" Grid.ColumnSpan="2" BorderBrush="{TemplateBinding SeparatorBrush}" BorderThickness="0,0,1,1">
+                            <Border.Background>
+                                <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
+                                    <LinearGradientBrush.GradientStops>
+                                        <GradientStopCollection>
+                                            <GradientStop Color="{DynamicResource ControlLightColor}" Offset="0.0" />
+                                            <GradientStop Color="{DynamicResource ControlMediumColor}" Offset="1.0" />
+                                        </GradientStopCollection>
+                                    </LinearGradientBrush.GradientStops>
+                                </LinearGradientBrush>
+                            </Border.Background>
+                        </Border>
+                        <Border x:Name="BackgroundOver" Opacity="0" Grid.ColumnSpan="2" BorderBrush="{TemplateBinding SeparatorBrush}" BorderThickness="0,0,1,1">
                             <Border.Background>
                                 <SolidColorBrush Color="{DynamicResource ControlMouseOverColor}" />
                             </Border.Background>
@@ -1500,7 +1517,7 @@
     			                VerticalAlignment="Top" RenderTransformOrigin=".5 .5"
     			                Data="M 0 0 L 4 4 L 8 0 Z"/>
                         <Grid Margin="{TemplateBinding Padding}">
-                            <ContentPresenter RecognizesAccessKey="True" Content="{Binding Path=Content, Converter={StaticResource StringHelper}, RelativeSource={RelativeSource TemplatedParent}}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentStringFormat="{TemplateBinding ContentStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            <ContentPresenter RecognizesAccessKey="True" Content="{Binding Path=Content, RelativeSource={RelativeSource TemplatedParent}}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentStringFormat="{TemplateBinding ContentStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Grid>
 
                         <Thumb Name="PART_LeftHeaderGripper" HorizontalAlignment="Left">
@@ -1567,6 +1584,105 @@
         </Setter>
 
     </Style>
+
+    <Style x:Key="{ComponentResourceKey ResourceId=DataGridSelectAllButtonStyle, TypeInTargetAssembly={x:Type DataGrid}}" TargetType="{x:Type Button}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Grid>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="MouseOver">
+                                    <Storyboard>
+                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="Border" Storyboard.TargetProperty="(Border.Background).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
+                                            <EasingColorKeyFrame KeyTime="0" Value="{StaticResource ControlMouseOverColor}" />
+                                        </ColorAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="Border" Storyboard.TargetProperty="(Border.Background).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
+                                            <EasingColorKeyFrame KeyTime="0" Value="{StaticResource ControlPressedColor}" />
+                                        </ColorAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="Arrow">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Collapsed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                        <Border x:Name="Border" SnapsToDevicePixels="True" BorderThickness="0,0,1,0">
+                            <Border.BorderBrush>
+                                <LinearGradientBrush EndPoint="0.5,1"
+                                   StartPoint="0.5,0">
+                                    <GradientStop Color="{DynamicResource BorderLightColor}" Offset="0" />
+                                    <GradientStop Color="{DynamicResource BorderMediumColor}" Offset="1" />
+                                </LinearGradientBrush>
+                            </Border.BorderBrush>
+                            <Border.Background>
+                                <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                    <GradientStop Color="{DynamicResource ControlLightColor}" Offset="0" />
+                                    <GradientStop Color="{DynamicResource ControlMediumColor}" Offset="1" />
+                                </LinearGradientBrush>
+                            </Border.Background>
+                        </Border>
+                        <Polygon x:Name="Arrow" Margin="2" HorizontalAlignment="Right" Points="0,10 10,10 10,0" Stretch="Uniform" VerticalAlignment="Bottom" Fill="{DynamicResource GlyphBrush}" />
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    
+    <Style TargetType="{x:Type DataGridRowHeader}">
+        <Style.Resources>
+            <Style x:Key="RowHeaderGripperStyle" TargetType="{x:Type Thumb}">
+                <Setter Property="Height" Value="4"/>
+                <Setter Property="Background" Value="Transparent"/>
+                <Setter Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=DataGrid}, Path=HorizontalGridLinesBrush}" />
+                <Setter Property="Cursor" Value="SizeNS"/>
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type Thumb}">
+                            <Border Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" />
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+        </Style.Resources>
+        <Setter Property="BorderThickness" Value="0,0,0,1" />
+        <Setter Property="Padding" Value="5" />
+        <Setter Property="SeparatorBrush" Value="{DynamicResource GlyphBrush}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type DataGridRowHeader}">
+                    <Grid Visibility="{TemplateBinding SeparatorVisibility}" Background="Transparent">
+                        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" 
+                                Padding="{TemplateBinding Padding}">
+                            <Grid>
+                                <StackPanel Orientation="Horizontal">
+                                    <ContentPresenter RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center"/>
+                                    <Control SnapsToDevicePixels="false" Template="{Binding ValidationErrorTemplate, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}}" Visibility="{Binding (Validation.HasError), Converter={StaticResource btvc}, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}}"/>
+                                </StackPanel>
+                                
+                            </Grid>
+                        </Border>
+                        <Border Background="{DynamicResource DarkBrush}" Visibility="{TemplateBinding IsRowSelected, Converter={StaticResource btvc}}">
+                            <Path VerticalAlignment="Center" HorizontalAlignment="Center" Data="M0,0 4,4 0,8 z" Fill="{TemplateBinding SeparatorBrush}" Visibility="{TemplateBinding IsRowSelected, Converter={StaticResource btvc}}" />
+                        </Border>
+                        <Rectangle Width="1" HorizontalAlignment="Right" Fill="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=DataGrid}, Path=VerticalGridLinesBrush}" />
+                        <Thumb x:Name="PART_TopHeaderGripper" Style="{StaticResource RowHeaderGripperStyle}" VerticalAlignment="Top" />
+                        <Thumb x:Name="PART_BottomHeaderGripper" Style="{StaticResource RowHeaderGripperStyle}" VerticalAlignment="Bottom" BorderThickness="0,0,0,1"/>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <Style TargetType="{x:Type DataGridCell}">
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
@@ -2362,7 +2478,7 @@
             </Setter.Value>
         </Setter>
     </Style>
-    <Style x:Key="GlassButton" TargetType="{x:Type Button}">
+    <Style x:Key="GlassButtonStyle" TargetType="{x:Type Button}">
         <Setter Property="SnapsToDevicePixels" Value="True"/>
         <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="HorizontalAlignment" Value="Left"/>
@@ -2833,10 +2949,13 @@
             </Setter.Value>
         </Setter>
     </Style>
+    
     <Style TargetType="ListView">
         <Setter Property="Background" Value="{DynamicResource WindowBackgroundBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource SolidBorderBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource UiForegroundBrush}"/>
+        <Setter Property="BorderThickness" Value="1.000001" />
+        <Setter Property="Padding" Value="0" />
         <Setter Property="bs:MarkupExtensionProperties.SpecialWidth" Value="18" />
         <Setter Property="bs:MarkupExtensionProperties.SpecialHeight" Value="18" />
     </Style>
@@ -2865,6 +2984,7 @@
     <Style TargetType="GridViewColumnHeader">
         <Setter Property="Foreground" Value="{DynamicResource UiForegroundBrush}" />
         <Setter Property="Background" Value="{DynamicResource NormalBrush}" />
+        <Setter Property="Padding" Value="3" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="GridViewColumnHeader">
@@ -2874,36 +2994,40 @@
                                 <VisualState x:Name="Normal" />
                                 <VisualState x:Name="MouseOver">
                                     <Storyboard>
-                                        <ColorAnimationUsingKeyFrames Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[1].(GradientStop.Color)" Storyboard.TargetName="HeaderBorder">
-                                            <EasingColorKeyFrame KeyTime="0" Value="{DynamicResource ControlMouseOverColor}" />
-                                        </ColorAnimationUsingKeyFrames>
+                                        <DoubleAnimation Duration="0:0:0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="BackgroundOver" To="1" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <DoubleAnimation Duration="0:0:0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="BackgroundOver" To="1" />
                                     </Storyboard>
                                 </VisualState>
-                                <VisualState x:Name="Pressed" />
                                 <VisualState x:Name="Disabled" />
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-                        <Border x:Name="HeaderBorder" BorderBrush="{DynamicResource NormalBorderBrush}" BorderThickness="0,1,0,1" Padding="2,0,2,0">
+                        <Border x:Name="HeaderBorder" BorderBrush="{DynamicResource NormalBorderBrush}" BorderThickness="0,1,0,1">
                             <Border.Background>
-                                <LinearGradientBrush StartPoint="0,0"
-                                   EndPoint="0,1">
+                                <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
                                     <LinearGradientBrush.GradientStops>
                                         <GradientStopCollection>
-                                            <GradientStop Color="{DynamicResource ControlLightColor}"
-                                  Offset="0.0" />
-                                            <GradientStop Color="{DynamicResource ControlMediumColor}"
-                                  Offset="1.0" />
+                                            <GradientStop Color="{DynamicResource ControlLightColor}" Offset="0.0" />
+                                            <GradientStop Color="{DynamicResource ControlMediumColor}" Offset="1.0" />
                                         </GradientStopCollection>
                                     </LinearGradientBrush.GradientStops>
                                 </LinearGradientBrush>
                             </Border.Background>
-                            <ContentPresenter x:Name="HeaderContent"
-                              Margin="0,0,0,1"
+                        </Border>
+                        <Border x:Name="BackgroundOver" Opacity="0" BorderBrush="{DynamicResource NormalBorderBrush}" BorderThickness="0,1,0,1">
+                            <Border.Background>
+                                <SolidColorBrush Color="{DynamicResource ControlMouseOverColor}" />
+                            </Border.Background>
+                        </Border>
+                        <ContentPresenter x:Name="HeaderContent"
+                              Margin="{TemplateBinding Padding}"
                               RecognizesAccessKey="True"
                               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        </Border>
+                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         <Thumb x:Name="PART_HeaderGripper" HorizontalAlignment="Right" Margin="0,0,-9,0" Style="{DynamicResource GridViewColumnHeaderGripper}" />
                     </Grid>
                 </ControlTemplate>
@@ -2967,16 +3091,14 @@
                                 <VisualState x:Name="Selected">
                                     <Storyboard>
                                         <ColorAnimationUsingKeyFrames Storyboard.TargetName="Border" Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)">
-                                            <EasingColorKeyFrame KeyTime="0" Value="{DynamicResource SelectedBackgroundColor}" />
+                                            <EasingColorKeyFrame KeyTime="0:0:.1" Value="{DynamicResource SelectedBackgroundColor}" />
                                         </ColorAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="SelectedUnfocused">
                                     <Storyboard>
-                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="Border"
-                                                Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)">
-                                            <EasingColorKeyFrame KeyTime="0"
-                                         Value="{DynamicResource SelectedUnfocusedColor}" />
+                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="Border" Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)">
+                                            <EasingColorKeyFrame KeyTime="0:0:.1" Value="{DynamicResource SelectedUnfocusedColor}" />
                                         </ColorAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
@@ -3138,7 +3260,7 @@
         <Setter Property="BorderThickness" Value="0,1,0,0" />
         <Setter Property="BorderBrush" Value="{DynamicResource SolidBorderBrush}" />
         <Setter Property="Margin" Value="5,3"/>
-        <Setter Property="Background" Value="{DynamicResource WindowSolidBrush}" />
+        <Setter Property="Background" Value="{DynamicResource WindowHeaderBrush}" />
         <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="Template">
             <Setter.Value>
@@ -3164,7 +3286,7 @@
                 <DoubleAnimation Duration="0:0:0.2" Storyboard.TargetName="MenuBackground" Storyboard.TargetProperty="Opacity" />
             </Storyboard>
         </ControlTemplate.Resources>
-        <Border x:Name="Border" >
+        <Border x:Name="Border">
             <Grid>
                 <Border x:Name="MenuBackground" IsHitTestVisible="False" Background="{DynamicResource TopLevelMenuBackgroundHover}" Opacity="0" />
                 <ContentPresenter 
@@ -3468,6 +3590,7 @@
                 <Setter Property="BorderThickness" Value="1"/>
                 <Setter Property="BorderBrush" Value="{DynamicResource SolidBorderBrush}"/>
                 <Setter Property="Background" Value="{DynamicResource WindowBackgroundBrush}"/>
+                <Setter Property="HorizontalAlignment" Value="Left" />
                 <Setter Property="Template" Value="{DynamicResource {x:Static MenuItem.TopLevelHeaderTemplateKey}}"/>
                 <Setter Property="Grid.IsSharedSizeScope" Value="true"/>
             </Trigger>
@@ -3506,7 +3629,6 @@
         <Setter Property="ContextMenu" Value="{DynamicResource DecoPasswordBoxContextMenu}" />
         <Setter Property="Foreground" Value="{DynamicResource OnWindowForegroundBrush}" />
         <Setter Property="CaretBrush" Value="{DynamicResource DisabledForegroundBrush}" />
-        <Setter Property="bs:MarkupExtensionProperties.SpecialBrush" Value="{DynamicResource PressedBorderBrush}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type PasswordBox}">
@@ -3554,7 +3676,9 @@
                                 <ColumnDefinition Width="*" />
                                 <ColumnDefinition Width="Auto" />
                             </Grid.ColumnDefinitions>
+                            <ContentPresenter Content="{TemplateBinding bs:MarkupExtensionProperties.LeadingElement}" VerticalAlignment="Center" Margin="2,0,0,0" />
                             <ScrollViewer Grid.Column="1" Margin="0" x:Name="PART_ContentHost" />
+                            <ContentPresenter Grid.Column="3" Content="{TemplateBinding bs:MarkupExtensionProperties.TrailingElement}" VerticalAlignment="Center" Margin="0,0,2,0" />
                         </Grid>
                         <Line Grid.Column="1" x:Name="FocusedLineHelper" VerticalAlignment="Top"
                                   Margin="5,1"
@@ -3576,7 +3700,6 @@
                             <Setter Property="BorderBrush" Value="Red" />
                             <Setter Property="ToolTip" Value="{Binding RelativeSource={RelativeSource Self},Path=(Validation.Errors)[0].ErrorContent}"/>
                         </Trigger>
-
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
@@ -4866,6 +4989,7 @@
         <Setter Property="ContextMenu" Value="{DynamicResource DecoTextBoxContextMenu}" />
         <Setter Property="CaretBrush" Value="{DynamicResource DisabledForegroundBrush}" />
         <Setter Property="bs:MarkupExtensionProperties.SpecialBrush" Value="{DynamicResource PressedBorderBrush}" />
+        <Setter Property="bs:MarkupExtensionProperties.SpecialWidth" Value="300" />
         <Setter Property="Validation.ErrorTemplate">
             <Setter.Value>
                 <ControlTemplate>
@@ -4874,8 +4998,8 @@
                             <RowDefinition />
                             <RowDefinition />
                         </Grid.RowDefinitions>
-                        <AdornedElementPlaceholder Name="MyAdorner" Grid.Row="1"/>
-                        <Label Margin="0,0,0,2" Visibility="{Binding ElementName=MyAdorner, Path=AdornedElement.IsFocused, Converter={StaticResource btvc}}" MaxWidth="250" Foreground="White" BorderBrush="DarkGray" BorderThickness="1" Background="#8F00" VerticalAlignment="Top" HorizontalAlignment="Right" IsHitTestVisible="False" HorizontalContentAlignment="Right">
+                        <AdornedElementPlaceholder Name="MyAdorner" Grid.Row="1" Panel.ZIndex="-1" />
+                        <Label Padding="5,2" Visibility="{Binding ElementName=MyAdorner, Path=AdornedElement.IsFocused, Converter={StaticResource btvc}}" MaxWidth="{Binding ElementName=MyAdorner, Path=AdornedElement.(bs:MarkupExtensionProperties.SpecialWidth)}" Foreground="White" BorderBrush="#FF444444" BorderThickness="5,1,1,0" Background="#BD00" VerticalAlignment="Top" HorizontalAlignment="Right" IsHitTestVisible="False" HorizontalContentAlignment="Right">
                             <Label.Triggers>
                                 <EventTrigger RoutedEvent="Loaded">
                                     <BeginStoryboard>
@@ -4891,27 +5015,6 @@
                             </Label.Triggers>
                             <TextBlock TextWrapping="Wrap" Text="{Binding ElementName=MyAdorner, Path=AdornedElement.(Validation.Errors)[0].ErrorContent}"></TextBlock>
                         </Label>
-                        <Border Grid.Row="1" VerticalAlignment="Center" Width="15" Height="14" HorizontalAlignment="Right" BorderBrush="White" BorderThickness="1" CornerRadius="7" Margin="0,0,4,0"
-                                ToolTip="{Binding ElementName=MyAdorner, Path=AdornedElement.(Validation.Errors)[0].ErrorContent}">
-                            <Border.Background>
-                                <SolidColorBrush Color="{DynamicResource ValidationErrorColor}" />
-                            </Border.Background>
-                            <Border.Triggers>
-                                <EventTrigger RoutedEvent="Loaded">
-                                    <BeginStoryboard>
-                                        <Storyboard>
-                                            <DoubleAnimation Storyboard.TargetProperty="Opacity" From="0" Duration="0:0:.6">
-                                                <DoubleAnimation.EasingFunction>
-                                                    <ExponentialEase />
-                                                </DoubleAnimation.EasingFunction>
-                                            </DoubleAnimation>
-                                        </Storyboard>
-                                    </BeginStoryboard>
-                                </EventTrigger>
-                            </Border.Triggers>
-                            <TextBlock Foreground="White" Text="!" HorizontalAlignment="Center" VerticalAlignment="Center" />
-                        </Border>
-
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
@@ -4963,9 +5066,30 @@
                                     <ColumnDefinition Width="Auto" />
                                     <ColumnDefinition Width="*" />
                                     <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
                                 </Grid.ColumnDefinitions>
                                 <ContentControl Margin="2,0,0,0" Content="{TemplateBinding bs:MarkupExtensionProperties.LeadingElement}" VerticalAlignment="Center" />
                                 <ContentControl Margin="0,0,2,0" Grid.Column="2" Content="{TemplateBinding bs:MarkupExtensionProperties.TrailingElement}" VerticalAlignment="Center" />
+                                <Border Visibility="{Binding (Validation.HasError), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource btvc}}" Grid.Column="3" VerticalAlignment="Center" Width="15" Height="14" HorizontalAlignment="Right" BorderBrush="White" BorderThickness="1" CornerRadius="7" Margin="0,0,4,0"
+                                Opacity=".8" ToolTip="{Binding Path=(Validation.Errors)[0].ErrorContent, RelativeSource={RelativeSource TemplatedParent}}">
+                                    <Border.Background>
+                                        <SolidColorBrush Color="{DynamicResource ValidationErrorColor}" />
+                                    </Border.Background>
+                                    <Border.Triggers>
+                                        <EventTrigger RoutedEvent="Loaded">
+                                            <BeginStoryboard>
+                                                <Storyboard>
+                                                    <DoubleAnimation Storyboard.TargetProperty="Opacity" From="0" Duration="0:0:.6">
+                                                        <DoubleAnimation.EasingFunction>
+                                                            <ExponentialEase />
+                                                        </DoubleAnimation.EasingFunction>
+                                                    </DoubleAnimation>
+                                                </Storyboard>
+                                            </BeginStoryboard>
+                                        </EventTrigger>
+                                    </Border.Triggers>
+                                    <TextBlock Foreground="White" Text="!" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                </Border>
                                 <ScrollViewer HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="0" Background="Transparent"
                                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Grid.Column="1" Margin="0" x:Name="PART_ContentHost" />
                                 <ContentControl Margin="3,0,0,0" HorizontalAlignment="Left" Visibility="Hidden" x:Name="WatermarkText" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Opacity=".5" FontStyle="Italic" IsHitTestVisible="False" Grid.Column="1" Content="{TemplateBinding bs:MarkupExtensionProperties.Header}" />
@@ -5034,7 +5158,7 @@
         <Setter Property="bs:MarkupExtensionProperties.CornerRadius" Value="0" />
         <Setter Property="Background" Value="{DynamicResource WindowBackgroundBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource SolidBorderBrush}" />
-        <Setter Property="Padding" Value="2,1" />
+        <Setter Property="Padding" Value="2,0" />
         <Setter Property="Foreground" Value="{DynamicResource OnWindowForegroundBrush}" />
         <Setter Property="ContextMenu" Value="{DynamicResource DecoTextBoxContextMenu}" />
         <Setter Property="CaretBrush" Value="{DynamicResource DisabledForegroundBrush}" />
@@ -5043,9 +5167,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TextBox}">
                     <Grid>
-
-                        <Border 
-        						x:Name="Border"
+                        <Border x:Name="Border"
         						CornerRadius="{TemplateBinding bs:MarkupExtensionProperties.CornerRadius}"	
         						Background="{TemplateBinding Background}"
         						BorderBrush="{TemplateBinding BorderBrush}"
@@ -5058,23 +5180,13 @@
                                 </Grid.ColumnDefinitions>
                                 <ContentControl Content="{TemplateBinding bs:MarkupExtensionProperties.LeadingElement}" VerticalAlignment="Center" />
                                 <ContentControl Grid.Column="2" Content="{TemplateBinding bs:MarkupExtensionProperties.TrailingElement}" VerticalAlignment="Center" />
-                                <ScrollViewer HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="0" Background="Transparent"
+                                <ScrollViewer HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Background="Transparent"
         								VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Grid.Column="1" Margin="0" x:Name="PART_ContentHost" />
                                 <ContentControl Margin="3,0,0,0" HorizontalAlignment="Left" Visibility="Hidden" x:Name="WatermarkText" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Opacity=".5" FontStyle="Italic" IsHitTestVisible="False" Grid.Column="1" Content="{TemplateBinding bs:MarkupExtensionProperties.Header}" />
                             </Grid>
                         </Border>
-
-                        <Line Grid.Column="1" x:Name="FocusedLineHelper" VerticalAlignment="Top"
-        						Margin="5,1"
-        						X2="32" IsHitTestVisible="False" Stroke="{TemplateBinding bs:MarkupExtensionProperties.SpecialBrush}" StrokeThickness="2"
-        						Visibility="Collapsed" StrokeEndLineCap="Triangle" StrokeStartLineCap="Triangle" />
-
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsFocused" Value="True">
-                            <Setter TargetName="FocusedLineHelper" Property="Visibility" Value="Visible" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource PressedBorderBrush}" />
-                        </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsKeyboardFocusWithin" Value="False"/>
@@ -5237,7 +5349,7 @@
     <Style BasedOn="{StaticResource {x:Type ToggleButton}}" x:Key="{x:Static ToolBar.ToggleButtonStyleKey}" TargetType="ToggleButton">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Padding" Value="0" />
+        <Setter Property="Padding" Value="1,0" />
         <Setter Property="bs:MarkupExtensionProperties.CornerRadius" Value="0" />
     </Style>
     <Style TargetType="{x:Type ToolBarTray}">
@@ -5297,7 +5409,7 @@
                                 </ToggleButton.Style>
                             </ToggleButton>
                             <Popup x:Name="OverflowPopup" AllowsTransparency="True" Focusable="False" IsOpen="{Binding IsOverflowOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom" StaysOpen="False">
-                                <Border x:Name="ToolBarSubMenuBorder" BorderBrush="#FFB6BDC5" BorderThickness="1" Background="#FFEEF5FD" RenderOptions.ClearTypeHint="Enabled">
+                                <Border x:Name="ToolBarSubMenuBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" RenderOptions.ClearTypeHint="Enabled">
                                     <ToolBarOverflowPanel x:Name="PART_ToolBarOverflowPanel" KeyboardNavigation.DirectionalNavigation="Cycle" FocusVisualStyle="{x:Null}" Focusable="True" Margin="2" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" KeyboardNavigation.TabNavigation="Cycle" WrapWidth="200"/>
                                 </Border>
                             </Popup>
@@ -5426,12 +5538,174 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-        <Style.Triggers>
-            <DataTrigger Binding="{Binding}" Value="true">
-                <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
-            </DataTrigger>
-        </Style.Triggers>
     </Style>
+    <Style TargetType="{x:Type ToolBar}" x:Key="FlatToolBar">
+        <Setter Property="Background" Value="{DynamicResource LightColorBrush}"/>
+        <Setter Property="Foreground" Value="{DynamicResource DisabledForegroundBrush}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToolBar}">
+                    <Grid x:Name="Grid" SnapsToDevicePixels="True">
+                        <Border x:Name="MainPanelBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" CornerRadius="{TemplateBinding bs:MarkupExtensionProperties.CornerRadius}">
+                            <DockPanel KeyboardNavigation.TabIndex="1" KeyboardNavigation.TabNavigation="Local">
+                                <ContentPresenter x:Name="ToolBarHeader" ContentTemplate="{TemplateBinding HeaderTemplate}" Content="{TemplateBinding Header}" ContentStringFormat="{TemplateBinding HeaderStringFormat}" ContentSource="Header" HorizontalAlignment="Center" Margin="2,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center"/>
+                                <ToolBarPanel x:Name="PART_ToolBarPanel" IsItemsHost="True" Margin="2,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                            </DockPanel>
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="Header" Value="{x:Null}">
+                            <Setter Property="Visibility" TargetName="ToolBarHeader" Value="Collapsed"/>
+                        </Trigger>
+                        <Trigger Property="Orientation" Value="Vertical">
+                            <Setter Property="Margin" TargetName="PART_ToolBarPanel" Value="1,0,2,2"/>
+                            <Setter Property="DockPanel.Dock" TargetName="ToolBarHeader" Value="Top"/>
+                            <Setter Property="Margin" TargetName="MainPanelBorder" Value="0,0,0,11"/>
+                            <Setter Property="Background" Value="#FFEEF5FD"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{DynamicResource DisabledForegroundBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="{x:Static ToolBar.MenuStyleKey}" BasedOn="{StaticResource {x:Type Menu}}" TargetType="Menu">
+    </Style>
+
+    <Style x:Key="{x:Static ToolBar.ComboBoxStyleKey}" BasedOn="{StaticResource {x:Type ComboBox}}" TargetType="ComboBox">
+        <Setter Property="bs:MarkupExtensionProperties.CornerRadius" Value="0" />
+    </Style>
+
+    <Style x:Key="{x:Static ToolBar.RadioButtonStyleKey}" BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Padding" Value="3" />
+        <Setter Property="bs:MarkupExtensionProperties.CornerRadius" Value="0" />
+        <Setter Property="SnapsToDevicePixels" Value="true"/>
+        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource ButtonFocusVisual}"/>
+        <Setter Property="Foreground" Value="{DynamicResource UiForegroundBrush}"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RadioButton}">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="PressedOn_Storyboard">
+                            <DoubleAnimation Duration="0:0:0.2" Storyboard.TargetName="BorderPressed" Storyboard.TargetProperty="Opacity" To="1">
+                                <DoubleAnimation.EasingFunction>
+                                    <SineEase />
+                                </DoubleAnimation.EasingFunction>
+                            </DoubleAnimation>
+                        </Storyboard>
+                        <Storyboard x:Key="PressedOff_Storyboard">
+                            <DoubleAnimation Duration="0:0:0.08" Storyboard.TargetName="BorderPressed" Storyboard.TargetProperty="Opacity" />
+                            <DoubleAnimation Duration="0:0:0.08" Storyboard.TargetName="Border" Storyboard.TargetProperty="Opacity" />
+                        </Storyboard>
+                        <Storyboard x:Key="MouseOverOn_Storyboard">
+                            <DoubleAnimation Duration="0:0:0.08" Storyboard.TargetName="BorderOver" Storyboard.TargetProperty="Opacity" To="1" />
+                            <DoubleAnimation Duration="0:0:0.15" Storyboard.TargetName="Border" Storyboard.TargetProperty="Opacity" To="0" />
+                        </Storyboard>
+                        <Storyboard x:Key="MouseOverOff_Storyboard">
+                            <DoubleAnimation Duration="0:0:0.15" Storyboard.TargetName="BorderOver" Storyboard.TargetProperty="Opacity" />
+                            <DoubleAnimation Duration="0:0:0.08" Storyboard.TargetName="Border" Storyboard.TargetProperty="Opacity" />
+                        </Storyboard>
+                    </ControlTemplate.Resources>
+                    <Grid>
+                        <Border 
+							x:Name="Border"  
+							CornerRadius="{TemplateBinding bs:MarkupExtensionProperties.CornerRadius}" 
+							Background="{TemplateBinding Background}"
+						    BorderBrush="{TemplateBinding BorderBrush}"
+						    BorderThickness="{TemplateBinding BorderThickness}" />
+                        <Border 
+							x:Name="BorderOver"  
+							CornerRadius="{TemplateBinding bs:MarkupExtensionProperties.CornerRadius}" 
+							BorderThickness="1"
+							Background="{DynamicResource DarkBrush}"
+							BorderBrush="{DynamicResource NormalBorderBrush}"  Opacity="0"/>
+                        <Border 
+							x:Name="BorderPressed"  
+							CornerRadius="{TemplateBinding bs:MarkupExtensionProperties.CornerRadius}" 
+							BorderThickness="1"
+							Background="{DynamicResource TogglePressedBrush}"
+							BorderBrush="{DynamicResource PressedBorderBrush}" Opacity="0" />
+
+                        <Grid x:Name="iconPresenter" Margin="{TemplateBinding Padding}"
+							HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+							VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+                            <ContentControl Focusable="False" Content="{TemplateBinding bs:MarkupExtensionProperties.Icon}" />
+                            <ContentPresenter Grid.Column="1" x:Name="contentPresenter" RecognizesAccessKey="True" 
+                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+							                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                        </Grid>
+
+
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsKeyboardFocused" Value="true">
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource DefaultedBorderBrush}" />
+                            <Setter TargetName="Border" Property="BorderThickness" Value="1.5" />
+                        </Trigger>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource DefaultedBorderBrush}" />
+                            <!--<Setter TargetName="Border" Property="BorderThickness" Value="1.5" />-->
+                        </Trigger>
+                        <Trigger Property="IsChecked" Value="true">
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource PressedBrush}" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard Storyboard="{StaticResource MouseOverOn_Storyboard}" />
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <BeginStoryboard Storyboard="{StaticResource MouseOverOff_Storyboard}" />
+                            </Trigger.ExitActions>
+                        </Trigger>
+
+
+                        <Trigger Property="IsPressed" Value="true">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard Storyboard="{StaticResource PressedOn_Storyboard}" />
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <BeginStoryboard Storyboard="{StaticResource PressedOff_Storyboard}" />
+                            </Trigger.ExitActions>
+                        </Trigger>
+
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsPressed" Value="false" />
+                                <Condition Property="IsChecked" Value="true" />
+                            </MultiTrigger.Conditions>
+                            <MultiTrigger.EnterActions>
+                                <BeginStoryboard Storyboard="{StaticResource PressedOn_Storyboard}" />
+                            </MultiTrigger.EnterActions>
+                            <MultiTrigger.ExitActions>
+                                <BeginStoryboard Storyboard="{StaticResource PressedOff_Storyboard}" />
+                            </MultiTrigger.ExitActions>
+                        </MultiTrigger>
+
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource DisabledBackgroundBrush}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource DisabledBorderBrush}" />
+                            <Setter Property="Foreground" Value="{DynamicResource DisabledForegroundBrush}"/>
+                            <Setter TargetName="contentPresenter" Property="Opacity" Value="0.8" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    
     <Style x:Key="{x:Type ToolTip}" TargetType="{x:Type ToolTip}">
         <Setter Property="OverridesDefaultStyle" Value="true"/>
         <Setter Property="HasDropShadow" Value="True"/>
@@ -5563,48 +5837,33 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="Padding" Value="1,0,1,1" />
+        <Setter Property="Padding" Value="0,3,0,3" />
         <Setter Property="Background" Value="Transparent" />
-
-
+        <Setter Property="bs:MarkupExtensionProperties.SpecialWidth" Value="16" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TreeViewItem}">
                     <Grid>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto"/>
-                            <RowDefinition/>
+                            <RowDefinition />
                         </Grid.RowDefinitions>
-                        <Border x:Name="Border" Margin="-50000,0,0,0"
-							Background="{TemplateBinding Background}" Grid.ColumnSpan="2">
-                        </Border>
-                        <!--<Rectangle Name="FocusRect" Grid.Column="1" Stroke="#60000000" StrokeDashArray="1 2" Visibility="Hidden"/>-->
-                        <ToggleButton
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Rectangle x:Name="OffsetRect" Width="{TemplateBinding bs:MarkupExtensionProperties.SpecialWidth}" />
+                        <Border x:Name="Border" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" />
+                        <Rectangle Name="FocusRect" Grid.Column="1" Stroke="#60000000" StrokeDashArray="1 2" Visibility="Hidden" Grid.ColumnSpan="2"/>
+                        <ToggleButton Grid.ColumnSpan="2"
 							x:Name="Expander"
 							Style="{DynamicResource ExpandCollapseToggleStyle}"
 							IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
-							ClickMode="Press">
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition />
-                                </Grid.ColumnDefinitions>
-                                <ContentControl Focusable="False" Content="{TemplateBinding bs:MarkupExtensionProperties.Icon}" />
-                                <Border Padding="{TemplateBinding Padding}" Grid.Column="1">
-                                    <ContentPresenter
-								x:Name="PART_Header"
-								ContentSource="Header" Margin="{TemplateBinding Padding}"
-								HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-                                </Border>
-                            </Grid>
-                        </ToggleButton>
-
-
-                        <ItemsPresenter
-							x:Name="ItemsHost"
-							Grid.Row="1"
-							Grid.Column="1" />
+							ClickMode="Press" />
+                        <Grid Background="Transparent" x:Name="PART_Header" Grid.ColumnSpan="2" Margin="16,0,0,0">
+                            <ContentPresenter ContentSource="Header" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                        </Grid>
+                        <ItemsPresenter Grid.Column="1" Grid.Row="1" x:Name="ItemsHost" />
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsExpanded" Value="false">
@@ -5612,6 +5871,8 @@
                         </Trigger>
                         <Trigger Property="HasItems" Value="false">
                             <Setter TargetName="Expander" Property="Visibility" Value="Hidden"/>
+                            <Setter TargetName="OffsetRect" Property="Width" Value="8" />
+                            <Setter TargetName="PART_Header" Property="Margin" Value="3,0,0,0" />
                         </Trigger>
                         <Trigger Property="IsSelected" Value="true">
                             <Setter TargetName="Border" Property="Background" Value="{DynamicResource SelectedBackgroundBrush}"/>
@@ -5637,9 +5898,6 @@
         </Setter>
     </Style>
 
-
-
-
     <Style TargetType="{x:Type diag:ZoomControl}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="ClipToBounds" Value="True" />
@@ -5674,36 +5932,14 @@
         </Setter>
     </Style>
 
-
-    <!-- Window (Experimental) Style -->
-
-    <LinearGradientBrush x:Key="WindowSolidBrush" EndPoint="0,1">
-        <GradientStop Color="#EFD3D3" />
-        <GradientStop Color="#FFB5BBC6" Offset="0.2" />
-        <GradientStop Color="#FFDDDDF7" Offset="0.8" />
-        <GradientStop Color="#FF93B1CE" Offset="1" />
-    </LinearGradientBrush>
+    <!-- Window (Beta) Style -->
 
     <Style x:Key="BrightSharpWindowStyle" TargetType="{x:Type Window}">
         <Setter Property="WindowStyle" Value="None" />
         <Setter Property="WindowStyle" Value="SingleBorderWindow" />
-        <Setter Property="bs:MarkupExtensionProperties.SpecialBrush">
-            <Setter.Value>
-                <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
-                    <GradientStop Color="#F0F0F0" Offset="1" />
-                    <GradientStop Color="White" />
-                </LinearGradientBrush>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="BorderBrush" >
-            <Setter.Value>
-                <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
-                    <GradientStop Color="#FF898989" Offset="0"/>
-                    <GradientStop Color="#FF898989" Offset="1"/>
-                    <GradientStop Color="LightGray" Offset="0.841"/>
-                    <GradientStop Color="#FFCBCBCB" Offset="0.23"/>
-                </LinearGradientBrush>
-            </Setter.Value>
+        <Setter Property="bs:MarkupExtensionProperties.SpecialBrush" Value="{DynamicResource WindowInnerBorderBrush}"/>
+
+        <Setter Property="BorderBrush" Value="{DynamicResource WindowBorderBrush}">
         </Setter>
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Icon" Value="icons/app.png" />
@@ -5712,8 +5948,8 @@
                 <WindowChrome CaptionHeight="30" ResizeBorderThickness="4" GlassFrameThickness="1" UseAeroCaptionButtons="False" />
             </Setter.Value>
         </Setter>
-        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"/>
-        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"/>
+        <Setter Property="Foreground" Value="{DynamicResource OnWindowForegroundBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource GradientWindowBackgroundBrush}"/>
         <Setter Property="bs:MarkupExtensionProperties.Header" Value="{Binding Path=Title, RelativeSource={RelativeSource Self}}" />
         <Setter Property="Template">
             <Setter.Value>
@@ -5725,7 +5961,7 @@
                                     <RowDefinition Height="30" />
                                     <RowDefinition />
                                 </Grid.RowDefinitions>
-                                <Border x:Name="HeaderBorder" Background="{DynamicResource WindowSolidBrush}">
+                                <Border x:Name="HeaderBorder" Background="{DynamicResource WindowHeaderBrush}">
                                     <DockPanel>
                                         <Image Width="16" Height="16" Source="{TemplateBinding Icon}" Margin="8" VerticalAlignment="Top" DockPanel.Dock="Left" />
                                         <StackPanel DockPanel.Dock="Right" Orientation="Horizontal" VerticalAlignment="Top" Margin="1">
@@ -5737,20 +5973,9 @@
                                                     <GradientStop Color="#FFE8E8E8" Offset="0.0"/>
                                                 </LinearGradientBrush>
                                             </StackPanel.Resources>
-                                            <Button VerticalAlignment="Top" Name="PART_MinimizeButton" Click="minimizeButton_Click" Focusable="False" WindowChrome.IsHitTestVisibleInChrome="True" Content="0" bs:MarkupExtensionProperties.CornerRadius="0" BorderBrush="Transparent" FontFamily="Webdings">
-                                                <Button.ToolTip>
-                                                    <Label FontFamily="{TemplateBinding FontFamily}">Minimize</Label>
-                                                </Button.ToolTip>
-                                            </Button>
-                                            <Button VerticalAlignment="Top" Name="PART_MaximizeButton" Click="maximizeButton_Click" Focusable="False" WindowChrome.IsHitTestVisibleInChrome="True" Content="1" bs:MarkupExtensionProperties.CornerRadius="0" BorderBrush="Transparent" FontFamily="Webdings">
-                                                <Button.ToolTip>
-                                                    <Label FontFamily="{TemplateBinding FontFamily}" Name="MaximizeBtnTooltip">Maximize</Label>
-                                                </Button.ToolTip>
-                                            </Button>
+                                            <Button VerticalAlignment="Top" Name="PART_MinimizeButton" Click="minimizeButton_Click" Focusable="False" WindowChrome.IsHitTestVisibleInChrome="True" Content="0" bs:MarkupExtensionProperties.CornerRadius="0" BorderBrush="Transparent" FontFamily="Webdings" />
+                                            <Button VerticalAlignment="Top" Name="PART_MaximizeButton" Click="maximizeButton_Click" Focusable="False" WindowChrome.IsHitTestVisibleInChrome="True" Content="1" bs:MarkupExtensionProperties.CornerRadius="0" BorderBrush="Transparent" FontFamily="Webdings" />
                                             <Button Padding="10,6" Name="PART_CloseButton" Click="closeButton_Click" Focusable="False" WindowChrome.IsHitTestVisibleInChrome="True" Content="r" bs:MarkupExtensionProperties.CornerRadius="0" BorderBrush="Transparent" FontFamily="Webdings">
-                                                <Button.ToolTip>
-                                                    <Label FontFamily="{TemplateBinding FontFamily}">Close (Alt+F4)</Label>
-                                                </Button.ToolTip>
                                                 <Button.Background>
                                                     <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
                                                         <GradientStop Color="#FFDEC3C3" Offset="0"/>
@@ -5765,7 +5990,7 @@
                                                 </Button.Resources>
                                             </Button>
                                         </StackPanel>
-                                        <Label Padding="0,5" Foreground="White" HorizontalContentAlignment="{TemplateBinding bs:MarkupExtensionProperties.HeaderHorizontalAlignment}" Content="{TemplateBinding bs:MarkupExtensionProperties.Header}" FontSize="14">
+                                        <Label Padding="0,3" Foreground="White" HorizontalContentAlignment="{TemplateBinding bs:MarkupExtensionProperties.HeaderHorizontalAlignment}" Content="{TemplateBinding bs:MarkupExtensionProperties.Header}" FontSize="14">
                                             <Label.Effect>
                                                 <DropShadowEffect BlurRadius="2" ShadowDepth="1" Color="Black" />
                                             </Label.Effect>
@@ -5787,7 +6012,6 @@
                         <Trigger Property="WindowState" Value="Maximized">
                             <Setter TargetName="PART_MaximizeButton" Property="Content" Value="2" />
                             <Setter TargetName="ContentPresenter" Property="Margin" Value="2,0,4,4" />
-                            <Setter TargetName="MaximizeBtnTooltip" Property="Content" Value="Normalize" />
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
@@ -5800,7 +6024,7 @@
                             <Setter Property="Margin" TargetName="Decorator" Value="6,0,4,0" />
                         </Trigger>
                         <Trigger Property="IsActive" Value="False">
-                            <Setter TargetName="HeaderBorder" Property="Background" Value="LightGray" />
+                            <Setter TargetName="HeaderBorder" Property="Background" Value="{DynamicResource WindowHeaderInactiveBackgroundBrush}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/BrightSharp/Mvvm/ViewModelBase.cs b/BrightSharp/Mvvm/ViewModelBase.cs
deleted file mode 100644
index e84e9de..0000000
--- a/BrightSharp/Mvvm/ViewModelBase.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq.Expressions;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Windows;
-
-namespace BrightSharp.Mvvm
-{
-    public class ObservableObject : INotifyPropertyChanged
-    {
-        static readonly DependencyObject designTimeObject = new DependencyObject();
-        public static bool IsInDesignTime
-        {
-            get
-            {
-                try
-                {
-                    return DesignerProperties.GetIsInDesignMode(designTimeObject);
-                }
-                catch(Exception)
-                {
-                    return true;
-                }
-
-            }
-        }
-
-        protected PropertyChangedEventHandler PropertyChangedHandler
-        {
-            get
-            {
-                return PropertyChanged;
-            }
-        }
-
-        public ObservableObject()
-        {
-        }
-
-        protected static string GetPropertyName<T>(Expression<Func<T>> propertyExpression)
-        {
-            if(propertyExpression == null)
-            {
-                throw new ArgumentNullException("propertyExpression");
-            }
-            MemberExpression body = propertyExpression.Body as MemberExpression;
-            if(body == null)
-            {
-                throw new ArgumentException("Invalid argument", "propertyExpression");
-            }
-            PropertyInfo property = body.Member as PropertyInfo;
-            if(property == null)
-            {
-                throw new ArgumentException("Argument is not a property", "propertyExpression");
-            }
-            return property.Name;
-        }
-
-        protected virtual void RaisePropertyChanged<T>(Expression<Func<T>> propertyExpression)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(GetPropertyName(propertyExpression)));
-        }
-
-        protected Boolean Set<T>(Expression<Func<T>> propertyExpression, ref T field, T newValue)
-        {
-            if(EqualityComparer<T>.Default.Equals(field, newValue))
-            {
-                return false;
-            }
-            field = newValue;
-            this.RaisePropertyChanged(propertyExpression);
-            return true;
-        }
-
-        protected bool Set<T>(string propertyName, ref T field, T newValue)
-        {
-            if(EqualityComparer<T>.Default.Equals(field, newValue))
-            {
-                return false;
-            }
-            field = newValue;
-            RaisePropertyChanged(propertyName);
-            return true;
-        }
-
-        protected void RaisePropertyChanged([CallerMemberName]string propertyName = null)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-        protected void RaisePropertyChangedAll()
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(null));
-        }
-
-        public event PropertyChangedEventHandler PropertyChanged;
-    }
-}
\ No newline at end of file
diff --git a/BrightSharp/Properties/AssemblyInfo.cs b/BrightSharp/Properties/AssemblyInfo.cs
index 1bb3d96..267c412 100644
--- a/BrightSharp/Properties/AssemblyInfo.cs
+++ b/BrightSharp/Properties/AssemblyInfo.cs
@@ -52,8 +52,8 @@ using System.Windows.Markup;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.0.0.0")]
+[assembly: AssemblyFileVersion("2.0.0.0")]
 [assembly: XmlnsPrefix("http://schemas.brightsharp.com/developer", "bs")]
 [assembly: XmlnsDefinition("http://schemas.brightsharp.com/developer", "BrightSharp")]
 [assembly: XmlnsDefinition("http://schemas.brightsharp.com/developer", "BrightSharp.Extensions")]
diff --git a/BrightSharp/Properties/Resources.Designer.cs b/BrightSharp/Properties/Resources.Designer.cs
index 928ec85..fa62214 100644
--- a/BrightSharp/Properties/Resources.Designer.cs
+++ b/BrightSharp/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace BrightSharp.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
diff --git a/BrightSharp/Properties/Settings.Designer.cs b/BrightSharp/Properties/Settings.Designer.cs
index 0e4f69e..1a76537 100644
--- a/BrightSharp/Properties/Settings.Designer.cs
+++ b/BrightSharp/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace BrightSharp.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.3.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/BrightSharp/Style.Blue.xaml b/BrightSharp/Style.Blue.xaml
index ab6dc2a..cf2e4e1 100644
--- a/BrightSharp/Style.Blue.xaml
+++ b/BrightSharp/Style.Blue.xaml
@@ -276,7 +276,7 @@
 
     <SolidColorBrush x:Key="ScrollBarBackgroundBrush" Color="#F0F0F0" />
     <SolidColorBrush x:Key="SynWindowBackgroundBrush" Color="#FFD1D1D1" />
-    <Color x:Key="SelectedBackgroundColor">#FFE6D745</Color>
+    <Color x:Key="SelectedBackgroundColor">#FFFFF8B8</Color>
     <SolidColorBrush x:Key="OnWindowForegroundBrush" Color="{DynamicResource OnWindowForegroundColor}" />
     <SolidColorBrush x:Key="HighLightForegroundBrush" Color="#FF500000" />
     <Color x:Key="UiForegroundColor">Black</Color>
diff --git a/BrightSharp/Style.DarkBlue.xaml b/BrightSharp/Style.DarkBlue.xaml
index ee68c25..8bc0a82 100644
--- a/BrightSharp/Style.DarkBlue.xaml
+++ b/BrightSharp/Style.DarkBlue.xaml
@@ -20,7 +20,7 @@
     <Color x:Key="ControlMediumColor"       >#FF10405B</Color>
     <Color x:Key="ControlDarkColor"         >#FF2B404B</Color>
 
-    <Color x:Key="ControlMouseOverColor"    >#FFA5A7BA</Color>
+    <Color x:Key="ControlMouseOverColor"    >#FF414888</Color>
     <Color x:Key="ControlPressedColor"      >#FF47909B</Color>
 
     <Color x:Key="ValidationErrorColor"     >#FF3333</Color>
@@ -36,10 +36,36 @@
     <SolidColorBrush x:Key="LightBorderBrush" Color="DarkGray" />
     <SolidColorBrush x:Key="MainMenuForegroundBrush" Color="White"/>
 
-    <LinearGradientBrush x:Key="WindowBackgroundBrush">
-        <GradientStop Color="#444444" />
+    <SolidColorBrush x:Key="WindowBackgroundBrush" Color="#444444" />
+
+    <LinearGradientBrush x:Key="GradientWindowBackgroundBrush" EndPoint="1,1" StartPoint="0,0">
+        <GradientStop Color="#FF35373C" Offset="0"/>
+        <GradientStop Color="#FF32353C" Offset="0.2"/>
+        <GradientStop Color="#FF242629" Offset="0.75"/>
+        <GradientStop Color="#FF222326" Offset="1"/>
     </LinearGradientBrush>
 
+    <LinearGradientBrush x:Key="WindowHeaderBrush" EndPoint="0,1">
+        <GradientStop Color="#FF556176" />
+        <GradientStop Color="#FF282B32" Offset="0.2" />
+        <GradientStop Color="#FF262634" Offset="0.8" />
+        <GradientStop Color="#FF15212C" Offset="1" />
+    </LinearGradientBrush>
+    <LinearGradientBrush x:Key="WindowBorderBrush" EndPoint="0,1" StartPoint="0,0">
+        <GradientStop Color="#FF2E2E2E" Offset="0"/>
+        <GradientStop Color="#FF1B1B1B" Offset="1"/>
+    </LinearGradientBrush>
+    <LinearGradientBrush x:Key="WindowInnerBorderBrush" StartPoint="0,0" EndPoint="0,1">
+        <GradientStop Color="#181818" Offset="1" />
+        <GradientStop Color="#1D1C21" />
+    </LinearGradientBrush>
+
+    <LinearGradientBrush x:Key="WindowHeaderInactiveBrush" EndPoint="0,1">
+        <GradientStop Color="#5E5E5E" />
+        <GradientStop Color="#FF3B3B3B" Offset="0.2" />
+        <GradientStop Color="#FF3B3B3B" Offset="0.8" />
+        <GradientStop Color="#5E5E5E" Offset="1" />
+    </LinearGradientBrush>
 
     <SolidColorBrush x:Key="GlyphBrush" Color="#ffffff" />
     <SolidColorBrush x:Key="LightColorBrush" Color="#FF57575F" />
@@ -124,27 +150,28 @@
     <LinearGradientBrush x:Key="PressedBrush" StartPoint="0,0" EndPoint="0,1">
         <GradientBrush.GradientStops>
             <GradientStopCollection>
-                <GradientStop Color="#FF7599AA" Offset="0.0"/>
-                <GradientStop Color="#FF37738F" Offset="1.0"/>
+                <GradientStop Color="#FF368BB4" Offset="0.0"/>
                 <GradientStop Color="#FF306178" Offset="0.55"/>
+                <GradientStop Color="#FF37738F" Offset="1.0"/>
             </GradientStopCollection>
         </GradientBrush.GradientStops>
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="TogglePressedBrush" StartPoint="0,0" EndPoint="0,1">
         <GradientBrush.GradientStops>
             <GradientStopCollection>
-                <GradientStop Color="#FF7599AA" Offset="0.0"/>
-                <GradientStop Color="#FF37738F" Offset="1.0"/>
-                <GradientStop Color="#FF306178" Offset="0.55"/>
+                <GradientStop Color="#FF156489" Offset="0.0"/>
+                <GradientStop Color="#FF2B86B2" Offset="0.2"/>
+                <GradientStop Color="#FF2187B8" Offset="0.55"/>
+                <GradientStop Color="#FF358FB9" Offset="1.0"/>
             </GradientStopCollection>
         </GradientBrush.GradientStops>
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="VerticalPressedBrush" StartPoint="0,0" EndPoint="1,0">
         <GradientBrush.GradientStops>
             <GradientStopCollection>
-                <GradientStop Color="#FF7599AA" Offset="0.0"/>
-                <GradientStop Color="#FF37738F" Offset="1.0"/>
+                <GradientStop Color="#FF368BB4" Offset="0.0"/>
                 <GradientStop Color="#FF306178" Offset="0.55"/>
+                <GradientStop Color="#FF37738F" Offset="1.0"/>
             </GradientStopCollection>
         </GradientBrush.GradientStops>
     </LinearGradientBrush>
diff --git a/BrightSharp/Style.DevLab.xaml b/BrightSharp/Style.DevLab.xaml
index 60e3729..36fa265 100644
--- a/BrightSharp/Style.DevLab.xaml
+++ b/BrightSharp/Style.DevLab.xaml
@@ -222,13 +222,13 @@
     <SolidColorBrush x:Key="AlternatingRowBackgroundBrush" Color="White" />
 
 
-    <Color x:Key="SelectedBackgroundColor">#C5C5C5</Color>
+    <Color x:Key="SelectedBackgroundColor">#E3E3E3</Color>
     <Color x:Key="SelectedUnfocusedColor">#FFB6B6B6</Color>
     <Color x:Key="ControlLightColor">#FFFFFFFF</Color>
     <Color x:Key="ControlMediumColor">#FFC5C5C5</Color>
     <Color x:Key="ControlDarkColor">#FF6B6B6B</Color>
 
-    <Color x:Key="ControlMouseOverColor">#FFA5A7BA</Color>
+    <Color x:Key="ControlMouseOverColor">#FFEEEEEE</Color>
     <Color x:Key="ControlPressedColor">#FF47909B</Color>
 
 
diff --git a/BrightSharp/Style.Silver.xaml b/BrightSharp/Style.Silver.xaml
index 8787724..4102abb 100644
--- a/BrightSharp/Style.Silver.xaml
+++ b/BrightSharp/Style.Silver.xaml
@@ -260,9 +260,14 @@
     </LinearGradientBrush>
 
     <SolidColorBrush x:Key="ScrollBarBackgroundBrush" Color="#F0F0F0" />
-    <SolidColorBrush x:Key="SynWindowBackgroundBrush" Color="#FFE4E4E4" />
+    <LinearGradientBrush x:Key="GradientWindowBackgroundBrush" EndPoint="1,1" StartPoint="0,0">
+        <GradientStop Color="White" Offset="0"/>
+        <GradientStop Color="#FFF8F8F8" Offset="0.2"/>
+        <GradientStop Color="#FFE3E3E3" Offset="0.75"/>
+        <GradientStop Color="White" Offset="1"/>
+    </LinearGradientBrush>
 
-    <SolidColorBrush x:Key="HighLightForegroundBrush" Color="DarkRed" />
+    <SolidColorBrush x:Key="HighLightForegroundBrush" Color="#410000" />
 
     <Color x:Key="UiForegroundColor">Black</Color>
     <SolidColorBrush x:Key="UiForegroundBrush" Color="{DynamicResource UiForegroundColor}" />
@@ -270,13 +275,13 @@
 
 
 
-    <Color x:Key="SelectedBackgroundColor">SkyBlue</Color>
+    <Color x:Key="SelectedBackgroundColor">#DEDEDE</Color>
     <Color x:Key="SelectedUnfocusedColor">#FFB6B6B6</Color>
     <Color x:Key="ControlLightColor">#FFFFFFFF</Color>
     <Color x:Key="ControlMediumColor">#FFC5C5C5</Color>
     <Color x:Key="ControlDarkColor">#FF6B6B6B</Color>
 
-    <Color x:Key="ControlMouseOverColor">#FFA5A7BA</Color>
+    <Color x:Key="ControlMouseOverColor">#FFCED0E1</Color>
     <Color x:Key="ControlPressedColor">#FF47909B</Color>
 
 
diff --git a/BrightSharp/ZoomControl.cs b/BrightSharp/ZoomControl.cs
index d5cd917..62016de 100644
--- a/BrightSharp/ZoomControl.cs
+++ b/BrightSharp/ZoomControl.cs
@@ -123,9 +123,11 @@ namespace Diagrams
                 anim.EasingFunction = new SineEase() { EasingMode = EasingMode.EaseInOut };
                 this.BeginAnimation(ZoomControl.RenderZoomProperty, anim);
             }
-            else
+            else 
             {
-                RenderZoom = newValue;
+                DoubleAnimation anim = new DoubleAnimation(newValue, TimeSpan.FromSeconds(0));
+                anim.EasingFunction = new SineEase() { EasingMode = EasingMode.EaseInOut };
+                this.BeginAnimation(ZoomControl.RenderZoomProperty, anim);
             }
 
             RaiseZoomChangedEvent();
@@ -144,7 +146,13 @@ namespace Diagrams
             }
             else
             {
-                TranslateX = translateXTo; TranslateY = translateYTo;
+                DoubleAnimation anim = new DoubleAnimation(translateXTo, TimeSpan.FromSeconds(0));
+                anim.EasingFunction = new SineEase() { EasingMode = EasingMode.EaseInOut };
+                this.BeginAnimation(ZoomControl.TranslateXProperty, anim);
+
+                anim = new DoubleAnimation(translateYTo, TimeSpan.FromSeconds(0));
+                anim.EasingFunction = new SineEase() { EasingMode = EasingMode.EaseInOut };
+                this.BeginAnimation(ZoomControl.TranslateYProperty, anim);
             }
 
             e.Handled = true;
diff --git a/README.md b/README.md
index 498b9c5..250934d 100644
--- a/README.md
+++ b/README.md
@@ -3,32 +3,46 @@
 ------------------------
 
 # BrightSharp.Toolkit
-## Free WPF Professional Themes and User Controls
 
-### version 1.0.0
+Professional WPF Themes and User Controls. It requires `.NET 4.5`. 
 
 
-### Install **basic** from nuget package manager (requires .NET 4.0 AnyCPU)
+### Current Version 2.0
+
+
+### Nuget
 ```batch
- PM > Install-Package BrightSharp.Toolkit
+ > Install-Package BrightSharp.Toolkit
 ```
 
-### Install **extra** from nuget package manager (requires .NET 4.5.2 - x86 or x64)
-```batch
- PM > Install-Package BrightSharp.Toolkit.Extra.64
-```
-NOTE: Extra controls use [CefSharp package](https://github.com/cefsharp/CefSharp) (x86 or x64 architecture required). 
-In future we will add many different controls, that use HTML5 technologies. Extra package does not depend on basic.
-
 ## How To
 
 1. [How to Apply Themes](docs/help/apply-themes.md)
 2. [How to Use HtmlEditor](docs/help/htmleditor.md)
-3. [Brushes/Colors List](docs/help/brushes.md)
+3. [Brushes List](docs/help/brushes.md)
+
+## See presentation screenshots
+Classic:
 
-## Classic Theme
 ![classic-theme](docs/classic-theme.png)
 
+DevLab:
 
-## HtmlEditor (CKEditor) Screenshot (Extra package)
-![CKEditor](docs/htmleditor.png)
+![classic-theme](docs/devlab-theme.png)
+
+Silver:
+
+![classic-theme](docs/silver-theme.png)
+
+Blue:
+
+![classic-theme](docs/blue-theme.png)
+
+DarkBlue:
+
+![classic-theme](docs/darkblue-theme.png)
+
+____________
+
+
+#### Created by Vitaly.S (Minsk, Skype)
\ No newline at end of file
diff --git a/build.extra/BrightSharp.Toolkit.Extra.UiTests.exe.config b/build.extra/BrightSharp.Toolkit.Extra.UiTests.exe.config
deleted file mode 100644
index 88fa402..0000000
--- a/build.extra/BrightSharp.Toolkit.Extra.UiTests.exe.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
-    </startup>
-</configuration>
\ No newline at end of file
diff --git a/build.extra/BrightSharp.Toolkit.Extra.UiTests.vshost.exe.config b/build.extra/BrightSharp.Toolkit.Extra.UiTests.vshost.exe.config
deleted file mode 100644
index 88fa402..0000000
--- a/build.extra/BrightSharp.Toolkit.Extra.UiTests.vshost.exe.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
-    </startup>
-</configuration>
\ No newline at end of file
diff --git a/build.extra/BrightSharp.Toolkit.Extra.UiTests.vshost.exe.manifest b/build.extra/BrightSharp.Toolkit.Extra.UiTests.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/build.extra/BrightSharp.Toolkit.Extra.UiTests.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>
diff --git a/docs/BrushesList.png b/docs/BrushesList.png
index fe2cb36..927810f 100644
Binary files a/docs/BrushesList.png and b/docs/BrushesList.png differ
diff --git a/docs/additional-datagrid.png b/docs/additional-datagrid.png
deleted file mode 100644
index a5949c3..0000000
Binary files a/docs/additional-datagrid.png and /dev/null differ
diff --git a/docs/additional-frame.png b/docs/additional-frame.png
deleted file mode 100644
index 97edf4b..0000000
Binary files a/docs/additional-frame.png and /dev/null differ
diff --git a/docs/additional-listview.png b/docs/additional-listview.png
deleted file mode 100644
index d6e5633..0000000
Binary files a/docs/additional-listview.png and /dev/null differ
diff --git a/docs/additional-propertygrid.png b/docs/additional-propertygrid.png
deleted file mode 100644
index 6310646..0000000
Binary files a/docs/additional-propertygrid.png and /dev/null differ
diff --git a/docs/additional-treeview.png b/docs/additional-treeview.png
deleted file mode 100644
index 484d06f..0000000
Binary files a/docs/additional-treeview.png and /dev/null differ
diff --git a/docs/blue-theme.png b/docs/blue-theme.png
new file mode 100644
index 0000000..40057c7
Binary files /dev/null and b/docs/blue-theme.png differ
diff --git a/docs/classic-theme.png b/docs/classic-theme.png
index 28d9ea8..fb48b7b 100644
Binary files a/docs/classic-theme.png and b/docs/classic-theme.png differ
diff --git a/docs/darkblue-theme.png b/docs/darkblue-theme.png
new file mode 100644
index 0000000..f7249c5
Binary files /dev/null and b/docs/darkblue-theme.png differ
diff --git a/docs/datagrid.png b/docs/datagrid.png
deleted file mode 100644
index aaa1240..0000000
Binary files a/docs/datagrid.png and /dev/null differ
diff --git a/docs/devlab-theme.png b/docs/devlab-theme.png
new file mode 100644
index 0000000..1372f11
Binary files /dev/null and b/docs/devlab-theme.png differ
diff --git a/docs/help/apply-themes.md b/docs/help/apply-themes.md
index b21555b..ea67ea1 100644
--- a/docs/help/apply-themes.md
+++ b/docs/help/apply-themes.md
@@ -13,23 +13,22 @@
 
 # Change themes by ThemeManager
 
-Change by static property
+Change by `ThemeManager`
 ```c#
     ThemeManager.CurrentTheme = ColorThemes.Classic;
 ```
 
 # Change themes by ResourceDictionary
 
-Also you can change theme by adding resource dictionary after generic.xaml. Use one of them:
+As default we use Classic theme.
+You also can change theme by adding resource dictionary after generic.xaml. Use one of them:
 ```xml
 <ResourceDictionary Source="/brightsharp;component/style.devlab.xaml" />
-or
 <ResourceDictionary Source="/brightsharp;component/style.blue.xaml" />
-or
 <ResourceDictionary Source="/brightsharp;component/style.darkblue.xaml" />
-or
 <ResourceDictionary Source="/brightsharp;component/style.silver.xaml" />
 ```
 
 ## NOTE
-It is recommended use `Background="{DynamicResource WindowBackgroundBrush}"` for Window markup
+You can use custom window style named `BrightSharpWindowStyle`.
+Also defined additional useful styles and extensions. For more info see Demo source code.
\ No newline at end of file
diff --git a/docs/help/brushes.md b/docs/help/brushes.md
index f49f329..f722b64 100644
--- a/docs/help/brushes.md
+++ b/docs/help/brushes.md
@@ -1,109 +1,5 @@
 ## Brushes List
 
-![brushes](../BrushesList.png)
+Here you can see set of brushes and colors we are use (Classic set). In demo application you can press `Brushes Explorer` button to see theme-specific brushes.
 
-## List of names
-
-AlternatingRowBackgroundBrush<br/>
-BorderGapMaskConverter<br/>
-ButtonEllipseFocusVisual<br/>
-ButtonFocusVisual<br/>
-CalendarButtonStyle<br/>
-CalendarDayButtonStyle<br/>
-CalendarItemStyle<br/>
-CFocusVisual<br/>
-ComboBoxFocusVisual<br/>
-ComboBoxToggleButton<br/>
-DarkBrush<br/>
-DecoPasswordBoxContextMenu<br/>
-DecoTextBoxContextMenu<br/>
-DefaultedBorderBrush<br/>
-DefaultRadiusNormal<br/>
-DefaultRadiusSmall<br/>
-DevLabFrameStyle<br/>
-DisabledBackgroundBrush<br/>
-DisabledBorderBrush<br/>
-DisabledForegroundBrush<br/>
-ExpandCollapseToggleStyle<br/>
-ExpanderToggleButton<br/>
-Expandr2StyleGroupBox<br/>
-ExpandrStyleGroupBox<br/>
-FileItemStyle<br/>
-GlassButton<br/>
-GlyphBrush<br/>
-GridViewColumnHeaderGripper<br/>
-HighLightForegroundBrush<br/>
-HorizontalLightBrush<br/>
-HorizontalNormalBorderBrush<br/>
-HorizontalScrollBar<br/>
-HorizontalSlider<br/>
-JournalEntryUnifiedViewConverter<br/>
-LightBorderBrush<br/>
-LightBrush<br/>
-LightColorBrush<br/>
-MainMenuForegroundBrush<br/>
-NormalBorderBrush<br/>
-NormalBrush<br/>
-NormalProgressBrush<br/>
-OnWindowForegroundBrush<br/>
-OptionMarkFocusVisualBottom<br/>
-OptionMarkFocusVisualLeft<br/>
-OptionMarkFocusVisualRight<br/>
-OptionMarkFocusVisualTop<br/>
-OptionRadioButtonStyle<br/>
-PressedBorderBrush<br/>
-PressedBrush<br/>
-ProgressBarIndeterminateFillBrush<br/>
-ProgressBarIndeterminateRootBrush<br/>
-ProgressBarIndicatorAnimatedFill<br/>
-RadioButtonFocusVisual<br/>
-RoundedTabItemStyle<br/>
-RowBackgroundBrush<br/>
-ScrollBarBackgroundBrush<br/>
-ScrollBarLineButton<br/>
-ScrollBarPageButtonHoriz<br/>
-ScrollBarPageButtonHorizBrush<br/>
-ScrollBarPageButtonVert<br/>
-ScrollBarPageButtonVertBrush<br/>
-ScrollBarThumb<br/>
-SelectedBackgroundBrush<br/>
-SliderButtonStyle<br/>
-SliderThumbStyle<br/>
-SliderThumbStyleDirected<br/>
-SliderThumbStyleDirectedHor<br/>
-SolidBorderBrush<br/>
-SubMenuItemRadioButtonTemplate<br/>
-SwitchButtonFocusVisual<br/>
-SwitchCheckBoxStyle<br/>
-SynWindowBackgroundBrush<br/>
-TabItemRadius<br/>
-TabItemSelectedBackgroundBrush<br/>
-TabRadiusBottom<br/>
-TabRadiusLeft<br/>
-TabRadiusRight<br/>
-TabRadiusTop<br/>
-TestWindowStyle<br/>
-TextBoxBorder<br/>
-ThickConv<br/>
-TogglePressedBrush<br/>
-TopLevelMenuBackgroundHover<br/>
-UiForegroundBrush<br/>
-VerticalDarkBrush<br/>
-VerticalNormalBrush<br/>
-VerticalPressedBrush<br/>
-VerticalScrollBar<br/>
-VerticalScrollBarThumb<br/>
-VerticalSlider<br/>
-WindowBackgroundBrush<br/>
-WindowSolidBrush<br/>
-ControlDarkColor<br/>
-ControlLightColor<br/>
-ControlMediumColor<br/>
-ControlMouseOverColor<br/>
-ControlPressedColor<br/>
-OnWindowForegroundColor<br/>
-SelectedBackgroundColor<br/>
-SelectedUnfocusedColor<br/>
-UiForegroundColor<br/>
-ValidationErrorColor<br/>
-WindowBackgroundHoverColor<br/>
+![Brushes list](../BrushesList.png)
diff --git a/docs/help/htmleditor.md b/docs/help/htmleditor.md
index 4e9cecb..4be0fbb 100644
--- a/docs/help/htmleditor.md
+++ b/docs/help/htmleditor.md
@@ -1,6 +1,6 @@
 # CKEditor (HtmlEditor) usage example
 
-Documentation in progress... 
+Extra package contains first experimental HtmlEditor
 
 For more info see `BrightSharp.Demo` project. How to setup video https://youtu.be/fQvdY69fQDw
 
diff --git a/docs/silver-theme.png b/docs/silver-theme.png
new file mode 100644
index 0000000..77d87c6
Binary files /dev/null and b/docs/silver-theme.png differ
diff --git a/docs/theme-blue.png b/docs/theme-blue.png
deleted file mode 100644
index 645ceec..0000000
Binary files a/docs/theme-blue.png and /dev/null differ
diff --git a/docs/theme-darkblue.png b/docs/theme-darkblue.png
deleted file mode 100644
index e3edc74..0000000
Binary files a/docs/theme-darkblue.png and /dev/null differ
diff --git a/docs/theme-devlab.png b/docs/theme-devlab.png
deleted file mode 100644
index 87e6fe8..0000000
Binary files a/docs/theme-devlab.png and /dev/null differ
diff --git a/docs/theme-silver.png b/docs/theme-silver.png
deleted file mode 100644
index bed300c..0000000
Binary files a/docs/theme-silver.png and /dev/null differ
diff --git a/docs/theme-standard.png b/docs/theme-standard.png
deleted file mode 100644
index 710d3ca..0000000
Binary files a/docs/theme-standard.png and /dev/null differ