diff --git a/src/library/Uno.Material.WinUI.Markup/Uno.Material.WinUI.Markup.csproj b/src/library/Uno.Material.WinUI.Markup/Uno.Material.WinUI.Markup.csproj
index 0507deb9e..bef70c77e 100644
--- a/src/library/Uno.Material.WinUI.Markup/Uno.Material.WinUI.Markup.csproj
+++ b/src/library/Uno.Material.WinUI.Markup/Uno.Material.WinUI.Markup.csproj
@@ -19,7 +19,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Uno.Extensions.Markup.Generators" PrivateAssets="All" Version="5.0.0-dev.407" />
+		<PackageReference Include="Uno.Extensions.Markup.Generators" PrivateAssets="All" Version="5.0.0-dev.448" />
 	</ItemGroup>
 
 	<PropertyGroup>
diff --git a/src/library/Uno.Material/Styles/Controls/v2/CalendarView.xaml b/src/library/Uno.Material/Styles/Controls/v2/CalendarView.xaml
index 55bcd7412..2f01db870 100644
--- a/src/library/Uno.Material/Styles/Controls/v2/CalendarView.xaml
+++ b/src/library/Uno.Material/Styles/Controls/v2/CalendarView.xaml
@@ -7,10 +7,10 @@
 					mc:Ignorable="not_win">
 
 	<x:String x:Key="MaterialDownArrowPathData">M0,0L32,0 16,19.745z</x:String>
-	<SolidColorBrush x:Key="MaterialCalendarTodayForeground"
+	<SolidColorBrush x:Key="MaterialCalendarViewTodayForeground"
 					 Color="{ThemeResource OnSurfaceColor}"
 					 Opacity="0.87" />
-	<SolidColorBrush x:Key="MaterialCalendarBlackoutForeground"
+	<SolidColorBrush x:Key="MaterialCalendarViewBlackoutForeground"
 					 Color="{ThemeResource OnSurfaceColor}"
 					 Opacity="0.38" />
 
@@ -31,9 +31,9 @@
 		<Setter Property="CalendarItemBorderBrush"
 				Value="{ThemeResource CalendarViewCalendarItemRevealBorderBrush}" />
 		<Setter Property="TodayForeground"
-				Value="{StaticResource MaterialCalendarTodayForeground}" />
+				Value="{StaticResource MaterialCalendarViewTodayForeground}" />
 		<Setter Property="BlackoutForeground"
-				Value="{ThemeResource MaterialCalendarBlackoutForeground}" />
+				Value="{StaticResource MaterialCalendarViewBlackoutForeground}" />
 		<Setter Property="SelectedForeground"
 					Value="{ThemeResource OnPrimaryBrush}" />
 		<Setter Property="PressedForeground"
diff --git a/src/library/Uno.Material/Styles/Controls/v2/CheckBox.xaml b/src/library/Uno.Material/Styles/Controls/v2/CheckBox.xaml
index 994d1c794..41efb86a0 100644
--- a/src/library/Uno.Material/Styles/Controls/v2/CheckBox.xaml
+++ b/src/library/Uno.Material/Styles/Controls/v2/CheckBox.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 					xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 					xmlns:um="using:Uno.Material"
@@ -65,6 +65,7 @@
 			<!-- endregion -->
 
 			<!--#region Check Background Stroke-->
+			<StaticResource x:Key="CheckBoxCheckBackgroundStroke" ResourceKey="OnSurfaceVariantBrush" />
 			<StaticResource x:Key="CheckBoxCheckBackgroundStrokeUnchecked" ResourceKey="OnSurfaceVariantBrush" />
 			<StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedPointerOver" ResourceKey="OnSurfaceBrush" />
 			<StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedPressed" ResourceKey="OnSurfaceBrush" />
@@ -82,6 +83,7 @@
 			<!--#endregion-->
 
 			<!--#region Check Background Fill-->
+			<StaticResource x:Key="CheckBoxCheckBackgroundFill" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="CheckBoxCheckBackgroundFillUnchecked" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedPressed" ResourceKey="SystemControlTransparentBrush" />
@@ -106,6 +108,7 @@
 			<!--#endregion-->
 
 			<!--#region Glyph-->
+			<StaticResource x:Key="CheckBoxGlyphForeground" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="CheckBoxGlyphForegroundUnchecked" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="CheckBoxGlyphForegroundUncheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="CheckBoxGlyphForegroundUncheckedPressed" ResourceKey="SystemControlTransparentBrush" />
@@ -127,7 +130,6 @@
 
 			<!--#region States-->
 			<StaticResource x:Key="CheckBoxStateCircleFillUnchecked" ResourceKey="OnSurfaceBrush" />
-
 			<StaticResource x:Key="CheckBoxStateCircleFillChecked" ResourceKey="PrimaryBrush" />
 
 			<StaticResource x:Key="CheckBoxStateCircleOpacityPointerOver" ResourceKey="HoverOpacity" />
@@ -202,6 +204,7 @@
 			<!-- endregion -->
 
 			<!--#region Check Background Stroke-->
+			<StaticResource x:Key="CheckBoxCheckBackgroundStroke" ResourceKey="OnSurfaceVariantBrush" />
 			<StaticResource x:Key="CheckBoxCheckBackgroundStrokeUnchecked" ResourceKey="OnSurfaceVariantBrush" />
 			<StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedPointerOver" ResourceKey="OnSurfaceBrush" />
 			<StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedPressed" ResourceKey="OnSurfaceBrush" />
@@ -219,6 +222,7 @@
 			<!--#endregion-->
 
 			<!--#region Check Background Fill-->
+			<StaticResource x:Key="CheckBoxCheckBackgroundFill" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="CheckBoxCheckBackgroundFillUnchecked" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedPressed" ResourceKey="SystemControlTransparentBrush" />
@@ -243,6 +247,8 @@
 			<!--#endregion-->
 
 			<!--#region Glyph-->
+			<StaticResource x:Key="CheckBoxGlyphForeground" ResourceKey="SystemControlTransparentBrush" />
+
 			<StaticResource x:Key="CheckBoxGlyphForegroundUnchecked" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="CheckBoxGlyphForegroundUncheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="CheckBoxGlyphForegroundUncheckedPressed" ResourceKey="SystemControlTransparentBrush" />
@@ -264,7 +270,6 @@
 
 			<!--#region States-->
 			<StaticResource x:Key="CheckBoxStateCircleFillUnchecked" ResourceKey="OnSurfaceBrush" />
-
 			<StaticResource x:Key="CheckBoxStateCircleFillChecked" ResourceKey="PrimaryBrush" />
 
 			<StaticResource x:Key="CheckBoxStateCircleOpacityPointerOver" ResourceKey="HoverOpacity" />
@@ -514,7 +519,9 @@
 							<VisualStateGroup x:Name="FocusStates">
 								<VisualState x:Name="Focused">
 									<VisualState.Setters>
+										<Setter Target="UncheckedFocusStateCircle.Fill" Value="{ThemeResource CheckBoxStateCircleFillUnchecked}" />
 										<Setter Target="UncheckedFocusStateCircle.Opacity" Value="{ThemeResource CheckBoxStateCircleOpacityFocused}" />
+										<Setter Target="CheckedFocusStateCircle.Fill" Value="{ThemeResource CheckBoxStateCircleFillChecked}" />
 										<Setter Target="CheckedFocusStateCircle.Opacity" Value="{ThemeResource CheckBoxStateCircleOpacityFocused}" />
 									</VisualState.Setters>
 								</VisualState>
@@ -536,7 +543,7 @@
 								 Stretch="Uniform"
 								 Width="{ThemeResource CheckBoxFocusAreaSize}"
 								 Height="{ThemeResource CheckBoxFocusAreaSize}"
-								 Fill="{ThemeResource CheckBoxStateCircleFillUnchecked}"
+								 Fill="Transparent"
 								 Visibility="{Binding IsChecked, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource CheckBoxIsCheckedToFocusStateCircleCollapsed}, TargetNullValue=Collapsed, FallbackValue=Collapsed}"
 								 IsHitTestVisible="False"
 								 Opacity="0" />
@@ -547,7 +554,7 @@
 								 Stretch="Uniform"
 								 Width="{ThemeResource CheckBoxFocusAreaSize}"
 								 Height="{ThemeResource CheckBoxFocusAreaSize}"
-								 Fill="{ThemeResource CheckBoxStateCircleFillChecked}"
+								 Fill="Transparent"
 								 Visibility="{Binding IsChecked, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource CheckBoxIsCheckedToFocusStateCircleVisible}, TargetNullValue=Collapsed, FallbackValue=Collapsed}"
 								 IsHitTestVisible="False"
 								 Opacity="0" />
@@ -558,7 +565,7 @@
 								 Stretch="Uniform"
 								 Width="{ThemeResource CheckBoxFocusAreaSize}"
 								 Height="{ThemeResource CheckBoxFocusAreaSize}"
-								 Fill="{ThemeResource CheckBoxStateCircleFillChecked}"
+								 Fill="Transparent"
 								 IsHitTestVisible="False"
 								 Opacity="0" />
 
@@ -568,13 +575,13 @@
 							  CornerRadius="{TemplateBinding CornerRadius}">
 
 							<Grid x:Name="BackgroundBorder"
-								  Background="{ThemeResource CheckBoxCheckBackgroundFillUnchecked}"
-								  BorderBrush="{ThemeResource CheckBoxCheckBackgroundStrokeUnchecked}"
+								  Background="{ThemeResource CheckBoxCheckBackgroundFill}"
+								  BorderBrush="{ThemeResource CheckBoxCheckBackgroundStroke}"
 								  BorderThickness="{ThemeResource CheckBoxCheckAreaBorderThickness}" />
 
 							<Path x:Name="HyphenGlyph"
 								  Data="{ThemeResource CheckBoxHyphenGlyphPathData}"
-								  Fill="{ThemeResource CheckBoxGlyphForegroundIndeterminate}"
+								  Fill="{ThemeResource CheckBoxGlyphForeground}"
 								  VerticalAlignment="Center"
 								  HorizontalAlignment="Center"
 								  Stretch="Uniform"
@@ -586,7 +593,7 @@
 
 							<Path x:Name="CheckGlyph"
 								  Data="{ThemeResource CheckBoxCheckGlyphPathData}"
-								  Fill="{ThemeResource CheckBoxGlyphForegroundChecked}"
+								  Fill="{ThemeResource CheckBoxGlyphForeground}"
 								  VerticalAlignment="Center"
 								  HorizontalAlignment="Center"
 								  Stretch="Uniform"
diff --git a/src/library/Uno.Themes.WinUI.Markup/ResourceKeyDefinitionAttribute.cs b/src/library/Uno.Themes.WinUI.Markup/ResourceKeyDefinitionAttribute.cs
deleted file mode 100644
index 892c7dd51..000000000
--- a/src/library/Uno.Themes.WinUI.Markup/ResourceKeyDefinitionAttribute.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-
-namespace Uno.Themes.WinUI.Markup;
-
-// temporary workaround for ResourceKeyDefinition not applicable on field members.
-[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field, AllowMultiple = false)]
-public sealed class ResourceKeyDefinitionAttribute : Attribute
-{
-	public ResourceKeyDefinitionAttribute(Type propertyType, string key)
-	{
-		this.PropertyType = propertyType;
-		this.Key = key;
-	}
-
-	public string Key { get; }
-	public Type PropertyType { get; }
-	public Type? TargetType { get; set; }
-}
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/Button.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/Button.cs
index 483b34bfb..07d62de17 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/Button.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/Button.cs
@@ -6,481 +6,439 @@
 using Uno.Extensions.Markup;
 using Uno.Extensions.Markup.Internals;
 
-using ResourceKeyDefinitionAttribute = Uno.Themes.WinUI.Markup.ResourceKeyDefinitionAttribute;
+namespace Uno.Themes.Markup;
 
-namespace Uno.Themes.Markup
+public static partial class Theme
 {
-	public static partial class Theme
+	public static partial class Button
 	{
-		public static partial class Button
+		public static partial class Resources
 		{
-			public static partial class Resources
+			public static partial class Elevated
 			{
-				public static partial class Elevated
+				public static partial class Background
 				{
-					public static readonly BackgroundVSG Background = new();
-					public partial class BackgroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBackground")]
-						public ThemeResourceKey<Brush> Default = new("ElevatedButtonBackground");
+					[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBackground")]
+					public static ThemeResourceKey<Brush> Default => new("ElevatedButtonBackground");
 
-						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBackgroundPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("ElevatedButtonBackgroundPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBackgroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("ElevatedButtonBackgroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBackgroundPressed")]
-						public ThemeResourceKey<Brush> Pressed = new("ElevatedButtonBackgroundPressed");
+					[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBackgroundPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("ElevatedButtonBackgroundPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBackgroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("ElevatedButtonBackgroundDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBackgroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("ElevatedButtonBackgroundDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBackgroundFocused")]
-						public ThemeResourceKey<Brush> Focused = new("ElevatedButtonBackgroundFocused");
+					[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBackgroundFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("ElevatedButtonBackgroundFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBackgroundPointerFocused")]
-						public ThemeResourceKey<Brush> PointerFocused = new("ElevatedButtonBackgroundPointerFocused");
-
-						public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
-					}
-
-					public static readonly BorderBrushVSG BorderBrush = new();
-					public partial class BorderBrushVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBorderBrush")]
-						public ThemeResourceKey<Brush> Default = new("ElevatedButtonBorderBrush");
-
-						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBorderBrushPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("ElevatedButtonBorderBrushPointerOver");
-
-						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBorderBrushPressed")]
-						public ThemeResourceKey<Brush> Pressed = new("ElevatedButtonBorderBrushPressed");
-
-						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBorderBrushDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("ElevatedButtonBorderBrushDisabled");
-
-						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBorderBrushFocused")]
-						public ThemeResourceKey<Brush> Focused = new("ElevatedButtonBorderBrushFocused");
-
-						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBorderBrushPointerFocused")]
-						public ThemeResourceKey<Brush> PointerFocused = new("ElevatedButtonBorderBrushPointerFocused");
-
-						public static implicit operator ThemeResourceKey<Brush>(BorderBrushVSG self) => self.Default;
-					}
-
-					public static readonly ElevationVSG Elevation = new();
-					public partial class ElevationVSG
-					{
-						[ResourceKeyDefinition(typeof(double), "ElevatedButtonElevation")]
-						public ThemeResourceKey<double> Default = new("ElevatedButtonElevation");
-
-						[ResourceKeyDefinition(typeof(double), "ElevatedButtonElevationDisabled")]
-						public ThemeResourceKey<double> Disabled = new("ElevatedButtonElevationDisabled");
-
-						public static implicit operator ThemeResourceKey<double>(ElevationVSG self) => self.Default;
-					}
-
-					public static readonly MarginVSG Margin = new();
-					public partial class MarginVSG
-					{
-						[ResourceKeyDefinition(typeof(Thickness), "ElevatedButtonMargin")]
-						public ThemeResourceKey<Thickness> Default = new("ElevatedButtonMargin");
+					[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBackgroundPointerFocused")]
+					public static ThemeResourceKey<Brush> PointerFocused => new("ElevatedButtonBackgroundPointerFocused");
+				}
 
-						[ResourceKeyDefinition(typeof(Thickness), "ElevatedButtonDisabledMargin")]
-						public ThemeResourceKey<Thickness> Disabled = new("ElevatedButtonDisabledMargin");
+				public static partial class BorderBrush
+				{
+					[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBorderBrush")]
+					public static ThemeResourceKey<Brush> Default => new("ElevatedButtonBorderBrush");
 
-						public static implicit operator ThemeResourceKey<Thickness>(MarginVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBorderBrushPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("ElevatedButtonBorderBrushPointerOver");
 
-					public static partial class StateLayerBackground
-					{
-						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonStateLayerBackgroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("ElevatedButtonStateLayerBackgroundPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBorderBrushPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("ElevatedButtonBorderBrushPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonStateLayerBackgroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("ElevatedButtonStateLayerBackgroundPressed");
+					[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBorderBrushDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("ElevatedButtonBorderBrushDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonStateLayerBackgroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("ElevatedButtonStateLayerBackgroundFocused");
+					[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBorderBrushFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("ElevatedButtonBorderBrushFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonStateLayerBackgroundPointerFocused")]
-						public static ThemeResourceKey<Brush> PointerFocused => new("ElevatedButtonStateLayerBackgroundPointerFocused");
-					}
+					[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBorderBrushPointerFocused")]
+					public static ThemeResourceKey<Brush> PointerFocused => new("ElevatedButtonBorderBrushPointerFocused");
+				}
 
-					[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonForeground")]
-					public static ThemeResourceKey<Brush> Foreground => new("ElevatedButtonForeground");
+				public static partial class Elevation
+				{
+					[ResourceKeyDefinition(typeof(double), "ElevatedButtonElevation")]
+					public static ThemeResourceKey<double> Default => new("ElevatedButtonElevation");
 
-					[ResourceKeyDefinition(typeof(bool), "ElevatedButtonIsTintEnabled")]
-					public static StaticResourceKey<bool> IsTintEnabled => new("ElevatedButtonIsTintEnabled");
+					[ResourceKeyDefinition(typeof(double), "ElevatedButtonElevationDisabled")]
+					public static ThemeResourceKey<double> Disabled => new("ElevatedButtonElevationDisabled");
 				}
 
-				public static partial class Filled
+				public static partial class Margin
 				{
-					public static readonly BackgroundVSG Background = new();
-					public partial class BackgroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "FilledButtonBackground")]
-						public ThemeResourceKey<Brush> Default = new("FilledButtonBackground");
+					[ResourceKeyDefinition(typeof(Thickness), "ElevatedButtonMargin")]
+					public static ThemeResourceKey<Thickness> Default => new("ElevatedButtonMargin");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledButtonBackgroundPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("FilledButtonBackgroundPointerOver");
-
-						[ResourceKeyDefinition(typeof(Brush), "FilledButtonBackgroundPressed")]
-						public ThemeResourceKey<Brush> Pressed = new("FilledButtonBackgroundPressed");
+					[ResourceKeyDefinition(typeof(Thickness), "ElevatedButtonDisabledMargin")]
+					public static ThemeResourceKey<Thickness> Disabled => new("ElevatedButtonDisabledMargin");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledButtonBackgroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("FilledButtonBackgroundDisabled");
+				public static partial class StateLayerBackground
+				{
+					[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonStateLayerBackgroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("ElevatedButtonStateLayerBackgroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledButtonBackgroundFocused")]
-						public ThemeResourceKey<Brush> Focused = new("FilledButtonBackgroundFocused");
+					[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonStateLayerBackgroundPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("ElevatedButtonStateLayerBackgroundPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledButtonBackgroundPointerFocused")]
-						public ThemeResourceKey<Brush> PointerFocused = new("FilledButtonBackgroundPointerFocused");
+					[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonStateLayerBackgroundFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("ElevatedButtonStateLayerBackgroundFocused");
 
-						public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonStateLayerBackgroundPointerFocused")]
+					public static ThemeResourceKey<Brush> PointerFocused => new("ElevatedButtonStateLayerBackgroundPointerFocused");
+				}
 
-					public static readonly BorderBrushVSG BorderBrush = new();
-					public partial class BorderBrushVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "FilledButtonBorderBrush")]
-						public ThemeResourceKey<Brush> Default = new("FilledButtonBorderBrush");
+				[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonForeground")]
+				public static ThemeResourceKey<Brush> Foreground => new("ElevatedButtonForeground");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledButtonBorderBrushPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("FilledButtonBorderBrushPointerOver");
+				[ResourceKeyDefinition(typeof(bool), "ElevatedButtonIsTintEnabled")]
+				public static StaticResourceKey<bool> IsTintEnabled => new("ElevatedButtonIsTintEnabled");
+			}
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledButtonBorderBrushPressed")]
-						public ThemeResourceKey<Brush> Pressed = new("FilledButtonBorderBrushPressed");
+			public static partial class Filled
+			{
+				public static partial class Background
+				{
+					[ResourceKeyDefinition(typeof(Brush), "FilledButtonBackground")]
+					public static ThemeResourceKey<Brush> Default => new("FilledButtonBackground");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledButtonBorderBrushDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("FilledButtonBorderBrushDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "FilledButtonBackgroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("FilledButtonBackgroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledButtonBorderBrushFocused")]
-						public ThemeResourceKey<Brush> Focused = new("FilledButtonBorderBrushFocused");
+					[ResourceKeyDefinition(typeof(Brush), "FilledButtonBackgroundPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("FilledButtonBackgroundPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledButtonBorderBrushPointerFocused")]
-						public ThemeResourceKey<Brush> PointerFocused = new("FilledButtonBorderBrushPointerFocused");
+					[ResourceKeyDefinition(typeof(Brush), "FilledButtonBackgroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("FilledButtonBackgroundDisabled");
 
-						public static implicit operator ThemeResourceKey<Brush>(BorderBrushVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "FilledButtonBackgroundFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("FilledButtonBackgroundFocused");
 
-					public static partial class StateLayerBackground
-					{
-						[ResourceKeyDefinition(typeof(Brush), "FilledButtonStateLayerBackgroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("FilledButtonStateLayerBackgroundPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "FilledButtonBackgroundPointerFocused")]
+					public static ThemeResourceKey<Brush> PointerFocused => new("FilledButtonBackgroundPointerFocused");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledButtonStateLayerBackgroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("FilledButtonStateLayerBackgroundPressed");
+				public static partial class BorderBrush
+				{
+					[ResourceKeyDefinition(typeof(Brush), "FilledButtonBorderBrush")]
+					public static ThemeResourceKey<Brush> Default => new("FilledButtonBorderBrush");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledButtonStateLayerBackgroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("FilledButtonStateLayerBackgroundFocused");
+					[ResourceKeyDefinition(typeof(Brush), "FilledButtonBorderBrushPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("FilledButtonBorderBrushPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledButtonStateLayerBackgroundPointerFocused")]
-						public static ThemeResourceKey<Brush> PointerFocused => new("FilledButtonStateLayerBackgroundPointerFocused");
-					}
+					[ResourceKeyDefinition(typeof(Brush), "FilledButtonBorderBrushPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("FilledButtonBorderBrushPressed");
 
-					[ResourceKeyDefinition(typeof(double), "ButtonElevation")]
-					public static ThemeResourceKey<double> Elevation => new("ButtonElevation");
+					[ResourceKeyDefinition(typeof(Brush), "FilledButtonBorderBrushDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("FilledButtonBorderBrushDisabled");
 
-					[ResourceKeyDefinition(typeof(Brush), "FilledButtonForeground")]
-					public static ThemeResourceKey<Brush> Foreground => new("FilledButtonForeground");
+					[ResourceKeyDefinition(typeof(Brush), "FilledButtonBorderBrushFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("FilledButtonBorderBrushFocused");
 
-					[ResourceKeyDefinition(typeof(Thickness), "ButtonMargin")]
-					public static ThemeResourceKey<Thickness> Margin => new("ButtonMargin");
+					[ResourceKeyDefinition(typeof(Brush), "FilledButtonBorderBrushPointerFocused")]
+					public static ThemeResourceKey<Brush> PointerFocused => new("FilledButtonBorderBrushPointerFocused");
 				}
 
-				public static partial class FilledTonal
+				public static partial class StateLayerBackground
 				{
-					public static readonly BackgroundVSG Background = new();
-					public partial class BackgroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBackground")]
-						public ThemeResourceKey<Brush> Default = new("FilledTonalButtonBackground");
-
-						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBackgroundPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("FilledTonalButtonBackgroundPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "FilledButtonStateLayerBackgroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("FilledButtonStateLayerBackgroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBackgroundPressed")]
-						public ThemeResourceKey<Brush> Pressed = new("FilledTonalButtonBackgroundPressed");
+					[ResourceKeyDefinition(typeof(Brush), "FilledButtonStateLayerBackgroundPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("FilledButtonStateLayerBackgroundPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBackgroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("FilledTonalButtonBackgroundDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "FilledButtonStateLayerBackgroundFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("FilledButtonStateLayerBackgroundFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBackgroundFocused")]
-						public ThemeResourceKey<Brush> Focused = new("FilledTonalButtonBackgroundFocused");
-
-						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBackgroundPointerFocused")]
-						public ThemeResourceKey<Brush> PointerFocused = new("FilledTonalButtonBackgroundPointerFocused");
+					[ResourceKeyDefinition(typeof(Brush), "FilledButtonStateLayerBackgroundPointerFocused")]
+					public static ThemeResourceKey<Brush> PointerFocused => new("FilledButtonStateLayerBackgroundPointerFocused");
+				}
 
-						public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
-					}
+				[ResourceKeyDefinition(typeof(double), "ButtonElevation")]
+				public static ThemeResourceKey<double> Elevation => new("ButtonElevation");
 
-					public static readonly BorderBrushVSG BorderBrush = new();
-					public partial class BorderBrushVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBorderBrush")]
-						public ThemeResourceKey<Brush> Default = new("FilledTonalButtonBorderBrush");
+				[ResourceKeyDefinition(typeof(Brush), "FilledButtonForeground")]
+				public static ThemeResourceKey<Brush> Foreground => new("FilledButtonForeground");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBorderBrushPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("FilledTonalButtonBorderBrushPointerOver");
+				[ResourceKeyDefinition(typeof(Thickness), "ButtonMargin")]
+				public static ThemeResourceKey<Thickness> Margin => new("ButtonMargin");
+			}
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBorderBrushPressed")]
-						public ThemeResourceKey<Brush> Pressed = new("FilledTonalButtonBorderBrushPressed");
+			public static partial class FilledTonal
+			{
+				public static partial class Background
+				{
+					[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBackground")]
+					public static ThemeResourceKey<Brush> Default => new("FilledTonalButtonBackground");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBorderBrushDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("FilledTonalButtonBorderBrushDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBackgroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("FilledTonalButtonBackgroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBorderBrushFocused")]
-						public ThemeResourceKey<Brush> Focused = new("FilledTonalButtonBorderBrushFocused");
+					[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBackgroundPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("FilledTonalButtonBackgroundPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBorderBrushPointerFocused")]
-						public ThemeResourceKey<Brush> PointerFocused = new("FilledTonalButtonBorderBrushPointerFocused");
+					[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBackgroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("FilledTonalButtonBackgroundDisabled");
 
-						public static implicit operator ThemeResourceKey<Brush>(BorderBrushVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBackgroundFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("FilledTonalButtonBackgroundFocused");
 
-					public static partial class StateLayerBackground
-					{
-						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonStateLayerBackgroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("FilledTonalButtonStateLayerBackgroundPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBackgroundPointerFocused")]
+					public static ThemeResourceKey<Brush> PointerFocused => new("FilledTonalButtonBackgroundPointerFocused");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonStateLayerBackgroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("FilledTonalButtonStateLayerBackgroundPressed");
+				public static partial class BorderBrush
+				{
+					[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBorderBrush")]
+					public static ThemeResourceKey<Brush> Default => new("FilledTonalButtonBorderBrush");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonStateLayerBackgroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("FilledTonalButtonStateLayerBackgroundFocused");
+					[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBorderBrushPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("FilledTonalButtonBorderBrushPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonStateLayerBackgroundPointerFocused")]
-						public static ThemeResourceKey<Brush> PointerFocused => new("FilledTonalButtonStateLayerBackgroundPointerFocused");
-					}
+					[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBorderBrushPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("FilledTonalButtonBorderBrushPressed");
 
-					[ResourceKeyDefinition(typeof(double), "ButtonElevation")]
-					public static ThemeResourceKey<double> Elevation => new("ButtonElevation");
+					[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBorderBrushDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("FilledTonalButtonBorderBrushDisabled");
 
-					[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonForeground")]
-					public static ThemeResourceKey<Brush> Foreground => new("FilledTonalButtonForeground");
+					[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBorderBrushFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("FilledTonalButtonBorderBrushFocused");
 
-					[ResourceKeyDefinition(typeof(Thickness), "ButtonMargin")]
-					public static ThemeResourceKey<Thickness> Margin => new("ButtonMargin");
+					[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBorderBrushPointerFocused")]
+					public static ThemeResourceKey<Brush> PointerFocused => new("FilledTonalButtonBorderBrushPointerFocused");
 				}
 
-				public static partial class Icon
+				public static partial class StateLayerBackground
 				{
-					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");
-					}
+					[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonStateLayerBackgroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("FilledTonalButtonStateLayerBackgroundPointerOver");
 
-					public static readonly OpacityHiddenStateVSG OpacityHiddenState = new();
-					public partial class OpacityHiddenStateVSG
-					{
-						[ResourceKeyDefinition(typeof(double), "IconButtonOpacityHiddenState")]
-						public ThemeResourceKey<double> Default = new("IconButtonOpacityHiddenState");
+					[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonStateLayerBackgroundPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("FilledTonalButtonStateLayerBackgroundPressed");
 
-						[ResourceKeyDefinition(typeof(double), "IconButtonOpacityVisibleState")]
-						public ThemeResourceKey<double> PointerOver = new("IconButtonOpacityVisibleState");
+					[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonStateLayerBackgroundFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("FilledTonalButtonStateLayerBackgroundFocused");
 
-						public static implicit operator ThemeResourceKey<double>(OpacityHiddenStateVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonStateLayerBackgroundPointerFocused")]
+					public static ThemeResourceKey<Brush> PointerFocused => new("FilledTonalButtonStateLayerBackgroundPointerFocused");
+				}
 
-					[ResourceKeyDefinition(typeof(Brush), "IconButtonEllipseFillFocused")]
-					public static ThemeResourceKey<Brush> EllipseFillFocused => new("IconButtonEllipseFillFocused");
+				[ResourceKeyDefinition(typeof(double), "ButtonElevation")]
+				public static ThemeResourceKey<double> Elevation => new("ButtonElevation");
 
-					[ResourceKeyDefinition(typeof(Brush), "IconButtonEllipseFillPointerOver")]
-					public static ThemeResourceKey<Brush> EllipseFillPointerOver => new("IconButtonEllipseFillPointerOver");
+				[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonForeground")]
+				public static ThemeResourceKey<Brush> Foreground => new("FilledTonalButtonForeground");
 
-					[ResourceKeyDefinition(typeof(Brush), "IconButtonEllipseFillPressed")]
-					public static ThemeResourceKey<Brush> EllipseFillPressed => new("IconButtonEllipseFillPressed");
+				[ResourceKeyDefinition(typeof(Thickness), "ButtonMargin")]
+				public static ThemeResourceKey<Thickness> Margin => new("ButtonMargin");
+			}
 
-					[ResourceKeyDefinition(typeof(Brush), "IconButtonForeground")]
-					public static ThemeResourceKey<Brush> Foreground => new("IconButtonForeground");
+			public static partial class Icon
+			{
+				public static partial class Ellipse
+				{
+					[ResourceKeyDefinition(typeof(string), "IconButtonEllipseHorizontalAlignment")]
+					public static StaticResourceKey<string> HorizontalAlignment => new("IconButtonEllipseHorizontalAlignment");
 
-					[ResourceKeyDefinition(typeof(Brush), "IconButtonForegroundDisabled")]
-					public static ThemeResourceKey<Brush> ForegroundDisabled => new("IconButtonForegroundDisabled");
+					[ResourceKeyDefinition(typeof(string), "IconButtonEllipseVerticalAlignment")]
+					public static StaticResourceKey<string> VerticalAlignment => new("IconButtonEllipseVerticalAlignment");
 				}
 
-				public static partial class Outlined
+				public static partial class OpacityHiddenState
 				{
-					public static readonly BackgroundVSG Background = new();
-					public partial class BackgroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBackground")]
-						public ThemeResourceKey<Brush> Default = new("OutlinedButtonBackground");
+					[ResourceKeyDefinition(typeof(double), "IconButtonOpacityHiddenState")]
+					public static ThemeResourceKey<double> Default => new("IconButtonOpacityHiddenState");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBackgroundPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("OutlinedButtonBackgroundPointerOver");
-
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBackgroundPressed")]
-						public ThemeResourceKey<Brush> Pressed = new("OutlinedButtonBackgroundPressed");
+					[ResourceKeyDefinition(typeof(double), "IconButtonOpacityVisibleState")]
+					public static ThemeResourceKey<double> PointerOver => new("IconButtonOpacityVisibleState");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBackgroundFocused")]
-						public ThemeResourceKey<Brush> Focused = new("OutlinedButtonBackgroundFocused");
+				[ResourceKeyDefinition(typeof(Brush), "IconButtonEllipseFillFocused")]
+				public static ThemeResourceKey<Brush> EllipseFillFocused => new("IconButtonEllipseFillFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBackgroundPointerFocused")]
-						public ThemeResourceKey<Brush> PointerFocused = new("OutlinedButtonBackgroundPointerFocused");
+				[ResourceKeyDefinition(typeof(Brush), "IconButtonEllipseFillPointerOver")]
+				public static ThemeResourceKey<Brush> EllipseFillPointerOver => new("IconButtonEllipseFillPointerOver");
 
-						public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
-					}
+				[ResourceKeyDefinition(typeof(Brush), "IconButtonEllipseFillPressed")]
+				public static ThemeResourceKey<Brush> EllipseFillPressed => new("IconButtonEllipseFillPressed");
 
-					public static readonly BorderBrushVSG BorderBrush = new();
-					public partial class BorderBrushVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBorderBrush")]
-						public ThemeResourceKey<Brush> Default = new("OutlinedButtonBorderBrush");
+				[ResourceKeyDefinition(typeof(Brush), "IconButtonForeground")]
+				public static ThemeResourceKey<Brush> Foreground => new("IconButtonForeground");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBorderBrushPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("OutlinedButtonBorderBrushPointerOver");
+				[ResourceKeyDefinition(typeof(Brush), "IconButtonForegroundDisabled")]
+				public static ThemeResourceKey<Brush> ForegroundDisabled => new("IconButtonForegroundDisabled");
+			}
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBorderBrushPressed")]
-						public ThemeResourceKey<Brush> Pressed = new("OutlinedButtonBorderBrushPressed");
+			public static partial class Outlined
+			{
+				public static partial class Background
+				{
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBackground")]
+					public static ThemeResourceKey<Brush> Default => new("OutlinedButtonBackground");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBackgroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("OutlinedButtonBackgroundDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBackgroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("OutlinedButtonBackgroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBorderBrushFocused")]
-						public ThemeResourceKey<Brush> Focused = new("OutlinedButtonBorderBrushFocused");
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBackgroundPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("OutlinedButtonBackgroundPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBorderBrushPointerFocused")]
-						public ThemeResourceKey<Brush> PointerFocused = new("OutlinedButtonBorderBrushPointerFocused");
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBackgroundFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("OutlinedButtonBackgroundFocused");
 
-						public static implicit operator ThemeResourceKey<Brush>(BorderBrushVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBackgroundPointerFocused")]
+					public static ThemeResourceKey<Brush> PointerFocused => new("OutlinedButtonBackgroundPointerFocused");
+				}
 
-					public static partial class StateLayerBackground
-					{
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonStateLayerBackgroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("OutlinedButtonStateLayerBackgroundPointerOver");
+				public static partial class BorderBrush
+				{
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBorderBrush")]
+					public static ThemeResourceKey<Brush> Default => new("OutlinedButtonBorderBrush");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonStateLayerBackgroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("OutlinedButtonStateLayerBackgroundPressed");
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBorderBrushPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("OutlinedButtonBorderBrushPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonStateLayerBackgroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("OutlinedButtonStateLayerBackgroundFocused");
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBorderBrushPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("OutlinedButtonBorderBrushPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonStateLayerBackgroundPointerFocused")]
-						public static ThemeResourceKey<Brush> PointerFocused => new("OutlinedButtonStateLayerBackgroundPointerFocused");
-					}
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBackgroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("OutlinedButtonBackgroundDisabled");
 
-					[ResourceKeyDefinition(typeof(Thickness), "OutlinedButtonBorderThickness")]
-					public static ThemeResourceKey<Thickness> BorderThickness => new("OutlinedButtonBorderThickness");
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBorderBrushFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("OutlinedButtonBorderBrushFocused");
 
-					[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonForeground")]
-					public static ThemeResourceKey<Brush> Foreground => new("OutlinedButtonForeground");
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBorderBrushPointerFocused")]
+					public static ThemeResourceKey<Brush> PointerFocused => new("OutlinedButtonBorderBrushPointerFocused");
 				}
 
-				public static partial class Text
+				public static partial class StateLayerBackground
 				{
-					public static readonly BackgroundVSG Background = new();
-					public partial class BackgroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "TextButtonBackground")]
-						public ThemeResourceKey<Brush> Default = new("TextButtonBackground");
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonStateLayerBackgroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("OutlinedButtonStateLayerBackgroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextButtonBackgroundPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("TextButtonBackgroundPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonStateLayerBackgroundPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("OutlinedButtonStateLayerBackgroundPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextButtonBackgroundPressed")]
-						public ThemeResourceKey<Brush> Pressed = new("TextButtonBackgroundPressed");
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonStateLayerBackgroundFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("OutlinedButtonStateLayerBackgroundFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextButtonBackgroundFocused")]
-						public ThemeResourceKey<Brush> Focused = new("TextButtonBackgroundFocused");
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonStateLayerBackgroundPointerFocused")]
+					public static ThemeResourceKey<Brush> PointerFocused => new("OutlinedButtonStateLayerBackgroundPointerFocused");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "TextButtonBackgroundPointerFocused")]
-						public ThemeResourceKey<Brush> PointerFocused = new("TextButtonBackgroundPointerFocused");
+				[ResourceKeyDefinition(typeof(Thickness), "OutlinedButtonBorderThickness")]
+				public static ThemeResourceKey<Thickness> BorderThickness => new("OutlinedButtonBorderThickness");
 
-						public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
-					}
+				[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonForeground")]
+				public static ThemeResourceKey<Brush> Foreground => new("OutlinedButtonForeground");
+			}
 
-					public static readonly BorderBrushVSG BorderBrush = new();
-					public partial class BorderBrushVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "TextButtonBorderBrush")]
-						public ThemeResourceKey<Brush> Default = new("TextButtonBorderBrush");
+			public static partial class Text
+			{
+				public static partial class Background
+				{
+					[ResourceKeyDefinition(typeof(Brush), "TextButtonBackground")]
+					public static ThemeResourceKey<Brush> Default => new("TextButtonBackground");
+
+					[ResourceKeyDefinition(typeof(Brush), "TextButtonBackgroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("TextButtonBackgroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextButtonBorderBrushPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("TextButtonBorderBrushPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "TextButtonBackgroundPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("TextButtonBackgroundPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextButtonBorderBrushPressed")]
-						public ThemeResourceKey<Brush> Pressed = new("TextButtonBorderBrushPressed");
+					[ResourceKeyDefinition(typeof(Brush), "TextButtonBackgroundFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("TextButtonBackgroundFocused");
+
+					[ResourceKeyDefinition(typeof(Brush), "TextButtonBackgroundPointerFocused")]
+					public static ThemeResourceKey<Brush> PointerFocused => new("TextButtonBackgroundPointerFocused");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "TextButtonBorderBrushDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("TextButtonBorderBrushDisabled");
+				public static partial class BorderBrush
+				{
+					[ResourceKeyDefinition(typeof(Brush), "TextButtonBorderBrush")]
+					public static ThemeResourceKey<Brush> Default => new("TextButtonBorderBrush");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextButtonBorderBrushFocused")]
-						public ThemeResourceKey<Brush> Focused = new("TextButtonBorderBrushFocused");
+					[ResourceKeyDefinition(typeof(Brush), "TextButtonBorderBrushPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("TextButtonBorderBrushPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextButtonBorderBrushPointerFocused")]
-						public ThemeResourceKey<Brush> PointerFocused = new("TextButtonBorderBrushPointerFocused");
+					[ResourceKeyDefinition(typeof(Brush), "TextButtonBorderBrushPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("TextButtonBorderBrushPressed");
 
-						public static implicit operator ThemeResourceKey<Brush>(BorderBrushVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "TextButtonBorderBrushDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("TextButtonBorderBrushDisabled");
 
-					public static partial class StateLayerBackground
-					{
-						[ResourceKeyDefinition(typeof(Brush), "TextButtonStateLayerBackgroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("TextButtonStateLayerBackgroundPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "TextButtonBorderBrushFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("TextButtonBorderBrushFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextButtonStateLayerBackgroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("TextButtonStateLayerBackgroundPressed");
+					[ResourceKeyDefinition(typeof(Brush), "TextButtonBorderBrushPointerFocused")]
+					public static ThemeResourceKey<Brush> PointerFocused => new("TextButtonBorderBrushPointerFocused");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "TextButtonStateLayerBackgroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("TextButtonStateLayerBackgroundFocused");
+				public static partial class StateLayerBackground
+				{
+					[ResourceKeyDefinition(typeof(Brush), "TextButtonStateLayerBackgroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("TextButtonStateLayerBackgroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextButtonStateLayerBackgroundPointerFocused")]
-						public static ThemeResourceKey<Brush> PointerFocused => new("TextButtonStateLayerBackgroundPointerFocused");
-					}
+					[ResourceKeyDefinition(typeof(Brush), "TextButtonStateLayerBackgroundPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("TextButtonStateLayerBackgroundPressed");
 
-					[ResourceKeyDefinition(typeof(Brush), "TextButtonForeground")]
-					public static ThemeResourceKey<Brush> Foreground => new("TextButtonForeground");
+					[ResourceKeyDefinition(typeof(Brush), "TextButtonStateLayerBackgroundFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("TextButtonStateLayerBackgroundFocused");
 
-					[ResourceKeyDefinition(typeof(Thickness), "TextButtonPadding")]
-					public static ThemeResourceKey<Thickness> Padding => new("TextButtonPadding");
+					[ResourceKeyDefinition(typeof(Brush), "TextButtonStateLayerBackgroundPointerFocused")]
+					public static ThemeResourceKey<Brush> PointerFocused => new("TextButtonStateLayerBackgroundPointerFocused");
 				}
 
-				[ResourceKeyDefinition(typeof(Thickness), "ButtonBorderThickness")]
-				public static ThemeResourceKey<Thickness> BorderThickness => new("ButtonBorderThickness");
+				[ResourceKeyDefinition(typeof(Brush), "TextButtonForeground")]
+				public static ThemeResourceKey<Brush> Foreground => new("TextButtonForeground");
 
-				[ResourceKeyDefinition(typeof(CornerRadius), "ButtonCornerRadius")]
-				public static ThemeResourceKey<CornerRadius> CornerRadius => new("ButtonCornerRadius");
+				[ResourceKeyDefinition(typeof(Thickness), "TextButtonPadding")]
+				public static ThemeResourceKey<Thickness> Padding => new("TextButtonPadding");
+			}
 
-				[ResourceKeyDefinition(typeof(string), "ButtonHorizontalContentAlignment")]
-				public static StaticResourceKey<string> HorizontalContentAlignment => new("ButtonHorizontalContentAlignment");
+			[ResourceKeyDefinition(typeof(Thickness), "ButtonBorderThickness")]
+			public static ThemeResourceKey<Thickness> BorderThickness => new("ButtonBorderThickness");
 
-				[ResourceKeyDefinition(typeof(double), "ButtonMinHeight")]
-				public static ThemeResourceKey<double> MinHeight => new("ButtonMinHeight");
+			[ResourceKeyDefinition(typeof(CornerRadius), "ButtonCornerRadius")]
+			public static ThemeResourceKey<CornerRadius> CornerRadius => new("ButtonCornerRadius");
 
-				[ResourceKeyDefinition(typeof(double), "ButtonMinWidth")]
-				public static ThemeResourceKey<double> MinWidth => new("ButtonMinWidth");
+			[ResourceKeyDefinition(typeof(string), "ButtonHorizontalContentAlignment")]
+			public static StaticResourceKey<string> HorizontalContentAlignment => new("ButtonHorizontalContentAlignment");
 
-				[ResourceKeyDefinition(typeof(Thickness), "ButtonPadding")]
-				public static ThemeResourceKey<Thickness> Padding => new("ButtonPadding");
+			[ResourceKeyDefinition(typeof(double), "ButtonMinHeight")]
+			public static ThemeResourceKey<double> MinHeight => new("ButtonMinHeight");
 
-				[ResourceKeyDefinition(typeof(string), "ButtonVerticalContentAlignment")]
-				public static StaticResourceKey<string> VerticalContentAlignment => new("ButtonVerticalContentAlignment");
-			}
+			[ResourceKeyDefinition(typeof(double), "ButtonMinWidth")]
+			public static ThemeResourceKey<double> MinWidth => new("ButtonMinWidth");
 
-			public static partial class Styles
-			{
-				[ResourceKeyDefinition(typeof(Style), "MaterialElevatedButtonStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
-				public static StaticResourceKey<Style> Elevated => new("MaterialElevatedButtonStyle");
+			[ResourceKeyDefinition(typeof(Thickness), "ButtonPadding")]
+			public static ThemeResourceKey<Thickness> Padding => new("ButtonPadding");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialFilledButtonStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
-				public static StaticResourceKey<Style> Filled => new("MaterialFilledButtonStyle");
+			[ResourceKeyDefinition(typeof(string), "ButtonVerticalContentAlignment")]
+			public static StaticResourceKey<string> VerticalContentAlignment => new("ButtonVerticalContentAlignment");
+		}
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialFilledTonalButtonStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
-				public static StaticResourceKey<Style> FilledTonal => new("MaterialFilledTonalButtonStyle");
+		public static partial class Styles
+		{
+			[ResourceKeyDefinition(typeof(Style), "MaterialElevatedButtonStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
+			public static StaticResourceKey<Style> Elevated => new("MaterialElevatedButtonStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialOutlinedButtonStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
-				public static StaticResourceKey<Style> Outlined => new("MaterialOutlinedButtonStyle");
+			[ResourceKeyDefinition(typeof(Style), "MaterialFilledButtonStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
+			public static StaticResourceKey<Style> Filled => new("MaterialFilledButtonStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialTextButtonStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
-				public static StaticResourceKey<Style> Text => new("MaterialTextButtonStyle");
+			[ResourceKeyDefinition(typeof(Style), "MaterialFilledTonalButtonStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
+			public static StaticResourceKey<Style> FilledTonal => new("MaterialFilledTonalButtonStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialIconButtonStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
-				public static StaticResourceKey<Style> Icon => new("MaterialIconButtonStyle");
-			}
+			[ResourceKeyDefinition(typeof(Style), "MaterialOutlinedButtonStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
+			public static StaticResourceKey<Style> Outlined => new("MaterialOutlinedButtonStyle");
+
+			[ResourceKeyDefinition(typeof(Style), "MaterialTextButtonStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
+			public static StaticResourceKey<Style> Text => new("MaterialTextButtonStyle");
+
+			[ResourceKeyDefinition(typeof(Style), "MaterialIconButtonStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
+			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
index 5e11baee8..1a1d028f5 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/CalendarDatePicker.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/CalendarDatePicker.cs
@@ -6,112 +6,100 @@
 using Uno.Extensions.Markup;
 using Uno.Extensions.Markup.Internals;
 
-using ResourceKeyDefinitionAttribute = Uno.Themes.WinUI.Markup.ResourceKeyDefinitionAttribute;
+namespace Uno.Themes.Markup;
 
-namespace Uno.Themes.Markup
+public static partial class Theme
 {
-	public static partial class Theme
+	public static partial class CalendarDatePicker
 	{
-		public static partial class CalendarDatePicker
+		public static partial class Resources
 		{
-			public static partial class Resources
+			public static partial class Background
 			{
-				public static readonly BackgroundVSG Background = new();
-				public partial class BackgroundVSG
-				{
-					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBackground")]
-					public ThemeResourceKey<Brush> Default = new("CalendarDatePickerBackground");
+				[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBackground")]
+				public static ThemeResourceKey<Brush> Default => new("CalendarDatePickerBackground");
 
-					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBackgroundPointerOver")]
-					public ThemeResourceKey<Brush> PointerOver = new("CalendarDatePickerBackgroundPointerOver");
+				[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBackgroundPointerOver")]
+				public static ThemeResourceKey<Brush> PointerOver => new("CalendarDatePickerBackgroundPointerOver");
 
-					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBackgroundPressed")]
-					public ThemeResourceKey<Brush> Pressed = new("CalendarDatePickerBackgroundPressed");
+				[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBackgroundPressed")]
+				public static ThemeResourceKey<Brush> Pressed => new("CalendarDatePickerBackgroundPressed");
 
-					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBackgroundDisabled")]
-					public ThemeResourceKey<Brush> Disabled = new("CalendarDatePickerBackgroundDisabled");
+				[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBackgroundDisabled")]
+				public static 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), "CalendarDatePickerBackgroundFocused")]
+				public static ThemeResourceKey<Brush> Focused => new("CalendarDatePickerBackgroundFocused");
+			}
 
-					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBorderBrushPressed")]
-					public ThemeResourceKey<Brush> Pressed = new("CalendarDatePickerBorderBrushPressed");
+			public static partial class BorderBrush
+			{
+				[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBorderBrush")]
+				public static ThemeResourceKey<Brush> Default => new("CalendarDatePickerBorderBrush");
 
-					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBorderBrushDisabled")]
-					public ThemeResourceKey<Brush> Disabled = new("CalendarDatePickerBorderBrushDisabled");
+				[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBorderBrushPointerOver")]
+				public static ThemeResourceKey<Brush> PointerOver => new("CalendarDatePickerBorderBrushPointerOver");
 
-					public static implicit operator ThemeResourceKey<Brush>(BorderBrushVSG self) => self.Default;
-				}
+				[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBorderBrushPressed")]
+				public static ThemeResourceKey<Brush> Pressed => new("CalendarDatePickerBorderBrushPressed");
 
-				public static partial class Header
-				{
-					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerHeaderForeground")]
-					public static ThemeResourceKey<Brush> Foreground => new("CalendarDatePickerHeaderForeground");
+				[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBorderBrushDisabled")]
+				public static ThemeResourceKey<Brush> Disabled => new("CalendarDatePickerBorderBrushDisabled");
+			}
 
-					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerHeaderForegroundDisabled")]
-					public static ThemeResourceKey<Brush> ForegroundDisabled => new("CalendarDatePickerHeaderForegroundDisabled");
-				}
+			public static partial class Header
+			{
+				[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerHeaderForeground")]
+				public static ThemeResourceKey<Brush> Foreground => new("CalendarDatePickerHeaderForeground");
 
-				public static readonly TextForegroundVSG TextForeground = new();
-				public partial class TextForegroundVSG
-				{
-					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerTextForeground")]
-					public ThemeResourceKey<Brush> Default = new("CalendarDatePickerTextForeground");
+				[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerHeaderForegroundDisabled")]
+				public static ThemeResourceKey<Brush> ForegroundDisabled => new("CalendarDatePickerHeaderForegroundDisabled");
+			}
 
-					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerTextForegroundDisabled")]
-					public ThemeResourceKey<Brush> Disabled = new("CalendarDatePickerTextForegroundDisabled");
+			public static partial class TextForeground
+			{
+				[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerTextForeground")]
+				public static ThemeResourceKey<Brush> Default => new("CalendarDatePickerTextForeground");
 
-					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerTextForegroundSelected")]
-					public ThemeResourceKey<Brush> Selected = new("CalendarDatePickerTextForegroundSelected");
+				[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerTextForegroundDisabled")]
+				public static ThemeResourceKey<Brush> Disabled => new("CalendarDatePickerTextForegroundDisabled");
 
-					public static implicit operator ThemeResourceKey<Brush>(TextForegroundVSG self) => self.Default;
-				}
+				[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerTextForegroundSelected")]
+				public static ThemeResourceKey<Brush> Selected => new("CalendarDatePickerTextForegroundSelected");
+			}
 
-				[ResourceKeyDefinition(typeof(CornerRadius), "CalendarDatePickerBackgroundCornerRadius")]
-				public static ThemeResourceKey<CornerRadius> BackgroundCornerRadius => new("CalendarDatePickerBackgroundCornerRadius");
+			[ResourceKeyDefinition(typeof(CornerRadius), "CalendarDatePickerBackgroundCornerRadius")]
+			public static ThemeResourceKey<CornerRadius> BackgroundCornerRadius => new("CalendarDatePickerBackgroundCornerRadius");
 
-				[ResourceKeyDefinition(typeof(double), "CalendarDatePickerBackgroundMinHeight")]
-				public static ThemeResourceKey<double> BackgroundMinHeight => new("CalendarDatePickerBackgroundMinHeight");
+			[ResourceKeyDefinition(typeof(double), "CalendarDatePickerBackgroundMinHeight")]
+			public static ThemeResourceKey<double> BackgroundMinHeight => new("CalendarDatePickerBackgroundMinHeight");
 
-				[ResourceKeyDefinition(typeof(Thickness), "CalendarDatePickerBorderThemeThickness")]
-				public static ThemeResourceKey<Thickness> BorderThemeThickness => new("CalendarDatePickerBorderThemeThickness");
+			[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), "CalendarDatePickerBottomBorderBrush")]
+			public static ThemeResourceKey<Brush> BottomBorderBrush => new("CalendarDatePickerBottomBorderBrush");
 
-				[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerCalendarGlyphForegroundDisabled")]
-				public static ThemeResourceKey<Brush> CalendarGlyphForegroundDisabled => new("CalendarDatePickerCalendarGlyphForegroundDisabled");
+			[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerCalendarGlyphForegroundDisabled")]
+			public static ThemeResourceKey<Brush> CalendarGlyphForegroundDisabled => new("CalendarDatePickerCalendarGlyphForegroundDisabled");
 
-				[ResourceKeyDefinition(typeof(Thickness), "CalendarDatePickerContentMargin")]
-				public static ThemeResourceKey<Thickness> ContentMargin => new("CalendarDatePickerContentMargin");
+			[ResourceKeyDefinition(typeof(Thickness), "CalendarDatePickerContentMargin")]
+			public static ThemeResourceKey<Thickness> ContentMargin => new("CalendarDatePickerContentMargin");
 
-				[ResourceKeyDefinition(typeof(CornerRadius), "CalendarDatePickerCornerRadius")]
-				public static ThemeResourceKey<CornerRadius> CornerRadius => new("CalendarDatePickerCornerRadius");
+			[ResourceKeyDefinition(typeof(CornerRadius), "CalendarDatePickerCornerRadius")]
+			public static ThemeResourceKey<CornerRadius> CornerRadius => new("CalendarDatePickerCornerRadius");
 
-				[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerForeground")]
-				public static ThemeResourceKey<Brush> Foreground => new("CalendarDatePickerForeground");
+			[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerForeground")]
+			public static ThemeResourceKey<Brush> Foreground => new("CalendarDatePickerForeground");
 
-				[ResourceKeyDefinition(typeof(double), "CalendarDatePickerHeight")]
-				public static ThemeResourceKey<double> Height => new("CalendarDatePickerHeight");
-			}
+			[ResourceKeyDefinition(typeof(double), "CalendarDatePickerHeight")]
+			public static ThemeResourceKey<double> Height => new("CalendarDatePickerHeight");
+		}
 
-			public static partial class Styles
-			{
-				[ResourceKeyDefinition(typeof(Style), "MaterialCalendarDatePickerStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.CalendarDatePicker))]
-				public static StaticResourceKey<Style> Default => new("MaterialCalendarDatePickerStyle");
-			}
+		public static partial class Styles
+		{
+			[ResourceKeyDefinition(typeof(Style), "MaterialCalendarDatePickerStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.CalendarDatePicker))]
+			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
index d99984183..7b716bffd 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/CalendarView.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/CalendarView.cs
@@ -6,31 +6,25 @@
 using Uno.Extensions.Markup;
 using Uno.Extensions.Markup.Internals;
 
-using ResourceKeyDefinitionAttribute = Uno.Themes.WinUI.Markup.ResourceKeyDefinitionAttribute;
+namespace Uno.Themes.Markup;
 
-namespace Uno.Themes.Markup
+public static partial class Theme
 {
-	public static partial class Theme
+	public static partial class CalendarView
 	{
-		public static partial class CalendarView
+		public static partial class Resources
 		{
-			public static partial class Resources
-			{
-				public static partial class Calendar
-				{
-					[ResourceKeyDefinition(typeof(Brush), "MaterialCalendarBlackoutForeground")]
-					public static ThemeResourceKey<Brush> BlackoutForeground => new("MaterialCalendarBlackoutForeground");
+			[ResourceKeyDefinition(typeof(Brush), "MaterialCalendarViewBlackoutForeground")]
+			public static StaticResourceKey<Brush> BlackoutForeground => new("MaterialCalendarViewBlackoutForeground");
 
-					[ResourceKeyDefinition(typeof(Brush), "MaterialCalendarTodayForeground")]
-					public static StaticResourceKey<Brush> TodayForeground => new("MaterialCalendarTodayForeground");
-				}
-			}
+			[ResourceKeyDefinition(typeof(Brush), "MaterialCalendarViewTodayForeground")]
+			public static StaticResourceKey<Brush> TodayForeground => new("MaterialCalendarViewTodayForeground");
+		}
 
-			public static partial class Styles
-			{
-				[ResourceKeyDefinition(typeof(Style), "MaterialCalendarViewStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.CalendarView))]
-				public static StaticResourceKey<Style> Default => new("MaterialCalendarViewStyle");
-			}
+		public static partial class Styles
+		{
+			[ResourceKeyDefinition(typeof(Style), "MaterialCalendarViewStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.CalendarView))]
+			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 cc8e9be2f..dd3845905 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/CheckBox.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/CheckBox.cs
@@ -6,173 +6,155 @@
 using Uno.Extensions.Markup;
 using Uno.Extensions.Markup.Internals;
 
-using ResourceKeyDefinitionAttribute = Uno.Themes.WinUI.Markup.ResourceKeyDefinitionAttribute;
+namespace Uno.Themes.Markup;
 
-namespace Uno.Themes.Markup
+public static partial class Theme
 {
-	public static partial class Theme
+	public static partial class CheckBox
 	{
-		public static partial class CheckBox
+		public static partial class Resources
 		{
-			public static partial class Resources
+			public static partial class CheckArea
 			{
-				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), "CheckBoxCheckBackgroundFillUnchecked")]
-					public ThemeResourceKey<Brush> Default = new("CheckBoxCheckBackgroundFillUnchecked");
+				[ResourceKeyDefinition(typeof(Thickness), "CheckBoxCheckAreaBorderThickness")]
+				public static ThemeResourceKey<Thickness> BorderThickness => new("CheckBoxCheckAreaBorderThickness");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillUncheckedPointerOver")]
-					public ThemeResourceKey<Brush> UncheckedPointerOver = new("CheckBoxCheckBackgroundFillUncheckedPointerOver");
+				[ResourceKeyDefinition(typeof(CornerRadius), "CheckBoxCheckAreaCornerRadius")]
+				public static ThemeResourceKey<CornerRadius> CornerRadius => new("CheckBoxCheckAreaCornerRadius");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillUncheckedPressed")]
-					public ThemeResourceKey<Brush> UncheckedPressed = new("CheckBoxCheckBackgroundFillUncheckedPressed");
+				[ResourceKeyDefinition(typeof(Thickness), "CheckBoxCheckAreaPadding")]
+				public static ThemeResourceKey<Thickness> Padding => new("CheckBoxCheckAreaPadding");
+			}
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillUncheckedDisabled")]
-					public ThemeResourceKey<Brush> UncheckedDisabled = new("CheckBoxCheckBackgroundFillUncheckedDisabled");
+			public static partial class CheckBackgroundFill
+			{
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFill")]
+				public static ThemeResourceKey<Brush> Default => new("CheckBoxCheckBackgroundFill");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillChecked")]
-					public ThemeResourceKey<Brush> CheckedNormal = new("CheckBoxCheckBackgroundFillChecked");
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillUnchecked")]
+				public static ThemeResourceKey<Brush> UncheckedNormal => new("CheckBoxCheckBackgroundFillUnchecked");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillCheckedPointerOver")]
-					public ThemeResourceKey<Brush> CheckedPointerOver = new("CheckBoxCheckBackgroundFillCheckedPointerOver");
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillUncheckedPointerOver")]
+				public static ThemeResourceKey<Brush> UncheckedPointerOver => new("CheckBoxCheckBackgroundFillUncheckedPointerOver");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillCheckedPressed")]
-					public ThemeResourceKey<Brush> CheckedPressed = new("CheckBoxCheckBackgroundFillCheckedPressed");
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillUncheckedPressed")]
+				public static ThemeResourceKey<Brush> UncheckedPressed => new("CheckBoxCheckBackgroundFillUncheckedPressed");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillCheckedDisabled")]
-					public ThemeResourceKey<Brush> CheckedDisabled = new("CheckBoxCheckBackgroundFillCheckedDisabled");
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillUncheckedDisabled")]
+				public static ThemeResourceKey<Brush> UncheckedDisabled => new("CheckBoxCheckBackgroundFillUncheckedDisabled");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillIndeterminate")]
-					public ThemeResourceKey<Brush> IndeterminateNormal = new("CheckBoxCheckBackgroundFillIndeterminate");
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillChecked")]
+				public static ThemeResourceKey<Brush> CheckedNormal => new("CheckBoxCheckBackgroundFillChecked");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillIndeterminatePointerOver")]
-					public ThemeResourceKey<Brush> IndeterminatePointerOver = new("CheckBoxCheckBackgroundFillIndeterminatePointerOver");
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillCheckedPointerOver")]
+				public static ThemeResourceKey<Brush> CheckedPointerOver => new("CheckBoxCheckBackgroundFillCheckedPointerOver");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillIndeterminatePressed")]
-					public ThemeResourceKey<Brush> IndeterminatePressed = new("CheckBoxCheckBackgroundFillIndeterminatePressed");
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillCheckedPressed")]
+				public static ThemeResourceKey<Brush> CheckedPressed => new("CheckBoxCheckBackgroundFillCheckedPressed");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillIndeterminateDisabled")]
-					public ThemeResourceKey<Brush> IndeterminateDisabled = new("CheckBoxCheckBackgroundFillIndeterminateDisabled");
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillCheckedDisabled")]
+				public static ThemeResourceKey<Brush> CheckedDisabled => new("CheckBoxCheckBackgroundFillCheckedDisabled");
 
-					public static implicit operator ThemeResourceKey<Brush>(CheckBackgroundFillUncheckedVSG self) => self.Default;
-				}
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillIndeterminate")]
+				public static ThemeResourceKey<Brush> IndeterminateNormal => new("CheckBoxCheckBackgroundFillIndeterminate");
 
-				public static readonly CheckBackgroundStrokeUncheckedVSG CheckBackgroundStrokeUnchecked = new();
-				public partial class CheckBackgroundStrokeUncheckedVSG
-				{
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeUnchecked")]
-					public ThemeResourceKey<Brush> Default = new("CheckBoxCheckBackgroundStrokeUnchecked");
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillIndeterminatePointerOver")]
+				public static ThemeResourceKey<Brush> IndeterminatePointerOver => new("CheckBoxCheckBackgroundFillIndeterminatePointerOver");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeUncheckedPointerOver")]
-					public ThemeResourceKey<Brush> UncheckedPointerOver = new("CheckBoxCheckBackgroundStrokeUncheckedPointerOver");
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillIndeterminatePressed")]
+				public static ThemeResourceKey<Brush> IndeterminatePressed => new("CheckBoxCheckBackgroundFillIndeterminatePressed");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeUncheckedPressed")]
-					public ThemeResourceKey<Brush> UncheckedPressed = new("CheckBoxCheckBackgroundStrokeUncheckedPressed");
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillIndeterminateDisabled")]
+				public static ThemeResourceKey<Brush> IndeterminateDisabled => new("CheckBoxCheckBackgroundFillIndeterminateDisabled");
+			}
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeUncheckedDisabled")]
-					public ThemeResourceKey<Brush> UncheckedDisabled = new("CheckBoxCheckBackgroundStrokeUncheckedDisabled");
+			public static partial class CheckBackgroundStroke
+			{
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStroke")]
+				public static ThemeResourceKey<Brush> Default => new("CheckBoxCheckBackgroundStroke");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeChecked")]
-					public ThemeResourceKey<Brush> CheckedNormal = new("CheckBoxCheckBackgroundStrokeChecked");
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeUnchecked")]
+				public static ThemeResourceKey<Brush> UncheckedNormal => new("CheckBoxCheckBackgroundStrokeUnchecked");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeCheckedPointerOver")]
-					public ThemeResourceKey<Brush> CheckedPointerOver = new("CheckBoxCheckBackgroundStrokeCheckedPointerOver");
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeUncheckedPointerOver")]
+				public static ThemeResourceKey<Brush> UncheckedPointerOver => new("CheckBoxCheckBackgroundStrokeUncheckedPointerOver");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeCheckedPressed")]
-					public ThemeResourceKey<Brush> CheckedPressed = new("CheckBoxCheckBackgroundStrokeCheckedPressed");
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeUncheckedPressed")]
+				public static ThemeResourceKey<Brush> UncheckedPressed => new("CheckBoxCheckBackgroundStrokeUncheckedPressed");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeCheckedDisabled")]
-					public ThemeResourceKey<Brush> CheckedDisabled = new("CheckBoxCheckBackgroundStrokeCheckedDisabled");
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeUncheckedDisabled")]
+				public static ThemeResourceKey<Brush> UncheckedDisabled => new("CheckBoxCheckBackgroundStrokeUncheckedDisabled");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeIndeterminate")]
-					public ThemeResourceKey<Brush> IndeterminateNormal = new("CheckBoxCheckBackgroundStrokeIndeterminate");
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeChecked")]
+				public static ThemeResourceKey<Brush> CheckedNormal => new("CheckBoxCheckBackgroundStrokeChecked");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeIndeterminatePointerOver")]
-					public ThemeResourceKey<Brush> IndeterminatePointerOver = new("CheckBoxCheckBackgroundStrokeIndeterminatePointerOver");
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeCheckedPointerOver")]
+				public static ThemeResourceKey<Brush> CheckedPointerOver => new("CheckBoxCheckBackgroundStrokeCheckedPointerOver");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeIndeterminatePressed")]
-					public ThemeResourceKey<Brush> IndeterminatePressed = new("CheckBoxCheckBackgroundStrokeIndeterminatePressed");
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeCheckedPressed")]
+				public static ThemeResourceKey<Brush> CheckedPressed => new("CheckBoxCheckBackgroundStrokeCheckedPressed");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeIndeterminateDisabled")]
-					public ThemeResourceKey<Brush> IndeterminateDisabled = new("CheckBoxCheckBackgroundStrokeIndeterminateDisabled");
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeCheckedDisabled")]
+				public static ThemeResourceKey<Brush> CheckedDisabled => new("CheckBoxCheckBackgroundStrokeCheckedDisabled");
 
-					public static implicit operator ThemeResourceKey<Brush>(CheckBackgroundStrokeUncheckedVSG self) => self.Default;
-				}
-
-				public static readonly GlyphForegroundCheckedVSG GlyphForegroundChecked = new();
-				public partial class GlyphForegroundCheckedVSG
-				{
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundChecked")]
-					public ThemeResourceKey<Brush> Default = new("CheckBoxGlyphForegroundChecked");
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeIndeterminate")]
+				public static ThemeResourceKey<Brush> IndeterminateNormal => new("CheckBoxCheckBackgroundStrokeIndeterminate");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundUnchecked")]
-					public ThemeResourceKey<Brush> UncheckedNormal = new("CheckBoxGlyphForegroundUnchecked");
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeIndeterminatePointerOver")]
+				public static ThemeResourceKey<Brush> IndeterminatePointerOver => new("CheckBoxCheckBackgroundStrokeIndeterminatePointerOver");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundUncheckedPointerOver")]
-					public ThemeResourceKey<Brush> UncheckedPointerOver = new("CheckBoxGlyphForegroundUncheckedPointerOver");
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeIndeterminatePressed")]
+				public static ThemeResourceKey<Brush> IndeterminatePressed => new("CheckBoxCheckBackgroundStrokeIndeterminatePressed");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundUncheckedPressed")]
-					public ThemeResourceKey<Brush> UncheckedPressed = new("CheckBoxGlyphForegroundUncheckedPressed");
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeIndeterminateDisabled")]
+				public static ThemeResourceKey<Brush> IndeterminateDisabled => new("CheckBoxCheckBackgroundStrokeIndeterminateDisabled");
+			}
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundUncheckedDisabled")]
-					public ThemeResourceKey<Brush> UncheckedDisabled = new("CheckBoxGlyphForegroundUncheckedDisabled");
+			public static partial class GlyphForeground
+			{
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForeground")]
+				public static ThemeResourceKey<Brush> Default => new("CheckBoxGlyphForeground");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundCheckedPointerOver")]
-					public ThemeResourceKey<Brush> CheckedPointerOver = new("CheckBoxGlyphForegroundCheckedPointerOver");
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundIndeterminate")]
+				public static ThemeResourceKey<Brush> IndeterminateNormal => new("CheckBoxGlyphForegroundIndeterminate");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundCheckedPressed")]
-					public ThemeResourceKey<Brush> CheckedPressed = new("CheckBoxGlyphForegroundCheckedPressed");
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundIndeterminatePointerOver")]
+				public static ThemeResourceKey<Brush> IndeterminatePointerOver => new("CheckBoxGlyphForegroundIndeterminatePointerOver");
 
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundCheckedDisabled")]
-					public ThemeResourceKey<Brush> CheckedDisabled = new("CheckBoxGlyphForegroundCheckedDisabled");
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundIndeterminatePressed")]
+				public static ThemeResourceKey<Brush> IndeterminatePressed => new("CheckBoxGlyphForegroundIndeterminatePressed");
 
-					public static implicit operator ThemeResourceKey<Brush>(GlyphForegroundCheckedVSG self) => self.Default;
-				}
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundIndeterminateDisabled")]
+				public static ThemeResourceKey<Brush> IndeterminateDisabled => new("CheckBoxGlyphForegroundIndeterminateDisabled");
 
-				public static readonly GlyphForegroundIndeterminateVSG GlyphForegroundIndeterminate = new();
-				public partial class GlyphForegroundIndeterminateVSG
-				{
-					[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundIndeterminate")]
-					public ThemeResourceKey<Brush> Default = new("CheckBoxGlyphForegroundIndeterminate");
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundUnchecked")]
+				public static ThemeResourceKey<Brush> UncheckedNormal => 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> CheckedNormal => 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
+			public static partial class StateCircle
+			{
+				public static partial class Opacity
 				{
 					[ResourceKeyDefinition(typeof(double), "CheckBoxStateCircleOpacityPointerOver")]
 					public static ThemeResourceKey<double> UncheckedPointerOver => new("CheckBoxStateCircleOpacityPointerOver");
@@ -181,51 +163,57 @@ public static partial class StateCircleOpacityPointerOver
 					public static ThemeResourceKey<double> UncheckedPressed => new("CheckBoxStateCircleOpacityPressed");
 				}
 
-				public static partial class Typography
-				{
-					[ResourceKeyDefinition(typeof(int), "CheckBoxCharacterSpacing")]
-					public static ThemeResourceKey<int> CharacterSpacing => new("CheckBoxCharacterSpacing");
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxStateCircleFillChecked")]
+				public static ThemeResourceKey<Brush> FillChecked => new("CheckBoxStateCircleFillChecked");
 
-					[ResourceKeyDefinition(typeof(FontFamily), "CheckBoxFontFamily")]
-					public static ThemeResourceKey<FontFamily> FontFamily => new("CheckBoxFontFamily");
+				[ResourceKeyDefinition(typeof(Brush), "CheckBoxStateCircleFillUnchecked")]
+				public static ThemeResourceKey<Brush> FillUnchecked => new("CheckBoxStateCircleFillUnchecked");
 
-					[ResourceKeyDefinition(typeof(double), "CheckBoxFontSize")]
-					public static ThemeResourceKey<double> FontSize => new("CheckBoxFontSize");
+				[ResourceKeyDefinition(typeof(double), "CheckBoxStateCircleOpacityFocused")]
+				public static ThemeResourceKey<double> OpacityFocused => new("CheckBoxStateCircleOpacityFocused");
+			}
 
-					[ResourceKeyDefinition(typeof(string), "CheckBoxFontWeight")]
-					public static ThemeResourceKey<string> FontWeight => new("CheckBoxFontWeight");
-				}
+			public static partial class Typography
+			{
+				[ResourceKeyDefinition(typeof(int), "CheckBoxCharacterSpacing")]
+				public static ThemeResourceKey<int> CharacterSpacing => new("CheckBoxCharacterSpacing");
 
-				[ResourceKeyDefinition(typeof(Brush), "CheckBoxBackgroundUnchecked")]
-				public static ThemeResourceKey<Brush> BackgroundUnchecked => new("CheckBoxBackgroundUnchecked");
+				[ResourceKeyDefinition(typeof(FontFamily), "CheckBoxFontFamily")]
+				public static ThemeResourceKey<FontFamily> FontFamily => new("CheckBoxFontFamily");
 
-				[ResourceKeyDefinition(typeof(Brush), "CheckBoxBorderBrushUnchecked")]
-				public static ThemeResourceKey<Brush> BorderBrushUnchecked => new("CheckBoxBorderBrushUnchecked");
+				[ResourceKeyDefinition(typeof(double), "CheckBoxFontSize")]
+				public static ThemeResourceKey<double> FontSize => new("CheckBoxFontSize");
 
-				[ResourceKeyDefinition(typeof(double), "CheckBoxCheckAreaSize")]
-				public static ThemeResourceKey<double> CheckAreaSize => new("CheckBoxCheckAreaSize");
+				[ResourceKeyDefinition(typeof(string), "CheckBoxFontWeight")]
+				public static ThemeResourceKey<string> FontWeight => new("CheckBoxFontWeight");
+			}
 
-				[ResourceKeyDefinition(typeof(string), "CheckBoxCheckGlyphPathData")]
-				public static ThemeResourceKey<string> CheckGlyphPathData => new("CheckBoxCheckGlyphPathData");
+			[ResourceKeyDefinition(typeof(Brush), "CheckBoxBackgroundUnchecked")]
+			public static ThemeResourceKey<Brush> BackgroundUnchecked => new("CheckBoxBackgroundUnchecked");
 
-				[ResourceKeyDefinition(typeof(double), "CheckBoxFocusAreaSize")]
-				public static ThemeResourceKey<double> FocusAreaSize => new("CheckBoxFocusAreaSize");
+			[ResourceKeyDefinition(typeof(Brush), "CheckBoxBorderBrushUnchecked")]
+			public static ThemeResourceKey<Brush> BorderBrushUnchecked => new("CheckBoxBorderBrushUnchecked");
 
-				[ResourceKeyDefinition(typeof(Brush), "CheckBoxForegroundUnchecked")]
-				public static ThemeResourceKey<Brush> ForegroundUnchecked => new("CheckBoxForegroundUnchecked");
+			[ResourceKeyDefinition(typeof(double), "CheckBoxCheckAreaSize")]
+			public static ThemeResourceKey<double> CheckAreaSize => new("CheckBoxCheckAreaSize");
 
-				[ResourceKeyDefinition(typeof(string), "CheckBoxHyphenGlyphPathData")]
-				public static ThemeResourceKey<string> HyphenGlyphPathData => new("CheckBoxHyphenGlyphPathData");
+			[ResourceKeyDefinition(typeof(string), "CheckBoxCheckGlyphPathData")]
+			public static ThemeResourceKey<string> CheckGlyphPathData => new("CheckBoxCheckGlyphPathData");
 
-				[ResourceKeyDefinition(typeof(double), "CheckBoxStateCircleOpacityFocused")]
-				public static ThemeResourceKey<double> StateCircleOpacityFocused => new("CheckBoxStateCircleOpacityFocused");
-			}
+			[ResourceKeyDefinition(typeof(double), "CheckBoxFocusAreaSize")]
+			public static ThemeResourceKey<double> FocusAreaSize => new("CheckBoxFocusAreaSize");
 
-			public static partial class Styles
-			{
-				[ResourceKeyDefinition(typeof(Style), "MaterialCheckBoxStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.CheckBox))]
-				public static StaticResourceKey<Style> Default => new("MaterialCheckBoxStyle");
-			}
+			[ResourceKeyDefinition(typeof(Brush), "CheckBoxForegroundUnchecked")]
+			public static ThemeResourceKey<Brush> ForegroundUnchecked => new("CheckBoxForegroundUnchecked");
+
+			[ResourceKeyDefinition(typeof(string), "CheckBoxHyphenGlyphPathData")]
+			public static ThemeResourceKey<string> HyphenGlyphPathData => new("CheckBoxHyphenGlyphPathData");
+		}
+
+		public static partial class Styles
+		{
+			[ResourceKeyDefinition(typeof(Style), "MaterialCheckBoxStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.CheckBox))]
+			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 5e9070e69..7bdb1ca35 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/ComboBox.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/ComboBox.cs
@@ -6,265 +6,235 @@
 using Uno.Extensions.Markup;
 using Uno.Extensions.Markup.Internals;
 
-using ResourceKeyDefinitionAttribute = Uno.Themes.WinUI.Markup.ResourceKeyDefinitionAttribute;
+namespace Uno.Themes.Markup;
 
-namespace Uno.Themes.Markup
+public static partial class Theme
 {
-	public static partial class Theme
+	public static partial class ComboBox
 	{
-		public static partial class ComboBox
+		public static partial class Resources
 		{
-			public static partial class Resources
+			public static partial class ArrowForeground
 			{
-				public static readonly ArrowForegroundVSG ArrowForeground = new();
-				public partial class ArrowForegroundVSG
-				{
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxArrowForeground")]
-					public ThemeResourceKey<Brush> Default = new("ComboBoxArrowForeground");
-
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxArrowForegroundOpened")]
-					public ThemeResourceKey<Brush> Opened = new("ComboBoxArrowForegroundOpened");
-
-					public static implicit operator ThemeResourceKey<Brush>(ArrowForegroundVSG self) => self.Default;
-				}
-
-				public static readonly BackgroundVSG Background = new();
-				public partial class BackgroundVSG
-				{
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackground")]
-					public ThemeResourceKey<Brush> Default = new("ComboBoxBackground");
-
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackgroundDisabled")]
-					public ThemeResourceKey<Brush> Disabled = new("ComboBoxBackgroundDisabled");
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxArrowForeground")]
+				public static ThemeResourceKey<Brush> Default => new("ComboBoxArrowForeground");
 
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackgroundPointerOver")]
-					public ThemeResourceKey<Brush> PointerOver = new("ComboBoxBackgroundPointerOver");
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxArrowForegroundOpened")]
+				public static ThemeResourceKey<Brush> Opened => new("ComboBoxArrowForegroundOpened");
+			}
 
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackgroundPressed")]
-					public ThemeResourceKey<Brush> Pressed = new("ComboBoxBackgroundPressed");
+			public static partial class Background
+			{
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackground")]
+				public static ThemeResourceKey<Brush> Default => new("ComboBoxBackground");
 
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackgroundFocused")]
-					public ThemeResourceKey<Brush> Focused = new("ComboBoxBackgroundFocused");
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackgroundDisabled")]
+				public static ThemeResourceKey<Brush> Disabled => new("ComboBoxBackgroundDisabled");
 
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackgroundFocusedPressed")]
-					public ThemeResourceKey<Brush> FocusedPressed = new("ComboBoxBackgroundFocusedPressed");
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackgroundPointerOver")]
+				public static ThemeResourceKey<Brush> PointerOver => new("ComboBoxBackgroundPointerOver");
 
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackgroundUnfocused")]
-					public ThemeResourceKey<Brush> Unfocused = new("ComboBoxBackgroundUnfocused");
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackgroundPressed")]
+				public static ThemeResourceKey<Brush> Pressed => new("ComboBoxBackgroundPressed");
 
-					public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
-				}
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackgroundFocused")]
+				public static ThemeResourceKey<Brush> Focused => new("ComboBoxBackgroundFocused");
 
-				public static readonly BorderBrushVSG BorderBrush = new();
-				public partial class BorderBrushVSG
-				{
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxBorderBrush")]
-					public ThemeResourceKey<Brush> Default = new("ComboBoxBorderBrush");
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackgroundFocusedPressed")]
+				public static ThemeResourceKey<Brush> FocusedPressed => new("ComboBoxBackgroundFocusedPressed");
 
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxBorderBrushDisabled")]
-					public ThemeResourceKey<Brush> Disabled = new("ComboBoxBorderBrushDisabled");
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackgroundUnfocused")]
+				public static ThemeResourceKey<Brush> Unfocused => new("ComboBoxBackgroundUnfocused");
+			}
 
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxBorderBrushPointerOver")]
-					public ThemeResourceKey<Brush> PointerOver = new("ComboBoxBorderBrushPointerOver");
+			public static partial class BorderBrush
+			{
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxBorderBrush")]
+				public static ThemeResourceKey<Brush> Default => new("ComboBoxBorderBrush");
 
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxBorderBrushPressed")]
-					public ThemeResourceKey<Brush> Pressed = new("ComboBoxBorderBrushPressed");
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxBorderBrushDisabled")]
+				public static ThemeResourceKey<Brush> Disabled => new("ComboBoxBorderBrushDisabled");
 
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxBorderBrushOpened")]
-					public ThemeResourceKey<Brush> Focused = new("ComboBoxBorderBrushOpened");
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxBorderBrushPointerOver")]
+				public static ThemeResourceKey<Brush> PointerOver => new("ComboBoxBorderBrushPointerOver");
 
-					public static implicit operator ThemeResourceKey<Brush>(BorderBrushVSG self) => self.Default;
-				}
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxBorderBrushPressed")]
+				public static ThemeResourceKey<Brush> Pressed => new("ComboBoxBorderBrushPressed");
 
-				public static readonly BorderThicknessVSG BorderThickness = new();
-				public partial class BorderThicknessVSG
-				{
-					[ResourceKeyDefinition(typeof(Thickness), "ComboBoxBorderThickness")]
-					public ThemeResourceKey<Thickness> Default = new("ComboBoxBorderThickness");
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxBorderBrushOpened")]
+				public static ThemeResourceKey<Brush> Focused => new("ComboBoxBorderBrushOpened");
+			}
 
-					[ResourceKeyDefinition(typeof(Thickness), "ComboBoxOpenedBorderThickness")]
-					public ThemeResourceKey<Thickness> Focused = new("ComboBoxOpenedBorderThickness");
+			public static partial class BorderThickness
+			{
+				[ResourceKeyDefinition(typeof(Thickness), "ComboBoxBorderThickness")]
+				public static ThemeResourceKey<Thickness> Default => new("ComboBoxBorderThickness");
 
-					public static implicit operator ThemeResourceKey<Thickness>(BorderThicknessVSG self) => self.Default;
-				}
+				[ResourceKeyDefinition(typeof(Thickness), "ComboBoxOpenedBorderThickness")]
+				public static ThemeResourceKey<Thickness> Focused => new("ComboBoxOpenedBorderThickness");
+			}
 
-				public static partial class DownGlyph
-				{
-					[ResourceKeyDefinition(typeof(double), "ComboBoxDownGlyphHeight")]
-					public static ThemeResourceKey<double> Height => new("ComboBoxDownGlyphHeight");
+			public static partial class DownGlyph
+			{
+				[ResourceKeyDefinition(typeof(double), "ComboBoxDownGlyphHeight")]
+				public static ThemeResourceKey<double> Height => new("ComboBoxDownGlyphHeight");
 
-					[ResourceKeyDefinition(typeof(Thickness), "ComboBoxDownGlyphMargin")]
-					public static ThemeResourceKey<Thickness> Margin => new("ComboBoxDownGlyphMargin");
+				[ResourceKeyDefinition(typeof(Thickness), "ComboBoxDownGlyphMargin")]
+				public static ThemeResourceKey<Thickness> Margin => new("ComboBoxDownGlyphMargin");
 
-					[ResourceKeyDefinition(typeof(double), "ComboBoxDownGlyphWidth")]
-					public static ThemeResourceKey<double> Width => new("ComboBoxDownGlyphWidth");
-				}
+				[ResourceKeyDefinition(typeof(double), "ComboBoxDownGlyphWidth")]
+				public static ThemeResourceKey<double> Width => new("ComboBoxDownGlyphWidth");
+			}
 
-				public static partial class DropDown
+			public static partial class DropDown
+			{
+				public static partial class Background
 				{
-					public static readonly BackgroundVSG Background = new();
-					public partial class BackgroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackground")]
-						public ThemeResourceKey<Brush> Default = new("ComboBoxDropDownBackground");
-
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackgroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("ComboBoxBackgroundDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackground")]
+					public static ThemeResourceKey<Brush> Default => new("ComboBoxDropDownBackground");
 
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackgroundPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("ComboBoxDropDownBackgroundPointerOver");
-
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackgroundPressed")]
-						public ThemeResourceKey<Brush> Pressed = new("ComboBoxDropDownBackgroundPressed");
-
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackgroundFocused")]
-						public ThemeResourceKey<Brush> Focused = new("ComboBoxDropDownBackgroundFocused");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackgroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("ComboBoxBackgroundDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackgroundFocusedPressed")]
-						public ThemeResourceKey<Brush> FocusedPressed = new("ComboBoxDropDownBackgroundFocusedPressed");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackgroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("ComboBoxDropDownBackgroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackgroundUnfocused")]
-						public ThemeResourceKey<Brush> Unfocused = new("ComboBoxBackgroundUnfocused");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackgroundPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("ComboBoxDropDownBackgroundPressed");
 
-						public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackgroundFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("ComboBoxDropDownBackgroundFocused");
 
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBorderBrush")]
-					public static ThemeResourceKey<Brush> BorderBrush => new("ComboBoxDropDownBorderBrush");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackgroundFocusedPressed")]
+					public static ThemeResourceKey<Brush> FocusedPressed => new("ComboBoxDropDownBackgroundFocusedPressed");
 
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownForeground")]
-					public static ThemeResourceKey<Brush> Foreground => new("ComboBoxDropDownForeground");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackgroundUnfocused")]
+					public static ThemeResourceKey<Brush> Unfocused => new("ComboBoxBackgroundUnfocused");
 				}
 
-				public static readonly ForegroundVSG Foreground = new();
-				public partial class ForegroundVSG
-				{
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxForeground")]
-					public ThemeResourceKey<Brush> Default = new("ComboBoxForeground");
-
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxForegroundDisabled")]
-					public ThemeResourceKey<Brush> Disabled = new("ComboBoxForegroundDisabled");
-
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxForegroundPointerOver")]
-					public ThemeResourceKey<Brush> PointerOver = new("ComboBoxForegroundPointerOver");
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBorderBrush")]
+				public static ThemeResourceKey<Brush> BorderBrush => new("ComboBoxDropDownBorderBrush");
 
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxForegroundPressed")]
-					public ThemeResourceKey<Brush> Pressed = new("ComboBoxForegroundPressed");
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownForeground")]
+				public static ThemeResourceKey<Brush> Foreground => new("ComboBoxDropDownForeground");
+			}
 
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxForegroundFocused")]
-					public ThemeResourceKey<Brush> Focused = new("ComboBoxForegroundFocused");
+			public static partial class Foreground
+			{
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxForeground")]
+				public static ThemeResourceKey<Brush> Default => new("ComboBoxForeground");
 
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxForegroundFocusedPressed")]
-					public ThemeResourceKey<Brush> FocusedPressed = new("ComboBoxForegroundFocusedPressed");
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxForegroundDisabled")]
+				public static ThemeResourceKey<Brush> Disabled => new("ComboBoxForegroundDisabled");
 
-					public static implicit operator ThemeResourceKey<Brush>(ForegroundVSG self) => self.Default;
-				}
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxForegroundPointerOver")]
+				public static ThemeResourceKey<Brush> PointerOver => new("ComboBoxForegroundPointerOver");
 
-				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), "ComboBoxForegroundPressed")]
+				public static ThemeResourceKey<Brush> Pressed => new("ComboBoxForegroundPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "ComboBoxLeadingIconForegroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("ComboBoxLeadingIconForegroundDisabled");
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxForegroundFocused")]
+				public static ThemeResourceKey<Brush> Focused => new("ComboBoxForegroundFocused");
 
-						public static implicit operator ThemeResourceKey<Brush>(ForegroundVSG self) => self.Default;
-					}
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxForegroundFocusedPressed")]
+				public static ThemeResourceKey<Brush> FocusedPressed => new("ComboBoxForegroundFocusedPressed");
+			}
 
-					[ResourceKeyDefinition(typeof(Thickness), "ComboBoxLeadingIconMargin")]
-					public static ThemeResourceKey<Thickness> Margin => new("ComboBoxLeadingIconMargin");
+			public static partial class LeadingIcon
+			{
+				public static partial class Foreground
+				{
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxLeadingIconForeground")]
+					public static ThemeResourceKey<Brush> Default => new("ComboBoxLeadingIconForeground");
 
-					[ResourceKeyDefinition(typeof(double), "ComboBoxLeadingIconWidth")]
-					public static ThemeResourceKey<double> Width => new("ComboBoxLeadingIconWidth");
+					[ResourceKeyDefinition(typeof(Brush), "ComboBoxLeadingIconForegroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("ComboBoxLeadingIconForegroundDisabled");
 				}
 
-				public static readonly PlaceHolderForegroundVSG PlaceHolderForeground = new();
-				public partial class PlaceHolderForegroundVSG
-				{
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForeground")]
-					public ThemeResourceKey<Brush> Default = new("ComboBoxPlaceHolderForeground");
+				[ResourceKeyDefinition(typeof(Thickness), "ComboBoxLeadingIconMargin")]
+				public static ThemeResourceKey<Thickness> Margin => new("ComboBoxLeadingIconMargin");
 
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForegroundDisabled")]
-					public ThemeResourceKey<Brush> Disabled = new("ComboBoxPlaceHolderForegroundDisabled");
+				[ResourceKeyDefinition(typeof(double), "ComboBoxLeadingIconWidth")]
+				public static ThemeResourceKey<double> Width => new("ComboBoxLeadingIconWidth");
+			}
 
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForegroundPointerOver")]
-					public ThemeResourceKey<Brush> PointerOver = new("ComboBoxPlaceHolderForegroundPointerOver");
+			public static partial class PlaceHolderForeground
+			{
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForeground")]
+				public static ThemeResourceKey<Brush> Default => new("ComboBoxPlaceHolderForeground");
 
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForegroundPressed")]
-					public ThemeResourceKey<Brush> Pressed = new("ComboBoxPlaceHolderForegroundPressed");
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForegroundDisabled")]
+				public static ThemeResourceKey<Brush> Disabled => new("ComboBoxPlaceHolderForegroundDisabled");
 
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForegroundFocused")]
-					public ThemeResourceKey<Brush> Focused = new("ComboBoxPlaceHolderForegroundFocused");
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForegroundPointerOver")]
+				public static ThemeResourceKey<Brush> PointerOver => new("ComboBoxPlaceHolderForegroundPointerOver");
 
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForegroundFocusedPressed")]
-					public ThemeResourceKey<Brush> FocusedPressed = new("ComboBoxPlaceHolderForegroundFocusedPressed");
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForegroundPressed")]
+				public static ThemeResourceKey<Brush> Pressed => new("ComboBoxPlaceHolderForegroundPressed");
 
-					public static implicit operator ThemeResourceKey<Brush>(PlaceHolderForegroundVSG self) => self.Default;
-				}
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForegroundFocused")]
+				public static ThemeResourceKey<Brush> Focused => new("ComboBoxPlaceHolderForegroundFocused");
 
-				public static partial class UpGlyph
-				{
-					[ResourceKeyDefinition(typeof(double), "ComboBoxUpGlyphHeight")]
-					public static ThemeResourceKey<double> Height => new("ComboBoxUpGlyphHeight");
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForegroundFocusedPressed")]
+				public static ThemeResourceKey<Brush> FocusedPressed => new("ComboBoxPlaceHolderForegroundFocusedPressed");
+			}
 
-					[ResourceKeyDefinition(typeof(Thickness), "ComboBoxUpGlyphMargin")]
-					public static ThemeResourceKey<Thickness> Margin => new("ComboBoxUpGlyphMargin");
+			public static partial class UpGlyph
+			{
+				[ResourceKeyDefinition(typeof(double), "ComboBoxUpGlyphHeight")]
+				public static ThemeResourceKey<double> Height => new("ComboBoxUpGlyphHeight");
 
-					[ResourceKeyDefinition(typeof(double), "ComboBoxUpGlyphWidth")]
-					public static ThemeResourceKey<double> Width => new("ComboBoxUpGlyphWidth");
-				}
+				[ResourceKeyDefinition(typeof(Thickness), "ComboBoxUpGlyphMargin")]
+				public static ThemeResourceKey<Thickness> Margin => new("ComboBoxUpGlyphMargin");
 
-				public static readonly UpperPlaceHolderForegroundVSG UpperPlaceHolderForeground = new();
-				public partial class UpperPlaceHolderForegroundVSG
-				{
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForeground")]
-					public ThemeResourceKey<Brush> Default = new("ComboBoxUpperPlaceHolderForeground");
+				[ResourceKeyDefinition(typeof(double), "ComboBoxUpGlyphWidth")]
+				public static ThemeResourceKey<double> Width => new("ComboBoxUpGlyphWidth");
+			}
 
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForegroundDisabled")]
-					public ThemeResourceKey<Brush> Disabled = new("ComboBoxUpperPlaceHolderForegroundDisabled");
+			public static partial class UpperPlaceHolderForeground
+			{
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForeground")]
+				public static ThemeResourceKey<Brush> Default => new("ComboBoxUpperPlaceHolderForeground");
 
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForegroundPointerOver")]
-					public ThemeResourceKey<Brush> PointerOver = new("ComboBoxUpperPlaceHolderForegroundPointerOver");
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForegroundDisabled")]
+				public static ThemeResourceKey<Brush> Disabled => new("ComboBoxUpperPlaceHolderForegroundDisabled");
 
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForegroundPressed")]
-					public ThemeResourceKey<Brush> Pressed = new("ComboBoxUpperPlaceHolderForegroundPressed");
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForegroundPointerOver")]
+				public static ThemeResourceKey<Brush> PointerOver => new("ComboBoxUpperPlaceHolderForegroundPointerOver");
 
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForegroundFocused")]
-					public ThemeResourceKey<Brush> Focused = new("ComboBoxUpperPlaceHolderForegroundFocused");
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForegroundPressed")]
+				public static ThemeResourceKey<Brush> Pressed => new("ComboBoxUpperPlaceHolderForegroundPressed");
 
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForegroundFocusedPressed")]
-					public ThemeResourceKey<Brush> FocusedPressed = new("ComboBoxUpperPlaceHolderForegroundFocusedPressed");
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForegroundFocused")]
+				public static ThemeResourceKey<Brush> Focused => new("ComboBoxUpperPlaceHolderForegroundFocused");
 
-					[ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForegroundOpened")]
-					public ThemeResourceKey<Brush> Opened = new("ComboBoxUpperPlaceHolderForegroundOpened");
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForegroundFocusedPressed")]
+				public static ThemeResourceKey<Brush> FocusedPressed => new("ComboBoxUpperPlaceHolderForegroundFocusedPressed");
 
-					public static implicit operator ThemeResourceKey<Brush>(UpperPlaceHolderForegroundVSG self) => self.Default;
-				}
+				[ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForegroundOpened")]
+				public static ThemeResourceKey<Brush> Opened => new("ComboBoxUpperPlaceHolderForegroundOpened");
+			}
 
-				[ResourceKeyDefinition(typeof(CornerRadius), "ComboBoxCornerRadius")]
-				public static ThemeResourceKey<CornerRadius> CornerRadius => new("ComboBoxCornerRadius");
+			[ResourceKeyDefinition(typeof(CornerRadius), "ComboBoxCornerRadius")]
+			public static ThemeResourceKey<CornerRadius> CornerRadius => new("ComboBoxCornerRadius");
 
-				[ResourceKeyDefinition(typeof(string), "ComboBoxDownArrowPathData")]
-				public static StaticResourceKey<string> DownArrowPathData => new("ComboBoxDownArrowPathData");
+			[ResourceKeyDefinition(typeof(string), "ComboBoxDownArrowPathData")]
+			public static StaticResourceKey<string> DownArrowPathData => new("ComboBoxDownArrowPathData");
 
-				[ResourceKeyDefinition(typeof(double), "ComboBoxMinHeight")]
-				public static ThemeResourceKey<double> MinHeight => new("ComboBoxMinHeight");
+			[ResourceKeyDefinition(typeof(double), "ComboBoxMinHeight")]
+			public static ThemeResourceKey<double> MinHeight => new("ComboBoxMinHeight");
 
-				[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");
-			}
+			[ResourceKeyDefinition(typeof(string), "ComboBoxUpArrowPathData")]
+			public static StaticResourceKey<string> UpArrowPathData => new("ComboBoxUpArrowPathData");
+		}
 
-			public static partial class Styles
-			{
-				[ResourceKeyDefinition(typeof(Style), "MaterialComboBoxStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.ComboBox))]
-				public static StaticResourceKey<Style> Default => new("MaterialComboBoxStyle");
-			}
+		public static partial class Styles
+		{
+			[ResourceKeyDefinition(typeof(Style), "MaterialComboBoxStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.ComboBox))]
+			public static StaticResourceKey<Style> Default => new("MaterialComboBoxStyle");
 		}
 	}
 }
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/ContentDialog.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/ContentDialog.cs
index 6b5cea0a5..c544148de 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/ContentDialog.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/ContentDialog.cs
@@ -6,61 +6,58 @@
 using Uno.Extensions.Markup;
 using Uno.Extensions.Markup.Internals;
 
-using ResourceKeyDefinitionAttribute = Uno.Themes.WinUI.Markup.ResourceKeyDefinitionAttribute;
+namespace Uno.Themes.Markup;
 
-namespace Uno.Themes.Markup
+public static partial class Theme
 {
-	public static partial class Theme
+	public static partial class ContentDialog
 	{
-		public static partial class ContentDialog
+		public static partial class Resources
 		{
-			public static partial class Resources
-			{
-				[ResourceKeyDefinition(typeof(Brush), "MaterialContentDialogBackground")]
-				public static StaticResourceKey<Brush> Background => new("MaterialContentDialogBackground");
+			[ResourceKeyDefinition(typeof(Brush), "MaterialContentDialogBackground")]
+			public static StaticResourceKey<Brush> Background => new("MaterialContentDialogBackground");
 
-				[ResourceKeyDefinition(typeof(Thickness), "MaterialContentDialogCommandSpaceToContentMargin")]
-				public static StaticResourceKey<Thickness> CommandSpaceToContentMargin => new("MaterialContentDialogCommandSpaceToContentMargin");
+			[ResourceKeyDefinition(typeof(Thickness), "MaterialContentDialogCommandSpaceToContentMargin")]
+			public static StaticResourceKey<Thickness> CommandSpaceToContentMargin => new("MaterialContentDialogCommandSpaceToContentMargin");
 
-				[ResourceKeyDefinition(typeof(Brush), "MaterialContentDialogContentForeground")]
-				public static StaticResourceKey<Brush> ContentForeground => new("MaterialContentDialogContentForeground");
+			[ResourceKeyDefinition(typeof(Brush), "MaterialContentDialogContentForeground")]
+			public static StaticResourceKey<Brush> ContentForeground => new("MaterialContentDialogContentForeground");
 
-				[ResourceKeyDefinition(typeof(CornerRadius), "MaterialContentDialogCornerRadius")]
-				public static StaticResourceKey<CornerRadius> CornerRadius => new("MaterialContentDialogCornerRadius");
+			[ResourceKeyDefinition(typeof(CornerRadius), "MaterialContentDialogCornerRadius")]
+			public static StaticResourceKey<CornerRadius> CornerRadius => new("MaterialContentDialogCornerRadius");
 
-				[ResourceKeyDefinition(typeof(Thickness), "MaterialContentDialogEdgeMargin")]
-				public static StaticResourceKey<Thickness> EdgeMargin => new("MaterialContentDialogEdgeMargin");
+			[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), "MaterialContentDialogMaxHeight")]
+			public static StaticResourceKey<double> MaxHeight => new("MaterialContentDialogMaxHeight");
 
-				[ResourceKeyDefinition(typeof(double), "MaterialContentDialogMaxWidth")]
-				public static StaticResourceKey<double> MaxWidth => new("MaterialContentDialogMaxWidth");
+			[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), "MaterialContentDialogMinHeight")]
+			public static StaticResourceKey<double> MinHeight => new("MaterialContentDialogMinHeight");
 
-				[ResourceKeyDefinition(typeof(double), "MaterialContentDialogMinWidth")]
-				public static StaticResourceKey<double> MinWidth => new("MaterialContentDialogMinWidth");
+			[ResourceKeyDefinition(typeof(double), "MaterialContentDialogMinWidth")]
+			public static StaticResourceKey<double> MinWidth => new("MaterialContentDialogMinWidth");
 
-				[ResourceKeyDefinition(typeof(Thickness), "MaterialContentDialogPanelPadding")]
-				public static StaticResourceKey<Thickness> PanelPadding => new("MaterialContentDialogPanelPadding");
+			[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), "MaterialContentDialogSmokeLayerBackground")]
+			public static StaticResourceKey<Brush> SmokeLayerBackground => new("MaterialContentDialogSmokeLayerBackground");
 
-				[ResourceKeyDefinition(typeof(Brush), "MaterialContentDialogTitleForeground")]
-				public static StaticResourceKey<Brush> TitleForeground => new("MaterialContentDialogTitleForeground");
+			[ResourceKeyDefinition(typeof(Brush), "MaterialContentDialogTitleForeground")]
+			public static StaticResourceKey<Brush> TitleForeground => new("MaterialContentDialogTitleForeground");
 
-				[ResourceKeyDefinition(typeof(Thickness), "MaterialContentDialogTitleToContentMargin")]
-				public static StaticResourceKey<Thickness> TitleToContentMargin => new("MaterialContentDialogTitleToContentMargin");
-			}
+			[ResourceKeyDefinition(typeof(Thickness), "MaterialContentDialogTitleToContentMargin")]
+			public static StaticResourceKey<Thickness> TitleToContentMargin => new("MaterialContentDialogTitleToContentMargin");
+		}
 
-			public static partial class Styles
-			{
-				[ResourceKeyDefinition(typeof(Style), "MaterialContentDialogStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.ContentDialog))]
-				public static StaticResourceKey<Style> Default => new("MaterialContentDialogStyle");
-			}
+		public static partial class Styles
+		{
+			[ResourceKeyDefinition(typeof(Style), "MaterialContentDialogStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.ContentDialog))]
+			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 274ec8e8c..0eba2c270 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/DatePicker.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/DatePicker.cs
@@ -6,121 +6,109 @@
 using Uno.Extensions.Markup;
 using Uno.Extensions.Markup.Internals;
 
-using ResourceKeyDefinitionAttribute = Uno.Themes.WinUI.Markup.ResourceKeyDefinitionAttribute;
+namespace Uno.Themes.Markup;
 
-namespace Uno.Themes.Markup
+public static partial class Theme
 {
-	public static partial class Theme
+	public static partial class DatePicker
 	{
-		public static partial class DatePicker
+		public static partial class Resources
 		{
-			public static partial class Resources
+			public static partial class Button
 			{
-				public static partial class Button
+				public static partial class Background
 				{
-					public static readonly BackgroundVSG Background = new();
-					public partial class BackgroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBackground")]
-						public ThemeResourceKey<Brush> Default = new("DatePickerButtonBackground");
+					[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBackground")]
+					public static ThemeResourceKey<Brush> Default => new("DatePickerButtonBackground");
 
-						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBackgroundPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("DatePickerButtonBackgroundPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBackgroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("DatePickerButtonBackgroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBackgroundPressed")]
-						public ThemeResourceKey<Brush> Pressed = new("DatePickerButtonBackgroundPressed");
+					[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBackgroundPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("DatePickerButtonBackgroundPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBackgroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("DatePickerButtonBackgroundDisabled");
-
-						public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
-					}
-
-					public static readonly ForegroundVSG Foreground = new();
-					public partial class ForegroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonForeground")]
-						public ThemeResourceKey<Brush> Default = new("DatePickerButtonForeground");
-
-						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonForegroundPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("DatePickerButtonForegroundPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBackgroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("DatePickerButtonBackgroundDisabled");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonForegroundPressed")]
-						public ThemeResourceKey<Brush> Pressed = new("DatePickerButtonForegroundPressed");
+				public static partial class Foreground
+				{
+					[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonForeground")]
+					public static ThemeResourceKey<Brush> Default => new("DatePickerButtonForeground");
 
-						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonForegroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("DatePickerButtonForegroundDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonForegroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("DatePickerButtonForegroundPointerOver");
 
-						public static implicit operator ThemeResourceKey<Brush>(ForegroundVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonForegroundPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("DatePickerButtonForegroundPressed");
 
-					[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBorderBrush")]
-					public static ThemeResourceKey<Brush> BorderBrush => new("DatePickerButtonBorderBrush");
+					[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonForegroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("DatePickerButtonForegroundDisabled");
 				}
 
-				public static partial class ButtonBorderBrush
-				{
-					[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 partial class ButtonContent
-				{
-					[ResourceKeyDefinition(typeof(double), "DatePickerButtonContentHeight")]
-					public static ThemeResourceKey<double> Height => new("DatePickerButtonContentHeight");
+				[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBorderBrushDisabled")]
+				public static ThemeResourceKey<Brush> Disabled => new("DatePickerButtonBorderBrushDisabled");
+			}
 
-					[ResourceKeyDefinition(typeof(Thickness), "DatePickerButtonContentMargin")]
-					public static ThemeResourceKey<Thickness> Margin => new("DatePickerButtonContentMargin");
-				}
+			public static partial class ButtonContent
+			{
+				[ResourceKeyDefinition(typeof(double), "DatePickerButtonContentHeight")]
+				public static ThemeResourceKey<double> Height => new("DatePickerButtonContentHeight");
 
-				public static readonly ButtonDateTextForegroundVSG ButtonDateTextForeground = new();
-				public partial class ButtonDateTextForegroundVSG
-				{
-					[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonDateTextForeground")]
-					public ThemeResourceKey<Brush> Default = new("DatePickerButtonDateTextForeground");
+				[ResourceKeyDefinition(typeof(Thickness), "DatePickerButtonContentMargin")]
+				public static ThemeResourceKey<Thickness> Margin => new("DatePickerButtonContentMargin");
+			}
 
-					[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonDateTextForegroundPointerOver")]
-					public ThemeResourceKey<Brush> PointerOver = new("DatePickerButtonDateTextForegroundPointerOver");
+			public static partial class ButtonDateTextForeground
+			{
+				[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonDateTextForeground")]
+				public static ThemeResourceKey<Brush> Default => new("DatePickerButtonDateTextForeground");
 
-					[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonDateTextForegroundPressed")]
-					public ThemeResourceKey<Brush> Pressed = new("DatePickerButtonDateTextForegroundPressed");
+				[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonDateTextForegroundPointerOver")]
+				public static ThemeResourceKey<Brush> PointerOver => new("DatePickerButtonDateTextForegroundPointerOver");
 
-					[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonDateTextForegroundDisabled")]
-					public ThemeResourceKey<Brush> Disabled = new("DatePickerButtonDateTextForegroundDisabled");
+				[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonDateTextForegroundPressed")]
+				public static ThemeResourceKey<Brush> Pressed => new("DatePickerButtonDateTextForegroundPressed");
 
-					public static implicit operator ThemeResourceKey<Brush>(ButtonDateTextForegroundVSG self) => self.Default;
-				}
+				[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonDateTextForegroundDisabled")]
+				public static ThemeResourceKey<Brush> Disabled => new("DatePickerButtonDateTextForegroundDisabled");
+			}
 
-				[ResourceKeyDefinition(typeof(double), "DatePickerButtonBottomBorderHeight")]
-				public static ThemeResourceKey<double> ButtonBottomBorderHeight => new("DatePickerButtonBottomBorderHeight");
+			[ResourceKeyDefinition(typeof(double), "DatePickerButtonBottomBorderHeight")]
+			public static ThemeResourceKey<double> ButtonBottomBorderHeight => new("DatePickerButtonBottomBorderHeight");
 
-				[ResourceKeyDefinition(typeof(Thickness), "DatePickerButtonHeaderMargin")]
-				public static ThemeResourceKey<Thickness> ButtonHeaderMargin => new("DatePickerButtonHeaderMargin");
+			[ResourceKeyDefinition(typeof(Thickness), "DatePickerButtonHeaderMargin")]
+			public static ThemeResourceKey<Thickness> ButtonHeaderMargin => new("DatePickerButtonHeaderMargin");
 
-				[ResourceKeyDefinition(typeof(Thickness), "DatePickerButtonPlaceholderMargin")]
-				public static ThemeResourceKey<Thickness> ButtonPlaceholderMargin => new("DatePickerButtonPlaceholderMargin");
+			[ResourceKeyDefinition(typeof(Thickness), "DatePickerButtonPlaceholderMargin")]
+			public static ThemeResourceKey<Thickness> ButtonPlaceholderMargin => new("DatePickerButtonPlaceholderMargin");
 
-				[ResourceKeyDefinition(typeof(CornerRadius), "DatePickerCornerRadius")]
-				public static ThemeResourceKey<CornerRadius> CornerRadius => new("DatePickerCornerRadius");
+			[ResourceKeyDefinition(typeof(CornerRadius), "DatePickerCornerRadius")]
+			public static ThemeResourceKey<CornerRadius> CornerRadius => new("DatePickerCornerRadius");
 
-				[ResourceKeyDefinition(typeof(double), "DatePickerHeight")]
-				public static ThemeResourceKey<double> Height => new("DatePickerHeight");
+			[ResourceKeyDefinition(typeof(double), "DatePickerHeight")]
+			public static ThemeResourceKey<double> Height => new("DatePickerHeight");
 
-				[ResourceKeyDefinition(typeof(Brush), "DatePickerPlaceholderTextForeground")]
-				public static ThemeResourceKey<Brush> PlaceholderTextForeground => new("DatePickerPlaceholderTextForeground");
-			}
+			[ResourceKeyDefinition(typeof(Brush), "DatePickerPlaceholderTextForeground")]
+			public static ThemeResourceKey<Brush> PlaceholderTextForeground => new("DatePickerPlaceholderTextForeground");
+		}
 
-			public static partial class Styles
-			{
-				[ResourceKeyDefinition(typeof(Style), "MaterialDatePickerStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.DatePicker))]
-				public static StaticResourceKey<Style> Default => new("MaterialDatePickerStyle");
-			}
+		public static partial class Styles
+		{
+			[ResourceKeyDefinition(typeof(Style), "MaterialDatePickerStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.DatePicker))]
+			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 1e55d4933..7815cf31b 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/FloatingActionButton.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/FloatingActionButton.cs
@@ -6,198 +6,168 @@
 using Uno.Extensions.Markup;
 using Uno.Extensions.Markup.Internals;
 
-using ResourceKeyDefinitionAttribute = Uno.Themes.WinUI.Markup.ResourceKeyDefinitionAttribute;
+namespace Uno.Themes.Markup;
 
-namespace Uno.Themes.Markup
+public static partial class Theme
 {
-	public static partial class Theme
+	public static partial class Button
 	{
-		public static partial class Button
+		public static partial class Resources
 		{
-			public static partial class Resources
+			public static partial class Fab
 			{
-				public static partial class Fab
+				public static partial class Background
 				{
-					public static readonly BackgroundVSG Background = new();
-					public partial class BackgroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "FabBackground")]
-						public ThemeResourceKey<Brush> Default = new("FabBackground");
-
-						[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 ThemeResourceKey<Brush> PointerOver = new("FabForegroundPointerOver");
-
-						[ResourceKeyDefinition(typeof(Brush), "FabForegroundPressed")]
-						public ThemeResourceKey<Brush> Pressed = new("FabForegroundPressed");
-
-						[ResourceKeyDefinition(typeof(Brush), "FabForegroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("FabForegroundDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "FabBackground")]
+					public static ThemeResourceKey<Brush> Default => new("FabBackground");
 
-						public static implicit operator ThemeResourceKey<Brush>(ForegroundVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "FabBackgroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("FabBackgroundPointerOver");
 
-					public static partial class StateOverlayBackground
-					{
-						[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), "FabStateOverlayBackgroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("FabStateOverlayBackgroundDisabled");
-
-						[ResourceKeyDefinition(typeof(Brush), "FabStateOverlayBackgroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("FabStateOverlayBackgroundFocused");
-					}
+					[ResourceKeyDefinition(typeof(Brush), "FabBackgroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("FabBackgroundDisabled");
+				}
 
-					[ResourceKeyDefinition(typeof(double), "MaterialFabContentWidthOrHeight")]
-					public static ThemeResourceKey<double> ContentWidthOrHeight => new("MaterialFabContentWidthOrHeight");
+				public static partial class Foreground
+				{
+					[ResourceKeyDefinition(typeof(Brush), "FabForeground")]
+					public static ThemeResourceKey<Brush> Default => new("FabForeground");
 
-					[ResourceKeyDefinition(typeof(CornerRadius), "MaterialFabCornerRadius")]
-					public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialFabCornerRadius");
+					[ResourceKeyDefinition(typeof(Brush), "FabForegroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("FabForegroundPointerOver");
 
-					[ResourceKeyDefinition(typeof(double), "MaterialFabIconTextPadding")]
-					public static ThemeResourceKey<double> IconTextPadding => new("MaterialFabIconTextPadding");
+					[ResourceKeyDefinition(typeof(Brush), "FabForegroundPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("FabForegroundPressed");
 
-					[ResourceKeyDefinition(typeof(Thickness), "MaterialFabPadding")]
-					public static ThemeResourceKey<Thickness> Padding => new("MaterialFabPadding");
+					[ResourceKeyDefinition(typeof(Brush), "FabForegroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("FabForegroundDisabled");
 				}
 
-				public static partial class LargeFab
+				public static partial class StateOverlayBackground
 				{
-					[ResourceKeyDefinition(typeof(double), "MaterialLargeFabContentWidthOrHeight")]
-					public static ThemeResourceKey<double> ContentWidthOrHeight => new("MaterialLargeFabContentWidthOrHeight");
+					[ResourceKeyDefinition(typeof(Brush), "FabStateOverlayBackgroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("FabStateOverlayBackgroundPointerOver");
 
-					[ResourceKeyDefinition(typeof(CornerRadius), "MaterialLargeFabCornerRadius")]
-					public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialLargeFabCornerRadius");
+					[ResourceKeyDefinition(typeof(Brush), "FabStateOverlayBackgroundPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("FabStateOverlayBackgroundPressed");
 
-					[ResourceKeyDefinition(typeof(Thickness), "MaterialLargeFabPadding")]
-					public static ThemeResourceKey<Thickness> Padding => new("MaterialLargeFabPadding");
-				}
+					[ResourceKeyDefinition(typeof(Brush), "FabStateOverlayBackgroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("FabStateOverlayBackgroundDisabled");
 
-				public static partial class SecondaryFab
-				{
-					public static readonly BackgroundVSG Background = new();
-					public partial class BackgroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryBackground")]
-						public ThemeResourceKey<Brush> Default = new("FabSecondaryBackground");
+					[ResourceKeyDefinition(typeof(Brush), "FabStateOverlayBackgroundFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("FabStateOverlayBackgroundFocused");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryBackgroundPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("FabSecondaryBackgroundPointerOver");
+				[ResourceKeyDefinition(typeof(double), "MaterialFabContentWidthOrHeight")]
+				public static ThemeResourceKey<double> ContentWidthOrHeight => new("MaterialFabContentWidthOrHeight");
 
-						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryBackgroundPressed")]
-						public ThemeResourceKey<Brush> Pressed = new("FabSecondaryBackgroundPressed");
+				[ResourceKeyDefinition(typeof(CornerRadius), "MaterialFabCornerRadius")]
+				public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialFabCornerRadius");
 
-						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryBackgroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("FabSecondaryBackgroundDisabled");
+				[ResourceKeyDefinition(typeof(double), "MaterialFabIconTextPadding")]
+				public static ThemeResourceKey<double> IconTextPadding => new("MaterialFabIconTextPadding");
 
-						public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
-					}
+				[ResourceKeyDefinition(typeof(Thickness), "MaterialFabPadding")]
+				public static ThemeResourceKey<Thickness> Padding => new("MaterialFabPadding");
+			}
 
-					public static partial class Fab
-					{
-						[ResourceKeyDefinition(typeof(CornerRadius), "MaterialFabCornerRadius")]
-						public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialFabCornerRadius");
+			public static partial class LargeFab
+			{
+				[ResourceKeyDefinition(typeof(double), "MaterialLargeFabContentWidthOrHeight")]
+				public static ThemeResourceKey<double> ContentWidthOrHeight => new("MaterialLargeFabContentWidthOrHeight");
 
-						[ResourceKeyDefinition(typeof(Thickness), "MaterialFabPadding")]
-						public static ThemeResourceKey<Thickness> Padding => new("MaterialFabPadding");
-					}
+				[ResourceKeyDefinition(typeof(CornerRadius), "MaterialLargeFabCornerRadius")]
+				public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialLargeFabCornerRadius");
 
-					public static readonly ForegroundVSG Foreground = new();
-					public partial class ForegroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryForeground")]
-						public ThemeResourceKey<Brush> Default = new("FabSecondaryForeground");
+				[ResourceKeyDefinition(typeof(Thickness), "MaterialLargeFabPadding")]
+				public static ThemeResourceKey<Thickness> Padding => new("MaterialLargeFabPadding");
+			}
 
-						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryForegroundPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("FabSecondaryForegroundPointerOver");
+			public static partial class SecondaryFab
+			{
+				public static partial class Background
+				{
+					[ResourceKeyDefinition(typeof(Brush), "FabSecondaryBackground")]
+					public static ThemeResourceKey<Brush> Default => new("FabSecondaryBackground");
 
-						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryForegroundPressed")]
-						public ThemeResourceKey<Brush> Pressed = new("FabSecondaryForegroundPressed");
+					[ResourceKeyDefinition(typeof(Brush), "FabSecondaryBackgroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("FabSecondaryBackgroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryForegroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("FabSecondaryForegroundDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "FabSecondaryBackgroundPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("FabSecondaryBackgroundPressed");
 
-						public static implicit operator ThemeResourceKey<Brush>(ForegroundVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "FabSecondaryBackgroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("FabSecondaryBackgroundDisabled");
+				}
 
-					public static partial class StateOverlayBackground
-					{
-						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryStateOverlayBackgroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("FabSecondaryStateOverlayBackgroundPointerOver");
+				public static partial class Fab
+				{
+					[ResourceKeyDefinition(typeof(CornerRadius), "MaterialFabCornerRadius")]
+					public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialFabCornerRadius");
 
-						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryStateOverlayBackgroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("FabSecondaryStateOverlayBackgroundPressed");
+					[ResourceKeyDefinition(typeof(Thickness), "MaterialFabPadding")]
+					public static ThemeResourceKey<Thickness> Padding => new("MaterialFabPadding");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryStateOverlayBackgroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("FabSecondaryStateOverlayBackgroundDisabled");
+				public static partial class Foreground
+				{
+					[ResourceKeyDefinition(typeof(Brush), "FabSecondaryForeground")]
+					public static ThemeResourceKey<Brush> Default => new("FabSecondaryForeground");
 
-						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryStateOverlayBackgroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("FabSecondaryStateOverlayBackgroundFocused");
-					}
+					[ResourceKeyDefinition(typeof(Brush), "FabSecondaryForegroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("FabSecondaryForegroundPointerOver");
 
-					[ResourceKeyDefinition(typeof(double), "MaterialFabContentWidthOrHeight")]
-					public static ThemeResourceKey<double> FabContentWidthOrHeight => new("MaterialFabContentWidthOrHeight");
+					[ResourceKeyDefinition(typeof(Brush), "FabSecondaryForegroundPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("FabSecondaryForegroundPressed");
 
-					[ResourceKeyDefinition(typeof(double), "MaterialFabIconTextPadding")]
-					public static ThemeResourceKey<double> FabIconTextPadding => new("MaterialFabIconTextPadding");
+					[ResourceKeyDefinition(typeof(Brush), "FabSecondaryForegroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("FabSecondaryForegroundDisabled");
 				}
 
-				public static partial class SecondaryLargeFab
+				public static partial class StateOverlayBackground
 				{
-					public static partial class LargeFab
-					{
-						[ResourceKeyDefinition(typeof(CornerRadius), "MaterialLargeFabCornerRadius")]
-						public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialLargeFabCornerRadius");
+					[ResourceKeyDefinition(typeof(Brush), "FabSecondaryStateOverlayBackgroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("FabSecondaryStateOverlayBackgroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Thickness), "MaterialLargeFabPadding")]
-						public static ThemeResourceKey<Thickness> Padding => new("MaterialLargeFabPadding");
-					}
+					[ResourceKeyDefinition(typeof(Brush), "FabSecondaryStateOverlayBackgroundPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("FabSecondaryStateOverlayBackgroundPressed");
 
-					[ResourceKeyDefinition(typeof(double), "MaterialLargeFabContentWidthOrHeight")]
-					public static ThemeResourceKey<double> LargeFabContentWidthOrHeight => new("MaterialLargeFabContentWidthOrHeight");
+					[ResourceKeyDefinition(typeof(Brush), "FabSecondaryStateOverlayBackgroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("FabSecondaryStateOverlayBackgroundDisabled");
+
+					[ResourceKeyDefinition(typeof(Brush), "FabSecondaryStateOverlayBackgroundFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("FabSecondaryStateOverlayBackgroundFocused");
 				}
 
-				public static partial class SecondarySmallFab
-				{
-					public static partial class SmallFab
-					{
-						[ResourceKeyDefinition(typeof(CornerRadius), "MaterialSmallFabCornerRadius")]
-						public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialSmallFabCornerRadius");
+				[ResourceKeyDefinition(typeof(double), "MaterialFabContentWidthOrHeight")]
+				public static ThemeResourceKey<double> FabContentWidthOrHeight => new("MaterialFabContentWidthOrHeight");
 
-						[ResourceKeyDefinition(typeof(Thickness), "MaterialSmallFabPadding")]
-						public static ThemeResourceKey<Thickness> Padding => new("MaterialSmallFabPadding");
-					}
+				[ResourceKeyDefinition(typeof(double), "MaterialFabIconTextPadding")]
+				public static ThemeResourceKey<double> FabIconTextPadding => new("MaterialFabIconTextPadding");
+			}
+
+			public static partial class SecondaryLargeFab
+			{
+				public static partial class LargeFab
+				{
+					[ResourceKeyDefinition(typeof(CornerRadius), "MaterialLargeFabCornerRadius")]
+					public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialLargeFabCornerRadius");
 
-					[ResourceKeyDefinition(typeof(double), "MaterialSmallFabContentWidthOrHeight")]
-					public static ThemeResourceKey<double> SmallFabContentWidthOrHeight => new("MaterialSmallFabContentWidthOrHeight");
+					[ResourceKeyDefinition(typeof(Thickness), "MaterialLargeFabPadding")]
+					public static ThemeResourceKey<Thickness> Padding => new("MaterialLargeFabPadding");
 				}
 
+				[ResourceKeyDefinition(typeof(double), "MaterialLargeFabContentWidthOrHeight")]
+				public static ThemeResourceKey<double> LargeFabContentWidthOrHeight => new("MaterialLargeFabContentWidthOrHeight");
+			}
+
+			public static partial class SecondarySmallFab
+			{
 				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");
 
@@ -205,243 +175,246 @@ public static partial class SmallFab
 					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 ThemeResourceKey<Brush> Default = new("FabSurfaceBackground");
+				[ResourceKeyDefinition(typeof(double), "MaterialSmallFabContentWidthOrHeight")]
+				public static ThemeResourceKey<double> SmallFabContentWidthOrHeight => new("MaterialSmallFabContentWidthOrHeight");
+			}
 
-						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceBackgroundPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("FabSurfaceBackgroundPointerOver");
+			public static partial class SmallFab
+			{
+				[ResourceKeyDefinition(typeof(double), "MaterialSmallFabContentWidthOrHeight")]
+				public static ThemeResourceKey<double> ContentWidthOrHeight => new("MaterialSmallFabContentWidthOrHeight");
 
-						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceBackgroundPressed")]
-						public ThemeResourceKey<Brush> Pressed = new("FabSurfaceBackgroundPressed");
+				[ResourceKeyDefinition(typeof(CornerRadius), "MaterialSmallFabCornerRadius")]
+				public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialSmallFabCornerRadius");
 
-						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceBackgroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("FabSurfaceBackgroundDisabled");
+				[ResourceKeyDefinition(typeof(Thickness), "MaterialSmallFabPadding")]
+				public static ThemeResourceKey<Thickness> Padding => new("MaterialSmallFabPadding");
+			}
 
-						public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
-					}
+			public static partial class SurfaceFab
+			{
+				public static partial class Background
+				{
+					[ResourceKeyDefinition(typeof(Brush), "FabSurfaceBackground")]
+					public static ThemeResourceKey<Brush> Default => new("FabSurfaceBackground");
 
-					public static partial class Fab
-					{
-						[ResourceKeyDefinition(typeof(CornerRadius), "MaterialFabCornerRadius")]
-						public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialFabCornerRadius");
+					[ResourceKeyDefinition(typeof(Brush), "FabSurfaceBackgroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("FabSurfaceBackgroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Thickness), "MaterialFabPadding")]
-						public static ThemeResourceKey<Thickness> Padding => new("MaterialFabPadding");
-					}
+					[ResourceKeyDefinition(typeof(Brush), "FabSurfaceBackgroundPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("FabSurfaceBackgroundPressed");
 
-					public static readonly ForegroundVSG Foreground = new();
-					public partial class ForegroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceForeground")]
-						public ThemeResourceKey<Brush> Default = new("FabSurfaceForeground");
+					[ResourceKeyDefinition(typeof(Brush), "FabSurfaceBackgroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("FabSurfaceBackgroundDisabled");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceForegroundPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("FabSurfaceForegroundPointerOver");
+				public static partial class Fab
+				{
+					[ResourceKeyDefinition(typeof(CornerRadius), "MaterialFabCornerRadius")]
+					public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialFabCornerRadius");
 
-						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceForegroundPressed")]
-						public ThemeResourceKey<Brush> Pressed = new("FabSurfaceForegroundPressed");
+					[ResourceKeyDefinition(typeof(Thickness), "MaterialFabPadding")]
+					public static ThemeResourceKey<Thickness> Padding => new("MaterialFabPadding");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceForegroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("FabSurfaceForegroundDisabled");
+				public static partial class Foreground
+				{
+					[ResourceKeyDefinition(typeof(Brush), "FabSurfaceForeground")]
+					public static ThemeResourceKey<Brush> Default => new("FabSurfaceForeground");
 
-						public static implicit operator ThemeResourceKey<Brush>(ForegroundVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "FabSurfaceForegroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("FabSurfaceForegroundPointerOver");
 
-					public static partial class StateOverlayBackground
-					{
-						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceStateOverlayBackgroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("FabSurfaceStateOverlayBackgroundPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "FabSurfaceForegroundPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("FabSurfaceForegroundPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceStateOverlayBackgroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("FabSurfaceStateOverlayBackgroundPressed");
+					[ResourceKeyDefinition(typeof(Brush), "FabSurfaceForegroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("FabSurfaceForegroundDisabled");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceStateOverlayBackgroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("FabSurfaceStateOverlayBackgroundDisabled");
+				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(double), "MaterialFabContentWidthOrHeight")]
-					public static ThemeResourceKey<double> FabContentWidthOrHeight => new("MaterialFabContentWidthOrHeight");
+					[ResourceKeyDefinition(typeof(Brush), "FabSurfaceStateOverlayBackgroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("FabSurfaceStateOverlayBackgroundDisabled");
 
-					[ResourceKeyDefinition(typeof(double), "MaterialFabIconTextPadding")]
-					public static ThemeResourceKey<double> FabIconTextPadding => new("MaterialFabIconTextPadding");
+					[ResourceKeyDefinition(typeof(Brush), "FabSurfaceStateOverlayBackgroundFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("FabSurfaceStateOverlayBackgroundFocused");
 				}
 
-				public static partial class SurfaceLargeFab
-				{
-					public static partial class LargeFab
-					{
-						[ResourceKeyDefinition(typeof(CornerRadius), "MaterialLargeFabCornerRadius")]
-						public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialLargeFabCornerRadius");
-
-						[ResourceKeyDefinition(typeof(Thickness), "MaterialLargeFabPadding")]
-						public static ThemeResourceKey<Thickness> Padding => new("MaterialLargeFabPadding");
-					}
+				[ResourceKeyDefinition(typeof(double), "MaterialFabContentWidthOrHeight")]
+				public static ThemeResourceKey<double> FabContentWidthOrHeight => new("MaterialFabContentWidthOrHeight");
 
-					[ResourceKeyDefinition(typeof(double), "MaterialLargeFabContentWidthOrHeight")]
-					public static ThemeResourceKey<double> LargeFabContentWidthOrHeight => new("MaterialLargeFabContentWidthOrHeight");
-				}
+				[ResourceKeyDefinition(typeof(double), "MaterialFabIconTextPadding")]
+				public static ThemeResourceKey<double> FabIconTextPadding => new("MaterialFabIconTextPadding");
+			}
 
-				public static partial class SurfaceSmallFab
+			public static partial class SurfaceLargeFab
+			{
+				public static partial class LargeFab
 				{
-					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");
-					}
+					[ResourceKeyDefinition(typeof(CornerRadius), "MaterialLargeFabCornerRadius")]
+					public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialLargeFabCornerRadius");
 
-					[ResourceKeyDefinition(typeof(double), "MaterialSmallFabContentWidthOrHeight")]
-					public static ThemeResourceKey<double> SmallFabContentWidthOrHeight => new("MaterialSmallFabContentWidthOrHeight");
+					[ResourceKeyDefinition(typeof(Thickness), "MaterialLargeFabPadding")]
+					public static ThemeResourceKey<Thickness> Padding => new("MaterialLargeFabPadding");
 				}
 
-				public static partial class TertiaryFab
-				{
-					public static readonly BackgroundVSG Background = new();
-					public partial class BackgroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryBackground")]
-						public ThemeResourceKey<Brush> Default = new("FabTertiaryBackground");
+				[ResourceKeyDefinition(typeof(double), "MaterialLargeFabContentWidthOrHeight")]
+				public static ThemeResourceKey<double> LargeFabContentWidthOrHeight => new("MaterialLargeFabContentWidthOrHeight");
+			}
 
-						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryBackgroundPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("FabTertiaryBackgroundPointerOver");
+			public static partial class SurfaceSmallFab
+			{
+				public static partial class SmallFab
+				{
+					[ResourceKeyDefinition(typeof(CornerRadius), "MaterialSmallFabCornerRadius")]
+					public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialSmallFabCornerRadius");
 
-						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryBackgroundPressed")]
-						public ThemeResourceKey<Brush> Pressed = new("FabTertiaryBackgroundPressed");
+					[ResourceKeyDefinition(typeof(Thickness), "MaterialSmallFabPadding")]
+					public static ThemeResourceKey<Thickness> Padding => new("MaterialSmallFabPadding");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryBackgroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("FabTertiaryBackgroundDisabled");
+				[ResourceKeyDefinition(typeof(double), "MaterialSmallFabContentWidthOrHeight")]
+				public static ThemeResourceKey<double> SmallFabContentWidthOrHeight => new("MaterialSmallFabContentWidthOrHeight");
+			}
 
-						public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
-					}
+			public static partial class TertiaryFab
+			{
+				public static partial class Background
+				{
+					[ResourceKeyDefinition(typeof(Brush), "FabTertiaryBackground")]
+					public static ThemeResourceKey<Brush> Default => new("FabTertiaryBackground");
 
-					public static partial class Fab
-					{
-						[ResourceKeyDefinition(typeof(CornerRadius), "MaterialFabCornerRadius")]
-						public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialFabCornerRadius");
+					[ResourceKeyDefinition(typeof(Brush), "FabTertiaryBackgroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("FabTertiaryBackgroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Thickness), "MaterialFabPadding")]
-						public static ThemeResourceKey<Thickness> Padding => new("MaterialFabPadding");
-					}
+					[ResourceKeyDefinition(typeof(Brush), "FabTertiaryBackgroundPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("FabTertiaryBackgroundPressed");
 
-					public static readonly ForegroundVSG Foreground = new();
-					public partial class ForegroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryForeground")]
-						public ThemeResourceKey<Brush> Default = new("FabTertiaryForeground");
+					[ResourceKeyDefinition(typeof(Brush), "FabTertiaryBackgroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("FabTertiaryBackgroundDisabled");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryForegroundPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("FabTertiaryForegroundPointerOver");
+				public static partial class Fab
+				{
+					[ResourceKeyDefinition(typeof(CornerRadius), "MaterialFabCornerRadius")]
+					public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialFabCornerRadius");
 
-						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryForegroundPressed")]
-						public ThemeResourceKey<Brush> Pressed = new("FabTertiaryForegroundPressed");
+					[ResourceKeyDefinition(typeof(Thickness), "MaterialFabPadding")]
+					public static ThemeResourceKey<Thickness> Padding => new("MaterialFabPadding");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryForegroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("FabTertiaryForegroundDisabled");
+				public static partial class Foreground
+				{
+					[ResourceKeyDefinition(typeof(Brush), "FabTertiaryForeground")]
+					public static ThemeResourceKey<Brush> Default => new("FabTertiaryForeground");
 
-						public static implicit operator ThemeResourceKey<Brush>(ForegroundVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "FabTertiaryForegroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("FabTertiaryForegroundPointerOver");
 
-					public static partial class StateOverlayBackground
-					{
-						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryStateOverlayBackgroundPointerOver")]
-						public static ThemeResourceKey<Brush> PointerOver => new("FabTertiaryStateOverlayBackgroundPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "FabTertiaryForegroundPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("FabTertiaryForegroundPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryStateOverlayBackgroundPressed")]
-						public static ThemeResourceKey<Brush> Pressed => new("FabTertiaryStateOverlayBackgroundPressed");
+					[ResourceKeyDefinition(typeof(Brush), "FabTertiaryForegroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("FabTertiaryForegroundDisabled");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryStateOverlayBackgroundDisabled")]
-						public static ThemeResourceKey<Brush> Disabled => new("FabTertiaryStateOverlayBackgroundDisabled");
+				public static partial class StateOverlayBackground
+				{
+					[ResourceKeyDefinition(typeof(Brush), "FabTertiaryStateOverlayBackgroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("FabTertiaryStateOverlayBackgroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryStateOverlayBackgroundFocused")]
-						public static ThemeResourceKey<Brush> Focused => new("FabTertiaryStateOverlayBackgroundFocused");
-					}
+					[ResourceKeyDefinition(typeof(Brush), "FabTertiaryStateOverlayBackgroundPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("FabTertiaryStateOverlayBackgroundPressed");
 
-					[ResourceKeyDefinition(typeof(double), "MaterialFabContentWidthOrHeight")]
-					public static ThemeResourceKey<double> FabContentWidthOrHeight => new("MaterialFabContentWidthOrHeight");
+					[ResourceKeyDefinition(typeof(Brush), "FabTertiaryStateOverlayBackgroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("FabTertiaryStateOverlayBackgroundDisabled");
 
-					[ResourceKeyDefinition(typeof(double), "MaterialFabIconTextPadding")]
-					public static ThemeResourceKey<double> FabIconTextPadding => new("MaterialFabIconTextPadding");
+					[ResourceKeyDefinition(typeof(Brush), "FabTertiaryStateOverlayBackgroundFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("FabTertiaryStateOverlayBackgroundFocused");
 				}
 
-				public static partial class TertiaryLargeFab
-				{
-					public static partial class LargeFab
-					{
-						[ResourceKeyDefinition(typeof(CornerRadius), "MaterialLargeFabCornerRadius")]
-						public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialLargeFabCornerRadius");
+				[ResourceKeyDefinition(typeof(double), "MaterialFabContentWidthOrHeight")]
+				public static ThemeResourceKey<double> FabContentWidthOrHeight => new("MaterialFabContentWidthOrHeight");
+
+				[ResourceKeyDefinition(typeof(double), "MaterialFabIconTextPadding")]
+				public static ThemeResourceKey<double> FabIconTextPadding => new("MaterialFabIconTextPadding");
+			}
 
-						[ResourceKeyDefinition(typeof(Thickness), "MaterialLargeFabPadding")]
-						public static ThemeResourceKey<Thickness> Padding => new("MaterialLargeFabPadding");
-					}
+			public static partial class TertiaryLargeFab
+			{
+				public static partial class LargeFab
+				{
+					[ResourceKeyDefinition(typeof(CornerRadius), "MaterialLargeFabCornerRadius")]
+					public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialLargeFabCornerRadius");
 
-					[ResourceKeyDefinition(typeof(double), "MaterialLargeFabContentWidthOrHeight")]
-					public static ThemeResourceKey<double> LargeFabContentWidthOrHeight => new("MaterialLargeFabContentWidthOrHeight");
+					[ResourceKeyDefinition(typeof(Thickness), "MaterialLargeFabPadding")]
+					public static ThemeResourceKey<Thickness> Padding => new("MaterialLargeFabPadding");
 				}
 
-				public static partial class TertiarySmallFab
-				{
-					public static partial class SmallFab
-					{
-						[ResourceKeyDefinition(typeof(CornerRadius), "MaterialSmallFabCornerRadius")]
-						public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialSmallFabCornerRadius");
+				[ResourceKeyDefinition(typeof(double), "MaterialLargeFabContentWidthOrHeight")]
+				public static ThemeResourceKey<double> LargeFabContentWidthOrHeight => new("MaterialLargeFabContentWidthOrHeight");
+			}
 
-						[ResourceKeyDefinition(typeof(Thickness), "MaterialSmallFabPadding")]
-						public static ThemeResourceKey<Thickness> Padding => new("MaterialSmallFabPadding");
-					}
+			public static partial class TertiarySmallFab
+			{
+				public static partial class SmallFab
+				{
+					[ResourceKeyDefinition(typeof(CornerRadius), "MaterialSmallFabCornerRadius")]
+					public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialSmallFabCornerRadius");
 
-					[ResourceKeyDefinition(typeof(double), "MaterialSmallFabContentWidthOrHeight")]
-					public static ThemeResourceKey<double> SmallFabContentWidthOrHeight => new("MaterialSmallFabContentWidthOrHeight");
+					[ResourceKeyDefinition(typeof(Thickness), "MaterialSmallFabPadding")]
+					public static ThemeResourceKey<Thickness> Padding => new("MaterialSmallFabPadding");
 				}
+
+				[ResourceKeyDefinition(typeof(double), "MaterialSmallFabContentWidthOrHeight")]
+				public static ThemeResourceKey<double> SmallFabContentWidthOrHeight => new("MaterialSmallFabContentWidthOrHeight");
 			}
+		}
 
-			public static partial class Styles
-			{
-				[ResourceKeyDefinition(typeof(Style), "MaterialFabStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
-				public static StaticResourceKey<Style> Fab => new("MaterialFabStyle");
+		public static partial class Styles
+		{
+			[ResourceKeyDefinition(typeof(Style), "MaterialFabStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
+			public static StaticResourceKey<Style> Fab => new("MaterialFabStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialSurfaceFabStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
-				public static StaticResourceKey<Style> SurfaceFab => new("MaterialSurfaceFabStyle");
+			[ResourceKeyDefinition(typeof(Style), "MaterialSurfaceFabStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
+			public static StaticResourceKey<Style> SurfaceFab => new("MaterialSurfaceFabStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialSecondaryFabStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
-				public static StaticResourceKey<Style> SecondaryFab => new("MaterialSecondaryFabStyle");
+			[ResourceKeyDefinition(typeof(Style), "MaterialSecondaryFabStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
+			public static StaticResourceKey<Style> SecondaryFab => new("MaterialSecondaryFabStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialTertiaryFabStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
-				public static StaticResourceKey<Style> TertiaryFab => new("MaterialTertiaryFabStyle");
+			[ResourceKeyDefinition(typeof(Style), "MaterialTertiaryFabStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
+			public static StaticResourceKey<Style> TertiaryFab => new("MaterialTertiaryFabStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialSmallFabStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
-				public static StaticResourceKey<Style> SmallFab => new("MaterialSmallFabStyle");
+			[ResourceKeyDefinition(typeof(Style), "MaterialSmallFabStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
+			public static StaticResourceKey<Style> SmallFab => new("MaterialSmallFabStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialSurfaceSmallFabStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
-				public static StaticResourceKey<Style> SurfaceSmallFab => new("MaterialSurfaceSmallFabStyle");
+			[ResourceKeyDefinition(typeof(Style), "MaterialSurfaceSmallFabStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
+			public static StaticResourceKey<Style> SurfaceSmallFab => new("MaterialSurfaceSmallFabStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialSecondarySmallFabStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
-				public static StaticResourceKey<Style> SecondarySmallFab => new("MaterialSecondarySmallFabStyle");
+			[ResourceKeyDefinition(typeof(Style), "MaterialSecondarySmallFabStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
+			public static StaticResourceKey<Style> SecondarySmallFab => new("MaterialSecondarySmallFabStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialTertiarySmallFabStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
-				public static StaticResourceKey<Style> TertiarySmallFab => new("MaterialTertiarySmallFabStyle");
+			[ResourceKeyDefinition(typeof(Style), "MaterialTertiarySmallFabStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
+			public static StaticResourceKey<Style> TertiarySmallFab => new("MaterialTertiarySmallFabStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialLargeFabStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
-				public static StaticResourceKey<Style> LargeFab => new("MaterialLargeFabStyle");
+			[ResourceKeyDefinition(typeof(Style), "MaterialLargeFabStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
+			public static StaticResourceKey<Style> LargeFab => new("MaterialLargeFabStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialSurfaceLargeFabStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
-				public static StaticResourceKey<Style> SurfaceLargeFab => new("MaterialSurfaceLargeFabStyle");
+			[ResourceKeyDefinition(typeof(Style), "MaterialSurfaceLargeFabStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
+			public static StaticResourceKey<Style> SurfaceLargeFab => new("MaterialSurfaceLargeFabStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialSecondaryLargeFabStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
-				public static StaticResourceKey<Style> SecondaryLargeFab => new("MaterialSecondaryLargeFabStyle");
+			[ResourceKeyDefinition(typeof(Style), "MaterialSecondaryLargeFabStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
+			public static StaticResourceKey<Style> SecondaryLargeFab => new("MaterialSecondaryLargeFabStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialTertiaryLargeFabStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
-				public static StaticResourceKey<Style> TertiaryLargeFab => new("MaterialTertiaryLargeFabStyle");
-			}
+			[ResourceKeyDefinition(typeof(Style), "MaterialTertiaryLargeFabStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Button))]
+			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 cd8460204..c79028f6d 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/HyperlinkButton.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/HyperlinkButton.cs
@@ -6,94 +6,82 @@
 using Uno.Extensions.Markup;
 using Uno.Extensions.Markup.Internals;
 
-using ResourceKeyDefinitionAttribute = Uno.Themes.WinUI.Markup.ResourceKeyDefinitionAttribute;
+namespace Uno.Themes.Markup;
 
-namespace Uno.Themes.Markup
+public static partial class Theme
 {
-	public static partial class Theme
+	public static partial class HyperlinkButton
 	{
-		public static partial class HyperlinkButton
+		public static partial class Resources
 		{
-			public static partial class Resources
+			public static partial class Background
 			{
-				public static readonly BackgroundVSG Background = new();
-				public partial class BackgroundVSG
-				{
-					[ResourceKeyDefinition(typeof(Brush), "HyperlinkButtonBackground")]
-					public ThemeResourceKey<Brush> Normal = new("HyperlinkButtonBackground");
+				[ResourceKeyDefinition(typeof(Brush), "HyperlinkButtonBackground")]
+				public static ThemeResourceKey<Brush> Normal => new("HyperlinkButtonBackground");
 
-					[ResourceKeyDefinition(typeof(Brush), "HyperlinkButtonBackgroundPointerOver")]
-					public ThemeResourceKey<Brush> PointerOver = new("HyperlinkButtonBackgroundPointerOver");
+				[ResourceKeyDefinition(typeof(Brush), "HyperlinkButtonBackgroundPointerOver")]
+				public static ThemeResourceKey<Brush> PointerOver => new("HyperlinkButtonBackgroundPointerOver");
 
-					[ResourceKeyDefinition(typeof(Brush), "HyperlinkButtonBackgroundPressed")]
-					public ThemeResourceKey<Brush> Pressed = new("HyperlinkButtonBackgroundPressed");
+				[ResourceKeyDefinition(typeof(Brush), "HyperlinkButtonBackgroundPressed")]
+				public static ThemeResourceKey<Brush> Pressed => new("HyperlinkButtonBackgroundPressed");
 
-					[ResourceKeyDefinition(typeof(Brush), "HyperlinkButtonBackgroundDisabled")]
-					public ThemeResourceKey<Brush> Disabled = new("HyperlinkButtonBackgroundDisabled");
-
-					public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Normal;
-				}
-
-				public static readonly BackgroundOpacityVSG BackgroundOpacity = new();
-				public partial class BackgroundOpacityVSG
-				{
-					[ResourceKeyDefinition(typeof(double), "HyperlinkButtonBackgroundOpacity")]
-					public ThemeResourceKey<double> Normal = new("HyperlinkButtonBackgroundOpacity");
-
-					[ResourceKeyDefinition(typeof(double), "HyperlinkButtonBackgroundOpacityPointerOver")]
-					public ThemeResourceKey<double> PointerOver = new("HyperlinkButtonBackgroundOpacityPointerOver");
+				[ResourceKeyDefinition(typeof(Brush), "HyperlinkButtonBackgroundDisabled")]
+				public static ThemeResourceKey<Brush> Disabled => new("HyperlinkButtonBackgroundDisabled");
+			}
 
-					[ResourceKeyDefinition(typeof(double), "HyperlinkButtonBackgroundOpacityPressed")]
-					public ThemeResourceKey<double> Pressed = new("HyperlinkButtonBackgroundOpacityPressed");
+			public static partial class BackgroundOpacity
+			{
+				[ResourceKeyDefinition(typeof(double), "HyperlinkButtonBackgroundOpacity")]
+				public static ThemeResourceKey<double> Normal => new("HyperlinkButtonBackgroundOpacity");
 
-					[ResourceKeyDefinition(typeof(double), "HyperlinkButtonBackgroundOpacityDisabled")]
-					public ThemeResourceKey<double> Disabled = new("HyperlinkButtonBackgroundOpacityDisabled");
+				[ResourceKeyDefinition(typeof(double), "HyperlinkButtonBackgroundOpacityPointerOver")]
+				public static ThemeResourceKey<double> PointerOver => new("HyperlinkButtonBackgroundOpacityPointerOver");
 
-					public static implicit operator ThemeResourceKey<double>(BackgroundOpacityVSG self) => self.Normal;
-				}
+				[ResourceKeyDefinition(typeof(double), "HyperlinkButtonBackgroundOpacityPressed")]
+				public static ThemeResourceKey<double> Pressed => new("HyperlinkButtonBackgroundOpacityPressed");
 
-				public static readonly BorderBrushVSG BorderBrush = new();
-				public partial class BorderBrushVSG
-				{
-					[ResourceKeyDefinition(typeof(Brush), "HyperlinkButtonBorderBrush")]
-					public ThemeResourceKey<Brush> Normal = new("HyperlinkButtonBorderBrush");
+				[ResourceKeyDefinition(typeof(double), "HyperlinkButtonBackgroundOpacityDisabled")]
+				public static ThemeResourceKey<double> Disabled => new("HyperlinkButtonBackgroundOpacityDisabled");
+			}
 
-					[ResourceKeyDefinition(typeof(Brush), "HyperlinkButtonBorderBrushPointerOver")]
-					public ThemeResourceKey<Brush> PointerOver = new("HyperlinkButtonBorderBrushPointerOver");
+			public static partial class BorderBrush
+			{
+				[ResourceKeyDefinition(typeof(Brush), "HyperlinkButtonBorderBrush")]
+				public static ThemeResourceKey<Brush> Normal => new("HyperlinkButtonBorderBrush");
 
-					[ResourceKeyDefinition(typeof(Brush), "HyperlinkButtonBorderBrushPressed")]
-					public ThemeResourceKey<Brush> Pressed = new("HyperlinkButtonBorderBrushPressed");
+				[ResourceKeyDefinition(typeof(Brush), "HyperlinkButtonBorderBrushPointerOver")]
+				public static ThemeResourceKey<Brush> PointerOver => new("HyperlinkButtonBorderBrushPointerOver");
 
-					[ResourceKeyDefinition(typeof(Brush), "HyperlinkButtonBorderBrushDisabled")]
-					public ThemeResourceKey<Brush> Disabled = new("HyperlinkButtonBorderBrushDisabled");
+				[ResourceKeyDefinition(typeof(Brush), "HyperlinkButtonBorderBrushPressed")]
+				public static ThemeResourceKey<Brush> Pressed => new("HyperlinkButtonBorderBrushPressed");
 
-					public static implicit operator ThemeResourceKey<Brush>(BorderBrushVSG self) => self.Normal;
-				}
+				[ResourceKeyDefinition(typeof(Brush), "HyperlinkButtonBorderBrushDisabled")]
+				public static ThemeResourceKey<Brush> Disabled => new("HyperlinkButtonBorderBrushDisabled");
+			}
 
-				public static partial class Typography
-				{
-					[ResourceKeyDefinition(typeof(FontFamily), "HyperlinkButtonFontFamily")]
-					public static ThemeResourceKey<FontFamily> FontFamily => new("HyperlinkButtonFontFamily");
+			public static partial 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(double), "HyperlinkButtonFontSize")]
+				public static ThemeResourceKey<double> FontSize => new("HyperlinkButtonFontSize");
+			}
 
-				[ResourceKeyDefinition(typeof(Brush), "HyperlinkButtonForeground")]
-				public static ThemeResourceKey<Brush> Foreground => new("HyperlinkButtonForeground");
+			[ResourceKeyDefinition(typeof(Brush), "HyperlinkButtonForeground")]
+			public static ThemeResourceKey<Brush> Foreground => new("HyperlinkButtonForeground");
 
-				[ResourceKeyDefinition(typeof(Thickness), "HyperlinkButtonPadding")]
-				public static ThemeResourceKey<Thickness> Padding => new("HyperlinkButtonPadding");
-			}
+			[ResourceKeyDefinition(typeof(Thickness), "HyperlinkButtonPadding")]
+			public static ThemeResourceKey<Thickness> Padding => new("HyperlinkButtonPadding");
+		}
 
-			public static partial class Styles
-			{
-				[ResourceKeyDefinition(typeof(Style), "MaterialHyperlinkButtonStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.HyperlinkButton))]
-				public static StaticResourceKey<Style> Default => new("MaterialHyperlinkButtonStyle");
+		public static partial class Styles
+		{
+			[ResourceKeyDefinition(typeof(Style), "MaterialHyperlinkButtonStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.HyperlinkButton))]
+			public static StaticResourceKey<Style> Default => new("MaterialHyperlinkButtonStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialSecondaryHyperlinkButtonStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.HyperlinkButton))]
-				public static StaticResourceKey<Style> Secondary => new("MaterialSecondaryHyperlinkButtonStyle");
-			}
+			[ResourceKeyDefinition(typeof(Style), "MaterialSecondaryHyperlinkButtonStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.HyperlinkButton))]
+			public static StaticResourceKey<Style> Secondary => new("MaterialSecondaryHyperlinkButtonStyle");
 		}
 	}
 }
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/PasswordBox.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/PasswordBox.cs
index 81b5c2adb..0eedbd94f 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/PasswordBox.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/PasswordBox.cs
@@ -6,292 +6,253 @@
 using Uno.Extensions.Markup;
 using Uno.Extensions.Markup.Internals;
 
-using ResourceKeyDefinitionAttribute = Uno.Themes.WinUI.Markup.ResourceKeyDefinitionAttribute;
+namespace Uno.Themes.Markup;
 
-namespace Uno.Themes.Markup
+public static partial class Theme
 {
-	public static partial class Theme
+	public static partial class PasswordBox
 	{
-		public static partial class PasswordBox
+		public static partial class Resources
 		{
-			public static partial class Resources
+			public static partial class Filled
 			{
-				public static partial class Filled
+				public static partial class Background
 				{
-					public static readonly BackgroundVSG Background = new();
-					public partial class BackgroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxBackground")]
-						public ThemeResourceKey<Brush> Default = new("FilledPasswordBoxBackground");
+					[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxBackground")]
+					public static ThemeResourceKey<Brush> Default => new("FilledPasswordBoxBackground");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxBackgroundPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("FilledPasswordBoxBackgroundPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxBackgroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("FilledPasswordBoxBackgroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxBackgroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("FilledPasswordBoxBackgroundDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxBackgroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("FilledPasswordBoxBackgroundDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxBackgroundFocused")]
-						public ThemeResourceKey<Brush> Focused = new("FilledPasswordBoxBackgroundFocused");
-
-						public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxBackgroundFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("FilledPasswordBoxBackgroundFocused");
+				}
 
-					public static readonly BorderBrushVSG BorderBrush = new();
-					public partial class BorderBrushVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxBorderBrushFocused")]
-						public ThemeResourceKey<Brush> Default = new("FilledPasswordBoxBorderBrushFocused");
+				public static partial class BorderBrush
+				{
+					[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxBorderBrushFocused")]
+					public static ThemeResourceKey<Brush> Default => new("FilledPasswordBoxBorderBrushFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxBorderBrushPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("FilledPasswordBoxBorderBrushPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxBorderBrushPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("FilledPasswordBoxBorderBrushPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxBorderBrushDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("FilledPasswordBoxBorderBrushDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxBorderBrushDisabled")]
+					public static 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");
 
-					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");
+				}
 
-						[ResourceKeyDefinition(typeof(double), "FilledPasswordBoxBorderHeightFocused")]
-						public static ThemeResourceKey<double> Focused => new("FilledPasswordBoxBorderHeightFocused");
-					}
+				public static partial class Foreground
+				{
+					[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxForeground")]
+					public static ThemeResourceKey<Brush> Default => new("FilledPasswordBoxForeground");
 
-					public static readonly ForegroundVSG Foreground = new();
-					public partial class ForegroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxForeground")]
-						public ThemeResourceKey<Brush> Default = new("FilledPasswordBoxForeground");
+					[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxForegroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("FilledPasswordBoxForegroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxForegroundPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("FilledPasswordBoxForegroundPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxForegroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("FilledPasswordBoxForegroundDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxForegroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("FilledPasswordBoxForegroundDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxForegroundFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("FilledPasswordBoxForegroundFocused");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxForegroundFocused")]
-						public ThemeResourceKey<Brush> Focused = new("FilledPasswordBoxForegroundFocused");
+				public static partial class LeadingIconForeground
+				{
+					[ResourceKeyDefinition(typeof(Brush), "PasswordBoxLeadingIconForeground")]
+					public static ThemeResourceKey<Brush> Default => new("PasswordBoxLeadingIconForeground");
 
-						public static implicit operator ThemeResourceKey<Brush>(ForegroundVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "PasswordBoxLeadingIconForegroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("PasswordBoxLeadingIconForegroundDisabled");
+				}
 
-					public static readonly LeadingIconForegroundVSG LeadingIconForeground = new();
-					public partial class LeadingIconForegroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "PasswordBoxLeadingIconForeground")]
-						public ThemeResourceKey<Brush> Default = new("PasswordBoxLeadingIconForeground");
+				public static partial class PlaceholderForeground
+				{
+					[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxPlaceholderForeground")]
+					public static ThemeResourceKey<Brush> Default => new("FilledPasswordBoxPlaceholderForeground");
 
-						[ResourceKeyDefinition(typeof(Brush), "PasswordBoxLeadingIconForegroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("PasswordBoxLeadingIconForegroundDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxPlaceholderForegroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("FilledPasswordBoxPlaceholderForegroundPointerOver");
 
-						public static implicit operator ThemeResourceKey<Brush>(LeadingIconForegroundVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxPlaceholderForegroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("FilledPasswordBoxPlaceholderForegroundDisabled");
 
-					public static readonly PlaceholderForegroundVSG PlaceholderForeground = new();
-					public partial class PlaceholderForegroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxPlaceholderForeground")]
-						public ThemeResourceKey<Brush> Default = new("FilledPasswordBoxPlaceholderForeground");
+					[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxPlaceholderForegroundFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("FilledPasswordBoxPlaceholderForegroundFocused");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxPlaceholderForegroundPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("FilledPasswordBoxPlaceholderForegroundPointerOver");
+				public static partial class Typography
+				{
+					[ResourceKeyDefinition(typeof(int), "FilledPasswordBoxCharacterSpacing")]
+					public static ThemeResourceKey<int> CharacterSpacing => new("FilledPasswordBoxCharacterSpacing");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxPlaceholderForegroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("FilledPasswordBoxPlaceholderForegroundDisabled");
+					[ResourceKeyDefinition(typeof(FontFamily), "FilledPasswordBoxFontFamily")]
+					public static ThemeResourceKey<FontFamily> FontFamily => new("FilledPasswordBoxFontFamily");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxPlaceholderForegroundFocused")]
-						public ThemeResourceKey<Brush> Focused = new("FilledPasswordBoxPlaceholderForegroundFocused");
+					[ResourceKeyDefinition(typeof(double), "FilledPasswordBoxFontSize")]
+					public static ThemeResourceKey<double> FontSize => new("FilledPasswordBoxFontSize");
 
-						public static implicit operator ThemeResourceKey<Brush>(PlaceholderForegroundVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(string), "FilledPasswordBoxFontWeight")]
+					public static ThemeResourceKey<string> FontWeight => new("FilledPasswordBoxFontWeight");
+				}
 
-					public static partial class Typography
-					{
-						[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), "FilledPasswordBoxForegroundOpacityDisabled")]
+				public static ThemeResourceKey<double> ForegroundOpacityDisabled => new("FilledPasswordBoxForegroundOpacityDisabled");
 
-						[ResourceKeyDefinition(typeof(double), "FilledPasswordBoxFontSize")]
-						public static ThemeResourceKey<double> FontSize => new("FilledPasswordBoxFontSize");
+				[ResourceKeyDefinition(typeof(double), "FilledPasswordBoxMinHeight")]
+				public static ThemeResourceKey<double> MinHeight => new("FilledPasswordBoxMinHeight");
 
-						[ResourceKeyDefinition(typeof(string), "FilledPasswordBoxFontWeight")]
-						public static ThemeResourceKey<string> FontWeight => new("FilledPasswordBoxFontWeight");
-					}
+				[ResourceKeyDefinition(typeof(Thickness), "FilledPasswordBoxPadding")]
+				public static ThemeResourceKey<Thickness> Padding => new("FilledPasswordBoxPadding");
 
-					[ResourceKeyDefinition(typeof(CornerRadius), "FilledPasswordBoxCornerRadius")]
-					public static ThemeResourceKey<CornerRadius> CornerRadius => new("FilledPasswordBoxCornerRadius");
+				[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxRevealButtonForeground")]
+				public static ThemeResourceKey<Brush> RevealButtonForeground => new("FilledPasswordBoxRevealButtonForeground");
+			}
 
-					[ResourceKeyDefinition(typeof(double), "FilledPasswordBoxForegroundOpacityDisabled")]
-					public static ThemeResourceKey<double> ForegroundOpacityDisabled => new("FilledPasswordBoxForegroundOpacityDisabled");
+			public static partial class Outlined
+			{
+				public static partial class Background
+				{
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxBackground")]
+					public static ThemeResourceKey<Brush> Default => new("OutlinedPasswordBoxBackground");
 
-					[ResourceKeyDefinition(typeof(double), "FilledPasswordBoxMinHeight")]
-					public static ThemeResourceKey<double> MinHeight => new("FilledPasswordBoxMinHeight");
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxBackgroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("OutlinedPasswordBoxBackgroundPointerOver");
 
-					[ResourceKeyDefinition(typeof(Thickness), "FilledPasswordBoxPadding")]
-					public static ThemeResourceKey<Thickness> Padding => new("FilledPasswordBoxPadding");
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxBackgroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("OutlinedPasswordBoxBackgroundDisabled");
 
-					[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxRevealButtonForeground")]
-					public static ThemeResourceKey<Brush> RevealButtonForeground => new("FilledPasswordBoxRevealButtonForeground");
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxBackgroundFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("OutlinedPasswordBoxBackgroundFocused");
 				}
 
-				public static partial class Outlined
+				public static partial class BorderBrush
 				{
-					public static readonly BackgroundVSG Background = new();
-					public partial class BackgroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxBackground")]
-						public ThemeResourceKey<Brush> Default = new("OutlinedPasswordBoxBackground");
-
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxBackgroundPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("OutlinedPasswordBoxBackgroundPointerOver");
-
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxBackgroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("OutlinedPasswordBoxBackgroundDisabled");
-
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxBackgroundFocused")]
-						public ThemeResourceKey<Brush> Focused = new("OutlinedPasswordBoxBackgroundFocused");
-
-						public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
-					}
-
-					public static readonly BorderBrushVSG BorderBrush = new();
-					public partial class BorderBrushVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxBorderBrush")]
-						public ThemeResourceKey<Brush> Default = new("OutlinedPasswordBoxBorderBrush");
-
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxBorderBrushPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("OutlinedPasswordBoxBorderBrushPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxBorderBrush")]
+					public static ThemeResourceKey<Brush> Default => new("OutlinedPasswordBoxBorderBrush");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxBorderBrushDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("OutlinedPasswordBoxBorderBrushDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxBorderBrushPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("OutlinedPasswordBoxBorderBrushPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "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 readonly BorderThicknessVSG BorderThickness = new();
-					public partial class BorderThicknessVSG
-					{
-						[ResourceKeyDefinition(typeof(Thickness), "OutlinedPasswordBoxBorderThickness")]
-						public ThemeResourceKey<Thickness> Default = new("OutlinedPasswordBoxBorderThickness");
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxBorderBrushFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("OutlinedPasswordBoxBorderBrushFocused");
+				}
 
-						[ResourceKeyDefinition(typeof(Thickness), "OutlinedPasswordBoxBorderThicknessPointerOver")]
-						public ThemeResourceKey<Thickness> PointerOver = new("OutlinedPasswordBoxBorderThicknessPointerOver");
+				public static partial class BorderPadding
+				{
+					[ResourceKeyDefinition(typeof(Thickness), "OutlinedPasswordBoxBorderPadding")]
+					public static ThemeResourceKey<Thickness> Default => new("OutlinedPasswordBoxBorderPadding");
 
-						[ResourceKeyDefinition(typeof(Thickness), "OutlinedPasswordBoxBorderThicknessFocused")]
-						public ThemeResourceKey<Thickness> Focused = new("OutlinedPasswordBoxBorderThicknessFocused");
+					[ResourceKeyDefinition(typeof(Thickness), "OutlinedPasswordBoxBorderPaddingPointerOver")]
+					public static ThemeResourceKey<Thickness> PointerOver => new("OutlinedPasswordBoxBorderPaddingPointerOver");
 
-						public static implicit operator ThemeResourceKey<Thickness>(BorderThicknessVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Thickness), "OutlinedPasswordBoxBorderPaddingFocused")]
+					public static ThemeResourceKey<Thickness> Focused => new("OutlinedPasswordBoxBorderPaddingFocused");
+				}
 
-					public static readonly ForegroundVSG Foreground = new();
-					public partial class ForegroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxForeground")]
-						public ThemeResourceKey<Brush> Default = new("OutlinedPasswordBoxForeground");
+				public static partial class BorderThickness
+				{
+					[ResourceKeyDefinition(typeof(Thickness), "OutlinedPasswordBoxBorderThickness")]
+					public static ThemeResourceKey<Thickness> Default => new("OutlinedPasswordBoxBorderThickness");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxForegroundPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("OutlinedPasswordBoxForegroundPointerOver");
+					[ResourceKeyDefinition(typeof(Thickness), "OutlinedPasswordBoxBorderThicknessPointerOver")]
+					public static ThemeResourceKey<Thickness> PointerOver => new("OutlinedPasswordBoxBorderThicknessPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxForegroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("OutlinedPasswordBoxForegroundDisabled");
+					[ResourceKeyDefinition(typeof(Thickness), "OutlinedPasswordBoxBorderThicknessFocused")]
+					public static ThemeResourceKey<Thickness> Focused => new("OutlinedPasswordBoxBorderThicknessFocused");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxForegroundFocused")]
-						public ThemeResourceKey<Brush> Focused = new("OutlinedPasswordBoxForegroundFocused");
+				public static partial class Foreground
+				{
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxForeground")]
+					public static ThemeResourceKey<Brush> Default => new("OutlinedPasswordBoxForeground");
 
-						public static implicit operator ThemeResourceKey<Brush>(ForegroundVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxForegroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("OutlinedPasswordBoxForegroundPointerOver");
 
-					public static readonly LeadingIconForegroundVSG LeadingIconForeground = new();
-					public partial class LeadingIconForegroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "PasswordBoxLeadingIconForeground")]
-						public ThemeResourceKey<Brush> Default = new("PasswordBoxLeadingIconForeground");
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxForegroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("OutlinedPasswordBoxForegroundDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "PasswordBoxLeadingIconForegroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("PasswordBoxLeadingIconForegroundDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxForegroundFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("OutlinedPasswordBoxForegroundFocused");
+				}
 
-						public static implicit operator ThemeResourceKey<Brush>(LeadingIconForegroundVSG self) => self.Default;
-					}
+				public static partial class LeadingIconForeground
+				{
+					[ResourceKeyDefinition(typeof(Brush), "PasswordBoxLeadingIconForeground")]
+					public static ThemeResourceKey<Brush> Default => new("PasswordBoxLeadingIconForeground");
 
-					public static readonly PlaceholderForegroundVSG PlaceholderForeground = new();
-					public partial class PlaceholderForegroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxPlaceholderForeground")]
-						public ThemeResourceKey<Brush> Default = new("OutlinedPasswordBoxPlaceholderForeground");
+					[ResourceKeyDefinition(typeof(Brush), "PasswordBoxLeadingIconForegroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("PasswordBoxLeadingIconForegroundDisabled");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxPlaceholderForegroundPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("OutlinedPasswordBoxPlaceholderForegroundPointerOver");
+				public static partial class PlaceholderForeground
+				{
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxPlaceholderForeground")]
+					public static ThemeResourceKey<Brush> Default => new("OutlinedPasswordBoxPlaceholderForeground");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxPlaceholderForegroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("OutlinedPasswordBoxPlaceholderForegroundDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxPlaceholderForegroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("OutlinedPasswordBoxPlaceholderForegroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxPlaceholderForegroundFocused")]
-						public ThemeResourceKey<Brush> Focused = new("OutlinedPasswordBoxPlaceholderForegroundFocused");
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxPlaceholderForegroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("OutlinedPasswordBoxPlaceholderForegroundDisabled");
 
-						public static implicit operator ThemeResourceKey<Brush>(PlaceholderForegroundVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxPlaceholderForegroundFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("OutlinedPasswordBoxPlaceholderForegroundFocused");
+				}
 
-					public static partial class Typography
-					{
-						[ResourceKeyDefinition(typeof(int), "OutlinedPasswordBoxCharacterSpacing")]
-						public static ThemeResourceKey<int> CharacterSpacing => new("OutlinedPasswordBoxCharacterSpacing");
+				public static partial class Typography
+				{
+					[ResourceKeyDefinition(typeof(int), "OutlinedPasswordBoxCharacterSpacing")]
+					public static ThemeResourceKey<int> CharacterSpacing => new("OutlinedPasswordBoxCharacterSpacing");
 
-						[ResourceKeyDefinition(typeof(FontFamily), "OutlinedPasswordBoxFontFamily")]
-						public static ThemeResourceKey<FontFamily> FontFamily => new("OutlinedPasswordBoxFontFamily");
+					[ResourceKeyDefinition(typeof(FontFamily), "OutlinedPasswordBoxFontFamily")]
+					public static ThemeResourceKey<FontFamily> FontFamily => new("OutlinedPasswordBoxFontFamily");
 
-						[ResourceKeyDefinition(typeof(double), "OutlinedPasswordBoxFontSize")]
-						public static ThemeResourceKey<double> FontSize => new("OutlinedPasswordBoxFontSize");
+					[ResourceKeyDefinition(typeof(double), "OutlinedPasswordBoxFontSize")]
+					public static ThemeResourceKey<double> FontSize => new("OutlinedPasswordBoxFontSize");
 
-						[ResourceKeyDefinition(typeof(string), "OutlinedPasswordBoxFontWeight")]
-						public static ThemeResourceKey<string> FontWeight => new("OutlinedPasswordBoxFontWeight");
-					}
+					[ResourceKeyDefinition(typeof(string), "OutlinedPasswordBoxFontWeight")]
+					public static ThemeResourceKey<string> FontWeight => new("OutlinedPasswordBoxFontWeight");
+				}
 
-					[ResourceKeyDefinition(typeof(CornerRadius), "OutlinedPasswordBoxCornerRadius")]
-					public static ThemeResourceKey<CornerRadius> CornerRadius => new("OutlinedPasswordBoxCornerRadius");
+				[ResourceKeyDefinition(typeof(CornerRadius), "OutlinedPasswordBoxCornerRadius")]
+				public static ThemeResourceKey<CornerRadius> CornerRadius => new("OutlinedPasswordBoxCornerRadius");
 
-					[ResourceKeyDefinition(typeof(double), "OutlinedPasswordBoxForegroundOpacityDisabled")]
-					public static ThemeResourceKey<double> ForegroundOpacityDisabled => new("OutlinedPasswordBoxForegroundOpacityDisabled");
+				[ResourceKeyDefinition(typeof(double), "OutlinedPasswordBoxForegroundOpacityDisabled")]
+				public static ThemeResourceKey<double> ForegroundOpacityDisabled => new("OutlinedPasswordBoxForegroundOpacityDisabled");
 
-					[ResourceKeyDefinition(typeof(double), "OutlinedPasswordBoxMinHeight")]
-					public static ThemeResourceKey<double> MinHeight => new("OutlinedPasswordBoxMinHeight");
+				[ResourceKeyDefinition(typeof(double), "OutlinedPasswordBoxMinHeight")]
+				public static ThemeResourceKey<double> MinHeight => new("OutlinedPasswordBoxMinHeight");
 
-					[ResourceKeyDefinition(typeof(Thickness), "OutlinedPasswordBoxPadding")]
-					public static ThemeResourceKey<Thickness> Padding => new("OutlinedPasswordBoxPadding");
-				}
+				[ResourceKeyDefinition(typeof(Thickness), "OutlinedPasswordBoxPadding")]
+				public static ThemeResourceKey<Thickness> Padding => new("OutlinedPasswordBoxPadding");
 			}
+		}
 
-			public static partial class Styles
-			{
-				[ResourceKeyDefinition(typeof(Style), "MaterialFilledPasswordBoxStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.PasswordBox))]
-				public static StaticResourceKey<Style> Filled => new("MaterialFilledPasswordBoxStyle");
+		public static partial class Styles
+		{
+			[ResourceKeyDefinition(typeof(Style), "MaterialFilledPasswordBoxStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.PasswordBox))]
+			public static StaticResourceKey<Style> Filled => new("MaterialFilledPasswordBoxStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialOutlinedPasswordBoxStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.PasswordBox))]
-				public static StaticResourceKey<Style> Outlined => new("MaterialOutlinedPasswordBoxStyle");
-			}
+			[ResourceKeyDefinition(typeof(Style), "MaterialOutlinedPasswordBoxStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.PasswordBox))]
+			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 dff5a99bf..79a34e58a 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressBar.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressBar.cs
@@ -6,37 +6,34 @@
 using Uno.Extensions.Markup;
 using Uno.Extensions.Markup.Internals;
 
-using ResourceKeyDefinitionAttribute = Uno.Themes.WinUI.Markup.ResourceKeyDefinitionAttribute;
+namespace Uno.Themes.Markup;
 
-namespace Uno.Themes.Markup
+public static partial class Theme
 {
-	public static partial class Theme
+	public static partial class ProgressBar
 	{
-		public static partial class ProgressBar
+		public static partial class Resources
 		{
-			public static partial class Resources
+			public static partial class ProgressBar
 			{
-				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(Brush), "ProgressBarForeground")]
+				public static ThemeResourceKey<Brush> Foreground => new("ProgressBarForeground");
 
-					[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");
-				}
+				[ResourceKeyDefinition(typeof(double), "ProgressBarMinWidth")]
+				public static ThemeResourceKey<double> MinWidth => new("ProgressBarMinWidth");
 			}
+		}
 
-			public static partial class Styles
-			{
-				[ResourceKeyDefinition(typeof(Style), "MaterialProgressBarStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.ProgressBar))]
-				public static StaticResourceKey<Style> Default => new("MaterialProgressBarStyle");
-			}
+		public static partial class Styles
+		{
+			[ResourceKeyDefinition(typeof(Style), "MaterialProgressBarStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.ProgressBar))]
+			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 fe2e75d4a..a78b5b884 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressRing.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressRing.cs
@@ -6,31 +6,28 @@
 using Uno.Extensions.Markup;
 using Uno.Extensions.Markup.Internals;
 
-using ResourceKeyDefinitionAttribute = Uno.Themes.WinUI.Markup.ResourceKeyDefinitionAttribute;
+namespace Uno.Themes.Markup;
 
-namespace Uno.Themes.Markup
+public static partial class Theme
 {
-	public static partial class Theme
+	public static partial class ProgressRing
 	{
-		public static partial class ProgressRing
+		public static partial class Resources
 		{
-			public static partial class Resources
+			public static partial class ProgressRing
 			{
-				public static partial class ProgressRing
-				{
-					[ResourceKeyDefinition(typeof(Brush), "ProgressRingBackground")]
-					public static ThemeResourceKey<Brush> Background => new("ProgressRingBackground");
+				[ResourceKeyDefinition(typeof(Brush), "ProgressRingBackground")]
+				public static ThemeResourceKey<Brush> Background => new("ProgressRingBackground");
 
-					[ResourceKeyDefinition(typeof(Brush), "ProgressRingForeground")]
-					public static ThemeResourceKey<Brush> Foreground => new("ProgressRingForeground");
-				}
+				[ResourceKeyDefinition(typeof(Brush), "ProgressRingForeground")]
+				public static ThemeResourceKey<Brush> Foreground => new("ProgressRingForeground");
 			}
+		}
 
-			public static partial class Styles
-			{
-				[ResourceKeyDefinition(typeof(Style), "MaterialProgressRingStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.ProgressRing))]
-				public static StaticResourceKey<Style> Default => new("MaterialProgressRingStyle");
-			}
+		public static partial class Styles
+		{
+			[ResourceKeyDefinition(typeof(Style), "MaterialProgressRingStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.ProgressRing))]
+			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 9e0881505..9c2f6e1f3 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/RadioButton.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/RadioButton.cs
@@ -6,160 +6,145 @@
 using Uno.Extensions.Markup;
 using Uno.Extensions.Markup.Internals;
 
-using ResourceKeyDefinitionAttribute = Uno.Themes.WinUI.Markup.ResourceKeyDefinitionAttribute;
+namespace Uno.Themes.Markup;
 
-namespace Uno.Themes.Markup
+public static partial class Theme
 {
-	public static partial class Theme
+	public static partial class RadioButton
 	{
-		public static partial class RadioButton
+		public static partial class Resources
 		{
-			public static partial class Resources
+			public static partial class Foreground
 			{
-				public static readonly ForegroundVSG Foreground = new();
-				public partial class ForegroundVSG
-				{
-					[ResourceKeyDefinition(typeof(Brush), "RadioButtonForeground")]
-					public ThemeResourceKey<Brush> Default = new("RadioButtonForeground");
-
-					[ResourceKeyDefinition(typeof(Brush), "RadioButtonForegroundPointerOver")]
-					public ThemeResourceKey<Brush> PointerOver = new("RadioButtonForegroundPointerOver");
+				[ResourceKeyDefinition(typeof(Brush), "RadioButtonForeground")]
+				public static ThemeResourceKey<Brush> Default => new("RadioButtonForeground");
 
-					[ResourceKeyDefinition(typeof(Brush), "RadioButtonForegroundPressed")]
-					public ThemeResourceKey<Brush> Pressed = new("RadioButtonForegroundPressed");
+				[ResourceKeyDefinition(typeof(Brush), "RadioButtonForegroundPointerOver")]
+				public static ThemeResourceKey<Brush> PointerOver => new("RadioButtonForegroundPointerOver");
 
-					[ResourceKeyDefinition(typeof(Brush), "RadioButtonForegroundDisabled")]
-					public ThemeResourceKey<Brush> Disabled = new("RadioButtonForegroundDisabled");
+				[ResourceKeyDefinition(typeof(Brush), "RadioButtonForegroundPressed")]
+				public static ThemeResourceKey<Brush> Pressed => new("RadioButtonForegroundPressed");
 
-					public static implicit operator ThemeResourceKey<Brush>(ForegroundVSG self) => self.Default;
-				}
+				[ResourceKeyDefinition(typeof(Brush), "RadioButtonForegroundDisabled")]
+				public static ThemeResourceKey<Brush> Disabled => new("RadioButtonForegroundDisabled");
+			}
 
-				public static partial class OuterEllipse
+			public static partial class OuterEllipse
+			{
+				public static partial class Fill
 				{
-					public static readonly FillVSG Fill = new();
-					public partial class FillVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseFill")]
-						public ThemeResourceKey<Brush> Normal = new("RadioButtonOuterEllipseFill");
-
-						[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseFillPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("RadioButtonOuterEllipseFillPointerOver");
-
-						[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseFillPressed")]
-						public ThemeResourceKey<Brush> Pressed = new("RadioButtonOuterEllipseFillPressed");
+					[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseFill")]
+					public static ThemeResourceKey<Brush> Normal => new("RadioButtonOuterEllipseFill");
 
-						[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseFillDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("RadioButtonOuterEllipseFillDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseFillPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("RadioButtonOuterEllipseFillPointerOver");
 
-						public static implicit operator ThemeResourceKey<Brush>(FillVSG self) => self.Normal;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseFillPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("RadioButtonOuterEllipseFillPressed");
 
-					public static readonly StrokeVSG Stroke = new();
-					public partial class StrokeVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseStroke")]
-						public ThemeResourceKey<Brush> Normal = new("RadioButtonOuterEllipseStroke");
+					[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseFillDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("RadioButtonOuterEllipseFillDisabled");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseStrokePointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("RadioButtonOuterEllipseStrokePointerOver");
+				public static partial class Stroke
+				{
+					[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseStroke")]
+					public static ThemeResourceKey<Brush> Normal => new("RadioButtonOuterEllipseStroke");
 
-						[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseStrokePressed")]
-						public ThemeResourceKey<Brush> Pressed = new("RadioButtonOuterEllipseStrokePressed");
+					[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseStrokePointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("RadioButtonOuterEllipseStrokePointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseStrokeDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("RadioButtonOuterEllipseStrokeDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseStrokePressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("RadioButtonOuterEllipseStrokePressed");
 
-						public static implicit operator ThemeResourceKey<Brush>(StrokeVSG self) => self.Normal;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseStrokeDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("RadioButtonOuterEllipseStrokeDisabled");
 				}
+			}
 
-				public static readonly OuterEllipseCheckedFillVSG OuterEllipseCheckedFill = new();
-				public partial class OuterEllipseCheckedFillVSG
-				{
-					[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseCheckedFill")]
-					public ThemeResourceKey<Brush> Normal = new("RadioButtonOuterEllipseCheckedFill");
-
-					[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseCheckedFillPointerOver")]
-					public ThemeResourceKey<Brush> PointerOver = new("RadioButtonOuterEllipseCheckedFillPointerOver");
+			public static partial class OuterEllipseCheckedFill
+			{
+				[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseCheckedFill")]
+				public static ThemeResourceKey<Brush> Normal => new("RadioButtonOuterEllipseCheckedFill");
 
-					[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseCheckedFillPressed")]
-					public ThemeResourceKey<Brush> Pressed = new("RadioButtonOuterEllipseCheckedFillPressed");
+				[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseCheckedFillPointerOver")]
+				public static ThemeResourceKey<Brush> PointerOver => new("RadioButtonOuterEllipseCheckedFillPointerOver");
 
-					[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseCheckedFillDisabled")]
-					public ThemeResourceKey<Brush> Disabled = new("RadioButtonOuterEllipseCheckedFillDisabled");
+				[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseCheckedFillPressed")]
+				public static ThemeResourceKey<Brush> Pressed => new("RadioButtonOuterEllipseCheckedFillPressed");
 
-					public static implicit operator ThemeResourceKey<Brush>(OuterEllipseCheckedFillVSG self) => self.Normal;
-				}
+				[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseCheckedFillDisabled")]
+				public static ThemeResourceKey<Brush> Disabled => new("RadioButtonOuterEllipseCheckedFillDisabled");
+			}
 
-				public static partial class StateCircle
+			public static partial class StateCircle
+			{
+				public static partial class Opacity
 				{
-					public static partial class Opacity
-					{
-						[ResourceKeyDefinition(typeof(double), "RadioButtonStateCircleOpacityPointerOver")]
-						public static ThemeResourceKey<double> PointerOver => new("RadioButtonStateCircleOpacityPointerOver");
+					[ResourceKeyDefinition(typeof(double), "RadioButtonStateCircleOpacityPointerOver")]
+					public static ThemeResourceKey<double> PointerOver => new("RadioButtonStateCircleOpacityPointerOver");
 
-						[ResourceKeyDefinition(typeof(double), "RadioButtonStateCircleOpacityPressed")]
-						public static ThemeResourceKey<double> Pressed => new("RadioButtonStateCircleOpacityPressed");
-					}
-
-					[ResourceKeyDefinition(typeof(double), "RadioButtonStateCircleOpacityFocused")]
-					public static ThemeResourceKey<double> OpacityFocused => new("RadioButtonStateCircleOpacityFocused");
+					[ResourceKeyDefinition(typeof(double), "RadioButtonStateCircleOpacityPressed")]
+					public static ThemeResourceKey<double> Pressed => new("RadioButtonStateCircleOpacityPressed");
 				}
 
-				public static partial class Typography
-				{
-					[ResourceKeyDefinition(typeof(int), "RadioButtonCharacterSpacing")]
-					public static ThemeResourceKey<int> CharacterSpacing => new("RadioButtonCharacterSpacing");
+				[ResourceKeyDefinition(typeof(double), "RadioButtonStateCircleOpacityFocused")]
+				public static ThemeResourceKey<double> OpacityFocused => new("RadioButtonStateCircleOpacityFocused");
+			}
 
-					[ResourceKeyDefinition(typeof(FontFamily), "RadioButtonFontFamily")]
-					public static ThemeResourceKey<FontFamily> FontFamily => new("RadioButtonFontFamily");
+			public static partial class Typography
+			{
+				[ResourceKeyDefinition(typeof(int), "RadioButtonCharacterSpacing")]
+				public static ThemeResourceKey<int> CharacterSpacing => new("RadioButtonCharacterSpacing");
 
-					[ResourceKeyDefinition(typeof(double), "RadioButtonFontSize")]
-					public static ThemeResourceKey<double> FontSize => new("RadioButtonFontSize");
+				[ResourceKeyDefinition(typeof(FontFamily), "RadioButtonFontFamily")]
+				public static ThemeResourceKey<FontFamily> FontFamily => new("RadioButtonFontFamily");
 
-					[ResourceKeyDefinition(typeof(string), "RadioButtonFontWeight")]
-					public static ThemeResourceKey<string> FontWeight => new("RadioButtonFontWeight");
-				}
+				[ResourceKeyDefinition(typeof(double), "RadioButtonFontSize")]
+				public static ThemeResourceKey<double> FontSize => new("RadioButtonFontSize");
 
-				[ResourceKeyDefinition(typeof(Thickness), "RadioButtonCheckEllipsePadding")]
-				public static ThemeResourceKey<Thickness> CheckEllipsePadding => new("RadioButtonCheckEllipsePadding");
+				[ResourceKeyDefinition(typeof(string), "RadioButtonFontWeight")]
+				public static ThemeResourceKey<string> FontWeight => new("RadioButtonFontWeight");
+			}
 
-				[ResourceKeyDefinition(typeof(double), "RadioButtonCheckGlyphSize")]
-				public static ThemeResourceKey<double> CheckGlyphSize => new("RadioButtonCheckGlyphSize");
+			[ResourceKeyDefinition(typeof(Thickness), "RadioButtonCheckEllipsePadding")]
+			public static ThemeResourceKey<Thickness> CheckEllipsePadding => new("RadioButtonCheckEllipsePadding");
 
-				[ResourceKeyDefinition(typeof(double), "RadioButtonHeight")]
-				public static ThemeResourceKey<double> Height => new("RadioButtonHeight");
+			[ResourceKeyDefinition(typeof(double), "RadioButtonCheckGlyphSize")]
+			public static ThemeResourceKey<double> CheckGlyphSize => new("RadioButtonCheckGlyphSize");
 
-				[ResourceKeyDefinition(typeof(double), "RadioButtonMinHeight")]
-				public static ThemeResourceKey<double> MinHeight => new("RadioButtonMinHeight");
+			[ResourceKeyDefinition(typeof(double), "RadioButtonHeight")]
+			public static ThemeResourceKey<double> Height => new("RadioButtonHeight");
 
-				[ResourceKeyDefinition(typeof(double), "RadioButtonMinWidth")]
-				public static ThemeResourceKey<double> MinWidth => new("RadioButtonMinWidth");
+			[ResourceKeyDefinition(typeof(double), "RadioButtonMinHeight")]
+			public static ThemeResourceKey<double> MinHeight => new("RadioButtonMinHeight");
 
-				[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseCheckedStroke")]
-				public static ThemeResourceKey<Brush> OuterEllipseCheckedStroke => new("RadioButtonOuterEllipseCheckedStroke");
+			[ResourceKeyDefinition(typeof(double), "RadioButtonMinWidth")]
+			public static ThemeResourceKey<double> MinWidth => new("RadioButtonMinWidth");
 
-				[ResourceKeyDefinition(typeof(Thickness), "RadioButtonPadding")]
-				public static ThemeResourceKey<Thickness> Padding => new("RadioButtonPadding");
+			[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseCheckedStroke")]
+			public static ThemeResourceKey<Brush> OuterEllipseCheckedStroke => new("RadioButtonOuterEllipseCheckedStroke");
 
-				[ResourceKeyDefinition(typeof(Brush), "RadioButtonStateCircleBackgroundChecked")]
-				public static ThemeResourceKey<Brush> StateCircleBackgroundChecked => new("RadioButtonStateCircleBackgroundChecked");
+			[ResourceKeyDefinition(typeof(Thickness), "RadioButtonPadding")]
+			public static ThemeResourceKey<Thickness> Padding => new("RadioButtonPadding");
 
-				[ResourceKeyDefinition(typeof(Brush), "RadioButtonStateCircleBackgroundUnchecked")]
-				public static ThemeResourceKey<Brush> StateCircleBackgroundUnchecked => new("RadioButtonStateCircleBackgroundUnchecked");
+			[ResourceKeyDefinition(typeof(Brush), "RadioButtonStateCircleBackgroundChecked")]
+			public static ThemeResourceKey<Brush> StateCircleBackgroundChecked => new("RadioButtonStateCircleBackgroundChecked");
 
-				[ResourceKeyDefinition(typeof(double), "RadioButtonStrokeThickness")]
-				public static ThemeResourceKey<double> StrokeThickness => new("RadioButtonStrokeThickness");
+			[ResourceKeyDefinition(typeof(Brush), "RadioButtonStateCircleBackgroundUnchecked")]
+			public static ThemeResourceKey<Brush> StateCircleBackgroundUnchecked => new("RadioButtonStateCircleBackgroundUnchecked");
 
-				[ResourceKeyDefinition(typeof(double), "RadioButtonWidth")]
-				public static ThemeResourceKey<double> Width => new("RadioButtonWidth");
-			}
+			[ResourceKeyDefinition(typeof(double), "RadioButtonStrokeThickness")]
+			public static ThemeResourceKey<double> StrokeThickness => new("RadioButtonStrokeThickness");
 
-			public static partial class Styles
-			{
-				[ResourceKeyDefinition(typeof(Style), "MaterialRadioButtonStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.RadioButton))]
-				public static StaticResourceKey<Style> Default => new("MaterialRadioButtonStyle");
-			}
+			[ResourceKeyDefinition(typeof(double), "RadioButtonWidth")]
+			public static ThemeResourceKey<double> Width => new("RadioButtonWidth");
+		}
+
+		public static partial class Styles
+		{
+			[ResourceKeyDefinition(typeof(Style), "MaterialRadioButtonStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.RadioButton))]
+			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
new file mode 100644
index 000000000..ea41d7385
--- /dev/null
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/RatingControl.cs
@@ -0,0 +1,108 @@
+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 RatingControl
+	{
+		public static partial class Resources
+		{
+			public static partial class RatingControl
+			{
+				[ResourceKeyDefinition(typeof(Brush), "RatingControlForeground")]
+				public static ThemeResourceKey<Brush> Foreground => new("RatingControlForeground");
+
+				[ResourceKeyDefinition(typeof(double), "RatingControlHeight")]
+				public static ThemeResourceKey<double> Height => new("RatingControlHeight");
+			}
+
+			public static partial class RatingControlCaption
+			{
+				[ResourceKeyDefinition(typeof(Brush), "RatingControlCaptionForeground")]
+				public static ThemeResourceKey<Brush> Foreground => new("RatingControlCaptionForeground");
+
+				[ResourceKeyDefinition(typeof(double), "RatingControlCaptionHeight")]
+				public static ThemeResourceKey<double> Height => new("RatingControlCaptionHeight");
+			}
+
+			public static partial class RatingControlForegroundSelected
+			{
+				[ResourceKeyDefinition(typeof(Brush), "RatingControlForegroundSelectedDisabled")]
+				public static ThemeResourceKey<Brush> Disabled => new("RatingControlForegroundSelectedDisabled");
+
+				[ResourceKeyDefinition(typeof(Brush), "RatingControlPlaceholderForeground")]
+				public static ThemeResourceKey<Brush> Placeholder => new("RatingControlPlaceholderForeground");
+
+				[ResourceKeyDefinition(typeof(Brush), "RatingControlPlaceholderForegroundPointerOver")]
+				public static ThemeResourceKey<Brush> PointerOverPlaceholder => new("RatingControlPlaceholderForegroundPointerOver");
+
+				[ResourceKeyDefinition(typeof(Brush), "RatingControlForegroundUnselectedPointerOver")]
+				public static ThemeResourceKey<Brush> PointerOverUnselected => new("RatingControlForegroundUnselectedPointerOver");
+
+				[ResourceKeyDefinition(typeof(Brush), "RatingControlForegroundSelected")]
+				public static ThemeResourceKey<Brush> Set => new("RatingControlForegroundSelected");
+			}
+
+			public static partial class Secondary
+			{
+				public static partial class Caption
+				{
+					[ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlCaptionForeground")]
+					public static ThemeResourceKey<Brush> Foreground => new("SecondaryRatingControlCaptionForeground");
+
+					[ResourceKeyDefinition(typeof(double), "SecondaryRatingControlCaptionHeight")]
+					public static ThemeResourceKey<double> Height => new("SecondaryRatingControlCaptionHeight");
+				}
+
+				public static partial class ForegroundSelected
+				{
+					[ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlForegroundSelectedDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("SecondaryRatingControlForegroundSelectedDisabled");
+
+					[ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlPlaceholderForeground")]
+					public static ThemeResourceKey<Brush> Placeholder => new("SecondaryRatingControlPlaceholderForeground");
+
+					[ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlPlaceholderForegroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOverPlaceholder => new("SecondaryRatingControlPlaceholderForegroundPointerOver");
+
+					[ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlForegroundUnselectedPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOverUnselected => new("SecondaryRatingControlForegroundUnselectedPointerOver");
+
+					[ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlForegroundSelected")]
+					public static ThemeResourceKey<Brush> Set => new("SecondaryRatingControlForegroundSelected");
+				}
+
+				[ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlForeground")]
+				public static ThemeResourceKey<Brush> Foreground => new("SecondaryRatingControlForeground");
+
+				[ResourceKeyDefinition(typeof(FontFamily), "SecondaryRatingControlCaptionFontFamily")]
+				public static ThemeResourceKey<FontFamily> Typography => new("SecondaryRatingControlCaptionFontFamily");
+			}
+
+			public static partial class Typography
+			{
+				[ResourceKeyDefinition(typeof(FontFamily), "RatingControlCaptionFontFamily")]
+				public static ThemeResourceKey<FontFamily> CaptionFontFamily => new("RatingControlCaptionFontFamily");
+
+				[ResourceKeyDefinition(typeof(FontFamily), "RatingControlFontFamily")]
+				public static ThemeResourceKey<FontFamily> FontFamily => new("RatingControlFontFamily");
+			}
+		}
+
+		public static partial class Styles
+		{
+			[ResourceKeyDefinition(typeof(Style), "MaterialRatingControlStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.RatingControl))]
+			public static StaticResourceKey<Style> Default => new("MaterialRatingControlStyle");
+
+			[ResourceKeyDefinition(typeof(Style), "SecondaryRatingControlStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.RatingControl))]
+			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 623751a1c..4986f4d26 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/Slider.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/Slider.cs
@@ -6,154 +6,142 @@
 using Uno.Extensions.Markup;
 using Uno.Extensions.Markup.Internals;
 
-using ResourceKeyDefinitionAttribute = Uno.Themes.WinUI.Markup.ResourceKeyDefinitionAttribute;
+namespace Uno.Themes.Markup;
 
-namespace Uno.Themes.Markup
+public static partial class Theme
 {
-	public static partial class Theme
+	public static partial class Slider
 	{
-		public static partial class Slider
+		public static partial class Resources
 		{
-			public static partial class Resources
+			public static partial class Thumb
 			{
-				public static partial class Thumb
+				[ResourceKeyDefinition(typeof(Brush), "SliderThumbBackgroundDisabled")]
+				public static ThemeResourceKey<Brush> BackgroundDisabled => new("SliderThumbBackgroundDisabled");
+
+				[ResourceKeyDefinition(typeof(double), "SliderThumbHeight")]
+				public static ThemeResourceKey<double> Height => new("SliderThumbHeight");
+
+				[ResourceKeyDefinition(typeof(double), "SliderThumbWidth")]
+				public static ThemeResourceKey<double> Width => new("SliderThumbWidth");
+			}
+
+			public static partial class TickBar
+			{
+				public static partial class Bottom
 				{
-					[ResourceKeyDefinition(typeof(Brush), "SliderThumbBackgroundDisabled")]
-					public static ThemeResourceKey<Brush> BackgroundDisabled => new("SliderThumbBackgroundDisabled");
+					[ResourceKeyDefinition(typeof(double), "SliderBottomTickBarHeight")]
+					public static ThemeResourceKey<double> Height => new("SliderBottomTickBarHeight");
+
+					[ResourceKeyDefinition(typeof(Thickness), "SliderBottomTickBarMargin")]
+					public static ThemeResourceKey<Thickness> Margin => new("SliderBottomTickBarMargin");
+				}
 
-					[ResourceKeyDefinition(typeof(double), "SliderThumbHeight")]
-					public static ThemeResourceKey<double> Height => new("SliderThumbHeight");
+				public static partial class Fill
+				{
+					[ResourceKeyDefinition(typeof(Brush), "SliderTickBarFill")]
+					public static ThemeResourceKey<Brush> Default => new("SliderTickBarFill");
 
-					[ResourceKeyDefinition(typeof(double), "SliderThumbWidth")]
-					public static ThemeResourceKey<double> Width => new("SliderThumbWidth");
+					[ResourceKeyDefinition(typeof(Brush), "SliderTickBarFillDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("SliderTickBarFillDisabled");
 				}
 
-				public static partial class TickBar
+				public static partial class Left
 				{
-					public static partial class Bottom
-					{
-						[ResourceKeyDefinition(typeof(double), "SliderBottomTickBarHeight")]
-						public static ThemeResourceKey<double> Height => new("SliderBottomTickBarHeight");
-
-						[ResourceKeyDefinition(typeof(Thickness), "SliderBottomTickBarMargin")]
-						public static ThemeResourceKey<Thickness> Margin => new("SliderBottomTickBarMargin");
-					}
-
-					public static readonly FillVSG Fill = new();
-					public partial class FillVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "SliderTickBarFill")]
-						public ThemeResourceKey<Brush> Default = new("SliderTickBarFill");
-
-						[ResourceKeyDefinition(typeof(Brush), "SliderTickBarFillDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("SliderTickBarFillDisabled");
-
-						public static implicit operator ThemeResourceKey<Brush>(FillVSG self) => self.Default;
-					}
-
-					public static partial class Left
-					{
-						[ResourceKeyDefinition(typeof(Thickness), "SliderLeftTickBarMargin")]
-						public static ThemeResourceKey<Thickness> Margin => new("SliderLeftTickBarMargin");
-
-						[ResourceKeyDefinition(typeof(double), "SliderLeftTickBarWidth")]
-						public static ThemeResourceKey<double> Width => new("SliderLeftTickBarWidth");
-					}
-
-					public static partial class Right
-					{
-						[ResourceKeyDefinition(typeof(Thickness), "SliderRightTickBarMargin")]
-						public static ThemeResourceKey<Thickness> Margin => new("SliderRightTickBarMargin");
-
-						[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");
+					[ResourceKeyDefinition(typeof(Thickness), "SliderLeftTickBarMargin")]
+					public static ThemeResourceKey<Thickness> Margin => new("SliderLeftTickBarMargin");
+
+					[ResourceKeyDefinition(typeof(double), "SliderLeftTickBarWidth")]
+					public static ThemeResourceKey<double> Width => new("SliderLeftTickBarWidth");
 				}
 
-				public static partial class Track
+				public static partial class Right
 				{
-					public static readonly FillVSG Fill = new();
-					public partial class FillVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "SliderTrackFill")]
-						public ThemeResourceKey<Brush> Default = new("SliderTrackFill");
+					[ResourceKeyDefinition(typeof(Thickness), "SliderRightTickBarMargin")]
+					public static ThemeResourceKey<Thickness> Margin => new("SliderRightTickBarMargin");
 
-						[ResourceKeyDefinition(typeof(Brush), "SliderTrackFillDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("SliderTrackFillDisabled");
+					[ResourceKeyDefinition(typeof(double), "SliderRightTickBarWidth")]
+					public static ThemeResourceKey<double> Width => new("SliderRightTickBarWidth");
+				}
 
-						public static implicit operator ThemeResourceKey<Brush>(FillVSG self) => self.Default;
-					}
+				public static partial class Top
+				{
+					[ResourceKeyDefinition(typeof(double), "SliderTopTickBarHeight")]
+					public static ThemeResourceKey<double> Height => new("SliderTopTickBarHeight");
 
-					public static readonly ValueFillVSG ValueFill = new();
-					public partial class ValueFillVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "SliderTrackValueFill")]
-						public ThemeResourceKey<Brush> Default = new("SliderTrackValueFill");
+					[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), "SliderTrackValueFillDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("SliderTrackValueFillDisabled");
+				[ResourceKeyDefinition(typeof(Brush), "SliderInlineTickBarFill")]
+				public static ThemeResourceKey<Brush> InlineFill => new("SliderInlineTickBarFill");
 
-						public static implicit operator ThemeResourceKey<Brush>(ValueFillVSG self) => self.Default;
-					}
+				[ResourceKeyDefinition(typeof(double), "SliderVerticallInlineTickBarWidth")]
+				public static ThemeResourceKey<double> VerticallInlineWidth => new("SliderVerticallInlineTickBarWidth");
+			}
 
-					[ResourceKeyDefinition(typeof(CornerRadius), "SliderTrackCornerRadius")]
-					public static ThemeResourceKey<CornerRadius> CornerRadius => new("SliderTrackCornerRadius");
+			public static partial class Track
+			{
+				public static partial class Fill
+				{
+					[ResourceKeyDefinition(typeof(Brush), "SliderTrackFill")]
+					public static ThemeResourceKey<Brush> Default => new("SliderTrackFill");
 
-					[ResourceKeyDefinition(typeof(double), "SliderTrackThickness")]
-					public static ThemeResourceKey<double> Thickness => new("SliderTrackThickness");
+					[ResourceKeyDefinition(typeof(Brush), "SliderTrackFillDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("SliderTrackFillDisabled");
 				}
 
-				public static partial class Typography
+				public static partial class ValueFill
 				{
-					[ResourceKeyDefinition(typeof(FontFamily), "SliderFontFamily")]
-					public static ThemeResourceKey<FontFamily> FontFamily => new("SliderFontFamily");
+					[ResourceKeyDefinition(typeof(Brush), "SliderTrackValueFill")]
+					public static ThemeResourceKey<Brush> Default => new("SliderTrackValueFill");
 
-					[ResourceKeyDefinition(typeof(double), "SliderFontSize")]
-					public static ThemeResourceKey<double> FontSize => new("SliderFontSize");
+					[ResourceKeyDefinition(typeof(Brush), "SliderTrackValueFillDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("SliderTrackValueFillDisabled");
 				}
 
-				[ResourceKeyDefinition(typeof(double), "SliderFillThickness")]
-				public static ThemeResourceKey<double> FillThickness => new("SliderFillThickness");
+				[ResourceKeyDefinition(typeof(CornerRadius), "SliderTrackCornerRadius")]
+				public static ThemeResourceKey<CornerRadius> CornerRadius => new("SliderTrackCornerRadius");
 
-				[ResourceKeyDefinition(typeof(Thickness), "SliderFocusVisualMargin")]
-				public static ThemeResourceKey<Thickness> FocusVisualMargin => new("SliderFocusVisualMargin");
+				[ResourceKeyDefinition(typeof(double), "SliderTrackThickness")]
+				public static ThemeResourceKey<double> Thickness => new("SliderTrackThickness");
+			}
 
-				[ResourceKeyDefinition(typeof(CornerRadius), "SliderHorizontalFillCornerRadius")]
-				public static ThemeResourceKey<CornerRadius> HorizontalFillCornerRadius => new("SliderHorizontalFillCornerRadius");
+			public static partial class Typography
+			{
+				[ResourceKeyDefinition(typeof(FontFamily), "SliderFontFamily")]
+				public static ThemeResourceKey<FontFamily> FontFamily => new("SliderFontFamily");
 
-				[ResourceKeyDefinition(typeof(Thickness), "SliderHorizontalFocusVisualMargin")]
-				public static ThemeResourceKey<Thickness> HorizontalFocusVisualMargin => new("SliderHorizontalFocusVisualMargin");
+				[ResourceKeyDefinition(typeof(double), "SliderFontSize")]
+				public static ThemeResourceKey<double> FontSize => new("SliderFontSize");
+			}
 
-				[ResourceKeyDefinition(typeof(CornerRadius), "SliderVerticalFillCornerRadius")]
-				public static ThemeResourceKey<CornerRadius> VerticalFillCornerRadius => new("SliderVerticalFillCornerRadius");
+			[ResourceKeyDefinition(typeof(double), "SliderFillThickness")]
+			public static ThemeResourceKey<double> FillThickness => new("SliderFillThickness");
 
-				[ResourceKeyDefinition(typeof(Thickness), "SliderVerticalFocusVisualMargin")]
-				public static ThemeResourceKey<Thickness> VerticalFocusVisualMargin => new("SliderVerticalFocusVisualMargin");
-			}
+			[ResourceKeyDefinition(typeof(Thickness), "SliderFocusVisualMargin")]
+			public static ThemeResourceKey<Thickness> FocusVisualMargin => new("SliderFocusVisualMargin");
 
-			public static partial class Styles
-			{
-				[ResourceKeyDefinition(typeof(Style), "MaterialSliderStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Slider))]
-				public static StaticResourceKey<Style> Default => new("MaterialSliderStyle");
-			}
+			[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 partial class Styles
+		{
+			[ResourceKeyDefinition(typeof(Style), "MaterialSliderStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Slider))]
+			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 02a5b7477..564471d47 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/TextBlock.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/TextBlock.cs
@@ -6,77 +6,74 @@
 using Uno.Extensions.Markup;
 using Uno.Extensions.Markup.Internals;
 
-using ResourceKeyDefinitionAttribute = Uno.Themes.WinUI.Markup.ResourceKeyDefinitionAttribute;
+namespace Uno.Themes.Markup;
 
-namespace Uno.Themes.Markup
+public static partial class Theme
 {
-	public static partial class Theme
+	public static partial class TextBlock
 	{
-		public static partial class TextBlock
+		public static partial class Resources
 		{
-			public static partial class Resources
-			{
-			}
+		}
 
-			public static partial class Styles
-			{
-				[ResourceKeyDefinition(typeof(Style), "MaterialDisplayLarge", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
-				public static StaticResourceKey<Style> DisplayLarge => new("MaterialDisplayLarge");
+		public static partial class Styles
+		{
+			[ResourceKeyDefinition(typeof(Style), "MaterialDisplayLarge", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
+			public static StaticResourceKey<Style> DisplayLarge => new("MaterialDisplayLarge");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialDisplayMedium", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
-				public static StaticResourceKey<Style> DisplayMedium => new("MaterialDisplayMedium");
+			[ResourceKeyDefinition(typeof(Style), "MaterialDisplayMedium", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
+			public static StaticResourceKey<Style> DisplayMedium => new("MaterialDisplayMedium");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialDisplaySmall", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
-				public static StaticResourceKey<Style> DisplaySmall => new("MaterialDisplaySmall");
+			[ResourceKeyDefinition(typeof(Style), "MaterialDisplaySmall", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
+			public static StaticResourceKey<Style> DisplaySmall => new("MaterialDisplaySmall");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialHeadlineLarge", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
-				public static StaticResourceKey<Style> HeadlineLarge => new("MaterialHeadlineLarge");
+			[ResourceKeyDefinition(typeof(Style), "MaterialHeadlineLarge", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
+			public static StaticResourceKey<Style> HeadlineLarge => new("MaterialHeadlineLarge");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialHeadlineMedium", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
-				public static StaticResourceKey<Style> HeadlineMedium => new("MaterialHeadlineMedium");
+			[ResourceKeyDefinition(typeof(Style), "MaterialHeadlineMedium", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
+			public static StaticResourceKey<Style> HeadlineMedium => new("MaterialHeadlineMedium");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialHeadlineSmall", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
-				public static StaticResourceKey<Style> HeadlineSmall => new("MaterialHeadlineSmall");
+			[ResourceKeyDefinition(typeof(Style), "MaterialHeadlineSmall", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
+			public static StaticResourceKey<Style> HeadlineSmall => new("MaterialHeadlineSmall");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialTitleLarge", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
-				public static StaticResourceKey<Style> TitleLarge => new("MaterialTitleLarge");
+			[ResourceKeyDefinition(typeof(Style), "MaterialTitleLarge", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
+			public static StaticResourceKey<Style> TitleLarge => new("MaterialTitleLarge");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialTitleMedium", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
-				public static StaticResourceKey<Style> TitleMedium => new("MaterialTitleMedium");
+			[ResourceKeyDefinition(typeof(Style), "MaterialTitleMedium", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
+			public static StaticResourceKey<Style> TitleMedium => new("MaterialTitleMedium");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialTitleSmall", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
-				public static StaticResourceKey<Style> TitleSmall => new("MaterialTitleSmall");
+			[ResourceKeyDefinition(typeof(Style), "MaterialTitleSmall", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
+			public static StaticResourceKey<Style> TitleSmall => new("MaterialTitleSmall");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialLabelLarge", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
-				public static StaticResourceKey<Style> LabelLarge => new("MaterialLabelLarge");
+			[ResourceKeyDefinition(typeof(Style), "MaterialLabelLarge", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
+			public static StaticResourceKey<Style> LabelLarge => new("MaterialLabelLarge");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialLabelMedium", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
-				public static StaticResourceKey<Style> LabelMedium => new("MaterialLabelMedium");
+			[ResourceKeyDefinition(typeof(Style), "MaterialLabelMedium", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
+			public static StaticResourceKey<Style> LabelMedium => new("MaterialLabelMedium");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialLabelSmall", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
-				public static StaticResourceKey<Style> LabelSmall => new("MaterialLabelSmall");
+			[ResourceKeyDefinition(typeof(Style), "MaterialLabelSmall", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
+			public static StaticResourceKey<Style> LabelSmall => new("MaterialLabelSmall");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialLabelExtraSmall", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
-				public static StaticResourceKey<Style> LabelExtraSmall => new("MaterialLabelExtraSmall");
+			[ResourceKeyDefinition(typeof(Style), "MaterialLabelExtraSmall", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
+			public static StaticResourceKey<Style> LabelExtraSmall => new("MaterialLabelExtraSmall");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialBodyLarge", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
-				public static StaticResourceKey<Style> BodyLarge => new("MaterialBodyLarge");
+			[ResourceKeyDefinition(typeof(Style), "MaterialBodyLarge", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
+			public static StaticResourceKey<Style> BodyLarge => new("MaterialBodyLarge");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialBodyMedium", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
-				public static StaticResourceKey<Style> BodyMedium => new("MaterialBodyMedium");
+			[ResourceKeyDefinition(typeof(Style), "MaterialBodyMedium", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
+			public static StaticResourceKey<Style> BodyMedium => new("MaterialBodyMedium");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialBodySmall", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
-				public static StaticResourceKey<Style> BodySmall => new("MaterialBodySmall");
+			[ResourceKeyDefinition(typeof(Style), "MaterialBodySmall", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
+			public static StaticResourceKey<Style> BodySmall => new("MaterialBodySmall");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialCaptionLarge", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
-				public static StaticResourceKey<Style> CaptionLarge => new("MaterialCaptionLarge");
+			[ResourceKeyDefinition(typeof(Style), "MaterialCaptionLarge", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
+			public static StaticResourceKey<Style> CaptionLarge => new("MaterialCaptionLarge");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialCaptionMedium", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
-				public static StaticResourceKey<Style> CaptionMedium => new("MaterialCaptionMedium");
+			[ResourceKeyDefinition(typeof(Style), "MaterialCaptionMedium", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
+			public static StaticResourceKey<Style> CaptionMedium => new("MaterialCaptionMedium");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialCaptionSmall", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
-				public static StaticResourceKey<Style> CaptionSmall => new("MaterialCaptionSmall");
-			}
+			[ResourceKeyDefinition(typeof(Style), "MaterialCaptionSmall", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBlock))]
+			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 080ea4894..aec598c37 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/TextBox.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/TextBox.cs
@@ -6,274 +6,238 @@
 using Uno.Extensions.Markup;
 using Uno.Extensions.Markup.Internals;
 
-using ResourceKeyDefinitionAttribute = Uno.Themes.WinUI.Markup.ResourceKeyDefinitionAttribute;
+namespace Uno.Themes.Markup;
 
-namespace Uno.Themes.Markup
+public static partial class Theme
 {
-	public static partial class Theme
+	public static partial class TextBox
 	{
-		public static partial class TextBox
+		public static partial class Resources
 		{
-			public static partial class Resources
+			public static partial class Filled
 			{
-				public static partial class Filled
+				public static partial class Background
 				{
-					public static readonly BackgroundVSG Background = new();
-					public partial class BackgroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBackground")]
-						public ThemeResourceKey<Brush> Default = new("FilledTextBoxBackground");
+					[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBackground")]
+					public static ThemeResourceKey<Brush> Default => new("FilledTextBoxBackground");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBackgroundPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("FilledTextBoxBackgroundPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBackgroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("FilledTextBoxBackgroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBackgroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("FilledTextBoxBackgroundDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBackgroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("FilledTextBoxBackgroundDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBackgroundFocused")]
-						public ThemeResourceKey<Brush> Focused = new("FilledTextBoxBackgroundFocused");
-
-						public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
-					}
-
-					public static readonly BorderBrushVSG BorderBrush = new();
-					public partial class BorderBrushVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBorderBrushFocused")]
-						public ThemeResourceKey<Brush> Default = new("FilledTextBoxBorderBrushFocused");
-
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBorderBrushPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("FilledTextBoxBorderBrushPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBackgroundFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("FilledTextBoxBackgroundFocused");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBorderBrushDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("FilledTextBoxBorderBrushDisabled");
+				public static partial class BorderBrush
+				{
+					[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBorderBrushFocused")]
+					public static ThemeResourceKey<Brush> Default => new("FilledTextBoxBorderBrushFocused");
 
-						public static implicit operator ThemeResourceKey<Brush>(BorderBrushVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBorderBrushPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("FilledTextBoxBorderBrushPointerOver");
 
-					public static readonly BorderThicknessNormalVSG BorderThicknessNormal = new();
-					public partial class BorderThicknessNormalVSG
-					{
-						[ResourceKeyDefinition(typeof(double), "FilledTextBoxBorderThicknessNormal")]
-						public ThemeResourceKey<double> Default = new("FilledTextBoxBorderThicknessNormal");
+					[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBorderBrushDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("FilledTextBoxBorderBrushDisabled");
+				}
 
-						[ResourceKeyDefinition(typeof(double), "MaterialFilledTextBoxBorderHeightFocused")]
-						public ThemeResourceKey<double> Focused = new("MaterialFilledTextBoxBorderHeightFocused");
+				public static partial class BorderThicknessNormal
+				{
+					[ResourceKeyDefinition(typeof(double), "FilledTextBoxBorderThicknessNormal")]
+					public static ThemeResourceKey<double> Default => new("FilledTextBoxBorderThicknessNormal");
 
-						public static implicit operator ThemeResourceKey<double>(BorderThicknessNormalVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(double), "MaterialFilledTextBoxBorderHeightFocused")]
+					public static ThemeResourceKey<double> Focused => new("MaterialFilledTextBoxBorderHeightFocused");
+				}
 
-					public static readonly DeleteButtonForegroundVSG DeleteButtonForeground = new();
-					public partial class DeleteButtonForegroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxDeleteButtonForeground")]
-						public ThemeResourceKey<Brush> Default = new("FilledTextBoxDeleteButtonForeground");
+				public static partial class DeleteButtonForeground
+				{
+					[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxDeleteButtonForeground")]
+					public static ThemeResourceKey<Brush> Default => new("FilledTextBoxDeleteButtonForeground");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxDeleteButtonForegroundPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("FilledTextBoxDeleteButtonForegroundPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxDeleteButtonForegroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("FilledTextBoxDeleteButtonForegroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxDeleteButtonForegroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("FilledTextBoxDeleteButtonForegroundDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxDeleteButtonForegroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("FilledTextBoxDeleteButtonForegroundDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxDeleteButtonForegroundFocused")]
-						public ThemeResourceKey<Brush> Focused = new("FilledTextBoxDeleteButtonForegroundFocused");
+					[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxDeleteButtonForegroundFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("FilledTextBoxDeleteButtonForegroundFocused");
+				}
 
-						public static implicit operator ThemeResourceKey<Brush>(DeleteButtonForegroundVSG self) => self.Default;
-					}
+				public static partial class Foreground
+				{
+					[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxForeground")]
+					public static ThemeResourceKey<Brush> Default => new("FilledTextBoxForeground");
 
-					public static readonly ForegroundVSG Foreground = new();
-					public partial class ForegroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxForeground")]
-						public ThemeResourceKey<Brush> Default = new("FilledTextBoxForeground");
+					[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxForegroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("FilledTextBoxForegroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxForegroundPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("FilledTextBoxForegroundPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxForegroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("FilledTextBoxForegroundDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxForegroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("FilledTextBoxForegroundDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxForegroundFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("FilledTextBoxForegroundFocused");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxForegroundFocused")]
-						public ThemeResourceKey<Brush> Focused = new("FilledTextBoxForegroundFocused");
+				public static partial class LeadingIconForeground
+				{
+					[ResourceKeyDefinition(typeof(Brush), "TextBoxLeadingIconForeground")]
+					public static ThemeResourceKey<Brush> Default => new("TextBoxLeadingIconForeground");
 
-						public static implicit operator ThemeResourceKey<Brush>(ForegroundVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "TextBoxLeadingIconForegroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("TextBoxLeadingIconForegroundDisabled");
+				}
 
-					public static readonly LeadingIconForegroundVSG LeadingIconForeground = new();
-					public partial class LeadingIconForegroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "TextBoxLeadingIconForeground")]
-						public ThemeResourceKey<Brush> Default = new("TextBoxLeadingIconForeground");
+				public static partial class PlaceholderForeground
+				{
+					[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxPlaceholderForeground")]
+					public static ThemeResourceKey<Brush> Default => new("FilledTextBoxPlaceholderForeground");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextBoxLeadingIconForegroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("TextBoxLeadingIconForegroundDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxPlaceholderForegroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("FilledTextBoxPlaceholderForegroundPointerOver");
 
-						public static implicit operator ThemeResourceKey<Brush>(LeadingIconForegroundVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxPlaceholderForegroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("FilledTextBoxPlaceholderForegroundDisabled");
 
-					public static readonly PlaceholderForegroundVSG PlaceholderForeground = new();
-					public partial class PlaceholderForegroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxPlaceholderForeground")]
-						public ThemeResourceKey<Brush> Default = new("FilledTextBoxPlaceholderForeground");
+					[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxPlaceholderForegroundFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("FilledTextBoxPlaceholderForegroundFocused");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxPlaceholderForegroundPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("FilledTextBoxPlaceholderForegroundPointerOver");
+				public static partial class Typography
+				{
+					[ResourceKeyDefinition(typeof(int), "FilledTextBoxCharacterSpacing")]
+					public static ThemeResourceKey<int> CharacterSpacing => new("FilledTextBoxCharacterSpacing");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxPlaceholderForegroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("FilledTextBoxPlaceholderForegroundDisabled");
+					[ResourceKeyDefinition(typeof(FontFamily), "FilledTextBoxFontFamily")]
+					public static ThemeResourceKey<FontFamily> FontFamily => new("FilledTextBoxFontFamily");
 
-						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxPlaceholderForegroundFocused")]
-						public ThemeResourceKey<Brush> Focused = new("FilledTextBoxPlaceholderForegroundFocused");
+					[ResourceKeyDefinition(typeof(double), "FilledTextBoxFontSize")]
+					public static ThemeResourceKey<double> FontSize => new("FilledTextBoxFontSize");
 
-						public static implicit operator ThemeResourceKey<Brush>(PlaceholderForegroundVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(string), "FilledTextBoxFontWeight")]
+					public static ThemeResourceKey<string> FontWeight => new("FilledTextBoxFontWeight");
+				}
 
-					public static partial class Typography
-					{
-						[ResourceKeyDefinition(typeof(int), "FilledTextBoxCharacterSpacing")]
-						public static ThemeResourceKey<int> CharacterSpacing => new("FilledTextBoxCharacterSpacing");
+				[ResourceKeyDefinition(typeof(double), "FilledTextBoxBorderThicknessFocused")]
+				public static ThemeResourceKey<double> BorderThicknessFocused => new("FilledTextBoxBorderThicknessFocused");
 
-						[ResourceKeyDefinition(typeof(FontFamily), "FilledTextBoxFontFamily")]
-						public static ThemeResourceKey<FontFamily> FontFamily => new("FilledTextBoxFontFamily");
+				[ResourceKeyDefinition(typeof(CornerRadius), "MaterialFilledTextBoxCornerRadius")]
+				public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialFilledTextBoxCornerRadius");
 
-						[ResourceKeyDefinition(typeof(double), "FilledTextBoxFontSize")]
-						public static ThemeResourceKey<double> FontSize => new("FilledTextBoxFontSize");
+				[ResourceKeyDefinition(typeof(double), "FilledTextBoxForegroundOpacityDisabled")]
+				public static ThemeResourceKey<double> ForegroundOpacityDisabled => new("FilledTextBoxForegroundOpacityDisabled");
 
-						[ResourceKeyDefinition(typeof(string), "FilledTextBoxFontWeight")]
-						public static ThemeResourceKey<string> FontWeight => new("FilledTextBoxFontWeight");
-					}
+				[ResourceKeyDefinition(typeof(double), "MaterialFilledTextBoxMinHeight")]
+				public static ThemeResourceKey<double> MinHeight => new("MaterialFilledTextBoxMinHeight");
 
-					[ResourceKeyDefinition(typeof(double), "FilledTextBoxBorderThicknessFocused")]
-					public static ThemeResourceKey<double> BorderThicknessFocused => new("FilledTextBoxBorderThicknessFocused");
+				[ResourceKeyDefinition(typeof(Thickness), "MaterialFilledTextBoxPadding")]
+				public static ThemeResourceKey<Thickness> Padding => new("MaterialFilledTextBoxPadding");
+			}
 
-					[ResourceKeyDefinition(typeof(CornerRadius), "MaterialFilledTextBoxCornerRadius")]
-					public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialFilledTextBoxCornerRadius");
+			public static partial class Outlined
+			{
+				public static partial class BorderBrush
+				{
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxBorderBrush")]
+					public static ThemeResourceKey<Brush> Default => new("OutlinedTextBoxBorderBrush");
 
-					[ResourceKeyDefinition(typeof(double), "FilledTextBoxForegroundOpacityDisabled")]
-					public static ThemeResourceKey<double> ForegroundOpacityDisabled => new("FilledTextBoxForegroundOpacityDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxBorderBrushPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("OutlinedTextBoxBorderBrushPointerOver");
 
-					[ResourceKeyDefinition(typeof(double), "MaterialFilledTextBoxMinHeight")]
-					public static ThemeResourceKey<double> MinHeight => new("MaterialFilledTextBoxMinHeight");
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxBorderBrushDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("OutlinedTextBoxBorderBrushDisabled");
 
-					[ResourceKeyDefinition(typeof(Thickness), "MaterialFilledTextBoxPadding")]
-					public static ThemeResourceKey<Thickness> Padding => new("MaterialFilledTextBoxPadding");
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxBorderBrushFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("OutlinedTextBoxBorderBrushFocused");
 				}
 
-				public static partial class Outlined
+				public static partial class Foreground
 				{
-					public static readonly BorderBrushVSG BorderBrush = new();
-					public partial class BorderBrushVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxBorderBrush")]
-						public ThemeResourceKey<Brush> Default = new("OutlinedTextBoxBorderBrush");
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxForeground")]
+					public static ThemeResourceKey<Brush> Default => new("OutlinedTextBoxForeground");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxBorderBrushPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("OutlinedTextBoxBorderBrushPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxForegroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("OutlinedTextBoxForegroundPointerOver");
 
-						[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 readonly ForegroundVSG Foreground = new();
-					public partial class ForegroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxForeground")]
-						public ThemeResourceKey<Brush> Default = new("OutlinedTextBoxForeground");
-
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxForegroundPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("OutlinedTextBoxForegroundPointerOver");
-
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxForegroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("OutlinedTextBoxForegroundDisabled");
-
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxForegroundFocused")]
-						public ThemeResourceKey<Brush> Focused = new("OutlinedTextBoxForegroundFocused");
-
-						public static implicit operator ThemeResourceKey<Brush>(ForegroundVSG self) => self.Default;
-					}
-
-					public static readonly LeadingIconForegroundVSG LeadingIconForeground = new();
-					public partial class LeadingIconForegroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "TextBoxLeadingIconForeground")]
-						public ThemeResourceKey<Brush> Default = new("TextBoxLeadingIconForeground");
-
-						[ResourceKeyDefinition(typeof(Brush), "TextBoxLeadingIconForegroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("TextBoxLeadingIconForegroundDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxForegroundFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("OutlinedTextBoxForegroundFocused");
+				}
 
-						public static implicit operator ThemeResourceKey<Brush>(LeadingIconForegroundVSG self) => self.Default;
-					}
+				public static partial class LeadingIconForeground
+				{
+					[ResourceKeyDefinition(typeof(Brush), "TextBoxLeadingIconForeground")]
+					public static ThemeResourceKey<Brush> Default => new("TextBoxLeadingIconForeground");
 
-					public static readonly PlaceholderForegroundVSG PlaceholderForeground = new();
-					public partial class PlaceholderForegroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxPlaceholderForeground")]
-						public ThemeResourceKey<Brush> Default = new("OutlinedTextBoxPlaceholderForeground");
+					[ResourceKeyDefinition(typeof(Brush), "TextBoxLeadingIconForegroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("TextBoxLeadingIconForegroundDisabled");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxPlaceholderForegroundPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("OutlinedTextBoxPlaceholderForegroundPointerOver");
+				public static partial class PlaceholderForeground
+				{
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxPlaceholderForeground")]
+					public static ThemeResourceKey<Brush> Default => new("OutlinedTextBoxPlaceholderForeground");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxPlaceholderForegroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("OutlinedTextBoxPlaceholderForegroundDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxPlaceholderForegroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("OutlinedTextBoxPlaceholderForegroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxPlaceholderForegroundFocused")]
-						public ThemeResourceKey<Brush> Focused = new("OutlinedTextBoxPlaceholderForegroundFocused");
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxPlaceholderForegroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("OutlinedTextBoxPlaceholderForegroundDisabled");
 
-						public static implicit operator ThemeResourceKey<Brush>(PlaceholderForegroundVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxPlaceholderForegroundFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("OutlinedTextBoxPlaceholderForegroundFocused");
+				}
 
-					public static partial class Typography
-					{
-						[ResourceKeyDefinition(typeof(int), "OutlinedTextBoxCharacterSpacing")]
-						public static ThemeResourceKey<int> CharacterSpacing => new("OutlinedTextBoxCharacterSpacing");
+				public static partial class Typography
+				{
+					[ResourceKeyDefinition(typeof(int), "OutlinedTextBoxCharacterSpacing")]
+					public static ThemeResourceKey<int> CharacterSpacing => new("OutlinedTextBoxCharacterSpacing");
 
-						[ResourceKeyDefinition(typeof(FontFamily), "OutlinedTextBoxFontFamily")]
-						public static ThemeResourceKey<FontFamily> FontFamily => new("OutlinedTextBoxFontFamily");
+					[ResourceKeyDefinition(typeof(FontFamily), "OutlinedTextBoxFontFamily")]
+					public static ThemeResourceKey<FontFamily> FontFamily => new("OutlinedTextBoxFontFamily");
 
-						[ResourceKeyDefinition(typeof(double), "OutlinedTextBoxFontSize")]
-						public static ThemeResourceKey<double> FontSize => new("OutlinedTextBoxFontSize");
+					[ResourceKeyDefinition(typeof(double), "OutlinedTextBoxFontSize")]
+					public static ThemeResourceKey<double> FontSize => new("OutlinedTextBoxFontSize");
 
-						[ResourceKeyDefinition(typeof(string), "OutlinedTextBoxFontWeight")]
-						public static ThemeResourceKey<string> FontWeight => new("OutlinedTextBoxFontWeight");
-					}
+					[ResourceKeyDefinition(typeof(string), "OutlinedTextBoxFontWeight")]
+					public static ThemeResourceKey<string> FontWeight => new("OutlinedTextBoxFontWeight");
+				}
 
-					[ResourceKeyDefinition(typeof(Thickness), "MaterialOutlinedTextBoxBorderPadding")]
-					public static ThemeResourceKey<Thickness> BorderPadding => new("MaterialOutlinedTextBoxBorderPadding");
+				[ResourceKeyDefinition(typeof(Thickness), "MaterialOutlinedTextBoxBorderPadding")]
+				public static ThemeResourceKey<Thickness> BorderPadding => new("MaterialOutlinedTextBoxBorderPadding");
 
-					[ResourceKeyDefinition(typeof(double), "MaterialOutlinedTextBoxBorderThickness")]
-					public static ThemeResourceKey<double> BorderThickness => new("MaterialOutlinedTextBoxBorderThickness");
+				[ResourceKeyDefinition(typeof(double), "MaterialOutlinedTextBoxBorderThickness")]
+				public static ThemeResourceKey<double> BorderThickness => new("MaterialOutlinedTextBoxBorderThickness");
 
-					[ResourceKeyDefinition(typeof(double), "MaterialOutlinedTextBoxBorderThicknessFocused")]
-					public static ThemeResourceKey<double> BorderThicknessFocused => new("MaterialOutlinedTextBoxBorderThicknessFocused");
+				[ResourceKeyDefinition(typeof(double), "MaterialOutlinedTextBoxBorderThicknessFocused")]
+				public static ThemeResourceKey<double> BorderThicknessFocused => new("MaterialOutlinedTextBoxBorderThicknessFocused");
 
-					[ResourceKeyDefinition(typeof(CornerRadius), "MaterialOutlinedTextBoxCornerRadius")]
-					public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialOutlinedTextBoxCornerRadius");
+				[ResourceKeyDefinition(typeof(CornerRadius), "MaterialOutlinedTextBoxCornerRadius")]
+				public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialOutlinedTextBoxCornerRadius");
 
-					[ResourceKeyDefinition(typeof(double), "OutlinedTextBoxForegroundOpacityDisabled")]
-					public static ThemeResourceKey<double> ForegroundOpacityDisabled => new("OutlinedTextBoxForegroundOpacityDisabled");
+				[ResourceKeyDefinition(typeof(double), "OutlinedTextBoxForegroundOpacityDisabled")]
+				public static ThemeResourceKey<double> ForegroundOpacityDisabled => new("OutlinedTextBoxForegroundOpacityDisabled");
 
-					[ResourceKeyDefinition(typeof(double), "MaterialOutlinedTextBoxMinHeight")]
-					public static ThemeResourceKey<double> MinHeight => new("MaterialOutlinedTextBoxMinHeight");
+				[ResourceKeyDefinition(typeof(double), "MaterialOutlinedTextBoxMinHeight")]
+				public static ThemeResourceKey<double> MinHeight => new("MaterialOutlinedTextBoxMinHeight");
 
-					[ResourceKeyDefinition(typeof(Thickness), "MaterialOutlinedTextBoxPadding")]
-					public static ThemeResourceKey<Thickness> Padding => new("MaterialOutlinedTextBoxPadding");
-				}
+				[ResourceKeyDefinition(typeof(Thickness), "MaterialOutlinedTextBoxPadding")]
+				public static ThemeResourceKey<Thickness> Padding => new("MaterialOutlinedTextBoxPadding");
 			}
+		}
 
-			public static partial class Styles
-			{
-				[ResourceKeyDefinition(typeof(Style), "MaterialFilledTextBoxStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBox))]
-				public static StaticResourceKey<Style> Filled => new("MaterialFilledTextBoxStyle");
+		public static partial class Styles
+		{
+			[ResourceKeyDefinition(typeof(Style), "MaterialFilledTextBoxStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBox))]
+			public static StaticResourceKey<Style> Filled => new("MaterialFilledTextBoxStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialOutlinedTextBoxStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBox))]
-				public static StaticResourceKey<Style> Outlined => new("MaterialOutlinedTextBoxStyle");
-			}
+			[ResourceKeyDefinition(typeof(Style), "MaterialOutlinedTextBoxStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.TextBox))]
+			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 11ca998b2..927f50133 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleButton.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleButton.cs
@@ -6,316 +6,295 @@
 using Uno.Extensions.Markup;
 using Uno.Extensions.Markup.Internals;
 
-using ResourceKeyDefinitionAttribute = Uno.Themes.WinUI.Markup.ResourceKeyDefinitionAttribute;
+namespace Uno.Themes.Markup;
 
-namespace Uno.Themes.Markup
+public static partial class Theme
 {
-	public static partial class Theme
+	public static partial class ToggleButton
 	{
-		public static partial class ToggleButton
+		public static partial class Resources
 		{
-			public static partial class Resources
+			public static partial class Icon
 			{
-				public static partial class Icon
+				public static partial class Background
 				{
-					public static readonly BackgroundVSG Background = new();
-					public partial class BackgroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackground")]
-						public ThemeResourceKey<Brush> Default = new("IconToggleButtonBackground");
-
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("IconToggleButtonBackgroundPointerOver");
-
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundPressed")]
-						public ThemeResourceKey<Brush> Pressed = new("IconToggleButtonBackgroundPressed");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackground")]
+					public static ThemeResourceKey<Brush> Default => new("IconToggleButtonBackground");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("IconToggleButtonBackgroundDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("IconToggleButtonBackgroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundChecked")]
-						public ThemeResourceKey<Brush> Checked = new("IconToggleButtonBackgroundChecked");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("IconToggleButtonBackgroundPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundCheckedPointerOver")]
-						public ThemeResourceKey<Brush> CheckedPointerOver = new("IconToggleButtonBackgroundCheckedPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("IconToggleButtonBackgroundDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundCheckedPressed")]
-						public ThemeResourceKey<Brush> CheckedPressed = new("IconToggleButtonBackgroundCheckedPressed");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundChecked")]
+					public static ThemeResourceKey<Brush> Checked => new("IconToggleButtonBackgroundChecked");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundCheckedDisabled")]
-						public ThemeResourceKey<Brush> CheckedDisabled = new("IconToggleButtonBackgroundCheckedDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundCheckedPointerOver")]
+					public static ThemeResourceKey<Brush> CheckedPointerOver => new("IconToggleButtonBackgroundCheckedPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundIndeterminate")]
-						public ThemeResourceKey<Brush> IndeterminateNormal = new("IconToggleButtonBackgroundIndeterminate");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundCheckedPressed")]
+					public static ThemeResourceKey<Brush> CheckedPressed => new("IconToggleButtonBackgroundCheckedPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundIndeterminatePointerOver")]
-						public ThemeResourceKey<Brush> IndeterminatePointerOver = new("IconToggleButtonBackgroundIndeterminatePointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundCheckedDisabled")]
+					public static ThemeResourceKey<Brush> CheckedDisabled => new("IconToggleButtonBackgroundCheckedDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundIndeterminatePressed")]
-						public ThemeResourceKey<Brush> IndeterminatePressed = new("IconToggleButtonBackgroundIndeterminatePressed");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundIndeterminate")]
+					public static ThemeResourceKey<Brush> IndeterminateNormal => new("IconToggleButtonBackgroundIndeterminate");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundIndeterminateDisabled")]
-						public ThemeResourceKey<Brush> IndeterminateDisabled = new("IconToggleButtonBackgroundIndeterminateDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundIndeterminatePointerOver")]
+					public static ThemeResourceKey<Brush> IndeterminatePointerOver => new("IconToggleButtonBackgroundIndeterminatePointerOver");
 
-						public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
-					}
-
-					public static readonly BorderBrushVSG BorderBrush = new();
-					public partial class BorderBrushVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrush")]
-						public ThemeResourceKey<Brush> Default = new("IconToggleButtonBorderBrush");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundIndeterminatePressed")]
+					public static ThemeResourceKey<Brush> IndeterminatePressed => new("IconToggleButtonBackgroundIndeterminatePressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("IconToggleButtonBorderBrushPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundIndeterminateDisabled")]
+					public static ThemeResourceKey<Brush> IndeterminateDisabled => new("IconToggleButtonBackgroundIndeterminateDisabled");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushPressed")]
-						public ThemeResourceKey<Brush> Pressed = new("IconToggleButtonBorderBrushPressed");
+				public static partial class BorderBrush
+				{
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrush")]
+					public static ThemeResourceKey<Brush> Default => new("IconToggleButtonBorderBrush");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("IconToggleButtonBorderBrushDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("IconToggleButtonBorderBrushPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushChecked")]
-						public ThemeResourceKey<Brush> Checked = new("IconToggleButtonBorderBrushChecked");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("IconToggleButtonBorderBrushPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushCheckedPointerOver")]
-						public ThemeResourceKey<Brush> CheckedPointerOver = new("IconToggleButtonBorderBrushCheckedPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("IconToggleButtonBorderBrushDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushCheckedPressed")]
-						public ThemeResourceKey<Brush> CheckedPressed = new("IconToggleButtonBorderBrushCheckedPressed");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushChecked")]
+					public static ThemeResourceKey<Brush> Checked => new("IconToggleButtonBorderBrushChecked");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushCheckedDisabled")]
-						public ThemeResourceKey<Brush> CheckedDisabled = new("IconToggleButtonBorderBrushCheckedDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushCheckedPointerOver")]
+					public static ThemeResourceKey<Brush> CheckedPointerOver => new("IconToggleButtonBorderBrushCheckedPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushIndeterminate")]
-						public ThemeResourceKey<Brush> IndeterminateNormal = new("IconToggleButtonBorderBrushIndeterminate");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushCheckedPressed")]
+					public static ThemeResourceKey<Brush> CheckedPressed => new("IconToggleButtonBorderBrushCheckedPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushIndeterminatePointerOver")]
-						public ThemeResourceKey<Brush> IndeterminatePointerOver = new("IconToggleButtonBorderBrushIndeterminatePointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushCheckedDisabled")]
+					public static ThemeResourceKey<Brush> CheckedDisabled => new("IconToggleButtonBorderBrushCheckedDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushIndeterminatePressed")]
-						public ThemeResourceKey<Brush> IndeterminatePressed = new("IconToggleButtonBorderBrushIndeterminatePressed");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushIndeterminate")]
+					public static ThemeResourceKey<Brush> IndeterminateNormal => new("IconToggleButtonBorderBrushIndeterminate");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushIndeterminateDisabled")]
-						public ThemeResourceKey<Brush> IndeterminateDisabled = new("IconToggleButtonBorderBrushIndeterminateDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushIndeterminatePointerOver")]
+					public static ThemeResourceKey<Brush> IndeterminatePointerOver => new("IconToggleButtonBorderBrushIndeterminatePointerOver");
 
-						public static implicit operator ThemeResourceKey<Brush>(BorderBrushVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushIndeterminatePressed")]
+					public static ThemeResourceKey<Brush> IndeterminatePressed => new("IconToggleButtonBorderBrushIndeterminatePressed");
 
-					public static readonly ForegroundVSG Foreground = new();
-					public partial class ForegroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForeground")]
-						public ThemeResourceKey<Brush> Default = new("IconToggleButtonForeground");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushIndeterminateDisabled")]
+					public static ThemeResourceKey<Brush> IndeterminateDisabled => new("IconToggleButtonBorderBrushIndeterminateDisabled");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("IconToggleButtonForegroundPointerOver");
+				public static partial class Foreground
+				{
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForeground")]
+					public static ThemeResourceKey<Brush> Default => new("IconToggleButtonForeground");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundPressed")]
-						public ThemeResourceKey<Brush> Pressed = new("IconToggleButtonForegroundPressed");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("IconToggleButtonForegroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("IconToggleButtonForegroundDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("IconToggleButtonForegroundPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundChecked")]
-						public ThemeResourceKey<Brush> Checked = new("IconToggleButtonForegroundChecked");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("IconToggleButtonForegroundDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundCheckedPointerOver")]
-						public ThemeResourceKey<Brush> CheckedPointerOver = new("IconToggleButtonForegroundCheckedPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundChecked")]
+					public static ThemeResourceKey<Brush> Checked => new("IconToggleButtonForegroundChecked");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundCheckedPressed")]
-						public ThemeResourceKey<Brush> CheckedPressed = new("IconToggleButtonForegroundCheckedPressed");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundCheckedPointerOver")]
+					public static ThemeResourceKey<Brush> CheckedPointerOver => new("IconToggleButtonForegroundCheckedPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundCheckedDisabled")]
-						public ThemeResourceKey<Brush> CheckedDisabled = new("IconToggleButtonForegroundCheckedDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundCheckedPressed")]
+					public static ThemeResourceKey<Brush> CheckedPressed => new("IconToggleButtonForegroundCheckedPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundIndeterminate")]
-						public ThemeResourceKey<Brush> IndeterminateNormal = new("IconToggleButtonForegroundIndeterminate");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundCheckedDisabled")]
+					public static ThemeResourceKey<Brush> CheckedDisabled => new("IconToggleButtonForegroundCheckedDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundIndeterminatePointerOver")]
-						public ThemeResourceKey<Brush> IndeterminatePointerOver = new("IconToggleButtonForegroundIndeterminatePointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundIndeterminate")]
+					public static ThemeResourceKey<Brush> IndeterminateNormal => new("IconToggleButtonForegroundIndeterminate");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundIndeterminatePressed")]
-						public ThemeResourceKey<Brush> IndeterminatePressed = new("IconToggleButtonForegroundIndeterminatePressed");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundIndeterminatePointerOver")]
+					public static ThemeResourceKey<Brush> IndeterminatePointerOver => new("IconToggleButtonForegroundIndeterminatePointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundIndeterminateDisabled")]
-						public ThemeResourceKey<Brush> IndeterminateDisabled = new("IconToggleButtonForegroundIndeterminateDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundIndeterminatePressed")]
+					public static ThemeResourceKey<Brush> IndeterminatePressed => new("IconToggleButtonForegroundIndeterminatePressed");
 
-						public static implicit operator ThemeResourceKey<Brush>(ForegroundVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundIndeterminateDisabled")]
+					public static ThemeResourceKey<Brush> IndeterminateDisabled => new("IconToggleButtonForegroundIndeterminateDisabled");
+				}
 
-					public static partial class StateCircle
+				public static partial class StateCircle
+				{
+					public static partial class Opacity
 					{
-						public static partial class Opacity
-						{
-							[ResourceKeyDefinition(typeof(double), "IconToggleButtonStateCircleOpacityPointerOver")]
-							public static ThemeResourceKey<double> PointerOver => new("IconToggleButtonStateCircleOpacityPointerOver");
-
-							[ResourceKeyDefinition(typeof(double), "IconToggleButtonStateCircleOpacityPressed")]
-							public static ThemeResourceKey<double> Pressed => new("IconToggleButtonStateCircleOpacityPressed");
-						}
+						[ResourceKeyDefinition(typeof(double), "IconToggleButtonStateCircleOpacityPointerOver")]
+						public static ThemeResourceKey<double> PointerOver => new("IconToggleButtonStateCircleOpacityPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonStateCircleFill")]
-						public static ThemeResourceKey<Brush> Fill => new("IconToggleButtonStateCircleFill");
-
-						[ResourceKeyDefinition(typeof(double), "IconToggleButtonStateCircleOpacityFocused")]
-						public static ThemeResourceKey<double> OpacityFocused => new("IconToggleButtonStateCircleOpacityFocused");
+						[ResourceKeyDefinition(typeof(double), "IconToggleButtonStateCircleOpacityPressed")]
+						public static ThemeResourceKey<double> Pressed => new("IconToggleButtonStateCircleOpacityPressed");
 					}
 
-					[ResourceKeyDefinition(typeof(Thickness), "IconToggleButtonBorderThickness")]
-					public static ThemeResourceKey<Thickness> BorderThickness => new("IconToggleButtonBorderThickness");
-
-					[ResourceKeyDefinition(typeof(double), "IconToggleButtonMinHeight")]
-					public static ThemeResourceKey<double> MinHeight => new("IconToggleButtonMinHeight");
+					[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonStateCircleFill")]
+					public static ThemeResourceKey<Brush> Fill => new("IconToggleButtonStateCircleFill");
 
-					[ResourceKeyDefinition(typeof(double), "IconToggleButtonMinWidth")]
-					public static ThemeResourceKey<double> MinWidth => new("IconToggleButtonMinWidth");
+					[ResourceKeyDefinition(typeof(double), "IconToggleButtonStateCircleOpacityFocused")]
+					public static ThemeResourceKey<double> OpacityFocused => new("IconToggleButtonStateCircleOpacityFocused");
 				}
 
-				public static partial class Text
-				{
-					public static readonly BackgroundVSG Background = new();
-					public partial class BackgroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackground")]
-						public ThemeResourceKey<Brush> Default = new("TextToggleButtonBackground");
+				[ResourceKeyDefinition(typeof(Thickness), "IconToggleButtonBorderThickness")]
+				public static ThemeResourceKey<Thickness> BorderThickness => new("IconToggleButtonBorderThickness");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("TextToggleButtonBackgroundPointerOver");
+				[ResourceKeyDefinition(typeof(double), "IconToggleButtonMinHeight")]
+				public static ThemeResourceKey<double> MinHeight => new("IconToggleButtonMinHeight");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundPressed")]
-						public ThemeResourceKey<Brush> Pressed = new("TextToggleButtonBackgroundPressed");
+				[ResourceKeyDefinition(typeof(double), "IconToggleButtonMinWidth")]
+				public static ThemeResourceKey<double> MinWidth => new("IconToggleButtonMinWidth");
+			}
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("TextToggleButtonBackgroundDisabled");
+			public static partial class Text
+			{
+				public static partial class Background
+				{
+					[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackground")]
+					public static ThemeResourceKey<Brush> Default => new("TextToggleButtonBackground");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundChecked")]
-						public ThemeResourceKey<Brush> Checked = new("TextToggleButtonBackgroundChecked");
+					[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("TextToggleButtonBackgroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundIndeterminate")]
-						public ThemeResourceKey<Brush> IndeterminateNormal = new("TextToggleButtonBackgroundIndeterminate");
+					[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("TextToggleButtonBackgroundPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundIndeterminatePointerOver")]
-						public ThemeResourceKey<Brush> IndeterminatePointerOver = new("TextToggleButtonBackgroundIndeterminatePointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("TextToggleButtonBackgroundDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundIndeterminatePressed")]
-						public ThemeResourceKey<Brush> IndeterminatePressed = new("TextToggleButtonBackgroundIndeterminatePressed");
+					[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundChecked")]
+					public static ThemeResourceKey<Brush> Checked => new("TextToggleButtonBackgroundChecked");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundIndeterminateDisabled")]
-						public ThemeResourceKey<Brush> IndeterminateDisabled = new("TextToggleButtonBackgroundIndeterminateDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundIndeterminate")]
+					public static ThemeResourceKey<Brush> IndeterminateNormal => new("TextToggleButtonBackgroundIndeterminate");
 
-						public static implicit operator ThemeResourceKey<Brush>(BackgroundVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundIndeterminatePointerOver")]
+					public static ThemeResourceKey<Brush> IndeterminatePointerOver => new("TextToggleButtonBackgroundIndeterminatePointerOver");
 
-					public static readonly BorderBrushVSG BorderBrush = new();
-					public partial class BorderBrushVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrush")]
-						public ThemeResourceKey<Brush> Default = new("TextToggleButtonBorderBrush");
+					[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundIndeterminatePressed")]
+					public static ThemeResourceKey<Brush> IndeterminatePressed => new("TextToggleButtonBackgroundIndeterminatePressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("TextToggleButtonBorderBrushPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundIndeterminateDisabled")]
+					public static ThemeResourceKey<Brush> IndeterminateDisabled => new("TextToggleButtonBackgroundIndeterminateDisabled");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushPressed")]
-						public ThemeResourceKey<Brush> Pressed = new("TextToggleButtonBorderBrushPressed");
+				public static partial class BorderBrush
+				{
+					[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrush")]
+					public static ThemeResourceKey<Brush> Default => new("TextToggleButtonBorderBrush");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("TextToggleButtonBorderBrushDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("TextToggleButtonBorderBrushPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushChecked")]
-						public ThemeResourceKey<Brush> Checked = new("TextToggleButtonBorderBrushChecked");
+					[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("TextToggleButtonBorderBrushPressed");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushIndeterminate")]
-						public ThemeResourceKey<Brush> IndeterminateNormal = new("TextToggleButtonBorderBrushIndeterminate");
+					[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("TextToggleButtonBorderBrushDisabled");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushIndeterminatePointerOver")]
-						public ThemeResourceKey<Brush> IndeterminatePointerOver = new("TextToggleButtonBorderBrushIndeterminatePointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushChecked")]
+					public static ThemeResourceKey<Brush> Checked => new("TextToggleButtonBorderBrushChecked");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushIndeterminatePressed")]
-						public ThemeResourceKey<Brush> IndeterminatePressed = new("TextToggleButtonBorderBrushIndeterminatePressed");
+					[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushIndeterminate")]
+					public static ThemeResourceKey<Brush> IndeterminateNormal => new("TextToggleButtonBorderBrushIndeterminate");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushIndeterminateDisabled")]
-						public ThemeResourceKey<Brush> IndeterminateDisabled = new("TextToggleButtonBorderBrushIndeterminateDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushIndeterminatePointerOver")]
+					public static ThemeResourceKey<Brush> IndeterminatePointerOver => new("TextToggleButtonBorderBrushIndeterminatePointerOver");
 
-						public static implicit operator ThemeResourceKey<Brush>(BorderBrushVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushIndeterminatePressed")]
+					public static ThemeResourceKey<Brush> IndeterminatePressed => new("TextToggleButtonBorderBrushIndeterminatePressed");
 
-					public static readonly ForegroundVSG Foreground = new();
-					public partial class ForegroundVSG
-					{
-						[ResourceKeyDefinition(typeof(Color), "TextToggleButtonForeground")]
-						public ThemeResourceKey<Color> Default = new("TextToggleButtonForeground");
+					[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushIndeterminateDisabled")]
+					public static ThemeResourceKey<Brush> IndeterminateDisabled => new("TextToggleButtonBorderBrushIndeterminateDisabled");
+				}
 
-						[ResourceKeyDefinition(typeof(Color), "TextToggleButtonForegroundPointerOver")]
-						public ThemeResourceKey<Color> PointerOver = new("TextToggleButtonForegroundPointerOver");
+				public static partial class Foreground
+				{
+					[ResourceKeyDefinition(typeof(Color), "TextToggleButtonForeground")]
+					public static ThemeResourceKey<Color> Default => new("TextToggleButtonForeground");
 
-						[ResourceKeyDefinition(typeof(Color), "TextToggleButtonForegroundPressed")]
-						public ThemeResourceKey<Color> Pressed = new("TextToggleButtonForegroundPressed");
+					[ResourceKeyDefinition(typeof(Color), "TextToggleButtonForegroundPointerOver")]
+					public static ThemeResourceKey<Color> PointerOver => new("TextToggleButtonForegroundPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonForegroundDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("TextToggleButtonForegroundDisabled");
+					[ResourceKeyDefinition(typeof(Color), "TextToggleButtonForegroundPressed")]
+					public static ThemeResourceKey<Color> Pressed => new("TextToggleButtonForegroundPressed");
 
-						[ResourceKeyDefinition(typeof(Color), "TextToggleButtonForegroundChecked")]
-						public ThemeResourceKey<Color> Checked = new("TextToggleButtonForegroundChecked");
+					[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonForegroundDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("TextToggleButtonForegroundDisabled");
 
-						[ResourceKeyDefinition(typeof(Color), "TextToggleButtonForegroundIndeterminate")]
-						public ThemeResourceKey<Color> IndeterminateNormal = new("TextToggleButtonForegroundIndeterminate");
+					[ResourceKeyDefinition(typeof(Color), "TextToggleButtonForegroundChecked")]
+					public static ThemeResourceKey<Color> Checked => new("TextToggleButtonForegroundChecked");
 
-						[ResourceKeyDefinition(typeof(Color), "TextToggleButtonForegroundIndeterminatePointerOver")]
-						public ThemeResourceKey<Color> IndeterminatePointerOver = new("TextToggleButtonForegroundIndeterminatePointerOver");
+					[ResourceKeyDefinition(typeof(Color), "TextToggleButtonForegroundIndeterminate")]
+					public static ThemeResourceKey<Color> IndeterminateNormal => new("TextToggleButtonForegroundIndeterminate");
 
-						[ResourceKeyDefinition(typeof(Color), "TextToggleButtonForegroundIndeterminatePressed")]
-						public ThemeResourceKey<Color> IndeterminatePressed = new("TextToggleButtonForegroundIndeterminatePressed");
+					[ResourceKeyDefinition(typeof(Color), "TextToggleButtonForegroundIndeterminatePointerOver")]
+					public static ThemeResourceKey<Color> IndeterminatePointerOver => new("TextToggleButtonForegroundIndeterminatePointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonForegroundIndeterminateDisabled")]
-						public ThemeResourceKey<Brush> IndeterminateDisabled = new("TextToggleButtonForegroundIndeterminateDisabled");
+					[ResourceKeyDefinition(typeof(Color), "TextToggleButtonForegroundIndeterminatePressed")]
+					public static ThemeResourceKey<Color> IndeterminatePressed => new("TextToggleButtonForegroundIndeterminatePressed");
 
-						public static implicit operator ThemeResourceKey<Color>(ForegroundVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonForegroundIndeterminateDisabled")]
+					public static ThemeResourceKey<Brush> IndeterminateDisabled => new("TextToggleButtonForegroundIndeterminateDisabled");
+				}
 
-					public static partial class Typography
-					{
-						[ResourceKeyDefinition(typeof(FontFamily), "TextToggleButtonFontFamily")]
-						public static ThemeResourceKey<FontFamily> FontFamily => new("TextToggleButtonFontFamily");
+				public static partial class Typography
+				{
+					[ResourceKeyDefinition(typeof(FontFamily), "TextToggleButtonFontFamily")]
+					public static ThemeResourceKey<FontFamily> FontFamily => new("TextToggleButtonFontFamily");
 
-						[ResourceKeyDefinition(typeof(double), "TextToggleButtonFontSize")]
-						public static ThemeResourceKey<double> FontSize => new("TextToggleButtonFontSize");
-					}
+					[ResourceKeyDefinition(typeof(double), "TextToggleButtonFontSize")]
+					public static ThemeResourceKey<double> FontSize => new("TextToggleButtonFontSize");
+				}
 
-					[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushFocusedOverlay")]
-					public static ThemeResourceKey<Brush> BorderBrushFocusedOverlay => new("TextToggleButtonBorderBrushFocusedOverlay");
+				[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushFocusedOverlay")]
+				public static ThemeResourceKey<Brush> BorderBrushFocusedOverlay => new("TextToggleButtonBorderBrushFocusedOverlay");
 
-					[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushHoverOverlay")]
-					public static ThemeResourceKey<Brush> BorderBrushHoverOverlay => new("TextToggleButtonBorderBrushHoverOverlay");
+				[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushHoverOverlay")]
+				public static ThemeResourceKey<Brush> BorderBrushHoverOverlay => new("TextToggleButtonBorderBrushHoverOverlay");
 
-					[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushSelectedOverlay")]
-					public static ThemeResourceKey<Brush> BorderBrushSelectedOverlay => new("TextToggleButtonBorderBrushSelectedOverlay");
+				[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushSelectedOverlay")]
+				public static ThemeResourceKey<Brush> BorderBrushSelectedOverlay => new("TextToggleButtonBorderBrushSelectedOverlay");
 
-					[ResourceKeyDefinition(typeof(Thickness), "TextToggleButtonBorderThickness")]
-					public static ThemeResourceKey<Thickness> BorderThickness => new("TextToggleButtonBorderThickness");
+				[ResourceKeyDefinition(typeof(Thickness), "TextToggleButtonBorderThickness")]
+				public static ThemeResourceKey<Thickness> BorderThickness => new("TextToggleButtonBorderThickness");
 
-					[ResourceKeyDefinition(typeof(CornerRadius), "TextToggleButtonCornerRadius")]
-					public static ThemeResourceKey<CornerRadius> CornerRadius => new("TextToggleButtonCornerRadius");
+				[ResourceKeyDefinition(typeof(CornerRadius), "TextToggleButtonCornerRadius")]
+				public static ThemeResourceKey<CornerRadius> CornerRadius => new("TextToggleButtonCornerRadius");
 
-					[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonFeedbackFocused")]
-					public static ThemeResourceKey<Brush> FeedbackFocused => new("TextToggleButtonFeedbackFocused");
+				[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonFeedbackFocused")]
+				public static ThemeResourceKey<Brush> FeedbackFocused => new("TextToggleButtonFeedbackFocused");
 
-					[ResourceKeyDefinition(typeof(double), "TextToggleButtonMinHeight")]
-					public static ThemeResourceKey<double> MinHeight => new("TextToggleButtonMinHeight");
+				[ResourceKeyDefinition(typeof(double), "TextToggleButtonMinHeight")]
+				public static ThemeResourceKey<double> MinHeight => new("TextToggleButtonMinHeight");
 
-					[ResourceKeyDefinition(typeof(Thickness), "TextToggleButtonPadding")]
-					public static ThemeResourceKey<Thickness> Padding => new("TextToggleButtonPadding");
-				}
+				[ResourceKeyDefinition(typeof(Thickness), "TextToggleButtonPadding")]
+				public static ThemeResourceKey<Thickness> Padding => new("TextToggleButtonPadding");
 			}
+		}
 
-			public static partial class Styles
-			{
-				[ResourceKeyDefinition(typeof(Style), "MaterialTextToggleButtonStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Primitives.ToggleButton))]
-				public static StaticResourceKey<Style> Text => new("MaterialTextToggleButtonStyle");
+		public static partial class Styles
+		{
+			[ResourceKeyDefinition(typeof(Style), "MaterialTextToggleButtonStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Primitives.ToggleButton))]
+			public static StaticResourceKey<Style> Text => new("MaterialTextToggleButtonStyle");
 
-				[ResourceKeyDefinition(typeof(Style), "MaterialIconToggleButtonStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Primitives.ToggleButton))]
-				public static StaticResourceKey<Style> Icon => new("MaterialIconToggleButtonStyle");
-			}
+			[ResourceKeyDefinition(typeof(Style), "MaterialIconToggleButtonStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.Primitives.ToggleButton))]
+			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 4af49856d..1f69a841d 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleSwitch.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleSwitch.cs
@@ -6,250 +6,217 @@
 using Uno.Extensions.Markup;
 using Uno.Extensions.Markup.Internals;
 
-using ResourceKeyDefinitionAttribute = Uno.Themes.WinUI.Markup.ResourceKeyDefinitionAttribute;
+namespace Uno.Themes.Markup;
 
-namespace Uno.Themes.Markup
+public static partial class Theme
 {
-	public static partial class Theme
+	public static partial class ToggleSwitch
 	{
-		public static partial class ToggleSwitch
+		public static partial class Resources
 		{
-			public static partial class Resources
+			public static partial class Knob
 			{
-				public static partial class Knob
+				public static partial class Icon
 				{
-					public static partial class Icon
-					{
-						[ResourceKeyDefinition(typeof(Thickness), "KnobIconPadding")]
-						public static ThemeResourceKey<Thickness> Padding => new("KnobIconPadding");
-
-						[ResourceKeyDefinition(typeof(double), "KnobIconSize")]
-						public static ThemeResourceKey<double> Size => new("KnobIconSize");
-					}
-
-					public static readonly OffFillVSG OffFill = new();
-					public partial class OffFillVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffFill")]
-						public ThemeResourceKey<Brush> Default = new("ToggleSwitchKnobOffFill");
+					[ResourceKeyDefinition(typeof(Thickness), "KnobIconPadding")]
+					public static ThemeResourceKey<Thickness> Padding => new("KnobIconPadding");
 
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffFillPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("ToggleSwitchKnobOffFillPointerOver");
+					[ResourceKeyDefinition(typeof(double), "KnobIconSize")]
+					public static ThemeResourceKey<double> Size => new("KnobIconSize");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffFillFocused")]
-						public ThemeResourceKey<Brush> Focused = new("ToggleSwitchKnobOffFillFocused");
+				public static partial class OffFill
+				{
+					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffFill")]
+					public static ThemeResourceKey<Brush> Default => new("ToggleSwitchKnobOffFill");
 
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffFillPressed")]
-						public ThemeResourceKey<Brush> Pressed = new("ToggleSwitchKnobOffFillPressed");
+					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffFillPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("ToggleSwitchKnobOffFillPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffFillDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("ToggleSwitchKnobOffFillDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffFillFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("ToggleSwitchKnobOffFillFocused");
 
-						public static implicit operator ThemeResourceKey<Brush>(OffFillVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffFillPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("ToggleSwitchKnobOffFillPressed");
 
-					public static readonly OffShadowFillVSG OffShadowFill = new();
-					public partial class OffShadowFillVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffShadowFill")]
-						public ThemeResourceKey<Brush> Default = new("ToggleSwitchKnobOffShadowFill");
+					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffFillDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("ToggleSwitchKnobOffFillDisabled");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffShadowFillPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("ToggleSwitchKnobOffShadowFillPointerOver");
+				public static partial class OffShadowFill
+				{
+					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffShadowFill")]
+					public static ThemeResourceKey<Brush> Default => new("ToggleSwitchKnobOffShadowFill");
 
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffShadowFillFocused")]
-						public ThemeResourceKey<Brush> Focused = new("ToggleSwitchKnobOffShadowFillFocused");
+					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffShadowFillPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("ToggleSwitchKnobOffShadowFillPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffShadowFillPressed")]
-						public ThemeResourceKey<Brush> Pressed = new("ToggleSwitchKnobOffShadowFillPressed");
+					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffShadowFillFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("ToggleSwitchKnobOffShadowFillFocused");
 
-						public static implicit operator ThemeResourceKey<Brush>(OffShadowFillVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffShadowFillPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("ToggleSwitchKnobOffShadowFillPressed");
+				}
 
-					public static partial class On
+				public static partial class On
+				{
+					public static partial class Fill
 					{
-						public static readonly FillVSG Fill = new();
-						public partial class FillVSG
-						{
-							[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnFill")]
-							public ThemeResourceKey<Brush> Default = new("ToggleSwitchKnobOnFill");
-
-							[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnFillPointerOver")]
-							public ThemeResourceKey<Brush> PointerOver = new("ToggleSwitchKnobOnFillPointerOver");
-
-							[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnFillFocused")]
-							public ThemeResourceKey<Brush> Focused = new("ToggleSwitchKnobOnFillFocused");
+						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnFill")]
+						public static ThemeResourceKey<Brush> Default => new("ToggleSwitchKnobOnFill");
 
-							[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnFillPressed")]
-							public ThemeResourceKey<Brush> Pressed = new("ToggleSwitchKnobOnFillPressed");
+						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnFillPointerOver")]
+						public static ThemeResourceKey<Brush> PointerOver => new("ToggleSwitchKnobOnFillPointerOver");
 
-							[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnFillDisabled")]
-							public ThemeResourceKey<Brush> Disabled = new("ToggleSwitchKnobOnFillDisabled");
+						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnFillFocused")]
+						public static ThemeResourceKey<Brush> Focused => new("ToggleSwitchKnobOnFillFocused");
 
-							public static implicit operator ThemeResourceKey<Brush>(FillVSG self) => self.Default;
-						}
+						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnFillPressed")]
+						public static ThemeResourceKey<Brush> Pressed => new("ToggleSwitchKnobOnFillPressed");
 
-						[ResourceKeyDefinition(typeof(Thickness), "KnobOnMargin")]
-						public static ThemeResourceKey<Thickness> Margin => new("KnobOnMargin");
+						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnFillDisabled")]
+						public static ThemeResourceKey<Brush> Disabled => new("ToggleSwitchKnobOnFillDisabled");
 					}
 
-					public static readonly OnShadowFillVSG OnShadowFill = new();
-					public partial class OnShadowFillVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnShadowFill")]
-						public ThemeResourceKey<Brush> Default = new("ToggleSwitchKnobOnShadowFill");
-
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnShadowFillPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("ToggleSwitchKnobOnShadowFillPointerOver");
-
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnShadowFillFocused")]
-						public ThemeResourceKey<Brush> Focused = new("ToggleSwitchKnobOnShadowFillFocused");
+					[ResourceKeyDefinition(typeof(Thickness), "KnobOnMargin")]
+					public static ThemeResourceKey<Thickness> Margin => new("KnobOnMargin");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnShadowFillPressed")]
-						public ThemeResourceKey<Brush> Pressed = new("ToggleSwitchKnobOnShadowFillPressed");
+				public static partial class OnShadowFill
+				{
+					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnShadowFill")]
+					public static ThemeResourceKey<Brush> Default => new("ToggleSwitchKnobOnShadowFill");
 
-						public static implicit operator ThemeResourceKey<Brush>(OnShadowFillVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnShadowFillPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("ToggleSwitchKnobOnShadowFillPointerOver");
 
-					public static readonly OnSwitchBoundsFillVSG OnSwitchBoundsFill = new();
-					public partial class OnSwitchBoundsFillVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOnSwitchKnobBoundsFill")]
-						public ThemeResourceKey<Brush> Default = new("ToggleSwitchOnSwitchKnobBoundsFill");
+					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnShadowFillFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("ToggleSwitchKnobOnShadowFillFocused");
 
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobBoundsFill")]
-						public ThemeResourceKey<Brush> Normal = new("ToggleSwitchKnobBoundsFill");
+					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnShadowFillPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("ToggleSwitchKnobOnShadowFillPressed");
+				}
 
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobBoundsFillPointerOver")]
-						public ThemeResourceKey<Brush> PointerOver = new("ToggleSwitchKnobBoundsFillPointerOver");
+				public static partial class OnSwitchBoundsFill
+				{
+					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOnSwitchKnobBoundsFill")]
+					public static ThemeResourceKey<Brush> Default => new("ToggleSwitchOnSwitchKnobBoundsFill");
 
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobBoundsFillFocused")]
-						public ThemeResourceKey<Brush> Focused = new("ToggleSwitchKnobBoundsFillFocused");
+					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobBoundsFill")]
+					public static ThemeResourceKey<Brush> Normal => new("ToggleSwitchKnobBoundsFill");
 
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobBoundsFillPressed")]
-						public ThemeResourceKey<Brush> Pressed = new("ToggleSwitchKnobBoundsFillPressed");
+					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobBoundsFillPointerOver")]
+					public static ThemeResourceKey<Brush> PointerOver => new("ToggleSwitchKnobBoundsFillPointerOver");
 
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobBoundsFillDisabled")]
-						public ThemeResourceKey<Brush> Disabled = new("ToggleSwitchKnobBoundsFillDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobBoundsFillFocused")]
+					public static ThemeResourceKey<Brush> Focused => new("ToggleSwitchKnobBoundsFillFocused");
 
-						public static implicit operator ThemeResourceKey<Brush>(OnSwitchBoundsFillVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobBoundsFillPressed")]
+					public static ThemeResourceKey<Brush> Pressed => new("ToggleSwitchKnobBoundsFillPressed");
 
-					public static partial class Switch
-					{
-						[ResourceKeyDefinition(typeof(double), "SwitchKnobHeight")]
-						public static ThemeResourceKey<double> Height => new("SwitchKnobHeight");
+					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobBoundsFillDisabled")]
+					public static ThemeResourceKey<Brush> Disabled => new("ToggleSwitchKnobBoundsFillDisabled");
+				}
 
-						[ResourceKeyDefinition(typeof(double), "SwitchKnobRadius")]
-						public static ThemeResourceKey<double> Radius => new("SwitchKnobRadius");
+				public static partial class Switch
+				{
+					[ResourceKeyDefinition(typeof(double), "SwitchKnobHeight")]
+					public static ThemeResourceKey<double> Height => new("SwitchKnobHeight");
 
-						[ResourceKeyDefinition(typeof(double), "SwitchKnobStrokeThickness")]
-						public static ThemeResourceKey<double> StrokeThickness => new("SwitchKnobStrokeThickness");
+					[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), "SwitchKnobStrokeThickness")]
+					public static ThemeResourceKey<double> StrokeThickness => new("SwitchKnobStrokeThickness");
 
-					[ResourceKeyDefinition(typeof(double), "SwitchKnobIncludingOffShadowWidth")]
-					public static ThemeResourceKey<double> SwitchIncludingOffShadowWidth => new("SwitchKnobIncludingOffShadowWidth");
+					[ResourceKeyDefinition(typeof(double), "SwitchKnobWidth")]
+					public static ThemeResourceKey<double> Width => new("SwitchKnobWidth");
+				}
 
-					[ResourceKeyDefinition(typeof(Thickness), "SwitchKnobOffMargin")]
-					public static ThemeResourceKey<Thickness> SwitchOffMargin => new("SwitchKnobOffMargin");
+				[ResourceKeyDefinition(typeof(double), "SwitchKnobIncludingOffShadowWidth")]
+				public static ThemeResourceKey<double> SwitchIncludingOffShadowWidth => new("SwitchKnobIncludingOffShadowWidth");
 
-					[ResourceKeyDefinition(typeof(Thickness), "SwitchKnobOffShadowMargin")]
-					public static ThemeResourceKey<Thickness> SwitchOffShadowMargin => new("SwitchKnobOffShadowMargin");
+				[ResourceKeyDefinition(typeof(Thickness), "SwitchKnobOffMargin")]
+				public static ThemeResourceKey<Thickness> SwitchOffMargin => new("SwitchKnobOffMargin");
 
-					[ResourceKeyDefinition(typeof(Thickness), "SwitchKnobOnMargin")]
-					public static ThemeResourceKey<Thickness> SwitchOnMargin => new("SwitchKnobOnMargin");
+				[ResourceKeyDefinition(typeof(Thickness), "SwitchKnobOffShadowMargin")]
+				public static ThemeResourceKey<Thickness> SwitchOffShadowMargin => new("SwitchKnobOffShadowMargin");
 
-					[ResourceKeyDefinition(typeof(Thickness), "SwitchKnobOnShadowMargin")]
-					public static ThemeResourceKey<Thickness> SwitchOnShadowMargin => new("SwitchKnobOnShadowMargin");
+				[ResourceKeyDefinition(typeof(Thickness), "SwitchKnobOnMargin")]
+				public static ThemeResourceKey<Thickness> SwitchOnMargin => new("SwitchKnobOnMargin");
 
-					[ResourceKeyDefinition(typeof(double), "SwitchKnobShadowSize")]
-					public static ThemeResourceKey<double> SwitchShadowSize => new("SwitchKnobShadowSize");
-				}
+				[ResourceKeyDefinition(typeof(Thickness), "SwitchKnobOnShadowMargin")]
+				public static ThemeResourceKey<Thickness> SwitchOnShadowMargin => new("SwitchKnobOnShadowMargin");
 
-				public static readonly OffIconPresenterForegroundVSG OffIconPresenterForeground = new();
-				public partial class OffIconPresenterForegroundVSG
-				{
-					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOffIconPresenterForeground")]
-					public ThemeResourceKey<Brush> Default = new("ToggleSwitchOffIconPresenterForeground");
+				[ResourceKeyDefinition(typeof(double), "SwitchKnobShadowSize")]
+				public static ThemeResourceKey<double> SwitchShadowSize => new("SwitchKnobShadowSize");
+			}
 
-					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOffIconPresenterForegroundDisabled")]
-					public ThemeResourceKey<Brush> Disabled = new("ToggleSwitchOffIconPresenterForegroundDisabled");
+			public static partial class OffIconPresenterForeground
+			{
+				[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOffIconPresenterForeground")]
+				public static ThemeResourceKey<Brush> Default => new("ToggleSwitchOffIconPresenterForeground");
 
-					public static implicit operator ThemeResourceKey<Brush>(OffIconPresenterForegroundVSG self) => self.Default;
-				}
+				[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOffIconPresenterForegroundDisabled")]
+				public static ThemeResourceKey<Brush> Disabled => new("ToggleSwitchOffIconPresenterForegroundDisabled");
+			}
 
-				public static partial class OffOuterBorder
+			public static partial class OffOuterBorder
+			{
+				public static partial class Fill
 				{
-					public static readonly FillVSG Fill = new();
-					public partial class FillVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOffOuterBorderFill")]
-						public ThemeResourceKey<Brush> Default = new("ToggleSwitchOffOuterBorderFill");
+					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOffOuterBorderFill")]
+					public static ThemeResourceKey<Brush> Default => new("ToggleSwitchOffOuterBorderFill");
 
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOuterBorderFill")]
-						public ThemeResourceKey<Brush> Normal = new("ToggleSwitchOuterBorderFill");
-
-						public static implicit operator ThemeResourceKey<Brush>(FillVSG self) => self.Default;
-					}
-
-					public static readonly StrokeVSG Stroke = new();
-					public partial class StrokeVSG
-					{
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOffOuterBorderStroke")]
-						public ThemeResourceKey<Brush> Default = new("ToggleSwitchOffOuterBorderStroke");
-
-						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOuterBorderStroke")]
-						public ThemeResourceKey<Brush> Normal = new("ToggleSwitchOuterBorderStroke");
-
-						public static implicit operator ThemeResourceKey<Brush>(StrokeVSG self) => self.Default;
-					}
+					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOuterBorderFill")]
+					public static ThemeResourceKey<Brush> Normal => new("ToggleSwitchOuterBorderFill");
 				}
 
-				public static readonly OnIconPresenterForegroundVSG OnIconPresenterForeground = new();
-				public partial class OnIconPresenterForegroundVSG
+				public static partial class Stroke
 				{
-					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOnIconPresenterForeground")]
-					public ThemeResourceKey<Brush> Default = new("ToggleSwitchOnIconPresenterForeground");
-
-					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOnIconPresenterForegroundDisabled")]
-					public ThemeResourceKey<Brush> Disabled = new("ToggleSwitchOnIconPresenterForegroundDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOffOuterBorderStroke")]
+					public static ThemeResourceKey<Brush> Default => new("ToggleSwitchOffOuterBorderStroke");
 
-					public static implicit operator ThemeResourceKey<Brush>(OnIconPresenterForegroundVSG self) => self.Default;
+					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOuterBorderStroke")]
+					public static ThemeResourceKey<Brush> Normal => new("ToggleSwitchOuterBorderStroke");
 				}
+			}
 
-				public static partial class Thumb
-				{
-					public static readonly MediumSizeVSG MediumSize = new();
-					public partial class MediumSizeVSG
-					{
-						[ResourceKeyDefinition(typeof(double), "MediumThumbSize")]
-						public ThemeResourceKey<double> Default = new("MediumThumbSize");
-
-						[ResourceKeyDefinition(typeof(double), "LargeThumbSize")]
-						public ThemeResourceKey<double> Pressed = new("LargeThumbSize");
+			public static partial class OnIconPresenterForeground
+			{
+				[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOnIconPresenterForeground")]
+				public static ThemeResourceKey<Brush> Default => new("ToggleSwitchOnIconPresenterForeground");
 
-						public static implicit operator ThemeResourceKey<double>(MediumSizeVSG self) => self.Default;
-					}
+				[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOnIconPresenterForegroundDisabled")]
+				public static ThemeResourceKey<Brush> Disabled => new("ToggleSwitchOnIconPresenterForegroundDisabled");
+			}
 
-					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchThumb")]
-					public static ThemeResourceKey<Brush> Fill => new("ToggleSwitchThumb");
+			public static partial class Thumb
+			{
+				public static partial class MediumSize
+				{
+					[ResourceKeyDefinition(typeof(double), "MediumThumbSize")]
+					public static ThemeResourceKey<double> Default => new("MediumThumbSize");
 
-					[ResourceKeyDefinition(typeof(CornerRadius), "LargeThumbCornerRadius")]
-					public static ThemeResourceKey<CornerRadius> LargeCornerRadius => new("LargeThumbCornerRadius");
+					[ResourceKeyDefinition(typeof(double), "LargeThumbSize")]
+					public static ThemeResourceKey<double> Pressed => new("LargeThumbSize");
 				}
 
-				[ResourceKeyDefinition(typeof(double), "ToggleSwitchThemeMinWidth")]
-				public static ThemeResourceKey<double> ThemeMinWidth => new("ToggleSwitchThemeMinWidth");
-			}
+				[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchThumb")]
+				public static ThemeResourceKey<Brush> Fill => new("ToggleSwitchThumb");
 
-			public static partial class Styles
-			{
-				[ResourceKeyDefinition(typeof(Style), "MaterialToggleSwitchStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.ToggleSwitch))]
-				public static StaticResourceKey<Style> Default => new("MaterialToggleSwitchStyle");
+				[ResourceKeyDefinition(typeof(CornerRadius), "LargeThumbCornerRadius")]
+				public static ThemeResourceKey<CornerRadius> LargeCornerRadius => new("LargeThumbCornerRadius");
 			}
+
+			[ResourceKeyDefinition(typeof(double), "ToggleSwitchThemeMinWidth")]
+			public static ThemeResourceKey<double> ThemeMinWidth => new("ToggleSwitchThemeMinWidth");
+		}
+
+		public static partial class Styles
+		{
+			[ResourceKeyDefinition(typeof(Style), "MaterialToggleSwitchStyle", TargetType = typeof(global::Microsoft.UI.Xaml.Controls.ToggleSwitch))]
+			public static StaticResourceKey<Style> Default => new("MaterialToggleSwitchStyle");
 		}
 	}
 }
diff --git a/src/library/Uno.Themes.WinUI.Markup/Uno.Themes.WinUI.Markup.csproj b/src/library/Uno.Themes.WinUI.Markup/Uno.Themes.WinUI.Markup.csproj
index dcea976c9..5d9fcd72e 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Uno.Themes.WinUI.Markup.csproj
+++ b/src/library/Uno.Themes.WinUI.Markup/Uno.Themes.WinUI.Markup.csproj
@@ -14,7 +14,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Uno.WinUI.Markup" Version="5.0.0-dev.407" />
+		<PackageReference Include="Uno.WinUI.Markup" Version="5.0.0-dev.448" />
 	</ItemGroup>
 
 	<PropertyGroup>