From 4526e67e0b77531cba1db36ca9c4b29de981da77 Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Wed, 1 Feb 2023 14:00:55 +0600
Subject: [PATCH 01/15] Updated navigation

---
 .../Navigation/NavigationView.Navigation.cs      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Wpf.Ui/Controls/Navigation/NavigationView.Navigation.cs b/src/Wpf.Ui/Controls/Navigation/NavigationView.Navigation.cs
index 56412eecd..6de532bfb 100644
--- a/src/Wpf.Ui/Controls/Navigation/NavigationView.Navigation.cs
+++ b/src/Wpf.Ui/Controls/Navigation/NavigationView.Navigation.cs
@@ -117,7 +117,7 @@ public virtual bool GoBack()
         if (Journal.Count <= 1)
             return false;
 
-        var itemId = Journal[Journal.Count - 2];
+        var itemId = Journal[^2];
 
         return NavigateInternal(PageIdOrTargetTagNavigationViewsDictionary[itemId], null, false, true);
     }
@@ -146,7 +146,7 @@ private bool TryToNavigateWithoutINavigationViewItem(Type pageType, bool addToNa
 
     private bool NavigateInternal(INavigationViewItem viewItem, object? dataContext = null, bool addToNavigationStack = false, bool isBackwardsNavigated = false)
     {
-        if (NavigationStack.Count > 0 && NavigationStack[NavigationStack.Count -1] == viewItem)
+        if (NavigationStack.Count > 0 && NavigationStack[^1] == viewItem)
             return false;
 
         Debug.WriteLineIf(EnableDebugMessages, $"DEBUG | {viewItem.Id} - {(string.IsNullOrEmpty(viewItem.TargetPageTag) ? "NO_TAG" : viewItem.TargetPageTag)} - {viewItem.TargetPageType} | NAVIGATED");
@@ -178,8 +178,8 @@ private void AddToJournal(INavigationViewItem viewItem, bool isBackwardsNavigate
     {
         if (isBackwardsNavigated)
         {
-            Journal.RemoveAt(Journal.LastIndexOf(Journal[Journal.Count - 2]));
-            Journal.RemoveAt(Journal.LastIndexOf(Journal[Journal.Count - 1]));
+            Journal.RemoveAt(Journal.LastIndexOf(Journal[^2]));
+            Journal.RemoveAt(Journal.LastIndexOf(Journal[^1]));
 
             _currentIndexInJournal -= 2;
         }
@@ -192,7 +192,7 @@ private void AddToJournal(INavigationViewItem viewItem, bool isBackwardsNavigate
 #if DEBUG
         Debug.WriteLineIf(EnableDebugMessages, $"JOURNAL INDEX {_currentIndexInJournal}");
         if (Journal.Count > 0)
-            Debug.WriteLineIf(EnableDebugMessages, $"JOURNAL LAST ELEMENT {Journal[Journal.Count - 1]}");
+            Debug.WriteLineIf(EnableDebugMessages, $"JOURNAL LAST ELEMENT {Journal[^1]}");
 #endif
     }
 
@@ -276,7 +276,7 @@ private void RecreateNavigationStackFromHistory(INavigationViewItem item)
         if (!_complexNavigationStackHistory.TryGetValue(item, out var historyList) || historyList.Count == 0)
             return;
 
-        var latestHistory = historyList[historyList.Count - 1];
+        var latestHistory = historyList[^1];
         var startIndex = 0;
 
         if (latestHistory[0]!.IsMenuElement)
@@ -307,7 +307,7 @@ private void RecreateNavigationStackFromHistory(INavigationViewItem item)
 
     private void AddToNavigationStackHistory(INavigationViewItem viewItem)
     {
-        var lastItem = NavigationStack[NavigationStack.Count - 1];
+        var lastItem = NavigationStack[^1];
         var startIndex = NavigationStack.IndexOf(viewItem);
 
         if (startIndex < 0)
@@ -331,7 +331,7 @@ private void AddToNavigationStackHistory(INavigationViewItem viewItem)
 #endif
 
         historyList.Add(array);
-        var latestHistory = historyList[historyList.Count - 1];
+        var latestHistory = historyList[^1];
 
         int i = 0;
         for (int j = startIndex; j < NavigationStack.Count - 1; j++)

From 9c7f1d0f12d2c5958067882a457a81c25fd8dff5 Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Wed, 1 Feb 2023 14:13:41 +0600
Subject: [PATCH 02/15] Added BreadcrumbBar folder

---
 .../Controls/{ => Breadcrumb}/BreadcrumbBar.cs  |  6 +++---
 .../{ => Breadcrumb}/BreadcrumbBarItem.cs       |  2 +-
 .../BreadcrumbBarItemClickedEventArgs.cs}       | 17 ++++++++---------
 .../Controls/Navigation/NavigationView.Base.cs  |  1 -
 4 files changed, 12 insertions(+), 14 deletions(-)
 rename src/Wpf.Ui/Controls/{ => Breadcrumb}/BreadcrumbBar.cs (94%)
 rename src/Wpf.Ui/Controls/{ => Breadcrumb}/BreadcrumbBarItem.cs (98%)
 rename src/Wpf.Ui/{Common/BreadcrumbBarEvent.cs => Controls/Breadcrumb/BreadcrumbBarItemClickedEventArgs.cs} (56%)

diff --git a/src/Wpf.Ui/Controls/BreadcrumbBar.cs b/src/Wpf.Ui/Controls/Breadcrumb/BreadcrumbBar.cs
similarity index 94%
rename from src/Wpf.Ui/Controls/BreadcrumbBar.cs
rename to src/Wpf.Ui/Controls/Breadcrumb/BreadcrumbBar.cs
index 8cb9a0629..4f85a0612 100644
--- a/src/Wpf.Ui/Controls/BreadcrumbBar.cs
+++ b/src/Wpf.Ui/Controls/Breadcrumb/BreadcrumbBar.cs
@@ -45,7 +45,7 @@ public class BreadcrumbBar : System.Windows.Controls.ItemsControl
     /// Property for <see cref="ItemClicked"/>.
     /// </summary>
     public static readonly RoutedEvent ItemClickedRoutedEvent = EventManager.RegisterRoutedEvent(nameof(ItemClicked),
-        RoutingStrategy.Bubble, typeof(BreadcrumbBarItemClickedEvent), typeof(BreadcrumbBar));
+        RoutingStrategy.Bubble, typeof(TypedEventHandler<BreadcrumbBar, BreadcrumbBarItemClickedEventArgs>), typeof(BreadcrumbBar));
 
     /// <summary>
     /// Gets or sets custom command executed after selecting the item.
@@ -62,7 +62,7 @@ public ICommand Command
     /// <summary>
     /// Occurs when an item is clicked in the <see cref="BreadcrumbBar"/>.
     /// </summary>
-    public event BreadcrumbBarItemClickedEvent ItemClicked
+    public event TypedEventHandler<BreadcrumbBar, BreadcrumbBarItemClickedEventArgs> ItemClicked
     {
         add => AddHandler(ItemClickedRoutedEvent, value);
         remove => RemoveHandler(ItemClickedRoutedEvent, value);
@@ -162,7 +162,7 @@ private void InteractWithItemContainer(int offsetFromEnd, Action<BreadcrumbBarIt
         if (ItemContainerGenerator.Items.Count <= 0)
             return;
 
-        var item = ItemContainerGenerator.Items[ItemContainerGenerator.Items.Count - offsetFromEnd];
+        var item = ItemContainerGenerator.Items[^offsetFromEnd];
         var container = (BreadcrumbBarItem)ItemContainerGenerator.ContainerFromItem(item);
 
         action.Invoke(container);
diff --git a/src/Wpf.Ui/Controls/BreadcrumbBarItem.cs b/src/Wpf.Ui/Controls/Breadcrumb/BreadcrumbBarItem.cs
similarity index 98%
rename from src/Wpf.Ui/Controls/BreadcrumbBarItem.cs
rename to src/Wpf.Ui/Controls/Breadcrumb/BreadcrumbBarItem.cs
index c501b89f2..a3855101c 100644
--- a/src/Wpf.Ui/Controls/BreadcrumbBarItem.cs
+++ b/src/Wpf.Ui/Controls/Breadcrumb/BreadcrumbBarItem.cs
@@ -60,7 +60,7 @@ public double SymbolIconFontSize
     }
 
     /// <summary>
-    /// Font wegiht of the <see cref="SymbolIconSymbol"/>.
+    /// Font weight of the <see cref="SymbolIconSymbol"/>.
     /// </summary>
     public FontWeight SymbolIconFontWeight
     {
diff --git a/src/Wpf.Ui/Common/BreadcrumbBarEvent.cs b/src/Wpf.Ui/Controls/Breadcrumb/BreadcrumbBarItemClickedEventArgs.cs
similarity index 56%
rename from src/Wpf.Ui/Common/BreadcrumbBarEvent.cs
rename to src/Wpf.Ui/Controls/Breadcrumb/BreadcrumbBarItemClickedEventArgs.cs
index 0e22e9c71..d56f63a1b 100644
--- a/src/Wpf.Ui/Common/BreadcrumbBarEvent.cs
+++ b/src/Wpf.Ui/Controls/Breadcrumb/BreadcrumbBarItemClickedEventArgs.cs
@@ -1,15 +1,14 @@
-using System.Windows;
-using Wpf.Ui.Controls;
-using System.Diagnostics.CodeAnalysis;
+// Based on Windows UI Library
+// Copyright(c) Microsoft Corporation.All rights reserved.
 
+// 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.
+// All Rights Reserved.
 
-namespace Wpf.Ui.Common;
+using System.Windows;
 
-/// <summary>
-/// Event triggered on via <see cref="BreadcrumbBar"/>.
-/// </summary>
-/// <param name="sender">Current <see cref="BreadcrumbBar"/> instance.</param>
-public delegate void BreadcrumbBarItemClickedEvent(BreadcrumbBar sender, BreadcrumbBarItemClickedEventArgs e);
+namespace Wpf.Ui.Controls;
 
 public sealed class BreadcrumbBarItemClickedEventArgs : RoutedEventArgs
 {
diff --git a/src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs b/src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs
index 9ac3ae058..5fdcb544e 100644
--- a/src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs
+++ b/src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs
@@ -14,7 +14,6 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Windows;
-using Wpf.Ui.Common;
 
 namespace Wpf.Ui.Controls.Navigation;
 

From b99c2c75581cbde7c231ea379649c1e138c3631e Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Wed, 1 Feb 2023 14:19:49 +0600
Subject: [PATCH 03/15] Added TitleBar folder

---
 src/Wpf.Ui/Controls/{ => TitleBar}/TitleBar.cs | 18 +++++++++---------
 .../Controls/{ => TitleBar}/TitleBarButton.cs  |  1 -
 .../{ => TitleBar}/TitleBarButtonType.cs       |  0
 3 files changed, 9 insertions(+), 10 deletions(-)
 rename src/Wpf.Ui/Controls/{ => TitleBar}/TitleBar.cs (96%)
 rename src/Wpf.Ui/Controls/{ => TitleBar}/TitleBarButton.cs (99%)
 rename src/Wpf.Ui/Controls/{ => TitleBar}/TitleBarButtonType.cs (100%)

diff --git a/src/Wpf.Ui/Controls/TitleBar.cs b/src/Wpf.Ui/Controls/TitleBar/TitleBar.cs
similarity index 96%
rename from src/Wpf.Ui/Controls/TitleBar.cs
rename to src/Wpf.Ui/Controls/TitleBar/TitleBar.cs
index 0535b4228..9cce87c43 100644
--- a/src/Wpf.Ui/Controls/TitleBar.cs
+++ b/src/Wpf.Ui/Controls/TitleBar/TitleBar.cs
@@ -153,32 +153,32 @@ public class TitleBar : System.Windows.Controls.Control, IThemeControl
     /// Routed event for <see cref="CloseClicked"/>.
     /// </summary>
     public static readonly RoutedEvent CloseClickedEvent = EventManager.RegisterRoutedEvent(
-        nameof(CloseClicked), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(TitleBar));
+        nameof(CloseClicked), RoutingStrategy.Bubble, typeof(TypedEventHandler<TitleBar, RoutedEventArgs>), typeof(TitleBar));
 
     /// <summary>
     /// Routed event for <see cref="MaximizeClicked"/>.
     /// </summary>
     public static readonly RoutedEvent MaximizeClickedEvent = EventManager.RegisterRoutedEvent(
-        nameof(MaximizeClicked), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(TitleBar));
+        nameof(MaximizeClicked), RoutingStrategy.Bubble, typeof(TypedEventHandler<TitleBar, RoutedEventArgs>), typeof(TitleBar));
 
     /// <summary>
     /// Routed event for <see cref="MinimizeClicked"/>.
     /// </summary>
     public static readonly RoutedEvent MinimizeClickedEvent = EventManager.RegisterRoutedEvent(
-        nameof(MinimizeClicked), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(TitleBar));
+        nameof(MinimizeClicked), RoutingStrategy.Bubble, typeof(TypedEventHandler<TitleBar, RoutedEventArgs>), typeof(TitleBar));
 
     /// <summary>
     /// Routed event for <see cref="HelpClicked"/>.
     /// </summary>
     public static readonly RoutedEvent HelpClickedEvent = EventManager.RegisterRoutedEvent(
-        nameof(HelpClicked), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(TitleBar));
+        nameof(HelpClicked), RoutingStrategy.Bubble, typeof(TypedEventHandler<TitleBar, RoutedEventArgs>), typeof(TitleBar));
 
     /// <summary>
     /// Property for <see cref="TemplateButtonCommand"/>.
     /// </summary>
     public static readonly DependencyProperty TemplateButtonCommandProperty =
         DependencyProperty.Register(nameof(TemplateButtonCommand),
-            typeof(Common.IRelayCommand), typeof(TitleBar), new PropertyMetadata(null));
+            typeof(IRelayCommand), typeof(TitleBar), new PropertyMetadata(null));
 
     #endregion
 
@@ -331,7 +331,7 @@ public NotifyIcon Tray
     /// <summary>
     /// Event triggered after clicking close button.
     /// </summary>
-    public event RoutedEventHandler CloseClicked
+    public event TypedEventHandler<TitleBar, RoutedEventArgs> CloseClicked
     {
         add => AddHandler(CloseClickedEvent, value);
         remove => RemoveHandler(CloseClickedEvent, value);
@@ -340,7 +340,7 @@ public event RoutedEventHandler CloseClicked
     /// <summary>
     /// Event triggered after clicking maximize or restore button.
     /// </summary>
-    public event RoutedEventHandler MaximizeClicked
+    public event TypedEventHandler<TitleBar, RoutedEventArgs> MaximizeClicked
     {
         add => AddHandler(MaximizeClickedEvent, value);
         remove => RemoveHandler(MaximizeClickedEvent, value);
@@ -349,7 +349,7 @@ public event RoutedEventHandler MaximizeClicked
     /// <summary>
     /// Event triggered after clicking minimize button.
     /// </summary>
-    public event RoutedEventHandler MinimizeClicked
+    public event TypedEventHandler<TitleBar, RoutedEventArgs> MinimizeClicked
     {
         add => AddHandler(MinimizeClickedEvent, value);
         remove => RemoveHandler(MinimizeClickedEvent, value);
@@ -358,7 +358,7 @@ public event RoutedEventHandler MinimizeClicked
     /// <summary>
     /// Event triggered after clicking help button
     /// </summary>
-    public event RoutedEventHandler HelpClicked
+    public event TypedEventHandler<TitleBar, RoutedEventArgs> HelpClicked
     {
         add => AddHandler(HelpClickedEvent, value);
         remove => RemoveHandler(HelpClickedEvent, value);
diff --git a/src/Wpf.Ui/Controls/TitleBarButton.cs b/src/Wpf.Ui/Controls/TitleBar/TitleBarButton.cs
similarity index 99%
rename from src/Wpf.Ui/Controls/TitleBarButton.cs
rename to src/Wpf.Ui/Controls/TitleBar/TitleBarButton.cs
index 0b818f5c0..66669a00f 100644
--- a/src/Wpf.Ui/Controls/TitleBarButton.cs
+++ b/src/Wpf.Ui/Controls/TitleBar/TitleBarButton.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 using System.Windows;
 using System.Windows.Automation.Peers;
 using System.Windows.Automation.Provider;
diff --git a/src/Wpf.Ui/Controls/TitleBarButtonType.cs b/src/Wpf.Ui/Controls/TitleBar/TitleBarButtonType.cs
similarity index 100%
rename from src/Wpf.Ui/Controls/TitleBarButtonType.cs
rename to src/Wpf.Ui/Controls/TitleBar/TitleBarButtonType.cs

From 03a6b3494ebcd2b787ad53813e76c1e58de5c42e Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Wed, 1 Feb 2023 14:26:45 +0600
Subject: [PATCH 04/15] Added MessageBox folder

---
 .../Controls/{ => MessageBox}/MessageBox.bmp  | Bin
 .../Controls/{ => MessageBox}/MessageBox.cs   |  38 ------------------
 .../Controls/MessageBox/MessageBoxButton.cs   |  20 +++++++++
 .../Controls/MessageBox/MessageBoxResult.cs   |  21 ++++++++++
 src/Wpf.Ui/Wpf.Ui.csproj                      |   2 +-
 5 files changed, 42 insertions(+), 39 deletions(-)
 rename src/Wpf.Ui/Controls/{ => MessageBox}/MessageBox.bmp (100%)
 rename src/Wpf.Ui/Controls/{ => MessageBox}/MessageBox.cs (94%)
 create mode 100644 src/Wpf.Ui/Controls/MessageBox/MessageBoxButton.cs
 create mode 100644 src/Wpf.Ui/Controls/MessageBox/MessageBoxResult.cs

diff --git a/src/Wpf.Ui/Controls/MessageBox.bmp b/src/Wpf.Ui/Controls/MessageBox/MessageBox.bmp
similarity index 100%
rename from src/Wpf.Ui/Controls/MessageBox.bmp
rename to src/Wpf.Ui/Controls/MessageBox/MessageBox.bmp
diff --git a/src/Wpf.Ui/Controls/MessageBox.cs b/src/Wpf.Ui/Controls/MessageBox/MessageBox.cs
similarity index 94%
rename from src/Wpf.Ui/Controls/MessageBox.cs
rename to src/Wpf.Ui/Controls/MessageBox/MessageBox.cs
index ea537495d..6a44c4e51 100644
--- a/src/Wpf.Ui/Controls/MessageBox.cs
+++ b/src/Wpf.Ui/Controls/MessageBox/MessageBox.cs
@@ -15,44 +15,6 @@
 
 namespace Wpf.Ui.Controls;
 
-/// <summary>
-/// Defines constants that specify the default button on a <see cref="MessageBox"/>.
-/// </summary>
-public enum MessageBoxButton
-{
-    /// <summary>
-    /// The primary button
-    /// </summary>
-    Primary,
-    /// <summary>
-    /// The secondary button
-    /// </summary>
-    Secondary,
-    /// <summary>
-    /// The close button
-    /// </summary>
-    Close
-}
-
-/// <summary>
-/// Specifies identifiers to indicate the return value of a <see cref="MessageBox"/>.
-/// </summary>
-public enum MessageBoxResult
-{
-    /// <summary>
-    /// No button was tapped.
-    /// </summary>
-    None,
-    /// <summary>
-    /// The primary button was tapped by the user.
-    /// </summary>
-    Primary,
-    /// <summary>
-    /// The secondary button was tapped by the user.
-    /// </summary>
-    Secondary
-}
-
 /// <summary>
 /// Customized window for notifications.
 /// </summary>
diff --git a/src/Wpf.Ui/Controls/MessageBox/MessageBoxButton.cs b/src/Wpf.Ui/Controls/MessageBox/MessageBoxButton.cs
new file mode 100644
index 000000000..0a17afd04
--- /dev/null
+++ b/src/Wpf.Ui/Controls/MessageBox/MessageBoxButton.cs
@@ -0,0 +1,20 @@
+namespace Wpf.Ui.Controls;
+
+/// <summary>
+/// Defines constants that specify the default button on a <see cref="MessageBox"/>.
+/// </summary>
+public enum MessageBoxButton
+{
+    /// <summary>
+    /// The primary button
+    /// </summary>
+    Primary,
+    /// <summary>
+    /// The secondary button
+    /// </summary>
+    Secondary,
+    /// <summary>
+    /// The close button
+    /// </summary>
+    Close
+}
diff --git a/src/Wpf.Ui/Controls/MessageBox/MessageBoxResult.cs b/src/Wpf.Ui/Controls/MessageBox/MessageBoxResult.cs
new file mode 100644
index 000000000..592aad9d7
--- /dev/null
+++ b/src/Wpf.Ui/Controls/MessageBox/MessageBoxResult.cs
@@ -0,0 +1,21 @@
+namespace Wpf.Ui.Controls
+{
+    /// <summary>
+    /// Specifies identifiers to indicate the return value of a <see cref="MessageBox"/>.
+    /// </summary>
+    public enum MessageBoxResult
+    {
+        /// <summary>
+        /// No button was tapped.
+        /// </summary>
+        None,
+        /// <summary>
+        /// The primary button was tapped by the user.
+        /// </summary>
+        Primary,
+        /// <summary>
+        /// The secondary button was tapped by the user.
+        /// </summary>
+        Secondary
+    }
+}
diff --git a/src/Wpf.Ui/Wpf.Ui.csproj b/src/Wpf.Ui/Wpf.Ui.csproj
index 385ce3c3e..e8bebde37 100644
--- a/src/Wpf.Ui/Wpf.Ui.csproj
+++ b/src/Wpf.Ui/Wpf.Ui.csproj
@@ -104,7 +104,7 @@
     <EmbeddedResource Include="Controls\CodeBlock.bmp" />
     <EmbeddedResource Include="Controls\DynamicScrollBar.bmp" />
     <EmbeddedResource Include="Controls\DynamicScrollViewer.bmp" />
-    <EmbeddedResource Include="Controls\MessageBox.bmp" />
+    <EmbeddedResource Include="Controls\MessageBox\MessageBox.bmp" />
     <EmbeddedResource Include="Controls\Dialog.bmp" />
     <EmbeddedResource Include="Controls\FontIcon.bmp" />
     <EmbeddedResource Include="Controls\Navigation\NavigationView.bmp" />

From 85f411382db0837a1ce4517508c0b83ef6ba02ae Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Wed, 1 Feb 2023 14:35:48 +0600
Subject: [PATCH 05/15] Added ContentDialog folder

---
 .../{ => ContentDialog}/ContentDialog.cs      | 38 -------------------
 .../ContentDialog/ContentDialogButton.cs      | 21 ++++++++++
 .../ContentDialog/ContentDialogResult.cs      | 21 ++++++++++
 3 files changed, 42 insertions(+), 38 deletions(-)
 rename src/Wpf.Ui/Controls/{ => ContentDialog}/ContentDialog.cs (95%)
 create mode 100644 src/Wpf.Ui/Controls/ContentDialog/ContentDialogButton.cs
 create mode 100644 src/Wpf.Ui/Controls/ContentDialog/ContentDialogResult.cs

diff --git a/src/Wpf.Ui/Controls/ContentDialog.cs b/src/Wpf.Ui/Controls/ContentDialog/ContentDialog.cs
similarity index 95%
rename from src/Wpf.Ui/Controls/ContentDialog.cs
rename to src/Wpf.Ui/Controls/ContentDialog/ContentDialog.cs
index 06d8b981c..b8ae7b89c 100644
--- a/src/Wpf.Ui/Controls/ContentDialog.cs
+++ b/src/Wpf.Ui/Controls/ContentDialog/ContentDialog.cs
@@ -12,44 +12,6 @@
 
 namespace Wpf.Ui.Controls;
 
-/// <summary>
-/// Specifies identifiers to indicate the return value of a <see cref="ContentDialog"/>.
-/// </summary>
-public enum ContentDialogResult
-{
-    /// <summary>
-    /// No button was tapped.
-    /// </summary>
-    None,
-    /// <summary>
-    /// The primary button was tapped by the user.
-    /// </summary>
-    Primary,
-    /// <summary>
-    /// The secondary button was tapped by the user.
-    /// </summary>
-    Secondary
-}
-
-/// <summary>
-/// Defines constants that specify the default button on a <see cref="ContentDialog"/>.
-/// </summary>
-public enum ContentDialogButton
-{
-    /// <summary>
-    /// The primary button is the default.
-    /// </summary>
-    Primary,
-    /// <summary>
-    /// The secondary button is the default.
-    /// </summary>
-    Secondary,
-    /// <summary>
-    /// The close button is the default.
-    /// </summary>
-    Close
-}
-
 public class ContentDialog : ContentControl
 {
     #region Static proerties
diff --git a/src/Wpf.Ui/Controls/ContentDialog/ContentDialogButton.cs b/src/Wpf.Ui/Controls/ContentDialog/ContentDialogButton.cs
new file mode 100644
index 000000000..d257d70f1
--- /dev/null
+++ b/src/Wpf.Ui/Controls/ContentDialog/ContentDialogButton.cs
@@ -0,0 +1,21 @@
+namespace Wpf.Ui.Controls
+{
+    /// <summary>
+    /// Defines constants that specify the default button on a <see cref="ContentDialog"/>.
+    /// </summary>
+    public enum ContentDialogButton
+    {
+        /// <summary>
+        /// The primary button is the default.
+        /// </summary>
+        Primary,
+        /// <summary>
+        /// The secondary button is the default.
+        /// </summary>
+        Secondary,
+        /// <summary>
+        /// The close button is the default.
+        /// </summary>
+        Close
+    }
+}
diff --git a/src/Wpf.Ui/Controls/ContentDialog/ContentDialogResult.cs b/src/Wpf.Ui/Controls/ContentDialog/ContentDialogResult.cs
new file mode 100644
index 000000000..a483d3f31
--- /dev/null
+++ b/src/Wpf.Ui/Controls/ContentDialog/ContentDialogResult.cs
@@ -0,0 +1,21 @@
+namespace Wpf.Ui.Controls
+{
+    /// <summary>
+    /// Specifies identifiers to indicate the return value of a <see cref="ContentDialog"/>.
+    /// </summary>
+    public enum ContentDialogResult
+    {
+        /// <summary>
+        /// No button was tapped.
+        /// </summary>
+        None,
+        /// <summary>
+        /// The primary button was tapped by the user.
+        /// </summary>
+        Primary,
+        /// <summary>
+        /// The secondary button was tapped by the user.
+        /// </summary>
+        Secondary
+    }
+}

From 55fc713248bd7382aa1eb628b4258fa312f90a56 Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Wed, 1 Feb 2023 14:46:24 +0600
Subject: [PATCH 06/15] Deleted Dialog control

---
 src/Wpf.Ui.Gallery/App.xaml.cs                |   3 -
 .../DialogsAndFlyouts/DialogViewModel.cs      |  52 ---
 .../ViewModels/Windows/MainWindowViewModel.cs |   1 -
 .../Pages/DialogsAndFlyouts/DialogPage.xaml   |  60 ---
 .../DialogsAndFlyouts/DialogPage.xaml.cs      |  23 --
 .../Views/Windows/EditorWindow.xaml           |   4 +-
 .../Views/Windows/MainWindow.xaml             |   6 -
 .../Views/Windows/MainWindow.xaml.cs          |   9 +-
 src/Wpf.Ui/Common/RoutedDialogEvent.cs        |  19 -
 src/Wpf.Ui/Contracts/IDialogService.cs        |  26 --
 src/Wpf.Ui/Controls/Dialog.bmp                | Bin 824 -> 0 bytes
 src/Wpf.Ui/Controls/Dialog.cs                 | 372 ------------------
 src/Wpf.Ui/Controls/DialogButtonPressed.cs    |  27 --
 src/Wpf.Ui/Controls/IDialogControl.cs         | 116 ------
 src/Wpf.Ui/Services/DialogService.cs          |  34 --
 src/Wpf.Ui/Styles/Controls/Dialog.xaml        | 166 --------
 src/Wpf.Ui/Styles/Wpf.Ui.xaml                 |   1 -
 src/Wpf.Ui/Wpf.Ui.csproj                      |   1 -
 18 files changed, 4 insertions(+), 916 deletions(-)
 delete mode 100644 src/Wpf.Ui.Gallery/ViewModels/Pages/DialogsAndFlyouts/DialogViewModel.cs
 delete mode 100644 src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/DialogPage.xaml
 delete mode 100644 src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/DialogPage.xaml.cs
 delete mode 100644 src/Wpf.Ui/Common/RoutedDialogEvent.cs
 delete mode 100644 src/Wpf.Ui/Contracts/IDialogService.cs
 delete mode 100644 src/Wpf.Ui/Controls/Dialog.bmp
 delete mode 100644 src/Wpf.Ui/Controls/Dialog.cs
 delete mode 100644 src/Wpf.Ui/Controls/DialogButtonPressed.cs
 delete mode 100644 src/Wpf.Ui/Controls/IDialogControl.cs
 delete mode 100644 src/Wpf.Ui/Services/DialogService.cs
 delete mode 100644 src/Wpf.Ui/Styles/Controls/Dialog.xaml

diff --git a/src/Wpf.Ui.Gallery/App.xaml.cs b/src/Wpf.Ui.Gallery/App.xaml.cs
index bf972a4ce..32cb3e0c4 100644
--- a/src/Wpf.Ui.Gallery/App.xaml.cs
+++ b/src/Wpf.Ui.Gallery/App.xaml.cs
@@ -61,7 +61,6 @@ public partial class App : Application
             services.AddSingleton<MainWindowViewModel>();
             services.AddSingleton<INavigationService, NavigationService>();
             services.AddSingleton<ISnackbarService, SnackbarService>();
-            services.AddSingleton<IDialogService, DialogService>();
             services.AddSingleton<WindowsProviderService>();
 
             // Top-level pages
@@ -125,9 +124,7 @@ public partial class App : Application
             services.AddTransient<DialogsAndFlyoutsViewModel>();
             services.AddTransient<SnackbarPage>();
             services.AddTransient<SnackbarViewModel>();
-            services.AddTransient<DialogPage>();
             services.AddTransient<ContentDialogPage>();
-            services.AddTransient<DialogViewModel>();
             services.AddTransient<FlyoutPage>();
             services.AddTransient<FlyoutViewModel>();
             services.AddTransient<MessageBoxPage>();
diff --git a/src/Wpf.Ui.Gallery/ViewModels/Pages/DialogsAndFlyouts/DialogViewModel.cs b/src/Wpf.Ui.Gallery/ViewModels/Pages/DialogsAndFlyouts/DialogViewModel.cs
deleted file mode 100644
index 3030211ba..000000000
--- a/src/Wpf.Ui.Gallery/ViewModels/Pages/DialogsAndFlyouts/DialogViewModel.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// 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.
-// All Rights Reserved.
-
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Wpf.Ui.Gallery.ViewModels.Pages.DialogsAndFlyouts;
-
-public partial class DialogViewModel : ObservableObject
-{
-    private readonly IDialogService _dialogService;
-    public DialogViewModel(IDialogService dialogService)
-    {
-        _dialogService = dialogService;
-    }
-
-    [RelayCommand]
-    private void OnShowDialog(object sender)
-    {
-        var rootDialog = _dialogService.GetDialogControl();
-
-        rootDialog.DialogHeight = 240;
-        rootDialog.Header = "This is global Dialog control managed by IDialogService";
-        rootDialog.Content = new TextBlock
-        {
-            Margin = new Thickness(0, 8, 0, 0),
-            TextWrapping = TextWrapping.WrapWithOverflow,
-            Text = "This dialog is placed under the TitleBar but above the NavigationView. This allows us to enable the window to be navigated, but cover the application's navigation. You can add Dialog anywhere you want and arrange it as you like."
-        };
-
-        var buttonLeft = new Wpf.Ui.Controls.Button
-        {
-            Content = "Left button",
-            Appearance = Ui.Controls.ControlAppearance.Primary,
-            HorizontalAlignment = HorizontalAlignment.Stretch
-        };
-        buttonLeft.Click += (_, _) => rootDialog.Hide();
-        rootDialog.ButtonLeft = buttonLeft;
-
-        var buttonRight = new Wpf.Ui.Controls.Button
-        {
-            Content = "Right button",
-            HorizontalAlignment = HorizontalAlignment.Stretch
-        };
-        buttonRight.Click += (_, _) => rootDialog.Hide();
-        rootDialog.ButtonRight = buttonRight;
-
-        rootDialog.Show();
-    }
-}
diff --git a/src/Wpf.Ui.Gallery/ViewModels/Windows/MainWindowViewModel.cs b/src/Wpf.Ui.Gallery/ViewModels/Windows/MainWindowViewModel.cs
index a4dfdf535..b8afd5e36 100644
--- a/src/Wpf.Ui.Gallery/ViewModels/Windows/MainWindowViewModel.cs
+++ b/src/Wpf.Ui.Gallery/ViewModels/Windows/MainWindowViewModel.cs
@@ -76,7 +76,6 @@ public MainWindowViewModel(IServiceProvider serviceProvider)
             new NavigationViewItem {Content = "Dialogs and Flyouts", Icon = new SymbolIcon { Symbol = SymbolRegular.Chat24  }, TargetPageType = typeof(DialogsAndFlyoutsPage), MenuItems = new ObservableCollection<object>
             {
                 new NavigationViewItem { Content = "Snackbar", TargetPageType = typeof(SnackbarPage) },
-                new NavigationViewItem { Content = "Dialog", TargetPageType = typeof(DialogPage) },
                 new NavigationViewItem { Content = "ContentDialog", TargetPageType = typeof(ContentDialogPage) },
                 new NavigationViewItem { Content = "Flyout", TargetPageType = typeof(FlyoutPage) },
                 new NavigationViewItem { Content = "MessageBox", TargetPageType = typeof(MessageBoxPage) },
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/DialogPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/DialogPage.xaml
deleted file mode 100644
index 1a5f14702..000000000
--- a/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/DialogPage.xaml
+++ /dev/null
@@ -1,60 +0,0 @@
-<Page
-    x:Class="Wpf.Ui.Gallery.Views.Pages.DialogsAndFlyouts.DialogPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Gallery.Controls"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:Wpf.Ui.Gallery.Views.Pages.DialogsAndFlyouts"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:system="clr-namespace:System;assembly=System.Runtime"
-    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
-    Title="DialogPage"
-    d:DataContext="{d:DesignInstance local:DialogPage,
-                                     IsDesignTimeCreatable=False}"
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}"
-    ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-    Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-    mc:Ignorable="d">
-    <Page.Resources>
-        <system:String x:Key="PageXamlUrl">https://github.com/lepoco/wpfui/blob/development/src/Wpf.Ui/Styles/Controls/Dialog.xaml</system:String>
-        <system:String x:Key="PageCsharpUrl">https://github.com/lepoco/wpfui/blob/development/src/Wpf.Ui/Controls/Dialog.cs</system:String>
-    </Page.Resources>
-
-    <Grid>
-        <ui:DynamicScrollViewer
-            x:Name="PageScrollViewer"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="280" />
-                </Grid.ColumnDefinitions>
-
-                <Grid Grid.Column="0" Margin="42">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <controls:GalleryControlPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        HeaderText="Global WPF UI Dialog above NavigationView control.">
-                        <controls:GalleryControlPresenter.Content>
-                            <Button
-                                Command="{Binding ViewModel.ShowDialogCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:DialogPage}, Mode=OneWay}"
-                                CommandParameter="{Binding RelativeSource={RelativeSource Self}, Mode=OneWay}"
-                                Content="Show Dialog" />
-                        </controls:GalleryControlPresenter.Content>
-                        <controls:GalleryControlPresenter.CodeText>
-                            &lt;ui:Dialog Content=&quot;Hello&quot; /&gt;
-                        </controls:GalleryControlPresenter.CodeText>
-                    </controls:GalleryControlPresenter>
-                </Grid>
-            </Grid>
-        </ui:DynamicScrollViewer>
-        <controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
-    </Grid>
-</Page>
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/DialogPage.xaml.cs b/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/DialogPage.xaml.cs
deleted file mode 100644
index fbca2a37e..000000000
--- a/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/DialogPage.xaml.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// 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.
-// All Rights Reserved.
-
-
-using Wpf.Ui.Controls.Navigation;
-using Wpf.Ui.Gallery.ViewModels.Pages.DialogsAndFlyouts;
-
-namespace Wpf.Ui.Gallery.Views.Pages.DialogsAndFlyouts;
-
-public partial class DialogPage : INavigableView<DialogViewModel>
-{
-    public DialogViewModel ViewModel { get; }
-
-    public DialogPage(DialogViewModel viewModel)
-    {
-        ViewModel = viewModel;
-        DataContext = this;
-
-        InitializeComponent();
-    }
-}
diff --git a/src/Wpf.Ui.Gallery/Views/Windows/EditorWindow.xaml b/src/Wpf.Ui.Gallery/Views/Windows/EditorWindow.xaml
index e3b1f5218..f1cb1724e 100644
--- a/src/Wpf.Ui.Gallery/Views/Windows/EditorWindow.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Windows/EditorWindow.xaml
@@ -233,7 +233,7 @@
             Grid.Row="0"
             Timeout="5000" />
 
-        <ui:Dialog x:Name="ActionDialog">
+        <!--<ui:Dialog x:Name="ActionDialog">
             <Grid>
                 <StackPanel>
                     <TextBlock FontWeight="Medium" Text="WPF UI - Editor" />
@@ -244,6 +244,6 @@
                         TextWrapping="WrapWithOverflow" />
                 </StackPanel>
             </Grid>
-        </ui:Dialog>
+        </ui:Dialog>-->
     </Grid>
 </ui:FluentWindow>
diff --git a/src/Wpf.Ui.Gallery/Views/Windows/MainWindow.xaml b/src/Wpf.Ui.Gallery/Views/Windows/MainWindow.xaml
index 18434e032..1fe7ea3e8 100644
--- a/src/Wpf.Ui.Gallery/Views/Windows/MainWindow.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Windows/MainWindow.xaml
@@ -52,12 +52,6 @@
             </ui:NavigationView.ContentOverlay>
         </ui:NavigationView>
 
-        <ui:Dialog
-            x:Name="RootDialog"
-            Grid.Row="0"
-            Grid.RowSpan="2"
-            Padding="0,42,0,0" />
-
         <ContentPresenter
             x:Name="RootContentDialog"
             Grid.Row="0"
diff --git a/src/Wpf.Ui.Gallery/Views/Windows/MainWindow.xaml.cs b/src/Wpf.Ui.Gallery/Views/Windows/MainWindow.xaml.cs
index d78f32463..524ae5822 100644
--- a/src/Wpf.Ui.Gallery/Views/Windows/MainWindow.xaml.cs
+++ b/src/Wpf.Ui.Gallery/Views/Windows/MainWindow.xaml.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Windows;
-using Wpf.Ui.Contracts;
-using Wpf.Ui.Controls.Navigation;
+using System.Windows;
 using Wpf.Ui.Gallery.Services.Contracts;
 using Wpf.Ui.Gallery.ViewModels.Windows;
 using Wpf.Ui.Gallery.Views.Pages;
@@ -16,8 +13,7 @@ public partial class MainWindow : IWindow
     public MainWindowViewModel ViewModel { get; }
 
     public MainWindow(MainWindowViewModel viewModel, INavigationService navigationService,
-        IServiceProvider serviceProvider, ISnackbarService snackbarService,
-        IDialogService dialogService)
+        IServiceProvider serviceProvider, ISnackbarService snackbarService)
     {
         Appearance.Watcher.Watch(this);
 
@@ -27,7 +23,6 @@ public MainWindow(MainWindowViewModel viewModel, INavigationService navigationSe
         InitializeComponent();
 
         snackbarService.SetSnackbarControl(RootSnackbar);
-        dialogService.SetDialogControl(RootDialog);
         navigationService.SetNavigationControl(NavigationView);
 
         NavigationView.SetServiceProvider(serviceProvider);
diff --git a/src/Wpf.Ui/Common/RoutedDialogEvent.cs b/src/Wpf.Ui/Common/RoutedDialogEvent.cs
deleted file mode 100644
index 75b3ca0df..000000000
--- a/src/Wpf.Ui/Common/RoutedDialogEvent.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// 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.
-// All Rights Reserved.
-
-using System.Diagnostics.CodeAnalysis;
-using System.Windows;
-
-namespace Wpf.Ui.Common;
-
-/// <summary>
-/// Event triggered on via <see cref="Controls.Dialog"/>.
-/// </summary>
-/// <param name="sender">Current <see cref="Controls.Dialog"/> instance.</param>
-#if NET5_0_OR_GREATER
-public delegate void RoutedDialogEvent([NotNull] Controls.Dialog sender, RoutedEventArgs e);
-#else
-public delegate void RoutedDialogEvent(Controls.Dialog sender, RoutedEventArgs e);
-#endif
diff --git a/src/Wpf.Ui/Contracts/IDialogService.cs b/src/Wpf.Ui/Contracts/IDialogService.cs
deleted file mode 100644
index 03acc175e..000000000
--- a/src/Wpf.Ui/Contracts/IDialogService.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// 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.
-// All Rights Reserved.
-
-using Wpf.Ui.Controls;
-
-namespace Wpf.Ui.Contracts;
-
-/// <summary>
-/// Represents a contract with the service that provides global <see cref="IDialogControl"/>.
-/// </summary>
-public interface IDialogService
-{
-    /// <summary>
-    /// Sets the <see cref="IDialogControl"/>
-    /// </summary>
-    /// <param name="dialog"></param>
-    void SetDialogControl(IDialogControl dialog);
-
-    /// <summary>
-    /// Provides direct access to the <see cref="IDialogControl"/>
-    /// </summary>
-    /// <returns>Instance of the <see cref="IDialogControl"/> control.</returns>
-    IDialogControl GetDialogControl();
-}
diff --git a/src/Wpf.Ui/Controls/Dialog.bmp b/src/Wpf.Ui/Controls/Dialog.bmp
deleted file mode 100644
index 4fcd099351afa45f63afecce3419b91ed51bcaac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 824
zcmZ?rwP0od12Z700mK4O%*Y@C7H0y=3voj*SO7@;XZSy;&^J;5(B(koPQ(GAO1S!u
p??2#2KqDzpPmGHwF(2r7pcVK@O3Ww8{XmO|1cNH2K^()t005es59<H`

diff --git a/src/Wpf.Ui/Controls/Dialog.cs b/src/Wpf.Ui/Controls/Dialog.cs
deleted file mode 100644
index b89ba8a40..000000000
--- a/src/Wpf.Ui/Controls/Dialog.cs
+++ /dev/null
@@ -1,372 +0,0 @@
-// 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.
-// All Rights Reserved.
-
-#nullable enable
-
-using System;
-using System.ComponentModel;
-using System.Drawing;
-using System.Threading.Tasks;
-using System.Windows;
-using Wpf.Ui.Common;
-
-namespace Wpf.Ui.Controls;
-
-/// <summary>
-/// Displays a large card with a slightly transparent background and two action buttons.
-/// </summary>
-[ToolboxItem(true)]
-[ToolboxBitmap(typeof(Dialog), "Dialog.bmp")]
-public class Dialog : System.Windows.Controls.ContentControl, IDialogControl
-{
-    private TaskCompletionSource<DialogButtonPressed>? _tcs = null;
-
-    private bool _automaticHide;
-
-    /// <summary>
-    /// Property for <see cref="IsFooterVisible"/>.
-    /// </summary>
-    public static readonly DependencyProperty IsFooterVisibleProperty = DependencyProperty.Register(nameof(IsFooterVisible),
-        typeof(bool), typeof(Dialog), new PropertyMetadata(true));
-
-    /// <summary>
-    /// Property for <see cref="IsShown"/>.
-    /// </summary>
-    public static readonly DependencyProperty IsShownProperty = DependencyProperty.Register(nameof(IsShown),
-        typeof(bool), typeof(Dialog), new PropertyMetadata(false, OnIsShownChange));
-
-    /// <summary>
-    /// Property for <see cref="Header"/>.
-    /// </summary>
-    public static readonly DependencyProperty HeaderProperty = DependencyProperty.Register(nameof(Header),
-        typeof(object), typeof(Dialog), new PropertyMetadata(null));
-
-    /// <summary>
-    /// Property for <see cref="Footer"/>.
-    /// </summary>
-    public static readonly DependencyProperty FooterProperty = DependencyProperty.Register(nameof(Footer),
-        typeof(object), typeof(Dialog), new PropertyMetadata(null));
-
-    /// <summary>
-    /// Property for <see cref="DialogWidth"/>.
-    /// </summary>
-    public static readonly DependencyProperty DialogWidthProperty =
-        DependencyProperty.Register(nameof(DialogWidth),
-            typeof(double), typeof(Dialog), new PropertyMetadata(420.0));
-
-    /// <summary>
-    /// Property for <see cref="DialogHeight"/>.
-    /// </summary>
-    public static readonly DependencyProperty DialogHeightProperty =
-        DependencyProperty.Register(nameof(DialogHeight),
-            typeof(double), typeof(Dialog), new PropertyMetadata(200.0));
-
-    /// <summary>
-    /// Property for <see cref="ButtonLeft"/>.
-    /// </summary>
-    public static readonly DependencyProperty ButtonLeftProperty = DependencyProperty.Register(
-        nameof(ButtonLeft),
-        typeof(System.Windows.Controls.Primitives.ButtonBase), typeof(Dialog), new PropertyMetadata(null));
-
-    /// <summary>
-    /// Property for <see cref="ButtonRight"/>.
-    /// </summary>
-    public static readonly DependencyProperty ButtonRightProperty = DependencyProperty.Register(
-        nameof(ButtonRight),
-        typeof(System.Windows.Controls.Primitives.ButtonBase), typeof(Dialog), new PropertyMetadata(null));
-
-    /// <summary>
-    /// Property for <see cref="TemplateButtonCommand"/>.
-    /// </summary>
-    public static readonly DependencyProperty TemplateButtonCommandProperty =
-        DependencyProperty.Register(nameof(TemplateButtonCommand),
-            typeof(Common.IRelayCommand), typeof(Dialog), new PropertyMetadata(null));
-
-    /// <summary>
-    /// Gets a value indicating whether the Footer grid with text and/or buttons should be displayed.
-    /// </summary>
-    public bool IsFooterVisible
-    {
-        get => (bool)GetValue(IsFooterVisibleProperty);
-        internal set => SetValue(IsFooterVisibleProperty, value);
-    }
-
-    /// <inheritdoc />
-    public bool IsShown
-    {
-        get => (bool)GetValue(IsShownProperty);
-        protected set => SetValue(IsShownProperty, value);
-    }
-
-    /// <inheritdoc />
-    public object Footer
-    {
-        get => GetValue(FooterProperty);
-        set => SetValue(FooterProperty, value);
-    }
-
-    /// <inheritdoc />
-    public object Header
-    {
-        get => GetValue(HeaderProperty);
-        set => SetValue(HeaderProperty, value);
-    }
-
-    /// <inheritdoc />
-    public double DialogWidth
-    {
-        get => (int)GetValue(DialogWidthProperty);
-        set => SetValue(DialogWidthProperty, value);
-    }
-
-    /// <inheritdoc />
-    public double DialogHeight
-    {
-        get => (int)GetValue(DialogHeightProperty);
-        set => SetValue(DialogHeightProperty, value);
-    }
-
-    /// <inheritdoc />
-    public System.Windows.Controls.Primitives.ButtonBase ButtonLeft
-    {
-        get => (System.Windows.Controls.Primitives.ButtonBase)GetValue(ButtonLeftProperty);
-        set => SetValue(ButtonLeftProperty, value);
-    }
-
-    /// <inheritdoc />
-    public System.Windows.Controls.Primitives.ButtonBase ButtonRight
-    {
-        get => (System.Windows.Controls.Primitives.ButtonBase)GetValue(ButtonRightProperty);
-        set => SetValue(ButtonRightProperty, value);
-    }
-
-    /// <summary>
-    /// Command triggered after clicking the button in the template.
-    /// </summary>
-    public Common.IRelayCommand TemplateButtonCommand =>
-        (Common.IRelayCommand)GetValue(TemplateButtonCommandProperty);
-
-    /// <summary>
-    /// Event triggered when <see cref="Dialog"/> opens.
-    /// </summary>
-    public static readonly RoutedEvent OpenedEvent = EventManager.RegisterRoutedEvent(nameof(Opened),
-        RoutingStrategy.Bubble, typeof(RoutedDialogEvent), typeof(Dialog));
-
-    /// <inheritdoc />
-    public event RoutedDialogEvent Opened
-    {
-        add => AddHandler(OpenedEvent, value);
-        remove => RemoveHandler(OpenedEvent, value);
-    }
-
-    /// <summary>
-    /// Event triggered when <see cref="Dialog"/> opens.
-    /// </summary>
-    public static readonly RoutedEvent ClosedEvent = EventManager.RegisterRoutedEvent(nameof(Closed),
-        RoutingStrategy.Bubble, typeof(RoutedDialogEvent), typeof(Dialog));
-
-    /// <inheritdoc />
-    public event RoutedDialogEvent Closed
-    {
-        add => AddHandler(ClosedEvent, value);
-        remove => RemoveHandler(ClosedEvent, value);
-    }
-
-    /// <summary>
-    /// Creates new instance and sets default <see cref="TemplateButtonCommandProperty"/>.
-    /// </summary>
-    public Dialog()
-    {
-        SetValue(TemplateButtonCommandProperty, new Common.RelayCommand<string>(o => OnTemplateButtonClick(o ?? String.Empty)));
-    }
-
-    /// <inheritdoc />
-    public Task<DialogButtonPressed> ShowAndWaitAsync()
-    {
-        _automaticHide = false;
-
-        Show();
-
-        _tcs = new TaskCompletionSource<DialogButtonPressed>();
-
-        return _tcs.Task;
-    }
-
-    /// <inheritdoc />
-    public Task<DialogButtonPressed> ShowAndWaitAsync(bool hideOnClick)
-    {
-        _automaticHide = hideOnClick;
-
-        Show();
-
-        _tcs = new TaskCompletionSource<DialogButtonPressed>();
-
-        return _tcs.Task;
-    }
-
-    /// <inheritdoc />
-    public Task<DialogButtonPressed> ShowAndWaitAsync(string title, string message)
-    {
-        _automaticHide = false;
-
-        if (IsShown)
-            Hide();
-
-        Show(title, message);
-
-        _tcs = new TaskCompletionSource<DialogButtonPressed>();
-
-        return _tcs.Task;
-    }
-
-    /// <inheritdoc />
-    public Task<DialogButtonPressed> ShowAndWaitAsync(string title, string message, bool hideOnClick)
-    {
-        _automaticHide = hideOnClick;
-
-        if (IsShown)
-            Hide();
-
-        Show(title, message);
-
-        _tcs = new TaskCompletionSource<DialogButtonPressed>();
-
-        return _tcs.Task;
-    }
-
-    /// <inheritdoc />
-    public bool Show()
-    {
-        if (IsShown)
-            return false;
-
-        _automaticHide = false;
-
-        IsShown = true;
-
-        FocusFirstButton();
-
-        return true;
-    }
-
-    /// <inheritdoc />
-    public bool Show(string title, string message)
-    {
-        if (IsShown)
-            Hide();
-
-        _automaticHide = false;
-
-        Header = title;
-        Content = message;
-        IsShown = true;
-
-        FocusFirstButton();
-
-        return true;
-    }
-
-    /// <inheritdoc />
-    public bool Hide()
-    {
-        if (!IsShown)
-            return false;
-
-        IsShown = false;
-
-        return true;
-    }
-
-    public override void OnApplyTemplate()
-    {
-        base.OnApplyTemplate();
-
-        //if (GetTemplateChild(ElementFooterButtonLeft) is System.Windows.Controls.Primitives.ButtonBase leftButton)
-        //    _leftFooterButton = leftButton;
-
-        //if (GetTemplateChild(ElementFooterButtonLeft) is System.Windows.Controls.Primitives.ButtonBase rightButton)
-        //    _rightFooterButton = rightButton;
-    }
-
-    /// <summary>
-    /// This virtual method is called when <see cref="Dialog"/> is opening and it raises the <see cref="Opened"/> <see langword="event"/>.
-    /// </summary>
-    protected virtual void OnOpened()
-    {
-        var newEvent = new RoutedEventArgs(Dialog.OpenedEvent, this);
-        RaiseEvent(newEvent);
-    }
-
-    /// <summary>
-    /// This virtual method is called when <see cref="Dialog"/> is closing and it raises the <see cref="Closed"/> <see langword="event"/>.
-    /// </summary>
-    protected virtual void OnClosed()
-    {
-        var newEvent = new RoutedEventArgs(Dialog.ClosedEvent, this);
-        RaiseEvent(newEvent);
-    }
-
-    /// <summary>
-    /// Triggered by clicking a button in the control template.
-    /// </summary>
-    protected virtual void OnTemplateButtonClick(string parameter)
-    {
-        //#if DEBUG
-        //        System.Diagnostics.Debug.WriteLine($"INFO: {typeof(Dialog)} button clicked with param: {parameter}",
-        //            "Wpf.Ui.Dialog");
-        //#endif
-
-        //        switch (parameter)
-        //        {
-        //            case "left":
-        //                RaiseEvent(new RoutedEventArgs(ButtonLeftClickEvent, this));
-
-        //                _tcs?.TrySetResult(ButtonPressed.Left);
-
-        //                break;
-
-        //            case "right":
-        //                RaiseEvent(new RoutedEventArgs(ButtonRightClickEvent, this));
-
-        //                _tcs?.TrySetResult(ButtonPressed.Right);
-
-        //                break;
-        //        }
-
-        //        if (_automaticHide)
-        //            Hide();
-    }
-
-    private static void OnIsShownChange(DependencyObject d, DependencyPropertyChangedEventArgs e)
-    {
-        if (d is not Dialog control)
-            return;
-
-        if (control.IsShown)
-            control.OnOpened();
-        else
-            control.OnClosed();
-    }
-
-    private void FocusFirstButton()
-    {
-        //if (Footer != null)
-        //    return;
-
-        //if (ButtonLeftVisibility == Visibility.Visible)
-        //{
-        //    if (_leftFooterButton != null)
-        //        _leftFooterButton.Focus();
-
-        //    return;
-        //}
-
-        //if (ButtonRightVisibility != Visibility.Visible)
-        //    return;
-
-        //if (_rightFooterButton != null)
-        //    _rightFooterButton.Focus();
-    }
-}
diff --git a/src/Wpf.Ui/Controls/DialogButtonPressed.cs b/src/Wpf.Ui/Controls/DialogButtonPressed.cs
deleted file mode 100644
index 98ce6a672..000000000
--- a/src/Wpf.Ui/Controls/DialogButtonPressed.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// 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.
-// All Rights Reserved.
-
-namespace Wpf.Ui.Controls;
-
-/// <summary>
-/// Which of the <see cref="Dialog"/> button is pressed.
-/// </summary>
-public enum DialogButtonPressed
-{
-    /// <summary>
-    /// None.
-    /// </summary>
-    None,
-
-    /// <summary>
-    /// Left button.
-    /// </summary>
-    Left,
-
-    /// <summary>
-    /// Right button.
-    /// </summary>
-    Right
-}
diff --git a/src/Wpf.Ui/Controls/IDialogControl.cs b/src/Wpf.Ui/Controls/IDialogControl.cs
deleted file mode 100644
index 0151c1a39..000000000
--- a/src/Wpf.Ui/Controls/IDialogControl.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-// 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.
-// All Rights Reserved.
-
-using System.Threading.Tasks;
-using System.Windows;
-using Wpf.Ui.Common;
-
-namespace Wpf.Ui.Controls;
-
-/// <summary>
-/// Represents a Dialog control.
-/// </summary>
-public interface IDialogControl
-{
-    /// <summary>
-    /// Gets the information whether the <see cref="IDialogControl"/> is visible.
-    /// </summary>
-    bool IsShown { get; }
-
-    /// <summary>
-    /// Gets or sets the header displayed at the top of the <see cref="IDialogControl"/>.
-    /// </summary>
-    object Header { get; set; }
-
-    /// <summary>
-    /// <see cref="FrameworkElement"/> or <see langword="string"/> displayed below the <see cref="Header"/> and <see cref="Message"/>.
-    /// </summary>
-    object Content { get; set; }
-
-    /// <summary>
-    /// Custom control or text displayed at the bottom of the <see cref="IDialogControl"/> instead of the buttons.
-    /// </summary>
-    object Footer { get; set; }
-
-    /// <summary>
-    /// Gets or sets maximum dialog width.
-    /// </summary>
-    double DialogWidth { get; set; }
-
-    /// <summary>
-    /// Gets or sets maximum dialog height.
-    /// </summary>
-    double DialogHeight { get; set; }
-
-    /// <summary>
-    /// Gets or sets the name of the left button displayed in the <see cref="IDialogControl"/> footer.
-    /// </summary>
-    System.Windows.Controls.Primitives.ButtonBase ButtonLeft { get; set; }
-
-    /// <summary>
-    /// Gets or sets the name of the right button displayed in the <see cref="IDialogControl"/> footer.
-    /// </summary>
-    System.Windows.Controls.Primitives.ButtonBase ButtonRight { get; set; }
-
-    /// <summary>
-    /// Occurs when the dialog is about to open.
-    /// </summary>
-    public event RoutedDialogEvent Opened;
-
-    /// <summary>
-    /// Occurs when the dialog is about to close.
-    /// </summary>
-    public event RoutedDialogEvent Closed;
-
-    /// <summary>
-    /// Reveals the <see cref="IDialogControl"/>.
-    /// </summary>
-    /// <returns><see langword="true"/> if the operation was successful.</returns>
-    bool Show();
-
-    /// <summary>
-    /// Reveals the <see cref="IDialogControl"/>.
-    /// </summary>
-    /// <param name="title"><see cref="Title"/> at the top of the dialog.</param>
-    /// <param name="message"><see cref="Message"/> above the <see cref="Content"/> of the dialog.</param>
-    /// <returns><see langword="true"/> if the operation was successful.</returns>
-    bool Show(string title, string message);
-
-    /// <summary>
-    /// Reveals the <see cref="IDialogControl"/> and waits for the user to click on of the footer buttons.
-    /// </summary>
-    /// <returns>Information about which button was pressed.</returns>
-    Task<DialogButtonPressed> ShowAndWaitAsync();
-
-    /// <summary>
-    /// Reveals the <see cref="IDialogControl"/> and waits for the user to click on of the footer buttons.
-    /// </summary>
-    /// <param name="hideOnClick">Whether the dialogue should be hidden after pressing any button in the footer.</param>
-    /// <returns>Information about which button was pressed.</returns>
-    Task<DialogButtonPressed> ShowAndWaitAsync(bool hideOnClick);
-
-    /// <summary>
-    /// Reveals the <see cref="IDialogControl"/> and waits for the user to click on of the footer buttons.
-    /// </summary>
-    /// <param name="title"><see cref="Title"/> at the top of the dialog.</param>
-    /// <param name="message"><see cref="Message"/> above the <see cref="Content"/> of the dialog.</param>
-    /// <returns>Information about which button was pressed.</returns>
-    Task<DialogButtonPressed> ShowAndWaitAsync(string title, string message);
-
-    /// <summary>
-    /// Reveals the <see cref="IDialogControl"/> and waits for the user to click on of the footer buttons.
-    /// </summary>
-    /// <param name="title"><see cref="Title"/> at the top of the dialog.</param>
-    /// <param name="message"><see cref="Message"/> above the <see cref="Content"/> of the dialog.</param>
-    /// <param name="hideOnClick">Whether the dialogue should be hidden after pressing any button in the footer.</param>
-    /// <returns>Information about which button was pressed.</returns>
-    Task<DialogButtonPressed> ShowAndWaitAsync(string title, string message, bool hideOnClick);
-
-    /// <summary>
-    /// Hides the <see cref="IDialogControl"/>.
-    /// <returns><see langword="true"/> if the operation was successful.</returns>
-    /// </summary>
-    bool Hide();
-}
diff --git a/src/Wpf.Ui/Services/DialogService.cs b/src/Wpf.Ui/Services/DialogService.cs
deleted file mode 100644
index 8ea9e35dd..000000000
--- a/src/Wpf.Ui/Services/DialogService.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// 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.
-// All Rights Reserved.
-
-using System;
-using Wpf.Ui.Contracts;
-using Wpf.Ui.Controls;
-
-namespace Wpf.Ui.Services;
-
-/// <summary>
-/// A service that provides methods related to displaying the <see cref="IDialogControl"/>.
-/// </summary>
-public class DialogService : IDialogService
-{
-    private IDialogControl? _dialogControl;
-
-    /// <inheritdoc />
-    public void SetDialogControl(IDialogControl dialog)
-    {
-        _dialogControl = dialog;
-    }
-
-    /// <inheritdoc />
-    public IDialogControl GetDialogControl()
-    {
-        if (_dialogControl is null)
-            throw new InvalidOperationException(
-                $"The ${typeof(DialogService)} cannot be used unless previously defined with {typeof(IDialogControl)}.{nameof(SetDialogControl)}().");
-
-        return _dialogControl;
-    }
-}
diff --git a/src/Wpf.Ui/Styles/Controls/Dialog.xaml b/src/Wpf.Ui/Styles/Controls/Dialog.xaml
deleted file mode 100644
index 8ccce0509..000000000
--- a/src/Wpf.Ui/Styles/Controls/Dialog.xaml
+++ /dev/null
@@ -1,166 +0,0 @@
-<!--
-    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.
-    All Rights Reserved.
--->
-
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
-
-    <CornerRadius x:Key="DialogFooterCornerRadius">0,0,8,8</CornerRadius>
-
-    <Style x:Key="DefaultUiDialogStyle" TargetType="{x:Type controls:Dialog}">
-        <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
-        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
-        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-        <Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="Border.CornerRadius" Value="{DynamicResource PopupCornerRadius}" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:Dialog}">
-                    <Grid x:Name="LayoutRoot">
-                        <Grid.Background>
-                            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-                                <GradientStop Offset="0.0" Color="#CF202020" />
-                                <GradientStop Offset="1.0" Color="#8F202020" />
-                            </LinearGradientBrush>
-                        </Grid.Background>
-
-                        <Border
-                            x:Name="DialogBorder"
-                            MaxWidth="{TemplateBinding DialogWidth}"
-                            MaxHeight="{TemplateBinding DialogHeight}"
-                            Margin="12"
-                            Padding="0"
-                            CornerRadius="{TemplateBinding Border.CornerRadius}"
-                            Opacity="0">
-                            <Border.Background>
-                                <SolidColorBrush Color="{DynamicResource SystemFillColorSolidNeutralBackground}" />
-                            </Border.Background>
-                            <Border.Effect>
-                                <DropShadowEffect
-                                    BlurRadius="30"
-                                    Direction="0"
-                                    Opacity="0.4"
-                                    ShadowDepth="0"
-                                    Color="#202020" />
-                            </Border.Effect>
-
-                            <Grid>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="*" />
-                                    <RowDefinition Height="Auto" />
-                                </Grid.RowDefinitions>
-
-                                <Grid Grid.Row="0" Margin="24">
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="*" />
-                                    </Grid.RowDefinitions>
-                                    <ContentPresenter
-                                        x:Name="HeaderContentPresenter"
-                                        Grid.Row="0"
-                                        Content="{TemplateBinding Header}"
-                                        TextElement.FontWeight="Medium" />
-                                    <ScrollViewer
-                                        Grid.Row="1"
-                                        Margin="0,0,-12,0"
-                                        Padding="0,0,12,0"
-                                        CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
-                                        HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                                        IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
-                                        VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
-                                        <ContentPresenter
-                                            HorizontalAlignment="Stretch"
-                                            VerticalAlignment="Stretch"
-                                            Content="{TemplateBinding Content}">
-                                            <ContentPresenter.Resources>
-                                                <Style TargetType="{x:Type TextBlock}">
-                                                    <Setter Property="TextAlignment" Value="Justify" />
-                                                    <Setter Property="TextWrapping" Value="Wrap" />
-                                                    <Setter Property="Foreground">
-                                                        <Setter.Value>
-                                                            <SolidColorBrush Color="{DynamicResource TextFillColorSecondary}" />
-                                                        </Setter.Value>
-                                                    </Setter>
-                                                </Style>
-                                            </ContentPresenter.Resources>
-                                        </ContentPresenter>
-                                    </ScrollViewer>
-                                </Grid>
-
-                                <Border
-                                    x:Name="FooterBorder"
-                                    Grid.Row="1"
-                                    CornerRadius="{StaticResource DialogFooterCornerRadius}">
-                                    <Border.Background>
-                                        <SolidColorBrush Color="{DynamicResource ControlFillColorDefault}" />
-                                    </Border.Background>
-                                    <Grid>
-                                        <Grid Margin="24">
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="*" />
-                                                <ColumnDefinition Width="*" />
-                                            </Grid.ColumnDefinitions>
-
-                                            <ContentPresenter
-                                                Grid.Column="0"
-                                                Margin="0,0,4,0"
-                                                HorizontalAlignment="Stretch"
-                                                Content="{TemplateBinding ButtonLeft}" />
-
-                                            <ContentPresenter
-                                                Grid.Column="1"
-                                                Margin="4,0,4,0"
-                                                HorizontalAlignment="Stretch"
-                                                Content="{TemplateBinding ButtonRight}" />
-                                        </Grid>
-                                        <ContentPresenter Content="{TemplateBinding Footer}" />
-                                    </Grid>
-                                </Border>
-                            </Grid>
-                        </Border>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsShown" Value="False">
-                            <Setter TargetName="LayoutRoot" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="LayoutRoot" Property="Height" Value="0" />
-                        </Trigger>
-                        <Trigger Property="IsShown" Value="True">
-                            <Trigger.EnterActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="DialogBorder"
-                                            Storyboard.TargetProperty="Opacity"
-                                            From="0"
-                                            To="1"
-                                            Duration="00:00:00.250" />
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </Trigger.EnterActions>
-                        </Trigger>
-                        <Trigger Property="Header" Value="{x:Null}">
-                            <Setter TargetName="HeaderContentPresenter" Property="Visibility" Value="Collapsed" />
-                        </Trigger>
-                        <Trigger Property="Header" Value="">
-                            <Setter TargetName="HeaderContentPresenter" Property="Visibility" Value="Collapsed" />
-                        </Trigger>
-                        <Trigger Property="IsFooterVisible" Value="False">
-                            <Setter TargetName="FooterBorder" Property="Visibility" Value="Collapsed" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style BasedOn="{StaticResource DefaultUiDialogStyle}" TargetType="{x:Type controls:Dialog}" />
-
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Wpf.Ui/Styles/Wpf.Ui.xaml b/src/Wpf.Ui/Styles/Wpf.Ui.xaml
index d32e6a9dd..83ab9cb71 100644
--- a/src/Wpf.Ui/Styles/Wpf.Ui.xaml
+++ b/src/Wpf.Ui/Styles/Wpf.Ui.xaml
@@ -33,7 +33,6 @@
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/CardControl.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/CardColor.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/CardExpander.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/Dialog.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/ContentDialog.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/InfoBar.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/Snackbar.xaml" />
diff --git a/src/Wpf.Ui/Wpf.Ui.csproj b/src/Wpf.Ui/Wpf.Ui.csproj
index e8bebde37..b01390c60 100644
--- a/src/Wpf.Ui/Wpf.Ui.csproj
+++ b/src/Wpf.Ui/Wpf.Ui.csproj
@@ -105,7 +105,6 @@
     <EmbeddedResource Include="Controls\DynamicScrollBar.bmp" />
     <EmbeddedResource Include="Controls\DynamicScrollViewer.bmp" />
     <EmbeddedResource Include="Controls\MessageBox\MessageBox.bmp" />
-    <EmbeddedResource Include="Controls\Dialog.bmp" />
     <EmbeddedResource Include="Controls\FontIcon.bmp" />
     <EmbeddedResource Include="Controls\Navigation\NavigationView.bmp" />
     <EmbeddedResource Include="Controls\Navigation\NavigationViewItem.bmp" />

From 999bdbaf3ba9abb2b066f77d30de78d25bfd9dcc Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Wed, 1 Feb 2023 15:23:52 +0600
Subject: [PATCH 07/15] Removed strange Clipboard static class

---
 src/Wpf.Ui/Common/Clipboard.cs   | 36 --------------------------------
 src/Wpf.Ui/Controls/CodeBlock.cs | 25 +++++++++++++++-------
 2 files changed, 17 insertions(+), 44 deletions(-)
 delete mode 100644 src/Wpf.Ui/Common/Clipboard.cs

diff --git a/src/Wpf.Ui/Common/Clipboard.cs b/src/Wpf.Ui/Common/Clipboard.cs
deleted file mode 100644
index 55fda401b..000000000
--- a/src/Wpf.Ui/Common/Clipboard.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// 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.
-// All Rights Reserved.
-
-using System;
-using System.Threading;
-
-namespace Wpf.Ui.Common;
-
-/// <summary>
-/// Provides methods to place data on and retrieve data from the system clipboard.
-/// </summary>
-public static class Clipboard
-{
-    /// <summary>
-    /// Set the text data to Clipboard.
-    /// </summary>
-    public static void SetText(string text)
-    {
-        try
-        {
-            Thread thread = new(() => System.Windows.Clipboard.SetText(text));
-
-            thread.SetApartmentState(ApartmentState.STA); //Set the thread to STA
-            thread.Start();
-            //thread.Join();
-        }
-        catch (Exception e)
-        {
-            Console.WriteLine(e);
-            throw;
-        }
-    }
-}
-
diff --git a/src/Wpf.Ui/Controls/CodeBlock.cs b/src/Wpf.Ui/Controls/CodeBlock.cs
index 5f7c4c657..f0df01db6 100644
--- a/src/Wpf.Ui/Controls/CodeBlock.cs
+++ b/src/Wpf.Ui/Controls/CodeBlock.cs
@@ -5,9 +5,11 @@
 
 using System;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Drawing;
 using System.Windows;
 using Wpf.Ui.Appearance;
+using Wpf.Ui.Common;
 using Color = System.Windows.Media.Color;
 
 namespace Wpf.Ui.Controls;
@@ -33,7 +35,7 @@ public class CodeBlock : System.Windows.Controls.ContentControl
     /// </summary>
     public static readonly DependencyProperty ButtonCommandProperty =
         DependencyProperty.Register(nameof(NumberBox),
-            typeof(Common.IRelayCommand), typeof(CodeBlock), new PropertyMetadata(null));
+            typeof(IRelayCommand), typeof(CodeBlock));
 
     /// <summary>
     /// Formatted <see cref="System.Windows.Controls.ContentControl.Content"/>.
@@ -47,14 +49,14 @@ public object SyntaxContent
     /// <summary>
     /// Command triggered after clicking the control button.
     /// </summary>
-    public Common.IRelayCommand ButtonCommand => (Common.IRelayCommand)GetValue(ButtonCommandProperty);
+    public IRelayCommand ButtonCommand => (Common.IRelayCommand)GetValue(ButtonCommandProperty);
 
     /// <summary>
     /// Creates new instance and assigns <see cref="ButtonCommand"/> default action.
     /// </summary>
     public CodeBlock()
     {
-        SetValue(ButtonCommandProperty, new Common.RelayCommand<string>(o => OnTemplateButtonClick(o ?? String.Empty)));
+        SetValue(ButtonCommandProperty, new RelayCommand<string>(OnTemplateButtonClick));
 
         Appearance.Theme.Changed += ThemeOnChanged;
     }
@@ -80,11 +82,18 @@ protected virtual void UpdateSyntax()
         SyntaxContent = Syntax.Highlighter.Format(_sourceCode);
     }
 
-    private void OnTemplateButtonClick(string parameter)
+    private void OnTemplateButtonClick(string? _)
     {
-#if DEBUG
-        System.Diagnostics.Debug.WriteLine($"INFO | CodeBlock source: \n{_sourceCode}", "Wpf.Ui.CodeBlock");
-#endif
-        Wpf.Ui.Common.Clipboard.SetText(_sourceCode);
+        Debug.WriteLine($"INFO | CodeBlock source: \n{_sourceCode}", "Wpf.Ui.CodeBlock");
+
+        try
+        {
+            Clipboard.Clear();
+            Clipboard.SetText(_sourceCode);
+        }
+        catch (Exception e)
+        {
+            Debug.WriteLine(e);
+        }
     }
 }

From 04e83994740132b8ef05329e3b866f6d4e1b4f99 Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Wed, 1 Feb 2023 18:28:10 +0600
Subject: [PATCH 08/15] Changed to internal

---
 src/Wpf.Ui/Converters/EnumToBoolConverter.cs | 2 +-
 src/Wpf.Ui/Extensions/UiElementExtensions.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Wpf.Ui/Converters/EnumToBoolConverter.cs b/src/Wpf.Ui/Converters/EnumToBoolConverter.cs
index 78aa38fcf..8d6a77fea 100644
--- a/src/Wpf.Ui/Converters/EnumToBoolConverter.cs
+++ b/src/Wpf.Ui/Converters/EnumToBoolConverter.cs
@@ -11,7 +11,7 @@
 
 namespace Wpf.Ui.Converters;
 
-public class EnumToBoolConverter<TEnum> : IValueConverter where TEnum : Enum
+internal class EnumToBoolConverter<TEnum> : IValueConverter where TEnum : Enum
 {
     public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
     {
diff --git a/src/Wpf.Ui/Extensions/UiElementExtensions.cs b/src/Wpf.Ui/Extensions/UiElementExtensions.cs
index 97e5fca0d..05a508f88 100644
--- a/src/Wpf.Ui/Extensions/UiElementExtensions.cs
+++ b/src/Wpf.Ui/Extensions/UiElementExtensions.cs
@@ -3,7 +3,7 @@
 
 namespace Wpf.Ui.Extensions;
 
-public static class UiElementExtensions
+internal static class UiElementExtensions
 {
     /// <summary>
     /// Do not call it outside of NCHITTEST, NCLBUTTONUP, NCLBUTTONDOWN messages!

From 3717d881e5a030cd23c690af4eecbd5029d9155c Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Wed, 1 Feb 2023 19:04:51 +0600
Subject: [PATCH 09/15] Added VirtualizingControls folder

And fixed virtual member call in constructor
---
 .../{ => VirtualizingControls}/SpacingMode.cs      |   0
 .../VirtualizingGridView.cs                        |  13 ++++++++-----
 .../VirtualizingItemsControl.bmp                   | Bin
 .../VirtualizingItemsControl.cs                    |   0
 .../VirtualizingPanelBase.cs                       |   0
 .../VirtualizingUniformGrid.cs                     |   0
 .../VirtualizingWrapPanel.bmp                      | Bin
 .../VirtualizingWrapPanel.cs                       |   0
 src/Wpf.Ui/Wpf.Ui.csproj                           |   4 ++--
 9 files changed, 10 insertions(+), 7 deletions(-)
 rename src/Wpf.Ui/Controls/{ => VirtualizingControls}/SpacingMode.cs (100%)
 rename src/Wpf.Ui/Controls/{ => VirtualizingControls}/VirtualizingGridView.cs (97%)
 rename src/Wpf.Ui/Controls/{ => VirtualizingControls}/VirtualizingItemsControl.bmp (100%)
 rename src/Wpf.Ui/Controls/{ => VirtualizingControls}/VirtualizingItemsControl.cs (100%)
 rename src/Wpf.Ui/Controls/{ => VirtualizingControls}/VirtualizingPanelBase.cs (100%)
 rename src/Wpf.Ui/Controls/{ => VirtualizingControls}/VirtualizingUniformGrid.cs (100%)
 rename src/Wpf.Ui/Controls/{ => VirtualizingControls}/VirtualizingWrapPanel.bmp (100%)
 rename src/Wpf.Ui/Controls/{ => VirtualizingControls}/VirtualizingWrapPanel.cs (100%)

diff --git a/src/Wpf.Ui/Controls/SpacingMode.cs b/src/Wpf.Ui/Controls/VirtualizingControls/SpacingMode.cs
similarity index 100%
rename from src/Wpf.Ui/Controls/SpacingMode.cs
rename to src/Wpf.Ui/Controls/VirtualizingControls/SpacingMode.cs
diff --git a/src/Wpf.Ui/Controls/VirtualizingGridView.cs b/src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingGridView.cs
similarity index 97%
rename from src/Wpf.Ui/Controls/VirtualizingGridView.cs
rename to src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingGridView.cs
index ca5a60525..300020fe0 100644
--- a/src/Wpf.Ui/Controls/VirtualizingGridView.cs
+++ b/src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingGridView.cs
@@ -5,6 +5,7 @@
 // Copyright (C) S. Bäumlisberger, Leszek Pomianowski and WPF UI Contributors.
 // All Rights Reserved.
 
+using System;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
@@ -71,18 +72,20 @@ public bool StretchItems
         set => SetValue(StretchItemsProperty, value);
     }
 
-    /// <summary>
-    /// Constructor initializing the <see cref="ItemsControl.ItemsPanel"/>.
-    /// </summary>
     public VirtualizingGridView()
     {
-        InitializeItemsPanel();
-
         VirtualizingPanel.SetCacheLengthUnit(this, VirtualizationCacheLengthUnit.Page);
         VirtualizingPanel.SetCacheLength(this, new VirtualizationCacheLength(1));
         VirtualizingPanel.SetIsVirtualizingWhenGrouping(this, true);
     }
 
+    protected override void OnInitialized(EventArgs e)
+    {
+        base.OnInitialized(e);
+
+        InitializeItemsPanel();
+    }
+
     /// <summary>
     /// Initializes the <see cref="ItemsControl.ItemsPanel"/> with <see cref="VirtualizingWrapPanel"/>.
     /// </summary>
diff --git a/src/Wpf.Ui/Controls/VirtualizingItemsControl.bmp b/src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingItemsControl.bmp
similarity index 100%
rename from src/Wpf.Ui/Controls/VirtualizingItemsControl.bmp
rename to src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingItemsControl.bmp
diff --git a/src/Wpf.Ui/Controls/VirtualizingItemsControl.cs b/src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingItemsControl.cs
similarity index 100%
rename from src/Wpf.Ui/Controls/VirtualizingItemsControl.cs
rename to src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingItemsControl.cs
diff --git a/src/Wpf.Ui/Controls/VirtualizingPanelBase.cs b/src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingPanelBase.cs
similarity index 100%
rename from src/Wpf.Ui/Controls/VirtualizingPanelBase.cs
rename to src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingPanelBase.cs
diff --git a/src/Wpf.Ui/Controls/VirtualizingUniformGrid.cs b/src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingUniformGrid.cs
similarity index 100%
rename from src/Wpf.Ui/Controls/VirtualizingUniformGrid.cs
rename to src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingUniformGrid.cs
diff --git a/src/Wpf.Ui/Controls/VirtualizingWrapPanel.bmp b/src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingWrapPanel.bmp
similarity index 100%
rename from src/Wpf.Ui/Controls/VirtualizingWrapPanel.bmp
rename to src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingWrapPanel.bmp
diff --git a/src/Wpf.Ui/Controls/VirtualizingWrapPanel.cs b/src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingWrapPanel.cs
similarity index 100%
rename from src/Wpf.Ui/Controls/VirtualizingWrapPanel.cs
rename to src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingWrapPanel.cs
diff --git a/src/Wpf.Ui/Wpf.Ui.csproj b/src/Wpf.Ui/Wpf.Ui.csproj
index b01390c60..fbddbe0ed 100644
--- a/src/Wpf.Ui/Wpf.Ui.csproj
+++ b/src/Wpf.Ui/Wpf.Ui.csproj
@@ -117,8 +117,8 @@
     <EmbeddedResource Include="Controls\ThumbRate.bmp" />
     <EmbeddedResource Include="Controls\ToggleSwitch.bmp" />
     <EmbeddedResource Include="Controls\Window\FluentWindow.bmp" />
-    <EmbeddedResource Include="Controls\VirtualizingItemsControl.bmp" />
-    <EmbeddedResource Include="Controls\VirtualizingWrapPanel.bmp" />
+    <EmbeddedResource Include="Controls\VirtualizingControls\VirtualizingItemsControl.bmp" />
+    <EmbeddedResource Include="Controls\VirtualizingControls\VirtualizingWrapPanel.bmp" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file

From fea8ba0434ceaf0f0202a8021ee5c8cd6436d6ab Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Wed, 1 Feb 2023 19:18:34 +0600
Subject: [PATCH 10/15] Added ThumbRate folder

---
 .../Pages/BasicInput/ThumbRateViewModel.cs    |   2 +-
 .../Controls/{ => ThumbRate}/ThumbRate.bmp    | Bin
 .../Controls/{ => ThumbRate}/ThumbRate.cs     |  24 ++++++++----------
 .../{ => ThumbRate}/ThumbRateState.cs         |   2 +-
 .../Controls/{ => TreeGrid}/TreeGrid.cs       |   4 +--
 .../Controls/{ => TreeGrid}/TreeGridHeader.cs |   0
 .../Controls/{ => TreeGrid}/TreeGridItem.cs   |   0
 src/Wpf.Ui/Styles/Controls/ThumbRate.xaml     |   4 +--
 src/Wpf.Ui/Wpf.Ui.csproj                      |   2 +-
 9 files changed, 17 insertions(+), 21 deletions(-)
 rename src/Wpf.Ui/Controls/{ => ThumbRate}/ThumbRate.bmp (100%)
 rename src/Wpf.Ui/Controls/{ => ThumbRate}/ThumbRate.cs (80%)
 rename src/Wpf.Ui/Controls/{ => ThumbRate}/ThumbRateState.cs (95%)
 rename src/Wpf.Ui/Controls/{ => TreeGrid}/TreeGrid.cs (96%)
 rename src/Wpf.Ui/Controls/{ => TreeGrid}/TreeGridHeader.cs (100%)
 rename src/Wpf.Ui/Controls/{ => TreeGrid}/TreeGridItem.cs (100%)

diff --git a/src/Wpf.Ui.Gallery/ViewModels/Pages/BasicInput/ThumbRateViewModel.cs b/src/Wpf.Ui.Gallery/ViewModels/Pages/BasicInput/ThumbRateViewModel.cs
index 025f5f8ad..76119fa91 100644
--- a/src/Wpf.Ui.Gallery/ViewModels/Pages/BasicInput/ThumbRateViewModel.cs
+++ b/src/Wpf.Ui.Gallery/ViewModels/Pages/BasicInput/ThumbRateViewModel.cs
@@ -3,7 +3,7 @@
 // Copyright (C) Leszek Pomianowski and WPF UI Contributors.
 // All Rights Reserved.
 
-using Wpf.Ui.Controls.States;
+using Wpf.Ui.Controls;
 
 namespace Wpf.Ui.Gallery.ViewModels.Pages.BasicInput;
 
diff --git a/src/Wpf.Ui/Controls/ThumbRate.bmp b/src/Wpf.Ui/Controls/ThumbRate/ThumbRate.bmp
similarity index 100%
rename from src/Wpf.Ui/Controls/ThumbRate.bmp
rename to src/Wpf.Ui/Controls/ThumbRate/ThumbRate.bmp
diff --git a/src/Wpf.Ui/Controls/ThumbRate.cs b/src/Wpf.Ui/Controls/ThumbRate/ThumbRate.cs
similarity index 80%
rename from src/Wpf.Ui/Controls/ThumbRate.cs
rename to src/Wpf.Ui/Controls/ThumbRate/ThumbRate.cs
index 63d1ef66c..e10c109db 100644
--- a/src/Wpf.Ui/Controls/ThumbRate.cs
+++ b/src/Wpf.Ui/Controls/ThumbRate/ThumbRate.cs
@@ -8,7 +8,6 @@
 using System.Drawing;
 using System.Windows;
 using Wpf.Ui.Common;
-using Wpf.Ui.Controls.States;
 
 namespace Wpf.Ui.Controls;
 
@@ -30,12 +29,12 @@ public class ThumbRate : System.Windows.Controls.Control
     /// Event property for <see cref="StateChanged"/>.
     /// </summary>
     public static readonly RoutedEvent StateChangedEvent = EventManager.RegisterRoutedEvent(nameof(StateChanged),
-        RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(ThumbRate));
+        RoutingStrategy.Bubble, typeof(TypedEventHandler<ThumbRate, RoutedEventArgs>), typeof(ThumbRate));
 
     /// <summary>
     /// Occurs when <see cref="State"/> is changed.
     /// </summary>
-    public event RoutedEventHandler StateChanged
+    public event TypedEventHandler<ThumbRate, RoutedEventArgs> StateChanged
     {
         add => AddHandler(StateChangedEvent, value);
         remove => RemoveHandler(StateChangedEvent, value);
@@ -46,7 +45,7 @@ public event RoutedEventHandler StateChanged
     /// </summary>
     public static readonly DependencyProperty TemplateButtonCommandProperty =
         DependencyProperty.Register(nameof(TemplateButtonCommand),
-            typeof(Common.IRelayCommand), typeof(ThumbRate), new PropertyMetadata(null));
+            typeof(IRelayCommand), typeof(ThumbRate), new PropertyMetadata(null));
 
     /// <summary>
     /// Gets or sets the value determining the current state of the control.
@@ -67,24 +66,21 @@ public ThumbRateState State
     /// </summary>
     public ThumbRate()
     {
-        SetValue(TemplateButtonCommandProperty, new RelayCommand<string>(o => OnTemplateButtonClick(o ?? String.Empty)));
+        SetValue(TemplateButtonCommandProperty, new RelayCommand<ThumbRateState>(OnTemplateButtonClick));
     }
 
     /// <summary>
     /// Triggered by clicking a button in the control template.
     /// </summary>
-    protected virtual void OnTemplateButtonClick(string parameter)
+    protected virtual void OnTemplateButtonClick(ThumbRateState parameter)
     {
-        switch (parameter)
+        if (State == parameter)
         {
-            case "up":
-                State = State == ThumbRateState.Liked ? ThumbRateState.None : ThumbRateState.Liked;
-                break;
-
-            case "down":
-                State = State == ThumbRateState.Disliked ? ThumbRateState.None : ThumbRateState.Disliked;
-                break;
+            State = ThumbRateState.None;
+            return;
         }
+
+        State = parameter;
     }
 
     /// <summary>
diff --git a/src/Wpf.Ui/Controls/ThumbRateState.cs b/src/Wpf.Ui/Controls/ThumbRate/ThumbRateState.cs
similarity index 95%
rename from src/Wpf.Ui/Controls/ThumbRateState.cs
rename to src/Wpf.Ui/Controls/ThumbRate/ThumbRateState.cs
index ba0e84388..14e32b477 100644
--- a/src/Wpf.Ui/Controls/ThumbRateState.cs
+++ b/src/Wpf.Ui/Controls/ThumbRate/ThumbRateState.cs
@@ -3,7 +3,7 @@
 // Copyright (C) Leszek Pomianowski and WPF UI Contributors.
 // All Rights Reserved.
 
-namespace Wpf.Ui.Controls.States;
+namespace Wpf.Ui.Controls;
 
 /// <summary>
 /// States of the <see cref="ThumbRate"/> control.
diff --git a/src/Wpf.Ui/Controls/TreeGrid.cs b/src/Wpf.Ui/Controls/TreeGrid/TreeGrid.cs
similarity index 96%
rename from src/Wpf.Ui/Controls/TreeGrid.cs
rename to src/Wpf.Ui/Controls/TreeGrid/TreeGrid.cs
index f7913da3a..3d63883c9 100644
--- a/src/Wpf.Ui/Controls/TreeGrid.cs
+++ b/src/Wpf.Ui/Controls/TreeGrid/TreeGrid.cs
@@ -19,7 +19,7 @@ public class TreeGrid : System.Windows.Controls.Primitives.Selector
     /// </summary>
     public static readonly DependencyProperty HeadersProperty = DependencyProperty.Register(nameof(Headers),
         typeof(ObservableCollection<TreeGridHeader>), typeof(TreeGrid),
-        new PropertyMetadata(new ObservableCollection<TreeGridHeader> { }, OnHeadersChanged));
+        new PropertyMetadata(new ObservableCollection<TreeGridHeader>(), OnHeadersChanged));
 
     ///// <summary>
     ///// Property for <see cref="Content"/>.
@@ -33,7 +33,7 @@ public class TreeGrid : System.Windows.Controls.Primitives.Selector
     [Bindable(true)]
     public ObservableCollection<TreeGridHeader> Headers
     {
-        get => GetValue(HeadersProperty) as ObservableCollection<TreeGridHeader>;
+        get => (GetValue(HeadersProperty) as ObservableCollection<TreeGridHeader>)!;
         set => SetValue(HeadersProperty, value);
     }
 
diff --git a/src/Wpf.Ui/Controls/TreeGridHeader.cs b/src/Wpf.Ui/Controls/TreeGrid/TreeGridHeader.cs
similarity index 100%
rename from src/Wpf.Ui/Controls/TreeGridHeader.cs
rename to src/Wpf.Ui/Controls/TreeGrid/TreeGridHeader.cs
diff --git a/src/Wpf.Ui/Controls/TreeGridItem.cs b/src/Wpf.Ui/Controls/TreeGrid/TreeGridItem.cs
similarity index 100%
rename from src/Wpf.Ui/Controls/TreeGridItem.cs
rename to src/Wpf.Ui/Controls/TreeGrid/TreeGridItem.cs
diff --git a/src/Wpf.Ui/Styles/Controls/ThumbRate.xaml b/src/Wpf.Ui/Styles/Controls/ThumbRate.xaml
index 937c0887d..1571a0ca4 100644
--- a/src/Wpf.Ui/Styles/Controls/ThumbRate.xaml
+++ b/src/Wpf.Ui/Styles/Controls/ThumbRate.xaml
@@ -38,7 +38,7 @@
                             Background="Transparent"
                             BorderBrush="Transparent"
                             Command="{Binding Path=TemplateButtonCommand, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
-                            CommandParameter="up"
+                            CommandParameter="{x:Static controls:ThumbRateState.Liked}"
                             FontSize="{TemplateBinding FontSize}"
                             Icon="ThumbLike24"
                             IconForeground="{TemplateBinding Foreground}" />
@@ -49,7 +49,7 @@
                             Background="Transparent"
                             BorderBrush="Transparent"
                             Command="{Binding Path=TemplateButtonCommand, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
-                            CommandParameter="down"
+                            CommandParameter="{x:Static controls:ThumbRateState.Disliked}"
                             FontSize="{TemplateBinding FontSize}"
                             Icon="ThumbDislike24"
                             IconForeground="{TemplateBinding Foreground}" />
diff --git a/src/Wpf.Ui/Wpf.Ui.csproj b/src/Wpf.Ui/Wpf.Ui.csproj
index fbddbe0ed..949d5cf7c 100644
--- a/src/Wpf.Ui/Wpf.Ui.csproj
+++ b/src/Wpf.Ui/Wpf.Ui.csproj
@@ -114,7 +114,7 @@
     <EmbeddedResource Include="Controls\RatingControl.bmp" />
     <EmbeddedResource Include="Controls\Snackbar.bmp" />
     <EmbeddedResource Include="Controls\SymbolIcon.bmp" />
-    <EmbeddedResource Include="Controls\ThumbRate.bmp" />
+    <EmbeddedResource Include="Controls\ThumbRate\ThumbRate.bmp" />
     <EmbeddedResource Include="Controls\ToggleSwitch.bmp" />
     <EmbeddedResource Include="Controls\Window\FluentWindow.bmp" />
     <EmbeddedResource Include="Controls\VirtualizingControls\VirtualizingItemsControl.bmp" />

From 44e0818728154fde9c4f4e49728c3f8f4d9d2134 Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Wed, 1 Feb 2023 19:46:23 +0600
Subject: [PATCH 11/15] Changed .editorconfig so that it is the same as in the
 dotnet/runtime repository

---
 src/.editorconfig | 269 ++++++++++++++++++++++++++++------------------
 1 file changed, 166 insertions(+), 103 deletions(-)

diff --git a/src/.editorconfig b/src/.editorconfig
index 7ee030292..ea1e3c700 100644
--- a/src/.editorconfig
+++ b/src/.editorconfig
@@ -1,142 +1,205 @@
+# editorconfig.org
+
+# top-most EditorConfig file
 root = true
-# All files
+
+# Default settings:
+# A newline ending every file
+# Use 4 spaces as indentation
 [*]
+insert_final_newline = true
 indent_style = space
-
-# XML project files
-[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
-indent_size = 2
-
-# XML config files
-[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
-indent_size = 2
-
-# Code files
-[*.{cs,csx,vb,vbx}]
 indent_size = 4
-insert_final_newline = true
-charset = utf-8-bom
+trim_trailing_whitespace = true
 
-###############################
-# .NET Coding Conventions     #
-###############################
-[*.{cs,vb}]
-# Organize usings
-dotnet_sort_system_directives_first = true
-# this. preferences
-dotnet_style_qualification_for_field = false:silent
-dotnet_style_qualification_for_property = false:silent
-dotnet_style_qualification_for_method = false:silent
-dotnet_style_qualification_for_event = false:silent
-# Language keywords vs BCL types preferences
-dotnet_style_predefined_type_for_locals_parameters_members = true:silent
-dotnet_style_predefined_type_for_member_access = true:silent
-# Parentheses preferences
+# Generated code
+[*{_AssemblyInfo.cs,.notsupported.cs,AsmOffsets.cs}]
+generated_code = true
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+tab_width = 4
+end_of_line = crlf
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
+dotnet_style_prefer_auto_properties = true:suggestion
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+dotnet_style_explicit_tuple_names = false:silent
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_compound_assignment = true:suggestion
+dotnet_style_prefer_simplified_interpolation = true:suggestion
+dotnet_style_namespace_match_folder = true:suggestion
+dotnet_style_readonly_field = true:suggestion
+dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
+dotnet_style_predefined_type_for_member_access = true:suggestion
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
+dotnet_style_allow_multiple_blank_lines_experimental = true:silent
+dotnet_style_allow_statement_immediately_after_block_experimental = true:silent
+dotnet_code_quality_unused_parameters = all:suggestion
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
 dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
 dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
-dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
 dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
+dotnet_style_qualification_for_field = false:suggestion
+dotnet_style_qualification_for_method = false:suggestion
+dotnet_style_qualification_for_property = false:suggestion
+dotnet_style_qualification_for_event = false:suggestion
+
+# C# files
+[*.cs]
+# New line preferences
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_between_query_expression_clauses = true
+
+# Indentation preferences
+csharp_indent_block_contents = true
+csharp_indent_braces = false
+csharp_indent_case_contents = true
+csharp_indent_case_contents_when_block = true
+csharp_indent_switch_labels = true
+csharp_indent_labels = one_less_than_current
+
 # Modifier preferences
-dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
+csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
+
+# avoid this. unless absolutely necessary
+dotnet_style_qualification_for_field = false:suggestion
+dotnet_style_qualification_for_property = false:suggestion
+dotnet_style_qualification_for_method = false:suggestion
+dotnet_style_qualification_for_event = false:suggestion
+
+# Types: use keywords instead of BCL types, and permit var only when the type is clear
+csharp_style_var_for_built_in_types = false:silent
+csharp_style_var_when_type_is_apparent = false:none
+csharp_style_var_elsewhere = false:suggestion
+dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
+dotnet_style_predefined_type_for_member_access = true:suggestion
+
+# name all constant fields using PascalCase
+dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols  = constant_fields
+dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
+dotnet_naming_symbols.constant_fields.applicable_kinds   = field
+dotnet_naming_symbols.constant_fields.required_modifiers = const
+dotnet_naming_style.pascal_case_style.capitalization = pascal_case
+
+# static fields should have s_ prefix
+dotnet_naming_rule.static_fields_should_have_prefix.severity = suggestion
+dotnet_naming_rule.static_fields_should_have_prefix.symbols  = static_fields
+dotnet_naming_rule.static_fields_should_have_prefix.style = static_prefix_style
+dotnet_naming_symbols.static_fields.applicable_kinds   = field
+dotnet_naming_symbols.static_fields.required_modifiers = static
+dotnet_naming_symbols.static_fields.applicable_accessibilities = private, internal, private_protected
+dotnet_naming_style.static_prefix_style.required_prefix = s_
+dotnet_naming_style.static_prefix_style.capitalization = camel_case
+
+# internal and private fields should be _camelCase
+dotnet_naming_rule.camel_case_for_private_internal_fields.severity = suggestion
+dotnet_naming_rule.camel_case_for_private_internal_fields.symbols  = private_internal_fields
+dotnet_naming_rule.camel_case_for_private_internal_fields.style = camel_case_underscore_style
+dotnet_naming_symbols.private_internal_fields.applicable_kinds = field
+dotnet_naming_symbols.private_internal_fields.applicable_accessibilities = private, internal
+dotnet_naming_style.camel_case_underscore_style.required_prefix = _
+dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case
+
+# Code style defaults
+csharp_using_directive_placement = outside_namespace:suggestion
+dotnet_sort_system_directives_first = true
+csharp_prefer_braces = true:silent
+csharp_preserve_single_line_blocks = true:none
+csharp_preserve_single_line_statements = false:none
+csharp_prefer_static_local_function = true:suggestion
+csharp_prefer_simple_using_statement = false:none
+csharp_style_prefer_switch_expression = true:suggestion
 dotnet_style_readonly_field = true:suggestion
+
 # Expression-level preferences
 dotnet_style_object_initializer = true:suggestion
 dotnet_style_collection_initializer = true:suggestion
 dotnet_style_explicit_tuple_names = true:suggestion
-dotnet_style_null_propagation = true:suggestion
 dotnet_style_coalesce_expression = true:suggestion
-dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
 dotnet_style_prefer_inferred_tuple_names = true:suggestion
 dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
-dotnet_style_prefer_auto_properties = true:silent
+dotnet_style_prefer_auto_properties = true:suggestion
 dotnet_style_prefer_conditional_expression_over_assignment = true:silent
 dotnet_style_prefer_conditional_expression_over_return = true:silent
+csharp_prefer_simple_default_expression = true:suggestion
 
-###############################
-# Naming Conventions          #
-###############################
-# Style Definitions
-dotnet_naming_style.pascal_case_style.capitalization             = pascal_case
-# Use PascalCase for constant fields  
-dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
-dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols  = constant_fields
-dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
-dotnet_naming_symbols.constant_fields.applicable_kinds            = field
-dotnet_naming_symbols.constant_fields.applicable_accessibilities  = *
-dotnet_naming_symbols.constant_fields.required_modifiers          = const
-dotnet_style_operator_placement_when_wrapping = beginning_of_line
-tab_width = 4
-end_of_line = crlf
-dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
-dotnet_style_prefer_compound_assignment = true:suggestion
-dotnet_style_prefer_simplified_interpolation = true:suggestion
-dotnet_style_namespace_match_folder = true:suggestion
-
-###############################
-# C# Coding Conventions       #
-###############################
-[*.cs]
-# var preferences
-csharp_style_var_for_built_in_types = true:silent
-csharp_style_var_when_type_is_apparent = true:silent
-csharp_style_var_elsewhere = true:silent
 # Expression-bodied members
-csharp_style_expression_bodied_methods = false:silent
-csharp_style_expression_bodied_constructors = false:silent
-csharp_style_expression_bodied_operators = false:silent
+csharp_style_expression_bodied_methods = true:silent
+csharp_style_expression_bodied_constructors = true:silent
+csharp_style_expression_bodied_operators = true:silent
 csharp_style_expression_bodied_properties = true:silent
 csharp_style_expression_bodied_indexers = true:silent
 csharp_style_expression_bodied_accessors = true:silent
-# Pattern matching preferences
+csharp_style_expression_bodied_lambdas = true:silent
+csharp_style_expression_bodied_local_functions = true:silent
+
+# Pattern matching
 csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
 csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
-# Null-checking preferences
+csharp_style_inlined_variable_declaration = true:suggestion
+
+# Null checking preferences
 csharp_style_throw_expression = true:suggestion
 csharp_style_conditional_delegate_call = true:suggestion
-# Modifier preferences
-csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
-# Expression-level preferences
-csharp_prefer_braces = true:silent
-csharp_style_deconstructed_variable_declaration = true:suggestion
-csharp_prefer_simple_default_expression = true:suggestion
-csharp_style_pattern_local_over_anonymous_function = true:suggestion
-csharp_style_inlined_variable_declaration = true:suggestion
 
-###############################
-# C# Formatting Rules         #
-###############################
-# New line preferences
-csharp_new_line_before_open_brace = all
-csharp_new_line_before_else = true
-csharp_new_line_before_catch = true
-csharp_new_line_before_finally = true
-csharp_new_line_before_members_in_object_initializers = true
-csharp_new_line_before_members_in_anonymous_types = true
-csharp_new_line_between_query_expression_clauses = true
-# Indentation preferences
-csharp_indent_case_contents = true
-csharp_indent_switch_labels = true
-csharp_indent_labels = flush_left
+# Other features
+csharp_style_prefer_index_operator = false:none
+csharp_style_prefer_range_operator = false:none
+csharp_style_pattern_local_over_anonymous_function = false:none
+
 # Space preferences
 csharp_space_after_cast = false
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_after_comma = true
+csharp_space_after_dot = false
 csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_after_semicolon_in_for_statement = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_around_declaration_statements = do_not_ignore
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_before_comma = false
+csharp_space_before_dot = false
+csharp_space_before_open_square_brackets = false
+csharp_space_before_semicolon_in_for_statement = false
+csharp_space_between_empty_square_brackets = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
 csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_name_and_open_parenthesis = false
 csharp_space_between_method_declaration_parameter_list_parentheses = false
 csharp_space_between_parentheses = false
-csharp_space_before_colon_in_inheritance_clause = true
-csharp_space_after_colon_in_inheritance_clause = true
-csharp_space_around_binary_operators = before_and_after
-csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
-csharp_space_between_method_call_name_and_opening_parenthesis = false
-csharp_space_between_method_call_empty_parameter_list_parentheses = false
-# Wrapping preferences
-csharp_preserve_single_line_statements = true
-csharp_preserve_single_line_blocks = true
-csharp_using_directive_placement = outside_namespace:silent
-csharp_prefer_simple_using_statement = true:suggestion
+csharp_space_between_square_brackets = false
 csharp_style_namespace_declarations = block_scoped:silent
 csharp_style_prefer_method_group_conversion = true:silent
 csharp_style_prefer_top_level_statements = true:silent
-csharp_style_expression_bodied_lambdas = true:silent
-csharp_style_expression_bodied_local_functions = false:silent
 csharp_style_prefer_null_check_over_type_check = true:suggestion
+csharp_style_prefer_local_over_anonymous_function = true:suggestion
+csharp_style_implicit_object_creation_when_type_is_apparent = true:suggestion
+csharp_style_prefer_tuple_swap = true:suggestion
+csharp_style_prefer_utf8_string_literals = true:suggestion
+csharp_style_deconstructed_variable_declaration = true:suggestion
+csharp_style_unused_value_expression_statement_preference = discard_variable:silent
+csharp_style_unused_value_assignment_preference = discard_variable:suggestion
+csharp_style_prefer_readonly_struct = true:suggestion
+csharp_style_allow_embedded_statements_on_same_line_experimental = true:silent
+csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true:silent
+csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true:silent
+csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true:silent
+csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true:silent
+csharp_style_prefer_pattern_matching = true:silent
+csharp_style_prefer_not_pattern = true:suggestion
+csharp_style_prefer_extended_property_pattern = true:suggestion
\ No newline at end of file

From a1b734d23b986d181a307da2381320dc46b89fd5 Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Wed, 1 Feb 2023 20:01:44 +0600
Subject: [PATCH 12/15] Added NumberBox folder

---
 .../Controls/{ => NumberBox}/INumberFormatter.cs    |   0
 .../Controls/{ => NumberBox}/INumberParser.cs       |   0
 src/Wpf.Ui/Controls/{ => NumberBox}/NumberBox.bmp   | Bin
 src/Wpf.Ui/Controls/{ => NumberBox}/NumberBox.cs    |   0
 .../NumberBoxSpinButtonPlacementMode.cs             |   0
 .../{ => NumberBox}/NumberBoxValidationMode.cs      |   0
 .../{ => NumberBox}/ValidateNumberFormatter.cs      |   0
 src/Wpf.Ui/Wpf.Ui.csproj                            |   2 +-
 8 files changed, 1 insertion(+), 1 deletion(-)
 rename src/Wpf.Ui/Controls/{ => NumberBox}/INumberFormatter.cs (100%)
 rename src/Wpf.Ui/Controls/{ => NumberBox}/INumberParser.cs (100%)
 rename src/Wpf.Ui/Controls/{ => NumberBox}/NumberBox.bmp (100%)
 rename src/Wpf.Ui/Controls/{ => NumberBox}/NumberBox.cs (100%)
 rename src/Wpf.Ui/Controls/{ => NumberBox}/NumberBoxSpinButtonPlacementMode.cs (100%)
 rename src/Wpf.Ui/Controls/{ => NumberBox}/NumberBoxValidationMode.cs (100%)
 rename src/Wpf.Ui/Controls/{ => NumberBox}/ValidateNumberFormatter.cs (100%)

diff --git a/src/Wpf.Ui/Controls/INumberFormatter.cs b/src/Wpf.Ui/Controls/NumberBox/INumberFormatter.cs
similarity index 100%
rename from src/Wpf.Ui/Controls/INumberFormatter.cs
rename to src/Wpf.Ui/Controls/NumberBox/INumberFormatter.cs
diff --git a/src/Wpf.Ui/Controls/INumberParser.cs b/src/Wpf.Ui/Controls/NumberBox/INumberParser.cs
similarity index 100%
rename from src/Wpf.Ui/Controls/INumberParser.cs
rename to src/Wpf.Ui/Controls/NumberBox/INumberParser.cs
diff --git a/src/Wpf.Ui/Controls/NumberBox.bmp b/src/Wpf.Ui/Controls/NumberBox/NumberBox.bmp
similarity index 100%
rename from src/Wpf.Ui/Controls/NumberBox.bmp
rename to src/Wpf.Ui/Controls/NumberBox/NumberBox.bmp
diff --git a/src/Wpf.Ui/Controls/NumberBox.cs b/src/Wpf.Ui/Controls/NumberBox/NumberBox.cs
similarity index 100%
rename from src/Wpf.Ui/Controls/NumberBox.cs
rename to src/Wpf.Ui/Controls/NumberBox/NumberBox.cs
diff --git a/src/Wpf.Ui/Controls/NumberBoxSpinButtonPlacementMode.cs b/src/Wpf.Ui/Controls/NumberBox/NumberBoxSpinButtonPlacementMode.cs
similarity index 100%
rename from src/Wpf.Ui/Controls/NumberBoxSpinButtonPlacementMode.cs
rename to src/Wpf.Ui/Controls/NumberBox/NumberBoxSpinButtonPlacementMode.cs
diff --git a/src/Wpf.Ui/Controls/NumberBoxValidationMode.cs b/src/Wpf.Ui/Controls/NumberBox/NumberBoxValidationMode.cs
similarity index 100%
rename from src/Wpf.Ui/Controls/NumberBoxValidationMode.cs
rename to src/Wpf.Ui/Controls/NumberBox/NumberBoxValidationMode.cs
diff --git a/src/Wpf.Ui/Controls/ValidateNumberFormatter.cs b/src/Wpf.Ui/Controls/NumberBox/ValidateNumberFormatter.cs
similarity index 100%
rename from src/Wpf.Ui/Controls/ValidateNumberFormatter.cs
rename to src/Wpf.Ui/Controls/NumberBox/ValidateNumberFormatter.cs
diff --git a/src/Wpf.Ui/Wpf.Ui.csproj b/src/Wpf.Ui/Wpf.Ui.csproj
index 949d5cf7c..adfb2f1a2 100644
--- a/src/Wpf.Ui/Wpf.Ui.csproj
+++ b/src/Wpf.Ui/Wpf.Ui.csproj
@@ -109,7 +109,7 @@
     <EmbeddedResource Include="Controls\Navigation\NavigationView.bmp" />
     <EmbeddedResource Include="Controls\Navigation\NavigationViewItem.bmp" />
     <EmbeddedResource Include="Controls\NotifyIcon.bmp" />
-    <EmbeddedResource Include="Controls\NumberBox.bmp" />
+    <EmbeddedResource Include="Controls\NumberBox\NumberBox.bmp" />
     <EmbeddedResource Include="Controls\ProgressRing.bmp" />
     <EmbeddedResource Include="Controls\RatingControl.bmp" />
     <EmbeddedResource Include="Controls\Snackbar.bmp" />

From dac048af24ec720d3437c52fb071c1293d0b871f Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Fri, 3 Feb 2023 19:17:22 +0600
Subject: [PATCH 13/15] Added and implemented IContentDialogService

---
 src/Wpf.Ui.Gallery/App.xaml.cs                |  2 +
 .../ContentDialogViewModel.cs                 | 30 +++++++-------
 .../DialogsAndFlyouts/ContentDialog.xaml.cs   | 13 ++++--
 .../Views/Windows/MainWindow.xaml.cs          |  3 +-
 src/Wpf.Ui/Contracts/IContentDialogService.cs | 33 +++++++++++++++
 src/Wpf.Ui/Services/IContentDialogService.cs  | 41 +++++++++++++++++++
 6 files changed, 103 insertions(+), 19 deletions(-)
 create mode 100644 src/Wpf.Ui/Contracts/IContentDialogService.cs
 create mode 100644 src/Wpf.Ui/Services/IContentDialogService.cs

diff --git a/src/Wpf.Ui.Gallery/App.xaml.cs b/src/Wpf.Ui.Gallery/App.xaml.cs
index 32cb3e0c4..0b40ddeec 100644
--- a/src/Wpf.Ui.Gallery/App.xaml.cs
+++ b/src/Wpf.Ui.Gallery/App.xaml.cs
@@ -61,6 +61,7 @@ public partial class App : Application
             services.AddSingleton<MainWindowViewModel>();
             services.AddSingleton<INavigationService, NavigationService>();
             services.AddSingleton<ISnackbarService, SnackbarService>();
+            services.AddSingleton<IContentDialogService, ContentDialogService>();
             services.AddSingleton<WindowsProviderService>();
 
             // Top-level pages
@@ -125,6 +126,7 @@ public partial class App : Application
             services.AddTransient<SnackbarPage>();
             services.AddTransient<SnackbarViewModel>();
             services.AddTransient<ContentDialogPage>();
+            services.AddTransient<ContentDialogViewModel>();
             services.AddTransient<FlyoutPage>();
             services.AddTransient<FlyoutViewModel>();
             services.AddTransient<MessageBoxPage>();
diff --git a/src/Wpf.Ui.Gallery/ViewModels/Pages/DialogsAndFlyouts/ContentDialogViewModel.cs b/src/Wpf.Ui.Gallery/ViewModels/Pages/DialogsAndFlyouts/ContentDialogViewModel.cs
index 8186f1a60..60b5b5265 100644
--- a/src/Wpf.Ui.Gallery/ViewModels/Pages/DialogsAndFlyouts/ContentDialogViewModel.cs
+++ b/src/Wpf.Ui.Gallery/ViewModels/Pages/DialogsAndFlyouts/ContentDialogViewModel.cs
@@ -12,22 +12,26 @@ namespace Wpf.Ui.Gallery.ViewModels.Pages.DialogsAndFlyouts;
 
 public partial class ContentDialogViewModel : ObservableObject
 {
+    public ContentDialogViewModel(IContentDialogService contentDialogService)
+    {
+        _contentDialogService = contentDialogService;
+    }
+
+    private readonly IContentDialogService _contentDialogService;
+
     [ObservableProperty]
     private string _dialogResultText = string.Empty;
 
     [RelayCommand]
     private async Task OnShowDialog(object content)
-    { 
-        var window = (MainWindow)Application.Current.MainWindow!;
-        var dialog = new ContentDialog(window.RootContentDialog)
-        {
-            Title = "Save your work?",
-            Content = content,
-            PrimaryButtonText = "Save",
-            SecondaryButtonText = "Don't Save",
-            CloseButtonText = "Cancel",
-            DefaultButton = ContentDialogButton.Primary,
-        };
+    {
+        var dialog = _contentDialogService.CreateDialog();
+        dialog.Title = "Save your work?";
+        dialog.Content = content;
+        dialog.PrimaryButtonText = "Save";
+        dialog.SecondaryButtonText = "Don't Save";
+        dialog.CloseButtonText = "Cancel";
+        dialog.DefaultButton = ContentDialogButton.Primary;
 
         var result = await dialog.ShowAsync();
 
@@ -42,9 +46,7 @@ private async Task OnShowDialog(object content)
     [RelayCommand]
     private async Task OnShowSignInContentDialog()
     {
-        var window = (MainWindow)Application.Current.MainWindow!;
-        var termsOfUseContentDialog = new TermsOfUseContentDialog(window.RootContentDialog);
-
+        var termsOfUseContentDialog = new TermsOfUseContentDialog(_contentDialogService.GetContentPresenter());
         await termsOfUseContentDialog.ShowAsync();
     }
 }
diff --git a/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/ContentDialog.xaml.cs b/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/ContentDialog.xaml.cs
index 7a37a7caf..9ac821899 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/ContentDialog.xaml.cs
+++ b/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/ContentDialog.xaml.cs
@@ -4,16 +4,21 @@
 // All Rights Reserved.
 
 
-using System.Windows.Controls;
+using Wpf.Ui.Controls.Navigation;
 using Wpf.Ui.Gallery.ViewModels.Pages.DialogsAndFlyouts;
 
 namespace Wpf.Ui.Gallery.Views.Pages.DialogsAndFlyouts;
 
-public partial class ContentDialogPage : Page
+public partial class ContentDialogPage : INavigableView<ContentDialogViewModel>
 {
-    public ContentDialogPage()
+    public ContentDialogPage(ContentDialogViewModel viewModel)
     {
+        ViewModel = viewModel;
+        DataContext = viewModel;
+        DataContext = viewModel;
+
         InitializeComponent();
-        DataContext = new ContentDialogViewModel();
     }
+
+    public ContentDialogViewModel ViewModel { get; }
 }
diff --git a/src/Wpf.Ui.Gallery/Views/Windows/MainWindow.xaml.cs b/src/Wpf.Ui.Gallery/Views/Windows/MainWindow.xaml.cs
index 524ae5822..e78e67d4f 100644
--- a/src/Wpf.Ui.Gallery/Views/Windows/MainWindow.xaml.cs
+++ b/src/Wpf.Ui.Gallery/Views/Windows/MainWindow.xaml.cs
@@ -13,7 +13,7 @@ public partial class MainWindow : IWindow
     public MainWindowViewModel ViewModel { get; }
 
     public MainWindow(MainWindowViewModel viewModel, INavigationService navigationService,
-        IServiceProvider serviceProvider, ISnackbarService snackbarService)
+        IServiceProvider serviceProvider, ISnackbarService snackbarService, IContentDialogService contentDialogService)
     {
         Appearance.Watcher.Watch(this);
 
@@ -24,6 +24,7 @@ public MainWindow(MainWindowViewModel viewModel, INavigationService navigationSe
 
         snackbarService.SetSnackbarControl(RootSnackbar);
         navigationService.SetNavigationControl(NavigationView);
+        contentDialogService.SetContentPresenter(RootContentDialog);
 
         NavigationView.SetServiceProvider(serviceProvider);
         NavigationView.Loaded += (_, _) => NavigationView.Navigate(typeof(DashboardPage));
diff --git a/src/Wpf.Ui/Contracts/IContentDialogService.cs b/src/Wpf.Ui/Contracts/IContentDialogService.cs
new file mode 100644
index 000000000..e382586e6
--- /dev/null
+++ b/src/Wpf.Ui/Contracts/IContentDialogService.cs
@@ -0,0 +1,33 @@
+// 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.
+// All Rights Reserved.
+
+using System.Windows.Controls;
+using Wpf.Ui.Controls;
+
+namespace Wpf.Ui.Contracts;
+
+/// <summary>
+/// Represents a contract with the service that creates <see cref="ContentDialog"/>.
+/// </summary>
+public interface IContentDialogService
+{
+    /// <summary>
+    /// Sets the <see cref="ContentPresenter"/>
+    /// </summary>
+    /// <param name="contentPresenter"></param>
+    void SetContentPresenter(ContentPresenter  contentPresenter);
+
+    /// <summary>
+    /// Provides direct access to the <see cref="ContentPresenter"/>
+    /// </summary>
+    /// <returns></returns>
+    ContentPresenter GetContentPresenter();
+
+    /// <summary>
+    /// Creates a new <see cref="ContentDialog"/>
+    /// </summary>
+    /// <returns></returns>
+    ContentDialog CreateDialog();
+}
diff --git a/src/Wpf.Ui/Services/IContentDialogService.cs b/src/Wpf.Ui/Services/IContentDialogService.cs
new file mode 100644
index 000000000..5a24dd638
--- /dev/null
+++ b/src/Wpf.Ui/Services/IContentDialogService.cs
@@ -0,0 +1,41 @@
+// 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.
+// All Rights Reserved.
+
+using System;
+using System.Windows.Controls;
+using Wpf.Ui.Contracts;
+using Wpf.Ui.Controls;
+
+namespace Wpf.Ui.Services;
+
+/// <summary>
+/// Represents a contract with the service that provides global <see cref="IContentDialogService"/>.
+/// </summary>
+public class ContentDialogService : IContentDialogService
+{
+    private ContentPresenter? _contentPresenter;
+
+    /// <inheritdoc/>
+    public void SetContentPresenter(ContentPresenter contentPresenter) => _contentPresenter = contentPresenter;
+
+    /// <inheritdoc/>
+    public ContentPresenter GetContentPresenter()
+    {
+        if (_contentPresenter is null)
+            throw new ArgumentNullException($"The ContentPresenter didn't set previously.");
+
+        return _contentPresenter;
+
+    }
+
+    /// <inheritdoc/>
+    public ContentDialog CreateDialog()
+    {
+        if (_contentPresenter is null)
+            throw new ArgumentNullException($"The ContentPresenter didn't set previously.");
+
+        return new ContentDialog(_contentPresenter);
+    }
+}

From 69bb8411112e376b338ec6f61c4f4bcba4a04056 Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Sat, 4 Feb 2023 11:40:08 +0600
Subject: [PATCH 14/15] TitleBar cleanup

---
 src/Wpf.Ui/Controls/TitleBar/TitleBar.cs | 89 +-----------------------
 1 file changed, 1 insertion(+), 88 deletions(-)

diff --git a/src/Wpf.Ui/Controls/TitleBar/TitleBar.cs b/src/Wpf.Ui/Controls/TitleBar/TitleBar.cs
index 9cce87c43..c5e2e0447 100644
--- a/src/Wpf.Ui/Controls/TitleBar/TitleBar.cs
+++ b/src/Wpf.Ui/Controls/TitleBar/TitleBar.cs
@@ -381,7 +381,6 @@ public event TypedEventHandler<TitleBar, RoutedEventArgs> HelpClicked
 
     #endregion
 
-    private Interop.WinDef.POINT _doubleClickPoint;
     private System.Windows.Window _currentWindow = null!;
     private System.Windows.Controls.Grid _mainGrid = null!;
     private System.Windows.Controls.Image _icon = null!;
@@ -426,9 +425,6 @@ private void OnUnloaded(object sender, RoutedEventArgs e)
         Unloaded -= OnUnloaded;
 
         Appearance.Theme.Changed -= OnThemeChanged;
-
-        _mainGrid.MouseLeftButtonDown -= OnMainGridMouseLeftButtonDown;
-        _mainGrid.MouseMove -= OnMainGridMouseMove;
     }
 
     /// <summary>
@@ -440,9 +436,6 @@ public override void OnApplyTemplate()
         base.OnApplyTemplate();
 
         _mainGrid = GetTemplateChild<System.Windows.Controls.Grid>(ElementMainGrid);
-        _mainGrid.MouseLeftButtonDown += OnMainGridMouseLeftButtonDown;
-        _mainGrid.MouseMove += OnMainGridMouseMove;
-
         _icon = GetTemplateChild<System.Windows.Controls.Image>(ElementIcon);
 
         var helpButton = GetTemplateChild<TitleBarButton>(ElementHelpButton);
@@ -520,30 +513,6 @@ private void MaximizeWindow()
         }
     }
 
-    private void RestoreWindow()
-    {
-        if (!CanMaximize)
-            return;
-
-        if (MaximizeActionOverride is not null)
-        {
-            MaximizeActionOverride(this, _currentWindow);
-
-            return;
-        }
-
-        if (_currentWindow.WindowState == WindowState.Normal)
-        {
-            IsMaximized = true;
-            _currentWindow.WindowState = WindowState.Maximized;
-        }
-        else
-        {
-            IsMaximized = false;
-            _currentWindow.WindowState = WindowState.Normal;
-        }
-    }
-
     private bool MinimizeWindowToTray()
     {
         if (!Tray.IsRegistered)
@@ -555,77 +524,21 @@ private bool MinimizeWindowToTray()
         return true;
     }
 
-    private void OnMainGridMouseMove(object sender, MouseEventArgs e)
-    {
-        if (e.LeftButton != MouseButtonState.Pressed)
-            return;
-
-        // prevent firing from double clicking when the mouse never actually moved
-        User32.GetCursorPos(out var currentMousePos);
-
-        if (currentMousePos.x == _doubleClickPoint.x && currentMousePos.y == _doubleClickPoint.y)
-            return;
-
-        if (IsMaximized)
-        {
-            var screenPoint = PointToScreen(e.MouseDevice.GetPosition(this));
-            var systemDpi = DpiHelper.GetSystemDpi();
-
-            screenPoint.X /= systemDpi.DpiScaleX;
-            screenPoint.Y /= systemDpi.DpiScaleY;
-
-            // TODO: refine the Left value to be more accurate
-            // - This calculation is good enough using the center
-            //   of the titlebar, however this isn't quite accurate for
-            //   how the OS operates.
-            // - It should be set as a % (e.g. screen X / maximized width),
-            //   then offset from the left to line up more naturally.
-            _currentWindow.Left = screenPoint.X - (_currentWindow.RestoreBounds.Width * 0.5);
-            _currentWindow.Top = screenPoint.Y;
-
-            // style has to be quickly swapped to avoid restore animation delay
-            var style = _currentWindow.WindowStyle;
-            _currentWindow.WindowStyle = WindowStyle.None;
-            _currentWindow.WindowState = WindowState.Normal;
-            _currentWindow.WindowStyle = style;
-        }
-
-        // Call drag move only when mouse down, check again
-        // if()
-        if (e.LeftButton == MouseButtonState.Pressed)
-            _currentWindow.DragMove();
-    }
-
     private void OnParentWindowStateChanged(object sender, EventArgs e)
     {
         if (IsMaximized != (_currentWindow.WindowState == WindowState.Maximized))
             IsMaximized = _currentWindow.WindowState == WindowState.Maximized;
     }
 
-    private void OnMainGridMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-    {
-        if (e.ClickCount != 2)
-            return;
-
-        Interop.User32.GetCursorPos(out _doubleClickPoint);
-
-        MaximizeWindow();
-    }
-
     private void OnTemplateButtonClick(TitleBarButtonType buttonType)
     {
         switch (buttonType)
         {
-            case TitleBarButtonType.Maximize:
+            case TitleBarButtonType.Maximize or TitleBarButtonType.Restore:
                 RaiseEvent(new RoutedEventArgs(MaximizeClickedEvent, this));
                 MaximizeWindow();
                 break;
 
-            case TitleBarButtonType.Restore:
-                RaiseEvent(new RoutedEventArgs(MaximizeClickedEvent, this));
-                RestoreWindow();
-                break;
-
             case TitleBarButtonType.Close:
                 RaiseEvent(new RoutedEventArgs(CloseClickedEvent, this));
                 CloseWindow();

From 5dc7d16c35a0b46e9cdb92cf971a0dc0b65cd986 Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Sun, 5 Feb 2023 22:15:06 +0600
Subject: [PATCH 15/15] Changed namespace

---
 .../Controls/TermsOfUseContentDialog.xaml.cs  |   1 +
 .../Pages/BasicInput/ThumbRateViewModel.cs    |   1 +
 .../ContentDialogViewModel.cs                 |   1 +
 .../DialogsAndFlyouts/MessageBoxViewModel.cs  |   2 +-
 src/Wpf.Ui/Contracts/IContentDialogService.cs |   1 +
 .../BreadcrumbBar.cs                          |   2 +-
 .../BreadcrumbBarItem.cs                      |   2 +-
 .../BreadcrumbBarItemClickedEventArgs.cs      |   2 +-
 src/Wpf.Ui/Controls/CodeBlock.cs              |   1 +
 .../ContentDialog.cs                          |   2 +-
 .../ContentDialogButton.cs                    |   2 +-
 .../ContentDialogResult.cs                    |   2 +-
 .../MessageBox.bmp                            | Bin
 .../MessageBox.cs                             |   5 +-
 .../MessageBoxButton.cs                       |   2 +-
 .../MessageBoxResult.cs                       |   2 +-
 .../Controls/Navigation/INavigationView.cs    |   1 +
 .../Navigation/NavigationView.Base.cs         |   1 +
 .../Navigation/NavigationView.Properties.cs   |   1 +
 .../INumberFormatter.cs                       |   2 +-
 .../INumberParser.cs                          |   2 +-
 .../NumberBox.bmp                             | Bin
 .../NumberBox.cs                              |   2 +-
 .../NumberBoxSpinButtonPlacementMode.cs       |   2 +-
 .../NumberBoxValidationMode.cs                |   2 +-
 .../ValidateNumberFormatter.cs                |   2 +-
 .../ThumbRate.bmp                             | Bin
 .../ThumbRate.cs                              |   3 +-
 .../ThumbRateState.cs                         |   2 +-
 .../{TitleBar => TitleBarControl}/TitleBar.cs |   4 +-
 .../TitleBarButton.cs                         |   2 +-
 .../TitleBarButtonType.cs                     |   2 +-
 .../{TreeGrid => TreeGridControl}/TreeGrid.cs |   2 +-
 .../TreeGridHeader.cs                         |   2 +-
 .../TreeGridItem.cs                           |   2 +-
 .../VirtualizingControls/SpacingMode.cs       |   2 +-
 .../VirtualizingGridView.cs                   |   2 +-
 .../VirtualizingItemsControl.cs               |   2 +-
 .../VirtualizingPanelBase.cs                  |   2 +-
 .../VirtualizingUniformGrid.cs                |   2 +-
 .../VirtualizingWrapPanel.cs                  |   2 +-
 src/Wpf.Ui/Converters/EnumToBoolConverter.cs  |   1 +
 src/Wpf.Ui/Properties/AssemblyInfo.cs         |   8 +++
 src/Wpf.Ui/Services/IContentDialogService.cs  |   1 +
 src/Wpf.Ui/Styles/Controls/BreadcrumbBar.xaml |  19 +++----
 src/Wpf.Ui/Styles/Controls/ContentDialog.xaml |  25 +++++-----
 src/Wpf.Ui/Styles/Controls/MessageBox.xaml    |  22 ++++----
 src/Wpf.Ui/Styles/Controls/NumberBox.xaml     |   9 ++--
 src/Wpf.Ui/Styles/Controls/ThumbRate.xaml     |  13 ++---
 src/Wpf.Ui/Styles/Controls/TitleBar.xaml      |  47 +++++++++---------
 src/Wpf.Ui/Styles/Controls/TreeGrid.xaml      |   9 ++--
 .../Styles/Controls/VirtualizingGridView.xaml |   9 ++--
 .../Controls/VirtualizingItemsControl.xaml    |   9 ++--
 .../Controls/VirtualizingWrapPanel.xaml       |   5 +-
 src/Wpf.Ui/VisualStudioToolsManifest.xml      |  22 ++++----
 src/Wpf.Ui/Wpf.Ui.csproj                      |   6 +--
 56 files changed, 153 insertions(+), 126 deletions(-)
 rename src/Wpf.Ui/Controls/{Breadcrumb => BreadcrumbControl}/BreadcrumbBar.cs (99%)
 rename src/Wpf.Ui/Controls/{Breadcrumb => BreadcrumbControl}/BreadcrumbBarItem.cs (98%)
 rename src/Wpf.Ui/Controls/{Breadcrumb => BreadcrumbControl}/BreadcrumbBarItemClickedEventArgs.cs (95%)
 rename src/Wpf.Ui/Controls/{ContentDialog => ContentDialogControl}/ContentDialog.cs (99%)
 rename src/Wpf.Ui/Controls/{ContentDialog => ContentDialogControl}/ContentDialogButton.cs (91%)
 rename src/Wpf.Ui/Controls/{ContentDialog => ContentDialogControl}/ContentDialogResult.cs (91%)
 rename src/Wpf.Ui/Controls/{MessageBox => MessageBoxControl}/MessageBox.bmp (100%)
 rename src/Wpf.Ui/Controls/{MessageBox => MessageBoxControl}/MessageBox.cs (98%)
 rename src/Wpf.Ui/Controls/{MessageBox => MessageBoxControl}/MessageBoxButton.cs (88%)
 rename src/Wpf.Ui/Controls/{MessageBox => MessageBoxControl}/MessageBoxResult.cs (91%)
 rename src/Wpf.Ui/Controls/{NumberBox => NumberBoxControl}/INumberFormatter.cs (96%)
 rename src/Wpf.Ui/Controls/{NumberBox => NumberBoxControl}/INumberParser.cs (95%)
 rename src/Wpf.Ui/Controls/{NumberBox => NumberBoxControl}/NumberBox.bmp (100%)
 rename src/Wpf.Ui/Controls/{NumberBox => NumberBoxControl}/NumberBox.cs (99%)
 rename src/Wpf.Ui/Controls/{NumberBox => NumberBoxControl}/NumberBoxSpinButtonPlacementMode.cs (96%)
 rename src/Wpf.Ui/Controls/{NumberBox => NumberBoxControl}/NumberBoxValidationMode.cs (94%)
 rename src/Wpf.Ui/Controls/{NumberBox => NumberBoxControl}/ValidateNumberFormatter.cs (97%)
 rename src/Wpf.Ui/Controls/{ThumbRate => ThumbRateControl}/ThumbRate.bmp (100%)
 rename src/Wpf.Ui/Controls/{ThumbRate => ThumbRateControl}/ThumbRate.cs (98%)
 rename src/Wpf.Ui/Controls/{ThumbRate => ThumbRateControl}/ThumbRateState.cs (93%)
 rename src/Wpf.Ui/Controls/{TitleBar => TitleBarControl}/TitleBar.cs (99%)
 rename src/Wpf.Ui/Controls/{TitleBar => TitleBarControl}/TitleBarButton.cs (99%)
 rename src/Wpf.Ui/Controls/{TitleBar => TitleBarControl}/TitleBarButtonType.cs (95%)
 rename src/Wpf.Ui/Controls/{TreeGrid => TreeGridControl}/TreeGrid.cs (98%)
 rename src/Wpf.Ui/Controls/{TreeGrid => TreeGridControl}/TreeGridHeader.cs (97%)
 rename src/Wpf.Ui/Controls/{TreeGrid => TreeGridControl}/TreeGridItem.cs (90%)

diff --git a/src/Wpf.Ui.Gallery/Controls/TermsOfUseContentDialog.xaml.cs b/src/Wpf.Ui.Gallery/Controls/TermsOfUseContentDialog.xaml.cs
index 7886bc746..8f7afc9b8 100644
--- a/src/Wpf.Ui.Gallery/Controls/TermsOfUseContentDialog.xaml.cs
+++ b/src/Wpf.Ui.Gallery/Controls/TermsOfUseContentDialog.xaml.cs
@@ -1,6 +1,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using Wpf.Ui.Controls;
+using Wpf.Ui.Controls.ContentDialogControl;
 
 namespace Wpf.Ui.Gallery.Controls;
 
diff --git a/src/Wpf.Ui.Gallery/ViewModels/Pages/BasicInput/ThumbRateViewModel.cs b/src/Wpf.Ui.Gallery/ViewModels/Pages/BasicInput/ThumbRateViewModel.cs
index 76119fa91..5cd329046 100644
--- a/src/Wpf.Ui.Gallery/ViewModels/Pages/BasicInput/ThumbRateViewModel.cs
+++ b/src/Wpf.Ui.Gallery/ViewModels/Pages/BasicInput/ThumbRateViewModel.cs
@@ -4,6 +4,7 @@
 // All Rights Reserved.
 
 using Wpf.Ui.Controls;
+using Wpf.Ui.Controls.ThumbRateControl;
 
 namespace Wpf.Ui.Gallery.ViewModels.Pages.BasicInput;
 
diff --git a/src/Wpf.Ui.Gallery/ViewModels/Pages/DialogsAndFlyouts/ContentDialogViewModel.cs b/src/Wpf.Ui.Gallery/ViewModels/Pages/DialogsAndFlyouts/ContentDialogViewModel.cs
index 60b5b5265..5441d0c25 100644
--- a/src/Wpf.Ui.Gallery/ViewModels/Pages/DialogsAndFlyouts/ContentDialogViewModel.cs
+++ b/src/Wpf.Ui.Gallery/ViewModels/Pages/DialogsAndFlyouts/ContentDialogViewModel.cs
@@ -5,6 +5,7 @@
 
 using System.Windows;
 using Wpf.Ui.Controls;
+using Wpf.Ui.Controls.ContentDialogControl;
 using Wpf.Ui.Gallery.Controls;
 using Wpf.Ui.Gallery.Views.Windows;
 
diff --git a/src/Wpf.Ui.Gallery/ViewModels/Pages/DialogsAndFlyouts/MessageBoxViewModel.cs b/src/Wpf.Ui.Gallery/ViewModels/Pages/DialogsAndFlyouts/MessageBoxViewModel.cs
index 28ac2ddbb..1bda84ed3 100644
--- a/src/Wpf.Ui.Gallery/ViewModels/Pages/DialogsAndFlyouts/MessageBoxViewModel.cs
+++ b/src/Wpf.Ui.Gallery/ViewModels/Pages/DialogsAndFlyouts/MessageBoxViewModel.cs
@@ -21,7 +21,7 @@ private void OnOpenStandardMessageBox(object sender)
     [RelayCommand]
     private async void OnOpenCustomMessageBox(object sender)
     {
-        var uiMessageBox = new Wpf.Ui.Controls.MessageBox
+        var uiMessageBox = new Wpf.Ui.Controls.MessageBoxControl.MessageBox
         {
             Title = "WPF UI Message Box",
             Content = "Never gonna give you up, never gonna let you down Never gonna run around and desert you Never gonna make you cry, never gonna say goodbye",
diff --git a/src/Wpf.Ui/Contracts/IContentDialogService.cs b/src/Wpf.Ui/Contracts/IContentDialogService.cs
index e382586e6..9b98a8283 100644
--- a/src/Wpf.Ui/Contracts/IContentDialogService.cs
+++ b/src/Wpf.Ui/Contracts/IContentDialogService.cs
@@ -5,6 +5,7 @@
 
 using System.Windows.Controls;
 using Wpf.Ui.Controls;
+using Wpf.Ui.Controls.ContentDialogControl;
 
 namespace Wpf.Ui.Contracts;
 
diff --git a/src/Wpf.Ui/Controls/Breadcrumb/BreadcrumbBar.cs b/src/Wpf.Ui/Controls/BreadcrumbControl/BreadcrumbBar.cs
similarity index 99%
rename from src/Wpf.Ui/Controls/Breadcrumb/BreadcrumbBar.cs
rename to src/Wpf.Ui/Controls/BreadcrumbControl/BreadcrumbBar.cs
index 4f85a0612..bd92df3a9 100644
--- a/src/Wpf.Ui/Controls/Breadcrumb/BreadcrumbBar.cs
+++ b/src/Wpf.Ui/Controls/BreadcrumbControl/BreadcrumbBar.cs
@@ -14,7 +14,7 @@
 using System.Windows.Input;
 using Wpf.Ui.Common;
 
-namespace Wpf.Ui.Controls;
+namespace Wpf.Ui.Controls.BreadcrumbControl;
 
 /// <summary>
 /// The <see cref="BreadcrumbBar"/> control provides the direct path of pages or folders to the current location.
diff --git a/src/Wpf.Ui/Controls/Breadcrumb/BreadcrumbBarItem.cs b/src/Wpf.Ui/Controls/BreadcrumbControl/BreadcrumbBarItem.cs
similarity index 98%
rename from src/Wpf.Ui/Controls/Breadcrumb/BreadcrumbBarItem.cs
rename to src/Wpf.Ui/Controls/BreadcrumbControl/BreadcrumbBarItem.cs
index a3855101c..868bce5ca 100644
--- a/src/Wpf.Ui/Controls/Breadcrumb/BreadcrumbBarItem.cs
+++ b/src/Wpf.Ui/Controls/BreadcrumbControl/BreadcrumbBarItem.cs
@@ -8,7 +8,7 @@
 
 using System.Windows;
 
-namespace Wpf.Ui.Controls;
+namespace Wpf.Ui.Controls.BreadcrumbControl;
 
 /// <summary>
 /// Represents an item in a <see cref="BreadcrumbBar"/> control.
diff --git a/src/Wpf.Ui/Controls/Breadcrumb/BreadcrumbBarItemClickedEventArgs.cs b/src/Wpf.Ui/Controls/BreadcrumbControl/BreadcrumbBarItemClickedEventArgs.cs
similarity index 95%
rename from src/Wpf.Ui/Controls/Breadcrumb/BreadcrumbBarItemClickedEventArgs.cs
rename to src/Wpf.Ui/Controls/BreadcrumbControl/BreadcrumbBarItemClickedEventArgs.cs
index d56f63a1b..6db3a61a7 100644
--- a/src/Wpf.Ui/Controls/Breadcrumb/BreadcrumbBarItemClickedEventArgs.cs
+++ b/src/Wpf.Ui/Controls/BreadcrumbControl/BreadcrumbBarItemClickedEventArgs.cs
@@ -8,7 +8,7 @@
 
 using System.Windows;
 
-namespace Wpf.Ui.Controls;
+namespace Wpf.Ui.Controls.BreadcrumbControl;
 
 public sealed class BreadcrumbBarItemClickedEventArgs : RoutedEventArgs
 {
diff --git a/src/Wpf.Ui/Controls/CodeBlock.cs b/src/Wpf.Ui/Controls/CodeBlock.cs
index f0df01db6..35e1e8403 100644
--- a/src/Wpf.Ui/Controls/CodeBlock.cs
+++ b/src/Wpf.Ui/Controls/CodeBlock.cs
@@ -10,6 +10,7 @@
 using System.Windows;
 using Wpf.Ui.Appearance;
 using Wpf.Ui.Common;
+using Wpf.Ui.Controls.NumberBoxControl;
 using Color = System.Windows.Media.Color;
 
 namespace Wpf.Ui.Controls;
diff --git a/src/Wpf.Ui/Controls/ContentDialog/ContentDialog.cs b/src/Wpf.Ui/Controls/ContentDialogControl/ContentDialog.cs
similarity index 99%
rename from src/Wpf.Ui/Controls/ContentDialog/ContentDialog.cs
rename to src/Wpf.Ui/Controls/ContentDialogControl/ContentDialog.cs
index b8ae7b89c..1e3ff2871 100644
--- a/src/Wpf.Ui/Controls/ContentDialog/ContentDialog.cs
+++ b/src/Wpf.Ui/Controls/ContentDialogControl/ContentDialog.cs
@@ -10,7 +10,7 @@
 using System.Windows.Controls;
 using Wpf.Ui.Common;
 
-namespace Wpf.Ui.Controls;
+namespace Wpf.Ui.Controls.ContentDialogControl;
 
 public class ContentDialog : ContentControl
 {
diff --git a/src/Wpf.Ui/Controls/ContentDialog/ContentDialogButton.cs b/src/Wpf.Ui/Controls/ContentDialogControl/ContentDialogButton.cs
similarity index 91%
rename from src/Wpf.Ui/Controls/ContentDialog/ContentDialogButton.cs
rename to src/Wpf.Ui/Controls/ContentDialogControl/ContentDialogButton.cs
index d257d70f1..16b73b78c 100644
--- a/src/Wpf.Ui/Controls/ContentDialog/ContentDialogButton.cs
+++ b/src/Wpf.Ui/Controls/ContentDialogControl/ContentDialogButton.cs
@@ -1,4 +1,4 @@
-namespace Wpf.Ui.Controls
+namespace Wpf.Ui.Controls.ContentDialogControl
 {
     /// <summary>
     /// Defines constants that specify the default button on a <see cref="ContentDialog"/>.
diff --git a/src/Wpf.Ui/Controls/ContentDialog/ContentDialogResult.cs b/src/Wpf.Ui/Controls/ContentDialogControl/ContentDialogResult.cs
similarity index 91%
rename from src/Wpf.Ui/Controls/ContentDialog/ContentDialogResult.cs
rename to src/Wpf.Ui/Controls/ContentDialogControl/ContentDialogResult.cs
index a483d3f31..71c7fffb9 100644
--- a/src/Wpf.Ui/Controls/ContentDialog/ContentDialogResult.cs
+++ b/src/Wpf.Ui/Controls/ContentDialogControl/ContentDialogResult.cs
@@ -1,4 +1,4 @@
-namespace Wpf.Ui.Controls
+namespace Wpf.Ui.Controls.ContentDialogControl
 {
     /// <summary>
     /// Specifies identifiers to indicate the return value of a <see cref="ContentDialog"/>.
diff --git a/src/Wpf.Ui/Controls/MessageBox/MessageBox.bmp b/src/Wpf.Ui/Controls/MessageBoxControl/MessageBox.bmp
similarity index 100%
rename from src/Wpf.Ui/Controls/MessageBox/MessageBox.bmp
rename to src/Wpf.Ui/Controls/MessageBoxControl/MessageBox.bmp
diff --git a/src/Wpf.Ui/Controls/MessageBox/MessageBox.cs b/src/Wpf.Ui/Controls/MessageBoxControl/MessageBox.cs
similarity index 98%
rename from src/Wpf.Ui/Controls/MessageBox/MessageBox.cs
rename to src/Wpf.Ui/Controls/MessageBoxControl/MessageBox.cs
index 6a44c4e51..ce0d0b585 100644
--- a/src/Wpf.Ui/Controls/MessageBox/MessageBox.cs
+++ b/src/Wpf.Ui/Controls/MessageBoxControl/MessageBox.cs
@@ -10,10 +10,11 @@
 using System.Threading.Tasks;
 using System.Windows;
 using Wpf.Ui.Common;
+using Wpf.Ui.Controls.TitleBarControl;
 using Wpf.Ui.Controls.Window;
 using Wpf.Ui.Interop;
 
-namespace Wpf.Ui.Controls;
+namespace Wpf.Ui.Controls.MessageBoxControl;
 
 /// <summary>
 /// Customized window for notifications.
@@ -124,7 +125,7 @@ public class MessageBox : System.Windows.Window
     #region Properties
 
     /// <summary>
-    /// Gets or sets a value that determines whether to show the <see cref="System.Windows.Window.Title"/> in <see cref="Wpf.Ui.Controls.TitleBar"/>.
+    /// Gets or sets a value that determines whether to show the <see cref="System.Windows.Window.Title"/> in <see cref="TitleBar"/>.
     /// </summary>
     public bool ShowTitle
     {
diff --git a/src/Wpf.Ui/Controls/MessageBox/MessageBoxButton.cs b/src/Wpf.Ui/Controls/MessageBoxControl/MessageBoxButton.cs
similarity index 88%
rename from src/Wpf.Ui/Controls/MessageBox/MessageBoxButton.cs
rename to src/Wpf.Ui/Controls/MessageBoxControl/MessageBoxButton.cs
index 0a17afd04..b2f0bb856 100644
--- a/src/Wpf.Ui/Controls/MessageBox/MessageBoxButton.cs
+++ b/src/Wpf.Ui/Controls/MessageBoxControl/MessageBoxButton.cs
@@ -1,4 +1,4 @@
-namespace Wpf.Ui.Controls;
+namespace Wpf.Ui.Controls.MessageBoxControl;
 
 /// <summary>
 /// Defines constants that specify the default button on a <see cref="MessageBox"/>.
diff --git a/src/Wpf.Ui/Controls/MessageBox/MessageBoxResult.cs b/src/Wpf.Ui/Controls/MessageBoxControl/MessageBoxResult.cs
similarity index 91%
rename from src/Wpf.Ui/Controls/MessageBox/MessageBoxResult.cs
rename to src/Wpf.Ui/Controls/MessageBoxControl/MessageBoxResult.cs
index 592aad9d7..a447b8067 100644
--- a/src/Wpf.Ui/Controls/MessageBox/MessageBoxResult.cs
+++ b/src/Wpf.Ui/Controls/MessageBoxControl/MessageBoxResult.cs
@@ -1,4 +1,4 @@
-namespace Wpf.Ui.Controls
+namespace Wpf.Ui.Controls.MessageBoxControl
 {
     /// <summary>
     /// Specifies identifiers to indicate the return value of a <see cref="MessageBox"/>.
diff --git a/src/Wpf.Ui/Controls/Navigation/INavigationView.cs b/src/Wpf.Ui/Controls/Navigation/INavigationView.cs
index f1eea75ce..18561cf49 100644
--- a/src/Wpf.Ui/Controls/Navigation/INavigationView.cs
+++ b/src/Wpf.Ui/Controls/Navigation/INavigationView.cs
@@ -13,6 +13,7 @@
 using Wpf.Ui.Animations;
 using Wpf.Ui.Common;
 using Wpf.Ui.Contracts;
+using Wpf.Ui.Controls.TitleBarControl;
 
 namespace Wpf.Ui.Controls.Navigation;
 
diff --git a/src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs b/src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs
index 15c3caeed..735169d40 100644
--- a/src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs
+++ b/src/Wpf.Ui/Controls/Navigation/NavigationView.Base.cs
@@ -16,6 +16,7 @@
 using System.Windows;
 using System.Windows.Input;
 using Wpf.Ui.Common;
+using Wpf.Ui.Controls.BreadcrumbControl;
 
 namespace Wpf.Ui.Controls.Navigation;
 
diff --git a/src/Wpf.Ui/Controls/Navigation/NavigationView.Properties.cs b/src/Wpf.Ui/Controls/Navigation/NavigationView.Properties.cs
index 007a06bea..722117f9a 100644
--- a/src/Wpf.Ui/Controls/Navigation/NavigationView.Properties.cs
+++ b/src/Wpf.Ui/Controls/Navigation/NavigationView.Properties.cs
@@ -12,6 +12,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using Wpf.Ui.Animations;
+using Wpf.Ui.Controls.TitleBarControl;
 
 namespace Wpf.Ui.Controls.Navigation;
 
diff --git a/src/Wpf.Ui/Controls/NumberBox/INumberFormatter.cs b/src/Wpf.Ui/Controls/NumberBoxControl/INumberFormatter.cs
similarity index 96%
rename from src/Wpf.Ui/Controls/NumberBox/INumberFormatter.cs
rename to src/Wpf.Ui/Controls/NumberBoxControl/INumberFormatter.cs
index ea5799583..0de2db802 100644
--- a/src/Wpf.Ui/Controls/NumberBox/INumberFormatter.cs
+++ b/src/Wpf.Ui/Controls/NumberBoxControl/INumberFormatter.cs
@@ -4,7 +4,7 @@
 // Copyright (C) .NET Foundation Contributors, WPF UI Contributors, Leszek Pomianowski.
 // All Rights Reserved.
 
-namespace Wpf.Ui.Controls;
+namespace Wpf.Ui.Controls.NumberBoxControl;
 
 /// <summary>
 /// An interface that returns a string representation of a provided value, using distinct format methods to format several data types.
diff --git a/src/Wpf.Ui/Controls/NumberBox/INumberParser.cs b/src/Wpf.Ui/Controls/NumberBoxControl/INumberParser.cs
similarity index 95%
rename from src/Wpf.Ui/Controls/NumberBox/INumberParser.cs
rename to src/Wpf.Ui/Controls/NumberBoxControl/INumberParser.cs
index 17203e3d2..bf5fa8774 100644
--- a/src/Wpf.Ui/Controls/NumberBox/INumberParser.cs
+++ b/src/Wpf.Ui/Controls/NumberBoxControl/INumberParser.cs
@@ -4,7 +4,7 @@
 // Copyright (C) .NET Foundation Contributors, WPF UI Contributors, Leszek Pomianowski.
 // All Rights Reserved.
 
-namespace Wpf.Ui.Controls;
+namespace Wpf.Ui.Controls.NumberBoxControl;
 
 /// <summary>
 /// An interface that parses a string representation of a numeric value.
diff --git a/src/Wpf.Ui/Controls/NumberBox/NumberBox.bmp b/src/Wpf.Ui/Controls/NumberBoxControl/NumberBox.bmp
similarity index 100%
rename from src/Wpf.Ui/Controls/NumberBox/NumberBox.bmp
rename to src/Wpf.Ui/Controls/NumberBoxControl/NumberBox.bmp
diff --git a/src/Wpf.Ui/Controls/NumberBox/NumberBox.cs b/src/Wpf.Ui/Controls/NumberBoxControl/NumberBox.cs
similarity index 99%
rename from src/Wpf.Ui/Controls/NumberBox/NumberBox.cs
rename to src/Wpf.Ui/Controls/NumberBoxControl/NumberBox.cs
index d3779ee32..24bcd57df 100644
--- a/src/Wpf.Ui/Controls/NumberBox/NumberBox.cs
+++ b/src/Wpf.Ui/Controls/NumberBoxControl/NumberBox.cs
@@ -9,7 +9,7 @@
 using System.Windows;
 using System.Windows.Input;
 
-namespace Wpf.Ui.Controls;
+namespace Wpf.Ui.Controls.NumberBoxControl;
 
 // TODO: Mask (with placeholder); Clipboard paste;
 // TODO: Constant decimals when formatting. Although this can actually be done with NumberFormatter.
diff --git a/src/Wpf.Ui/Controls/NumberBox/NumberBoxSpinButtonPlacementMode.cs b/src/Wpf.Ui/Controls/NumberBoxControl/NumberBoxSpinButtonPlacementMode.cs
similarity index 96%
rename from src/Wpf.Ui/Controls/NumberBox/NumberBoxSpinButtonPlacementMode.cs
rename to src/Wpf.Ui/Controls/NumberBoxControl/NumberBoxSpinButtonPlacementMode.cs
index dfcba77b4..ecc197540 100644
--- a/src/Wpf.Ui/Controls/NumberBox/NumberBoxSpinButtonPlacementMode.cs
+++ b/src/Wpf.Ui/Controls/NumberBoxControl/NumberBoxSpinButtonPlacementMode.cs
@@ -4,7 +4,7 @@
 // Copyright (C) .NET Foundation Contributors, WPF UI Contributors, Leszek Pomianowski.
 // All Rights Reserved.
 
-namespace Wpf.Ui.Controls;
+namespace Wpf.Ui.Controls.NumberBoxControl;
 
 /// <summary>
 /// Defines values that specify how the spin buttons used to increment or decrement the <see cref="NumberBox.Value"/> are displayed.
diff --git a/src/Wpf.Ui/Controls/NumberBox/NumberBoxValidationMode.cs b/src/Wpf.Ui/Controls/NumberBoxControl/NumberBoxValidationMode.cs
similarity index 94%
rename from src/Wpf.Ui/Controls/NumberBox/NumberBoxValidationMode.cs
rename to src/Wpf.Ui/Controls/NumberBoxControl/NumberBoxValidationMode.cs
index bebbcb431..9e740a8b3 100644
--- a/src/Wpf.Ui/Controls/NumberBox/NumberBoxValidationMode.cs
+++ b/src/Wpf.Ui/Controls/NumberBoxControl/NumberBoxValidationMode.cs
@@ -4,7 +4,7 @@
 // Copyright (C) .NET Foundation Contributors, WPF UI Contributors, Leszek Pomianowski.
 // All Rights Reserved.
 
-namespace Wpf.Ui.Controls;
+namespace Wpf.Ui.Controls.NumberBoxControl;
 
 /// <summary>
 /// Defines values that specify the input validation behavior of a <see cref="NumberBox"/> when invalid input is entered.
diff --git a/src/Wpf.Ui/Controls/NumberBox/ValidateNumberFormatter.cs b/src/Wpf.Ui/Controls/NumberBoxControl/ValidateNumberFormatter.cs
similarity index 97%
rename from src/Wpf.Ui/Controls/NumberBox/ValidateNumberFormatter.cs
rename to src/Wpf.Ui/Controls/NumberBoxControl/ValidateNumberFormatter.cs
index 49322d09b..12bbd06a1 100644
--- a/src/Wpf.Ui/Controls/NumberBox/ValidateNumberFormatter.cs
+++ b/src/Wpf.Ui/Controls/NumberBoxControl/ValidateNumberFormatter.cs
@@ -7,7 +7,7 @@
 using System;
 using System.Globalization;
 
-namespace Wpf.Ui.Controls;
+namespace Wpf.Ui.Controls.NumberBoxControl;
 
 /// <summary>
 /// Base nubmer formatter that uses default format specifier and <see cref="CultureInfo"/> that represents the culture used by the current thread.
diff --git a/src/Wpf.Ui/Controls/ThumbRate/ThumbRate.bmp b/src/Wpf.Ui/Controls/ThumbRateControl/ThumbRate.bmp
similarity index 100%
rename from src/Wpf.Ui/Controls/ThumbRate/ThumbRate.bmp
rename to src/Wpf.Ui/Controls/ThumbRateControl/ThumbRate.bmp
diff --git a/src/Wpf.Ui/Controls/ThumbRate/ThumbRate.cs b/src/Wpf.Ui/Controls/ThumbRateControl/ThumbRate.cs
similarity index 98%
rename from src/Wpf.Ui/Controls/ThumbRate/ThumbRate.cs
rename to src/Wpf.Ui/Controls/ThumbRateControl/ThumbRate.cs
index e10c109db..f7827ca69 100644
--- a/src/Wpf.Ui/Controls/ThumbRate/ThumbRate.cs
+++ b/src/Wpf.Ui/Controls/ThumbRateControl/ThumbRate.cs
@@ -3,13 +3,12 @@
 // Copyright (C) Leszek Pomianowski and WPF UI Contributors.
 // All Rights Reserved.
 
-using System;
 using System.ComponentModel;
 using System.Drawing;
 using System.Windows;
 using Wpf.Ui.Common;
 
-namespace Wpf.Ui.Controls;
+namespace Wpf.Ui.Controls.ThumbRateControl;
 
 /// <summary>
 /// Allows to rate positively or negatively by clicking on one of the thumbs.
diff --git a/src/Wpf.Ui/Controls/ThumbRate/ThumbRateState.cs b/src/Wpf.Ui/Controls/ThumbRateControl/ThumbRateState.cs
similarity index 93%
rename from src/Wpf.Ui/Controls/ThumbRate/ThumbRateState.cs
rename to src/Wpf.Ui/Controls/ThumbRateControl/ThumbRateState.cs
index 14e32b477..22221cccc 100644
--- a/src/Wpf.Ui/Controls/ThumbRate/ThumbRateState.cs
+++ b/src/Wpf.Ui/Controls/ThumbRateControl/ThumbRateState.cs
@@ -3,7 +3,7 @@
 // Copyright (C) Leszek Pomianowski and WPF UI Contributors.
 // All Rights Reserved.
 
-namespace Wpf.Ui.Controls;
+namespace Wpf.Ui.Controls.ThumbRateControl;
 
 /// <summary>
 /// States of the <see cref="ThumbRate"/> control.
diff --git a/src/Wpf.Ui/Controls/TitleBar/TitleBar.cs b/src/Wpf.Ui/Controls/TitleBarControl/TitleBar.cs
similarity index 99%
rename from src/Wpf.Ui/Controls/TitleBar/TitleBar.cs
rename to src/Wpf.Ui/Controls/TitleBarControl/TitleBar.cs
index c5e2e0447..de9821ae9 100644
--- a/src/Wpf.Ui/Controls/TitleBar/TitleBar.cs
+++ b/src/Wpf.Ui/Controls/TitleBarControl/TitleBar.cs
@@ -7,15 +7,13 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Windows;
-using System.Windows.Input;
 using System.Windows.Interop;
 using System.Windows.Media;
 using Wpf.Ui.Common;
-using Wpf.Ui.Dpi;
 using Wpf.Ui.Extensions;
 using Wpf.Ui.Interop;
 
-namespace Wpf.Ui.Controls;
+namespace Wpf.Ui.Controls.TitleBarControl;
 
 /// <summary>
 /// Custom navigation buttons for the window.
diff --git a/src/Wpf.Ui/Controls/TitleBar/TitleBarButton.cs b/src/Wpf.Ui/Controls/TitleBarControl/TitleBarButton.cs
similarity index 99%
rename from src/Wpf.Ui/Controls/TitleBar/TitleBarButton.cs
rename to src/Wpf.Ui/Controls/TitleBarControl/TitleBarButton.cs
index 66669a00f..bd0c3fa17 100644
--- a/src/Wpf.Ui/Controls/TitleBar/TitleBarButton.cs
+++ b/src/Wpf.Ui/Controls/TitleBarControl/TitleBarButton.cs
@@ -6,7 +6,7 @@
 using Wpf.Ui.Extensions;
 using Wpf.Ui.Interop;
 
-namespace Wpf.Ui.Controls;
+namespace Wpf.Ui.Controls.TitleBarControl;
 
 internal class TitleBarButton : Wpf.Ui.Controls.Button
 {
diff --git a/src/Wpf.Ui/Controls/TitleBar/TitleBarButtonType.cs b/src/Wpf.Ui/Controls/TitleBarControl/TitleBarButtonType.cs
similarity index 95%
rename from src/Wpf.Ui/Controls/TitleBar/TitleBarButtonType.cs
rename to src/Wpf.Ui/Controls/TitleBarControl/TitleBarButtonType.cs
index 1e2196c3c..4b3136916 100644
--- a/src/Wpf.Ui/Controls/TitleBar/TitleBarButtonType.cs
+++ b/src/Wpf.Ui/Controls/TitleBarControl/TitleBarButtonType.cs
@@ -3,7 +3,7 @@
 // Copyright (C) Leszek Pomianowski and WPF UI Contributors.
 // All Rights Reserved.
 
-namespace Wpf.Ui.Controls;
+namespace Wpf.Ui.Controls.TitleBarControl;
 
 /// <summary>
 /// Type of the Title Bar button.
diff --git a/src/Wpf.Ui/Controls/TreeGrid/TreeGrid.cs b/src/Wpf.Ui/Controls/TreeGridControl/TreeGrid.cs
similarity index 98%
rename from src/Wpf.Ui/Controls/TreeGrid/TreeGrid.cs
rename to src/Wpf.Ui/Controls/TreeGridControl/TreeGrid.cs
index 3d63883c9..c2899f9b8 100644
--- a/src/Wpf.Ui/Controls/TreeGrid/TreeGrid.cs
+++ b/src/Wpf.Ui/Controls/TreeGridControl/TreeGrid.cs
@@ -7,7 +7,7 @@
 using System.ComponentModel;
 using System.Windows;
 
-namespace Wpf.Ui.Controls;
+namespace Wpf.Ui.Controls.TreeGridControl;
 
 /// <summary>
 /// Work in progress.
diff --git a/src/Wpf.Ui/Controls/TreeGrid/TreeGridHeader.cs b/src/Wpf.Ui/Controls/TreeGridControl/TreeGridHeader.cs
similarity index 97%
rename from src/Wpf.Ui/Controls/TreeGrid/TreeGridHeader.cs
rename to src/Wpf.Ui/Controls/TreeGridControl/TreeGridHeader.cs
index b5ed10558..ff0dd1b67 100644
--- a/src/Wpf.Ui/Controls/TreeGrid/TreeGridHeader.cs
+++ b/src/Wpf.Ui/Controls/TreeGridControl/TreeGridHeader.cs
@@ -7,7 +7,7 @@
 using System.ComponentModel;
 using System.Windows;
 
-namespace Wpf.Ui.Controls;
+namespace Wpf.Ui.Controls.TreeGridControl;
 
 /// <summary>
 /// Work in progress.
diff --git a/src/Wpf.Ui/Controls/TreeGrid/TreeGridItem.cs b/src/Wpf.Ui/Controls/TreeGridControl/TreeGridItem.cs
similarity index 90%
rename from src/Wpf.Ui/Controls/TreeGrid/TreeGridItem.cs
rename to src/Wpf.Ui/Controls/TreeGridControl/TreeGridItem.cs
index d60f50e2a..4d75e70da 100644
--- a/src/Wpf.Ui/Controls/TreeGrid/TreeGridItem.cs
+++ b/src/Wpf.Ui/Controls/TreeGridControl/TreeGridItem.cs
@@ -3,7 +3,7 @@
 // Copyright (C) Leszek Pomianowski and WPF UI Contributors.
 // All Rights Reserved.
 
-namespace Wpf.Ui.Controls;
+namespace Wpf.Ui.Controls.TreeGridControl;
 
 /// <summary>
 /// Work in progress.
diff --git a/src/Wpf.Ui/Controls/VirtualizingControls/SpacingMode.cs b/src/Wpf.Ui/Controls/VirtualizingControls/SpacingMode.cs
index a9439fefd..1d7f56d09 100644
--- a/src/Wpf.Ui/Controls/VirtualizingControls/SpacingMode.cs
+++ b/src/Wpf.Ui/Controls/VirtualizingControls/SpacingMode.cs
@@ -5,7 +5,7 @@
 // Copyright (C) S. Bäumlisberger, Leszek Pomianowski and WPF UI Contributors.
 // All Rights Reserved.
 
-namespace Wpf.Ui.Controls;
+namespace Wpf.Ui.Controls.VirtualizingControls;
 
 /// <summary>
 /// Specifies how remaining space is distributed.
diff --git a/src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingGridView.cs b/src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingGridView.cs
index 300020fe0..1da76c37d 100644
--- a/src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingGridView.cs
+++ b/src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingGridView.cs
@@ -10,7 +10,7 @@
 using System.Windows.Controls;
 using System.Windows.Data;
 
-namespace Wpf.Ui.Controls;
+namespace Wpf.Ui.Controls.VirtualizingControls;
 
 /// <summary>
 /// Simple control that displays a gird of items. Depending on the orientation, the items are either stacked horizontally or vertically 
diff --git a/src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingItemsControl.cs b/src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingItemsControl.cs
index 4e06341c2..40e0a70fc 100644
--- a/src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingItemsControl.cs
+++ b/src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingItemsControl.cs
@@ -10,7 +10,7 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace Wpf.Ui.Controls;
+namespace Wpf.Ui.Controls.VirtualizingControls;
 
 /// <summary>
 /// Virtualized <see cref="ItemsControl"/>.
diff --git a/src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingPanelBase.cs b/src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingPanelBase.cs
index 538387f74..defc2b86d 100644
--- a/src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingPanelBase.cs
+++ b/src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingPanelBase.cs
@@ -17,7 +17,7 @@
 using System.Windows.Media;
 using Wpf.Ui.Common;
 
-namespace Wpf.Ui.Controls;
+namespace Wpf.Ui.Controls.VirtualizingControls;
 
 /// <summary>
 /// Base abstract class for creating virtualized panels.
diff --git a/src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingUniformGrid.cs b/src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingUniformGrid.cs
index 1ad8687fd..15cf1ed29 100644
--- a/src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingUniformGrid.cs
+++ b/src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingUniformGrid.cs
@@ -5,7 +5,7 @@
 
 using System;
 
-namespace Wpf.Ui.Controls;
+namespace Wpf.Ui.Controls.VirtualizingControls;
 
 /// <summary>
 /// <para><c>Work in progress.</c></para>
diff --git a/src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingWrapPanel.cs b/src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingWrapPanel.cs
index 53dbe9150..0f5da4aed 100644
--- a/src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingWrapPanel.cs
+++ b/src/Wpf.Ui/Controls/VirtualizingControls/VirtualizingWrapPanel.cs
@@ -16,7 +16,7 @@
 using Point = System.Windows.Point;
 using Size = System.Windows.Size;
 
-namespace Wpf.Ui.Controls;
+namespace Wpf.Ui.Controls.VirtualizingControls;
 
 /// <summary>
 /// Extended base class for <see cref="VirtualizingPanel"/>.
diff --git a/src/Wpf.Ui/Converters/EnumToBoolConverter.cs b/src/Wpf.Ui/Converters/EnumToBoolConverter.cs
index 8d6a77fea..0c51bc1ba 100644
--- a/src/Wpf.Ui/Converters/EnumToBoolConverter.cs
+++ b/src/Wpf.Ui/Converters/EnumToBoolConverter.cs
@@ -8,6 +8,7 @@
 using System.Globalization;
 using System.Windows.Data;
 using Wpf.Ui.Controls;
+using Wpf.Ui.Controls.ContentDialogControl;
 
 namespace Wpf.Ui.Converters;
 
diff --git a/src/Wpf.Ui/Properties/AssemblyInfo.cs b/src/Wpf.Ui/Properties/AssemblyInfo.cs
index b898fba7f..cf644e052 100644
--- a/src/Wpf.Ui/Properties/AssemblyInfo.cs
+++ b/src/Wpf.Ui/Properties/AssemblyInfo.cs
@@ -19,3 +19,11 @@
 [assembly: XmlnsDefinition("http://schemas.lepo.co/wpfui/2022/xaml", "Wpf.Ui.Converters")]
 [assembly: XmlnsDefinition("http://schemas.lepo.co/wpfui/2022/xaml", "Wpf.Ui.Controls.Navigation")]
 [assembly: XmlnsDefinition("http://schemas.lepo.co/wpfui/2022/xaml", "Wpf.Ui.Controls.Window")]
+[assembly: XmlnsDefinition("http://schemas.lepo.co/wpfui/2022/xaml", "Wpf.Ui.Controls.TreeGridControl")]
+[assembly: XmlnsDefinition("http://schemas.lepo.co/wpfui/2022/xaml", "Wpf.Ui.Controls.VirtualizingControls")]
+[assembly: XmlnsDefinition("http://schemas.lepo.co/wpfui/2022/xaml", "Wpf.Ui.Controls.TitleBarControl")]
+[assembly: XmlnsDefinition("http://schemas.lepo.co/wpfui/2022/xaml", "Wpf.Ui.Controls.ThumbRateControl")]
+[assembly: XmlnsDefinition("http://schemas.lepo.co/wpfui/2022/xaml", "Wpf.Ui.Controls.NumberBoxControl")]
+[assembly: XmlnsDefinition("http://schemas.lepo.co/wpfui/2022/xaml", "Wpf.Ui.Controls.MessageBoxControl")]
+[assembly: XmlnsDefinition("http://schemas.lepo.co/wpfui/2022/xaml", "Wpf.Ui.Controls.ContentDialogControl")]
+[assembly: XmlnsDefinition("http://schemas.lepo.co/wpfui/2022/xaml", "Wpf.Ui.Controls.BreadcrumbControl")]
diff --git a/src/Wpf.Ui/Services/IContentDialogService.cs b/src/Wpf.Ui/Services/IContentDialogService.cs
index 5a24dd638..ff51a2d00 100644
--- a/src/Wpf.Ui/Services/IContentDialogService.cs
+++ b/src/Wpf.Ui/Services/IContentDialogService.cs
@@ -7,6 +7,7 @@
 using System.Windows.Controls;
 using Wpf.Ui.Contracts;
 using Wpf.Ui.Controls;
+using Wpf.Ui.Controls.ContentDialogControl;
 
 namespace Wpf.Ui.Services;
 
diff --git a/src/Wpf.Ui/Styles/Controls/BreadcrumbBar.xaml b/src/Wpf.Ui/Styles/Controls/BreadcrumbBar.xaml
index ecabfe128..bcc0e030e 100644
--- a/src/Wpf.Ui/Styles/Controls/BreadcrumbBar.xaml
+++ b/src/Wpf.Ui/Styles/Controls/BreadcrumbBar.xaml
@@ -8,7 +8,8 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+    xmlns:breadcrumbControl="clr-namespace:Wpf.Ui.Controls.BreadcrumbControl">
 
     <Style x:Key="DefaultUiBreadcrumbButtonStyle" TargetType="{x:Type ButtonBase}">
         <Setter Property="Foreground">
@@ -48,7 +49,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="DefaultUiBreadcrumbBarItemStyle" TargetType="{x:Type controls:BreadcrumbBarItem}">
+    <Style x:Key="DefaultUiBreadcrumbBarItemStyle" TargetType="{x:Type breadcrumbControl:BreadcrumbBarItem}">
         <Setter Property="FontSize" Value="28" />
         <Setter Property="FontWeight" Value="DemiBold" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -57,7 +58,7 @@
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:BreadcrumbBarItem}">
+                <ControlTemplate TargetType="{x:Type breadcrumbControl:BreadcrumbBarItem}">
                     <Grid>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*" />
@@ -69,11 +70,11 @@
                             Grid.Column="0"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                             VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            Command="{Binding Path=TemplateButtonCommand, Mode=OneTime, RelativeSource={RelativeSource AncestorType={x:Type controls:BreadcrumbBar}}}"
+                            Command="{Binding Path=TemplateButtonCommand, Mode=OneTime, RelativeSource={RelativeSource AncestorType={x:Type breadcrumbControl:BreadcrumbBar}}}"
                             CommandParameter="{TemplateBinding Content}"
                             Content="{TemplateBinding Content}"
-                            ContentTemplate="{Binding Path=ItemTemplate, Mode=OneTime, RelativeSource={RelativeSource AncestorType={x:Type controls:BreadcrumbBar}}}"
-                            ContentTemplateSelector="{Binding Path=ItemTemplateSelector, Mode=OneTime, RelativeSource={RelativeSource AncestorType={x:Type controls:BreadcrumbBar}}}"
+                            ContentTemplate="{Binding Path=ItemTemplate, Mode=OneTime, RelativeSource={RelativeSource AncestorType={x:Type breadcrumbControl:BreadcrumbBar}}}"
+                            ContentTemplateSelector="{Binding Path=ItemTemplateSelector, Mode=OneTime, RelativeSource={RelativeSource AncestorType={x:Type breadcrumbControl:BreadcrumbBar}}}"
                             FontSize="{TemplateBinding FontSize}"
                             FontWeight="{TemplateBinding FontWeight}"
                             Style="{StaticResource DefaultUiBreadcrumbButtonStyle}" />
@@ -104,7 +105,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="DefaultUiBreadcrumbBarStyle" TargetType="{x:Type controls:BreadcrumbBar}">
+    <Style x:Key="DefaultUiBreadcrumbBarStyle" TargetType="{x:Type breadcrumbControl:BreadcrumbBar}">
         <Setter Property="ItemsPanel">
             <Setter.Value>
                 <ItemsPanelTemplate>
@@ -114,7 +115,7 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultUiBreadcrumbBarItemStyle}" TargetType="{x:Type controls:BreadcrumbBarItem}" />
-    <Style BasedOn="{StaticResource DefaultUiBreadcrumbBarStyle}" TargetType="{x:Type controls:BreadcrumbBar}" />
+    <Style BasedOn="{StaticResource DefaultUiBreadcrumbBarItemStyle}" TargetType="{x:Type breadcrumbControl:BreadcrumbBarItem}" />
+    <Style BasedOn="{StaticResource DefaultUiBreadcrumbBarStyle}" TargetType="{x:Type breadcrumbControl:BreadcrumbBar}" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Wpf.Ui/Styles/Controls/ContentDialog.xaml b/src/Wpf.Ui/Styles/Controls/ContentDialog.xaml
index f42b3e284..aa97b6e4f 100644
--- a/src/Wpf.Ui/Styles/Controls/ContentDialog.xaml
+++ b/src/Wpf.Ui/Styles/Controls/ContentDialog.xaml
@@ -2,14 +2,15 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    xmlns:converters="clr-namespace:Wpf.Ui.Converters">
+    xmlns:converters="clr-namespace:Wpf.Ui.Converters"
+    xmlns:contentDialogControl="clr-namespace:Wpf.Ui.Controls.ContentDialogControl">
 
     <converters:ContentDialogButtonEnumToBoolConverter x:Key="EnumToBoolConverter" />
     <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
 
     <CornerRadius x:Key="DialogFooterCornerRadius">0,0,8,8</CornerRadius>
 
-    <Style TargetType="{x:Type controls:ContentDialog}">
+    <Style TargetType="{x:Type contentDialogControl:ContentDialog}">
         <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
@@ -27,7 +28,7 @@
         <Setter Property="DialogMargin" Value="35" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:ContentDialog}">
+                <ControlTemplate TargetType="{x:Type contentDialogControl:ContentDialog}">
                     <Grid Focusable="False">
                         <Grid.Background>
                             <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
@@ -129,38 +130,38 @@
                                             Grid.Column="0"
                                             HorizontalAlignment="Stretch"
                                             Appearance="{TemplateBinding PrimaryButtonAppearance}"
-                                            Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type controls:ContentDialog}}, Mode=OneTime, Path=TemplateButtonCommand}"
-                                            CommandParameter="{x:Static controls:ContentDialogButton.Primary}"
+                                            Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type contentDialogControl:ContentDialog}}, Mode=OneTime, Path=TemplateButtonCommand}"
+                                            CommandParameter="{x:Static contentDialogControl:ContentDialogButton.Primary}"
                                             Content="{TemplateBinding PrimaryButtonText}"
                                             Icon="{TemplateBinding PrimaryButtonIcon}"
                                             IsDefault="{TemplateBinding DefaultButton,
                                                                         Converter={StaticResource EnumToBoolConverter},
-                                                                        ConverterParameter={x:Static controls:ContentDialogButton.Primary}}" />
+                                                                        ConverterParameter={x:Static contentDialogControl:ContentDialogButton.Primary}}" />
 
                                         <controls:Button
                                             Grid.Column="2"
                                             HorizontalAlignment="Stretch"
                                             Appearance="{TemplateBinding SecondaryButtonAppearance}"
-                                            Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type controls:ContentDialog}}, Mode=OneTime, Path=TemplateButtonCommand}"
-                                            CommandParameter="{x:Static controls:ContentDialogButton.Secondary}"
+                                            Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type contentDialogControl:ContentDialog}}, Mode=OneTime, Path=TemplateButtonCommand}"
+                                            CommandParameter="{x:Static contentDialogControl:ContentDialogButton.Secondary}"
                                             Content="{TemplateBinding SecondaryButtonText}"
                                             Icon="{TemplateBinding SecondaryButtonIcon}"
                                             IsDefault="{TemplateBinding DefaultButton,
                                                                         Converter={StaticResource EnumToBoolConverter},
-                                                                        ConverterParameter={x:Static controls:ContentDialogButton.Secondary}}" />
+                                                                        ConverterParameter={x:Static contentDialogControl:ContentDialogButton.Secondary}}" />
 
                                         <controls:Button
                                             Grid.Column="4"
                                             HorizontalAlignment="Stretch"
                                             Appearance="{TemplateBinding CloseButtonAppearance}"
-                                            Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type controls:ContentDialog}}, Mode=OneTime, Path=TemplateButtonCommand}"
-                                            CommandParameter="{x:Static controls:ContentDialogButton.Close}"
+                                            Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type contentDialogControl:ContentDialog}}, Mode=OneTime, Path=TemplateButtonCommand}"
+                                            CommandParameter="{x:Static contentDialogControl:ContentDialogButton.Close}"
                                             Content="{TemplateBinding CloseButtonText}"
                                             Icon="{TemplateBinding CloseButtonIcon}"
                                             IsCancel="True"
                                             IsDefault="{TemplateBinding DefaultButton,
                                                                         Converter={StaticResource EnumToBoolConverter},
-                                                                        ConverterParameter={x:Static controls:ContentDialogButton.Close}}" />
+                                                                        ConverterParameter={x:Static contentDialogControl:ContentDialogButton.Close}}" />
                                     </Grid>
                                 </Border>
                             </Grid>
diff --git a/src/Wpf.Ui/Styles/Controls/MessageBox.xaml b/src/Wpf.Ui/Styles/Controls/MessageBox.xaml
index 16d83d83d..c4ed7736b 100644
--- a/src/Wpf.Ui/Styles/Controls/MessageBox.xaml
+++ b/src/Wpf.Ui/Styles/Controls/MessageBox.xaml
@@ -8,9 +8,11 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+    xmlns:titleBarControl="clr-namespace:Wpf.Ui.Controls.TitleBarControl"
+    xmlns:messageBoxControl="clr-namespace:Wpf.Ui.Controls.MessageBoxControl">
 
-    <Style TargetType="{x:Type controls:MessageBox}">
+    <Style TargetType="{x:Type messageBoxControl:MessageBox}">
         <Setter Property="MaxWidth" Value="450" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="Background">
@@ -51,7 +53,7 @@
         </Setter>
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:MessageBox}">
+                <ControlTemplate TargetType="{x:Type messageBoxControl:MessageBox}">
                     <Grid Background="{TemplateBinding Background}">
                         <AdornerDecorator>
                             <Grid>
@@ -72,7 +74,7 @@
                                     </TextBlock.Foreground>
                                 </TextBlock>
 
-                                <controls:TitleBar
+                                <titleBarControl:TitleBar
                                     Grid.Row="0"
                                     ForceShutdown="False"
                                     ShowMaximize="False"
@@ -117,8 +119,8 @@
                                             Grid.Column="0"
                                             HorizontalAlignment="Stretch"
                                             Appearance="{TemplateBinding PrimaryButtonAppearance}"
-                                            Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type controls:MessageBox}}, Path=TemplateButtonCommand, Mode=OneTime}"
-                                            CommandParameter="{x:Static controls:MessageBoxButton.Primary}"
+                                            Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type messageBoxControl:MessageBox}}, Path=TemplateButtonCommand, Mode=OneTime}"
+                                            CommandParameter="{x:Static messageBoxControl:MessageBoxButton.Primary}"
                                             Content="{TemplateBinding PrimaryButtonText}"
                                             IsDefault="True" />
 
@@ -126,16 +128,16 @@
                                             Grid.Column="2"
                                             HorizontalAlignment="Stretch"
                                             Appearance="{TemplateBinding SecondaryButtonAppearance}"
-                                            Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type controls:MessageBox}}, Path=TemplateButtonCommand, Mode=OneTime}"
-                                            CommandParameter="{x:Static controls:MessageBoxButton.Secondary}"
+                                            Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type messageBoxControl:MessageBox}}, Path=TemplateButtonCommand, Mode=OneTime}"
+                                            CommandParameter="{x:Static messageBoxControl:MessageBoxButton.Secondary}"
                                             Content="{TemplateBinding SecondaryButtonText}" />
 
                                         <controls:Button
                                             Grid.Column="4"
                                             HorizontalAlignment="Stretch"
                                             Appearance="{TemplateBinding CloseButtonAppearance}"
-                                            Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type controls:MessageBox}}, Path=TemplateButtonCommand, Mode=OneTime}"
-                                            CommandParameter="{x:Static controls:MessageBoxButton.Close}"
+                                            Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type messageBoxControl:MessageBox}}, Path=TemplateButtonCommand, Mode=OneTime}"
+                                            CommandParameter="{x:Static messageBoxControl:MessageBoxButton.Close}"
                                             Content="{TemplateBinding CloseButtonText}"
                                             IsCancel="True" />
                                     </Grid>
diff --git a/src/Wpf.Ui/Styles/Controls/NumberBox.xaml b/src/Wpf.Ui/Styles/Controls/NumberBox.xaml
index 3127233e0..dc83391fd 100644
--- a/src/Wpf.Ui/Styles/Controls/NumberBox.xaml
+++ b/src/Wpf.Ui/Styles/Controls/NumberBox.xaml
@@ -12,7 +12,8 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    xmlns:system="clr-namespace:System;assembly=mscorlib">
+    xmlns:system="clr-namespace:System;assembly=mscorlib"
+    xmlns:numberBoxControl="clr-namespace:Wpf.Ui.Controls.NumberBoxControl">
 
     <Thickness x:Key="NumberBoxBorderThemeThickness">1,1,1,0</Thickness>
     <Thickness x:Key="NumberBoxAccentBorderThemeThickness">0,0,0,1</Thickness>
@@ -23,7 +24,7 @@
     <system:Double x:Key="NumberBoxButtonHeight">24</system:Double>
     <system:Double x:Key="NumberBoxButtonIconSize">14</system:Double>
 
-    <Style x:Key="DefaultUiNumberBoxStyle" TargetType="{x:Type controls:NumberBox}">
+    <Style x:Key="DefaultUiNumberBoxStyle" TargetType="{x:Type numberBoxControl:NumberBox}">
         <!--  Universal WPF UI focus  -->
         <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
         <!--  Universal WPF UI focus  -->
@@ -69,7 +70,7 @@
         <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:NumberBox}">
+                <ControlTemplate TargetType="{x:Type numberBoxControl:NumberBox}">
                     <Grid HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
                         <Border
                             x:Name="ContentBorder"
@@ -297,6 +298,6 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultUiNumberBoxStyle}" TargetType="{x:Type controls:NumberBox}" />
+    <Style BasedOn="{StaticResource DefaultUiNumberBoxStyle}" TargetType="{x:Type numberBoxControl:NumberBox}" />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Styles/Controls/ThumbRate.xaml b/src/Wpf.Ui/Styles/Controls/ThumbRate.xaml
index 1571a0ca4..3f66bb57f 100644
--- a/src/Wpf.Ui/Styles/Controls/ThumbRate.xaml
+++ b/src/Wpf.Ui/Styles/Controls/ThumbRate.xaml
@@ -8,9 +8,10 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+    xmlns:thumbRateControl="clr-namespace:Wpf.Ui.Controls.ThumbRateControl">
 
-    <Style x:Key="DefaultUiThumbRateStyle" TargetType="{x:Type controls:ThumbRate}">
+    <Style x:Key="DefaultUiThumbRateStyle" TargetType="{x:Type thumbRateControl:ThumbRate}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Foreground">
             <Setter.Value>
@@ -24,7 +25,7 @@
         <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:ThumbRate}">
+                <ControlTemplate TargetType="{x:Type thumbRateControl:ThumbRate}">
                     <Grid>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
@@ -38,7 +39,7 @@
                             Background="Transparent"
                             BorderBrush="Transparent"
                             Command="{Binding Path=TemplateButtonCommand, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
-                            CommandParameter="{x:Static controls:ThumbRateState.Liked}"
+                            CommandParameter="{x:Static thumbRateControl:ThumbRateState.Liked}"
                             FontSize="{TemplateBinding FontSize}"
                             Icon="ThumbLike24"
                             IconForeground="{TemplateBinding Foreground}" />
@@ -49,7 +50,7 @@
                             Background="Transparent"
                             BorderBrush="Transparent"
                             Command="{Binding Path=TemplateButtonCommand, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
-                            CommandParameter="{x:Static controls:ThumbRateState.Disliked}"
+                            CommandParameter="{x:Static thumbRateControl:ThumbRateState.Disliked}"
                             FontSize="{TemplateBinding FontSize}"
                             Icon="ThumbDislike24"
                             IconForeground="{TemplateBinding Foreground}" />
@@ -67,6 +68,6 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultUiThumbRateStyle}" TargetType="{x:Type controls:ThumbRate}" />
+    <Style BasedOn="{StaticResource DefaultUiThumbRateStyle}" TargetType="{x:Type thumbRateControl:ThumbRate}" />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Styles/Controls/TitleBar.xaml b/src/Wpf.Ui/Styles/Controls/TitleBar.xaml
index 4dd48238b..324c7c2db 100644
--- a/src/Wpf.Ui/Styles/Controls/TitleBar.xaml
+++ b/src/Wpf.Ui/Styles/Controls/TitleBar.xaml
@@ -8,23 +8,24 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+    xmlns:titleBarControl="clr-namespace:Wpf.Ui.Controls.TitleBarControl">
 
-    <Style TargetType="{x:Type controls:TitleBarButton}">
+    <Style TargetType="{x:Type titleBarControl:TitleBarButton}">
         <Setter Property="Width" Value="44" />
         <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="MouseOverBackground" Value="{Binding Path=ButtonsBackground, RelativeSource={RelativeSource AncestorType={x:Type titleBarControl:TitleBar}}}" />
+        <Setter Property="ButtonsForeground" Value="{Binding Path=ButtonsForeground, RelativeSource={RelativeSource AncestorType={x:Type titleBarControl:TitleBar}}}" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="Command" Value="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource AncestorType={x:Type controls:TitleBar}}}" />
+        <Setter Property="Command" Value="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource AncestorType={x:Type titleBarControl:TitleBar}}}" />
         <Setter Property="KeyboardNavigation.IsTabStop" Value="True" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:TitleBarButton}">
+                <ControlTemplate TargetType="{x:Type titleBarControl:TitleBarButton}">
                     <Grid x:Name="LayoutRoot" Background="{TemplateBinding Background}">
                         <Viewbox
                             x:Name="ViewBox"
@@ -47,36 +48,36 @@
                         <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}" />
+                        <Trigger Property="ButtonType" Value="{x:Static titleBarControl:TitleBarButtonType.Help}">
+                            <Setter Property="CommandParameter" Value="{x:Static titleBarControl:TitleBarButtonType.Help}" />
                             <Setter TargetName="ViewBox" Property="Width" Value="13" />
                             <Setter TargetName="ViewBox" Property="Height" Value="13" />
                             <Setter TargetName="Canvas" Property="Width" Value="24" />
                             <Setter TargetName="Canvas" Property="Height" Value="41" />
                             <Setter TargetName="CanvasPath" Property="Data" Value="M20.56,11.57c0-1.19-.24-2.31-.71-3.36-.47-1.05-1.11-1.96-1.92-2.74-.8-.78-1.74-1.4-2.81-1.85-1.07-.45-2.2-.68-3.37-.68s-2.37,.23-3.44,.69c-1.07,.46-2,1.09-2.8,1.88s-1.42,1.73-1.88,2.8c-.46,1.07-.69,2.22-.69,3.44,0,.4-.15,.74-.44,1.03s-.64,.44-1.03,.44c-.49,0-.86-.17-1.1-.52-.25-.34-.37-.74-.37-1.18,0-1.59,.32-3.09,.95-4.49,.63-1.4,1.49-2.62,2.57-3.66,1.08-1.04,2.33-1.86,3.74-2.47,1.42-.6,2.91-.91,4.49-.91s3.07,.3,4.49,.91c1.42,.6,2.66,1.43,3.74,2.47,1.08,1.04,1.93,2.26,2.57,3.66,.63,1.4,.95,2.9,.95,4.49,0,1.24-.13,2.32-.39,3.25-.26,.93-.63,1.77-1.12,2.54-.49,.77-1.08,1.49-1.78,2.18-.7,.69-1.48,1.42-2.35,2.2-.44,.4-.88,.78-1.31,1.16-.43,.38-.84,.78-1.24,1.21-.5,.55-.89,1.08-1.17,1.59-.28,.51-.48,1.03-.62,1.56-.14,.53-.22,1.09-.25,1.69-.03,.6-.05,1.25-.05,1.95,0,.4-.15,.74-.44,1.03-.29,.29-.64,.44-1.03,.44-.34,0-.6-.06-.79-.18-.19-.12-.34-.29-.44-.49-.1-.21-.17-.44-.2-.7-.03-.26-.05-.52-.05-.78v-.78c0-1.21,.15-2.28,.44-3.2,.29-.93,.68-1.76,1.16-2.5,.48-.74,1.03-1.41,1.65-2.02,.62-.6,1.25-1.19,1.89-1.74,.64-.56,1.27-1.11,1.88-1.66,.61-.55,1.16-1.15,1.64-1.8,.48-.65,.87-1.37,1.17-2.16,.3-.79,.45-1.69,.45-2.72Zm-11.02,27.36c0-.61,.21-1.13,.64-1.56,.43-.43,.95-.64,1.56-.64s1.13,.21,1.56,.64c.43,.43,.64,.95,.64,1.56s-.21,1.13-.64,1.56c-.43,.43-.95,.64-1.56,.64s-1.13-.21-1.56-.64c-.43-.43-.64-.95-.64-1.56Z" />
                         </Trigger>
-                        <Trigger Property="ButtonType" Value="{x:Static controls:TitleBarButtonType.Minimize}">
-                            <Setter Property="CommandParameter" Value="{x:Static controls:TitleBarButtonType.Minimize}" />
+                        <Trigger Property="ButtonType" Value="{x:Static titleBarControl:TitleBarButtonType.Minimize}">
+                            <Setter Property="CommandParameter" Value="{x:Static titleBarControl:TitleBarButtonType.Minimize}" />
                             <Setter TargetName="Canvas" Property="Width" Value="72" />
                             <Setter TargetName="Canvas" Property="Height" Value="8" />
                             <Setter TargetName="CanvasPath" Property="Data" Value="M3.59,7.21A3.56,3.56,0,0,1,2.2,6.93a3.66,3.66,0,0,1-1.15-.78A3.88,3.88,0,0,1,.28,5,3.42,3.42,0,0,1,0,3.62,3.45,3.45,0,0,1,.28,2.23a4.12,4.12,0,0,1,.77-1.16A3.52,3.52,0,0,1,2.2.28,3.39,3.39,0,0,1,3.59,0H68.41A3.39,3.39,0,0,1,69.8.28,3.52,3.52,0,0,1,71,1.07a4.12,4.12,0,0,1,.77,1.16A3.45,3.45,0,0,1,72,3.62,3.42,3.42,0,0,1,71.72,5,3.88,3.88,0,0,1,71,6.15a3.66,3.66,0,0,1-1.15.78,3.56,3.56,0,0,1-1.39.28Z" />
                         </Trigger>
-                        <Trigger Property="ButtonType" Value="{x:Static controls:TitleBarButtonType.Restore}">
-                            <Setter Property="CommandParameter" Value="{x:Static controls:TitleBarButtonType.Restore}" />
+                        <Trigger Property="ButtonType" Value="{x:Static titleBarControl:TitleBarButtonType.Restore}">
+                            <Setter Property="CommandParameter" Value="{x:Static titleBarControl:TitleBarButtonType.Restore}" />
                             <Setter TargetName="CanvasPath" Property="Data" Value="M10.62,72a9.92,9.92,0,0,1-4-.86A11.15,11.15,0,0,1,.86,65.43,9.92,9.92,0,0,1,0,61.38V25A9.86,9.86,0,0,1,.86,21,11.32,11.32,0,0,1,3.18,17.6a11,11,0,0,1,3.38-2.32,9.68,9.68,0,0,1,4.06-.87H47a9.84,9.84,0,0,1,4.08.87A11,11,0,0,1,56.72,21,9.84,9.84,0,0,1,57.59,25V61.38a9.68,9.68,0,0,1-.87,4.06,11,11,0,0,1-2.32,3.38A11.32,11.32,0,0,1,51,71.14,9.86,9.86,0,0,1,47,72Zm36.17-7.21a3.39,3.39,0,0,0,1.39-.28,3.79,3.79,0,0,0,1.16-.77,3.47,3.47,0,0,0,1.07-2.53v-36a3.55,3.55,0,0,0-.28-1.41,3.51,3.51,0,0,0-.77-1.16,3.67,3.67,0,0,0-1.16-.77,3.55,3.55,0,0,0-1.41-.28h-36a3.45,3.45,0,0,0-1.39.28,3.59,3.59,0,0,0-1.14.79,3.79,3.79,0,0,0-.77,1.16,3.39,3.39,0,0,0-.28,1.39v36a3.45,3.45,0,0,0,.28,1.39A3.62,3.62,0,0,0,9.4,64.51a3.45,3.45,0,0,0,1.39.28Zm18-43.45a13.14,13.14,0,0,0-1.16-5.5,14.41,14.41,0,0,0-3.14-4.5,15,15,0,0,0-4.61-3,14.14,14.14,0,0,0-5.5-1.1H15A10.73,10.73,0,0,1,21.88.51,10.93,10.93,0,0,1,25.21,0H50.38a20.82,20.82,0,0,1,8.4,1.71A21.72,21.72,0,0,1,70.29,13.18,20.91,20.91,0,0,1,72,21.59v25.2a10.93,10.93,0,0,1-.51,3.33A10.71,10.71,0,0,1,70,53.05a10.84,10.84,0,0,1-2.28,2.36,10.66,10.66,0,0,1-3,1.58Z" />
                         </Trigger>
-                        <Trigger Property="ButtonType" Value="{x:Static controls:TitleBarButtonType.Maximize}">
-                            <Setter Property="CommandParameter" Value="{x:Static controls:TitleBarButtonType.Maximize}" />
+                        <Trigger Property="ButtonType" Value="{x:Static titleBarControl:TitleBarButtonType.Maximize}">
+                            <Setter Property="CommandParameter" Value="{x:Static titleBarControl:TitleBarButtonType.Maximize}" />
                             <Setter TargetName="CanvasPath" Property="Data" Value="M10.62,72a9.92,9.92,0,0,1-4-.86A11.15,11.15,0,0,1,.86,65.43,9.92,9.92,0,0,1,0,61.38V10.62a9.92,9.92,0,0,1,.86-4A11.15,11.15,0,0,1,6.57.86a9.92,9.92,0,0,1,4-.86H61.38a9.92,9.92,0,0,1,4.05.86,11.15,11.15,0,0,1,5.71,5.71,9.92,9.92,0,0,1,.86,4V61.38a9.92,9.92,0,0,1-.86,4.05,11.15,11.15,0,0,1-5.71,5.71,9.92,9.92,0,0,1-4.05.86Zm50.59-7.21a3.45,3.45,0,0,0,1.39-.28,3.62,3.62,0,0,0,1.91-1.91,3.45,3.45,0,0,0,.28-1.39V10.79a3.45,3.45,0,0,0-.28-1.39A3.62,3.62,0,0,0,62.6,7.49a3.45,3.45,0,0,0-1.39-.28H10.79a3.45,3.45,0,0,0-1.39.28A3.62,3.62,0,0,0,7.49,9.4a3.45,3.45,0,0,0-.28,1.39V61.21a3.45,3.45,0,0,0,.28,1.39A3.62,3.62,0,0,0,9.4,64.51a3.45,3.45,0,0,0,1.39.28Z" />
                         </Trigger>
-                        <Trigger Property="ButtonType" Value="{x:Static controls:TitleBarButtonType.Close}">
-                            <Setter Property="CommandParameter" Value="{x:Static controls:TitleBarButtonType.Close}" />
+                        <Trigger Property="ButtonType" Value="{x:Static titleBarControl:TitleBarButtonType.Close}">
+                            <Setter Property="CommandParameter" Value="{x:Static titleBarControl: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="ButtonType" Value="{x:Static titleBarControl:TitleBarButtonType.Close}" />
                                 <Condition Property="IsMouseOver" Value="True" />
                             </MultiTrigger.Conditions>
                             <Setter Property="Foreground" Value="#FFFFFFFF" />
@@ -87,7 +88,7 @@
         </Setter>
     </Style>
 
-    <Style TargetType="{x:Type controls:TitleBar}">
+    <Style TargetType="{x:Type titleBarControl:TitleBar}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Foreground">
             <Setter.Value>
@@ -114,7 +115,7 @@
         <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:TitleBar}">
+                <ControlTemplate TargetType="{x:Type titleBarControl:TitleBar}">
                     <Grid
                         x:Name="PART_MainGrid"
                         HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
@@ -172,22 +173,22 @@
                                     <ColumnDefinition Width="Auto" />
                                 </Grid.ColumnDefinitions>
 
-                                <controls:TitleBarButton
+                                <titleBarControl:TitleBarButton
                                     x:Name="PART_HelpButton"
                                     Grid.Column="0"
                                     ButtonType="Help" />
 
-                                <controls:TitleBarButton
+                                <titleBarControl:TitleBarButton
                                     x:Name="PART_MinimizeButton"
                                     Grid.Column="1"
                                     ButtonType="Minimize" />
 
-                                <controls:TitleBarButton
+                                <titleBarControl:TitleBarButton
                                     x:Name="PART_MaximizeButton"
                                     Grid.Column="2"
                                     ButtonType="Maximize" />
 
-                                <controls:TitleBarButton
+                                <titleBarControl:TitleBarButton
                                     x:Name="PART_CloseButton"
                                     Grid.Column="4"
                                     ButtonType="Close"
diff --git a/src/Wpf.Ui/Styles/Controls/TreeGrid.xaml b/src/Wpf.Ui/Styles/Controls/TreeGrid.xaml
index 8334d011a..0edffbe0d 100644
--- a/src/Wpf.Ui/Styles/Controls/TreeGrid.xaml
+++ b/src/Wpf.Ui/Styles/Controls/TreeGrid.xaml
@@ -9,13 +9,14 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    xmlns:converters="clr-namespace:Wpf.Ui.Converters">
+    xmlns:converters="clr-namespace:Wpf.Ui.Converters"
+    xmlns:treeGridControl="clr-namespace:Wpf.Ui.Controls.TreeGridControl">
 
-    <Style TargetType="{x:Type controls:TreeGridItem}">
+    <Style TargetType="{x:Type treeGridControl:TreeGridItem}">
         <Setter Property="Margin" Value="0" />
     </Style>
 
-    <Style TargetType="{x:Type controls:TreeGrid}">
+    <Style TargetType="{x:Type treeGridControl:TreeGrid}">
         <Setter Property="Margin" Value="0" />
         <Setter Property="Padding" Value="0" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
@@ -37,7 +38,7 @@
         </Setter>
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:TreeGrid}">
+                <ControlTemplate TargetType="{x:Type treeGridControl:TreeGrid}">
                     <Grid>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
diff --git a/src/Wpf.Ui/Styles/Controls/VirtualizingGridView.xaml b/src/Wpf.Ui/Styles/Controls/VirtualizingGridView.xaml
index c013f1b85..0f7504829 100644
--- a/src/Wpf.Ui/Styles/Controls/VirtualizingGridView.xaml
+++ b/src/Wpf.Ui/Styles/Controls/VirtualizingGridView.xaml
@@ -8,9 +8,10 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+    xmlns:virtualizingControls="clr-namespace:Wpf.Ui.Controls.VirtualizingControls">
 
-    <Style TargetType="{x:Type controls:VirtualizingGridView}">
+    <Style TargetType="{x:Type virtualizingControls:VirtualizingGridView}">
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
         <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
@@ -22,7 +23,7 @@
         <Setter Property="ItemsPanel">
             <Setter.Value>
                 <ItemsPanelTemplate>
-                    <controls:VirtualizingWrapPanel
+                    <virtualizingControls:VirtualizingWrapPanel
                         IsVirtualizing="{TemplateBinding VirtualizingPanel.IsVirtualizing}"
                         Orientation="Vertical"
                         SpacingMode="StartAndEndOnly"
@@ -33,7 +34,7 @@
         </Setter>
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:VirtualizingGridView}">
+                <ControlTemplate TargetType="{x:Type virtualizingControls:VirtualizingGridView}">
                     <Grid>
                         <ScrollViewer x:Name="PART_ContentHost">
                             <ItemsPresenter />
diff --git a/src/Wpf.Ui/Styles/Controls/VirtualizingItemsControl.xaml b/src/Wpf.Ui/Styles/Controls/VirtualizingItemsControl.xaml
index 3d5012d4c..43b6e5764 100644
--- a/src/Wpf.Ui/Styles/Controls/VirtualizingItemsControl.xaml
+++ b/src/Wpf.Ui/Styles/Controls/VirtualizingItemsControl.xaml
@@ -8,9 +8,10 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+    xmlns:virtualizingControls="clr-namespace:Wpf.Ui.Controls.VirtualizingControls">
 
-    <Style TargetType="{x:Type controls:VirtualizingItemsControl}">
+    <Style TargetType="{x:Type virtualizingControls:VirtualizingItemsControl}">
         <Setter Property="Margin" Value="0" />
         <Setter Property="Padding" Value="0" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
@@ -23,7 +24,7 @@
         <Setter Property="ItemsPanel">
             <Setter.Value>
                 <ItemsPanelTemplate>
-                    <controls:VirtualizingWrapPanel
+                    <virtualizingControls:VirtualizingWrapPanel
                         IsVirtualizing="{TemplateBinding VirtualizingPanel.IsVirtualizing}"
                         Orientation="Vertical"
                         SpacingMode="StartAndEndOnly"
@@ -34,7 +35,7 @@
         </Setter>
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:VirtualizingItemsControl}">
+                <ControlTemplate TargetType="{x:Type virtualizingControls:VirtualizingItemsControl}">
                     <ScrollViewer
                         CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
                         Focusable="False"
diff --git a/src/Wpf.Ui/Styles/Controls/VirtualizingWrapPanel.xaml b/src/Wpf.Ui/Styles/Controls/VirtualizingWrapPanel.xaml
index ba601b0ee..7a8313ec8 100644
--- a/src/Wpf.Ui/Styles/Controls/VirtualizingWrapPanel.xaml
+++ b/src/Wpf.Ui/Styles/Controls/VirtualizingWrapPanel.xaml
@@ -8,9 +8,10 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+    xmlns:virtualizingControls="clr-namespace:Wpf.Ui.Controls.VirtualizingControls">
 
-    <Style TargetType="{x:Type controls:VirtualizingWrapPanel}">
+    <Style TargetType="{x:Type virtualizingControls:VirtualizingWrapPanel}">
         <Setter Property="Margin" Value="0" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
diff --git a/src/Wpf.Ui/VisualStudioToolsManifest.xml b/src/Wpf.Ui/VisualStudioToolsManifest.xml
index b199f28ca..d18260ffe 100644
--- a/src/Wpf.Ui/VisualStudioToolsManifest.xml
+++ b/src/Wpf.Ui/VisualStudioToolsManifest.xml
@@ -6,8 +6,9 @@
             <Item Type="Wpf.Ui.Controls.AutoSuggestBox" />
             <Item Type="Wpf.Ui.Controls.Badge" />
             <Item Type="Wpf.Ui.Controls.Button" />
-            <Item Type="Wpf.Ui.Controls.BreadcrumbBar" />
-            <Item Type="Wpf.Ui.Controls.BreadcrumbBarItem" />
+            <Item Type="Wpf.Ui.Controls.BreadcrumbControl.BreadcrumbBar" />
+            <Item Type="Wpf.Ui.Controls.BreadcrumbControl.BreadcrumbBarItem" />
+            <Item Type="Wpf.Ui.Controls.ContentDialogControl.BreadcrumbBar" />
             <Item Type="Wpf.Ui.Controls.Card" />
             <Item Type="Wpf.Ui.Controls.CardAction" />
             <Item Type="Wpf.Ui.Controls.CardColor" />
@@ -15,7 +16,6 @@
             <Item Type="Wpf.Ui.Controls.CardExpander" />
             <Item Type="Wpf.Ui.Controls.ClientAreaBorder" />
             <Item Type="Wpf.Ui.Controls.CodeBlock" />
-            <Item Type="Wpf.Ui.Controls.Dialog" />
             <Item Type="Wpf.Ui.Controls.DropDownButton" />
             <Item Type="Wpf.Ui.Controls.DynamicScrollBar" />
             <Item Type="Wpf.Ui.Controls.DynamicScrollViewer" />
@@ -23,7 +23,7 @@
             <Item Type="Wpf.Ui.Controls.FontIcon" />
             <Item Type="Wpf.Ui.Controls.Hyperlink" />
             <Item Type="Wpf.Ui.Controls.MenuItem" />
-            <Item Type="Wpf.Ui.Controls.MessageBox" />
+            <Item Type="Wpf.Ui.Controls.MessageBoxControl.MessageBox" />
             <Item Type="Wpf.Ui.Controls.Navigation.NavigationView" />
             <Item Type="Wpf.Ui.Controls.Navigation.NavigationViewItem" />
             <Item Type="Wpf.Ui.Controls.Navigation.NavigationViewItemHeader" />
@@ -31,20 +31,20 @@
             <Item Type="Wpf.Ui.Controls.Navigation.NavigationViewBreadcrumb" />
             <Item Type="Wpf.Ui.Controls.Navigation.NavigationViewContentPresenter" />
             <Item Type="Wpf.Ui.Controls.NotifyIcon" />
-            <Item Type="Wpf.Ui.Controls.NumberBox" />
+            <Item Type="Wpf.Ui.Controls.NumberBoxControl.NumberBox" />
             <Item Type="Wpf.Ui.Controls.PasswordBox" />
             <Item Type="Wpf.Ui.Controls.ProgressRing" />
             <Item Type="Wpf.Ui.Controls.RatingControl" />
             <Item Type="Wpf.Ui.Controls.Snackbar" />
             <Item Type="Wpf.Ui.Controls.SymbolIcon" />
             <Item Type="Wpf.Ui.Controls.TextBox" />
-            <Item Type="Wpf.Ui.Controls.ThumbRate" />
-            <Item Type="Wpf.Ui.Controls.TitleBar" />
+            <Item Type="Wpf.Ui.Controls.ThumbRateControl.ThumbRate" />
+            <Item Type="Wpf.Ui.Controls.TitleBarControl.TitleBar" />
             <Item Type="Wpf.Ui.Controls.ToggleSwitch" />
             <Item Type="Wpf.Ui.Controls.Window.FluentWindow" />
-            <Item Type="Wpf.Ui.Controls.VirtualizingItemsControl" />
-            <Item Type="Wpf.Ui.Controls.VirtualizingUniformGrid" />
-            <Item Type="Wpf.Ui.Controls.VirtualizingWrapPanel" />
+            <Item Type="Wpf.Ui.Controls.VirtualizingControls.VirtualizingItemsControl" />
+            <Item Type="Wpf.Ui.Controls.VirtualizingControls.VirtualizingUniformGrid" />
+            <Item Type="Wpf.Ui.Controls.VirtualizingControls.VirtualizingWrapPanel" />
         </ToolboxItems>
     </File>
-</FileList>
\ No newline at end of file
+</FileList>
diff --git a/src/Wpf.Ui/Wpf.Ui.csproj b/src/Wpf.Ui/Wpf.Ui.csproj
index adfb2f1a2..9d349a5e9 100644
--- a/src/Wpf.Ui/Wpf.Ui.csproj
+++ b/src/Wpf.Ui/Wpf.Ui.csproj
@@ -104,17 +104,17 @@
     <EmbeddedResource Include="Controls\CodeBlock.bmp" />
     <EmbeddedResource Include="Controls\DynamicScrollBar.bmp" />
     <EmbeddedResource Include="Controls\DynamicScrollViewer.bmp" />
-    <EmbeddedResource Include="Controls\MessageBox\MessageBox.bmp" />
+    <EmbeddedResource Include="Controls\MessageBoxControl\MessageBox.bmp" />
     <EmbeddedResource Include="Controls\FontIcon.bmp" />
     <EmbeddedResource Include="Controls\Navigation\NavigationView.bmp" />
     <EmbeddedResource Include="Controls\Navigation\NavigationViewItem.bmp" />
     <EmbeddedResource Include="Controls\NotifyIcon.bmp" />
-    <EmbeddedResource Include="Controls\NumberBox\NumberBox.bmp" />
+    <EmbeddedResource Include="Controls\NumberBoxControl\NumberBox.bmp" />
     <EmbeddedResource Include="Controls\ProgressRing.bmp" />
     <EmbeddedResource Include="Controls\RatingControl.bmp" />
     <EmbeddedResource Include="Controls\Snackbar.bmp" />
     <EmbeddedResource Include="Controls\SymbolIcon.bmp" />
-    <EmbeddedResource Include="Controls\ThumbRate\ThumbRate.bmp" />
+    <EmbeddedResource Include="Controls\ThumbRateControl\ThumbRate.bmp" />
     <EmbeddedResource Include="Controls\ToggleSwitch.bmp" />
     <EmbeddedResource Include="Controls\Window\FluentWindow.bmp" />
     <EmbeddedResource Include="Controls\VirtualizingControls\VirtualizingItemsControl.bmp" />