diff --git a/README.md b/README.md
index 93e0718..71bb9e1 100644
--- a/README.md
+++ b/README.md
@@ -153,7 +153,7 @@ Here is an exemple:
     x:Class="MicaWPF.DesktopApp.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:mica="clr-namespace:MicaWPF.Styles;assembly=MicaWPF" <!-- For the lite version: clr-namespace:MicaWPF.Lite.Styles;assembly=MicaWPF.Lite -->
+    xmlns:mica="clr-namespace:MicaWPF.Styles;assembly=MicaWPF" <!-- For the lite version: clr-namespace:MicaWPF.Styles;assembly=MicaWPF.Lite -->
     StartupUri="MainWindow.xaml">
     <Application.Resources>
         <ResourceDictionary>
diff --git a/src/MicaWPF.Core/Helpers/ServiceLocatorHelper.cs b/src/MicaWPF.Core/Helpers/ServiceLocatorHelper.cs
index eb61e15..dc225aa 100644
--- a/src/MicaWPF.Core/Helpers/ServiceLocatorHelper.cs
+++ b/src/MicaWPF.Core/Helpers/ServiceLocatorHelper.cs
@@ -19,7 +19,7 @@ internal static class ServiceLocatorHelper
     /// <returns>The current namespace.</returns>
     public static string GetNamespace()
     {
-        return _assemblies.Any(x => x.GetName().Name == "MicaWPF") ? "MicaWPF" : "MicaWPF.Lite";
+        return _assemblies.Any(x => x.GetName().Name == "MicaWPF") ? "MicaWPF" : "MicaWPF.Core";
     }
 
     /// <summary>
@@ -36,6 +36,11 @@ public static T GetService<T>()
         // Simplified assembly search with pattern matching
         var currentAssembly = _assemblies.FirstOrDefault(x => x.GetName().Name is "MicaWPF" or "MicaWPF.Lite");
 
+        if (currentAssembly?.GetName().Name == "MicaWPF.Lite")
+        {
+            currentAssembly = _assemblies.FirstOrDefault(x => x.GetName().Name is "MicaWPF.Core");
+        }
+
         if (currentAssembly is not null)
         {
             var instance = GetInstanceFromAssembly<T>(currentAssembly, serviceType);
diff --git a/src/MicaWPF.Core/MicaWPF.Core.csproj b/src/MicaWPF.Core/MicaWPF.Core.csproj
index ee11ccc..1ddaba0 100644
--- a/src/MicaWPF.Core/MicaWPF.Core.csproj
+++ b/src/MicaWPF.Core/MicaWPF.Core.csproj
@@ -2,6 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>net461;net47;net48;net481;netcoreapp3.1;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
+		<TargetMinimumPlatformVersion>7.0</TargetMinimumPlatformVersion>
 		<UseWPF>true</UseWPF>
 		<Copyright>Copyright (c) 2021 Simnico99</Copyright>
 		<RepositoryUrl>https://github.com/Simnico99/MicaWPF</RepositoryUrl>
diff --git a/src/MicaWPF/Styles/Assets/Accent.xaml b/src/MicaWPF.Core/Styles/Assets/Accent.xaml
similarity index 100%
rename from src/MicaWPF/Styles/Assets/Accent.xaml
rename to src/MicaWPF.Core/Styles/Assets/Accent.xaml
diff --git a/src/MicaWPF/Styles/Controls/Dark/GradientBorder.xaml b/src/MicaWPF.Core/Styles/Controls/Dark/GradientBorder.xaml
similarity index 98%
rename from src/MicaWPF/Styles/Controls/Dark/GradientBorder.xaml
rename to src/MicaWPF.Core/Styles/Controls/Dark/GradientBorder.xaml
index 20ce21a..e4e96a2 100644
--- a/src/MicaWPF/Styles/Controls/Dark/GradientBorder.xaml
+++ b/src/MicaWPF.Core/Styles/Controls/Dark/GradientBorder.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:MicaWPF.Controls">
+    xmlns:controls="clr-namespace:MicaWPF.Core.Controls">
 
     <Style x:Key="MicaWPF.Styles.GradientBorder.Default" TargetType="{x:Type controls:GradientBorder}">
         <Setter Property="TopBorderBrush" Value="{DynamicResource MicaWPF.Brushes.ControlStrokeColorSecondary}" />
diff --git a/src/MicaWPF/Styles/Controls/Light/GradientBorder.xaml b/src/MicaWPF.Core/Styles/Controls/Light/GradientBorder.xaml
similarity index 98%
rename from src/MicaWPF/Styles/Controls/Light/GradientBorder.xaml
rename to src/MicaWPF.Core/Styles/Controls/Light/GradientBorder.xaml
index 35e7a66..9963142 100644
--- a/src/MicaWPF/Styles/Controls/Light/GradientBorder.xaml
+++ b/src/MicaWPF.Core/Styles/Controls/Light/GradientBorder.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:MicaWPF.Controls">
+    xmlns:controls="clr-namespace:MicaWPF.Core.Controls">
 
     <Style x:Key="MicaWPF.Styles.GradientBorder.Default" TargetType="{x:Type controls:GradientBorder}">
         <Setter Property="TopBorderBrush" Value="{DynamicResource MicaWPF.Brushes.ControlStrokeColorDefault}" />
diff --git a/src/MicaWPF.Core/Styles/ThemeDictionaryBase.cs b/src/MicaWPF.Core/Styles/ThemeDictionaryBase.cs
index 0a44f09..9a70de5 100644
--- a/src/MicaWPF.Core/Styles/ThemeDictionaryBase.cs
+++ b/src/MicaWPF.Core/Styles/ThemeDictionaryBase.cs
@@ -23,13 +23,13 @@ public ThemeDictionaryBase()
             return;
         }
 
-        if(!WindowsTheme.HasValue)
+        if (!WindowsTheme.HasValue)
         {
             SetTheme(Enums.WindowsTheme.Auto);
         }
     }
 
-    public WindowsTheme? WindowsTheme { get; private set; } = null;
+    public WindowsTheme? WindowsTheme { get; private set; } = Enums.WindowsTheme.Auto;
 
     public virtual string SourceLocation { get; } = string.Empty;
 
diff --git a/src/MicaWPF.Core/Styles/Themes/MicaDark.xaml b/src/MicaWPF.Core/Styles/Themes/MicaDark.xaml
new file mode 100644
index 0000000..7c17cfb
--- /dev/null
+++ b/src/MicaWPF.Core/Styles/Themes/MicaDark.xaml
@@ -0,0 +1,264 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <!--  Colors  -->
+    <Color x:Key="MicaWPF.Colors.ApplicationBackgroundColor">#202020</Color>
+
+    <Color x:Key="MicaWPF.Colors.TextFillColorPrimary">#FFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.TextFillColorSecondary">#C5FFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.TextFillColorTertiary">#87FFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.TextFillColorDisabled">#5DFFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.TextFillColorInverse">#FF000000</Color>
+
+    <Color x:Key="MicaWPF.Colors.AccentTextFillColorDisabled">#5DFFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.TextOnAccentFillColorSelectedText">#FFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.TextOnAccentFillColorPrimary">#000000</Color>
+    <Color x:Key="MicaWPF.Colors.TextOnAccentFillColorSecondary">#80000000</Color>
+    <Color x:Key="MicaWPF.Colors.TextOnAccentFillColorDisabled">#87FFFFFF</Color>
+
+    <Color x:Key="MicaWPF.Colors.ControlFillColorDefault">#0FFFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.ControlFillColorSecondary">#15FFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.ControlFillColorTertiary">#08FFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.ControlFillColorDisabled">#0BFFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.ControlFillColorTransparent">#00FFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.ControlFillColorInputActive">#B31E1E1E</Color>
+
+    <Color x:Key="MicaWPF.Colors.ControlStrongFillColorDefault">#8BFFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.ControlStrongFillColorDisabled">#3FFFFFFF</Color>
+
+    <Color x:Key="MicaWPF.Colors.ControlSolidFillColorDefault">#454545</Color>
+
+    <Color x:Key="MicaWPF.Colors.SubtleFillColorTransparent">#00FFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.SubtleFillColorSecondary">#0FFFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.SubtleFillColorTertiary">#0AFFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.SubtleFillColorDisabled">#00FFFFFF</Color>
+
+    <Color x:Key="MicaWPF.Colors.ControlAltFillColorTransparent">#00FFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.ControlAltFillColorSecondary">#19000000</Color>
+    <Color x:Key="MicaWPF.Colors.ControlAltFillColorTertiary">#0BFFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.ControlAltFillColorQuarternary">#12FFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.ControlAltFillColorDisabled">#00FFFFFF</Color>
+
+    <Color x:Key="MicaWPF.Colors.ControlOnImageFillColorDefault">#B31C1C1C</Color>
+    <Color x:Key="MicaWPF.Colors.ControlOnImageFillColorSecondary">#1A1A1A</Color>
+    <Color x:Key="MicaWPF.Colors.ControlOnImageFillColorTertiary">#131313</Color>
+    <Color x:Key="MicaWPF.Colors.ControlOnImageFillColorDisabled">#1E1E1E</Color>
+
+    <Color x:Key="MicaWPF.Colors.AccentFillColorDisabled">#28FFFFFF</Color>
+
+    <Color x:Key="MicaWPF.Colors.ControlStrokeColorDefault">#12FFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.ControlStrokeColorSecondary">#18FFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.ControlStrokeColorOnAccentDefault">#14FFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.ControlStrokeColorOnAccentSecondary">#23000000</Color>
+    <Color x:Key="MicaWPF.Colors.ControlStrokeColorOnAccentTertiary">#37000000</Color>
+    <Color x:Key="MicaWPF.Colors.ControlStrokeColorOnAccentDisabled">#33000000</Color>
+
+    <Color x:Key="MicaWPF.Colors.ControlStrokeColorForStrongFillWhenOnImage">#6B000000</Color>
+
+    <Color x:Key="MicaWPF.Colors.CardStrokeColorDefault">#19000000</Color>
+    <Color x:Key="MicaWPF.Colors.CardStrokeColorDefaultSolid">#1C1C1C</Color>
+
+    <Color x:Key="MicaWPF.Colors.MenuBorderColorDefault">#151515</Color>
+
+    <Color x:Key="MicaWPF.Colors.ControlStrongStrokeColorDefault">#8BFFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.ControlStrongStrokeColorDisabled">#28FFFFFF</Color>
+
+    <Color x:Key="MicaWPF.Colors.SurfaceStrokeColorDefault">#66757575</Color>
+    <Color x:Key="MicaWPF.Colors.SurfaceStrokeColorFlyout">#33000000</Color>
+    <Color x:Key="MicaWPF.Colors.SurfaceStrokeColorInverse">#0F000000</Color>
+
+    <Color x:Key="MicaWPF.Colors.DividerStrokeColorDefault">#15FFFFFF</Color>
+
+    <Color x:Key="MicaWPF.Colors.FocusStrokeColorOuter">#FFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.FocusStrokeColorInner">#B3000000</Color>
+
+    <Color x:Key="MicaWPF.Colors.CardBackgroundFillColorDefault">#0DFFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.CardBackgroundFillColorSecondary">#08FFFFFF</Color>
+
+    <Color x:Key="MicaWPF.Colors.SmokeFillColorDefault">#4D000000</Color>
+
+    <Color x:Key="MicaWPF.Colors.LayerFillColorDefault">#4C3A3A3A</Color>
+    <Color x:Key="MicaWPF.Colors.LayerFillColorAlt">#0DFFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.LayerOnAcrylicFillColorDefault">#09FFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.LayerOnAccentAcrylicFillColorDefault">#09FFFFFF</Color>
+
+    <Color x:Key="MicaWPF.Colors.SolidBackgroundFillColorBase">#202020</Color>
+    <Color x:Key="MicaWPF.Colors.SolidBackgroundFillColorSecondary">#1C1C1C</Color>
+    <Color x:Key="MicaWPF.Colors.SolidBackgroundFillColorTertiary">#282828</Color>
+    <Color x:Key="MicaWPF.Colors.SolidBackgroundFillColorQuarternary">#2C2C2C</Color>
+    <Color x:Key="MicaWPF.Colors.SolidBackgroundFillColorTransparent">#00202020</Color>
+
+    <Color x:Key="MicaWPF.Colors.SystemFillColorSuccess">#6CCB5F</Color>
+    <Color x:Key="MicaWPF.Colors.SystemFillColorCaution">#FCE100</Color>
+    <Color x:Key="MicaWPF.Colors.SystemFillColorCritical">#FF99A4</Color>
+    <Color x:Key="MicaWPF.Colors.SystemFillColorNeutral">#8BFFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.SystemFillColorSolidNeutral">#9D9D9D</Color>
+    <Color x:Key="MicaWPF.Colors.SystemFillColorAttentionBackground">#08FFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.SystemFillColorSuccessBackground">#393D1B</Color>
+    <Color x:Key="MicaWPF.Colors.SystemFillColorCautionBackground">#433519</Color>
+    <Color x:Key="MicaWPF.Colors.SystemFillColorCriticalBackground">#442726</Color>
+    <Color x:Key="MicaWPF.Colors.SystemFillColorNeutralBackground">#08FFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.SystemFillColorSolidAttentionBackground">#2E2E2E</Color>
+    <Color x:Key="MicaWPF.Colors.SystemFillColorSolidNeutralBackground">#2E2E2E</Color>
+
+    <!--  Elevation border brushes  -->
+
+    <LinearGradientBrush x:Key="MicaWPF.GradientBrushes.ControlElevationBorder" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
+        <LinearGradientBrush.GradientStops>
+            <GradientStop Offset="0.33" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorSecondary}" />
+            <GradientStop Offset="1.0" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorDefault}" />
+        </LinearGradientBrush.GradientStops>
+    </LinearGradientBrush>
+
+    <LinearGradientBrush x:Key="MicaWPF.GradientBrushes.CircleElevationBorder" MappingMode="RelativeToBoundingBox" StartPoint="0,0" EndPoint="0,1">
+        <LinearGradientBrush.GradientStops>
+            <GradientStop Offset="0.70" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorSecondary}" />
+            <GradientStop Offset="0.50" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorDefault}" />
+        </LinearGradientBrush.GradientStops>
+    </LinearGradientBrush>
+
+    <LinearGradientBrush x:Key="MicaWPF.GradientBrushes.AccentControlElevationBorder" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
+        <LinearGradientBrush.RelativeTransform>
+            <ScaleTransform CenterY="0.5" ScaleY="-1" />
+        </LinearGradientBrush.RelativeTransform>
+        <LinearGradientBrush.GradientStops>
+            <GradientStop Offset="0.33" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorOnAccentSecondary}" />
+            <GradientStop Offset="1.0" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorOnAccentDefault}" />
+        </LinearGradientBrush.GradientStops>
+    </LinearGradientBrush>
+
+    <!--  Color Brushes  -->
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorLight3" Color="{StaticResource MicaWPF.Colors.SystemAccentColorLight3}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorLight2" Color="{StaticResource MicaWPF.Colors.SystemAccentColorLight2}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorLight1" Color="{StaticResource MicaWPF.Colors.SystemAccentColorLight1}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColor" Color="{StaticResource MicaWPF.Colors.SystemAccentColor}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorDark1" Color="{StaticResource MicaWPF.Colors.SystemAccentColorDark1}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorDark2" Color="{StaticResource MicaWPF.Colors.SystemAccentColorDark2}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorDark3" Color="{StaticResource MicaWPF.Colors.SystemAccentColorDark3}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorPrimary" Color="{StaticResource MicaWPF.Colors.SystemAccentColorPrimary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorSecondary" Color="{StaticResource MicaWPF.Colors.SystemAccentColorSecondary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorTertiary" Color="{StaticResource MicaWPF.Colors.SystemAccentColorTertiary}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.AccentTextFillColorPrimary" Color="{StaticResource MicaWPF.Colors.SystemAccentColorLight3}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.AccentTextFillColorSecondary" Color="{StaticResource MicaWPF.Colors.SystemAccentColorLight3}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.AccentTextFillColorTertiary" Color="{StaticResource MicaWPF.Colors.SystemAccentColorLight2}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.AccentFillColorSelectedTextBackground" Color="{StaticResource MicaWPF.Colors.SystemAccentColor}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.AccentFillColorDefault" Color="{StaticResource MicaWPF.Colors.SystemAccentColorLight2}" />
+    <SolidColorBrush
+        x:Key="MicaWPF.Brushes.AccentFillColorSecondary"
+        Opacity="0.9"
+        Color="{DynamicResource MicaWPF.Colors.SystemAccentColorLight2}" />
+    <SolidColorBrush
+        x:Key="MicaWPF.Brushes.AccentFillColorTertiary"
+        Opacity="0.8"
+        Color="{DynamicResource MicaWPF.Colors.SystemAccentColorLight2}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.AccentFillColorDisabled" Color="{StaticResource MicaWPF.Colors.AccentFillColorDisabled}" />
+
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorAttention" Color="{StaticResource MicaWPF.Colors.SystemAccentColor}" />
+
+    <!--  Brushes  -->
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ApplicationBackground" Color="{StaticResource MicaWPF.Colors.ApplicationBackgroundColor}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.TextFillColorPrimary" Color="{StaticResource MicaWPF.Colors.TextFillColorPrimary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.TextFillColorSecondary" Color="{StaticResource MicaWPF.Colors.TextFillColorSecondary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.TextFillColorTertiary" Color="{StaticResource MicaWPF.Colors.TextFillColorTertiary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.TextFillColorDisabled" Color="{StaticResource MicaWPF.Colors.TextFillColorDisabled}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.TextFillColorInverse" Color="{StaticResource MicaWPF.Colors.TextFillColorInverse}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.TextOnAccentFillColorSelectedText" Color="{StaticResource MicaWPF.Colors.TextOnAccentFillColorSelectedText}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.TextOnAccentFillColorPrimary" Color="{StaticResource MicaWPF.Colors.TextOnAccentFillColorPrimary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.TextOnAccentFillColorSecondary" Color="{StaticResource MicaWPF.Colors.TextOnAccentFillColorSecondary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.TextOnAccentFillColorDisabled" Color="{StaticResource MicaWPF.Colors.TextOnAccentFillColorDisabled}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlFillColorDefault" Color="{StaticResource MicaWPF.Colors.ControlFillColorDefault}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlFillColorSecondary" Color="{StaticResource MicaWPF.Colors.ControlFillColorSecondary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlFillColorTertiary" Color="{StaticResource MicaWPF.Colors.ControlFillColorTertiary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlFillColorDisabled" Color="{StaticResource MicaWPF.Colors.ControlFillColorDisabled}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlFillColorTransparent" Color="{StaticResource MicaWPF.Colors.ControlFillColorTransparent}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlFillColorInputActive" Color="{StaticResource MicaWPF.Colors.ControlFillColorInputActive}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrongFillColorDefault" Color="{StaticResource MicaWPF.Colors.ControlStrongFillColorDefault}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrongFillColorDisabled" Color="{StaticResource MicaWPF.Colors.ControlStrongFillColorDisabled}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlSolidFillColorDefault" Color="{StaticResource MicaWPF.Colors.ControlSolidFillColorDefault}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SubtleFillColorTransparent" Color="{StaticResource MicaWPF.Colors.SubtleFillColorTransparent}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SubtleFillColorSecondary" Color="{StaticResource MicaWPF.Colors.SubtleFillColorSecondary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SubtleFillColorTertiary" Color="{StaticResource MicaWPF.Colors.SubtleFillColorTertiary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SubtleFillColorDisabled" Color="{StaticResource MicaWPF.Colors.SubtleFillColorDisabled}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlAltFillColorTransparent" Color="{StaticResource MicaWPF.Colors.ControlAltFillColorTransparent}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlAltFillColorSecondary" Color="{StaticResource MicaWPF.Colors.ControlAltFillColorSecondary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlAltFillColorTertiary" Color="{StaticResource MicaWPF.Colors.ControlAltFillColorTertiary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlAltFillColorQuarternary" Color="{StaticResource MicaWPF.Colors.ControlAltFillColorQuarternary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlAltFillColorDisabled" Color="{StaticResource MicaWPF.Colors.ControlAltFillColorDisabled}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlOnImageFillColorDefault" Color="{StaticResource MicaWPF.Colors.ControlOnImageFillColorDefault}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlOnImageFillColorSecondary" Color="{StaticResource MicaWPF.Colors.ControlOnImageFillColorSecondary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlOnImageFillColorTertiary" Color="{StaticResource MicaWPF.Colors.ControlOnImageFillColorTertiary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlOnImageFillColorDisabled" Color="{StaticResource MicaWPF.Colors.ControlOnImageFillColorDisabled}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrokeColorDefault" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorDefault}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrokeColorSecondary" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorSecondary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrokeColorOnAccentDefault" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorOnAccentDefault}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrokeColorOnAccentSecondary" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorOnAccentSecondary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrokeColorOnAccentTertiary" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorOnAccentTertiary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrokeColorOnAccentDisabled" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorOnAccentDisabled}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrokeColorForStrongFillWhenOnImage" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorForStrongFillWhenOnImage}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.CardStrokeColorDefault" Color="{StaticResource MicaWPF.Colors.CardStrokeColorDefault}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.CardStrokeColorDefaultSolid" Color="{StaticResource MicaWPF.Colors.CardStrokeColorDefaultSolid}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrongStrokeColorDefault" Color="{StaticResource MicaWPF.Colors.ControlStrongStrokeColorDefault}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrongStrokeColorDisabled" Color="{StaticResource MicaWPF.Colors.ControlStrongStrokeColorDisabled}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SurfaceStrokeColorDefault" Color="{StaticResource MicaWPF.Colors.SurfaceStrokeColorDefault}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SurfaceStrokeColorFlyout" Color="{StaticResource MicaWPF.Colors.SurfaceStrokeColorFlyout}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SurfaceStrokeColorInverse" Color="{StaticResource MicaWPF.Colors.SurfaceStrokeColorInverse}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.DividerStrokeColorDefault" Color="{StaticResource MicaWPF.Colors.DividerStrokeColorDefault}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.FocusStrokeColorOuter" Color="{StaticResource MicaWPF.Colors.FocusStrokeColorOuter}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.FocusStrokeColorInner" Color="{StaticResource MicaWPF.Colors.FocusStrokeColorInner}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.CardBackgroundFillColorDefault" Color="{StaticResource MicaWPF.Colors.CardBackgroundFillColorDefault}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.CardBackgroundFillColorSecondary" Color="{StaticResource MicaWPF.Colors.CardBackgroundFillColorSecondary}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.MenuBorderColorDefault" Color="{StaticResource MicaWPF.Colors.MenuBorderColorDefault}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SmokeFillColorDefault" Color="{StaticResource MicaWPF.Colors.SmokeFillColorDefault}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.LayerFillColorDefault" Color="{StaticResource MicaWPF.Colors.LayerFillColorDefault}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.LayerFillColorAlt" Color="{StaticResource MicaWPF.Colors.LayerFillColorAlt}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.LayerOnAcrylicFillColorDefault" Color="{StaticResource MicaWPF.Colors.LayerOnAcrylicFillColorDefault}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.LayerOnAccentAcrylicFillColorDefault" Color="{StaticResource MicaWPF.Colors.LayerOnAccentAcrylicFillColorDefault}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SolidBackgroundFillColorBase" Color="{StaticResource MicaWPF.Colors.SolidBackgroundFillColorBase}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SolidBackgroundFillColorSecondary" Color="{StaticResource MicaWPF.Colors.SolidBackgroundFillColorSecondary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SolidBackgroundFillColorTertiary" Color="{StaticResource MicaWPF.Colors.SolidBackgroundFillColorTertiary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SolidBackgroundFillColorQuarternary" Color="{StaticResource MicaWPF.Colors.SolidBackgroundFillColorQuarternary}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorSuccess" Color="{StaticResource MicaWPF.Colors.SystemFillColorSuccess}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorCaution" Color="{StaticResource MicaWPF.Colors.SystemFillColorCaution}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorCritical" Color="{StaticResource MicaWPF.Colors.SystemFillColorCritical}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorNeutral" Color="{StaticResource MicaWPF.Colors.SystemFillColorNeutral}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorSolidNeutral" Color="{StaticResource MicaWPF.Colors.SystemFillColorSolidNeutral}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorAttentionBackground" Color="{StaticResource MicaWPF.Colors.SystemFillColorAttentionBackground}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorSuccessBackground" Color="{StaticResource MicaWPF.Colors.SystemFillColorSuccessBackground}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorCautionBackground" Color="{StaticResource MicaWPF.Colors.SystemFillColorCautionBackground}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorCriticalBackground" Color="{StaticResource MicaWPF.Colors.SystemFillColorCriticalBackground}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorNeutralBackground" Color="{StaticResource MicaWPF.Colors.SystemFillColorNeutralBackground}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorSolidAttentionBackground" Color="{StaticResource MicaWPF.Colors.SystemFillColorSolidAttentionBackground}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorSolidNeutralBackground" Color="{StaticResource MicaWPF.Colors.SystemFillColorSolidNeutralBackground}" />
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="pack://application:,,,/MicaWPF.Core;component/Styles/Controls/Dark/GradientBorder.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
diff --git a/src/MicaWPF.Core/Styles/Themes/MicaLight.xaml b/src/MicaWPF.Core/Styles/Themes/MicaLight.xaml
new file mode 100644
index 0000000..e66cc33
--- /dev/null
+++ b/src/MicaWPF.Core/Styles/Themes/MicaLight.xaml
@@ -0,0 +1,269 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <!--  Colors  -->
+    <Color x:Key="MicaWPF.Colors.ApplicationBackgroundColor">#fafafa</Color>
+
+    <Color x:Key="MicaWPF.Colors.TextFillColorPrimary">#E4000000</Color>
+    <Color x:Key="MicaWPF.Colors.TextFillColorSecondary">#9E000000</Color>
+    <Color x:Key="MicaWPF.Colors.TextFillColorTertiary">#72000000</Color>
+    <Color x:Key="MicaWPF.Colors.TextFillColorDisabled">#5C000000</Color>
+    <Color x:Key="MicaWPF.Colors.TextFillColorInverse">#FFFFFF</Color>
+
+    <Color x:Key="MicaWPF.Colors.AccentTextFillColorDisabled">#5C000000</Color>
+
+    <Color x:Key="MicaWPF.Colors.TextOnAccentFillColorSelectedText">#FFFFFF</Color>
+
+    <Color x:Key="MicaWPF.Colors.TextOnAccentFillColorPrimary">#FFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.TextOnAccentFillColorSecondary">#B3FFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.TextOnAccentFillColorDisabled">#FFFFFF</Color>
+
+    <Color x:Key="MicaWPF.Colors.ControlFillColorDefault">#B3FFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.ControlFillColorSecondary">#80F9F9F9</Color>
+    <Color x:Key="MicaWPF.Colors.ControlFillColorTertiary">#4DF9F9F9</Color>
+    <Color x:Key="MicaWPF.Colors.ControlFillColorDisabled">#4DF9F9F9</Color>
+    <Color x:Key="MicaWPF.Colors.ControlFillColorTransparent">#00FFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.ControlFillColorInputActive">#FFFFFF</Color>
+
+    <Color x:Key="MicaWPF.Colors.ControlStrongFillColorDefault">#72000000</Color>
+    <Color x:Key="MicaWPF.Colors.ControlStrongFillColorDisabled">#51000000</Color>
+
+    <Color x:Key="MicaWPF.Colors.ControlSolidFillColorDefault">#FFFFFF</Color>
+
+    <Color x:Key="MicaWPF.Colors.SubtleFillColorTransparent">#00FFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.SubtleFillColorSecondary">#09000000</Color>
+    <Color x:Key="MicaWPF.Colors.SubtleFillColorTertiary">#06000000</Color>
+    <Color x:Key="MicaWPF.Colors.SubtleFillColorDisabled">#00FFFFFF</Color>
+
+    <Color x:Key="MicaWPF.Colors.ControlAltFillColorTransparent">#00FFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.ControlAltFillColorSecondary">#06000000</Color>
+    <Color x:Key="MicaWPF.Colors.ControlAltFillColorTertiary">#0F000000</Color>
+    <Color x:Key="MicaWPF.Colors.ControlAltFillColorQuarternary">#18000000</Color>
+    <Color x:Key="MicaWPF.Colors.ControlAltFillColorDisabled">#00FFFFFF</Color>
+
+    <Color x:Key="MicaWPF.Colors.ControlOnImageFillColorDefault">#C9FFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.ControlOnImageFillColorSecondary">#F3F3F3</Color>
+    <Color x:Key="MicaWPF.Colors.ControlOnImageFillColorTertiary">#EBEBEB</Color>
+    <Color x:Key="MicaWPF.Colors.ControlOnImageFillColorDisabled">#00FFFFFF</Color>
+
+    <Color x:Key="MicaWPF.Colors.AccentFillColorDisabled">#37000000</Color>
+
+    <Color x:Key="MicaWPF.Colors.ControlStrokeColorDefault">#0F000000</Color>
+    <Color x:Key="MicaWPF.Colors.ControlStrokeColorSecondary">#29000000</Color>
+    <Color x:Key="MicaWPF.Colors.ControlStrokeColorOnAccentDefault">#14FFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.ControlStrokeColorOnAccentSecondary">#66000000</Color>
+    <Color x:Key="MicaWPF.Colors.ControlStrokeColorOnAccentTertiary">#37000000</Color>
+    <Color x:Key="MicaWPF.Colors.ControlStrokeColorOnAccentDisabled">#0F000000</Color>
+
+    <Color x:Key="MicaWPF.Colors.ControlStrokeColorForStrongFillWhenOnImage">#59FFFFFF</Color>
+
+    <Color x:Key="MicaWPF.Colors.CardStrokeColorDefault">#0F000000</Color>
+    <Color x:Key="MicaWPF.Colors.CardStrokeColorDefaultSolid">#EBEBEB</Color>
+
+    <Color x:Key="MicaWPF.Colors.MenuBorderColorDefault">#0F000000</Color>
+
+    <Color x:Key="MicaWPF.Colors.ControlStrongStrokeColorDefault">#72000000</Color>
+    <Color x:Key="MicaWPF.Colors.ControlStrongStrokeColorDisabled">#37000000</Color>
+
+    <Color x:Key="MicaWPF.Colors.SurfaceStrokeColorDefault">#66757575</Color>
+    <Color x:Key="MicaWPF.Colors.SurfaceStrokeColorFlyout">#0F000000</Color>
+    <Color x:Key="MicaWPF.Colors.SurfaceStrokeColorInverse">#15FFFFFF</Color>
+
+    <Color x:Key="MicaWPF.Colors.DividerStrokeColorDefault">#0F000000</Color>
+
+    <Color x:Key="MicaWPF.Colors.FocusStrokeColorOuter">#E4000000</Color>
+    <Color x:Key="MicaWPF.Colors.FocusStrokeColorInner">#B3FFFFFF</Color>
+
+    <Color x:Key="MicaWPF.Colors.CardBackgroundFillColorDefault">#B3FFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.CardBackgroundFillColorSecondary">#80F6F6F6</Color>
+
+    <Color x:Key="MicaWPF.Colors.SmokeFillColorDefault">#4D000000</Color>
+
+    <Color x:Key="MicaWPF.Colors.LayerFillColorDefault">#80FFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.LayerFillColorAlt">#FFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.LayerOnAcrylicFillColorDefault">#40FFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.LayerOnAccentAcrylicFillColorDefault">#40FFFFFF</Color>
+
+    <Color x:Key="MicaWPF.Colors.SolidBackgroundFillColorBase">#F3F3F3</Color>
+    <Color x:Key="MicaWPF.Colors.SolidBackgroundFillColorSecondary">#EEEEEE</Color>
+    <Color x:Key="MicaWPF.Colors.SolidBackgroundFillColorTertiary">#F9F9F9</Color>
+    <Color x:Key="MicaWPF.Colors.SolidBackgroundFillColorQuarternary">#FFFFFF</Color>
+    <Color x:Key="MicaWPF.Colors.SolidBackgroundFillColorTransparent">#00F3F3F3</Color>
+
+    <Color x:Key="MicaWPF.Colors.SystemFillColorSuccess">#0F7B0F</Color>
+    <Color x:Key="MicaWPF.Colors.SystemFillColorCaution">#9D5D00</Color>
+    <Color x:Key="MicaWPF.Colors.SystemFillColorCritical">#C42B1C</Color>
+    <Color x:Key="MicaWPF.Colors.SystemFillColorNeutral">#72000000</Color>
+    <Color x:Key="MicaWPF.Colors.SystemFillColorSolidNeutral">#8A8A8A</Color>
+    <Color x:Key="MicaWPF.Colors.SystemFillColorAttentionBackground">#80F6F6F6</Color>
+    <Color x:Key="MicaWPF.Colors.SystemFillColorSuccessBackground">#DFF6DD</Color>
+    <Color x:Key="MicaWPF.Colors.SystemFillColorCautionBackground">#FFF4CE</Color>
+    <Color x:Key="MicaWPF.Colors.SystemFillColorCriticalBackground">#FDE7E9</Color>
+    <Color x:Key="MicaWPF.Colors.SystemFillColorNeutralBackground">#06000000</Color>
+    <Color x:Key="MicaWPF.Colors.SystemFillColorSolidAttentionBackground">#F7F7F7</Color>
+    <Color x:Key="MicaWPF.Colors.SystemFillColorSolidNeutralBackground">#F3F3F3</Color>
+
+    <!--  Elevation border brushes  -->
+
+    <LinearGradientBrush x:Key="MicaWPF.GradientBrushes.ControlElevationBorder" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
+        <LinearGradientBrush.RelativeTransform>
+            <ScaleTransform CenterY="0.0" ScaleY="-1" />
+        </LinearGradientBrush.RelativeTransform>
+        <LinearGradientBrush.GradientStops>
+            <GradientStop Offset="0.33" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorSecondary}" />
+            <GradientStop Offset="1.0" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorDefault}" />
+        </LinearGradientBrush.GradientStops>
+    </LinearGradientBrush>
+
+    <LinearGradientBrush x:Key="MicaWPF.GradientBrushes.CircleElevationBorder" MappingMode="RelativeToBoundingBox" StartPoint="0,0" EndPoint="0,1">
+        <LinearGradientBrush.GradientStops>
+            <GradientStop Offset="0.50" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorDefault}" />
+            <GradientStop Offset="0.70" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorSecondary}" />
+        </LinearGradientBrush.GradientStops>
+    </LinearGradientBrush>
+
+    <LinearGradientBrush x:Key="MicaWPF.GradientBrushes.AccentControlElevationBorder" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
+        <LinearGradientBrush.RelativeTransform>
+            <ScaleTransform CenterY="0.0" ScaleY="-0" />
+        </LinearGradientBrush.RelativeTransform>
+        <LinearGradientBrush.GradientStops>
+            <GradientStop Offset="0.33" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorOnAccentSecondary}" />
+            <GradientStop Offset="1.0" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorOnAccentDefault}" />
+        </LinearGradientBrush.GradientStops>
+    </LinearGradientBrush>
+
+    <!--  Color Brushes  -->
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorLight3" Color="{StaticResource MicaWPF.Colors.SystemAccentColorLight3}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorLight2" Color="{StaticResource MicaWPF.Colors.SystemAccentColorLight2}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorLight1" Color="{StaticResource MicaWPF.Colors.SystemAccentColorLight1}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColor" Color="{StaticResource MicaWPF.Colors.SystemAccentColor}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorDark1" Color="{StaticResource MicaWPF.Colors.SystemAccentColorDark1}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorDark2" Color="{StaticResource MicaWPF.Colors.SystemAccentColorDark2}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorDark3" Color="{StaticResource MicaWPF.Colors.SystemAccentColorDark3}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorPrimary" Color="{StaticResource MicaWPF.Colors.SystemAccentColorPrimary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorSecondary" Color="{StaticResource MicaWPF.Colors.SystemAccentColorSecondary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorTertiary" Color="{StaticResource MicaWPF.Colors.SystemAccentColorTertiary}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.AccentTextFillColorPrimary" Color="{StaticResource MicaWPF.Colors.SystemAccentColorDark2}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.AccentTextFillColorSecondary" Color="{StaticResource MicaWPF.Colors.SystemAccentColorDark3}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.AccentTextFillColorTertiary" Color="{StaticResource MicaWPF.Colors.SystemAccentColorDark1}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.AccentFillColorSelectedTextBackground" Color="{StaticResource MicaWPF.Colors.SystemAccentColor}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.AccentFillColorDefault" Color="{StaticResource MicaWPF.Colors.SystemAccentColorDark1}" />
+    <SolidColorBrush
+        x:Key="MicaWPF.Brushes.AccentFillColorSecondary"
+        Opacity="0.9"
+        Color="{StaticResource MicaWPF.Colors.SystemAccentColorDark1}" />
+    <SolidColorBrush
+        x:Key="MicaWPF.Brushes.AccentFillColorTertiary"
+        Opacity="0.8"
+        Color="{StaticResource MicaWPF.Colors.SystemAccentColorDark1}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.AccentFillColorDisabled" Color="{StaticResource MicaWPF.Colors.AccentFillColorDisabled}" />
+
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorAttention" Color="{StaticResource MicaWPF.Colors.SystemAccentColor}" />
+
+    <!--  Brushes  -->
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ApplicationBackground" Color="{StaticResource MicaWPF.Colors.ApplicationBackgroundColor}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.TextFillColorPrimary" Color="{StaticResource MicaWPF.Colors.TextFillColorPrimary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.TextFillColorSecondary" Color="{StaticResource MicaWPF.Colors.TextFillColorSecondary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.TextFillColorTertiary" Color="{StaticResource MicaWPF.Colors.TextFillColorTertiary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.TextFillColorDisabled" Color="{StaticResource MicaWPF.Colors.TextFillColorDisabled}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.TextFillColorInverse" Color="{StaticResource MicaWPF.Colors.TextFillColorInverse}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.TextOnAccentFillColorSelectedText" Color="{StaticResource MicaWPF.Colors.TextOnAccentFillColorSelectedText}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.TextOnAccentFillColorPrimary" Color="{StaticResource MicaWPF.Colors.TextOnAccentFillColorPrimary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.TextOnAccentFillColorSecondary" Color="{StaticResource MicaWPF.Colors.TextOnAccentFillColorSecondary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.TextOnAccentFillColorDisabled" Color="{StaticResource MicaWPF.Colors.TextOnAccentFillColorDisabled}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlFillColorDefault" Color="{StaticResource MicaWPF.Colors.ControlFillColorDefault}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlFillColorSecondary" Color="{StaticResource MicaWPF.Colors.ControlFillColorSecondary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlFillColorTertiary" Color="{StaticResource MicaWPF.Colors.ControlFillColorTertiary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlFillColorDisabled" Color="{StaticResource MicaWPF.Colors.ControlFillColorDisabled}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlFillColorTransparent" Color="{StaticResource MicaWPF.Colors.ControlFillColorTransparent}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlFillColorInputActive" Color="{StaticResource MicaWPF.Colors.ControlFillColorInputActive}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrongFillColorDefault" Color="{StaticResource MicaWPF.Colors.ControlStrongFillColorDefault}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrongFillColorDisabled" Color="{StaticResource MicaWPF.Colors.ControlStrongFillColorDisabled}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlSolidFillColorDefault" Color="{StaticResource MicaWPF.Colors.ControlSolidFillColorDefault}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SubtleFillColorTransparent" Color="{StaticResource MicaWPF.Colors.SubtleFillColorTransparent}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SubtleFillColorSecondary" Color="{StaticResource MicaWPF.Colors.SubtleFillColorSecondary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SubtleFillColorTertiary" Color="{StaticResource MicaWPF.Colors.SubtleFillColorTertiary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SubtleFillColorDisabled" Color="{StaticResource MicaWPF.Colors.SubtleFillColorDisabled}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlAltFillColorTransparent" Color="{StaticResource MicaWPF.Colors.ControlAltFillColorTransparent}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlAltFillColorSecondary" Color="{StaticResource MicaWPF.Colors.ControlAltFillColorSecondary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlAltFillColorTertiary" Color="{StaticResource MicaWPF.Colors.ControlAltFillColorTertiary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlAltFillColorQuarternary" Color="{StaticResource MicaWPF.Colors.ControlAltFillColorQuarternary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlAltFillColorDisabled" Color="{StaticResource MicaWPF.Colors.ControlAltFillColorDisabled}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlOnImageFillColorDefault" Color="{StaticResource MicaWPF.Colors.ControlOnImageFillColorDefault}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlOnImageFillColorSecondary" Color="{StaticResource MicaWPF.Colors.ControlOnImageFillColorSecondary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlOnImageFillColorTertiary" Color="{StaticResource MicaWPF.Colors.ControlOnImageFillColorTertiary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlOnImageFillColorDisabled" Color="{StaticResource MicaWPF.Colors.ControlOnImageFillColorDisabled}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrokeColorDefault" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorDefault}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrokeColorSecondary" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorSecondary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrokeColorOnAccentDefault" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorOnAccentDefault}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrokeColorOnAccentSecondary" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorOnAccentSecondary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrokeColorOnAccentTertiary" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorOnAccentTertiary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrokeColorOnAccentDisabled" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorOnAccentDisabled}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrokeColorForStrongFillWhenOnImage" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorForStrongFillWhenOnImage}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.CardStrokeColorDefault" Color="{StaticResource MicaWPF.Colors.CardStrokeColorDefault}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.CardStrokeColorDefaultSolid" Color="{StaticResource MicaWPF.Colors.CardStrokeColorDefaultSolid}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrongStrokeColorDefault" Color="{StaticResource MicaWPF.Colors.ControlStrongStrokeColorDefault}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrongStrokeColorDisabled" Color="{StaticResource MicaWPF.Colors.ControlStrongStrokeColorDisabled}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SurfaceStrokeColorDefault" Color="{StaticResource MicaWPF.Colors.SurfaceStrokeColorDefault}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SurfaceStrokeColorFlyout" Color="{StaticResource MicaWPF.Colors.SurfaceStrokeColorFlyout}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SurfaceStrokeColorInverse" Color="{StaticResource MicaWPF.Colors.SurfaceStrokeColorInverse}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.DividerStrokeColorDefault" Color="{StaticResource MicaWPF.Colors.DividerStrokeColorDefault}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.FocusStrokeColorOuter" Color="{StaticResource MicaWPF.Colors.FocusStrokeColorOuter}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.FocusStrokeColorInner" Color="{StaticResource MicaWPF.Colors.FocusStrokeColorInner}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.CardBackgroundFillColorDefault" Color="{StaticResource MicaWPF.Colors.CardBackgroundFillColorDefault}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.CardBackgroundFillColorSecondary" Color="{StaticResource MicaWPF.Colors.CardBackgroundFillColorSecondary}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.MenuBorderColorDefault" Color="{StaticResource MicaWPF.Colors.MenuBorderColorDefault}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SmokeFillColorDefault" Color="{StaticResource MicaWPF.Colors.SmokeFillColorDefault}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.LayerFillColorDefault" Color="{StaticResource MicaWPF.Colors.LayerFillColorDefault}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.LayerFillColorAlt" Color="{StaticResource MicaWPF.Colors.LayerFillColorAlt}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.LayerOnAcrylicFillColorDefault" Color="{StaticResource MicaWPF.Colors.LayerOnAcrylicFillColorDefault}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.LayerOnAccentAcrylicFillColorDefault" Color="{StaticResource MicaWPF.Colors.LayerOnAccentAcrylicFillColorDefault}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SolidBackgroundFillColorBase" Color="{StaticResource MicaWPF.Colors.SolidBackgroundFillColorBase}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SolidBackgroundFillColorSecondary" Color="{StaticResource MicaWPF.Colors.SolidBackgroundFillColorSecondary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SolidBackgroundFillColorTertiary" Color="{StaticResource MicaWPF.Colors.SolidBackgroundFillColorTertiary}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SolidBackgroundFillColorQuarternary" Color="{StaticResource MicaWPF.Colors.SolidBackgroundFillColorQuarternary}" />
+
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorSuccess" Color="{StaticResource MicaWPF.Colors.SystemFillColorSuccess}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorCaution" Color="{StaticResource MicaWPF.Colors.SystemFillColorCaution}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorCritical" Color="{StaticResource MicaWPF.Colors.SystemFillColorCritical}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorNeutral" Color="{StaticResource MicaWPF.Colors.SystemFillColorNeutral}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorSolidNeutral" Color="{StaticResource MicaWPF.Colors.SystemFillColorSolidNeutral}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorAttentionBackground" Color="{StaticResource MicaWPF.Colors.SystemFillColorAttentionBackground}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorSuccessBackground" Color="{StaticResource MicaWPF.Colors.SystemFillColorSuccessBackground}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorCautionBackground" Color="{StaticResource MicaWPF.Colors.SystemFillColorCautionBackground}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorCriticalBackground" Color="{StaticResource MicaWPF.Colors.SystemFillColorCriticalBackground}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorNeutralBackground" Color="{StaticResource MicaWPF.Colors.SystemFillColorNeutralBackground}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorSolidAttentionBackground" Color="{StaticResource MicaWPF.Colors.SystemFillColorSolidAttentionBackground}" />
+    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorSolidNeutralBackground" Color="{StaticResource MicaWPF.Colors.SystemFillColorSolidNeutralBackground}" />
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="pack://application:,,,/MicaWPF.Core;component/Styles/Controls/Light/GradientBorder.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/MicaWPF.Lite/Controls/GradientBorder.cs b/src/MicaWPF.Lite/Controls/GradientBorder.cs
deleted file mode 100644
index 568d4cc..0000000
--- a/src/MicaWPF.Lite/Controls/GradientBorder.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// <copyright file="GradientBorder.cs" company="Zircon Technology">
-// This software is distributed under the MIT license and its code is open-source and free for use, modification, and distribution.
-// </copyright>
-
-using System.ComponentModel;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-
-namespace MicaWPF.Lite.Controls;
-
-/// <summary>
-/// A border that has a gradient based on the current theme.
-/// </summary>
-[ToolboxItem(true)]
-public class GradientBorder : UserControl
-{
-    public static readonly DependencyProperty BottomBorderBrushProperty = DependencyProperty.Register(nameof(BottomBorderBrush), typeof(Brush), typeof(GradientBorder));
-    public static readonly DependencyProperty TopBorderBrushProperty = DependencyProperty.Register(nameof(TopBorderBrush), typeof(Brush), typeof(GradientBorder));
-    public static readonly DependencyProperty CornerRadiusProperty = DependencyProperty.Register(nameof(CornerRadius), typeof(CornerRadius), typeof(GradientBorder));
-
-    public Brush? TopBorderBrush
-    {
-        get => (Brush)GetValue(BottomBorderBrushProperty);
-        set => SetValue(BottomBorderBrushProperty, value);
-    }
-
-    public Brush? BottomBorderBrush
-    {
-        get => (Brush)GetValue(BottomBorderBrushProperty);
-        set => SetValue(BottomBorderBrushProperty, value);
-    }
-
-    public CornerRadius? CornerRadius
-    {
-        get => (CornerRadius)GetValue(BottomBorderBrushProperty);
-        set => SetValue(BottomBorderBrushProperty, value);
-    }
-}
diff --git a/src/MicaWPF.Lite/Styles/Assets/Accent.xaml b/src/MicaWPF.Lite/Styles/Assets/Accent.xaml
deleted file mode 100644
index 82938f4..0000000
--- a/src/MicaWPF.Lite/Styles/Assets/Accent.xaml
+++ /dev/null
@@ -1,18 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <!--  These colors change when the theme change (Dark/Light)  -->
-    <Color x:Key="MicaWPF.Lite.Colors.SystemAccentColorPrimary">#559ce4</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SystemAccentColorSecondary">#80b9ee</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SystemAccentColorTertiary">#add8ff</Color>
-
-    <!--  These colors stay the same even on theme change  -->
-
-    <Color x:Key="MicaWPF.Lite.Colors.SystemAccentColorLight3">#91C5F0</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SystemAccentColorLight2">#60AFEE</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SystemAccentColorLight1">#3091E2</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SystemAccentColor">#2D78D6</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SystemAccentColorDark1">#1F5AA2</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SystemAccentColorDark2">#113D70</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SystemAccentColorDark3">#0C2F56</Color>
-
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/MicaWPF.Lite/Styles/Controls/Dark/GradientBorder.xaml b/src/MicaWPF.Lite/Styles/Controls/Dark/GradientBorder.xaml
deleted file mode 100644
index 86d44ce..0000000
--- a/src/MicaWPF.Lite/Styles/Controls/Dark/GradientBorder.xaml
+++ /dev/null
@@ -1,66 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:MicaWPF.Lite.Controls">
-
-    <Style x:Key="MicaWPF.Lite.Styles.GradientBorder.Default" TargetType="{x:Type controls:GradientBorder}">
-        <Setter Property="TopBorderBrush" Value="{DynamicResource MicaWPF.Lite.Brushes.ControlStrokeColorSecondary}" />
-        <Setter Property="BottomBorderBrush" Value="{DynamicResource MicaWPF.Lite.Brushes.ControlStrokeColorDefault}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:GradientBorder}">
-                    <Grid>
-                        <Border
-                            Margin="0"
-                            BorderBrush="{TemplateBinding TopBorderBrush}"
-                            BorderThickness="0,1,0,0"
-                            CornerRadius="{TemplateBinding CornerRadius}" />
-                        <Border
-                            Margin="0"
-                            BorderBrush="{TemplateBinding BottomBorderBrush}"
-                            BorderThickness="1,0,1,1"
-                            CornerRadius="{TemplateBinding CornerRadius}" />
-                        <Border
-                            Margin="1"
-                            Background="{TemplateBinding Background}"
-                            BorderThickness="0"
-                            CornerRadius="3" />
-                        <ContentPresenter Margin="{TemplateBinding Padding}" />
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="MicaWPF.Lite.Styles.GradientBorder.Accent" TargetType="{x:Type controls:GradientBorder}">
-        <Setter Property="TopBorderBrush" Value="{DynamicResource MicaWPF.Lite.Brushes.ControlStrokeColorOnAccentDefault}" />
-        <Setter Property="BottomBorderBrush" Value="{DynamicResource MicaWPF.Lite.Brushes.ControlStrokeColorOnAccentSecondary}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:GradientBorder}">
-                    <Border
-                        Margin="1"
-                        Background="{TemplateBinding Background}"
-                        BorderThickness="0"
-                        CornerRadius="4">
-                        <Grid Opacity="{TemplateBinding Opacity}">
-                            <Border
-                                Margin="0"
-                                BorderBrush="{TemplateBinding TopBorderBrush}"
-                                BorderThickness="1,1,1,0"
-                                CornerRadius="{TemplateBinding CornerRadius}" />
-                            <Border
-                                Margin="0"
-                                BorderBrush="{TemplateBinding BottomBorderBrush}"
-                                BorderThickness="0,0,0,1"
-                                CornerRadius="{TemplateBinding CornerRadius}" />
-                            <ContentPresenter Margin="{TemplateBinding Padding}" />
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style BasedOn="{StaticResource MicaWPF.Lite.Styles.GradientBorder.Default}" TargetType="{x:Type controls:GradientBorder}" />
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/MicaWPF.Lite/Styles/Controls/Light/GradientBorder.xaml b/src/MicaWPF.Lite/Styles/Controls/Light/GradientBorder.xaml
deleted file mode 100644
index 4df18f4..0000000
--- a/src/MicaWPF.Lite/Styles/Controls/Light/GradientBorder.xaml
+++ /dev/null
@@ -1,66 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:MicaWPF.Lite.Controls">
-
-    <Style x:Key="MicaWPF.Lite.Styles.GradientBorder.Default" TargetType="{x:Type controls:GradientBorder}">
-        <Setter Property="TopBorderBrush" Value="{DynamicResource MicaWPF.Lite.Brushes.ControlStrokeColorDefault}" />
-        <Setter Property="BottomBorderBrush" Value="{DynamicResource MicaWPF.Lite.Brushes.ControlStrokeColorSecondary}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:GradientBorder}">
-                    <Grid Opacity="{TemplateBinding Opacity}">
-                        <Border
-                            Margin="0"
-                            BorderBrush="{TemplateBinding TopBorderBrush}"
-                            BorderThickness="1,1,1,0"
-                            CornerRadius="{TemplateBinding CornerRadius}" />
-                        <Border
-                            Margin="0"
-                            BorderBrush="{TemplateBinding BottomBorderBrush}"
-                            BorderThickness="0,0,0,1"
-                            CornerRadius="{TemplateBinding CornerRadius}" />
-                        <Border
-                            Margin="1"
-                            Background="{TemplateBinding Background}"
-                            BorderThickness="0"
-                            CornerRadius="3" />
-                        <ContentPresenter Margin="{TemplateBinding Padding}" />
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="MicaWPF.Lite.Styles.GradientBorder.Accent" TargetType="{x:Type controls:GradientBorder}">
-        <Setter Property="TopBorderBrush" Value="{DynamicResource MicaWPF.Lite.Brushes.ControlStrokeColorOnAccentDefault}" />
-        <Setter Property="BottomBorderBrush" Value="{DynamicResource MicaWPF.Lite.Brushes.ControlStrokeColorOnAccentSecondary}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:GradientBorder}">
-                    <Border
-                        Margin="1"
-                        Background="{TemplateBinding Background}"
-                        BorderThickness="0"
-                        CornerRadius="4">
-                        <Grid Opacity="{TemplateBinding Opacity}">
-                            <Border
-                                Margin="0"
-                                BorderBrush="{TemplateBinding TopBorderBrush}"
-                                BorderThickness="1,1,1,0"
-                                CornerRadius="{TemplateBinding CornerRadius}" />
-                            <Border
-                                Margin="0"
-                                BorderBrush="{TemplateBinding BottomBorderBrush}"
-                                BorderThickness="0,0,0,1"
-                                CornerRadius="{TemplateBinding CornerRadius}" />
-                            <ContentPresenter Margin="{TemplateBinding Padding}" />
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style BasedOn="{StaticResource MicaWPF.Lite.Styles.GradientBorder.Default}" TargetType="{x:Type controls:GradientBorder}" />
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/MicaWPF.Lite/Styles/MicaWPF.Lite.xaml b/src/MicaWPF.Lite/Styles/MicaWPF.Lite.xaml
index e710abf..96d5211 100644
--- a/src/MicaWPF.Lite/Styles/MicaWPF.Lite.xaml
+++ b/src/MicaWPF.Lite/Styles/MicaWPF.Lite.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/MicaWPF.Lite;component/Styles/Assets/Accent.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MicaWPF.Core;component/Styles/Assets/Accent.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MicaWPF.Lite/Styles/ThemeDictionary.cs b/src/MicaWPF.Lite/Styles/ThemeDictionary.cs
index 281e94d..91565e0 100644
--- a/src/MicaWPF.Lite/Styles/ThemeDictionary.cs
+++ b/src/MicaWPF.Lite/Styles/ThemeDictionary.cs
@@ -8,5 +8,5 @@ namespace MicaWPF.Lite.Styles;
 
 public sealed class ThemeDictionary : ThemeDictionaryBase
 {
-    public override string SourceLocation { get; } = "pack://application:,,,/MicaWPF.Lite;component/Styles/Themes";
+    public override string SourceLocation { get; } = "pack://application:,,,/MicaWPF.Core;component/Styles/Themes";
 }
\ No newline at end of file
diff --git a/src/MicaWPF.Lite/Styles/Themes/MicaDark.xaml b/src/MicaWPF.Lite/Styles/Themes/MicaDark.xaml
deleted file mode 100644
index 3f681bd..0000000
--- a/src/MicaWPF.Lite/Styles/Themes/MicaDark.xaml
+++ /dev/null
@@ -1,264 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <!--  Colors  -->
-    <Color x:Key="MicaWPF.Lite.Colors.ApplicationBackgroundColor">#202020</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.TextFillColorPrimary">#FFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.TextFillColorSecondary">#C5FFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.TextFillColorTertiary">#87FFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.TextFillColorDisabled">#5DFFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.TextFillColorInverse">#FF000000</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.AccentTextFillColorDisabled">#5DFFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.TextOnAccentFillColorSelectedText">#FFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.TextOnAccentFillColorPrimary">#000000</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.TextOnAccentFillColorSecondary">#80000000</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.TextOnAccentFillColorDisabled">#87FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.ControlFillColorDefault">#0FFFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlFillColorSecondary">#15FFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlFillColorTertiary">#08FFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlFillColorDisabled">#0BFFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlFillColorTransparent">#00FFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlFillColorInputActive">#B31E1E1E</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.ControlStrongFillColorDefault">#8BFFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlStrongFillColorDisabled">#3FFFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.ControlSolidFillColorDefault">#454545</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.SubtleFillColorTransparent">#00FFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SubtleFillColorSecondary">#0FFFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SubtleFillColorTertiary">#0AFFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SubtleFillColorDisabled">#00FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.ControlAltFillColorTransparent">#00FFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlAltFillColorSecondary">#19000000</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlAltFillColorTertiary">#0BFFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlAltFillColorQuarternary">#12FFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlAltFillColorDisabled">#00FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.ControlOnImageFillColorDefault">#B31C1C1C</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlOnImageFillColorSecondary">#1A1A1A</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlOnImageFillColorTertiary">#131313</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlOnImageFillColorDisabled">#1E1E1E</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.AccentFillColorDisabled">#28FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.ControlStrokeColorDefault">#12FFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlStrokeColorSecondary">#18FFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlStrokeColorOnAccentDefault">#14FFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlStrokeColorOnAccentSecondary">#23000000</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlStrokeColorOnAccentTertiary">#37000000</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlStrokeColorOnAccentDisabled">#33000000</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.ControlStrokeColorForStrongFillWhenOnImage">#6B000000</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.CardStrokeColorDefault">#19000000</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.CardStrokeColorDefaultSolid">#1C1C1C</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.MenuBorderColorDefault">#151515</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.ControlStrongStrokeColorDefault">#8BFFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlStrongStrokeColorDisabled">#28FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.SurfaceStrokeColorDefault">#66757575</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SurfaceStrokeColorFlyout">#33000000</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SurfaceStrokeColorInverse">#0F000000</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.DividerStrokeColorDefault">#15FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.FocusStrokeColorOuter">#FFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.FocusStrokeColorInner">#B3000000</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.CardBackgroundFillColorDefault">#0DFFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.CardBackgroundFillColorSecondary">#08FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.SmokeFillColorDefault">#4D000000</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.LayerFillColorDefault">#4C3A3A3A</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.LayerFillColorAlt">#0DFFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.LayerOnAcrylicFillColorDefault">#09FFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.LayerOnAccentAcrylicFillColorDefault">#09FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.SolidBackgroundFillColorBase">#202020</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SolidBackgroundFillColorSecondary">#1C1C1C</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SolidBackgroundFillColorTertiary">#282828</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SolidBackgroundFillColorQuarternary">#2C2C2C</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SolidBackgroundFillColorTransparent">#00202020</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.SystemFillColorSuccess">#6CCB5F</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SystemFillColorCaution">#FCE100</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SystemFillColorCritical">#FF99A4</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SystemFillColorNeutral">#8BFFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SystemFillColorSolidNeutral">#9D9D9D</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SystemFillColorAttentionBackground">#08FFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SystemFillColorSuccessBackground">#393D1B</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SystemFillColorCautionBackground">#433519</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SystemFillColorCriticalBackground">#442726</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SystemFillColorNeutralBackground">#08FFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SystemFillColorSolidAttentionBackground">#2E2E2E</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SystemFillColorSolidNeutralBackground">#2E2E2E</Color>
-
-    <!--  Elevation border brushes  -->
-
-    <LinearGradientBrush x:Key="MicaWPF.Lite.GradientBrushes.ControlElevationBorder" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
-        <LinearGradientBrush.GradientStops>
-            <GradientStop Offset="0.33" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrokeColorSecondary}" />
-            <GradientStop Offset="1.0" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrokeColorDefault}" />
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="MicaWPF.Lite.GradientBrushes.CircleElevationBorder" MappingMode="RelativeToBoundingBox" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStop Offset="0.70" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrokeColorSecondary}" />
-            <GradientStop Offset="0.50" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrokeColorDefault}" />
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="MicaWPF.Lite.GradientBrushes.AccentControlElevationBorder" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
-        <LinearGradientBrush.RelativeTransform>
-            <ScaleTransform CenterY="0.5" ScaleY="-1" />
-        </LinearGradientBrush.RelativeTransform>
-        <LinearGradientBrush.GradientStops>
-            <GradientStop Offset="0.33" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrokeColorOnAccentSecondary}" />
-            <GradientStop Offset="1.0" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrokeColorOnAccentDefault}" />
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <!--  Color Brushes  -->
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemAccentColorLight3" Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColorLight3}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemAccentColorLight2" Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColorLight2}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemAccentColorLight1" Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColorLight1}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemAccentColor" Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColor}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemAccentColorDark1" Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColorDark1}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemAccentColorDark2" Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColorDark2}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemAccentColorDark3" Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColorDark3}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemAccentColorPrimary" Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColorPrimary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemAccentColorSecondary" Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemAccentColorTertiary" Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColorTertiary}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.AccentTextFillColorPrimary" Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColorLight3}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.AccentTextFillColorSecondary" Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColorLight3}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.AccentTextFillColorTertiary" Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColorLight2}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.AccentFillColorSelectedTextBackground" Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColor}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.AccentFillColorDefault" Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColorLight2}" />
-    <SolidColorBrush
-        x:Key="MicaWPF.Lite.Brushes.AccentFillColorSecondary"
-        Opacity="0.9"
-        Color="{DynamicResource MicaWPF.Lite.Colors.SystemAccentColorLight2}" />
-    <SolidColorBrush
-        x:Key="MicaWPF.Lite.Brushes.AccentFillColorTertiary"
-        Opacity="0.8"
-        Color="{DynamicResource MicaWPF.Lite.Colors.SystemAccentColorLight2}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.AccentFillColorDisabled" Color="{StaticResource MicaWPF.Lite.Colors.AccentFillColorDisabled}" />
-
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemFillColorAttention" Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColor}" />
-
-    <!--  Brushes  -->
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ApplicationBackground" Color="{StaticResource MicaWPF.Lite.Colors.ApplicationBackgroundColor}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.TextFillColorPrimary" Color="{StaticResource MicaWPF.Lite.Colors.TextFillColorPrimary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.TextFillColorSecondary" Color="{StaticResource MicaWPF.Lite.Colors.TextFillColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.TextFillColorTertiary" Color="{StaticResource MicaWPF.Lite.Colors.TextFillColorTertiary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.TextFillColorDisabled" Color="{StaticResource MicaWPF.Lite.Colors.TextFillColorDisabled}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.TextFillColorInverse" Color="{StaticResource MicaWPF.Lite.Colors.TextFillColorInverse}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.TextOnAccentFillColorSelectedText" Color="{StaticResource MicaWPF.Lite.Colors.TextOnAccentFillColorSelectedText}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.TextOnAccentFillColorPrimary" Color="{StaticResource MicaWPF.Lite.Colors.TextOnAccentFillColorPrimary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.TextOnAccentFillColorSecondary" Color="{StaticResource MicaWPF.Lite.Colors.TextOnAccentFillColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.TextOnAccentFillColorDisabled" Color="{StaticResource MicaWPF.Lite.Colors.TextOnAccentFillColorDisabled}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlFillColorDefault" Color="{StaticResource MicaWPF.Lite.Colors.ControlFillColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlFillColorSecondary" Color="{StaticResource MicaWPF.Lite.Colors.ControlFillColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlFillColorTertiary" Color="{StaticResource MicaWPF.Lite.Colors.ControlFillColorTertiary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlFillColorDisabled" Color="{StaticResource MicaWPF.Lite.Colors.ControlFillColorDisabled}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlFillColorTransparent" Color="{StaticResource MicaWPF.Lite.Colors.ControlFillColorTransparent}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlFillColorInputActive" Color="{StaticResource MicaWPF.Lite.Colors.ControlFillColorInputActive}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlStrongFillColorDefault" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrongFillColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlStrongFillColorDisabled" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrongFillColorDisabled}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlSolidFillColorDefault" Color="{StaticResource MicaWPF.Lite.Colors.ControlSolidFillColorDefault}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SubtleFillColorTransparent" Color="{StaticResource MicaWPF.Lite.Colors.SubtleFillColorTransparent}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SubtleFillColorSecondary" Color="{StaticResource MicaWPF.Lite.Colors.SubtleFillColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SubtleFillColorTertiary" Color="{StaticResource MicaWPF.Lite.Colors.SubtleFillColorTertiary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SubtleFillColorDisabled" Color="{StaticResource MicaWPF.Lite.Colors.SubtleFillColorDisabled}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlAltFillColorTransparent" Color="{StaticResource MicaWPF.Lite.Colors.ControlAltFillColorTransparent}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlAltFillColorSecondary" Color="{StaticResource MicaWPF.Lite.Colors.ControlAltFillColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlAltFillColorTertiary" Color="{StaticResource MicaWPF.Lite.Colors.ControlAltFillColorTertiary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlAltFillColorQuarternary" Color="{StaticResource MicaWPF.Lite.Colors.ControlAltFillColorQuarternary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlAltFillColorDisabled" Color="{StaticResource MicaWPF.Lite.Colors.ControlAltFillColorDisabled}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlOnImageFillColorDefault" Color="{StaticResource MicaWPF.Lite.Colors.ControlOnImageFillColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlOnImageFillColorSecondary" Color="{StaticResource MicaWPF.Lite.Colors.ControlOnImageFillColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlOnImageFillColorTertiary" Color="{StaticResource MicaWPF.Lite.Colors.ControlOnImageFillColorTertiary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlOnImageFillColorDisabled" Color="{StaticResource MicaWPF.Lite.Colors.ControlOnImageFillColorDisabled}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlStrokeColorDefault" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrokeColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlStrokeColorSecondary" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrokeColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlStrokeColorOnAccentDefault" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrokeColorOnAccentDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlStrokeColorOnAccentSecondary" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrokeColorOnAccentSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlStrokeColorOnAccentTertiary" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrokeColorOnAccentTertiary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlStrokeColorOnAccentDisabled" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrokeColorOnAccentDisabled}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlStrokeColorForStrongFillWhenOnImage" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrokeColorForStrongFillWhenOnImage}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.CardStrokeColorDefault" Color="{StaticResource MicaWPF.Lite.Colors.CardStrokeColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.CardStrokeColorDefaultSolid" Color="{StaticResource MicaWPF.Lite.Colors.CardStrokeColorDefaultSolid}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlStrongStrokeColorDefault" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrongStrokeColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlStrongStrokeColorDisabled" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrongStrokeColorDisabled}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SurfaceStrokeColorDefault" Color="{StaticResource MicaWPF.Lite.Colors.SurfaceStrokeColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SurfaceStrokeColorFlyout" Color="{StaticResource MicaWPF.Lite.Colors.SurfaceStrokeColorFlyout}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SurfaceStrokeColorInverse" Color="{StaticResource MicaWPF.Lite.Colors.SurfaceStrokeColorInverse}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.DividerStrokeColorDefault" Color="{StaticResource MicaWPF.Lite.Colors.DividerStrokeColorDefault}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.FocusStrokeColorOuter" Color="{StaticResource MicaWPF.Lite.Colors.FocusStrokeColorOuter}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.FocusStrokeColorInner" Color="{StaticResource MicaWPF.Lite.Colors.FocusStrokeColorInner}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.CardBackgroundFillColorDefault" Color="{StaticResource MicaWPF.Lite.Colors.CardBackgroundFillColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.CardBackgroundFillColorSecondary" Color="{StaticResource MicaWPF.Lite.Colors.CardBackgroundFillColorSecondary}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.MenuBorderColorDefault" Color="{StaticResource MicaWPF.Lite.Colors.MenuBorderColorDefault}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SmokeFillColorDefault" Color="{StaticResource MicaWPF.Lite.Colors.SmokeFillColorDefault}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.LayerFillColorDefault" Color="{StaticResource MicaWPF.Lite.Colors.LayerFillColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.LayerFillColorAlt" Color="{StaticResource MicaWPF.Lite.Colors.LayerFillColorAlt}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.LayerOnAcrylicFillColorDefault" Color="{StaticResource MicaWPF.Lite.Colors.LayerOnAcrylicFillColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.LayerOnAccentAcrylicFillColorDefault" Color="{StaticResource MicaWPF.Lite.Colors.LayerOnAccentAcrylicFillColorDefault}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SolidBackgroundFillColorBase" Color="{StaticResource MicaWPF.Lite.Colors.SolidBackgroundFillColorBase}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SolidBackgroundFillColorSecondary" Color="{StaticResource MicaWPF.Lite.Colors.SolidBackgroundFillColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SolidBackgroundFillColorTertiary" Color="{StaticResource MicaWPF.Lite.Colors.SolidBackgroundFillColorTertiary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SolidBackgroundFillColorQuarternary" Color="{StaticResource MicaWPF.Lite.Colors.SolidBackgroundFillColorQuarternary}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemFillColorSuccess" Color="{StaticResource MicaWPF.Lite.Colors.SystemFillColorSuccess}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemFillColorCaution" Color="{StaticResource MicaWPF.Lite.Colors.SystemFillColorCaution}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemFillColorCritical" Color="{StaticResource MicaWPF.Lite.Colors.SystemFillColorCritical}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemFillColorNeutral" Color="{StaticResource MicaWPF.Lite.Colors.SystemFillColorNeutral}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemFillColorSolidNeutral" Color="{StaticResource MicaWPF.Lite.Colors.SystemFillColorSolidNeutral}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemFillColorAttentionBackground" Color="{StaticResource MicaWPF.Lite.Colors.SystemFillColorAttentionBackground}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemFillColorSuccessBackground" Color="{StaticResource MicaWPF.Lite.Colors.SystemFillColorSuccessBackground}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemFillColorCautionBackground" Color="{StaticResource MicaWPF.Lite.Colors.SystemFillColorCautionBackground}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemFillColorCriticalBackground" Color="{StaticResource MicaWPF.Lite.Colors.SystemFillColorCriticalBackground}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemFillColorNeutralBackground" Color="{StaticResource MicaWPF.Lite.Colors.SystemFillColorNeutralBackground}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemFillColorSolidAttentionBackground" Color="{StaticResource MicaWPF.Lite.Colors.SystemFillColorSolidAttentionBackground}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemFillColorSolidNeutralBackground" Color="{StaticResource MicaWPF.Lite.Colors.SystemFillColorSolidNeutralBackground}" />
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/MicaWPF.Lite;component/Styles/Controls/Dark/GradientBorder.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-</ResourceDictionary>
diff --git a/src/MicaWPF.Lite/Styles/Themes/MicaLight.xaml b/src/MicaWPF.Lite/Styles/Themes/MicaLight.xaml
deleted file mode 100644
index 1d9b3a3..0000000
--- a/src/MicaWPF.Lite/Styles/Themes/MicaLight.xaml
+++ /dev/null
@@ -1,269 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <!--  Colors  -->
-    <Color x:Key="MicaWPF.Lite.Colors.ApplicationBackgroundColor">#fafafa</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.TextFillColorPrimary">#E4000000</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.TextFillColorSecondary">#9E000000</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.TextFillColorTertiary">#72000000</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.TextFillColorDisabled">#5C000000</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.TextFillColorInverse">#FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.AccentTextFillColorDisabled">#5C000000</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.TextOnAccentFillColorSelectedText">#FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.TextOnAccentFillColorPrimary">#FFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.TextOnAccentFillColorSecondary">#B3FFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.TextOnAccentFillColorDisabled">#FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.ControlFillColorDefault">#B3FFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlFillColorSecondary">#80F9F9F9</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlFillColorTertiary">#4DF9F9F9</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlFillColorDisabled">#4DF9F9F9</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlFillColorTransparent">#00FFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlFillColorInputActive">#FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.ControlStrongFillColorDefault">#72000000</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlStrongFillColorDisabled">#51000000</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.ControlSolidFillColorDefault">#FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.SubtleFillColorTransparent">#00FFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SubtleFillColorSecondary">#09000000</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SubtleFillColorTertiary">#06000000</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SubtleFillColorDisabled">#00FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.ControlAltFillColorTransparent">#00FFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlAltFillColorSecondary">#06000000</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlAltFillColorTertiary">#0F000000</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlAltFillColorQuarternary">#18000000</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlAltFillColorDisabled">#00FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.ControlOnImageFillColorDefault">#C9FFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlOnImageFillColorSecondary">#F3F3F3</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlOnImageFillColorTertiary">#EBEBEB</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlOnImageFillColorDisabled">#00FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.AccentFillColorDisabled">#37000000</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.ControlStrokeColorDefault">#0F000000</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlStrokeColorSecondary">#29000000</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlStrokeColorOnAccentDefault">#14FFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlStrokeColorOnAccentSecondary">#66000000</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlStrokeColorOnAccentTertiary">#37000000</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlStrokeColorOnAccentDisabled">#0F000000</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.ControlStrokeColorForStrongFillWhenOnImage">#59FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.CardStrokeColorDefault">#0F000000</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.CardStrokeColorDefaultSolid">#EBEBEB</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.MenuBorderColorDefault">#0F000000</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.ControlStrongStrokeColorDefault">#72000000</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.ControlStrongStrokeColorDisabled">#37000000</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.SurfaceStrokeColorDefault">#66757575</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SurfaceStrokeColorFlyout">#0F000000</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SurfaceStrokeColorInverse">#15FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.DividerStrokeColorDefault">#0F000000</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.FocusStrokeColorOuter">#E4000000</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.FocusStrokeColorInner">#B3FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.CardBackgroundFillColorDefault">#B3FFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.CardBackgroundFillColorSecondary">#80F6F6F6</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.SmokeFillColorDefault">#4D000000</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.LayerFillColorDefault">#80FFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.LayerFillColorAlt">#FFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.LayerOnAcrylicFillColorDefault">#40FFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.LayerOnAccentAcrylicFillColorDefault">#40FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.SolidBackgroundFillColorBase">#F3F3F3</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SolidBackgroundFillColorSecondary">#EEEEEE</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SolidBackgroundFillColorTertiary">#F9F9F9</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SolidBackgroundFillColorQuarternary">#FFFFFF</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SolidBackgroundFillColorTransparent">#00F3F3F3</Color>
-
-    <Color x:Key="MicaWPF.Lite.Colors.SystemFillColorSuccess">#0F7B0F</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SystemFillColorCaution">#9D5D00</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SystemFillColorCritical">#C42B1C</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SystemFillColorNeutral">#72000000</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SystemFillColorSolidNeutral">#8A8A8A</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SystemFillColorAttentionBackground">#80F6F6F6</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SystemFillColorSuccessBackground">#DFF6DD</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SystemFillColorCautionBackground">#FFF4CE</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SystemFillColorCriticalBackground">#FDE7E9</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SystemFillColorNeutralBackground">#06000000</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SystemFillColorSolidAttentionBackground">#F7F7F7</Color>
-    <Color x:Key="MicaWPF.Lite.Colors.SystemFillColorSolidNeutralBackground">#F3F3F3</Color>
-
-    <!--  Elevation border brushes  -->
-
-    <LinearGradientBrush x:Key="MicaWPF.Lite.GradientBrushes.ControlElevationBorder" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
-        <LinearGradientBrush.RelativeTransform>
-            <ScaleTransform CenterY="0.0" ScaleY="-1" />
-        </LinearGradientBrush.RelativeTransform>
-        <LinearGradientBrush.GradientStops>
-            <GradientStop Offset="0.33" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrokeColorSecondary}" />
-            <GradientStop Offset="1.0" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrokeColorDefault}" />
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="MicaWPF.Lite.GradientBrushes.CircleElevationBorder" MappingMode="RelativeToBoundingBox" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStop Offset="0.50" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrokeColorDefault}" />
-            <GradientStop Offset="0.70" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrokeColorSecondary}" />
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="MicaWPF.Lite.GradientBrushes.AccentControlElevationBorder" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
-        <LinearGradientBrush.RelativeTransform>
-            <ScaleTransform CenterY="0.0" ScaleY="-0" />
-        </LinearGradientBrush.RelativeTransform>
-        <LinearGradientBrush.GradientStops>
-            <GradientStop Offset="0.33" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrokeColorOnAccentSecondary}" />
-            <GradientStop Offset="1.0" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrokeColorOnAccentDefault}" />
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <!--  Color Brushes  -->
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemAccentColorLight3" Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColorLight3}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemAccentColorLight2" Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColorLight2}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemAccentColorLight1" Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColorLight1}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemAccentColor" Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColor}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemAccentColorDark1" Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColorDark1}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemAccentColorDark2" Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColorDark2}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemAccentColorDark3" Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColorDark3}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemAccentColorPrimary" Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColorPrimary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemAccentColorSecondary" Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemAccentColorTertiary" Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColorTertiary}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.AccentTextFillColorPrimary" Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColorDark2}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.AccentTextFillColorSecondary" Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColorDark3}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.AccentTextFillColorTertiary" Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColorDark1}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.AccentFillColorSelectedTextBackground" Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColor}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.AccentFillColorDefault" Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColorDark1}" />
-    <SolidColorBrush
-        x:Key="MicaWPF.Lite.Brushes.AccentFillColorSecondary"
-        Opacity="0.9"
-        Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColorDark1}" />
-    <SolidColorBrush
-        x:Key="MicaWPF.Lite.Brushes.AccentFillColorTertiary"
-        Opacity="0.8"
-        Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColorDark1}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.AccentFillColorDisabled" Color="{StaticResource MicaWPF.Lite.Colors.AccentFillColorDisabled}" />
-
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemFillColorAttention" Color="{StaticResource MicaWPF.Lite.Colors.SystemAccentColor}" />
-
-    <!--  Brushes  -->
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ApplicationBackground" Color="{StaticResource MicaWPF.Lite.Colors.ApplicationBackgroundColor}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.TextFillColorPrimary" Color="{StaticResource MicaWPF.Lite.Colors.TextFillColorPrimary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.TextFillColorSecondary" Color="{StaticResource MicaWPF.Lite.Colors.TextFillColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.TextFillColorTertiary" Color="{StaticResource MicaWPF.Lite.Colors.TextFillColorTertiary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.TextFillColorDisabled" Color="{StaticResource MicaWPF.Lite.Colors.TextFillColorDisabled}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.TextFillColorInverse" Color="{StaticResource MicaWPF.Lite.Colors.TextFillColorInverse}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.TextOnAccentFillColorSelectedText" Color="{StaticResource MicaWPF.Lite.Colors.TextOnAccentFillColorSelectedText}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.TextOnAccentFillColorPrimary" Color="{StaticResource MicaWPF.Lite.Colors.TextOnAccentFillColorPrimary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.TextOnAccentFillColorSecondary" Color="{StaticResource MicaWPF.Lite.Colors.TextOnAccentFillColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.TextOnAccentFillColorDisabled" Color="{StaticResource MicaWPF.Lite.Colors.TextOnAccentFillColorDisabled}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlFillColorDefault" Color="{StaticResource MicaWPF.Lite.Colors.ControlFillColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlFillColorSecondary" Color="{StaticResource MicaWPF.Lite.Colors.ControlFillColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlFillColorTertiary" Color="{StaticResource MicaWPF.Lite.Colors.ControlFillColorTertiary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlFillColorDisabled" Color="{StaticResource MicaWPF.Lite.Colors.ControlFillColorDisabled}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlFillColorTransparent" Color="{StaticResource MicaWPF.Lite.Colors.ControlFillColorTransparent}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlFillColorInputActive" Color="{StaticResource MicaWPF.Lite.Colors.ControlFillColorInputActive}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlStrongFillColorDefault" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrongFillColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlStrongFillColorDisabled" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrongFillColorDisabled}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlSolidFillColorDefault" Color="{StaticResource MicaWPF.Lite.Colors.ControlSolidFillColorDefault}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SubtleFillColorTransparent" Color="{StaticResource MicaWPF.Lite.Colors.SubtleFillColorTransparent}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SubtleFillColorSecondary" Color="{StaticResource MicaWPF.Lite.Colors.SubtleFillColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SubtleFillColorTertiary" Color="{StaticResource MicaWPF.Lite.Colors.SubtleFillColorTertiary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SubtleFillColorDisabled" Color="{StaticResource MicaWPF.Lite.Colors.SubtleFillColorDisabled}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlAltFillColorTransparent" Color="{StaticResource MicaWPF.Lite.Colors.ControlAltFillColorTransparent}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlAltFillColorSecondary" Color="{StaticResource MicaWPF.Lite.Colors.ControlAltFillColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlAltFillColorTertiary" Color="{StaticResource MicaWPF.Lite.Colors.ControlAltFillColorTertiary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlAltFillColorQuarternary" Color="{StaticResource MicaWPF.Lite.Colors.ControlAltFillColorQuarternary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlAltFillColorDisabled" Color="{StaticResource MicaWPF.Lite.Colors.ControlAltFillColorDisabled}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlOnImageFillColorDefault" Color="{StaticResource MicaWPF.Lite.Colors.ControlOnImageFillColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlOnImageFillColorSecondary" Color="{StaticResource MicaWPF.Lite.Colors.ControlOnImageFillColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlOnImageFillColorTertiary" Color="{StaticResource MicaWPF.Lite.Colors.ControlOnImageFillColorTertiary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlOnImageFillColorDisabled" Color="{StaticResource MicaWPF.Lite.Colors.ControlOnImageFillColorDisabled}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlStrokeColorDefault" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrokeColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlStrokeColorSecondary" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrokeColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlStrokeColorOnAccentDefault" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrokeColorOnAccentDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlStrokeColorOnAccentSecondary" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrokeColorOnAccentSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlStrokeColorOnAccentTertiary" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrokeColorOnAccentTertiary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlStrokeColorOnAccentDisabled" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrokeColorOnAccentDisabled}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlStrokeColorForStrongFillWhenOnImage" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrokeColorForStrongFillWhenOnImage}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.CardStrokeColorDefault" Color="{StaticResource MicaWPF.Lite.Colors.CardStrokeColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.CardStrokeColorDefaultSolid" Color="{StaticResource MicaWPF.Lite.Colors.CardStrokeColorDefaultSolid}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlStrongStrokeColorDefault" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrongStrokeColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.ControlStrongStrokeColorDisabled" Color="{StaticResource MicaWPF.Lite.Colors.ControlStrongStrokeColorDisabled}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SurfaceStrokeColorDefault" Color="{StaticResource MicaWPF.Lite.Colors.SurfaceStrokeColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SurfaceStrokeColorFlyout" Color="{StaticResource MicaWPF.Lite.Colors.SurfaceStrokeColorFlyout}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SurfaceStrokeColorInverse" Color="{StaticResource MicaWPF.Lite.Colors.SurfaceStrokeColorInverse}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.DividerStrokeColorDefault" Color="{StaticResource MicaWPF.Lite.Colors.DividerStrokeColorDefault}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.FocusStrokeColorOuter" Color="{StaticResource MicaWPF.Lite.Colors.FocusStrokeColorOuter}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.FocusStrokeColorInner" Color="{StaticResource MicaWPF.Lite.Colors.FocusStrokeColorInner}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.CardBackgroundFillColorDefault" Color="{StaticResource MicaWPF.Lite.Colors.CardBackgroundFillColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.CardBackgroundFillColorSecondary" Color="{StaticResource MicaWPF.Lite.Colors.CardBackgroundFillColorSecondary}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.MenuBorderColorDefault" Color="{StaticResource MicaWPF.Lite.Colors.MenuBorderColorDefault}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SmokeFillColorDefault" Color="{StaticResource MicaWPF.Lite.Colors.SmokeFillColorDefault}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.LayerFillColorDefault" Color="{StaticResource MicaWPF.Lite.Colors.LayerFillColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.LayerFillColorAlt" Color="{StaticResource MicaWPF.Lite.Colors.LayerFillColorAlt}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.LayerOnAcrylicFillColorDefault" Color="{StaticResource MicaWPF.Lite.Colors.LayerOnAcrylicFillColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.LayerOnAccentAcrylicFillColorDefault" Color="{StaticResource MicaWPF.Lite.Colors.LayerOnAccentAcrylicFillColorDefault}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SolidBackgroundFillColorBase" Color="{StaticResource MicaWPF.Lite.Colors.SolidBackgroundFillColorBase}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SolidBackgroundFillColorSecondary" Color="{StaticResource MicaWPF.Lite.Colors.SolidBackgroundFillColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SolidBackgroundFillColorTertiary" Color="{StaticResource MicaWPF.Lite.Colors.SolidBackgroundFillColorTertiary}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SolidBackgroundFillColorQuarternary" Color="{StaticResource MicaWPF.Lite.Colors.SolidBackgroundFillColorQuarternary}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemFillColorSuccess" Color="{StaticResource MicaWPF.Lite.Colors.SystemFillColorSuccess}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemFillColorCaution" Color="{StaticResource MicaWPF.Lite.Colors.SystemFillColorCaution}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemFillColorCritical" Color="{StaticResource MicaWPF.Lite.Colors.SystemFillColorCritical}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemFillColorNeutral" Color="{StaticResource MicaWPF.Lite.Colors.SystemFillColorNeutral}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemFillColorSolidNeutral" Color="{StaticResource MicaWPF.Lite.Colors.SystemFillColorSolidNeutral}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemFillColorAttentionBackground" Color="{StaticResource MicaWPF.Lite.Colors.SystemFillColorAttentionBackground}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemFillColorSuccessBackground" Color="{StaticResource MicaWPF.Lite.Colors.SystemFillColorSuccessBackground}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemFillColorCautionBackground" Color="{StaticResource MicaWPF.Lite.Colors.SystemFillColorCautionBackground}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemFillColorCriticalBackground" Color="{StaticResource MicaWPF.Lite.Colors.SystemFillColorCriticalBackground}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemFillColorNeutralBackground" Color="{StaticResource MicaWPF.Lite.Colors.SystemFillColorNeutralBackground}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemFillColorSolidAttentionBackground" Color="{StaticResource MicaWPF.Lite.Colors.SystemFillColorSolidAttentionBackground}" />
-    <SolidColorBrush x:Key="MicaWPF.Lite.Brushes.SystemFillColorSolidNeutralBackground" Color="{StaticResource MicaWPF.Lite.Colors.SystemFillColorSolidNeutralBackground}" />
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/MicaWPF.Lite;component/Styles/Controls/Light/GradientBorder.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/MicaWPF/Controls/GradientBorder.cs b/src/MicaWPF/Controls/GradientBorder.cs
deleted file mode 100644
index 4cbe946..0000000
--- a/src/MicaWPF/Controls/GradientBorder.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// <copyright file="GradientBorder.cs" company="Zircon Technology">
-// This software is distributed under the MIT license and its code is open-source and free for use, modification, and distribution.
-// </copyright>
-
-using System.ComponentModel;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-
-namespace MicaWPF.Controls;
-
-/// <summary>
-/// A border that has a gradient based on the current theme.
-/// </summary>
-[ToolboxItem(true)]
-public class GradientBorder : UserControl
-{
-    public static readonly DependencyProperty BottomBorderBrushProperty = DependencyProperty.Register(nameof(BottomBorderBrush), typeof(Brush), typeof(GradientBorder));
-    public static readonly DependencyProperty TopBorderBrushProperty = DependencyProperty.Register(nameof(TopBorderBrush), typeof(Brush), typeof(GradientBorder));
-    public static readonly DependencyProperty CornerRadiusProperty = DependencyProperty.Register(nameof(CornerRadius), typeof(CornerRadius), typeof(GradientBorder));
-
-    public Brush? TopBorderBrush
-    {
-        get => (Brush)GetValue(BottomBorderBrushProperty);
-        set => SetValue(BottomBorderBrushProperty, value);
-    }
-
-    public Brush? BottomBorderBrush
-    {
-        get => (Brush)GetValue(BottomBorderBrushProperty);
-        set => SetValue(BottomBorderBrushProperty, value);
-    }
-
-    public CornerRadius? CornerRadius
-    {
-        get => (CornerRadius)GetValue(BottomBorderBrushProperty);
-        set => SetValue(BottomBorderBrushProperty, value);
-    }
-}
diff --git a/src/MicaWPF/Styles/Controls/Button.xaml b/src/MicaWPF/Styles/Controls/Button.xaml
index 43cbb1d..5ec35d4 100644
--- a/src/MicaWPF/Styles/Controls/Button.xaml
+++ b/src/MicaWPF/Styles/Controls/Button.xaml
@@ -1,7 +1,8 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:MicaWPF.Controls">
+    xmlns:controls="clr-namespace:MicaWPF.Controls"
+    xmlns:corecontrols="clr-namespace:MicaWPF.Core.Controls;assembly=MicaWPF.Core">
 
     <Style x:Key="MicaWPF.Styles.Default.Button" TargetType="{x:Type controls:Button}">
         <Setter Property="FocusVisualStyle" Value="{DynamicResource MicaWPF.Styles.Default.FocusVisualStyle}" />
@@ -19,7 +20,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:Button}">
                     <Grid>
-                        <controls:GradientBorder
+                        <corecontrols:GradientBorder
                             x:Name="ContentBorder"
                             Padding="{TemplateBinding Padding}"
                             Background="{TemplateBinding Background}"
@@ -30,7 +31,7 @@
                                 x:Name="ContentPresenter"
                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                 VerticalAlignment="Center" />
-                        </controls:GradientBorder>
+                        </corecontrols:GradientBorder>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualState x:Name="Normal" />
@@ -61,19 +62,19 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:Button}">
                     <Grid>
-                        <controls:GradientBorder
+                        <corecontrols:GradientBorder
                             x:Name="ContentBorder"
                             Margin="-2"
                             Padding="{TemplateBinding Padding}"
+                            Background="{TemplateBinding Background}"
                             BorderThickness="{TemplateBinding BorderThickness}"
                             CornerRadius="{TemplateBinding CornerRadius}"
-                            Background="{TemplateBinding Background}"
                             Style="{DynamicResource MicaWPF.Styles.GradientBorder.Accent}">
                             <ContentPresenter
                                 x:Name="ContentPresenter"
                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                 VerticalAlignment="Center" />
-                        </controls:GradientBorder>
+                        </corecontrols:GradientBorder>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualState x:Name="Normal" />
@@ -107,9 +108,9 @@
                         <Border
                             x:Name="ContentBorder"
                             Padding="{TemplateBinding Padding}"
+                            Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
-                            Background="{TemplateBinding Background}"
                             CornerRadius="{TemplateBinding CornerRadius}">
                             <ContentPresenter
                                 x:Name="ContentPresenter"
diff --git a/src/MicaWPF/Styles/Controls/ComboBox.xaml b/src/MicaWPF/Styles/Controls/ComboBox.xaml
index 2200643..f6c82a9 100644
--- a/src/MicaWPF/Styles/Controls/ComboBox.xaml
+++ b/src/MicaWPF/Styles/Controls/ComboBox.xaml
@@ -1,7 +1,8 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:MicaWPF.Controls">
+    xmlns:controls="clr-namespace:MicaWPF.Controls"
+    xmlns:corecontrols="clr-namespace:MicaWPF.Core.Controls;assembly=MicaWPF.Core">
 
     <Thickness x:Key="ComboBoxPadding">10,8,10,8</Thickness>
     <Thickness x:Key="ComboBoxAccentBorderThemeThickness">0,0,0,2</Thickness>
@@ -213,7 +214,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ComboBox}">
                     <Grid HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
-                        <controls:GradientBorder
+                        <corecontrols:GradientBorder
                             x:Name="ContentBorder"
                             Grid.Row="0"
                             MinWidth="{TemplateBinding MinWidth}"
@@ -326,7 +327,7 @@
                                     </Border>
                                 </Popup>
                             </Grid>
-                        </controls:GradientBorder>
+                        </corecontrols:GradientBorder>
                         <Border
                             x:Name="AccentBorder"
                             HorizontalAlignment="Stretch"
diff --git a/src/MicaWPF/Styles/MicaWPF.xaml b/src/MicaWPF/Styles/MicaWPF.xaml
index aa72807..8773a6d 100644
--- a/src/MicaWPF/Styles/MicaWPF.xaml
+++ b/src/MicaWPF/Styles/MicaWPF.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/MicaWPF;component/Styles/Assets/Accent.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MicaWPF.Core;component/Styles/Assets/Accent.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MicaWPF;component/Styles/Assets/Fonts.xaml" />
 
         <!--  Controls  -->
diff --git a/src/MicaWPF/Styles/Themes/MicaDark.xaml b/src/MicaWPF/Styles/Themes/MicaDark.xaml
index 56066bd..c00e84c 100644
--- a/src/MicaWPF/Styles/Themes/MicaDark.xaml
+++ b/src/MicaWPF/Styles/Themes/MicaDark.xaml
@@ -1,265 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <!--  Colors  -->
-    <Color x:Key="MicaWPF.Colors.ApplicationBackgroundColor">#202020</Color>
-
-    <Color x:Key="MicaWPF.Colors.TextFillColorPrimary">#FFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.TextFillColorSecondary">#C5FFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.TextFillColorTertiary">#87FFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.TextFillColorDisabled">#5DFFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.TextFillColorInverse">#FF000000</Color>
-
-    <Color x:Key="MicaWPF.Colors.AccentTextFillColorDisabled">#5DFFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.TextOnAccentFillColorSelectedText">#FFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.TextOnAccentFillColorPrimary">#000000</Color>
-    <Color x:Key="MicaWPF.Colors.TextOnAccentFillColorSecondary">#80000000</Color>
-    <Color x:Key="MicaWPF.Colors.TextOnAccentFillColorDisabled">#87FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Colors.ControlFillColorDefault">#0FFFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.ControlFillColorSecondary">#15FFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.ControlFillColorTertiary">#08FFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.ControlFillColorDisabled">#0BFFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.ControlFillColorTransparent">#00FFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.ControlFillColorInputActive">#B31E1E1E</Color>
-
-    <Color x:Key="MicaWPF.Colors.ControlStrongFillColorDefault">#8BFFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.ControlStrongFillColorDisabled">#3FFFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Colors.ControlSolidFillColorDefault">#454545</Color>
-
-    <Color x:Key="MicaWPF.Colors.SubtleFillColorTransparent">#00FFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.SubtleFillColorSecondary">#0FFFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.SubtleFillColorTertiary">#0AFFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.SubtleFillColorDisabled">#00FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Colors.ControlAltFillColorTransparent">#00FFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.ControlAltFillColorSecondary">#19000000</Color>
-    <Color x:Key="MicaWPF.Colors.ControlAltFillColorTertiary">#0BFFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.ControlAltFillColorQuarternary">#12FFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.ControlAltFillColorDisabled">#00FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Colors.ControlOnImageFillColorDefault">#B31C1C1C</Color>
-    <Color x:Key="MicaWPF.Colors.ControlOnImageFillColorSecondary">#1A1A1A</Color>
-    <Color x:Key="MicaWPF.Colors.ControlOnImageFillColorTertiary">#131313</Color>
-    <Color x:Key="MicaWPF.Colors.ControlOnImageFillColorDisabled">#1E1E1E</Color>
-
-    <Color x:Key="MicaWPF.Colors.AccentFillColorDisabled">#28FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Colors.ControlStrokeColorDefault">#12FFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.ControlStrokeColorSecondary">#18FFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.ControlStrokeColorOnAccentDefault">#14FFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.ControlStrokeColorOnAccentSecondary">#23000000</Color>
-    <Color x:Key="MicaWPF.Colors.ControlStrokeColorOnAccentTertiary">#37000000</Color>
-    <Color x:Key="MicaWPF.Colors.ControlStrokeColorOnAccentDisabled">#33000000</Color>
-
-    <Color x:Key="MicaWPF.Colors.ControlStrokeColorForStrongFillWhenOnImage">#6B000000</Color>
-
-    <Color x:Key="MicaWPF.Colors.CardStrokeColorDefault">#19000000</Color>
-    <Color x:Key="MicaWPF.Colors.CardStrokeColorDefaultSolid">#1C1C1C</Color>
-
-    <Color x:Key="MicaWPF.Colors.MenuBorderColorDefault">#151515</Color>
-
-    <Color x:Key="MicaWPF.Colors.ControlStrongStrokeColorDefault">#8BFFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.ControlStrongStrokeColorDisabled">#28FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Colors.SurfaceStrokeColorDefault">#66757575</Color>
-    <Color x:Key="MicaWPF.Colors.SurfaceStrokeColorFlyout">#33000000</Color>
-    <Color x:Key="MicaWPF.Colors.SurfaceStrokeColorInverse">#0F000000</Color>
-
-    <Color x:Key="MicaWPF.Colors.DividerStrokeColorDefault">#15FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Colors.FocusStrokeColorOuter">#FFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.FocusStrokeColorInner">#B3000000</Color>
-
-    <Color x:Key="MicaWPF.Colors.CardBackgroundFillColorDefault">#0DFFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.CardBackgroundFillColorSecondary">#08FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Colors.SmokeFillColorDefault">#4D000000</Color>
-
-    <Color x:Key="MicaWPF.Colors.LayerFillColorDefault">#4C3A3A3A</Color>
-    <Color x:Key="MicaWPF.Colors.LayerFillColorAlt">#0DFFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.LayerOnAcrylicFillColorDefault">#09FFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.LayerOnAccentAcrylicFillColorDefault">#09FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Colors.SolidBackgroundFillColorBase">#202020</Color>
-    <Color x:Key="MicaWPF.Colors.SolidBackgroundFillColorSecondary">#1C1C1C</Color>
-    <Color x:Key="MicaWPF.Colors.SolidBackgroundFillColorTertiary">#282828</Color>
-    <Color x:Key="MicaWPF.Colors.SolidBackgroundFillColorQuarternary">#2C2C2C</Color>
-    <Color x:Key="MicaWPF.Colors.SolidBackgroundFillColorTransparent">#00202020</Color>
-
-    <Color x:Key="MicaWPF.Colors.SystemFillColorSuccess">#6CCB5F</Color>
-    <Color x:Key="MicaWPF.Colors.SystemFillColorCaution">#FCE100</Color>
-    <Color x:Key="MicaWPF.Colors.SystemFillColorCritical">#FF99A4</Color>
-    <Color x:Key="MicaWPF.Colors.SystemFillColorNeutral">#8BFFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.SystemFillColorSolidNeutral">#9D9D9D</Color>
-    <Color x:Key="MicaWPF.Colors.SystemFillColorAttentionBackground">#08FFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.SystemFillColorSuccessBackground">#393D1B</Color>
-    <Color x:Key="MicaWPF.Colors.SystemFillColorCautionBackground">#433519</Color>
-    <Color x:Key="MicaWPF.Colors.SystemFillColorCriticalBackground">#442726</Color>
-    <Color x:Key="MicaWPF.Colors.SystemFillColorNeutralBackground">#08FFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.SystemFillColorSolidAttentionBackground">#2E2E2E</Color>
-    <Color x:Key="MicaWPF.Colors.SystemFillColorSolidNeutralBackground">#2E2E2E</Color>
-
-    <!--  Elevation border brushes  -->
-
-    <LinearGradientBrush x:Key="MicaWPF.GradientBrushes.ControlElevationBorder" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
-        <LinearGradientBrush.GradientStops>
-            <GradientStop Offset="0.33" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorSecondary}" />
-            <GradientStop Offset="1.0" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorDefault}" />
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="MicaWPF.GradientBrushes.CircleElevationBorder" MappingMode="RelativeToBoundingBox" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStop Offset="0.70" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorSecondary}" />
-            <GradientStop Offset="0.50" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorDefault}" />
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="MicaWPF.GradientBrushes.AccentControlElevationBorder" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
-        <LinearGradientBrush.RelativeTransform>
-            <ScaleTransform CenterY="0.5" ScaleY="-1" />
-        </LinearGradientBrush.RelativeTransform>
-        <LinearGradientBrush.GradientStops>
-            <GradientStop Offset="0.33" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorOnAccentSecondary}" />
-            <GradientStop Offset="1.0" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorOnAccentDefault}" />
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <!--  Color Brushes  -->
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorLight3" Color="{StaticResource MicaWPF.Colors.SystemAccentColorLight3}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorLight2" Color="{StaticResource MicaWPF.Colors.SystemAccentColorLight2}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorLight1" Color="{StaticResource MicaWPF.Colors.SystemAccentColorLight1}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColor" Color="{StaticResource MicaWPF.Colors.SystemAccentColor}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorDark1" Color="{StaticResource MicaWPF.Colors.SystemAccentColorDark1}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorDark2" Color="{StaticResource MicaWPF.Colors.SystemAccentColorDark2}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorDark3" Color="{StaticResource MicaWPF.Colors.SystemAccentColorDark3}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorPrimary" Color="{StaticResource MicaWPF.Colors.SystemAccentColorPrimary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorSecondary" Color="{StaticResource MicaWPF.Colors.SystemAccentColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorTertiary" Color="{StaticResource MicaWPF.Colors.SystemAccentColorTertiary}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.AccentTextFillColorPrimary" Color="{StaticResource MicaWPF.Colors.SystemAccentColorLight3}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.AccentTextFillColorSecondary" Color="{StaticResource MicaWPF.Colors.SystemAccentColorLight3}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.AccentTextFillColorTertiary" Color="{StaticResource MicaWPF.Colors.SystemAccentColorLight2}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.AccentFillColorSelectedTextBackground" Color="{StaticResource MicaWPF.Colors.SystemAccentColor}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.AccentFillColorDefault" Color="{StaticResource MicaWPF.Colors.SystemAccentColorLight2}" />
-    <SolidColorBrush
-        x:Key="MicaWPF.Brushes.AccentFillColorSecondary"
-        Opacity="0.9"
-        Color="{DynamicResource MicaWPF.Colors.SystemAccentColorLight2}" />
-    <SolidColorBrush
-        x:Key="MicaWPF.Brushes.AccentFillColorTertiary"
-        Opacity="0.8"
-        Color="{DynamicResource MicaWPF.Colors.SystemAccentColorLight2}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.AccentFillColorDisabled" Color="{StaticResource MicaWPF.Colors.AccentFillColorDisabled}" />
-
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorAttention" Color="{StaticResource MicaWPF.Colors.SystemAccentColor}" />
-
-    <!--  Brushes  -->
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ApplicationBackground" Color="{StaticResource MicaWPF.Colors.ApplicationBackgroundColor}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.TextFillColorPrimary" Color="{StaticResource MicaWPF.Colors.TextFillColorPrimary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.TextFillColorSecondary" Color="{StaticResource MicaWPF.Colors.TextFillColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.TextFillColorTertiary" Color="{StaticResource MicaWPF.Colors.TextFillColorTertiary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.TextFillColorDisabled" Color="{StaticResource MicaWPF.Colors.TextFillColorDisabled}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.TextFillColorInverse" Color="{StaticResource MicaWPF.Colors.TextFillColorInverse}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.TextOnAccentFillColorSelectedText" Color="{StaticResource MicaWPF.Colors.TextOnAccentFillColorSelectedText}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.TextOnAccentFillColorPrimary" Color="{StaticResource MicaWPF.Colors.TextOnAccentFillColorPrimary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.TextOnAccentFillColorSecondary" Color="{StaticResource MicaWPF.Colors.TextOnAccentFillColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.TextOnAccentFillColorDisabled" Color="{StaticResource MicaWPF.Colors.TextOnAccentFillColorDisabled}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlFillColorDefault" Color="{StaticResource MicaWPF.Colors.ControlFillColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlFillColorSecondary" Color="{StaticResource MicaWPF.Colors.ControlFillColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlFillColorTertiary" Color="{StaticResource MicaWPF.Colors.ControlFillColorTertiary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlFillColorDisabled" Color="{StaticResource MicaWPF.Colors.ControlFillColorDisabled}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlFillColorTransparent" Color="{StaticResource MicaWPF.Colors.ControlFillColorTransparent}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlFillColorInputActive" Color="{StaticResource MicaWPF.Colors.ControlFillColorInputActive}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrongFillColorDefault" Color="{StaticResource MicaWPF.Colors.ControlStrongFillColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrongFillColorDisabled" Color="{StaticResource MicaWPF.Colors.ControlStrongFillColorDisabled}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlSolidFillColorDefault" Color="{StaticResource MicaWPF.Colors.ControlSolidFillColorDefault}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SubtleFillColorTransparent" Color="{StaticResource MicaWPF.Colors.SubtleFillColorTransparent}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SubtleFillColorSecondary" Color="{StaticResource MicaWPF.Colors.SubtleFillColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SubtleFillColorTertiary" Color="{StaticResource MicaWPF.Colors.SubtleFillColorTertiary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SubtleFillColorDisabled" Color="{StaticResource MicaWPF.Colors.SubtleFillColorDisabled}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlAltFillColorTransparent" Color="{StaticResource MicaWPF.Colors.ControlAltFillColorTransparent}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlAltFillColorSecondary" Color="{StaticResource MicaWPF.Colors.ControlAltFillColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlAltFillColorTertiary" Color="{StaticResource MicaWPF.Colors.ControlAltFillColorTertiary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlAltFillColorQuarternary" Color="{StaticResource MicaWPF.Colors.ControlAltFillColorQuarternary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlAltFillColorDisabled" Color="{StaticResource MicaWPF.Colors.ControlAltFillColorDisabled}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlOnImageFillColorDefault" Color="{StaticResource MicaWPF.Colors.ControlOnImageFillColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlOnImageFillColorSecondary" Color="{StaticResource MicaWPF.Colors.ControlOnImageFillColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlOnImageFillColorTertiary" Color="{StaticResource MicaWPF.Colors.ControlOnImageFillColorTertiary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlOnImageFillColorDisabled" Color="{StaticResource MicaWPF.Colors.ControlOnImageFillColorDisabled}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrokeColorDefault" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrokeColorSecondary" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrokeColorOnAccentDefault" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorOnAccentDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrokeColorOnAccentSecondary" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorOnAccentSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrokeColorOnAccentTertiary" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorOnAccentTertiary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrokeColorOnAccentDisabled" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorOnAccentDisabled}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrokeColorForStrongFillWhenOnImage" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorForStrongFillWhenOnImage}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.CardStrokeColorDefault" Color="{StaticResource MicaWPF.Colors.CardStrokeColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.CardStrokeColorDefaultSolid" Color="{StaticResource MicaWPF.Colors.CardStrokeColorDefaultSolid}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrongStrokeColorDefault" Color="{StaticResource MicaWPF.Colors.ControlStrongStrokeColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrongStrokeColorDisabled" Color="{StaticResource MicaWPF.Colors.ControlStrongStrokeColorDisabled}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SurfaceStrokeColorDefault" Color="{StaticResource MicaWPF.Colors.SurfaceStrokeColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SurfaceStrokeColorFlyout" Color="{StaticResource MicaWPF.Colors.SurfaceStrokeColorFlyout}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SurfaceStrokeColorInverse" Color="{StaticResource MicaWPF.Colors.SurfaceStrokeColorInverse}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.DividerStrokeColorDefault" Color="{StaticResource MicaWPF.Colors.DividerStrokeColorDefault}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.FocusStrokeColorOuter" Color="{StaticResource MicaWPF.Colors.FocusStrokeColorOuter}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.FocusStrokeColorInner" Color="{StaticResource MicaWPF.Colors.FocusStrokeColorInner}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.CardBackgroundFillColorDefault" Color="{StaticResource MicaWPF.Colors.CardBackgroundFillColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.CardBackgroundFillColorSecondary" Color="{StaticResource MicaWPF.Colors.CardBackgroundFillColorSecondary}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.MenuBorderColorDefault" Color="{StaticResource MicaWPF.Colors.MenuBorderColorDefault}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SmokeFillColorDefault" Color="{StaticResource MicaWPF.Colors.SmokeFillColorDefault}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.LayerFillColorDefault" Color="{StaticResource MicaWPF.Colors.LayerFillColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.LayerFillColorAlt" Color="{StaticResource MicaWPF.Colors.LayerFillColorAlt}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.LayerOnAcrylicFillColorDefault" Color="{StaticResource MicaWPF.Colors.LayerOnAcrylicFillColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.LayerOnAccentAcrylicFillColorDefault" Color="{StaticResource MicaWPF.Colors.LayerOnAccentAcrylicFillColorDefault}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SolidBackgroundFillColorBase" Color="{StaticResource MicaWPF.Colors.SolidBackgroundFillColorBase}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SolidBackgroundFillColorSecondary" Color="{StaticResource MicaWPF.Colors.SolidBackgroundFillColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SolidBackgroundFillColorTertiary" Color="{StaticResource MicaWPF.Colors.SolidBackgroundFillColorTertiary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SolidBackgroundFillColorQuarternary" Color="{StaticResource MicaWPF.Colors.SolidBackgroundFillColorQuarternary}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorSuccess" Color="{StaticResource MicaWPF.Colors.SystemFillColorSuccess}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorCaution" Color="{StaticResource MicaWPF.Colors.SystemFillColorCaution}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorCritical" Color="{StaticResource MicaWPF.Colors.SystemFillColorCritical}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorNeutral" Color="{StaticResource MicaWPF.Colors.SystemFillColorNeutral}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorSolidNeutral" Color="{StaticResource MicaWPF.Colors.SystemFillColorSolidNeutral}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorAttentionBackground" Color="{StaticResource MicaWPF.Colors.SystemFillColorAttentionBackground}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorSuccessBackground" Color="{StaticResource MicaWPF.Colors.SystemFillColorSuccessBackground}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorCautionBackground" Color="{StaticResource MicaWPF.Colors.SystemFillColorCautionBackground}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorCriticalBackground" Color="{StaticResource MicaWPF.Colors.SystemFillColorCriticalBackground}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorNeutralBackground" Color="{StaticResource MicaWPF.Colors.SystemFillColorNeutralBackground}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorSolidAttentionBackground" Color="{StaticResource MicaWPF.Colors.SystemFillColorSolidAttentionBackground}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorSolidNeutralBackground" Color="{StaticResource MicaWPF.Colors.SystemFillColorSolidNeutralBackground}" />
-
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/MicaWPF;component/Styles/Controls/Dark/GradientBorder.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MicaWPF;component/Styles/Controls/VisualStates/Dark/Button.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MicaWPF.Core;component/Styles/Controls/Dark/GradientBorder.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MicaWPF.Core;component/Styles/Themes/MicaDark.xaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
diff --git a/src/MicaWPF/Styles/Themes/MicaLight.xaml b/src/MicaWPF/Styles/Themes/MicaLight.xaml
index 76d1a9e..575a683 100644
--- a/src/MicaWPF/Styles/Themes/MicaLight.xaml
+++ b/src/MicaWPF/Styles/Themes/MicaLight.xaml
@@ -1,270 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <!--  Colors  -->
-    <Color x:Key="MicaWPF.Colors.ApplicationBackgroundColor">#f3f3f3</Color>
-
-    <Color x:Key="MicaWPF.Colors.TextFillColorPrimary">#E4000000</Color>
-    <Color x:Key="MicaWPF.Colors.TextFillColorSecondary">#9E000000</Color>
-    <Color x:Key="MicaWPF.Colors.TextFillColorTertiary">#72000000</Color>
-    <Color x:Key="MicaWPF.Colors.TextFillColorDisabled">#5C000000</Color>
-    <Color x:Key="MicaWPF.Colors.TextFillColorInverse">#FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Colors.AccentTextFillColorDisabled">#5C000000</Color>
-
-    <Color x:Key="MicaWPF.Colors.TextOnAccentFillColorSelectedText">#FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Colors.TextOnAccentFillColorPrimary">#FFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.TextOnAccentFillColorSecondary">#B3FFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.TextOnAccentFillColorDisabled">#FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Colors.ControlFillColorDefault">#B3FFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.ControlFillColorSecondary">#80F9F9F9</Color>
-    <Color x:Key="MicaWPF.Colors.ControlFillColorTertiary">#4DF9F9F9</Color>
-    <Color x:Key="MicaWPF.Colors.ControlFillColorDisabled">#4DF9F9F9</Color>
-    <Color x:Key="MicaWPF.Colors.ControlFillColorTransparent">#00FFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.ControlFillColorInputActive">#FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Colors.ControlStrongFillColorDefault">#72000000</Color>
-    <Color x:Key="MicaWPF.Colors.ControlStrongFillColorDisabled">#51000000</Color>
-
-    <Color x:Key="MicaWPF.Colors.ControlSolidFillColorDefault">#FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Colors.SubtleFillColorTransparent">#00FFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.SubtleFillColorSecondary">#09000000</Color>
-    <Color x:Key="MicaWPF.Colors.SubtleFillColorTertiary">#06000000</Color>
-    <Color x:Key="MicaWPF.Colors.SubtleFillColorDisabled">#00FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Colors.ControlAltFillColorTransparent">#00FFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.ControlAltFillColorSecondary">#06000000</Color>
-    <Color x:Key="MicaWPF.Colors.ControlAltFillColorTertiary">#0F000000</Color>
-    <Color x:Key="MicaWPF.Colors.ControlAltFillColorQuarternary">#18000000</Color>
-    <Color x:Key="MicaWPF.Colors.ControlAltFillColorDisabled">#00FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Colors.ControlOnImageFillColorDefault">#C9FFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.ControlOnImageFillColorSecondary">#F3F3F3</Color>
-    <Color x:Key="MicaWPF.Colors.ControlOnImageFillColorTertiary">#EBEBEB</Color>
-    <Color x:Key="MicaWPF.Colors.ControlOnImageFillColorDisabled">#00FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Colors.AccentFillColorDisabled">#37000000</Color>
-
-    <Color x:Key="MicaWPF.Colors.ControlStrokeColorDefault">#0F000000</Color>
-    <Color x:Key="MicaWPF.Colors.ControlStrokeColorSecondary">#29000000</Color>
-    <Color x:Key="MicaWPF.Colors.ControlStrokeColorOnAccentDefault">#14FFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.ControlStrokeColorOnAccentSecondary">#66000000</Color>
-    <Color x:Key="MicaWPF.Colors.ControlStrokeColorOnAccentTertiary">#37000000</Color>
-    <Color x:Key="MicaWPF.Colors.ControlStrokeColorOnAccentDisabled">#0F000000</Color>
-
-    <Color x:Key="MicaWPF.Colors.ControlStrokeColorForStrongFillWhenOnImage">#59FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Colors.CardStrokeColorDefault">#0F000000</Color>
-    <Color x:Key="MicaWPF.Colors.CardStrokeColorDefaultSolid">#EBEBEB</Color>
-
-    <Color x:Key="MicaWPF.Colors.MenuBorderColorDefault">#0F000000</Color>
-
-    <Color x:Key="MicaWPF.Colors.ControlStrongStrokeColorDefault">#72000000</Color>
-    <Color x:Key="MicaWPF.Colors.ControlStrongStrokeColorDisabled">#37000000</Color>
-
-    <Color x:Key="MicaWPF.Colors.SurfaceStrokeColorDefault">#66757575</Color>
-    <Color x:Key="MicaWPF.Colors.SurfaceStrokeColorFlyout">#0F000000</Color>
-    <Color x:Key="MicaWPF.Colors.SurfaceStrokeColorInverse">#15FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Colors.DividerStrokeColorDefault">#0F000000</Color>
-
-    <Color x:Key="MicaWPF.Colors.FocusStrokeColorOuter">#E4000000</Color>
-    <Color x:Key="MicaWPF.Colors.FocusStrokeColorInner">#B3FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Colors.CardBackgroundFillColorDefault">#B3FFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.CardBackgroundFillColorSecondary">#80F6F6F6</Color>
-
-    <Color x:Key="MicaWPF.Colors.SmokeFillColorDefault">#4D000000</Color>
-
-    <Color x:Key="MicaWPF.Colors.LayerFillColorDefault">#80FFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.LayerFillColorAlt">#FFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.LayerOnAcrylicFillColorDefault">#40FFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.LayerOnAccentAcrylicFillColorDefault">#40FFFFFF</Color>
-
-    <Color x:Key="MicaWPF.Colors.SolidBackgroundFillColorBase">#F3F3F3</Color>
-    <Color x:Key="MicaWPF.Colors.SolidBackgroundFillColorSecondary">#EEEEEE</Color>
-    <Color x:Key="MicaWPF.Colors.SolidBackgroundFillColorTertiary">#F9F9F9</Color>
-    <Color x:Key="MicaWPF.Colors.SolidBackgroundFillColorQuarternary">#FFFFFF</Color>
-    <Color x:Key="MicaWPF.Colors.SolidBackgroundFillColorTransparent">#00F3F3F3</Color>
-
-    <Color x:Key="MicaWPF.Colors.SystemFillColorSuccess">#0F7B0F</Color>
-    <Color x:Key="MicaWPF.Colors.SystemFillColorCaution">#9D5D00</Color>
-    <Color x:Key="MicaWPF.Colors.SystemFillColorCritical">#C42B1C</Color>
-    <Color x:Key="MicaWPF.Colors.SystemFillColorNeutral">#72000000</Color>
-    <Color x:Key="MicaWPF.Colors.SystemFillColorSolidNeutral">#8A8A8A</Color>
-    <Color x:Key="MicaWPF.Colors.SystemFillColorAttentionBackground">#80F6F6F6</Color>
-    <Color x:Key="MicaWPF.Colors.SystemFillColorSuccessBackground">#DFF6DD</Color>
-    <Color x:Key="MicaWPF.Colors.SystemFillColorCautionBackground">#FFF4CE</Color>
-    <Color x:Key="MicaWPF.Colors.SystemFillColorCriticalBackground">#FDE7E9</Color>
-    <Color x:Key="MicaWPF.Colors.SystemFillColorNeutralBackground">#06000000</Color>
-    <Color x:Key="MicaWPF.Colors.SystemFillColorSolidAttentionBackground">#F7F7F7</Color>
-    <Color x:Key="MicaWPF.Colors.SystemFillColorSolidNeutralBackground">#F3F3F3</Color>
-
-    <!--  Elevation border brushes  -->
-
-    <LinearGradientBrush x:Key="MicaWPF.GradientBrushes.ControlElevationBorder" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
-        <LinearGradientBrush.RelativeTransform>
-            <ScaleTransform CenterY="0.0" ScaleY="-1" />
-        </LinearGradientBrush.RelativeTransform>
-        <LinearGradientBrush.GradientStops>
-            <GradientStop Offset="0.33" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorSecondary}" />
-            <GradientStop Offset="1.0" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorDefault}" />
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="MicaWPF.GradientBrushes.CircleElevationBorder" MappingMode="RelativeToBoundingBox" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStop Offset="0.50" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorDefault}" />
-            <GradientStop Offset="0.70" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorSecondary}" />
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="MicaWPF.GradientBrushes.AccentControlElevationBorder" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
-        <LinearGradientBrush.RelativeTransform>
-            <ScaleTransform CenterY="0.0" ScaleY="-0" />
-        </LinearGradientBrush.RelativeTransform>
-        <LinearGradientBrush.GradientStops>
-            <GradientStop Offset="0.33" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorOnAccentSecondary}" />
-            <GradientStop Offset="1.0" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorOnAccentDefault}" />
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <!--  Color Brushes  -->
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorLight3" Color="{StaticResource MicaWPF.Colors.SystemAccentColorLight3}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorLight2" Color="{StaticResource MicaWPF.Colors.SystemAccentColorLight2}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorLight1" Color="{StaticResource MicaWPF.Colors.SystemAccentColorLight1}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColor" Color="{StaticResource MicaWPF.Colors.SystemAccentColor}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorDark1" Color="{StaticResource MicaWPF.Colors.SystemAccentColorDark1}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorDark2" Color="{StaticResource MicaWPF.Colors.SystemAccentColorDark2}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorDark3" Color="{StaticResource MicaWPF.Colors.SystemAccentColorDark3}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorPrimary" Color="{StaticResource MicaWPF.Colors.SystemAccentColorPrimary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorSecondary" Color="{StaticResource MicaWPF.Colors.SystemAccentColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemAccentColorTertiary" Color="{StaticResource MicaWPF.Colors.SystemAccentColorTertiary}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.AccentTextFillColorPrimary" Color="{StaticResource MicaWPF.Colors.SystemAccentColorDark2}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.AccentTextFillColorSecondary" Color="{StaticResource MicaWPF.Colors.SystemAccentColorDark3}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.AccentTextFillColorTertiary" Color="{StaticResource MicaWPF.Colors.SystemAccentColorDark1}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.AccentFillColorSelectedTextBackground" Color="{StaticResource MicaWPF.Colors.SystemAccentColor}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.AccentFillColorDefault" Color="{StaticResource MicaWPF.Colors.SystemAccentColorDark1}" />
-    <SolidColorBrush
-        x:Key="MicaWPF.Brushes.AccentFillColorSecondary"
-        Opacity="0.9"
-        Color="{StaticResource MicaWPF.Colors.SystemAccentColorDark1}" />
-    <SolidColorBrush
-        x:Key="MicaWPF.Brushes.AccentFillColorTertiary"
-        Opacity="0.8"
-        Color="{StaticResource MicaWPF.Colors.SystemAccentColorDark1}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.AccentFillColorDisabled" Color="{StaticResource MicaWPF.Colors.AccentFillColorDisabled}" />
-
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorAttention" Color="{StaticResource MicaWPF.Colors.SystemAccentColor}" />
-
-    <!--  Brushes  -->
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ApplicationBackground" Color="{StaticResource MicaWPF.Colors.ApplicationBackgroundColor}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.TextFillColorPrimary" Color="{StaticResource MicaWPF.Colors.TextFillColorPrimary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.TextFillColorSecondary" Color="{StaticResource MicaWPF.Colors.TextFillColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.TextFillColorTertiary" Color="{StaticResource MicaWPF.Colors.TextFillColorTertiary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.TextFillColorDisabled" Color="{StaticResource MicaWPF.Colors.TextFillColorDisabled}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.TextFillColorInverse" Color="{StaticResource MicaWPF.Colors.TextFillColorInverse}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.TextOnAccentFillColorSelectedText" Color="{StaticResource MicaWPF.Colors.TextOnAccentFillColorSelectedText}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.TextOnAccentFillColorPrimary" Color="{StaticResource MicaWPF.Colors.TextOnAccentFillColorPrimary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.TextOnAccentFillColorSecondary" Color="{StaticResource MicaWPF.Colors.TextOnAccentFillColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.TextOnAccentFillColorDisabled" Color="{StaticResource MicaWPF.Colors.TextOnAccentFillColorDisabled}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlFillColorDefault" Color="{StaticResource MicaWPF.Colors.ControlFillColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlFillColorSecondary" Color="{StaticResource MicaWPF.Colors.ControlFillColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlFillColorTertiary" Color="{StaticResource MicaWPF.Colors.ControlFillColorTertiary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlFillColorDisabled" Color="{StaticResource MicaWPF.Colors.ControlFillColorDisabled}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlFillColorTransparent" Color="{StaticResource MicaWPF.Colors.ControlFillColorTransparent}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlFillColorInputActive" Color="{StaticResource MicaWPF.Colors.ControlFillColorInputActive}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrongFillColorDefault" Color="{StaticResource MicaWPF.Colors.ControlStrongFillColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrongFillColorDisabled" Color="{StaticResource MicaWPF.Colors.ControlStrongFillColorDisabled}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlSolidFillColorDefault" Color="{StaticResource MicaWPF.Colors.ControlSolidFillColorDefault}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SubtleFillColorTransparent" Color="{StaticResource MicaWPF.Colors.SubtleFillColorTransparent}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SubtleFillColorSecondary" Color="{StaticResource MicaWPF.Colors.SubtleFillColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SubtleFillColorTertiary" Color="{StaticResource MicaWPF.Colors.SubtleFillColorTertiary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SubtleFillColorDisabled" Color="{StaticResource MicaWPF.Colors.SubtleFillColorDisabled}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlAltFillColorTransparent" Color="{StaticResource MicaWPF.Colors.ControlAltFillColorTransparent}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlAltFillColorSecondary" Color="{StaticResource MicaWPF.Colors.ControlAltFillColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlAltFillColorTertiary" Color="{StaticResource MicaWPF.Colors.ControlAltFillColorTertiary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlAltFillColorQuarternary" Color="{StaticResource MicaWPF.Colors.ControlAltFillColorQuarternary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlAltFillColorDisabled" Color="{StaticResource MicaWPF.Colors.ControlAltFillColorDisabled}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlOnImageFillColorDefault" Color="{StaticResource MicaWPF.Colors.ControlOnImageFillColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlOnImageFillColorSecondary" Color="{StaticResource MicaWPF.Colors.ControlOnImageFillColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlOnImageFillColorTertiary" Color="{StaticResource MicaWPF.Colors.ControlOnImageFillColorTertiary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlOnImageFillColorDisabled" Color="{StaticResource MicaWPF.Colors.ControlOnImageFillColorDisabled}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrokeColorDefault" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrokeColorSecondary" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrokeColorOnAccentDefault" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorOnAccentDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrokeColorOnAccentSecondary" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorOnAccentSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrokeColorOnAccentTertiary" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorOnAccentTertiary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrokeColorOnAccentDisabled" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorOnAccentDisabled}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrokeColorForStrongFillWhenOnImage" Color="{StaticResource MicaWPF.Colors.ControlStrokeColorForStrongFillWhenOnImage}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.CardStrokeColorDefault" Color="{StaticResource MicaWPF.Colors.CardStrokeColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.CardStrokeColorDefaultSolid" Color="{StaticResource MicaWPF.Colors.CardStrokeColorDefaultSolid}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrongStrokeColorDefault" Color="{StaticResource MicaWPF.Colors.ControlStrongStrokeColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.ControlStrongStrokeColorDisabled" Color="{StaticResource MicaWPF.Colors.ControlStrongStrokeColorDisabled}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SurfaceStrokeColorDefault" Color="{StaticResource MicaWPF.Colors.SurfaceStrokeColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SurfaceStrokeColorFlyout" Color="{StaticResource MicaWPF.Colors.SurfaceStrokeColorFlyout}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SurfaceStrokeColorInverse" Color="{StaticResource MicaWPF.Colors.SurfaceStrokeColorInverse}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.DividerStrokeColorDefault" Color="{StaticResource MicaWPF.Colors.DividerStrokeColorDefault}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.FocusStrokeColorOuter" Color="{StaticResource MicaWPF.Colors.FocusStrokeColorOuter}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.FocusStrokeColorInner" Color="{StaticResource MicaWPF.Colors.FocusStrokeColorInner}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.CardBackgroundFillColorDefault" Color="{StaticResource MicaWPF.Colors.CardBackgroundFillColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.CardBackgroundFillColorSecondary" Color="{StaticResource MicaWPF.Colors.CardBackgroundFillColorSecondary}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.MenuBorderColorDefault" Color="{StaticResource MicaWPF.Colors.MenuBorderColorDefault}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SmokeFillColorDefault" Color="{StaticResource MicaWPF.Colors.SmokeFillColorDefault}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.LayerFillColorDefault" Color="{StaticResource MicaWPF.Colors.LayerFillColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.LayerFillColorAlt" Color="{StaticResource MicaWPF.Colors.LayerFillColorAlt}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.LayerOnAcrylicFillColorDefault" Color="{StaticResource MicaWPF.Colors.LayerOnAcrylicFillColorDefault}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.LayerOnAccentAcrylicFillColorDefault" Color="{StaticResource MicaWPF.Colors.LayerOnAccentAcrylicFillColorDefault}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SolidBackgroundFillColorBase" Color="{StaticResource MicaWPF.Colors.SolidBackgroundFillColorBase}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SolidBackgroundFillColorSecondary" Color="{StaticResource MicaWPF.Colors.SolidBackgroundFillColorSecondary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SolidBackgroundFillColorTertiary" Color="{StaticResource MicaWPF.Colors.SolidBackgroundFillColorTertiary}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SolidBackgroundFillColorQuarternary" Color="{StaticResource MicaWPF.Colors.SolidBackgroundFillColorQuarternary}" />
-
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorSuccess" Color="{StaticResource MicaWPF.Colors.SystemFillColorSuccess}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorCaution" Color="{StaticResource MicaWPF.Colors.SystemFillColorCaution}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorCritical" Color="{StaticResource MicaWPF.Colors.SystemFillColorCritical}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorNeutral" Color="{StaticResource MicaWPF.Colors.SystemFillColorNeutral}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorSolidNeutral" Color="{StaticResource MicaWPF.Colors.SystemFillColorSolidNeutral}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorAttentionBackground" Color="{StaticResource MicaWPF.Colors.SystemFillColorAttentionBackground}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorSuccessBackground" Color="{StaticResource MicaWPF.Colors.SystemFillColorSuccessBackground}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorCautionBackground" Color="{StaticResource MicaWPF.Colors.SystemFillColorCautionBackground}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorCriticalBackground" Color="{StaticResource MicaWPF.Colors.SystemFillColorCriticalBackground}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorNeutralBackground" Color="{StaticResource MicaWPF.Colors.SystemFillColorNeutralBackground}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorSolidAttentionBackground" Color="{StaticResource MicaWPF.Colors.SystemFillColorSolidAttentionBackground}" />
-    <SolidColorBrush x:Key="MicaWPF.Brushes.SystemFillColorSolidNeutralBackground" Color="{StaticResource MicaWPF.Colors.SystemFillColorSolidNeutralBackground}" />
-
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/MicaWPF;component/Styles/Controls/Light/GradientBorder.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MicaWPF;component/Styles/Controls/VisualStates/Light/Button.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MicaWPF.Core;component/Styles/Controls/Light/GradientBorder.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MicaWPF.Core;component/Styles/Themes/MicaLight.xaml" />
     </ResourceDictionary.MergedDictionaries>
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>