diff --git a/.github/labeler.yml b/.github/labeler.yml
index 56acb887f..1516e2e58 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,29 +1,40 @@
----
 PR:
   - "*"
 
+dotnet:
+  - '**/*.cs'
+  
 github_actions:
-  - .github/workflows/*
+  - ".github/workflows/*"
 
 documentation:
-  - docs/*
+  - "docs/*"
 
 update:
-  - src/Directory.Build.props
+  - "src/Directory.Build.props"
 
-controls:
-  - src/Wpf.Ui/Controls/*
+dependencies:
+  - "src/Packages.props"
+  - "branding/package.json"
+  - "src/Packages.props"
+
+NuGet:
+  - "src/Packages.props"
 
 styles:
-  - src/Wpf.Ui/Styles/*
+  - "src/Wpf.Ui/**/*.xaml"
 
-icons:
-  - src/Wpf.Ui/Fonts/FluentSystemIcons-Filled.ttf
-  - src/Wpf.Ui/Fonts/FluentSystemIcons-Regular.ttf
+themes:
+  - "src/Wpf.Ui/Appearance/*"
 
-dependencies:
-  - src/Packages.props
-  - branding/package.json
+tray:
+  - "src/Wpf.Ui.Tray/*"
 
-NuGet:
-  - src/Packages.props
+controls:
+  - "src/Wpf.Ui/Controls/*"
+
+icons:
+  - "src/Wpf.Ui/Resources/Fonts/*"
+
+navigation:
+  - "src/Wpf.Ui/Controls/NavigationView/*"
diff --git a/.github/labels.yml b/.github/labels.yml
index 396124380..fa1849006 100644
--- a/.github/labels.yml
+++ b/.github/labels.yml
@@ -1,4 +1,3 @@
----
 - name: "icons"
   color: "86CBEC"
   description: "Fonts and icons updates"
@@ -47,6 +46,9 @@
 - name: ".NET"
   color: "7121c6"
   description: "Pull requests that update .NET code."
+- name: "dotnet"
+  color: "7121c6"
+  description: "Pull requests that update .NET code."
 - name: "NuGet"
   color: "004880"
   description: "Update of the NuGet package."
@@ -71,3 +73,4 @@
 - name: "wontfix"
   color: "ffffff"
   description: "This will not be worked on."
+  
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 000000000..884f651c4
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,39 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ development ]
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: windows-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - uses: microsoft/setup-msbuild@v1.3
+      with:
+        msbuild-architecture: x64
+
+    - name: Setup .NET Core SDK 8.x
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 8.x
+
+    - name: Install dependencies
+      run: dotnet restore
+
+    - name: Build
+      run: dotnet build src\Wpf.Ui.Gallery\Wpf.Ui.Gallery.csproj --configuration Release --no-restore
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: "csharp"
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
diff --git a/Directory.Build.props b/Directory.Build.props
index 5214885e2..a09c48302 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <Version>3.0.0</Version>
+    <Version>3.0.1</Version>
     <LangVersion>12.0</LangVersion>
     <Deterministic>true</Deterministic>
   </PropertyGroup>
diff --git a/README.md b/README.md
index 5650a4fb9..9e2eefa6c 100644
--- a/README.md
+++ b/README.md
@@ -127,15 +127,16 @@ public partial class MainWindow
 Now you can create fantastic apps, e.g. with one button:
 
 ```xml
-<ui:UiWindow
+<ui:FluentWindow
   ...
   xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml">
-  <Grid>
-    <ui:Button
-      Content="Hello World"
-      Icon="Fluent24"/>
-  </Grid>
-</ui:UiWindow>
+  <StackPanel>
+      <ui:TitleBar Title="WPF UI"/>
+      <ui:Card Margin="8">
+          <ui:Button Content="Hello World" Icon="{ui:SymbolIcon Fluent24}" />
+      </ui:Card>
+  </StackPanel>
+</ui:FluentWindow>
 ```
 
 ## Special thanks
diff --git a/src/Wpf.Ui/Appearance/ApplicationThemeManager.cs b/src/Wpf.Ui/Appearance/ApplicationThemeManager.cs
index a4f7b7694..b96e2cbbb 100644
--- a/src/Wpf.Ui/Appearance/ApplicationThemeManager.cs
+++ b/src/Wpf.Ui/Appearance/ApplicationThemeManager.cs
@@ -233,7 +233,7 @@ public static void ApplySystemTheme(bool updateAccent)
             themeToSet = ApplicationTheme.HighContrast;
         }
 
-        Apply(themeToSet);
+        Apply(themeToSet, updateAccent: updateAccent);
     }
 
     /// <summary>
diff --git a/src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml b/src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml
index d63fb518d..2e8e596c6 100644
--- a/src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml
+++ b/src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml
@@ -20,7 +20,7 @@
     <Thickness x:Key="ComboBoxBorderThemeThickness">1,1,1,1</Thickness>
     <Thickness x:Key="ComboBoxAccentBorderThemeThickness">0,0,0,2</Thickness>
     <Thickness x:Key="ComboBoxChevronMargin">8,0,10,0</Thickness>
-    <Thickness x:Key="ComboBoxItemMargin">3,2,3,0</Thickness>
+    <Thickness x:Key="ComboBoxItemMargin">6,4,6,0</Thickness>
     <Thickness x:Key="ComboBoxItemContentMargin">10,8,8,8</Thickness>
     <system:Double x:Key="ComboBoxChevronSize">11.0</system:Double>
     <system:Double x:Key="ComboBoxPopupMinHeight">32.0</system:Double>
@@ -92,7 +92,6 @@
         <!--  Universal WPF UI focus  -->
         <Setter Property="Foreground" Value="{DynamicResource ComboBoxForeground}" />
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Margin" Value="{StaticResource ComboBoxItemMargin}" />
         <Setter Property="Padding" Value="{StaticResource ComboBoxItemContentMargin}" />
         <Setter Property="Cursor" Value="Hand" />
         <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
@@ -101,10 +100,10 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ComboBoxItem}">
-                    <Grid>
+                    <Grid Background="Transparent">
                         <Border
                             Name="ContentBorder"
-                            Margin="{TemplateBinding Margin}"
+                            Margin="{DynamicResource ComboBoxItemMargin}"
                             Padding="0"
                             VerticalAlignment="Stretch"
                             CornerRadius="{TemplateBinding Border.CornerRadius}"
diff --git a/src/Wpf.Ui/Controls/ContentDialog/ContentDialog.xaml b/src/Wpf.Ui/Controls/ContentDialog/ContentDialog.xaml
index ddb90575e..b0adce341 100644
--- a/src/Wpf.Ui/Controls/ContentDialog/ContentDialog.xaml
+++ b/src/Wpf.Ui/Controls/ContentDialog/ContentDialog.xaml
@@ -24,7 +24,9 @@
         <Setter Property="DialogMaxWidth" Value="1000" />
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="Focusable" Value="False" />
+        <Setter Property="Focusable" Value="True" />
+        <Setter Property="KeyboardNavigation.TabNavigation" Value="Cycle" />
+        <Setter Property="KeyboardNavigation.DirectionalNavigation" Value="Cycle" />
         <Setter Property="DialogMargin" Value="35" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Foreground" Value="{DynamicResource ContentDialogForeground}" />
diff --git a/src/Wpf.Ui/Controls/NavigationView/NavigationView.Properties.cs b/src/Wpf.Ui/Controls/NavigationView/NavigationView.Properties.cs
index 592ef644c..4c5ecd779 100644
--- a/src/Wpf.Ui/Controls/NavigationView/NavigationView.Properties.cs
+++ b/src/Wpf.Ui/Controls/NavigationView/NavigationView.Properties.cs
@@ -7,6 +7,7 @@
 // Copyright(c) Microsoft Corporation.All rights reserved.
 
 using System.Collections;
+using System.Collections.Specialized;
 using System.Windows.Controls;
 using Wpf.Ui.Animations;
 
@@ -82,7 +83,7 @@ public partial class NavigationView
         nameof(FooterMenuItemsProperty),
         typeof(IList),
         typeof(NavigationView),
-        new FrameworkPropertyMetadata(null)
+        new FrameworkPropertyMetadata(null, OnFooterMenuItemsPropertyChanged)
     );
 
     /// <summary>
@@ -513,16 +514,45 @@ private static void OnMenuItemsPropertyChanged(DependencyObject? d, DependencyPr
 
         if (navigationView.MenuItemsItemsControl is null)
         {
+            navigationView.UpdateCollectionChangedEvent(e.OldValue as IList, e.NewValue as IList);
             return;
         }
 
         if (navigationView.MenuItemsItemsControl.ItemsSource.Equals(enumerableNewValue))
         {
+            navigationView.UpdateMenuItemsTemplate(enumerableNewValue);
             return;
         }
 
         navigationView.MenuItemsItemsControl.ItemsSource = null;
         navigationView.MenuItemsItemsControl.ItemsSource = enumerableNewValue;
+        navigationView.UpdateMenuItemsTemplate(enumerableNewValue);
+        navigationView.AddItemsToDictionaries(enumerableNewValue);
+
+        navigationView.UpdateCollectionChangedEvent(e.OldValue as IList, e.NewValue as IList);
+    }
+
+    private void UpdateCollectionChangedEvent(IList? oldMenuItems, IList? newMenuItems)
+    {
+        if(oldMenuItems is INotifyCollectionChanged notifyCollection)
+        {
+            notifyCollection.CollectionChanged -= OnMenuItems_CollectionChanged;
+        }
+        if(newMenuItems is INotifyCollectionChanged newNotifyCollection)
+        {
+            newNotifyCollection.CollectionChanged += OnMenuItems_CollectionChanged;
+        }
+    }
+
+    private void OnMenuItems_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
+    {
+        if (e.NewItems is null)
+        {
+            return;
+        }
+
+        UpdateMenuItemsTemplate(e.NewItems);
+        AddItemsToDictionaries(e.NewItems);
     }
 
     private static void OnMenuItemsSourcePropertyChanged(
@@ -551,6 +581,31 @@ DependencyPropertyChangedEventArgs e
         navigationView.FooterMenuItems = enumerableNewValue;
     }
 
+    private static void OnFooterMenuItemsPropertyChanged(DependencyObject? d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is not NavigationView navigationView || e.NewValue is not IList enumerableNewValue)
+        {
+            return;
+        }
+
+        if (navigationView.FooterMenuItemsItemsControl is null)
+        {
+            navigationView.UpdateCollectionChangedEvent(e.OldValue as IList, e.NewValue as IList);
+            return;
+        }
+
+        if (navigationView.FooterMenuItemsItemsControl.ItemsSource.Equals(enumerableNewValue))
+        {
+            return;
+        }
+
+        navigationView.FooterMenuItemsItemsControl.ItemsSource = null;
+        navigationView.FooterMenuItemsItemsControl.ItemsSource = enumerableNewValue;
+        navigationView.UpdateMenuItemsTemplate(enumerableNewValue);
+        navigationView.AddItemsToDictionaries(enumerableNewValue);
+        navigationView.UpdateCollectionChangedEvent(e.OldValue as IList, e.NewValue as IList);
+    }
+
     private static void OnPaneDisplayModePropertyChanged(
         DependencyObject? d,
         DependencyPropertyChangedEventArgs e
diff --git a/src/Wpf.Ui/Controls/NavigationView/NavigationViewCompact.xaml b/src/Wpf.Ui/Controls/NavigationView/NavigationViewCompact.xaml
index 78d2e1c60..29b31e856 100644
--- a/src/Wpf.Ui/Controls/NavigationView/NavigationViewCompact.xaml
+++ b/src/Wpf.Ui/Controls/NavigationView/NavigationViewCompact.xaml
@@ -17,7 +17,7 @@
             <Border
                 x:Name="MainBorder"
                 Grid.Row="0"
-                MinWidth="310"
+                MinWidth="40"
                 MinHeight="40"
                 Margin="0"
                 Padding="0"
diff --git a/src/Wpf.Ui/Controls/NavigationView/NavigationViewLeftMinimalCompact.xaml b/src/Wpf.Ui/Controls/NavigationView/NavigationViewLeftMinimalCompact.xaml
index b362c47f5..c57065f4f 100644
--- a/src/Wpf.Ui/Controls/NavigationView/NavigationViewLeftMinimalCompact.xaml
+++ b/src/Wpf.Ui/Controls/NavigationView/NavigationViewLeftMinimalCompact.xaml
@@ -15,7 +15,7 @@
             <Border
                 x:Name="MainBorder"
                 Grid.Row="0"
-                MinWidth="310"
+                MinWidth="40"
                 MinHeight="40"
                 Margin="0"
                 Padding="0"
diff --git a/src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml b/src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml
index 12dce7090..b9788ab89 100644
--- a/src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml
+++ b/src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml
@@ -82,6 +82,7 @@
                                     VerticalAlignment="Top"
                                     Content="{TemplateBinding Icon}"
                                     FontSize="16"
+                                    IsTabStop="False"
                                     Foreground="{TemplateBinding Foreground}" />
                                 <Grid Grid.Column="1" Margin="{TemplateBinding Padding}">
                                     <Decorator
@@ -115,6 +116,7 @@
                                     Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
                                     CommandParameter="clear"
                                     Cursor="Arrow"
+                                    IsTabStop="False"
                                     Foreground="{DynamicResource TextControlButtonForeground}">
                                     <controls:Button.Icon>
                                         <controls:SymbolIcon FontSize="{StaticResource NumberBoxButtonIconSize}" Symbol="Dismiss24" />
@@ -138,6 +140,7 @@
                                     CommandParameter="increment"
                                     Cursor="Arrow"
                                     Foreground="{DynamicResource TextControlButtonForeground}"
+                                    IsTabStop="False"
                                     Visibility="Collapsed">
                                     <controls:Button.Icon>
                                         <controls:SymbolIcon FontSize="{StaticResource NumberBoxButtonIconSize}" Symbol="ChevronUp24" />
@@ -162,6 +165,7 @@
                                     Cursor="Arrow"
                                     FontSize="{StaticResource NumberBoxButtonIconSize}"
                                     Foreground="{DynamicResource TextControlButtonForeground}"
+                                    IsTabStop="False"
                                     Visibility="Collapsed">
                                     <controls:Button.Icon>
                                         <controls:SymbolIcon FontSize="{StaticResource NumberBoxButtonIconSize}" Symbol="ChevronDown24" />
@@ -175,6 +179,7 @@
                                     VerticalAlignment="Top"
                                     Content="{TemplateBinding Icon}"
                                     FontSize="16"
+                                    IsTabStop="False"
                                     Foreground="{TemplateBinding Foreground}" />
                             </Grid>
                         </Border>
diff --git a/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.xaml b/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.xaml
index 862188d46..6d02f27e8 100644
--- a/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.xaml
+++ b/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.xaml
@@ -206,6 +206,7 @@
                                     Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
                                     CommandParameter="clear"
                                     Cursor="Arrow"
+                                    IsTabStop="False"
                                     Foreground="{DynamicResource TextControlButtonForeground}">
                                     <controls:Button.Icon>
                                         <controls:SymbolIcon FontSize="{StaticResource PasswordBoxButtonIconSize}" Symbol="Dismiss24" />
@@ -229,6 +230,7 @@
                                     Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
                                     CommandParameter="reveal"
                                     Cursor="Arrow"
+                                    IsTabStop="False"
                                     Foreground="{DynamicResource TextControlButtonForeground}">
                                     <controls:Button.Icon>
                                         <controls:SymbolIcon FontSize="{StaticResource PasswordBoxButtonIconSize}" Symbol="Eye24" />
diff --git a/src/Wpf.Ui/Controls/ProgressBar/ProgressBar.xaml b/src/Wpf.Ui/Controls/ProgressBar/ProgressBar.xaml
index 9c3e1be21..cced092ad 100644
--- a/src/Wpf.Ui/Controls/ProgressBar/ProgressBar.xaml
+++ b/src/Wpf.Ui/Controls/ProgressBar/ProgressBar.xaml
@@ -1,4 +1,4 @@
-<!--
+<!--
     This Source Code Form is subject to the terms of the MIT License.
     If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
     Copyright (C) Leszek Pomianowski and WPF UI Contributors.
@@ -19,6 +19,26 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ProgressBar}">
                     <Grid Name="TemplateRoot" SnapsToDevicePixels="True">
+                        <Grid.Style>
+                            <Style TargetType="Grid">
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Orientation}" Value="Horizontal">
+                                        <Setter Property="LayoutTransform">
+                                            <Setter.Value>
+                                                <RotateTransform Angle="0" />
+                                            </Setter.Value>
+                                        </Setter>
+                                    </DataTrigger>
+                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Orientation}" Value="Vertical">
+                                        <Setter Property="LayoutTransform">
+                                            <Setter.Value>
+                                                <RotateTransform Angle="-90" />
+                                            </Setter.Value>
+                                        </Setter>
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </Grid.Style>
                         <Border
                             Margin="1,1,1,1"
                             Background="{TemplateBinding Background}"
@@ -42,6 +62,26 @@
                     <Setter.Value>
                         <ControlTemplate TargetType="{x:Type ProgressBar}">
                             <Grid Name="TemplateRoot">
+                                <Grid.Style>
+                                    <Style TargetType="Grid">
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Orientation}" Value="Horizontal">
+                                                <Setter Property="LayoutTransform">
+                                                    <Setter.Value>
+                                                        <RotateTransform Angle="0" />
+                                                    </Setter.Value>
+                                                </Setter>
+                                            </DataTrigger>
+                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Orientation}" Value="Vertical">
+                                                <Setter Property="LayoutTransform">
+                                                    <Setter.Value>
+                                                        <RotateTransform Angle="-90" />
+                                                    </Setter.Value>
+                                                </Setter>
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </Grid.Style>
                                 <Border
                                     Margin="1,1,1,1"
                                     Background="{DynamicResource ProgressBarIndeterminateBackground}"
diff --git a/src/Wpf.Ui/Controls/TextBox/TextBox.xaml b/src/Wpf.Ui/Controls/TextBox/TextBox.xaml
index d7cfcb677..bbfc4cca1 100644
--- a/src/Wpf.Ui/Controls/TextBox/TextBox.xaml
+++ b/src/Wpf.Ui/Controls/TextBox/TextBox.xaml
@@ -206,6 +206,7 @@
                         BorderBrush="Transparent"
                         Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
                         Cursor="Arrow"
+                        IsTabStop="False"
                         Foreground="{DynamicResource TextControlButtonForeground}">
                         <controls:Button.Icon>
                             <controls:SymbolIcon FontSize="{TemplateBinding FontSize}" Symbol="Dismiss24" />
diff --git a/src/Wpf.Ui/Controls/TitleBar/TitleBar.cs b/src/Wpf.Ui/Controls/TitleBar/TitleBar.cs
index c0cd90e90..495553dcf 100644
--- a/src/Wpf.Ui/Controls/TitleBar/TitleBar.cs
+++ b/src/Wpf.Ui/Controls/TitleBar/TitleBar.cs
@@ -4,6 +4,7 @@
 // All Rights Reserved.
 
 using System.Diagnostics;
+using System.Windows.Input;
 using Wpf.Ui.Designer;
 using Wpf.Ui.Extensions;
 using Wpf.Ui.Input;
@@ -32,6 +33,10 @@ public class TitleBar : System.Windows.Controls.Control, IThemeControl
     private const string ElementRestoreButton = "PART_RestoreButton";
     private const string ElementCloseButton = "PART_CloseButton";
 
+    private static DpiScale? dpiScale;
+
+    private DependencyObject? parentWindow;
+
     #region Static properties
 
     /// <summary>
@@ -423,6 +428,8 @@ public TitleBar()
     {
         SetValue(TemplateButtonCommandProperty, new RelayCommand<TitleBarButtonType>(OnTemplateButtonClick));
 
+        dpiScale ??= VisualTreeHelper.GetDpi(this);
+
         Loaded += OnLoaded;
         Unloaded += OnUnloaded;
     }
@@ -465,6 +472,15 @@ public override void OnApplyTemplate()
     {
         base.OnApplyTemplate();
 
+        parentWindow = VisualTreeHelper.GetParent(this);
+
+        while (parentWindow != null && parentWindow is not Window)
+        {
+            parentWindow = VisualTreeHelper.GetParent(parentWindow);
+        }
+
+        this.MouseRightButtonUp += TitleBar_MouseRightButtonUp;
+
         _mainGrid = GetTemplateChild<System.Windows.Controls.Grid>(ElementMainGrid);
         _icon = GetTemplateChild<System.Windows.Controls.ContentPresenter>(ElementIcon);
 
@@ -652,6 +668,15 @@ or User32.WM.NCLBUTTONUP
         }
     }
 
+    /// <summary>
+    /// Show 'SystemMenu' on mouse right button up.
+    /// </summary>
+    private void TitleBar_MouseRightButtonUp(object sender, MouseButtonEventArgs e)
+    {
+        var point = PointToScreen(e.GetPosition(this));
+        SystemCommands.ShowSystemMenu(parentWindow as Window, new Point(point.X / dpiScale.Value.DpiScaleX, point.Y / dpiScale.Value.DpiScaleY));
+    }
+
     private T GetTemplateChild<T>(string name)
         where T : DependencyObject
     {
diff --git a/src/Wpf.Ui/Controls/TitleBar/TitleBar.xaml b/src/Wpf.Ui/Controls/TitleBar/TitleBar.xaml
index afdd69040..110a281b8 100644
--- a/src/Wpf.Ui/Controls/TitleBar/TitleBar.xaml
+++ b/src/Wpf.Ui/Controls/TitleBar/TitleBar.xaml
@@ -15,6 +15,7 @@
         <Setter Property="Height" Value="30" />
         <Setter Property="MouseOverBackground" Value="{Binding Path=ButtonsBackground, RelativeSource={RelativeSource AncestorType={x:Type controls:TitleBar}}}" />
         <Setter Property="ButtonsForeground" Value="{Binding Path=ButtonsForeground, RelativeSource={RelativeSource AncestorType={x:Type controls:TitleBar}}}" />
+        <Setter Property="MouseOverButtonsForeground" Value="{Binding Path=MouseOverButtonsForeground, RelativeSource={RelativeSource AncestorType={x:Type controls:TitleBar}}}" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -45,9 +46,6 @@
                         </Viewbox>
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="LayoutRoot" Property="Background" Value="{Binding Path=MouseOverBackground, RelativeSource={RelativeSource TemplatedParent}}" />
-                        </Trigger>
                         <Trigger Property="ButtonType" Value="{x:Static controls:TitleBarButtonType.Help}">
                             <Setter Property="CommandParameter" Value="{x:Static controls:TitleBarButtonType.Help}" />
                             <Setter TargetName="ViewBox" Property="Width" Value="13" />
@@ -74,14 +72,6 @@
                             <Setter Property="CommandParameter" Value="{x:Static controls:TitleBarButtonType.Close}" />
                             <Setter TargetName="CanvasPath" Property="Data" Value="M36,41.1,6.15,71a3.44,3.44,0,0,1-2.53,1A3.55,3.55,0,0,1,0,68.38a3.44,3.44,0,0,1,1.05-2.53L30.9,36,1.05,6.15A3.49,3.49,0,0,1,0,3.59,3.51,3.51,0,0,1,.28,2.18,3.42,3.42,0,0,1,1.05,1,3.82,3.82,0,0,1,2.21.28,3.58,3.58,0,0,1,3.62,0,3.44,3.44,0,0,1,6.15,1.05L36,30.9,65.85,1.05a3.49,3.49,0,0,1,2.56-1A3.39,3.39,0,0,1,69.8.28,3.8,3.8,0,0,1,71,1.05a3.8,3.8,0,0,1,.77,1.15A3.39,3.39,0,0,1,72,3.59a3.49,3.49,0,0,1-1,2.56L41.1,36,71,65.85a3.44,3.44,0,0,1,1,2.53,3.58,3.58,0,0,1-.28,1.41A3.82,3.82,0,0,1,71,71a3.42,3.42,0,0,1-1.14.77,3.66,3.66,0,0,1-4-.77Z" />
                         </Trigger>
-
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="ButtonType" Value="{x:Static controls:TitleBarButtonType.Close}" />
-                                <Condition Property="IsMouseOver" Value="True" />
-                            </MultiTrigger.Conditions>
-                            <Setter Property="Foreground" Value="#FFFFFFFF" />
-                        </MultiTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
@@ -146,7 +136,7 @@
                             <TextBlock
                                 Grid.Column="1"
                                 VerticalAlignment="Center"
-                                FontSize="12"
+                                FontSize="{TemplateBinding FontSize}"
                                 Text="{TemplateBinding Title}" />
                         </Grid>
                         <Grid Grid.Column="1">
@@ -193,6 +183,7 @@
                                     x:Name="PART_CloseButton"
                                     Grid.Column="4"
                                     ButtonType="Close"
+                                    MouseOverButtonsForeground="White"
                                     MouseOverBackground="{DynamicResource PaletteRedBrush}" />
                             </Grid>
                         </Grid>
diff --git a/src/Wpf.Ui/Controls/TitleBar/TitleBarButton.cs b/src/Wpf.Ui/Controls/TitleBar/TitleBarButton.cs
index 876352858..33d2deb9e 100644
--- a/src/Wpf.Ui/Controls/TitleBar/TitleBarButton.cs
+++ b/src/Wpf.Ui/Controls/TitleBar/TitleBarButton.cs
@@ -11,7 +11,7 @@
 // ReSharper disable once CheckNamespace
 namespace Wpf.Ui.Controls;
 
-internal class TitleBarButton : Wpf.Ui.Controls.Button
+public class TitleBarButton : Wpf.Ui.Controls.Button
 {
     /// <summary>
     /// Property for <see cref="ButtonType"/>.
@@ -36,6 +36,19 @@ internal class TitleBarButton : Wpf.Ui.Controls.Button
         )
     );
 
+    /// <summary>
+    /// Property for <see cref="MouseOverButtonsForeground"/>.
+    /// </summary>
+    public static readonly DependencyProperty MouseOverButtonsForegroundProperty = DependencyProperty.Register(
+        nameof(MouseOverButtonsForeground),
+        typeof(Brush),
+        typeof(TitleBarButton),
+        new FrameworkPropertyMetadata(
+            SystemColors.ControlTextBrush,
+            FrameworkPropertyMetadataOptions.Inherits
+        )
+    );
+
     /// <summary>
     /// Sets or gets the
     /// </summary>
@@ -53,11 +66,20 @@ public Brush ButtonsForeground
         get => (Brush)GetValue(ButtonsForegroundProperty);
         set => SetValue(ButtonsForegroundProperty, value);
     }
+    /// <summary>
+    /// Foreground of the navigation buttons while mouse over.
+    /// </summary>
+    public Brush MouseOverButtonsForeground
+    {
+        get => (Brush)GetValue(MouseOverButtonsForegroundProperty);
+        set => SetValue(MouseOverButtonsForegroundProperty, value);
+    }
 
     public bool IsHovered { get; private set; }
 
     private User32.WM_NCHITTEST _returnValue;
     private Brush _defaultBackgroundBrush = Brushes.Transparent; //Should it be transparent?
+    private Brush _cacheButtonsForeground = SystemColors.ControlTextBrush; // cache ButtonsForeground while mouse over
 
     private bool _isClickedDown;
 
@@ -70,6 +92,8 @@ public void Hover()
             return;
 
         Background = MouseOverBackground;
+        _cacheButtonsForeground = ButtonsForeground;
+        ButtonsForeground = MouseOverButtonsForeground;
         IsHovered = true;
     }
 
@@ -82,6 +106,7 @@ public void RemoveHover()
             return;
 
         Background = _defaultBackgroundBrush;
+        ButtonsForeground = _cacheButtonsForeground;
 
         IsHovered = false;
         _isClickedDown = false;
@@ -119,7 +144,6 @@ internal bool ReactToHwndHook(User32.WM msg, IntPtr lParam, out IntPtr returnInt
 
                 RemoveHover();
                 return false;
-
             case User32.WM.NCMOUSELEAVE: // Mouse leaves the window
                 RemoveHover();
                 return false;
diff --git a/src/Wpf.Ui/INavigationService.cs b/src/Wpf.Ui/INavigationService.cs
index 6c3fa683c..fc6075c78 100644
--- a/src/Wpf.Ui/INavigationService.cs
+++ b/src/Wpf.Ui/INavigationService.cs
@@ -20,6 +20,14 @@ public interface INavigationService
     /// <returns><see langword="true"/> if the operation succeeds. <see langword="false"/> otherwise.</returns>
     bool Navigate(Type pageType);
 
+    /// <summary>
+    /// Lets you navigate to the selected page based on it's type, Should be used with <see cref="IPageService"/>.
+    /// </summary>
+    /// <param name="pageType"><see langword="Type"/> of the page.</param>
+    /// <param name="dataContext">DataContext <see cref="Object"/></param>
+    /// <returns><see langword="true"/> if the operation succeeds. <see langword="false"/> otherwise.</returns>
+    bool Navigate(Type pageType, object? dataContext);
+
     /// <summary>
     /// Lets you navigate to the selected page based on it's tag. Should be used with <see cref="IPageService"/>.
     /// </summary>
@@ -27,6 +35,14 @@ public interface INavigationService
     /// <returns><see langword="true"/> if the operation succeeds. <see langword="false"/> otherwise.</returns>
     bool Navigate(string pageIdOrTargetTag);
 
+    /// <summary>
+    /// Lets you navigate to the selected page based on it's tag. Should be used with <see cref="IPageService"/>.
+    /// </summary>
+    /// <param name="pageIdOrTargetTag">Id or tag of the page.</param>
+    /// <param name="dataContext">DataContext <see cref="Object"/></param>
+    /// <returns><see langword="true"/> if the operation succeeds. <see langword="false"/> otherwise.</returns>
+    bool Navigate(string pageIdOrTargetTag, object? dataContext);
+
     /// <summary>
     /// Synchronously adds an element to the navigation stack and navigates current navigation Frame to the
     /// </summary>
@@ -34,6 +50,14 @@ public interface INavigationService
     /// <returns><see langword="true"/> if the operation succeeds. <see langword="false"/> otherwise.</returns>
     bool NavigateWithHierarchy(Type pageType);
 
+    /// <summary>
+    /// Synchronously adds an element to the navigation stack and navigates current navigation Frame to the
+    /// </summary>
+    /// <param name="pageType">Type of control to be synchronously added to the navigation stack</param>
+    /// <param name="dataContext">DataContext <see cref="Object"/></param>
+    /// <returns><see langword="true"/> if the operation succeeds. <see langword="false"/> otherwise.</returns>
+    bool NavigateWithHierarchy(Type pageType, object? dataContext);
+
     /// <summary>
     /// Provides direct access to the control responsible for navigation.
     /// </summary>
diff --git a/src/Wpf.Ui/NavigationService.cs b/src/Wpf.Ui/NavigationService.cs
index efca739bb..8115fa2b0 100644
--- a/src/Wpf.Ui/NavigationService.cs
+++ b/src/Wpf.Ui/NavigationService.cs
@@ -80,6 +80,14 @@ public bool Navigate(Type pageType)
         return NavigationControl!.Navigate(pageType);
     }
 
+    /// <inheritdoc />
+    public bool Navigate(Type pageType, object? dataContext)
+    {
+        ThrowIfNavigationControlIsNull();
+
+        return NavigationControl!.Navigate(pageType, dataContext);
+    }
+
     /// <inheritdoc />
     public bool Navigate(string pageTag)
     {
@@ -88,6 +96,14 @@ public bool Navigate(string pageTag)
         return NavigationControl!.Navigate(pageTag);
     }
 
+    /// <inheritdoc />
+    public bool Navigate(string pageTag, object? dataContext)
+    {
+        ThrowIfNavigationControlIsNull();
+
+        return NavigationControl!.Navigate(pageTag, dataContext);
+    }
+
     /// <inheritdoc />
     public bool GoBack()
     {
@@ -104,7 +120,15 @@ public bool NavigateWithHierarchy(Type pageType)
         return NavigationControl!.NavigateWithHierarchy(pageType);
     }
 
-    private void ThrowIfNavigationControlIsNull()
+    /// <inheritdoc />
+    public bool NavigateWithHierarchy(Type pageType, object? dataContext)
+    {
+        ThrowIfNavigationControlIsNull();
+
+        return NavigationControl!.NavigateWithHierarchy(pageType, dataContext);
+    }
+
+    protected void ThrowIfNavigationControlIsNull()
     {
         if (NavigationControl is null)
         {
@@ -112,7 +136,7 @@ private void ThrowIfNavigationControlIsNull()
         }
     }
 
-    private void ThrowIfPageServiceIsNull()
+    protected void ThrowIfPageServiceIsNull()
     {
         if (_pageService is null)
         {