diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/Button.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/Button.cs
index a597ef2f5..3c077631e 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/Button.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/Button.cs
@@ -1,4 +1,7 @@
-using Microsoft.UI.Xaml;
+using System;
+using Windows.UI;
+using Microsoft.UI.Text;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
 using Uno.Extensions.Markup;
 using Uno.Extensions.Markup.Internals;
@@ -7,525 +10,474 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class Button
+		public static partial class Button
 		{
-			public static class Resources
+			public static partial class Resources
 			{
-				public static class Elevated
+				public static partial class Elevated
 				{
-					public static class Foreground
-					{
-						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonForeground")]
-						public static ThemeResourceKey<Brush> Default => new("ElevatedButtonForeground");
-
-						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonForegroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("ElevatedButtonForegroundPointerOver");
-
-						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonForegroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("ElevatedButtonForegroundPressed");
-
-						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonForegroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("ElevatedButtonForegroundFocused");
-
-						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonForegroundPointerFocused")]
-						public static ThemeResourceKey<Brush> PointerFocused => new("ElevatedButtonForegroundPointerFocused");
-
-						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonForegroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("ElevatedButtonForegroundDisabled");
-					}
-
-					public static class IconForeground
-					{
-						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonIconForeground")]
-						public static ThemeResourceKey<Brush> Default => new("ElevatedButtonIconForeground");
-
-						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonIconForegroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("ElevatedButtonIconForegroundPointerOver");
-
-						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonIconForegroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("ElevatedButtonIconForegroundPressed");
-
-						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonIconForegroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("ElevatedButtonIconForegroundFocused");
-
-						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonIconForegroundPointerFocused")]
-						public static ThemeResourceKey<Brush> PointerFocused => new("ElevatedButtonIconForegroundPointerFocused");
-
-						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonIconForegroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("ElevatedButtonIconForegroundDisabled");
-					}
-
-					public static class Background
+					public static readonly BackgroundVSG Background = new();
+					public partial class BackgroundVSG
 					{
 						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBackground")]
-						public static ThemeResourceKey<Brush> Default => new("ElevatedButtonBackground");
+						public ThemeResourceKey<Brush> Default = new("ElevatedButtonBackground");
 
 						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBackgroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("ElevatedButtonBackgroundPointerOver");
+						public ThemeResourceKey<Brush> PointerOver = new("ElevatedButtonBackgroundPointerOver");
 
 						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBackgroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("ElevatedButtonBackgroundPressed");
+						public ThemeResourceKey<Brush> Pressed = new("ElevatedButtonBackgroundPressed");
+
+						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBackgroundDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("ElevatedButtonBackgroundDisabled");
 
 						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBackgroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("ElevatedButtonBackgroundFocused");
+						public ThemeResourceKey<Brush> Focused = new("ElevatedButtonBackgroundFocused");
 
 						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBackgroundPointerFocused")]
-						public static ThemeResourceKey<Brush> PointerFocused => new("ElevatedButtonBackgroundPointerFocused");
+						public ThemeResourceKey<Brush> PointerFocused = new("ElevatedButtonBackgroundPointerFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBackgroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("ElevatedButtonBackgroundDisabled");
+						public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
 					}
 
-					public static class BorderBrush
+					public static readonly BorderBrushVSG BorderBrush = new();
+					public partial class BorderBrushVSG
 					{
 						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBorderBrush")]
-						public static ThemeResourceKey<Brush> Default => new("ElevatedButtonBorderBrush");
+						public ThemeResourceKey<Brush> Default = new("ElevatedButtonBorderBrush");
 
 						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBorderBrushPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("ElevatedButtonBorderBrushPointerOver");
+						public ThemeResourceKey<Brush> PointerOver = new("ElevatedButtonBorderBrushPointerOver");
 
 						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBorderBrushPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("ElevatedButtonBorderBrushPressed");
+						public ThemeResourceKey<Brush> Pressed = new("ElevatedButtonBorderBrushPressed");
+
+						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBorderBrushDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("ElevatedButtonBorderBrushDisabled");
 
 						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBorderBrushFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("ElevatedButtonBorderBrushFocused");
+						public ThemeResourceKey<Brush> Focused = new("ElevatedButtonBorderBrushFocused");
 
 						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBorderBrushPointerFocused")]
-						public static ThemeResourceKey<Brush> PointerFocused => new("ElevatedButtonBorderBrushPointerFocused");
+						public ThemeResourceKey<Brush> PointerFocused = new("ElevatedButtonBorderBrushPointerFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBorderBrushDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("ElevatedButtonBorderBrushDisabled");
+						public static implicit operator ThemeResourceKey<Brush>(BorderBrushVSG self) => self.Default;
 					}
-				}
 
-				public static class Filled
-				{
-					public static class Foreground
+					public static readonly ElevationVSG Elevation = new();
+					public partial class ElevationVSG
 					{
-						[ResourceKeyDefinition(typeof(Brush), "FilledButtonForeground")]
-						public static ThemeResourceKey<Brush> Default => new("FilledButtonForeground");
+						[ResourceKeyDefinition(typeof(double), "ElevatedButtonElevation")]
+						public ThemeResourceKey<double> Default = new("ElevatedButtonElevation");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledButtonForegroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("FilledButtonForegroundPointerOver");
+						[ResourceKeyDefinition(typeof(double), "ElevatedButtonElevationDisabled")]
+						public ThemeResourceKey<double> Disabled = new("ElevatedButtonElevationDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledButtonForegroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("FilledButtonForegroundPressed");
+						public static implicit operator ThemeResourceKey<double>(ElevationVSG self) => self.Default;
+					}
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledButtonForegroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("FilledButtonForegroundFocused");
+					public static readonly MarginVSG Margin = new();
+					public partial class MarginVSG
+					{
+						[ResourceKeyDefinition(typeof(Thickness), "ElevatedButtonMargin")]
+						public ThemeResourceKey<Thickness> Default = new("ElevatedButtonMargin");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledButtonForegroundPointerFocused")]
-						public static ThemeResourceKey<Brush> PointerFocused => new("FilledButtonForegroundPointerFocused");
+						[ResourceKeyDefinition(typeof(Thickness), "ElevatedButtonDisabledMargin")]
+						public ThemeResourceKey<Thickness> Disabled = new("ElevatedButtonDisabledMargin");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledButtonForegroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("FilledButtonForegroundDisabled");
+						public static implicit operator ThemeResourceKey<Thickness>(MarginVSG self) => self.Default;
 					}
 
-					public static class IconForeground
+					public static partial class StateLayerBackground
 					{
-						[ResourceKeyDefinition(typeof(Brush), "FilledButtonIconForeground")]
-						public static ThemeResourceKey<Brush> Default => new("FilledButtonIconForeground");
+						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonStateLayerBackgroundPointerOver")]
+						public static ThemeResourceKey<Brush> PointerOver => new("ElevatedButtonStateLayerBackgroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledButtonIconForegroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("FilledButtonIconForegroundPointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonStateLayerBackgroundPressed")]
+						public static ThemeResourceKey<Brush> Pressed => new("ElevatedButtonStateLayerBackgroundPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledButtonIconForegroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("FilledButtonIconForegroundPressed");
+						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonStateLayerBackgroundFocused")]
+						public static ThemeResourceKey<Brush> Focused => new("ElevatedButtonStateLayerBackgroundFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledButtonIconForegroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("FilledButtonIconForegroundFocused");
+						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonStateLayerBackgroundPointerFocused")]
+						public static ThemeResourceKey<Brush> PointerFocused => new("ElevatedButtonStateLayerBackgroundPointerFocused");
+					}
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledButtonIconForegroundPointerFocused")]
-						public static ThemeResourceKey<Brush> PointerFocused => new("FilledButtonIconForegroundPointerFocused");
+					[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonForeground")]
+					public static ThemeResourceKey<Brush> Foreground => new("ElevatedButtonForeground");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledButtonIconForegroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("FilledButtonIconForegroundDisabled");
-					}
+					[ResourceKeyDefinition(typeof(bool), "ElevatedButtonIsTintEnabled")]
+					public static StaticResourceKey<bool> IsTintEnabled => new("ElevatedButtonIsTintEnabled");
+				}
 
-					public static class Background
+				public static partial class Filled
+				{
+					public static readonly BackgroundVSG Background = new();
+					public partial class BackgroundVSG
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FilledButtonBackground")]
-						public static ThemeResourceKey<Brush> Default => new("FilledButtonBackground");
+						public ThemeResourceKey<Brush> Default = new("FilledButtonBackground");
 
 						[ResourceKeyDefinition(typeof(Brush), "FilledButtonBackgroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("FilledButtonBackgroundPointerOver");
+						public ThemeResourceKey<Brush> PointerOver = new("FilledButtonBackgroundPointerOver");
 
 						[ResourceKeyDefinition(typeof(Brush), "FilledButtonBackgroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("FilledButtonBackgroundPressed");
+						public ThemeResourceKey<Brush> Pressed = new("FilledButtonBackgroundPressed");
+
+						[ResourceKeyDefinition(typeof(Brush), "FilledButtonBackgroundDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("FilledButtonBackgroundDisabled");
 
 						[ResourceKeyDefinition(typeof(Brush), "FilledButtonBackgroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("FilledButtonBackgroundFocused");
+						public ThemeResourceKey<Brush> Focused = new("FilledButtonBackgroundFocused");
 
 						[ResourceKeyDefinition(typeof(Brush), "FilledButtonBackgroundPointerFocused")]
-						public static ThemeResourceKey<Brush> PointerFocused => new("FilledButtonBackgroundPointerFocused");
+						public ThemeResourceKey<Brush> PointerFocused = new("FilledButtonBackgroundPointerFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledButtonBackgroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("FilledButtonBackgroundDisabled");
+						public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
 					}
 
-					public static class BorderBrush
+					public static readonly BorderBrushVSG BorderBrush = new();
+					public partial class BorderBrushVSG
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FilledButtonBorderBrush")]
-						public static ThemeResourceKey<Brush> Default => new("FilledButtonBorderBrush");
+						public ThemeResourceKey<Brush> Default = new("FilledButtonBorderBrush");
 
 						[ResourceKeyDefinition(typeof(Brush), "FilledButtonBorderBrushPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("FilledButtonBorderBrushPointerOver");
+						public ThemeResourceKey<Brush> PointerOver = new("FilledButtonBorderBrushPointerOver");
 
 						[ResourceKeyDefinition(typeof(Brush), "FilledButtonBorderBrushPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("FilledButtonBorderBrushPressed");
+						public ThemeResourceKey<Brush> Pressed = new("FilledButtonBorderBrushPressed");
+
+						[ResourceKeyDefinition(typeof(Brush), "FilledButtonBorderBrushDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("FilledButtonBorderBrushDisabled");
 
 						[ResourceKeyDefinition(typeof(Brush), "FilledButtonBorderBrushFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("FilledButtonBorderBrushFocused");
+						public ThemeResourceKey<Brush> Focused = new("FilledButtonBorderBrushFocused");
 
 						[ResourceKeyDefinition(typeof(Brush), "FilledButtonBorderBrushPointerFocused")]
-						public static ThemeResourceKey<Brush> PointerFocused => new("FilledButtonBorderBrushPointerFocused");
+						public ThemeResourceKey<Brush> PointerFocused = new("FilledButtonBorderBrushPointerFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledButtonBorderBrushDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("FilledButtonBorderBrushDisabled");
+						public static implicit operator ThemeResourceKey<Brush>(BorderBrushVSG self) => self.Default;
 					}
-				}
 
-				public static class FilledTonal
-				{
-					public static class Foreground
+					public static partial class StateLayerBackground
 					{
-						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonForeground")]
-						public static ThemeResourceKey<Brush> Default => new("FilledTonalButtonForeground");
+						[ResourceKeyDefinition(typeof(Brush), "FilledButtonStateLayerBackgroundPointerOver")]
+						public static ThemeResourceKey<Brush> PointerOver => new("FilledButtonStateLayerBackgroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonForegroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("FilledTonalButtonForegroundPointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "FilledButtonStateLayerBackgroundPressed")]
+						public static ThemeResourceKey<Brush> Pressed => new("FilledButtonStateLayerBackgroundPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonForegroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("FilledTonalButtonForegroundPressed");
+						[ResourceKeyDefinition(typeof(Brush), "FilledButtonStateLayerBackgroundFocused")]
+						public static ThemeResourceKey<Brush> Focused => new("FilledButtonStateLayerBackgroundFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonForegroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("FilledTonalButtonForegroundFocused");
-
-						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonForegroundPointerFocused")]
-						public static ThemeResourceKey<Brush> PointerFocused => new("FilledTonalButtonForegroundPointerFocused");
-
-						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonForegroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("FilledTonalButtonForegroundDisabled");
+						[ResourceKeyDefinition(typeof(Brush), "FilledButtonStateLayerBackgroundPointerFocused")]
+						public static ThemeResourceKey<Brush> PointerFocused => new("FilledButtonStateLayerBackgroundPointerFocused");
 					}
 
-					public static class IconForeground
-					{
-						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonIconForeground")]
-						public static ThemeResourceKey<Brush> Default => new("FilledTonalButtonIconForeground");
-
-						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonIconForegroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("FilledTonalButtonIconForegroundPointerOver");
-
-						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonIconForegroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("FilledTonalButtonIconForegroundPressed");
-
-						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonIconForegroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("FilledTonalButtonIconForegroundFocused");
+					[ResourceKeyDefinition(typeof(double), "ButtonElevation")]
+					public static ThemeResourceKey<double> Elevation => new("ButtonElevation");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonIconForegroundPointerFocused")]
-						public static ThemeResourceKey<Brush> PointerFocused => new("FilledTonalButtonIconForegroundPointerFocused");
+					[ResourceKeyDefinition(typeof(Brush), "FilledButtonForeground")]
+					public static ThemeResourceKey<Brush> Foreground => new("FilledButtonForeground");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonIconForegroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("FilledTonalButtonIconForegroundDisabled");
-					}
+					[ResourceKeyDefinition(typeof(Thickness), "ButtonMargin")]
+					public static ThemeResourceKey<Thickness> Margin => new("ButtonMargin");
+				}
 
-					public static class Background
+				public static partial class FilledTonal
+				{
+					public static readonly BackgroundVSG Background = new();
+					public partial class BackgroundVSG
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBackground")]
-						public static ThemeResourceKey<Brush> Default => new("FilledTonalButtonBackground");
+						public ThemeResourceKey<Brush> Default = new("FilledTonalButtonBackground");
 
 						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBackgroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("FilledTonalButtonBackgroundPointerOver");
+						public ThemeResourceKey<Brush> PointerOver = new("FilledTonalButtonBackgroundPointerOver");
 
 						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBackgroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("FilledTonalButtonBackgroundPressed");
+						public ThemeResourceKey<Brush> Pressed = new("FilledTonalButtonBackgroundPressed");
+
+						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBackgroundDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("FilledTonalButtonBackgroundDisabled");
 
 						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBackgroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("FilledTonalButtonBackgroundFocused");
+						public ThemeResourceKey<Brush> Focused = new("FilledTonalButtonBackgroundFocused");
 
 						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBackgroundPointerFocused")]
-						public static ThemeResourceKey<Brush> PointerFocused => new("FilledTonalButtonBackgroundPointerFocused");
+						public ThemeResourceKey<Brush> PointerFocused = new("FilledTonalButtonBackgroundPointerFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBackgroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("FilledTonalButtonBackgroundDisabled");
+						public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
 					}
 
-					public static class BorderBrush
+					public static readonly BorderBrushVSG BorderBrush = new();
+					public partial class BorderBrushVSG
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBorderBrush")]
-						public static ThemeResourceKey<Brush> Default => new("FilledTonalButtonBorderBrush");
+						public ThemeResourceKey<Brush> Default = new("FilledTonalButtonBorderBrush");
 
 						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBorderBrushPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("FilledTonalButtonBorderBrushPointerOver");
+						public ThemeResourceKey<Brush> PointerOver = new("FilledTonalButtonBorderBrushPointerOver");
 
 						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBorderBrushPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("FilledTonalButtonBorderBrushPressed");
+						public ThemeResourceKey<Brush> Pressed = new("FilledTonalButtonBorderBrushPressed");
+
+						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBorderBrushDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("FilledTonalButtonBorderBrushDisabled");
 
 						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBorderBrushFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("FilledTonalButtonBorderBrushFocused");
+						public ThemeResourceKey<Brush> Focused = new("FilledTonalButtonBorderBrushFocused");
 
 						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBorderBrushPointerFocused")]
-						public static ThemeResourceKey<Brush> PointerFocused => new("FilledTonalButtonBorderBrushPointerFocused");
+						public ThemeResourceKey<Brush> PointerFocused = new("FilledTonalButtonBorderBrushPointerFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBorderBrushDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("FilledTonalButtonBorderBrushDisabled");
+						public static implicit operator ThemeResourceKey<Brush>(BorderBrushVSG self) => self.Default;
 					}
-				}
 
-				public static class Outlined
-				{
-					public static class Foreground
+					public static partial class StateLayerBackground
 					{
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonForeground")]
-						public static ThemeResourceKey<Brush> Default => new("OutlinedButtonForeground");
+						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonStateLayerBackgroundPointerOver")]
+						public static ThemeResourceKey<Brush> PointerOver => new("FilledTonalButtonStateLayerBackgroundPointerOver");
+
+						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonStateLayerBackgroundPressed")]
+						public static ThemeResourceKey<Brush> Pressed => new("FilledTonalButtonStateLayerBackgroundPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonForegroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("OutlinedButtonForegroundPointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonStateLayerBackgroundFocused")]
+						public static ThemeResourceKey<Brush> Focused => new("FilledTonalButtonStateLayerBackgroundFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonForegroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("OutlinedButtonForegroundPressed");
+						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonStateLayerBackgroundPointerFocused")]
+						public static ThemeResourceKey<Brush> PointerFocused => new("FilledTonalButtonStateLayerBackgroundPointerFocused");
+					}
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonForegroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("OutlinedButtonForegroundFocused");
+					[ResourceKeyDefinition(typeof(double), "ButtonElevation")]
+					public static ThemeResourceKey<double> Elevation => new("ButtonElevation");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonForegroundPointerFocused")]
-						public static ThemeResourceKey<Brush> PointerFocused => new("OutlinedButtonForegroundPointerFocused");
+					[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonForeground")]
+					public static ThemeResourceKey<Brush> Foreground => new("FilledTonalButtonForeground");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonForegroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("OutlinedButtonForegroundDisabled");
+					[ResourceKeyDefinition(typeof(Thickness), "ButtonMargin")]
+					public static ThemeResourceKey<Thickness> Margin => new("ButtonMargin");
+				}
+
+				public static partial class Icon
+				{
+					public static partial class Ellipse
+					{
+						[ResourceKeyDefinition(typeof(string), "IconButtonEllipseHorizontalAlignment")]
+						public static StaticResourceKey<string> HorizontalAlignment => new("IconButtonEllipseHorizontalAlignment");
+
+						[ResourceKeyDefinition(typeof(string), "IconButtonEllipseVerticalAlignment")]
+						public static StaticResourceKey<string> VerticalAlignment => new("IconButtonEllipseVerticalAlignment");
 					}
 
-					public static class IconForeground
+					public static readonly OpacityHiddenStateVSG OpacityHiddenState = new();
+					public partial class OpacityHiddenStateVSG
 					{
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonIconForeground")]
-						public static ThemeResourceKey<Brush> Default => new("OutlinedButtonIconForeground");
+						[ResourceKeyDefinition(typeof(double), "IconButtonOpacityHiddenState")]
+						public ThemeResourceKey<double> Default = new("IconButtonOpacityHiddenState");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonIconForegroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("OutlinedButtonIconForegroundPointerOver");
+						[ResourceKeyDefinition(typeof(double), "IconButtonOpacityVisibleState")]
+						public ThemeResourceKey<double> PointerOver = new("IconButtonOpacityVisibleState");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonIconForegroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("OutlinedButtonIconForegroundPressed");
+						public static implicit operator ThemeResourceKey<double>(OpacityHiddenStateVSG self) => self.Default;
+					}
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonIconForegroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("OutlinedButtonIconForegroundFocused");
+					[ResourceKeyDefinition(typeof(Brush), "IconButtonEllipseFillFocused")]
+					public static ThemeResourceKey<Brush> EllipseFillFocused => new("IconButtonEllipseFillFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonIconForegroundPointerFocused")]
-						public static ThemeResourceKey<Brush> PointerFocused => new("OutlinedButtonIconForegroundPointerFocused");
+					[ResourceKeyDefinition(typeof(Brush), "IconButtonEllipseFillPointerOver")]
+					public static ThemeResourceKey<Brush> EllipseFillPointerOver => new("IconButtonEllipseFillPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonIconForegroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("OutlinedButtonIconForegroundDisabled");
-					}
+					[ResourceKeyDefinition(typeof(Brush), "IconButtonEllipseFillPressed")]
+					public static ThemeResourceKey<Brush> EllipseFillPressed => new("IconButtonEllipseFillPressed");
+
+					[ResourceKeyDefinition(typeof(Brush), "IconButtonForeground")]
+					public static ThemeResourceKey<Brush> Foreground => new("IconButtonForeground");
+
+					[ResourceKeyDefinition(typeof(Brush), "IconButtonForegroundDisabled")]
+					public static ThemeResourceKey<Brush> ForegroundDisabled => new("IconButtonForegroundDisabled");
+				}
 
-					public static class Background
+				public static partial class Outlined
+				{
+					public static readonly BackgroundVSG Background = new();
+					public partial class BackgroundVSG
 					{
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBackground")]
-						public static ThemeResourceKey<Brush> Default => new("OutlinedButtonBackground");
+						public ThemeResourceKey<Brush> Default = new("OutlinedButtonBackground");
 
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBackgroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("OutlinedButtonBackgroundPointerOver");
+						public ThemeResourceKey<Brush> PointerOver = new("OutlinedButtonBackgroundPointerOver");
 
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBackgroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("OutlinedButtonBackgroundPressed");
+						public ThemeResourceKey<Brush> Pressed = new("OutlinedButtonBackgroundPressed");
 
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBackgroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("OutlinedButtonBackgroundFocused");
+						public ThemeResourceKey<Brush> Focused = new("OutlinedButtonBackgroundFocused");
 
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBackgroundPointerFocused")]
-						public static ThemeResourceKey<Brush> PointerFocused => new("OutlinedButtonBackgroundPointerFocused");
+						public ThemeResourceKey<Brush> PointerFocused = new("OutlinedButtonBackgroundPointerFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBackgroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("OutlinedButtonBackgroundDisabled");
+						public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
 					}
 
-					public static class BorderBrush
+					public static readonly BorderBrushVSG BorderBrush = new();
+					public partial class BorderBrushVSG
 					{
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBorderBrush")]
-						public static ThemeResourceKey<Brush> Default => new("OutlinedButtonBorderBrush");
+						public ThemeResourceKey<Brush> Default = new("OutlinedButtonBorderBrush");
 
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBorderBrushPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("OutlinedButtonBorderBrushPointerOver");
+						public ThemeResourceKey<Brush> PointerOver = new("OutlinedButtonBorderBrushPointerOver");
 
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBorderBrushPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("OutlinedButtonBorderBrushPressed");
+						public ThemeResourceKey<Brush> Pressed = new("OutlinedButtonBorderBrushPressed");
+
+						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBackgroundDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("OutlinedButtonBackgroundDisabled");
 
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBorderBrushFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("OutlinedButtonBorderBrushFocused");
+						public ThemeResourceKey<Brush> Focused = new("OutlinedButtonBorderBrushFocused");
 
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBorderBrushPointerFocused")]
-						public static ThemeResourceKey<Brush> PointerFocused => new("OutlinedButtonBorderBrushPointerFocused");
+						public ThemeResourceKey<Brush> PointerFocused = new("OutlinedButtonBorderBrushPointerFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBorderBrushDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("OutlinedButtonBorderBrushDisabled");
+						public static implicit operator ThemeResourceKey<Brush>(BorderBrushVSG self) => self.Default;
 					}
-				}
 
-				public static class Text
-				{
-					public static class Foreground
+					public static partial class StateLayerBackground
 					{
-						[ResourceKeyDefinition(typeof(Brush), "TextButtonForeground")]
-						public static ThemeResourceKey<Brush> Default => new("TextButtonForeground");
-
-						[ResourceKeyDefinition(typeof(Brush), "TextButtonForegroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("TextButtonForegroundPointerOver");
-
-						[ResourceKeyDefinition(typeof(Brush), "TextButtonForegroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("TextButtonForegroundPressed");
+						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonStateLayerBackgroundPointerOver")]
+						public static ThemeResourceKey<Brush> PointerOver => new("OutlinedButtonStateLayerBackgroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextButtonForegroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("TextButtonForegroundFocused");
+						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonStateLayerBackgroundPressed")]
+						public static ThemeResourceKey<Brush> Pressed => new("OutlinedButtonStateLayerBackgroundPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextButtonForegroundPointerFocused")]
-						public static ThemeResourceKey<Brush> PointerFocused => new("TextButtonForegroundPointerFocused");
+						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonStateLayerBackgroundFocused")]
+						public static ThemeResourceKey<Brush> Focused => new("OutlinedButtonStateLayerBackgroundFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextButtonForegroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("TextButtonForegroundDisabled");
+						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonStateLayerBackgroundPointerFocused")]
+						public static ThemeResourceKey<Brush> PointerFocused => new("OutlinedButtonStateLayerBackgroundPointerFocused");
 					}
 
-					public static class IconForeground
-					{
-						[ResourceKeyDefinition(typeof(Brush), "TextButtonIconForeground")]
-						public static ThemeResourceKey<Brush> Default => new("TextButtonIconForeground");
-
-						[ResourceKeyDefinition(typeof(Brush), "TextButtonIconForegroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("TextButtonIconForegroundPointerOver");
-
-						[ResourceKeyDefinition(typeof(Brush), "TextButtonIconForegroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("TextButtonIconForegroundPressed");
-
-						[ResourceKeyDefinition(typeof(Brush), "TextButtonIconForegroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("TextButtonIconForegroundFocused");
+					[ResourceKeyDefinition(typeof(Thickness), "OutlinedButtonBorderThickness")]
+					public static ThemeResourceKey<Thickness> BorderThickness => new("OutlinedButtonBorderThickness");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextButtonIconForegroundPointerFocused")]
-						public static ThemeResourceKey<Brush> PointerFocused => new("TextButtonIconForegroundPointerFocused");
-
-						[ResourceKeyDefinition(typeof(Brush), "TextButtonIconForegroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("TextButtonIconForegroundDisabled");
-					}
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonForeground")]
+					public static ThemeResourceKey<Brush> Foreground => new("OutlinedButtonForeground");
+				}
 
-					public static class Background
+				public static partial class Text
+				{
+					public static readonly BackgroundVSG Background = new();
+					public partial class BackgroundVSG
 					{
 						[ResourceKeyDefinition(typeof(Brush), "TextButtonBackground")]
-						public static ThemeResourceKey<Brush> Default => new("TextButtonBackground");
+						public ThemeResourceKey<Brush> Default = new("TextButtonBackground");
 
 						[ResourceKeyDefinition(typeof(Brush), "TextButtonBackgroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("TextButtonBackgroundPointerOver");
+						public ThemeResourceKey<Brush> PointerOver = new("TextButtonBackgroundPointerOver");
 
 						[ResourceKeyDefinition(typeof(Brush), "TextButtonBackgroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("TextButtonBackgroundPressed");
+						public ThemeResourceKey<Brush> Pressed = new("TextButtonBackgroundPressed");
 
 						[ResourceKeyDefinition(typeof(Brush), "TextButtonBackgroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("TextButtonBackgroundFocused");
+						public ThemeResourceKey<Brush> Focused = new("TextButtonBackgroundFocused");
 
 						[ResourceKeyDefinition(typeof(Brush), "TextButtonBackgroundPointerFocused")]
-						public static ThemeResourceKey<Brush> PointerFocused => new("TextButtonBackgroundPointerFocused");
+						public ThemeResourceKey<Brush> PointerFocused = new("TextButtonBackgroundPointerFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextButtonBackgroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("TextButtonBackgroundDisabled");
+						public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
 					}
 
-					public static class BorderBrush
+					public static readonly BorderBrushVSG BorderBrush = new();
+					public partial class BorderBrushVSG
 					{
 						[ResourceKeyDefinition(typeof(Brush), "TextButtonBorderBrush")]
-						public static ThemeResourceKey<Brush> Default => new("TextButtonBorderBrush");
+						public ThemeResourceKey<Brush> Default = new("TextButtonBorderBrush");
 
 						[ResourceKeyDefinition(typeof(Brush), "TextButtonBorderBrushPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("TextButtonBorderBrushPointerOver");
+						public ThemeResourceKey<Brush> PointerOver = new("TextButtonBorderBrushPointerOver");
 
 						[ResourceKeyDefinition(typeof(Brush), "TextButtonBorderBrushPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("TextButtonBorderBrushPressed");
+						public ThemeResourceKey<Brush> Pressed = new("TextButtonBorderBrushPressed");
+
+						[ResourceKeyDefinition(typeof(Brush), "TextButtonBorderBrushDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("TextButtonBorderBrushDisabled");
 
 						[ResourceKeyDefinition(typeof(Brush), "TextButtonBorderBrushFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("TextButtonBorderBrushFocused");
+						public ThemeResourceKey<Brush> Focused = new("TextButtonBorderBrushFocused");
 
 						[ResourceKeyDefinition(typeof(Brush), "TextButtonBorderBrushPointerFocused")]
-						public static ThemeResourceKey<Brush> PointerFocused => new("TextButtonBorderBrushPointerFocused");
+						public ThemeResourceKey<Brush> PointerFocused = new("TextButtonBorderBrushPointerFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextButtonBorderBrushDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("TextButtonBorderBrushDisabled");
+						public static implicit operator ThemeResourceKey<Brush>(BorderBrushVSG self) => self.Default;
 					}
-				}
 
-				public static class Icon
-				{
-					public static class Foreground
+					public static partial class StateLayerBackground
 					{
-						[ResourceKeyDefinition(typeof(Brush), "IconButtonForeground")]
-						public static ThemeResourceKey<Brush> Default => new("IconButtonForeground");
+						[ResourceKeyDefinition(typeof(Brush), "TextButtonStateLayerBackgroundPointerOver")]
+						public static ThemeResourceKey<Brush> PointerOver => new("TextButtonStateLayerBackgroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconButtonForegroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("IconButtonForegroundDisabled");
-					}
-
-					public static class EllipseFill
-					{
-						[ResourceKeyDefinition(typeof(Brush), "IconButtonEllipseFillPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("IconButtonEllipseFillPointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "TextButtonStateLayerBackgroundPressed")]
+						public static ThemeResourceKey<Brush> Pressed => new("TextButtonStateLayerBackgroundPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconButtonEllipseFillPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("IconButtonEllipseFillPressed");
+						[ResourceKeyDefinition(typeof(Brush), "TextButtonStateLayerBackgroundFocused")]
+						public static ThemeResourceKey<Brush> Focused => new("TextButtonStateLayerBackgroundFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconButtonEllipseFillFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("IconButtonEllipseFillFocused");
+						[ResourceKeyDefinition(typeof(Brush), "TextButtonStateLayerBackgroundPointerFocused")]
+						public static ThemeResourceKey<Brush> PointerFocused => new("TextButtonStateLayerBackgroundPointerFocused");
 					}
-				}
-			}
-
-			public static class Styles
-			{
-				[ResourceKeyDefinition(typeof(Style), "ElevatedButtonStyle", TargetType = typeof(Button))]
-				public static StaticResourceKey<Style> Elevated => new("ElevatedButtonStyle");
-
-				[ResourceKeyDefinition(typeof(Style), "FilledButtonStyle", TargetType = typeof(Button))]
-				public static StaticResourceKey<Style> Filled => new("FilledButtonStyle");
-
-				[ResourceKeyDefinition(typeof(Style), "FilledTonalButtonStyle", TargetType = typeof(Button))]
-				public static StaticResourceKey<Style> FilledTonal => new("FilledTonalButtonStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "OutlinedButtonStyle", TargetType = typeof(Button))]
-				public static StaticResourceKey<Style> Outlined => new("OutlinedButtonStyle");
+					[ResourceKeyDefinition(typeof(Brush), "TextButtonForeground")]
+					public static ThemeResourceKey<Brush> Foreground => new("TextButtonForeground");
 
-				[ResourceKeyDefinition(typeof(Style), "TextButtonStyle", TargetType = typeof(Button))]
-				public static StaticResourceKey<Style> Text => new("TextButtonStyle");
+					[ResourceKeyDefinition(typeof(Thickness), "TextButtonPadding")]
+					public static ThemeResourceKey<Thickness> Padding => new("TextButtonPadding");
+				}
 
-				[ResourceKeyDefinition(typeof(Style), "IconButtonStyle", TargetType = typeof(Button))]
-				public static StaticResourceKey<Style> Icon => new("IconButtonStyle");
+				[ResourceKeyDefinition(typeof(Thickness), "ButtonBorderThickness")]
+				public static ThemeResourceKey<Thickness> BorderThickness => new("ButtonBorderThickness");
 
-				[ResourceKeyDefinition(typeof(Style), "FabStyle", TargetType = typeof(Button))]
-				public static StaticResourceKey<Style> Fab => new("FabStyle");
+				[ResourceKeyDefinition(typeof(CornerRadius), "ButtonCornerRadius")]
+				public static ThemeResourceKey<CornerRadius> CornerRadius => new("ButtonCornerRadius");
 
-				[ResourceKeyDefinition(typeof(Style), "SurfaceFabStyle", TargetType = typeof(Button))]
-				public static StaticResourceKey<Style> SurfaceFab => new("SurfaceFabStyle");
+				[ResourceKeyDefinition(typeof(string), "ButtonHorizontalContentAlignment")]
+				public static StaticResourceKey<string> HorizontalContentAlignment => new("ButtonHorizontalContentAlignment");
 
-				[ResourceKeyDefinition(typeof(Style), "SecondaryFabStyle", TargetType = typeof(Button))]
-				public static StaticResourceKey<Style> SecondaryFab => new("SecondaryFabStyle");
+				[ResourceKeyDefinition(typeof(double), "ButtonMinHeight")]
+				public static ThemeResourceKey<double> MinHeight => new("ButtonMinHeight");
 
-				[ResourceKeyDefinition(typeof(Style), "TertiaryFabStyle", TargetType = typeof(Button))]
-				public static StaticResourceKey<Style> TertiaryFab => new("TertiaryFabStyle");
+				[ResourceKeyDefinition(typeof(double), "ButtonMinWidth")]
+				public static ThemeResourceKey<double> MinWidth => new("ButtonMinWidth");
 
-				[ResourceKeyDefinition(typeof(Style), "SmallFabStyle", TargetType = typeof(Button))]
-				public static StaticResourceKey<Style> SmallFab => new("SmallFabStyle");
+				[ResourceKeyDefinition(typeof(Thickness), "ButtonPadding")]
+				public static ThemeResourceKey<Thickness> Padding => new("ButtonPadding");
 
-				[ResourceKeyDefinition(typeof(Style), "SurfaceSmallFabStyle", TargetType = typeof(Button))]
-				public static StaticResourceKey<Style> SurfaceSmallFab => new("SurfaceSmallFabStyle");
+				[ResourceKeyDefinition(typeof(string), "ButtonVerticalContentAlignment")]
+				public static StaticResourceKey<string> VerticalContentAlignment => new("ButtonVerticalContentAlignment");
+			}
 
-				[ResourceKeyDefinition(typeof(Style), "SecondarySmallFabStyle", TargetType = typeof(Button))]
-				public static StaticResourceKey<Style> SecondarySmallFab => new("SecondarySmallFabStyle");
+			public static partial class Styles
+			{
+				[ResourceKeyDefinition(typeof(Style), "MaterialElevatedButtonStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> Elevated => new("MaterialElevatedButtonStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "TertiarySmallFabStyle", TargetType = typeof(Button))]
-				public static StaticResourceKey<Style> TertiarySmallFab => new("TertiarySmallFabStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialFilledButtonStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> Filled => new("MaterialFilledButtonStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "LargeFabStyle", TargetType = typeof(Button))]
-				public static StaticResourceKey<Style> LargeFab => new("LargeFabStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialFilledTonalButtonStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> FilledTonal => new("MaterialFilledTonalButtonStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "SurfaceLargeFabStyle", TargetType = typeof(Button))]
-				public static StaticResourceKey<Style> SurfaceLargeFab => new("SurfaceLargeFabStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialOutlinedButtonStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> Outlined => new("MaterialOutlinedButtonStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "SecondaryLargeFabStyle", TargetType = typeof(Button))]
-				public static StaticResourceKey<Style> SecondaryLargeFab => new("SecondaryLargeFabStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialTextButtonStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> Text => new("MaterialTextButtonStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "TertiaryLargeFabStyle", TargetType = typeof(Button))]
-				public static StaticResourceKey<Style> TertiaryLargeFab => new("TertiaryLargeFabStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialIconButtonStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> Icon => new("MaterialIconButtonStyle");
 			}
 		}
 	}
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/CalendarDatePicker.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/CalendarDatePicker.cs
new file mode 100644
index 000000000..94d68a235
--- /dev/null
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/CalendarDatePicker.cs
@@ -0,0 +1,115 @@
+using System;
+using Windows.UI;
+using Microsoft.UI.Text;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Media;
+using Uno.Extensions.Markup;
+using Uno.Extensions.Markup.Internals;
+
+namespace Uno.Themes.Markup
+{
+	public static partial class Theme
+	{
+		public static partial class CalendarDatePicker
+		{
+			public static partial class Resources
+			{
+				public static readonly BackgroundVSG Background = new();
+				public partial class BackgroundVSG
+				{
+					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBackground")]
+					public ThemeResourceKey<Brush> Default = new("CalendarDatePickerBackground");
+
+					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBackgroundPointerOver")]
+					public ThemeResourceKey<Brush> PointerOver = new("CalendarDatePickerBackgroundPointerOver");
+
+					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBackgroundPressed")]
+					public ThemeResourceKey<Brush> Pressed = new("CalendarDatePickerBackgroundPressed");
+
+					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBackgroundDisabled")]
+					public ThemeResourceKey<Brush> Disabled = new("CalendarDatePickerBackgroundDisabled");
+
+					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBackgroundFocused")]
+					public ThemeResourceKey<Brush> Focused = new("CalendarDatePickerBackgroundFocused");
+
+					public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
+				}
+
+				public static readonly BorderBrushVSG BorderBrush = new();
+				public partial class BorderBrushVSG
+				{
+					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBorderBrush")]
+					public ThemeResourceKey<Brush> Default = new("CalendarDatePickerBorderBrush");
+
+					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBorderBrushPointerOver")]
+					public ThemeResourceKey<Brush> PointerOver = new("CalendarDatePickerBorderBrushPointerOver");
+
+					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBorderBrushPressed")]
+					public ThemeResourceKey<Brush> Pressed = new("CalendarDatePickerBorderBrushPressed");
+
+					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBorderBrushDisabled")]
+					public ThemeResourceKey<Brush> Disabled = new("CalendarDatePickerBorderBrushDisabled");
+
+					public static implicit operator ThemeResourceKey<Brush>(BorderBrushVSG self) => self.Default;
+				}
+
+				public static partial class Header
+				{
+					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerHeaderForeground")]
+					public static ThemeResourceKey<Brush> Foreground => new("CalendarDatePickerHeaderForeground");
+
+					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerHeaderForegroundDisabled")]
+					public static ThemeResourceKey<Brush> ForegroundDisabled => new("CalendarDatePickerHeaderForegroundDisabled");
+				}
+
+				public static readonly TextForegroundVSG TextForeground = new();
+				public partial class TextForegroundVSG
+				{
+					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerTextForeground")]
+					public ThemeResourceKey<Brush> Default = new("CalendarDatePickerTextForeground");
+
+					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerTextForegroundDisabled")]
+					public ThemeResourceKey<Brush> Disabled = new("CalendarDatePickerTextForegroundDisabled");
+
+					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerTextForegroundSelected")]
+					public ThemeResourceKey<Brush> Selected = new("CalendarDatePickerTextForegroundSelected");
+
+					public static implicit operator ThemeResourceKey<Brush>(TextForegroundVSG self) => self.Default;
+				}
+
+				[ResourceKeyDefinition(typeof(CornerRadius), "CalendarDatePickerBackgroundCornerRadius")]
+				public static ThemeResourceKey<CornerRadius> BackgroundCornerRadius => new("CalendarDatePickerBackgroundCornerRadius");
+
+				[ResourceKeyDefinition(typeof(double), "CalendarDatePickerBackgroundMinHeight")]
+				public static ThemeResourceKey<double> BackgroundMinHeight => new("CalendarDatePickerBackgroundMinHeight");
+
+				[ResourceKeyDefinition(typeof(Thickness), "CalendarDatePickerBorderThemeThickness")]
+				public static ThemeResourceKey<Thickness> BorderThemeThickness => new("CalendarDatePickerBorderThemeThickness");
+
+				[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBottomBorderBrush")]
+				public static ThemeResourceKey<Brush> BottomBorderBrush => new("CalendarDatePickerBottomBorderBrush");
+
+				[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerCalendarGlyphForegroundDisabled")]
+				public static ThemeResourceKey<Brush> CalendarGlyphForegroundDisabled => new("CalendarDatePickerCalendarGlyphForegroundDisabled");
+
+				[ResourceKeyDefinition(typeof(Thickness), "CalendarDatePickerContentMargin")]
+				public static ThemeResourceKey<Thickness> ContentMargin => new("CalendarDatePickerContentMargin");
+
+				[ResourceKeyDefinition(typeof(CornerRadius), "CalendarDatePickerCornerRadius")]
+				public static ThemeResourceKey<CornerRadius> CornerRadius => new("CalendarDatePickerCornerRadius");
+
+				[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerForeground")]
+				public static ThemeResourceKey<Brush> Foreground => new("CalendarDatePickerForeground");
+
+				[ResourceKeyDefinition(typeof(double), "CalendarDatePickerHeight")]
+				public static ThemeResourceKey<double> Height => new("CalendarDatePickerHeight");
+			}
+
+			public static partial class Styles
+			{
+				[ResourceKeyDefinition(typeof(Style), "MaterialCalendarDatePickerStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> Default => new("MaterialCalendarDatePickerStyle");
+			}
+		}
+	}
+}
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/CalendarView.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/CalendarView.cs
new file mode 100644
index 000000000..e88194d5c
--- /dev/null
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/CalendarView.cs
@@ -0,0 +1,34 @@
+using System;
+using Windows.UI;
+using Microsoft.UI.Text;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Media;
+using Uno.Extensions.Markup;
+using Uno.Extensions.Markup.Internals;
+
+namespace Uno.Themes.Markup
+{
+	public static partial class Theme
+	{
+		public static partial class CalendarView
+		{
+			public static partial class Resources
+			{
+				public static partial class Calendar
+				{
+					[ResourceKeyDefinition(typeof(Brush), "MaterialCalendarBlackoutForeground")]
+					public static ThemeResourceKey<Brush> BlackoutForeground => new("MaterialCalendarBlackoutForeground");
+
+					[ResourceKeyDefinition(typeof(Brush), "MaterialCalendarTodayForeground")]
+					public static StaticResourceKey<Brush> TodayForeground => new("MaterialCalendarTodayForeground");
+				}
+			}
+
+			public static partial class Styles
+			{
+				[ResourceKeyDefinition(typeof(Style), "MaterialCalendarViewStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> Default => new("MaterialCalendarViewStyle");
+			}
+		}
+	}
+}
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/CheckBox.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/CheckBox.cs
index b342053b1..512ba4f6a 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/CheckBox.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/CheckBox.cs
@@ -1,227 +1,225 @@
-using Microsoft.UI.Text;
+using System;
+using Windows.UI;
+using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
 using Uno.Extensions.Markup;
 using Uno.Extensions.Markup.Internals;
-using MUXCornerRadius = Microsoft.UI.Xaml.CornerRadius;
 
 namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class CheckBox
+		public static partial class CheckBox
 		{
-			[ResourceKeyDefinition(typeof(double), "CheckBoxFocusAreaSize")]
-			public static ThemeResourceKey<double> FocusAreaSize => new("CheckBoxFocusAreaSize");
-
-			public static class Resources
+			public static partial class Resources
 			{
-				public static class Background
+				public static partial class CheckArea
+				{
+					[ResourceKeyDefinition(typeof(Thickness), "CheckBoxCheckAreaBorderThickness")]
+					public static ThemeResourceKey<Thickness> BorderThickness => new("CheckBoxCheckAreaBorderThickness");
+
+					[ResourceKeyDefinition(typeof(CornerRadius), "CheckBoxCheckAreaCornerRadius")]
+					public static ThemeResourceKey<CornerRadius> CornerRadius => new("CheckBoxCheckAreaCornerRadius");
+
+					[ResourceKeyDefinition(typeof(Thickness), "CheckBoxCheckAreaPadding")]
+					public static ThemeResourceKey<Thickness> Padding => new("CheckBoxCheckAreaPadding");
+				}
+
+				public static readonly CheckBackgroundFillUncheckedVSG CheckBackgroundFillUnchecked = new();
+				public partial class CheckBackgroundFillUncheckedVSG
 				{
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxBackgroundUnchecked")]
-					public static ThemeResourceKey<Brush> Unchecked => new("CheckBoxBackgroundUnchecked");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillUnchecked")]
+					public ThemeResourceKey<Brush> Default = new("CheckBoxCheckBackgroundFillUnchecked");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxBackgroundUncheckedPointerOver")]
-					public static ThemeResourceKey<Brush> UncheckedPointerOver => new("CheckBoxBackgroundUncheckedPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillUncheckedPointerOver")]
+					public ThemeResourceKey<Brush> UncheckedPointerOver = new("CheckBoxCheckBackgroundFillUncheckedPointerOver");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxBackgroundUncheckedPressed")]
-					public static ThemeResourceKey<Brush> UncheckedPressed => new("CheckBoxBackgroundUncheckedPressed");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillUncheckedPressed")]
+					public ThemeResourceKey<Brush> UncheckedPressed = new("CheckBoxCheckBackgroundFillUncheckedPressed");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxBackgroundUncheckedDisabled")]
-					public static ThemeResourceKey<Brush> UncheckedDisabled => new("CheckBoxBackgroundUncheckedDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillUncheckedDisabled")]
+					public ThemeResourceKey<Brush> UncheckedDisabled = new("CheckBoxCheckBackgroundFillUncheckedDisabled");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxBackgroundChecked")]
-					public static ThemeResourceKey<Brush> Checked => new("CheckBoxBackgroundChecked");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillChecked")]
+					public ThemeResourceKey<Brush> CheckedNormal = new("CheckBoxCheckBackgroundFillChecked");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxBackgroundCheckedPointerOver")]
-					public static ThemeResourceKey<Brush> CheckedPointerOver => new("CheckBoxBackgroundCheckedPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillCheckedPointerOver")]
+					public ThemeResourceKey<Brush> CheckedPointerOver = new("CheckBoxCheckBackgroundFillCheckedPointerOver");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxBackgroundCheckedPressed")]
-					public static ThemeResourceKey<Brush> CheckedPressed => new("CheckBoxBackgroundCheckedPressed");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillCheckedPressed")]
+					public ThemeResourceKey<Brush> CheckedPressed = new("CheckBoxCheckBackgroundFillCheckedPressed");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxBackgroundCheckedDisabled")]
-					public static ThemeResourceKey<Brush> CheckedDisabled => new("CheckBoxBackgroundCheckedDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillCheckedDisabled")]
+					public ThemeResourceKey<Brush> CheckedDisabled = new("CheckBoxCheckBackgroundFillCheckedDisabled");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxBackgroundIndeterminate")]
-					public static ThemeResourceKey<Brush> Indeterminate => new("CheckBoxBackgroundIndeterminate");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillIndeterminate")]
+					public ThemeResourceKey<Brush> IndeterminateNormal = new("CheckBoxCheckBackgroundFillIndeterminate");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxBackgroundIndeterminatePointerOver")]
-					public static ThemeResourceKey<Brush> IndeterminatePointerOver => new("CheckBoxBackgroundIndeterminatePointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillIndeterminatePointerOver")]
+					public ThemeResourceKey<Brush> IndeterminatePointerOver = new("CheckBoxCheckBackgroundFillIndeterminatePointerOver");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxBackgroundIndeterminatePressed")]
-					public static ThemeResourceKey<Brush> IndeterminatePressed => new("CheckBoxBackgroundIndeterminatePressed");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillIndeterminatePressed")]
+					public ThemeResourceKey<Brush> IndeterminatePressed = new("CheckBoxCheckBackgroundFillIndeterminatePressed");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxBackgroundIndeterminateDisabled")]
-					public static ThemeResourceKey<Brush> IndeterminateDisabled => new("CheckBoxBackgroundIndeterminateDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillIndeterminateDisabled")]
+					public ThemeResourceKey<Brush> IndeterminateDisabled = new("CheckBoxCheckBackgroundFillIndeterminateDisabled");
+
+					public static implicit operator ThemeResourceKey<Brush>(CheckBackgroundFillUncheckedVSG self) => self.Default;
 				}
 
-				public static class Foreground
+				public static readonly CheckBackgroundStrokeUncheckedVSG CheckBackgroundStrokeUnchecked = new();
+				public partial class CheckBackgroundStrokeUncheckedVSG
 				{
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxForegroundUnchecked")]
-					public static ThemeResourceKey<Brush> Unchecked => new("CheckBoxForegroundUnchecked");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeUnchecked")]
+					public ThemeResourceKey<Brush> Default = new("CheckBoxCheckBackgroundStrokeUnchecked");
+
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeUncheckedPointerOver")]
+					public ThemeResourceKey<Brush> UncheckedPointerOver = new("CheckBoxCheckBackgroundStrokeUncheckedPointerOver");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxForegroundUncheckedPointerOver")]
-					public static ThemeResourceKey<Brush> UncheckedPointerOver => new("CheckBoxForegroundUncheckedPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeUncheckedPressed")]
+					public ThemeResourceKey<Brush> UncheckedPressed = new("CheckBoxCheckBackgroundStrokeUncheckedPressed");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxForegroundUncheckedPressed")]
-					public static ThemeResourceKey<Brush> UncheckedPressed => new("CheckBoxForegroundUncheckedPressed");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeUncheckedDisabled")]
+					public ThemeResourceKey<Brush> UncheckedDisabled = new("CheckBoxCheckBackgroundStrokeUncheckedDisabled");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxForegroundUncheckedDisabled")]
-					public static ThemeResourceKey<Brush> UncheckedDisabled => new("CheckBoxForegroundUncheckedDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeChecked")]
+					public ThemeResourceKey<Brush> CheckedNormal = new("CheckBoxCheckBackgroundStrokeChecked");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxForegroundChecked")]
-					public static ThemeResourceKey<Brush> Checked => new("CheckBoxForegroundChecked");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeCheckedPointerOver")]
+					public ThemeResourceKey<Brush> CheckedPointerOver = new("CheckBoxCheckBackgroundStrokeCheckedPointerOver");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxForegroundCheckedPointerOver")]
-					public static ThemeResourceKey<Brush> CheckedPointerOver => new("CheckBoxForegroundCheckedPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeCheckedPressed")]
+					public ThemeResourceKey<Brush> CheckedPressed = new("CheckBoxCheckBackgroundStrokeCheckedPressed");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxForegroundCheckedPressed")]
-					public static ThemeResourceKey<Brush> CheckedPressed => new("CheckBoxForegroundCheckedPressed");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeCheckedDisabled")]
+					public ThemeResourceKey<Brush> CheckedDisabled = new("CheckBoxCheckBackgroundStrokeCheckedDisabled");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxForegroundCheckedDisabled")]
-					public static ThemeResourceKey<Brush> CheckedDisabled => new("CheckBoxForegroundCheckedDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeIndeterminate")]
+					public ThemeResourceKey<Brush> IndeterminateNormal = new("CheckBoxCheckBackgroundStrokeIndeterminate");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxForegroundIndeterminate")]
-					public static ThemeResourceKey<Brush> Indeterminate => new("CheckBoxForegroundIndeterminate");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeIndeterminatePointerOver")]
+					public ThemeResourceKey<Brush> IndeterminatePointerOver = new("CheckBoxCheckBackgroundStrokeIndeterminatePointerOver");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxForegroundIndeterminatePointerOver")]
-					public static ThemeResourceKey<Brush> IndeterminatePointerOver => new("CheckBoxForegroundIndeterminatePointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeIndeterminatePressed")]
+					public ThemeResourceKey<Brush> IndeterminatePressed = new("CheckBoxCheckBackgroundStrokeIndeterminatePressed");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxForegroundIndeterminatePressed")]
-					public static ThemeResourceKey<Brush> IndeterminatePressed => new("CheckBoxForegroundIndeterminatePressed");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeIndeterminateDisabled")]
+					public ThemeResourceKey<Brush> IndeterminateDisabled = new("CheckBoxCheckBackgroundStrokeIndeterminateDisabled");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxForegroundIndeterminateDisabled")]
-					public static ThemeResourceKey<Brush> IndeterminateDisabled => new("CheckBoxForegroundIndeterminateDisabled");
+					public static implicit operator ThemeResourceKey<Brush>(CheckBackgroundStrokeUncheckedVSG self) => self.Default;
 				}
 
-				public static class BorderBrush
+				public static readonly GlyphForegroundCheckedVSG GlyphForegroundChecked = new();
+				public partial class GlyphForegroundCheckedVSG
 				{
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxBorderBrushUnchecked")]
-					public static ThemeResourceKey<Brush> Unchecked => new("CheckBoxBorderBrushUnchecked");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundChecked")]
+					public ThemeResourceKey<Brush> Default = new("CheckBoxGlyphForegroundChecked");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxBorderBrushUncheckedPointerOver")]
-					public static ThemeResourceKey<Brush> UncheckedPointerOver => new("CheckBoxBorderBrushUncheckedPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundUnchecked")]
+					public ThemeResourceKey<Brush> UncheckedNormal = new("CheckBoxGlyphForegroundUnchecked");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxBorderBrushUncheckedPressed")]
-					public static ThemeResourceKey<Brush> UncheckedPressed => new("CheckBoxBorderBrushUncheckedPressed");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundUncheckedPointerOver")]
+					public ThemeResourceKey<Brush> UncheckedPointerOver = new("CheckBoxGlyphForegroundUncheckedPointerOver");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxBorderBrushUncheckedDisabled")]
-					public static ThemeResourceKey<Brush> UncheckedDisabled => new("CheckBoxBorderBrushUncheckedDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundUncheckedPressed")]
+					public ThemeResourceKey<Brush> UncheckedPressed = new("CheckBoxGlyphForegroundUncheckedPressed");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxBorderBrushChecked")]
-					public static ThemeResourceKey<Brush> Checked => new("CheckBoxBorderBrushChecked");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundUncheckedDisabled")]
+					public ThemeResourceKey<Brush> UncheckedDisabled = new("CheckBoxGlyphForegroundUncheckedDisabled");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxBorderBrushCheckedPointerOver")]
-					public static ThemeResourceKey<Brush> CheckedPointerOver => new("CheckBoxBorderBrushCheckedPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundCheckedPointerOver")]
+					public ThemeResourceKey<Brush> CheckedPointerOver = new("CheckBoxGlyphForegroundCheckedPointerOver");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxBorderBrushCheckedPressed")]
-					public static ThemeResourceKey<Brush> CheckedPressed => new("CheckBoxBorderBrushCheckedPressed");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundCheckedPressed")]
+					public ThemeResourceKey<Brush> CheckedPressed = new("CheckBoxGlyphForegroundCheckedPressed");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxBorderBrushCheckedDisabled")]
-					public static ThemeResourceKey<Brush> CheckedDisabled => new("CheckBoxBorderBrushCheckedDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundCheckedDisabled")]
+					public ThemeResourceKey<Brush> CheckedDisabled = new("CheckBoxGlyphForegroundCheckedDisabled");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxBorderBrushIndeterminate")]
-					public static ThemeResourceKey<Brush> Indeterminate => new("CheckBoxBorderBrushIndeterminate");
-
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxBorderBrushIndeterminatePointerOver")]
-					public static ThemeResourceKey<Brush> IndeterminatePointerOver => new("CheckBoxBorderBrushIndeterminatePointerOver");
-
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxBorderBrushIndeterminatePressed")]
-					public static ThemeResourceKey<Brush> IndeterminatePressed => new("CheckBoxBorderBrushIndeterminatePressed");
-
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxBorderBrushIndeterminateDisabled")]
-					public static ThemeResourceKey<Brush> IndeterminateDisabled => new("CheckBoxBorderBrushIndeterminateDisabled");
+					public static implicit operator ThemeResourceKey<Brush>(GlyphForegroundCheckedVSG self) => self.Default;
 				}
 
-				public static class Glyph
+				public static readonly GlyphForegroundIndeterminateVSG GlyphForegroundIndeterminate = new();
+				public partial class GlyphForegroundIndeterminateVSG
 				{
-					[ResourceKeyDefinition(typeof(string), "CheckBoxHyphenGlyphPathData")]
-					public static ThemeResourceKey<string> HyphenPathData => new("CheckBoxHyphenGlyphPathData");
-
-					[ResourceKeyDefinition(typeof(string), "CheckBoxCheckGlyphPathData")]
-					public static ThemeResourceKey<string> CheckPathData => new("CheckBoxCheckGlyphPathData");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundIndeterminate")]
+					public ThemeResourceKey<Brush> Default = new("CheckBoxGlyphForegroundIndeterminate");
 
-					public static class Foreground
-					{
-						[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundUnchecked")]
-						public static ThemeResourceKey<Brush> Unchecked => new("CheckBoxGlyphForegroundUnchecked");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundIndeterminatePointerOver")]
+					public ThemeResourceKey<Brush> IndeterminatePointerOver = new("CheckBoxGlyphForegroundIndeterminatePointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundUncheckedPointerOver")]
-						public static ThemeResourceKey<Brush> UncheckedPointerOver => new("CheckBoxGlyphForegroundUncheckedPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundIndeterminatePressed")]
+					public ThemeResourceKey<Brush> IndeterminatePressed = new("CheckBoxGlyphForegroundIndeterminatePressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundUncheckedPressed")]
-						public static ThemeResourceKey<Brush> UncheckedPressed => new("CheckBoxGlyphForegroundUncheckedPressed");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundIndeterminateDisabled")]
+					public ThemeResourceKey<Brush> IndeterminateDisabled = new("CheckBoxGlyphForegroundIndeterminateDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundUncheckedDisabled")]
-						public static ThemeResourceKey<Brush> UncheckedDisabled => new("CheckBoxGlyphForegroundUncheckedDisabled");
+					public static implicit operator ThemeResourceKey<Brush>(GlyphForegroundIndeterminateVSG self) => self.Default;
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundChecked")]
-						public static ThemeResourceKey<Brush> Checked => new("CheckBoxGlyphForegroundChecked");
+				public static readonly StateCircleFillCheckedVSG StateCircleFillChecked = new();
+				public partial class StateCircleFillCheckedVSG
+				{
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxStateCircleFillChecked")]
+					public ThemeResourceKey<Brush> Default = new("CheckBoxStateCircleFillChecked");
 
-						[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundCheckedPointerOver")]
-						public static ThemeResourceKey<Brush> CheckedPointerOver => new("CheckBoxGlyphForegroundCheckedPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "CheckBoxStateCircleFillUnchecked")]
+					public ThemeResourceKey<Brush> UncheckedPointerOver = new("CheckBoxStateCircleFillUnchecked");
 
-						[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundCheckedPressed")]
-						public static ThemeResourceKey<Brush> CheckedPressed => new("CheckBoxGlyphForegroundCheckedPressed");
+					public static implicit operator ThemeResourceKey<Brush>(StateCircleFillCheckedVSG self) => self.Default;
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundCheckedDisabled")]
-						public static ThemeResourceKey<Brush> CheckedDisabled => new("CheckBoxGlyphForegroundCheckedDisabled");
+				public static partial class StateCircleOpacityPointerOver
+				{
+					[ResourceKeyDefinition(typeof(double), "CheckBoxStateCircleOpacityPointerOver")]
+					public static ThemeResourceKey<double> UncheckedPointerOver => new("CheckBoxStateCircleOpacityPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundIndeterminate")]
-						public static ThemeResourceKey<Brush> Indeterminate => new("CheckBoxGlyphForegroundIndeterminate");
+					[ResourceKeyDefinition(typeof(double), "CheckBoxStateCircleOpacityPressed")]
+					public static ThemeResourceKey<double> UncheckedPressed => new("CheckBoxStateCircleOpacityPressed");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundIndeterminatePointerOver")]
-						public static ThemeResourceKey<Brush> IndeterminatePointerOver => new("CheckBoxGlyphForegroundIndeterminatePointerOver");
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxBackgroundUnchecked")]
+				public static ThemeResourceKey<Brush> BackgroundUnchecked => new("CheckBoxBackgroundUnchecked");
 
-						[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundIndeterminatePressed")]
-						public static ThemeResourceKey<Brush> IndeterminatePressed => new("CheckBoxGlyphForegroundIndeterminatePressed");
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxBorderBrushUnchecked")]
+				public static ThemeResourceKey<Brush> BorderBrushUnchecked => new("CheckBoxBorderBrushUnchecked");
 
-						[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundIndeterminateDisabled")]
-						public static ThemeResourceKey<Brush> IndeterminateDisabled => new("CheckBoxGlyphForegroundIndeterminateDisabled");
-					}
-				}
+				[ResourceKeyDefinition(typeof(int), "CheckBoxCharacterSpacing")]
+				public static ThemeResourceKey<int> CharacterSpacing => new("CheckBoxCharacterSpacing");
 
-				public static class Typography
-				{
-					[ResourceKeyDefinition(typeof(FontFamily), "CheckBoxFontFamily")]
-					public static ThemeResourceKey<FontFamily> FontFamily => new("CheckBoxFontFamily");
+				[ResourceKeyDefinition(typeof(double), "CheckBoxCheckAreaSize")]
+				public static ThemeResourceKey<double> CheckAreaSize => new("CheckBoxCheckAreaSize");
 
-					[ResourceKeyDefinition(typeof(FontWeights), "CheckBoxFontWeight")]
-					public static ThemeResourceKey<FontWeights> FontWeight => new("CheckBoxFontWeight");
+				[ResourceKeyDefinition(typeof(string), "CheckBoxCheckGlyphPathData")]
+				public static ThemeResourceKey<string> CheckGlyphPathData => new("CheckBoxCheckGlyphPathData");
 
-					[ResourceKeyDefinition(typeof(double), "CheckBoxFontSize")]
-					public static ThemeResourceKey<double> FontSize => new("CheckBoxFontSize");
+				[ResourceKeyDefinition(typeof(double), "CheckBoxFocusAreaSize")]
+				public static ThemeResourceKey<double> FocusAreaSize => new("CheckBoxFocusAreaSize");
 
-					[ResourceKeyDefinition(typeof(double), "CheckBoxCharacterSpacing")]
-					public static ThemeResourceKey<double> CharacterSpacing => new("CheckBoxCharacterSpacing");
-				}
+				[ResourceKeyDefinition(typeof(FontFamily), "CheckBoxFontFamily")]
+				public static ThemeResourceKey<FontFamily> FontFamily => new("CheckBoxFontFamily");
 
-				public static class CheckArea
-				{
-					[ResourceKeyDefinition(typeof(double), "CheckBoxCheckAreaSize")]
-					public static ThemeResourceKey<double> Size => new("CheckBoxCheckAreaSize");
+				[ResourceKeyDefinition(typeof(double), "CheckBoxFontSize")]
+				public static ThemeResourceKey<double> FontSize => new("CheckBoxFontSize");
 
-					[ResourceKeyDefinition(typeof(GridLength), "CheckBoxCheckAreaLength")]
-					public static ThemeResourceKey<GridLength> Length => new("CheckBoxCheckAreaLength");
+				[ResourceKeyDefinition(typeof(string), "CheckBoxFontWeight")]
+				public static ThemeResourceKey<string> FontWeight => new("CheckBoxFontWeight");
 
-					[ResourceKeyDefinition(typeof(MUXCornerRadius), "CheckBoxCheckAreaCornerRadius")]
-					public static ThemeResourceKey<MUXCornerRadius> CornerRadius => new("CheckBoxCheckAreaCornerRadius");
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxForegroundUnchecked")]
+				public static ThemeResourceKey<Brush> ForegroundUnchecked => new("CheckBoxForegroundUnchecked");
 
-					[ResourceKeyDefinition(typeof(Thickness), "CheckBoxCheckAreaBorderThickness")]
-					public static ThemeResourceKey<Thickness> BorderThickness => new("CheckBoxCheckAreaBorderThickness");
+				[ResourceKeyDefinition(typeof(string), "CheckBoxHyphenGlyphPathData")]
+				public static ThemeResourceKey<string> HyphenGlyphPathData => new("CheckBoxHyphenGlyphPathData");
 
-					[ResourceKeyDefinition(typeof(Thickness), "CheckBoxCheckAreaPadding")]
-					public static ThemeResourceKey<Thickness> Padding => new("CheckBoxCheckAreaPadding");
-				}
+				[ResourceKeyDefinition(typeof(double), "CheckBoxStateCircleOpacityFocused")]
+				public static ThemeResourceKey<double> StateCircleOpacityFocused => new("CheckBoxStateCircleOpacityFocused");
 			}
 
-			public static class Styles
+			public static partial class Styles
 			{
-				[ResourceKeyDefinition(typeof(Style), "CheckBoxStyle", TargetType = typeof(CheckBox))]
-				public static StaticResourceKey<Style> Default => new("CheckBoxStyle");
-
-				[ResourceKeyDefinition(typeof(Style), "SecondaryCheckBoxStyle", TargetType = typeof(CheckBox))]
-				public static StaticResourceKey<Style> Secondary => new("SecondaryCheckBoxStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialCheckBoxStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> Default => new("MaterialCheckBoxStyle");
 			}
 		}
 	}
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/ComboBox.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/ComboBox.cs
index 04ddd31b9..9388eae85 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/ComboBox.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/ComboBox.cs
@@ -1,4 +1,7 @@
-using Microsoft.UI.Xaml;
+using System;
+using Windows.UI;
+using Microsoft.UI.Text;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
 using Uno.Extensions.Markup;
 using Uno.Extensions.Markup.Internals;
@@ -7,345 +10,259 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class ComboBox
+		public static partial class ComboBox
 		{
-			public static class Resources
+			public static partial class Resources
 			{
-				public static class Default
+				public static readonly ArrowForegroundVSG ArrowForeground = new();
+				public partial class ArrowForegroundVSG
 				{
-					public static class Foreground
-					{
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxForeground")]
-						public static ThemeResourceKey<Brush> Default => new("ComboBoxForeground");
-
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxForegroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("ComboBoxForegroundPointerOver");
-
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxForegroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("ComboBoxForegroundPressed");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxArrowForeground")]
+					public ThemeResourceKey<Brush> Default = new("ComboBoxArrowForeground");
 
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxForegroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("ComboBoxForegroundDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxArrowForegroundOpened")]
+					public ThemeResourceKey<Brush> Opened = new("ComboBoxArrowForegroundOpened");
 
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxForegroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("ComboBoxForegroundFocused");
-
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxForegroundFocusedPressed")]
-						public static ThemeResourceKey<Brush> FocusedPressed => new("ComboBoxForegroundFocusedPressed");
-					}
+					public static implicit operator ThemeResourceKey<Brush>(ArrowForegroundVSG self) => self.Default;
+				}
 
-					public static class PlaceholderForeground
-					{
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForeground")]
-						public static ThemeResourceKey<Brush> Default => new("ComboBoxPlaceHolderForeground");
+				public static readonly BackgroundVSG Background = new();
+				public partial class BackgroundVSG
+				{
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackground")]
+					public ThemeResourceKey<Brush> Default = new("ComboBoxBackground");
 
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForegroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("ComboBoxPlaceHolderForegroundPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackgroundDisabled")]
+					public ThemeResourceKey<Brush> Disabled = new("ComboBoxBackgroundDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForegroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("ComboBoxPlaceHolderForegroundPressed");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackgroundPointerOver")]
+					public ThemeResourceKey<Brush> PointerOver = new("ComboBoxBackgroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForegroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("ComboBoxPlaceHolderForegroundDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackgroundPressed")]
+					public ThemeResourceKey<Brush> Pressed = new("ComboBoxBackgroundPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForegroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("ComboBoxPlaceHolderForegroundFocused");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackgroundFocused")]
+					public ThemeResourceKey<Brush> Focused = new("ComboBoxBackgroundFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForegroundFocusedPressed")]
-						public static ThemeResourceKey<Brush> FocusedPressed => new("ComboBoxPlaceHolderForegroundFocusedPressed");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackgroundFocusedPressed")]
+					public ThemeResourceKey<Brush> FocusedPressed = new("ComboBoxBackgroundFocusedPressed");
 
-					}
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackgroundUnfocused")]
+					public ThemeResourceKey<Brush> Unfocused = new("ComboBoxBackgroundUnfocused");
 
-					public static class UpperPlaceholderForeground
-					{
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForeground")]
-						public static ThemeResourceKey<Brush> Default => new("ComboBoxUpperPlaceHolderForeground");
+					public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForegroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("ComboBoxUpperPlaceHolderForegroundPointerOver");
+				public static readonly BorderBrushVSG BorderBrush = new();
+				public partial class BorderBrushVSG
+				{
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxBorderBrush")]
+					public ThemeResourceKey<Brush> Default = new("ComboBoxBorderBrush");
 
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForegroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("ComboBoxUpperPlaceHolderForegroundPressed");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxBorderBrushDisabled")]
+					public ThemeResourceKey<Brush> Disabled = new("ComboBoxBorderBrushDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForegroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("ComboBoxUpperPlaceHolderForegroundDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxBorderBrushPointerOver")]
+					public ThemeResourceKey<Brush> PointerOver = new("ComboBoxBorderBrushPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForegroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("ComboBoxUpperPlaceHolderForegroundFocused");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxBorderBrushPressed")]
+					public ThemeResourceKey<Brush> Pressed = new("ComboBoxBorderBrushPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForegroundFocusedPressed")]
-						public static ThemeResourceKey<Brush> FocusedPressed => new("ComboBoxUpperPlaceHolderForegroundFocusedPressed");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxBorderBrushOpened")]
+					public ThemeResourceKey<Brush> Focused = new("ComboBoxBorderBrushOpened");
 
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForegroundOpened")]
-						public static ThemeResourceKey<Brush> Opened => new("ComboBoxUpperPlaceHolderForegroundOpened");
-					}
+					public static implicit operator ThemeResourceKey<Brush>(BorderBrushVSG self) => self.Default;
+				}
 
-					public static class LeadingIcon
-					{
-						public static class Foreground
-						{
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxLeadingIconForeground")]
-							public static ThemeResourceKey<Brush> Default => new("ComboBoxLeadingIconForeground");
+				public static readonly BorderThicknessVSG BorderThickness = new();
+				public partial class BorderThicknessVSG
+				{
+					[ResourceKeyDefinition(typeof(Thickness), "ComboBoxBorderThickness")]
+					public ThemeResourceKey<Thickness> Default = new("ComboBoxBorderThickness");
 
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxLeadingIconForegroundDisabled")]
-							public static ThemeResourceKey<Brush> Disabled => new("ComboBoxLeadingIconForegroundDisabled");
-						}
+					[ResourceKeyDefinition(typeof(Thickness), "ComboBoxOpenedBorderThickness")]
+					public ThemeResourceKey<Thickness> Focused = new("ComboBoxOpenedBorderThickness");
 
-						[ResourceKeyDefinition(typeof(double), "ComboBoxLeadingIconWidth")]
-						public static ThemeResourceKey<double> Width => new("ComboBoxLeadingIconWidth");
+					public static implicit operator ThemeResourceKey<Thickness>(BorderThicknessVSG self) => self.Default;
+				}
 
-						[ResourceKeyDefinition(typeof(Thickness), "ComboBoxLeadingIconMargin")]
-						public static ThemeResourceKey<Thickness> Margin => new("ComboBoxLeadingIconMargin");
-					}
+				public static partial class DownGlyph
+				{
+					[ResourceKeyDefinition(typeof(double), "ComboBoxDownGlyphHeight")]
+					public static ThemeResourceKey<double> Height => new("ComboBoxDownGlyphHeight");
 
-					public static class ArrowForeground
-					{
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxArrowForeground")]
-						public static ThemeResourceKey<Brush> Default => new("ComboBoxArrowForeground");
+					[ResourceKeyDefinition(typeof(Thickness), "ComboBoxDownGlyphMargin")]
+					public static ThemeResourceKey<Thickness> Margin => new("ComboBoxDownGlyphMargin");
 
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxArrowForegroundOpened")]
-						public static ThemeResourceKey<Brush> Opened => new("ComboBoxArrowForegroundOpened");
-					}
+					[ResourceKeyDefinition(typeof(double), "ComboBoxDownGlyphWidth")]
+					public static ThemeResourceKey<double> Width => new("ComboBoxDownGlyphWidth");
+				}
 
-					public static class Background
+				public static partial class DropDown
+				{
+					public static readonly BackgroundVSG Background = new();
+					public partial class BackgroundVSG
 					{
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackground")]
-						public static ThemeResourceKey<Brush> Default => new("ComboBoxBackground");
-
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackgroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("ComboBoxBackgroundPointerOver");
-
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackgroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("ComboBoxBackgroundPressed");
+						[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackground")]
+						public ThemeResourceKey<Brush> Default = new("ComboBoxDropDownBackground");
 
 						[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackgroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("ComboBoxBackgroundDisabled");
+						public ThemeResourceKey<Brush> Disabled = new("ComboBoxBackgroundDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackgroundUnfocused")]
-						public static ThemeResourceKey<Brush> Unfocused => new("ComboBoxBackgroundUnfocused");
-
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackgroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("ComboBoxBackgroundFocused");
-
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackgroundFocusedPressed")]
-						public static ThemeResourceKey<Brush> FocusedPressed => new("ComboBoxBackgroundFocusedPressed");
-					}
+						[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackgroundPointerOver")]
+						public ThemeResourceKey<Brush> PointerOver = new("ComboBoxDropDownBackgroundPointerOver");
 
-					public static class BorderBrush
-					{
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxBorderBrush")]
-						public static ThemeResourceKey<Brush> Default => new("ComboBoxBorderBrush");
+						[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackgroundPressed")]
+						public ThemeResourceKey<Brush> Pressed = new("ComboBoxDropDownBackgroundPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxBorderBrushPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("ComboBoxBorderBrushPressed");
+						[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackgroundFocused")]
+						public ThemeResourceKey<Brush> Focused = new("ComboBoxDropDownBackgroundFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxBorderBrushPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("ComboBoxBorderBrushPointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackgroundFocusedPressed")]
+						public ThemeResourceKey<Brush> FocusedPressed = new("ComboBoxDropDownBackgroundFocusedPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxBorderBrushDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("ComboBoxBorderBrushDisabled");
+						[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackgroundUnfocused")]
+						public ThemeResourceKey<Brush> Unfocused = new("ComboBoxBackgroundUnfocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxBorderBrushOpened")]
-						public static ThemeResourceKey<Brush> Opened => new("ComboBoxBorderBrushOpened");
+						public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
 					}
 
-					public static class Item
-					{
-						public static class Foreground
-						{
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxItemForeground")]
-							public static ThemeResourceKey<Brush> Default => new("ComboBoxItemForeground");
-
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxItemForegroundPressed")]
-							public static ThemeResourceKey<Brush> Pressed => new("ComboBoxItemForegroundPressed");
-
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxItemForegroundPointerOver")]
-							public static ThemeResourceKey<Brush> PointerOver => new("ComboBoxItemForegroundPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBorderBrush")]
+					public static ThemeResourceKey<Brush> BorderBrush => new("ComboBoxDropDownBorderBrush");
 
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxItemForegroundDisabled")]
-							public static ThemeResourceKey<Brush> Disabled => new("ComboBoxItemForegroundDisabled");
-
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxItemForegroundSelected")]
-							public static ThemeResourceKey<Brush> Selected => new("ComboBoxItemForegroundSelected");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownForeground")]
+					public static ThemeResourceKey<Brush> Foreground => new("ComboBoxDropDownForeground");
+				}
 
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxItemForegroundSelectedUnfocused")]
-							public static ThemeResourceKey<Brush> SelectedUnfocused => new("ComboBoxItemForegroundSelectedUnfocused");
+				public static readonly ForegroundVSG Foreground = new();
+				public partial class ForegroundVSG
+				{
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxForeground")]
+					public ThemeResourceKey<Brush> Default = new("ComboBoxForeground");
 
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxItemForegroundSelectedPressed")]
-							public static ThemeResourceKey<Brush> SelectedPressed => new("ComboBoxItemForegroundSelectedPressed");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxForegroundDisabled")]
+					public ThemeResourceKey<Brush> Disabled = new("ComboBoxForegroundDisabled");
 
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxItemForegroundSelectedPointerOver")]
-							public static ThemeResourceKey<Brush> SelectedPointerOver => new("ComboBoxItemForegroundSelectedPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxForegroundPointerOver")]
+					public ThemeResourceKey<Brush> PointerOver = new("ComboBoxForegroundPointerOver");
 
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxItemForegroundSelectedDisabled")]
-							public static ThemeResourceKey<Brush> SelectedDisabled => new("ComboBoxItemForegroundSelectedDisabled");
-						}
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxForegroundPressed")]
+					public ThemeResourceKey<Brush> Pressed = new("ComboBoxForegroundPressed");
 
-						public static class Background
-						{
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBackground")]
-							public static ThemeResourceKey<Brush> Default => new("ComboBoxItemBackground");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxForegroundFocused")]
+					public ThemeResourceKey<Brush> Focused = new("ComboBoxForegroundFocused");
 
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBackgroundPressed")]
-							public static ThemeResourceKey<Brush> Pressed => new("ComboBoxItemBackgroundPressed");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxForegroundFocusedPressed")]
+					public ThemeResourceKey<Brush> FocusedPressed = new("ComboBoxForegroundFocusedPressed");
 
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBackgroundPointerOver")]
-							public static ThemeResourceKey<Brush> PointerOver => new("ComboBoxItemBackgroundPointerOver");
+					public static implicit operator ThemeResourceKey<Brush>(ForegroundVSG self) => self.Default;
+				}
 
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBackgroundDisabled")]
-							public static ThemeResourceKey<Brush> Disabled => new("ComboBoxItemBackgroundDisabled");
+				public static partial class LeadingIcon
+				{
+					public static readonly ForegroundVSG Foreground = new();
+					public partial class ForegroundVSG
+					{
+						[ResourceKeyDefinition(typeof(Brush), "ComboBoxLeadingIconForeground")]
+						public ThemeResourceKey<Brush> Default = new("ComboBoxLeadingIconForeground");
 
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBackgroundSelected")]
-							public static ThemeResourceKey<Brush> Selected => new("ComboBoxItemBackgroundSelected");
+						[ResourceKeyDefinition(typeof(Brush), "ComboBoxLeadingIconForegroundDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("ComboBoxLeadingIconForegroundDisabled");
 
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBackgroundSelectedUnfocused")]
-							public static ThemeResourceKey<Brush> SelectedUnfocused => new("ComboBoxItemBackgroundSelectedUnfocused");
+						public static implicit operator ThemeResourceKey<Brush>(ForegroundVSG self) => self.Default;
+					}
 
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBackgroundSelectedPressed")]
-							public static ThemeResourceKey<Brush> SelectedPressed => new("ComboBoxItemBackgroundSelectedPressed");
+					[ResourceKeyDefinition(typeof(Thickness), "ComboBoxLeadingIconMargin")]
+					public static ThemeResourceKey<Thickness> Margin => new("ComboBoxLeadingIconMargin");
 
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBackgroundSelectedPointerOver")]
-							public static ThemeResourceKey<Brush> SelectedPointerOver => new("ComboBoxItemBackgroundSelectedPointerOver");
+					[ResourceKeyDefinition(typeof(double), "ComboBoxLeadingIconWidth")]
+					public static ThemeResourceKey<double> Width => new("ComboBoxLeadingIconWidth");
+				}
 
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBackgroundSelectedDisabled")]
-							public static ThemeResourceKey<Brush> SelectedDisabled => new("ComboBoxItemBackgroundSelectedDisabled");
-						}
+				public static readonly PlaceHolderForegroundVSG PlaceHolderForeground = new();
+				public partial class PlaceHolderForegroundVSG
+				{
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForeground")]
+					public ThemeResourceKey<Brush> Default = new("ComboBoxPlaceHolderForeground");
 
-						public static class BorderBrush
-						{
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBorderBrush")]
-							public static ThemeResourceKey<Brush> Default => new("ComboBoxItemBorderBrush");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForegroundDisabled")]
+					public ThemeResourceKey<Brush> Disabled = new("ComboBoxPlaceHolderForegroundDisabled");
 
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBorderBrushPressed")]
-							public static ThemeResourceKey<Brush> Pressed => new("ComboBoxItemBorderBrushPressed");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForegroundPointerOver")]
+					public ThemeResourceKey<Brush> PointerOver = new("ComboBoxPlaceHolderForegroundPointerOver");
 
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBorderBrushPointerOver")]
-							public static ThemeResourceKey<Brush> PointerOver => new("ComboBoxItemBorderBrushPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForegroundPressed")]
+					public ThemeResourceKey<Brush> Pressed = new("ComboBoxPlaceHolderForegroundPressed");
 
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBorderBrushDisabled")]
-							public static ThemeResourceKey<Brush> Disabled => new("ComboBoxItemBorderBrushDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForegroundFocused")]
+					public ThemeResourceKey<Brush> Focused = new("ComboBoxPlaceHolderForegroundFocused");
 
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBorderBrushSelected")]
-							public static ThemeResourceKey<Brush> Selected => new("ComboBoxItemBorderBrushSelected");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForegroundFocusedPressed")]
+					public ThemeResourceKey<Brush> FocusedPressed = new("ComboBoxPlaceHolderForegroundFocusedPressed");
 
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBorderBrushSelectedUnfocused")]
-							public static ThemeResourceKey<Brush> SelectedUnfocused => new("ComboBoxItemBorderBrushSelectedUnfocused");
+					public static implicit operator ThemeResourceKey<Brush>(PlaceHolderForegroundVSG self) => self.Default;
+				}
 
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBorderBrushSelectedPressed")]
-							public static ThemeResourceKey<Brush> SelectedPressed => new("ComboBoxItemBorderBrushSelectedPressed");
+				public static partial class UpGlyph
+				{
+					[ResourceKeyDefinition(typeof(double), "ComboBoxUpGlyphHeight")]
+					public static ThemeResourceKey<double> Height => new("ComboBoxUpGlyphHeight");
 
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBorderBrushSelectedPointerOver")]
-							public static ThemeResourceKey<Brush> SelectedPointerOver => new("ComboBoxItemBorderBrushSelectedPointerOver");
+					[ResourceKeyDefinition(typeof(Thickness), "ComboBoxUpGlyphMargin")]
+					public static ThemeResourceKey<Thickness> Margin => new("ComboBoxUpGlyphMargin");
 
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBorderBrushSelectedDisabled")]
-							public static ThemeResourceKey<Brush> SelectedDisabled => new("ComboBoxItemBorderBrushSelectedDisabled");
-						}
+					[ResourceKeyDefinition(typeof(double), "ComboBoxUpGlyphWidth")]
+					public static ThemeResourceKey<double> Width => new("ComboBoxUpGlyphWidth");
+				}
 
-						public static class PillFill
-						{
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxItemPillFillBrush")]
-							public static ThemeResourceKey<Brush> Default => new("ComboBoxItemPillFillBrush");
-						}
-					}
+				public static readonly UpperPlaceHolderForegroundVSG UpperPlaceHolderForeground = new();
+				public partial class UpperPlaceHolderForegroundVSG
+				{
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForeground")]
+					public ThemeResourceKey<Brush> Default = new("ComboBoxUpperPlaceHolderForeground");
 
-					public static class DropDown
-					{
-						public static class Foreground
-						{
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownForeground")]
-							public static ThemeResourceKey<Brush> Default => new("ComboBoxDropDownForeground");
-						}
-
-						public static class GlyphForeground
-						{
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownGlyphForeground")]
-							public static ThemeResourceKey<Brush> Default => new("ComboBoxDropDownGlyphForeground");
-
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownGlyphForegroundFocusedPressed")]
-							public static ThemeResourceKey<Brush> FocusedPressed => new("ComboBoxDropDownGlyphForegroundFocusedPressed");
-
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownGlyphForegroundFocused")]
-							public static ThemeResourceKey<Brush> Focused => new("ComboBoxDropDownGlyphForegroundFocused");
-
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownGlyphForegroundDisabled")]
-							public static ThemeResourceKey<Brush> Disabled => new("ComboBoxDropDownGlyphForegroundDisabled");
-						}
-
-						public static class EditableGlyphForeground
-						{
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxEditableDropDownGlyphForeground")]
-							public static ThemeResourceKey<Brush> Default => new("ComboBoxEditableDropDownGlyphForeground");
-						}
-						public static class BorderBrush
-						{
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBorderBrush")]
-							public static ThemeResourceKey<Brush> Default => new("ComboBoxDropDownBorderBrush");
-						}
-
-						public static class Background
-						{
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackground")]
-							public static ThemeResourceKey<Brush> Default => new("ComboBoxDropDownBackground");
-
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackgroundPointerOver")]
-							public static ThemeResourceKey<Brush> PointerOver => new("ComboBoxDropDownBackgroundPointerOver");
-
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackgroundPointerPressed")]
-							public static ThemeResourceKey<Brush> PointerPressed => new("ComboBoxDropDownBackgroundPointerPressed");
-
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackgroundPressed")]
-							public static ThemeResourceKey<Brush> Pressed => new("ComboBoxDropDownBackgroundPressed");
-
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackgroundFocused")]
-							public static ThemeResourceKey<Brush> Focused => new("ComboBoxDropDownBackgroundFocused");
-
-							[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackgroundFocusedPressed")]
-							public static ThemeResourceKey<Brush> FocusedPressed => new("ComboBoxDropDownBackgroundFocusedPressed");
-						}
-					}
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForegroundDisabled")]
+					public ThemeResourceKey<Brush> Disabled = new("ComboBoxUpperPlaceHolderForegroundDisabled");
 
-					[ResourceKeyDefinition(typeof(CornerRadius), "ComboBoxCornerRadius")]
-					public static ThemeResourceKey<CornerRadius> CornerRadius => new("ComboBoxCornerRadius");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForegroundPointerOver")]
+					public ThemeResourceKey<Brush> PointerOver = new("ComboBoxUpperPlaceHolderForegroundPointerOver");
 
-					[ResourceKeyDefinition(typeof(double), "ComboBoxHeight")]
-					public static ThemeResourceKey<double> Height => new("ComboBoxHeight");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForegroundPressed")]
+					public ThemeResourceKey<Brush> Pressed = new("ComboBoxUpperPlaceHolderForegroundPressed");
 
-					[ResourceKeyDefinition(typeof(double), "ComboBoxMinHeight")]
-					public static ThemeResourceKey<double> MinHeight => new("ComboBoxMinHeight");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForegroundFocused")]
+					public ThemeResourceKey<Brush> Focused = new("ComboBoxUpperPlaceHolderForegroundFocused");
 
-					[ResourceKeyDefinition(typeof(double), "ComboBoxDownGlyphWidth")]
-					public static ThemeResourceKey<double> DownGlyphWidth => new("ComboBoxDownGlyphWidth");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForegroundFocusedPressed")]
+					public ThemeResourceKey<Brush> FocusedPressed = new("ComboBoxUpperPlaceHolderForegroundFocusedPressed");
 
-					[ResourceKeyDefinition(typeof(double), "ComboBoxUpGlyphWidth")]
-					public static ThemeResourceKey<double> UpGlyphWidth => new("ComboBoxUpGlyphWidth");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForegroundOpened")]
+					public ThemeResourceKey<Brush> Opened = new("ComboBoxUpperPlaceHolderForegroundOpened");
 
-					[ResourceKeyDefinition(typeof(double), "ComboBoxDownGlyphHeight")]
-					public static ThemeResourceKey<double> DownGlyphHeight => new("ComboBoxDownGlyphHeight");
+					public static implicit operator ThemeResourceKey<Brush>(UpperPlaceHolderForegroundVSG self) => self.Default;
+				}
 
-					[ResourceKeyDefinition(typeof(double), "ComboBoxUpGlyphHeight")]
-					public static ThemeResourceKey<double> UpGlyphHeight => new("ComboBoxUpGlyphHeight");
+				[ResourceKeyDefinition(typeof(CornerRadius), "ComboBoxCornerRadius")]
+				public static ThemeResourceKey<CornerRadius> CornerRadius => new("ComboBoxCornerRadius");
 
-					[ResourceKeyDefinition(typeof(Thickness), "ComboBoxDownGlyphMargin")]
-					public static ThemeResourceKey<Thickness> DownGlyphMargin => new("ComboBoxDownGlyphMargin");
+				[ResourceKeyDefinition(typeof(string), "ComboBoxDownArrowPathData")]
+				public static StaticResourceKey<string> DownArrowPathData => new("ComboBoxDownArrowPathData");
 
-					[ResourceKeyDefinition(typeof(Thickness), "ComboBoxUpGlyphMargin")]
-					public static ThemeResourceKey<Thickness> UpGlyphMargin => new("ComboBoxUpGlyphMargin");
 
-					[ResourceKeyDefinition(typeof(Thickness), "ComboBoxBorderThickness")]
-					public static ThemeResourceKey<Thickness> BorderThickness => new("ComboBoxBorderThickness");
+				[ResourceKeyDefinition(typeof(double), "ComboBoxMinHeight")]
+				public static ThemeResourceKey<double> MinHeight => new("ComboBoxMinHeight");
 
-					[ResourceKeyDefinition(typeof(Thickness), "ComboBoxOpenedBorderThickness")]
-					public static ThemeResourceKey<Thickness> OpenedBorderThickness => new("ComboBoxOpenedBorderThickness");
+				[ResourceKeyDefinition(typeof(Thickness), "ComboBoxPadding")]
+				public static ThemeResourceKey<Thickness> Padding => new("ComboBoxPadding");
 
-					[ResourceKeyDefinition(typeof(Thickness), "ComboBoxPadding")]
-					public static ThemeResourceKey<Thickness> Padding => new("ComboBoxPadding");
-				}
+				[ResourceKeyDefinition(typeof(string), "ComboBoxUpArrowPathData")]
+				public static StaticResourceKey<string> UpArrowPathData => new("ComboBoxUpArrowPathData");
 			}
 
-			public static class Styles
+			public static partial class Styles
 			{
-				[ResourceKeyDefinition(typeof(Style), "ComboBoxStyle", TargetType = typeof(ComboBox))]
-				public static StaticResourceKey<Style> Default => new("ComboBoxStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialComboBoxStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> Default => new("MaterialComboBoxStyle");
 			}
 		}
 	}
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/CommandBar.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/CommandBar.cs
new file mode 100644
index 000000000..0c2200ec3
--- /dev/null
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/CommandBar.cs
@@ -0,0 +1,31 @@
+using System;
+using Windows.UI;
+using Microsoft.UI.Text;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Media;
+using Uno.Extensions.Markup;
+using Uno.Extensions.Markup.Internals;
+
+namespace Uno.Themes.Markup
+{
+	public static partial class Theme
+	{
+		public static partial class CommandBar
+		{
+			public static partial class Resources
+			{
+				[ResourceKeyDefinition(typeof(double), "MaterialCommandBarElevation")]
+				public static StaticResourceKey<double> CommandBarElevation => new("MaterialCommandBarElevation");
+
+				[ResourceKeyDefinition(typeof(double), "MaterialCommandBarHeight")]
+				public static StaticResourceKey<double> CommandBarHeight => new("MaterialCommandBarHeight");
+			}
+
+			public static partial class Styles
+			{
+				[ResourceKeyDefinition(typeof(Style), "MaterialCommandBarStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> Default => new("MaterialCommandBarStyle");
+			}
+		}
+	}
+}
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/ContentDialog.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/ContentDialog.cs
new file mode 100644
index 000000000..4de907d65
--- /dev/null
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/ContentDialog.cs
@@ -0,0 +1,66 @@
+using System;
+using Windows.UI;
+using Microsoft.UI.Text;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Media;
+using Uno.Extensions.Markup;
+using Uno.Extensions.Markup.Internals;
+
+namespace Uno.Themes.Markup
+{
+	public static partial class Theme
+	{
+		public static partial class ContentDialog
+		{
+			public static partial class Resources
+			{
+				[ResourceKeyDefinition(typeof(Brush), "MaterialContentDialogBackground")]
+				public static StaticResourceKey<Brush> Background => new("MaterialContentDialogBackground");
+
+
+				[ResourceKeyDefinition(typeof(Thickness), "MaterialContentDialogCommandSpaceToContentMargin")]
+				public static StaticResourceKey<Thickness> CommandSpaceToContentMargin => new("MaterialContentDialogCommandSpaceToContentMargin");
+
+				[ResourceKeyDefinition(typeof(Brush), "MaterialContentDialogContentForeground")]
+				public static StaticResourceKey<Brush> ContentForeground => new("MaterialContentDialogContentForeground");
+
+				[ResourceKeyDefinition(typeof(CornerRadius), "MaterialContentDialogCornerRadius")]
+				public static StaticResourceKey<CornerRadius> CornerRadius => new("MaterialContentDialogCornerRadius");
+
+
+				[ResourceKeyDefinition(typeof(Thickness), "MaterialContentDialogEdgeMargin")]
+				public static StaticResourceKey<Thickness> EdgeMargin => new("MaterialContentDialogEdgeMargin");
+
+				[ResourceKeyDefinition(typeof(double), "MaterialContentDialogMaxHeight")]
+				public static StaticResourceKey<double> MaxHeight => new("MaterialContentDialogMaxHeight");
+
+				[ResourceKeyDefinition(typeof(double), "MaterialContentDialogMaxWidth")]
+				public static StaticResourceKey<double> MaxWidth => new("MaterialContentDialogMaxWidth");
+
+				[ResourceKeyDefinition(typeof(double), "MaterialContentDialogMinHeight")]
+				public static StaticResourceKey<double> MinHeight => new("MaterialContentDialogMinHeight");
+
+				[ResourceKeyDefinition(typeof(double), "MaterialContentDialogMinWidth")]
+				public static StaticResourceKey<double> MinWidth => new("MaterialContentDialogMinWidth");
+
+				[ResourceKeyDefinition(typeof(Thickness), "MaterialContentDialogPanelPadding")]
+				public static StaticResourceKey<Thickness> PanelPadding => new("MaterialContentDialogPanelPadding");
+
+				[ResourceKeyDefinition(typeof(Brush), "MaterialContentDialogSmokeLayerBackground")]
+				public static StaticResourceKey<Brush> SmokeLayerBackground => new("MaterialContentDialogSmokeLayerBackground");
+
+				[ResourceKeyDefinition(typeof(Brush), "MaterialContentDialogTitleForeground")]
+				public static StaticResourceKey<Brush> TitleForeground => new("MaterialContentDialogTitleForeground");
+
+				[ResourceKeyDefinition(typeof(Thickness), "MaterialContentDialogTitleToContentMargin")]
+				public static StaticResourceKey<Thickness> TitleToContentMargin => new("MaterialContentDialogTitleToContentMargin");
+			}
+
+			public static partial class Styles
+			{
+				[ResourceKeyDefinition(typeof(Style), "MaterialContentDialogStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> Default => new("MaterialContentDialogStyle");
+			}
+		}
+	}
+}
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/DatePicker.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/DatePicker.cs
index 3c3add7b8..863f3740b 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/DatePicker.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/DatePicker.cs
@@ -1,4 +1,6 @@
-using System;
+using System;
+using Windows.UI;
+using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
 using Uno.Extensions.Markup;
@@ -8,192 +10,115 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class DatePicker
+		public static partial class DatePicker
 		{
-			public static class Resources
+			public static partial class Resources
 			{
-				public static class Flyout
+				public static partial class Button
 				{
-					public static class Background
-					{
-						[ResourceKeyDefinition(typeof(Brush), "DatePickerFlyoutPresenterBackground")]
-						public static ThemeResourceKey<Brush> Default => new("DatePickerFlyoutPresenterBackground");
-					}
-
-					public static class BorderBrush
-					{
-						[ResourceKeyDefinition(typeof(Brush), "DatePickerFlyoutPresenterBorderBrush")]
-						public static ThemeResourceKey<Brush> Default => new("DatePickerFlyoutPresenterBorderBrush");
-					}
-
-					public static class SpacerFill
-					{
-						[ResourceKeyDefinition(typeof(Brush), "DatePickerFlyoutPresenterSpacerFill")]
-						public static ThemeResourceKey<Brush> Default => new("DatePickerFlyoutPresenterSpacerFill");
-					}
-
-					public static class HighlightFill
-					{
-						[ResourceKeyDefinition(typeof(Brush), "DatePickerFlyoutPresenterHighlightFill")]
-						public static ThemeResourceKey<Brush> Default => new("DatePickerFlyoutPresenterHighlightFill");
-					}
-
-					public static class Typography
-					{
-						[ResourceKeyDefinition(typeof(FontFamily), "DatePickerFlyoutPresenterFontFamily")]
-						public static ThemeResourceKey<FontFamily> FontFamily => new("DatePickerFlyoutPresenterFontFamily");
-
-						[ResourceKeyDefinition(typeof(double), "DatePickerFlyoutPresenterFontSize")]
-						public static ThemeResourceKey<double> FontSize => new("DatePickerFlyoutPresenterFontSize");
-					}
-
-					public static class Button
-					{
-						public static class Background
-						{
-							[ResourceKeyDefinition(typeof(Brush), "DatePickerFlyoutButtonBackground")]
-							public static ThemeResourceKey<Brush> Default => new("DatePickerFlyoutButtonBackground");
-						}
-
-						public static class Opacity
-						{
-							[ResourceKeyDefinition(typeof(double), "DatePickerFlyoutButtonOpacityPressed")]
-							public static ThemeResourceKey<double> Pressed => new("DatePickerFlyoutButtonOpacityPressed");
-
-							[ResourceKeyDefinition(typeof(double), "DatePickerFlyoutButtonOpacityDisabled")]
-							public static ThemeResourceKey<double> Disabled => new("DatePickerFlyoutButtonOpacityDisabled");
-						}
-
-						[ResourceKeyDefinition(typeof(Thickness), "DatePickerFlyoutButtonPadding")]
-						public static ThemeResourceKey<Thickness> Padding => new("DatePickerFlyoutButtonPadding");
-					}
-
-
-
-
-					[ResourceKeyDefinition(typeof(CornerRadius), "DatePickerFlyoutPresenterCornerRadius")]
-					public static ThemeResourceKey<CornerRadius> CornerRadius => new("DatePickerFlyoutPresenterCornerRadius");
-
-					[ResourceKeyDefinition(typeof(double), "DatePickerFlyoutBorderThickness")]
-					public static ThemeResourceKey<double> BorderThickness => new("DatePickerFlyoutBorderThickness");
-
-					[ResourceKeyDefinition(typeof(double), "DatePickerFlyoutElevation")]
-					public static ThemeResourceKey<double> Elevation => new("DatePickerFlyoutElevation");
-
-					[ResourceKeyDefinition(typeof(double), "DatePickerFlyoutPresenterWidth")]
-					public static ThemeResourceKey<double> Width => new("DatePickerFlyoutPresenterWidth");
-
-					[ResourceKeyDefinition(typeof(double), "DatePickerFlyoutPresenterMinWidth")]
-					public static ThemeResourceKey<double> MinWidth => new("DatePickerFlyoutPresenterMinWidth");
-
-					[ResourceKeyDefinition(typeof(double), "DatePickerFlyoutPresenterMaxHeight")]
-					public static ThemeResourceKey<double> MaxHeight => new("DatePickerFlyoutPresenterMaxHeight");
-
-					[ResourceKeyDefinition(typeof(double), "DatePickerFlyoutPresenterAcceptDismissHostGridHeight")]
-					public static ThemeResourceKey<double> AcceptDismissHostGridHeight => new("DatePickerFlyoutPresenterAcceptDismissHostGridHeight");
-
-					[ResourceKeyDefinition(typeof(double), "DatePickerFlyoutPresenterHighlightHeight")]
-					public static ThemeResourceKey<double> HighlightHeight => new("DatePickerFlyoutPresenterHighlightHeight");
-
-
-				}
-
-				public static class Button
-				{
-					public static class Background
+					public static readonly BackgroundVSG Background = new();
+					public partial class BackgroundVSG
 					{
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBackground")]
-						public static ThemeResourceKey<Brush> Default => new("DatePickerButtonBackground");
+						public ThemeResourceKey<Brush> Default = new("DatePickerButtonBackground");
 
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBackgroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("DatePickerButtonBackgroundPointerOver");
+						public ThemeResourceKey<Brush> PointerOver = new("DatePickerButtonBackgroundPointerOver");
 
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBackgroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("DatePickerButtonBackgroundPressed");
+						public ThemeResourceKey<Brush> Pressed = new("DatePickerButtonBackgroundPressed");
 
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBackgroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("DatePickerButtonBackgroundDisabled");
+						public ThemeResourceKey<Brush> Disabled = new("DatePickerButtonBackgroundDisabled");
+
+						public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
 					}
 
-					public static class Foreground
+					public static readonly ForegroundVSG Foreground = new();
+					public partial class ForegroundVSG
 					{
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonForeground")]
-						public static ThemeResourceKey<Brush> Default => new("DatePickerButtonForeground");
+						public ThemeResourceKey<Brush> Default = new("DatePickerButtonForeground");
 
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonForegroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("DatePickerButtonForegroundPointerOver");
+						public ThemeResourceKey<Brush> PointerOver = new("DatePickerButtonForegroundPointerOver");
 
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonForegroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("DatePickerButtonForegroundPressed");
+						public ThemeResourceKey<Brush> Pressed = new("DatePickerButtonForegroundPressed");
 
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonForegroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("DatePickerButtonForegroundDisabled");
-					}
+						public ThemeResourceKey<Brush> Disabled = new("DatePickerButtonForegroundDisabled");
 
-					public static class BorderBrush
-					{
-						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBorderBrush")]
-						public static ThemeResourceKey<Brush> Default => new("DatePickerButtonBorderBrush");
+						public static implicit operator ThemeResourceKey<Brush>(ForegroundVSG self) => self.Default;
+					}
 
-						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBorderBrushPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("DatePickerButtonBorderBrushPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBorderBrush")]
+					public static ThemeResourceKey<Brush> BorderBrush => new("DatePickerButtonBorderBrush");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBorderBrushPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("DatePickerButtonBorderBrushPressed");
+				public static partial class ButtonBorderBrush
+				{
+					[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBorderBrushPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("DatePickerButtonBorderBrushPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBorderBrushDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("DatePickerButtonBorderBrushDisabled");
-					}
+					[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBorderBrushPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("DatePickerButtonBorderBrushPressed");
 
-					public static class DateTextForeground
-					{
-						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonDateTextForeground")]
-						public static ThemeResourceKey<Brush> Default => new("DatePickerButtonDateTextForeground");
+					[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBorderBrushDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("DatePickerButtonBorderBrushDisabled");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonDateTextForegroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("DatePickerButtonDateTextForegroundPointerOver");
+				public static partial class ButtonContent
+				{
+					[ResourceKeyDefinition(typeof(double), "DatePickerButtonContentHeight")]
+					public static ThemeResourceKey<double> Height => new("DatePickerButtonContentHeight");
 
-						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonDateTextForegroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("DatePickerButtonDateTextForegroundPressed");
+					[ResourceKeyDefinition(typeof(Thickness), "DatePickerButtonContentMargin")]
+					public static ThemeResourceKey<Thickness> Margin => new("DatePickerButtonContentMargin");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonDateTextForegroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("DatePickerButtonDateTextForegroundDisabled");
-					}
+				public static readonly ButtonDateTextForegroundVSG ButtonDateTextForeground = new();
+				public partial class ButtonDateTextForegroundVSG
+				{
+					[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonDateTextForeground")]
+					public ThemeResourceKey<Brush> Default = new("DatePickerButtonDateTextForeground");
 
-					[ResourceKeyDefinition(typeof(double), "DatePickerButtonBottomBorderHeight")]
-					public static ThemeResourceKey<double> BottomBorderHeight => new("DatePickerButtonBottomBorderHeight");
+					[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonDateTextForegroundPointerOver")]
+					public ThemeResourceKey<Brush> PointerOver = new("DatePickerButtonDateTextForegroundPointerOver");
 
-					[ResourceKeyDefinition(typeof(double), "DatePickerButtonContentHeight")]
-					public static ThemeResourceKey<double> ContentHeight => new("DatePickerButtonContentHeight");
+					[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonDateTextForegroundPressed")]
+					public ThemeResourceKey<Brush> Pressed = new("DatePickerButtonDateTextForegroundPressed");
 
-					[ResourceKeyDefinition(typeof(Thickness), "DatePickerButtonHeaderMargin")]
-					public static ThemeResourceKey<Thickness> HeaderMargin => new("DatePickerButtonHeaderMargin");
+					[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonDateTextForegroundDisabled")]
+					public ThemeResourceKey<Brush> Disabled = new("DatePickerButtonDateTextForegroundDisabled");
 
-					[ResourceKeyDefinition(typeof(Thickness), "DatePickerButtonPlaceholderMargin")]
-					public static ThemeResourceKey<Thickness> PlaceholderMargin => new("DatePickerButtonPlaceholderMargin");
+					public static implicit operator ThemeResourceKey<Brush>(ButtonDateTextForegroundVSG self) => self.Default;
+				}
 
-					[ResourceKeyDefinition(typeof(Thickness), "DatePickerButtonContentMargin")]
-					public static ThemeResourceKey<Thickness> ContentMargin => new("DatePickerButtonContentMargin");
+				[ResourceKeyDefinition(typeof(double), "DatePickerButtonBottomBorderHeight")]
+				public static ThemeResourceKey<double> ButtonBottomBorderHeight => new("DatePickerButtonBottomBorderHeight");
 
-				}
+				[ResourceKeyDefinition(typeof(Thickness), "DatePickerButtonHeaderMargin")]
+				public static ThemeResourceKey<Thickness> ButtonHeaderMargin => new("DatePickerButtonHeaderMargin");
 
-				public static class PlaceholderForeground
-				{
-					[ResourceKeyDefinition(typeof(Brush), "DatePickerPlaceholderTextForeground")]
-					public static ThemeResourceKey<Brush> Default => new("DatePickerPlaceholderTextForeground");
-				}
+				[ResourceKeyDefinition(typeof(Thickness), "DatePickerButtonPlaceholderMargin")]
+				public static ThemeResourceKey<Thickness> ButtonPlaceholderMargin => new("DatePickerButtonPlaceholderMargin");
 
 				[ResourceKeyDefinition(typeof(CornerRadius), "DatePickerCornerRadius")]
 				public static ThemeResourceKey<CornerRadius> CornerRadius => new("DatePickerCornerRadius");
 
-				[ResourceKeyDefinition(typeof(Thickness), "DatePickerHostPadding")]
-				public static ThemeResourceKey<Thickness> HostPadding => new("DatePickerHostPadding");
+
+				[ResourceKeyDefinition(typeof(double), "DatePickerHeight")]
+				public static ThemeResourceKey<double> Height => new("DatePickerHeight");
+
+				[ResourceKeyDefinition(typeof(Brush), "DatePickerPlaceholderTextForeground")]
+				public static ThemeResourceKey<Brush> PlaceholderTextForeground => new("DatePickerPlaceholderTextForeground");
 			}
 
-			public static class Styles
+			public static partial class Styles
 			{
-				[ResourceKeyDefinition(typeof(Style), "DatePickerStyle", TargetType = typeof(DatePicker))]
-				public static StaticResourceKey<Style> Default => new("DatePickerStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialDatePickerStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> Default => new("MaterialDatePickerStyle");
 			}
 		}
 	}
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/FloatingActionButton.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/FloatingActionButton.cs
index cf4a531ea..18bf2ab73 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/FloatingActionButton.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/FloatingActionButton.cs
@@ -1,4 +1,7 @@
-using Microsoft.UI.Xaml;
+using System;
+using Windows.UI;
+using Microsoft.UI.Text;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
 using Uno.Extensions.Markup;
 using Uno.Extensions.Markup.Internals;
@@ -7,264 +10,435 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class FloatingActionButton
+		public static partial class Button
 		{
-			public static class Resources
+			public static partial class Resources
 			{
-				public static class Default
+				public static partial class Fab
 				{
-					public static class Foreground
+					public static readonly BackgroundVSG Background = new();
+					public partial class BackgroundVSG
 					{
-						[ResourceKeyDefinition(typeof(Brush), "FabForeground")]
-						public static ThemeResourceKey<Brush> Default => new("FabForeground");
+						[ResourceKeyDefinition(typeof(Brush), "FabBackground")]
+						public ThemeResourceKey<Brush> Default = new("FabBackground");
 
-						[ResourceKeyDefinition(typeof(Brush), "FabForegroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("FabForegroundPressed");
+						[ResourceKeyDefinition(typeof(Brush), "FabBackgroundPointerOver")]
+						public ThemeResourceKey<Brush> PointerOver = new("FabBackgroundPointerOver");
+
+						[ResourceKeyDefinition(typeof(Brush), "FabBackgroundPressed")]
+						public ThemeResourceKey<Brush> Pressed = new("FabBackgroundPressed");
+
+						[ResourceKeyDefinition(typeof(Brush), "FabBackgroundDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("FabBackgroundDisabled");
+
+						public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
+					}
+
+					public static readonly ForegroundVSG Foreground = new();
+					public partial class ForegroundVSG
+					{
+						[ResourceKeyDefinition(typeof(Brush), "FabForeground")]
+						public ThemeResourceKey<Brush> Default = new("FabForeground");
 
 						[ResourceKeyDefinition(typeof(Brush), "FabForegroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("FabForegroundPointerOver");
+						public ThemeResourceKey<Brush> PointerOver = new("FabForegroundPointerOver");
+
+						[ResourceKeyDefinition(typeof(Brush), "FabForegroundPressed")]
+						public ThemeResourceKey<Brush> Pressed = new("FabForegroundPressed");
 
 						[ResourceKeyDefinition(typeof(Brush), "FabForegroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("FabForegroundDisabled");
+						public ThemeResourceKey<Brush> Disabled = new("FabForegroundDisabled");
+
+						public static implicit operator ThemeResourceKey<Brush>(ForegroundVSG self) => self.Default;
 					}
 
-					public static class Background
+					public static partial class StateOverlayBackground
 					{
-						[ResourceKeyDefinition(typeof(Brush), "FabBackground")]
-						public static ThemeResourceKey<Brush> Default => new("FabBackground");
+						[ResourceKeyDefinition(typeof(Brush), "FabStateOverlayBackgroundPointerOver")]
+						public static ThemeResourceKey<Brush> PointerOver => new("FabStateOverlayBackgroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "FabBackgroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("FabBackgroundPressed");
+						[ResourceKeyDefinition(typeof(Brush), "FabStateOverlayBackgroundPressed")]
+						public static ThemeResourceKey<Brush> Pressed => new("FabStateOverlayBackgroundPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "FabBackgroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("FabBackgroundPointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "FabStateOverlayBackgroundDisabled")]
+						public static ThemeResourceKey<Brush> Disabled => new("FabStateOverlayBackgroundDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "FabBackgroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("FabBackgroundDisabled");
+						[ResourceKeyDefinition(typeof(Brush), "FabStateOverlayBackgroundFocused")]
+						public static ThemeResourceKey<Brush> Focused => new("FabStateOverlayBackgroundFocused");
 					}
 
-					public static class StateOverlay
+					[ResourceKeyDefinition(typeof(double), "MaterialFabContentWidthOrHeight")]
+					public static ThemeResourceKey<double> ContentWidthOrHeight => new("MaterialFabContentWidthOrHeight");
+
+					[ResourceKeyDefinition(typeof(CornerRadius), "MaterialFabCornerRadius")]
+					public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialFabCornerRadius");
+
+					[ResourceKeyDefinition(typeof(double), "MaterialFabIconTextPadding")]
+					public static ThemeResourceKey<double> IconTextPadding => new("MaterialFabIconTextPadding");
+
+					[ResourceKeyDefinition(typeof(Thickness), "MaterialFabPadding")]
+					public static ThemeResourceKey<Thickness> Padding => new("MaterialFabPadding");
+				}
+
+				public static partial class LargeFab
+				{
+					[ResourceKeyDefinition(typeof(double), "MaterialLargeFabContentWidthOrHeight")]
+					public static ThemeResourceKey<double> ContentWidthOrHeight => new("MaterialLargeFabContentWidthOrHeight");
+
+					[ResourceKeyDefinition(typeof(CornerRadius), "MaterialLargeFabCornerRadius")]
+					public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialLargeFabCornerRadius");
+
+					[ResourceKeyDefinition(typeof(Thickness), "MaterialLargeFabPadding")]
+					public static ThemeResourceKey<Thickness> Padding => new("MaterialLargeFabPadding");
+				}
+
+				public static partial class SecondaryFab
+				{
+					public static readonly BackgroundVSG Background = new();
+					public partial class BackgroundVSG
 					{
-						public static class Background
-						{
-							[ResourceKeyDefinition(typeof(Brush), "FabStateOverlayBackground")]
-							public static ThemeResourceKey<Brush> Default => new("FabStateOverlayBackground");
+						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryBackground")]
+						public ThemeResourceKey<Brush> Default = new("FabSecondaryBackground");
 
-							[ResourceKeyDefinition(typeof(Brush), "FabStateOverlayBackgroundPressed")]
-							public static ThemeResourceKey<Brush> Pressed => new("FabStateOverlayBackgroundPressed");
+						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryBackgroundPointerOver")]
+						public ThemeResourceKey<Brush> PointerOver = new("FabSecondaryBackgroundPointerOver");
 
-							[ResourceKeyDefinition(typeof(Brush), "FabStateOverlayBackgroundPointerOver")]
-							public static ThemeResourceKey<Brush> PointerOver => new("FabStateOverlayBackgroundPointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryBackgroundPressed")]
+						public ThemeResourceKey<Brush> Pressed = new("FabSecondaryBackgroundPressed");
 
-							[ResourceKeyDefinition(typeof(Brush), "FabStateOverlayBackgroundFocused")]
-							public static ThemeResourceKey<Brush> Focused => new("FabStateOverlayBackgroundFocused");
+						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryBackgroundDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("FabSecondaryBackgroundDisabled");
 
-							[ResourceKeyDefinition(typeof(Brush), "FabStateOverlayBackgroundDisabled")]
-							public static ThemeResourceKey<Brush> Disabled => new("FabStateOverlayBackgroundDisabled");
-						}
+						public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
 					}
+
+					public static partial class Fab
+					{
+						[ResourceKeyDefinition(typeof(CornerRadius), "MaterialFabCornerRadius")]
+						public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialFabCornerRadius");
+
+						[ResourceKeyDefinition(typeof(Thickness), "MaterialFabPadding")]
+						public static ThemeResourceKey<Thickness> Padding => new("MaterialFabPadding");
+					}
+
+					public static readonly ForegroundVSG Foreground = new();
+					public partial class ForegroundVSG
+					{
+						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryForeground")]
+						public ThemeResourceKey<Brush> Default = new("FabSecondaryForeground");
+
+						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryForegroundPointerOver")]
+						public ThemeResourceKey<Brush> PointerOver = new("FabSecondaryForegroundPointerOver");
+
+						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryForegroundPressed")]
+						public ThemeResourceKey<Brush> Pressed = new("FabSecondaryForegroundPressed");
+
+						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryForegroundDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("FabSecondaryForegroundDisabled");
+
+						public static implicit operator ThemeResourceKey<Brush>(ForegroundVSG self) => self.Default;
+					}
+
+					public static partial class StateOverlayBackground
+					{
+						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryStateOverlayBackgroundPointerOver")]
+						public static ThemeResourceKey<Brush> PointerOver => new("FabSecondaryStateOverlayBackgroundPointerOver");
+
+						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryStateOverlayBackgroundPressed")]
+						public static ThemeResourceKey<Brush> Pressed => new("FabSecondaryStateOverlayBackgroundPressed");
+
+						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryStateOverlayBackgroundDisabled")]
+						public static ThemeResourceKey<Brush> Disabled => new("FabSecondaryStateOverlayBackgroundDisabled");
+
+						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryStateOverlayBackgroundFocused")]
+						public static ThemeResourceKey<Brush> Focused => new("FabSecondaryStateOverlayBackgroundFocused");
+					}
+
+					[ResourceKeyDefinition(typeof(double), "MaterialFabContentWidthOrHeight")]
+					public static ThemeResourceKey<double> FabContentWidthOrHeight => new("MaterialFabContentWidthOrHeight");
+
+					[ResourceKeyDefinition(typeof(double), "MaterialFabIconTextPadding")]
+					public static ThemeResourceKey<double> FabIconTextPadding => new("MaterialFabIconTextPadding");
 				}
 
-				public static class Surface
+				public static partial class SecondaryLargeFab
 				{
-					public static class Foreground
+					public static partial class LargeFab
 					{
-						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceForeground")]
-						public static ThemeResourceKey<Brush> Default => new("FabSurfaceForeground");
+						[ResourceKeyDefinition(typeof(CornerRadius), "MaterialLargeFabCornerRadius")]
+						public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialLargeFabCornerRadius");
 
-						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceForegroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("FabSurfaceForegroundPressed");
+						[ResourceKeyDefinition(typeof(Thickness), "MaterialLargeFabPadding")]
+						public static ThemeResourceKey<Thickness> Padding => new("MaterialLargeFabPadding");
+					}
 
-						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceForegroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("FabSurfaceForegroundPointerOver");
+					[ResourceKeyDefinition(typeof(double), "MaterialLargeFabContentWidthOrHeight")]
+					public static ThemeResourceKey<double> LargeFabContentWidthOrHeight => new("MaterialLargeFabContentWidthOrHeight");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceForegroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("FabSurfaceForegroundDisabled");
+				public static partial class SecondarySmallFab
+				{
+					public static partial class SmallFab
+					{
+						[ResourceKeyDefinition(typeof(CornerRadius), "MaterialSmallFabCornerRadius")]
+						public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialSmallFabCornerRadius");
+
+						[ResourceKeyDefinition(typeof(Thickness), "MaterialSmallFabPadding")]
+						public static ThemeResourceKey<Thickness> Padding => new("MaterialSmallFabPadding");
 					}
 
-					public static class Background
+					[ResourceKeyDefinition(typeof(double), "MaterialSmallFabContentWidthOrHeight")]
+					public static ThemeResourceKey<double> SmallFabContentWidthOrHeight => new("MaterialSmallFabContentWidthOrHeight");
+				}
+
+				public static partial class SmallFab
+				{
+					[ResourceKeyDefinition(typeof(double), "MaterialSmallFabContentWidthOrHeight")]
+					public static ThemeResourceKey<double> ContentWidthOrHeight => new("MaterialSmallFabContentWidthOrHeight");
+
+					[ResourceKeyDefinition(typeof(CornerRadius), "MaterialSmallFabCornerRadius")]
+					public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialSmallFabCornerRadius");
+
+					[ResourceKeyDefinition(typeof(Thickness), "MaterialSmallFabPadding")]
+					public static ThemeResourceKey<Thickness> Padding => new("MaterialSmallFabPadding");
+				}
+
+				public static partial class SurfaceFab
+				{
+					public static readonly BackgroundVSG Background = new();
+					public partial class BackgroundVSG
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceBackground")]
-						public static ThemeResourceKey<Brush> Default => new("FabSurfaceBackground");
-
-						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceBackgroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("FabSurfaceBackgroundPressed");
+						public ThemeResourceKey<Brush> Default = new("FabSurfaceBackground");
 
 						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceBackgroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("FabSurfaceBackgroundPointerOver");
+						public ThemeResourceKey<Brush> PointerOver = new("FabSurfaceBackgroundPointerOver");
+
+						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceBackgroundPressed")]
+						public ThemeResourceKey<Brush> Pressed = new("FabSurfaceBackgroundPressed");
 
 						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceBackgroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("FabSurfaceBackgroundDisabled");
+						public ThemeResourceKey<Brush> Disabled = new("FabSurfaceBackgroundDisabled");
+
+						public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
 					}
-				}
 
-				public static class StateOverlay
-				{
-					public static class Background
+					public static partial class Fab
 					{
-						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceStateOverlayBackground")]
-						public static ThemeResourceKey<Brush> Default => new("FabSurfaceStateOverlayBackground");
+						[ResourceKeyDefinition(typeof(CornerRadius), "MaterialFabCornerRadius")]
+						public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialFabCornerRadius");
 
-						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceStateOverlayBackgroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("FabSurfaceStateOverlayBackgroundPressed");
+						[ResourceKeyDefinition(typeof(Thickness), "MaterialFabPadding")]
+						public static ThemeResourceKey<Thickness> Padding => new("MaterialFabPadding");
+					}
+
+					public static readonly ForegroundVSG Foreground = new();
+					public partial class ForegroundVSG
+					{
+						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceForeground")]
+						public ThemeResourceKey<Brush> Default = new("FabSurfaceForeground");
+
+						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceForegroundPointerOver")]
+						public ThemeResourceKey<Brush> PointerOver = new("FabSurfaceForegroundPointerOver");
+
+						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceForegroundPressed")]
+						public ThemeResourceKey<Brush> Pressed = new("FabSurfaceForegroundPressed");
+
+						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceForegroundDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("FabSurfaceForegroundDisabled");
 
+						public static implicit operator ThemeResourceKey<Brush>(ForegroundVSG self) => self.Default;
+					}
+
+					public static partial class StateOverlayBackground
+					{
 						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceStateOverlayBackgroundPointerOver")]
 						public static ThemeResourceKey<Brush> PointerOver => new("FabSurfaceStateOverlayBackgroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceStateOverlayBackgroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("FabSurfaceStateOverlayBackgroundFocused");
+						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceStateOverlayBackgroundPressed")]
+						public static ThemeResourceKey<Brush> Pressed => new("FabSurfaceStateOverlayBackgroundPressed");
 
 						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceStateOverlayBackgroundDisabled")]
 						public static ThemeResourceKey<Brush> Disabled => new("FabSurfaceStateOverlayBackgroundDisabled");
+
+						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceStateOverlayBackgroundFocused")]
+						public static ThemeResourceKey<Brush> Focused => new("FabSurfaceStateOverlayBackgroundFocused");
 					}
+
+					[ResourceKeyDefinition(typeof(double), "MaterialFabContentWidthOrHeight")]
+					public static ThemeResourceKey<double> FabContentWidthOrHeight => new("MaterialFabContentWidthOrHeight");
+
+					[ResourceKeyDefinition(typeof(double), "MaterialFabIconTextPadding")]
+					public static ThemeResourceKey<double> FabIconTextPadding => new("MaterialFabIconTextPadding");
 				}
 
-				public static class Secondary
+				public static partial class SurfaceLargeFab
 				{
-					public static class Foreground
+					public static partial class LargeFab
 					{
-						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryForeground")]
-						public static ThemeResourceKey<Brush> Default => new("FabSecondaryForeground");
+						[ResourceKeyDefinition(typeof(CornerRadius), "MaterialLargeFabCornerRadius")]
+						public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialLargeFabCornerRadius");
 
-						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryForegroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("FabSecondaryForegroundPressed");
+						[ResourceKeyDefinition(typeof(Thickness), "MaterialLargeFabPadding")]
+						public static ThemeResourceKey<Thickness> Padding => new("MaterialLargeFabPadding");
+					}
 
-						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryForegroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("FabSecondaryForegroundPointerOver");
+					[ResourceKeyDefinition(typeof(double), "MaterialLargeFabContentWidthOrHeight")]
+					public static ThemeResourceKey<double> LargeFabContentWidthOrHeight => new("MaterialLargeFabContentWidthOrHeight");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryForegroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("FabSecondaryForegroundDisabled");
+				public static partial class SurfaceSmallFab
+				{
+					public static partial class SmallFab
+					{
+						[ResourceKeyDefinition(typeof(CornerRadius), "MaterialSmallFabCornerRadius")]
+						public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialSmallFabCornerRadius");
+
+						[ResourceKeyDefinition(typeof(Thickness), "MaterialSmallFabPadding")]
+						public static ThemeResourceKey<Thickness> Padding => new("MaterialSmallFabPadding");
 					}
 
-					public static class Background
+					[ResourceKeyDefinition(typeof(double), "MaterialSmallFabContentWidthOrHeight")]
+					public static ThemeResourceKey<double> SmallFabContentWidthOrHeight => new("MaterialSmallFabContentWidthOrHeight");
+				}
+
+				public static partial class TertiaryFab
+				{
+					public static readonly BackgroundVSG Background = new();
+					public partial class BackgroundVSG
 					{
-						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryBackground")]
-						public static ThemeResourceKey<Brush> Default => new("FabSecondaryBackground");
+						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryBackground")]
+						public ThemeResourceKey<Brush> Default = new("FabTertiaryBackground");
 
-						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryBackgroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("FabSecondaryBackgroundPressed");
+						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryBackgroundPointerOver")]
+						public ThemeResourceKey<Brush> PointerOver = new("FabTertiaryBackgroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryBackgroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("FabSecondaryBackgroundPointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryBackgroundPressed")]
+						public ThemeResourceKey<Brush> Pressed = new("FabTertiaryBackgroundPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryBackgroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("FabSecondaryBackgroundDisabled");
+						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryBackgroundDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("FabTertiaryBackgroundDisabled");
+
+						public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
 					}
 
-					public static class StateOverlay
+					public static partial class Fab
 					{
-						public static class Background
-						{
-							[ResourceKeyDefinition(typeof(Brush), "FabSecondaryStateOverlayBackground")]
-							public static ThemeResourceKey<Brush> Default => new("FabSecondaryStateOverlayBackground");
-
-							[ResourceKeyDefinition(typeof(Brush), "FabSecondaryStateOverlayBackgroundPressed")]
-							public static ThemeResourceKey<Brush> Pressed => new("FabSecondaryStateOverlayBackgroundPressed");
+						[ResourceKeyDefinition(typeof(CornerRadius), "MaterialFabCornerRadius")]
+						public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialFabCornerRadius");
 
-							[ResourceKeyDefinition(typeof(Brush), "FabSecondaryStateOverlayBackgroundPointerOver")]
-							public static ThemeResourceKey<Brush> PointerOver => new("FabSecondaryStateOverlayBackgroundPointerOver");
-
-							[ResourceKeyDefinition(typeof(Brush), "FabSecondaryStateOverlayBackgroundFocused")]
-							public static ThemeResourceKey<Brush> Focused => new("FabSecondaryStateOverlayBackgroundFocused");
-
-							[ResourceKeyDefinition(typeof(Brush), "FabSecondaryStateOverlayBackgroundDisabled")]
-							public static ThemeResourceKey<Brush> Disabled => new("FabSecondaryStateOverlayBackgroundDisabled");
-						}
+						[ResourceKeyDefinition(typeof(Thickness), "MaterialFabPadding")]
+						public static ThemeResourceKey<Thickness> Padding => new("MaterialFabPadding");
 					}
-				}
 
-				public static class Tertiary
-				{
-					public static class Foreground
+					public static readonly ForegroundVSG Foreground = new();
+					public partial class ForegroundVSG
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryForeground")]
-						public static ThemeResourceKey<Brush> Default => new("FabTertiaryForeground");
-
-						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryForegroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("FabTertiaryForegroundPressed");
+						public ThemeResourceKey<Brush> Default = new("FabTertiaryForeground");
 
 						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryForegroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("FabTertiaryForegroundPointerOver");
+						public ThemeResourceKey<Brush> PointerOver = new("FabTertiaryForegroundPointerOver");
+
+						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryForegroundPressed")]
+						public ThemeResourceKey<Brush> Pressed = new("FabTertiaryForegroundPressed");
 
 						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryForegroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("FabTertiaryForegroundDisabled");
+						public ThemeResourceKey<Brush> Disabled = new("FabTertiaryForegroundDisabled");
+
+						public static implicit operator ThemeResourceKey<Brush>(ForegroundVSG self) => self.Default;
 					}
 
-					public static class Background
+					public static partial class StateOverlayBackground
 					{
-						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryBackground")]
-						public static ThemeResourceKey<Brush> Default => new("FabTertiaryBackground");
+						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryStateOverlayBackgroundPointerOver")]
+						public static ThemeResourceKey<Brush> PointerOver => new("FabTertiaryStateOverlayBackgroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryBackgroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("FabTertiaryBackgroundPressed");
+						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryStateOverlayBackgroundPressed")]
+						public static ThemeResourceKey<Brush> Pressed => new("FabTertiaryStateOverlayBackgroundPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryBackgroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("FabTertiaryBackgroundPointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryStateOverlayBackgroundDisabled")]
+						public static ThemeResourceKey<Brush> Disabled => new("FabTertiaryStateOverlayBackgroundDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryBackgroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("FabTertiaryBackgroundDisabled");
+						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryStateOverlayBackgroundFocused")]
+						public static ThemeResourceKey<Brush> Focused => new("FabTertiaryStateOverlayBackgroundFocused");
 					}
 
-					public static class StateOverlay
+					[ResourceKeyDefinition(typeof(double), "MaterialFabContentWidthOrHeight")]
+					public static ThemeResourceKey<double> FabContentWidthOrHeight => new("MaterialFabContentWidthOrHeight");
+
+					[ResourceKeyDefinition(typeof(double), "MaterialFabIconTextPadding")]
+					public static ThemeResourceKey<double> FabIconTextPadding => new("MaterialFabIconTextPadding");
+				}
+
+				public static partial class TertiaryLargeFab
+				{
+					public static partial class LargeFab
 					{
-						public static class Background
-						{
-							[ResourceKeyDefinition(typeof(Brush), "FabTertiaryStateOverlayBackground")]
-							public static ThemeResourceKey<Brush> Default => new("FabTertiaryStateOverlayBackground");
+						[ResourceKeyDefinition(typeof(CornerRadius), "MaterialLargeFabCornerRadius")]
+						public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialLargeFabCornerRadius");
 
-							[ResourceKeyDefinition(typeof(Brush), "FabTertiaryStateOverlayBackgroundPressed")]
-							public static ThemeResourceKey<Brush> Pressed => new("FabTertiaryStateOverlayBackgroundPressed");
+						[ResourceKeyDefinition(typeof(Thickness), "MaterialLargeFabPadding")]
+						public static ThemeResourceKey<Thickness> Padding => new("MaterialLargeFabPadding");
+					}
 
-							[ResourceKeyDefinition(typeof(Brush), "FabTertiaryStateOverlayBackgroundPointerOver")]
-							public static ThemeResourceKey<Brush> PointerOver => new("FabTertiaryStateOverlayBackgroundPointerOver");
+					[ResourceKeyDefinition(typeof(double), "MaterialLargeFabContentWidthOrHeight")]
+					public static ThemeResourceKey<double> LargeFabContentWidthOrHeight => new("MaterialLargeFabContentWidthOrHeight");
+				}
 
-							[ResourceKeyDefinition(typeof(Brush), "FabTertiaryStateOverlayBackgroundFocused")]
-							public static ThemeResourceKey<Brush> Focused => new("FabTertiaryStateOverlayBackgroundFocused");
+				public static partial class TertiarySmallFab
+				{
+					public static partial class SmallFab
+					{
+						[ResourceKeyDefinition(typeof(CornerRadius), "MaterialSmallFabCornerRadius")]
+						public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialSmallFabCornerRadius");
 
-							[ResourceKeyDefinition(typeof(Brush), "FabTertiaryStateOverlayBackgroundDisabled")]
-							public static ThemeResourceKey<Brush> Disabled => new("FabTertiaryStateOverlayBackgroundDisabled");
-						}
+						[ResourceKeyDefinition(typeof(Thickness), "MaterialSmallFabPadding")]
+						public static ThemeResourceKey<Thickness> Padding => new("MaterialSmallFabPadding");
 					}
+
+					[ResourceKeyDefinition(typeof(double), "MaterialSmallFabContentWidthOrHeight")]
+					public static ThemeResourceKey<double> SmallFabContentWidthOrHeight => new("MaterialSmallFabContentWidthOrHeight");
 				}
 			}
 
-			public static class Styles
+			public static partial class Styles
 			{
-				[ResourceKeyDefinition(typeof(Style), "MaterialFabStyle", TargetType = typeof(Button))]
-				public static StaticResourceKey<Style> Default => new("MaterialFabStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialFabStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> Fab => new("MaterialFabStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialSurfaceFabStyle", TargetType = typeof(Button))]
-				public static StaticResourceKey<Style> Surface => new("MaterialSurfaceFabStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialSurfaceFabStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> SurfaceFab => new("MaterialSurfaceFabStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialSecondaryFabStyle", TargetType = typeof(Button))]
-				public static StaticResourceKey<Style> Secondary => new("MaterialSecondaryFabStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialSecondaryFabStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> SecondaryFab => new("MaterialSecondaryFabStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialTertiaryFabStyle", TargetType = typeof(Button))]
-				public static StaticResourceKey<Style> Tertiary => new("MaterialTertiaryFabStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialTertiaryFabStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> TertiaryFab => new("MaterialTertiaryFabStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialSmallFabStyle", TargetType = typeof(Button))]
-				public static StaticResourceKey<Style> Small => new("MaterialSmallFabStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialSmallFabStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> SmallFab => new("MaterialSmallFabStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialSurfaceSmallFabStyle", TargetType = typeof(Button))]
-				public static StaticResourceKey<Style> SurfaceSmall => new("MaterialSurfaceSmallFabStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialSurfaceSmallFabStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> SurfaceSmallFab => new("MaterialSurfaceSmallFabStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialSecondarySmallFabStyle", TargetType = typeof(Button))]
-				public static StaticResourceKey<Style> SecondarySmall => new("MaterialSecondarySmallFabStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialSecondarySmallFabStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> SecondarySmallFab => new("MaterialSecondarySmallFabStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialTertiarySmallFabStyle", TargetType = typeof(Button))]
-				public static StaticResourceKey<Style> TertiarySmall => new("MaterialTertiarySmallFabStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialTertiarySmallFabStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> TertiarySmallFab => new("MaterialTertiarySmallFabStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialLargeFabStyle", TargetType = typeof(Button))]
-				public static StaticResourceKey<Style> Large => new("MaterialLargeFabStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialLargeFabStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> LargeFab => new("MaterialLargeFabStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialSurfaceLargeFabStyle", TargetType = typeof(Button))]
-				public static StaticResourceKey<Style> SurfaceLarge => new("MaterialSurfaceLargeFabStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialSurfaceLargeFabStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> SurfaceLargeFab => new("MaterialSurfaceLargeFabStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialSecondaryLargeFabStyle", TargetType = typeof(Button))]
-				public static StaticResourceKey<Style> SecondaryLarge => new("MaterialSecondaryLargeFabStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialSecondaryLargeFabStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> SecondaryLargeFab => new("MaterialSecondaryLargeFabStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialTertiaryLargeFabStyle", TargetType = typeof(Button))]
-				public static StaticResourceKey<Style> TertiaryLarge => new("MaterialTertiaryLargeFabStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialTertiaryLargeFabStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> TertiaryLargeFab => new("MaterialTertiaryLargeFabStyle");
 			}
 		}
 	}
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/HyperlinkButton.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/HyperlinkButton.cs
index 087a97178..c37774c5e 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/HyperlinkButton.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/HyperlinkButton.cs
@@ -1,4 +1,7 @@
-using Microsoft.UI.Xaml;
+using System;
+using Windows.UI;
+using Microsoft.UI.Text;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
 using Uno.Extensions.Markup;
 using Uno.Extensions.Markup.Internals;
@@ -7,29 +10,14 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class HyperlinkButton
+		public static partial class HyperlinkButton
 		{
-			public static class Resources
+			public static partial class Resources
 			{
-				public static class Foreground
-				{
-					[ResourceKeyDefinition(typeof(Brush), "HyperlinkButtonForeground")]
-					public static ThemeResourceKey<Brush> Default => new("HyperlinkButtonForeground");
-
-					[ResourceKeyDefinition(typeof(Brush), "HyperlinkButtonForegroundPointerOver")]
-					public static ThemeResourceKey<Brush> PointerOver => new("HyperlinkButtonForegroundPointerOver");
-
-					[ResourceKeyDefinition(typeof(Brush), "HyperlinkButtonForegroundPressed")]
-					public static ThemeResourceKey<Brush> Pressed => new("HyperlinkButtonForegroundPressed");
-
-					[ResourceKeyDefinition(typeof(Brush), "HyperlinkButtonForegroundDisabled")]
-					public static ThemeResourceKey<Brush> Disabled => new("HyperlinkButtonForegroundDisabled");
-				}
-
-				public static class Background
+				public static partial class Background
 				{
 					[ResourceKeyDefinition(typeof(Brush), "HyperlinkButtonBackground")]
-					public static ThemeResourceKey<Brush> Default => new("HyperlinkButtonBackground");
+					public static ThemeResourceKey<Brush> Normal => new("HyperlinkButtonBackground");
 
 					[ResourceKeyDefinition(typeof(Brush), "HyperlinkButtonBackgroundPointerOver")]
 					public static ThemeResourceKey<Brush> PointerOver => new("HyperlinkButtonBackgroundPointerOver");
@@ -41,10 +29,25 @@ public static class Background
 					public static ThemeResourceKey<Brush> Disabled => new("HyperlinkButtonBackgroundDisabled");
 				}
 
-				public static class BorderBrush
+				public static partial class BackgroundOpacity
+				{
+					[ResourceKeyDefinition(typeof(double), "HyperlinkButtonBackgroundOpacity")]
+					public static ThemeResourceKey<double> Normal => new("HyperlinkButtonBackgroundOpacity");
+
+					[ResourceKeyDefinition(typeof(double), "HyperlinkButtonBackgroundOpacityPointerOver")]
+					public static ThemeResourceKey<double> PointerOver => new("HyperlinkButtonBackgroundOpacityPointerOver");
+
+					[ResourceKeyDefinition(typeof(double), "HyperlinkButtonBackgroundOpacityPressed")]
+					public static ThemeResourceKey<double> Pressed => new("HyperlinkButtonBackgroundOpacityPressed");
+
+					[ResourceKeyDefinition(typeof(double), "HyperlinkButtonBackgroundOpacityDisabled")]
+					public static ThemeResourceKey<double> Disabled => new("HyperlinkButtonBackgroundOpacityDisabled");
+				}
+
+				public static partial class BorderBrush
 				{
 					[ResourceKeyDefinition(typeof(Brush), "HyperlinkButtonBorderBrush")]
-					public static ThemeResourceKey<Brush> Default => new("HyperlinkButtonBorderBrush");
+					public static ThemeResourceKey<Brush> Normal => new("HyperlinkButtonBorderBrush");
 
 					[ResourceKeyDefinition(typeof(Brush), "HyperlinkButtonBorderBrushPointerOver")]
 					public static ThemeResourceKey<Brush> PointerOver => new("HyperlinkButtonBorderBrushPointerOver");
@@ -56,38 +59,27 @@ public static class BorderBrush
 					public static ThemeResourceKey<Brush> Disabled => new("HyperlinkButtonBorderBrushDisabled");
 				}
 
-				public static class Typography
-				{
-					[ResourceKeyDefinition(typeof(FontFamily), "HyperlinkButtonFontFamily")]
-					public static ThemeResourceKey<FontFamily> FontFamily => new("HyperlinkButtonFontFamily");
 
-					[ResourceKeyDefinition(typeof(double), "HyperlinkButtonFontSize")]
-					public static ThemeResourceKey<double> FontSize => new("HyperlinkButtonFontSize");
-				}
+				[ResourceKeyDefinition(typeof(FontFamily), "HyperlinkButtonFontFamily")]
+				public static ThemeResourceKey<FontFamily> FontFamily => new("HyperlinkButtonFontFamily");
 
-				public static class Opacity
-				{
-					[ResourceKeyDefinition(typeof(double), "HyperlinkButtonBackgroundOpacity")]
-					public static ThemeResourceKey<double> Default => new("HyperlinkButtonBackgroundOpacity");
+				[ResourceKeyDefinition(typeof(double), "HyperlinkButtonFontSize")]
+				public static ThemeResourceKey<double> FontSize => new("HyperlinkButtonFontSize");
 
-					[ResourceKeyDefinition(typeof(double), "HyperlinkButtonBackgroundOpacityPointerOver")]
-					public static ThemeResourceKey<double> PointerOver => new("HyperlinkButtonBackgroundOpacityPointerOver");
-
-					[ResourceKeyDefinition(typeof(double), "HyperlinkButtonBackgroundOpacityPressed")]
-					public static ThemeResourceKey<double> Pressed => new("HyperlinkButtonBackgroundOpacityPressed");
+				[ResourceKeyDefinition(typeof(Brush), "HyperlinkButtonForeground")]
+				public static ThemeResourceKey<Brush> Foreground => new("HyperlinkButtonForeground");
 
-					[ResourceKeyDefinition(typeof(double), "HyperlinkButtonBackgroundOpacityDisabled")]
-					public static ThemeResourceKey<double> Disabled => new("HyperlinkButtonBackgroundOpacityDisabled");
-				}
+				[ResourceKeyDefinition(typeof(Thickness), "HyperlinkButtonPadding")]
+				public static ThemeResourceKey<Thickness> Padding => new("HyperlinkButtonPadding");
 			}
 
-			public static class Styles
+			public static partial class Styles
 			{
-				[ResourceKeyDefinition(typeof(Style), "HyperlinkButtonStyle", TargetType = typeof(HyperlinkButton))]
-				public static StaticResourceKey<Style> Default => new("HyperlinkButtonStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialHyperlinkButtonStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> Default => new("MaterialHyperlinkButtonStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "SecondaryHyperlinkButtonStyle", TargetType = typeof(HyperlinkButton))]
-				public static StaticResourceKey<Style> Secondary => new("SecondaryHyperlinkButtonStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialSecondaryHyperlinkButtonStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> Secondary => new("MaterialSecondaryHyperlinkButtonStyle");
 			}
 		}
 	}
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/MediaPlayerElement.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/MediaPlayerElement.cs
new file mode 100644
index 000000000..d055b84f6
--- /dev/null
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/MediaPlayerElement.cs
@@ -0,0 +1,52 @@
+using System;
+using Windows.UI;
+using Microsoft.UI.Text;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Media;
+using Uno.Extensions.Markup;
+using Uno.Extensions.Markup.Internals;
+
+namespace Uno.Themes.Markup
+{
+	public static partial class Theme
+	{
+		public static partial class MediaTransportControls
+		{
+			public static partial class Resources
+			{
+				[ResourceKeyDefinition(typeof(Brush), "MediaTransportControlsBorderBrush")]
+				public static ThemeResourceKey<Brush> BorderBrush => new("MediaTransportControlsBorderBrush");
+
+				[ResourceKeyDefinition(typeof(double), "MediaTransportControlsBorderThickness")]
+				public static ThemeResourceKey<double> BorderThickness => new("MediaTransportControlsBorderThickness");
+
+				[ResourceKeyDefinition(typeof(Brush), "MediaTransportControlsFillTimeElapsedText")]
+				public static ThemeResourceKey<Brush> FillTimeElapsedText => new("MediaTransportControlsFillTimeElapsedText");
+
+				[ResourceKeyDefinition(typeof(Thickness), "MediaTransportControlsMargin")]
+				public static ThemeResourceKey<Thickness> Margin => new("MediaTransportControlsMargin");
+
+				[ResourceKeyDefinition(typeof(double), "MediaTransportControlsMaxWidth")]
+				public static ThemeResourceKey<double> MaxWidth => new("MediaTransportControlsMaxWidth");
+
+				[ResourceKeyDefinition(typeof(double), "MediaTransportControlsMinWidth")]
+				public static ThemeResourceKey<double> MinWidth => new("MediaTransportControlsMinWidth");
+
+				[ResourceKeyDefinition(typeof(Brush), "MediaTransportControlsPanelBackground")]
+				public static ThemeResourceKey<Brush> PanelBackground => new("MediaTransportControlsPanelBackground");
+
+				[ResourceKeyDefinition(typeof(Thickness), "MediaTransportControlsProgressSliderCompactMargin")]
+				public static ThemeResourceKey<Thickness> ProgressSliderCompactMargin => new("MediaTransportControlsProgressSliderCompactMargin");
+
+				[ResourceKeyDefinition(typeof(double), "MediaTransportControlsSliderHeight")]
+				public static ThemeResourceKey<double> SliderHeight => new("MediaTransportControlsSliderHeight");
+			}
+
+			public static partial class Styles
+			{
+				[ResourceKeyDefinition(typeof(Style), "MaterialMediaTransportControlsStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> Default => new("MaterialMediaTransportControlsStyle");
+			}
+		}
+	}
+}
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/PasswordBox.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/PasswordBox.cs
index 9c9457852..1848add95 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/PasswordBox.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/PasswordBox.cs
@@ -1,4 +1,6 @@
-using Microsoft.UI.Text;
+using System;
+using Windows.UI;
+using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
 using Uno.Extensions.Markup;
@@ -8,213 +10,279 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class PasswordBox
+		public static partial class PasswordBox
 		{
-			public static class Resources
+			public static partial class Resources
 			{
-				public static class Default
+				public static partial class Filled
 				{
-					public static class Reveal
-					{
-						public static class Glyph
-						{
-							public static class PathData
-							{
-								[ResourceKeyDefinition(typeof(Geometry), "PasswordBoxRevealGlyphPathData")]
-								public static ThemeResourceKey<Geometry> Default => new("PasswordBoxRevealGlyphPathData");
-							}
-						}
-
-						public static class Button
-						{
-							public static class Foreground
-							{
-								[ResourceKeyDefinition(typeof(Brush), "PasswordBoxRevealButtonForeground")]
-								public static ThemeResourceKey<Brush> Default => new("PasswordBoxRevealButtonForeground");
-							}
-						}
-					}
-				}
-
-				public static class Filled
-				{
-					public static class Background
+					public static readonly BackgroundVSG Background = new();
+					public partial class BackgroundVSG
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxBackground")]
-						public static ThemeResourceKey<Brush> Default => new("FilledPasswordBoxBackground");
+						public ThemeResourceKey<Brush> Default = new("FilledPasswordBoxBackground");
 
 						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxBackgroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("FilledPasswordBoxBackgroundPointerOver");
+						public ThemeResourceKey<Brush> PointerOver = new("FilledPasswordBoxBackgroundPointerOver");
+
+						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxBackgroundDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("FilledPasswordBoxBackgroundDisabled");
 
 						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxBackgroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("FilledPasswordBoxBackgroundFocused");
+						public ThemeResourceKey<Brush> Focused = new("FilledPasswordBoxBackgroundFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxBackgroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("FilledPasswordBoxBackgroundDisabled");
+						public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
 					}
 
-					public static class BorderBrush
+					public static readonly BorderBrushVSG BorderBrush = new();
+					public partial class BorderBrushVSG
 					{
-						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxBorderBrush")]
-						public static ThemeResourceKey<Brush> Default => new("FilledPasswordBoxBorderBrush");
+						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxBorderBrushFocused")]
+						public ThemeResourceKey<Brush> Default = new("FilledPasswordBoxBorderBrushFocused");
 
 						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxBorderBrushPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("FilledPasswordBoxBorderBrushPointerOver");
-
-						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxBorderBrushFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("FilledPasswordBoxBorderBrushFocused");
+						public ThemeResourceKey<Brush> PointerOver = new("FilledPasswordBoxBorderBrushPointerOver");
 
 						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxBorderBrushDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("FilledPasswordBoxBorderBrushDisabled");
+						public ThemeResourceKey<Brush> Disabled = new("FilledPasswordBoxBorderBrushDisabled");
+
+						public static implicit operator ThemeResourceKey<Brush>(BorderBrushVSG self) => self.Default;
+					}
+
+					public static partial class BorderHeight
+					{
+						[ResourceKeyDefinition(typeof(double), "FilledPasswordBoxBorderHeightPointerOver")]
+						public static ThemeResourceKey<double> PointerOver => new("FilledPasswordBoxBorderHeightPointerOver");
+
+						[ResourceKeyDefinition(typeof(double), "FilledPasswordBoxBorderHeightFocused")]
+						public static ThemeResourceKey<double> Focused => new("FilledPasswordBoxBorderHeightFocused");
 					}
 
-					public static class Foreground
+					public static readonly ForegroundVSG Foreground = new();
+					public partial class ForegroundVSG
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxForeground")]
-						public static ThemeResourceKey<Brush> Default => new("FilledPasswordBoxForeground");
+						public ThemeResourceKey<Brush> Default = new("FilledPasswordBoxForeground");
 
 						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxForegroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("FilledPasswordBoxForegroundPointerOver");
+						public ThemeResourceKey<Brush> PointerOver = new("FilledPasswordBoxForegroundPointerOver");
+
+						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxForegroundDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("FilledPasswordBoxForegroundDisabled");
 
 						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxForegroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("FilledPasswordBoxForegroundFocused");
+						public ThemeResourceKey<Brush> Focused = new("FilledPasswordBoxForegroundFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxForegroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("FilledPasswordBoxForegroundDisabled");
+						public static implicit operator ThemeResourceKey<Brush>(ForegroundVSG self) => self.Default;
 					}
 
-					public static class Placeholder
+					public static readonly LeadingIconForegroundVSG LeadingIconForeground = new();
+					public partial class LeadingIconForegroundVSG
 					{
-						public static class Foreground
-						{
-							[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxPlaceholderForeground")]
-							public static ThemeResourceKey<Brush> Default => new("FilledPasswordBoxPlaceholderForeground");
-
-							[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxPlaceholderForegroundPointerOver")]
-							public static ThemeResourceKey<Brush> PointerOver => new("FilledPasswordBoxPlaceholderForegroundPointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "PasswordBoxLeadingIconForeground")]
+						public ThemeResourceKey<Brush> Default = new("PasswordBoxLeadingIconForeground");
 
-							[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxPlaceholderForegroundFocused")]
-							public static ThemeResourceKey<Brush> Focused => new("FilledPasswordBoxPlaceholderForegroundFocused");
+						[ResourceKeyDefinition(typeof(Brush), "PasswordBoxLeadingIconForegroundDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("PasswordBoxLeadingIconForegroundDisabled");
 
-							[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxPlaceholderForegroundDisabled")]
-							public static ThemeResourceKey<Brush> Disabled => new("FilledPasswordBoxPlaceholderForegroundDisabled");
-						}
+						public static implicit operator ThemeResourceKey<Brush>(LeadingIconForegroundVSG self) => self.Default;
 					}
 
-					public static class RevealButton
+					public static readonly PlaceholderForegroundVSG PlaceholderForeground = new();
+					public partial class PlaceholderForegroundVSG
 					{
-						public static class Foreground
-						{
-							[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxRevealButtonForeground")]
-							public static ThemeResourceKey<Brush> Default => new("FilledPasswordBoxRevealButtonForeground");
-						}
-					}
+						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxPlaceholderForeground")]
+						public ThemeResourceKey<Brush> Default = new("FilledPasswordBoxPlaceholderForeground");
 
-					public static class Typography
-					{
-						[ResourceKeyDefinition(typeof(FontFamily), "FilledPasswordBoxFontFamily")]
-						public static StaticResourceKey<FontFamily> FontFamily => new("FilledPasswordBoxFontFamily");
+						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxPlaceholderForegroundPointerOver")]
+						public ThemeResourceKey<Brush> PointerOver = new("FilledPasswordBoxPlaceholderForegroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(FontWeights), "FilledPasswordBoxFontWeight")]
-						public static StaticResourceKey<FontWeights> FontWeight => new("FilledPasswordBoxFontWeight");
+						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxPlaceholderForegroundDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("FilledPasswordBoxPlaceholderForegroundDisabled");
 
-						[ResourceKeyDefinition(typeof(double), "FilledPasswordBoxFontSize")]
-						public static StaticResourceKey<double> FontSize => new("FilledPasswordBoxFontSize");
+						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxPlaceholderForegroundFocused")]
+						public ThemeResourceKey<Brush> Focused = new("FilledPasswordBoxPlaceholderForegroundFocused");
 
-						[ResourceKeyDefinition(typeof(int), "FilledPasswordBoxCharacterSpacing")]
-						public static StaticResourceKey<int> CharacterSpacing => new("FilledPasswordBoxCharacterSpacing");
+						public static implicit operator ThemeResourceKey<Brush>(PlaceholderForegroundVSG self) => self.Default;
 					}
+
+					[ResourceKeyDefinition(typeof(int), "FilledPasswordBoxCharacterSpacing")]
+					public static ThemeResourceKey<int> CharacterSpacing => new("FilledPasswordBoxCharacterSpacing");
+
+					[ResourceKeyDefinition(typeof(CornerRadius), "FilledPasswordBoxCornerRadius")]
+					public static ThemeResourceKey<CornerRadius> CornerRadius => new("FilledPasswordBoxCornerRadius");
+
+					[ResourceKeyDefinition(typeof(FontFamily), "FilledPasswordBoxFontFamily")]
+					public static ThemeResourceKey<FontFamily> FontFamily => new("FilledPasswordBoxFontFamily");
+
+					[ResourceKeyDefinition(typeof(double), "FilledPasswordBoxFontSize")]
+					public static ThemeResourceKey<double> FontSize => new("FilledPasswordBoxFontSize");
+
+					[ResourceKeyDefinition(typeof(string), "FilledPasswordBoxFontWeight")]
+					public static ThemeResourceKey<string> FontWeight => new("FilledPasswordBoxFontWeight");
+
+					[ResourceKeyDefinition(typeof(double), "FilledPasswordBoxForegroundOpacityDisabled")]
+					public static ThemeResourceKey<double> ForegroundOpacityDisabled => new("FilledPasswordBoxForegroundOpacityDisabled");
+
+					[ResourceKeyDefinition(typeof(double), "FilledPasswordBoxMinHeight")]
+					public static ThemeResourceKey<double> MinHeight => new("FilledPasswordBoxMinHeight");
+
+					[ResourceKeyDefinition(typeof(Thickness), "FilledPasswordBoxPadding")]
+					public static ThemeResourceKey<Thickness> Padding => new("FilledPasswordBoxPadding");
+
+					[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxRevealButtonForeground")]
+					public static ThemeResourceKey<Brush> RevealButtonForeground => new("FilledPasswordBoxRevealButtonForeground");
 				}
 
-				public static class Outlined
+				public static partial class Outlined
 				{
-					public static class Background
+					public static readonly BackgroundVSG Background = new();
+					public partial class BackgroundVSG
 					{
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxBackground")]
-						public static ThemeResourceKey<Brush> Default => new("OutlinedPasswordBoxBackground");
+						public ThemeResourceKey<Brush> Default = new("OutlinedPasswordBoxBackground");
 
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxBackgroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("OutlinedPasswordBoxBackgroundPointerOver");
+						public ThemeResourceKey<Brush> PointerOver = new("OutlinedPasswordBoxBackgroundPointerOver");
+
+						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxBackgroundDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("OutlinedPasswordBoxBackgroundDisabled");
 
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxBackgroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("OutlinedPasswordBoxBackgroundFocused");
+						public ThemeResourceKey<Brush> Focused = new("OutlinedPasswordBoxBackgroundFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxBackgroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("OutlinedPasswordBoxBackgroundDisabled");
+						public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
 					}
 
-					public static class BorderBrush
+					public static readonly BorderBrushVSG BorderBrush = new();
+					public partial class BorderBrushVSG
 					{
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxBorderBrush")]
-						public static ThemeResourceKey<Brush> Default => new("OutlinedPasswordBoxBorderBrush");
+						public ThemeResourceKey<Brush> Default = new("OutlinedPasswordBoxBorderBrush");
 
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxBorderBrushPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("OutlinedPasswordBoxBorderBrushPointerOver");
+						public ThemeResourceKey<Brush> PointerOver = new("OutlinedPasswordBoxBorderBrushPointerOver");
+
+						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxBorderBrushDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("OutlinedPasswordBoxBorderBrushDisabled");
 
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxBorderBrushFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("OutlinedPasswordBoxBorderBrushFocused");
+						public ThemeResourceKey<Brush> Focused = new("OutlinedPasswordBoxBorderBrushFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxBorderBrushDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("OutlinedPasswordBoxBorderBrushDisabled");
+						public static implicit operator ThemeResourceKey<Brush>(BorderBrushVSG self) => self.Default;
+					}
+
+					public static readonly BorderPaddingVSG BorderPadding = new();
+					public partial class BorderPaddingVSG
+					{
+						[ResourceKeyDefinition(typeof(Thickness), "OutlinedPasswordBoxBorderPadding")]
+						public ThemeResourceKey<Thickness> Default = new("OutlinedPasswordBoxBorderPadding");
+
+						[ResourceKeyDefinition(typeof(Thickness), "OutlinedPasswordBoxBorderPaddingPointerOver")]
+						public ThemeResourceKey<Thickness> PointerOver = new("OutlinedPasswordBoxBorderPaddingPointerOver");
+
+						[ResourceKeyDefinition(typeof(Thickness), "OutlinedPasswordBoxBorderPaddingFocused")]
+						public ThemeResourceKey<Thickness> Focused = new("OutlinedPasswordBoxBorderPaddingFocused");
+
+						public static implicit operator ThemeResourceKey<Thickness>(BorderPaddingVSG self) => self.Default;
 					}
 
-					public static class Foreground
+					public static readonly BorderThicknessVSG BorderThickness = new();
+					public partial class BorderThicknessVSG
+					{
+						[ResourceKeyDefinition(typeof(Thickness), "OutlinedPasswordBoxBorderThickness")]
+						public ThemeResourceKey<Thickness> Default = new("OutlinedPasswordBoxBorderThickness");
+
+						[ResourceKeyDefinition(typeof(Thickness), "OutlinedPasswordBoxBorderThicknessPointerOver")]
+						public ThemeResourceKey<Thickness> PointerOver = new("OutlinedPasswordBoxBorderThicknessPointerOver");
+
+						[ResourceKeyDefinition(typeof(Thickness), "OutlinedPasswordBoxBorderThicknessFocused")]
+						public ThemeResourceKey<Thickness> Focused = new("OutlinedPasswordBoxBorderThicknessFocused");
+
+						public static implicit operator ThemeResourceKey<Thickness>(BorderThicknessVSG self) => self.Default;
+					}
+
+					public static readonly ForegroundVSG Foreground = new();
+					public partial class ForegroundVSG
 					{
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxForeground")]
-						public static ThemeResourceKey<Brush> Default => new("OutlinedPasswordBoxForeground");
+						public ThemeResourceKey<Brush> Default = new("OutlinedPasswordBoxForeground");
 
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxForegroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("OutlinedPasswordBoxForegroundPointerOver");
+						public ThemeResourceKey<Brush> PointerOver = new("OutlinedPasswordBoxForegroundPointerOver");
+
+						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxForegroundDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("OutlinedPasswordBoxForegroundDisabled");
 
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxForegroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("OutlinedPasswordBoxForegroundFocused");
+						public ThemeResourceKey<Brush> Focused = new("OutlinedPasswordBoxForegroundFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxForegroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("OutlinedPasswordBoxForegroundDisabled");
+						public static implicit operator ThemeResourceKey<Brush>(ForegroundVSG self) => self.Default;
 					}
 
-					public static class Placeholder
+					public static readonly LeadingIconForegroundVSG LeadingIconForeground = new();
+					public partial class LeadingIconForegroundVSG
 					{
-						public static class Foreground
-						{
-							[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxPlaceholderForeground")]
-							public static ThemeResourceKey<Brush> Default => new("OutlinedPasswordBoxPlaceholderForeground");
-
-							[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxPlaceholderForegroundPointerOver")]
-							public static ThemeResourceKey<Brush> PointerOver => new("OutlinedPasswordBoxPlaceholderForegroundPointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "PasswordBoxLeadingIconForeground")]
+						public ThemeResourceKey<Brush> Default = new("PasswordBoxLeadingIconForeground");
 
-							[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxPlaceholderForegroundFocused")]
-							public static ThemeResourceKey<Brush> Focused => new("OutlinedPasswordBoxPlaceholderForegroundFocused");
+						[ResourceKeyDefinition(typeof(Brush), "PasswordBoxLeadingIconForegroundDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("PasswordBoxLeadingIconForegroundDisabled");
 
-							[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxPlaceholderForegroundDisabled")]
-							public static ThemeResourceKey<Brush> Disabled => new("OutlinedPasswordBoxPlaceholderForegroundDisabled");
-						}
+						public static implicit operator ThemeResourceKey<Brush>(LeadingIconForegroundVSG self) => self.Default;
 					}
 
-					public static class Typography
+					public static readonly PlaceholderForegroundVSG PlaceholderForeground = new();
+					public partial class PlaceholderForegroundVSG
 					{
-						[ResourceKeyDefinition(typeof(FontFamily), "OutlinedPasswordBoxFontFamily")]
-						public static StaticResourceKey<FontFamily> FontFamily => new("OutlinedPasswordBoxFontFamily");
+						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxPlaceholderForeground")]
+						public ThemeResourceKey<Brush> Default = new("OutlinedPasswordBoxPlaceholderForeground");
 
-						[ResourceKeyDefinition(typeof(FontWeights), "OutlinedPasswordBoxFontWeight")]
-						public static StaticResourceKey<FontWeights> FontWeight => new("OutlinedPasswordBoxFontWeight");
+						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxPlaceholderForegroundPointerOver")]
+						public ThemeResourceKey<Brush> PointerOver = new("OutlinedPasswordBoxPlaceholderForegroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(double), "OutlinedPasswordBoxFontSize")]
-						public static StaticResourceKey<double> FontSize => new("OutlinedPasswordBoxFontSize");
+						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxPlaceholderForegroundDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("OutlinedPasswordBoxPlaceholderForegroundDisabled");
 
-						[ResourceKeyDefinition(typeof(int), "OutlinedPasswordBoxCharacterSpacing")]
-						public static StaticResourceKey<int> CharacterSpacing => new("OutlinedPasswordBoxCharacterSpacing");
+						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxPlaceholderForegroundFocused")]
+						public ThemeResourceKey<Brush> Focused = new("OutlinedPasswordBoxPlaceholderForegroundFocused");
+
+						public static implicit operator ThemeResourceKey<Brush>(PlaceholderForegroundVSG self) => self.Default;
 					}
+
+					[ResourceKeyDefinition(typeof(int), "OutlinedPasswordBoxCharacterSpacing")]
+					public static ThemeResourceKey<int> CharacterSpacing => new("OutlinedPasswordBoxCharacterSpacing");
+
+					[ResourceKeyDefinition(typeof(CornerRadius), "OutlinedPasswordBoxCornerRadius")]
+					public static ThemeResourceKey<CornerRadius> CornerRadius => new("OutlinedPasswordBoxCornerRadius");
+
+					[ResourceKeyDefinition(typeof(FontFamily), "OutlinedPasswordBoxFontFamily")]
+					public static ThemeResourceKey<FontFamily> FontFamily => new("OutlinedPasswordBoxFontFamily");
+
+					[ResourceKeyDefinition(typeof(double), "OutlinedPasswordBoxFontSize")]
+					public static ThemeResourceKey<double> FontSize => new("OutlinedPasswordBoxFontSize");
+
+					[ResourceKeyDefinition(typeof(string), "OutlinedPasswordBoxFontWeight")]
+					public static ThemeResourceKey<string> FontWeight => new("OutlinedPasswordBoxFontWeight");
+
+					[ResourceKeyDefinition(typeof(double), "OutlinedPasswordBoxForegroundOpacityDisabled")]
+					public static ThemeResourceKey<double> ForegroundOpacityDisabled => new("OutlinedPasswordBoxForegroundOpacityDisabled");
+
+					[ResourceKeyDefinition(typeof(double), "OutlinedPasswordBoxMinHeight")]
+					public static ThemeResourceKey<double> MinHeight => new("OutlinedPasswordBoxMinHeight");
+
+					[ResourceKeyDefinition(typeof(Thickness), "OutlinedPasswordBoxPadding")]
+					public static ThemeResourceKey<Thickness> Padding => new("OutlinedPasswordBoxPadding");
 				}
 			}
 
-			public static class Styles
+			public static partial class Styles
 			{
-				[ResourceKeyDefinition(typeof(Style), "FilledPasswordBoxStyle", TargetType = typeof(PasswordBox))]
-				public static StaticResourceKey<Style> Filled => new("FilledPasswordBoxStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialFilledPasswordBoxStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> Filled => new("MaterialFilledPasswordBoxStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "OutlinedPasswordBoxStyle", TargetType = typeof(PasswordBox))]
-				public static StaticResourceKey<Style> Outlined => new("OutlinedPasswordBoxStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialOutlinedPasswordBoxStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> Outlined => new("MaterialOutlinedPasswordBoxStyle");
 			}
 		}
 	}
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressBar.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressBar.cs
index 900a2230e..a23b9a7c4 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressBar.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressBar.cs
@@ -1,4 +1,7 @@
-using Microsoft.UI.Xaml;
+using System;
+using Windows.UI;
+using Microsoft.UI.Text;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
 using Uno.Extensions.Markup;
 using Uno.Extensions.Markup.Internals;
@@ -7,27 +10,30 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class ProgressBar
+		public static partial class ProgressBar
 		{
-			public static class Resources
+			public static partial class Resources
 			{
-				[ResourceKeyDefinition(typeof(Brush), "ProgressBarForeground")]
-				public static ThemeResourceKey<Brush> Foreground => new("ProgressBarForeground");
+				public static partial class ProgressBar
+				{
+					[ResourceKeyDefinition(typeof(Brush), "ProgressBarBackground")]
+					public static ThemeResourceKey<Brush> Background => new("ProgressBarBackground");
 
-				[ResourceKeyDefinition(typeof(Brush), "ProgressBarBackground")]
-				public static ThemeResourceKey<Brush> Background => new("ProgressBarBackground");
+					[ResourceKeyDefinition(typeof(Brush), "ProgressBarForeground")]
+					public static ThemeResourceKey<Brush> Foreground => new("ProgressBarForeground");
 
-				[ResourceKeyDefinition(typeof(double), "ProgressBarMinWidth")]
-				public static ThemeResourceKey<double> MinWidth => new("ProgressBarMinWidth");
+					[ResourceKeyDefinition(typeof(double), "ProgressBarHeight")]
+					public static ThemeResourceKey<double> Height => new("ProgressBarHeight");
 
-				[ResourceKeyDefinition(typeof(double), "ProgressBarHeight")]
-				public static ThemeResourceKey<double> Height => new("ProgressBarHeight");
+					[ResourceKeyDefinition(typeof(double), "ProgressBarMinWidth")]
+					public static ThemeResourceKey<double> MinWidth => new("ProgressBarMinWidth");
+				}
 			}
 
-			public static class Styles
+			public static partial class Styles
 			{
-				[ResourceKeyDefinition(typeof(Style), "ProgressBarStyle", TargetType = typeof(ProgressBar))]
-				public static StaticResourceKey<Style> Default => new("ProgressBarStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialProgressBarStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> Default => new("MaterialProgressBarStyle");
 			}
 		}
 	}
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressRing.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressRing.cs
index d5a56ef38..25758f8fb 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressRing.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressRing.cs
@@ -1,4 +1,7 @@
-using Microsoft.UI.Xaml;
+using System;
+using Windows.UI;
+using Microsoft.UI.Text;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
 using Uno.Extensions.Markup;
 using Uno.Extensions.Markup.Internals;
@@ -7,27 +10,24 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class ProgressRing
+		public static partial class ProgressRing
 		{
-			public static class Resources
+			public static partial class Resources
 			{
-				public static class Foreground
-				{
-					[ResourceKeyDefinition(typeof(Brush), "ProgressRingForeground")]
-					public static ThemeResourceKey<Brush> Default => new("ProgressRingForeground");
-				}
-
-				public static class Background
+				public static partial class ProgressRing
 				{
 					[ResourceKeyDefinition(typeof(Brush), "ProgressRingBackground")]
-					public static ThemeResourceKey<Brush> Default => new("ProgressRingBackground");
+					public static ThemeResourceKey<Brush> Background => new("ProgressRingBackground");
+
+					[ResourceKeyDefinition(typeof(Brush), "ProgressRingForeground")]
+					public static ThemeResourceKey<Brush> Foreground => new("ProgressRingForeground");
 				}
 			}
 
-			public static class Styles
+			public static partial class Styles
 			{
-				[ResourceKeyDefinition(typeof(Style), "ProgressRingStyle", TargetType = typeof(ProgressRing))]
-				public static StaticResourceKey<Style> Default => new("ProgressRingStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialProgressRingStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> Default => new("MaterialProgressRingStyle");
 			}
 		}
 	}
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/RadioButton.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/RadioButton.cs
index f509fe4ff..721b8bca5 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/RadioButton.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/RadioButton.cs
@@ -1,38 +1,58 @@
-using Microsoft.UI.Xaml;
+using System;
+using Windows.UI;
+using Microsoft.UI.Text;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
 using Uno.Extensions.Markup;
 using Uno.Extensions.Markup.Internals;
-using Microsoft.UI.Text;
 
 namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class RadioButton
+		public static partial class RadioButton
 		{
-			public static class Resources
+			public static partial class Resources
 			{
-				public static class Default
+				public static readonly ForegroundVSG Foreground = new();
+				public partial class ForegroundVSG
 				{
-					public static class Foreground
+					[ResourceKeyDefinition(typeof(Brush), "RadioButtonForeground")]
+					public ThemeResourceKey<Brush> Default = new("RadioButtonForeground");
+
+					[ResourceKeyDefinition(typeof(Brush), "RadioButtonForegroundPointerOver")]
+					public ThemeResourceKey<Brush> PointerOver = new("RadioButtonForegroundPointerOver");
+
+					[ResourceKeyDefinition(typeof(Brush), "RadioButtonForegroundPressed")]
+					public ThemeResourceKey<Brush> Pressed = new("RadioButtonForegroundPressed");
+
+					[ResourceKeyDefinition(typeof(Brush), "RadioButtonForegroundDisabled")]
+					public ThemeResourceKey<Brush> Disabled = new("RadioButtonForegroundDisabled");
+
+					public static implicit operator ThemeResourceKey<Brush>(ForegroundVSG self) => self.Default;
+				}
+
+				public static partial class OuterEllipse
+				{
+					public static partial class Fill
 					{
-						[ResourceKeyDefinition(typeof(Brush), "RadioButtonForeground")]
-						public static ThemeResourceKey<Brush> Default => new("RadioButtonForeground");
+						[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseFill")]
+						public static ThemeResourceKey<Brush> Normal => new("RadioButtonOuterEllipseFill");
 
-						[ResourceKeyDefinition(typeof(Brush), "RadioButtonForegroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("RadioButtonForegroundPointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseFillPointerOver")]
+						public static ThemeResourceKey<Brush> PointerOver => new("RadioButtonOuterEllipseFillPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "RadioButtonForegroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("RadioButtonForegroundPressed");
+						[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseFillPressed")]
+						public static ThemeResourceKey<Brush> Pressed => new("RadioButtonOuterEllipseFillPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "RadioButtonForegroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("RadioButtonForegroundDisabled");
+						[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseFillDisabled")]
+						public static ThemeResourceKey<Brush> Disabled => new("RadioButtonOuterEllipseFillDisabled");
 					}
 
-					public static class Stroke
+					public static partial class Stroke
 					{
 						[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseStroke")]
-						public static ThemeResourceKey<Brush> Default => new("RadioButtonOuterEllipseStroke");
+						public static ThemeResourceKey<Brush> Normal => new("RadioButtonOuterEllipseStroke");
 
 						[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseStrokePointerOver")]
 						public static ThemeResourceKey<Brush> PointerOver => new("RadioButtonOuterEllipseStrokePointerOver");
@@ -42,80 +62,89 @@ public static class Stroke
 
 						[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseStrokeDisabled")]
 						public static ThemeResourceKey<Brush> Disabled => new("RadioButtonOuterEllipseStrokeDisabled");
+					}
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseCheckedStroke")]
-						public static ThemeResourceKey<Brush> Checked => new("RadioButtonOuterEllipseCheckedStroke");
+				public static partial class OuterEllipseCheckedFill
+				{
+					[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseCheckedFill")]
+					public static ThemeResourceKey<Brush> Normal => new("RadioButtonOuterEllipseCheckedFill");
 
-						[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseCheckedStrokePointerOver")]
-						public static ThemeResourceKey<Brush> CheckedPointerOver => new("RadioButtonOuterEllipseCheckedStrokePointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseCheckedFillPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("RadioButtonOuterEllipseCheckedFillPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseCheckedStrokePressed")]
-						public static ThemeResourceKey<Brush> CheckedPressed => new("RadioButtonOuterEllipseCheckedStrokePressed");
+					[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseCheckedFillPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("RadioButtonOuterEllipseCheckedFillPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseCheckedStrokeDisabled")]
-						public static ThemeResourceKey<Brush> CheckedDisabled => new("RadioButtonOuterEllipseCheckedStrokeDisabled");
-					}
+					[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseCheckedFillDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("RadioButtonOuterEllipseCheckedFillDisabled");
+				}
 
-					public static class Fill
+				public static partial class StateCircle
+				{
+					public static partial class Opacity
 					{
-						[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseFill")]
-						public static ThemeResourceKey<Brush> Default => new("RadioButtonOuterEllipseFill");
+						[ResourceKeyDefinition(typeof(double), "RadioButtonStateCircleOpacityPointerOver")]
+						public static ThemeResourceKey<double> PointerOver => new("RadioButtonStateCircleOpacityPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseFillPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("RadioButtonOuterEllipseFillPointerOver");
+						[ResourceKeyDefinition(typeof(double), "RadioButtonStateCircleOpacityPressed")]
+						public static ThemeResourceKey<double> Pressed => new("RadioButtonStateCircleOpacityPressed");
+					}
 
-						[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseFillPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("RadioButtonOuterEllipseFillPressed");
+					[ResourceKeyDefinition(typeof(double), "RadioButtonStateCircleOpacityFocused")]
+					public static ThemeResourceKey<double> OpacityFocused => new("RadioButtonStateCircleOpacityFocused");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseFillDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("RadioButtonOuterEllipseFillDisabled");
+				[ResourceKeyDefinition(typeof(int), "RadioButtonCharacterSpacing")]
+				public static ThemeResourceKey<int> CharacterSpacing => new("RadioButtonCharacterSpacing");
 
-						[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseCheckedFill")]
-						public static ThemeResourceKey<Brush> Checked => new("RadioButtonOuterEllipseCheckedFill");
+				[ResourceKeyDefinition(typeof(Thickness), "RadioButtonCheckEllipsePadding")]
+				public static ThemeResourceKey<Thickness> CheckEllipsePadding => new("RadioButtonCheckEllipsePadding");
 
-						[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseCheckedFillPointerOver")]
-						public static ThemeResourceKey<Brush> CheckedPointerOver => new("RadioButtonOuterEllipseCheckedFillPointerOver");
+				[ResourceKeyDefinition(typeof(double), "RadioButtonCheckGlyphSize")]
+				public static ThemeResourceKey<double> CheckGlyphSize => new("RadioButtonCheckGlyphSize");
 
-						[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseCheckedFillPressed")]
-						public static ThemeResourceKey<Brush> CheckedPressed => new("RadioButtonOuterEllipseCheckedFillPressed");
+				[ResourceKeyDefinition(typeof(FontFamily), "RadioButtonFontFamily")]
+				public static ThemeResourceKey<FontFamily> FontFamily => new("RadioButtonFontFamily");
 
-						[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseCheckedFillDisabled")]
-						public static ThemeResourceKey<Brush> CheckedDisabled => new("RadioButtonOuterEllipseCheckedFillDisabled");
-					}
+				[ResourceKeyDefinition(typeof(double), "RadioButtonFontSize")]
+				public static ThemeResourceKey<double> FontSize => new("RadioButtonFontSize");
 
-					public static class HoverRingFill
-					{
-						[ResourceKeyDefinition(typeof(Brush), "MaterialRadioButtonHoverRingFillPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("MaterialRadioButtonHoverRingFillPointerOver");
+				[ResourceKeyDefinition(typeof(string), "RadioButtonFontWeight")]
+				public static ThemeResourceKey<string> FontWeight => new("RadioButtonFontWeight");
 
-						[ResourceKeyDefinition(typeof(Brush), "MaterialRadioButtonHoverRingFillPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("MaterialRadioButtonHoverRingFillPressed");
-					}
+				[ResourceKeyDefinition(typeof(double), "RadioButtonHeight")]
+				public static ThemeResourceKey<double> Height => new("RadioButtonHeight");
 
-					public static class Typography
-					{
-						[ResourceKeyDefinition(typeof(FontFamily), "RadioButtonFontFamily")]
-						public static StaticResourceKey<FontFamily> FontFamily => new("RadioButtonFontFamily");
+				[ResourceKeyDefinition(typeof(double), "RadioButtonMinHeight")]
+				public static ThemeResourceKey<double> MinHeight => new("RadioButtonMinHeight");
 
-						[ResourceKeyDefinition(typeof(FontWeights), "RadioButtonFontWeight")]
-						public static StaticResourceKey<FontWeights> FontWeight => new("RadioButtonFontWeight");
+				[ResourceKeyDefinition(typeof(double), "RadioButtonMinWidth")]
+				public static ThemeResourceKey<double> MinWidth => new("RadioButtonMinWidth");
 
-						[ResourceKeyDefinition(typeof(double), "RadioButtonFontSize")]
-						public static StaticResourceKey<double> FontSize => new("RadioButtonFontSize");
+				[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseCheckedStroke")]
+				public static ThemeResourceKey<Brush> OuterEllipseCheckedStroke => new("RadioButtonOuterEllipseCheckedStroke");
 
-						[ResourceKeyDefinition(typeof(int), "RadioButtonCharacterSpacing")]
-						public static StaticResourceKey<int> CharacterSpacing => new("RadioButtonCharacterSpacing");
-					}
-				}
+				[ResourceKeyDefinition(typeof(Thickness), "RadioButtonPadding")]
+				public static ThemeResourceKey<Thickness> Padding => new("RadioButtonPadding");
+
+				[ResourceKeyDefinition(typeof(Brush), "RadioButtonStateCircleBackgroundChecked")]
+				public static ThemeResourceKey<Brush> StateCircleBackgroundChecked => new("RadioButtonStateCircleBackgroundChecked");
+
+				[ResourceKeyDefinition(typeof(Brush), "RadioButtonStateCircleBackgroundUnchecked")]
+				public static ThemeResourceKey<Brush> StateCircleBackgroundUnchecked => new("RadioButtonStateCircleBackgroundUnchecked");
+
+				[ResourceKeyDefinition(typeof(double), "RadioButtonStrokeThickness")]
+				public static ThemeResourceKey<double> StrokeThickness => new("RadioButtonStrokeThickness");
+
+				[ResourceKeyDefinition(typeof(double), "RadioButtonWidth")]
+				public static ThemeResourceKey<double> Width => new("RadioButtonWidth");
 			}
 
-			public static class Styles
+			public static partial class Styles
 			{
-				[ResourceKeyDefinition(typeof(Style), "RadioButtonStyle", TargetType = typeof(RadioButton))]
-				public static StaticResourceKey<Style> Default => new("RadioButtonStyle");
-
-				[ResourceKeyDefinition(typeof(Style), "SecondaryRadioButtonStyle", TargetType = typeof(RadioButton))]
-				public static StaticResourceKey<Style> Secondary => new("SecondaryRadioButtonStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialRadioButtonStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> Default => new("MaterialRadioButtonStyle");
 			}
 		}
 	}
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/RatingControl.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/RatingControl.cs
index 433c46ca3..fa2bd6b89 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/RatingControl.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/RatingControl.cs
@@ -1,4 +1,6 @@
-using Microsoft.UI.Text;
+using System;
+using Windows.UI;
+using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
 using Uno.Extensions.Markup;
@@ -8,125 +10,95 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class RatingControl
+		public static partial class RatingControl
 		{
-			public static class Resources
+			public static partial class Resources
 			{
-				public static class Default
+				public static partial class RatingControl
 				{
-					public static class Foreground
-					{
-						[ResourceKeyDefinition(typeof(Brush), "RatingControlForeground")]
-						public static ThemeResourceKey<Brush> Default => new("RatingControlForeground");
-
-						[ResourceKeyDefinition(typeof(Brush), "RatingControlForegroundUnselected")]
-						public static ThemeResourceKey<Brush> Unselected => new("RatingControlForegroundUnselected");
-
-						[ResourceKeyDefinition(typeof(Brush), "RatingControlForegroundUnselectedPointerOver")]
-						public static ThemeResourceKey<Brush> UnselectedPointerOver => new("RatingControlForegroundUnselectedPointerOver");
+					[ResourceKeyDefinition(typeof(FontFamily), "RatingControlFontFamily")]
+					public static ThemeResourceKey<FontFamily> FontFamily => new("RatingControlFontFamily");
 
-						[ResourceKeyDefinition(typeof(Brush), "RatingControlForegroundSelected")]
-						public static ThemeResourceKey<Brush> Selected => new("RatingControlForegroundSelected");
+					[ResourceKeyDefinition(typeof(Brush), "RatingControlForeground")]
+					public static ThemeResourceKey<Brush> Foreground => new("RatingControlForeground");
 
-						[ResourceKeyDefinition(typeof(Brush), "RatingControlForegroundSelectedPointerOver")]
-						public static ThemeResourceKey<Brush> SelectedPointerOver => new("RatingControlForegroundSelectedPointerOver");
-
-						[ResourceKeyDefinition(typeof(Brush), "RatingControlForegroundSelectedDisabled")]
-						public static ThemeResourceKey<Brush> SelectedDisabled => new("RatingControlForegroundSelectedDisabled");
-					}
+					[ResourceKeyDefinition(typeof(double), "RatingControlHeight")]
+					public static ThemeResourceKey<double> Height => new("RatingControlHeight");
+				}
 
-					public static class PlaceholderForeground
-					{
-						[ResourceKeyDefinition(typeof(Brush), "RatingControlPlaceholderForeground")]
-						public static ThemeResourceKey<Brush> Default => new("RatingControlPlaceholderForeground");
+				public static partial class RatingControlCaption
+				{
+					[ResourceKeyDefinition(typeof(FontFamily), "RatingControlCaptionFontFamily")]
+					public static ThemeResourceKey<FontFamily> FontFamily => new("RatingControlCaptionFontFamily");
 
-						[ResourceKeyDefinition(typeof(Brush), "RatingControlPlaceholderForegroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("RatingControlPlaceholderForegroundPointerOver");
-					}
+					[ResourceKeyDefinition(typeof(Brush), "RatingControlCaptionForeground")]
+					public static ThemeResourceKey<Brush> Foreground => new("RatingControlCaptionForeground");
 
-					public static class CaptionForeground
-					{
-						[ResourceKeyDefinition(typeof(Brush), "RatingControlCaptionForeground")]
-						public static ThemeResourceKey<Brush> Default => new("RatingControlCaptionForeground");
-					}
+					[ResourceKeyDefinition(typeof(double), "RatingControlCaptionHeight")]
+					public static ThemeResourceKey<double> Height => new("RatingControlCaptionHeight");
+				}
 
-					public static class Typography
-					{
-						[ResourceKeyDefinition(typeof(FontFamily), "RatingControlFontFamily")]
-						public static ThemeResourceKey<FontFamily> FontFamily => new("RatingControlFontFamily");
+				public static partial class RatingControlForegroundSelected
+				{
+					[ResourceKeyDefinition(typeof(Brush), "RatingControlForegroundSelectedDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("RatingControlForegroundSelectedDisabled");
 
-						[ResourceKeyDefinition(typeof(FontFamily), "RatingControlCaptionFontFamily")]
-						public static ThemeResourceKey<FontFamily> CaptionFontFamily => new("RatingControlCaptionFontFamily");
+					[ResourceKeyDefinition(typeof(Brush), "RatingControlPlaceholderForeground")]
+					public static ThemeResourceKey<Brush> Placeholder => new("RatingControlPlaceholderForeground");
 
-						[ResourceKeyDefinition(typeof(Style), "RatingControlCaptionStyle")]
-						public static ThemeResourceKey<Style> CaptionStyle => new("RatingControlCaptionStyle");
-					}
+					[ResourceKeyDefinition(typeof(Brush), "RatingControlPlaceholderForegroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOverPlaceholder => new("RatingControlPlaceholderForegroundPointerOver");
 
-					[ResourceKeyDefinition(typeof(double), "RatingControlHeight")]
-					public static ThemeResourceKey<double> Height => new("RatingControlHeight");
+					[ResourceKeyDefinition(typeof(Brush), "RatingControlForegroundUnselectedPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOverUnselected => new("RatingControlForegroundUnselectedPointerOver");
 
-					[ResourceKeyDefinition(typeof(double), "RatingControlCaptionHeight")]
-					public static ThemeResourceKey<double> CaptionHeight => new("RatingControlCaptionHeight");
+					[ResourceKeyDefinition(typeof(Brush), "RatingControlForegroundSelected")]
+					public static ThemeResourceKey<Brush> Set => new("RatingControlForegroundSelected");
 				}
 
-				public static class Secondary
+				public static partial class Secondary
 				{
-					public static class Foreground
+					public static partial class Caption
 					{
-						[ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlForeground")]
-						public static ThemeResourceKey<Brush> Default => new("SecondaryRatingControlForeground");
-
-						[ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlForegroundUnselected")]
-						public static ThemeResourceKey<Brush> Unselected => new("SecondaryRatingControlForegroundUnselected");
-
-						[ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlForegroundUnselectedPointerOver")]
-						public static ThemeResourceKey<Brush> UnselectedPointerOver => new("SecondaryRatingControlForegroundUnselectedPointerOver");
-
-						[ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlForegroundSelected")]
-						public static ThemeResourceKey<Brush> Selected => new("SecondaryRatingControlForegroundSelected");
+						[ResourceKeyDefinition(typeof(FontFamily), "SecondaryRatingControlCaptionFontFamily")]
+						public static ThemeResourceKey<FontFamily> FontFamily => new("SecondaryRatingControlCaptionFontFamily");
 
-						[ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlForegroundSelectedPointerOver")]
-						public static ThemeResourceKey<Brush> SelectedPointerOver => new("SecondaryRatingControlForegroundSelectedPointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlCaptionForeground")]
+						public static ThemeResourceKey<Brush> Foreground => new("SecondaryRatingControlCaptionForeground");
 
-						[ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlForegroundSelectedDisabled")]
-						public static ThemeResourceKey<Brush> SelectedDisabled => new("SecondaryRatingControlForegroundSelectedDisabled");
+						[ResourceKeyDefinition(typeof(double), "SecondaryRatingControlCaptionHeight")]
+						public static ThemeResourceKey<double> Height => new("SecondaryRatingControlCaptionHeight");
 					}
 
-					public static class PlaceholderForeground
+					public static partial class ForegroundSelected
 					{
+						[ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlForegroundSelectedDisabled")]
+						public static ThemeResourceKey<Brush> Disabled => new("SecondaryRatingControlForegroundSelectedDisabled");
+
 						[ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlPlaceholderForeground")]
-						public static ThemeResourceKey<Brush> Default => new("SecondaryRatingControlPlaceholderForeground");
+						public static ThemeResourceKey<Brush> Placeholder => new("SecondaryRatingControlPlaceholderForeground");
 
 						[ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlPlaceholderForegroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("SecondaryRatingControlPlaceholderForegroundPointerOver");
-					}
-
-					public static class CaptionForeground
-					{
-						[ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlCaptionForeground")]
-						public static ThemeResourceKey<Brush> Default => new("SecondaryRatingControlCaptionForeground");
-					}
+						public static ThemeResourceKey<Brush> PointerOverPlaceholder => new("SecondaryRatingControlPlaceholderForegroundPointerOver");
 
-					public static class Typography
-					{
-						[ResourceKeyDefinition(typeof(FontFamily), "SecondaryRatingControlCaptionFontFamily")]
-						public static ThemeResourceKey<FontFamily> CaptionFontFamily => new("SecondaryRatingControlCaptionFontFamily");
+						[ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlForegroundUnselectedPointerOver")]
+						public static ThemeResourceKey<Brush> PointerOverUnselected => new("SecondaryRatingControlForegroundUnselectedPointerOver");
 
-						[ResourceKeyDefinition(typeof(Style), "SecondaryRatingControlCaptionStyle")]
-						public static ThemeResourceKey<Style> CaptionStyle => new("SecondaryRatingControlCaptionStyle");
+						[ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlForegroundSelected")]
+						public static ThemeResourceKey<Brush> Set => new("SecondaryRatingControlForegroundSelected");
 					}
 
-					[ResourceKeyDefinition(typeof(double), "SecondaryRatingControlCaptionHeight")]
-					public static ThemeResourceKey<double> CaptionHeight => new("SecondaryRatingControlCaptionHeight");
+					[ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlForeground")]
+					public static ThemeResourceKey<Brush> Foreground => new("SecondaryRatingControlForeground");
 				}
 			}
 
-			public static class Styles
+			public static partial class Styles
 			{
-				[ResourceKeyDefinition(typeof(Style), "RatingControlStyle", TargetType = typeof(RatingControl))]
-				public static StaticResourceKey<Style> Default => new("RatingControlStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialRatingControlStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> Default => new("MaterialRatingControlStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "SecondaryRatingControlStyle", TargetType = typeof(RatingControl))]
+				[ResourceKeyDefinition(typeof(Style), "SecondaryRatingControlStyle", TargetType = typeof(Style))]
 				public static StaticResourceKey<Style> Secondary => new("SecondaryRatingControlStyle");
 			}
 		}
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/Slider.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/Slider.cs
index fa2826fb2..336d82bc9 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/Slider.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/Slider.cs
@@ -1,4 +1,7 @@
-using Microsoft.UI.Xaml;
+using System;
+using Windows.UI;
+using Microsoft.UI.Text;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
 using Uno.Extensions.Markup;
 using Uno.Extensions.Markup.Internals;
@@ -7,75 +10,144 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class Slider
+		public static partial class Slider
 		{
-			public static class Resources
+			public static partial class Resources
 			{
-				public static class Typography
+				public static partial class Thumb
 				{
-					[ResourceKeyDefinition(typeof(FontFamily), "SliderFontFamily")]
-					public static ThemeResourceKey<FontFamily> FontFamily => new("SliderFontFamily");
+					[ResourceKeyDefinition(typeof(Brush), "SliderThumbBackgroundDisabled")]
+					public static ThemeResourceKey<Brush> BackgroundDisabled => new("SliderThumbBackgroundDisabled");
 
-					[ResourceKeyDefinition(typeof(double), "SliderFontSize")]
-					public static ThemeResourceKey<double> FontSize => new("SliderFontSize");
+					[ResourceKeyDefinition(typeof(double), "SliderThumbHeight")]
+					public static ThemeResourceKey<double> Height => new("SliderThumbHeight");
+
+					[ResourceKeyDefinition(typeof(double), "SliderThumbWidth")]
+					public static ThemeResourceKey<double> Width => new("SliderThumbWidth");
 				}
 
-				public static class Track
+				public static partial class TickBar
 				{
-					public static class Fill
+					public static partial class Bottom
 					{
-						[ResourceKeyDefinition(typeof(Brush), "SliderTrackFill")]
-						public static ThemeResourceKey<Brush> Default => new("SliderTrackFill");
+						[ResourceKeyDefinition(typeof(double), "SliderBottomTickBarHeight")]
+						public static ThemeResourceKey<double> Height => new("SliderBottomTickBarHeight");
 
-						[ResourceKeyDefinition(typeof(Brush), "SliderTrackFillDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("SliderTrackFillDisabled");
+						[ResourceKeyDefinition(typeof(Thickness), "SliderBottomTickBarMargin")]
+						public static ThemeResourceKey<Thickness> Margin => new("SliderBottomTickBarMargin");
 					}
 
-					public static class ValueFill
+					public static readonly FillVSG Fill = new();
+					public partial class FillVSG
 					{
-						[ResourceKeyDefinition(typeof(Brush), "SliderTrackValueFill")]
-						public static ThemeResourceKey<Brush> Default => new("SliderTrackFill");
+						[ResourceKeyDefinition(typeof(Brush), "SliderTickBarFill")]
+						public ThemeResourceKey<Brush> Default = new("SliderTickBarFill");
 
-						[ResourceKeyDefinition(typeof(Brush), "SliderTrackValueFillDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("SliderTrackFillDisabled");
+						[ResourceKeyDefinition(typeof(Brush), "SliderTickBarFillDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("SliderTickBarFillDisabled");
+
+						public static implicit operator ThemeResourceKey<Brush>(FillVSG self) => self.Default;
 					}
 
-					[ResourceKeyDefinition(typeof(CornerRadius), "SliderTrackCornerRadius")]
-					public static ThemeResourceKey<CornerRadius> CornerRadius => new("SliderTrackCornerRadius");
-				}
+					public static partial class Left
+					{
+						[ResourceKeyDefinition(typeof(Thickness), "SliderLeftTickBarMargin")]
+						public static ThemeResourceKey<Thickness> Margin => new("SliderLeftTickBarMargin");
 
-				public static class TickBar
-				{
-					public static class Fill
+						[ResourceKeyDefinition(typeof(double), "SliderLeftTickBarWidth")]
+						public static ThemeResourceKey<double> Width => new("SliderLeftTickBarWidth");
+					}
+
+					public static partial class Right
 					{
-						[ResourceKeyDefinition(typeof(Brush), "SliderTickBarFill")]
-						public static ThemeResourceKey<Brush> Default => new("SliderTickBarFill");
+						[ResourceKeyDefinition(typeof(Thickness), "SliderRightTickBarMargin")]
+						public static ThemeResourceKey<Thickness> Margin => new("SliderRightTickBarMargin");
 
-						[ResourceKeyDefinition(typeof(Brush), "SliderTickBarFillDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("SliderTickBarFillDisabled");
+						[ResourceKeyDefinition(typeof(double), "SliderRightTickBarWidth")]
+						public static ThemeResourceKey<double> Width => new("SliderRightTickBarWidth");
 					}
 
+					public static partial class Top
+					{
+						[ResourceKeyDefinition(typeof(double), "SliderTopTickBarHeight")]
+						public static ThemeResourceKey<double> Height => new("SliderTopTickBarHeight");
+
+						[ResourceKeyDefinition(typeof(Thickness), "SliderTopTickBarMargin")]
+						public static ThemeResourceKey<Thickness> Margin => new("SliderTopTickBarMargin");
+					}
+
+					[ResourceKeyDefinition(typeof(double), "SliderHorizontalInlineTickBarHeight")]
+					public static ThemeResourceKey<double> HorizontalInlineHeight => new("SliderHorizontalInlineTickBarHeight");
+
 					[ResourceKeyDefinition(typeof(Brush), "SliderInlineTickBarFill")]
 					public static ThemeResourceKey<Brush> InlineFill => new("SliderInlineTickBarFill");
+
+					[ResourceKeyDefinition(typeof(double), "SliderVerticallInlineTickBarWidth")]
+					public static ThemeResourceKey<double> VerticallInlineWidth => new("SliderVerticallInlineTickBarWidth");
 				}
 
-				public static class Thumb
+				public static partial class Track
 				{
-					public static class Background
+					public static readonly FillVSG Fill = new();
+					public partial class FillVSG
 					{
-						[ResourceKeyDefinition(typeof(Brush), "SliderThumbBackground")]
-						public static ThemeResourceKey<Brush> Default => new("SliderThumbBackground");
+						[ResourceKeyDefinition(typeof(Brush), "SliderTrackFill")]
+						public ThemeResourceKey<Brush> Default = new("SliderTrackFill");
+
+						[ResourceKeyDefinition(typeof(Brush), "SliderTrackFillDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("SliderTrackFillDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "SliderThumbBackgroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("SliderThumbBackgroundDisabled");
+						public static implicit operator ThemeResourceKey<Brush>(FillVSG self) => self.Default;
 					}
+
+					public static readonly ValueFillVSG ValueFill = new();
+					public partial class ValueFillVSG
+					{
+						[ResourceKeyDefinition(typeof(Brush), "SliderTrackValueFill")]
+						public ThemeResourceKey<Brush> Default = new("SliderTrackValueFill");
+
+						[ResourceKeyDefinition(typeof(Brush), "SliderTrackValueFillDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("SliderTrackValueFillDisabled");
+
+						public static implicit operator ThemeResourceKey<Brush>(ValueFillVSG self) => self.Default;
+					}
+
+					[ResourceKeyDefinition(typeof(CornerRadius), "SliderTrackCornerRadius")]
+					public static ThemeResourceKey<CornerRadius> CornerRadius => new("SliderTrackCornerRadius");
+
+					[ResourceKeyDefinition(typeof(double), "SliderTrackThickness")]
+					public static ThemeResourceKey<double> Thickness => new("SliderTrackThickness");
 				}
+
+				[ResourceKeyDefinition(typeof(double), "SliderFillThickness")]
+				public static ThemeResourceKey<double> FillThickness => new("SliderFillThickness");
+
+				[ResourceKeyDefinition(typeof(Thickness), "SliderFocusVisualMargin")]
+				public static ThemeResourceKey<Thickness> FocusVisualMargin => new("SliderFocusVisualMargin");
+
+				[ResourceKeyDefinition(typeof(FontFamily), "SliderFontFamily")]
+				public static ThemeResourceKey<FontFamily> FontFamily => new("SliderFontFamily");
+
+				[ResourceKeyDefinition(typeof(double), "SliderFontSize")]
+				public static ThemeResourceKey<double> FontSize => new("SliderFontSize");
+
+				[ResourceKeyDefinition(typeof(CornerRadius), "SliderHorizontalFillCornerRadius")]
+				public static ThemeResourceKey<CornerRadius> HorizontalFillCornerRadius => new("SliderHorizontalFillCornerRadius");
+
+				[ResourceKeyDefinition(typeof(Thickness), "SliderHorizontalFocusVisualMargin")]
+				public static ThemeResourceKey<Thickness> HorizontalFocusVisualMargin => new("SliderHorizontalFocusVisualMargin");
+
+				[ResourceKeyDefinition(typeof(CornerRadius), "SliderVerticalFillCornerRadius")]
+				public static ThemeResourceKey<CornerRadius> VerticalFillCornerRadius => new("SliderVerticalFillCornerRadius");
+
+				[ResourceKeyDefinition(typeof(Thickness), "SliderVerticalFocusVisualMargin")]
+				public static ThemeResourceKey<Thickness> VerticalFocusVisualMargin => new("SliderVerticalFocusVisualMargin");
 			}
 
-			public static class Styles
+			public static partial class Styles
 			{
-				[ResourceKeyDefinition(typeof(Style), "SliderStyle", TargetType = typeof(Slider))]
-				public static StaticResourceKey<Style> Default => new("SliderStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialSliderStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> Default => new("MaterialSliderStyle");
 			}
 		}
 	}
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/TextBlock.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/TextBlock.cs
index e62b69556..026fd2602 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/TextBlock.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/TextBlock.cs
@@ -1,4 +1,7 @@
-using Microsoft.UI.Xaml;
+using System;
+using Windows.UI;
+using Microsoft.UI.Text;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
 using Uno.Extensions.Markup;
 using Uno.Extensions.Markup.Internals;
@@ -7,66 +10,70 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class TextBlock
+		public static partial class TextBlock
 		{
-			public static class Styles
+			public static partial class Resources
 			{
-				[ResourceKeyDefinition(typeof(Style), "DisplayLarge", TargetType = typeof(TextBlock))]
-				public static StaticResourceKey<Style> DisplayLarge => new("DisplayLarge");
+			}
+
+			public static partial class Styles
+			{
+				[ResourceKeyDefinition(typeof(Style), "MaterialDisplayLarge", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> DisplayLarge => new("MaterialDisplayLarge");
 
-				[ResourceKeyDefinition(typeof(Style), "DisplayMedium", TargetType = typeof(TextBlock))]
-				public static StaticResourceKey<Style> DisplayMedium => new("DisplayMedium");
+				[ResourceKeyDefinition(typeof(Style), "MaterialDisplayMedium", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> DisplayMedium => new("MaterialDisplayMedium");
 
-				[ResourceKeyDefinition(typeof(Style), "DisplaySmall", TargetType = typeof(TextBlock))]
-				public static StaticResourceKey<Style> DisplaySmall => new("DisplaySmall");
+				[ResourceKeyDefinition(typeof(Style), "MaterialDisplaySmall", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> DisplaySmall => new("MaterialDisplaySmall");
 
-				[ResourceKeyDefinition(typeof(Style), "HeadlineLarge", TargetType = typeof(TextBlock))]
-				public static StaticResourceKey<Style> HeadlineLarge => new("HeadlineLarge");
+				[ResourceKeyDefinition(typeof(Style), "MaterialHeadlineLarge", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> HeadlineLarge => new("MaterialHeadlineLarge");
 
-				[ResourceKeyDefinition(typeof(Style), "HeadlineMedium", TargetType = typeof(TextBlock))]
-				public static StaticResourceKey<Style> HeadlineMedium => new("HeadlineMedium");
+				[ResourceKeyDefinition(typeof(Style), "MaterialHeadlineMedium", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> HeadlineMedium => new("MaterialHeadlineMedium");
 
-				[ResourceKeyDefinition(typeof(Style), "HeadlineSmall", TargetType = typeof(TextBlock))]
-				public static StaticResourceKey<Style> HeadlineSmall => new("HeadlineSmall");
+				[ResourceKeyDefinition(typeof(Style), "MaterialHeadlineSmall", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> HeadlineSmall => new("MaterialHeadlineSmall");
 
-				[ResourceKeyDefinition(typeof(Style), "TitleLarge", TargetType = typeof(TextBlock))]
-				public static StaticResourceKey<Style> TitleLarge => new("TitleLarge");
+				[ResourceKeyDefinition(typeof(Style), "MaterialTitleLarge", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> TitleLarge => new("MaterialTitleLarge");
 
-				[ResourceKeyDefinition(typeof(Style), "TitleMedium", TargetType = typeof(TextBlock))]
-				public static StaticResourceKey<Style> TitleMedium => new("TitleMedium");
+				[ResourceKeyDefinition(typeof(Style), "MaterialTitleMedium", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> TitleMedium => new("MaterialTitleMedium");
 
-				[ResourceKeyDefinition(typeof(Style), "TitleSmall", TargetType = typeof(TextBlock))]
-				public static StaticResourceKey<Style> TitleSmall => new("TitleSmall");
+				[ResourceKeyDefinition(typeof(Style), "MaterialTitleSmall", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> TitleSmall => new("MaterialTitleSmall");
 
-				[ResourceKeyDefinition(typeof(Style), "LabelLarge", TargetType = typeof(TextBlock))]
-				public static StaticResourceKey<Style> LabelLarge => new("LabelLarge");
+				[ResourceKeyDefinition(typeof(Style), "MaterialLabelLarge", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> LabelLarge => new("MaterialLabelLarge");
 
-				[ResourceKeyDefinition(typeof(Style), "LabelMedium", TargetType = typeof(TextBlock))]
-				public static StaticResourceKey<Style> LabelMedium => new("LabelMedium");
+				[ResourceKeyDefinition(typeof(Style), "MaterialLabelMedium", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> LabelMedium => new("MaterialLabelMedium");
 
-				[ResourceKeyDefinition(typeof(Style), "LabelSmall", TargetType = typeof(TextBlock))]
-				public static StaticResourceKey<Style> LabelSmall => new("LabelSmall");
+				[ResourceKeyDefinition(typeof(Style), "MaterialLabelSmall", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> LabelSmall => new("MaterialLabelSmall");
 
-				[ResourceKeyDefinition(typeof(Style), "LabelExtraSmall", TargetType = typeof(TextBlock))]
-				public static StaticResourceKey<Style> LabelExtraSmall => new("LabelExtraSmall");
+				[ResourceKeyDefinition(typeof(Style), "MaterialLabelExtraSmall", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> LabelExtraSmall => new("MaterialLabelExtraSmall");
 
-				[ResourceKeyDefinition(typeof(Style), "BodyLarge", TargetType = typeof(TextBlock))]
-				public static StaticResourceKey<Style> BodyLarge => new("BodyLarge");
+				[ResourceKeyDefinition(typeof(Style), "MaterialBodyLarge", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> BodyLarge => new("MaterialBodyLarge");
 
-				[ResourceKeyDefinition(typeof(Style), "BodyMedium", TargetType = typeof(TextBlock))]
-				public static StaticResourceKey<Style> BodyMedium => new("BodyMedium");
+				[ResourceKeyDefinition(typeof(Style), "MaterialBodyMedium", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> BodyMedium => new("MaterialBodyMedium");
 
-				[ResourceKeyDefinition(typeof(Style), "BodySmall", TargetType = typeof(TextBlock))]
-				public static StaticResourceKey<Style> BodySmall => new("BodySmall");
+				[ResourceKeyDefinition(typeof(Style), "MaterialBodySmall", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> BodySmall => new("MaterialBodySmall");
 
-				[ResourceKeyDefinition(typeof(Style), "CaptionLarge", TargetType = typeof(TextBlock))]
-				public static StaticResourceKey<Style> CaptionLarge => new("CaptionLarge");
+				[ResourceKeyDefinition(typeof(Style), "MaterialCaptionLarge", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> CaptionLarge => new("MaterialCaptionLarge");
 
-				[ResourceKeyDefinition(typeof(Style), "CaptionMedium", TargetType = typeof(TextBlock))]
-				public static StaticResourceKey<Style> CaptionMedium => new("CaptionMedium");
+				[ResourceKeyDefinition(typeof(Style), "MaterialCaptionMedium", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> CaptionMedium => new("MaterialCaptionMedium");
 
-				[ResourceKeyDefinition(typeof(Style), "CaptionSmall", TargetType = typeof(TextBlock))]
-				public static StaticResourceKey<Style> CaptionSmall => new("CaptionSmall");
+				[ResourceKeyDefinition(typeof(Style), "MaterialCaptionSmall", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> CaptionSmall => new("MaterialCaptionSmall");
 			}
 		}
 	}
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/TextBox.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/TextBox.cs
index 6aa197830..3289b776d 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/TextBox.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/TextBox.cs
@@ -1,4 +1,6 @@
-using Microsoft.UI.Text;
+using System;
+using Windows.UI;
+using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
 using Uno.Extensions.Markup;
@@ -8,244 +10,261 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class TextBox
+		public static partial class TextBox
 		{
-			public static class Resources
+			public static partial class Resources
 			{
-				public static class Filled
+				public static partial class Filled
 				{
-					public static class Foreground
+					public static readonly BackgroundVSG Background = new();
+					public partial class BackgroundVSG
 					{
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxForeground")]
-						public static ThemeResourceKey<Brush> Default => new("FilledTextBoxForeground");
+						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBackground")]
+						public ThemeResourceKey<Brush> Default = new("FilledTextBoxBackground");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxForegroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("FilledTextBoxForegroundPointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBackgroundPointerOver")]
+						public ThemeResourceKey<Brush> PointerOver = new("FilledTextBoxBackgroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxForegroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("FilledTextBoxForegroundFocused");
+						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBackgroundDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("FilledTextBoxBackgroundDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxForegroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("FilledTextBoxForegroundDisabled");
+						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBackgroundFocused")]
+						public ThemeResourceKey<Brush> Focused = new("FilledTextBoxBackgroundFocused");
+
+						public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
 					}
 
-					public static class PlaceholderForeground
+					public static readonly BorderBrushVSG BorderBrush = new();
+					public partial class BorderBrushVSG
 					{
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxPlaceholderForeground")]
-						public static ThemeResourceKey<Brush> Default => new("FilledTextBoxPlaceholderForeground");
+						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBorderBrushFocused")]
+						public ThemeResourceKey<Brush> Default = new("FilledTextBoxBorderBrushFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxPlaceholderForegroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("FilledTextBoxPlaceholderForegroundPointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBorderBrushPointerOver")]
+						public ThemeResourceKey<Brush> PointerOver = new("FilledTextBoxBorderBrushPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxPlaceholderForegroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("FilledTextBoxPlaceholderForegroundFocused");
+						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBorderBrushDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("FilledTextBoxBorderBrushDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxPlaceholderForegroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("FilledTextBoxPlaceholderForegroundDisabled");
+						public static implicit operator ThemeResourceKey<Brush>(BorderBrushVSG self) => self.Default;
+					}
+
+					public static readonly BorderThicknessNormalVSG BorderThicknessNormal = new();
+					public partial class BorderThicknessNormalVSG
+					{
+						[ResourceKeyDefinition(typeof(double), "FilledTextBoxBorderThicknessNormal")]
+						public ThemeResourceKey<double> Default = new("FilledTextBoxBorderThicknessNormal");
+
+						[ResourceKeyDefinition(typeof(double), "MaterialFilledTextBoxBorderHeightFocused")]
+						public ThemeResourceKey<double> Focused = new("MaterialFilledTextBoxBorderHeightFocused");
+
+						public static implicit operator ThemeResourceKey<double>(BorderThicknessNormalVSG self) => self.Default;
 					}
 
-					public static class DeleteButtonForeground
+					public static readonly DeleteButtonForegroundVSG DeleteButtonForeground = new();
+					public partial class DeleteButtonForegroundVSG
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxDeleteButtonForeground")]
-						public static ThemeResourceKey<Brush> Default => new("FilledTextBoxDeleteButtonForeground");
+						public ThemeResourceKey<Brush> Default = new("FilledTextBoxDeleteButtonForeground");
 
 						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxDeleteButtonForegroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("FilledTextBoxDeleteButtonForegroundPointerOver");
+						public ThemeResourceKey<Brush> PointerOver = new("FilledTextBoxDeleteButtonForegroundPointerOver");
+
+						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxDeleteButtonForegroundDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("FilledTextBoxDeleteButtonForegroundDisabled");
 
 						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxDeleteButtonForegroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("FilledTextBoxDeleteButtonForegroundFocused");
+						public ThemeResourceKey<Brush> Focused = new("FilledTextBoxDeleteButtonForegroundFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxDeleteButtonForegroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("FilledTextBoxDeleteButtonForegroundDisabled");
+						public static implicit operator ThemeResourceKey<Brush>(DeleteButtonForegroundVSG self) => self.Default;
 					}
 
-					public static class Background
+					public static readonly ForegroundVSG Foreground = new();
+					public partial class ForegroundVSG
 					{
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBackground")]
-						public static ThemeResourceKey<Brush> Default => new("FilledTextBoxBackground");
+						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxForeground")]
+						public ThemeResourceKey<Brush> Default = new("FilledTextBoxForeground");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBackgroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("FilledTextBoxBackgroundPointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxForegroundPointerOver")]
+						public ThemeResourceKey<Brush> PointerOver = new("FilledTextBoxForegroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBackgroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("FilledTextBoxBackgroundFocused");
+						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxForegroundDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("FilledTextBoxForegroundDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBackgroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("FilledTextBoxBackgroundDisabled");
+						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxForegroundFocused")]
+						public ThemeResourceKey<Brush> Focused = new("FilledTextBoxForegroundFocused");
 
+						public static implicit operator ThemeResourceKey<Brush>(ForegroundVSG self) => self.Default;
 					}
 
-					public static class BorderBrush
+					public static readonly LeadingIconForegroundVSG LeadingIconForeground = new();
+					public partial class LeadingIconForegroundVSG
 					{
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBorderBrush")]
-						public static ThemeResourceKey<Brush> Default => new("FilledTextBoxBorderBrush");
-
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBorderBrushPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("FilledTextBoxBorderBrushPointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "TextBoxLeadingIconForeground")]
+						public ThemeResourceKey<Brush> Default = new("TextBoxLeadingIconForeground");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBorderBrushFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("FilledTextBoxBorderBrushFocused");
+						[ResourceKeyDefinition(typeof(Brush), "TextBoxLeadingIconForegroundDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("TextBoxLeadingIconForegroundDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBorderBrushDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("FilledTextBoxBorderBrushDisabled");
+						public static implicit operator ThemeResourceKey<Brush>(LeadingIconForegroundVSG self) => self.Default;
 					}
 
-					public static class BorderThickness
+					public static readonly PlaceholderForegroundVSG PlaceholderForeground = new();
+					public partial class PlaceholderForegroundVSG
 					{
-						[ResourceKeyDefinition(typeof(Thickness), "FilledTextBoxBorderThicknessNormal")]
-						public static ThemeResourceKey<Thickness> Default => new("FilledTextBoxBorderThicknessNormal");
+						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxPlaceholderForeground")]
+						public ThemeResourceKey<Brush> Default = new("FilledTextBoxPlaceholderForeground");
 
-						[ResourceKeyDefinition(typeof(Thickness), "FilledTextBoxBorderThicknessFocused")]
-						public static ThemeResourceKey<Thickness> Focused => new("FilledTextBoxBorderThicknessFocused");
+						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxPlaceholderForegroundPointerOver")]
+						public ThemeResourceKey<Brush> PointerOver = new("FilledTextBoxPlaceholderForegroundPointerOver");
+
+						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxPlaceholderForegroundDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("FilledTextBoxPlaceholderForegroundDisabled");
+
+						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxPlaceholderForegroundFocused")]
+						public ThemeResourceKey<Brush> Focused = new("FilledTextBoxPlaceholderForegroundFocused");
+
+						public static implicit operator ThemeResourceKey<Brush>(PlaceholderForegroundVSG self) => self.Default;
 					}
 
-					public static class Typography
-					{
-						[ResourceKeyDefinition(typeof(FontFamily), "FilledTextBoxFontFamily")]
-						public static ThemeResourceKey<FontFamily> FontFamily => new("FilledTextBoxFontFamily");
+					[ResourceKeyDefinition(typeof(double), "FilledTextBoxBorderThicknessFocused")]
+					public static ThemeResourceKey<double> BorderThicknessFocused => new("FilledTextBoxBorderThicknessFocused");
 
-						[ResourceKeyDefinition(typeof(double), "FilledTextBoxFontSize")]
-						public static ThemeResourceKey<double> FontSize => new("FilledTextBoxFontSize");
+					[ResourceKeyDefinition(typeof(int), "FilledTextBoxCharacterSpacing")]
+					public static ThemeResourceKey<int> CharacterSpacing => new("FilledTextBoxCharacterSpacing");
 
-						[ResourceKeyDefinition(typeof(FontWeights), "FilledTextBoxFontWeight")]
-						public static ThemeResourceKey<FontWeights> FontWeight => new("FilledTextBoxFontWeight");
+					[ResourceKeyDefinition(typeof(CornerRadius), "MaterialFilledTextBoxCornerRadius")]
+					public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialFilledTextBoxCornerRadius");
 
-						[ResourceKeyDefinition(typeof(int), "FilledTextBoxCharacterSpacing")]
-						public static ThemeResourceKey<int> CharacterSpacing => new("FilledTextBoxCharacterSpacing");
-					}
+					[ResourceKeyDefinition(typeof(FontFamily), "FilledTextBoxFontFamily")]
+					public static ThemeResourceKey<FontFamily> FontFamily => new("FilledTextBoxFontFamily");
 
-					[ResourceKeyDefinition(typeof(Microsoft.UI.Xaml.CornerRadius), "MaterialFilledTextBoxCornerRadius")]
-					public static ThemeResourceKey<Microsoft.UI.Xaml.CornerRadius> CornerRadius => new("MaterialFilledTextBoxCornerRadius");
+					[ResourceKeyDefinition(typeof(double), "FilledTextBoxFontSize")]
+					public static ThemeResourceKey<double> FontSize => new("FilledTextBoxFontSize");
 
-					[ResourceKeyDefinition(typeof(Thickness), "MaterialFilledTextBoxPadding")]
-					public static ThemeResourceKey<Thickness> Padding => new("MaterialFilledTextBoxPadding");
+					[ResourceKeyDefinition(typeof(string), "FilledTextBoxFontWeight")]
+					public static ThemeResourceKey<string> FontWeight => new("FilledTextBoxFontWeight");
+
+					[ResourceKeyDefinition(typeof(double), "FilledTextBoxForegroundOpacityDisabled")]
+					public static ThemeResourceKey<double> ForegroundOpacityDisabled => new("FilledTextBoxForegroundOpacityDisabled");
 
 					[ResourceKeyDefinition(typeof(double), "MaterialFilledTextBoxMinHeight")]
 					public static ThemeResourceKey<double> MinHeight => new("MaterialFilledTextBoxMinHeight");
 
-					[ResourceKeyDefinition(typeof(double), "MaterialFilledTextBoxBorderHeightFocused")]
-					public static ThemeResourceKey<double> BorderHeightFocused => new("MaterialFilledTextBoxBorderHeightFocused");
+					[ResourceKeyDefinition(typeof(Thickness), "MaterialFilledTextBoxPadding")]
+					public static ThemeResourceKey<Thickness> Padding => new("MaterialFilledTextBoxPadding");
 				}
 
-				public static class Outlined
+				public static partial class Outlined
 				{
-					public static class Foreground
+					public static readonly BorderBrushVSG BorderBrush = new();
+					public partial class BorderBrushVSG
 					{
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxForeground")]
-						public static ThemeResourceKey<Brush> Default => new("OutlinedTextBoxForeground");
+						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxBorderBrush")]
+						public ThemeResourceKey<Brush> Default = new("OutlinedTextBoxBorderBrush");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxForegroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("OutlinedTextBoxForegroundPointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxBorderBrushPointerOver")]
+						public ThemeResourceKey<Brush> PointerOver = new("OutlinedTextBoxBorderBrushPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxForegroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("OutlinedTextBoxForegroundFocused");
+						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxBorderBrushDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("OutlinedTextBoxBorderBrushDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxForegroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("OutlinedTextBoxForegroundDisabled");
+						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxBorderBrushFocused")]
+						public ThemeResourceKey<Brush> Focused = new("OutlinedTextBoxBorderBrushFocused");
+
+						public static implicit operator ThemeResourceKey<Brush>(BorderBrushVSG self) => self.Default;
 					}
 
-					public static class PlaceholderForeground
+					public static readonly ForegroundVSG Foreground = new();
+					public partial class ForegroundVSG
 					{
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxPlaceholderForeground")]
-						public static ThemeResourceKey<Brush> Default => new("OutlinedTextBoxPlaceholderForeground");
+						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxForeground")]
+						public ThemeResourceKey<Brush> Default = new("OutlinedTextBoxForeground");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxPlaceholderForegroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("OutlinedTextBoxPlaceholderForegroundPointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxForegroundPointerOver")]
+						public ThemeResourceKey<Brush> PointerOver = new("OutlinedTextBoxForegroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxPlaceholderForegroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("OutlinedTextBoxPlaceholderForegroundFocused");
+						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxForegroundDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("OutlinedTextBoxForegroundDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxPlaceholderForegroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("OutlinedTextBoxPlaceholderForegroundDisabled");
+						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxForegroundFocused")]
+						public ThemeResourceKey<Brush> Focused = new("OutlinedTextBoxForegroundFocused");
+
+						public static implicit operator ThemeResourceKey<Brush>(ForegroundVSG self) => self.Default;
 					}
 
-					public static class BorderBrush
+					public static readonly LeadingIconForegroundVSG LeadingIconForeground = new();
+					public partial class LeadingIconForegroundVSG
 					{
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxBorderBrush")]
-						public static ThemeResourceKey<Brush> Default => new("OutlinedTextBoxBorderBrush");
-
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxBorderBrushPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("OutlinedTextBoxBorderBrushPointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "TextBoxLeadingIconForeground")]
+						public ThemeResourceKey<Brush> Default = new("TextBoxLeadingIconForeground");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxBorderBrushFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("OutlinedTextBoxBorderBrushFocused");
+						[ResourceKeyDefinition(typeof(Brush), "TextBoxLeadingIconForegroundDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("TextBoxLeadingIconForegroundDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxBorderBrushDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("OutlinedTextBoxBorderBrushDisabled");
+						public static implicit operator ThemeResourceKey<Brush>(LeadingIconForegroundVSG self) => self.Default;
 					}
 
-					public static class Typography
+					public static readonly PlaceholderForegroundVSG PlaceholderForeground = new();
+					public partial class PlaceholderForegroundVSG
 					{
-						[ResourceKeyDefinition(typeof(FontFamily), "OutlinedTextBoxFontFamily")]
-						public static ThemeResourceKey<FontFamily> FontFamily => new("OutlinedTextBoxFontFamily");
+						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxPlaceholderForeground")]
+						public ThemeResourceKey<Brush> Default = new("OutlinedTextBoxPlaceholderForeground");
+
+						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxPlaceholderForegroundPointerOver")]
+						public ThemeResourceKey<Brush> PointerOver = new("OutlinedTextBoxPlaceholderForegroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(double), "OutlinedTextBoxFontSize")]
-						public static ThemeResourceKey<double> FontSize => new("OutlinedTextBoxFontSize");
+						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxPlaceholderForegroundDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("OutlinedTextBoxPlaceholderForegroundDisabled");
 
-						[ResourceKeyDefinition(typeof(FontWeights), "OutlinedTextBoxFontWeight")]
-						public static ThemeResourceKey<FontWeights> FontWeight => new("OutlinedTextBoxFontWeight");
+						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxPlaceholderForegroundFocused")]
+						public ThemeResourceKey<Brush> Focused = new("OutlinedTextBoxPlaceholderForegroundFocused");
 
-						[ResourceKeyDefinition(typeof(int), "OutlinedTextBoxCharacterSpacing")]
-						public static ThemeResourceKey<int> CharacterSpacing => new("OutlinedTextBoxCharacterSpacing");
+						public static implicit operator ThemeResourceKey<Brush>(PlaceholderForegroundVSG self) => self.Default;
 					}
 
+					[ResourceKeyDefinition(typeof(Thickness), "MaterialOutlinedTextBoxBorderPadding")]
+					public static ThemeResourceKey<Thickness> BorderPadding => new("MaterialOutlinedTextBoxBorderPadding");
+
 					[ResourceKeyDefinition(typeof(double), "MaterialOutlinedTextBoxBorderThickness")]
 					public static ThemeResourceKey<double> BorderThickness => new("MaterialOutlinedTextBoxBorderThickness");
 
-					[ResourceKeyDefinition(typeof(Microsoft.UI.Xaml.CornerRadius), "MaterialOutlinedTextBoxCornerRadius")]
-					public static ThemeResourceKey<Microsoft.UI.Xaml.CornerRadius> CornerRadius => new("MaterialOutlinedTextBoxCornerRadius");
-
-					[ResourceKeyDefinition(typeof(Thickness), "MaterialOutlinedTextBoxPadding")]
-					public static ThemeResourceKey<Thickness> Padding => new("MaterialOutlinedTextBoxPadding");
-
-					[ResourceKeyDefinition(typeof(double), "MaterialOutlinedTextBoxMinHeight")]
-					public static ThemeResourceKey<double> MinHeight => new("MaterialOutlinedTextBoxMinHeight");
-
-					[ResourceKeyDefinition(typeof(double), "MaterialOutlinedTextBoxBorderPadding")]
-					public static ThemeResourceKey<double> BorderPadding => new("MaterialOutlinedTextBoxBorderPadding");
-
 					[ResourceKeyDefinition(typeof(double), "MaterialOutlinedTextBoxBorderThicknessFocused")]
 					public static ThemeResourceKey<double> BorderThicknessFocused => new("MaterialOutlinedTextBoxBorderThicknessFocused");
-				}
 
-				public static class DeleteButtonForeground
-				{
-					[ResourceKeyDefinition(typeof(Brush), "TextBoxDeleteButtonForeground")]
-					public static ThemeResourceKey<Brush> Default => new("TextBoxDeleteButtonForeground");
+					[ResourceKeyDefinition(typeof(int), "OutlinedTextBoxCharacterSpacing")]
+					public static ThemeResourceKey<int> CharacterSpacing => new("OutlinedTextBoxCharacterSpacing");
 
-					[ResourceKeyDefinition(typeof(Brush), "TextBoxDeleteButtonForegroundPointerOver")]
-					public static ThemeResourceKey<Brush> PointerOver => new("TextBoxDeleteButtonForegroundPointerOver");
+					[ResourceKeyDefinition(typeof(CornerRadius), "MaterialOutlinedTextBoxCornerRadius")]
+					public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialOutlinedTextBoxCornerRadius");
 
-					[ResourceKeyDefinition(typeof(Brush), "TextBoxDeleteButtonForegroundPressed")]
-					public static ThemeResourceKey<Brush> Pressed => new("TextBoxDeleteButtonForegroundPressed");
+					[ResourceKeyDefinition(typeof(FontFamily), "OutlinedTextBoxFontFamily")]
+					public static ThemeResourceKey<FontFamily> FontFamily => new("OutlinedTextBoxFontFamily");
 
-					[ResourceKeyDefinition(typeof(Brush), "TextBoxDeleteButtonForegroundDisabled")]
-					public static ThemeResourceKey<Brush> Disabled => new("TextBoxDeleteButtonForegroundDisabled");
-				}
+					[ResourceKeyDefinition(typeof(double), "OutlinedTextBoxFontSize")]
+					public static ThemeResourceKey<double> FontSize => new("OutlinedTextBoxFontSize");
 
-				public static class LeadingIconForeground
-				{
-					[ResourceKeyDefinition(typeof(Brush), "TextBoxLeadingIconForeground")]
-					public static ThemeResourceKey<Brush> Default => new("TextBoxLeadingIconForeground");
+					[ResourceKeyDefinition(typeof(string), "OutlinedTextBoxFontWeight")]
+					public static ThemeResourceKey<string> FontWeight => new("OutlinedTextBoxFontWeight");
 
-					[ResourceKeyDefinition(typeof(Brush), "TextBoxLeadingIconForegroundDisabled")]
-					public static ThemeResourceKey<Brush> Disabled => new("TextBoxLeadingIconForegroundDisabled");
-				}
+					[ResourceKeyDefinition(typeof(double), "OutlinedTextBoxForegroundOpacityDisabled")]
+					public static ThemeResourceKey<double> ForegroundOpacityDisabled => new("OutlinedTextBoxForegroundOpacityDisabled");
 
-				[ResourceKeyDefinition(typeof(double), "MaterialTextBoxClearGlyphWidth")]
-				public static ThemeResourceKey<double> ClearGlyphWidth => new("MaterialTextBoxClearGlyphWidth");
+					[ResourceKeyDefinition(typeof(double), "MaterialOutlinedTextBoxMinHeight")]
+					public static ThemeResourceKey<double> MinHeight => new("MaterialOutlinedTextBoxMinHeight");
 
-				[ResourceKeyDefinition(typeof(double), "MaterialTextBoxClearGlyphHeight")]
-				public static ThemeResourceKey<double> ClearGlyphHeight => new("MaterialTextBoxClearGlyphHeight");
+					[ResourceKeyDefinition(typeof(Thickness), "MaterialOutlinedTextBoxPadding")]
+					public static ThemeResourceKey<Thickness> Padding => new("MaterialOutlinedTextBoxPadding");
+				}
 			}
 
-			public static class Styles
+			public static partial class Styles
 			{
-				[ResourceKeyDefinition(typeof(Style), "FilledTextBoxStyle", TargetType = typeof(TextBox))]
-				public static StaticResourceKey<Style> Filled => new("FilledTextBoxStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialFilledTextBoxStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> Filled => new("MaterialFilledTextBoxStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "OutlinedTextBoxStyle", TargetType = typeof(TextBox))]
-				public static StaticResourceKey<Style> Outlined => new("OutlinedTextBoxStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialOutlinedTextBoxStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> Outlined => new("MaterialOutlinedTextBoxStyle");
 			}
 		}
 	}
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleButton.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleButton.cs
index 4b6a75e78..24964d03f 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleButton.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleButton.cs
@@ -1,4 +1,6 @@
-using Microsoft.UI.Text;
+using System;
+using Windows.UI;
+using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
 using Uno.Extensions.Markup;
@@ -8,336 +10,306 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class ToggleButton
+		public static partial class ToggleButton
 		{
-			public static class Resources
+			public static partial class Resources
 			{
-				public static class Text
+				public static partial class Icon
 				{
-					public static class Background
+					public static readonly BackgroundVSG Background = new();
+					public partial class BackgroundVSG
 					{
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackground")]
-						public static ThemeResourceKey<Brush> Default => new("TextToggleButtonBackground");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackground")]
+						public ThemeResourceKey<Brush> Default = new("IconToggleButtonBackground");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("TextToggleButtonBackgroundPointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundPointerOver")]
+						public ThemeResourceKey<Brush> PointerOver = new("IconToggleButtonBackgroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("TextToggleButtonBackgroundPressed");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundPressed")]
+						public ThemeResourceKey<Brush> Pressed = new("IconToggleButtonBackgroundPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("TextToggleButtonBackgroundDisabled");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("IconToggleButtonBackgroundDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundChecked")]
-						public static ThemeResourceKey<Brush> Checked => new("TextToggleButtonBackgroundChecked");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundChecked")]
+						public ThemeResourceKey<Brush> Checked = new("IconToggleButtonBackgroundChecked");
+
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundCheckedPointerOver")]
+						public ThemeResourceKey<Brush> CheckedPointerOver = new("IconToggleButtonBackgroundCheckedPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundCheckedPointerOver")]
-						public static ThemeResourceKey<Brush> CheckedPointerOver => new("TextToggleButtonBackgroundCheckedPointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundCheckedPressed")]
+						public ThemeResourceKey<Brush> CheckedPressed = new("IconToggleButtonBackgroundCheckedPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundCheckedPressed")]
-						public static ThemeResourceKey<Brush> CheckedPressed => new("TextToggleButtonBackgroundCheckedPressed");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundCheckedDisabled")]
+						public ThemeResourceKey<Brush> CheckedDisabled = new("IconToggleButtonBackgroundCheckedDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundCheckedDisabled")]
-						public static ThemeResourceKey<Brush> CheckedDisabled => new("TextToggleButtonBackgroundCheckedDisabled");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundIndeterminate")]
+						public ThemeResourceKey<Brush> IndeterminateNormal = new("IconToggleButtonBackgroundIndeterminate");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundIndeterminate")]
-						public static ThemeResourceKey<Brush> Indeterminate => new("TextToggleButtonBackgroundIndeterminate");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundIndeterminatePointerOver")]
+						public ThemeResourceKey<Brush> IndeterminatePointerOver = new("IconToggleButtonBackgroundIndeterminatePointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundIndeterminatePointerOver")]
-						public static ThemeResourceKey<Brush> IndeterminatePointerOver => new("TextToggleButtonBackgroundIndeterminatePointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundIndeterminatePressed")]
+						public ThemeResourceKey<Brush> IndeterminatePressed = new("IconToggleButtonBackgroundIndeterminatePressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundIndeterminatePressed")]
-						public static ThemeResourceKey<Brush> IndeterminatePressed => new("TextToggleButtonBackgroundIndeterminatePressed");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundIndeterminateDisabled")]
+						public ThemeResourceKey<Brush> IndeterminateDisabled = new("IconToggleButtonBackgroundIndeterminateDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundIndeterminateDisabled")]
-						public static ThemeResourceKey<Brush> IndeterminateDisabled => new("TextToggleButtonBackgroundIndeterminateDisabled");
+						public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
 					}
 
-					public static class Foreground
+					public static readonly BorderBrushVSG BorderBrush = new();
+					public partial class BorderBrushVSG
 					{
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonForeground")]
-						public static ThemeResourceKey<Brush> Default => new("TextToggleButtonForeground");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrush")]
+						public ThemeResourceKey<Brush> Default = new("IconToggleButtonBorderBrush");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonForegroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("TextToggleButtonForegroundPointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushPointerOver")]
+						public ThemeResourceKey<Brush> PointerOver = new("IconToggleButtonBorderBrushPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonForegroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("TextToggleButtonForegroundPressed");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushPressed")]
+						public ThemeResourceKey<Brush> Pressed = new("IconToggleButtonBorderBrushPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonForegroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("TextToggleButtonForegroundDisabled");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("IconToggleButtonBorderBrushDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonForegroundChecked")]
-						public static ThemeResourceKey<Brush> Checked => new("TextToggleButtonForegroundChecked");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushChecked")]
+						public ThemeResourceKey<Brush> Checked = new("IconToggleButtonBorderBrushChecked");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonForegroundCheckedPointerOver")]
-						public static ThemeResourceKey<Brush> CheckedPointerOver => new("TextToggleButtonForegroundCheckedPointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushCheckedPointerOver")]
+						public ThemeResourceKey<Brush> CheckedPointerOver = new("IconToggleButtonBorderBrushCheckedPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonForegroundCheckedPressed")]
-						public static ThemeResourceKey<Brush> CheckedPressed => new("TextToggleButtonForegroundCheckedPressed");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushCheckedPressed")]
+						public ThemeResourceKey<Brush> CheckedPressed = new("IconToggleButtonBorderBrushCheckedPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonForegroundCheckedDisabled")]
-						public static ThemeResourceKey<Brush> CheckedDisabled => new("TextToggleButtonForegroundCheckedDisabled");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushCheckedDisabled")]
+						public ThemeResourceKey<Brush> CheckedDisabled = new("IconToggleButtonBorderBrushCheckedDisabled");
+
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushIndeterminate")]
+						public ThemeResourceKey<Brush> IndeterminateNormal = new("IconToggleButtonBorderBrushIndeterminate");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonForegroundIndeterminate")]
-						public static ThemeResourceKey<Brush> Indeterminate => new("TextToggleButtonForegroundIndeterminate");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushIndeterminatePointerOver")]
+						public ThemeResourceKey<Brush> IndeterminatePointerOver = new("IconToggleButtonBorderBrushIndeterminatePointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonForegroundIndeterminatePointerOver")]
-						public static ThemeResourceKey<Brush> IndeterminatePointerOver => new("TextToggleButtonForegroundIndeterminatePointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushIndeterminatePressed")]
+						public ThemeResourceKey<Brush> IndeterminatePressed = new("IconToggleButtonBorderBrushIndeterminatePressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonForegroundIndeterminatePressed")]
-						public static ThemeResourceKey<Brush> IndeterminatePressed => new("TextToggleButtonForegroundIndeterminatePressed");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushIndeterminateDisabled")]
+						public ThemeResourceKey<Brush> IndeterminateDisabled = new("IconToggleButtonBorderBrushIndeterminateDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonForegroundIndeterminateDisabled")]
-						public static ThemeResourceKey<Brush> IndeterminateDisabled => new("TextToggleButtonForegroundIndeterminateDisabled");
+						public static implicit operator ThemeResourceKey<Brush>(BorderBrushVSG self) => self.Default;
 					}
 
-					public static class BorderBrush
+					public static readonly ForegroundVSG Foreground = new();
+					public partial class ForegroundVSG
 					{
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrush")]
-						public static ThemeResourceKey<Brush> Default => new("TextToggleButtonBorderBrush");
-
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("TextToggleButtonBorderBrushPointerOver");
-
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("TextToggleButtonBorderBrushPressed");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForeground")]
+						public ThemeResourceKey<Brush> Default = new("IconToggleButtonForeground");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("TextToggleButtonBorderBrushDisabled");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundPointerOver")]
+						public ThemeResourceKey<Brush> PointerOver = new("IconToggleButtonForegroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushChecked")]
-						public static ThemeResourceKey<Brush> Checked => new("TextToggleButtonBorderBrushChecked");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundPressed")]
+						public ThemeResourceKey<Brush> Pressed = new("IconToggleButtonForegroundPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushCheckedPointerOver")]
-						public static ThemeResourceKey<Brush> CheckedPointerOver => new("TextToggleButtonBorderBrushCheckedPointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("IconToggleButtonForegroundDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushCheckedPressed")]
-						public static ThemeResourceKey<Brush> CheckedPressed => new("TextToggleButtonBorderBrushCheckedPressed");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundChecked")]
+						public ThemeResourceKey<Brush> Checked = new("IconToggleButtonForegroundChecked");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushCheckedDisabled")]
-						public static ThemeResourceKey<Brush> CheckedDisabled => new("TextToggleButtonBorderBrushCheckedDisabled");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundCheckedPointerOver")]
+						public ThemeResourceKey<Brush> CheckedPointerOver = new("IconToggleButtonForegroundCheckedPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushIndeterminate")]
-						public static ThemeResourceKey<Brush> Indeterminate => new("TextToggleButtonBorderBrushIndeterminate");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundCheckedPressed")]
+						public ThemeResourceKey<Brush> CheckedPressed = new("IconToggleButtonForegroundCheckedPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushIndeterminatePointerOver")]
-						public static ThemeResourceKey<Brush> IndeterminatePointerOver => new("TextToggleButtonBorderBrushIndeterminatePointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundCheckedDisabled")]
+						public ThemeResourceKey<Brush> CheckedDisabled = new("IconToggleButtonForegroundCheckedDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushIndeterminatePressed")]
-						public static ThemeResourceKey<Brush> IndeterminatePressed => new("TextToggleButtonBorderBrushIndeterminatePressed");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundIndeterminate")]
+						public ThemeResourceKey<Brush> IndeterminateNormal = new("IconToggleButtonForegroundIndeterminate");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushIndeterminateDisabled")]
-						public static ThemeResourceKey<Brush> IndeterminateDisabled => new("TextToggleButtonBorderBrushIndeterminateDisabled");
-					}
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundIndeterminatePointerOver")]
+						public ThemeResourceKey<Brush> IndeterminatePointerOver = new("IconToggleButtonForegroundIndeterminatePointerOver");
 
-					public static class BorderBrushOverlay
-					{
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushHoverOverlay")]
-						public static ThemeResourceKey<Brush> Hover => new("TextToggleButtonBorderBrushHoverOverlay");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundIndeterminatePressed")]
+						public ThemeResourceKey<Brush> IndeterminatePressed = new("IconToggleButtonForegroundIndeterminatePressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushFocusedOverlay")]
-						public static ThemeResourceKey<Brush> Focused => new("TextToggleButtonBorderBrushFocusedOverlay");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundIndeterminateDisabled")]
+						public ThemeResourceKey<Brush> IndeterminateDisabled = new("IconToggleButtonForegroundIndeterminateDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushSelectedOverlay")]
-						public static ThemeResourceKey<Brush> Selected => new("TextToggleButtonBorderBrushSelectedOverlay");
+						public static implicit operator ThemeResourceKey<Brush>(ForegroundVSG self) => self.Default;
 					}
 
-					public static class Typography
+					public static partial class StateCircle
 					{
-						[ResourceKeyDefinition(typeof(FontFamily), "TextToggleButtonFontFamily")]
-						public static ThemeResourceKey<FontFamily> FontFamily => new("TextToggleButtonFontFamily");
+						public static partial class Opacity
+						{
+							[ResourceKeyDefinition(typeof(double), "IconToggleButtonStateCircleOpacityPointerOver")]
+							public static ThemeResourceKey<double> PointerOver => new("IconToggleButtonStateCircleOpacityPointerOver");
 
-						[ResourceKeyDefinition(typeof(double), "TextToggleButtonFontSize")]
-						public static ThemeResourceKey<double> FontSize => new("TextToggleButtonFontSize");
-					}
+							[ResourceKeyDefinition(typeof(double), "IconToggleButtonStateCircleOpacityPressed")]
+							public static ThemeResourceKey<double> Pressed => new("IconToggleButtonStateCircleOpacityPressed");
+						}
 
-					[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonFeedbackFocused")]
-					public static ThemeResourceKey<Brush> FeedbackFocused => new("TextToggleButtonFeedbackFocused");
+						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonStateCircleFill")]
+						public static ThemeResourceKey<Brush> Fill => new("IconToggleButtonStateCircleFill");
 
-					[ResourceKeyDefinition(typeof(Thickness), "TextToggleButtonBorderThickness")]
-					public static ThemeResourceKey<Thickness> BorderThickness => new("TextToggleButtonBorderThickness");
+						[ResourceKeyDefinition(typeof(double), "IconToggleButtonStateCircleOpacityFocused")]
+						public static ThemeResourceKey<double> OpacityFocused => new("IconToggleButtonStateCircleOpacityFocused");
+					}
 
-					[ResourceKeyDefinition(typeof(CornerRadius), "TextToggleButtonCornerRadius")]
-					public static ThemeResourceKey<CornerRadius> CornerRadius => new("TextToggleButtonCornerRadius");
+					[ResourceKeyDefinition(typeof(Thickness), "IconToggleButtonBorderThickness")]
+					public static ThemeResourceKey<Thickness> BorderThickness => new("IconToggleButtonBorderThickness");
 
-					[ResourceKeyDefinition(typeof(Thickness), "TextToggleButtonPadding")]
-					public static ThemeResourceKey<Thickness> Padding => new("TextToggleButtonPadding");
+					[ResourceKeyDefinition(typeof(double), "IconToggleButtonMinHeight")]
+					public static ThemeResourceKey<double> MinHeight => new("IconToggleButtonMinHeight");
 
-					[ResourceKeyDefinition(typeof(double), "TextToggleButtonMinHeight")]
-					public static ThemeResourceKey<double> MinHeight => new("TextToggleButtonMinHeight");
+					[ResourceKeyDefinition(typeof(double), "IconToggleButtonMinWidth")]
+					public static ThemeResourceKey<double> MinWidth => new("IconToggleButtonMinWidth");
 				}
 
-				public static class Icon
+				public static partial class Text
 				{
-					public static class Background
+					public static readonly BackgroundVSG Background = new();
+					public partial class BackgroundVSG
 					{
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackground")]
-						public static ThemeResourceKey<Brush> Default => new("IconToggleButtonBackground");
-
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("IconToggleButtonBackgroundPointerOver");
-
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("IconToggleButtonBackgroundPressed");
+						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackground")]
+						public ThemeResourceKey<Brush> Default = new("TextToggleButtonBackground");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("IconToggleButtonBackgroundDisabled");
+						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundPointerOver")]
+						public ThemeResourceKey<Brush> PointerOver = new("TextToggleButtonBackgroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundChecked")]
-						public static ThemeResourceKey<Brush> Checked => new("IconToggleButtonBackgroundChecked");
+						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundPressed")]
+						public ThemeResourceKey<Brush> Pressed = new("TextToggleButtonBackgroundPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundCheckedPointerOver")]
-						public static ThemeResourceKey<Brush> CheckedPointerOver => new("IconToggleButtonBackgroundCheckedPointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("TextToggleButtonBackgroundDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundCheckedPressed")]
-						public static ThemeResourceKey<Brush> CheckedPressed => new("IconToggleButtonBackgroundCheckedPressed");
+						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundChecked")]
+						public ThemeResourceKey<Brush> Checked = new("TextToggleButtonBackgroundChecked");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundCheckedDisabled")]
-						public static ThemeResourceKey<Brush> CheckedDisabled => new("IconToggleButtonBackgroundCheckedDisabled");
+						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundIndeterminate")]
+						public ThemeResourceKey<Brush> IndeterminateNormal = new("TextToggleButtonBackgroundIndeterminate");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundIndeterminate")]
-						public static ThemeResourceKey<Brush> Indeterminate => new("IconToggleButtonBackgroundIndeterminate");
+						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundIndeterminatePointerOver")]
+						public ThemeResourceKey<Brush> IndeterminatePointerOver = new("TextToggleButtonBackgroundIndeterminatePointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundIndeterminatePointerOver")]
-						public static ThemeResourceKey<Brush> IndeterminatePointerOver => new("IconToggleButtonBackgroundIndeterminatePointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundIndeterminatePressed")]
+						public ThemeResourceKey<Brush> IndeterminatePressed = new("TextToggleButtonBackgroundIndeterminatePressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundIndeterminatePressed")]
-						public static ThemeResourceKey<Brush> IndeterminatePressed => new("IconToggleButtonBackgroundIndeterminatePressed");
+						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundIndeterminateDisabled")]
+						public ThemeResourceKey<Brush> IndeterminateDisabled = new("TextToggleButtonBackgroundIndeterminateDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundIndeterminateDisabled")]
-						public static ThemeResourceKey<Brush> IndeterminateDisabled => new("IconToggleButtonBackgroundIndeterminateDisabled");
+						public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
 					}
 
-					public static class Foreground
+					public static readonly BorderBrushVSG BorderBrush = new();
+					public partial class BorderBrushVSG
 					{
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForeground")]
-						public static ThemeResourceKey<Brush> Default => new("IconToggleButtonForeground");
-
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("IconToggleButtonForegroundPointerOver");
-
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("IconToggleButtonForegroundPressed");
+						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrush")]
+						public ThemeResourceKey<Brush> Default = new("TextToggleButtonBorderBrush");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("IconToggleButtonForegroundDisabled");
+						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushPointerOver")]
+						public ThemeResourceKey<Brush> PointerOver = new("TextToggleButtonBorderBrushPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundChecked")]
-						public static ThemeResourceKey<Brush> Checked => new("IconToggleButtonForegroundChecked");
+						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushPressed")]
+						public ThemeResourceKey<Brush> Pressed = new("TextToggleButtonBorderBrushPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundCheckedPointerOver")]
-						public static ThemeResourceKey<Brush> CheckedPointerOver => new("IconToggleButtonForegroundCheckedPointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("TextToggleButtonBorderBrushDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundCheckedPressed")]
-						public static ThemeResourceKey<Brush> CheckedPressed => new("IconToggleButtonForegroundCheckedPressed");
+						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushChecked")]
+						public ThemeResourceKey<Brush> Checked = new("TextToggleButtonBorderBrushChecked");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundCheckedDisabled")]
-						public static ThemeResourceKey<Brush> CheckedDisabled => new("IconToggleButtonForegroundCheckedDisabled");
+						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushIndeterminate")]
+						public ThemeResourceKey<Brush> IndeterminateNormal = new("TextToggleButtonBorderBrushIndeterminate");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundIndeterminate")]
-						public static ThemeResourceKey<Brush> Indeterminate => new("IconToggleButtonForegroundIndeterminate");
+						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushIndeterminatePointerOver")]
+						public ThemeResourceKey<Brush> IndeterminatePointerOver = new("TextToggleButtonBorderBrushIndeterminatePointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundIndeterminatePointerOver")]
-						public static ThemeResourceKey<Brush> IndeterminatePointerOver => new("IconToggleButtonForegroundIndeterminatePointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushIndeterminatePressed")]
+						public ThemeResourceKey<Brush> IndeterminatePressed = new("TextToggleButtonBorderBrushIndeterminatePressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundIndeterminatePressed")]
-						public static ThemeResourceKey<Brush> IndeterminatePressed => new("IconToggleButtonForegroundIndeterminatePressed");
+						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushIndeterminateDisabled")]
+						public ThemeResourceKey<Brush> IndeterminateDisabled = new("TextToggleButtonBorderBrushIndeterminateDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundIndeterminateDisabled")]
-						public static ThemeResourceKey<Brush> IndeterminateDisabled => new("IconToggleButtonForegroundIndeterminateDisabled");
+						public static implicit operator ThemeResourceKey<Brush>(BorderBrushVSG self) => self.Default;
 					}
 
-					public static class BorderBrush
+					public static readonly ForegroundVSG Foreground = new();
+					public partial class ForegroundVSG
 					{
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrush")]
-						public static ThemeResourceKey<Brush> Default => new("IconToggleButtonBorderBrush");
-
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("IconToggleButtonBorderBrushPointerOver");
+						[ResourceKeyDefinition(typeof(Color), "TextToggleButtonForeground")]
+						public ThemeResourceKey<Color> Default = new("TextToggleButtonForeground");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("IconToggleButtonBorderBrushPressed");
+						[ResourceKeyDefinition(typeof(Color), "TextToggleButtonForegroundPointerOver")]
+						public ThemeResourceKey<Color> PointerOver = new("TextToggleButtonForegroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("IconToggleButtonBorderBrushDisabled");
+						[ResourceKeyDefinition(typeof(Color), "TextToggleButtonForegroundPressed")]
+						public ThemeResourceKey<Color> Pressed = new("TextToggleButtonForegroundPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushChecked")]
-						public static ThemeResourceKey<Brush> Checked => new("IconToggleButtonBorderBrushChecked");
-
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushCheckedPointerOver")]
-						public static ThemeResourceKey<Brush> CheckedPointerOver => new("IconToggleButtonBorderBrushCheckedPointerOver");
-
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushCheckedPressed")]
-						public static ThemeResourceKey<Brush> CheckedPressed => new("IconToggleButtonBorderBrushCheckedPressed");
+						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonForegroundDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("TextToggleButtonForegroundDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushCheckedDisabled")]
-						public static ThemeResourceKey<Brush> CheckedDisabled => new("IconToggleButtonBorderBrushCheckedDisabled");
+						[ResourceKeyDefinition(typeof(Color), "TextToggleButtonForegroundChecked")]
+						public ThemeResourceKey<Color> Checked = new("TextToggleButtonForegroundChecked");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushIndeterminate")]
-						public static ThemeResourceKey<Brush> Indeterminate => new("IconToggleButtonBorderBrushIndeterminate");
+						[ResourceKeyDefinition(typeof(Color), "TextToggleButtonForegroundIndeterminate")]
+						public ThemeResourceKey<Color> IndeterminateNormal = new("TextToggleButtonForegroundIndeterminate");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushIndeterminatePointerOver")]
-						public static ThemeResourceKey<Brush> IndeterminatePointerOver => new("IconToggleButtonBorderBrushIndeterminatePointerOver");
+						[ResourceKeyDefinition(typeof(Color), "TextToggleButtonForegroundIndeterminatePointerOver")]
+						public ThemeResourceKey<Color> IndeterminatePointerOver = new("TextToggleButtonForegroundIndeterminatePointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushIndeterminatePressed")]
-						public static ThemeResourceKey<Brush> IndeterminatePressed => new("IconToggleButtonBorderBrushIndeterminatePressed");
+						[ResourceKeyDefinition(typeof(Color), "TextToggleButtonForegroundIndeterminatePressed")]
+						public ThemeResourceKey<Color> IndeterminatePressed = new("TextToggleButtonForegroundIndeterminatePressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushIndeterminateDisabled")]
-						public static ThemeResourceKey<Brush> IndeterminateDisabled => new("IconToggleButtonBorderBrushIndeterminateDisabled");
+						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonForegroundIndeterminateDisabled")]
+						public ThemeResourceKey<Brush> IndeterminateDisabled = new("TextToggleButtonForegroundIndeterminateDisabled");
 
-						[ResourceKeyDefinition(typeof(Thickness), "IconToggleButtonBorderThickness")]
-						public static ThemeResourceKey<Thickness> BorderThickness => new("IconToggleButtonBorderThickness");
+						public static implicit operator ThemeResourceKey<Color>(ForegroundVSG self) => self.Default;
 					}
 
-					public static class BorderBrushOverlay
-					{
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushHoverOverlay")]
-						public static ThemeResourceKey<Brush> Hover => new("IconToggleButtonBorderBrushHoverOverlay");
+					[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushFocusedOverlay")]
+					public static ThemeResourceKey<Brush> BorderBrushFocusedOverlay => new("TextToggleButtonBorderBrushFocusedOverlay");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushFocusedOverlay")]
-						public static ThemeResourceKey<Brush> Focused => new("IconToggleButtonBorderBrushFocusedOverlay");
+					[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushHoverOverlay")]
+					public static ThemeResourceKey<Brush> BorderBrushHoverOverlay => new("TextToggleButtonBorderBrushHoverOverlay");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushSelectedOverlay")]
-						public static ThemeResourceKey<Brush> Selected => new("IconToggleButtonBorderBrushSelectedOverlay");
-					}
+					[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushSelectedOverlay")]
+					public static ThemeResourceKey<Brush> BorderBrushSelectedOverlay => new("TextToggleButtonBorderBrushSelectedOverlay");
 
-					public static class StateCircle
-					{
-						public static class Fill
-						{
-							[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonStateCircleFill")]
-							public static ThemeResourceKey<Brush> Default => new("IconToggleButtonStateCircleFill");
-						}
+					[ResourceKeyDefinition(typeof(Thickness), "TextToggleButtonBorderThickness")]
+					public static ThemeResourceKey<Thickness> BorderThickness => new("TextToggleButtonBorderThickness");
 
-						public static class Opacity
-						{ 
-							[ResourceKeyDefinition(typeof(double), "IconToggleButtonStateCircleOpacityPointerOver")]
-							public static ThemeResourceKey<double> PointerOver => new("IconToggleButtonStateCircleOpacityPointerOver");
+					[ResourceKeyDefinition(typeof(CornerRadius), "TextToggleButtonCornerRadius")]
+					public static ThemeResourceKey<CornerRadius> CornerRadius => new("TextToggleButtonCornerRadius");
 
-							[ResourceKeyDefinition(typeof(double), "IconToggleButtonStateCircleOpacityPressed")]
-							public static ThemeResourceKey<double> Pressed => new("IconToggleButtonStateCircleOpacityPressed");
+					[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonFeedbackFocused")]
+					public static ThemeResourceKey<Brush> FeedbackFocused => new("TextToggleButtonFeedbackFocused");
 
-							[ResourceKeyDefinition(typeof(double), "IconToggleButtonStateCircleOpacityFocused")]
-							public static ThemeResourceKey<double> Focused => new("IconToggleButtonStateCircleOpacityFocused");
-						}
-					}
+					[ResourceKeyDefinition(typeof(FontFamily), "TextToggleButtonFontFamily")]
+					public static ThemeResourceKey<FontFamily> FontFamily => new("TextToggleButtonFontFamily");
 
-					[ResourceKeyDefinition(typeof(double), "IconToggleButtonMinWidth")]
-					public static ThemeResourceKey<double> MinWidth => new("IconToggleButtonMinWidth");
+					[ResourceKeyDefinition(typeof(double), "TextToggleButtonFontSize")]
+					public static ThemeResourceKey<double> FontSize => new("TextToggleButtonFontSize");
 
-					[ResourceKeyDefinition(typeof(double), "IconToggleButtonMinHeight")]
-					public static ThemeResourceKey<double> MinHeight => new("IconToggleButtonMinHeight");
+					[ResourceKeyDefinition(typeof(double), "TextToggleButtonMinHeight")]
+					public static ThemeResourceKey<double> MinHeight => new("TextToggleButtonMinHeight");
+
+					[ResourceKeyDefinition(typeof(Thickness), "TextToggleButtonPadding")]
+					public static ThemeResourceKey<Thickness> Padding => new("TextToggleButtonPadding");
 				}
 			}
 
-			public static class Styles
+			public static partial class Styles
 			{
-				[ResourceKeyDefinition(typeof(Style), "TextToggleButtonStyle", TargetType = typeof(ToggleButton))]
-				public static StaticResourceKey<Style> Text => new("TextToggleButtonStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialTextToggleButtonStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> Text => new("MaterialTextToggleButtonStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "IconToggleButtonStyle", TargetType = typeof(ToggleButton))]
-				public static ThemeResourceKey<Style> Icon => new("IconToggleButtonStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialIconToggleButtonStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> Icon => new("MaterialIconToggleButtonStyle");
 			}
 		}
 	}
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleSwitch.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleSwitch.cs
index 9642ae2be..c711406bf 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleSwitch.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleSwitch.cs
@@ -1,4 +1,6 @@
-using System;
+using System;
+using Windows.UI;
+using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
 using Uno.Extensions.Markup;
@@ -8,223 +10,240 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class ToggleSwitch
+		public static partial class ToggleSwitch
 		{
-			public static class Resources
+			public static partial class Resources
 			{
-				public static class OuterBorder
+				public static partial class Knob
 				{
-					public static class Fill
+					public static partial class Icon
 					{
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOuterBorderFill")]
-						public static ThemeResourceKey<Brush> Default => new("ToggleSwitchOuterBorderFill");
-					}
-
-					public static class OffFill
-					{
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOffOuterBorderFill")]
-						public static ThemeResourceKey<Brush> Default => new("ToggleSwitchOffOuterBorderFill");
-					}
+						[ResourceKeyDefinition(typeof(Thickness), "KnobIconPadding")]
+						public static ThemeResourceKey<Thickness> Padding => new("KnobIconPadding");
 
-					public static class Stroke
-					{
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOuterBorderStroke")]
-						public static ThemeResourceKey<Brush> Default => new("ToggleSwitchOuterBorderStroke");
+						[ResourceKeyDefinition(typeof(double), "KnobIconSize")]
+						public static ThemeResourceKey<double> Size => new("KnobIconSize");
 					}
 
-					public static class OffStroke
+					public static readonly OffFillVSG OffFill = new();
+					public partial class OffFillVSG
 					{
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOffOuterBorderStroke")]
-						public static ThemeResourceKey<Brush> Default => new("ToggleSwitchOffOuterBorderStroke");
-					}
-				}
+						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffFill")]
+						public ThemeResourceKey<Brush> Default = new("ToggleSwitchKnobOffFill");
 
-				public static class Knob
-				{
-					public static class OnFill
-					{
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnFill")]
-						public static ThemeResourceKey<Brush> Default => new("ToggleSwitchKnobOnFill");
+						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffFillPointerOver")]
+						public ThemeResourceKey<Brush> PointerOver = new("ToggleSwitchKnobOffFillPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnFillPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("ToggleSwitchKnobOnFillPointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffFillFocused")]
+						public ThemeResourceKey<Brush> Focused = new("ToggleSwitchKnobOffFillFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnFillFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("ToggleSwitchKnobOnFillFocused");
+						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffFillPressed")]
+						public ThemeResourceKey<Brush> Pressed = new("ToggleSwitchKnobOffFillPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnFillPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("ToggleSwitchKnobOnFillPressed");
+						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffFillDisabled")]
+						public ThemeResourceKey<Brush> Disabled = new("ToggleSwitchKnobOffFillDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnFillDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("ToggleSwitchKnobOnFillDisabled");
+						public static implicit operator ThemeResourceKey<Brush>(OffFillVSG self) => self.Default;
 					}
 
-					public static class OffFill
+					public static readonly OffShadowFillVSG OffShadowFill = new();
+					public partial class OffShadowFillVSG
 					{
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffFill")]
-						public static ThemeResourceKey<Brush> Default => new("ToggleSwitchKnobOffFill");
+						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffShadowFill")]
+						public ThemeResourceKey<Brush> Default = new("ToggleSwitchKnobOffShadowFill");
 
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffFillPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("ToggleSwitchKnobOffFillPointerOver");
+						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffShadowFillPointerOver")]
+						public ThemeResourceKey<Brush> PointerOver = new("ToggleSwitchKnobOffShadowFillPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffFillFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("ToggleSwitchKnobOffFillFocused");
+						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffShadowFillFocused")]
+						public ThemeResourceKey<Brush> Focused = new("ToggleSwitchKnobOffShadowFillFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffFillPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("ToggleSwitchKnobOffFillPressed");
+						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffShadowFillPressed")]
+						public ThemeResourceKey<Brush> Pressed = new("ToggleSwitchKnobOffShadowFillPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffFillDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("ToggleSwitchKnobOffFillDisabled");
+						public static implicit operator ThemeResourceKey<Brush>(OffShadowFillVSG self) => self.Default;
 					}
 
-					public static class Shadow
+					public static partial class On
 					{
-						public static class OnFill
+						public static readonly FillVSG Fill = new();
+						public partial class FillVSG
 						{
-							[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnShadowFill")]
-							public static ThemeResourceKey<Brush> Default => new("ToggleSwitchKnobOnShadowFill");
+							[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnFill")]
+							public ThemeResourceKey<Brush> Default = new("ToggleSwitchKnobOnFill");
 
-							[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnShadowFillPointerOver")]
-							public static ThemeResourceKey<Brush> PointerOver => new("ToggleSwitchKnobOnShadowFillPointerOver");
+							[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnFillPointerOver")]
+							public ThemeResourceKey<Brush> PointerOver = new("ToggleSwitchKnobOnFillPointerOver");
 
-							[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnShadowFillFocused")]
-							public static ThemeResourceKey<Brush> Focused => new("ToggleSwitchKnobOnShadowFillFocused");
+							[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnFillFocused")]
+							public ThemeResourceKey<Brush> Focused = new("ToggleSwitchKnobOnFillFocused");
 
-							[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnShadowFillPressed")]
-							public static ThemeResourceKey<Brush> Pressed => new("ToggleSwitchKnobOnShadowFillPressed");
-						}
+							[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnFillPressed")]
+							public ThemeResourceKey<Brush> Pressed = new("ToggleSwitchKnobOnFillPressed");
 
-						public static class OffFill
-						{
-							[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffShadowFill")]
-							public static ThemeResourceKey<Brush> Default => new("ToggleSwitchKnobOffShadowFill");
+							[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnFillDisabled")]
+							public ThemeResourceKey<Brush> Disabled = new("ToggleSwitchKnobOnFillDisabled");
 
-							[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffShadowFillPointerOver")]
-							public static ThemeResourceKey<Brush> PointerOver => new("ToggleSwitchKnobOffShadowFillPointerOver");
+							public static implicit operator ThemeResourceKey<Brush>(FillVSG self) => self.Default;
+						}
 
-							[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffShadowFillFocused")]
-							public static ThemeResourceKey<Brush> Focused => new("ToggleSwitchKnobOffShadowFillFocused");
+						[ResourceKeyDefinition(typeof(Thickness), "KnobOnMargin")]
+						public static ThemeResourceKey<Thickness> Margin => new("KnobOnMargin");
+					}
 
-							[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffShadowFillPressed")]
-							public static ThemeResourceKey<Brush> Pressed => new("ToggleSwitchKnobOffShadowFillPressed");
-						}
-						
+					public static readonly OnShadowFillVSG OnShadowFill = new();
+					public partial class OnShadowFillVSG
+					{
+						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnShadowFill")]
+						public ThemeResourceKey<Brush> Default = new("ToggleSwitchKnobOnShadowFill");
 
-						[ResourceKeyDefinition(typeof(double), "SwitchKnobShadowSize")]
-						public static ThemeResourceKey<double> Size => new("SwitchKnobShadowSize");
+						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnShadowFillPointerOver")]
+						public ThemeResourceKey<Brush> PointerOver = new("ToggleSwitchKnobOnShadowFillPointerOver");
 
-						[ResourceKeyDefinition(typeof(Thickness), "SwitchKnobOnShadowMargin")]
-						public static ThemeResourceKey<Thickness> OnMargin => new("SwitchKnobOnShadowMargin");
+						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnShadowFillFocused")]
+						public ThemeResourceKey<Brush> Focused = new("ToggleSwitchKnobOnShadowFillFocused");
 
-						[ResourceKeyDefinition(typeof(Thickness), "SwitchKnobOffShadowMargin")]
-						public static ThemeResourceKey<Thickness> OffMargin => new("SwitchKnobOffShadowMargin");
+						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnShadowFillPressed")]
+						public ThemeResourceKey<Brush> Pressed = new("ToggleSwitchKnobOnShadowFillPressed");
 
-						[ResourceKeyDefinition(typeof(double), "SwitchKnobIncludingOffShadowWidth")]
-						public static ThemeResourceKey<double> IncludingOffShadowWidth => new("SwitchKnobIncludingOffShadowWidth");
+						public static implicit operator ThemeResourceKey<Brush>(OnShadowFillVSG self) => self.Default;
 					}
 
-
-					public static class BoundsFill
+					public static readonly OnSwitchBoundsFillVSG OnSwitchBoundsFill = new();
+					public partial class OnSwitchBoundsFillVSG
 					{
+						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOnSwitchKnobBoundsFill")]
+						public ThemeResourceKey<Brush> Default = new("ToggleSwitchOnSwitchKnobBoundsFill");
+
 						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobBoundsFill")]
-						public static ThemeResourceKey<Brush> Default => new("ToggleSwitchKnobBoundsFill");
+						public ThemeResourceKey<Brush> Normal = new("ToggleSwitchKnobBoundsFill");
 
 						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobBoundsFillPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("ToggleSwitchKnobBoundsFillPointerOver");
+						public ThemeResourceKey<Brush> PointerOver = new("ToggleSwitchKnobBoundsFillPointerOver");
 
 						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobBoundsFillFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("ToggleSwitchKnobBoundsFillFocused");
+						public ThemeResourceKey<Brush> Focused = new("ToggleSwitchKnobBoundsFillFocused");
 
 						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobBoundsFillPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("ToggleSwitchKnobBoundsFillPressed");
+						public ThemeResourceKey<Brush> Pressed = new("ToggleSwitchKnobBoundsFillPressed");
 
 						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobBoundsFillDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("ToggleSwitchKnobBoundsFillDisabled");
+						public ThemeResourceKey<Brush> Disabled = new("ToggleSwitchKnobBoundsFillDisabled");
+
+						public static implicit operator ThemeResourceKey<Brush>(OnSwitchBoundsFillVSG self) => self.Default;
 					}
 
-					public static class OnBoundsFill
+					public static partial class Switch
 					{
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOnSwitchKnobBoundsFill")]
-						public static ThemeResourceKey<Brush> Default => new("ToggleSwitchOnSwitchKnobBoundsFill");
-					}
-			
-					[ResourceKeyDefinition(typeof(Thickness), "SwitchKnobStrokeThickness")]
-					public static ThemeResourceKey<Thickness> StrokeThickness => new("SwitchKnobStrokeThickness");
+						[ResourceKeyDefinition(typeof(double), "SwitchKnobHeight")]
+						public static ThemeResourceKey<double> Height => new("SwitchKnobHeight");
+
+						[ResourceKeyDefinition(typeof(double), "SwitchKnobRadius")]
+						public static ThemeResourceKey<double> Radius => new("SwitchKnobRadius");
 
-					[ResourceKeyDefinition(typeof(double), "SwitchKnobWidth")]
-					public static ThemeResourceKey<double> Width => new("SwitchKnobWidth");
-					
-					[ResourceKeyDefinition(typeof(double), "KnobIconSize")]
-					public static ThemeResourceKey<double> IconSize => new("KnobIconSize");
+						[ResourceKeyDefinition(typeof(double), "SwitchKnobStrokeThickness")]
+						public static ThemeResourceKey<double> StrokeThickness => new("SwitchKnobStrokeThickness");
 
-					[ResourceKeyDefinition(typeof(Thickness), "KnobIconPadding")]
-					public static ThemeResourceKey<Thickness> IconPadding => new("KnobIconPadding");
+						[ResourceKeyDefinition(typeof(double), "SwitchKnobWidth")]
+						public static ThemeResourceKey<double> Width => new("SwitchKnobWidth");
+					}
 
-					[ResourceKeyDefinition(typeof(Thickness), "KnobOnMargin")]
-					public static ThemeResourceKey<Thickness> OnMargin => new("KnobOnMargin");
+					[ResourceKeyDefinition(typeof(double), "SwitchKnobIncludingOffShadowWidth")]
+					public static ThemeResourceKey<double> SwitchIncludingOffShadowWidth => new("SwitchKnobIncludingOffShadowWidth");
 
-					[ResourceKeyDefinition(typeof(double), "SwitchKnobHeight")]
-					public static ThemeResourceKey<double> Height => new("SwitchKnobHeight");
+					[ResourceKeyDefinition(typeof(Thickness), "SwitchKnobOffMargin")]
+					public static ThemeResourceKey<Thickness> SwitchOffMargin => new("SwitchKnobOffMargin");
 
-					[ResourceKeyDefinition(typeof(double), "SwitchKnobRadius")]
-					public static ThemeResourceKey<double> Radius => new("SwitchKnobRadius");
+					[ResourceKeyDefinition(typeof(Thickness), "SwitchKnobOffShadowMargin")]
+					public static ThemeResourceKey<Thickness> SwitchOffShadowMargin => new("SwitchKnobOffShadowMargin");
 
 					[ResourceKeyDefinition(typeof(Thickness), "SwitchKnobOnMargin")]
 					public static ThemeResourceKey<Thickness> SwitchOnMargin => new("SwitchKnobOnMargin");
 
-					[ResourceKeyDefinition(typeof(Thickness), "SwitchKnobOffMargin")]
-					public static ThemeResourceKey<Thickness> SwitchOffMargin => new("SwitchKnobOffMargin");
+					[ResourceKeyDefinition(typeof(Thickness), "SwitchKnobOnShadowMargin")]
+					public static ThemeResourceKey<Thickness> SwitchOnShadowMargin => new("SwitchKnobOnShadowMargin");
+
+					[ResourceKeyDefinition(typeof(double), "SwitchKnobShadowSize")]
+					public static ThemeResourceKey<double> SwitchShadowSize => new("SwitchKnobShadowSize");
+				}
+
+				public static readonly OffIconPresenterForegroundVSG OffIconPresenterForeground = new();
+				public partial class OffIconPresenterForegroundVSG
+				{
+					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOffIconPresenterForeground")]
+					public ThemeResourceKey<Brush> Default = new("ToggleSwitchOffIconPresenterForeground");
+
+					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOffIconPresenterForegroundDisabled")]
+					public ThemeResourceKey<Brush> Disabled = new("ToggleSwitchOffIconPresenterForegroundDisabled");
+
+					public static implicit operator ThemeResourceKey<Brush>(OffIconPresenterForegroundVSG self) => self.Default;
 				}
 
-				public static class IconPresenter
+				public static partial class OffOuterBorder
 				{
-					public static class OnForeground
+					public static readonly FillVSG Fill = new();
+					public partial class FillVSG
 					{
+						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOffOuterBorderFill")]
+						public ThemeResourceKey<Brush> Default = new("ToggleSwitchOffOuterBorderFill");
 
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOnIconPresenterForeground")]
-						public static ThemeResourceKey<Brush> Default => new("ToggleSwitchOnIconPresenterForeground");
+						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOuterBorderFill")]
+						public ThemeResourceKey<Brush> Normal = new("ToggleSwitchOuterBorderFill");
 
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOnIconPresenterForegroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("ToggleSwitchOnIconPresenterForegroundDisabled");
+						public static implicit operator ThemeResourceKey<Brush>(FillVSG self) => self.Default;
 					}
 
-					public static class OffForeground
+					public static readonly StrokeVSG Stroke = new();
+					public partial class StrokeVSG
 					{
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOffIconPresenterForeground")]
-						public static ThemeResourceKey<Brush> Default => new("ToggleSwitchOffIconPresenterForeground");
+						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOffOuterBorderStroke")]
+						public ThemeResourceKey<Brush> Default = new("ToggleSwitchOffOuterBorderStroke");
 
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOffIconPresenterForegroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("ToggleSwitchOffIconPresenterForegroundDisabled");
+						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOuterBorderStroke")]
+						public ThemeResourceKey<Brush> Normal = new("ToggleSwitchOuterBorderStroke");
+
+						public static implicit operator ThemeResourceKey<Brush>(StrokeVSG self) => self.Default;
 					}
 				}
 
-				public static class Thumb
+				public static readonly OnIconPresenterForegroundVSG OnIconPresenterForeground = new();
+				public partial class OnIconPresenterForegroundVSG
 				{
-					
-					[ResourceKeyDefinition(typeof(double), "SmallThumbSize")]
-					public static ThemeResourceKey<double> SmallSize => new("SmallThumbSize");
+					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOnIconPresenterForeground")]
+					public ThemeResourceKey<Brush> Default = new("ToggleSwitchOnIconPresenterForeground");
 
-					[ResourceKeyDefinition(typeof(double), "MediumThumbSize")]
-					public static ThemeResourceKey<double> MediumSize => new("MediumThumbSize");
+					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOnIconPresenterForegroundDisabled")]
+					public ThemeResourceKey<Brush> Disabled = new("ToggleSwitchOnIconPresenterForegroundDisabled");
 
-					[ResourceKeyDefinition(typeof(double), "LargeThumbSize")]
-					public static ThemeResourceKey<double> LargeSize => new("LargeThumbSize");
+					public static implicit operator ThemeResourceKey<Brush>(OnIconPresenterForegroundVSG self) => self.Default;
+				}
 
-					public static class Fill
+				public static partial class Thumb
+				{
+					public static readonly MediumSizeVSG MediumSize = new();
+					public partial class MediumSizeVSG
 					{
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchThumb")]
-						public static ThemeResourceKey<Brush> Default => new("ToggleSwitchThumb");
+						[ResourceKeyDefinition(typeof(double), "MediumThumbSize")]
+						public ThemeResourceKey<double> Default = new("MediumThumbSize");
+
+						[ResourceKeyDefinition(typeof(double), "LargeThumbSize")]
+						public ThemeResourceKey<double> Pressed = new("LargeThumbSize");
+
+						public static implicit operator ThemeResourceKey<double>(MediumSizeVSG self) => self.Default;
 					}
 
-					[ResourceKeyDefinition(typeof(int), "LargeThumbCornerRadius")]
-					public static ThemeResourceKey<int> LargeCornerRadius => new("LargeThumbCornerRadius");
+					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchThumb")]
+					public static ThemeResourceKey<Brush> Fill => new("ToggleSwitchThumb");
+
+					[ResourceKeyDefinition(typeof(CornerRadius), "LargeThumbCornerRadius")]
+					public static ThemeResourceKey<CornerRadius> LargeCornerRadius => new("LargeThumbCornerRadius");
 				}
 			}
 
-			public static class Styles
+			public static partial class Styles
 			{
-				[ResourceKeyDefinition(typeof(Style), "ToggleSwitchStyle", TargetType = typeof(ToggleSwitch))]
-				public static StaticResourceKey<Style> Default => new("ToggleSwitchStyle");
+				[ResourceKeyDefinition(typeof(Style), "MaterialToggleSwitchStyle", TargetType = typeof(Style))]
+				public static StaticResourceKey<Style> Default => new("MaterialToggleSwitchStyle");
 			}
 		}
 	}