From 982230a7a0f4999b0a450963269fac254671becb Mon Sep 17 00:00:00 2001
From: Chris Pulman <chris.pulman@yahoo.com>
Date: Fri, 2 Aug 2024 14:26:09 +0100
Subject: [PATCH] Fix Inability To Have Custom Font Sizes

---
 .../Views/Pages/DashboardPage.xaml            | 11 ++++++++++
 .../Appearance/ApplicationThemeManager.cs     |  2 +-
 .../AutoSuggestBox/AutoSuggestBox.xaml        |  2 +-
 .../Controls/Button/Button.xaml               |  4 ++--
 src/CrissCross.WPF.UI/Controls/Card/Card.xaml |  2 +-
 .../Controls/CardAction/CardAction.xaml       |  2 +-
 .../Controls/CardControl/CardControl.xaml     |  2 +-
 .../Controls/CardExpander/CardExpander.xaml   |  2 +-
 .../Controls/CheckBox/CheckBox.xaml           |  2 +-
 .../Controls/ComboBox/ComboBox.xaml           |  2 +-
 .../Controls/ContentDialog/ContentDialog.xaml |  4 ++--
 .../Controls/DataGrid/DataGrid.xaml           |  4 ++--
 .../Controls/DatePicker/DatePicker.xaml       |  2 +-
 .../Controls/Expander/Expander.xaml           |  2 +-
 .../FluentNavigationWindow.xaml               |  2 +-
 .../Controls/FluentWindow/FluentWindow.xaml   |  2 +-
 .../HyperlinkButton/HyperlinkButton.xaml      |  2 +-
 .../Controls/InfoBar/InfoBar.xaml             |  2 +-
 .../Controls/ListBox/ListBox.xaml             |  2 +-
 .../Controls/ModernWindow/ModernWindow.xaml   |  2 +-
 .../NavigationViewBasePaneButtonStyle.xaml    |  2 +-
 .../Controls/NumberBox/NumberBox.xaml         |  2 +-
 .../Controls/PasswordBox/PasswordBox.xaml     |  4 ++--
 .../Controls/RadioButton/RadioButton.xaml     |  2 +-
 .../Controls/RichTextBox/RichTextBox.xaml     |  2 +-
 .../Controls/TextBlock/TextBlock.xaml         |  2 +-
 .../Controls/TextBox/TextBox.xaml             |  4 ++--
 .../Controls/ThumbRate/ThumbRate.xaml         |  2 +-
 .../Controls/TimePicker/TimePicker.xaml       |  2 +-
 .../Controls/TitleBar/TitleBar.xaml           |  2 +-
 .../Controls/ToggleButton/ToggleButton.xaml   |  2 +-
 .../Controls/ToggleSwitch/ToggleSwitch.xaml   |  2 +-
 .../Controls/TreeView/TreeViewItem.xaml       | 20 +++++++++++++++++--
 .../Controls/Window/Window.xaml               |  2 +-
 .../Resources/Typography.xaml                 |  4 ++--
 .../Resources/Variables.xaml                  |  2 +-
 36 files changed, 69 insertions(+), 42 deletions(-)

diff --git a/src/CrissCross.WPF.UI.Test/Views/Pages/DashboardPage.xaml b/src/CrissCross.WPF.UI.Test/Views/Pages/DashboardPage.xaml
index 1dc031d..b4edfe9 100644
--- a/src/CrissCross.WPF.UI.Test/Views/Pages/DashboardPage.xaml
+++ b/src/CrissCross.WPF.UI.Test/Views/Pages/DashboardPage.xaml
@@ -62,6 +62,7 @@
         <ui:CheckBoxModern
             Grid.Row="1"
             Grid.Column="2"
+            FontSize="20"
             Text="I Am A Modern CheckBox" />
         <ui:CheckBox
             Grid.Row="1"
@@ -88,5 +89,15 @@
             Height="312"
             AnimateInDesignMode="True"
             Source="/Assets/working.gif" />
+        <ui:TreeView
+            Grid.Row="3"
+            Grid.Column="3"
+            FontSize="28">
+            <ui:TreeViewItem Header="Hello">
+                <ui:TreeViewItem Header="World1" />
+                <ui:TreeViewItem Header="World2" />
+            </ui:TreeViewItem>
+        </ui:TreeView>
+
     </ui:Grid>
 </ui:Page>
diff --git a/src/CrissCross.WPF.UI/Appearance/ApplicationThemeManager.cs b/src/CrissCross.WPF.UI/Appearance/ApplicationThemeManager.cs
index cef91a4..123900c 100644
--- a/src/CrissCross.WPF.UI/Appearance/ApplicationThemeManager.cs
+++ b/src/CrissCross.WPF.UI/Appearance/ApplicationThemeManager.cs
@@ -30,7 +30,7 @@ namespace CrissCross.WPF.UI.Appearance;
 /// </example>
 public static class ApplicationThemeManager
 {
-    internal const string LibraryNamespace = "wpf.ui;";
+    internal const string LibraryNamespace = "crisscross.wpf.ui;";
 
     internal const string ThemesDictionaryPath = "pack://application:,,,/CrissCross.WPF.UI;component/Resources/Theme/";
     private static ApplicationTheme _cachedApplicationTheme = ApplicationTheme.Unknown;
diff --git a/src/CrissCross.WPF.UI/Controls/AutoSuggestBox/AutoSuggestBox.xaml b/src/CrissCross.WPF.UI/Controls/AutoSuggestBox/AutoSuggestBox.xaml
index ba4a8f9..a04dabc 100644
--- a/src/CrissCross.WPF.UI/Controls/AutoSuggestBox/AutoSuggestBox.xaml
+++ b/src/CrissCross.WPF.UI/Controls/AutoSuggestBox/AutoSuggestBox.xaml
@@ -100,7 +100,7 @@
         <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
         <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="BorderThickness" Value="{StaticResource AutoSuggestBoxBorderThemeThickness}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="ItemContainerStyle" Value="{StaticResource DefaultAutoSuggestBoxItemContainerStyle}" />
         <Setter Property="OverridesDefaultStyle" Value="True" />
diff --git a/src/CrissCross.WPF.UI/Controls/Button/Button.xaml b/src/CrissCross.WPF.UI/Controls/Button/Button.xaml
index af726f3..52a5b44 100644
--- a/src/CrissCross.WPF.UI/Controls/Button/Button.xaml
+++ b/src/CrissCross.WPF.UI/Controls/Button/Button.xaml
@@ -20,7 +20,7 @@
         <Setter Property="VerticalAlignment" Value="Stretch" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -89,7 +89,7 @@
         <Setter Property="VerticalAlignment" Value="Stretch" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="Appearance" Value="Secondary" />
diff --git a/src/CrissCross.WPF.UI/Controls/Card/Card.xaml b/src/CrissCross.WPF.UI/Controls/Card/Card.xaml
index 4ad30ec..cf822a7 100644
--- a/src/CrissCross.WPF.UI/Controls/Card/Card.xaml
+++ b/src/CrissCross.WPF.UI/Controls/Card/Card.xaml
@@ -16,7 +16,7 @@
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="Focusable" Value="False" />
diff --git a/src/CrissCross.WPF.UI/Controls/CardAction/CardAction.xaml b/src/CrissCross.WPF.UI/Controls/CardAction/CardAction.xaml
index b65d88c..b2f152f 100644
--- a/src/CrissCross.WPF.UI/Controls/CardAction/CardAction.xaml
+++ b/src/CrissCross.WPF.UI/Controls/CardAction/CardAction.xaml
@@ -24,7 +24,7 @@
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
diff --git a/src/CrissCross.WPF.UI/Controls/CardControl/CardControl.xaml b/src/CrissCross.WPF.UI/Controls/CardControl/CardControl.xaml
index e5065e0..7cd66ae 100644
--- a/src/CrissCross.WPF.UI/Controls/CardControl/CardControl.xaml
+++ b/src/CrissCross.WPF.UI/Controls/CardControl/CardControl.xaml
@@ -23,7 +23,7 @@
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
diff --git a/src/CrissCross.WPF.UI/Controls/CardExpander/CardExpander.xaml b/src/CrissCross.WPF.UI/Controls/CardExpander/CardExpander.xaml
index 9f6b6f4..4b9a231 100644
--- a/src/CrissCross.WPF.UI/Controls/CardExpander/CardExpander.xaml
+++ b/src/CrissCross.WPF.UI/Controls/CardExpander/CardExpander.xaml
@@ -84,7 +84,7 @@
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="IsExpanded" Value="False" />
diff --git a/src/CrissCross.WPF.UI/Controls/CheckBox/CheckBox.xaml b/src/CrissCross.WPF.UI/Controls/CheckBox/CheckBox.xaml
index 2f2fb73..153a90c 100644
--- a/src/CrissCross.WPF.UI/Controls/CheckBox/CheckBox.xaml
+++ b/src/CrissCross.WPF.UI/Controls/CheckBox/CheckBox.xaml
@@ -38,7 +38,7 @@
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="KeyboardNavigation.IsTabStop" Value="True" />
         <Setter Property="Focusable" Value="True" />
diff --git a/src/CrissCross.WPF.UI/Controls/ComboBox/ComboBox.xaml b/src/CrissCross.WPF.UI/Controls/ComboBox/ComboBox.xaml
index 50b7c8d..d90f922 100644
--- a/src/CrissCross.WPF.UI/Controls/ComboBox/ComboBox.xaml
+++ b/src/CrissCross.WPF.UI/Controls/ComboBox/ComboBox.xaml
@@ -144,7 +144,7 @@
         <Setter Property="Background" Value="{DynamicResource ComboBoxBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
         <Setter Property="BorderThickness" Value="{StaticResource ComboBoxBorderThemeThickness}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
diff --git a/src/CrissCross.WPF.UI/Controls/ContentDialog/ContentDialog.xaml b/src/CrissCross.WPF.UI/Controls/ContentDialog/ContentDialog.xaml
index 7ed5a9d..10803e9 100644
--- a/src/CrissCross.WPF.UI/Controls/ContentDialog/ContentDialog.xaml
+++ b/src/CrissCross.WPF.UI/Controls/ContentDialog/ContentDialog.xaml
@@ -16,7 +16,7 @@
         <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="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="Border.CornerRadius" Value="{DynamicResource PopupCornerRadius}" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="DialogMaxHeight" Value="850" />
@@ -105,7 +105,7 @@
                                                 <Style BasedOn="{StaticResource {x:Type TextBlock}}" TargetType="{x:Type TextBlock}">
                                                     <Setter Property="TextWrapping" Value="WrapWithOverflow" />
                                                     <Setter Property="TextAlignment" Value="Justify" />
-                                                    <Setter Property="FontSize" Value="14" />
+                                                    <!--<Setter Property="FontSize" Value="14" />-->
                                                 </Style>
                                             </ContentPresenter.Resources>
                                         </ContentPresenter>
diff --git a/src/CrissCross.WPF.UI/Controls/DataGrid/DataGrid.xaml b/src/CrissCross.WPF.UI/Controls/DataGrid/DataGrid.xaml
index 6cf79eb..2d17632 100644
--- a/src/CrissCross.WPF.UI/Controls/DataGrid/DataGrid.xaml
+++ b/src/CrissCross.WPF.UI/Controls/DataGrid/DataGrid.xaml
@@ -626,7 +626,7 @@
         <Setter Property="HorizontalGridLinesBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
         <Setter Property="VerticalGridLinesBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="FontSize" Value="{StaticResource DefaultDataGridFontSize}" />
+        <!--<Setter Property="FontSize" Value="{StaticResource DefaultDataGridFontSize}" />-->
         <Setter Property="RowDetailsVisibilityMode" Value="VisibleWhenSelected" />
         <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
         <Setter Property="ScrollViewer.PanningMode" Value="Both" />
@@ -768,7 +768,7 @@
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="KeyboardNavigation.IsTabStop" Value="True" />
         <Setter Property="Focusable" Value="True" />
diff --git a/src/CrissCross.WPF.UI/Controls/DatePicker/DatePicker.xaml b/src/CrissCross.WPF.UI/Controls/DatePicker/DatePicker.xaml
index 6c3bce7..ec6447e 100644
--- a/src/CrissCross.WPF.UI/Controls/DatePicker/DatePicker.xaml
+++ b/src/CrissCross.WPF.UI/Controls/DatePicker/DatePicker.xaml
@@ -67,7 +67,7 @@
         </Setter>
         <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
         <Setter Property="BorderThickness" Value="{StaticResource DatePickerBorderThemeThickness}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
diff --git a/src/CrissCross.WPF.UI/Controls/Expander/Expander.xaml b/src/CrissCross.WPF.UI/Controls/Expander/Expander.xaml
index 54a43c3..7b0ed4c 100644
--- a/src/CrissCross.WPF.UI/Controls/Expander/Expander.xaml
+++ b/src/CrissCross.WPF.UI/Controls/Expander/Expander.xaml
@@ -80,7 +80,7 @@
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="IsExpanded" Value="False" />
diff --git a/src/CrissCross.WPF.UI/Controls/FluentNavigationWindow/FluentNavigationWindow.xaml b/src/CrissCross.WPF.UI/Controls/FluentNavigationWindow/FluentNavigationWindow.xaml
index 5667c75..0b91cdb 100644
--- a/src/CrissCross.WPF.UI/Controls/FluentNavigationWindow/FluentNavigationWindow.xaml
+++ b/src/CrissCross.WPF.UI/Controls/FluentNavigationWindow/FluentNavigationWindow.xaml
@@ -18,7 +18,7 @@
         <Setter Property="MinWidth" Value="518" />
         <Setter Property="Margin" Value="0" />
         <Setter Property="Padding" Value="0" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="UseLayoutRounding" Value="True" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
diff --git a/src/CrissCross.WPF.UI/Controls/FluentWindow/FluentWindow.xaml b/src/CrissCross.WPF.UI/Controls/FluentWindow/FluentWindow.xaml
index 61b35fd..81b6e40 100644
--- a/src/CrissCross.WPF.UI/Controls/FluentWindow/FluentWindow.xaml
+++ b/src/CrissCross.WPF.UI/Controls/FluentWindow/FluentWindow.xaml
@@ -18,7 +18,7 @@
         <Setter Property="MinWidth" Value="518" />
         <Setter Property="Margin" Value="0" />
         <Setter Property="Padding" Value="0" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="UseLayoutRounding" Value="True" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
diff --git a/src/CrissCross.WPF.UI/Controls/HyperlinkButton/HyperlinkButton.xaml b/src/CrissCross.WPF.UI/Controls/HyperlinkButton/HyperlinkButton.xaml
index 3c6e626..f16161a 100644
--- a/src/CrissCross.WPF.UI/Controls/HyperlinkButton/HyperlinkButton.xaml
+++ b/src/CrissCross.WPF.UI/Controls/HyperlinkButton/HyperlinkButton.xaml
@@ -20,7 +20,7 @@
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="Appearance" Value="Secondary" />
diff --git a/src/CrissCross.WPF.UI/Controls/InfoBar/InfoBar.xaml b/src/CrissCross.WPF.UI/Controls/InfoBar/InfoBar.xaml
index e0e98fb..e078bec 100644
--- a/src/CrissCross.WPF.UI/Controls/InfoBar/InfoBar.xaml
+++ b/src/CrissCross.WPF.UI/Controls/InfoBar/InfoBar.xaml
@@ -20,7 +20,7 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="BorderBrush" Value="{DynamicResource InfoBarBorderBrush}" />
         <Setter Property="BorderThickness" Value="{StaticResource InfoBarBorderThemeThickness}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="Focusable" Value="False" />
diff --git a/src/CrissCross.WPF.UI/Controls/ListBox/ListBox.xaml b/src/CrissCross.WPF.UI/Controls/ListBox/ListBox.xaml
index 5be64e6..256a2c5 100644
--- a/src/CrissCross.WPF.UI/Controls/ListBox/ListBox.xaml
+++ b/src/CrissCross.WPF.UI/Controls/ListBox/ListBox.xaml
@@ -7,7 +7,7 @@
         <Setter Property="Margin" Value="0" />
         <Setter Property="Padding" Value="0" />
         <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="FontSize" Value="14" />
+        <!--<Setter Property="FontSize" Value="14" />-->
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
         <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
diff --git a/src/CrissCross.WPF.UI/Controls/ModernWindow/ModernWindow.xaml b/src/CrissCross.WPF.UI/Controls/ModernWindow/ModernWindow.xaml
index e3cb9a1..15fbbe7 100644
--- a/src/CrissCross.WPF.UI/Controls/ModernWindow/ModernWindow.xaml
+++ b/src/CrissCross.WPF.UI/Controls/ModernWindow/ModernWindow.xaml
@@ -15,7 +15,7 @@
     <Style TargetType="{x:Type rxNav:ModernWindow}">
         <Setter Property="BackgroundContent" Value="{DynamicResource WindowBackgroundContent}" />
         <Setter Property="FontFamily" Value="{DynamicResource DefaultFontFamily}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="Foreground" Value="{DynamicResource WindowForeground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource WindowBorder}" />
diff --git a/src/CrissCross.WPF.UI/Controls/NavigationView/NavigationViewBasePaneButtonStyle.xaml b/src/CrissCross.WPF.UI/Controls/NavigationView/NavigationViewBasePaneButtonStyle.xaml
index c3cadfe..1290700 100644
--- a/src/CrissCross.WPF.UI/Controls/NavigationView/NavigationViewBasePaneButtonStyle.xaml
+++ b/src/CrissCross.WPF.UI/Controls/NavigationView/NavigationViewBasePaneButtonStyle.xaml
@@ -11,7 +11,7 @@
         <Setter Property="Foreground" Value="{DynamicResource ButtonForeground}" />
         <Setter Property="BorderBrush" Value="Transparent" />
         <Setter Property="BorderThickness" Value="{StaticResource PaneToggleButtonThickness}" />
-        <Setter Property="FontSize" Value="16" />
+        <!--<Setter Property="FontSize" Value="16" />-->
         <Setter Property="MinHeight" Value="{StaticResource PaneToggleButtonHeight}" />
         <Setter Property="MinWidth" Value="{StaticResource PaneToggleButtonWidth}" />
         <Setter Property="Padding" Value="10" />
diff --git a/src/CrissCross.WPF.UI/Controls/NumberBox/NumberBox.xaml b/src/CrissCross.WPF.UI/Controls/NumberBox/NumberBox.xaml
index cecbae7..c3fcb33 100644
--- a/src/CrissCross.WPF.UI/Controls/NumberBox/NumberBox.xaml
+++ b/src/CrissCross.WPF.UI/Controls/NumberBox/NumberBox.xaml
@@ -25,7 +25,7 @@
         <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource TextControlElevationBorderBrush}" />
         <Setter Property="BorderThickness" Value="{StaticResource NumberBoxBorderThemeThickness}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
diff --git a/src/CrissCross.WPF.UI/Controls/PasswordBox/PasswordBox.xaml b/src/CrissCross.WPF.UI/Controls/PasswordBox/PasswordBox.xaml
index 3e18011..95fb03d 100644
--- a/src/CrissCross.WPF.UI/Controls/PasswordBox/PasswordBox.xaml
+++ b/src/CrissCross.WPF.UI/Controls/PasswordBox/PasswordBox.xaml
@@ -29,7 +29,7 @@
         <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource TextControlElevationBorderBrush}" />
         <Setter Property="BorderThickness" Value="{StaticResource PasswordBoxBorderThemeThickness}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
@@ -115,7 +115,7 @@
         <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource TextControlElevationBorderBrush}" />
         <Setter Property="BorderThickness" Value="{StaticResource PasswordBoxBorderThemeThickness}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
diff --git a/src/CrissCross.WPF.UI/Controls/RadioButton/RadioButton.xaml b/src/CrissCross.WPF.UI/Controls/RadioButton/RadioButton.xaml
index 23eab88..7041e25 100644
--- a/src/CrissCross.WPF.UI/Controls/RadioButton/RadioButton.xaml
+++ b/src/CrissCross.WPF.UI/Controls/RadioButton/RadioButton.xaml
@@ -25,7 +25,7 @@
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="VerticalContentAlignment" Value="Top" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="MinWidth" Value="120" />
         <Setter Property="KeyboardNavigation.IsTabStop" Value="True" />
diff --git a/src/CrissCross.WPF.UI/Controls/RichTextBox/RichTextBox.xaml b/src/CrissCross.WPF.UI/Controls/RichTextBox/RichTextBox.xaml
index 95e6135..e997853 100644
--- a/src/CrissCross.WPF.UI/Controls/RichTextBox/RichTextBox.xaml
+++ b/src/CrissCross.WPF.UI/Controls/RichTextBox/RichTextBox.xaml
@@ -14,7 +14,7 @@
         <Setter Property="MinHeight" Value="34" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Padding" Value="6,4" />
-        <Setter Property="FontSize" Value="14" />
+        <!--<Setter Property="FontSize" Value="14" />-->
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="Template">
diff --git a/src/CrissCross.WPF.UI/Controls/TextBlock/TextBlock.xaml b/src/CrissCross.WPF.UI/Controls/TextBlock/TextBlock.xaml
index 2cc572b..1fe14b8 100644
--- a/src/CrissCross.WPF.UI/Controls/TextBlock/TextBlock.xaml
+++ b/src/CrissCross.WPF.UI/Controls/TextBlock/TextBlock.xaml
@@ -2,7 +2,7 @@
 
     <Style TargetType="{x:Type TextBlock}">
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="FontSize" Value="14" />
+        <!--<Setter Property="FontSize" Value="14" />-->
         <Setter Property="Margin" Value="0" />
         <Setter Property="Padding" Value="0" />
         <Setter Property="Focusable" Value="False" />
diff --git a/src/CrissCross.WPF.UI/Controls/TextBox/TextBox.xaml b/src/CrissCross.WPF.UI/Controls/TextBox/TextBox.xaml
index f868327..dbd7320 100644
--- a/src/CrissCross.WPF.UI/Controls/TextBox/TextBox.xaml
+++ b/src/CrissCross.WPF.UI/Controls/TextBox/TextBox.xaml
@@ -24,7 +24,7 @@
         <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource TextControlElevationBorderBrush}" />
         <Setter Property="BorderThickness" Value="{StaticResource TextBoxBorderThemeThickness}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
@@ -305,7 +305,7 @@
         <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource TextControlElevationBorderBrush}" />
         <Setter Property="BorderThickness" Value="{StaticResource TextBoxBorderThemeThickness}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
diff --git a/src/CrissCross.WPF.UI/Controls/ThumbRate/ThumbRate.xaml b/src/CrissCross.WPF.UI/Controls/ThumbRate/ThumbRate.xaml
index 060bb91..6392159 100644
--- a/src/CrissCross.WPF.UI/Controls/ThumbRate/ThumbRate.xaml
+++ b/src/CrissCross.WPF.UI/Controls/ThumbRate/ThumbRate.xaml
@@ -6,7 +6,7 @@
     <Style x:Key="DefaultUiThumbRateStyle" TargetType="{x:Type controls:ThumbRate}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Foreground" Value="{DynamicResource ThumbRateForeground}" />
-        <Setter Property="FontSize" Value="24" />
+        <!--<Setter Property="FontSize" Value="24" />-->
         <Setter Property="Focusable" Value="False" />
         <Setter Property="KeyboardNavigation.IsTabStop" Value="False" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
diff --git a/src/CrissCross.WPF.UI/Controls/TimePicker/TimePicker.xaml b/src/CrissCross.WPF.UI/Controls/TimePicker/TimePicker.xaml
index 1e7ecba..a99745e 100644
--- a/src/CrissCross.WPF.UI/Controls/TimePicker/TimePicker.xaml
+++ b/src/CrissCross.WPF.UI/Controls/TimePicker/TimePicker.xaml
@@ -17,7 +17,7 @@
         <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
         <Setter Property="BorderThickness" Value="{StaticResource TimePickerBorderThemeThickness}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
diff --git a/src/CrissCross.WPF.UI/Controls/TitleBar/TitleBar.xaml b/src/CrissCross.WPF.UI/Controls/TitleBar/TitleBar.xaml
index 21b9885..ff1b31b 100644
--- a/src/CrissCross.WPF.UI/Controls/TitleBar/TitleBar.xaml
+++ b/src/CrissCross.WPF.UI/Controls/TitleBar/TitleBar.xaml
@@ -83,7 +83,7 @@
         <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="Padding" Value="16,4,16,4" />
-        <Setter Property="FontSize" Value="12" />
+        <!--<Setter Property="FontSize" Value="12" />-->
         <Setter Property="Height" Value="48" />
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="Focusable" Value="False" />
diff --git a/src/CrissCross.WPF.UI/Controls/ToggleButton/ToggleButton.xaml b/src/CrissCross.WPF.UI/Controls/ToggleButton/ToggleButton.xaml
index bd3950c..d5b622e 100644
--- a/src/CrissCross.WPF.UI/Controls/ToggleButton/ToggleButton.xaml
+++ b/src/CrissCross.WPF.UI/Controls/ToggleButton/ToggleButton.xaml
@@ -17,7 +17,7 @@
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
diff --git a/src/CrissCross.WPF.UI/Controls/ToggleSwitch/ToggleSwitch.xaml b/src/CrissCross.WPF.UI/Controls/ToggleSwitch/ToggleSwitch.xaml
index 7b0ac34..4899c0b 100644
--- a/src/CrissCross.WPF.UI/Controls/ToggleSwitch/ToggleSwitch.xaml
+++ b/src/CrissCross.WPF.UI/Controls/ToggleSwitch/ToggleSwitch.xaml
@@ -26,7 +26,7 @@
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="OverridesDefaultStyle" Value="True" />
diff --git a/src/CrissCross.WPF.UI/Controls/TreeView/TreeViewItem.xaml b/src/CrissCross.WPF.UI/Controls/TreeView/TreeViewItem.xaml
index aceda3b..e705c23 100644
--- a/src/CrissCross.WPF.UI/Controls/TreeView/TreeViewItem.xaml
+++ b/src/CrissCross.WPF.UI/Controls/TreeView/TreeViewItem.xaml
@@ -212,20 +212,33 @@
                             </Border.Background>
                             <Grid>
                                 <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" MinWidth="19" />
                                     <ColumnDefinition Width="Auto" />
                                     <ColumnDefinition Width="*" />
                                 </Grid.ColumnDefinitions>
+                                <Rectangle
+                                    x:Name="ActiveRectangle"
+                                    Grid.Column="0"
+                                    Width="3"
+                                    Height="16"
+                                    Margin="0,0,0,0"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center"
+                                    Fill="{DynamicResource TreeViewItemSelectionIndicatorForeground}"
+                                    RadiusX="2"
+                                    RadiusY="2"
+                                    Visibility="Collapsed" />
 
                                 <ContentPresenter
                                     x:Name="SymbolIcon"
-                                    Grid.Column="0"
+                                    Grid.Column="1"
                                     Margin="0,0,8,0"
                                     Content="{TemplateBinding Icon}"
                                     TextElement.Foreground="{TemplateBinding Foreground}" />
 
                                 <ContentPresenter
                                     x:Name="PART_Header"
-                                    Grid.Column="1"
+                                    Grid.Column="2"
                                     HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                     ContentSource="Header" />
                             </Grid>
@@ -278,6 +291,9 @@
                         <Trigger Property="HasItems" Value="False">
                             <Setter TargetName="Expander" Property="Visibility" Value="Hidden" />
                         </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="ActiveRectangle" Property="Visibility" Value="Visible" />
+                        </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="HasHeader" Value="False" />
diff --git a/src/CrissCross.WPF.UI/Controls/Window/Window.xaml b/src/CrissCross.WPF.UI/Controls/Window/Window.xaml
index 0aa5a63..e610926 100644
--- a/src/CrissCross.WPF.UI/Controls/Window/Window.xaml
+++ b/src/CrissCross.WPF.UI/Controls/Window/Window.xaml
@@ -20,7 +20,7 @@
         <Setter Property="Padding" Value="0" />
         <Setter Property="BorderBrush" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="WindowStyle" Value="SingleBorderWindow" />
         <Setter Property="AllowsTransparency" Value="False" />
diff --git a/src/CrissCross.WPF.UI/Resources/Typography.xaml b/src/CrissCross.WPF.UI/Resources/Typography.xaml
index 6d83373..5454f3a 100644
--- a/src/CrissCross.WPF.UI/Resources/Typography.xaml
+++ b/src/CrissCross.WPF.UI/Resources/Typography.xaml
@@ -1,9 +1,9 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <Style TargetType="TextBlock">
-        <Setter Property="FontSize" Value="14" />
+        <!--<Setter Property="FontSize" Value="14" />
         <Setter Property="LineHeight" Value="20" />
-        <Setter Property="FontWeight" Value="Regular" />
+        <Setter Property="FontWeight" Value="Regular" />-->
     </Style>
 
     <Style
diff --git a/src/CrissCross.WPF.UI/Resources/Variables.xaml b/src/CrissCross.WPF.UI/Resources/Variables.xaml
index 6f83500..d690591 100644
--- a/src/CrissCross.WPF.UI/Resources/Variables.xaml
+++ b/src/CrissCross.WPF.UI/Resources/Variables.xaml
@@ -5,7 +5,7 @@
 
     <system:Double x:Key="DefaultIconFontSize">16</system:Double>
 
-    <system:Double x:Key="ControlContentThemeFontSize">14</system:Double>
+    <!--<system:Double x:Key="ControlContentThemeFontSize">14</system:Double>-->
     <CornerRadius x:Key="ControlCornerRadius">4,4,4,4</CornerRadius>
     <CornerRadius x:Key="OverlayCornerRadius">4,4,4,4</CornerRadius>
     <CornerRadius x:Key="PopupCornerRadius">8,8,8,8</CornerRadius>