From 511a58d0cbb858e2050f67daf4cb47c80204e789 Mon Sep 17 00:00:00 2001
From: xiaoy312 <xiaoyao312@gmail.com>
Date: Tue, 10 Oct 2023 11:03:28 -0400
Subject: [PATCH] chore: wip (to rebase)

---
 .../Uno.Themes.WinUI.Markup/Theme/Button.cs   | 55 ++++++++++---------
 .../Theme/CalendarDatePicker.cs               | 15 ++---
 .../Theme/CalendarView.cs                     |  7 ++-
 .../Uno.Themes.WinUI.Markup/Theme/CheckBox.cs | 19 ++++---
 .../Uno.Themes.WinUI.Markup/Theme/ComboBox.cs | 33 +++++------
 .../Theme/CommandBar.cs                       | 13 ++---
 .../Theme/ContentDialog.cs                    |  7 ++-
 .../Theme/DatePicker.cs                       | 19 ++++---
 .../Theme/FloatingActionButton.cs             | 55 ++++++++++---------
 .../Theme/HyperlinkButton.cs                  | 13 +++--
 .../Theme/MediaPlayerElement.cs               |  7 ++-
 .../Theme/PasswordBox.cs                      | 37 +++++++------
 .../Theme/ProgressBar.cs                      |  7 ++-
 .../Theme/ProgressRing.cs                     | 13 ++---
 .../Theme/RadioButton.cs                      | 21 +++----
 .../Theme/RatingControl.cs                    | 17 +++---
 .../Uno.Themes.WinUI.Markup/Theme/Slider.cs   | 21 +++----
 .../Theme/TextBlock.cs                        |  7 ++-
 .../Uno.Themes.WinUI.Markup/Theme/TextBox.cs  | 41 +++++++-------
 .../Theme/ToggleButton.cs                     | 27 ++++-----
 .../Theme/ToggleSwitch.cs                     | 35 ++++++------
 21 files changed, 239 insertions(+), 230 deletions(-)

diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/Button.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/Button.cs
index 1232e0bb2..29e09298a 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/Button.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/Button.cs
@@ -1,4 +1,5 @@
 using System;
+using Windows.UI;
 using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
@@ -9,13 +10,13 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class Button
+		public static partial class Button
 		{
-			public static class Resources
+			public static partial class Resources
 			{
-				public static class Elevated
+				public static partial class Elevated
 				{
-					public static class Background
+					public static partial class Background
 					{
 						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBackground")]
 						public static ThemeResourceKey<Brush> Default => new("ElevatedButtonBackground");
@@ -35,7 +36,7 @@ public static class Background
 						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBackgroundPressed")]
 						public static ThemeResourceKey<Brush> Pressed => new("ElevatedButtonBackgroundPressed");
 					}
-					public static class BorderBrush
+					public static partial class BorderBrush
 					{
 						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBorderBrush")]
 						public static ThemeResourceKey<Brush> Default => new("ElevatedButtonBorderBrush");
@@ -55,7 +56,7 @@ public static class BorderBrush
 						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBorderBrushPressed")]
 						public static ThemeResourceKey<Brush> Pressed => new("ElevatedButtonBorderBrushPressed");
 					}
-					public static class Margin
+					public static partial class Margin
 					{
 						[ResourceKeyDefinition(typeof(Thickness), "ElevatedButtonMargin")]
 						public static ThemeResourceKey<Thickness> Default => new("ElevatedButtonMargin");
@@ -63,7 +64,7 @@ public static class Margin
 						[ResourceKeyDefinition(typeof(Thickness), "ElevatedButtonDisabledMargin")]
 						public static ThemeResourceKey<Thickness> Disabled => new("ElevatedButtonDisabledMargin");
 					}
-					public static class StateLayerBackground
+					public static partial class StateLayerBackground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonStateLayerBackgroundFocused")]
 						public static ThemeResourceKey<Brush> Focused => new("ElevatedButtonStateLayerBackgroundFocused");
@@ -89,9 +90,9 @@ public static class StateLayerBackground
 					[ResourceKeyDefinition(typeof(double), "ElevatedButtonElevationDisabled")]
 					public static ThemeResourceKey<double> ElevationDisabled => new("ElevatedButtonElevationDisabled");
 				}
-				public static class Filled
+				public static partial class Filled
 				{
-					public static class Background
+					public static partial class Background
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FilledButtonBackground")]
 						public static ThemeResourceKey<Brush> Default => new("FilledButtonBackground");
@@ -111,7 +112,7 @@ public static class Background
 						[ResourceKeyDefinition(typeof(Brush), "FilledButtonBackgroundPressed")]
 						public static ThemeResourceKey<Brush> Pressed => new("FilledButtonBackgroundPressed");
 					}
-					public static class BorderBrush
+					public static partial class BorderBrush
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FilledButtonBorderBrush")]
 						public static ThemeResourceKey<Brush> Default => new("FilledButtonBorderBrush");
@@ -131,7 +132,7 @@ public static class BorderBrush
 						[ResourceKeyDefinition(typeof(Brush), "FilledButtonBorderBrushPressed")]
 						public static ThemeResourceKey<Brush> Pressed => new("FilledButtonBorderBrushPressed");
 					}
-					public static class StateLayerBackground
+					public static partial class StateLayerBackground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FilledButtonStateLayerBackgroundFocused")]
 						public static ThemeResourceKey<Brush> Focused => new("FilledButtonStateLayerBackgroundFocused");
@@ -154,9 +155,9 @@ public static class StateLayerBackground
 					[ResourceKeyDefinition(typeof(Thickness), "ButtonMargin")]
 					public static ThemeResourceKey<Thickness> Margin => new("ButtonMargin");
 				}
-				public static class FilledTonal
+				public static partial class FilledTonal
 				{
-					public static class Background
+					public static partial class Background
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBackground")]
 						public static ThemeResourceKey<Brush> Default => new("FilledTonalButtonBackground");
@@ -176,7 +177,7 @@ public static class Background
 						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBackgroundPressed")]
 						public static ThemeResourceKey<Brush> Pressed => new("FilledTonalButtonBackgroundPressed");
 					}
-					public static class BorderBrush
+					public static partial class BorderBrush
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBorderBrush")]
 						public static ThemeResourceKey<Brush> Default => new("FilledTonalButtonBorderBrush");
@@ -196,7 +197,7 @@ public static class BorderBrush
 						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBorderBrushPressed")]
 						public static ThemeResourceKey<Brush> Pressed => new("FilledTonalButtonBorderBrushPressed");
 					}
-					public static class StateLayerBackground
+					public static partial class StateLayerBackground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonStateLayerBackgroundFocused")]
 						public static ThemeResourceKey<Brush> Focused => new("FilledTonalButtonStateLayerBackgroundFocused");
@@ -219,9 +220,9 @@ public static class StateLayerBackground
 					[ResourceKeyDefinition(typeof(Thickness), "ButtonMargin")]
 					public static ThemeResourceKey<Thickness> Margin => new("ButtonMargin");
 				}
-				public static class Icon
+				public static partial class Icon
 				{
-					public static class Ellipse
+					public static partial class Ellipse
 					{
 						[ResourceKeyDefinition(typeof(string), "IconButtonEllipseHorizontalAlignment")]
 						public static StaticResourceKey<string> HorizontalAlignment => new("IconButtonEllipseHorizontalAlignment");
@@ -229,7 +230,7 @@ public static class Ellipse
 						[ResourceKeyDefinition(typeof(string), "IconButtonEllipseVerticalAlignment")]
 						public static StaticResourceKey<string> VerticalAlignment => new("IconButtonEllipseVerticalAlignment");
 					}
-					public static class OpacityHiddenState
+					public static partial class OpacityHiddenState
 					{
 						[ResourceKeyDefinition(typeof(double), "IconButtonOpacityHiddenState")]
 						public static ThemeResourceKey<double> Default => new("IconButtonOpacityHiddenState");
@@ -252,9 +253,9 @@ public static class OpacityHiddenState
 					[ResourceKeyDefinition(typeof(Brush), "IconButtonForegroundDisabled")]
 					public static ThemeResourceKey<Brush> ForegroundDisabled => new("IconButtonForegroundDisabled");
 				}
-				public static class Outlined
+				public static partial class Outlined
 				{
-					public static class Background
+					public static partial class Background
 					{
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBackground")]
 						public static ThemeResourceKey<Brush> Default => new("OutlinedButtonBackground");
@@ -271,7 +272,7 @@ public static class Background
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBackgroundPressed")]
 						public static ThemeResourceKey<Brush> Pressed => new("OutlinedButtonBackgroundPressed");
 					}
-					public static class BorderBrush
+					public static partial class BorderBrush
 					{
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBorderBrush")]
 						public static ThemeResourceKey<Brush> Default => new("OutlinedButtonBorderBrush");
@@ -291,7 +292,7 @@ public static class BorderBrush
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBorderBrushPressed")]
 						public static ThemeResourceKey<Brush> Pressed => new("OutlinedButtonBorderBrushPressed");
 					}
-					public static class StateLayerBackground
+					public static partial class StateLayerBackground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonStateLayerBackgroundFocused")]
 						public static ThemeResourceKey<Brush> Focused => new("OutlinedButtonStateLayerBackgroundFocused");
@@ -311,9 +312,9 @@ public static class StateLayerBackground
 					[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonForeground")]
 					public static ThemeResourceKey<Brush> Foreground => new("OutlinedButtonForeground");
 				}
-				public static class Text
+				public static partial class Text
 				{
-					public static class Background
+					public static partial class Background
 					{
 						[ResourceKeyDefinition(typeof(Brush), "TextButtonBackground")]
 						public static ThemeResourceKey<Brush> Default => new("TextButtonBackground");
@@ -330,7 +331,7 @@ public static class Background
 						[ResourceKeyDefinition(typeof(Brush), "TextButtonBackgroundPressed")]
 						public static ThemeResourceKey<Brush> Pressed => new("TextButtonBackgroundPressed");
 					}
-					public static class BorderBrush
+					public static partial class BorderBrush
 					{
 						[ResourceKeyDefinition(typeof(Brush), "TextButtonBorderBrush")]
 						public static ThemeResourceKey<Brush> Default => new("TextButtonBorderBrush");
@@ -350,7 +351,7 @@ public static class BorderBrush
 						[ResourceKeyDefinition(typeof(Brush), "TextButtonBorderBrushPressed")]
 						public static ThemeResourceKey<Brush> Pressed => new("TextButtonBorderBrushPressed");
 					}
-					public static class StateLayerBackground
+					public static partial class StateLayerBackground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "TextButtonStateLayerBackgroundFocused")]
 						public static ThemeResourceKey<Brush> Focused => new("TextButtonStateLayerBackgroundFocused");
@@ -391,7 +392,7 @@ public static class StateLayerBackground
 				[ResourceKeyDefinition(typeof(string), "ButtonVerticalContentAlignment")]
 				public static StaticResourceKey<string> VerticalContentAlignment => new("ButtonVerticalContentAlignment");
 			}
-			public static class Styles
+			public static partial class Styles
 			{
 				[ResourceKeyDefinition(typeof(Style), "MaterialElevatedButtonStyle", TargetType = typeof(Style))]
 				public static StaticResourceKey<Style> Elevated => new("MaterialElevatedButtonStyle");
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/CalendarDatePicker.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/CalendarDatePicker.cs
index d38a1188e..66d8ff542 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/CalendarDatePicker.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/CalendarDatePicker.cs
@@ -1,4 +1,5 @@
 using System;
+using Windows.UI;
 using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
@@ -9,11 +10,11 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class CalendarDatePicker
+		public static partial class CalendarDatePicker
 		{
-			public static class Resources
+			public static partial class Resources
 			{
-				public static class Background
+				public static partial class Background
 				{
 					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBackground")]
 					public static ThemeResourceKey<Brush> Default => new("CalendarDatePickerBackground");
@@ -30,7 +31,7 @@ public static class Background
 					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBackgroundPressed")]
 					public static ThemeResourceKey<Brush> Pressed => new("CalendarDatePickerBackgroundPressed");
 				}
-				public static class BorderBrush
+				public static partial class BorderBrush
 				{
 					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBorderBrush")]
 					public static ThemeResourceKey<Brush> Default => new("CalendarDatePickerBorderBrush");
@@ -44,7 +45,7 @@ public static class BorderBrush
 					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBorderBrushPressed")]
 					public static ThemeResourceKey<Brush> Pressed => new("CalendarDatePickerBorderBrushPressed");
 				}
-				public static class Header
+				public static partial class Header
 				{
 					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerHeaderForeground")]
 					public static ThemeResourceKey<Brush> Foreground => new("CalendarDatePickerHeaderForeground");
@@ -52,7 +53,7 @@ public static class Header
 					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerHeaderForegroundDisabled")]
 					public static ThemeResourceKey<Brush> ForegroundDisabled => new("CalendarDatePickerHeaderForegroundDisabled");
 				}
-				public static class TextForeground
+				public static partial class TextForeground
 				{
 					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerTextForeground")]
 					public static ThemeResourceKey<Brush> Default => new("CalendarDatePickerTextForeground");
@@ -90,7 +91,7 @@ public static class TextForeground
 				[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerCalendarGlyphForegroundDisabled")]
 				public static ThemeResourceKey<Brush> CalendarGlyphForegroundDisabled => new("CalendarDatePickerCalendarGlyphForegroundDisabled");
 			}
-			public static class Styles
+			public static partial class Styles
 			{
 				[ResourceKeyDefinition(typeof(Style), "MaterialCalendarDatePickerStyle", TargetType = typeof(Style))]
 				public static StaticResourceKey<Style> Default => new("MaterialCalendarDatePickerStyle");
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/CalendarView.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/CalendarView.cs
index 7a2762c15..ca83d96ea 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/CalendarView.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/CalendarView.cs
@@ -1,4 +1,5 @@
 using System;
+using Windows.UI;
 using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
@@ -9,9 +10,9 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class CalendarView
+		public static partial class CalendarView
 		{
-			public static class Resources
+			public static partial class Resources
 			{
 				[ResourceKeyDefinition(typeof(Brush), "MaterialCalendarBlackoutForeground")]
 				public static ThemeResourceKey<Brush> CalendarBlackoutForeground => new("MaterialCalendarBlackoutForeground");
@@ -19,7 +20,7 @@ public static class Resources
 				[ResourceKeyDefinition(typeof(Brush), "MaterialCalendarTodayForeground")]
 				public static StaticResourceKey<Brush> CalendarTodayForeground => new("MaterialCalendarTodayForeground");
 			}
-			public static class Styles
+			public static partial class Styles
 			{
 				[ResourceKeyDefinition(typeof(Style), "MaterialCalendarViewStyle", TargetType = typeof(Style))]
 				public static StaticResourceKey<Style> Default => new("MaterialCalendarViewStyle");
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/CheckBox.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/CheckBox.cs
index 2dd8e5a4a..bbfb7b03f 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/CheckBox.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/CheckBox.cs
@@ -1,4 +1,5 @@
 using System;
+using Windows.UI;
 using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
@@ -9,11 +10,11 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class CheckBox
+		public static partial class CheckBox
 		{
-			public static class Resources
+			public static partial class Resources
 			{
-				public static class CheckBackgroundFillUnchecked
+				public static partial class CheckBackgroundFillUnchecked
 				{
 					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillCheckedDisabled")]
 					public static ThemeResourceKey<Brush> CheckedDisabled => new("CheckBoxCheckBackgroundFillCheckedDisabled");
@@ -51,7 +52,7 @@ public static class CheckBackgroundFillUnchecked
 					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillUncheckedPressed")]
 					public static ThemeResourceKey<Brush> UncheckedPressed => new("CheckBoxCheckBackgroundFillUncheckedPressed");
 				}
-				public static class CheckBackgroundStrokeUnchecked
+				public static partial class CheckBackgroundStrokeUnchecked
 				{
 					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeCheckedDisabled")]
 					public static ThemeResourceKey<Brush> CheckedDisabled => new("CheckBoxCheckBackgroundStrokeCheckedDisabled");
@@ -89,7 +90,7 @@ public static class CheckBackgroundStrokeUnchecked
 					[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeUncheckedPressed")]
 					public static ThemeResourceKey<Brush> UncheckedPressed => new("CheckBoxCheckBackgroundStrokeUncheckedPressed");
 				}
-				public static class GlyphForegroundChecked
+				public static partial class GlyphForegroundChecked
 				{
 					[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundCheckedDisabled")]
 					public static ThemeResourceKey<Brush> CheckedDisabled => new("CheckBoxGlyphForegroundCheckedDisabled");
@@ -115,7 +116,7 @@ public static class GlyphForegroundChecked
 					[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundUncheckedPressed")]
 					public static ThemeResourceKey<Brush> UncheckedPressed => new("CheckBoxGlyphForegroundUncheckedPressed");
 				}
-				public static class GlyphForegroundIndeterminate
+				public static partial class GlyphForegroundIndeterminate
 				{
 					[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundIndeterminate")]
 					public static ThemeResourceKey<Brush> Default => new("CheckBoxGlyphForegroundIndeterminate");
@@ -129,7 +130,7 @@ public static class GlyphForegroundIndeterminate
 					[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundIndeterminatePressed")]
 					public static ThemeResourceKey<Brush> IndeterminatePressed => new("CheckBoxGlyphForegroundIndeterminatePressed");
 				}
-				public static class StateCircleFillChecked
+				public static partial class StateCircleFillChecked
 				{
 					[ResourceKeyDefinition(typeof(Brush), "CheckBoxStateCircleFillChecked")]
 					public static ThemeResourceKey<Brush> Default => new("CheckBoxStateCircleFillChecked");
@@ -137,7 +138,7 @@ public static class StateCircleFillChecked
 					[ResourceKeyDefinition(typeof(Brush), "CheckBoxStateCircleFillUnchecked")]
 					public static ThemeResourceKey<Brush> UncheckedPointerOver => new("CheckBoxStateCircleFillUnchecked");
 				}
-				public static class StateCircleOpacityPointerOver
+				public static partial class StateCircleOpacityPointerOver
 				{
 					[ResourceKeyDefinition(typeof(double), "CheckBoxStateCircleOpacityPointerOver")]
 					public static ThemeResourceKey<double> UncheckedPointerOver => new("CheckBoxStateCircleOpacityPointerOver");
@@ -190,7 +191,7 @@ public static class StateCircleOpacityPointerOver
 				[ResourceKeyDefinition(typeof(string), "CheckBoxHyphenGlyphPathData")]
 				public static ThemeResourceKey<string> HyphenGlyphPathData => new("CheckBoxHyphenGlyphPathData");
 			}
-			public static class Styles
+			public static partial class Styles
 			{
 				[ResourceKeyDefinition(typeof(Style), "MaterialCheckBoxStyle", TargetType = typeof(Style))]
 				public static StaticResourceKey<Style> Default => new("MaterialCheckBoxStyle");
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/ComboBox.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/ComboBox.cs
index ac88ddf01..4e5a3e192 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/ComboBox.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/ComboBox.cs
@@ -1,4 +1,5 @@
 using System;
+using Windows.UI;
 using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
@@ -9,11 +10,11 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class ComboBox
+		public static partial class ComboBox
 		{
-			public static class Resources
+			public static partial class Resources
 			{
-				public static class ArrowForeground
+				public static partial class ArrowForeground
 				{
 					[ResourceKeyDefinition(typeof(Brush), "ComboBoxArrowForeground")]
 					public static ThemeResourceKey<Brush> Default => new("ComboBoxArrowForeground");
@@ -21,7 +22,7 @@ public static class ArrowForeground
 					[ResourceKeyDefinition(typeof(Brush), "ComboBoxArrowForegroundOpened")]
 					public static ThemeResourceKey<Brush> Opened => new("ComboBoxArrowForegroundOpened");
 				}
-				public static class Background
+				public static partial class Background
 				{
 					[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackground")]
 					public static ThemeResourceKey<Brush> Default => new("ComboBoxBackground");
@@ -44,7 +45,7 @@ public static class Background
 					[ResourceKeyDefinition(typeof(Brush), "ComboBoxBackgroundUnfocused")]
 					public static ThemeResourceKey<Brush> Unfocused => new("ComboBoxBackgroundUnfocused");
 				}
-				public static class BorderBrush
+				public static partial class BorderBrush
 				{
 					[ResourceKeyDefinition(typeof(Brush), "ComboBoxBorderBrush")]
 					public static ThemeResourceKey<Brush> Default => new("ComboBoxBorderBrush");
@@ -61,7 +62,7 @@ public static class BorderBrush
 					[ResourceKeyDefinition(typeof(Brush), "ComboBoxBorderBrushPressed")]
 					public static ThemeResourceKey<Brush> Pressed => new("ComboBoxBorderBrushPressed");
 				}
-				public static class BorderThickness
+				public static partial class BorderThickness
 				{
 					[ResourceKeyDefinition(typeof(Thickness), "ComboBoxBorderThickness")]
 					public static ThemeResourceKey<Thickness> Default => new("ComboBoxBorderThickness");
@@ -69,7 +70,7 @@ public static class BorderThickness
 					[ResourceKeyDefinition(typeof(Thickness), "ComboBoxOpenedBorderThickness")]
 					public static ThemeResourceKey<Thickness> Focused => new("ComboBoxOpenedBorderThickness");
 				}
-				public static class DownGlyph
+				public static partial class DownGlyph
 				{
 					[ResourceKeyDefinition(typeof(double), "ComboBoxDownGlyphHeight")]
 					public static ThemeResourceKey<double> Height => new("ComboBoxDownGlyphHeight");
@@ -80,9 +81,9 @@ public static class DownGlyph
 					[ResourceKeyDefinition(typeof(double), "ComboBoxDownGlyphWidth")]
 					public static ThemeResourceKey<double> Width => new("ComboBoxDownGlyphWidth");
 				}
-				public static class DropDown
+				public static partial class DropDown
 				{
-					public static class Background
+					public static partial class Background
 					{
 						[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackground")]
 						public static ThemeResourceKey<Brush> Default => new("ComboBoxDropDownBackground");
@@ -111,7 +112,7 @@ public static class Background
 					[ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownForeground")]
 					public static ThemeResourceKey<Brush> Foreground => new("ComboBoxDropDownForeground");
 				}
-				public static class Foreground
+				public static partial class Foreground
 				{
 					[ResourceKeyDefinition(typeof(Brush), "ComboBoxForeground")]
 					public static ThemeResourceKey<Brush> Default => new("ComboBoxForeground");
@@ -131,9 +132,9 @@ public static class Foreground
 					[ResourceKeyDefinition(typeof(Brush), "ComboBoxForegroundPressed")]
 					public static ThemeResourceKey<Brush> Pressed => new("ComboBoxForegroundPressed");
 				}
-				public static class LeadingIcon
+				public static partial class LeadingIcon
 				{
-					public static class Foreground
+					public static partial class Foreground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "ComboBoxLeadingIconForeground")]
 						public static ThemeResourceKey<Brush> Default => new("ComboBoxLeadingIconForeground");
@@ -147,7 +148,7 @@ public static class Foreground
 					[ResourceKeyDefinition(typeof(double), "ComboBoxLeadingIconWidth")]
 					public static ThemeResourceKey<double> Width => new("ComboBoxLeadingIconWidth");
 				}
-				public static class PlaceHolderForeground
+				public static partial class PlaceHolderForeground
 				{
 					[ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForeground")]
 					public static ThemeResourceKey<Brush> Default => new("ComboBoxPlaceHolderForeground");
@@ -167,7 +168,7 @@ public static class PlaceHolderForeground
 					[ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForegroundPressed")]
 					public static ThemeResourceKey<Brush> Pressed => new("ComboBoxPlaceHolderForegroundPressed");
 				}
-				public static class UpGlyph
+				public static partial class UpGlyph
 				{
 					[ResourceKeyDefinition(typeof(double), "ComboBoxUpGlyphHeight")]
 					public static ThemeResourceKey<double> Height => new("ComboBoxUpGlyphHeight");
@@ -178,7 +179,7 @@ public static class UpGlyph
 					[ResourceKeyDefinition(typeof(double), "ComboBoxUpGlyphWidth")]
 					public static ThemeResourceKey<double> Width => new("ComboBoxUpGlyphWidth");
 				}
-				public static class UpperPlaceHolderForeground
+				public static partial class UpperPlaceHolderForeground
 				{
 					[ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForeground")]
 					public static ThemeResourceKey<Brush> Default => new("ComboBoxUpperPlaceHolderForeground");
@@ -217,7 +218,7 @@ public static class UpperPlaceHolderForeground
 				[ResourceKeyDefinition(typeof(CornerRadius), "ComboBoxCornerRadius")]
 				public static ThemeResourceKey<CornerRadius> CornerRadius => new("ComboBoxCornerRadius");
 			}
-			public static class Styles
+			public static partial class Styles
 			{
 				[ResourceKeyDefinition(typeof(Style), "MaterialComboBoxStyle", TargetType = typeof(Style))]
 				public static StaticResourceKey<Style> Default => new("MaterialComboBoxStyle");
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/CommandBar.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/CommandBar.cs
index ad9a7cfce..47921d91b 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/CommandBar.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/CommandBar.cs
@@ -1,4 +1,5 @@
 using System;
+using Windows.UI;
 using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
@@ -9,23 +10,17 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class CommandBar
+		public static partial class CommandBar
 		{
-			public static class Resources
+			public static partial class Resources
 			{
 				[ResourceKeyDefinition(typeof(double), "MaterialCommandBarElevation")]
 				public static StaticResourceKey<double> CommandBarElevation => new("MaterialCommandBarElevation");
 
 				[ResourceKeyDefinition(typeof(double), "MaterialCommandBarHeight")]
 				public static StaticResourceKey<double> CommandBarHeight => new("MaterialCommandBarHeight");
-
-				[ResourceKeyDefinition(typeof(ControlTemplate), "MaterialXamlCommandBarTemplate")]
-				public static StaticResourceKey<ControlTemplate> XamlCommandBarTemplate => new("MaterialXamlCommandBarTemplate");
-
-				[ResourceKeyDefinition(typeof(ControlTemplate), "NativeM3CommandBarTemplate")]
-				public static StaticResourceKey<ControlTemplate> NativeM3CommandBarTemplate => new("NativeM3CommandBarTemplate");
 			}
-			public static class Styles
+			public static partial class Styles
 			{
 				[ResourceKeyDefinition(typeof(Style), "MaterialCommandBarStyle", TargetType = typeof(Style))]
 				public static StaticResourceKey<Style> Default => new("MaterialCommandBarStyle");
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/ContentDialog.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/ContentDialog.cs
index 21c2de6ff..0dcd124dc 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/ContentDialog.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/ContentDialog.cs
@@ -1,4 +1,5 @@
 using System;
+using Windows.UI;
 using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
@@ -9,9 +10,9 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class ContentDialog
+		public static partial class ContentDialog
 		{
-			public static class Resources
+			public static partial class Resources
 			{
 
 				[ResourceKeyDefinition(typeof(Brush), "MaterialContentDialogBackground")]
@@ -54,7 +55,7 @@ public static class Resources
 				[ResourceKeyDefinition(typeof(double), "MaterialContentDialogMinWidth")]
 				public static StaticResourceKey<double> MinWidth => new("MaterialContentDialogMinWidth");
 			}
-			public static class Styles
+			public static partial class Styles
 			{
 				[ResourceKeyDefinition(typeof(Style), "MaterialContentDialogStyle", TargetType = typeof(Style))]
 				public static StaticResourceKey<Style> Default => new("MaterialContentDialogStyle");
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/DatePicker.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/DatePicker.cs
index e1902e4b4..0a083b2b1 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/DatePicker.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/DatePicker.cs
@@ -1,4 +1,5 @@
 using System;
+using Windows.UI;
 using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
@@ -9,13 +10,13 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class DatePicker
+		public static partial class DatePicker
 		{
-			public static class Resources
+			public static partial class Resources
 			{
-				public static class Button
+				public static partial class Button
 				{
-					public static class Background
+					public static partial class Background
 					{
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBackgroundDisabled")]
 						public static ThemeResourceKey<Brush> Disabled => new("DatePickerButtonBackgroundDisabled");
@@ -26,7 +27,7 @@ public static class Background
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBackgroundPressed")]
 						public static ThemeResourceKey<Brush> Pressed => new("DatePickerButtonBackgroundPressed");
 					}
-					public static class Foreground
+					public static partial class Foreground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonForegroundDisabled")]
 						public static ThemeResourceKey<Brush> Disabled => new("DatePickerButtonForegroundDisabled");
@@ -38,7 +39,7 @@ public static class Foreground
 						public static ThemeResourceKey<Brush> Pressed => new("DatePickerButtonForegroundPressed");
 					}
 				}
-				public static class ButtonBorderBrush
+				public static partial class ButtonBorderBrush
 				{
 					[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBorderBrush")]
 					public static ThemeResourceKey<Brush> Default => new("DatePickerButtonBorderBrush");
@@ -52,7 +53,7 @@ public static class ButtonBorderBrush
 					[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBorderBrushPressed")]
 					public static ThemeResourceKey<Brush> Pressed => new("DatePickerButtonBorderBrushPressed");
 				}
-				public static class ButtonContent
+				public static partial class ButtonContent
 				{
 					[ResourceKeyDefinition(typeof(double), "DatePickerButtonContentHeight")]
 					public static ThemeResourceKey<double> Height => new("DatePickerButtonContentHeight");
@@ -60,7 +61,7 @@ public static class ButtonContent
 					[ResourceKeyDefinition(typeof(Thickness), "DatePickerButtonContentMargin")]
 					public static ThemeResourceKey<Thickness> Margin => new("DatePickerButtonContentMargin");
 				}
-				public static class ButtonDateTextForeground
+				public static partial class ButtonDateTextForeground
 				{
 					[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonDateTextForeground")]
 					public static ThemeResourceKey<Brush> Default => new("DatePickerButtonDateTextForeground");
@@ -99,7 +100,7 @@ public static class ButtonDateTextForeground
 				[ResourceKeyDefinition(typeof(Brush), "DatePickerPlaceholderTextForeground")]
 				public static ThemeResourceKey<Brush> PlaceholderTextForeground => new("DatePickerPlaceholderTextForeground");
 			}
-			public static class Styles
+			public static partial class Styles
 			{
 				[ResourceKeyDefinition(typeof(Style), "MaterialDatePickerStyle", TargetType = typeof(Style))]
 				public static StaticResourceKey<Style> Default => new("MaterialDatePickerStyle");
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/FloatingActionButton.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/FloatingActionButton.cs
index ef5fc9725..243742c87 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/FloatingActionButton.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/FloatingActionButton.cs
@@ -1,4 +1,5 @@
 using System;
+using Windows.UI;
 using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
@@ -9,13 +10,13 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class Button
+		public static partial class Button
 		{
-			public static class Resources
+			public static partial class Resources
 			{
-				public static class Fab
+				public static partial class Fab
 				{
-					public static class Background
+					public static partial class Background
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FabBackground")]
 						public static ThemeResourceKey<Brush> Default => new("FabBackground");
@@ -29,7 +30,7 @@ public static class Background
 						[ResourceKeyDefinition(typeof(Brush), "FabBackgroundPressed")]
 						public static ThemeResourceKey<Brush> Pressed => new("FabBackgroundPressed");
 					}
-					public static class Foreground
+					public static partial class Foreground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FabForeground")]
 						public static ThemeResourceKey<Brush> Default => new("FabForeground");
@@ -43,7 +44,7 @@ public static class Foreground
 						[ResourceKeyDefinition(typeof(Brush), "FabForegroundPressed")]
 						public static ThemeResourceKey<Brush> Pressed => new("FabForegroundPressed");
 					}
-					public static class StateOverlayBackground
+					public static partial class StateOverlayBackground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FabStateOverlayBackgroundDisabled")]
 						public static ThemeResourceKey<Brush> Disabled => new("FabStateOverlayBackgroundDisabled");
@@ -69,7 +70,7 @@ public static class StateOverlayBackground
 					[ResourceKeyDefinition(typeof(double), "MaterialFabIconTextPadding")]
 					public static ThemeResourceKey<double> IconTextPadding => new("MaterialFabIconTextPadding");
 				}
-				public static class LargeFab
+				public static partial class LargeFab
 				{
 					[ResourceKeyDefinition(typeof(double), "MaterialLargeFabContentWidthOrHeight")]
 					public static ThemeResourceKey<double> ContentWidthOrHeight => new("MaterialLargeFabContentWidthOrHeight");
@@ -80,9 +81,9 @@ public static class LargeFab
 					[ResourceKeyDefinition(typeof(Thickness), "MaterialLargeFabPadding")]
 					public static ThemeResourceKey<Thickness> Padding => new("MaterialLargeFabPadding");
 				}
-				public static class SecondaryFab
+				public static partial class SecondaryFab
 				{
-					public static class Background
+					public static partial class Background
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryBackground")]
 						public static ThemeResourceKey<Brush> Default => new("FabSecondaryBackground");
@@ -96,7 +97,7 @@ public static class Background
 						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryBackgroundPressed")]
 						public static ThemeResourceKey<Brush> Pressed => new("FabSecondaryBackgroundPressed");
 					}
-					public static class Foreground
+					public static partial class Foreground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryForeground")]
 						public static ThemeResourceKey<Brush> Default => new("FabSecondaryForeground");
@@ -110,7 +111,7 @@ public static class Foreground
 						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryForegroundPressed")]
 						public static ThemeResourceKey<Brush> Pressed => new("FabSecondaryForegroundPressed");
 					}
-					public static class StateOverlayBackground
+					public static partial class StateOverlayBackground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FabSecondaryStateOverlayBackgroundDisabled")]
 						public static ThemeResourceKey<Brush> Disabled => new("FabSecondaryStateOverlayBackgroundDisabled");
@@ -136,7 +137,7 @@ public static class StateOverlayBackground
 					[ResourceKeyDefinition(typeof(double), "MaterialFabIconTextPadding")]
 					public static ThemeResourceKey<double> FabIconTextPadding => new("MaterialFabIconTextPadding");
 				}
-				public static class SecondaryLargeFab
+				public static partial class SecondaryLargeFab
 				{
 					[ResourceKeyDefinition(typeof(double), "MaterialLargeFabContentWidthOrHeight")]
 					public static ThemeResourceKey<double> LargeFabContentWidthOrHeight => new("MaterialLargeFabContentWidthOrHeight");
@@ -147,7 +148,7 @@ public static class SecondaryLargeFab
 					[ResourceKeyDefinition(typeof(Thickness), "MaterialLargeFabPadding")]
 					public static ThemeResourceKey<Thickness> LargeFabPadding => new("MaterialLargeFabPadding");
 				}
-				public static class SecondarySmallFab
+				public static partial class SecondarySmallFab
 				{
 					[ResourceKeyDefinition(typeof(double), "MaterialSmallFabContentWidthOrHeight")]
 					public static ThemeResourceKey<double> SmallFabContentWidthOrHeight => new("MaterialSmallFabContentWidthOrHeight");
@@ -158,7 +159,7 @@ public static class SecondarySmallFab
 					[ResourceKeyDefinition(typeof(Thickness), "MaterialSmallFabPadding")]
 					public static ThemeResourceKey<Thickness> SmallFabPadding => new("MaterialSmallFabPadding");
 				}
-				public static class SmallFab
+				public static partial class SmallFab
 				{
 					[ResourceKeyDefinition(typeof(double), "MaterialSmallFabContentWidthOrHeight")]
 					public static ThemeResourceKey<double> ContentWidthOrHeight => new("MaterialSmallFabContentWidthOrHeight");
@@ -169,9 +170,9 @@ public static class SmallFab
 					[ResourceKeyDefinition(typeof(Thickness), "MaterialSmallFabPadding")]
 					public static ThemeResourceKey<Thickness> Padding => new("MaterialSmallFabPadding");
 				}
-				public static class SurfaceFab
+				public static partial class SurfaceFab
 				{
-					public static class Background
+					public static partial class Background
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceBackground")]
 						public static ThemeResourceKey<Brush> Default => new("FabSurfaceBackground");
@@ -185,7 +186,7 @@ public static class Background
 						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceBackgroundPressed")]
 						public static ThemeResourceKey<Brush> Pressed => new("FabSurfaceBackgroundPressed");
 					}
-					public static class Foreground
+					public static partial class Foreground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceForeground")]
 						public static ThemeResourceKey<Brush> Default => new("FabSurfaceForeground");
@@ -199,7 +200,7 @@ public static class Foreground
 						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceForegroundPressed")]
 						public static ThemeResourceKey<Brush> Pressed => new("FabSurfaceForegroundPressed");
 					}
-					public static class StateOverlayBackground
+					public static partial class StateOverlayBackground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FabSurfaceStateOverlayBackgroundDisabled")]
 						public static ThemeResourceKey<Brush> Disabled => new("FabSurfaceStateOverlayBackgroundDisabled");
@@ -225,7 +226,7 @@ public static class StateOverlayBackground
 					[ResourceKeyDefinition(typeof(double), "MaterialFabIconTextPadding")]
 					public static ThemeResourceKey<double> FabIconTextPadding => new("MaterialFabIconTextPadding");
 				}
-				public static class SurfaceLargeFab
+				public static partial class SurfaceLargeFab
 				{
 					[ResourceKeyDefinition(typeof(double), "MaterialLargeFabContentWidthOrHeight")]
 					public static ThemeResourceKey<double> LargeFabContentWidthOrHeight => new("MaterialLargeFabContentWidthOrHeight");
@@ -236,7 +237,7 @@ public static class SurfaceLargeFab
 					[ResourceKeyDefinition(typeof(Thickness), "MaterialLargeFabPadding")]
 					public static ThemeResourceKey<Thickness> LargeFabPadding => new("MaterialLargeFabPadding");
 				}
-				public static class SurfaceSmallFab
+				public static partial class SurfaceSmallFab
 				{
 					[ResourceKeyDefinition(typeof(double), "MaterialSmallFabContentWidthOrHeight")]
 					public static ThemeResourceKey<double> SmallFabContentWidthOrHeight => new("MaterialSmallFabContentWidthOrHeight");
@@ -247,9 +248,9 @@ public static class SurfaceSmallFab
 					[ResourceKeyDefinition(typeof(Thickness), "MaterialSmallFabPadding")]
 					public static ThemeResourceKey<Thickness> SmallFabPadding => new("MaterialSmallFabPadding");
 				}
-				public static class TertiaryFab
+				public static partial class TertiaryFab
 				{
-					public static class Background
+					public static partial class Background
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryBackground")]
 						public static ThemeResourceKey<Brush> Default => new("FabTertiaryBackground");
@@ -263,7 +264,7 @@ public static class Background
 						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryBackgroundPressed")]
 						public static ThemeResourceKey<Brush> Pressed => new("FabTertiaryBackgroundPressed");
 					}
-					public static class Foreground
+					public static partial class Foreground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryForeground")]
 						public static ThemeResourceKey<Brush> Default => new("FabTertiaryForeground");
@@ -277,7 +278,7 @@ public static class Foreground
 						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryForegroundPressed")]
 						public static ThemeResourceKey<Brush> Pressed => new("FabTertiaryForegroundPressed");
 					}
-					public static class StateOverlayBackground
+					public static partial class StateOverlayBackground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FabTertiaryStateOverlayBackgroundDisabled")]
 						public static ThemeResourceKey<Brush> Disabled => new("FabTertiaryStateOverlayBackgroundDisabled");
@@ -303,7 +304,7 @@ public static class StateOverlayBackground
 					[ResourceKeyDefinition(typeof(double), "MaterialFabIconTextPadding")]
 					public static ThemeResourceKey<double> FabIconTextPadding => new("MaterialFabIconTextPadding");
 				}
-				public static class TertiaryLargeFab
+				public static partial class TertiaryLargeFab
 				{
 					[ResourceKeyDefinition(typeof(double), "MaterialLargeFabContentWidthOrHeight")]
 					public static ThemeResourceKey<double> LargeFabContentWidthOrHeight => new("MaterialLargeFabContentWidthOrHeight");
@@ -314,7 +315,7 @@ public static class TertiaryLargeFab
 					[ResourceKeyDefinition(typeof(Thickness), "MaterialLargeFabPadding")]
 					public static ThemeResourceKey<Thickness> LargeFabPadding => new("MaterialLargeFabPadding");
 				}
-				public static class TertiarySmallFab
+				public static partial class TertiarySmallFab
 				{
 					[ResourceKeyDefinition(typeof(double), "MaterialSmallFabContentWidthOrHeight")]
 					public static ThemeResourceKey<double> SmallFabContentWidthOrHeight => new("MaterialSmallFabContentWidthOrHeight");
@@ -326,7 +327,7 @@ public static class TertiarySmallFab
 					public static ThemeResourceKey<Thickness> SmallFabPadding => new("MaterialSmallFabPadding");
 				}
 			}
-			public static class Styles
+			public static partial class Styles
 			{
 				[ResourceKeyDefinition(typeof(Style), "MaterialFabStyle", TargetType = typeof(Style))]
 				public static StaticResourceKey<Style> Fab => new("MaterialFabStyle");
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/HyperlinkButton.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/HyperlinkButton.cs
index 97e423692..ea3800ba0 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/HyperlinkButton.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/HyperlinkButton.cs
@@ -1,4 +1,5 @@
 using System;
+using Windows.UI;
 using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
@@ -9,11 +10,11 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class HyperlinkButton
+		public static partial class HyperlinkButton
 		{
-			public static class Resources
+			public static partial class Resources
 			{
-				public static class Background
+				public static partial class Background
 				{
 					[ResourceKeyDefinition(typeof(Brush), "HyperlinkButtonBackgroundDisabled")]
 					public static ThemeResourceKey<Brush> Disabled => new("HyperlinkButtonBackgroundDisabled");
@@ -27,7 +28,7 @@ public static class Background
 					[ResourceKeyDefinition(typeof(Brush), "HyperlinkButtonBackgroundPressed")]
 					public static ThemeResourceKey<Brush> Pressed => new("HyperlinkButtonBackgroundPressed");
 				}
-				public static class BackgroundOpacity
+				public static partial class BackgroundOpacity
 				{
 					[ResourceKeyDefinition(typeof(double), "HyperlinkButtonBackgroundOpacityDisabled")]
 					public static ThemeResourceKey<double> Disabled => new("HyperlinkButtonBackgroundOpacityDisabled");
@@ -41,7 +42,7 @@ public static class BackgroundOpacity
 					[ResourceKeyDefinition(typeof(double), "HyperlinkButtonBackgroundOpacityPressed")]
 					public static ThemeResourceKey<double> Pressed => new("HyperlinkButtonBackgroundOpacityPressed");
 				}
-				public static class BorderBrush
+				public static partial class BorderBrush
 				{
 					[ResourceKeyDefinition(typeof(Brush), "HyperlinkButtonBorderBrushDisabled")]
 					public static ThemeResourceKey<Brush> Disabled => new("HyperlinkButtonBorderBrushDisabled");
@@ -67,7 +68,7 @@ public static class BorderBrush
 				[ResourceKeyDefinition(typeof(Thickness), "HyperlinkButtonPadding")]
 				public static ThemeResourceKey<Thickness> Padding => new("HyperlinkButtonPadding");
 			}
-			public static class Styles
+			public static partial class Styles
 			{
 				[ResourceKeyDefinition(typeof(Style), "MaterialHyperlinkButtonStyle", TargetType = typeof(Style))]
 				public static StaticResourceKey<Style> Default => new("MaterialHyperlinkButtonStyle");
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/MediaPlayerElement.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/MediaPlayerElement.cs
index 6bd308b51..bfe09bacd 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/MediaPlayerElement.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/MediaPlayerElement.cs
@@ -1,4 +1,5 @@
 using System;
+using Windows.UI;
 using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
@@ -9,9 +10,9 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class MediaTransportControls
+		public static partial class MediaTransportControls
 		{
-			public static class Resources
+			public static partial class Resources
 			{
 				[ResourceKeyDefinition(typeof(Thickness), "MediaTransportControlsMargin")]
 				public static ThemeResourceKey<Thickness> Margin => new("MediaTransportControlsMargin");
@@ -40,7 +41,7 @@ public static class Resources
 				[ResourceKeyDefinition(typeof(double), "MediaTransportControlsBorderThickness")]
 				public static ThemeResourceKey<double> BorderThickness => new("MediaTransportControlsBorderThickness");
 			}
-			public static class Styles
+			public static partial class Styles
 			{
 				[ResourceKeyDefinition(typeof(Style), "MaterialMediaTransportControlsStyle", TargetType = typeof(Style))]
 				public static StaticResourceKey<Style> Default => new("MaterialMediaTransportControlsStyle");
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/PasswordBox.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/PasswordBox.cs
index 32c9354e8..8c07368f0 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/PasswordBox.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/PasswordBox.cs
@@ -1,4 +1,5 @@
 using System;
+using Windows.UI;
 using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
@@ -9,13 +10,13 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class PasswordBox
+		public static partial class PasswordBox
 		{
-			public static class Resources
+			public static partial class Resources
 			{
-				public static class Filled
+				public static partial class Filled
 				{
-					public static class Background
+					public static partial class Background
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxBackground")]
 						public static ThemeResourceKey<Brush> Default => new("FilledPasswordBoxBackground");
@@ -29,7 +30,7 @@ public static class Background
 						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxBackgroundPointerOver")]
 						public static ThemeResourceKey<Brush> PointerOver => new("FilledPasswordBoxBackgroundPointerOver");
 					}
-					public static class BorderBrush
+					public static partial class BorderBrush
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxBorderBrushFocused")]
 						public static ThemeResourceKey<Brush> Default => new("FilledPasswordBoxBorderBrushFocused");
@@ -40,7 +41,7 @@ public static class BorderBrush
 						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxBorderBrushPointerOver")]
 						public static ThemeResourceKey<Brush> PointerOver => new("FilledPasswordBoxBorderBrushPointerOver");
 					}
-					public static class BorderHeight
+					public static partial class BorderHeight
 					{
 						[ResourceKeyDefinition(typeof(double), "FilledPasswordBoxBorderHeightFocused")]
 						public static ThemeResourceKey<double> Focused => new("FilledPasswordBoxBorderHeightFocused");
@@ -48,7 +49,7 @@ public static class BorderHeight
 						[ResourceKeyDefinition(typeof(double), "FilledPasswordBoxBorderHeightPointerOver")]
 						public static ThemeResourceKey<double> PointerOver => new("FilledPasswordBoxBorderHeightPointerOver");
 					}
-					public static class Foreground
+					public static partial class Foreground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxForeground")]
 						public static ThemeResourceKey<Brush> Default => new("FilledPasswordBoxForeground");
@@ -62,7 +63,7 @@ public static class Foreground
 						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxForegroundPointerOver")]
 						public static ThemeResourceKey<Brush> PointerOver => new("FilledPasswordBoxForegroundPointerOver");
 					}
-					public static class LeadingIconForeground
+					public static partial class LeadingIconForeground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "PasswordBoxLeadingIconForeground")]
 						public static ThemeResourceKey<Brush> Default => new("PasswordBoxLeadingIconForeground");
@@ -70,7 +71,7 @@ public static class LeadingIconForeground
 						[ResourceKeyDefinition(typeof(Brush), "PasswordBoxLeadingIconForegroundDisabled")]
 						public static ThemeResourceKey<Brush> Disabled => new("PasswordBoxLeadingIconForegroundDisabled");
 					}
-					public static class PlaceholderForeground
+					public static partial class PlaceholderForeground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxPlaceholderForeground")]
 						public static ThemeResourceKey<Brush> Default => new("FilledPasswordBoxPlaceholderForeground");
@@ -111,9 +112,9 @@ public static class PlaceholderForeground
 					[ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxRevealButtonForeground")]
 					public static ThemeResourceKey<Brush> RevealButtonForeground => new("FilledPasswordBoxRevealButtonForeground");
 				}
-				public static class Outlined
+				public static partial class Outlined
 				{
-					public static class Background
+					public static partial class Background
 					{
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxBackground")]
 						public static ThemeResourceKey<Brush> Default => new("OutlinedPasswordBoxBackground");
@@ -127,7 +128,7 @@ public static class Background
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxBackgroundPointerOver")]
 						public static ThemeResourceKey<Brush> PointerOver => new("OutlinedPasswordBoxBackgroundPointerOver");
 					}
-					public static class BorderBrush
+					public static partial class BorderBrush
 					{
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxBorderBrush")]
 						public static ThemeResourceKey<Brush> Default => new("OutlinedPasswordBoxBorderBrush");
@@ -141,7 +142,7 @@ public static class BorderBrush
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxBorderBrushPointerOver")]
 						public static ThemeResourceKey<Brush> PointerOver => new("OutlinedPasswordBoxBorderBrushPointerOver");
 					}
-					public static class BorderPadding
+					public static partial class BorderPadding
 					{
 						[ResourceKeyDefinition(typeof(Thickness), "OutlinedPasswordBoxBorderPadding")]
 						public static ThemeResourceKey<Thickness> Default => new("OutlinedPasswordBoxBorderPadding");
@@ -152,7 +153,7 @@ public static class BorderPadding
 						[ResourceKeyDefinition(typeof(Thickness), "OutlinedPasswordBoxBorderPaddingPointerOver")]
 						public static ThemeResourceKey<Thickness> PointerOver => new("OutlinedPasswordBoxBorderPaddingPointerOver");
 					}
-					public static class BorderThickness
+					public static partial class BorderThickness
 					{
 						[ResourceKeyDefinition(typeof(Thickness), "OutlinedPasswordBoxBorderThickness")]
 						public static ThemeResourceKey<Thickness> Default => new("OutlinedPasswordBoxBorderThickness");
@@ -163,7 +164,7 @@ public static class BorderThickness
 						[ResourceKeyDefinition(typeof(Thickness), "OutlinedPasswordBoxBorderThicknessPointerOver")]
 						public static ThemeResourceKey<Thickness> PointerOver => new("OutlinedPasswordBoxBorderThicknessPointerOver");
 					}
-					public static class Foreground
+					public static partial class Foreground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxForeground")]
 						public static ThemeResourceKey<Brush> Default => new("OutlinedPasswordBoxForeground");
@@ -177,7 +178,7 @@ public static class Foreground
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxForegroundPointerOver")]
 						public static ThemeResourceKey<Brush> PointerOver => new("OutlinedPasswordBoxForegroundPointerOver");
 					}
-					public static class LeadingIconForeground
+					public static partial class LeadingIconForeground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "PasswordBoxLeadingIconForeground")]
 						public static ThemeResourceKey<Brush> Default => new("PasswordBoxLeadingIconForeground");
@@ -185,7 +186,7 @@ public static class LeadingIconForeground
 						[ResourceKeyDefinition(typeof(Brush), "PasswordBoxLeadingIconForegroundDisabled")]
 						public static ThemeResourceKey<Brush> Disabled => new("PasswordBoxLeadingIconForegroundDisabled");
 					}
-					public static class PlaceholderForeground
+					public static partial class PlaceholderForeground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedPasswordBoxPlaceholderForeground")]
 						public static ThemeResourceKey<Brush> Default => new("OutlinedPasswordBoxPlaceholderForeground");
@@ -224,7 +225,7 @@ public static class PlaceholderForeground
 					public static ThemeResourceKey<double> ForegroundOpacityDisabled => new("OutlinedPasswordBoxForegroundOpacityDisabled");
 				}
 			}
-			public static class Styles
+			public static partial class Styles
 			{
 				[ResourceKeyDefinition(typeof(Style), "MaterialFilledPasswordBoxStyle", TargetType = typeof(Style))]
 				public static StaticResourceKey<Style> Filled => new("MaterialFilledPasswordBoxStyle");
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressBar.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressBar.cs
index 9b254f10c..6f9cb0c2a 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressBar.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressBar.cs
@@ -1,4 +1,5 @@
 using System;
+using Windows.UI;
 using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
@@ -9,9 +10,9 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class ProgressBar
+		public static partial class ProgressBar
 		{
-			public static class Resources
+			public static partial class Resources
 			{
 				[ResourceKeyDefinition(typeof(Brush), "ProgressBarBackground")]
 				public static ThemeResourceKey<Brush> ProgressBarBackground => new("ProgressBarBackground");
@@ -25,7 +26,7 @@ public static class Resources
 				[ResourceKeyDefinition(typeof(double), "ProgressBarMinWidth")]
 				public static ThemeResourceKey<double> ProgressBarMinWidth => new("ProgressBarMinWidth");
 			}
-			public static class Styles
+			public static partial class Styles
 			{
 				[ResourceKeyDefinition(typeof(Style), "MaterialProgressBarStyle", TargetType = typeof(Style))]
 				public static StaticResourceKey<Style> Default => new("MaterialProgressBarStyle");
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressRing.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressRing.cs
index cf52ffb4d..8cba1dbb1 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressRing.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressRing.cs
@@ -1,4 +1,5 @@
 using System;
+using Windows.UI;
 using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
@@ -9,23 +10,17 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class ProgressRing
+		public static partial class ProgressRing
 		{
-			public static class Resources
+			public static partial class Resources
 			{
-				[ResourceKeyDefinition(typeof(LottieVisualSource), "MaterialDeterminateAnimation_Uno")]
-				public static StaticResourceKey<LottieVisualSource> DeterminateAnimation_Uno => new("MaterialDeterminateAnimation_Uno");
-
-				[ResourceKeyDefinition(typeof(LottieVisualSource), "MaterialIndeterminateAnimation_Uno")]
-				public static StaticResourceKey<LottieVisualSource> IndeterminateAnimation_Uno => new("MaterialIndeterminateAnimation_Uno");
-
 				[ResourceKeyDefinition(typeof(Brush), "ProgressRingBackground")]
 				public static ThemeResourceKey<Brush> ProgressRingBackground => new("ProgressRingBackground");
 
 				[ResourceKeyDefinition(typeof(Brush), "ProgressRingForeground")]
 				public static ThemeResourceKey<Brush> ProgressRingForeground => new("ProgressRingForeground");
 			}
-			public static class Styles
+			public static partial class Styles
 			{
 				[ResourceKeyDefinition(typeof(Style), "MaterialProgressRingStyle", TargetType = typeof(Style))]
 				public static StaticResourceKey<Style> Default => new("MaterialProgressRingStyle");
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/RadioButton.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/RadioButton.cs
index 2de818c10..791bb7db9 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/RadioButton.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/RadioButton.cs
@@ -1,4 +1,5 @@
 using System;
+using Windows.UI;
 using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
@@ -9,11 +10,11 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class RadioButton
+		public static partial class RadioButton
 		{
-			public static class Resources
+			public static partial class Resources
 			{
-				public static class Foreground
+				public static partial class Foreground
 				{
 					[ResourceKeyDefinition(typeof(Brush), "RadioButtonForeground")]
 					public static ThemeResourceKey<Brush> Default => new("RadioButtonForeground");
@@ -27,9 +28,9 @@ public static class Foreground
 					[ResourceKeyDefinition(typeof(Brush), "RadioButtonForegroundPressed")]
 					public static ThemeResourceKey<Brush> Pressed => new("RadioButtonForegroundPressed");
 				}
-				public static class OuterEllipse
+				public static partial class OuterEllipse
 				{
-					public static class Fill
+					public static partial class Fill
 					{
 						[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseFillDisabled")]
 						public static ThemeResourceKey<Brush> Disabled => new("RadioButtonOuterEllipseFillDisabled");
@@ -43,7 +44,7 @@ public static class Fill
 						[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseFillPressed")]
 						public static ThemeResourceKey<Brush> Pressed => new("RadioButtonOuterEllipseFillPressed");
 					}
-					public static class Stroke
+					public static partial class Stroke
 					{
 						[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseStrokeDisabled")]
 						public static ThemeResourceKey<Brush> Disabled => new("RadioButtonOuterEllipseStrokeDisabled");
@@ -58,7 +59,7 @@ public static class Stroke
 						public static ThemeResourceKey<Brush> Pressed => new("RadioButtonOuterEllipseStrokePressed");
 					}
 				}
-				public static class OuterEllipseCheckedFill
+				public static partial class OuterEllipseCheckedFill
 				{
 					[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseCheckedFillDisabled")]
 					public static ThemeResourceKey<Brush> Disabled => new("RadioButtonOuterEllipseCheckedFillDisabled");
@@ -72,9 +73,9 @@ public static class OuterEllipseCheckedFill
 					[ResourceKeyDefinition(typeof(Brush), "RadioButtonOuterEllipseCheckedFillPressed")]
 					public static ThemeResourceKey<Brush> Pressed => new("RadioButtonOuterEllipseCheckedFillPressed");
 				}
-				public static class StateCircle
+				public static partial class StateCircle
 				{
-					public static class Opacity
+					public static partial class Opacity
 					{
 						[ResourceKeyDefinition(typeof(double), "RadioButtonStateCircleOpacityPointerOver")]
 						public static ThemeResourceKey<double> PointerOver => new("RadioButtonStateCircleOpacityPointerOver");
@@ -130,7 +131,7 @@ public static class Opacity
 				[ResourceKeyDefinition(typeof(double), "RadioButtonStrokeThickness")]
 				public static ThemeResourceKey<double> StrokeThickness => new("RadioButtonStrokeThickness");
 			}
-			public static class Styles
+			public static partial class Styles
 			{
 				[ResourceKeyDefinition(typeof(Style), "MaterialRadioButtonStyle", TargetType = typeof(Style))]
 				public static StaticResourceKey<Style> Default => new("MaterialRadioButtonStyle");
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/RatingControl.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/RatingControl.cs
index 989f5573a..86d927a45 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/RatingControl.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/RatingControl.cs
@@ -1,4 +1,5 @@
 using System;
+using Windows.UI;
 using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
@@ -9,11 +10,11 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class RatingControl
+		public static partial class RatingControl
 		{
-			public static class Resources
+			public static partial class Resources
 			{
-				public static class RatingControlCaption
+				public static partial class RatingControlCaption
 				{
 					[ResourceKeyDefinition(typeof(FontFamily), "RatingControlCaptionFontFamily")]
 					public static ThemeResourceKey<FontFamily> FontFamily => new("RatingControlCaptionFontFamily");
@@ -24,7 +25,7 @@ public static class RatingControlCaption
 					[ResourceKeyDefinition(typeof(double), "RatingControlCaptionHeight")]
 					public static ThemeResourceKey<double> Height => new("RatingControlCaptionHeight");
 				}
-				public static class RatingControlForegroundSelected
+				public static partial class RatingControlForegroundSelected
 				{
 					[ResourceKeyDefinition(typeof(Brush), "RatingControlForegroundSelectedDisabled")]
 					public static ThemeResourceKey<Brush> Disabled => new("RatingControlForegroundSelectedDisabled");
@@ -41,9 +42,9 @@ public static class RatingControlForegroundSelected
 					[ResourceKeyDefinition(typeof(Brush), "RatingControlForegroundSelected")]
 					public static ThemeResourceKey<Brush> Set => new("RatingControlForegroundSelected");
 				}
-				public static class Secondary
+				public static partial class Secondary
 				{
-					public static class Caption
+					public static partial class Caption
 					{
 						[ResourceKeyDefinition(typeof(FontFamily), "SecondaryRatingControlCaptionFontFamily")]
 						public static ThemeResourceKey<FontFamily> FontFamily => new("SecondaryRatingControlCaptionFontFamily");
@@ -54,7 +55,7 @@ public static class Caption
 						[ResourceKeyDefinition(typeof(double), "SecondaryRatingControlCaptionHeight")]
 						public static ThemeResourceKey<double> Height => new("SecondaryRatingControlCaptionHeight");
 					}
-					public static class ForegroundSelected
+					public static partial class ForegroundSelected
 					{
 						[ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlForegroundSelectedDisabled")]
 						public static ThemeResourceKey<Brush> Disabled => new("SecondaryRatingControlForegroundSelectedDisabled");
@@ -83,7 +84,7 @@ public static class ForegroundSelected
 				[ResourceKeyDefinition(typeof(double), "RatingControlHeight")]
 				public static ThemeResourceKey<double> RatingControlHeight => new("RatingControlHeight");
 			}
-			public static class Styles
+			public static partial class Styles
 			{
 				[ResourceKeyDefinition(typeof(Style), "MaterialRatingControlStyle", TargetType = typeof(Style))]
 				public static StaticResourceKey<Style> Default => new("MaterialRatingControlStyle");
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/Slider.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/Slider.cs
index a4d7bd25b..e7f56684c 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/Slider.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/Slider.cs
@@ -1,4 +1,5 @@
 using System;
+using Windows.UI;
 using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
@@ -9,11 +10,11 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class Slider
+		public static partial class Slider
 		{
-			public static class Resources
+			public static partial class Resources
 			{
-				public static class BottomTickBar
+				public static partial class BottomTickBar
 				{
 					[ResourceKeyDefinition(typeof(double), "SliderBottomTickBarHeight")]
 					public static ThemeResourceKey<double> Height => new("SliderBottomTickBarHeight");
@@ -21,7 +22,7 @@ public static class BottomTickBar
 					[ResourceKeyDefinition(typeof(Thickness), "SliderBottomTickBarMargin")]
 					public static ThemeResourceKey<Thickness> Margin => new("SliderBottomTickBarMargin");
 				}
-				public static class LeftTickBar
+				public static partial class LeftTickBar
 				{
 					[ResourceKeyDefinition(typeof(Thickness), "SliderLeftTickBarMargin")]
 					public static ThemeResourceKey<Thickness> Margin => new("SliderLeftTickBarMargin");
@@ -29,7 +30,7 @@ public static class LeftTickBar
 					[ResourceKeyDefinition(typeof(double), "SliderLeftTickBarWidth")]
 					public static ThemeResourceKey<double> Width => new("SliderLeftTickBarWidth");
 				}
-				public static class RightTickBar
+				public static partial class RightTickBar
 				{
 					[ResourceKeyDefinition(typeof(Thickness), "SliderRightTickBarMargin")]
 					public static ThemeResourceKey<Thickness> Margin => new("SliderRightTickBarMargin");
@@ -37,7 +38,7 @@ public static class RightTickBar
 					[ResourceKeyDefinition(typeof(double), "SliderRightTickBarWidth")]
 					public static ThemeResourceKey<double> Width => new("SliderRightTickBarWidth");
 				}
-				public static class Thumb
+				public static partial class Thumb
 				{
 					[ResourceKeyDefinition(typeof(Brush), "SliderThumbBackgroundDisabled")]
 					public static ThemeResourceKey<Brush> BackgroundDisabled => new("SliderThumbBackgroundDisabled");
@@ -48,7 +49,7 @@ public static class Thumb
 					[ResourceKeyDefinition(typeof(double), "SliderThumbWidth")]
 					public static ThemeResourceKey<double> Width => new("SliderThumbWidth");
 				}
-				public static class TickBarFill
+				public static partial class TickBarFill
 				{
 					[ResourceKeyDefinition(typeof(Brush), "SliderTickBarFill")]
 					public static ThemeResourceKey<Brush> Default => new("SliderTickBarFill");
@@ -56,7 +57,7 @@ public static class TickBarFill
 					[ResourceKeyDefinition(typeof(Brush), "SliderTickBarFillDisabled")]
 					public static ThemeResourceKey<Brush> Disabled => new("SliderTickBarFillDisabled");
 				}
-				public static class TopTickBar
+				public static partial class TopTickBar
 				{
 					[ResourceKeyDefinition(typeof(double), "SliderTopTickBarHeight")]
 					public static ThemeResourceKey<double> Height => new("SliderTopTickBarHeight");
@@ -64,7 +65,7 @@ public static class TopTickBar
 					[ResourceKeyDefinition(typeof(Thickness), "SliderTopTickBarMargin")]
 					public static ThemeResourceKey<Thickness> Margin => new("SliderTopTickBarMargin");
 				}
-				public static class Track
+				public static partial class Track
 				{
 					[ResourceKeyDefinition(typeof(Brush), "SliderTrackFillDisabled")]
 					public static ThemeResourceKey<Brush> FillDisabled => new("SliderTrackFillDisabled");
@@ -117,7 +118,7 @@ public static class Track
 				[ResourceKeyDefinition(typeof(double), "SliderVerticallInlineTickBarWidth")]
 				public static ThemeResourceKey<double> VerticallInlineTickBarWidth => new("SliderVerticallInlineTickBarWidth");
 			}
-			public static class Styles
+			public static partial class Styles
 			{
 				[ResourceKeyDefinition(typeof(Style), "MaterialSliderStyle", TargetType = typeof(Style))]
 				public static StaticResourceKey<Style> Default => new("MaterialSliderStyle");
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/TextBlock.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/TextBlock.cs
index c88858447..c8aa7e2dc 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/TextBlock.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/TextBlock.cs
@@ -1,4 +1,5 @@
 using System;
+using Windows.UI;
 using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
@@ -9,12 +10,12 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class TextBlock
+		public static partial class TextBlock
 		{
-			public static class Resources
+			public static partial class Resources
 			{
 			}
-			public static class Styles
+			public static partial class Styles
 			{
 				[ResourceKeyDefinition(typeof(Style), "MaterialDisplayLarge", TargetType = typeof(Style))]
 				public static StaticResourceKey<Style> DisplayLarge => new("MaterialDisplayLarge");
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/TextBox.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/TextBox.cs
index e8e913f11..d7a61d4bb 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/TextBox.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/TextBox.cs
@@ -1,4 +1,5 @@
 using System;
+using Windows.UI;
 using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
@@ -9,13 +10,13 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class TextBox
+		public static partial class TextBox
 		{
-			public static class Resources
+			public static partial class Resources
 			{
-				public static class Filled
+				public static partial class Filled
 				{
-					public static class Background
+					public static partial class Background
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBackground")]
 						public static ThemeResourceKey<Brush> Default => new("FilledTextBoxBackground");
@@ -29,7 +30,7 @@ public static class Background
 						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBackgroundPointerOver")]
 						public static ThemeResourceKey<Brush> PointerOver => new("FilledTextBoxBackgroundPointerOver");
 					}
-					public static class BorderBrush
+					public static partial class BorderBrush
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBorderBrushFocused")]
 						public static ThemeResourceKey<Brush> Default => new("FilledTextBoxBorderBrushFocused");
@@ -40,15 +41,15 @@ public static class BorderBrush
 						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxBorderBrushPointerOver")]
 						public static ThemeResourceKey<Brush> PointerOver => new("FilledTextBoxBorderBrushPointerOver");
 					}
-					public static class BorderThicknessNormal
+					public static partial class BorderThicknessNormal
 					{
-						[ResourceKeyDefinition(typeof(StaticResourceRef), "FilledTextBoxBorderThicknessNormal")]
-						public static ThemeResourceKey<StaticResourceRef> Default => new("FilledTextBoxBorderThicknessNormal");
+						[ResourceKeyDefinition(typeof(double), "FilledTextBoxBorderThicknessNormal")]
+						public static ThemeResourceKey<double> Default => new("FilledTextBoxBorderThicknessNormal");
 
 						[ResourceKeyDefinition(typeof(double), "MaterialFilledTextBoxBorderHeightFocused")]
 						public static ThemeResourceKey<double> Focused => new("MaterialFilledTextBoxBorderHeightFocused");
 					}
-					public static class DeleteButtonForeground
+					public static partial class DeleteButtonForeground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxDeleteButtonForeground")]
 						public static ThemeResourceKey<Brush> Default => new("FilledTextBoxDeleteButtonForeground");
@@ -62,7 +63,7 @@ public static class DeleteButtonForeground
 						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxDeleteButtonForegroundPointerOver")]
 						public static ThemeResourceKey<Brush> PointerOver => new("FilledTextBoxDeleteButtonForegroundPointerOver");
 					}
-					public static class Foreground
+					public static partial class Foreground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxForeground")]
 						public static ThemeResourceKey<Brush> Default => new("FilledTextBoxForeground");
@@ -76,7 +77,7 @@ public static class Foreground
 						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxForegroundPointerOver")]
 						public static ThemeResourceKey<Brush> PointerOver => new("FilledTextBoxForegroundPointerOver");
 					}
-					public static class LeadingIconForeground
+					public static partial class LeadingIconForeground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "TextBoxLeadingIconForeground")]
 						public static ThemeResourceKey<Brush> Default => new("TextBoxLeadingIconForeground");
@@ -84,7 +85,7 @@ public static class LeadingIconForeground
 						[ResourceKeyDefinition(typeof(Brush), "TextBoxLeadingIconForegroundDisabled")]
 						public static ThemeResourceKey<Brush> Disabled => new("TextBoxLeadingIconForegroundDisabled");
 					}
-					public static class PlaceholderForeground
+					public static partial class PlaceholderForeground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "FilledTextBoxPlaceholderForeground")]
 						public static ThemeResourceKey<Brush> Default => new("FilledTextBoxPlaceholderForeground");
@@ -119,15 +120,15 @@ public static class PlaceholderForeground
 					[ResourceKeyDefinition(typeof(double), "MaterialFilledTextBoxMinHeight")]
 					public static ThemeResourceKey<double> MinHeight => new("MaterialFilledTextBoxMinHeight");
 
-					[ResourceKeyDefinition(typeof(StaticResourceRef), "FilledTextBoxBorderThicknessFocused")]
-					public static ThemeResourceKey<StaticResourceRef> BorderThicknessFocused => new("FilledTextBoxBorderThicknessFocused");
+					[ResourceKeyDefinition(typeof(double), "FilledTextBoxBorderThicknessFocused")]
+					public static ThemeResourceKey<double> BorderThicknessFocused => new("FilledTextBoxBorderThicknessFocused");
 
 					[ResourceKeyDefinition(typeof(double), "FilledTextBoxForegroundOpacityDisabled")]
 					public static ThemeResourceKey<double> ForegroundOpacityDisabled => new("FilledTextBoxForegroundOpacityDisabled");
 				}
-				public static class Outlined
+				public static partial class Outlined
 				{
-					public static class BorderBrush
+					public static partial class BorderBrush
 					{
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxBorderBrush")]
 						public static ThemeResourceKey<Brush> Default => new("OutlinedTextBoxBorderBrush");
@@ -141,7 +142,7 @@ public static class BorderBrush
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxBorderBrushPointerOver")]
 						public static ThemeResourceKey<Brush> PointerOver => new("OutlinedTextBoxBorderBrushPointerOver");
 					}
-					public static class Foreground
+					public static partial class Foreground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxForeground")]
 						public static ThemeResourceKey<Brush> Default => new("OutlinedTextBoxForeground");
@@ -155,7 +156,7 @@ public static class Foreground
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxForegroundPointerOver")]
 						public static ThemeResourceKey<Brush> PointerOver => new("OutlinedTextBoxForegroundPointerOver");
 					}
-					public static class LeadingIconForeground
+					public static partial class LeadingIconForeground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "TextBoxLeadingIconForeground")]
 						public static ThemeResourceKey<Brush> Default => new("TextBoxLeadingIconForeground");
@@ -163,7 +164,7 @@ public static class LeadingIconForeground
 						[ResourceKeyDefinition(typeof(Brush), "TextBoxLeadingIconForegroundDisabled")]
 						public static ThemeResourceKey<Brush> Disabled => new("TextBoxLeadingIconForegroundDisabled");
 					}
-					public static class PlaceholderForeground
+					public static partial class PlaceholderForeground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxPlaceholderForeground")]
 						public static ThemeResourceKey<Brush> Default => new("OutlinedTextBoxPlaceholderForeground");
@@ -211,7 +212,7 @@ public static class PlaceholderForeground
 					public static ThemeResourceKey<double> ForegroundOpacityDisabled => new("OutlinedTextBoxForegroundOpacityDisabled");
 				}
 			}
-			public static class Styles
+			public static partial class Styles
 			{
 				[ResourceKeyDefinition(typeof(Style), "MaterialFilledTextBoxStyle", TargetType = typeof(Style))]
 				public static StaticResourceKey<Style> Filled => new("MaterialFilledTextBoxStyle");
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleButton.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleButton.cs
index dc8574458..19d835a3b 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleButton.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleButton.cs
@@ -1,4 +1,5 @@
 using System;
+using Windows.UI;
 using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
@@ -9,13 +10,13 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class ToggleButton
+		public static partial class ToggleButton
 		{
-			public static class Resources
+			public static partial class Resources
 			{
-				public static class Icon
+				public static partial class Icon
 				{
-					public static class Background
+					public static partial class Background
 					{
 						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundChecked")]
 						public static ThemeResourceKey<Brush> Checked => new("IconToggleButtonBackgroundChecked");
@@ -53,7 +54,7 @@ public static class Background
 						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBackgroundPressed")]
 						public static ThemeResourceKey<Brush> Pressed => new("IconToggleButtonBackgroundPressed");
 					}
-					public static class BorderBrush
+					public static partial class BorderBrush
 					{
 						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushChecked")]
 						public static ThemeResourceKey<Brush> Checked => new("IconToggleButtonBorderBrushChecked");
@@ -91,7 +92,7 @@ public static class BorderBrush
 						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonBorderBrushPressed")]
 						public static ThemeResourceKey<Brush> Pressed => new("IconToggleButtonBorderBrushPressed");
 					}
-					public static class Foreground
+					public static partial class Foreground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundChecked")]
 						public static ThemeResourceKey<Brush> Checked => new("IconToggleButtonForegroundChecked");
@@ -129,9 +130,9 @@ public static class Foreground
 						[ResourceKeyDefinition(typeof(Brush), "IconToggleButtonForegroundPressed")]
 						public static ThemeResourceKey<Brush> Pressed => new("IconToggleButtonForegroundPressed");
 					}
-					public static class StateCircle
+					public static partial class StateCircle
 					{
-						public static class Opacity
+						public static partial class Opacity
 						{
 							[ResourceKeyDefinition(typeof(double), "IconToggleButtonStateCircleOpacityPointerOver")]
 							public static ThemeResourceKey<double> PointerOver => new("IconToggleButtonStateCircleOpacityPointerOver");
@@ -154,9 +155,9 @@ public static class Opacity
 					[ResourceKeyDefinition(typeof(double), "IconToggleButtonMinWidth")]
 					public static ThemeResourceKey<double> MinWidth => new("IconToggleButtonMinWidth");
 				}
-				public static class Text
+				public static partial class Text
 				{
-					public static class Background
+					public static partial class Background
 					{
 						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundChecked")]
 						public static ThemeResourceKey<Brush> Checked => new("TextToggleButtonBackgroundChecked");
@@ -185,7 +186,7 @@ public static class Background
 						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBackgroundPressed")]
 						public static ThemeResourceKey<Brush> Pressed => new("TextToggleButtonBackgroundPressed");
 					}
-					public static class BorderBrush
+					public static partial class BorderBrush
 					{
 						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushChecked")]
 						public static ThemeResourceKey<Brush> Checked => new("TextToggleButtonBorderBrushChecked");
@@ -214,7 +215,7 @@ public static class BorderBrush
 						[ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushPressed")]
 						public static ThemeResourceKey<Brush> Pressed => new("TextToggleButtonBorderBrushPressed");
 					}
-					public static class Foreground
+					public static partial class Foreground
 					{
 						[ResourceKeyDefinition(typeof(Color), "TextToggleButtonForegroundChecked")]
 						public static ThemeResourceKey<Color> Checked => new("TextToggleButtonForegroundChecked");
@@ -274,7 +275,7 @@ public static class Foreground
 					public static ThemeResourceKey<Brush> FeedbackFocused => new("TextToggleButtonFeedbackFocused");
 				}
 			}
-			public static class Styles
+			public static partial class Styles
 			{
 				[ResourceKeyDefinition(typeof(Style), "MaterialTextToggleButtonStyle", TargetType = typeof(Style))]
 				public static StaticResourceKey<Style> Text => new("MaterialTextToggleButtonStyle");
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleSwitch.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleSwitch.cs
index 4387fde36..493c324a4 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleSwitch.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleSwitch.cs
@@ -1,4 +1,5 @@
 using System;
+using Windows.UI;
 using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
@@ -9,11 +10,11 @@ namespace Uno.Themes.Markup
 {
 	public static partial class Theme
 	{
-		public static class ToggleSwitch
+		public static partial class ToggleSwitch
 		{
-			public static class Resources
+			public static partial class Resources
 			{
-				public static class KnobIcon
+				public static partial class KnobIcon
 				{
 					[ResourceKeyDefinition(typeof(double), "KnobIconSize")]
 					public static ThemeResourceKey<double> Size => new("KnobIconSize");
@@ -21,7 +22,7 @@ public static class KnobIcon
 					[ResourceKeyDefinition(typeof(Thickness), "KnobIconPadding")]
 					public static ThemeResourceKey<Thickness> Padding => new("KnobIconPadding");
 				}
-				public static class KnobOffFill
+				public static partial class KnobOffFill
 				{
 					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffFill")]
 					public static ThemeResourceKey<Brush> Default => new("ToggleSwitchKnobOffFill");
@@ -38,7 +39,7 @@ public static class KnobOffFill
 					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffFillPressed")]
 					public static ThemeResourceKey<Brush> Pressed => new("ToggleSwitchKnobOffFillPressed");
 				}
-				public static class KnobOffShadowFill
+				public static partial class KnobOffShadowFill
 				{
 					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffShadowFill")]
 					public static ThemeResourceKey<Brush> Default => new("ToggleSwitchKnobOffShadowFill");
@@ -52,9 +53,9 @@ public static class KnobOffShadowFill
 					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOffShadowFillPressed")]
 					public static ThemeResourceKey<Brush> Pressed => new("ToggleSwitchKnobOffShadowFillPressed");
 				}
-				public static class KnobOn
+				public static partial class KnobOn
 				{
-					public static class Fill
+					public static partial class Fill
 					{
 						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnFill")]
 						public static ThemeResourceKey<Brush> Default => new("ToggleSwitchKnobOnFill");
@@ -74,7 +75,7 @@ public static class Fill
 					[ResourceKeyDefinition(typeof(Thickness), "KnobOnMargin")]
 					public static ThemeResourceKey<Thickness> Margin => new("KnobOnMargin");
 				}
-				public static class KnobOnShadowFill
+				public static partial class KnobOnShadowFill
 				{
 					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnShadowFill")]
 					public static ThemeResourceKey<Brush> Default => new("ToggleSwitchKnobOnShadowFill");
@@ -88,7 +89,7 @@ public static class KnobOnShadowFill
 					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobOnShadowFillPressed")]
 					public static ThemeResourceKey<Brush> Pressed => new("ToggleSwitchKnobOnShadowFillPressed");
 				}
-				public static class MediumThumbSize
+				public static partial class MediumThumbSize
 				{
 					[ResourceKeyDefinition(typeof(double), "MediumThumbSize")]
 					public static ThemeResourceKey<double> Default => new("MediumThumbSize");
@@ -96,7 +97,7 @@ public static class MediumThumbSize
 					[ResourceKeyDefinition(typeof(double), "LargeThumbSize")]
 					public static ThemeResourceKey<double> Pressed => new("LargeThumbSize");
 				}
-				public static class OffIconPresenterForeground
+				public static partial class OffIconPresenterForeground
 				{
 					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOffIconPresenterForeground")]
 					public static ThemeResourceKey<Brush> Default => new("ToggleSwitchOffIconPresenterForeground");
@@ -104,9 +105,9 @@ public static class OffIconPresenterForeground
 					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOffIconPresenterForegroundDisabled")]
 					public static ThemeResourceKey<Brush> Disabled => new("ToggleSwitchOffIconPresenterForegroundDisabled");
 				}
-				public static class OffOuterBorder
+				public static partial class OffOuterBorder
 				{
-					public static class Fill
+					public static partial class Fill
 					{
 						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOffOuterBorderFill")]
 						public static ThemeResourceKey<Brush> Default => new("ToggleSwitchOffOuterBorderFill");
@@ -114,7 +115,7 @@ public static class Fill
 						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOuterBorderFill")]
 						public static ThemeResourceKey<Brush> Normal => new("ToggleSwitchOuterBorderFill");
 					}
-					public static class Stroke
+					public static partial class Stroke
 					{
 						[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOffOuterBorderStroke")]
 						public static ThemeResourceKey<Brush> Default => new("ToggleSwitchOffOuterBorderStroke");
@@ -123,7 +124,7 @@ public static class Stroke
 						public static ThemeResourceKey<Brush> Normal => new("ToggleSwitchOuterBorderStroke");
 					}
 				}
-				public static class OnIconPresenterForeground
+				public static partial class OnIconPresenterForeground
 				{
 					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOnIconPresenterForeground")]
 					public static ThemeResourceKey<Brush> Default => new("ToggleSwitchOnIconPresenterForeground");
@@ -131,7 +132,7 @@ public static class OnIconPresenterForeground
 					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOnIconPresenterForegroundDisabled")]
 					public static ThemeResourceKey<Brush> Disabled => new("ToggleSwitchOnIconPresenterForegroundDisabled");
 				}
-				public static class OnSwitchKnobBoundsFill
+				public static partial class OnSwitchKnobBoundsFill
 				{
 					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchOnSwitchKnobBoundsFill")]
 					public static ThemeResourceKey<Brush> Default => new("ToggleSwitchOnSwitchKnobBoundsFill");
@@ -151,7 +152,7 @@ public static class OnSwitchKnobBoundsFill
 					[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchKnobBoundsFillPressed")]
 					public static ThemeResourceKey<Brush> Pressed => new("ToggleSwitchKnobBoundsFillPressed");
 				}
-				public static class SwitchKnob
+				public static partial class SwitchKnob
 				{
 					[ResourceKeyDefinition(typeof(double), "SwitchKnobRadius")]
 					public static ThemeResourceKey<double> Radius => new("SwitchKnobRadius");
@@ -189,7 +190,7 @@ public static class SwitchKnob
 				[ResourceKeyDefinition(typeof(Brush), "ToggleSwitchThumb")]
 				public static ThemeResourceKey<Brush> Thumb => new("ToggleSwitchThumb");
 			}
-			public static class Styles
+			public static partial class Styles
 			{
 				[ResourceKeyDefinition(typeof(Style), "MaterialToggleSwitchStyle", TargetType = typeof(Style))]
 				public static StaticResourceKey<Style> Default => new("MaterialToggleSwitchStyle");