diff --git a/Material.Avalonia/Material.Avalonia.csproj b/Material.Avalonia/Material.Avalonia.csproj
index f4d98214..fa2e5b5a 100644
--- a/Material.Avalonia/Material.Avalonia.csproj
+++ b/Material.Avalonia/Material.Avalonia.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
-        <VersionPrefix>2.4.1</VersionPrefix>
+        <VersionPrefix>2.5.0</VersionPrefix>
         <Title>Material.Avalonia</Title>
         <Authors>Larymar,SKProCH,Appleneko2001</Authors>
         <Description>This repository is a set of styles that will help you customize your application in an appropriate material design.</Description>
@@ -12,7 +12,16 @@
         <RepositoryType>git</RepositoryType>
         <LangVersion>8</LangVersion>
         <PackageReleaseNotes>
-            - Add support for vertically scrolling textboxes
+            - Allow the alignment of the snackbar to be configured #116
+            - Prevent ArgumentNullException in StringToTransformConverter
+            - Replacing IBrush instead of Brush class  in RippleEffect #114
+            - Deprecate and replace Transitions instead of Animations in TreeView #117
+            - Update DialogHost package, coerce styles, add examples #94
+            - Replace ContentControl in CustomDialog with ContentPresenter for Content #121
+            - Add recursive BundledTheme finding in resources for theming #120
+            - Fix doubling the padding of the Card
+            - Add Label style #123
+            - Fix show password button is not visible until clicked #124
         </PackageReleaseNotes>
     </PropertyGroup>
 
diff --git a/Material.Demo/Models/Sample2Model.cs b/Material.Demo/Models/Sample2Model.cs
new file mode 100644
index 00000000..11e921b9
--- /dev/null
+++ b/Material.Demo/Models/Sample2Model.cs
@@ -0,0 +1,8 @@
+namespace Material.Demo.Models {
+    public class Sample2Model {
+        public Sample2Model(int number) {
+            Number = number;
+        }
+        public int Number { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Material.Demo/Pages/ComboBoxesDemo.axaml b/Material.Demo/Pages/ComboBoxesDemo.axaml
index ccb07caf..7149d9a6 100644
--- a/Material.Demo/Pages/ComboBoxesDemo.axaml
+++ b/Material.Demo/Pages/ComboBoxesDemo.axaml
@@ -5,6 +5,7 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              xmlns:styles="clr-namespace:Material.Styles;assembly=Material.Styles"
              xmlns:showMeTheXaml="clr-namespace:ShowMeTheXaml;assembly=ShowMeTheXaml.Avalonia"
+             xmlns:assist="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
              x:Class="Material.Demo.Pages.ComboBoxesDemo">
     <StackPanel Margin="16, 0" HorizontalAlignment="Stretch">
         <TextBlock Classes="Headline4 Subheadline" Text="ComboBoxes" />
@@ -42,6 +43,14 @@
                             <TextBlock Text="Item 4" />
                         </ComboBox>
                     </showMeTheXaml:XamlDisplay>
+                    <showMeTheXaml:XamlDisplay UniqueId="ComboBoxes3">
+                        <ComboBox Classes="Outline" assist:ComboBoxAssist.Label="ComboBox">
+                            <TextBlock Text="Item 1" />
+                            <TextBlock Text="Item 2" />
+                            <TextBlock Text="Item 3" />
+                            <TextBlock Text="Item 4" />
+                        </ComboBox>
+                    </showMeTheXaml:XamlDisplay>
                 </StackPanel>
             </StackPanel>
         </WrapPanel>
diff --git a/Material.Demo/Pages/DialogDemo.axaml b/Material.Demo/Pages/DialogDemo.axaml
index 71b72e47..0120cc5c 100644
--- a/Material.Demo/Pages/DialogDemo.axaml
+++ b/Material.Demo/Pages/DialogDemo.axaml
@@ -1,98 +1,131 @@
 <UserControl xmlns="https://github.com/avaloniaui"
-            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-            xmlns:styles="clr-namespace:Material.Styles;assembly=Material.Styles"
-            xmlns:viewModels="clr-namespace:Material.Demo.ViewModels"
-            x:Class="Material.Demo.Pages.DialogDemo"
-            x:DataType="viewModels:DialogDemoViewModel"> 
-  <StackPanel Margin="16, 0">
-    <TextBlock Classes="Headline4 Subheadline" Text="Dialogs"/>
-
-    <WrapPanel>
-      <WrapPanel.Styles>
-        <Style Selector="WrapPanel > StackPanel,
-               WrapPanel > Grid">
-          <Setter Property="Width" Value="300"/>
-          <Setter Property="MinHeight" Value="300"/>
-        </Style>
-        <Style Selector="WrapPanel > StackPanel > StackPanel,
-               WrapPanel > Grid > StackPanel"> 
-          <Setter Property="HorizontalAlignment" Value="Center"/>
-          <Setter Property="VerticalAlignment" Value="Center"/>
-          <Setter Property="Margin" Value="8"/>
-        </Style>
-        <Style Selector="WrapPanel > Grid > StackPanel > StackPanel,
-               WrapPanel > StackPanel > StackPanel > StackPanel"> 
-          <Setter Property="Margin" Value="8"/>
-        </Style>
-      </WrapPanel.Styles>
-      <Grid>
-        <TextBlock Classes="Headline6 Subheadline2" Text="From DialogHost"/>
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:styles="clr-namespace:Material.Styles;assembly=Material.Styles"
+             xmlns:viewModels="clr-namespace:Material.Demo.ViewModels"
+             xmlns:dialogHost="clr-namespace:DialogHost;assembly=DialogHost.Avalonia"
+             xmlns:models="clr-namespace:Material.Demo.Models"
+             x:Class="Material.Demo.Pages.DialogDemo"
+             x:DataType="viewModels:DialogDemoViewModel">
+  <UserControl.Resources>
+    <StackPanel x:Key="Sample2View">
+      <ProgressBar Classes="Circle" IsIndeterminate="True" />
+      <Button Margin="0 16 0 0"
+              Command="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=dialogHost:DialogHost}, Path=CloseDialogCommand}">
+        CLOSE
+      </Button>
+    </StackPanel>
+  </UserControl.Resources>
+  <dialogHost:DialogHost Identifier="MainDialogHost">
+    <dialogHost:DialogHost.DialogContentTemplate>
+      <DataTemplate DataType="models:Sample2Model">
         <StackPanel>
-          <Button Content="DialogHost is still preparing" IsEnabled="False"/>
+          <TextBlock TextAlignment="Center">Your lucky number:</TextBlock>
+          <TextBlock Classes="Body1"
+                     TextAlignment="Center"
+                     Text="{Binding Number}" />
+          <Button Margin="0 8 0 0"
+                  Command="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=dialogHost:DialogHost}, Path=CloseDialogCommand}">
+            THANKS, CLOSE
+          </Button>
         </StackPanel>
-      </Grid>
-      <StackPanel>
-        <TextBlock Classes="Headline6 Subheadline2" Text="In messagebox"/>
-        <StackPanel>
+      </DataTemplate>
+    </dialogHost:DialogHost.DialogContentTemplate>
+    <StackPanel Margin="16, 0">
+      <TextBlock Classes="Headline4 Subheadline" Text="Dialogs" />
+
+      <WrapPanel>
+        <WrapPanel.Styles>
+          <Style Selector="WrapPanel > StackPanel,
+               WrapPanel > Grid">
+            <Setter Property="Width" Value="300" />
+            <Setter Property="MinHeight" Value="300" />
+          </Style>
+          <Style Selector="WrapPanel > StackPanel > StackPanel,
+               WrapPanel > Grid > StackPanel">
+            <Setter Property="HorizontalAlignment" Value="Center" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="Margin" Value="8" />
+          </Style>
+          <Style
+            Selector="WrapPanel > Grid > StackPanel > StackPanel,
+               WrapPanel > StackPanel > StackPanel > StackPanel">
+            <Setter Property="Margin" Value="8" />
+          </Style>
+        </WrapPanel.Styles>
+        <Grid>
+          <TextBlock Classes="Headline6 Subheadline2" Text="From DialogHost" />
           <StackPanel>
-            <Button Content="Show dialog #1" Command="{Binding Dialog1}"/>
-            <TextBlock Text="{CompiledBinding Dialog1Result}"
-                       IsVisible="{CompiledBinding Dialog1Result, FallbackValue=False, 
-                       Converter={x:Static StringConverters.IsNotNullOrEmpty}}" 
-                       Margin="8" HorizontalAlignment="Center"/>
+            <TextBlock TextWrapping="Wrap">Top level dialog with custom corner radius, using OpenDialog, passing content via the Parameter. You can pass a view model, provided a corresponding DataTemplate can be found in the scope of the root DialogHost.</TextBlock>
+            <StackPanel Margin="8 8 8 0">
+              <Button Margin="8" Click="OpenDialogWithView">PASS VIEW</Button>
+              <Button Margin="8" Click="OpenDialogWithModel">PASS MODEL</Button>
+              <Button Margin="8" Click="OpenMoreDialogHostExamples">MORE EXAMPLES</Button>
+            </StackPanel>
           </StackPanel>
+        </Grid>
+        <StackPanel>
+          <TextBlock Classes="Headline6 Subheadline2" Text="In messagebox" />
           <StackPanel>
-            <Button Content="Show dialog #2" Command="{Binding Dialog2}"/>
-            <TextBlock Text="{CompiledBinding Dialog2Result}"
-                       IsVisible="{CompiledBinding Dialog2Result, FallbackValue=False,
+            <StackPanel>
+              <Button Content="Show dialog #1" Command="{Binding Dialog1}" />
+              <TextBlock Text="{CompiledBinding Dialog1Result}"
+                         IsVisible="{CompiledBinding Dialog1Result, FallbackValue=False, 
                        Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
-                       Margin="8" HorizontalAlignment="Center"/>
-          </StackPanel>
-          <StackPanel>
-            <Button Content="Show dialog #3" Command="{Binding Dialog3}"/>
-            <TextBlock Text="{CompiledBinding Dialog3Result}"
-                       IsVisible="{CompiledBinding Dialog3Result,
+                         Margin="8" HorizontalAlignment="Center" />
+            </StackPanel>
+            <StackPanel>
+              <Button Content="Show dialog #2" Command="{Binding Dialog2}" />
+              <TextBlock Text="{CompiledBinding Dialog2Result}"
+                         IsVisible="{CompiledBinding Dialog2Result, FallbackValue=False,
+                       Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
+                         Margin="8" HorizontalAlignment="Center" />
+            </StackPanel>
+            <StackPanel>
+              <Button Content="Show dialog #3" Command="{Binding Dialog3}" />
+              <TextBlock Text="{CompiledBinding Dialog3Result}"
+                         IsVisible="{CompiledBinding Dialog3Result,
                           FallbackValue=False, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
-                       Margin="8" HorizontalAlignment="Center"/>
-          </StackPanel>
-          <StackPanel>
-            <Button Content="Show dialog #4" Command="{Binding Dialog4}"/>
-            <TextBlock Text="{CompiledBinding Dialog4Result}"
-                          IsVisible="{CompiledBinding Dialog4Result,
+                         Margin="8" HorizontalAlignment="Center" />
+            </StackPanel>
+            <StackPanel>
+              <Button Content="Show dialog #4" Command="{Binding Dialog4}" />
+              <TextBlock Text="{CompiledBinding Dialog4Result}"
+                         IsVisible="{CompiledBinding Dialog4Result,
                        FallbackValue=False, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
-                       Margin="8" HorizontalAlignment="Center"/>
-          </StackPanel>
-          <StackPanel>
-            <Button Content="Login dialog" Command="{Binding LoginDialog}"/>
-            <TextBlock Text="{CompiledBinding LoginDialogResult}"
-                          IsVisible="{CompiledBinding LoginDialogResult,
+                         Margin="8" HorizontalAlignment="Center" />
+            </StackPanel>
+            <StackPanel>
+              <Button Content="Login dialog" Command="{Binding LoginDialog}" />
+              <TextBlock Text="{CompiledBinding LoginDialogResult}"
+                         IsVisible="{CompiledBinding LoginDialogResult,
                        FallbackValue=False, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
-                       Margin="8" HorizontalAlignment="Center"/>
-          </StackPanel>
-          <StackPanel>
-            <Button Content="Rename file dialog" Command="{Binding FolderNameDialog}"/>
-            <TextBlock Text="{CompiledBinding FolderNameDialogResult}"
-                          IsVisible="{CompiledBinding FolderNameDialogResult,
+                         Margin="8" HorizontalAlignment="Center" />
+            </StackPanel>
+            <StackPanel>
+              <Button Content="Rename file dialog" Command="{Binding FolderNameDialog}" />
+              <TextBlock Text="{CompiledBinding FolderNameDialogResult}"
+                         IsVisible="{CompiledBinding FolderNameDialogResult,
                        FallbackValue=False, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
-                       Margin="8" HorizontalAlignment="Center"/>
-          </StackPanel>
-          <StackPanel>
-            <Button Content="TimePicker dialog" Command="{Binding TimePickerDialog}"/>
-            <TextBlock Text="{CompiledBinding TimePickerDialogResult}"
-                          IsVisible="{CompiledBinding TimePickerDialogResult,
+                         Margin="8" HorizontalAlignment="Center" />
+            </StackPanel>
+            <StackPanel>
+              <Button Content="TimePicker dialog" Command="{Binding TimePickerDialog}" />
+              <TextBlock Text="{CompiledBinding TimePickerDialogResult}"
+                         IsVisible="{CompiledBinding TimePickerDialogResult,
                        FallbackValue=False, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
-                       Margin="8" HorizontalAlignment="Center"/>
-          </StackPanel>
-          <StackPanel>
-            <Button Content="DatePicker dialog" Command="{Binding DatePickerDialog}"/>
-            <TextBlock Text="{CompiledBinding DatePickerDialogResult}"
-                          IsVisible="{CompiledBinding DatePickerDialogResult,
+                         Margin="8" HorizontalAlignment="Center" />
+            </StackPanel>
+            <StackPanel>
+              <Button Content="DatePicker dialog" Command="{Binding DatePickerDialog}" />
+              <TextBlock Text="{CompiledBinding DatePickerDialogResult}"
+                         IsVisible="{CompiledBinding DatePickerDialogResult,
                        FallbackValue=False, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
-                       Margin="8" HorizontalAlignment="Center"/>
+                         Margin="8" HorizontalAlignment="Center" />
+            </StackPanel>
           </StackPanel>
         </StackPanel>
-      </StackPanel>
-    </WrapPanel> 
-  </StackPanel>
-</UserControl>
+      </WrapPanel>
+    </StackPanel>
+  </dialogHost:DialogHost>
+</UserControl>
\ No newline at end of file
diff --git a/Material.Demo/Pages/DialogDemo.axaml.cs b/Material.Demo/Pages/DialogDemo.axaml.cs
index d5c25b3b..182a9c9f 100644
--- a/Material.Demo/Pages/DialogDemo.axaml.cs
+++ b/Material.Demo/Pages/DialogDemo.axaml.cs
@@ -1,6 +1,10 @@
-using Avalonia;
+using System;
+using System.Diagnostics;
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
+using Material.Demo.Models;
 using Material.Demo.ViewModels;
 using Material.Dialog;
 
@@ -21,5 +25,18 @@ private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
         }
+
+        private void OpenDialogWithView(object? sender, RoutedEventArgs e) {
+            DialogHost.DialogHost.Show(this.Resources["Sample2View"]!, "MainDialogHost");
+        }
+
+        private void OpenDialogWithModel(object? sender, RoutedEventArgs e) {
+            // View that associated with this model defined at DialogContentTemplate in DialogDemo.axaml
+            DialogHost.DialogHost.Show(new Sample2Model(new Random().Next(0, 100)), "MainDialogHost");
+        }
+
+        private void OpenMoreDialogHostExamples(object? sender, RoutedEventArgs e) {
+            Process.Start(new ProcessStartInfo(){FileName = "https://github.com/AvaloniaUtils/DialogHost.Avalonia", UseShellExecute = true});
+        }
     }
 }
diff --git a/Material.Dialog/Converters/StringToTransformConverter.cs b/Material.Dialog/Converters/StringToTransformConverter.cs
index 751e5d3a..7da74b37 100644
--- a/Material.Dialog/Converters/StringToTransformConverter.cs
+++ b/Material.Dialog/Converters/StringToTransformConverter.cs
@@ -9,6 +9,8 @@ public class StringToTransformConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
+            if (value == null)
+                return TransformOperation.Identity;
             var r = TransformOperations.Parse(value.ToString());
             return r;
         }
diff --git a/Material.Dialog/Views/CustomDialog.axaml b/Material.Dialog/Views/CustomDialog.axaml
index 1ceac36e..d4523432 100644
--- a/Material.Dialog/Views/CustomDialog.axaml
+++ b/Material.Dialog/Views/CustomDialog.axaml
@@ -61,7 +61,7 @@
       
       <!-- Content panel -->
       <Panel Grid.Column="0" Grid.ColumnSpan="3" Grid.Row="3" ClipToBounds="True">
-        <ContentControl Name="PART_Content" Content="{Binding Content}" ClipToBounds="False"/>
+        <ContentPresenter Name="PART_Content" Content="{Binding Content}" ClipToBounds="False"/>
       </Panel>
       
       <Grid Grid.Column="0" 
diff --git a/Material.Dialog/Views/CustomDialog.axaml.cs b/Material.Dialog/Views/CustomDialog.axaml.cs
index f599163f..ff2bc049 100644
--- a/Material.Dialog/Views/CustomDialog.axaml.cs
+++ b/Material.Dialog/Views/CustomDialog.axaml.cs
@@ -1,5 +1,5 @@
-using Avalonia;
-using Avalonia.Controls;
+using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
 using Avalonia.Markup.Xaml;
 using Material.Dialog.Interfaces;
 
@@ -7,7 +7,7 @@ namespace Material.Dialog.Views
 {
     public class CustomDialog : Window, IDialogWindowResult<DialogResult>, IHasNegativeResult
     {
-        private ContentControl PART_Content;
+        private ContentPresenter PART_Content;
         
         public DialogResult Result { get; set; } = DialogResult.NoResult;
 
@@ -15,7 +15,7 @@ public CustomDialog()
         {
             this.InitializeComponent(); 
             
-            PART_Content = this.Get<ContentControl>(nameof(PART_Content));
+            PART_Content = this.Get<ContentPresenter>(nameof(PART_Content));
         }
 
         public void ApplyViewModel(object vm) => PART_Content.DataContext = vm;
diff --git a/Material.Ripple/RippleEffect.cs b/Material.Ripple/RippleEffect.cs
index 558c2dad..fef16f4f 100644
--- a/Material.Ripple/RippleEffect.cs
+++ b/Material.Ripple/RippleEffect.cs
@@ -87,10 +87,10 @@ private Ripple CreateRipple()
 
         #region Styled properties
 
-        public static readonly StyledProperty<Brush> RippleFillProperty =
-            AvaloniaProperty.Register<RippleEffect, Brush>(nameof(RippleFill), SolidColorBrush.Parse("#FFF"));
+        public static readonly StyledProperty<IBrush> RippleFillProperty =
+            AvaloniaProperty.Register<RippleEffect, IBrush>(nameof(RippleFill), SolidColorBrush.Parse("#FFF"));
 
-        public Brush RippleFill {
+        public IBrush RippleFill {
             get => GetValue(RippleFillProperty);
             set => SetValue(RippleFillProperty, value);
         }
diff --git a/Material.Styles/Assists/ComboBoxAssist.cs b/Material.Styles/Assists/ComboBoxAssist.cs
new file mode 100644
index 00000000..eaf36c34
--- /dev/null
+++ b/Material.Styles/Assists/ComboBoxAssist.cs
@@ -0,0 +1,15 @@
+using Avalonia;
+using Avalonia.Controls;
+
+namespace Material.Styles.Assists
+{
+    public class ComboBoxAssist
+    {
+        public static AvaloniaProperty<string> LabelProperty = AvaloniaProperty.RegisterAttached<ComboBox, string>(
+            "Label", typeof(ComboBox));
+
+        public static void SetLabel(AvaloniaObject element, string value) => element.SetValue(LabelProperty, value);
+
+        public static string GetLabel(AvaloniaObject element) => (string)element.GetValue(LabelProperty);
+    }
+}
\ No newline at end of file
diff --git a/Material.Styles/Card.xaml b/Material.Styles/Card.xaml
index 719dfdab..d1d028cf 100644
--- a/Material.Styles/Card.xaml
+++ b/Material.Styles/Card.xaml
@@ -10,15 +10,14 @@
         <Setter Property="Padding" Value="8" />
         <Setter Property="Template">
             <ControlTemplate>
-                <Grid Background="Transparent" ClipToBounds="False">
+                <Panel Background="Transparent" ClipToBounds="False">
                     <Border assists:ShadowAssist.ShadowDepth="{Binding RelativeSource={RelativeSource TemplatedParent}, 
                                 Path=(assists:ShadowAssist.ShadowDepth)}"
                             CornerRadius="{TemplateBinding CornerRadius}"
-                            ClipToBounds="False">
+                            ClipToBounds="False" >
                         <Border assists:ShadowAssist.ShadowDepth="{Binding RelativeSource={RelativeSource TemplatedParent}, 
                                     Path=(assists:ShadowAssist.ShadowDepth)}"
                                 Background="{TemplateBinding Background}"
-                                Padding="{TemplateBinding Padding}"
                                 Name="PART_ClipBorder"
                                 CornerRadius="{TemplateBinding CornerRadius}"
                                 ClipToBounds="{TemplateBinding InsideClipping}">
@@ -28,7 +27,7 @@
                                               ContentTemplate="{TemplateBinding ContentTemplate}" />
                         </Border>
                     </Border>
-                </Grid>
+                </Panel>
             </ControlTemplate>
         </Setter>
     </Style>
diff --git a/Material.Styles/ComboBox.xaml b/Material.Styles/ComboBox.xaml
index eb6f32cb..4b6148ba 100644
--- a/Material.Styles/ComboBox.xaml
+++ b/Material.Styles/ComboBox.xaml
@@ -1,7 +1,6 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:cc="clr-namespace:Material.Styles"
-        xmlns:animations="clr-namespace:Material.Styles.Additional.Animations"
         xmlns:assists="clr-namespace:Material.Styles.Assists"
         xmlns:styles="clr-namespace:Material.Styles">
   <Style Selector="ToggleButton.ComboBoxToggleButton">
@@ -154,12 +153,11 @@
                         MinHeight="48" BorderThickness="0"
                         HorizontalContentAlignment="Stretch"
                         IsChecked="{TemplateBinding IsDropDownOpen, Mode=TwoWay}"
-                        Margin="0"
+                        Margin="4,0"
+                        CornerRadius="4,4,0,0"
                         Padding="0">
             <Border Name="border"
-                    Margin="4,0"
                     MinHeight="48"
-                    CornerRadius="4,4,0,0"
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}">
@@ -265,6 +263,133 @@
     <Setter Property="Margin" Value="10,20,1,1"/>
   </Style>
   
+  <Style Selector="ComboBox.Outline">
+    <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignBody }"/>
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="ContextMenu" Value="{StaticResource DefaultTextBoxContextMenu}" />
+    <Setter Property="FontFamily" Value="avares://Material.Styles/Fonts/Roboto#Roboto"/>
+    <Setter Property="Padding" Value="16,8" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <StackPanel>
+          <Grid RowDefinitions="*, Auto">
+              <Grid Name="PART_RootBorder"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    Background="Transparent"
+                    Margin="0,8,0,0"
+                    ClipToBounds="False">
+                  <Border Name="PART_Border" CornerRadius="4"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          BorderBrush="{TemplateBinding BorderBrush}">
+                      <Border.Clip>
+                          <MultiBinding Converter="{StaticResource RectangleHollowGeometry}">
+                              <Binding ElementName="PART_Border" Path="Bounds" />
+                              <Binding ElementName="watermarkRoot" Path="Bounds" />
+                              <Binding ElementName="watermarkRoot" Path="TransformedBounds" />
+                          </MultiBinding>
+                      </Border.Clip>
+                  </Border>
+                  <Border Name="watermarkRoot"
+                          HorizontalAlignment="Left" VerticalAlignment="Top"
+                          RenderTransformOrigin="0, 0" Opacity="1">
+                      <TextBlock Name="floatingWatermark" Classes="Subtitle1"
+                                 HorizontalAlignment="Stretch" Margin="4,2" Foreground="{TemplateBinding BorderBrush}"
+                                 Opacity="{Binding ElementName=PART_Border, Path=Opacity}"
+                                 Text="{TemplateBinding (assists:ComboBoxAssist.Label)}" />
+                  </Border>
+                  <Grid ColumnDefinitions="*,Auto">
+                    <ContentPresenter Name="contentPresenter"
+                                      BorderThickness="0" BorderBrush="Transparent"
+                                      HorizontalAlignment="Left"
+                                      VerticalAlignment="Center"
+                                      Content="{TemplateBinding SelectionBoxItem}"
+                                      ContentTemplate="{TemplateBinding ItemTemplate}"
+                                      Margin="{TemplateBinding Padding}"/>
+                    <Border Name="splitBorder"
+                            Grid.Column="1"
+                            Margin="16"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Center" 
+                            BorderBrush="Transparent"
+                            BorderThickness="0">
+                      <Path Name="arrow"
+                            Width="8" Height="8" 
+                            Stretch="Uniform"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Center"
+                            Data="M7,10L12,15L17,10H7Z"
+                            Fill="{DynamicResource MaterialDesignTextBoxBorder}" />
+                    </Border>
+                  </Grid>
+              </Grid>
+          </Grid>
+          <Popup Name="PART_Popup"
+                 IsOpen="{TemplateBinding IsDropDownOpen, Mode=TwoWay}"
+                 MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
+                 VerticalOffset="0"
+                 Margin="0"
+                 WindowManagerAddShadowHint="False"
+                 PlacementTarget="{Binding ElementName=templateRoot}"
+                 IsLightDismissEnabled="True"
+                 UseLayoutRounding="True"
+                 ClipToBounds="False" >
+            <cc:Card assists:ShadowAssist.ShadowDepth="Depth1"
+                     Margin="4,0,4,4"
+                     CornerRadius="8"
+                     Padding="0">
+              <ScrollViewer Background="{Binding Background, ElementName=PART_Popup}"
+                            MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                            MinHeight="1" >
+                <ItemsPresenter Name="PART_ItemsPresenter"
+                        Items="{TemplateBinding Items}"
+                        ItemsPanel="{TemplateBinding ItemsPanel}"
+                        ItemTemplate="{TemplateBinding ItemTemplate}"
+                        VirtualizationMode="{TemplateBinding VirtualizationMode}" />
+              </ScrollViewer>
+            </cc:Card>
+          </Popup>
+        </StackPanel>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+  
+  <!-- Transitions -->
+  <Style Selector="ComboBox.Outline:not(.notransitions) /template/ TextBlock#floatingWatermark,
+                     ComboBox.Outline:not(.notransitions) /template/ Border#watermarkRoot">
+    <Setter Property="Transitions">
+      <Transitions>
+        <ThicknessTransition Duration="0:0:0.25" Property="Margin" Easing="CubicEaseOut"/>
+        <TransformOperationsTransition Property="RenderTransform"  Duration="0:0:0.25" Easing="CubicEaseOut"/>
+      </Transitions>
+    </Setter>
+  </Style>
+  
+  <Style Selector="ComboBox.Outline /template/ Grid#PART_RootBorder">
+    <Setter Property="MinHeight" Value="52"/>
+  </Style>
+  
+  <Style Selector="ComboBox.Outline:focus-within:not(ComboBox.Outline[SelectedIndex=-1]) /template/ Border#watermarkRoot,
+                     ComboBox.Outline:focus-within /template/ Border#watermarkRoot,
+                     ComboBox.Outline:not(ComboBox.Outline[SelectedIndex=-1]) /template/ Border#watermarkRoot">
+    <Setter Property="Margin" Value="14,-8,1,1"/>
+    <Setter Property="RenderTransform" Value="scale(0.75)"/>
+  </Style>
+    
+  <Style Selector="ComboBox.Outline[SelectedIndex=-1]:not(:focus-within) /template/ Border#watermarkRoot">
+    <Setter Property="Margin" Value="10,14,1,1"/>
+    <Setter Property="RenderTransform" Value="scale(1)"/>
+  </Style>
+    
+  <Style Selector="ComboBox.Outline">
+    <Setter Property="BorderThickness" Value="1"/>
+  </Style>
+    
+  <Style Selector="ComboBox.Outline:focus-within">
+    <Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueMidBrush}" />
+    <Setter Property="BorderThickness" Value="2"/> 
+  </Style> 
+  
 
   <Design.PreviewWith>
     <Border Padding="20" Width="360" Height="400">
diff --git a/Material.Styles/DialogHost.axaml b/Material.Styles/DialogHost.axaml
new file mode 100644
index 00000000..4e5cb72a
--- /dev/null
+++ b/Material.Styles/DialogHost.axaml
@@ -0,0 +1,17 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:dialogHost="clr-namespace:DialogHost;assembly=DialogHost.Avalonia"
+        xmlns:styles="clr-namespace:Material.Styles"
+        xmlns:assists="clr-namespace:Material.Styles.Assists">
+    <Style Selector="dialogHost|DialogHost">
+        <Setter Property="PopupTemplate">
+            <ControlTemplate>
+                <styles:Card assists:ShadowAssist.ShadowDepth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(assists:ShadowAssist.ShadowDepth)}"
+                             CornerRadius="{Binding Path=(dialogHost:DialogHostStyle.CornerRadius), RelativeSource={RelativeSource FindAncestor, AncestorType=dialogHost:DialogHost}}"
+                             Padding="{TemplateBinding Padding}"
+                             Content="{TemplateBinding Content}"
+                             ContentTemplate="{TemplateBinding ContentTemplate}" />
+            </ControlTemplate>
+        </Setter>
+    </Style>
+</Styles>
diff --git a/Material.Styles/DialogHost.xaml b/Material.Styles/DialogHost.xaml
deleted file mode 100644
index 91f2024d..00000000
--- a/Material.Styles/DialogHost.xaml
+++ /dev/null
@@ -1,37 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:assists="clr-namespace:Material.Styles.Assists"
-        xmlns:cc="clr-namespace:Material.Styles">
-
-    <Style Selector="cc|DialogHost">
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="ClipToBounds" Value="False" />
-        <Setter Property="Padding" Value="8" />
-        <Setter Property="Template">
-            <ControlTemplate>
-                <Grid Background="Transparent" ClipToBounds="False">
-                    <ContentPresenter Name="ContentPresenter"
-                                      Margin="{TemplateBinding Padding}"
-                                      Content="{TemplateBinding Content}"
-                                      ContentTemplate="{TemplateBinding ContentTemplate}" />
-                    <Border Name="PART_Scrim" Background="Black"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch">
-                        <Border.Styles>
-                            <Style Selector="cc|DialogHost:not(.notransitions) /template/ Border#PART_Scrim">
-                                <Setter Property="Transitions">
-                                    <Transitions>
-                                        <DoubleTransition Duration="0:0:0.3" Property="Opacity" Easing="CubicEaseInOut" />
-                                    </Transitions>
-                                </Setter>
-                            </Style>
-                        </Border.Styles>
-                    </Border>
-                    <ContentPresenter Name="ContentPresenter"
-                                      Content="{TemplateBinding DialogContent}"
-                                      ContentTemplate="{TemplateBinding DialogTemplateContent}" />
-                </Grid>
-            </ControlTemplate>
-        </Setter>
-    </Style>
-</Styles>
\ No newline at end of file
diff --git a/Material.Styles/DialogHost.xaml.cs b/Material.Styles/DialogHost.xaml.cs
deleted file mode 100644
index 6a92c495..00000000
--- a/Material.Styles/DialogHost.xaml.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Controls.Templates; 
-
-namespace Material.Styles {
-    [Obsolete("Do not use DialogHost since it doesnt ready for use!")]
-    public class DialogHost : ContentControl { 
-
-        public static readonly StyledProperty<bool> InsideClippingProperty =
-            AvaloniaProperty.Register<DialogHost, bool>(nameof(InsideClipping), true);
-
-        /// <summary>
-        /// Get or set the inside border clipping.
-        /// </summary>
-        public bool InsideClipping
-        {
-            get => GetValue(InsideClippingProperty);
-            set => SetValue(InsideClippingProperty, value);
-        }
-
-
-        public static readonly StyledProperty<object> DialogContentProperty =
-            AvaloniaProperty.Register<DialogHost, object>(nameof(DialogContent));
-         
-        public object DialogContent
-        {
-            get => GetValue(DialogContentProperty);
-            set => SetValue(DialogContentProperty, value);
-        }
-
-        public static readonly StyledProperty<IDataTemplate> DialogTemplateContentProperty =
-            AvaloniaProperty.Register<DialogHost, IDataTemplate>(nameof(DialogTemplateContent));
-         
-        public IDataTemplate DialogTemplateContent
-        {
-            get => GetValue(DialogTemplateContentProperty);
-            set => SetValue(DialogTemplateContentProperty, value);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Material.Styles/Label.axaml b/Material.Styles/Label.axaml
new file mode 100644
index 00000000..49462922
--- /dev/null
+++ b/Material.Styles/Label.axaml
@@ -0,0 +1,21 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Style Selector="Label">
+    <Setter Property="Padding" Value="3" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Content="{TemplateBinding Content}"
+                          Padding="{TemplateBinding Padding}"
+                          RecognizesAccessKey="True"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" />
+      </ControlTemplate>
+    </Setter>
+  </Style>
+</Styles>
\ No newline at end of file
diff --git a/Material.Styles/Material.Styles.csproj b/Material.Styles/Material.Styles.csproj
index 776c5f44..eddcd361 100644
--- a/Material.Styles/Material.Styles.csproj
+++ b/Material.Styles/Material.Styles.csproj
@@ -56,6 +56,7 @@
 
     <ItemGroup>
       <PackageReference Include="Avalonia" Version="0.10.7" />
+      <PackageReference Include="DialogHost.Avalonia" Version="0.3.1" />
       <PackageReference Include="Material.Icons" Version="1.0.8" />
       <PackageReference Include="Material.Icons.Avalonia" Version="1.0.2" />
     </ItemGroup>
diff --git a/Material.Styles/MaterialToolKit.xaml b/Material.Styles/MaterialToolKit.xaml
index 54313c77..5ae038fd 100644
--- a/Material.Styles/MaterialToolKit.xaml
+++ b/Material.Styles/MaterialToolKit.xaml
@@ -30,6 +30,7 @@
     <StyleInclude Source="avares://Material.Styles/FocusAdorner.xaml" />
     <StyleInclude Source="avares://Material.Styles/GridSplitter.xaml" />
     <StyleInclude Source="avares://Material.Styles/ItemsControl.xaml" />
+    <StyleInclude Source="avares://Material.Styles/Label.axaml" />
     <StyleInclude Source="avares://Material.Styles/ListBox.xaml" />
     <StyleInclude Source="avares://Material.Styles/ListBoxItem.xaml" />
     <StyleInclude Source="avares://Material.Styles/Menu.xaml" />
@@ -60,6 +61,9 @@
     <StyleInclude Source="avares://Material.Styles/Window.xaml" />
     <StyleInclude Source="avares://Material.Styles/WindowNotificationManager.xaml" />
     <StyleInclude Source="avares://Material.Ripple/RippleEffect.xaml" />
+    <!-- dialog host -->
+    <StyleInclude Source="avares://DialogHost.Avalonia/Styles.xaml" />
+    <StyleInclude Source="avares://Material.Styles/DialogHost.axaml" />
     <!--custom controls-->
     <StyleInclude Source="avares://Material.Styles/FloatingButton.xaml" />
     <StyleInclude Source="avares://Material.Styles/Card.xaml"/>
diff --git a/Material.Styles/SnackbarHost.xaml b/Material.Styles/SnackbarHost.xaml
index 5b972be7..a97fe1e9 100644
--- a/Material.Styles/SnackbarHost.xaml
+++ b/Material.Styles/SnackbarHost.xaml
@@ -15,7 +15,7 @@
         <Panel>
           <ContentPresenter Content="{TemplateBinding Content}"
                             ContentTemplate="{TemplateBinding ContentTemplate}" />
-          <ItemsControl HorizontalAlignment="Left" VerticalAlignment="Bottom"
+          <ItemsControl HorizontalAlignment="{TemplateBinding SnackbarHorizontalAlignment}" VerticalAlignment="{TemplateBinding SnackbarVerticalAlignment}"
                         Items="{CompiledBinding $parent[cc:SnackbarHost].SnackbarModels}">
             <ItemsControl.ItemsPanel>
               <ItemsPanelTemplate>
@@ -45,4 +45,4 @@
       </ControlTemplate>
     </Setter>
   </Style>
-</Styles>
\ No newline at end of file
+</Styles>
diff --git a/Material.Styles/SnackbarHost.xaml.cs b/Material.Styles/SnackbarHost.xaml.cs
index 49a2775a..9932d6e6 100644
--- a/Material.Styles/SnackbarHost.xaml.cs
+++ b/Material.Styles/SnackbarHost.xaml.cs
@@ -8,6 +8,7 @@
 using Avalonia.Controls;
 using Avalonia.LogicalTree;
 using Avalonia.Controls.Primitives;
+using Avalonia.Layout;
 using Avalonia.Threading;
 using Material.Styles.Models;
 
@@ -38,6 +39,24 @@ public string HostName
         public static readonly StyledProperty<string> HostNameProperty =
             AvaloniaProperty.Register<SnackbarHost, string>(nameof(HostName));
 
+        public HorizontalAlignment SnackbarHorizontalAlignment
+        {
+            get => GetValue(SnackbarHorizontalAlignmentProperty);
+            set => SetValue(SnackbarHorizontalAlignmentProperty, value);
+        }
+
+        public static readonly StyledProperty<HorizontalAlignment> SnackbarHorizontalAlignmentProperty =
+            AvaloniaProperty.Register<SnackbarHost, HorizontalAlignment>(nameof(SnackbarHorizontalAlignment), HorizontalAlignment.Left);
+
+        public VerticalAlignment SnackbarVerticalAlignment
+        {
+            get => GetValue(SnackbarVerticalAlignmentProperty);
+            set => SetValue(SnackbarVerticalAlignmentProperty, value);
+        }
+
+        public static readonly StyledProperty<VerticalAlignment> SnackbarVerticalAlignmentProperty =
+            AvaloniaProperty.Register<SnackbarHost, VerticalAlignment>(nameof(SnackbarVerticalAlignment), VerticalAlignment.Bottom);
+
         static SnackbarHost()
         {
             _snackbarHosts = new HashSet<SnackbarHost>();
diff --git a/Material.Styles/TextBox.xaml b/Material.Styles/TextBox.xaml
index 3d6aa063..e2c1df1d 100644
--- a/Material.Styles/TextBox.xaml
+++ b/Material.Styles/TextBox.xaml
@@ -121,7 +121,10 @@
                                        </Panel>
                                     </ScrollViewer>
                                     </Panel>
-                                    <ContentPresenter Grid.Column="2" Content="{TemplateBinding InnerRightContent}" />
+                                    <StackPanel Grid.Column="2" Orientation="Horizontal">
+                                        <ContentPresenter Content="{TemplateBinding InnerRightContent}" />
+                                        <Border Name="PART_AssistButtonsContainer"/>
+                                    </StackPanel>
                                     <styles:MaterialUnderline Grid.ColumnSpan="3" Classes="MirrorY"
                                                               VerticalAlignment="Bottom"
                                                               Name="PART_Underline" />
@@ -272,7 +275,10 @@
                                         </Panel>
                                     </ScrollViewer>
                                     </Panel>
-                                    <ContentPresenter Grid.Column="2" Content="{TemplateBinding InnerRightContent}" />
+                                    <StackPanel Grid.Column="2" Orientation="Horizontal">
+                                        <ContentPresenter Content="{TemplateBinding InnerRightContent}" />
+                                        <Border Name="PART_AssistButtonsContainer"/>
+                                    </StackPanel>
                                     <styles:MaterialUnderline Grid.ColumnSpan="3" Classes="MirrorY"
                                                               VerticalAlignment="Bottom"
                                                               Name="PART_Underline" />
@@ -423,7 +429,10 @@
                                     </Panel>
                                 </ScrollViewer>
                                 </Panel>
-                                <ContentPresenter Grid.Column="2" Content="{TemplateBinding InnerRightContent}" />
+                                <StackPanel Grid.Column="2" Orientation="Horizontal">
+                                    <ContentPresenter Content="{TemplateBinding InnerRightContent}" />
+                                    <Border Name="PART_AssistButtonsContainer"/>
+                                </StackPanel>
                             </Grid>
 
                         </Grid>
@@ -497,13 +506,13 @@
     <!-- Additional decorations for TextFields -->
     <!-- ReSharper disable InconsistentNaming -->
     
-    <Style Selector="TextBox.clearButton, TextBox.revealPasswordButton">
+    <!--Style Selector="TextBox.clearButton, TextBox.revealPasswordButton">
         <Setter Property="InnerRightContent">
             <Template>
                 <Border Name="PART_AssistButtonsContainer"/>
             </Template>
         </Setter>
-    </Style> 
+    </Style--> 
     
     <Style Selector="TextBox.clearButton[AcceptsReturn=False][IsReadOnly=False]:not(TextBox:empty) Border#PART_AssistButtonsContainer">
         <Setter Property="Child">
@@ -520,7 +529,8 @@
     <Style Selector="TextBox.revealPasswordButton[AcceptsReturn=False][IsReadOnly=False] Border#PART_AssistButtonsContainer">
         <Setter Property="Child">
             <Template>
-                <ToggleButton Name="PART_PasswordRevealToggle" Classes="Icon ConstantForeground" BorderThickness="0"
+                <ToggleButton Name="PART_PasswordRevealToggle" Classes="Icon ImplicitForeground ConstantForeground" BorderThickness="0"
+                              wpf:ToggleButtonAssist.UncheckedForeground="{DynamicResource PrimaryHueMidBrush}"
                               Width="{Binding Path=$self.Height}" Cursor="Arrow" Focusable="True" Padding="4"
                               IsChecked="{Binding $parent[TextBox].RevealPassword, Mode=OneWayToSource}" >
                     <ToggleButton.Styles>
diff --git a/Material.Styles/Themes/PaletteHelper.cs b/Material.Styles/Themes/PaletteHelper.cs
index 8a3a2d3c..e2192b09 100644
--- a/Material.Styles/Themes/PaletteHelper.cs
+++ b/Material.Styles/Themes/PaletteHelper.cs
@@ -1,28 +1,42 @@
 using System;
+using System.Linq;
 using Avalonia;
+using Avalonia.Controls;
 
 namespace Material.Styles.Themes {
     public class PaletteHelper {
-        public virtual ITheme GetTheme() {
+        public virtual BundledTheme? LocateBundledTheme() {
             if (Application.Current == null)
-                throw new InvalidOperationException(
-                    "Cannot get theme outside of a WPF application. Use ResourceDictionaryExtensions.GetTheme on the appropriate resource dictionary instead.");
-            return Application.Current.Resources.GetTheme();
+                throw new InvalidOperationException("Cannot locate BundledTheme outside of a Avalonia application. Use ResourceDictionaryExtensions.GetTheme on the appropriate resource dictionary instead.");
+            return LocateBundledThemeInternal(Application.Current.Resources);
+        }
+
+        private BundledTheme? LocateBundledThemeInternal(IResourceDictionary dictionary) {
+            if (dictionary is BundledTheme bundledTheme) {
+                return bundledTheme;
+            }
+            return dictionary.MergedDictionaries
+                .Select(provider => provider as IResourceDictionary)
+                .Where(resourceDictionary => resourceDictionary != null)
+                .Select(LocateBundledThemeInternal!)
+                .FirstOrDefault();
+        }
+
+        private IResourceDictionary GetBundledThemeOrRoot() {
+            return LocateBundledTheme() ?? Application.Current.Resources;
+        }
+
+        public virtual ITheme GetTheme() {
+            return GetBundledThemeOrRoot().GetTheme();
         }
 
         public virtual void SetTheme(ITheme theme) {
             if (theme == null) throw new ArgumentNullException(nameof(theme));
-            if (Application.Current == null)
-                throw new InvalidOperationException(
-                    "Cannot set theme outside of a WPF application. Use ResourceDictionaryExtensions.SetTheme on the appropriate resource dictionary instead.");
-            Application.Current.Resources.SetTheme(theme);
+            GetBundledThemeOrRoot().SetTheme(theme);
         }
 
         public virtual IThemeManager GetThemeManager() {
-            if (Application.Current == null)
-                throw new InvalidOperationException(
-                    "Cannot get ThemeManager. Use ResourceDictionaryExtensions.GetThemeManager on the appropriate resource dictionary instead.");
-            return Application.Current.Resources.GetThemeManager();
+            return GetBundledThemeOrRoot().GetThemeManager();
         }
     }
 }
\ No newline at end of file
diff --git a/Material.Styles/TreeView.xaml b/Material.Styles/TreeView.xaml
index 9a6becc5..69e5342e 100644
--- a/Material.Styles/TreeView.xaml
+++ b/Material.Styles/TreeView.xaml
@@ -93,39 +93,53 @@
     <Style Selector="TreeViewItem[ItemCount=0] /template/ ToggleButton#Expander">
         <Setter Property="Opacity" Value="0" />
     </Style>
+    
+    <!-- Statements for transition elements -->
+    <!-- Default statement - hover border and selected border should have invisible (full-transparent) -->
     <Style Selector="TreeViewItem /template/ Border#MouseOverBorder">
         <Setter Property="Opacity" Value="0" />
     </Style>
-    <Style Selector="TreeViewItem:pointerover /template/ Border#MouseOverBorder">
-        <Style.Animations>
-            <animations:ReverseAfterEndAnimation>
-                <Animation Duration="0:0:0.2" FillMode="Both">
-                    <KeyFrame Cue="0%">
-                        <Setter Property="Opacity" Value="0" />
-                    </KeyFrame>
-                    <KeyFrame Cue="100%">
-                        <Setter Property="Opacity" Value="0.1" />
-                    </KeyFrame>
-                </Animation>
-            </animations:ReverseAfterEndAnimation>
-        </Style.Animations>
-    </Style>
     <Style Selector="TreeViewItem /template/ Border#SelectedBorder">
         <Setter Property="Opacity" Value="0" />
     </Style>
+    
+    <Style Selector="ToggleButton.MaterialDesignExpandCollapseToggleStyle /template/ Path#ExpandPath">
+        <Setter Property="RenderTransform" Value="rotate(0deg)" />
+    </Style>
+    
+    
+    <!-- Set hover highlight to semi-transparent barely visible when cursor hovering TreeViewItem -->
+    <Style Selector="TreeViewItem:pointerover /template/ Border#MouseOverBorder">
+        <Setter Property="Opacity" Value="0.1" />
+    </Style>
+    
+    <!-- Set selected highlight to semi-transparent visible when user selected TreeViewItem -->
     <Style Selector="TreeViewItem:selected /template/ Border#SelectedBorder">
-        <Style.Animations>
-            <animations:ReverseAfterEndAnimation>
-                <Animation Duration="0:0:0.2" FillMode="Both">
-                    <KeyFrame Cue="0%">
-                        <Setter Property="Opacity" Value="0" />
-                    </KeyFrame>
-                    <KeyFrame Cue="100%">
-                        <Setter Property="Opacity" Value="0.3" />
-                    </KeyFrame>
-                </Animation>
-            </animations:ReverseAfterEndAnimation>
-        </Style.Animations>
+        <Setter Property="Opacity" Value="0.3" />
+    </Style>
+    
+    <!-- Rotate the arrow to 45 degrees when TreeViewItem expanded -->
+    <Style Selector="ToggleButton.MaterialDesignExpandCollapseToggleStyle:checked /template/ Path#ExpandPath">
+        <Setter Property="RenderTransform" Value="rotate(45deg)" />
+    </Style>
+    
+    
+    <!-- Transitions -->
+    <Style Selector="TreeViewItem:not(.notransitions) /template/ Border#SelectedBorder,
+                   TreeViewItem:not(.notransitions) /template/ Border#MouseOverBorder">
+        <Setter Property="Transitions">
+            <Transitions>
+                <DoubleTransition Duration="0:0:0.25" Property="Opacity" Easing="LinearEasing" />
+            </Transitions>
+        </Setter>
+    </Style>
+    
+    <Style Selector="ToggleButton.MaterialDesignExpandCollapseToggleStyle:not(.notransitions) /template/ Path#ExpandPath">
+        <Setter Property="Transitions">
+            <Transitions>
+                <TransformOperationsTransition Duration="0:0:0.25" Property="RenderTransform" Easing="CircularEaseOut" />
+            </Transitions>
+        </Setter>
     </Style>
 
     <Style Selector="ToggleButton.MaterialDesignExpandCollapseToggleStyle">
@@ -150,18 +164,4 @@
             </Setter.Value>
         </Setter>
     </Style>
-    <Style Selector="ToggleButton.MaterialDesignExpandCollapseToggleStyle:checked /template/ Path#ExpandPath">
-        <Style.Animations>
-            <animations:ReverseAfterEndAnimation>
-                <Animation Duration="0:0:0.2" FillMode="Both">
-                    <KeyFrame Cue="0%">
-                        <Setter Property="RotateTransform.Angle" Value="0" />
-                    </KeyFrame>
-                    <KeyFrame Cue="100%">
-                        <Setter Property="RotateTransform.Angle" Value="45" />
-                    </KeyFrame>
-                </Animation>
-            </animations:ReverseAfterEndAnimation>
-        </Style.Animations>
-    </Style>
 </Styles>
\ No newline at end of file