From f0642982bc0a593cb46a4f32c8d4d219b0372aea Mon Sep 17 00:00:00 2001
From: yuzh <46953451+yuzh0816@users.noreply.github.com>
Date: Thu, 29 Aug 2024 10:34:20 +0800
Subject: [PATCH] modify: Merge SukiUI

---
 SukiUI/ColorTheme/Dark.axaml                  | 12 ++--
 SukiUI/ColorTheme/Light.axaml                 |  9 ++-
 SukiUI/ColorTheme/NotificationColor.cs        | 52 ++++++++++++--
 SukiUI/Content/Shaders/Background/bubble.sksl | 14 ++--
 .../Shaders/Background/bubblestrong.sksl      | 10 +--
 SukiUI/Content/Shaders/Background/flat.sksl   |  2 +-
 .../Content/Shaders/Background/gradient.sksl  | 14 ++--
 SukiUI/Controls/GlassMorphism/GlassCard.axaml | 31 ++++++++-
 SukiUI/Controls/GroupBox.axaml                |  8 +--
 SukiUI/Controls/InfoBadge.axaml               |  4 +-
 SukiUI/Controls/InfoBadge.axaml.cs            | 14 ++--
 SukiUI/Controls/InfoBar.axaml.cs              | 12 ++--
 .../PropertyGridTemplateSelector.axaml        |  4 +-
 .../PropertyGridTemplateSelector.axaml.cs     | 27 ++++----
 SukiUI/Controls/SukiSideMenu.axaml            | 14 ++--
 SukiUI/Controls/SukiWindow.axaml              |  3 +-
 SukiUI/Controls/SukiWindow.axaml.cs           |  5 ++
 SukiUI/Enums/SukiBackgroundStyle.cs           |  2 +-
 SukiUI/Enums/ToastLocation.cs                 |  4 +-
 SukiUI/Models/SukiColorTheme.cs               |  6 +-
 SukiUI/Theme/Button.axaml                     |  2 +-
 SukiUI/Theme/CalendarDatePickerStyle.axaml    | 10 ++-
 SukiUI/Theme/CheckBoxStyles.axaml             | 38 +++--------
 SukiUI/Theme/ComboBoxStyles.xaml              | 30 ++++----
 SukiUI/Theme/DatePicker.axaml                 | 18 +++--
 SukiUI/Theme/DropDownButton.axaml             | 15 ++--
 SukiUI/Theme/FlyoutPresenter.axaml            |  2 +-
 SukiUI/Theme/HyperlinkButton.axaml            | 21 +++---
 SukiUI/Theme/Index.axaml                      |  3 +-
 SukiUI/Theme/Menu.axaml                       | 11 ++-
 SukiUI/Theme/MenuFlyoutPresenter.axaml        | 14 ++--
 SukiUI/Theme/MenuItem.axaml                   | 15 +---
 SukiUI/Theme/NumericUpDownStyles.xaml         | 17 +++--
 SukiUI/Theme/ProgressBarStyles.xaml           | 20 +++---
 SukiUI/Theme/RadioButtonStyles.xaml           | 56 +++------------
 SukiUI/Theme/Separator.axaml                  | 36 ++++++++++
 SukiUI/Theme/SliderStyles.xaml                | 18 ++---
 SukiUI/Theme/TabControl.axaml                 | 19 +++++-
 SukiUI/Theme/TextBoxStyles.xaml               | 61 +++++++++++------
 SukiUI/Theme/TimePickerStyle.axaml            | 25 ++++---
 SukiUI/Theme/ToggleSwitchStyles.xaml          | 68 ++++++++++++++++---
 SukiUI/Utilities/Effects/SukiEffect.cs        |  1 +
 42 files changed, 456 insertions(+), 291 deletions(-)
 create mode 100644 SukiUI/Theme/Separator.axaml

diff --git a/SukiUI/ColorTheme/Dark.axaml b/SukiUI/ColorTheme/Dark.axaml
index ac455d52..facb4f48 100644
--- a/SukiUI/ColorTheme/Dark.axaml
+++ b/SukiUI/ColorTheme/Dark.axaml
@@ -4,7 +4,7 @@
     <Color x:Key="SukiBackground">Transparent</Color>
     <Color x:Key="SukiStrongBackground">#353535</Color>
     <Color x:Key="SukiLightBackground">Transparent</Color>
-    <Color x:Key="SukiCardBackground">#292929</Color>
+    <Color x:Key="SukiCardBackground">#323232</Color>
     <Color x:Key="SukiGlassCardBackground">#49aaaaaa</Color>
     <Color x:Key="SukiGlassCardOpaqueBackground">#333333</Color>
     <Color x:Key="SukiControlTouchBackground">#505050</Color>
@@ -24,10 +24,10 @@
     <BoxShadows x:Key="SukiSwitchShadow">0 1 5 0 #555555</BoxShadows>
     <BoxShadows x:Key="SukiSmallPopupShadow">0 0 4 1 #101010</BoxShadows>
     <BoxShadows x:Key="SukiPopupShadow">1 1 14 1 #101010</BoxShadows>
-    <BoxShadows x:Key="SukiBigPopupShadow">1 1 15 0 #606060</BoxShadows>
+    <BoxShadows x:Key="SukiBigPopupShadow">1 4 17 0 #111111</BoxShadows>
     
     <LinearGradientBrush x:Key="PopupGradientBrush" StartPoint="0%,0%" EndPoint="100%,100%">
-        <GradientStop Color="{DynamicResource SukiAccentColor10}" Offset="0"></GradientStop>
+        <GradientStop Color="{DynamicResource SukiAccentColor3}" Offset="0"></GradientStop>
         <GradientStop Color="{DynamicResource SukiPrimaryColor10}" Offset="0.9"></GradientStop>
 
     </LinearGradientBrush>
@@ -36,7 +36,9 @@
     <system:Boolean x:Key="IsLight">False</system:Boolean>
 
     <system:Double x:Key="GlassOpacity">0.18</system:Double>
-    <system:Double x:Key="GlassOpacityDark">0.18</system:Double>
-    <system:Double x:Key="GlassOpacityLight">0.57</system:Double>
+   
+    <system:Double x:Key="ControlGlassOpacity">0.3</system:Double>
+    <system:Double x:Key="DiscreteControlGlassOpacity">0.17</system:Double>
+    <Color x:Key="ControlSukiGlassCardBackground">#49aaaaaa</Color>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/SukiUI/ColorTheme/Light.axaml b/SukiUI/ColorTheme/Light.axaml
index 3ffc3dd6..38caa0bf 100644
--- a/SukiUI/ColorTheme/Light.axaml
+++ b/SukiUI/ColorTheme/Light.axaml
@@ -24,7 +24,7 @@
     <BoxShadows x:Key="SukiSwitchShadow">0 1 5 0 #aaaaaa</BoxShadows>
     <BoxShadows x:Key="SukiSmallPopupShadow">0 0 2 0 DimGray</BoxShadows>
     <BoxShadows x:Key="SukiPopupShadow">1 1 8 0 LightGray</BoxShadows>
-    <BoxShadows x:Key="SukiBigPopupShadow">1 1 15 0 #dedede</BoxShadows>
+    <BoxShadows x:Key="SukiBigPopupShadow">1 4 17 0 #999999</BoxShadows>
     
     <LinearGradientBrush x:Key="PopupGradientBrush" StartPoint="0%,0%" EndPoint="100%,100%">
         <GradientStop Color="{DynamicResource SukiAccentColor5}" Offset="0"></GradientStop>
@@ -36,6 +36,9 @@
     <system:Boolean x:Key="IsLight">True</system:Boolean>
 
     <system:Double x:Key="GlassOpacity">0.42</system:Double>
-    <system:Double x:Key="GlassOpacityDark">0.3</system:Double>
-    <system:Double x:Key="GlassOpacityLight">0.42</system:Double>
+    
+    <system:Double x:Key="ControlGlassOpacity">0.05</system:Double>
+    <system:Double x:Key="DiscreteControlGlassOpacity">0.4</system:Double>
+    <Color x:Key="ControlSukiGlassCardBackground">#fd111111</Color>
+    
 </ResourceDictionary>
diff --git a/SukiUI/ColorTheme/NotificationColor.cs b/SukiUI/ColorTheme/NotificationColor.cs
index af4355dc..d9211a8f 100644
--- a/SukiUI/ColorTheme/NotificationColor.cs
+++ b/SukiUI/ColorTheme/NotificationColor.cs
@@ -1,11 +1,53 @@
-using Avalonia.Media;
+using Avalonia;
+using Avalonia.Media;
+using Avalonia.Styling;
 
 namespace SukiUI.ColorTheme;
 
 public static class NotificationColor
 {
-    public static readonly SolidColorBrush InfoIconForeground = new(Color.FromRgb(47,84,235));
-    public static readonly SolidColorBrush SuccessIconForeground = new(Color.FromRgb(56,158,13));
-    public static readonly SolidColorBrush WarningIconForeground = new(Color.FromRgb(240,140,22));
-    public static readonly SolidColorBrush ErrorIconForeground = new(Color.FromRgb(236,63,48));
+    public static readonly LinearGradientBrush InfoIconForeground = new LinearGradientBrush()
+    {
+        EndPoint = new RelativePoint(0, 0, RelativeUnit.Relative),
+        StartPoint = new RelativePoint(1, 1, RelativeUnit.Relative),
+        GradientStops = new GradientStops()
+        {
+            new() { Color = Color.FromRgb(89,126,247), Offset = 0.3 },
+            new() { Color = Color.FromRgb(47,84,235), Offset = 1 },
+            
+        }
+    };
+    public static readonly LinearGradientBrush SuccessIconForeground =  new LinearGradientBrush()
+    {
+        EndPoint = new RelativePoint(0, 0, RelativeUnit.Relative),
+        StartPoint = new RelativePoint(1, 1, RelativeUnit.Relative),
+        GradientStops = new GradientStops()
+        {
+            new() { Color = Color.FromRgb(82,196,26), Offset = 0.3 },
+            new() { Color = Color.FromRgb(56,158,13), Offset = 1 },
+            
+        }
+    };
+    public static readonly LinearGradientBrush WarningIconForeground = new LinearGradientBrush()
+    {
+        EndPoint = new RelativePoint(0, 0, RelativeUnit.Relative),
+        StartPoint = new RelativePoint(1, 1, RelativeUnit.Relative),
+        GradientStops = new GradientStops()
+        {
+            new() { Color = Color.FromRgb(255,169,64), Offset = 0.3 },
+            new() { Color = Color.FromRgb(250,140,22), Offset = 1 },
+            
+        }
+    };
+    public static readonly LinearGradientBrush ErrorIconForeground = new LinearGradientBrush()
+    {
+        EndPoint = new RelativePoint(0, 0, RelativeUnit.Relative),
+        StartPoint = new RelativePoint(1, 1, RelativeUnit.Relative),
+        GradientStops = new GradientStops()
+        {
+            new() { Color = Color.FromRgb(255,77,79), Offset = 0.3 },
+            new() { Color = Color.FromRgb(245,34,45), Offset = 1 },
+            
+        }
+    };
 }
\ No newline at end of file
diff --git a/SukiUI/Content/Shaders/Background/bubble.sksl b/SukiUI/Content/Shaders/Background/bubble.sksl
index 57f2fc15..6c2b450c 100644
--- a/SukiUI/Content/Shaders/Background/bubble.sksl
+++ b/SukiUI/Content/Shaders/Background/bubble.sksl
@@ -13,9 +13,9 @@ vec3 blendOverlay(vec3 base, vec3 blend) {
 
 vec3 blendOverlayDark(vec3 base, vec3 blend) {
     vec3 result;
-    result.r = (base.r < 0.5) ? (4 * base.r * blend.r) : (3.5 - 2.0 * (3 - base.r) * (3.5 - blend.r));
-    result.g = (base.g < 0.5) ? (4 * base.g * blend.g) : (3.5 - 2.0 * (3 - base.g) * (3.5 - blend.g));
-    result.b = (base.b < 0.5) ? (4 * base.b * blend.b) : (3.5 - 2.0 * (3 - base.b) * (3.5 - blend.b));
+    result.r = (base.r < 0.5) ? (5 * base.r * blend.r) : (4 - 2.0 * (3 - base.r) * (4 - blend.r));
+    result.g = (base.g < 0.5) ? (5 * base.g * blend.g) : (4 - 2.0 * (3 - base.g) * (4 - blend.g));
+    result.b = (base.b < 0.5) ? (5 * base.b * blend.b) : (4 - 2.0 * (3 - base.b) * (4 - blend.b));
     return mix(base, clamp(result, 0.0, 1.0), 0.5); // Mélange avec la couleur de base pour réduire l'assombrissement
 }
 
@@ -66,16 +66,16 @@ vec4 main(vec2 fragCoord) {
     float opacityLayer2 = 0.85 - (iDark / 2);
 
     
-    float iPrimaryOpacity = 1; // Exemple de nouvelle opacité pour iPrimary
+    float iPrimaryOpacity = 1.1;
     if (iDark == 1) {
-        iPrimaryOpacity = 0.28;
+        iPrimaryOpacity = 0.52;
     }
     vec3 iPrimaryWithOpacity = iPrimary * iPrimaryOpacity;
 
   
-    float iAccentOpacity = 0.8; 
+    float iAccentOpacity = 1; 
     if (iDark == 1) {
-            iAccentOpacity = 0.34;
+            iAccentOpacity = 0.9;
         }
     vec3 iAccentWithOpacity = iAccent * iAccentOpacity;
 
diff --git a/SukiUI/Content/Shaders/Background/bubblestrong.sksl b/SukiUI/Content/Shaders/Background/bubblestrong.sksl
index 2ae3213c..47f2665d 100644
--- a/SukiUI/Content/Shaders/Background/bubblestrong.sksl
+++ b/SukiUI/Content/Shaders/Background/bubblestrong.sksl
@@ -13,9 +13,9 @@ vec3 blendOverlay(vec3 base, vec3 blend) {
 
 vec3 blendOverlayDark(vec3 base, vec3 blend) {
     vec3 result;
-    result.r = (base.r < 0.5) ? (4 * base.r * blend.r) : (3.5 - 2.0 * (3 - base.r) * (3.5 - blend.r));
-    result.g = (base.g < 0.5) ? (4 * base.g * blend.g) : (3.5 - 2.0 * (3 - base.g) * (3.5 - blend.g));
-    result.b = (base.b < 0.5) ? (4 * base.b * blend.b) : (3.5 - 2.0 * (3 - base.b) * (3.5 - blend.b));
+    result.r = (base.r < 0.5) ? (5 * base.r * blend.r) : (4 - 2.0 * (3 - base.r) * (4 - blend.r));
+    result.g = (base.g < 0.5) ? (5 * base.g * blend.g) : (4 - 2.0 * (3 - base.g) * (4 - blend.g));
+    result.b = (base.b < 0.5) ? (5 * base.b * blend.b) : (4 - 2.0 * (3 - base.b) * (4 - blend.b));
     return mix(base, clamp(result, 0.0, 1.0), 0.5); // Mélange avec la couleur de base pour réduire l'assombrissement
 }
 
@@ -68,14 +68,14 @@ vec4 main(vec2 fragCoord) {
     
     float iPrimaryOpacity = 1.1; // Exemple de nouvelle opacité pour iPrimary
     if (iDark == 1) {
-        iPrimaryOpacity = 0.34;
+        iPrimaryOpacity = 0.52;
     }
     vec3 iPrimaryWithOpacity = iPrimary * iPrimaryOpacity;
 
   
     float iAccentOpacity = 1; 
     if (iDark == 1) {
-            iAccentOpacity = 0.55;
+            iAccentOpacity = 0.9;
         }
     vec3 iAccentWithOpacity = iAccent * iAccentOpacity;
 
diff --git a/SukiUI/Content/Shaders/Background/flat.sksl b/SukiUI/Content/Shaders/Background/flat.sksl
index b3d36523..c671dcff 100644
--- a/SukiUI/Content/Shaders/Background/flat.sksl
+++ b/SukiUI/Content/Shaders/Background/flat.sksl
@@ -1,7 +1,7 @@
 vec4 main(vec2 fragCoord) {
     
     if(iDark == 1)
-        return vec4(iBase * 0.7, iAlpha);
+        return vec4(iBase * 1, iAlpha);
         
     return vec4(iBase, iAlpha);
 }
\ No newline at end of file
diff --git a/SukiUI/Content/Shaders/Background/gradient.sksl b/SukiUI/Content/Shaders/Background/gradient.sksl
index b071e431..0daeb7dd 100644
--- a/SukiUI/Content/Shaders/Background/gradient.sksl
+++ b/SukiUI/Content/Shaders/Background/gradient.sksl
@@ -13,9 +13,9 @@ vec3 blendOverlay(vec3 base, vec3 blend) {
 
 vec3 blendOverlayDark(vec3 base, vec3 blend) {
     vec3 result;
-    result.r = (base.r < 0.5) ? (4 * base.r * blend.r) : (3.5 - 2.0 * (3 - base.r) * (3.5 - blend.r));
-    result.g = (base.g < 0.5) ? (4 * base.g * blend.g) : (3.5 - 2.0 * (3 - base.g) * (3.5 - blend.g));
-    result.b = (base.b < 0.5) ? (4 * base.b * blend.b) : (3.5 - 2.0 * (3 - base.b) * (3.5 - blend.b));
+    result.r = (base.r < 0.5) ? (2 * base.r * blend.r) : (4 - 1.5 * (3 - base.r) * (4 - blend.r));
+    result.g = (base.g < 0.5) ? (2* base.g * blend.g) : (4 - 1.5 * (3 - base.g) * (4 - blend.g));
+    result.b = (base.b < 0.5) ? (2 * base.b * blend.b) : (4 - 1.5 * (3 - base.b) * (4 - blend.b));
     return mix(base, clamp(result, 0.0, 1.0), 0.5); // Mélange avec la couleur de base pour réduire l'assombrissement
 }
 
@@ -66,16 +66,16 @@ vec4 main(vec2 fragCoord) {
     float opacityLayer2 = 0.85 - (iDark / 2);
 
     
-    float iPrimaryOpacity = 0.8; // Exemple de nouvelle opacité pour iPrimary
+    float iPrimaryOpacity = 0.2; // Exemple de nouvelle opacité pour iPrimary
     if (iDark == 1) {
-        iPrimaryOpacity = 0.32;
+        iPrimaryOpacity = 0.4;
     }
     vec3 iPrimaryWithOpacity = iPrimary * iPrimaryOpacity;
 
   
-    float iAccentOpacity = 0; 
+    float iAccentOpacity = 1; 
     if (iDark == 1) {
-            iAccentOpacity = 0;
+            iAccentOpacity = 2;
         }
     vec3 iAccentWithOpacity = iPrimary * iAccentOpacity;
 
diff --git a/SukiUI/Controls/GlassMorphism/GlassCard.axaml b/SukiUI/Controls/GlassMorphism/GlassCard.axaml
index f3984536..d1a3ab06 100644
--- a/SukiUI/Controls/GlassMorphism/GlassCard.axaml
+++ b/SukiUI/Controls/GlassMorphism/GlassCard.axaml
@@ -3,13 +3,14 @@
                     xmlns:suki="clr-namespace:SukiUI.Controls">
     <ControlTheme x:Key="SukiGlassCardStyle" TargetType="suki:GlassCard">
         <Setter Property="BorderBrush" Value="{DynamicResource GlassBorderBrush}" />
+        <Setter Property="Background" Value="{DynamicResource SukiGlassCardBackground}" />
         <Setter Property="Padding" Value="20" />
         <Setter Property="Template">
             <ControlTemplate>
             
                 <Panel Name="RootPanel" Opacity="0">
                     <Border Name="PART_BorderCard" RenderTransformOrigin="50%,50%"
-                            Background="{DynamicResource SukiGlassCardBackground}"
+                            Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
                             ClipToBounds="{TemplateBinding ClipToBounds}"
@@ -53,6 +54,29 @@
                 </Panel>
             </ControlTemplate>
         </Setter>
+        
+        
+        <Style Selector="^.Control">
+            <Setter Property="IsAnimated" Value="False"></Setter>
+            <Setter Property="Padding" Value="0"></Setter>
+        </Style>
+        
+        <Style Selector="^.Discrete">
+            <Setter Property="BorderBrush" Value="{DynamicResource SukiControlBorderBrush}" />
+            <Setter Property="Padding" Value="0"></Setter>
+        </Style>
+        <Style Selector="^.Control /template/ Border#PART_BorderCard">
+            <Setter Property="Background" Value="{DynamicResource ControlSukiGlassCardBackground}" />
+            <Setter Property="Opacity" Value="{DynamicResource ControlGlassOpacity}" />
+        </Style>
+        
+        <Style Selector="^.Discrete /template/ Border#PART_BorderCard">
+            <Setter Property="Background" Value="{DynamicResource SukiGlassCardBackground}" />
+            <Setter Property="Opacity" Value="{DynamicResource DiscreteControlGlassOpacity}" />
+            
+
+        </Style>
+        
         <Style Selector="^.Primary /template/ Border#PART_ClipBorder">
             <Setter Property="BorderBrush" Value="{DynamicResource SukiAccentColor0}" />
         </Style>
@@ -79,6 +103,11 @@
             <Setter Property="Background" Value="{DynamicResource SukiPrimaryColor25}" />
         </Style>
         
+        <Style Selector="^.PrimaryOpaque /template/ Border#PART_BorderCard">
+            <Setter Property="Opacity" Value="1"/>
+            <Setter Property="Background" Value="{DynamicResource SukiPrimaryColor}" />
+        </Style>
+        
         <Style Selector="^[IsVisible=True] /template/ Panel#RootPanel">
             <Setter Property="Opacity" Value="1" />
         </Style>
diff --git a/SukiUI/Controls/GroupBox.axaml b/SukiUI/Controls/GroupBox.axaml
index d0f95837..3aa78f6b 100644
--- a/SukiUI/Controls/GroupBox.axaml
+++ b/SukiUI/Controls/GroupBox.axaml
@@ -11,7 +11,7 @@
         <Style Selector="suki|GroupBox">
             <Setter Property="Template">
                 <ControlTemplate>
-                    <StackPanel>
+                    <Grid RowDefinitions="Auto, Auto, *">
                         <ContentControl Margin="0,0,0,0" Content="{TemplateBinding Header}">
                             <ContentControl.Styles>
                                 <Style Selector="TextBlock">
@@ -23,12 +23,12 @@
                             </ContentControl.Styles>
                         </ContentControl>
 
-                        <Border Height="1"
+                        <Border Grid.Row="1" Height="1"
                                 Margin="0,10,0,10"
                                 Background="{DynamicResource SukiControlBorderBrush}"
                                 BorderThickness="0" />
-                        <ContentControl Content="{TemplateBinding Content}" />
-                    </StackPanel>
+                        <ContentControl Grid.Row="2" Content="{TemplateBinding Content}" />
+                    </Grid>
                 </ControlTemplate>
             </Setter>
         </Style>
diff --git a/SukiUI/Controls/InfoBadge.axaml b/SukiUI/Controls/InfoBadge.axaml
index ecddd1fe..96c1b5d3 100644
--- a/SukiUI/Controls/InfoBadge.axaml
+++ b/SukiUI/Controls/InfoBadge.axaml
@@ -8,7 +8,7 @@
                     Height="400"
                     Margin="0,20,0,0"
                     Spacing="20">
-            <controls:InfoBadge Appearance="Info"
+            <controls:InfoBadge Appearance="Information"
                                 CornerPosition="TopRight"
                                 Header="Info">
 
@@ -34,7 +34,7 @@
                                 IsDot="True">
                 <Button />
             </controls:InfoBadge>
-            <controls:InfoBadge Appearance="Info"
+            <controls:InfoBadge Appearance="Information"
                                 CornerPosition="TopRight"
                                 Header="100"
                                 Overflow="99">
diff --git a/SukiUI/Controls/InfoBadge.axaml.cs b/SukiUI/Controls/InfoBadge.axaml.cs
index 9d4f5121..fa379ee4 100644
--- a/SukiUI/Controls/InfoBadge.axaml.cs
+++ b/SukiUI/Controls/InfoBadge.axaml.cs
@@ -12,20 +12,20 @@ public class InfoBadge: HeaderedContentControl
 {
     private Border? _badgeContainer;
     
-    public static readonly StyledProperty<NotificationType> AppearanceProperty =
-        AvaloniaProperty.Register<InfoBadge, NotificationType>(nameof(Appearance), NotificationType.Info);
+    public static readonly StyledProperty<Avalonia.Controls.Notifications.NotificationType> AppearanceProperty =
+        AvaloniaProperty.Register<InfoBadge, Avalonia.Controls.Notifications.NotificationType>(nameof(Appearance), Avalonia.Controls.Notifications.NotificationType.Information);
 
-    public NotificationType Appearance
+    public Avalonia.Controls.Notifications.NotificationType Appearance
     {
         get => GetValue(AppearanceProperty);
         set
         {
             Background = value switch
             {
-                NotificationType.Info => NotificationColor.InfoIconForeground,
-                NotificationType.Success => NotificationColor.SuccessIconForeground,
-                NotificationType.Warning => NotificationColor.WarningIconForeground,
-                NotificationType.Error => NotificationColor.ErrorIconForeground,
+                Avalonia.Controls.Notifications.NotificationType.Information => NotificationColor.InfoIconForeground,
+                Avalonia.Controls.Notifications.NotificationType.Success => NotificationColor.SuccessIconForeground,
+                Avalonia.Controls.Notifications.NotificationType.Warning => NotificationColor.WarningIconForeground,
+                Avalonia.Controls.Notifications.NotificationType.Error => NotificationColor.ErrorIconForeground,
                 _ => NotificationColor.InfoIconForeground
             };
             
diff --git a/SukiUI/Controls/InfoBar.axaml.cs b/SukiUI/Controls/InfoBar.axaml.cs
index 0afedcae..7fd02b4b 100644
--- a/SukiUI/Controls/InfoBar.axaml.cs
+++ b/SukiUI/Controls/InfoBar.axaml.cs
@@ -1,19 +1,17 @@
-using System.Windows.Input;
-using Avalonia;
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.Notifications;
 using Avalonia.Controls.Primitives;
-using Avalonia.Interactivity;
 using Avalonia.Media;
 using SukiUI.ColorTheme;
 using SukiUI.Content;
-using SukiUI.Enums;
 
 namespace SukiUI.Controls;
 
 public class InfoBar : ContentControl
 {
     public static readonly StyledProperty<NotificationType> SeverityProperty =
-        AvaloniaProperty.Register<InfoBar, NotificationType>(nameof(Severity), NotificationType.Info);
+        AvaloniaProperty.Register<InfoBar, NotificationType>(nameof(Severity), NotificationType.Information);
 
     public NotificationType Severity
     {
@@ -22,7 +20,7 @@ public NotificationType Severity
         {
             Icon = value switch
             {
-                NotificationType.Info => Icons.InformationOutline,
+                NotificationType.Information => Icons.InformationOutline,
                 NotificationType.Success => Icons.Check,
                 NotificationType.Warning => Icons.AlertOutline,
                 NotificationType.Error => Icons.AlertOutline,
@@ -31,7 +29,7 @@ public NotificationType Severity
             
             IconForeground = value switch
             {
-                NotificationType.Info => NotificationColor.InfoIconForeground,
+                NotificationType.Information => NotificationColor.InfoIconForeground,
                 NotificationType.Success => NotificationColor.SuccessIconForeground,
                 NotificationType.Warning => NotificationColor.WarningIconForeground,
                 NotificationType.Error => NotificationColor.ErrorIconForeground,
diff --git a/SukiUI/Controls/PropertyGrid/PropertyGridTemplateSelector.axaml b/SukiUI/Controls/PropertyGrid/PropertyGridTemplateSelector.axaml
index bb56d98d..f876aa17 100644
--- a/SukiUI/Controls/PropertyGrid/PropertyGridTemplateSelector.axaml
+++ b/SukiUI/Controls/PropertyGrid/PropertyGridTemplateSelector.axaml
@@ -41,7 +41,7 @@
 
             <TextBlock Classes="Label" />
             <DatePicker Grid.Column="2" Width="175"
-                        Margin="4,0" Height="36"
+                        Margin="-6,0" Height="36"
                         HorizontalAlignment="Right"
                         VerticalAlignment="Stretch"
                         IsEnabled="{Binding !IsReadOnly}"
@@ -59,7 +59,7 @@
 
             <TextBlock Classes="Label" />
             <DatePicker Grid.Column="2"
-                        Margin="4,0" Height="36"
+                        Margin="-6,0" Height="36"
                         HorizontalAlignment="Right" Width="175"
                         VerticalAlignment="Stretch"
                         IsEnabled="{Binding !IsReadOnly}"
diff --git a/SukiUI/Controls/PropertyGrid/PropertyGridTemplateSelector.axaml.cs b/SukiUI/Controls/PropertyGrid/PropertyGridTemplateSelector.axaml.cs
index 4179eb47..8590ff18 100644
--- a/SukiUI/Controls/PropertyGrid/PropertyGridTemplateSelector.axaml.cs
+++ b/SukiUI/Controls/PropertyGrid/PropertyGridTemplateSelector.axaml.cs
@@ -9,7 +9,7 @@ namespace SukiUI.Controls;
 public partial class PropertyGridTemplateSelector : ResourceDictionary, IDataTemplate
 {
     public bool UseSukiHost { get; set; } = true;
-
+    
     public PropertyGridTemplateSelector()
     {
         InitializeComponent();
@@ -70,19 +70,18 @@ private async void OnMoreInfoClick(object sender, RoutedEventArgs e)
         {
             return;
         }
-
-        if (UseSukiHost)
-        {
-            if (control.DataContext is not ComplexTypeViewModel childViewModel || childViewModel.Value is null)
-            {
-                return;
-            }
-
-            SukiHost.ShowDialog(new PropertyGridDialog()
-            {
-                DataContext = childViewModel.Value
-            }, true, true);
-        }
+        // TODO: No longer possible to just statically use SukiHost to show dialogs.
+        // if (UseSukiHost)
+        // {
+        //     if (control.DataContext is not ComplexTypeViewModel childViewModel || childViewModel.Value is null)
+        //     {
+        //         return;
+        //     }
+        //     SukiHost.ShowDialog(new PropertyGridDialog()
+        //     {
+        //         DataContext = childViewModel.Value
+        //     }, true, true);
+        // }
         else
         {
             var root = control.GetVisualRoot();
diff --git a/SukiUI/Controls/SukiSideMenu.axaml b/SukiUI/Controls/SukiSideMenu.axaml
index e13cb769..e273d732 100644
--- a/SukiUI/Controls/SukiSideMenu.axaml
+++ b/SukiUI/Controls/SukiSideMenu.axaml
@@ -16,12 +16,12 @@
                     <SplitView.Pane>
                         <Border>
                             <Grid Background="Transparent">
-                                <suki:GlassCard Name="Glass"
-                                                BorderThickness="0"
+                                <suki:GlassCard Name="Glass" Classes=""
+                                                BorderThickness="0,0,1,0"
                                                 CornerRadius="0"
                                                 IsAnimated="False" />
                                 <DockPanel>
-                                    <!--<Button Name="PART_SidebarToggleButton"
+                                    <!-- <Button Name="PART_SidebarToggleButton"
                                             Margin="7"
                                             HorizontalAlignment="{TemplateBinding TogglePaneButtonPosition}"
                                             VerticalAlignment="Top"
@@ -41,7 +41,7 @@
                                                 </PathIcon.Transitions>
                                             </PathIcon>
                                         </Panel>
-                                    </Button>-->
+                                    </Button> -->
                                     <Grid MinHeight="{TemplateBinding HeaderMinHeight}"
                                           DockPanel.Dock="Top"
                                           IsVisible="{TemplateBinding IsMenuExpanded}">
@@ -57,12 +57,12 @@
                                     <DockPanel>
                                         <StackPanel IsVisible="{TemplateBinding IsSearchEnabled}" DockPanel.Dock="Top">
                                             <StackPanel.Styles>
-                                                <Style Selector="suki|GlassCard:pointerover">
+                                                <Style Selector="suki|GlassCard.Search:pointerover">
                                                     <Setter Property="Width" Value="190"></Setter>
                                                     <Setter Property="CornerRadius" Value="12" />
                                                 </Style>
                                             </StackPanel.Styles>
-                                            <suki:GlassCard HorizontalAlignment="Right" IsAnimated="False" Width="42" Margin="15,10,15,15" CornerRadius="22" Height="42">
+                                            <suki:GlassCard Classes="Search" HorizontalAlignment="Right" IsAnimated="False" Width="42" Margin="15,10,15,15" CornerRadius="22" Height="42">
                                                 <suki:GlassCard.Transitions>
                                                     <Transitions>
                                                         <CornerRadiusTransition Property="CornerRadius" Duration="0:0:0.35"></CornerRadiusTransition>
@@ -73,7 +73,7 @@
                                                 <PathIcon Width="13" DockPanel.Dock="Left" VerticalAlignment="Center" Foreground="{DynamicResource SukiLowText}"
                                                           Height="13"
                                                           Data="{x:Static content:Icons.Search}" />
-                                                <TextBox Text="{Binding Search, Mode=TwoWay}" x:DataType="suki:SukiSideMenuService" DataContext="{x:Static suki:SukiSideMenuService.Instance}" BorderThickness="0" Watermark="Search"></TextBox>
+                                                <TextBox theme:TextBoxExtensions.AddDeleteButton="True" Classes="NoShadow" Text="{Binding Search, Mode=TwoWay}" x:DataType="suki:SukiSideMenuService" DataContext="{x:Static suki:SukiSideMenuService.Instance}" BorderThickness="0" Watermark="Search"></TextBox>
                                             </DockPanel>
                                         </suki:GlassCard>
                                             
diff --git a/SukiUI/Controls/SukiWindow.axaml b/SukiUI/Controls/SukiWindow.axaml
index 4bd9993b..e8e428ae 100644
--- a/SukiUI/Controls/SukiWindow.axaml
+++ b/SukiUI/Controls/SukiWindow.axaml
@@ -21,7 +21,8 @@
                             <suki:SukiHost />
                         </VisualLayerManager.ChromeOverlayLayer>
                         <Panel x:Name="PART_Root">
-                            <suki:SukiBackground Name="PART_Background"
+                            <!-- Margin -100 is there to exclude the unwanted bright corners -->
+                            <suki:SukiBackground Name="PART_Background" Margin="-150"
                                                  AnimationEnabled="{TemplateBinding BackgroundAnimationEnabled}"
                                                  ShaderCode="{TemplateBinding BackgroundShaderCode}"
                                                  ShaderFile="{TemplateBinding BackgroundShaderFile}"
diff --git a/SukiUI/Controls/SukiWindow.axaml.cs b/SukiUI/Controls/SukiWindow.axaml.cs
index 1ed0d5af..93cae8da 100644
--- a/SukiUI/Controls/SukiWindow.axaml.cs
+++ b/SukiUI/Controls/SukiWindow.axaml.cs
@@ -303,6 +303,11 @@ private void OnWindowStateChanged(WindowState state)
     {
         if (state == WindowState.FullScreen)
             CanResize = CanMove = false;
+        
+        if (state == WindowState.Maximized)
+            Margin = new Thickness(7);
+        else 
+            Margin = new Thickness(0);
     }
 
     private void OnTitleBarPointerPressed(object? sender, PointerPressedEventArgs e)
diff --git a/SukiUI/Enums/SukiBackgroundStyle.cs b/SukiUI/Enums/SukiBackgroundStyle.cs
index c0dc7f28..d5ed1d13 100644
--- a/SukiUI/Enums/SukiBackgroundStyle.cs
+++ b/SukiUI/Enums/SukiBackgroundStyle.cs
@@ -5,7 +5,7 @@ public enum SukiBackgroundStyle
         Gradient,
         Flat,
         Bubble,
-        BubbleStrong,
+     
        
     }
 }
\ No newline at end of file
diff --git a/SukiUI/Enums/ToastLocation.cs b/SukiUI/Enums/ToastLocation.cs
index 28e513d2..2d72fd73 100644
--- a/SukiUI/Enums/ToastLocation.cs
+++ b/SukiUI/Enums/ToastLocation.cs
@@ -3,5 +3,7 @@ namespace SukiUI.Enums;
 public enum ToastLocation
 {
     BottomRight,
-    BottomLeft
+    BottomLeft,
+    TopRight,
+    TopLeft
 }
\ No newline at end of file
diff --git a/SukiUI/Models/SukiColorTheme.cs b/SukiUI/Models/SukiColorTheme.cs
index a03011fe..7739182d 100644
--- a/SukiUI/Models/SukiColorTheme.cs
+++ b/SukiUI/Models/SukiColorTheme.cs
@@ -70,9 +70,9 @@ private static Color GetBackgroundColor(Color input)
         var minValue = Math.Min(Math.Min(r, g), b);
         var maxValue = Math.Max(Math.Max(r, g), b);
 
-        r = (r == minValue) ? 62 : ((r == maxValue) ? 62 : 45);
-        g = (g == minValue) ? 62 : ((g == maxValue) ? 62 : 45);
-        b = (b == minValue) ? 62 : ((b == maxValue) ? 62 : 45);
+        r = (r == minValue) ? 47 : ((r == maxValue) ? 47 : 27);
+        g = (g == minValue) ? 47 : ((g == maxValue) ? 47 : 27);
+        b = (b == minValue) ? 47 : ((b == maxValue) ? 47 : 27);
         return new Color(255, (byte)r, (byte)g, (byte)b);
     }
 }
diff --git a/SukiUI/Theme/Button.axaml b/SukiUI/Theme/Button.axaml
index f138d38f..960669a8 100644
--- a/SukiUI/Theme/Button.axaml
+++ b/SukiUI/Theme/Button.axaml
@@ -102,7 +102,7 @@
                 <Setter Property="Foreground" Value="{DynamicResource SukiPrimaryColor}" />
             </Style>
             <Style Selector="^ /template/ Border">
-                <Setter Property="Background" Value="{DynamicResource SukiCardBackground}" />
+              <!--  <Setter Property="Background" Value="{DynamicResource SukiCardBackground}" /> -->
                 <Setter Property="BorderBrush" Value="{DynamicResource SukiPrimaryColor}" />
                 <Setter Property="RenderTransform">
                     <Setter.Value>
diff --git a/SukiUI/Theme/CalendarDatePickerStyle.axaml b/SukiUI/Theme/CalendarDatePickerStyle.axaml
index ef00320d..7eb668f5 100644
--- a/SukiUI/Theme/CalendarDatePickerStyle.axaml
+++ b/SukiUI/Theme/CalendarDatePickerStyle.axaml
@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:sys="using:System"
+                    xmlns:suki="https://github.com/kikipoulet/SukiUI"
                     x:ClassModifier="internal">
 
     <Design.PreviewWith>
@@ -13,6 +14,7 @@
 
     <ControlTheme x:Key="{x:Type CalendarDatePicker}" TargetType="CalendarDatePicker">
         <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Height" Value="38" />
         <Setter Property="BorderThickness" Value="0,0,0,1" />
         <Setter Property="FontSize" Value="14" />
         <Setter Property="BorderBrush" Value="{DynamicResource SukiControlBorderBrush}" />
@@ -20,14 +22,16 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="Template">
             <ControlTemplate>
+                <suki:GlassCard Height="{TemplateBinding Height}" CornerRadius="{DynamicResource SmallCornerRadius}" Classes="Discrete" >
                 <Grid ColumnDefinitions="*,Auto">
                     <Grid.Styles>
                         <Style Selector="Button.CalendarDropDown">
                             <Setter Property="Template">
                                 <ControlTemplate>
+                                    
                                     <Grid Width="22"
                                           Height="20"
-                                          Margin="0,0,0,0"
+                                          Margin="0,0,16,0"
                                           HorizontalAlignment="Center"
                                           VerticalAlignment="Center"
                                           Background="Transparent"
@@ -74,6 +78,7 @@
                                                  Fill="{DynamicResource SukiControlBorderBrush}"
                                                  StrokeThickness="0" />
                                     </Grid>
+                                 
                                 </ControlTemplate>
                             </Setter>
                         </Style>
@@ -83,7 +88,7 @@
                         </Style>
                     </Grid.Styles>
 
-                    <TextBox Name="PART_TextBox"
+                    <TextBox Name="PART_TextBox" Classes="NoShadow"
                              Grid.Column="0"
                              Padding="{TemplateBinding Padding}"
                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -134,6 +139,7 @@
                         
                     </Popup>
                 </Grid>
+                    </suki:GlassCard>
             </ControlTemplate>
         </Setter>
 
diff --git a/SukiUI/Theme/CheckBoxStyles.axaml b/SukiUI/Theme/CheckBoxStyles.axaml
index 996fd507..e378a116 100644
--- a/SukiUI/Theme/CheckBoxStyles.axaml
+++ b/SukiUI/Theme/CheckBoxStyles.axaml
@@ -1,4 +1,5 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:suki="https://github.com/kikipoulet/SukiUI">
     <Design.PreviewWith>
         <Border Padding="20" Background="White">
             <StackPanel Spacing="20">
@@ -25,20 +26,14 @@
         <Setter Property="Template">
             <ControlTemplate>
                 <Grid ColumnDefinitions="Auto,*">
-                    <Border Name="border"
+                    <suki:GlassCard IsInteractive="True" Classes="Control" Name="border"
                             Width="20"
                             Height="20"
-                            VerticalAlignment="Center"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{DynamicResource SukiStrongBackground}"
-                            BorderThickness="1"
+                            VerticalAlignment="Center"  
+                        Classes.PrimaryOpaque="{TemplateBinding IsChecked}"
+                       
                             CornerRadius="6">
-                        <Border.Transitions>
-                            <Transitions>
-                                <BrushTransition Property="Background" Duration="0:0:0.15" />
-
-                            </Transitions>
-                        </Border.Transitions>
+                        
                         <Panel>
                             <Path Name="checkMark"
                                   Width="9"
@@ -63,7 +58,7 @@
                                 </Border.Transitions>
                             </Border>
                         </Panel>
-                    </Border>
+                    </suki:GlassCard>
                     <ContentPresenter Name="PART_ContentPresenter"
                                       Grid.Column="1"
                                       Margin="{TemplateBinding Padding}"
@@ -82,15 +77,7 @@
     <Style Selector="CheckBox TextBlock">
         <Setter Property="Foreground" Value="{DynamicResource SukiText}" />
     </Style>
-    <Style Selector="CheckBox:pointerover /template/ Border#border">
-        <Setter Property="BorderBrush" Value="{DynamicResource SukiBorderBrush}" />
-    </Style>
-    <Style Selector="CheckBox /template/ Border#border">
-        <Setter Property="BorderBrush" Value="{DynamicResource SukiControlBorderBrush}" />
-    </Style>
-    <Style Selector="CheckBox:checked /template/ Border#border">
-        <Setter Property="Background" Value="{DynamicResource SukiPrimaryColor}" />
-    </Style>
+
     <Style Selector="CheckBox /template/ Path#checkMark">
         <Setter Property="Opacity" Value="0"></Setter>
     </Style>
@@ -108,10 +95,7 @@
         <Setter Property="Opacity" Value="1"></Setter>
     </Style>
  
-    <Style Selector="CheckBox:indeterminate /template/ Border#border">
-        <Setter Property="Background" Value="{DynamicResource SukiPrimaryColor}" />
-    </Style>
-    <Style Selector="CheckBox:disabled /template/ Border#border">
-        <Setter Property="Opacity" Value="1"></Setter>
+    <Style Selector="CheckBox:disabled /template/ suki|GlassCard#border">
+        <Setter Property="Opacity" Value="0.7"></Setter>
     </Style>
 </Styles>
diff --git a/SukiUI/Theme/ComboBoxStyles.xaml b/SukiUI/Theme/ComboBoxStyles.xaml
index 36598b47..7f059148 100644
--- a/SukiUI/Theme/ComboBoxStyles.xaml
+++ b/SukiUI/Theme/ComboBoxStyles.xaml
@@ -1,11 +1,13 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:glassMorphism="clr-namespace:SukiUI.Controls.GlassMorphism"
-        xmlns:theme="clr-namespace:SukiUI.Theme">
+        xmlns:theme="clr-namespace:SukiUI.Theme"
+        xmlns:suki="https://github.com/kikipoulet/SukiUI">
 
     <Design.PreviewWith>
-        <Border Padding="20">
-            <StackPanel Spacing="10">
+        <Border Background="Transparent" Padding="20">
+            <StackPanel Background="AliceBlue" Orientation="Horizontal" Spacing="10">
+                <TextBox Text="TEst"></TextBox>
                 <ComboBox Margin="0,0,50,0" PlaceholderText="Select an item">
                     <ComboBoxItem>Item 1</ComboBoxItem>
                     <ComboBoxItem>Item 2</ComboBoxItem>
@@ -22,13 +24,13 @@
     </Design.PreviewWith>
 
     <Style Selector="ComboBox">
-        <Setter Property="BorderThickness" Value="0,0,0,1" />
+        <Setter Property="BorderThickness" Value="1,1,1,1" />
         <Setter Property="BorderBrush" Value="{DynamicResource SukiControlBorderBrush}" />
-        <Setter Property="CornerRadius" Value="0" />
+        <Setter Property="CornerRadius" Value="{DynamicResource SmallCornerRadius}" />
         <Setter Property="Background" Value="{DynamicResource SukiBackground}" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Padding" Value="4" />
+        <Setter Property="Padding" Value="6,6,-6,6" />
         <Setter Property="MinHeight" Value="45" />
         <Setter Property="PlaceholderForeground" Value="{DynamicResource SukiLowText}" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
@@ -49,17 +51,17 @@
                                     <Setter Property="Background" Value="Transparent" />
                                 </Style>
                             </Border.Styles>
-                    <Border Name="border"
-                            Background="{TemplateBinding Background}"
+                    <suki:GlassCard Name="border"
+                            Classes="Discrete" Padding="{TemplateBinding Padding}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
-                            BoxShadow="{DynamicResource SukiLowShadow}"
+                           
                             CornerRadius="{TemplateBinding CornerRadius}">
-                        <Border.Transitions>
+                        <suki:GlassCard.Transitions>
                             <Transitions>
                                 <BrushTransition Property="BorderBrush" Duration="0:0:0.2" />
                             </Transitions>
-                        </Border.Transitions>
+                        </suki:GlassCard.Transitions>
                         <Grid ColumnDefinitions="*,Auto">
                             
                             <Grid.Resources>
@@ -138,7 +140,7 @@
                                     </LayoutTransformControl>
                             </Popup>
                         </Grid>
-                    </Border>
+                    </suki:GlassCard>
                 </Border>
             </ControlTemplate>
         </Setter>
@@ -188,10 +190,10 @@
         </Style.Animations>
     </Style>
     
-    <Style Selector="ComboBox:pointerover /template/ Border#border">
+    <Style Selector="ComboBox:pointerover /template/ suki|GlassCard#border">
         <Setter Property="BorderBrush" Value="{DynamicResource SukiLightBorderBrush}" />
     </Style>
-    <Style Selector="ComboBox:disabled /template/ Border#border">
+    <Style Selector="ComboBox:disabled /template/ suki|GlassCard#border">
         <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
     </Style>
 
diff --git a/SukiUI/Theme/DatePicker.axaml b/SukiUI/Theme/DatePicker.axaml
index 33a93147..8893382f 100644
--- a/SukiUI/Theme/DatePicker.axaml
+++ b/SukiUI/Theme/DatePicker.axaml
@@ -1,7 +1,8 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:icons="clr-namespace:SukiUI.Content"
-                    xmlns:sys="using:System">
+                    xmlns:sys="using:System"
+                    xmlns:suki="https://github.com/kikipoulet/SukiUI">
     <Design.PreviewWith>
         <Border Width="1000"
                 Height="500"
@@ -40,7 +41,7 @@
         <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlHighlightMidBrush}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Height" Value="40" />
+        <Setter Property="Height" Value="38" />
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="Template">
@@ -48,14 +49,16 @@
                 <DataValidationErrors>
                     <Grid Name="LayoutRoot" Margin="0,0,0,0">
 
-                        <Button Name="PART_FlyoutButton"
+                        <Button Name="PART_FlyoutButton" Margin="0"
                                 Height="{TemplateBinding Height}"
-                                Background="Transparent"
-                                BorderThickness="0,0,0,1"
-                                CornerRadius="0"
+                                Background="Transparent" 
+                                BorderThickness="0,0,0,0"
+                                CornerRadius="0" Padding="0"
                                 IsEnabled="{TemplateBinding IsEnabled}"
                                 TemplatedControl.IsTemplateFocusTarget="True">
-                            <Grid Margin="0,1,0,0" ColumnDefinitions="Auto,Auto">
+                            <suki:GlassCard CornerRadius="{DynamicResource SmallCornerRadius}" Height="{TemplateBinding Height}" 
+                                            BorderThickness="{TemplateBinding BorderThickness}" Classes="Discrete" >
+                            <Grid Margin="14,0"  ColumnDefinitions="Auto,Auto">
                                 <Grid Name="PART_ButtonContentGrid"
                                       Grid.Column="0"
                                       VerticalAlignment="Center"
@@ -106,6 +109,7 @@
                                           Foreground="{DynamicResource SukiLowText}" />
 
                             </Grid>
+                                </suki:GlassCard>
                         </Button>
 
                         <Popup Name="PART_Popup"
diff --git a/SukiUI/Theme/DropDownButton.axaml b/SukiUI/Theme/DropDownButton.axaml
index 97a4c6de..27ce4979 100644
--- a/SukiUI/Theme/DropDownButton.axaml
+++ b/SukiUI/Theme/DropDownButton.axaml
@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:content="clr-namespace:SukiUI.Content">
+                    xmlns:content="clr-namespace:SukiUI.Content"
+                    xmlns:suki="https://github.com/kikipoulet/SukiUI">
     <ControlTheme x:Key="SukiDropDownButtonStyle" TargetType="DropDownButton">
         <Setter Property="BorderThickness" Value="1.2" />
         <Setter Property="BorderBrush" Value="{DynamicResource SukiMediumBorderBrush}" />
@@ -14,17 +15,15 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate>
-                    <Border Name="RootBorder"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
+                    <suki:GlassCard Name="RootBorder" Classes="Discrete"
+                                    Padding="0"
                             ClipToBounds="True"
                             CornerRadius="{TemplateBinding CornerRadius}">
-                        <Border.Transitions>
+                        <suki:GlassCard.Transitions>
                             <Transitions>
                                 <BrushTransition Property="BorderBrush" Duration="0:0:0.25" />
                             </Transitions>
-                        </Border.Transitions>
+                        </suki:GlassCard.Transitions>
                         <Grid Name="InnerGrid">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="*" />
@@ -68,7 +67,7 @@
                             </PathIcon>
 
                         </Grid>
-                    </Border>
+                    </suki:GlassCard>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
diff --git a/SukiUI/Theme/FlyoutPresenter.axaml b/SukiUI/Theme/FlyoutPresenter.axaml
index f631a6d9..928f0525 100644
--- a/SukiUI/Theme/FlyoutPresenter.axaml
+++ b/SukiUI/Theme/FlyoutPresenter.axaml
@@ -10,7 +10,7 @@
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
         <Setter Property="TextElement.Foreground" Value="{DynamicResource SukiText}"/>
         <Setter Property="Cursor" Value="Arrow"/>
-        <Setter Property="FlowDirection" Value="{TemplateBinding FlowDirection}"/>
+   <!--     <Setter Property="FlowDirection" Value="{TemplateBinding FlowDirection}"/> -->
         <Setter Property="Template">
             <ControlTemplate>
                 <Border Name="LayoutRoot" 
diff --git a/SukiUI/Theme/HyperlinkButton.axaml b/SukiUI/Theme/HyperlinkButton.axaml
index 87f64f25..d7f8ea08 100644
--- a/SukiUI/Theme/HyperlinkButton.axaml
+++ b/SukiUI/Theme/HyperlinkButton.axaml
@@ -1,5 +1,4 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ControlTheme x:Key="SukiHyperlinkButtonStyle" TargetType="HyperlinkButton">
         <Setter Property="Cursor" Value="Hand" />
         <Setter Property="Background" Value="Transparent" />
@@ -21,30 +20,30 @@
         <Setter Property="Template">
             <ControlTemplate>
                 <ContentPresenter x:Name="PART_ContentPresenter"
+                                  Padding="{TemplateBinding Padding}"
+                                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                                   Background="{TemplateBinding Background}"
                                   BackgroundSizing="{TemplateBinding BackgroundSizing}"
                                   BorderBrush="{TemplateBinding BorderBrush}"
                                   BorderThickness="{TemplateBinding BorderThickness}"
-                                  CornerRadius="{TemplateBinding CornerRadius}"
                                   Content="{TemplateBinding Content}"
                                   ContentTemplate="{TemplateBinding ContentTemplate}"
-                                  Padding="{TemplateBinding Padding}"
-                                  RecognizesAccessKey="True"
-                                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+                                  CornerRadius="{TemplateBinding CornerRadius}"
+                                  RecognizesAccessKey="True" />
             </ControlTemplate>
         </Setter>
-        
+
         <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
             <Setter Property="Transitions">
                 <Transitions>
-                    <BrushTransition Property="Foreground" Duration="{StaticResource ShortAnimationDuration}"/>
+                    <BrushTransition Property="Foreground" Duration="{StaticResource ShortAnimationDuration}" />
                 </Transitions>
             </Setter>
         </Style>
-        
+
         <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="Foreground" Value="{DynamicResource SukiPrimaryDarkColor}" />
+            <Setter Property="Foreground" Value="{DynamicResource SukiPrimaryColor50}" />
         </Style>
 
         <Style Selector="^:pressed">
diff --git a/SukiUI/Theme/Index.axaml b/SukiUI/Theme/Index.axaml
index 4d46f65b..84eaf584 100644
--- a/SukiUI/Theme/Index.axaml
+++ b/SukiUI/Theme/Index.axaml
@@ -38,7 +38,7 @@
                 <ResourceInclude x:Key="Dark" Source="../ColorTheme/Dark.axaml" />
             </ResourceDictionary.ThemeDictionaries>
 
-            <CornerRadius x:Key="SmallCornerRadius">7</CornerRadius>
+            <CornerRadius x:Key="SmallCornerRadius">8</CornerRadius>
             <CornerRadius x:Key="MediumCornerRadius">15</CornerRadius>
 
             <system:TimeSpan x:Key="LongAnimationDuration">0.5</system:TimeSpan>
@@ -61,6 +61,7 @@
                 <ResourceInclude Source="avares://sukiUI/Theme/CalendarDatePickerStyle.axaml" />
                 <ResourceInclude Source="avares://sukiUI/Theme/TabControl.axaml" />
                 <ResourceInclude Source="avares://sukiUI/Theme/TabItem.axaml" />
+                <ResourceInclude Source="avares://sukiUI/Theme/Separator.axaml" />
                 <ResourceInclude Source="avares://sukiUI/Theme/DropDownButton.axaml" />
                 <ResourceInclude Source="avares://sukiUI/Theme/Menu.axaml" />
                 <ResourceInclude Source="avares://sukiUI/Theme/ContextMenu.axaml" />
diff --git a/SukiUI/Theme/Menu.axaml b/SukiUI/Theme/Menu.axaml
index 3c1ec2bd..3645c779 100644
--- a/SukiUI/Theme/Menu.axaml
+++ b/SukiUI/Theme/Menu.axaml
@@ -15,6 +15,13 @@
                         BorderThickness="0"
                         CornerRadius="8">
                     <Panel>
+                        <controls:GlassCard CornerRadius="8" Opacity="0" Name="GlassMenuItemBackground" Classes="Control">
+                            <controls:GlassCard.Transitions>
+                                <Transitions>
+                                    <DoubleTransition Property="Opacity" Duration="0:0:0.15"></DoubleTransition>
+                                </Transitions>
+                            </controls:GlassCard.Transitions>
+                        </controls:GlassCard>
                         <ContentPresenter Name="PART_HeaderPresenter"
                                           Margin="{TemplateBinding Padding}"
                                           HorizontalContentAlignment="Left"
@@ -62,8 +69,8 @@
                 </Border>
             </ControlTemplate>
         </Setter>
-        <Style Selector="^:pointerover">
-            <Setter Property="Background" Value="{DynamicResource SukiLightBorderBrush}" />
+        <Style Selector="^:pointerover /template/ controls|GlassCard#GlassMenuItemBackground">
+            <Setter Property="Opacity" Value="1" />
         </Style>
 
         <Style Selector="^:open /template/ LayoutTransformControl#PART_LayoutTransform">
diff --git a/SukiUI/Theme/MenuFlyoutPresenter.axaml b/SukiUI/Theme/MenuFlyoutPresenter.axaml
index f19ec4ad..4ded1388 100644
--- a/SukiUI/Theme/MenuFlyoutPresenter.axaml
+++ b/SukiUI/Theme/MenuFlyoutPresenter.axaml
@@ -16,11 +16,13 @@
                             BorderThickness="{TemplateBinding BorderThickness}"
                             ClipToBounds="True"
                             CornerRadius="{TemplateBinding CornerRadius}">
-                        <ItemsPresenter Name="PART_ItemsPresenter"
-                                        HorizontalAlignment="Left"
-                                        VerticalAlignment="Center"
-                                        ItemsPanel="{TemplateBinding ItemsPanel}"
-                                        KeyboardNavigation.TabNavigation="Continue" />
+                        <Panel Background="{DynamicResource PopupGradientBrush}">
+                            <ItemsPresenter Name="PART_ItemsPresenter"
+                                            HorizontalAlignment="Left"
+                                            VerticalAlignment="Center"
+                                            ItemsPanel="{TemplateBinding ItemsPanel}"
+                                            KeyboardNavigation.TabNavigation="Continue" />
+                        </Panel>
                     </Border>
                 </Panel>
             </ControlTemplate>
@@ -32,4 +34,4 @@
     <ControlTheme x:Key="{x:Type MenuFlyoutPresenter}"
                   BasedOn="{StaticResource SukiMenuFlyoutPresenterStyle}"
                   TargetType="MenuFlyoutPresenter" />
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/SukiUI/Theme/MenuItem.axaml b/SukiUI/Theme/MenuItem.axaml
index 9d7e6625..d84559e1 100644
--- a/SukiUI/Theme/MenuItem.axaml
+++ b/SukiUI/Theme/MenuItem.axaml
@@ -100,16 +100,6 @@
             <Setter Property="Background" Value="{DynamicResource SukiLightBorderBrush}" />
         </Style>
 
-        <Style Selector="^:separator">
-            <Setter Property="Template">
-                <ControlTemplate>
-                    <Separator Height="1"
-                               Margin="20,1,0,1"
-                               Background="{DynamicResource ThemeControlMidBrush}" />
-                </ControlTemplate>
-            </Setter>
-        </Style>
-
         <Style Selector="^:open /template/ LayoutTransformControl#PART_LayoutTransform">
             <Style.Animations>
                 <Animation Easing="{StaticResource MenuEasing}"
@@ -152,12 +142,9 @@
         </Style>
 
         <Style Selector="^:separator">
-            <Setter Property="Height" Value="NaN" />
             <Setter Property="Template">
                 <ControlTemplate>
-                    <Separator Height="1"
-                               Margin="0,0"
-                               Background="{DynamicResource SukiLightBorderBrush}" />
+                    <Separator Margin="0"/>
                 </ControlTemplate>
             </Setter>
         </Style>
diff --git a/SukiUI/Theme/NumericUpDownStyles.xaml b/SukiUI/Theme/NumericUpDownStyles.xaml
index 515cf367..72e5b3bb 100644
--- a/SukiUI/Theme/NumericUpDownStyles.xaml
+++ b/SukiUI/Theme/NumericUpDownStyles.xaml
@@ -1,22 +1,28 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:theme="clr-namespace:SukiUI.Theme">
+        xmlns:theme="clr-namespace:SukiUI.Theme"
+        xmlns:suki="https://github.com/kikipoulet/SukiUI">
     <Design.PreviewWith>
         <Border Padding="20">
-            <NumericUpDown />
+            <StackPanel Orientation="Horizontal" Spacing="5" >
+            <NumericUpDown Value="4" />
+            <TextBox Classes="NoShadow" Text="test"></TextBox>
+            </StackPanel>
         </Border>
     </Design.PreviewWith>
     <Style Selector="NumericUpDown">
-        <Setter Property="BorderThickness" Value="0,0,0,1" />
+        <Setter Property="BorderThickness" Value="0,0,0,0" />
         <Setter Property="BorderBrush" Value="{DynamicResource SukiControlBorderBrush}" />
-        <Setter Property="CornerRadius" Value="0" />
+        <Setter Property="CornerRadius" Value="{DynamicResource SmallCornerRadius}" />
         <Setter Property="Background" Value="{DynamicResource SukiBackground}" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="Padding" Value="4" />
         <Setter Property="Template">
             <ControlTemplate>
+                <suki:GlassCard Classes="Discrete" VerticalAlignment="Center" CornerRadius="{TemplateBinding CornerRadius}" Padding="0">
                 <ButtonSpinner Name="PART_Spinner" 
-                               Margin="5,1" 
+                               Margin="5,4" 
+                               Height="26"
                                HorizontalContentAlignment="Stretch"
                                VerticalContentAlignment="Stretch"
                                AllowSpin="{TemplateBinding AllowSpin}"
@@ -51,6 +57,7 @@
                     </Grid>
                    
                 </ButtonSpinner>
+                    </suki:GlassCard>
             </ControlTemplate>
         </Setter>
     </Style>
diff --git a/SukiUI/Theme/ProgressBarStyles.xaml b/SukiUI/Theme/ProgressBarStyles.xaml
index dbdfe063..99ce9a5f 100644
--- a/SukiUI/Theme/ProgressBarStyles.xaml
+++ b/SukiUI/Theme/ProgressBarStyles.xaml
@@ -1,7 +1,9 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:suki="https://github.com/kikipoulet/SukiUI"
+        xmlns:system="clr-namespace:System;assembly=netstandard">
 
     <Design.PreviewWith>
-        <Panel>
+        <Panel Background="Red">
             <ProgressBar Width="100"
                          Height="6"
                          Value="50" />
@@ -16,7 +18,9 @@
         <Setter Property="Template">
             <ControlTemplate>
                 <DockPanel Name="PART_Dock">
-
+<DockPanel.Resources>
+   
+</DockPanel.Resources>
                     <TextBlock Name="PART_Text"
                                Width="0"
                                Height="0"
@@ -29,9 +33,9 @@
                                Text="{Binding Value, RelativeSource={RelativeSource TemplatedParent}, StringFormat={}{0:0}%}"
                                TextAlignment="Right" />
 
-                    <Border Name="PART_RootBorder"
+                    <suki:GlassCard Name="PART_RootBorder"
                             MinWidth="{TemplateBinding MinWidth}"
-                            Background="{TemplateBinding Background}"
+                          Padding="0" Classes="Control"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
                             ClipToBounds="True"
@@ -62,7 +66,7 @@
                                     CornerRadius="{TemplateBinding CornerRadius}"
                                     IsVisible="{Binding IsIndeterminate, RelativeSource={RelativeSource TemplatedParent}}" />
                         </Panel>
-                    </Border>
+                    </suki:GlassCard>
 
 
                 </DockPanel>
@@ -156,13 +160,13 @@
         </Style.Animations>
     </Style>
 
-    <Style Selector="ProgressBar:horizontal /template/ Border#PART_RootBorder">
+    <Style Selector="ProgressBar:horizontal /template/ suki|GlassCard#PART_RootBorder">
         <Setter Property="MinHeight" Value="8" />
         <Setter Property="Height" Value="8" />
         <Setter Property="MaxHeight" Value="8" />
     </Style>
 
-    <Style Selector="ProgressBar:vertical /template/ Border#PART_RootBorder">
+    <Style Selector="ProgressBar:vertical /template/ suki|GlassCard#PART_RootBorder">
         <Setter Property="MinWidth" Value="8" />
         <Setter Property="Width" Value="8" />
         <Setter Property="MaxWidth" Value="8" />
diff --git a/SukiUI/Theme/RadioButtonStyles.xaml b/SukiUI/Theme/RadioButtonStyles.xaml
index 2d899b16..79646dbf 100644
--- a/SukiUI/Theme/RadioButtonStyles.xaml
+++ b/SukiUI/Theme/RadioButtonStyles.xaml
@@ -1,6 +1,7 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:content="clr-namespace:SukiUI.Content">
+        xmlns:content="clr-namespace:SukiUI.Content"
+        xmlns:suki="https://github.com/kikipoulet/SukiUI">
     <Design.PreviewWith>
         <Border Padding="20" Background="White">
             <StackPanel Orientation="Horizontal">
@@ -119,7 +120,7 @@
                         </PathIcon.Transitions>
                     </PathIcon>
                     <Border Name="SelectedBorder"
-                            Margin="4"
+                            Margin="3"
                             BorderBrush="{DynamicResource SukiPrimaryColor}"
                             BorderThickness="2"
                             CornerRadius="{TemplateBinding CornerRadius}"
@@ -203,52 +204,11 @@
         <Setter Property="Template">
             <ControlTemplate>
                 <Grid Background="{TemplateBinding Background}" ColumnDefinitions="Auto,*">
-                    <Ellipse Name="border"
-                             Width="18"
-                             Height="18"
-                             VerticalAlignment="Center"
-                             Stroke="{TemplateBinding BorderBrush}"
-                             StrokeThickness="1.5">
-                        <Ellipse.Transitions>
-                            <Transitions>
-                                <BrushTransition Property="Fill" Duration="0:0:0.4" />
-                                <DoubleTransition Property="Width" Duration="0:0:0.4" />
-                                <DoubleTransition Property="Height" Duration="0:0:0.4" />
-                            </Transitions>
-                        </Ellipse.Transitions>
-                    </Ellipse>
-                    <Ellipse Name="checkMark"
-                             Width="16"
-                             Height="16"
-                             Margin="0,0,0,0"
-                             HorizontalAlignment="Center"
-                             VerticalAlignment="Center"
-                             Stretch="Uniform"
-                             UseLayoutRounding="False">
-                        <Ellipse.Transitions>
-                            <Transitions>
-                                <BrushTransition Property="Fill" Duration="0:0:0.1" />
-                                <DoubleTransition Property="Width" Duration="0:0:0.3" />
-                                <DoubleTransition Property="Height" Duration="0:0:0.3" />
-                            </Transitions>
-                        </Ellipse.Transitions>
-                    </Ellipse>
-                    <Ellipse Name="indeterminateMark"
-                             Width="9"
-                             Height="9"
-                             HorizontalAlignment="Center"
-                             VerticalAlignment="Center"
-                             Fill="{DynamicResource ThemeAccentBrush}"
-                             Stretch="Uniform"
-                             UseLayoutRounding="False">
-                        <Ellipse.Transitions>
-                            <Transitions>
-                                <BrushTransition Property="Fill" Duration="0:0:0.4" />
-                                <DoubleTransition Property="Width" Duration="0:0:0.4" />
-                                <DoubleTransition Property="Height" Duration="0:0:0.4" />
-                            </Transitions>
-                        </Ellipse.Transitions>
-                    </Ellipse>
+                    <suki:GlassCard Width="20" Height="20" CornerRadius="50" Classes="Control"
+                                    Classes.PrimaryOpaque="{TemplateBinding IsChecked}"
+                                    />
+                    
+                    <Ellipse Height="8" Width="8" HorizontalAlignment="Center" VerticalAlignment="Center" IsVisible="{TemplateBinding IsChecked}"  Fill="White"/>
                     <ContentPresenter Name="PART_ContentPresenter"
                                       Grid.Column="1"
                                       Margin="10,0,0,0"
diff --git a/SukiUI/Theme/Separator.axaml b/SukiUI/Theme/Separator.axaml
new file mode 100644
index 00000000..85dd0833
--- /dev/null
+++ b/SukiUI/Theme/Separator.axaml
@@ -0,0 +1,36 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ControlTheme x:Key="SukiSeparatorStyle" TargetType="Separator">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="CornerRadius" Value="0" />
+        <Setter Property="Foreground" Value="{DynamicResource SukiLightBorderBrush}" />
+        <Setter Property="MinHeight" Value="1" />
+        <Setter Property="Height" Value="1" />
+        <Setter Property="Margin" Value="0" />
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Border Name="PART_RootBorder"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderThickness}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}">
+                    <Rectangle Name="PART_Content" Fill="{TemplateBinding Foreground}" />
+                </Border>
+            </ControlTemplate>
+        </Setter>
+
+        <Style Selector="^ /template/ Border#PART_RootBorder">
+            <Setter Property="ClipToBounds" Value="True" />
+        </Style>
+
+        <Style Selector="^ /template/ Rectangle#PART_Content">
+            <Setter Property="Height" Value="1" />
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+        </Style>
+    </ControlTheme>
+    <ControlTheme x:Key="{x:Type Separator}" TargetType="Separator"
+                  BasedOn="{StaticResource SukiSeparatorStyle}" />
+</ResourceDictionary>
diff --git a/SukiUI/Theme/SliderStyles.xaml b/SukiUI/Theme/SliderStyles.xaml
index c8cea19d..a3c9b178 100644
--- a/SukiUI/Theme/SliderStyles.xaml
+++ b/SukiUI/Theme/SliderStyles.xaml
@@ -1,4 +1,6 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:suki="https://github.com/kikipoulet/SukiUI"
+        xmlns:system="clr-namespace:System;assembly=netstandard">
     <Design.PreviewWith>
         <Border Padding="20" Background="White">
             <Slider Width="100" Value="50" />
@@ -55,17 +57,19 @@
         <Setter Property="Template">
             <ControlTemplate>
                 <Grid Name="grid">
+                    <Grid.Resources>
+                       
+                    </Grid.Resources>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" MinHeight="20" />
                         <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
-                    <Border Name="TrackBackground"
-                            Grid.Row="1"
+                    <suki:GlassCard Name="TrackBackground"
+                            Grid.Row="1" Classes="Control"
                             Height="22"
                             Margin="8,0"
                             VerticalAlignment="Center"
-                            Background="{DynamicResource SukiLightBorderBrush}"
                             BorderThickness="0"
                             CornerRadius="20" />
 
@@ -156,11 +160,7 @@
         <Setter Property="Maximum" Value="{TemplateBinding Maximum}" />
         <Setter Property="Value" Value="{TemplateBinding Value, Mode=TwoWay}" />
     </Style>
-    <Style Selector="Slider /template/ Border#TrackBackground">
-
-        <Setter Property="BorderThickness" Value="2" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}" />
-    </Style>
+ 
     <Style Selector="Slider /template/ RepeatButton.repeattrack">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Focusable" Value="False" />
diff --git a/SukiUI/Theme/TabControl.axaml b/SukiUI/Theme/TabControl.axaml
index a420bf40..49ac2c18 100644
--- a/SukiUI/Theme/TabControl.axaml
+++ b/SukiUI/Theme/TabControl.axaml
@@ -28,7 +28,7 @@
 
         <Style Selector="^[TabStripPlacement=Left] /template/ LayoutTransformControl#PART_LayoutTransform">
             <Setter Property="LayoutTransform" Value="rotate(-90deg)" />
-            <Style Selector="^ ItemsPresenter#PART_ItemsPresenter &gt; WrapPanel">
+            <Style Selector="^ ItemsPresenter#PART_ItemsPresenter WrapPanel">
                 <Setter Property="Orientation" Value="Horizontal" />
                 <Setter Property="FlowDirection" Value="RightToLeft" />
             </Style>
@@ -42,7 +42,24 @@
         <Style Selector="^[TabStripPlacement=Top] /template/ ItemsPresenter#PART_ItemsPresenter">
             <Setter Property="Margin" Value="{DynamicResource TabControlTopPlacementItemMargin}" />
         </Style>
+        
+        <Style Selector="^.HorizontalTabs">
+            <Style Selector="^[TabStripPlacement=Left] /template/ LayoutTransformControl#PART_LayoutTransform">
+                <Setter Property="LayoutTransform" Value="rotate(0)" />
+                <Style Selector="^ ItemsPresenter#PART_ItemsPresenter WrapPanel">
+                    <Setter Property="Orientation" Value="Vertical" />
+                    <Setter Property="FlowDirection" Value="RightToLeft" />
+                </Style>
+            </Style>
+            <Style Selector="^[TabStripPlacement=Right] /template/ LayoutTransformControl#PART_LayoutTransform">
+                <Setter Property="LayoutTransform" Value="rotate(0)" />
+                <Style Selector="^ ItemsPresenter#PART_ItemsPresenter WrapPanel">
+                    <Setter Property="Orientation" Value="Vertical" />
+                </Style>
+            </Style>
+        </Style>
     </ControlTheme>
+    
     <ControlTheme x:Key="{x:Type TabControl}"
                   BasedOn="{StaticResource SukiTabControlStyle}"
                   TargetType="TabControl" />
diff --git a/SukiUI/Theme/TextBoxStyles.xaml b/SukiUI/Theme/TextBoxStyles.xaml
index f87ae2db..88d08f2a 100644
--- a/SukiUI/Theme/TextBoxStyles.xaml
+++ b/SukiUI/Theme/TextBoxStyles.xaml
@@ -1,7 +1,9 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:content="clr-namespace:SukiUI.Content"
-        xmlns:theme="clr-namespace:SukiUI.Theme">
+        xmlns:theme="clr-namespace:SukiUI.Theme"
+        xmlns:suki="https://github.com/kikipoulet/SukiUI"
+        xmlns:system="clr-namespace:System;assembly=netstandard">
 
     <Design.PreviewWith>
         <Border Width="300"
@@ -25,7 +27,7 @@
                 <TextBox Width="200"
                          Margin="5"
                          Text="Elem" />
-                <TextBox Classes="FlatTextBox" Text="Elem" />
+                <TextBox Classes="NoShadow" Text="Elem" />
 
                 <Panel>
                     <Border Margin="0,0,0,25" Classes="Card">
@@ -221,9 +223,7 @@
         </Setter>
     </Style>
 
-    <Style Selector="TextBox.NoShadow /template/ Border">
-        <Setter Property="BoxShadow" Value="0 0 0 0 Gray" />
-    </Style>
+
 
     <Style Selector="TextBox.Suffix">
         <Setter Property="VerticalContentAlignment" Value="Center" />
@@ -334,10 +334,10 @@
 
     <Style Selector="TextBox">
         <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="BorderThickness" Value="0,0,0,1" />
+        <Setter Property="BorderThickness" Value="1" />
         <Setter Property="FontSize" Value="14" />
         <Setter Property="BorderBrush" Value="{DynamicResource SukiControlBorderBrush}" />
-        <Setter Property="CornerRadius" Value="0" />
+        <Setter Property="CornerRadius" Value="{DynamicResource SmallCornerRadius}" />
         <Setter Property="Background" Value="{DynamicResource SukiBackground}" />
 
 
@@ -353,23 +353,27 @@
 
                 <Border Padding="5">
                     <Border.Resources>
+                       
+                       
                         <theme:StringToDoubleConverter x:Key="StringToDoubleC" />
                     </Border.Resources>
-                    <Border Name="border"
-                            Background="{TemplateBinding Background}"
+                    <Panel>
+                    <suki:GlassCard Name="border"
+                            Padding="0" Classes="Discrete"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
-                            BoxShadow="{DynamicResource SukiLowShadow}"
+                        
                             CornerRadius="{TemplateBinding CornerRadius}">
-                        <Border.Transitions>
+                        <suki:GlassCard.Transitions>
                             <Transitions>
                                 <BrushTransition Property="BorderBrush" Duration="0:0:0.2" />
                             </Transitions>
-                        </Border.Transitions>
+                        </suki:GlassCard.Transitions>
+                    </suki:GlassCard>
                         <Border Name="borderbottom"
                                 Margin="1,-1,1,-1"
                                 BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
+                                BorderThickness="0"
                                 ClipToBounds="True"
                                 CornerRadius="1">
                             <Border.Transitions>
@@ -456,21 +460,21 @@
 
                             </DockPanel>
                         </Border>
-                    </Border>
+                    </Panel>
                 </Border>
 
             </ControlTemplate>
         </Setter>
     </Style>
-    <Style Selector="TextBox:pointerover /template/ Border#border">
+    <Style Selector="TextBox:pointerover /template/ suki|GlassCard#border">
         <Setter Property="BorderBrush" Value="{DynamicResource SukiBorderBrush}" />
 
     </Style>
 
-    <Style Selector="TextBox.FlatTextBox /template/ Border#border">
+    <Style Selector="TextBox.FlatTextBox /template/ suki|GlassCard#border">
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="ClipToBounds" Value="True" />
-        <Setter Property="BoxShadow" Value="0 0 0 0 White" />
+ 
     </Style>
 
 
@@ -490,17 +494,17 @@
         <Setter Property="BorderBrush" Value="{DynamicResource SukiPrimaryColor}" />
 
     </Style>
-    <Style Selector="TextBox:focus /template/ Border#border">
+    <Style Selector="TextBox:focus /template/ suki|GlassCard#border">
         <Setter Property="BorderBrush" Value="{DynamicResource SukiPrimaryColor}" />
-
+<Setter Property="BorderThickness" Value="1.2" />
     </Style>
-    <Style Selector="TextBox:error /template/ Border#border">
+    <Style Selector="TextBox:error /template/ suki|GlassCard#border">
         <Setter Property="BorderBrush" Value="{DynamicResource ErrorBrush}" />
     </Style>
     <Style Selector="TextBox /template/ DockPanel">
         <Setter Property="Cursor" Value="IBeam" />
     </Style>
-    <Style Selector="TextBox:disabled /template/ Border#border">
+    <Style Selector="TextBox:disabled /template/ suki|GlassCard#border">
         <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
     </Style>
 
@@ -599,5 +603,20 @@
         <Setter Property="Focusable" Value="False" />
     </Style>
 
+    <Style Selector="TextBox.NoShadow /template/ Border">
+        <Setter Property="BoxShadow" Value="0 0 0 0 Gray" />
+    </Style>
+    
+    <Style Selector="TextBox.NoShadow /template/ suki|GlassCard#border">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="IsVisible" Value="False"></Setter>
+    </Style>
+    
+    <Style Selector="TextBox.NoShadow:focus /template/ suki|GlassCard#border">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0" />
+    </Style>
 
+    
 </Styles>
\ No newline at end of file
diff --git a/SukiUI/Theme/TimePickerStyle.axaml b/SukiUI/Theme/TimePickerStyle.axaml
index 6c67c0e6..f5cfd70d 100644
--- a/SukiUI/Theme/TimePickerStyle.axaml
+++ b/SukiUI/Theme/TimePickerStyle.axaml
@@ -2,7 +2,8 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:icons="clr-namespace:SukiUI.Content"
-                    xmlns:sys="using:System">
+                    xmlns:sys="using:System"
+                    xmlns:suki="https://github.com/kikipoulet/SukiUI">
     <Design.PreviewWith>
         <Border Height="500" Padding="20">
             <StackPanel VerticalAlignment="Center" Spacing="20">
@@ -12,7 +13,7 @@
         </Border>
     </Design.PreviewWith>
 
-    <x:Double x:Key="TimePickerFlyoutPresenterItemHeight">40</x:Double>
+  <!--  <x:Double x:Key="TimePickerFlyoutPresenterItemHeight">40</x:Double>
     <x:Double x:Key="TimePickerSpacerThemeWidth">1</x:Double>
     <Thickness x:Key="TimePickerBorderThemeThickness">1</Thickness>
     <x:Double x:Key="TimePickerFlyoutPresenterHighlightHeight">40</x:Double>
@@ -41,7 +42,7 @@
 
         <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
             <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlHighBrush}" />
-            <Setter Property="TextElement.Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+            <Setter Property="TextElement.Foreground" Value="{TemplateBinding Foreground}" />
         </Style>
 
         <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
@@ -49,7 +50,7 @@
                 <SolidColorBrush Opacity="0.6" Color="{DynamicResource ThemeControlMidHighColor}" />
             </Setter>
             <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlLowBrush}" />
-            <Setter Property="TextElement.Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+            <Setter Property="TextElement.Foreground" Value="{TemplateBinding Foreground}" />
         </Style>
 
         <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
@@ -59,7 +60,7 @@
 
     <ControlTheme x:Key="{x:Type TimePicker}" TargetType="TimePicker">
         <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}" />
-        <Setter Property="BorderThickness" Value="0,0,0,1" />
+        <Setter Property="BorderThickness" Value="0,0,0,0" />
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="BorderBrush" Value="{DynamicResource SukiMediumBorderBrush}" />
@@ -71,6 +72,8 @@
             <ControlTemplate>
                 <DataValidationErrors>
                     <Grid Name="LayoutRoot">
+                        <suki:GlassCard Height="{TemplateBinding Height}" CornerRadius="{DynamicResource SmallCornerRadius}" Classes="Discrete" >
+
                         <Button x:Name="PART_FlyoutButton"
                                 MinWidth="{DynamicResource TimePickerThemeMinWidth}"
                                 MaxWidth="{DynamicResource TimePickerThemeMaxWidth}"
@@ -93,7 +96,7 @@
                                           Foreground="{DynamicResource SukiLowText}" />
 
                                 <Grid Name="PART_FlyoutButtonContentGrid">
-                                    <!--  Ignore col defs here, set in code  -->
+                                  
                                     <Border x:Name="PART_FirstPickerHost"
                                             Grid.Column="0"
                                             HorizontalAlignment="Stretch"
@@ -144,7 +147,7 @@
                                 </Grid>
                             </DockPanel>
                         </Button>
-
+</suki:GlassCard>
                         <Popup Name="PART_Popup"
                                IsLightDismissEnabled="True"
                                Placement="Bottom"
@@ -236,7 +239,7 @@
                                     </Setter>
                                 </Style>
                             </Grid.Styles>
-                            <!--  Ignore col defs here, set in code  -->
+                        
                             <Panel Name="PART_HourHost" Grid.Column="0">
                                 <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Hidden">
                                     <DateTimePickerPanel Name="PART_HourSelector"
@@ -325,7 +328,7 @@
                                                Text="Apply" />
                                 </StackPanel>
                             </Button>
-                            <!--  <Button Name="PART_DismissButton"
+                              <Button Name="PART_DismissButton"
                       Grid.Column="1"
                       Height="{DynamicResource TimePickerFlyoutPresenterAcceptDismissHostGridHeight}"
                       HorizontalAlignment="Stretch"
@@ -336,7 +339,7 @@
                       Stroke="{Binding $parent[Button].Foreground}"
                       StrokeLineCap="Round"
                       StrokeThickness="0.75" />
-              </Button>-->
+              </Button>
                         </Grid>
                     </Grid>
                 </Border>
@@ -348,5 +351,5 @@
                 <Setter Property="IsVisible" Value="True" />
             </Style>
         </Style>
-    </ControlTheme>
+    </ControlTheme> -->
 </ResourceDictionary>
\ No newline at end of file
diff --git a/SukiUI/Theme/ToggleSwitchStyles.xaml b/SukiUI/Theme/ToggleSwitchStyles.xaml
index 876b6383..a2f865fb 100644
--- a/SukiUI/Theme/ToggleSwitchStyles.xaml
+++ b/SukiUI/Theme/ToggleSwitchStyles.xaml
@@ -1,4 +1,6 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:suki="https://github.com/kikipoulet/SukiUI"
+        xmlns:system="clr-namespace:System;assembly=netstandard">
     <Styles.Resources>
         <Thickness x:Key="ToggleSwitchTopHeaderMargin">0,0,0,6</Thickness>
         <GridLength x:Key="ToggleSwitchPreContentMargin">6</GridLength>
@@ -29,7 +31,17 @@
         <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
         <Setter Property="Template">
             <ControlTemplate>
-                <DockPanel>
+                <DockPanel Name="DP">
+                    <DockPanel.Resources>
+                        <ResourceDictionary>
+                            <ResourceDictionary.ThemeDictionaries>
+                                <ResourceDictionary x:Key="Dark">
+                                    <system:Double x:Key="ControlGlassOpacity">0.4</system:Double>
+                                </ResourceDictionary>
+                                </ResourceDictionary.ThemeDictionaries>
+                        </ResourceDictionary>
+                        
+                    </DockPanel.Resources>
                     <ContentPresenter x:Name="PART_OffContentPresenter"
                                       DockPanel.Dock="Left" Margin="0,0,7,0"
                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -45,7 +57,10 @@
                                       ContentTemplate="{TemplateBinding OnContentTemplate}" />
                 
                 <Grid Background="Transparent" RowDefinitions="Auto,*">
-
+<Grid.Resources>
+    
+ 
+</Grid.Resources>
                     <ContentPresenter x:Name="PART_ContentPresenter"
                                       Grid.Row="0"
                                       VerticalAlignment="Top"
@@ -75,13 +90,13 @@
                               Grid.ColumnSpan="3"
                               Margin="0,5"
                               TemplatedControl.IsTemplateFocusTarget="True" />
-
+                        
 
                         <Border 
                                 Grid.Row="1"
                                 Width="40"
                                 Height="22"
-                                Background="{DynamicResource SukiControlBorderBrush}"
+                                Background="{DynamicResource SukiPrimaryColor0}"
                                 BorderThickness="0"
                                 CornerRadius="{DynamicResource MediumCornerRadius}">
                             <Border.Transitions>
@@ -90,15 +105,42 @@
                                 </Transitions>
                             </Border.Transitions>
                         </Border>
+                        
+                        
+                        <suki:GlassCard 
+                            Grid.Row="1"
+                            Width="40" Classes="Control"
+                            Height="22" IsAnimated="False"
+                        
+                            BorderThickness="0"
+                            CornerRadius="{DynamicResource MediumCornerRadius}">
+                            
+                        </suki:GlassCard>
 
                         <Border x:Name="SwitchBackground"
                                 Grid.Row="1"
-                                Width="40"
+                                Width="40" ClipToBounds="True"
                                 Height="22"
-                                Background="{DynamicResource SukiControlBorderBrush}"
+                                Background="Transparent"
                                 BorderThickness="0"
                                 CornerRadius="{DynamicResource MediumCornerRadius}">
-
+                            <Panel HorizontalAlignment="Right" Name="PanelSelected" Width="160" Margin="40,0,-160,0" >
+                             <Panel.Background>
+                                 <LinearGradientBrush StartPoint="0%,50%" EndPoint="100%,50%">
+                                     <GradientStop Color="{DynamicResource SukiPrimaryColor0}" Offset="0.3"></GradientStop>
+                                     <GradientStop Color="{DynamicResource SukiPrimaryColor}" Offset="1"></GradientStop>
+                                 </LinearGradientBrush>
+                             </Panel.Background>
+                                <Panel.Transitions>
+                                    <Transitions>
+                                        <ThicknessTransition Delay="0:0:0" Property="Margin" Duration="0:0:0.7">
+                                            <ThicknessTransition.Easing>
+                                                    <SineEaseOut />
+                                            </ThicknessTransition.Easing>
+                                        </ThicknessTransition>
+                                    </Transitions>
+                                </Panel.Transitions>
+                            </Panel>
                             <Border.Transitions>
                                 <Transitions>
                                     <DoubleTransition Property="Opacity" Duration="0:0:0.15" />
@@ -141,6 +183,8 @@
         </Setter>
     </Style>
 
+   
+    
     <Style Selector="ToggleSwitch:unchecked /template/ Border#SwitchKnob">
         <Style.Animations>
             <Animation FillMode="Both" Duration="0:0:0.25">
@@ -239,10 +283,12 @@
     </Style>
 
 
-    <Style Selector="ToggleSwitch:checked /template/ Border#SwitchBackground">
+   <!-- <Style Selector="ToggleSwitch:checked /template/ Border#SwitchBackground">
         <Setter Property="Background" Value="{DynamicResource SukiPrimaryColor}" />
-    </Style>
-
+    </Style> -->
 
+   <Style Selector="ToggleSwitch:checked /template/ Panel#PanelSelected">
+       <Setter Property="Margin" Value="40,0,0,0" />
+   </Style>
     
 </Styles>
\ No newline at end of file
diff --git a/SukiUI/Utilities/Effects/SukiEffect.cs b/SukiUI/Utilities/Effects/SukiEffect.cs
index 3aef94ae..9f54eb50 100644
--- a/SukiUI/Utilities/Effects/SukiEffect.cs
+++ b/SukiUI/Utilities/Effects/SukiEffect.cs
@@ -125,6 +125,7 @@ public override bool Equals(object obj)
         }
 
         private static readonly float[] White = { 0.95f, 0.95f, 0.95f };
+     
 
         internal SKShader ToShaderWithUniforms(float timeSeconds, ThemeVariant activeVariant, Rect bounds,
             float animationScale, float alpha = 1f)