From 11aa6e303466293d17886965c778431ebdf85f9f Mon Sep 17 00:00:00 2001
From: YJammak <yjk@yjk.name>
Date: Tue, 6 Aug 2024 13:29:17 +0800
Subject: [PATCH] Use DefaultDemiBold to set the DemiBold in the style to avoid
 blurring caused by being too thick in some fonts.

---
 SukiUI/Controls/BusyArea.axaml               |   2 +-
 SukiUI/Controls/InfoBadge.axaml              |  17 ++-
 SukiUI/Controls/MessageBox.axaml             | 151 +++++++++++--------
 SukiUI/Controls/SettingsLayout.axaml         |  12 +-
 SukiUI/Controls/Stepper.axaml.cs             | 126 +++++++++++-----
 SukiUI/Controls/SukiToast.axaml              | 143 ++++++++++--------
 SukiUI/Theme/Button.axaml                    |   6 +-
 SukiUI/Theme/Calendar/CalendarItem.axaml     |   7 +-
 SukiUI/Theme/DataGridStyle.axaml             |   2 +-
 SukiUI/Theme/DatePicker.axaml                |   2 +-
 SukiUI/Theme/DropDownButton.axaml            |   2 +-
 SukiUI/Theme/Expander.axaml                  |   8 +-
 SukiUI/Theme/Index.axaml                     |   3 +-
 SukiUI/Theme/ManagedFileChooser.axaml        |   4 +-
 SukiUI/Theme/ManagedFileChooserConverters.cs |  52 ++++---
 SukiUI/Theme/Menu.axaml                      |  26 ++--
 SukiUI/Theme/MenuItem.axaml                  |   8 +-
 SukiUI/Theme/NotificationCardStyle.axaml     |  28 ++--
 SukiUI/Theme/NotificationStyle.axaml         |   2 +-
 SukiUI/Theme/ProgressBarStyles.xaml          |  22 ++-
 SukiUI/Theme/RadioButtonStyles.xaml          |   6 +-
 SukiUI/Theme/TextBoxStyles.xaml              |  68 ++++-----
 SukiUI/Theme/TimePickerStyle.axaml           |   2 +-
 SukiUI/Theme/ToggleButtonStyles.xaml         |  23 ++-
 24 files changed, 415 insertions(+), 307 deletions(-)

diff --git a/SukiUI/Controls/BusyArea.axaml b/SukiUI/Controls/BusyArea.axaml
index c94bb4a7a..98aec9792 100644
--- a/SukiUI/Controls/BusyArea.axaml
+++ b/SukiUI/Controls/BusyArea.axaml
@@ -19,7 +19,7 @@
                                    LastChildFill="True">
                             <TextBlock Margin="10"
                                        DockPanel.Dock="Bottom"
-                                       FontWeight="DemiBold"
+                                       FontWeight="{DynamicResource DefaultDemiBold}"
                                        IsVisible="{TemplateBinding BusyText,
                                                                    Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
                                        Text="{TemplateBinding BusyText}" />
diff --git a/SukiUI/Controls/InfoBadge.axaml b/SukiUI/Controls/InfoBadge.axaml
index 407bb416d..ecddd1feb 100644
--- a/SukiUI/Controls/InfoBadge.axaml
+++ b/SukiUI/Controls/InfoBadge.axaml
@@ -8,10 +8,10 @@
                     Height="400"
                     Margin="0,20,0,0"
                     Spacing="20">
-            <controls:InfoBadge Appearance="Info" Header="Info"
+            <controls:InfoBadge Appearance="Info"
                                 CornerPosition="TopRight"
-                                >
-            
+                                Header="Info">
+
                 <Button Content="Log In" />
             </controls:InfoBadge>
             <controls:InfoBadge Appearance="Warning"
@@ -72,14 +72,17 @@
                             CornerRadius="{TemplateBinding CornerRadius}"
                             IsVisible="{Binding !!Header, RelativeSource={RelativeSource TemplatedParent}}"
                             UseLayoutRounding="False">
-                        <ContentPresenter Name="PART_HeaderPresenter" Margin="2"  
-                                          HorizontalAlignment="Center" FontWeight="DemiBold"
-                                          VerticalAlignment="Center" Foreground="White" 
+                        <ContentPresenter Name="PART_HeaderPresenter"
+                                          Margin="2"
+                                          HorizontalAlignment="Center"
+                                          VerticalAlignment="Center"
                                           Focusable="False"
+                                          FontWeight="{DynamicResource DefaultDemiBold}"
+                                          Foreground="White"
                                           IsTabStop="False">
                             <ContentPresenter.Styles>
                                 <Style Selector="TextBlock">
-                                    <Setter Property="FontSize" Value="13"></Setter>
+                                    <Setter Property="FontSize" Value="13" />
                                 </Style>
                             </ContentPresenter.Styles>
                             <ContentPresenter.Content>
diff --git a/SukiUI/Controls/MessageBox.axaml b/SukiUI/Controls/MessageBox.axaml
index 725f6c9c8..74dfdd19a 100644
--- a/SukiUI/Controls/MessageBox.axaml
+++ b/SukiUI/Controls/MessageBox.axaml
@@ -1,72 +1,105 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl x:Class="SukiUI.Controls.MessageBox"
+             xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:content="clr-namespace:SukiUI.Content"
+             xmlns:controls="clr-namespace:SukiUI.Controls"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:controls="clr-namespace:SukiUI.Controls"
-             xmlns:content="clr-namespace:SukiUI.Content"
-             mc:Ignorable="d" d:DesignWidth="480"  Width="480" 
-             x:Class="SukiUI.Controls.MessageBox">
+             Width="480"
+             d:DesignWidth="480"
+             mc:Ignorable="d">
     <UserControl.Styles>
         <Style Selector="controls|MessageBox">
             <Setter Property="Template">
                 <ControlTemplate>
-    <Panel>
-        <Border Background="{DynamicResource SukiCardBackground}" BorderBrush="{DynamicResource SukiBorderBrush}" BorderThickness="1" CornerRadius="25" Margin="0,90,0,0">
-            <Border CornerRadius="25" ClipToBounds="True">
-            <Panel>
-                <Panel IsVisible="{DynamicResource IsDark}">
-                    
-                        <Panel.Background>
-                            <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
-                                <GradientStop Color="{DynamicResource SukiAccentColor3}" Offset="0"></GradientStop>
-                                <GradientStop Color="{DynamicResource SukiPrimaryColor15}" Offset="1"></GradientStop>
+                    <Panel>
+                        <Border Margin="0,90,0,0"
+                                Background="{DynamicResource SukiCardBackground}"
+                                BorderBrush="{DynamicResource SukiBorderBrush}"
+                                BorderThickness="1"
+                                CornerRadius="25">
+                            <Border ClipToBounds="True" CornerRadius="25">
+                                <Panel>
+                                    <Panel IsVisible="{DynamicResource IsDark}">
 
-                            </LinearGradientBrush>
-                        </Panel.Background>
-                   
-                </Panel>
-                        
-                <Panel IsVisible="{DynamicResource IsLight}">
-                        <Panel.Background>
-                            <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
-                                <GradientStop Color="{DynamicResource SukiAccentColor5}" Offset="0"></GradientStop>
-                                <GradientStop Color="{DynamicResource SukiPrimaryColor7}" Offset="1"></GradientStop>
+                                        <Panel.Background>
+                                            <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
+                                                <GradientStop Offset="0" Color="{DynamicResource SukiAccentColor3}" />
+                                                <GradientStop Offset="1" Color="{DynamicResource SukiPrimaryColor15}" />
 
-                            </LinearGradientBrush>
-                        </Panel.Background>
-                </Panel>
-                <StackPanel>
-                    <TextBlock Margin="0,60,0,0" Text="{TemplateBinding Title}" FontWeight="DemiBold" FontSize="26" HorizontalAlignment="Center" Foreground="{DynamicResource SukiText}"></TextBlock>
-                    <ContentPresenter Margin="30,20,30,30" Content="{TemplateBinding Content}" FontWeight="DemiBold" TextWrapping="Wrap" Foreground="{DynamicResource SukiLowText}"></ContentPresenter>
-                    <StackPanel IsVisible="{TemplateBinding ShowActionButton}" Orientation="Horizontal" Spacing="15" Margin="0,0,30,30" HorizontalAlignment="Right">
-                      
-                        <Button Name="ButtonAction" Classes="Flat" Content="{TemplateBinding ActionButtonContent}"></Button>
-                    </StackPanel>
-                </StackPanel>
-            </Panel>
-            </Border>
-        </Border>
-        
-        <Border CornerRadius="50" Margin="0,50,0,0" Height="60" Width="70" HorizontalAlignment="Center" VerticalAlignment="Top" BoxShadow="{DynamicResource SukiBigPopupShadow}"></Border>
-        <Border  
-                 Margin="0,20,0,0" Background="#fafafa" Width="100" Height="100" CornerRadius="50" VerticalAlignment="Top" HorizontalAlignment="Center">
-            <Border CornerRadius="50" ClipToBounds="True">
-                <Panel>
-                    <Panel Opacity="1"  Background="{TemplateBinding Foreground}">
-                        
-                    </Panel>
-                    
-                    <PathIcon Width="28" Margin="0,0,0,0"
-                              Height="28" HorizontalAlignment="Center" VerticalAlignment="Center"
-                              Data="{TemplateBinding Icon}"
-                              Foreground="White" />
+                                            </LinearGradientBrush>
+                                        </Panel.Background>
+
+                                    </Panel>
 
-                </Panel>
-            </Border>
-        </Border>
-    </Panel>
+                                    <Panel IsVisible="{DynamicResource IsLight}">
+                                        <Panel.Background>
+                                            <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
+                                                <GradientStop Offset="0" Color="{DynamicResource SukiAccentColor5}" />
+                                                <GradientStop Offset="1" Color="{DynamicResource SukiPrimaryColor7}" />
+
+                                            </LinearGradientBrush>
+                                        </Panel.Background>
+                                    </Panel>
+                                    <StackPanel>
+                                        <TextBlock Margin="0,60,0,0"
+                                                   HorizontalAlignment="Center"
+                                                   FontSize="26"
+                                                   FontWeight="{DynamicResource DefaultDemiBold}"
+                                                   Foreground="{DynamicResource SukiText}"
+                                                   Text="{TemplateBinding Title}" />
+                                        <ContentPresenter Margin="30,20,30,30"
+                                                          Content="{TemplateBinding Content}"
+                                                          FontWeight="{DynamicResource DefaultDemiBold}"
+                                                          Foreground="{DynamicResource SukiLowText}"
+                                                          TextWrapping="Wrap" />
+                                        <StackPanel Margin="0,0,30,30"
+                                                    HorizontalAlignment="Right"
+                                                    IsVisible="{TemplateBinding ShowActionButton}"
+                                                    Orientation="Horizontal"
+                                                    Spacing="15">
+
+                                            <Button Name="ButtonAction"
+                                                    Classes="Flat"
+                                                    Content="{TemplateBinding ActionButtonContent}" />
+                                        </StackPanel>
+                                    </StackPanel>
+                                </Panel>
+                            </Border>
+                        </Border>
+
+                        <Border Width="70"
+                                Height="60"
+                                Margin="0,50,0,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Top"
+                                BoxShadow="{DynamicResource SukiBigPopupShadow}"
+                                CornerRadius="50" />
+                        <Border Width="100"
+                                Height="100"
+                                Margin="0,20,0,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Top"
+                                Background="#fafafa"
+                                CornerRadius="50">
+                            <Border ClipToBounds="True" CornerRadius="50">
+                                <Panel>
+                                    <Panel Background="{TemplateBinding Foreground}" Opacity="1" />
+
+                                    <PathIcon Width="28"
+                                              Height="28"
+                                              Margin="0,0,0,0"
+                                              HorizontalAlignment="Center"
+                                              VerticalAlignment="Center"
+                                              Data="{TemplateBinding Icon}"
+                                              Foreground="White" />
+
+                                </Panel>
+                            </Border>
+                        </Border>
+                    </Panel>
                 </ControlTemplate>
             </Setter>
-            </Style>
-        </UserControl.Styles>
+        </Style>
+    </UserControl.Styles>
 </UserControl>
diff --git a/SukiUI/Controls/SettingsLayout.axaml b/SukiUI/Controls/SettingsLayout.axaml
index e6f1fe42a..7c4be8e52 100644
--- a/SukiUI/Controls/SettingsLayout.axaml
+++ b/SukiUI/Controls/SettingsLayout.axaml
@@ -53,7 +53,7 @@
         </Style>
 
         <Style Selector="RadioButton.MenuChip:checked">
-            <Setter Property="TextBlock.FontWeight" Value="DemiBold" />
+            <Setter Property="TextBlock.FontWeight" Value="{DynamicResource DefaultDemiBold}" />
 
             <Setter Property="BorderThickness" Value="0,0,0,0" />
             <Setter Property="BorderBrush" Value="{DynamicResource SukiPrimaryColor}" />
@@ -72,7 +72,7 @@
 
 
         <Style Selector="RadioButton.MenuChip:checked  TextBlock">
-            <Setter Property="FontWeight" Value="DemiBold" />
+            <Setter Property="FontWeight" Value="{DynamicResource DefaultDemiBold}" />
             <Setter Property="Foreground" Value="{DynamicResource SukiPrimaryColor}" />
         </Style>
 
@@ -102,7 +102,7 @@
 
             </Setter>
 
-            <Setter Property="TextBlock.FontWeight" Value="DemiBold" />
+            <Setter Property="TextBlock.FontWeight" Value="{DynamicResource DefaultDemiBold}" />
             <Setter Property="TextBlock.Foreground" Value="{DynamicResource SukiPrimaryColor}" />
             <Setter Property="Background" Value="{DynamicResource SukiPrimaryColor10}" />
             <Setter Property="BorderBrush" Value="{DynamicResource SukiPrimaryColor}" />
@@ -128,8 +128,10 @@
                                     Margin="0,25,0,0"
                                     HorizontalAlignment="Left"
                                     DockPanel.Dock="Left" />
-                        <ScrollViewer Classes="Stack" Name="MyScroll">
-                            <StackPanel theme:StackPanelExtensions.AnimatedScroll="True" Name="StackItems" Margin="-10,0" />
+                        <ScrollViewer Name="MyScroll" Classes="Stack">
+                            <StackPanel Name="StackItems"
+                                        Margin="-10,0"
+                                        theme:StackPanelExtensions.AnimatedScroll="True" />
                         </ScrollViewer>
                     </DockPanel>
                 </ControlTemplate>
diff --git a/SukiUI/Controls/Stepper.axaml.cs b/SukiUI/Controls/Stepper.axaml.cs
index 99286a51f..836919c10 100644
--- a/SukiUI/Controls/Stepper.axaml.cs
+++ b/SukiUI/Controls/Stepper.axaml.cs
@@ -1,11 +1,3 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
-using Avalonia.Layout;
-using Avalonia.Markup.Xaml.MarkupExtensions;
-using Avalonia.Media;
-using Avalonia.Threading;
-using SukiUI.Content;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -13,34 +5,42 @@
 using System.Linq;
 using System.Reactive;
 using System.Reactive.Linq;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
 using Avalonia.Interactivity;
+using Avalonia.Layout;
+using Avalonia.Markup.Xaml.MarkupExtensions;
+using Avalonia.Media;
+using Avalonia.Threading;
+using SukiUI.Content;
 
 namespace SukiUI.Controls
 {
     public class Stepper : TemplatedControl
     {
         public static readonly StyledProperty<bool> AlternativeStyleProperty =
-            AvaloniaProperty.Register<Stepper, bool>(nameof(AlternativeStyle), defaultValue: false);
-
-        public bool AlternativeStyle
-        {
-            get { return GetValue(AlternativeStyleProperty); }
-            set { SetValue(AlternativeStyleProperty, value); }
-        }
+            AvaloniaProperty.Register<Stepper, bool>(nameof(AlternativeStyle));
 
 
         public static readonly StyledProperty<int> IndexProperty =
             AvaloniaProperty.Register<Stepper, int>(nameof(Index));
 
+        public static readonly StyledProperty<IEnumerable?> StepsProperty =
+            AvaloniaProperty.Register<Stepper, IEnumerable?>(nameof(Steps));
+
+        public bool AlternativeStyle
+        {
+            get => GetValue(AlternativeStyleProperty);
+            set => SetValue(AlternativeStyleProperty, value);
+        }
+
         public int Index
         {
             get => GetValue(IndexProperty);
             set => SetValue(IndexProperty, value);
         }
 
-        public static readonly StyledProperty<IEnumerable?> StepsProperty =
-            AvaloniaProperty.Register<Stepper, IEnumerable?>(nameof(Steps));
-
         public IEnumerable? Steps
         {
             get => GetValue(StepsProperty);
@@ -53,7 +53,11 @@ public IEnumerable? Steps
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
             base.OnApplyTemplate(e);
-            if (e.NameScope.Get<Grid>("PART_GridStepper") is not { } grid) return;
+            if (e.NameScope.Get<Grid>("PART_GridStepper") is not { } grid)
+            {
+                return;
+            }
+
             _grid = grid;
         }
 
@@ -72,36 +76,56 @@ protected override void OnLoaded(RoutedEventArgs e)
 
         private void StepsChangedHandler(IEnumerable? newSteps)
         {
-            if (newSteps is null) return;
-            if (newSteps is not IEnumerable<object> stepsEnumerable) return;
+            if (newSteps is null)
+            {
+                return;
+            }
+
+            if (newSteps is not IEnumerable<object> stepsEnumerable)
+            {
+                return;
+            }
+
             var steps = stepsEnumerable.ToArray();
 
             if (AlternativeStyle)
+            {
                 UpdateAlternate(steps);
+            }
             else
+            {
                 Update(steps);
+            }
 
             if (newSteps is INotifyCollectionChanged notify)
+            {
                 notify.CollectionChanged += (_, _) => Update(steps);
+            }
         }
 
         #region StepperBaseStyle
 
         private void Update(object[] steps)
         {
-            if (_grid is null) return;
+            if (_grid is null)
+            {
+                return;
+            }
+
             _grid.Children.Clear();
 
             SetColumnDefinitions(_grid, steps);
 
             for (var i = 0; i < steps.Length; i++)
+            {
                 AddStep(steps[i], i, _grid, steps.Length);
+            }
         }
 
         private void SetColumnDefinitions(Grid grid, object[] steps)
         {
             var columns = new ColumnDefinitions();
-            for (int i = 0; i < steps.Length; i++)
+            for (var i = 0; i < steps.Length; i++)
             {
                 columns.Add(new ColumnDefinition());
             }
@@ -111,21 +135,23 @@ private void SetColumnDefinitions(Grid grid, object[] steps)
 
         private void AddStep(object step, int index, Grid grid, int stepCount)
         {
-            var griditem = new Grid()
+            var griditem = new Grid
             {
-                ColumnDefinitions = new ColumnDefinitions()
+                ColumnDefinitions = new ColumnDefinitions
                     { new(GridLength.Auto), new(GridLength.Star), new(GridLength.Auto) }
             };
 
-            var icon = new PathIcon()
+            var icon = new PathIcon
                 { Height = 10, Width = 10, Data = Icons.ChevronRight, Margin = new Thickness(0, 0, 20, 0) };
             if (index == stepCount - 1)
+            {
                 icon.IsVisible = false;
+            }
 
             Grid.SetColumn(icon, 2);
             griditem.Children.Add(icon);
 
-            var circle = new Border()
+            var circle = new Border
             {
                 Margin = new Thickness(0, 0, 0, 2),
                 Height = 24,
@@ -140,7 +166,7 @@ private void AddStep(object step, int index, Grid grid, int stepCount)
                 circle[!BackgroundProperty] = new DynamicResourceExtension("SukiPrimaryColor");
 
                 circle.BorderThickness = new Thickness(0);
-                circle.Child = new TextBlock()
+                circle.Child = new TextBlock
                 {
                     VerticalAlignment = VerticalAlignment.Center,
                     HorizontalAlignment = HorizontalAlignment.Center,
@@ -154,7 +180,7 @@ private void AddStep(object step, int index, Grid grid, int stepCount)
                 circle[!BackgroundProperty] = new DynamicResourceExtension("SukiControlBorderBrush");
 
                 circle.BorderThickness = new Thickness(0);
-                circle.Child = new TextBlock()
+                circle.Child = new TextBlock
                 {
                     VerticalAlignment = VerticalAlignment.Center,
                     HorizontalAlignment = HorizontalAlignment.Center,
@@ -168,15 +194,19 @@ private void AddStep(object step, int index, Grid grid, int stepCount)
             griditem.Children.Add(circle);
             Control content = step switch
             {
-                string s => new TextBlock()
+                string s => new TextBlock
                 {
-                    FontWeight = index <= Index ? FontWeight.DemiBold : FontWeight.Normal,
+                    FontWeight = index <= Index
+                        ? TryGetResource("DefaultDemiBold", ActualThemeVariant, out var fontWeight)
+                            ? (FontWeight)fontWeight!
+                            : FontWeight.Bold
+                        : FontWeight.Normal,
                     Margin = new Thickness(10, 0, 0, 0),
                     Text = s,
                     VerticalAlignment = VerticalAlignment.Center,
                     HorizontalAlignment = HorizontalAlignment.Left, TextWrapping = TextWrapping.Wrap
                 },
-                _ => new ContentControl() { Content = step }
+                _ => new ContentControl { Content = step }
             };
 
             Grid.SetColumn(content, 1);
@@ -199,7 +229,11 @@ protected override void OnUnloaded(RoutedEventArgs e)
 
         public void UpdateAlternate(object[] steps)
         {
-            if (_grid is null) return;
+            if (_grid is null)
+            {
+                return;
+            }
+
             _grid.Children.Clear();
 
             SetColumnDefinitionsAlternate(_grid);
@@ -214,13 +248,16 @@ private void SetColumnDefinitionsAlternate(Grid grid)
         {
             var columns = new ColumnDefinitions();
             foreach (var s in Steps)
+            {
                 columns.Add(new ColumnDefinition());
+            }
+
             grid.ColumnDefinitions = columns;
         }
 
         private void AddStepAlternate(object step, int index, Grid grid, object[] steps)
         {
-            var gridItem = new Grid() { ColumnDefinitions = new ColumnDefinitions() { new(), new() } };
+            var gridItem = new Grid { ColumnDefinitions = new ColumnDefinitions { new(), new() } };
 
             var line = new Border
             {
@@ -239,12 +276,19 @@ private void AddStepAlternate(object step, int index, Grid grid, object[] steps)
             };
 
             if (index == 0)
+            {
                 line.IsVisible = false;
+            }
+
             if (index == steps.Length - 1)
+            {
                 line1.IsVisible = false;
+            }
 
             if (index == Index)
+            {
                 line[!BackgroundProperty] = new DynamicResourceExtension("SukiPrimaryColor");
+            }
 
             if (index < Index)
             {
@@ -260,13 +304,13 @@ private void AddStepAlternate(object step, int index, Grid grid, object[] steps)
 
             var gridBorder = new Grid();
 
-            var circle = new Border()
+            var circle = new Border
             {
-                Margin = new Thickness(0, 0, 0, 2), 
-                Height = 30, 
-                Width = 30, 
+                Margin = new Thickness(0, 0, 0, 2),
+                Height = 30,
+                Width = 30,
                 CornerRadius = new CornerRadius(25),
-                HorizontalAlignment = HorizontalAlignment.Center, 
+                HorizontalAlignment = HorizontalAlignment.Center,
                 VerticalAlignment = VerticalAlignment.Center
             };
 
@@ -274,7 +318,7 @@ private void AddStepAlternate(object step, int index, Grid grid, object[] steps)
             {
                 circle[!BackgroundProperty] = new DynamicResourceExtension("SukiPrimaryColor");
                 circle.BorderThickness = new Thickness(0);
-                circle.Child = new TextBlock()
+                circle.Child = new TextBlock
                 {
                     VerticalAlignment = VerticalAlignment.Center,
                     HorizontalAlignment = HorizontalAlignment.Center,
@@ -311,7 +355,7 @@ private void AddStepAlternate(object step, int index, Grid grid, object[] steps)
 
             gridBorder.Children.Add(circle);
 
-            gridBorder.Children.Add(new TextBlock()
+            gridBorder.Children.Add(new TextBlock
             {
                 FontWeight = index == Index ? FontWeight.Medium : FontWeight.Normal,
                 Text = step.ToString(), VerticalAlignment = VerticalAlignment.Center,
diff --git a/SukiUI/Controls/SukiToast.axaml b/SukiUI/Controls/SukiToast.axaml
index b40a23a7e..b804fdaf0 100644
--- a/SukiUI/Controls/SukiToast.axaml
+++ b/SukiUI/Controls/SukiToast.axaml
@@ -2,82 +2,99 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:content="clr-namespace:SukiUI.Content"
                     xmlns:suki="clr-namespace:SukiUI.Controls">
-   <Design.PreviewWith>
-       <suki:SukiToast Title="titre" Content="message"></suki:SukiToast>
-   </Design.PreviewWith>
+    <Design.PreviewWith>
+        <suki:SukiToast Title="titre" Content="message" />
+    </Design.PreviewWith>
     <ControlTheme x:Key="SukiToastTheme" TargetType="suki:SukiToast">
         <Setter Property="Template">
             <ControlTemplate>
                 <Panel>
-                 
+
                     <Border Name="PART_ToastCard"
-                            Width="300" 
+                            Width="300"
                             Margin="40,5,30,10"
-                            Padding="0" BorderThickness="1" BorderBrush="{DynamicResource SukiBorderBrush}"
-                            BoxShadow="{DynamicResource SukiPopupShadow}"
+                            Padding="0"
                             Background="{DynamicResource SukiCardBackground}"
+                            BorderBrush="{DynamicResource SukiBorderBrush}"
+                            BorderThickness="1"
+                            BoxShadow="{DynamicResource SukiPopupShadow}"
                             CornerRadius="15">
-                    <Border CornerRadius="15" ClipToBounds="True">
-                    <Panel>
-                        <Panel IsVisible="{DynamicResource IsDark}">
-                            <Panel Margin="0">
-                                <Panel.Background>
-                                    <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
-                                        <GradientStop Color="{DynamicResource SukiAccentColor5}" Offset="0"></GradientStop>
-                                        <GradientStop Color="{DynamicResource SukiPrimaryColor10}" Offset="1"></GradientStop>
+                        <Border ClipToBounds="True" CornerRadius="15">
+                            <Panel>
+                                <Panel IsVisible="{DynamicResource IsDark}">
+                                    <Panel Margin="0">
+                                        <Panel.Background>
+                                            <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
+                                                <GradientStop Offset="0" Color="{DynamicResource SukiAccentColor5}" />
+                                                <GradientStop Offset="1" Color="{DynamicResource SukiPrimaryColor10}" />
 
-                                    </LinearGradientBrush>
-                                </Panel.Background>
-                            </Panel>
-                        </Panel>
-                        
-                        <Panel IsVisible="{DynamicResource IsLight}">
-                            <Panel Margin="0">
-                                <Panel.Background>
-                                    <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
-                                        <GradientStop Color="{DynamicResource SukiAccentColor3}" Offset="0"></GradientStop>
-                                        <GradientStop Color="{DynamicResource SukiPrimaryColor3}" Offset="1"></GradientStop>
+                                            </LinearGradientBrush>
+                                        </Panel.Background>
+                                    </Panel>
+                                </Panel>
 
-                                    </LinearGradientBrush>
-                                </Panel.Background>
-                            </Panel>
-                            
-                        </Panel>
+                                <Panel IsVisible="{DynamicResource IsLight}">
+                                    <Panel Margin="0">
+                                        <Panel.Background>
+                                            <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
+                                                <GradientStop Offset="0" Color="{DynamicResource SukiAccentColor3}" />
+                                                <GradientStop Offset="1" Color="{DynamicResource SukiPrimaryColor3}" />
+
+                                            </LinearGradientBrush>
+                                        </Panel.Background>
+                                    </Panel>
+
+                                </Panel>
 
-                      
-                        <Panel Margin="20, 22">
-                        
-                        <DockPanel Margin="0,-7" LastChildFill="True">
-                        <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
-                               <ContentPresenter Margin="12,0,0,0"
-                                       FontSize="15"
-                                       FontWeight="DemiBold"
-                                       Foreground="{DynamicResource SukiText}"
-                                       Content="{TemplateBinding Title}" />
-                        </StackPanel>
-                            <Button Name="ButtonAction" FontSize="14" Padding="14,6" DockPanel.Dock="Bottom" IsVisible="{TemplateBinding ShowActionButton}" HorizontalAlignment="Right" Margin="0,14,0,0" Content="{TemplateBinding ActionButtonContent}">
-                            </Button>
-                        <ContentPresenter Margin="12,10,0,0"
-                                          Content="{TemplateBinding Content}"
-                                          Foreground="{DynamicResource SukiText}"
-                                          TextWrapping="Wrap" />
-                        
-                    </DockPanel>
-                    </Panel>
-                    </Panel>
+
+                                <Panel Margin="20,22">
+
+                                    <DockPanel Margin="0,-7" LastChildFill="True">
+                                        <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
+                                            <ContentPresenter Margin="12,0,0,0"
+                                                              Content="{TemplateBinding Title}"
+                                                              FontSize="15"
+                                                              FontWeight="{DynamicResource DefaultDemiBold}"
+                                                              Foreground="{DynamicResource SukiText}" />
+                                        </StackPanel>
+                                        <Button Name="ButtonAction"
+                                                Margin="0,14,0,0"
+                                                Padding="14,6"
+                                                HorizontalAlignment="Right"
+                                                Content="{TemplateBinding ActionButtonContent}"
+                                                DockPanel.Dock="Bottom"
+                                                FontSize="14"
+                                                IsVisible="{TemplateBinding ShowActionButton}" />
+                                        <ContentPresenter Margin="12,10,0,0"
+                                                          Content="{TemplateBinding Content}"
+                                                          Foreground="{DynamicResource SukiText}"
+                                                          TextWrapping="Wrap" />
+
+                                    </DockPanel>
+                                </Panel>
+                            </Panel>
+                        </Border>
                     </Border>
-                </Border>
-                    <Border  BoxShadow="{DynamicResource SukiSmallPopupShadow}"
-                             Margin="22,0,0,0" Background="{DynamicResource SukiCardBackground}" Width="35" Height="35" CornerRadius="35" VerticalAlignment="Center" HorizontalAlignment="Left">
-                        <Border CornerRadius="35" ClipToBounds="True">
-                        <Panel>
-                            <Panel  Opacity="1" Background="{TemplateBinding Foreground}"></Panel>
-                           <PathIcon Width="15" Margin="0,0,0,0"
-                                      Height="15" HorizontalAlignment="Center" VerticalAlignment="Center"
-                                      Data="{TemplateBinding Icon}"
-                                      Foreground="White" />
+                    <Border Width="35"
+                            Height="35"
+                            Margin="22,0,0,0"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Background="{DynamicResource SukiCardBackground}"
+                            BoxShadow="{DynamicResource SukiSmallPopupShadow}"
+                            CornerRadius="35">
+                        <Border ClipToBounds="True" CornerRadius="35">
+                            <Panel>
+                                <Panel Background="{TemplateBinding Foreground}" Opacity="1" />
+                                <PathIcon Width="15"
+                                          Height="15"
+                                          Margin="0,0,0,0"
+                                          HorizontalAlignment="Center"
+                                          VerticalAlignment="Center"
+                                          Data="{TemplateBinding Icon}"
+                                          Foreground="White" />
 
-                        </Panel>
+                            </Panel>
                         </Border>
                     </Border>
                 </Panel>
diff --git a/SukiUI/Theme/Button.axaml b/SukiUI/Theme/Button.axaml
index 1a7f6cf52..1c3a915f5 100644
--- a/SukiUI/Theme/Button.axaml
+++ b/SukiUI/Theme/Button.axaml
@@ -38,7 +38,7 @@
                                           Content="{TemplateBinding Content}"
                                           FontFamily="{TemplateBinding FontFamily}"
                                           FontSize="{TemplateBinding FontSize}"
-                                          FontWeight="DemiBold"
+                                          FontWeight="{DynamicResource DefaultDemiBold}"
                                           RecognizesAccessKey="True" />
                     </StackPanel>
                 </Border>
@@ -54,7 +54,7 @@
         <!--  Nested Selectors For Basic Button  -->
         <Style Selector="^ /template/ TextBlock">
             <Setter Property="FontSize" Value="15" />
-            <Setter Property="FontWeight" Value="DemiBold" />
+            <Setter Property="FontWeight" Value="{DynamicResource DefaultDemiBold}" />
             <Setter Property="Transitions">
                 <Transitions>
                     <BrushTransition Property="Foreground" Duration="0:0:0.3" />
@@ -462,7 +462,7 @@
             <Setter Property="Padding" Value="0" />
             <Setter Property="Transitions">
                 <Transitions>
-                    <BrushTransition Property="Background" Duration="0.01"/>
+                    <BrushTransition Property="Background" Duration="0.01" />
                 </Transitions>
             </Setter>
             <Style Selector="^:pointerover">
diff --git a/SukiUI/Theme/Calendar/CalendarItem.axaml b/SukiUI/Theme/Calendar/CalendarItem.axaml
index c77aa7d90..dda6bbe2a 100644
--- a/SukiUI/Theme/Calendar/CalendarItem.axaml
+++ b/SukiUI/Theme/Calendar/CalendarItem.axaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:content="clr-namespace:SukiUI.Content">
-    
+
     <ControlTheme x:Key="SukiCalendarItemStyle" TargetType="CalendarItem">
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="VerticalAlignment" Value="Stretch" />
@@ -29,7 +29,8 @@
                               ColumnDefinitions="Auto, *, Auto, Auto">
                             <Button Name="PART_HeaderButton"
                                     Grid.Column="0"
-                                    Classes="Basic" FontWeight="DemiBold"
+                                    Classes="Basic"
+                                    FontWeight="{DynamicResource DefaultDemiBold}"
                                     IsEnabled="False" />
 
                             <Button Name="PART_PreviousButton"
@@ -72,7 +73,7 @@
 
         <Style Selector="^ /template/ Button.HeaderButton">
             <Setter Property="Height" Value="24" />
-            <Setter Property="TextElement.FontWeight" Value="DemiBold"></Setter>
+            <Setter Property="TextElement.FontWeight" Value="{DynamicResource DefaultDemiBold}" />
             <Setter Property="Padding" Value="8, 0" />
             <Setter Property="HorizontalContentAlignment" Value="Left" />
         </Style>
diff --git a/SukiUI/Theme/DataGridStyle.axaml b/SukiUI/Theme/DataGridStyle.axaml
index f61e08a81..b9b00d082 100644
--- a/SukiUI/Theme/DataGridStyle.axaml
+++ b/SukiUI/Theme/DataGridStyle.axaml
@@ -59,7 +59,7 @@
 
     <Style Selector="DataGridColumnHeader">
         <Setter Property="HorizontalContentAlignment" Value="Left" />
-        <Setter Property="FontWeight" Value="DemiBold" />
+        <Setter Property="FontWeight" Value="{DynamicResource DefaultDemiBold}" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="SeparatorBrush" Value="{DynamicResource ThemeControlLowColor}" />
         <Setter Property="Padding" Value="12" />
diff --git a/SukiUI/Theme/DatePicker.axaml b/SukiUI/Theme/DatePicker.axaml
index 6553b1174..33a931472 100644
--- a/SukiUI/Theme/DatePicker.axaml
+++ b/SukiUI/Theme/DatePicker.axaml
@@ -262,7 +262,7 @@
                                               Foreground="{DynamicResource SukiPrimaryColor}" />
                                     <TextBlock Margin="10,0,0,0"
                                                FontSize="16"
-                                               FontWeight="DemiBold"
+                                               FontWeight="{DynamicResource DefaultDemiBold}"
                                                Foreground="{DynamicResource SukiPrimaryColor}"
                                                Text="Apply" />
                                 </StackPanel>
diff --git a/SukiUI/Theme/DropDownButton.axaml b/SukiUI/Theme/DropDownButton.axaml
index 576cc68de..97a4c6de4 100644
--- a/SukiUI/Theme/DropDownButton.axaml
+++ b/SukiUI/Theme/DropDownButton.axaml
@@ -10,7 +10,7 @@
         <Setter Property="FontSize" Value="15" />
         <Setter Property="Padding" Value="20,8" />
         <Setter Property="FontFamily" Value="{DynamicResource DefaultFontFamily}" />
-        <Setter Property="FontWeight" Value="DemiBold" />
+        <Setter Property="FontWeight" Value="{DynamicResource DefaultDemiBold}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate>
diff --git a/SukiUI/Theme/Expander.axaml b/SukiUI/Theme/Expander.axaml
index c7c626dbf..db5d50420 100644
--- a/SukiUI/Theme/Expander.axaml
+++ b/SukiUI/Theme/Expander.axaml
@@ -24,14 +24,14 @@
 
                             <LayoutTransformControl Name="PART_ToggleTransform">
                                 <DockPanel>
-                                  
+
                                     <Border Name="PART_BottomBorder"
                                             Height="2"
                                             HorizontalAlignment="Stretch"
                                             Background="{DynamicResource SukiBorderBrush}"
                                             DockPanel.Dock="Bottom" />
-                                    
-                                    <ToggleButton Name="PART_ToggleButton" 
+
+                                    <ToggleButton Name="PART_ToggleButton"
                                                   HorizontalAlignment="Stretch"
                                                   VerticalAlignment="Center"
                                                   HorizontalContentAlignment="Stretch"
@@ -47,7 +47,7 @@
                                                               HorizontalAlignment="Left"
                                                               VerticalAlignment="Center"
                                                               Content="{TemplateBinding Header}"
-                                                              FontWeight="DemiBold" />
+                                                              FontWeight="{DynamicResource DefaultDemiBold}" />
                                             <PathIcon Name="PART_Icon"
                                                       Grid.Column="2"
                                                       Width="10"
diff --git a/SukiUI/Theme/Index.axaml b/SukiUI/Theme/Index.axaml
index d300b5492..e21edf866 100644
--- a/SukiUI/Theme/Index.axaml
+++ b/SukiUI/Theme/Index.axaml
@@ -47,6 +47,7 @@
             <Easing x:Key="MenuEasing">CircularEaseOut</Easing>
 
             <FontFamily x:Key="DefaultFontFamily">avares://SukiUI/CustomFont#Quicksand</FontFamily>
+            <FontWeight x:Key="DefaultDemiBold">DemiBold</FontWeight>
 
             <ResourceDictionary.MergedDictionaries>
                 <ResourceInclude Source="avares://sukiUI/Theme/TextBlock.xaml" />
@@ -54,7 +55,7 @@
                 <ResourceInclude Source="avares://SukiUI/Theme/DatePicker.axaml" />
                 <ResourceInclude Source="avares://sukiUI/Theme/ToolTipStyle.axaml" />
                 <ResourceInclude Source="avares://sukiUI/Theme/Button.axaml" />
-                <ResourceInclude Source="avares://sukiUI/Theme/HyperlinkButton.axaml"/>
+                <ResourceInclude Source="avares://sukiUI/Theme/HyperlinkButton.axaml" />
                 <ResourceInclude Source="avares://sukiUI/Theme/PathIcon.axaml" />
                 <ResourceInclude Source="avares://sukiUI/Theme/Expander.axaml" />
                 <ResourceInclude Source="avares://sukiUI/Theme/CalendarDatePickerStyle.axaml" />
diff --git a/SukiUI/Theme/ManagedFileChooser.axaml b/SukiUI/Theme/ManagedFileChooser.axaml
index 46cb46f3b..9c8f3d3d2 100644
--- a/SukiUI/Theme/ManagedFileChooser.axaml
+++ b/SukiUI/Theme/ManagedFileChooser.axaml
@@ -77,7 +77,7 @@
                                        Source="/Content/Images/icons8-file-explorer-new-48.png" />
                                 <TextBlock Margin="12,0,0,0"
                                            FontSize="25"
-                                           FontWeight="DemiBold"
+                                           FontWeight="{DynamicResource DefaultDemiBold}"
                                            Text="{Binding Title}">
                                     <TextBlock.Foreground>
                                         <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
@@ -151,7 +151,7 @@
                                                 </Image>
                                                 <TextBlock Margin="7,0,0,0"
                                                            FontSize="17"
-                                                           FontWeight="DemiBold"
+                                                           FontWeight="{DynamicResource DefaultDemiBold}"
                                                            Text="{Binding DisplayName}" />
                                             </StackPanel>
                                         </DataTemplate>
diff --git a/SukiUI/Theme/ManagedFileChooserConverters.cs b/SukiUI/Theme/ManagedFileChooserConverters.cs
index d9b8d7b0d..765405f77 100644
--- a/SukiUI/Theme/ManagedFileChooserConverters.cs
+++ b/SukiUI/Theme/ManagedFileChooserConverters.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Data;
+using Avalonia.Controls.Primitives;
 using Avalonia.Data.Converters;
 using Avalonia.Layout;
 using Avalonia.Markup.Xaml.MarkupExtensions;
@@ -14,36 +14,46 @@ namespace SukiUI.Theme
 {
     public class TextToPathConverter : IValueConverter
     {
-        
         public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
         {
             var pathes = (value as string).Split('\\');
             if (pathes.Length > 3)
             {
-               pathes =  pathes.Skip(1).ToArray();
+                pathes = pathes.Skip(1).ToArray();
             }
 
-            var stackPanel = new StackPanel() { VerticalAlignment = VerticalAlignment.Center, Orientation = Orientation.Horizontal, Margin = new Thickness(5)};
-            
+            var stackPanel = new StackPanel
+            {
+                VerticalAlignment = VerticalAlignment.Center, Orientation = Orientation.Horizontal,
+                Margin = new Thickness(5)
+            };
+
             for (var i = 0; i < pathes.Length; i++)
             {
-                var t = new TextBlock()
+                var t = new TextBlock
                 {
-                    Text = pathes[i], FontWeight = FontWeight.DemiBold, FontSize = 14, VerticalAlignment = VerticalAlignment.Center
-                    
+                    Text = pathes[i],
+                    FontWeight =
+                        Application.Current!.TryGetResource("DefaultDemiBold", Application.Current!.ActualThemeVariant,
+                            out var fontWeight)
+                            ? (FontWeight)fontWeight!
+                            : FontWeight.DemiBold,
+                    FontSize = 14, VerticalAlignment = VerticalAlignment.Center,
+                    [!TextBlock.ForegroundProperty] = i == pathes.Length - 1
+                        ? new DynamicResourceExtension("SukiText")
+                        : new DynamicResourceExtension("SukiLowText")
                 };
-                
-                t[!TextBlock.ForegroundProperty]= i == pathes.Length -1 ?  new DynamicResourceExtension("SukiText") : new DynamicResourceExtension("SukiLowText");
-                
+
                 stackPanel.Children.Add(t);
 
-                var p = new PathIcon()
+                var p = new PathIcon
                 {
-                    Height = 6, Margin = new Thickness(12,4,12,2),Width = 5, Data = Icons.ChevronRight, IsVisible = i != pathes.Length - 1, VerticalAlignment = VerticalAlignment.Center
+                    Height = 6, Margin = new Thickness(12, 4, 12, 2), Width = 5, Data = Icons.ChevronRight,
+                    IsVisible = i != pathes.Length - 1, VerticalAlignment = VerticalAlignment.Center
                 };
-                
-                p[!PathIcon.ForegroundProperty] = new DynamicResourceExtension("SukiLowText");
-                
+
+                p[!TemplatedControl.ForegroundProperty] = new DynamicResourceExtension("SukiLowText");
+
                 stackPanel.Children.Add(p);
             }
 
@@ -55,18 +65,16 @@ public object ConvertBack(object? value, Type targetType, object? parameter, Cul
             throw new NotSupportedException();
         }
     }
-    
+
     public class WindowManagedConverter : IValueConverter
     {
-        
         public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
         {
             var w = value as Window;
             w.SystemDecorations = SystemDecorations.BorderOnly;
-        //    w.ExtendClientAreaToDecorationsHint = true;
-            
-            
-            
+            //    w.ExtendClientAreaToDecorationsHint = true;
+
+
             return "";
         }
 
diff --git a/SukiUI/Theme/Menu.axaml b/SukiUI/Theme/Menu.axaml
index 94470aa8a..3c1ec2bd3 100644
--- a/SukiUI/Theme/Menu.axaml
+++ b/SukiUI/Theme/Menu.axaml
@@ -3,12 +3,13 @@
                     xmlns:controls="clr-namespace:SukiUI.Controls"
                     xmlns:system="clr-namespace:System;assembly=netstandard">
     <ControlTheme x:Key="SukiTopLevelMenuItem" TargetType="MenuItem">
-        <Setter Property="FontWeight" Value="DemiBold" />
+        <Setter Property="FontWeight" Value="{DynamicResource DefaultDemiBold}" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Padding" Value="10 0" />
         <Setter Property="Template">
             <ControlTemplate>
-                <Border Name="root" Margin="5,5"
+                <Border Name="root"
+                        Margin="5,5"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{DynamicResource SukiLightBorderBrush}"
                         BorderThickness="0"
@@ -21,7 +22,7 @@
                                           Content="{TemplateBinding Header}">
                             <ContentPresenter.DataTemplates>
                                 <DataTemplate DataType="system:String">
-                                    <TextBlock FontWeight="DemiBold" Text="{CompiledBinding}" />
+                                    <TextBlock FontWeight="{DynamicResource DefaultDemiBold}" Text="{CompiledBinding}" />
                                 </DataTemplate>
                             </ContentPresenter.DataTemplates>
                         </ContentPresenter>
@@ -47,12 +48,12 @@
                                             ClipToBounds="True"
                                             CornerRadius="6">
                                         <Panel Background="{DynamicResource PopupGradientBrush}">
-                                        <ScrollViewer>
-                                            <ItemsPresenter Name="PART_ItemsPresenter"
-                                                            Grid.IsSharedSizeScope="True"
-                                                            ItemsPanel="{TemplateBinding ItemsPanel}" />
-                                        </ScrollViewer>
-                                            </Panel>
+                                            <ScrollViewer>
+                                                <ItemsPresenter Name="PART_ItemsPresenter"
+                                                                Grid.IsSharedSizeScope="True"
+                                                                ItemsPanel="{TemplateBinding ItemsPanel}" />
+                                            </ScrollViewer>
+                                        </Panel>
                                     </Border>
                                 </Grid>
                             </LayoutTransformControl>
@@ -91,11 +92,12 @@
         <Setter Property="Template">
             <ControlTemplate>
                 <LayoutTransformControl Name="PART_LayoutTransform" RenderTransformOrigin="50%, 0%">
-                    <controls:GlassCard Height="45" IsAnimated="False"
+                    <controls:GlassCard Height="45"
                                         Padding="{TemplateBinding Padding}"
                                         BorderBrush="{DynamicResource SukiBorderBrush}"
                                         BorderThickness="0"
-                                        CornerRadius="{TemplateBinding CornerRadius}">
+                                        CornerRadius="{TemplateBinding CornerRadius}"
+                                        IsAnimated="False">
                         <ItemsPresenter Name="PART_ItemsPresenter"
                                         ItemsPanel="{TemplateBinding ItemsPanel}"
                                         KeyboardNavigation.TabNavigation="Continue" />
@@ -136,7 +138,7 @@
                         <Setter Property="ScaleTransform.ScaleY" Value="0.9" />
                         <Setter Property="ScaleTransform.ScaleX" Value="0.9" />
                         <Setter Property="Opacity" Value="0" />
-                        <Setter Property="IsVisible" Value="False"></Setter>
+                        <Setter Property="IsVisible" Value="False" />
                     </KeyFrame>
                 </Animation>
             </Style.Animations>
diff --git a/SukiUI/Theme/MenuItem.axaml b/SukiUI/Theme/MenuItem.axaml
index 7fc980ccf..9d7e6625c 100644
--- a/SukiUI/Theme/MenuItem.axaml
+++ b/SukiUI/Theme/MenuItem.axaml
@@ -48,7 +48,7 @@
                                               Content="{TemplateBinding Header}">
                                 <ContentPresenter.DataTemplates>
                                     <DataTemplate DataType="system:String">
-                                        <TextBlock FontWeight="DemiBold" Text="{Binding}" />
+                                        <TextBlock FontWeight="{DynamicResource DefaultDemiBold}" Text="{Binding}" />
                                     </DataTemplate>
                                 </ContentPresenter.DataTemplates>
                             </ContentPresenter>
@@ -83,9 +83,9 @@
                                             ClipToBounds="True"
                                             CornerRadius="5">
                                         <Panel Background="{DynamicResource PopupGradientBrush}">
-                                        <ScrollViewer>
-                                            <ItemsPresenter Name="PART_ItemsPresenter" ItemsPanel="{TemplateBinding ItemsPanel}" />
-                                        </ScrollViewer>
+                                            <ScrollViewer>
+                                                <ItemsPresenter Name="PART_ItemsPresenter" ItemsPanel="{TemplateBinding ItemsPanel}" />
+                                            </ScrollViewer>
                                         </Panel>
                                     </Border>
                                 </Panel>
diff --git a/SukiUI/Theme/NotificationCardStyle.axaml b/SukiUI/Theme/NotificationCardStyle.axaml
index 1e2c85bff..b8e44f606 100644
--- a/SukiUI/Theme/NotificationCardStyle.axaml
+++ b/SukiUI/Theme/NotificationCardStyle.axaml
@@ -32,20 +32,20 @@
                                 ClipToBounds="True"
                                 CornerRadius="10">
                             <Panel>
-                                
+
                                 <DockPanel>
-                                <PathIcon Margin="11,11,5,5"
-                                          VerticalAlignment="Top"
-                                          Data="{x:Static content:Icons.CircleInformation}"
-                                          DockPanel.Dock="Left"
-                                          Foreground="{DynamicResource SukiPrimaryColor}" />
-                                <Panel x:Name="PART_HeaderBar"
-                                       Height="4"
-                                       Margin="0,-3,0,0"
-                                       Classes="TextBold"
-                                       DockPanel.Dock="Top" />
-                                <ContentControl Name="PART_Content" Content="{TemplateBinding Content}" />
-                            </DockPanel>
+                                    <PathIcon Margin="11,11,5,5"
+                                              VerticalAlignment="Top"
+                                              Data="{x:Static content:Icons.CircleInformation}"
+                                              DockPanel.Dock="Left"
+                                              Foreground="{DynamicResource SukiPrimaryColor}" />
+                                    <Panel x:Name="PART_HeaderBar"
+                                           Height="4"
+                                           Margin="0,-3,0,0"
+                                           Classes="TextBold"
+                                           DockPanel.Dock="Top" />
+                                    <ContentControl Name="PART_Content" Content="{TemplateBinding Content}" />
+                                </DockPanel>
                             </Panel>
                         </Border>
                     </Border>
@@ -55,7 +55,7 @@
     </Style>
 
     <Style Selector="Panel.TextBold /template/ TextBlock">
-        <Setter Property="FontWeight" Value="DemiBold" />
+        <Setter Property="FontWeight" Value="{DynamicResource DefaultDemiBold}" />
     </Style>
 
     <Style Selector="NotificationCard/template/ ContentControl#PART_Content">
diff --git a/SukiUI/Theme/NotificationStyle.axaml b/SukiUI/Theme/NotificationStyle.axaml
index 1ec3e6ca0..b2d10e606 100644
--- a/SukiUI/Theme/NotificationStyle.axaml
+++ b/SukiUI/Theme/NotificationStyle.axaml
@@ -18,7 +18,7 @@
                                         Spacing="8"
                                         TextBlock.Foreground="{DynamicResource SukiText}">
                                 <TextBlock FontSize="18"
-                                           FontWeight="DemiBold"
+                                           FontWeight="{DynamicResource DefaultDemiBold}"
                                            Text="{Binding Title}" />
                                 <TextBlock MaxHeight="80"
                                            Margin="0,0,12,0"
diff --git a/SukiUI/Theme/ProgressBarStyles.xaml b/SukiUI/Theme/ProgressBarStyles.xaml
index f44be78c4..dbdfe063f 100644
--- a/SukiUI/Theme/ProgressBarStyles.xaml
+++ b/SukiUI/Theme/ProgressBarStyles.xaml
@@ -24,7 +24,7 @@
                                HorizontalAlignment="Right"
                                VerticalAlignment="Center"
                                DockPanel.Dock="Right"
-                               FontWeight="DemiBold"
+                               FontWeight="{DynamicResource DefaultDemiBold}"
                                Foreground="{DynamicResource SukiText}"
                                Text="{Binding Value, RelativeSource={RelativeSource TemplatedParent}, StringFormat={}{0:0}%}"
                                TextAlignment="Right" />
@@ -182,14 +182,17 @@
                        IterationCount="Infinite"
                        Duration="0:0:2">
                 <KeyFrame Cue="0%">
-                    <Setter Property="TranslateTransform.X" Value="{Binding IndeterminateStartingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
+                    <Setter Property="TranslateTransform.X"
+                            Value="{Binding IndeterminateStartingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
                 </KeyFrame>
                 <KeyFrame Cue="100%">
-                    <Setter Property="TranslateTransform.X" Value="{Binding IndeterminateEndingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
+                    <Setter Property="TranslateTransform.X"
+                            Value="{Binding IndeterminateEndingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
                 </KeyFrame>
             </Animation>
         </Style.Animations>
-        <Setter Property="Width" Value="{Binding TemplateProperties.ContainerWidth, RelativeSource={RelativeSource TemplatedParent}}" />
+        <Setter Property="Width"
+                Value="{Binding TemplateProperties.ContainerWidth, RelativeSource={RelativeSource TemplatedParent}}" />
     </Style>
 
     <Style Selector="ProgressBar:vertical:indeterminate /template/ Border#PART_IndeterminateIndicator">
@@ -198,14 +201,17 @@
                        IterationCount="Infinite"
                        Duration="0:0:2">
                 <KeyFrame Cue="0%">
-                    <Setter Property="TranslateTransform.Y" Value="{Binding IndeterminateStartingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
+                    <Setter Property="TranslateTransform.Y"
+                            Value="{Binding IndeterminateStartingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
                 </KeyFrame>
                 <KeyFrame Cue="100%">
-                    <Setter Property="TranslateTransform.Y" Value="{Binding IndeterminateEndingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
+                    <Setter Property="TranslateTransform.Y"
+                            Value="{Binding IndeterminateEndingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
                 </KeyFrame>
             </Animation>
         </Style.Animations>
-        <Setter Property="Height" Value="{Binding TemplateProperties.ContainerWidth, RelativeSource={RelativeSource TemplatedParent}}" />
+        <Setter Property="Height"
+                Value="{Binding TemplateProperties.ContainerWidth, RelativeSource={RelativeSource TemplatedParent}}" />
     </Style>
 
     <Style Selector="ProgressBar.Accent">
@@ -213,7 +219,7 @@
     </Style>
 
     <Style Selector="ProgressBar.Light">
-        <Setter Property="Foreground" Value="{DynamicResource SukiPrimaryColor75}"></Setter>
+        <Setter Property="Foreground" Value="{DynamicResource SukiPrimaryColor75}" />
     </Style>
 
 </Styles>
\ No newline at end of file
diff --git a/SukiUI/Theme/RadioButtonStyles.xaml b/SukiUI/Theme/RadioButtonStyles.xaml
index 815b822e6..2d899b162 100644
--- a/SukiUI/Theme/RadioButtonStyles.xaml
+++ b/SukiUI/Theme/RadioButtonStyles.xaml
@@ -264,7 +264,7 @@
 
 
     <Style Selector="RadioButton.MenuItem:checked">
-        <Setter Property="TextBlock.FontWeight" Value="DemiBold" />
+        <Setter Property="TextBlock.FontWeight" Value="{DynamicResource DefaultDemiBold}" />
         <Setter Property="BorderThickness" Value="0,0,0,0" />
         <Setter Property="BorderBrush" Value="{DynamicResource SukiPrimaryColor}" />
         <Setter Property="Margin" Value="-30,5,5,5" />
@@ -277,7 +277,7 @@
     </Style>
 
     <Style Selector="RadioButton.MenuItem:checked  TextBlock">
-        <Setter Property="FontWeight" Value="DemiBold" />
+        <Setter Property="FontWeight" Value="{DynamicResource DefaultDemiBold}" />
         <Setter Property="Foreground" Value="{DynamicResource SukiPrimaryColor}" />
     </Style>
 
@@ -290,7 +290,7 @@
 
         </Setter>
 
-        <Setter Property="TextBlock.FontWeight" Value="DemiBold" />
+        <Setter Property="TextBlock.FontWeight" Value="{DynamicResource DefaultDemiBold}" />
         <Setter Property="TextBlock.Foreground" Value="{DynamicResource SukiPrimaryColor}" />
         <Setter Property="Background" Value="{DynamicResource SukiPrimaryColor10}" />
         <Setter Property="BorderBrush" Value="{DynamicResource SukiPrimaryColor}" />
diff --git a/SukiUI/Theme/TextBoxStyles.xaml b/SukiUI/Theme/TextBoxStyles.xaml
index 8d199e070..f87ae2db3 100644
--- a/SukiUI/Theme/TextBoxStyles.xaml
+++ b/SukiUI/Theme/TextBoxStyles.xaml
@@ -32,13 +32,13 @@
                         <StackPanel>
                             <TextBlock Margin="6,0,0,3"
                                        FontSize="13"
-                                       FontWeight="DemiBold"
+                                       FontWeight="{DynamicResource DefaultDemiBold}"
                                        Text="Username" />
                             <TextBox />
 
                             <TextBlock Margin="6,18,0,3"
                                        FontSize="13"
-                                       FontWeight="DemiBold"
+                                       FontWeight="{DynamicResource DefaultDemiBold}"
                                        Text="Password" />
                             <TextBox Margin="0,0,0,20" />
                         </StackPanel>
@@ -53,7 +53,7 @@
                             <PathIcon Data="{x:Static content:Icons.Login}" Foreground="White" />
                             <TextBlock Margin="10,0,0,0"
                                        FontSize="13"
-                                       FontWeight="DemiBold"
+                                       FontWeight="{DynamicResource DefaultDemiBold}"
                                        Foreground="White"
                                        Text="Sign In" />
                         </StackPanel>
@@ -69,18 +69,21 @@
         <StreamGeometry x:Key="PasswordBoxRevealButtonData">m10.051 7.0032c2.215 0 4.0105 1.7901 4.0105 3.9984s-1.7956 3.9984-4.0105 3.9984c-2.215 0-4.0105-1.7901-4.0105-3.9984s1.7956-3.9984 4.0105-3.9984zm0 1.4994c-1.3844 0-2.5066 1.1188-2.5066 2.499s1.1222 2.499 2.5066 2.499 2.5066-1.1188 2.5066-2.499-1.1222-2.499-2.5066-2.499zm0-5.0026c4.6257 0 8.6188 3.1487 9.7267 7.5613 0.10085 0.40165-0.14399 0.80877-0.54686 0.90931-0.40288 0.10054-0.81122-0.14355-0.91208-0.54521-0.94136-3.7492-4.3361-6.4261-8.2678-6.4261-3.9334 0-7.3292 2.6792-8.2689 6.4306-0.10063 0.40171-0.50884 0.64603-0.91177 0.54571s-0.648-0.5073-0.54737-0.90901c1.106-4.4152 5.1003-7.5667 9.728-7.5667z</StreamGeometry>
         <StreamGeometry x:Key="PasswordBoxHideButtonData">m0.21967 0.21965c-0.26627 0.26627-0.29047 0.68293-0.07262 0.97654l0.07262 0.08412 4.0346 4.0346c-1.922 1.3495-3.3585 3.365-3.9554 5.7495-0.10058 0.4018 0.14362 0.8091 0.54543 0.9097 0.40182 0.1005 0.80909-0.1436 0.90968-0.5455 0.52947-2.1151 1.8371-3.8891 3.5802-5.0341l1.8096 1.8098c-0.70751 0.7215-1.1438 1.71-1.1438 2.8003 0 2.2092 1.7909 4 4 4 1.0904 0 2.0788-0.4363 2.8004-1.1438l5.9193 5.9195c0.2929 0.2929 0.7677 0.2929 1.0606 0 0.2663-0.2662 0.2905-0.6829 0.0726-0.9765l-0.0726-0.0841-6.1135-6.1142 0.0012-0.0015-1.2001-1.1979-2.8699-2.8693 2e-3 -8e-4 -2.8812-2.8782 0.0012-0.0018-1.1333-1.1305-4.3064-4.3058c-0.29289-0.29289-0.76777-0.29289-1.0607 0zm7.9844 9.0458 3.5351 3.5351c-0.45 0.4358-1.0633 0.704-1.7392 0.704-1.3807 0-2.5-1.1193-2.5-2.5 0-0.6759 0.26824-1.2892 0.7041-1.7391zm1.7959-5.7655c-1.0003 0-1.9709 0.14807-2.8889 0.425l1.237 1.2362c0.5358-0.10587 1.0883-0.16119 1.6519-0.16119 3.9231 0 7.3099 2.6803 8.2471 6.4332 0.1004 0.4018 0.5075 0.6462 0.9094 0.5459 0.4019-0.1004 0.6463-0.5075 0.5459-0.9094-1.103-4.417-5.0869-7.5697-9.7024-7.5697zm0.1947 3.5093 3.8013 3.8007c-0.1018-2.0569-1.7488-3.7024-3.8013-3.8007z</StreamGeometry>
 
-        <MenuFlyout   x:Key="DefaultTextBoxContextFlyout" Placement="Bottom">
-            <MenuItem Margin="10,0,0,0" x:Name="TextBoxContextFlyoutCutItem" 
+        <MenuFlyout x:Key="DefaultTextBoxContextFlyout" Placement="Bottom">
+            <MenuItem x:Name="TextBoxContextFlyoutCutItem"
+                      Margin="10,0,0,0"
                       Command="{Binding $parent[TextBox].Cut}"
                       Header="Cut"
                       InputGesture="{x:Static TextBox.CutGesture}"
                       IsEnabled="{Binding $parent[TextBox].CanCut}" />
-            <MenuItem Margin="10,0,0,0" x:Name="TextBoxContextFlyoutCopyItem"
+            <MenuItem x:Name="TextBoxContextFlyoutCopyItem"
+                      Margin="10,0,0,0"
                       Command="{Binding $parent[TextBox].Copy}"
                       Header="Copy"
                       InputGesture="{x:Static TextBox.CopyGesture}"
                       IsEnabled="{Binding $parent[TextBox].CanCopy}" />
-            <MenuItem Margin="10,0,0,0" x:Name="TextBoxContextFlyoutPasteItem"
+            <MenuItem x:Name="TextBoxContextFlyoutPasteItem"
+                      Margin="10,0,0,0"
                       Command="{Binding $parent[TextBox].Paste}"
                       Header="Paste"
                       InputGesture="{x:Static TextBox.PasteGesture}"
@@ -88,17 +91,20 @@
         </MenuFlyout>
 
         <ContextMenu x:Key="DefaultTextBoxContextMenu" x:Name="TextBoxContextMenu">
-            <MenuItem Margin="10,0,0,0" x:Name="TextBoxContextMenuCutItem"
+            <MenuItem x:Name="TextBoxContextMenuCutItem"
+                      Margin="10,0,0,0"
                       Command="{Binding $parent[TextBox].Cut}"
-                      Header="Cut" 
+                      Header="Cut"
                       InputGesture="{x:Static TextBox.CutGesture}"
                       IsEnabled="{Binding $parent[TextBox].CanCut}" />
-            <MenuItem Margin="10,0,0,0" x:Name="TextBoxContextMenuCopyItem"
+            <MenuItem x:Name="TextBoxContextMenuCopyItem"
+                      Margin="10,0,0,0"
                       Command="{Binding $parent[TextBox].Copy}"
                       Header="Copy"
                       InputGesture="{x:Static TextBox.CopyGesture}"
                       IsEnabled="{Binding $parent[TextBox].CanCopy}" />
-            <MenuItem Margin="10,0,0,0" x:Name="TextBoxContextMenuPasteItem"
+            <MenuItem x:Name="TextBoxContextMenuPasteItem"
+                      Margin="10,0,0,0"
                       Command="{Binding $parent[TextBox].Paste}"
                       Header="Paste"
                       InputGesture="{x:Static TextBox.PasteGesture}"
@@ -155,7 +161,6 @@
                             </Border>
 
 
-
                             <DockPanel Margin="{TemplateBinding Padding}"
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
@@ -166,7 +171,8 @@
                                            Text="{TemplateBinding Watermark}">
                                     <TextBlock.IsVisible>
                                         <MultiBinding Converter="{x:Static BoolConverters.And}">
-                                            <Binding Path="UseFloatingWatermark" RelativeSource="{RelativeSource TemplatedParent}" />
+                                            <Binding Path="UseFloatingWatermark"
+                                                     RelativeSource="{RelativeSource TemplatedParent}" />
                                             <Binding Converter="{x:Static StringConverters.IsNotNullOrEmpty}"
                                                      Path="Text"
                                                      RelativeSource="{RelativeSource TemplatedParent}" />
@@ -177,11 +183,8 @@
                                 <DataValidationErrors>
 
                                     <Grid ColumnDefinitions="Auto,*,Auto">
-                                        <ContentPresenter Grid.Column="0"
-                                                          Grid.ColumnSpan="1"
-                                                          Content="{TemplateBinding InnerLeftContent}" />
+                                        <ContentPresenter Grid.Column="0" Content="{TemplateBinding InnerLeftContent}" />
                                         <ScrollViewer Grid.Column="1"
-                                                      Grid.ColumnSpan="1"
                                                       HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
                                                       VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
                                             <Panel Margin="0,0,0,0">
@@ -207,9 +210,7 @@
                                                                TextWrapping="{TemplateBinding TextWrapping}" />
                                             </Panel>
                                         </ScrollViewer>
-                                        <ContentPresenter Grid.Column="2"
-                                                          Grid.ColumnSpan="1"
-                                                          Content="{TemplateBinding InnerRightContent}" />
+                                        <ContentPresenter Grid.Column="2" Content="{TemplateBinding InnerRightContent}" />
                                     </Grid>
                                 </DataValidationErrors>
                             </DockPanel>
@@ -267,7 +268,6 @@
                             </Border>
 
 
-
                             <DockPanel Margin="{TemplateBinding Padding}"
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
@@ -278,7 +278,8 @@
                                            Text="{TemplateBinding Watermark}">
                                     <TextBlock.IsVisible>
                                         <MultiBinding Converter="{x:Static BoolConverters.And}">
-                                            <Binding Path="UseFloatingWatermark" RelativeSource="{RelativeSource TemplatedParent}" />
+                                            <Binding Path="UseFloatingWatermark"
+                                                     RelativeSource="{RelativeSource TemplatedParent}" />
                                             <Binding Converter="{x:Static StringConverters.IsNotNullOrEmpty}"
                                                      Path="Text"
                                                      RelativeSource="{RelativeSource TemplatedParent}" />
@@ -289,11 +290,8 @@
                                 <DataValidationErrors>
 
                                     <Grid ColumnDefinitions="Auto,*,Auto">
-                                        <ContentPresenter Grid.Column="0"
-                                                          Grid.ColumnSpan="1"
-                                                          Content="{TemplateBinding InnerLeftContent}" />
+                                        <ContentPresenter Grid.Column="0" Content="{TemplateBinding InnerLeftContent}" />
                                         <ScrollViewer Grid.Column="1"
-                                                      Grid.ColumnSpan="1"
                                                       HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
                                                       VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
                                             <Panel>
@@ -322,9 +320,7 @@
 
                                             </Panel>
                                         </ScrollViewer>
-                                        <ContentPresenter Grid.Column="2"
-                                                          Grid.ColumnSpan="1"
-                                                          Content="{TemplateBinding InnerRightContent}" />
+                                        <ContentPresenter Grid.Column="2" Content="{TemplateBinding InnerRightContent}" />
                                     </Grid>
 
                                 </DataValidationErrors>
@@ -383,8 +379,6 @@
                             </Border.Transitions>
 
 
-
-
                             <DockPanel Margin="{TemplateBinding Padding}"
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
@@ -394,7 +388,8 @@
                                            Text="{TemplateBinding Watermark}">
                                     <TextBlock.IsVisible>
                                         <MultiBinding Converter="{x:Static BoolConverters.And}">
-                                            <Binding Path="UseFloatingWatermark" RelativeSource="{RelativeSource TemplatedParent}" />
+                                            <Binding Path="UseFloatingWatermark"
+                                                     RelativeSource="{RelativeSource TemplatedParent}" />
                                             <Binding Converter="{x:Static StringConverters.IsNotNullOrEmpty}"
                                                      Path="Text"
                                                      RelativeSource="{RelativeSource TemplatedParent}" />
@@ -416,9 +411,10 @@
                                                       VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
                                             <Panel>
                                                 <TextBlock Name="watermark"
+                                                           FontSize="{TemplateBinding FontSize}"
                                                            IsVisible="{TemplateBinding Text,
                                                                                        Converter={x:Static StringConverters.IsNullOrEmpty}}"
-                                                           Opacity="0.5" FontSize="{TemplateBinding FontSize}"
+                                                           Opacity="0.5"
                                                            Text="{TemplateBinding Watermark}"
                                                            TextAlignment="{TemplateBinding TextAlignment}"
                                                            TextWrapping="{TemplateBinding TextWrapping}" />
@@ -426,7 +422,6 @@
                                                                Margin="0,0,0,0"
                                                                CaretBrush="{DynamicResource SukiLowText}"
                                                                CaretIndex="{TemplateBinding CaretIndex}"
-                                                               TextBlock.FontSize="{TemplateBinding FontSize}"
                                                                PasswordChar="{TemplateBinding PasswordChar}"
                                                                RevealPassword="{TemplateBinding RevealPassword}"
                                                                SelectionBrush="{TemplateBinding SelectionBrush}"
@@ -436,6 +431,7 @@
                                                                Text="{TemplateBinding Text,
                                                                                       Mode=TwoWay}"
                                                                TextAlignment="{TemplateBinding TextAlignment}"
+                                                               TextBlock.FontSize="{TemplateBinding FontSize}"
                                                                TextBlock.Foreground="{TemplateBinding Foreground}"
                                                                TextWrapping="{TemplateBinding TextWrapping}" />
                                             </Panel>
@@ -590,7 +586,8 @@
         </Setter>
     </Style>
 
-    <Style Selector="ToggleButton.passwordBoxRevealButton:not(ToggleButton:checked) /template/ Path#PART_GlyphElement_Hide">
+    <Style
+        Selector="ToggleButton.passwordBoxRevealButton:not(ToggleButton:checked) /template/ Path#PART_GlyphElement_Hide">
         <Setter Property="IsVisible" Value="False" />
     </Style>
 
@@ -603,5 +600,4 @@
     </Style>
 
 
-
 </Styles>
\ No newline at end of file
diff --git a/SukiUI/Theme/TimePickerStyle.axaml b/SukiUI/Theme/TimePickerStyle.axaml
index 8df3a640d..6c67c0e60 100644
--- a/SukiUI/Theme/TimePickerStyle.axaml
+++ b/SukiUI/Theme/TimePickerStyle.axaml
@@ -320,7 +320,7 @@
                                               Foreground="{DynamicResource SukiPrimaryColor}" />
                                     <TextBlock Margin="10,0,0,0"
                                                FontSize="15"
-                                               FontWeight="DemiBold"
+                                               FontWeight="{DynamicResource DefaultDemiBold}"
                                                Foreground="{DynamicResource SukiPrimaryColor}"
                                                Text="Apply" />
                                 </StackPanel>
diff --git a/SukiUI/Theme/ToggleButtonStyles.xaml b/SukiUI/Theme/ToggleButtonStyles.xaml
index b251f68c0..abd769747 100644
--- a/SukiUI/Theme/ToggleButtonStyles.xaml
+++ b/SukiUI/Theme/ToggleButtonStyles.xaml
@@ -16,7 +16,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource SukiControlBorderBrush}" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Padding" Value="18,10,18,8" />
-        <Setter Property="FontWeight" Value="DemiBold" />
+        <Setter Property="FontWeight" Value="{DynamicResource DefaultDemiBold}" />
         <Setter Property="FontSize" Value="14" />
         <Setter Property="Foreground" Value="{DynamicResource SukiText}" />
         <Setter Property="Transitions">
@@ -188,9 +188,7 @@
                                     CornerRadius="{DynamicResource MediumCornerRadius}">
                                 <Border />
                                 <Border.Transitions>
-                                    <Transitions >
-                                     
-                                    </Transitions>
+                                    <Transitions />
                                 </Border.Transitions>
                             </Border>
 
@@ -201,11 +199,9 @@
             </ControlTemplate>
         </Setter>
     </Style>
-    
-   
 
 
-   <Style Selector="ToggleButton.Switch:unchecked /template/ Border#SwitchKnob">
+    <Style Selector="ToggleButton.Switch:unchecked /template/ Border#SwitchKnob">
         <Style.Animations>
             <Animation FillMode="Both" Duration="0:0:0.4">
                 <Animation.Easing>
@@ -255,8 +251,8 @@
                     <Setter Property="Canvas.Left" Value="11" />
 
                 </KeyFrame>
-                
-                
+
+
                 <KeyFrame Cue="80%">
                     <Setter Property="Width" Value="18" />
                 </KeyFrame>
@@ -277,7 +273,7 @@
     </Style>
 
 
-  <!--  <Style Selector="ToggleButton.Switch:pressed[IsChecked=False] /template/ Border#SwitchKnob">
+    <!--  <Style Selector="ToggleButton.Switch:pressed[IsChecked=False] /template/ Border#SwitchKnob">
         <Style.Animations>
             <Animation FillMode="Forward" Duration="0:0:0.15">
                 <KeyFrame Cue="0%">
@@ -309,8 +305,7 @@
             </Animation>
         </Style.Animations>
         <Setter Property="Width" Value="20" />
-    </Style>
--->
+    </Style>    -->
 
     <Style Selector="ToggleButton.Switch:checked /template/ Border#SwitchBackground">
         <Setter Property="Background" Value="{DynamicResource SukiPrimaryColor}" />
@@ -324,11 +319,11 @@
         <Setter Property="Background" Value="Transparent" />
         <Style Selector="^:checked">
             <Setter Property="Background" Value="Transparent" />
-            <Setter Property="Foreground" Value="{DynamicResource SukiText}"></Setter>
+            <Setter Property="Foreground" Value="{DynamicResource SukiText}" />
         </Style>
         <Style Selector="^:pointerover">
             <Setter Property="Background" Value="Transparent" />
-            <Setter Property="Foreground" Value="{DynamicResource SukiText}"></Setter>
+            <Setter Property="Foreground" Value="{DynamicResource SukiText}" />
         </Style>
         <Style Selector="^:checked">
             <Setter Property="Background" Value="Transparent" />