From a7ce2e208db1b4376b04274e16af7e6882b3a793 Mon Sep 17 00:00:00 2001
From: Luis <info@lemaluis.com>
Date: Sun, 5 Jul 2020 19:56:15 -0500
Subject: [PATCH] New styles for buttons and textboxes and context menus.
 Khernet.App.Container nuget package updated to 1.0.7 version. Removed unused
 folders of vlc library. Version marked as RC (Release Candidate)

---
 .../Khernet.Core.Container.csproj             |    4 +-
 .../Khernet.Core.Container/packages.config    |    2 +-
 Khernet.UI/Khernet.UI.Presentation/App.xaml   |    4 +-
 .../Controls/Chat/FileMessageControl.xaml     |    3 +-
 .../Controls/Chat/ReplyMessageControl.xaml    |    6 +-
 .../Controls/Chat/VideoMessageControl.xaml    |    6 +-
 .../Controls/Dialogs/CacheCleanerControl.xaml |   14 +-
 .../Controls/Dialogs/FieldEditorControl.xaml  |    6 +-
 .../Controls/Dialogs/NotificationControl.xaml |    8 +-
 .../Controls/Media/AudioItemControl.xaml      |    3 +-
 .../Controls/Media/ImageItemControl.xaml      |    2 +
 .../Controls/Media/MediaGalleryControl.xaml   |    3 +-
 .../Controls/MessageBoxUserControl.xaml       |   70 +-
 .../Controls/User/UserBrowser.xaml            |   13 +-
 .../Converters/ButtonShapeMultiConverter.cs   |   55 +
 .../Converters/ButtonShineMultiConverter.cs   |   49 +
 .../Khernet.UI.Presentation.csproj            |    2 +
 .../Khernet.UI.Presentation/MainWindow.xaml   |    2 +-
 .../Pages/AboutPage.xaml                      |    2 +-
 .../Pages/CachePage.xaml                      |   45 +-
 .../Pages/ChatPage.xaml                       |   16 +-
 .../Pages/FileListPage.xaml                   |    9 +-
 .../Pages/LoginPage.xaml                      |   28 +-
 .../Pages/ProfilePage.xaml                    |   22 +-
 .../Pages/ProfileViewerPage.xaml              |   31 +-
 .../Pages/ResendPage.xaml                     |    4 +-
 .../Pages/SettingsPage.xaml                   |    6 +-
 .../Pages/SignOutPage.xaml                    |    3 +-
 .../Pages/SignUpPage.xaml                     |   13 +-
 .../Pages/VideoListPage.xaml                  |    7 +-
 .../Resources/DataTemplates.xaml              |   55 +-
 .../Resources/ObjectModels.xaml               |   40 +-
 .../Styles/Buttons.xaml                       |  366 ++--
 .../Styles/Colors.xaml                        |    5 +
 .../Styles/ListBoxStyles.xaml                 |    1 +
 .../Styles/Textblocks.xaml                    |   19 +-
 .../Styles/Textboxes.xaml                     | 1491 +----------------
 37 files changed, 603 insertions(+), 1812 deletions(-)
 create mode 100644 Khernet.UI/Khernet.UI.Presentation/Converters/ButtonShapeMultiConverter.cs
 create mode 100644 Khernet.UI/Khernet.UI.Presentation/Converters/ButtonShineMultiConverter.cs

diff --git a/Khernet.Core/Engine/Khernet.Core.Container/Khernet.Core.Container.csproj b/Khernet.Core/Engine/Khernet.Core.Container/Khernet.Core.Container.csproj
index 0cc81f3..18b9328 100644
--- a/Khernet.Core/Engine/Khernet.Core.Container/Khernet.Core.Container.csproj
+++ b/Khernet.Core/Engine/Khernet.Core.Container/Khernet.Core.Container.csproj
@@ -69,11 +69,11 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\packages\Khernet.App.Container.1.0.6\build\Khernet.App.Container.targets" Condition="Exists('..\..\packages\Khernet.App.Container.1.0.6\build\Khernet.App.Container.targets')" />
+  <Import Project="..\..\packages\Khernet.App.Container.1.0.7\build\Khernet.App.Container.targets" Condition="Exists('..\..\packages\Khernet.App.Container.1.0.7\build\Khernet.App.Container.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>Este proyecto hace referencia a los paquetes NuGet que faltan en este equipo. Use la restauración de paquetes NuGet para descargarlos. Para obtener más información, consulte http://go.microsoft.com/fwlink/?LinkID=322105. El archivo que falta es {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Khernet.App.Container.1.0.6\build\Khernet.App.Container.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Khernet.App.Container.1.0.6\build\Khernet.App.Container.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Khernet.App.Container.1.0.7\build\Khernet.App.Container.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Khernet.App.Container.1.0.7\build\Khernet.App.Container.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/Khernet.Core/Engine/Khernet.Core.Container/packages.config b/Khernet.Core/Engine/Khernet.Core.Container/packages.config
index d259c2a..32b4e27 100644
--- a/Khernet.Core/Engine/Khernet.Core.Container/packages.config
+++ b/Khernet.Core/Engine/Khernet.Core.Container/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Khernet.App.Container" version="1.0.6" targetFramework="net40" />
+  <package id="Khernet.App.Container" version="1.0.7" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/Khernet.UI/Khernet.UI.Presentation/App.xaml b/Khernet.UI/Khernet.UI.Presentation/App.xaml
index 35e9cdb..96bd6d6 100644
--- a/Khernet.UI/Khernet.UI.Presentation/App.xaml
+++ b/Khernet.UI/Khernet.UI.Presentation/App.xaml
@@ -17,14 +17,14 @@
                 <ResourceDictionary Source="/Khernet;component/Styles/Colors.xaml"/>
                 <ResourceDictionary Source="/Khernet;component/Styles/ScrollBar.xaml"/>
                 <ResourceDictionary Source="/Khernet;component/Styles/FontStyles.xaml"/>
+                <ResourceDictionary Source="/Khernet;component/Styles/Textblocks.xaml"/>
                 <ResourceDictionary Source="/Khernet;component/Styles/Buttons.xaml"/>
+                <ResourceDictionary Source="/Khernet;component/Resources/ObjectModels.xaml"/>
                 <ResourceDictionary Source="/Khernet;component/Styles/Textboxes.xaml"/>
-                <ResourceDictionary Source="/Khernet;component/Styles/Textblocks.xaml"/>
                 <ResourceDictionary Source="/Khernet;component/Styles/Sliders.xaml"/>
                 <ResourceDictionary Source="/Khernet;component/Styles/ListBoxStyles.xaml"/>
                 <ResourceDictionary Source="/Khernet;component/Styles/MarkdownStyles.xaml"/>
                 <ResourceDictionary Source="/Khernet;component/Resources/DataTemplates.xaml"/>
-                <ResourceDictionary Source="/Khernet;component/Resources/ObjectModels.xaml"/>
             </ResourceDictionary.MergedDictionaries>
             <Style TargetType="{x:Type Controls:MetroWindow}" x:Key="WinStyle" BasedOn="{StaticResource CleanWindowStyleKey}"/>
         </ResourceDictionary>
diff --git a/Khernet.UI/Khernet.UI.Presentation/Controls/Chat/FileMessageControl.xaml b/Khernet.UI/Khernet.UI.Presentation/Controls/Chat/FileMessageControl.xaml
index cf1e2e8..3b16293 100644
--- a/Khernet.UI/Khernet.UI.Presentation/Controls/Chat/FileMessageControl.xaml
+++ b/Khernet.UI/Khernet.UI.Presentation/Controls/Chat/FileMessageControl.xaml
@@ -92,6 +92,7 @@
                     <!-- File name-->
                     <TextBlock Text="{Binding FileName}"
                                FontFamily="{StaticResource RobotoBoldFont}"
+                               Style="{StaticResource TextblockItemStyle}"
                                Grid.Row="0"
                                Margin="0"/>
 
@@ -105,7 +106,7 @@
                         </TextBlock>
 
                         <!--File size-->
-                        <TextBlock>
+                        <TextBlock Style="{StaticResource TextblockItemStyle}">
                         <Run Text="{Binding FileSize,Converter={conv:SizeUnitConverter}}"/>
                         <Run Text="{Binding FileSize,Converter={conv:SizeToUnitNameConverter}}"/>
                         </TextBlock>
diff --git a/Khernet.UI/Khernet.UI.Presentation/Controls/Chat/ReplyMessageControl.xaml b/Khernet.UI/Khernet.UI.Presentation/Controls/Chat/ReplyMessageControl.xaml
index 5281035..9624302 100644
--- a/Khernet.UI/Khernet.UI.Presentation/Controls/Chat/ReplyMessageControl.xaml
+++ b/Khernet.UI/Khernet.UI.Presentation/Controls/Chat/ReplyMessageControl.xaml
@@ -145,7 +145,8 @@
                     <TextBlock Grid.Column="2"
                                Grid.Row="1"
                                depend:InlineSourceProperty.Value="{Binding TextContent}"
-                               Margin="8 5 0 5"/>
+                               Margin="8 5 0 5"
+                               Style="{StaticResource TextblockItemStyle}"/>
 
                     <!--File name-->
                     <TextBlock Grid.Column="2"
@@ -153,7 +154,8 @@
                                Text="{Binding FileName}"
                                Visibility="{Binding FileName,Converter={conv:StringToVisibilityConverter}}"
                                VerticalAlignment="Center"
-                               Margin="0"/>
+                               Margin="0"
+                               Style="{StaticResource TextblockItemStyle}"/>
                 </Grid>
             </Grid>
         </Border>
diff --git a/Khernet.UI/Khernet.UI.Presentation/Controls/Chat/VideoMessageControl.xaml b/Khernet.UI/Khernet.UI.Presentation/Controls/Chat/VideoMessageControl.xaml
index 9b69671..5934acb 100644
--- a/Khernet.UI/Khernet.UI.Presentation/Controls/Chat/VideoMessageControl.xaml
+++ b/Khernet.UI/Khernet.UI.Presentation/Controls/Chat/VideoMessageControl.xaml
@@ -93,7 +93,8 @@
                            HorizontalAlignment="Left"
                            Text="{Binding Duration,Converter={conv:TimeSpanToStringConverter}}"
                            Foreground="White"
-                           Padding="8 0 0 8"/>
+                           Padding="8 0 0 8"
+                           Style="{StaticResource TextblockItemStyle}"/>
             </Grid>
 
             <!--Video Name-->
@@ -103,7 +104,8 @@
                        VerticalAlignment="Top"
                        HorizontalAlignment="Stretch"
                        Padding="8 8 8 0"
-                       MaxWidth="{Binding Path=ActualWidth,ElementName=img}"/>
+                       MaxWidth="{Binding Path=ActualWidth,ElementName=img}"
+                       Style="{StaticResource TextblockItemStyle}"/>
 
         </Grid>
     </Grid>
diff --git a/Khernet.UI/Khernet.UI.Presentation/Controls/Dialogs/CacheCleanerControl.xaml b/Khernet.UI/Khernet.UI.Presentation/Controls/Dialogs/CacheCleanerControl.xaml
index 3112539..e6efcf3 100644
--- a/Khernet.UI/Khernet.UI.Presentation/Controls/Dialogs/CacheCleanerControl.xaml
+++ b/Khernet.UI/Khernet.UI.Presentation/Controls/Dialogs/CacheCleanerControl.xaml
@@ -20,7 +20,8 @@
         <TextBlock Grid.Row="0"
                    Text="{Binding TextProgress}"
                    VerticalAlignment="Center"
-                   Margin="20 20 0 15"/>
+                   Margin="20 20 0 15"
+                   Style="{StaticResource TextblockItemStyle}"/>
 
         <!-- Progress ring to show load progress -->
         <Controls:ProgressRing Grid.Row="1"
@@ -31,11 +32,12 @@
                                VerticalAlignment="Center"
                                        />
         <!--Accept button-->
-        <Button Content="Accept"
+        <Button Content="OK"
                 Visibility="{Binding IsCleaning,Converter={conv:InverseBoolToVisibilityConverter}}"
-                    Click="Button_Click_1"
-                    HorizontalAlignment="Center"
-                    Margin="0 0 0 10"
-                    Width="100"/>
+                Click="Button_Click_1"
+                HorizontalAlignment="Center"
+                Margin="0 0 0 10"
+                Width="100"
+                Style="{StaticResource HexagonalButtonStyle}"/>
     </StackPanel>
 </local:BasePopUpControl>
diff --git a/Khernet.UI/Khernet.UI.Presentation/Controls/Dialogs/FieldEditorControl.xaml b/Khernet.UI/Khernet.UI.Presentation/Controls/Dialogs/FieldEditorControl.xaml
index 8b5903c..8a4b56f 100644
--- a/Khernet.UI/Khernet.UI.Presentation/Controls/Dialogs/FieldEditorControl.xaml
+++ b/Khernet.UI/Khernet.UI.Presentation/Controls/Dialogs/FieldEditorControl.xaml
@@ -84,18 +84,20 @@
                     Margin="15">
             
             <!--Accept button-->
-            <Button Content="Accept"
+            <Button Content="OK"
                     Command="{Binding UpdateFieldCommand}"
                     CommandParameter="{Binding ElementName=nameEditor}"
+                    Style="{StaticResource HexagonalButtonStyle}"
                     Click="Button_Click_1"
                     HorizontalAlignment="Left"
                     Margin="10 0 0 0"
                     Width="100"/>
 
             <!--Cancel button-->
-            <Button Content="Cancel"
+            <Button Content="CANCEL"
                     Click="Button_Click_1"
                     HorizontalAlignment="Right"
+                    Style="{StaticResource LightHexagonalButtonStyle}"
                     Margin="10 0 0 0"
                     Width="100"/>
 
diff --git a/Khernet.UI/Khernet.UI.Presentation/Controls/Dialogs/NotificationControl.xaml b/Khernet.UI/Khernet.UI.Presentation/Controls/Dialogs/NotificationControl.xaml
index da06c87..447d815 100644
--- a/Khernet.UI/Khernet.UI.Presentation/Controls/Dialogs/NotificationControl.xaml
+++ b/Khernet.UI/Khernet.UI.Presentation/Controls/Dialogs/NotificationControl.xaml
@@ -65,8 +65,7 @@
                                VerticalAlignment="Center"
                                Foreground="{StaticResource LightBrush}"
                                FontSize="{StaticResource LargeFontSize}"
-                               FontFamily="{StaticResource RobotoBoldFont}"
-                               />
+                               FontFamily="{StaticResource RobotoBoldFont}"/>
                 </Border>
 
                 <!-- Profile picture-->
@@ -90,12 +89,13 @@
 
                     <!--User name-->
                     <RichTextBox depend:DocumentSourceProperty.Value="{Binding User.DisplayName}"
-                               IsReadOnly="True"
+                                 IsReadOnly="True"
                                  BorderThickness="0"
-                                             IsReadOnlyCaretVisible="True"/>
+                                 IsReadOnlyCaretVisible="True"/>
 
                     <!--Message type description-->
                     <TextBlock Text="{Binding MessageType,Converter={conv:MessageTypeToFriendlyName}}"
+                               Style="{StaticResource TextblockItemStyle}"
                                Margin="0 10 0 0"/>
                 </StackPanel>
             </Grid>
diff --git a/Khernet.UI/Khernet.UI.Presentation/Controls/Media/AudioItemControl.xaml b/Khernet.UI/Khernet.UI.Presentation/Controls/Media/AudioItemControl.xaml
index d16d699..18b55a6 100644
--- a/Khernet.UI/Khernet.UI.Presentation/Controls/Media/AudioItemControl.xaml
+++ b/Khernet.UI/Khernet.UI.Presentation/Controls/Media/AudioItemControl.xaml
@@ -118,6 +118,7 @@
             <TextBlock Text="{Binding FileName}"
                        Grid.Row="0"
                        FontFamily="{StaticResource RobotoBoldFont}"
+                       Style="{StaticResource TextblockItemStyle}"
                        TextWrapping="WrapWithOverflow"
                        Width="250"
                        HorizontalAlignment="Left"/>
@@ -127,7 +128,7 @@
                         Visibility="{Binding IsReadingFile, Converter={conv:BoolToVisibilityGoneConverter}, FallbackValue=Collapsed}">
 
                 <!--File size-->
-                <TextBlock>
+                <TextBlock Style="{StaticResource TextblockItemStyle}">
                     <Run Text="{Binding CurrentReadBytes,Converter={conv:SizeUnitConverter}}"/>
                     <Run Text=" / "/>
                     <Run Text="{Binding FileSize,Converter={conv:SizeUnitConverter}}"/>
diff --git a/Khernet.UI/Khernet.UI.Presentation/Controls/Media/ImageItemControl.xaml b/Khernet.UI/Khernet.UI.Presentation/Controls/Media/ImageItemControl.xaml
index 9e6d9ab..be79f3c 100644
--- a/Khernet.UI/Khernet.UI.Presentation/Controls/Media/ImageItemControl.xaml
+++ b/Khernet.UI/Khernet.UI.Presentation/Controls/Media/ImageItemControl.xaml
@@ -98,6 +98,7 @@
                        Text="{Binding SendDate,Converter={conv:TimeToStringConverter}}"
                        Foreground="{StaticResource DarkGrayBrush}"
                        FontSize="{StaticResource SmallFontSize}"
+                       FontFamily="{StaticResource RobotoRegularFont}"
                        Margin="5 5 0 0"
                        Visibility="{Binding IsMessageLoaded,Converter={conv:BoolToVisibilityGoneConverter}}"/>
 
@@ -105,6 +106,7 @@
             <TextBlock Grid.Row="2"
                        Foreground="{StaticResource DarkGrayBrush}"
                        FontSize="{StaticResource SmallFontSize}"
+                       FontFamily="{StaticResource RobotoRegularFont}"
                        Margin="5 0 0 10"
                        Visibility="{Binding IsMessageLoaded,Converter={conv:BoolToVisibilityGoneConverter}}">
                         <Run Text="{Binding FileSize,Converter={conv:SizeUnitConverter}}"/>
diff --git a/Khernet.UI/Khernet.UI.Presentation/Controls/Media/MediaGalleryControl.xaml b/Khernet.UI/Khernet.UI.Presentation/Controls/Media/MediaGalleryControl.xaml
index 19dc4a6..c33b019 100644
--- a/Khernet.UI/Khernet.UI.Presentation/Controls/Media/MediaGalleryControl.xaml
+++ b/Khernet.UI/Khernet.UI.Presentation/Controls/Media/MediaGalleryControl.xaml
@@ -61,7 +61,8 @@
             <TextBlock Text="Loading..."
                        Visibility="{Binding IsLoading,Converter={conv:BoolToVisibilityGoneConverter},FallbackValue=Collapsed}"
                        HorizontalAlignment="Center"
-                       VerticalAlignment="Center"/>
+                       VerticalAlignment="Center"
+                       Style="{StaticResource TextblockItemStyle}"/>
         </Grid>
 
     </Border>
diff --git a/Khernet.UI/Khernet.UI.Presentation/Controls/MessageBoxUserControl.xaml b/Khernet.UI/Khernet.UI.Presentation/Controls/MessageBoxUserControl.xaml
index 440538c..feabd03 100644
--- a/Khernet.UI/Khernet.UI.Presentation/Controls/MessageBoxUserControl.xaml
+++ b/Khernet.UI/Khernet.UI.Presentation/Controls/MessageBoxUserControl.xaml
@@ -12,56 +12,54 @@
                              Height="140"
                              Width="286"
                              d:DataContext="{d:DesignInstance vm:MessageBoxDesignModel,IsDesignTimeCreatable=True}">
-    
+
     <Grid Background="{StaticResource LightBrush}">
         <Grid.RowDefinitions>
             <RowDefinition Height="*"/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
-            <!-- Text message -->
-            <FlowDocumentScrollViewer 
-                                      Margin="0 20 0 0"
-                                      Grid.Row="0"
-                                      VerticalScrollBarVisibility="Auto">
-                <FlowDocument FontFamily="{StaticResource RobotoRegularFont}"
-                              FontSize="{StaticResource RegularFontSize}">
-                    <Paragraph>
-                        <Run Text="{Binding Message}"/>
-                    </Paragraph>
-                </FlowDocument>
-            </FlowDocumentScrollViewer>
+        <!-- Text message -->
+        <FlowDocumentScrollViewer Margin="0 20 0 0"
+                                  Grid.Row="0"
+                                  VerticalScrollBarVisibility="Auto">
+            <FlowDocument FontFamily="{StaticResource RobotoRegularFont}"
+                          FontSize="{StaticResource RegularFontSize}">
+                <Paragraph>
+                    <Run Text="{Binding Message}"/>
+                </Paragraph>
+            </FlowDocument>
+        </FlowDocumentScrollViewer>
 
         <StackPanel Orientation="Horizontal"
-                        HorizontalAlignment="Right"
-                        Grid.Row="1"
+                    HorizontalAlignment="Right"
+                    Grid.Row="1"
                     Margin="0 15 15 15">
 
-                <!-- Accept button -->
+            <!-- Accept button -->
             <Button Margin="10 0 0 0"
-                        Visibility="{Binding ShowAcceptOption,Converter={conv:BoolToVisibilityGoneConverter}}"
-                        Content="{Binding AcceptOptionLabel}"
-                        MaxWidth="100"
+                    Visibility="{Binding ShowAcceptOption,Converter={conv:BoolToVisibilityGoneConverter}}"
+                    Content="{Binding AcceptOptionLabel}"
+                    MaxWidth="100"
                     MinWidth="80"
-                        Command="{Binding AcceptCommand}"
-                        IsDefault="True"
-                        Click="Button_Click"
-                        HorizontalAlignment="Right"
-                        >
-
-                </Button>
+                    Height="30"
+                    Command="{Binding AcceptCommand}"
+                    IsDefault="True"
+                    Click="Button_Click"
+                    HorizontalAlignment="Right"
+                    Style="{StaticResource HexagonalButtonStyle}"/>
 
-                <!-- Cancel button -->
+            <!-- Cancel button -->
             <Button Margin="10 0 0 0"
-                        Visibility="{Binding ShowCancelOption,Converter={conv:BoolToVisibilityGoneConverter}}"
-                        Content="{Binding CancelOptionLabel}"
-                        MaxWidth="100"
+                    Visibility="{Binding ShowCancelOption,Converter={conv:BoolToVisibilityGoneConverter}}"
+                    Content="{Binding CancelOptionLabel}"
+                    MaxWidth="100"
                     MinWidth="80"
-                        Command="{Binding CancelCommand}"
-                        Click="Button_Click"
-                        HorizontalAlignment="Right">
-
-                </Button>
-            </StackPanel>
+                    Height="30"
+                    Command="{Binding CancelCommand}"
+                    Click="Button_Click"
+                    HorizontalAlignment="Right"
+                    Style="{StaticResource LightHexagonalButtonStyle}"/>
+        </StackPanel>
     </Grid>
 </local:BaseDialogUserControl>
diff --git a/Khernet.UI/Khernet.UI.Presentation/Controls/User/UserBrowser.xaml b/Khernet.UI/Khernet.UI.Presentation/Controls/User/UserBrowser.xaml
index 6c46b0f..e8a1318 100644
--- a/Khernet.UI/Khernet.UI.Presentation/Controls/User/UserBrowser.xaml
+++ b/Khernet.UI/Khernet.UI.Presentation/Controls/User/UserBrowser.xaml
@@ -37,26 +37,17 @@
                             <Button ToolTip="Settings" 
                                     Grid.Column="0"
                                     Command="{Binding ApplicationViewModel.ViewSettingsCommand,Source={x:Static app:ViewModelLocator.Instance}}"
-                                    Style="{DynamicResource ButtonStyle2}">
+                                    Style="{DynamicResource GlowButtonStyle}">
                                 <iconPacks:PackIconMaterial Width="15" Kind="Settings" />
                             </Button>
 
                             <!-- Update button -->
                             <Button 
                                 Grid.Column="1" 
-                                Style="{DynamicResource ButtonStyle2}"
+                                Style="{DynamicResource GlowButtonStyle}"
                                 Visibility="Hidden">
                                 <iconPacks:PackIconMaterial Kind="Refresh" Width="15" Height="15"/>
                             </Button>
-
-                            <!--Search user textbox-->
-                            <TextBox 
-                                Grid.Column="2"
-                                Visibility="Hidden"
-                                Height="10"
-                                Margin="5 0 5 0"
-                                Controls:TextBoxHelper.Watermark="Search user..."
-                                Style="{StaticResource TextBoxStyle11}"/>
                         </Grid>
                     </Border>
 
diff --git a/Khernet.UI/Khernet.UI.Presentation/Converters/ButtonShapeMultiConverter.cs b/Khernet.UI/Khernet.UI.Presentation/Converters/ButtonShapeMultiConverter.cs
new file mode 100644
index 0000000..60a1a22
--- /dev/null
+++ b/Khernet.UI/Khernet.UI.Presentation/Converters/ButtonShapeMultiConverter.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Media;
+
+namespace Khernet.UI.Converters
+{
+    /// <summary>
+    /// Returns a <see cref="PointCollection"/> containing a hexagon.
+    /// </summary>
+    public class ButtonShapeMultiConverter : BaseMultiValueConverter<ButtonShapeMultiConverter>
+    {
+        public override object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (values == null)
+                return null;
+
+            if (values[0] == DependencyProperty.UnsetValue ||
+                values[1] == DependencyProperty.UnsetValue)
+                return null;
+
+
+            double width = (double)values[0];
+            double height = (double)values[1] / 2;
+
+            double xFirstCoordinate = height * Math.Tan(Math.PI / 6);
+
+            Point Point4 = new Point(xFirstCoordinate, 0);
+            Point Point5 = new Point(0, height);
+            Point Point6 = new Point(xFirstCoordinate, height * 2);
+            Point Point7 = new Point(width, height * 2);
+            Point Point8 = new Point(width + xFirstCoordinate, height);
+            Point Point9 = new Point(width, 0);
+
+            PointCollection myPointCollection2 = new PointCollection();
+
+            myPointCollection2.Add(Point4);
+            myPointCollection2.Add(Point5);
+            myPointCollection2.Add(Point6);
+            myPointCollection2.Add(Point7);
+            myPointCollection2.Add(Point8);
+            myPointCollection2.Add(Point9);
+
+            return myPointCollection2;
+        }
+
+        public override object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            return null;
+        }
+    }
+}
diff --git a/Khernet.UI/Khernet.UI.Presentation/Converters/ButtonShineMultiConverter.cs b/Khernet.UI/Khernet.UI.Presentation/Converters/ButtonShineMultiConverter.cs
new file mode 100644
index 0000000..96a4c38
--- /dev/null
+++ b/Khernet.UI/Khernet.UI.Presentation/Converters/ButtonShineMultiConverter.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Media;
+
+namespace Khernet.UI.Converters
+{
+    /// <summary>
+    /// Returns a <see cref="PointCollection"/> containing  trapeze.
+    /// </summary>
+    public class ButtonShineMultiConverter : BaseMultiValueConverter<ButtonShineMultiConverter>
+    {
+        public override object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (values == null)
+                return null;
+
+            if (values[0] == DependencyProperty.UnsetValue ||
+                values[1] == DependencyProperty.UnsetValue)
+                return null;
+
+            double width = (double)values[0];
+            double height = (double)values[1] / 2;
+
+            double xFirstCoordinate = height * Math.Tan(Math.PI / 6);
+
+            Point Point4 = new Point(xFirstCoordinate, 0);
+            Point Point5 = new Point(0, height);
+            Point Point8 = new Point(width + xFirstCoordinate, height);
+            Point Point9 = new Point(width, 0);
+            PointCollection myPointCollection2 = new PointCollection();
+
+            myPointCollection2.Add(Point4);
+            myPointCollection2.Add(Point5);
+            myPointCollection2.Add(Point8);
+            myPointCollection2.Add(Point9);
+
+            return myPointCollection2;
+        }
+
+        public override object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Khernet.UI/Khernet.UI.Presentation/Khernet.UI.Presentation.csproj b/Khernet.UI/Khernet.UI.Presentation/Khernet.UI.Presentation.csproj
index f44b25e..78ba494 100644
--- a/Khernet.UI/Khernet.UI.Presentation/Khernet.UI.Presentation.csproj
+++ b/Khernet.UI/Khernet.UI.Presentation/Khernet.UI.Presentation.csproj
@@ -228,6 +228,8 @@
       <DependentUpon>AudioItemControl.xaml</DependentUpon>
     </Compile>
     <Compile Include="Converters\BaseValueMultiConverter.cs" />
+    <Compile Include="Converters\ButtonShapeMultiConverter.cs" />
+    <Compile Include="Converters\ButtonShineMultiConverter.cs" />
     <Compile Include="Converters\InverseBoolConverter.cs" />
     <Compile Include="Converters\BoolToHeightConverter.cs" />
     <Compile Include="Converters\VolumeToStringConverter.cs" />
diff --git a/Khernet.UI/Khernet.UI.Presentation/MainWindow.xaml b/Khernet.UI/Khernet.UI.Presentation/MainWindow.xaml
index fbbda40..6410a1b 100644
--- a/Khernet.UI/Khernet.UI.Presentation/MainWindow.xaml
+++ b/Khernet.UI/Khernet.UI.Presentation/MainWindow.xaml
@@ -10,7 +10,7 @@
                       x:Class="Khernet.UI.MainWindow"
                       mc:Ignorable="d"
                       x:Name="MainWin"
-                      Title="(PREVIEW)"
+                      Title="(RC)"
                       ShowIconOnTitleBar="True"
                       WindowTransitionsEnabled="False"
                       WindowStartupLocation="CenterScreen"
diff --git a/Khernet.UI/Khernet.UI.Presentation/Pages/AboutPage.xaml b/Khernet.UI/Khernet.UI.Presentation/Pages/AboutPage.xaml
index 3baa07c..07fb618 100644
--- a/Khernet.UI/Khernet.UI.Presentation/Pages/AboutPage.xaml
+++ b/Khernet.UI/Khernet.UI.Presentation/Pages/AboutPage.xaml
@@ -41,7 +41,7 @@
                 <Paragraph FontFamily="{StaticResource RobotoRegularFont}"
                            FontSize="{StaticResource RegularFontSize}">
 
-                    <Run Text="Version 0.8.10"/>
+                    <Run Text="Version 0.9.0"/>
                     <LineBreak/>
                     <Hyperlink Command="{Binding OpenIssueCommand}" >
                         <Run Text="Report an issue"/>
diff --git a/Khernet.UI/Khernet.UI.Presentation/Pages/CachePage.xaml b/Khernet.UI/Khernet.UI.Presentation/Pages/CachePage.xaml
index de9182d..237f9cd 100644
--- a/Khernet.UI/Khernet.UI.Presentation/Pages/CachePage.xaml
+++ b/Khernet.UI/Khernet.UI.Presentation/Pages/CachePage.xaml
@@ -17,14 +17,9 @@
 
     <Grid Margin="24">
 
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="Auto"/>
-        </Grid.ColumnDefinitions>
-        
         <Grid.RowDefinitions>
 
-            <!-- Description of page -->
+            <!-- Header page -->
             <RowDefinition Height="Auto"/>
 
             <!-- Size in bytes -->
@@ -38,33 +33,37 @@
 
         </Grid.RowDefinitions>
 
-        <!-- Description of page -->
-        <TextBlock Text="Space used by files in cache folder"
-                   Style="{StaticResource TextblockHeader}"
-                   Grid.Row="0"/>
+        <!-- Header page -->
+        <Grid Grid.Row="0">
 
-        <StackPanel Grid.Row="0"
-                    Grid.Column="1"
-                    Orientation="Horizontal">
+            <!-- Description of page -->
+            <TextBlock Text="Space used by files in cache folder"
+                       Style="{StaticResource TextblockHeader}"
+                       Grid.Row="0"
+                       HorizontalAlignment="Left"/>
 
             <Button Style="{StaticResource IconButton}"
                     Command="{Binding OpenCacheFolderCommand}"
-                    Margin="0 0 10 0"
-                    ToolTip="Open cache folder">
+                    Margin="0 0 40 0"
+                    ToolTip="Open cache folder"
+                    HorizontalAlignment="Right">
                 <iconPacks:PackIconMaterial Kind="FolderOpen" Width="15" Height="15"/>
             </Button>
 
             <!-- Refresh size button -->
-        <Button Style="{StaticResource IconButton}"
-                ToolTip="Update space used value"
-                Command="{Binding GetCacheSizeCommand}">
-            <iconPacks:PackIconMaterial Kind="Refresh" Width="15" Height="15"/>
-        </Button>
-        </StackPanel>
+            <Button Style="{StaticResource IconButton}"
+                    ToolTip="Update space used value"
+                    Command="{Binding GetCacheSizeCommand}"
+                    Margin="0 0 10 0"
+                    HorizontalAlignment="Right">
+                <iconPacks:PackIconMaterial Kind="Refresh" Width="15" Height="15"/>
+            </Button>
+        </Grid>
 
         <!-- Size in bytes -->
         <TextBlock Text="{Binding Size,Converter={conv:SizeUnitConverter}}"
                    FontSize="50"
+                   FontFamily="{StaticResource RobotoRegularFont}"
                    HorizontalAlignment="Center"
                    VerticalAlignment="Center"
                    Grid.Row="1"/>
@@ -79,11 +78,11 @@
                    />
 
         <!-- Clear button -->
-        <Button Content="Clear"
+        <Button Content="CLEAR"
                 Grid.Row="3"
                 Width="100"
                 Margin="0 0 0 20"
-                Style="{StaticResource FlatButtonStyle}"
+                Style="{StaticResource HexagonalButtonStyle}"
                 Command="{Binding ClearCacheCommand}"/>
 
     </Grid>
diff --git a/Khernet.UI/Khernet.UI.Presentation/Pages/ChatPage.xaml b/Khernet.UI/Khernet.UI.Presentation/Pages/ChatPage.xaml
index 57e318d..af60fda 100644
--- a/Khernet.UI/Khernet.UI.Presentation/Pages/ChatPage.xaml
+++ b/Khernet.UI/Khernet.UI.Presentation/Pages/ChatPage.xaml
@@ -19,6 +19,10 @@
                 FocusManager.FocusedElement="{Binding ElementName=rtxt}"
                 FocusManager.IsFocusScope="True">
 
+    <local:BasePage.Resources>
+      
+    </local:BasePage.Resources>
+
     <Border Background="{StaticResource LightBrush}">
         <Grid Name="mainChatContainer"
               Margin="0 0 0 10">
@@ -137,6 +141,7 @@
                                    VerticalAlignment="Center"/>
                     </Border>
 
+                    <!-- Go to bottom button -->
                     <Border Height="50"
                             Width="{Binding Height,RelativeSource={RelativeSource Self}}"
                             CornerRadius="{Binding ActualHeight,RelativeSource={RelativeSource Self}}"
@@ -161,8 +166,9 @@
 
                 <!-- Typing message indicator -->
                 <TextBlock Grid.Row="1" 
-                           Background="{StaticResource LightBrush}"
-                           Padding="10 0 0 0">
+                           Background="Transparent"
+                           Padding="10 0 0 0"
+                           Style="{StaticResource TextblockItemStyle}">
                     <TextBlock.Text>
                         <MultiBinding Converter="{conv:BoolToStringConverter}" FallbackValue="">
                             <Binding Path="UserContext.User.IsWritingMessage"/>
@@ -207,7 +213,7 @@
                                 Command="{Binding CloseReplyMessage}">
 
                             <iconPacks:PackIconMaterial Kind="WindowClose"
-                                                    Width="15"/>
+                                                        Width="15"/>
                         </Button>
 
                     </Grid>
@@ -270,11 +276,11 @@
                                       VerticalAlignment="Top"
                                       ToolTip="Markdown message"
                                       Style="{StaticResource IconToggleButton}"
+                                      FontFamily="{StaticResource RobotoRegularFont}"
                                       IsChecked="{Binding MessageFormat,Converter={conv:MessageFormatToStringConverter},Mode=TwoWay}"
                                       Checked="tgBtn_Markdown_Checked">
                             <iconPacks:PackIconMaterial Kind="Markdown" />
                         </ToggleButton>
-
                     </StackPanel>
 
                     <Border Grid.Column="1"
@@ -301,7 +307,7 @@
                                                          FontStretch="Expanded"
                                                          PreviewKeyDown="TextBox_PreviewKeyDown" 
                                                          Focusable="True"
-                                                         Style="{DynamicResource RichTextBoxStyle1}"
+                                                         Style="{DynamicResource MarkedRichTextBoxStyle}"
                                                          TextChanged="Rtxt_TextChanged"
                                                          TabIndex="0"
                                                          VerticalAlignment="Stretch"
diff --git a/Khernet.UI/Khernet.UI.Presentation/Pages/FileListPage.xaml b/Khernet.UI/Khernet.UI.Presentation/Pages/FileListPage.xaml
index 9bc64db..dc4be3f 100644
--- a/Khernet.UI/Khernet.UI.Presentation/Pages/FileListPage.xaml
+++ b/Khernet.UI/Khernet.UI.Presentation/Pages/FileListPage.xaml
@@ -101,6 +101,7 @@
                                 <!-- File name-->
                                 <TextBlock Text="{Binding FileName}"
                                            FontFamily="{StaticResource RobotoBoldFont}"
+                                           Style="{StaticResource TextblockItemStyle}"
                                            Grid.Row="0"
                                            Margin="0"
                                            TextWrapping="WrapWithOverflow"
@@ -110,13 +111,14 @@
                                             Orientation="Horizontal">
 
                                     <!-- Current read bytes -->
-                                    <TextBlock Visibility="{Binding IsReadingFile,Converter={conv:BoolToVisibilityGoneConverter},FallbackValue=Collapsed}">
+                                    <TextBlock Visibility="{Binding IsReadingFile,Converter={conv:BoolToVisibilityGoneConverter},FallbackValue=Collapsed}"
+                                               Style="{StaticResource TextblockItemStyle}">
                                         <Run Text="{Binding CurrentReadBytes,Converter={conv:SizeUnitConverter}}"/>
                                         <Run Text="/" />
                                     </TextBlock>
 
                                     <!--File size-->
-                                    <TextBlock>
+                                    <TextBlock Style="{StaticResource TextblockItemStyle}">
                                         <Run Text="{Binding FileSize,Converter={conv:SizeUnitConverter}}"/>
                                         <Run Text="{Binding FileSize,Converter={conv:SizeToUnitNameConverter}}"/>
                                     </TextBlock>
@@ -126,7 +128,8 @@
                                 <!-- Send/receive date -->
                                 <TextBlock Grid.Row="2"
                                            Text="{Binding SendDate,Converter={conv:TimeToStringConverter}}"
-                                           Foreground="{StaticResource DarkGrayBrush}"/>
+                                           Foreground="{StaticResource DarkGrayBrush}"
+                                           Style="{StaticResource TextblockItemStyle}"/>
                             </Grid>
                         </Grid>
                     </Border>
diff --git a/Khernet.UI/Khernet.UI.Presentation/Pages/LoginPage.xaml b/Khernet.UI/Khernet.UI.Presentation/Pages/LoginPage.xaml
index 37b802f..6256e28 100644
--- a/Khernet.UI/Khernet.UI.Presentation/Pages/LoginPage.xaml
+++ b/Khernet.UI/Khernet.UI.Presentation/Pages/LoginPage.xaml
@@ -25,41 +25,43 @@
         <!-- Title-->
         <TextBlock Text="Sign in" 
                    Style="{StaticResource TitleText}"
-                   FontFamily="{StaticResource RobotoRegularFont}"
-                   Margin="0 0 0 20"/>
+                   Margin="0 0 0 15"/>
 
         <TextBlock Text="Username" 
-                   Style="{StaticResource TextblockStyle}"/>
+                   Style="{StaticResource TextblockHeader}"/>
 
         <!--Username textbox-->
         <TextBox Text="{Binding Username,UpdateSourceTrigger=PropertyChanged,ValidatesOnDataErrors=True,NotifyOnValidationError=True}"
-                 Style="{StaticResource TextStyle2}"
+                 Style="{StaticResource EditTextBox}"
                  depend:IsFocusedProperty.Value="True"
                  MaxLength="20" 
-                 Template="{DynamicResource TextBoxControlTemplate1}"
                  Height="28"
                  VerticalContentAlignment="Center"/>
 
         <TextBlock Text="Password" 
-                   Style="{StaticResource TextblockStyle}"/>
+                   Style="{StaticResource TextblockHeader}"
+                   Margin="0 15 0 5"/>
 
         <!--Password textbox-->
         <PasswordBox Name="pass1"
-                     Style="{StaticResource PasswordStyle}" 
-                     Template="{DynamicResource PasswordBoxControlTemplate1}"
+                     Style="{StaticResource EditPasswordBox}" 
+                     VerticalContentAlignment="Center"
                      Height="28"/>
 
         <!--Login button-->
         <Button x:Name="button" 
                 IsDefault="True"
-                Content="Log in" 
-                Width="139"
+                Content="LOG IN" 
+                Width="120"
+                Height="30"
+                Margin="15"
                 IsEnabled="{Binding CanLogin}"
                 depend:IsBusyProperty.Value="{Binding IsAttemptingLogin}"
                 Command="{Binding LoginCommand}"
                 CommandParameter="{Binding ElementName=Login}"
-                Style="{StaticResource ButtonStyle1}"/>
-        
-        <!--Remove Style="{StaticResource ButtonStyle1}" this to clear issue with generics-->
+                Style="{DynamicResource HexagonalButtonStyle}"
+                />
+
+        <!--Remove Style="{StaticResource HexagonalButtonStyle}" this to clear issue with generics-->
     </StackPanel>
 </local:BasePage>
diff --git a/Khernet.UI/Khernet.UI.Presentation/Pages/ProfilePage.xaml b/Khernet.UI/Khernet.UI.Presentation/Pages/ProfilePage.xaml
index 927ec36..492964a 100644
--- a/Khernet.UI/Khernet.UI.Presentation/Pages/ProfilePage.xaml
+++ b/Khernet.UI/Khernet.UI.Presentation/Pages/ProfilePage.xaml
@@ -71,9 +71,13 @@
                                         <MouseBinding MouseAction="LeftClick" Command="{Binding OpenProfileImageCommand}"/>
                                     </Border.InputBindings>
                                 </Border>
-                                <Button Content="Choose profile image"
+                                <Button Content="CHOOSE PROFILE IMAGE"
                                         Margin="0 10 0 0"
                                         Grid.Row="1"
+                                        Height="30"
+                                        Width="160"
+                                        FontFamily="{StaticResource RobotoBoldFont}"
+                                        Style="{StaticResource LightHexagonalButtonStyle}"
                                         Command="{Binding UpdateProfileImageCommand}"/>
                             </Grid>
                         </Border>
@@ -136,7 +140,7 @@
                         
                         <TextBox Text="{Binding User.Group,UpdateSourceTrigger=PropertyChanged}"
                                  Style="{StaticResource EditTextBox}"
-                                 Margin="0 0 0 10"
+                                 Margin="0 10 0 10"
                                  MaxLength="50"/>
 
                         <!-- Slogan-->
@@ -148,7 +152,7 @@
                                  Style="{StaticResource EditTextBox}"
                                  TextWrapping="Wrap"
                                  MaxLength="106"
-                                 Margin="0 0 0 10"/>
+                                 Margin="0 10 0 10"/>
 
                         <!--Accoutn section-->
                         <TextBlock Text="Account"
@@ -162,7 +166,7 @@
 
                         <TextBox Text="{Binding User.Username,UpdateSourceTrigger=PropertyChanged}"
                                  Style="{StaticResource EditTextBox}"
-                                 Margin="0 0 0 10"/>
+                                 Margin="0 10 0 10"/>
                         
                         <!-- Token-->
                         <TextBlock Text="Token"
@@ -170,8 +174,9 @@
                                    Margin="0 10 0 0"/>
                         
                         <ucontrols:SelectableTextBlock Text="{Binding User.Token}"
-                                                       Margin="0 0 0 20"
-                                                       FocusVisualStyle="{x:Null}"/>
+                                                       Margin="0 10 0 0"
+                                                       FocusVisualStyle="{x:Null}"
+                                                       Style="{StaticResource TextblockItemStyle}"/>
                     </StackPanel>
                 </Grid>
             </ScrollViewer>
@@ -184,10 +189,11 @@
                 <!--Save button-->
                 <Button Width="150"
                         Margin="20"
-                        Content="Save profile"
+                        Height="30"
+                        Content="SAVE PROFILE"
                         Command="{Binding SaveProfileCommand}"
                         CommandParameter="{Binding ElementName=Profile}"
-                        Style="{StaticResource FlatButtonStyle}"/>
+                        Style="{StaticResource HexagonalButtonStyle}"/>
             </Border>
 
         </Grid>
diff --git a/Khernet.UI/Khernet.UI.Presentation/Pages/ProfileViewerPage.xaml b/Khernet.UI/Khernet.UI.Presentation/Pages/ProfileViewerPage.xaml
index 5a220b2..7c2e56a 100644
--- a/Khernet.UI/Khernet.UI.Presentation/Pages/ProfileViewerPage.xaml
+++ b/Khernet.UI/Khernet.UI.Presentation/Pages/ProfileViewerPage.xaml
@@ -79,11 +79,12 @@
                             <!--State-->
                             <TextBlock Text="{Binding User.State}"/>
 
-                            <Button Content="Edit Name"
+                            <Button Content="EDIT NAME"
                                     Margin="0 10 0 0"
                                     Width="100"
                                     Command="{Binding OpenEditNameCommand}"
-                                        HorizontalAlignment="Left"/>
+                                    Style="{StaticResource LightHexagonalButtonStyle}"
+                                    HorizontalAlignment="Left"/>
 
                         </StackPanel>
                     </Grid>
@@ -115,28 +116,34 @@
                             <!-- Group-->
                             <TextBlock Text="Group"
                                            Style="{StaticResource TextblockHeader}"/>
+                            
                             <ucontrols:SelectableTextBlock Text="{Binding User.Group}"
-                                           Margin="0 0 0 10"/>
+                                                           Margin="0 0 0 10"
+                                                           Style="{StaticResource TextblockItemStyle}"/>
 
                             <!-- Slogan-->
                             <TextBlock Text="Slogan"
                                            Style="{StaticResource TextblockHeader}"/>
                             <ucontrols:SelectableTextBlock Text="{Binding User.Slogan}"
-                                           TextWrapping="Wrap"
-                                           Margin="0 0 0 10"/>
+                                                           TextWrapping="Wrap"
+                                                           Margin="0 0 0 10"
+                                                           Style="{StaticResource TextblockItemStyle}"/>
 
                             <!-- User name-->
                             <TextBlock Text="Username"
                                            Style="{StaticResource TextblockHeader}"/>
+
                             <ucontrols:SelectableTextBlock Text="{Binding User.Username}"
-                                           VerticalAlignment="Center"
-                                           />
+                                                           VerticalAlignment="Center"
+                                                           Style="{StaticResource TextblockItemStyle}"/>
 
                             <!-- Token-->
                             <TextBlock Text="Token"
-                                           Style="{StaticResource TextblockHeader}"/>
+                                       Style="{StaticResource TextblockHeader}"/>
+                            
                             <ucontrols:SelectableTextBlock Text="{Binding User.Token}"
-                                           Margin="0 0 0 10"/>
+                                                           Margin="0 0 0 10"
+                                                           Style="{StaticResource TextblockItemStyle}"/>
 
                         </StackPanel>
 
@@ -159,6 +166,7 @@
                                 <iconPacks:PackIconMaterial Kind="Image" />
                                 <TextBlock Text="Images"
                                            VerticalAlignment="Center"
+                                           Style="{StaticResource TextblockItemStyle}"
                                            Margin="20 0 0 0"/>
                             </StackPanel>
                         </Button>
@@ -172,7 +180,8 @@
                                 <iconPacks:PackIconMaterial Kind="File" />
                                 <TextBlock Text="Files"
                                            VerticalAlignment="Center"
-                                           Margin="20 0 0 0"/>
+                                           Margin="20 0 0 0"
+                                           Style="{StaticResource TextblockItemStyle}"/>
                             </StackPanel>
                         </Button>
 
@@ -185,6 +194,7 @@
                                 <iconPacks:PackIconMaterial Kind="Video" />
                                 <TextBlock Text="Videos"
                                            VerticalAlignment="Center"
+                                           Style="{StaticResource TextblockItemStyle}"
                                            Margin="20 0 0 0"/>
                             </StackPanel>
                         </Button>
@@ -198,6 +208,7 @@
                                 <iconPacks:PackIconMaterial Kind="VolumeHigh" />
                                 <TextBlock Text="Audio"
                                            VerticalAlignment="Center"
+                                           Style="{StaticResource TextblockItemStyle}"
                                            Margin="20 0 0 0"/>
                             </StackPanel>
                         </Button>
diff --git a/Khernet.UI/Khernet.UI.Presentation/Pages/ResendPage.xaml b/Khernet.UI/Khernet.UI.Presentation/Pages/ResendPage.xaml
index 5616f8b..371cf04 100644
--- a/Khernet.UI/Khernet.UI.Presentation/Pages/ResendPage.xaml
+++ b/Khernet.UI/Khernet.UI.Presentation/Pages/ResendPage.xaml
@@ -26,11 +26,11 @@
 
         <!-- Cancel button -->
         <Grid Grid.Row="2">
-            <Button Content="Cancel"
+            <Button Content="CANCEL"
                     Width="100"
                     Margin="0 10 0 10"
                     HorizontalAlignment="Center"
-                    Style="{StaticResource FlatButtonStyle}"
+                    Style="{StaticResource HexagonalButtonStyle}"
                     Click="Button_Click"/>
         </Grid>
     </Grid>
diff --git a/Khernet.UI/Khernet.UI.Presentation/Pages/SettingsPage.xaml b/Khernet.UI/Khernet.UI.Presentation/Pages/SettingsPage.xaml
index fdea410..298dcee 100644
--- a/Khernet.UI/Khernet.UI.Presentation/Pages/SettingsPage.xaml
+++ b/Khernet.UI/Khernet.UI.Presentation/Pages/SettingsPage.xaml
@@ -15,7 +15,8 @@
     
     <Page.Resources>
         <DataTemplate x:Key="DataTemplate1">
-            <Border Background="Transparent" Height="50">
+            <Border Background="Transparent" 
+                    Height="50">
 
                 <Border.InputBindings>
                     <MouseBinding MouseAction="LeftClick" Command="{Binding OpenSettingCommand}"/>
@@ -34,7 +35,8 @@
                                                         Grid.Column="0"/>
                     <TextBlock Grid.Column="1" 
                                Text="{Binding Name}"
-                               VerticalAlignment="Center"/>
+                               VerticalAlignment="Center"
+                               Style="{StaticResource TextblockItemStyle}"/>
                 </Grid>
             </Border>
         </DataTemplate>
diff --git a/Khernet.UI/Khernet.UI.Presentation/Pages/SignOutPage.xaml b/Khernet.UI/Khernet.UI.Presentation/Pages/SignOutPage.xaml
index 25181cc..93a0906 100644
--- a/Khernet.UI/Khernet.UI.Presentation/Pages/SignOutPage.xaml
+++ b/Khernet.UI/Khernet.UI.Presentation/Pages/SignOutPage.xaml
@@ -18,6 +18,7 @@
         
         <!-- Progress description -->
         <TextBlock Text="Signing out..."
-                   HorizontalAlignment="Center"/>
+                   HorizontalAlignment="Center"
+                   Style="{StaticResource TextblockItemStyle}"/>
     </StackPanel>
 </local:BasePage>
diff --git a/Khernet.UI/Khernet.UI.Presentation/Pages/SignUpPage.xaml b/Khernet.UI/Khernet.UI.Presentation/Pages/SignUpPage.xaml
index 9695917..28fc59b 100644
--- a/Khernet.UI/Khernet.UI.Presentation/Pages/SignUpPage.xaml
+++ b/Khernet.UI/Khernet.UI.Presentation/Pages/SignUpPage.xaml
@@ -33,9 +33,8 @@
         <TextBox Height="28" 
                  Width="220" 
                  Text="{Binding Username,UpdateSourceTrigger=PropertyChanged,ValidatesOnDataErrors=True,NotifyOnValidationError=True}"
-                 Style="{StaticResource TextStyle2}"
+                 Style="{StaticResource EditTextBox}"
                  depend:IsFocusedProperty.Value="True"
-                 Template="{DynamicResource TextBoxControlTemplate1}"
                  VerticalContentAlignment="Center"/>
 
         <TextBlock Text="Password" 
@@ -46,8 +45,7 @@
         <PasswordBox Name="pass1"
                      Height="28" 
                      Width="220" 
-                     Style="{StaticResource PasswordStyle}"
-                     Template="{DynamicResource PasswordBoxControlTemplate1}"/>
+                     Style="{StaticResource EditPasswordBox}"/>
 
         <TextBlock Text="Confirm password" 
                    Width="220"
@@ -57,19 +55,18 @@
         <PasswordBox Name="pass2"
                      Height="28" 
                      Width="220" 
-                     Style="{StaticResource PasswordStyle}"
-                     Template="{DynamicResource PasswordBoxControlTemplate1}"/>
+                     Style="{StaticResource EditPasswordBox}"/>
 
         <!--Creation account/Login button-->
         <Button x:Name="button" 
-                Content="Create" 
+                Content="CREATE" 
                 Width="139"
                 IsDefault="True"
                 IsEnabled="{Binding CanLogin}"
                 depend:IsBusyProperty.Value="{Binding IsAttemptingLogin}"
                 Command="{Binding SignUpCommand}"
                 CommandParameter="{Binding ElementName=Login}"
-                Style="{StaticResource ButtonStyle1}"/>
+                Style="{StaticResource HexagonalButtonStyle}"/>
         
     </StackPanel>
 </local:BasePage>
diff --git a/Khernet.UI/Khernet.UI.Presentation/Pages/VideoListPage.xaml b/Khernet.UI/Khernet.UI.Presentation/Pages/VideoListPage.xaml
index 7271da6..b3030ea 100644
--- a/Khernet.UI/Khernet.UI.Presentation/Pages/VideoListPage.xaml
+++ b/Khernet.UI/Khernet.UI.Presentation/Pages/VideoListPage.xaml
@@ -132,11 +132,13 @@
                                 <TextBlock Text="{Binding FileName}" 
                                            HorizontalAlignment="Left"
                                            FontFamily="{StaticResource RobotoBoldFont}"
+                                           Style="{StaticResource TextblockItemStyle}"
                                            TextWrapping="WrapWithOverflow"
                                            Width="230"/>
 
                                 <!--File size-->
-                                <TextBlock Foreground="{StaticResource DarkGrayBrush}">
+                                <TextBlock Foreground="{StaticResource DarkGrayBrush}"
+                                           Style="{StaticResource TextblockItemStyle}">
                                      <Run Text="{Binding FileSize,Converter={conv:SizeUnitConverter}}"/>
                                      <Run Text="{Binding FileSize,Converter={conv:SizeToUnitNameConverter}}"/>
                                 </TextBlock>
@@ -144,7 +146,8 @@
                                 <!-- Send/receive date -->
                                 <TextBlock Grid.Row="2"
                                            Text="{Binding SendDate,Converter={conv:TimeToStringConverter}}"
-                                           Foreground="{StaticResource DarkGrayBrush}"/>
+                                           Foreground="{StaticResource DarkGrayBrush}"
+                                           Style="{StaticResource TextblockItemStyle}"/>
                             </StackPanel>
                         </Grid>
                     </Border>
diff --git a/Khernet.UI/Khernet.UI.Presentation/Resources/DataTemplates.xaml b/Khernet.UI/Khernet.UI.Presentation/Resources/DataTemplates.xaml
index 2878490..f1853ca 100644
--- a/Khernet.UI/Khernet.UI.Presentation/Resources/DataTemplates.xaml
+++ b/Khernet.UI/Khernet.UI.Presentation/Resources/DataTemplates.xaml
@@ -61,15 +61,14 @@
 
             <!--Background color profile-->
             <Border Width="32"
-                        Grid.Column="0"
-                        Grid.Row="1"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Top"
-                        Background="{Binding User.ColorHex, Converter={conv:StringRGBToColorConverter}}"
-                        Margin="0 0 10 0"
-                        
-                        Height="{Binding ActualWidth,RelativeSource={RelativeSource Self}}"
-                        CornerRadius="{Binding ActualWidth,RelativeSource={RelativeSource Self}}">
+                    Grid.Column="0"
+                    Grid.Row="1"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top"
+                    Background="{Binding User.ColorHex, Converter={conv:StringRGBToColorConverter}}"
+                    Margin="0 0 10 0"
+                    Height="{Binding ActualWidth,RelativeSource={RelativeSource Self}}"
+                    CornerRadius="{Binding ActualWidth,RelativeSource={RelativeSource Self}}">
                 <Border.Visibility>
                     <MultiBinding Converter="{conv:SentByMeToVisibilityMultiConverter}">
                         <Binding Path="IsSentByMe"/>
@@ -79,11 +78,9 @@
 
                 <!--Initials-->
                 <TextBlock Text="{Binding User.Initials}"
-                               HorizontalAlignment="Center"
-                               VerticalAlignment="Center"
-                               Foreground="{StaticResource LightBrush}"
-                           >
-                </TextBlock>
+                           HorizontalAlignment="Center"
+                           VerticalAlignment="Center"
+                           Foreground="{StaticResource LightBrush}"/>
             </Border>
 
             <!--Avatar image-->
@@ -105,10 +102,10 @@
 
             <!-- Upper anchor -->
             <Path Grid.Column="1" 
-                      Data="{Binding IsSentByMe,Converter={conv:SentByMeToPathDataConverter},ConverterParameter=upperAnchor}" 
-                      Margin="0" 
-                      StrokeThickness="1"
-                      Grid.Row="0"
+                  Data="{Binding IsSentByMe,Converter={conv:SentByMeToPathDataConverter},ConverterParameter=upperAnchor}" 
+                  Margin="0" 
+                  StrokeThickness="1"
+                  Grid.Row="0"
                   VerticalAlignment="Bottom">
                 <Path.Stroke>
                     <MultiBinding Converter="{conv:ChatStateToBrushMultiConverter}" ConverterParameter="Id1">
@@ -120,13 +117,13 @@
 
             <!-- Vertical line -->
             <Path Grid.Column="1" 
-                      Data="M0,0 L0,1" 
-                      Fill="#FFF4F4F5" 
-                      Margin="0 -1 0 -1" 
-                      StrokeThickness="1"
-                      Grid.Row="1" 
-                      Stretch="Fill"
-                      HorizontalAlignment="{Binding IsSentByMe,Converter={conv:SentByMeToAligment}}">
+                  Data="M0,0 L0,1" 
+                  Fill="#FFF4F4F5" 
+                  Margin="0 -1 0 -1" 
+                  StrokeThickness="1"
+                  Grid.Row="1" 
+                  Stretch="Fill"
+                  HorizontalAlignment="{Binding IsSentByMe,Converter={conv:SentByMeToAligment}}">
                 <Path.Stroke>
                     <MultiBinding Converter="{conv:ChatStateToBrushMultiConverter}" ConverterParameter="Id2">
                         <Binding Path="IsSentByMe"/>
@@ -170,10 +167,10 @@
 
             <!-- Bottom anchor -->
             <Path Grid.Column="1" 
-                      Data="{Binding IsSentByMe,Converter={conv:SentByMeToPathDataConverter},ConverterParameter=bottomAnchor}" 
-                      Margin="0" 
-                      StrokeThickness="1"
-                      Grid.Row="2" >
+                  Data="{Binding IsSentByMe,Converter={conv:SentByMeToPathDataConverter},ConverterParameter=bottomAnchor}" 
+                  Margin="0" 
+                  StrokeThickness="1"
+                  Grid.Row="2" >
                 <Path.Stroke>
                     <MultiBinding Converter="{conv:ChatStateToBrushMultiConverter}" ConverterParameter="Id3">
                         <Binding Path="IsSentByMe"/>
diff --git a/Khernet.UI/Khernet.UI.Presentation/Resources/ObjectModels.xaml b/Khernet.UI/Khernet.UI.Presentation/Resources/ObjectModels.xaml
index f3aa505..dcd38bd 100644
--- a/Khernet.UI/Khernet.UI.Presentation/Resources/ObjectModels.xaml
+++ b/Khernet.UI/Khernet.UI.Presentation/Resources/ObjectModels.xaml
@@ -2,7 +2,9 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Khernet.UI"
                     xmlns:tb="http://www.hardcodet.net/taskbar"
-                    xmlns:ucontrols="clr-namespace:Khernet.UI.Controls">
+                    xmlns:ucontrols="clr-namespace:Khernet.UI.Controls"
+                    xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
+                    >
     
     <!--Default image-->
     <BitmapImage UriSource="pack://application:,,,/Khernet.UI.Container;component/blank.png" x:Key="DefaultImage"/>
@@ -22,8 +24,14 @@
     <!--Emoji list view model-->
     <local:EmojiListCollection x:Key="emojiLightList"/>
 
-        <!--Context meny for taskbar notify icon-->
-    <ContextMenu x:Shared="false" x:Key="SysTrayMenu">
+    <Style x:Key="{x:Type ContextMenu}" TargetType="ContextMenu" BasedOn="{StaticResource MetroContextMenu}">
+        <Setter Property="FontFamily" Value="{StaticResource RobotoRegularFont}"/>
+        <Setter Property="FontSize" Value="{StaticResource RegularFontSize}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BlueBrush}"/>
+    </Style>
+
+    <!--Context meny for taskbar notify icon-->
+    <ContextMenu x:Shared="false" x:Key="SysTrayMenu" >
         <MenuItem Header="Show Window" Command="{Binding ShowWindowCommand}" />
         <MenuItem Header="Hide Window" Command="{Binding HideWindowCommand}" />
         <Separator />
@@ -44,35 +52,41 @@
 
     </tb:TaskbarIcon>
 
+    <ContextMenu x:Key="textboxContextMenu" >
+        <MenuItem Command="ApplicationCommands.Cut"/>
+        <MenuItem Command="ApplicationCommands.Copy"/>
+        <MenuItem Command="ApplicationCommands.Paste"/>
+    </ContextMenu>
+
     <!--Context menu for text messages-->
-    <ContextMenu x:Key="messageContextMenu">
+    <ContextMenu x:Key="messageContextMenu" >
         <MenuItem Header="Reply" Command="{Binding ReplyCommand}"/>
         <MenuItem Header="Resend" Command="{Binding ResendCommand}"/>
-        <MenuItem Command="ApplicationCommands.Cut" Style="{DynamicResource MetroMenuItem}" />
-        <MenuItem Command="ApplicationCommands.Copy" Style="{DynamicResource MetroMenuItem}" />
-        <MenuItem Command="ApplicationCommands.Paste" Style="{DynamicResource MetroMenuItem}" />
+        <MenuItem Command="ApplicationCommands.Cut"/>
+        <MenuItem Command="ApplicationCommands.Copy"/>
+        <MenuItem Command="ApplicationCommands.Paste"/>
     </ContextMenu>
 
     <!--Context menu for markdown messages-->
-    <ContextMenu x:Key="markdownContextMenu">
+    <ContextMenu x:Key="markdownContextMenu" >
         <MenuItem Header="Reply" Command="{Binding ReplyCommand}"/>
         <MenuItem Header="Resend" Command="{Binding ResendCommand}"/>
-        <MenuItem Command="ApplicationCommands.Cut" Style="{DynamicResource MetroMenuItem}" />
-        <MenuItem Command="ApplicationCommands.Copy" Style="{DynamicResource MetroMenuItem}" />
-        <MenuItem Command="ApplicationCommands.Paste" Style="{DynamicResource MetroMenuItem}" />
+        <MenuItem Command="ApplicationCommands.Cut"/>
+        <MenuItem Command="ApplicationCommands.Copy"/>
+        <MenuItem Command="ApplicationCommands.Paste"/>
         <MenuItem Header="Save as Markdown" Command="{Binding SaveMarkdownSourceCommand}" />
         <MenuItem Header="Save as HTML" Command="{Binding SaveHtmlSourceCommand}" />
     </ContextMenu>
 
     <!--Context menu for file messages-->
-    <ContextMenu x:Key="fileMessageContextMenu">
+    <ContextMenu x:Key="fileMessageContextMenu" >
         <MenuItem Header="Reply" Command="{Binding ReplyCommand}"/>
         <MenuItem Header="Resend" Command="{Binding ResendCommand}"/>
         <MenuItem Header="Save as..." Command="{Binding SaveCommand}"/>
     </ContextMenu>
 
     <!--Context menu for animation messages-->
-    <ContextMenu x:Key="animationMessageContextMenu">
+    <ContextMenu x:Key="animationMessageContextMenu" >
         <MenuItem Header="Reply" Command="{Binding ReplyCommand}"/>
         <MenuItem Header="Resend" Command="{Binding ResendCommand}"/>
         <MenuItem Header="Add GIF to gallery" Command="{Binding SaveAnimationCommand}"/>
diff --git a/Khernet.UI/Khernet.UI.Presentation/Styles/Buttons.xaml b/Khernet.UI/Khernet.UI.Presentation/Styles/Buttons.xaml
index 307c7eb..5235502 100644
--- a/Khernet.UI/Khernet.UI.Presentation/Styles/Buttons.xaml
+++ b/Khernet.UI/Khernet.UI.Presentation/Styles/Buttons.xaml
@@ -7,142 +7,7 @@
                     xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls" 
                     xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks">
 
-    <SolidColorBrush x:Key="OverBlueButton" Color="#0072f2"/>
-    <SolidColorBrush x:Key="BlueMainButton" Color="#0366d6"/>
-    <SolidColorBrush x:Key="ProgressRingbackgroud" Color="#ffffff"/>
-
-
-    <Style x:Key="ButtonStyle1" TargetType="{x:Type Button}" BasedOn="{StaticResource MahApps.Metro.Styles.MetroButton}">
-        <Setter Property="Background" Value="{DynamicResource BlueMainButton}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderBrush}"/>
-        <Setter Property="Foreground" Value="White" />
-        <Setter Property="Controls:ControlsHelper.CornerRadius" Value="3" />
-        <Setter Property="Margin" Value="7"/>
-
-        <Setter Property="depend:IsBusyProperty.Value" Value="False"/>
-
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Button}">
-                    <Grid>
-                        <Border 
-                                x:Name="Border" 
-                                BorderBrush="{TemplateBinding BorderBrush}" 
-                                BorderThickness="{TemplateBinding BorderThickness}" 
-                                Background="{TemplateBinding Background}" 
-                                CornerRadius="{Binding (Controls:ControlsHelper.CornerRadius), Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" 
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        <Border 
-                                x:Name="DisabledVisualElement" 
-                                Background="{DynamicResource ControlsDisabledBrush}" 
-                                CornerRadius="{Binding (Controls:ControlsHelper.CornerRadius), Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" 
-                                IsHitTestVisible="False" 
-                                Opacity="0" 
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        <Controls:ProgressRing 
-                            Width="20" 
-                            Height="20" 
-                            IsActive="True" 
-                            HorizontalAlignment="Left" 
-                            Margin="3 0 0 0" 
-                            Visibility="{Binding (depend:IsBusyProperty.Value),RelativeSource={RelativeSource TemplatedParent},Converter={conv:BoolToVisibilityConverter}}"
-                            Foreground="{StaticResource ProgressRingbackgroud}"></Controls:ProgressRing>
-                        <Controls:ContentControlEx 
-                                x:Name="PART_ContentPresenter"
-                                ContentCharacterCasing="{Binding (Controls:ControlsHelper.ContentCharacterCasing), RelativeSource={RelativeSource TemplatedParent}}" 
-                                ContentTemplate="{TemplateBinding ContentTemplate}" 
-                                Content="{TemplateBinding Content}" 
-                                ContentStringFormat="{TemplateBinding ContentStringFormat}" 
-                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" 
-                                Margin="{TemplateBinding BorderThickness}" 
-                                Padding="{TemplateBinding Padding}" 
-                                RecognizesAccessKey="True" 
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" 
-                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" TargetName="Border" Value="{DynamicResource OverBlueButton}"/>
-                        </Trigger>
-                        <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="Background" TargetName="Border" Value="{DynamicResource BlueMainButton}"/>
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Opacity" TargetName="DisabledVisualElement" Value="0.7"/>
-                            <Setter Property="Opacity" TargetName="PART_ContentPresenter" Value="0.3"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="ButtonStyleTurquoise" TargetType="{x:Type Button}" BasedOn="{StaticResource MahApps.Metro.Styles.MetroButton}">
-        <Setter Property="Background" Value="{DynamicResource TurquoiseBrush}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource TurquoiseBrush}"/>
-        <Setter Property="Foreground" Value="White" />
-        <Setter Property="Controls:ControlsHelper.CornerRadius" Value="3" />
-        <Setter Property="Margin" Value="7"/>
-
-        <Setter Property="depend:IsBusyProperty.Value" Value="False"/>
-
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Button}">
-                    <Grid>
-                        <Border 
-                                x:Name="Border" 
-                                BorderBrush="{TemplateBinding BorderBrush}" 
-                                BorderThickness="{TemplateBinding BorderThickness}" 
-                                Background="{TemplateBinding Background}" 
-                                CornerRadius="{Binding (Controls:ControlsHelper.CornerRadius), Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" 
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        <Border 
-                                x:Name="DisabledVisualElement" 
-                                Background="{DynamicResource ControlsDisabledBrush}" 
-                                CornerRadius="{Binding (Controls:ControlsHelper.CornerRadius), Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" 
-                                IsHitTestVisible="False" 
-                                Opacity="0" 
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        <Controls:ProgressRing 
-                            Width="20" 
-                            Height="20" 
-                            IsActive="True" 
-                            HorizontalAlignment="Left" 
-                            Margin="3 0 0 0" 
-                            Visibility="{Binding (depend:IsBusyProperty.Value),RelativeSource={RelativeSource TemplatedParent},Converter={conv:BoolToVisibilityConverter}}"
-                            Foreground="{StaticResource ProgressRingbackgroud}"></Controls:ProgressRing>
-                        <Controls:ContentControlEx 
-                                x:Name="PART_ContentPresenter"
-                                ContentCharacterCasing="{Binding (Controls:ControlsHelper.ContentCharacterCasing), RelativeSource={RelativeSource TemplatedParent}}" 
-                                ContentTemplate="{TemplateBinding ContentTemplate}" 
-                                Content="{TemplateBinding Content}" 
-                                ContentStringFormat="{TemplateBinding ContentStringFormat}" 
-                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" 
-                                Margin="{TemplateBinding BorderThickness}" 
-                                Padding="{TemplateBinding Padding}" 
-                                RecognizesAccessKey="True" 
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" 
-                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" TargetName="Border" Value="{DynamicResource LightTurquoiseBrush}"/>
-                        </Trigger>
-                        <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="Background" TargetName="Border" Value="{DynamicResource DarkTurquoiseBrush}"/>
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Opacity" TargetName="DisabledVisualElement" Value="0.7"/>
-                            <Setter Property="Opacity" TargetName="PART_ContentPresenter" Value="0.3"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="ButtonStyle2" TargetType="{x:Type Button}">
+    <Style x:Key="GlowButtonStyle" TargetType="{x:Type Button}">
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="BorderBrush" Value="{DynamicResource GrayBrush3}"/>
         <Setter Property="BorderThickness" Value="0"/>
@@ -493,4 +358,233 @@
             </Trigger>
         </Style.Triggers>
     </Style>
+
+    <Style x:Key="HexagonalButtonStyle" TargetType="{x:Type Button}">
+        <Setter Property="FocusVisualStyle">
+            <Setter.Value>
+                <Style>
+                    <Setter Property="Control.Template">
+                        <Setter.Value>
+                            <ControlTemplate>
+                                <Rectangle Margin="2" SnapsToDevicePixels="True"
+                                           StrokeThickness="1" 
+                                           StrokeDashArray="1 2"/>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </Style>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Background" Value="#4A86E8"/>
+        <Setter Property="Foreground" Value="White"/>
+        <Setter Property="FontFamily" Value="{StaticResource RobotoBoldFont}"/>
+        <Setter Property="FontSize" Value="{StaticResource RegularFontSize}"/>
+        <Setter Property="Height" Value="30"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Upper" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Border x:Name="border" 
+                                SnapsToDevicePixels="True">
+                        <Grid>
+
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                            </Grid.RowDefinitions>
+
+                            <!-- Main button shape -->
+                            <Polygon Grid.Row="0"
+                                     Grid.RowSpan="2"
+                                     Name="polygonBorder"
+                                     StrokeThickness="0"
+                                     StrokeLineJoin="Round"
+                                     Stretch="Uniform" 
+                                     Margin="0,0,0,0" 
+                                     Fill="{TemplateBinding Background}"
+                                     VerticalAlignment="Center">
+
+                                <Polygon.Effect>
+                                    <DropShadowEffect BlurRadius="2" 
+                                                      Color="#4A86E8"
+                                                      ShadowDepth="0"
+                                                      Opacity="1"/>
+                                </Polygon.Effect>
+
+                                <Polygon.Points>
+                                    <MultiBinding Converter="{conv:ButtonShapeMultiConverter}">
+                                        <Binding Path="ActualWidth" ElementName="border"/>
+                                        <Binding Path="ActualHeight" ElementName="border"/>
+                                    </MultiBinding>
+                                </Polygon.Points>
+                            </Polygon>
+
+                            <!-- Shine shape -->
+                            <Polygon Grid.Row="0"
+                                     Name="polygonShineBorder"
+                                     StrokeThickness="0"
+                                     StrokeLineJoin="Round"
+                                     Stretch="Uniform" 
+                                     Margin="0,0,0,0" 
+                                     Fill="White"
+                                     Opacity="0.03"
+                                     VerticalAlignment="Top">
+                                <Polygon.Points>
+                                    <MultiBinding Converter="{conv:ButtonShineMultiConverter}">
+                                        <Binding Path="ActualWidth" ElementName="border"/>
+                                        <Binding Path="ActualHeight" ElementName="border"/>
+                                    </MultiBinding>
+                                </Polygon.Points>
+                            </Polygon>
+
+                            <Controls:ProgressRing Grid.RowSpan="2"
+                                                   Width="20" 
+                                                   Height="20" 
+                                                   IsActive="True" 
+                                                   HorizontalAlignment="Left" 
+                                                   VerticalAlignment="Center"
+                                                   Margin="7 0 0 0" 
+                                                   Visibility="{Binding (depend:IsBusyProperty.Value),
+                                                                RelativeSource={RelativeSource TemplatedParent},
+                                                                Converter={conv:BoolToVisibilityConverter},
+                                                                TargetNullValue=Collapsed,
+                                                                FallbackValue=Collapsed}"
+                                                   Foreground="{StaticResource ProgressRingbackgroud}"></Controls:ProgressRing>
+
+                            <!-- Button content -->
+                            <ContentPresenter Grid.Row="0"
+                                              Grid.RowSpan="2"
+                                              x:Name="contentPresenter" 
+                                              ContentTemplate="{TemplateBinding ContentTemplate}" 
+                                              Content="{TemplateBinding Content}" 
+                                              ContentStringFormat="{TemplateBinding ContentStringFormat}" 
+                                              Focusable="False" 
+                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" 
+                                              Margin="{TemplateBinding Padding}" 
+                                              RecognizesAccessKey="True" 
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" 
+                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsDefaulted" Value="True">
+                            <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Fill" TargetName="polygonBorder" Value="#4189ff"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter Property="Fill" TargetName="polygonBorder" Value="#2d75eb"/>
+                        </Trigger>
+                        <Trigger Property="ToggleButton.IsChecked" Value="True">
+                            <Setter Property="Background" TargetName="border" Value="#FFBCDDEE"/>
+                            <Setter Property="BorderBrush" TargetName="border" Value="#FF245A83"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Fill" TargetName="polygonBorder" Value="#8bafea"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="LightHexagonalButtonStyle" TargetType="{x:Type Button}">
+        <Setter Property="FocusVisualStyle">
+            <Setter.Value>
+                <Style>
+                    <Setter Property="Control.Template">
+                        <Setter.Value>
+                            <ControlTemplate>
+                                <Rectangle Margin="2" SnapsToDevicePixels="True" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" StrokeThickness="1" StrokeDashArray="1 2"/>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </Style>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="#4A86E8"/>
+        <Setter Property="FontFamily" Value="{StaticResource RobotoBoldFont}"/>
+        <Setter Property="FontSize" Value="{StaticResource RegularFontSize}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Height" Value="30"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Upper" />
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Border x:Name="border" 
+                            SnapsToDevicePixels="True">
+                        <Grid>
+
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                            </Grid.RowDefinitions>
+
+                            <!-- Main button shape -->
+                            <Polygon Grid.Row="0"
+                                     Grid.RowSpan="2"
+                                     Name="polygonBorder"
+                                     StrokeThickness="1"
+                                     Stroke="#cccccc"
+                                     StrokeLineJoin="Round"
+                                     Stretch="Uniform" 
+                                     Margin="0" 
+                                     Fill="{TemplateBinding Background}"
+                                     VerticalAlignment="Center">
+
+                                <Polygon.Points>
+                                    <MultiBinding Converter="{conv:ButtonShapeMultiConverter}">
+                                        <Binding Path="ActualWidth" ElementName="border"/>
+                                        <Binding Path="ActualHeight" ElementName="border"/>
+                                    </MultiBinding>
+                                </Polygon.Points>
+                            </Polygon>
+
+                            <!-- Button content -->
+                            <ContentPresenter Grid.Row="0"
+                                              Grid.RowSpan="2"
+                                              x:Name="contentPresenter" 
+                                              ContentTemplate="{TemplateBinding ContentTemplate}" 
+                                              Content="{TemplateBinding Content}" 
+                                              ContentStringFormat="{TemplateBinding ContentStringFormat}" 
+                                              Focusable="False" 
+                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" 
+                                              Margin="{TemplateBinding Padding}" 
+                                              RecognizesAccessKey="True" 
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" 
+                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsDefaulted" Value="True">
+                            <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Fill" TargetName="polygonBorder" Value="#fbfdff"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter Property="Fill" TargetName="polygonBorder" Value="#eef3fd"/>
+                        </Trigger>
+                        <Trigger Property="ToggleButton.IsChecked" Value="True">
+                            <Setter Property="Background" TargetName="border" Value="#FFBCDDEE"/>
+                            <Setter Property="BorderBrush" TargetName="border" Value="#FF245A83"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Stroke" TargetName="polygonBorder" Value="{StaticResource LightGrayAnchorBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Khernet.UI/Khernet.UI.Presentation/Styles/Colors.xaml b/Khernet.UI/Khernet.UI.Presentation/Styles/Colors.xaml
index a36dc95..cf1bfdf 100644
--- a/Khernet.UI/Khernet.UI.Presentation/Styles/Colors.xaml
+++ b/Khernet.UI/Khernet.UI.Presentation/Styles/Colors.xaml
@@ -3,6 +3,11 @@
                     >
 
     <!--Color an brushes must be especified ordered: fisrt Color then Brush-->
+
+    <SolidColorBrush x:Key="OverBlueButton" Color="#0072f2"/>
+    <SolidColorBrush x:Key="BlueMainButton" Color="#0366d6"/>
+    <SolidColorBrush x:Key="ProgressRingbackgroud" Color="#ffffff"/>
+    
     <Color x:Key="LightColor">#ffffff</Color>
     <SolidColorBrush x:Key="LightBrush" Color="{StaticResource LightColor}"/>
 
diff --git a/Khernet.UI/Khernet.UI.Presentation/Styles/ListBoxStyles.xaml b/Khernet.UI/Khernet.UI.Presentation/Styles/ListBoxStyles.xaml
index 1d7a8ec..1891c69 100644
--- a/Khernet.UI/Khernet.UI.Presentation/Styles/ListBoxStyles.xaml
+++ b/Khernet.UI/Khernet.UI.Presentation/Styles/ListBoxStyles.xaml
@@ -121,6 +121,7 @@
             <!-- Number of files -->
             <TextBlock Grid.Row="0" 
                        Foreground="{StaticResource DarkGrayBrush}"
+                       FontFamily="{StaticResource RobotoRegularFont}"
                        Visibility="{Binding IsLoading,Converter={conv:InverseBoolToVisibilityConverter}}"
                        Padding="20 0 0 10">
                 <Run Text="{Binding ItemsCount}"/>
diff --git a/Khernet.UI/Khernet.UI.Presentation/Styles/Textblocks.xaml b/Khernet.UI/Khernet.UI.Presentation/Styles/Textblocks.xaml
index 2cc359a..34cc106 100644
--- a/Khernet.UI/Khernet.UI.Presentation/Styles/Textblocks.xaml
+++ b/Khernet.UI/Khernet.UI.Presentation/Styles/Textblocks.xaml
@@ -1,11 +1,11 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:ucontrols="clr-namespace:Khernet.UI.Controls"
-                    >
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <Style  x:Key="{x:Type TextBlock}" TargetType="TextBlock">
+    <Style  x:Key="{x:Type ToolTip}" TargetType="ToolTip">
         <Setter Property="FontFamily" Value="{StaticResource RobotoRegularFont}"/>
         <Setter Property="FontSize" Value="{StaticResource RegularFontSize}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource TextBoxBackgroundBrush}"/>
+        <Setter Property="Background" Value="{StaticResource LightBrush}"/>
     </Style>
 
     <Style x:Key="TextblockStyle" TargetType="TextBlock">
@@ -15,6 +15,11 @@
         <Setter Property="Margin" Value="0 5 0 5"/>
     </Style>
 
+    <Style x:Key="TextblockItemStyle" TargetType="TextBlock">
+        <Setter Property="FontFamily" Value="{StaticResource RobotoRegularFont}"/>
+        <Setter Property="FontSize" Value="{StaticResource RegularFontSize}"/>
+    </Style>
+
     <Style x:Key="TextblockHeader" TargetType="TextBlock">
         <Setter Property="Foreground" Value="#777777"/>
         <Setter Property="FontFamily" Value="{StaticResource RobotoMediumFont}"/>
@@ -39,13 +44,7 @@
         <Setter Property="Foreground" Value="{StaticResource MediumBlueBrush}"/>
     </Style>
 
-    <Style TargetType="ucontrols:SelectableTextBlock">
-        <Setter Property="FontFamily" Value="{StaticResource RobotoRegularFont}"/>
-        <Setter Property="FontSize" Value="{StaticResource RegularFontSize}"/>
-    </Style>
-
     <Style x:Key="TimeTextBlock" TargetType="TextBlock">
-
         <Setter Property="Foreground" Value="{StaticResource LightBrush}"/>
         <Setter Property="FontSize" Value="{StaticResource RegularFontSize}"/>
     </Style>
diff --git a/Khernet.UI/Khernet.UI.Presentation/Styles/Textboxes.xaml b/Khernet.UI/Khernet.UI.Presentation/Styles/Textboxes.xaml
index fe3251c..8a33a78 100644
--- a/Khernet.UI/Khernet.UI.Presentation/Styles/Textboxes.xaml
+++ b/Khernet.UI/Khernet.UI.Presentation/Styles/Textboxes.xaml
@@ -4,968 +4,29 @@
                     xmlns:converters="clr-namespace:MahApps.Metro.Converters;assembly=MahApps.Metro"
                     xmlns:ucontrols="clr-namespace:Khernet.UI.Controls">
 
-    <Style x:Key="TextStyle2" TargetType="TextBox" BasedOn="{StaticResource MetroTextBox}">
-        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource FocusedTextboxBrush}"/>
-        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource OverTextboxBorderBrush}"/>
-        <Setter Property="Controls:ControlsHelper.CornerRadius" Value="8"/>
-        <Setter Property="FontFamily" Value="{StaticResource RobotoRegularFont}"/>
-        <Setter Property="FontSize" Value="{StaticResource RegularFontSize}"/>
-    </Style>
-
-    <Style x:Key="PasswordStyle" TargetType="PasswordBox" BasedOn="{StaticResource MetroPasswordBox}">
-        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource FocusedTextboxBrush}"/>
-        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource OverTextboxBorderBrush}"/>
-        <Setter Property="Controls:ControlsHelper.CornerRadius" Value="0" />
-        <Setter Property="Margin" Value="0 5 0 5"/>
-    </Style>
-
-    <Style x:Key="txtStyle1" TargetType="TextBox" BasedOn="{StaticResource SearchMetroTextBox}">
-        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource FocusedTextboxBrush}"/>
-        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource OverTextboxBorderBrush}"/>
-        <Setter Property="Controls:ControlsHelper.CornerRadius" Value="1" />
-        <Setter Property="FontFamily" Value="{StaticResource RobotoRegularFont}"/>
-        <Setter Property="Margin" Value="4"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type TextBox}">
-                    <ControlTemplate.Resources>
-                        <Storyboard x:Key="enterGotFocus">
-                            <DoubleAnimation Duration="0:0:0.2" To="0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                        </Storyboard>
-                        <Storyboard x:Key="exitGotFocus">
-                            <DoubleAnimation Duration="0:0:0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                        </Storyboard>
-                        <Storyboard x:Key="enterHasText">
-                            <DoubleAnimation Duration="0:0:0.2" From="0.2" To="0" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                        </Storyboard>
-                        <Storyboard x:Key="exitHasText">
-                            <DoubleAnimation Duration="0:0:0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                        </Storyboard>
-                    </ControlTemplate.Resources>
-                    <Grid>
-                        <AdornerDecorator x:Name="PART_WaitingForDataEffectAdornerDecorator" Visibility="Collapsed">
-                            <Border 
-                            x:Name="PART_WaitingForDataEffectGrid" 
-                            BorderBrush="Transparent" 
-                            BorderThickness="{TemplateBinding BorderThickness}" 
-                            Background="{TemplateBinding Background}" 
-                            Effect="{DynamicResource WaitingForDataEffect}" 
-                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                            CornerRadius="10"/>
-                        </AdornerDecorator>
-                        <Border 
-                        x:Name="Base" 
-                        BorderBrush="{TemplateBinding BorderBrush}" 
-                        BorderThickness="{TemplateBinding BorderThickness}" 
-                        Background="{TemplateBinding Background}" 
-                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" 
-                        CornerRadius="{Binding (Controls:ControlsHelper.CornerRadius),Mode=OneWay,RelativeSource={RelativeSource TemplatedParent}}"/>
-                        <Grid x:Name="PART_InnerGrid" Margin="6,2,2,2">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition x:Name="TextColumn" Width="*"/>
-                                <ColumnDefinition x:Name="ButtonColumn" Width="Auto"/>
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition x:Name="ButtonRow" Height="*"/>
-                            </Grid.RowDefinitions>
-                            <ScrollViewer x:Name="PART_ContentHost" BorderThickness="0" Background="{x:Null}" Grid.Column="0" IsTabStop="False" Margin="2" Grid.Row="1" VerticalAlignment="Stretch"/>
-                            <TextBlock x:Name="PART_Message" Grid.Column="0" Foreground="{TemplateBinding Foreground}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="6,2" Padding="{TemplateBinding Padding}" Grid.Row="1" Style="{DynamicResource MahApps.Metro.Styles.MetroWatermarkTextBlock}" TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}" TextWrapping="{TemplateBinding Controls:TextBoxHelper.WatermarkWrapping}" Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}" Visibility="Collapsed" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                            <ContentControl x:Name="PART_FloatingMessageContainer" Grid.Column="0" Grid.Row="0" Style="{DynamicResource FloatingMessageContainerStyle}">
-                                <ContentControl.Height>
-                                    <MultiBinding Converter="{converters:MathMultiplyConverter}" UpdateSourceTrigger="Default">
-                                        <Binding ElementName="PART_FloatingMessage" Mode="OneWay" Path="ActualHeight"/>
-                                        <Binding ElementName="PART_FloatingMessageContainer" Mode="OneWay" Path="Opacity"/>
-                                    </MultiBinding>
-                                </ContentControl.Height>
-                                <TextBlock x:Name="PART_FloatingMessage" Foreground="{TemplateBinding Foreground}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Style="{DynamicResource MetroAutoCollapsingTextBlock}" TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}" Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                                    <TextBlock.RenderTransform>
-                                        <TranslateTransform>
-                                            <TranslateTransform.Y>
-                                                <MultiBinding Converter="{converters:MathSubtractConverter}" UpdateSourceTrigger="Default">
-                                                    <Binding ElementName="PART_FloatingMessage" Mode="OneWay" Path="ActualHeight"/>
-                                                    <Binding ElementName="PART_FloatingMessageContainer" Mode="OneWay" Path="ActualHeight"/>
-                                                </MultiBinding>
-                                            </TranslateTransform.Y>
-                                        </TranslateTransform>
-                                    </TextBlock.RenderTransform>
-                                </TextBlock>
-                            </ContentControl>
-                            <Button x:Name="PART_ClearText" ContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}" Content="{TemplateBinding Controls:TextBoxHelper.ButtonContent}" Grid.Column="1" Foreground="{TemplateBinding Foreground}" Focusable="False" FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}" FontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}" IsTabStop="False" Controls:TextBoxHelper.IsClearTextButtonBehaviorEnabled="{Binding (Controls:TextBoxHelper.ClearTextButton), Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.RowSpan="2" Style="{DynamicResource ChromelessButtonStyle}" Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}">
-                                <Button.Visibility>
-                                    <Binding Mode="OneWay" Path="(Controls:TextBoxHelper.ClearTextButton)" RelativeSource="{RelativeSource TemplatedParent}">
-                                        <Binding.Converter>
-                                            <BooleanToVisibilityConverter/>
-                                        </Binding.Converter>
-                                    </Binding>
-                                </Button.Visibility>
-                            </Button>
-                        </Grid>
-                        <Border x:Name="DisabledVisualElement" BorderBrush="{DynamicResource ControlsDisabledBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{DynamicResource ControlsDisabledBrush}" IsHitTestVisible="False" Opacity="0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Visibility="{Binding (Controls:ControlsHelper.DisabledVisualElementVisibility), Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"/>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding (Controls:TextBoxHelper.ButtonsAlignment), RelativeSource={RelativeSource Self}}" Value="Left">
-                            <Setter Property="Width" TargetName="ButtonColumn" Value="*"/>
-                            <Setter Property="Grid.Column" TargetName="PART_ClearText" Value="0"/>
-                            <Setter Property="Grid.Column" TargetName="PART_ContentHost" Value="1"/>
-                            <Setter Property="Grid.Column" TargetName="PART_Message" Value="1"/>
-                            <Setter Property="Width" TargetName="TextColumn" Value="Auto"/>
-                        </DataTrigger>
-                        <DataTrigger Binding="{Binding Text, RelativeSource={RelativeSource Self}}" Value="">
-                            <Setter Property="Visibility" TargetName="PART_Message" Value="Visible"/>
-                        </DataTrigger>
-                        <MultiDataTrigger>
-                            <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding IsVisible, RelativeSource={RelativeSource Self}}" Value="True"/>
-                                <Condition Binding="{Binding (Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True"/>
-                                <Condition Binding="{Binding (Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True"/>
-                            </MultiDataTrigger.Conditions>
-                            <MultiDataTrigger.EnterActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="PART_FloatingMessageContainer">
-                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Visible</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <DoubleAnimation Duration="0:0:0.2" From="0" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_FloatingMessageContainer">
-                                            <DoubleAnimation.EasingFunction>
-                                                <ExponentialEase EasingMode="EaseInOut" Exponent="2"/>
-                                            </DoubleAnimation.EasingFunction>
-                                        </DoubleAnimation>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </MultiDataTrigger.EnterActions>
-                            <MultiDataTrigger.ExitActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0:0:0.2" From="1" To="0" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_FloatingMessageContainer">
-                                            <DoubleAnimation.EasingFunction>
-                                                <ExponentialEase EasingMode="EaseInOut" Exponent="2"/>
-                                            </DoubleAnimation.EasingFunction>
-                                        </DoubleAnimation>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="PART_FloatingMessageContainer">
-                                            <DiscreteObjectKeyFrame KeyTime="0:0:0.2">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Collapsed</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </MultiDataTrigger.ExitActions>
-                        </MultiDataTrigger>
-                        <MultiDataTrigger>
-                            <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding (Controls:TextBoxHelper.ButtonsAlignment), RelativeSource={RelativeSource Self}}" Value="Right"/>
-                                <Condition Binding="{Binding (Controls:TextBoxHelper.ClearTextButton), RelativeSource={RelativeSource Self}}" Value="False"/>
-                            </MultiDataTrigger.Conditions>
-                            <Setter Property="Grid.ColumnSpan" TargetName="PART_ContentHost" Value="2"/>
-                            <Setter Property="Grid.ColumnSpan" TargetName="PART_Message" Value="2"/>
-                        </MultiDataTrigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="BorderBrush" TargetName="Base" Value="{Binding (Controls:ControlsHelper.MouseOverBorderBrush), RelativeSource={RelativeSource TemplatedParent}}"/>
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Opacity" TargetName="DisabledVisualElement" Value="0.6"/>
-                        </Trigger>
-                        <Trigger Property="IsReadOnly" Value="True">
-                            <Setter Property="IsEnabled" TargetName="PART_ClearText" Value="False"/>
-                        </Trigger>
-                        <Trigger Property="IsFocused" Value="True">
-                            <Setter Property="BorderBrush" TargetName="Base" Value="{Binding (Controls:ControlsHelper.FocusBorderBrush), RelativeSource={RelativeSource TemplatedParent}}"/>
-                            <Setter Property="Foreground" TargetName="PART_FloatingMessage" Value="{DynamicResource AccentColorBrush}"/>
-                            <Setter Property="Opacity" TargetName="PART_FloatingMessage" Value="1"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" SourceName="PART_ClearText" Value="True">
-                            <Setter Property="Background" TargetName="PART_ClearText" Value="{DynamicResource GrayBrush8}"/>
-                            <Setter Property="Foreground" TargetName="PART_ClearText" Value="{DynamicResource AccentColorBrush}"/>
-                        </Trigger>
-                        <Trigger Property="IsPressed" SourceName="PART_ClearText" Value="True">
-                            <Setter Property="Background" TargetName="PART_ClearText" Value="{DynamicResource BlackBrush}"/>
-                            <Setter Property="Foreground" TargetName="PART_ClearText" Value="{DynamicResource WhiteBrush}"/>
-                        </Trigger>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="Controls:TextBoxHelper.HasText" Value="False"/>
-                                <Condition Property="IsFocused" Value="True"/>
-                            </MultiTrigger.Conditions>
-                            <MultiTrigger.EnterActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0:0:0.2" To="0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </MultiTrigger.EnterActions>
-                            <MultiTrigger.ExitActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0:0:0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </MultiTrigger.ExitActions>
-                        </MultiTrigger>
-                        <Trigger Property="Controls:TextBoxHelper.HasText" Value="True">
-                            <Trigger.EnterActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0:0:0.2" From="0.2" To="0" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </Trigger.EnterActions>
-                            <Trigger.ExitActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0:0:0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </Trigger.ExitActions>
-                        </Trigger>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="IsVisible" Value="True"/>
-                                <Condition Property="Controls:TextBoxHelper.IsWaitingForData" Value="True"/>
-                            </MultiTrigger.Conditions>
-                            <MultiTrigger.EnterActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <DoubleAnimation AutoReverse="True" Timeline.DesiredFrameRate="30" Duration="0:0:2" From="0" RepeatBehavior="Forever" To="1" Storyboard.TargetProperty="(Effect).Opacity" Storyboard.TargetName="PART_WaitingForDataEffectGrid"/>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </MultiTrigger.EnterActions>
-                            <Setter Property="Visibility" TargetName="PART_WaitingForDataEffectAdornerDecorator" Value="Visible"/>
-                        </MultiTrigger>
-                        <Trigger Property="Controls:TextBoxHelper.IsWaitingForData" Value="False">
-                            <Setter Property="Visibility" TargetName="PART_WaitingForDataEffectAdornerDecorator" Value="Collapsed"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="IconTextboxStyle" TargetType="TextBox" BasedOn="{StaticResource SearchMetroTextBox}">
-        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource FocusedTextboxBrush}"/>
+    <Style x:Key="EditTextBox" TargetType="TextBox">
+        <Setter Property="BorderThickness" Value="0 0 0 1"/>
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource OverTextboxBorderBrush}"/>
-        <Setter Property="Controls:ControlsHelper.CornerRadius" Value="13" />
-        <Setter Property="Margin" Value="4"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type TextBox}">
-                    <ControlTemplate.Resources>
-                        <Storyboard x:Key="enterGotFocus">
-                            <DoubleAnimation Duration="0:0:0.2" To="0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                        </Storyboard>
-                        <Storyboard x:Key="exitGotFocus">
-                            <DoubleAnimation Duration="0:0:0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                        </Storyboard>
-                        <Storyboard x:Key="enterHasText">
-                            <DoubleAnimation Duration="0:0:0.2" From="0.2" To="0" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                        </Storyboard>
-                        <Storyboard x:Key="exitHasText">
-                            <DoubleAnimation Duration="0:0:0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                        </Storyboard>
-                    </ControlTemplate.Resources>
-                    <Grid>
-                        <AdornerDecorator x:Name="PART_WaitingForDataEffectAdornerDecorator" Visibility="Collapsed">
-                            <Border 
-                            x:Name="PART_WaitingForDataEffectGrid" 
-                            BorderBrush="Transparent" 
-                            BorderThickness="{TemplateBinding BorderThickness}" 
-                            Background="{TemplateBinding Background}" 
-                            Effect="{DynamicResource WaitingForDataEffect}" 
-                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                            CornerRadius="10"/>
-                        </AdornerDecorator>
-                        <Border 
-                        x:Name="Base" 
-                        BorderBrush="{TemplateBinding BorderBrush}" 
-                        BorderThickness="{TemplateBinding BorderThickness}" 
-                        Background="{TemplateBinding Background}" 
-                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" 
-                        CornerRadius="{Binding (Controls:ControlsHelper.CornerRadius),Mode=OneWay,RelativeSource={RelativeSource TemplatedParent}}"/>
-                        <Grid x:Name="PART_InnerGrid" Margin="6,2,2,2">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition x:Name="TextColumn" Width="*"/>
-                                <ColumnDefinition x:Name="ButtonColumn" Width="Auto"/>
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition x:Name="ButtonRow" Height="*"/>
-                            </Grid.RowDefinitions>
-                            <ScrollViewer x:Name="PART_ContentHost" BorderThickness="0" Background="{x:Null}" Grid.Column="0" IsTabStop="False" Margin="2" Grid.Row="1" VerticalAlignment="Stretch"/>
-                            <TextBlock x:Name="PART_Message" Grid.Column="0" Foreground="{TemplateBinding Foreground}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="6,2" Padding="{TemplateBinding Padding}" Grid.Row="1" Style="{DynamicResource MahApps.Metro.Styles.MetroWatermarkTextBlock}" TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}" TextWrapping="{TemplateBinding Controls:TextBoxHelper.WatermarkWrapping}" Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}" Visibility="Collapsed" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                            <ContentControl x:Name="PART_FloatingMessageContainer" Grid.Column="0" Grid.Row="0" Style="{DynamicResource FloatingMessageContainerStyle}">
-                                <ContentControl.Height>
-                                    <MultiBinding Converter="{converters:MathMultiplyConverter}" UpdateSourceTrigger="Default">
-                                        <Binding ElementName="PART_FloatingMessage" Mode="OneWay" Path="ActualHeight"/>
-                                        <Binding ElementName="PART_FloatingMessageContainer" Mode="OneWay" Path="Opacity"/>
-                                    </MultiBinding>
-                                </ContentControl.Height>
-                                <TextBlock x:Name="PART_FloatingMessage" Foreground="{TemplateBinding Foreground}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Style="{DynamicResource MetroAutoCollapsingTextBlock}" TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}" Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                                    <TextBlock.RenderTransform>
-                                        <TranslateTransform>
-                                            <TranslateTransform.Y>
-                                                <MultiBinding Converter="{converters:MathSubtractConverter}" UpdateSourceTrigger="Default">
-                                                    <Binding ElementName="PART_FloatingMessage" Mode="OneWay" Path="ActualHeight"/>
-                                                    <Binding ElementName="PART_FloatingMessageContainer" Mode="OneWay" Path="ActualHeight"/>
-                                                </MultiBinding>
-                                            </TranslateTransform.Y>
-                                        </TranslateTransform>
-                                    </TextBlock.RenderTransform>
-                                </TextBlock>
-                            </ContentControl>
-                            <Button x:Name="PART_ClearText" ContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}" Content="{TemplateBinding Controls:TextBoxHelper.ButtonContent}" Grid.Column="1" Foreground="{TemplateBinding Foreground}" Focusable="False" FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}" FontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}" IsTabStop="False" Controls:TextBoxHelper.IsClearTextButtonBehaviorEnabled="{Binding (Controls:TextBoxHelper.ClearTextButton), Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.RowSpan="2" Style="{DynamicResource ChromelessButtonStyle}" Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}">
-                                <Button.Visibility>
-                                    <Binding Mode="OneWay" Path="(Controls:TextBoxHelper.ClearTextButton)" RelativeSource="{RelativeSource TemplatedParent}">
-                                        <Binding.Converter>
-                                            <BooleanToVisibilityConverter/>
-                                        </Binding.Converter>
-                                    </Binding>
-                                </Button.Visibility>
-                            </Button>
-                        </Grid>
-                        <Border x:Name="DisabledVisualElement" BorderBrush="{DynamicResource ControlsDisabledBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{DynamicResource ControlsDisabledBrush}" IsHitTestVisible="False" Opacity="0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Visibility="{Binding (Controls:ControlsHelper.DisabledVisualElementVisibility), Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"/>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding (Controls:TextBoxHelper.ButtonsAlignment), RelativeSource={RelativeSource Self}}" Value="Left">
-                            <Setter Property="Width" TargetName="ButtonColumn" Value="*"/>
-                            <Setter Property="Grid.Column" TargetName="PART_ClearText" Value="0"/>
-                            <Setter Property="Grid.Column" TargetName="PART_ContentHost" Value="1"/>
-                            <Setter Property="Grid.Column" TargetName="PART_Message" Value="1"/>
-                            <Setter Property="Width" TargetName="TextColumn" Value="Auto"/>
-                        </DataTrigger>
-                        <DataTrigger Binding="{Binding Text, RelativeSource={RelativeSource Self}}" Value="">
-                            <Setter Property="Visibility" TargetName="PART_Message" Value="Visible"/>
-                        </DataTrigger>
-                        <MultiDataTrigger>
-                            <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding IsVisible, RelativeSource={RelativeSource Self}}" Value="True"/>
-                                <Condition Binding="{Binding (Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True"/>
-                                <Condition Binding="{Binding (Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True"/>
-                            </MultiDataTrigger.Conditions>
-                            <MultiDataTrigger.EnterActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="PART_FloatingMessageContainer">
-                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Visible</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <DoubleAnimation Duration="0:0:0.2" From="0" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_FloatingMessageContainer">
-                                            <DoubleAnimation.EasingFunction>
-                                                <ExponentialEase EasingMode="EaseInOut" Exponent="2"/>
-                                            </DoubleAnimation.EasingFunction>
-                                        </DoubleAnimation>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </MultiDataTrigger.EnterActions>
-                            <MultiDataTrigger.ExitActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0:0:0.2" From="1" To="0" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_FloatingMessageContainer">
-                                            <DoubleAnimation.EasingFunction>
-                                                <ExponentialEase EasingMode="EaseInOut" Exponent="2"/>
-                                            </DoubleAnimation.EasingFunction>
-                                        </DoubleAnimation>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="PART_FloatingMessageContainer">
-                                            <DiscreteObjectKeyFrame KeyTime="0:0:0.2">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Collapsed</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </MultiDataTrigger.ExitActions>
-                        </MultiDataTrigger>
-                        <MultiDataTrigger>
-                            <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding (Controls:TextBoxHelper.ButtonsAlignment), RelativeSource={RelativeSource Self}}" Value="Right"/>
-                                <Condition Binding="{Binding (Controls:TextBoxHelper.ClearTextButton), RelativeSource={RelativeSource Self}}" Value="False"/>
-                            </MultiDataTrigger.Conditions>
-                            <Setter Property="Grid.ColumnSpan" TargetName="PART_ContentHost" Value="2"/>
-                            <Setter Property="Grid.ColumnSpan" TargetName="PART_Message" Value="2"/>
-                        </MultiDataTrigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="BorderBrush" TargetName="Base" Value="{Binding (Controls:ControlsHelper.MouseOverBorderBrush), RelativeSource={RelativeSource TemplatedParent}}"/>
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Opacity" TargetName="DisabledVisualElement" Value="0.6"/>
-                        </Trigger>
-                        <Trigger Property="IsReadOnly" Value="True">
-                            <Setter Property="IsEnabled" TargetName="PART_ClearText" Value="False"/>
-                        </Trigger>
-                        <Trigger Property="IsFocused" Value="True">
-                            <Setter Property="BorderBrush" TargetName="Base" Value="{Binding (Controls:ControlsHelper.FocusBorderBrush), RelativeSource={RelativeSource TemplatedParent}}"/>
-                            <Setter Property="Foreground" TargetName="PART_FloatingMessage" Value="{DynamicResource AccentColorBrush}"/>
-                            <Setter Property="Opacity" TargetName="PART_FloatingMessage" Value="1"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" SourceName="PART_ClearText" Value="True">
-                            <Setter Property="Background" TargetName="PART_ClearText" Value="{DynamicResource GrayBrush8}"/>
-                            <Setter Property="Foreground" TargetName="PART_ClearText" Value="{DynamicResource AccentColorBrush}"/>
-                        </Trigger>
-                        <Trigger Property="IsPressed" SourceName="PART_ClearText" Value="True">
-                            <Setter Property="Background" TargetName="PART_ClearText" Value="{DynamicResource BlackBrush}"/>
-                            <Setter Property="Foreground" TargetName="PART_ClearText" Value="{DynamicResource WhiteBrush}"/>
-                        </Trigger>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="Controls:TextBoxHelper.HasText" Value="False"/>
-                                <Condition Property="IsFocused" Value="True"/>
-                            </MultiTrigger.Conditions>
-                            <MultiTrigger.EnterActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0:0:0.2" To="0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </MultiTrigger.EnterActions>
-                            <MultiTrigger.ExitActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0:0:0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </MultiTrigger.ExitActions>
-                        </MultiTrigger>
-                        <Trigger Property="Controls:TextBoxHelper.HasText" Value="True">
-                            <Trigger.EnterActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0:0:0.2" From="0.2" To="0" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </Trigger.EnterActions>
-                            <Trigger.ExitActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0:0:0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </Trigger.ExitActions>
-                        </Trigger>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="IsVisible" Value="True"/>
-                                <Condition Property="Controls:TextBoxHelper.IsWaitingForData" Value="True"/>
-                            </MultiTrigger.Conditions>
-                            <MultiTrigger.EnterActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <DoubleAnimation AutoReverse="True" Timeline.DesiredFrameRate="30" Duration="0:0:2" From="0" RepeatBehavior="Forever" To="1" Storyboard.TargetProperty="(Effect).Opacity" Storyboard.TargetName="PART_WaitingForDataEffectGrid"/>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </MultiTrigger.EnterActions>
-                            <Setter Property="Visibility" TargetName="PART_WaitingForDataEffectAdornerDecorator" Value="Visible"/>
-                        </MultiTrigger>
-                        <Trigger Property="Controls:TextBoxHelper.IsWaitingForData" Value="False">
-                            <Setter Property="Visibility" TargetName="PART_WaitingForDataEffectAdornerDecorator" Value="Collapsed"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="TextBoxStyle11" TargetType="{x:Type TextBox}">
-        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource FocusedTextboxBrush}"/>
-        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{StaticResource OverTextboxBorderBrush}"/>
-        <Setter Property="Background" Value="{StaticResource TextBoxBackgroundBrush}"/>
-        <Setter Property="BorderBrush" Value="{StaticResource TextBoxBackgroundBrush}"/>
-        <Setter Property="FontFamily" Value="{StaticResource RobotoRegularFont}"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Controls:TextBoxHelper.ButtonContentTemplate">
-            <Setter.Value>
-                <DataTemplate>
-                    <ContentControl x:Name="PART_PackIcon" Content="M42.5,22A12.5,12.5 0 0,1 55,34.5A12.5,12.5 0 0,1 42.5,47C40.14,47 37.92,46.34 36,45.24L26.97,54.27C25.8,55.44 23.9,55.44 22.73,54.27C21.56,53.1 21.56,51.2 22.73,50.03L31.8,40.96C30.66,39.08 30,36.86 30,34.5A12.5,12.5 0 0,1 42.5,22M42.5,26A8.5,8.5 0 0,0 34,34.5A8.5,8.5 0 0,0 42.5,43A8.5,8.5 0 0,0 51,34.5A8.5,8.5 0 0,0 42.5,26Z" HorizontalAlignment="Center" Height="{Binding (Controls:TextBoxHelper.ButtonWidth), Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type TextBox}}}" Padding="3" Style="{DynamicResource PathIconContentControlStyle}" VerticalAlignment="Center" Width="{Binding (Controls:TextBoxHelper.ButtonWidth), Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type TextBox}}}"/>
-                </DataTemplate>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Controls:ControlsHelper.CornerRadius" Value="13"/>
-        <Style.BasedOn>
-            <Style TargetType="{x:Type TextBox}">
-                <Setter Property="Controls:TextBoxHelper.ButtonTemplate" Value="{DynamicResource ChromelessButtonTemplate}"/>
-                <Setter Property="Controls:TextBoxHelper.TextButton" Value="True"/>
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type TextBox}">
-                            <ControlTemplate.Resources>
-                                <Storyboard x:Key="enterGotFocus">
-                                    <DoubleAnimation Duration="0:0:0.2" To="0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                                </Storyboard>
-                                <Storyboard x:Key="exitGotFocus">
-                                    <DoubleAnimation Duration="0:0:0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                                </Storyboard>
-                                <Storyboard x:Key="enterHasText">
-                                    <DoubleAnimation Duration="0:0:0.2" From="0.2" To="0" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                                </Storyboard>
-                                <Storyboard x:Key="exitHasText">
-                                    <DoubleAnimation Duration="0:0:0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                                </Storyboard>
-                            </ControlTemplate.Resources>
-                            <Grid>
-                                <AdornerDecorator x:Name="PART_WaitingForDataEffectAdornerDecorator" Visibility="Collapsed">
-                                    <Border x:Name="PART_WaitingForDataEffectGrid" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Effect="{DynamicResource WaitingForDataEffect}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                                </AdornerDecorator>
-                                <Border 
-                                    x:Name="Base" BorderBrush="{TemplateBinding BorderBrush}" 
-                                    BorderThickness="{TemplateBinding BorderThickness}" 
-                                    Background="{TemplateBinding Background}" 
-                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                    CornerRadius="{Binding (Controls:ControlsHelper.CornerRadius),Mode=OneWay,RelativeSource={RelativeSource TemplatedParent}}"
-                                    />
-                                <Grid x:Name="PART_InnerGrid" Margin="6,2,2,2">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition x:Name="TextColumn" Width="*"/>
-                                        <ColumnDefinition x:Name="ButtonColumn" Width="Auto"/>
-                                    </Grid.ColumnDefinitions>
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="Auto"/>
-                                        <RowDefinition x:Name="ButtonRow" Height="*"/>
-                                    </Grid.RowDefinitions>
-                                    <ScrollViewer x:Name="PART_ContentHost" 
-                                                  BorderThickness="0" 
-                                                  Background="{x:Null}" 
-                                                  Grid.Column="0" 
-                                                  IsTabStop="False" 
-                                                  Margin="2" 
-                                                  Grid.Row="1" 
-                                                  VerticalAlignment="Stretch"/>
-                                    <TextBlock x:Name="PART_Message" 
-                                               Grid.Column="0" 
-                                               Foreground="{TemplateBinding Foreground}" 
-                                               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" 
-                                               Margin="6,2" 
-                                               Padding="{TemplateBinding Padding}" 
-                                               Grid.Row="1" 
-                                               Style="{DynamicResource MahApps.Metro.Styles.MetroWatermarkTextBlock}" 
-                                               TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}" 
-                                               TextWrapping="{TemplateBinding Controls:TextBoxHelper.WatermarkWrapping}" 
-                                               Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" 
-                                               TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}" 
-                                               Visibility="Collapsed" 
-                                               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                                    <ContentControl x:Name="PART_FloatingMessageContainer" 
-                                                    Grid.Column="0" 
-                                                    Grid.Row="0" 
-                                                    Style="{DynamicResource FloatingMessageContainerStyle}">
-                                        <ContentControl.Height>
-                                            <MultiBinding Converter="{converters:MathMultiplyConverter}" UpdateSourceTrigger="Default">
-                                                <Binding ElementName="PART_FloatingMessage" Mode="OneWay" Path="ActualHeight"/>
-                                                <Binding ElementName="PART_FloatingMessageContainer" Mode="OneWay" Path="Opacity"/>
-                                            </MultiBinding>
-                                        </ContentControl.Height>
-                                        <TextBlock x:Name="PART_FloatingMessage" 
-                                                   Foreground="{TemplateBinding Foreground}" 
-                                                   HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" 
-                                                   Style="{DynamicResource MetroAutoCollapsingTextBlock}" 
-                                                   TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}" 
-                                                   Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" 
-                                                   TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}" 
-                                                   VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                                            <TextBlock.RenderTransform>
-                                                <TranslateTransform>
-                                                    <TranslateTransform.Y>
-                                                        <MultiBinding Converter="{converters:MathSubtractConverter}" UpdateSourceTrigger="Default">
-                                                            <Binding ElementName="PART_FloatingMessage" Mode="OneWay" Path="ActualHeight"/>
-                                                            <Binding ElementName="PART_FloatingMessageContainer" Mode="OneWay" Path="ActualHeight"/>
-                                                        </MultiBinding>
-                                                    </TranslateTransform.Y>
-                                                </TranslateTransform>
-                                            </TextBlock.RenderTransform>
-                                        </TextBlock>
-                                    </ContentControl>
-                                    <Button 
-                                        x:Name="PART_ClearText" 
-                                        ContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}" 
-                                        Content="{TemplateBinding Controls:TextBoxHelper.ButtonContent}" 
-                                        Grid.Column="1" 
-                                        Foreground="{TemplateBinding Foreground}" 
-                                        Focusable="False" 
-                                        FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}" 
-                                        FontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}" 
-                                        IsTabStop="False" 
-                                        Controls:TextBoxHelper.IsClearTextButtonBehaviorEnabled="True" 
-                                        Grid.Row="0" 
-                                        Grid.RowSpan="2" 
-                                        Style="{DynamicResource ChromelessButtonStyle}" 
-                                        Template="{TemplateBinding Controls:TextBoxHelper.ButtonTemplate}" 
-                                        Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
-                                        Margin="0,0,6,0"
-                                        >
-                                        <Button.Visibility>
-                                            <Binding Mode="OneWay" Path="(Controls:TextBoxHelper.TextButton)" RelativeSource="{RelativeSource TemplatedParent}">
-                                                <Binding.Converter>
-                                                    <BooleanToVisibilityConverter/>
-                                                </Binding.Converter>
-                                            </Binding>
-                                        </Button.Visibility>
-                                    </Button>
-                                </Grid>
-                                <Border x:Name="DisabledVisualElement" BorderBrush="{DynamicResource ControlsDisabledBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{DynamicResource ControlsDisabledBrush}" IsHitTestVisible="False" Opacity="0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Visibility="{Binding (Controls:ControlsHelper.DisabledVisualElementVisibility), Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"/>
-                            </Grid>
-                            <ControlTemplate.Triggers>
-                                <DataTrigger Binding="{Binding (Controls:TextBoxHelper.ButtonsAlignment), RelativeSource={RelativeSource Self}}" Value="Left">
-                                    <Setter Property="Width" TargetName="ButtonColumn" Value="*"/>
-                                    <Setter Property="Grid.Column" TargetName="PART_ClearText" Value="0"/>
-                                    <Setter Property="Grid.Column" TargetName="PART_ContentHost" Value="1"/>
-                                    <Setter Property="Grid.Column" TargetName="PART_Message" Value="1"/>
-                                    <Setter Property="Width" TargetName="TextColumn" Value="Auto"/>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding Text, RelativeSource={RelativeSource Self}}" Value="">
-                                    <Setter Property="Visibility" TargetName="PART_Message" Value="Visible"/>
-                                </DataTrigger>
-                                <MultiDataTrigger>
-                                    <MultiDataTrigger.Conditions>
-                                        <Condition Binding="{Binding IsVisible, RelativeSource={RelativeSource Self}}" Value="True"/>
-                                        <Condition Binding="{Binding (Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True"/>
-                                        <Condition Binding="{Binding (Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True"/>
-                                    </MultiDataTrigger.Conditions>
-                                    <MultiDataTrigger.EnterActions>
-                                        <BeginStoryboard>
-                                            <Storyboard>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="PART_FloatingMessageContainer">
-                                                    <DiscreteObjectKeyFrame KeyTime="0">
-                                                        <DiscreteObjectKeyFrame.Value>
-                                                            <Visibility>Visible</Visibility>
-                                                        </DiscreteObjectKeyFrame.Value>
-                                                    </DiscreteObjectKeyFrame>
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <DoubleAnimation Duration="0:0:0.2" From="0" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_FloatingMessageContainer">
-                                                    <DoubleAnimation.EasingFunction>
-                                                        <ExponentialEase EasingMode="EaseInOut" Exponent="2"/>
-                                                    </DoubleAnimation.EasingFunction>
-                                                </DoubleAnimation>
-                                            </Storyboard>
-                                        </BeginStoryboard>
-                                    </MultiDataTrigger.EnterActions>
-                                    <MultiDataTrigger.ExitActions>
-                                        <BeginStoryboard>
-                                            <Storyboard>
-                                                <DoubleAnimation Duration="0:0:0.2" From="1" To="0" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_FloatingMessageContainer">
-                                                    <DoubleAnimation.EasingFunction>
-                                                        <ExponentialEase EasingMode="EaseInOut" Exponent="2"/>
-                                                    </DoubleAnimation.EasingFunction>
-                                                </DoubleAnimation>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="PART_FloatingMessageContainer">
-                                                    <DiscreteObjectKeyFrame KeyTime="0:0:0.2">
-                                                        <DiscreteObjectKeyFrame.Value>
-                                                            <Visibility>Collapsed</Visibility>
-                                                        </DiscreteObjectKeyFrame.Value>
-                                                    </DiscreteObjectKeyFrame>
-                                                </ObjectAnimationUsingKeyFrames>
-                                            </Storyboard>
-                                        </BeginStoryboard>
-                                    </MultiDataTrigger.ExitActions>
-                                </MultiDataTrigger>
-                                <MultiDataTrigger>
-                                    <MultiDataTrigger.Conditions>
-                                        <Condition Binding="{Binding (Controls:TextBoxHelper.ButtonsAlignment), RelativeSource={RelativeSource Self}}" Value="Right"/>
-                                        <Condition Binding="{Binding (Controls:TextBoxHelper.TextButton), RelativeSource={RelativeSource Self}}" Value="False"/>
-                                    </MultiDataTrigger.Conditions>
-                                    <Setter Property="Grid.ColumnSpan" TargetName="PART_ContentHost" Value="2"/>
-                                    <Setter Property="Grid.ColumnSpan" TargetName="PART_Message" Value="2"/>
-                                </MultiDataTrigger>
-                                <Trigger Property="IsMouseOver" Value="True">
-                                    <Setter Property="BorderBrush" TargetName="Base" Value="{Binding (Controls:ControlsHelper.MouseOverBorderBrush), RelativeSource={RelativeSource TemplatedParent}}"/>
-                                </Trigger>
-                                <Trigger Property="IsEnabled" Value="False">
-                                    <Setter Property="Opacity" TargetName="DisabledVisualElement" Value="0.6"/>
-                                </Trigger>
-                                <MultiTrigger>
-                                    <MultiTrigger.Conditions>
-                                        <Condition Property="IsReadOnly" Value="True"/>
-                                        <Condition Property="Controls:TextBoxHelper.ButtonCommand" Value="{x:Null}"/>
-                                    </MultiTrigger.Conditions>
-                                    <Setter Property="IsEnabled" TargetName="PART_ClearText" Value="False"/>
-                                </MultiTrigger>
-                                <Trigger Property="IsFocused" Value="True">
-                                    <Setter Property="BorderBrush" TargetName="Base" Value="{Binding (Controls:ControlsHelper.FocusBorderBrush), RelativeSource={RelativeSource TemplatedParent}}"/>
-                                    <Setter Property="Foreground" TargetName="PART_FloatingMessage" Value="{DynamicResource AccentColorBrush}"/>
-                                    <Setter Property="Opacity" TargetName="PART_FloatingMessage" Value="1"/>
-                                </Trigger>
-                                <Trigger Property="IsMouseOver" SourceName="PART_ClearText" Value="True">
-                                    <Setter Property="Background" TargetName="PART_ClearText" Value="{DynamicResource GrayBrush8}"/>
-                                    <Setter Property="Foreground" TargetName="PART_ClearText" Value="{DynamicResource AccentColorBrush}"/>
-                                </Trigger>
-                                <Trigger Property="IsPressed" SourceName="PART_ClearText" Value="True">
-                                    <Setter Property="Background" TargetName="PART_ClearText" Value="{DynamicResource BlackBrush}"/>
-                                    <Setter Property="Foreground" TargetName="PART_ClearText" Value="{DynamicResource WhiteBrush}"/>
-                                </Trigger>
-                                <MultiTrigger>
-                                    <MultiTrigger.Conditions>
-                                        <Condition Property="IsVisible" Value="True"/>
-                                        <Condition Property="Controls:TextBoxHelper.IsWaitingForData" Value="True"/>
-                                    </MultiTrigger.Conditions>
-                                    <MultiTrigger.EnterActions>
-                                        <BeginStoryboard>
-                                            <Storyboard>
-                                                <DoubleAnimation AutoReverse="True" Timeline.DesiredFrameRate="30" Duration="0:0:2" From="0" RepeatBehavior="Forever" To="1" Storyboard.TargetProperty="(Effect).Opacity" Storyboard.TargetName="PART_WaitingForDataEffectGrid"/>
-                                            </Storyboard>
-                                        </BeginStoryboard>
-                                    </MultiTrigger.EnterActions>
-                                    <Setter Property="Visibility" TargetName="PART_WaitingForDataEffectAdornerDecorator" Value="Visible"/>
-                                </MultiTrigger>
-                                <Trigger Property="Controls:TextBoxHelper.IsWaitingForData" Value="False">
-                                    <Setter Property="Visibility" TargetName="PART_WaitingForDataEffectAdornerDecorator" Value="Collapsed"/>
-                                </Trigger>
-                            </ControlTemplate.Triggers>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-                <Style.BasedOn>
-                    <Style TargetType="{x:Type TextBox}">
-                        <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}"/>
-                        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderBrush}"/>
-                        <Setter Property="BorderThickness" Value="1"/>
-                        <Setter Property="CaretBrush" Value="{DynamicResource BlackBrush}"/>
-                        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}"/>
-                        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}"/>
-                        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource TextBoxMouseOverBorderBrush}"/>
-                        <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource ClearTextButtonFontSize}"/>
-                        <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22"/>
-                        <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True"/>
-                        <Setter Property="Controls:TextBoxHelper.IsSpellCheckContextMenuEnabled" Value="{Binding (SpellCheck.IsEnabled), RelativeSource={RelativeSource Self}}"/>
-                        <Setter Property="Controls:TextBoxHelper.WatermarkWrapping" Value="{Binding TextWrapping, Mode=OneWay, RelativeSource={RelativeSource Self}}"/>
-                        <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}"/>
-                        <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}"/>
-                        <Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
-                        <Setter Property="MinHeight" Value="26"/>
-                        <Setter Property="Padding" Value="0"/>
-                        <Setter Property="SelectionBrush" Value="{DynamicResource HighlightBrush}"/>
-                        <Setter Property="SnapsToDevicePixels" Value="True"/>
-                        <Setter Property="Template">
-                            <Setter.Value>
-                                <ControlTemplate TargetType="{x:Type TextBox}">
-                                    <ControlTemplate.Resources>
-                                        <Storyboard x:Key="enterGotFocus">
-                                            <DoubleAnimation Duration="0:0:0.2" To="0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                                        </Storyboard>
-                                        <Storyboard x:Key="exitGotFocus">
-                                            <DoubleAnimation Duration="0:0:0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                                        </Storyboard>
-                                        <Storyboard x:Key="enterHasText">
-                                            <DoubleAnimation Duration="0:0:0.2" From="0.2" To="0" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                                        </Storyboard>
-                                        <Storyboard x:Key="exitHasText">
-                                            <DoubleAnimation Duration="0:0:0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                                        </Storyboard>
-                                    </ControlTemplate.Resources>
-                                    <Grid>
-                                        <AdornerDecorator x:Name="PART_WaitingForDataEffectAdornerDecorator" Visibility="Collapsed">
-                                            <Border x:Name="PART_WaitingForDataEffectGrid" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Effect="{DynamicResource WaitingForDataEffect}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                                        </AdornerDecorator>
-                                        <Border x:Name="Base" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                                        <Grid x:Name="PART_InnerGrid" Margin="2">
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition x:Name="TextColumn" Width="*"/>
-                                                <ColumnDefinition x:Name="ButtonColumn" Width="Auto"/>
-                                            </Grid.ColumnDefinitions>
-                                            <Grid.RowDefinitions>
-                                                <RowDefinition Height="Auto"/>
-                                                <RowDefinition x:Name="ButtonRow" Height="*"/>
-                                            </Grid.RowDefinitions>
-                                            <ScrollViewer x:Name="PART_ContentHost" BorderThickness="0" Background="{x:Null}" Grid.Column="0" IsTabStop="False" Margin="2" Grid.Row="1" VerticalAlignment="Stretch"/>
-                                            <TextBlock x:Name="PART_Message" Grid.Column="0" Foreground="{TemplateBinding Foreground}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="6,2" Padding="{TemplateBinding Padding}" Grid.Row="1" Style="{DynamicResource MahApps.Metro.Styles.MetroWatermarkTextBlock}" TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}" TextWrapping="{TemplateBinding Controls:TextBoxHelper.WatermarkWrapping}" Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}" Visibility="Collapsed" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                                            <ContentControl x:Name="PART_FloatingMessageContainer" Grid.Column="0" Grid.Row="0" Style="{DynamicResource FloatingMessageContainerStyle}">
-                                                <ContentControl.Height>
-                                                    <MultiBinding Converter="{converters:MathMultiplyConverter}" UpdateSourceTrigger="Default">
-                                                        <Binding ElementName="PART_FloatingMessage" Mode="OneWay" Path="ActualHeight"/>
-                                                        <Binding ElementName="PART_FloatingMessageContainer" Mode="OneWay" Path="Opacity"/>
-                                                    </MultiBinding>
-                                                </ContentControl.Height>
-                                                <TextBlock x:Name="PART_FloatingMessage" Foreground="{TemplateBinding Foreground}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Style="{DynamicResource MetroAutoCollapsingTextBlock}" TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}" Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                                                    <TextBlock.RenderTransform>
-                                                        <TranslateTransform>
-                                                            <TranslateTransform.Y>
-                                                                <MultiBinding Converter="{converters:MathSubtractConverter}" UpdateSourceTrigger="Default">
-                                                                    <Binding ElementName="PART_FloatingMessage" Mode="OneWay" Path="ActualHeight"/>
-                                                                    <Binding ElementName="PART_FloatingMessageContainer" Mode="OneWay" Path="ActualHeight"/>
-                                                                </MultiBinding>
-                                                            </TranslateTransform.Y>
-                                                        </TranslateTransform>
-                                                    </TextBlock.RenderTransform>
-                                                </TextBlock>
-                                            </ContentControl>
-                                            <Button x:Name="PART_ClearText" ContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}" Content="{TemplateBinding Controls:TextBoxHelper.ButtonContent}" Grid.Column="1" Foreground="{TemplateBinding Foreground}" Focusable="False" FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}" FontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}" IsTabStop="False" Controls:TextBoxHelper.IsClearTextButtonBehaviorEnabled="{Binding (Controls:TextBoxHelper.ClearTextButton), Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.RowSpan="2" Style="{DynamicResource ChromelessButtonStyle}" Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}">
-                                                <Button.Visibility>
-                                                    <Binding Mode="OneWay" Path="(Controls:TextBoxHelper.ClearTextButton)" RelativeSource="{RelativeSource TemplatedParent}">
-                                                        <Binding.Converter>
-                                                            <BooleanToVisibilityConverter/>
-                                                        </Binding.Converter>
-                                                    </Binding>
-                                                </Button.Visibility>
-                                            </Button>
-                                        </Grid>
-                                        <Border x:Name="DisabledVisualElement" BorderBrush="{DynamicResource ControlsDisabledBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{DynamicResource ControlsDisabledBrush}" IsHitTestVisible="False" Opacity="0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Visibility="{Binding (Controls:ControlsHelper.DisabledVisualElementVisibility), Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"/>
-                                    </Grid>
-                                    <ControlTemplate.Triggers>
-                                        <DataTrigger Binding="{Binding (Controls:TextBoxHelper.ButtonsAlignment), RelativeSource={RelativeSource Self}}" Value="Left">
-                                            <Setter Property="Width" TargetName="ButtonColumn" Value="*"/>
-                                            <Setter Property="Grid.Column" TargetName="PART_ClearText" Value="0"/>
-                                            <Setter Property="Grid.Column" TargetName="PART_ContentHost" Value="1"/>
-                                            <Setter Property="Grid.Column" TargetName="PART_Message" Value="1"/>
-                                            <Setter Property="Width" TargetName="TextColumn" Value="Auto"/>
-                                        </DataTrigger>
-                                        <DataTrigger Binding="{Binding Text, RelativeSource={RelativeSource Self}}" Value="">
-                                            <Setter Property="Visibility" TargetName="PART_Message" Value="Visible"/>
-                                        </DataTrigger>
-                                        <MultiDataTrigger>
-                                            <MultiDataTrigger.Conditions>
-                                                <Condition Binding="{Binding IsVisible, RelativeSource={RelativeSource Self}}" Value="True"/>
-                                                <Condition Binding="{Binding (Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True"/>
-                                                <Condition Binding="{Binding (Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True"/>
-                                            </MultiDataTrigger.Conditions>
-                                            <MultiDataTrigger.EnterActions>
-                                                <BeginStoryboard>
-                                                    <Storyboard>
-                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="PART_FloatingMessageContainer">
-                                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                                <DiscreteObjectKeyFrame.Value>
-                                                                    <Visibility>Visible</Visibility>
-                                                                </DiscreteObjectKeyFrame.Value>
-                                                            </DiscreteObjectKeyFrame>
-                                                        </ObjectAnimationUsingKeyFrames>
-                                                        <DoubleAnimation Duration="0:0:0.2" From="0" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_FloatingMessageContainer">
-                                                            <DoubleAnimation.EasingFunction>
-                                                                <ExponentialEase EasingMode="EaseInOut" Exponent="2"/>
-                                                            </DoubleAnimation.EasingFunction>
-                                                        </DoubleAnimation>
-                                                    </Storyboard>
-                                                </BeginStoryboard>
-                                            </MultiDataTrigger.EnterActions>
-                                            <MultiDataTrigger.ExitActions>
-                                                <BeginStoryboard>
-                                                    <Storyboard>
-                                                        <DoubleAnimation Duration="0:0:0.2" From="1" To="0" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_FloatingMessageContainer">
-                                                            <DoubleAnimation.EasingFunction>
-                                                                <ExponentialEase EasingMode="EaseInOut" Exponent="2"/>
-                                                            </DoubleAnimation.EasingFunction>
-                                                        </DoubleAnimation>
-                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="PART_FloatingMessageContainer">
-                                                            <DiscreteObjectKeyFrame KeyTime="0:0:0.2">
-                                                                <DiscreteObjectKeyFrame.Value>
-                                                                    <Visibility>Collapsed</Visibility>
-                                                                </DiscreteObjectKeyFrame.Value>
-                                                            </DiscreteObjectKeyFrame>
-                                                        </ObjectAnimationUsingKeyFrames>
-                                                    </Storyboard>
-                                                </BeginStoryboard>
-                                            </MultiDataTrigger.ExitActions>
-                                        </MultiDataTrigger>
-                                        <MultiDataTrigger>
-                                            <MultiDataTrigger.Conditions>
-                                                <Condition Binding="{Binding (Controls:TextBoxHelper.ButtonsAlignment), RelativeSource={RelativeSource Self}}" Value="Right"/>
-                                                <Condition Binding="{Binding (Controls:TextBoxHelper.ClearTextButton), RelativeSource={RelativeSource Self}}" Value="False"/>
-                                            </MultiDataTrigger.Conditions>
-                                            <Setter Property="Grid.ColumnSpan" TargetName="PART_ContentHost" Value="2"/>
-                                            <Setter Property="Grid.ColumnSpan" TargetName="PART_Message" Value="2"/>
-                                        </MultiDataTrigger>
-                                        <Trigger Property="IsMouseOver" Value="True">
-                                            <Setter Property="BorderBrush" TargetName="Base" Value="{Binding (Controls:ControlsHelper.MouseOverBorderBrush), RelativeSource={RelativeSource TemplatedParent}}"/>
-                                        </Trigger>
-                                        <Trigger Property="IsEnabled" Value="False">
-                                            <Setter Property="Opacity" TargetName="DisabledVisualElement" Value="0.6"/>
-                                        </Trigger>
-                                        <Trigger Property="IsReadOnly" Value="True">
-                                            <Setter Property="IsEnabled" TargetName="PART_ClearText" Value="False"/>
-                                        </Trigger>
-                                        <Trigger Property="IsFocused" Value="True">
-                                            <Setter Property="BorderBrush" TargetName="Base" Value="{Binding (Controls:ControlsHelper.FocusBorderBrush), RelativeSource={RelativeSource TemplatedParent}}"/>
-                                            <Setter Property="Foreground" TargetName="PART_FloatingMessage" Value="{DynamicResource AccentColorBrush}"/>
-                                            <Setter Property="Opacity" TargetName="PART_FloatingMessage" Value="1"/>
-                                        </Trigger>
-                                        <Trigger Property="IsMouseOver" SourceName="PART_ClearText" Value="True">
-                                            <Setter Property="Background" TargetName="PART_ClearText" Value="{DynamicResource GrayBrush8}"/>
-                                            <Setter Property="Foreground" TargetName="PART_ClearText" Value="{DynamicResource AccentColorBrush}"/>
-                                        </Trigger>
-                                        <Trigger Property="IsPressed" SourceName="PART_ClearText" Value="True">
-                                            <Setter Property="Background" TargetName="PART_ClearText" Value="{DynamicResource BlackBrush}"/>
-                                            <Setter Property="Foreground" TargetName="PART_ClearText" Value="{DynamicResource WhiteBrush}"/>
-                                        </Trigger>
-                                        <MultiTrigger>
-                                            <MultiTrigger.Conditions>
-                                                <Condition Property="Controls:TextBoxHelper.HasText" Value="False"/>
-                                                <Condition Property="IsFocused" Value="True"/>
-                                            </MultiTrigger.Conditions>
-                                            <MultiTrigger.EnterActions>
-                                                <BeginStoryboard>
-                                                    <Storyboard>
-                                                        <DoubleAnimation Duration="0:0:0.2" To="0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                                                    </Storyboard>
-                                                </BeginStoryboard>
-                                            </MultiTrigger.EnterActions>
-                                            <MultiTrigger.ExitActions>
-                                                <BeginStoryboard>
-                                                    <Storyboard>
-                                                        <DoubleAnimation Duration="0:0:0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                                                    </Storyboard>
-                                                </BeginStoryboard>
-                                            </MultiTrigger.ExitActions>
-                                        </MultiTrigger>
-                                        <Trigger Property="Controls:TextBoxHelper.HasText" Value="True">
-                                            <Trigger.EnterActions>
-                                                <BeginStoryboard>
-                                                    <Storyboard>
-                                                        <DoubleAnimation Duration="0:0:0.2" From="0.2" To="0" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                                                    </Storyboard>
-                                                </BeginStoryboard>
-                                            </Trigger.EnterActions>
-                                            <Trigger.ExitActions>
-                                                <BeginStoryboard>
-                                                    <Storyboard>
-                                                        <DoubleAnimation Duration="0:0:0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                                                    </Storyboard>
-                                                </BeginStoryboard>
-                                            </Trigger.ExitActions>
-                                        </Trigger>
-                                        <MultiTrigger>
-                                            <MultiTrigger.Conditions>
-                                                <Condition Property="IsVisible" Value="True"/>
-                                                <Condition Property="Controls:TextBoxHelper.IsWaitingForData" Value="True"/>
-                                            </MultiTrigger.Conditions>
-                                            <MultiTrigger.EnterActions>
-                                                <BeginStoryboard>
-                                                    <Storyboard>
-                                                        <DoubleAnimation AutoReverse="True" Timeline.DesiredFrameRate="30" Duration="0:0:2" From="0" RepeatBehavior="Forever" To="1" Storyboard.TargetProperty="(Effect).Opacity" Storyboard.TargetName="PART_WaitingForDataEffectGrid"/>
-                                                    </Storyboard>
-                                                </BeginStoryboard>
-                                            </MultiTrigger.EnterActions>
-                                            <Setter Property="Visibility" TargetName="PART_WaitingForDataEffectAdornerDecorator" Value="Visible"/>
-                                        </MultiTrigger>
-                                        <Trigger Property="Controls:TextBoxHelper.IsWaitingForData" Value="False">
-                                            <Setter Property="Visibility" TargetName="PART_WaitingForDataEffectAdornerDecorator" Value="Collapsed"/>
-                                        </Trigger>
-                                    </ControlTemplate.Triggers>
-                                </ControlTemplate>
-                            </Setter.Value>
-                        </Setter>
-                        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource ValidationErrorTemplate}"/>
-                    </Style>
-                </Style.BasedOn>
-            </Style>
-        </Style.BasedOn>
-    </Style>
-
-    <Style x:Key="BorderlessTextBox" TargetType="TextBox" BasedOn="{StaticResource MetroTextBox}">
-        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="BorderBrush" Value="{StaticResource OverTextboxBorderBrush}"/>
         <Setter Property="FontFamily" Value="{StaticResource RobotoRegularFont}"/>
         <Setter Property="FontSize" Value="{StaticResource RegularFontSize}"/>
+        <Setter Property="ContextMenu" Value="{StaticResource textboxContextMenu}"/>
+        <Style.Triggers>
+            <Trigger Property="IsFocused" Value="True">
+                <Setter Property="BorderThickness" Value="0 0 0 2"/>
+                <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{StaticResource BlueBrush}"/>
+            </Trigger>
+        </Style.Triggers>
     </Style>
 
-    <Style x:Key="EditTextBox" TargetType="TextBox" BasedOn="{StaticResource MetroTextBox}">
+    <Style x:Key="EditPasswordBox" TargetType="PasswordBox">
         <Setter Property="BorderThickness" Value="0 0 0 1"/>
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource OverTextboxBorderBrush}"/>
         <Setter Property="BorderBrush" Value="{StaticResource OverTextboxBorderBrush}"/>
         <Setter Property="FontFamily" Value="{StaticResource RobotoRegularFont}"/>
         <Setter Property="FontSize" Value="{StaticResource RegularFontSize}"/>
+        <Setter Property="ContextMenu" Value="{StaticResource textboxContextMenu}"/>
+
         <Style.Triggers>
             <Trigger Property="IsFocused" Value="True">
                 <Setter Property="BorderThickness" Value="0 0 0 2"/>
@@ -974,12 +35,13 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="EditRichTextBox" TargetType="RichTextBox" BasedOn="{StaticResource MetroRichTextBox}">
+    <Style x:Key="EditRichTextBox" TargetType="RichTextBox">
         <Setter Property="BorderThickness" Value="0 0 0 1"/>
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource OverTextboxBorderBrush}"/>
         <Setter Property="BorderBrush" Value="{StaticResource OverTextboxBorderBrush}"/>
         <Setter Property="FontFamily" Value="{StaticResource RobotoRegularFont}"/>
         <Setter Property="FontSize" Value="{StaticResource RegularFontSize}"/>
+        <Setter Property="ContextMenu" Value="{StaticResource textboxContextMenu}"/>
         <Style.Triggers>
             <Trigger Property="IsFocused" Value="True">
                 <Setter Property="BorderThickness" Value="0 0 0 2"/>
@@ -988,7 +50,7 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="RichTextBoxStyle1" TargetType="{x:Type ucontrols:MarkedRichTextBox}">
+    <Style x:Key="MarkedRichTextBoxStyle" TargetType="{x:Type ucontrols:MarkedRichTextBox}">
         <Style.Resources>
             <Style x:Key="{x:Type Hyperlink}" TargetType="{x:Type Hyperlink}">
                 <Setter Property="Foreground" Value="{DynamicResource AccentColorBrush}"/>
@@ -1037,6 +99,7 @@
         <Setter Property="SelectionBrush" Value="{DynamicResource HighlightBrush}"/>
         <Setter Property="SnapsToDevicePixels" Value="True"/>
         <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="ContextMenu" Value="{StaticResource textboxContextMenu}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ucontrols:MarkedRichTextBox}">
@@ -1087,525 +150,5 @@
             </Setter.Value>
         </Setter>
     </Style>
-
-    <Style x:Key="richTextBoxStyle" TargetType="RichTextBox" BasedOn="{StaticResource MetroRichTextBox}">
-        <Setter Property="FontFamily" Value="{StaticResource RobotoRegularFont}"/>
-        <Setter Property="FontSize" Value="{StaticResource RegularFontSize}"/>
-    </Style>
-
-    <Style x:Key="richTextBoxStyle2" TargetType="{x:Type RichTextBox}">
-        <Style.Resources>
-            <Style BasedOn="{StaticResource {x:Type Hyperlink}}" TargetType="{x:Type Hyperlink}">
-                <Setter Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
-                <Setter Property="TextDecorations" Value="Underline" />
-                <Style.Triggers>
-                    <Trigger Property="IsMouseOver" Value="True">
-                        <Setter Property="Foreground" Value="{DynamicResource HighlightBrush}" />
-                    </Trigger>
-                    <Trigger Property="IsEnabled" Value="False">
-                        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-                    </Trigger>
-                    <Trigger Property="IsEnabled" Value="True">
-                        <Setter Property="Cursor" Value="Hand" />
-                    </Trigger>
-                </Style.Triggers>
-            </Style>
-        </Style.Resources>
-        <Setter Property="AllowDrop" Value="True" />
-        <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderBrush}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="CaretBrush" Value="{DynamicResource BlackBrush}" />
-        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
-        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
-        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource TextBoxMouseOverBorderBrush}" />
-        <Setter Property="Controls:TextBoxHelper.IsSpellCheckContextMenuEnabled" Value="{Binding RelativeSource={RelativeSource Self}, Path=(SpellCheck.IsEnabled)}" />
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
-        <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
-        <Setter Property="MinHeight" Value="26" />
-        <Setter Property="MinWidth" Value="10" />
-        <Setter Property="Padding" Value="1" />
-        <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
-        <Setter Property="SelectionBrush" Value="{DynamicResource HighlightBrush}" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type TextBoxBase}">
-                    <Grid>
-                        <Border x:Name="Bd"
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                            <ScrollViewer x:Name="PART_ContentHost" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        </Border>
-                        <Border x:Name="DisabledVisualElement"
-                                Background="{DynamicResource ControlsDisabledBrush}"
-                                BorderBrush="{DynamicResource ControlsDisabledBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                IsHitTestVisible="False"
-                                Opacity="0"
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.DisabledVisualElementVisibility), Mode=OneWay}" />
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Bd" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.MouseOverBorderBrush)}" />
-                        </Trigger>
-                        <Trigger Property="IsFocused" Value="True">
-                            <Setter TargetName="Bd" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="DisabledVisualElement" Property="Opacity" Value="0.6" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
     
-    <Style TargetType="{x:Type FlowDocument}" 
-               x:Key="MyStyle"
-               >
-        <Setter Property="FontSize" Value="12" />
-        <Setter Property="Foreground" Value="{StaticResource BlueBrush}"/>
-        <Setter Property="FontFamily" Value="{DynamicResource RobotoRegularFont}"/>
-    </Style>
-
-    <Style TargetType="{x:Type Control}" >
-        <Setter Property="FontFamily" Value="{DynamicResource RobotoRegularFont}"/>
-    </Style>
-
-    <ControlTemplate x:Key="TextBoxControlTemplate1" TargetType="{x:Type TextBox}">
-        <ControlTemplate.Resources>
-            <Storyboard x:Key="enterGotFocus">
-                <DoubleAnimation Duration="0:0:0.2" To="0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-            </Storyboard>
-            <Storyboard x:Key="exitGotFocus">
-                <DoubleAnimation Duration="0:0:0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-            </Storyboard>
-            <Storyboard x:Key="enterHasText">
-                <DoubleAnimation Duration="0:0:0.2" From="0.2" To="0" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-            </Storyboard>
-            <Storyboard x:Key="exitHasText">
-                <DoubleAnimation Duration="0:0:0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-            </Storyboard>
-        </ControlTemplate.Resources>
-        <Grid>
-            <AdornerDecorator x:Name="PART_WaitingForDataEffectAdornerDecorator" Visibility="Collapsed">
-                <Border x:Name="PART_WaitingForDataEffectGrid" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Effect="{DynamicResource WaitingForDataEffect}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-            </AdornerDecorator>
-            <Border BorderBrush="Transparent"
-                        Background="Transparent"
-                        Name="lightBorder"
-                        BorderThickness="{TemplateBinding BorderThickness}" 
-                        CornerRadius="2">
-                <Border x:Name="Base" 
-                        BorderBrush="{TemplateBinding BorderBrush}" 
-                        BorderThickness="{TemplateBinding BorderThickness}" 
-                        Background="{TemplateBinding Background}" 
-                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                        CornerRadius="2"/>
-            </Border>
-            <Grid x:Name="PART_InnerGrid" Margin="2">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition x:Name="TextColumn" Width="*"/>
-                    <ColumnDefinition x:Name="ButtonColumn" Width="Auto"/>
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition x:Name="ButtonRow" Height="*"/>
-                </Grid.RowDefinitions>
-                <ScrollViewer x:Name="PART_ContentHost" BorderThickness="0" Background="{x:Null}" Grid.Column="0" IsTabStop="False" Margin="2" Grid.Row="1" VerticalAlignment="Stretch"/>
-                <TextBlock x:Name="PART_Message" Grid.Column="0" Foreground="{TemplateBinding Foreground}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="6,2" Padding="{TemplateBinding Padding}" Grid.Row="1" Style="{DynamicResource MahApps.Metro.Styles.MetroWatermarkTextBlock}" TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}" TextWrapping="{TemplateBinding Controls:TextBoxHelper.WatermarkWrapping}" Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}" Visibility="Collapsed" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                <ContentControl x:Name="PART_FloatingMessageContainer" Grid.Column="0" Grid.Row="0" Style="{DynamicResource FloatingMessageContainerStyle}">
-                    <ContentControl.Height>
-                        <MultiBinding Converter="{converters:MathMultiplyConverter}" UpdateSourceTrigger="Default">
-                            <Binding ElementName="PART_FloatingMessage" Mode="OneWay" Path="ActualHeight"/>
-                            <Binding ElementName="PART_FloatingMessageContainer" Mode="OneWay" Path="Opacity"/>
-                        </MultiBinding>
-                    </ContentControl.Height>
-                    <TextBlock x:Name="PART_FloatingMessage" Foreground="{TemplateBinding Foreground}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Style="{DynamicResource MetroAutoCollapsingTextBlock}" TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}" Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                        <TextBlock.RenderTransform>
-                            <TranslateTransform>
-                                <TranslateTransform.Y>
-                                    <MultiBinding Converter="{converters:MathSubtractConverter}" UpdateSourceTrigger="Default">
-                                        <Binding ElementName="PART_FloatingMessage" Mode="OneWay" Path="ActualHeight"/>
-                                        <Binding ElementName="PART_FloatingMessageContainer" Mode="OneWay" Path="ActualHeight"/>
-                                    </MultiBinding>
-                                </TranslateTransform.Y>
-                            </TranslateTransform>
-                        </TextBlock.RenderTransform>
-                    </TextBlock>
-                </ContentControl>
-                <Button x:Name="PART_ClearText" ContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}" Content="{TemplateBinding Controls:TextBoxHelper.ButtonContent}" Grid.Column="1" Foreground="{TemplateBinding Foreground}" Focusable="False" FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}" FontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}" IsTabStop="False" Controls:TextBoxHelper.IsClearTextButtonBehaviorEnabled="{Binding (Controls:TextBoxHelper.ClearTextButton), Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.RowSpan="2" Style="{DynamicResource ChromelessButtonStyle}" Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}">
-                    <Button.Visibility>
-                        <Binding Mode="OneWay" Path="(Controls:TextBoxHelper.ClearTextButton)" RelativeSource="{RelativeSource TemplatedParent}">
-                            <Binding.Converter>
-                                <BooleanToVisibilityConverter/>
-                            </Binding.Converter>
-                        </Binding>
-                    </Button.Visibility>
-                </Button>
-            </Grid>
-            <Border x:Name="DisabledVisualElement" 
-                        BorderBrush="{DynamicResource ControlsDisabledBrush}" 
-                        BorderThickness="{TemplateBinding BorderThickness}" 
-                        Background="{DynamicResource ControlsDisabledBrush}" 
-                        IsHitTestVisible="False" 
-                        Opacity="0" 
-                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" 
-                        Visibility="{Binding (Controls:ControlsHelper.DisabledVisualElementVisibility), Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"/>
-        </Grid>
-        <ControlTemplate.Triggers>
-            <DataTrigger Binding="{Binding (Controls:TextBoxHelper.ButtonsAlignment), RelativeSource={RelativeSource Self}}" Value="Left">
-                <Setter Property="Width" TargetName="ButtonColumn" Value="*"/>
-                <Setter Property="Grid.Column" TargetName="PART_ClearText" Value="0"/>
-                <Setter Property="Grid.Column" TargetName="PART_ContentHost" Value="1"/>
-                <Setter Property="Grid.Column" TargetName="PART_Message" Value="1"/>
-                <Setter Property="Width" TargetName="TextColumn" Value="Auto"/>
-            </DataTrigger>
-            <DataTrigger Binding="{Binding Text, RelativeSource={RelativeSource Self}}" Value="">
-                <Setter Property="Visibility" TargetName="PART_Message" Value="Visible"/>
-            </DataTrigger>
-            <MultiDataTrigger>
-                <MultiDataTrigger.Conditions>
-                    <Condition Binding="{Binding IsVisible, RelativeSource={RelativeSource Self}}" Value="True"/>
-                    <Condition Binding="{Binding (Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True"/>
-                    <Condition Binding="{Binding (Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True"/>
-                </MultiDataTrigger.Conditions>
-                <MultiDataTrigger.EnterActions>
-                    <BeginStoryboard>
-                        <Storyboard>
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="PART_FloatingMessageContainer">
-                                <DiscreteObjectKeyFrame KeyTime="0">
-                                    <DiscreteObjectKeyFrame.Value>
-                                        <Visibility>Visible</Visibility>
-                                    </DiscreteObjectKeyFrame.Value>
-                                </DiscreteObjectKeyFrame>
-                            </ObjectAnimationUsingKeyFrames>
-                            <DoubleAnimation Duration="0:0:0.2" From="0" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_FloatingMessageContainer">
-                                <DoubleAnimation.EasingFunction>
-                                    <ExponentialEase EasingMode="EaseInOut" Exponent="2"/>
-                                </DoubleAnimation.EasingFunction>
-                            </DoubleAnimation>
-                        </Storyboard>
-                    </BeginStoryboard>
-                </MultiDataTrigger.EnterActions>
-                <MultiDataTrigger.ExitActions>
-                    <BeginStoryboard>
-                        <Storyboard>
-                            <DoubleAnimation Duration="0:0:0.2" From="1" To="0" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_FloatingMessageContainer">
-                                <DoubleAnimation.EasingFunction>
-                                    <ExponentialEase EasingMode="EaseInOut" Exponent="2"/>
-                                </DoubleAnimation.EasingFunction>
-                            </DoubleAnimation>
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="PART_FloatingMessageContainer">
-                                <DiscreteObjectKeyFrame KeyTime="0:0:0.2">
-                                    <DiscreteObjectKeyFrame.Value>
-                                        <Visibility>Collapsed</Visibility>
-                                    </DiscreteObjectKeyFrame.Value>
-                                </DiscreteObjectKeyFrame>
-                            </ObjectAnimationUsingKeyFrames>
-                        </Storyboard>
-                    </BeginStoryboard>
-                </MultiDataTrigger.ExitActions>
-            </MultiDataTrigger>
-            <MultiDataTrigger>
-                <MultiDataTrigger.Conditions>
-                    <Condition Binding="{Binding (Controls:TextBoxHelper.ButtonsAlignment), RelativeSource={RelativeSource Self}}" Value="Right"/>
-                    <Condition Binding="{Binding (Controls:TextBoxHelper.ClearTextButton), RelativeSource={RelativeSource Self}}" Value="False"/>
-                </MultiDataTrigger.Conditions>
-                <Setter Property="Grid.ColumnSpan" TargetName="PART_ContentHost" Value="2"/>
-                <Setter Property="Grid.ColumnSpan" TargetName="PART_Message" Value="2"/>
-            </MultiDataTrigger>
-            <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="BorderBrush" TargetName="Base" Value="{Binding (Controls:ControlsHelper.MouseOverBorderBrush), RelativeSource={RelativeSource TemplatedParent}}"/>
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="Opacity" TargetName="DisabledVisualElement" Value="0.6"/>
-            </Trigger>
-            <Trigger Property="IsReadOnly" Value="True">
-                <Setter Property="IsEnabled" TargetName="PART_ClearText" Value="False"/>
-            </Trigger>
-            <Trigger Property="IsFocused" Value="True">
-                <Setter Property="BorderBrush" TargetName="Base" Value="{Binding (Controls:ControlsHelper.FocusBorderBrush), RelativeSource={RelativeSource TemplatedParent}}"/>
-                <Setter Property="Foreground" TargetName="PART_FloatingMessage" Value="{DynamicResource AccentColorBrush}"/>
-                <Setter Property="Opacity" TargetName="PART_FloatingMessage" Value="1"/>
-                <Setter Property="BorderBrush" TargetName="lightBorder" Value="{StaticResource GlowLighterBlue}"/>
-            </Trigger>
-            <Trigger Property="IsMouseOver" SourceName="PART_ClearText" Value="True">
-                <Setter Property="Background" TargetName="PART_ClearText" Value="{DynamicResource GrayBrush8}"/>
-                <Setter Property="Foreground" TargetName="PART_ClearText" Value="{DynamicResource AccentColorBrush}"/>
-            </Trigger>
-            <Trigger Property="IsPressed" SourceName="PART_ClearText" Value="True">
-                <Setter Property="Background" TargetName="PART_ClearText" Value="{DynamicResource BlackBrush}"/>
-                <Setter Property="Foreground" TargetName="PART_ClearText" Value="{DynamicResource WhiteBrush}"/>
-            </Trigger>
-            <MultiTrigger>
-                <MultiTrigger.Conditions>
-                    <Condition Property="Controls:TextBoxHelper.HasText" Value="False"/>
-                    <Condition Property="IsFocused" Value="True"/>
-                </MultiTrigger.Conditions>
-                <MultiTrigger.EnterActions>
-                    <BeginStoryboard>
-                        <Storyboard>
-                            <DoubleAnimation Duration="0:0:0.2" To="0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                        </Storyboard>
-                    </BeginStoryboard>
-                </MultiTrigger.EnterActions>
-                <MultiTrigger.ExitActions>
-                    <BeginStoryboard>
-                        <Storyboard>
-                            <DoubleAnimation Duration="0:0:0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                        </Storyboard>
-                    </BeginStoryboard>
-                </MultiTrigger.ExitActions>
-            </MultiTrigger>
-            <Trigger Property="Controls:TextBoxHelper.HasText" Value="True">
-                <Trigger.EnterActions>
-                    <BeginStoryboard>
-                        <Storyboard>
-                            <DoubleAnimation Duration="0:0:0.2" From="0.2" To="0" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                        </Storyboard>
-                    </BeginStoryboard>
-                </Trigger.EnterActions>
-                <Trigger.ExitActions>
-                    <BeginStoryboard>
-                        <Storyboard>
-                            <DoubleAnimation Duration="0:0:0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                        </Storyboard>
-                    </BeginStoryboard>
-                </Trigger.ExitActions>
-            </Trigger>
-            <MultiTrigger>
-                <MultiTrigger.Conditions>
-                    <Condition Property="IsVisible" Value="True"/>
-                    <Condition Property="Controls:TextBoxHelper.IsWaitingForData" Value="True"/>
-                </MultiTrigger.Conditions>
-                <MultiTrigger.EnterActions>
-                    <BeginStoryboard>
-                        <Storyboard>
-                            <DoubleAnimation AutoReverse="True" Timeline.DesiredFrameRate="30" Duration="0:0:2" From="0" RepeatBehavior="Forever" To="1" Storyboard.TargetProperty="(Effect).Opacity" Storyboard.TargetName="PART_WaitingForDataEffectGrid"/>
-                        </Storyboard>
-                    </BeginStoryboard>
-                </MultiTrigger.EnterActions>
-                <Setter Property="Visibility" TargetName="PART_WaitingForDataEffectAdornerDecorator" Value="Visible"/>
-            </MultiTrigger>
-            <Trigger Property="Controls:TextBoxHelper.IsWaitingForData" Value="False">
-                <Setter Property="Visibility" TargetName="PART_WaitingForDataEffectAdornerDecorator" Value="Collapsed"/>
-            </Trigger>
-        </ControlTemplate.Triggers>
-    </ControlTemplate>
-
-    <ControlTemplate x:Key="PasswordBoxControlTemplate1" TargetType="{x:Type PasswordBox}">
-        <ControlTemplate.Resources>
-            <Storyboard x:Key="enterGotFocus">
-                <DoubleAnimation Duration="0:0:0.2" To="0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-            </Storyboard>
-            <Storyboard x:Key="exitGotFocus">
-                <DoubleAnimation Duration="0:0:0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-            </Storyboard>
-            <Storyboard x:Key="enterHasText">
-                <DoubleAnimation Duration="0:0:0.2" From="0.2" To="0" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-            </Storyboard>
-            <Storyboard x:Key="exitHasText">
-                <DoubleAnimation Duration="0:0:0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-            </Storyboard>
-        </ControlTemplate.Resources>
-        <Grid>
-            <AdornerDecorator x:Name="PART_WaitingForDataEffectAdornerDecorator" Visibility="Collapsed">
-                <Border x:Name="PART_WaitingForDataEffectGrid" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Effect="{DynamicResource WaitingForDataEffect}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-            </AdornerDecorator>
-            <Border BorderBrush="Transparent"
-                        Background="Transparent"
-                        Name="lightBorder"
-                        BorderThickness="{TemplateBinding BorderThickness}" 
-                        CornerRadius="2">
-                <Border x:Name="Base" 
-                            BorderBrush="{TemplateBinding BorderBrush}" 
-                            BorderThickness="{TemplateBinding BorderThickness}" 
-                            Background="{TemplateBinding Background}" 
-                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                            CornerRadius="2"/>
-            </Border>
-            <Grid Margin="2">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition x:Name="TextColumn" Width="*"/>
-                    <ColumnDefinition x:Name="CapsLockColumn" Width="Auto"/>
-                    <ColumnDefinition x:Name="ButtonColumn" Width="Auto"/>
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition x:Name="ButtonRow" Height="*"/>
-                </Grid.RowDefinitions>
-                <ScrollViewer x:Name="PART_ContentHost" BorderThickness="0" Background="{x:Null}" Grid.Column="0" IsTabStop="False" Margin="2" Grid.Row="1" VerticalAlignment="Stretch"/>
-                <TextBlock x:Name="PART_Message" Grid.Column="0" Foreground="{TemplateBinding Foreground}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="6,2" Padding="{TemplateBinding Padding}" Grid.Row="1" Style="{DynamicResource MahApps.Metro.Styles.MetroWatermarkTextBlock}" TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}" Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}" Visibility="Collapsed" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                <ContentControl x:Name="PART_FloatingMessageContainer" Grid.Column="0" Grid.Row="0" Style="{DynamicResource FloatingMessageContainerStyle}">
-                    <ContentControl.Height>
-                        <MultiBinding Converter="{converters:MathMultiplyConverter}" UpdateSourceTrigger="Default">
-                            <Binding ElementName="PART_FloatingMessage" Mode="OneWay" Path="ActualHeight"/>
-                            <Binding ElementName="PART_FloatingMessageContainer" Mode="OneWay" Path="Opacity"/>
-                        </MultiBinding>
-                    </ContentControl.Height>
-                    <TextBlock x:Name="PART_FloatingMessage" Foreground="{TemplateBinding Foreground}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Style="{DynamicResource MetroAutoCollapsingTextBlock}" TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}" Text="{TemplateBinding Controls:TextBoxHelper.Watermark}" TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                        <TextBlock.RenderTransform>
-                            <TranslateTransform>
-                                <TranslateTransform.Y>
-                                    <MultiBinding Converter="{converters:MathSubtractConverter}" UpdateSourceTrigger="Default">
-                                        <Binding ElementName="PART_FloatingMessage" Mode="OneWay" Path="ActualHeight"/>
-                                        <Binding ElementName="PART_FloatingMessageContainer" Mode="OneWay" Path="ActualHeight"/>
-                                    </MultiBinding>
-                                </TranslateTransform.Y>
-                            </TranslateTransform>
-                        </TextBlock.RenderTransform>
-                    </TextBlock>
-                </ContentControl>
-                <ContentPresenter x:Name="PART_CapsLockIndicator" Content="{Binding (Controls:PasswordBoxHelper.CapsLockIcon), Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="1" TextElement.Foreground="{DynamicResource ControlsValidationBrush}" HorizontalAlignment="Right" Margin="1" Grid.Row="0" Grid.RowSpan="2" ToolTip="{Binding (Controls:PasswordBoxHelper.CapsLockWarningToolTip), Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" Visibility="Collapsed" VerticalAlignment="Center"/>
-                <Button x:Name="PART_ClearText" ContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}" Content="{TemplateBinding Controls:TextBoxHelper.ButtonContent}" Grid.Column="2" Foreground="{TemplateBinding Foreground}" Focusable="False" FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}" FontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}" IsTabStop="False" Controls:TextBoxHelper.IsClearTextButtonBehaviorEnabled="{Binding (Controls:TextBoxHelper.ClearTextButton), Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.RowSpan="2" Style="{DynamicResource ChromelessButtonStyle}" Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}">
-                    <Button.Visibility>
-                        <Binding Mode="OneWay" Path="(Controls:TextBoxHelper.ClearTextButton)" RelativeSource="{RelativeSource TemplatedParent}">
-                            <Binding.Converter>
-                                <BooleanToVisibilityConverter/>
-                            </Binding.Converter>
-                        </Binding>
-                    </Button.Visibility>
-                </Button>
-            </Grid>
-            <Border x:Name="DisabledVisualElement" BorderBrush="{DynamicResource ControlsDisabledBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{DynamicResource ControlsDisabledBrush}" IsHitTestVisible="False" Opacity="0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Visibility="{Binding (Controls:ControlsHelper.DisabledVisualElementVisibility), Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"/>
-        </Grid>
-        <ControlTemplate.Triggers>
-            <DataTrigger Binding="{Binding (Controls:TextBoxHelper.ButtonsAlignment), RelativeSource={RelativeSource Self}}" Value="Left">
-                <Setter Property="Width" TargetName="ButtonColumn" Value="*"/>
-                <Setter Property="Grid.Column" TargetName="PART_ClearText" Value="0"/>
-                <Setter Property="Grid.Column" TargetName="PART_ContentHost" Value="2"/>
-                <Setter Property="Grid.Column" TargetName="PART_FloatingMessageContainer" Value="2"/>
-                <Setter Property="Grid.Column" TargetName="PART_Message" Value="2"/>
-                <Setter Property="Width" TargetName="TextColumn" Value="Auto"/>
-            </DataTrigger>
-            <DataTrigger Binding="{Binding Password, Mode=OneWay, RelativeSource={RelativeSource Self}}" Value="">
-                <Setter Property="Visibility" TargetName="PART_Message" Value="Visible"/>
-            </DataTrigger>
-            <MultiDataTrigger>
-                <MultiDataTrigger.Conditions>
-                    <Condition Binding="{Binding IsVisible, RelativeSource={RelativeSource Self}}" Value="True"/>
-                    <Condition Binding="{Binding (Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True"/>
-                    <Condition Binding="{Binding (Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True"/>
-                </MultiDataTrigger.Conditions>
-                <MultiDataTrigger.EnterActions>
-                    <BeginStoryboard>
-                        <Storyboard>
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="PART_FloatingMessageContainer">
-                                <DiscreteObjectKeyFrame KeyTime="0">
-                                    <DiscreteObjectKeyFrame.Value>
-                                        <Visibility>Visible</Visibility>
-                                    </DiscreteObjectKeyFrame.Value>
-                                </DiscreteObjectKeyFrame>
-                            </ObjectAnimationUsingKeyFrames>
-                            <DoubleAnimation Duration="0:0:0.2" From="0" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_FloatingMessageContainer">
-                                <DoubleAnimation.EasingFunction>
-                                    <ExponentialEase EasingMode="EaseInOut" Exponent="2"/>
-                                </DoubleAnimation.EasingFunction>
-                            </DoubleAnimation>
-                        </Storyboard>
-                    </BeginStoryboard>
-                </MultiDataTrigger.EnterActions>
-                <MultiDataTrigger.ExitActions>
-                    <BeginStoryboard>
-                        <Storyboard>
-                            <DoubleAnimation Duration="0:0:0.2" From="1" To="0" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_FloatingMessageContainer">
-                                <DoubleAnimation.EasingFunction>
-                                    <ExponentialEase EasingMode="EaseInOut" Exponent="2"/>
-                                </DoubleAnimation.EasingFunction>
-                            </DoubleAnimation>
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="PART_FloatingMessageContainer">
-                                <DiscreteObjectKeyFrame KeyTime="0:0:0.2">
-                                    <DiscreteObjectKeyFrame.Value>
-                                        <Visibility>Collapsed</Visibility>
-                                    </DiscreteObjectKeyFrame.Value>
-                                </DiscreteObjectKeyFrame>
-                            </ObjectAnimationUsingKeyFrames>
-                        </Storyboard>
-                    </BeginStoryboard>
-                </MultiDataTrigger.ExitActions>
-            </MultiDataTrigger>
-            <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="BorderBrush" TargetName="Base" Value="{Binding (Controls:ControlsHelper.MouseOverBorderBrush), RelativeSource={RelativeSource TemplatedParent}}"/>
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="Opacity" TargetName="DisabledVisualElement" Value="0.6"/>
-            </Trigger>
-            <Trigger Property="IsFocused" Value="True">
-                <Setter Property="BorderBrush" TargetName="Base" Value="{Binding (Controls:ControlsHelper.FocusBorderBrush), RelativeSource={RelativeSource TemplatedParent}}"/>
-                <Setter Property="Foreground" TargetName="PART_FloatingMessage" Value="{DynamicResource AccentColorBrush}"/>
-                <Setter Property="Opacity" TargetName="PART_FloatingMessage" Value="1"/>
-                <Setter Property="BorderBrush" TargetName="lightBorder" Value="{StaticResource GlowLighterBlue}"/>
-            </Trigger>
-            <Trigger Property="IsMouseOver" SourceName="PART_ClearText" Value="True">
-                <Setter Property="Background" TargetName="PART_ClearText" Value="{DynamicResource GrayBrush8}"/>
-                <Setter Property="Foreground" TargetName="PART_ClearText" Value="{DynamicResource AccentColorBrush}"/>
-            </Trigger>
-            <Trigger Property="IsPressed" SourceName="PART_ClearText" Value="True">
-                <Setter Property="Background" TargetName="PART_ClearText" Value="{DynamicResource BlackBrush}"/>
-                <Setter Property="Foreground" TargetName="PART_ClearText" Value="{DynamicResource WhiteBrush}"/>
-            </Trigger>
-            <MultiTrigger>
-                <MultiTrigger.Conditions>
-                    <Condition Property="Controls:TextBoxHelper.HasText" Value="False"/>
-                    <Condition Property="IsFocused" Value="True"/>
-                </MultiTrigger.Conditions>
-                <MultiTrigger.EnterActions>
-                    <BeginStoryboard>
-                        <Storyboard>
-                            <DoubleAnimation Duration="0:0:0.2" To="0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                        </Storyboard>
-                    </BeginStoryboard>
-                </MultiTrigger.EnterActions>
-                <MultiTrigger.ExitActions>
-                    <BeginStoryboard>
-                        <Storyboard>
-                            <DoubleAnimation Duration="0:0:0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                        </Storyboard>
-                    </BeginStoryboard>
-                </MultiTrigger.ExitActions>
-            </MultiTrigger>
-            <Trigger Property="Controls:TextBoxHelper.HasText" Value="True">
-                <Trigger.EnterActions>
-                    <BeginStoryboard>
-                        <Storyboard>
-                            <DoubleAnimation Duration="0:0:0.2" From="0.2" To="0" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                        </Storyboard>
-                    </BeginStoryboard>
-                </Trigger.EnterActions>
-                <Trigger.ExitActions>
-                    <BeginStoryboard>
-                        <Storyboard>
-                            <DoubleAnimation Duration="0:0:0.2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Message"/>
-                        </Storyboard>
-                    </BeginStoryboard>
-                </Trigger.ExitActions>
-                <Setter Property="Visibility" TargetName="PART_Message" Value="Visible"/>
-            </Trigger>
-            <MultiTrigger>
-                <MultiTrigger.Conditions>
-                    <Condition Property="IsVisible" Value="True"/>
-                    <Condition Property="Controls:TextBoxHelper.IsWaitingForData" Value="True"/>
-                </MultiTrigger.Conditions>
-                <MultiTrigger.EnterActions>
-                    <BeginStoryboard>
-                        <Storyboard>
-                            <DoubleAnimation AutoReverse="True" Timeline.DesiredFrameRate="30" Duration="0:0:2" From="0" RepeatBehavior="Forever" To="1" Storyboard.TargetProperty="(Effect).Opacity" Storyboard.TargetName="PART_WaitingForDataEffectGrid"/>
-                        </Storyboard>
-                    </BeginStoryboard>
-                </MultiTrigger.EnterActions>
-                <Setter Property="Visibility" TargetName="PART_WaitingForDataEffectAdornerDecorator" Value="Visible"/>
-            </MultiTrigger>
-            <Trigger Property="Controls:TextBoxHelper.IsWaitingForData" Value="False">
-                <Setter Property="Visibility" TargetName="PART_WaitingForDataEffectAdornerDecorator" Value="Collapsed"/>
-            </Trigger>
-        </ControlTemplate.Triggers>
-    </ControlTemplate>
 </ResourceDictionary>
\ No newline at end of file