From b81b7363cd3fa8aa2764f339cd967bd884aadfe9 Mon Sep 17 00:00:00 2001
From: Marc-Antoine Soucy <ma.soucy@nventive.com>
Date: Thu, 10 Aug 2023 11:11:00 -0400
Subject: [PATCH] feat: add lightweight extension

---
 Settings.XamlStyler                           |   2 +-
 .../Extensions/ResourceExtensions.cs          |  38 ++
 .../Uno.Gallery.Shared.projitems              |  38 ++
 .../Uno.Gallery.Shared.shproj                 |   6 +
 .../Fluent/Button.xaml                        |  19 +
 .../Fluent/CheckBox.xaml                      |  33 ++
 .../Fluent/RadioButton.xaml                   |  27 ++
 .../Fluent/TextBox.xaml                       |  16 +
 .../Material/Button.xaml                      |  23 +
 .../Material/CheckBox.xaml                    |  30 ++
 .../Material/RadioButton.xaml                 |  27 ++
 .../Material/TextBox.xaml                     |  18 +
 .../LightWeightExtensionSameplePage.xaml      | 400 ++++++++++++++++++
 .../LightWeightExtensionSameplePage.xaml.cs   |  13 +
 .../Views/Styles/Button.xaml                  |   8 +
 15 files changed, 697 insertions(+), 1 deletion(-)
 create mode 100644 Uno.Gallery/Uno.Gallery.Shared/Extensions/ResourceExtensions.cs
 create mode 100644 Uno.Gallery/Uno.Gallery.Shared/Views/ControlResourcesOverride/Fluent/Button.xaml
 create mode 100644 Uno.Gallery/Uno.Gallery.Shared/Views/ControlResourcesOverride/Fluent/CheckBox.xaml
 create mode 100644 Uno.Gallery/Uno.Gallery.Shared/Views/ControlResourcesOverride/Fluent/RadioButton.xaml
 create mode 100644 Uno.Gallery/Uno.Gallery.Shared/Views/ControlResourcesOverride/Fluent/TextBox.xaml
 create mode 100644 Uno.Gallery/Uno.Gallery.Shared/Views/ControlResourcesOverride/Material/Button.xaml
 create mode 100644 Uno.Gallery/Uno.Gallery.Shared/Views/ControlResourcesOverride/Material/CheckBox.xaml
 create mode 100644 Uno.Gallery/Uno.Gallery.Shared/Views/ControlResourcesOverride/Material/RadioButton.xaml
 create mode 100644 Uno.Gallery/Uno.Gallery.Shared/Views/ControlResourcesOverride/Material/TextBox.xaml
 create mode 100644 Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/LightWeightExtensionSameplePage.xaml
 create mode 100644 Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/LightWeightExtensionSameplePage.xaml.cs

diff --git a/Settings.XamlStyler b/Settings.XamlStyler
index 3d76cddc6..059bef472 100644
--- a/Settings.XamlStyler
+++ b/Settings.XamlStyler
@@ -3,7 +3,7 @@
 	"KeepFirstAttributeOnSameLine": true,
 	"MaxAttributeCharactersPerLine": 0,
 	"MaxAttributesPerLine": 1,
-	"NewlineExemptionElements": "RadialGradientBrush, GradientStop, LinearGradientBrush, ScaleTransform, SkewTransform, RotateTransform, TranslateTransform, Trigger, Condition, Setter, StaticResource",
+	"NewlineExemptionElements": "RadialGradientBrush, GradientStop, LinearGradientBrush, ScaleTransform, SkewTransform, RotateTransform, TranslateTransform, Trigger, Condition, Setter, StaticResource, SolidColorBrush",
 	"SeparateByGroups": false,
 	"AttributeIndentation": 0,
 	"AttributeIndentationStyle": 0,
diff --git a/Uno.Gallery/Uno.Gallery.Shared/Extensions/ResourceExtensions.cs b/Uno.Gallery/Uno.Gallery.Shared/Extensions/ResourceExtensions.cs
new file mode 100644
index 000000000..3382307d6
--- /dev/null
+++ b/Uno.Gallery/Uno.Gallery.Shared/Extensions/ResourceExtensions.cs
@@ -0,0 +1,38 @@
+using Microsoft.UI.Xaml;
+using System;
+
+namespace Uno.Gallery
+{
+	/// <summary>
+	/// Helper class for Resources Extensions.
+	/// </summary>
+	public static class ResourceExtensions
+	{
+		public static readonly DependencyProperty OverridePathProperty =
+		DependencyProperty.RegisterAttached(
+			"OverridePath",
+			typeof(string),
+			typeof(ResourceExtensions),
+			new PropertyMetadata(null, OnOverridePathChanged));
+
+		public static void SetOverridePath(FrameworkElement element, string value)
+		{
+			element.SetValue(OverridePathProperty, value);
+		}
+
+		public static string GetOverridePath(FrameworkElement element)
+		{
+			return (string)element.GetValue(OverridePathProperty);
+		}
+
+		private static void OnOverridePathChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+		{
+			if (d is FrameworkElement fe)
+			{
+				fe.Resources = e.NewValue is string path
+					? new ResourceDictionary() { Source = new Uri(path, UriKind.RelativeOrAbsolute) }
+					: default;
+			}
+		}
+	}
+}
diff --git a/Uno.Gallery/Uno.Gallery.Shared/Uno.Gallery.Shared.projitems b/Uno.Gallery/Uno.Gallery.Shared/Uno.Gallery.Shared.projitems
index 71a767a8a..13398256e 100644
--- a/Uno.Gallery/Uno.Gallery.Shared/Uno.Gallery.Shared.projitems
+++ b/Uno.Gallery/Uno.Gallery.Shared/Uno.Gallery.Shared.projitems
@@ -173,6 +173,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Entities\Design.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Entities\SourceSdk.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\ClipboardExtensions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Extensions\ResourceExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\XamlDisplayExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Helpers\Disposable.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Helpers\EnumHelper.cs" />
@@ -180,12 +181,49 @@
     <Compile Include="$(MSBuildThisFileDirectory)Helpers\VisualTreeHelperEx.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModels\Command.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModels\ViewModelBase.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Views\SamplePages\LightWeightExtensionSameplePage.xaml.cs" />
   </ItemGroup>
   <ItemGroup>
     <ApplicationDefinition Include="$(MSBuildThisFileDirectory)App.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </ApplicationDefinition>
+    <Page Include="$(MSBuildThisFileDirectory)Views\ControlResourcesOverride\Fluent\Button.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Views\ControlResourcesOverride\Fluent\CheckBox.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Views\ControlResourcesOverride\Fluent\RadioButton.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Views\ControlResourcesOverride\Fluent\TextBox.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Views\ControlResourcesOverride\Material\Button.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Views\ControlResourcesOverride\Material\CheckBox.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Views\ControlResourcesOverride\Material\RadioButton.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Views\ControlResourcesOverride\Material\TextBox.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Views\SamplePages\LightWeightExtensionSameplePage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <_Globbled_Page Include="$(MSBuildThisFileDirectory)**/*.xaml" Exclude="@(Page);@(ApplicationDefinition)">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/Uno.Gallery/Uno.Gallery.Shared/Uno.Gallery.Shared.shproj b/Uno.Gallery/Uno.Gallery.Shared/Uno.Gallery.Shared.shproj
index 451a2c1af..395bb7445 100644
--- a/Uno.Gallery/Uno.Gallery.Shared/Uno.Gallery.Shared.shproj
+++ b/Uno.Gallery/Uno.Gallery.Shared/Uno.Gallery.Shared.shproj
@@ -10,4 +10,10 @@
   <PropertyGroup />
   <Import Project="Uno.Gallery.Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+  <ItemGroup>
+    <_Globbed_Compile Remove="Views\SamplePages\LightWeightExtensionSameplePage.xaml.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <_Globbled_Page Remove="Views\SamplePages\LightWeightExtensionSameplePage.xaml" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/ControlResourcesOverride/Fluent/Button.xaml b/Uno.Gallery/Uno.Gallery.Shared/Views/ControlResourcesOverride/Fluent/Button.xaml
new file mode 100644
index 000000000..f897eaba6
--- /dev/null
+++ b/Uno.Gallery/Uno.Gallery.Shared/Views/ControlResourcesOverride/Fluent/Button.xaml
@@ -0,0 +1,19 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+	<SolidColorBrush x:Key="ButtonForeground" Color="DarkGreen" />
+	<SolidColorBrush x:Key="ButtonBackground" Color="LightGreen" />
+	<SolidColorBrush x:Key="ButtonBorderBrush" Color="DarkGreen" />
+
+	<SolidColorBrush x:Key="ButtonForegroundPointerOver" Color="DarkRed" />
+	<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="LightPink" />
+	<SolidColorBrush x:Key="ButtonBorderBrushPointerOver" Color="DarkRed" />
+
+	<SolidColorBrush x:Key="ButtonForegroundPressed" Color="DarkBlue" />
+	<SolidColorBrush x:Key="ButtonBackgroundPressed" Color="LightSteelBlue" />
+	<SolidColorBrush x:Key="ButtonBorderBrushPressed" Color="DarkBlue" />
+
+	<SolidColorBrush x:Key="ButtonForegroundDisabled" Color="LightSlateGray" />
+	<SolidColorBrush x:Key="ButtonBackgroundDisabled" Color="DarkGray" />
+	<SolidColorBrush x:Key="ButtonBorderBrushDisabled" Color="LightSlateGray" />
+</ResourceDictionary>
diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/ControlResourcesOverride/Fluent/CheckBox.xaml b/Uno.Gallery/Uno.Gallery.Shared/Views/ControlResourcesOverride/Fluent/CheckBox.xaml
new file mode 100644
index 000000000..999548ea5
--- /dev/null
+++ b/Uno.Gallery/Uno.Gallery.Shared/Views/ControlResourcesOverride/Fluent/CheckBox.xaml
@@ -0,0 +1,33 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+	<!-- Checked state -->
+	<SolidColorBrush x:Key="CheckBoxCheckGlyphForegroundChecked" Color="Teal" />
+	<SolidColorBrush x:Key="CheckBoxBorderBrushChecked" Color="Navy" />
+	<SolidColorBrush x:Key="CheckBoxBackgroundChecked" Color="Maroon" />
+
+	<!-- Checked and pointer over state -->
+	<SolidColorBrush x:Key="CheckBoxCheckGlyphForegroundCheckedPointerOver" Color="Lime" />
+	<SolidColorBrush x:Key="CheckBoxBorderBrushCheckedPointerOver" Color="Olive" />
+	<SolidColorBrush x:Key="CheckBoxBackgroundCheckedPointerOver" Color="Silver" />
+
+	<!-- Checked and pressed state -->
+	<SolidColorBrush x:Key="CheckBoxCheckGlyphForegroundCheckedPressed" Color="Purple" />
+	<SolidColorBrush x:Key="CheckBoxBorderBrushCheckedPressed" Color="Aqua" />
+	<SolidColorBrush x:Key="CheckBoxBackgroundCheckedPressed" Color="Yellow" />
+
+	<!-- Unchecked state -->
+	<SolidColorBrush x:Key="CheckBoxCheckGlyphForegroundUnchecked" Color="Black" />
+	<SolidColorBrush x:Key="CheckBoxBorderBrushUnchecked" Color="White" />
+	<SolidColorBrush x:Key="CheckBoxBackgroundUnchecked" Color="Gray" />
+
+	<!-- Unchecked and pointer over state -->
+	<SolidColorBrush x:Key="CheckBoxCheckGlyphForegroundUncheckedPointerOver" Color="Blue" />
+	<SolidColorBrush x:Key="CheckBoxBorderBrushUncheckedPointerOver" Color="Orange" />
+	<SolidColorBrush x:Key="CheckBoxBackgroundUncheckedPointerOver" Color="Green" />
+
+	<!-- Unchecked and pressed state -->
+	<SolidColorBrush x:Key="CheckBoxCheckGlyphForegroundUncheckedPressed" Color="Red" />
+	<SolidColorBrush x:Key="CheckBoxBorderBrushUncheckedPressed" Color="Cyan" />
+	<SolidColorBrush x:Key="CheckBoxBackgroundUncheckedPressed" Color="Pink" />
+</ResourceDictionary>
diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/ControlResourcesOverride/Fluent/RadioButton.xaml b/Uno.Gallery/Uno.Gallery.Shared/Views/ControlResourcesOverride/Fluent/RadioButton.xaml
new file mode 100644
index 000000000..db7f43f0d
--- /dev/null
+++ b/Uno.Gallery/Uno.Gallery.Shared/Views/ControlResourcesOverride/Fluent/RadioButton.xaml
@@ -0,0 +1,27 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+	<SolidColorBrush x:Key="RadioButtonForeground" Color="DarkGreen" />
+	<SolidColorBrush x:Key="RadioButtonOuterEllipseStroke" Color="LightGreen" />
+	<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedStroke" Color="DarkGreen" />
+	<SolidColorBrush x:Key="RadioButtonOuterEllipseFill" Color="LightGreen" />
+	<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedFill" Color="DarkGreen" />
+
+	<SolidColorBrush x:Key="RadioButtonForegroundPointerOver" Color="DarkRed" />
+	<SolidColorBrush x:Key="RadioButtonOuterEllipseStrokePointerOver" Color="LightPink" />
+	<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedStrokePointerOver" Color="DarkRed" />
+	<SolidColorBrush x:Key="RadioButtonOuterEllipseFillPointerOver" Color="LightPink" />
+	<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedFillPointerOver" Color="DarkRed" />
+
+	<SolidColorBrush x:Key="RadioButtonForegroundPressed" Color="DarkBlue" />
+	<SolidColorBrush x:Key="RadioButtonOuterEllipseStrokePressed" Color="LightSteelBlue" />
+	<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedStrokePressed" Color="DarkBlue" />
+	<SolidColorBrush x:Key="RadioButtonOuterEllipseFillPressed" Color="LightSteelBlue" />
+	<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedFillPressed" Color="DarkBlue" />
+
+	<SolidColorBrush x:Key="RadioButtonForegroundDisabled" Color="LightSlateGray" />
+	<SolidColorBrush x:Key="RadioButtonOuterEllipseStrokeDisabled" Color="DarkGray" />
+	<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedStrokeDisabled" Color="LightSlateGray" />
+	<SolidColorBrush x:Key="RadioButtonOuterEllipseFillDisabled" Color="DarkGray" />
+	<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedFillDisabled" Color="LightSlateGray" />
+</ResourceDictionary>
diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/ControlResourcesOverride/Fluent/TextBox.xaml b/Uno.Gallery/Uno.Gallery.Shared/Views/ControlResourcesOverride/Fluent/TextBox.xaml
new file mode 100644
index 000000000..f68d33743
--- /dev/null
+++ b/Uno.Gallery/Uno.Gallery.Shared/Views/ControlResourcesOverride/Fluent/TextBox.xaml
@@ -0,0 +1,16 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+	<!-- Default State -->
+	<SolidColorBrush x:Key="TextControlForeground" Color="Red" />
+	<SolidColorBrush x:Key="TextControlBackground" Color="Cyan" />
+
+	<!-- Pointer Over State -->
+	<SolidColorBrush x:Key="TextControlButtonBackgroundPointerOver" Color="Orange" />
+	<SolidColorBrush x:Key="TextControlBackgroundPointerOver" Color="Navy" />
+	<SolidColorBrush x:Key="TextControlForegroundPointerOver" Color="Gray" />
+
+	<!-- Focused State -->
+	<SolidColorBrush x:Key="TextControlForegroundFocused" Color="Yellow" />
+	<SolidColorBrush x:Key="TextControlBackgroundFocused" Color="RosyBrown" />
+</ResourceDictionary>
diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/ControlResourcesOverride/Material/Button.xaml b/Uno.Gallery/Uno.Gallery.Shared/Views/ControlResourcesOverride/Material/Button.xaml
new file mode 100644
index 000000000..71a8b0441
--- /dev/null
+++ b/Uno.Gallery/Uno.Gallery.Shared/Views/ControlResourcesOverride/Material/Button.xaml
@@ -0,0 +1,23 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+	<SolidColorBrush x:Key="FilledButtonForeground" Color="DarkGreen" />
+	<SolidColorBrush x:Key="FilledButtonBackground" Color="LightGreen" />
+	<SolidColorBrush x:Key="FilledButtonBorderBrush" Color="DarkGreen" />
+
+	<SolidColorBrush x:Key="FilledButtonForegroundPointerOver" Color="DarkRed" />
+	<SolidColorBrush x:Key="FilledButtonBackgroundPointerOver" Color="LightPink" />
+	<SolidColorBrush x:Key="FilledButtonBorderBrushPointerOver" Color="DarkRed" />
+
+	<SolidColorBrush x:Key="FilledButtonForegroundPressed" Color="DarkBlue" />
+	<SolidColorBrush x:Key="FilledButtonBackgroundPressed" Color="LightSteelBlue" />
+	<SolidColorBrush x:Key="FilledButtonBorderBrushPressed" Color="DarkBlue" />
+
+	<SolidColorBrush x:Key="FilledButtonForegroundFocused" Color="AntiqueWhite" />
+	<SolidColorBrush x:Key="FilledButtonBackgroundFocused" Color="DarkMagenta" />
+	<SolidColorBrush x:Key="FilledButtonBorderBrushFocused" Color="AntiqueWhite" />
+
+	<SolidColorBrush x:Key="FilledButtonForegroundDisabled" Color="LightSlateGray" />
+	<SolidColorBrush x:Key="FilledButtonBackgroundDisabled" Color="DarkGray" />
+	<SolidColorBrush x:Key="FilledButtonBorderBrushDisabled" Color="LightSlateGray" />
+</ResourceDictionary>
diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/ControlResourcesOverride/Material/CheckBox.xaml b/Uno.Gallery/Uno.Gallery.Shared/Views/ControlResourcesOverride/Material/CheckBox.xaml
new file mode 100644
index 000000000..bfe92fa25
--- /dev/null
+++ b/Uno.Gallery/Uno.Gallery.Shared/Views/ControlResourcesOverride/Material/CheckBox.xaml
@@ -0,0 +1,30 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+	<!-- Checked state -->
+	<SolidColorBrush x:Key="CheckBoxGlyphForegroundChecked" Color="Red" />
+	<SolidColorBrush x:Key="CheckBoxBorderBrushChecked" Color="Green" />
+	<SolidColorBrush x:Key="CheckBoxBackgroundChecked" Color="White" />
+
+	<!-- Checked and pointer over state -->
+	<SolidColorBrush x:Key="CheckBoxGlyphForegroundCheckedPointerOver" Color="Blue" />
+	<SolidColorBrush x:Key="CheckBoxBorderBrushCheckedPointerOver" Color="Yellow" />
+	<SolidColorBrush x:Key="CheckBoxBackgroundCheckedPointerOver" Color="Black" />
+
+	<!-- Checked and pressed state -->
+	<SolidColorBrush x:Key="CheckBoxGlyphForegroundPressed" Color="Purple" />
+	<SolidColorBrush x:Key="CheckBoxBorderBrushCheckedPressed" Color="Silver" />
+	<SolidColorBrush x:Key="CheckBoxBackgroundCheckedPressed" Color="Cyan" />
+
+	<!-- Unchecked state -->
+	<StaticResource x:Key="CheckBoxBorderBrushUnchecked" ResourceKey="SecondaryBrush" />
+	<StaticResource x:Key="CheckBoxBackgroundUnchecked" ResourceKey="PrimaryLowBrush" />
+
+	<!-- Unchecked and pressed state -->
+	<SolidColorBrush x:Key="CheckBoxBorderBrushUncheckedPressed" Color="Lime" />
+	<SolidColorBrush x:Key="CheckBoxBackgroundUncheckedPressed" Color="Navy" />
+
+	<!-- Unchecked and pointer over state -->
+	<SolidColorBrush x:Key="CheckBoxBorderBrushUncheckedPointerOver" Color="Maroon" />
+	<SolidColorBrush x:Key="CheckBoxBackgroundUncheckedPointerOver" Color="Olive" />
+</ResourceDictionary>
diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/ControlResourcesOverride/Material/RadioButton.xaml b/Uno.Gallery/Uno.Gallery.Shared/Views/ControlResourcesOverride/Material/RadioButton.xaml
new file mode 100644
index 000000000..db7f43f0d
--- /dev/null
+++ b/Uno.Gallery/Uno.Gallery.Shared/Views/ControlResourcesOverride/Material/RadioButton.xaml
@@ -0,0 +1,27 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+	<SolidColorBrush x:Key="RadioButtonForeground" Color="DarkGreen" />
+	<SolidColorBrush x:Key="RadioButtonOuterEllipseStroke" Color="LightGreen" />
+	<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedStroke" Color="DarkGreen" />
+	<SolidColorBrush x:Key="RadioButtonOuterEllipseFill" Color="LightGreen" />
+	<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedFill" Color="DarkGreen" />
+
+	<SolidColorBrush x:Key="RadioButtonForegroundPointerOver" Color="DarkRed" />
+	<SolidColorBrush x:Key="RadioButtonOuterEllipseStrokePointerOver" Color="LightPink" />
+	<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedStrokePointerOver" Color="DarkRed" />
+	<SolidColorBrush x:Key="RadioButtonOuterEllipseFillPointerOver" Color="LightPink" />
+	<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedFillPointerOver" Color="DarkRed" />
+
+	<SolidColorBrush x:Key="RadioButtonForegroundPressed" Color="DarkBlue" />
+	<SolidColorBrush x:Key="RadioButtonOuterEllipseStrokePressed" Color="LightSteelBlue" />
+	<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedStrokePressed" Color="DarkBlue" />
+	<SolidColorBrush x:Key="RadioButtonOuterEllipseFillPressed" Color="LightSteelBlue" />
+	<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedFillPressed" Color="DarkBlue" />
+
+	<SolidColorBrush x:Key="RadioButtonForegroundDisabled" Color="LightSlateGray" />
+	<SolidColorBrush x:Key="RadioButtonOuterEllipseStrokeDisabled" Color="DarkGray" />
+	<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedStrokeDisabled" Color="LightSlateGray" />
+	<SolidColorBrush x:Key="RadioButtonOuterEllipseFillDisabled" Color="DarkGray" />
+	<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedFillDisabled" Color="LightSlateGray" />
+</ResourceDictionary>
diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/ControlResourcesOverride/Material/TextBox.xaml b/Uno.Gallery/Uno.Gallery.Shared/Views/ControlResourcesOverride/Material/TextBox.xaml
new file mode 100644
index 000000000..17d7e257d
--- /dev/null
+++ b/Uno.Gallery/Uno.Gallery.Shared/Views/ControlResourcesOverride/Material/TextBox.xaml
@@ -0,0 +1,18 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+	<!-- Normal State -->
+	<SolidColorBrush x:Key="OutlinedTextBoxBorderBrush" Color="Red" />
+	<SolidColorBrush x:Key="OutlinedTextBoxPlaceholderForeground" Color="Green" />
+	<SolidColorBrush x:Key="OutlinedTextBoxForeground" Color="Orange" />
+
+	<!-- Focused state -->
+	<SolidColorBrush x:Key="OutlinedTextBoxBorderBrushFocused" Color="Lime" />
+	<SolidColorBrush x:Key="OutlinedTextBoxPlaceholderForegroundFocused" Color="Navy" />
+	<SolidColorBrush x:Key="OutlinedTextBoxForegroundFocused" Color="Pink" />
+
+	<!-- Pointer over state -->
+	<StaticResource x:Key="OutlinedTextBoxPlaceholderForegroundPointerOver" ResourceKey="SecondaryLowBrush" />
+	<StaticResource x:Key="OutlinedTextBoxBorderBrushPointerOver" ResourceKey="SecondaryLowBrush" />
+	<StaticResource x:Key="OutlinedTextBoxForegroundPointerOver" ResourceKey="PrimaryBrush" />
+</ResourceDictionary>
diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/LightWeightExtensionSameplePage.xaml b/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/LightWeightExtensionSameplePage.xaml
new file mode 100644
index 000000000..1a5da9a19
--- /dev/null
+++ b/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/LightWeightExtensionSameplePage.xaml
@@ -0,0 +1,400 @@
+<Page x:Class="Uno.Gallery.Views.SamplePages.LightWeightExtensionSameplePage"
+	  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	  xmlns:local="using:Uno.Gallery"
+	  xmlns:smtx="using:ShowMeTheXAML"
+	  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	  xmlns:example="http://schemas.microsoft.com/expression/blend/2008"
+	  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	  mc:Ignorable="d example"
+	  Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+
+	<Grid>
+		<local:SamplePageLayout>
+			<local:SamplePageLayout.MaterialTemplate>
+				<DataTemplate>
+					<StackPanel>
+						<!-- Button -->
+						<smtx:XamlDisplay UniqueKey="LightweightExtensionSamplePage_Button_Material"
+										  smtx:XamlDisplayExtensions.Description="The examples contrast ordinary Buttons with others that apply an Extension to override some properties, as defined in the Material/Buttons.xaml ResourceDictionary."
+										  smtx:XamlDisplayExtensions.IgnorePath="XamlDisplay\StackPanel">
+							<StackPanel Spacing="40">
+
+								<Button Content="Default Button Style"
+										Style="{StaticResource MaterialFilledButtonStyle}" />
+
+								<Button Content="Overridden Button Style"
+										BorderThickness="2"
+										Style="{StaticResource OverridenMaterialButton}" />
+
+								<!-- OverridenMaterialButton defintion: -->
+								<example:ResourceDictionary>
+									<Style x:Key="OverridenMaterialButton"
+										   BasedOn="{StaticResource MaterialFilledButtonStyle}"
+										   TargetType="Button">
+										<Setter Property="local:ResourceExtensions.OverridePath" Value="ms-appx:///Views/ControlResourcesOverride/Material/Button.xaml" />
+									</Style>
+								</example:ResourceDictionary>
+
+
+								<Button Content="Default Button Style - Disabled"
+										IsEnabled="False"
+										Style="{StaticResource MaterialFilledButtonStyle}" />
+
+								<Button Content="Overridden Button Style - Disabled"
+										BorderThickness="2"
+										IsEnabled="False"
+										Style="{StaticResource MaterialFilledButtonStyle}"
+										local:ResourceExtensions.OverridePath="ms-appx:///Views/ControlResourcesOverride/Material/Button.xaml" />
+
+								<!-- Material/Button.xaml content: -->
+								<example:ResourceDictionary>
+									<SolidColorBrush x:Key="FilledButtonForeground" Color="DarkGreen" />
+									<SolidColorBrush x:Key="FilledButtonBackground" Color="LightGreen" />
+									<SolidColorBrush x:Key="FilledButtonBorderBrush" Color="DarkGreen" />
+
+									<SolidColorBrush x:Key="FilledButtonForegroundPointerOver" Color="DarkRed" />
+									<SolidColorBrush x:Key="FilledButtonBackgroundPointerOver" Color="LightPink" />
+									<SolidColorBrush x:Key="FilledButtonBorderBrushPointerOver" Color="DarkRed" />
+
+									<SolidColorBrush x:Key="FilledButtonForegroundPressed" Color="DarkBlue" />
+									<SolidColorBrush x:Key="FilledButtonBackgroundPressed" Color="LightSteelBlue" />
+									<SolidColorBrush x:Key="FilledButtonBorderBrushPressed" Color="DarkBlue" />
+
+									<SolidColorBrush x:Key="FilledButtonForegroundFocused" Color="AntiqueWhite" />
+									<SolidColorBrush x:Key="FilledButtonBackgroundFocused" Color="DarkMagenta" />
+									<SolidColorBrush x:Key="FilledButtonBorderBrushFocused" Color="AntiqueWhite" />
+
+									<SolidColorBrush x:Key="FilledButtonForegroundDisabled" Color="LightSlateGray" />
+									<SolidColorBrush x:Key="FilledButtonBackgroundDisabled" Color="DarkGray" />
+									<SolidColorBrush x:Key="FilledButtonBorderBrushDisabled" Color="LightSlateGray" />
+								</example:ResourceDictionary>
+
+
+							</StackPanel>
+						</smtx:XamlDisplay>
+
+						<!-- TextBox -->
+						<smtx:XamlDisplay UniqueKey="LightWeightExtensionSamplePage_MaterialTextBox"
+										  smtx:XamlDisplayExtensions.Description="The examples contrast ordinary Buttons with others that apply an Extension to override some properties, as defined in the Material/Buttons.xaml ResourceDictionary."
+										  smtx:XamlDisplayExtensions.IgnorePath="XamlDisplay\StackPanel">
+							<StackPanel Spacing="24">
+								<TextBox PlaceholderText="Default TextBox Style"
+										 Style="{StaticResource MaterialOutlinedTextBoxStyle}" />
+
+								<TextBox PlaceholderText="Overriden TextBox Style"
+										 Style="{StaticResource MaterialOutlinedTextBoxStyle}"
+										 local:ResourceExtensions.OverridePath="ms-appx:///Views/ControlResourcesOverride/Material/TextBox.xaml" />
+
+								<!-- Material/TextBox.xaml content: -->
+								<example:ResourceDictionary>
+									<!-- Normal State -->
+									<SolidColorBrush x:Key="OutlinedTextBoxBorderBrush" Color="Red" />
+									<SolidColorBrush x:Key="OutlinedTextBoxPlaceholderForeground" Color="Green" />
+									<SolidColorBrush x:Key="OutlinedTextBoxForeground" Color="Orange" />
+
+									<!-- Focused state -->
+									<SolidColorBrush x:Key="OutlinedTextBoxBorderBrushFocused" Color="Lime" />
+									<SolidColorBrush x:Key="OutlinedTextBoxPlaceholderForegroundFocused" Color="Navy" />
+									<SolidColorBrush x:Key="OutlinedTextBoxForegroundFocused" Color="Pink" />
+
+									<!-- Pointer over state -->
+									<StaticResource x:Key="OutlinedTextBoxPlaceholderForegroundPointerOver" ResourceKey="SecondaryLowBrush" />
+									<StaticResource x:Key="OutlinedTextBoxBorderBrushPointerOver" ResourceKey="SecondaryLowBrush" />
+									<StaticResource x:Key="OutlinedTextBoxForegroundPointerOver" ResourceKey="PrimaryBrush" />
+								</example:ResourceDictionary>
+
+							</StackPanel>
+						</smtx:XamlDisplay>
+
+						<!-- CheckBox -->
+						<smtx:XamlDisplay UniqueKey="LightWeightExtensionSamplePage_MaterialCheckBox"
+										  smtx:XamlDisplayExtensions.Description="The examples contrast ordinary Buttons with others that apply an Extension to override some properties, as defined in the Material/Buttons.xaml ResourceDictionary."
+										  smtx:XamlDisplayExtensions.IgnorePath="XamlDisplay\StackPanel">
+							<StackPanel Spacing="24">
+								<CheckBox Content="Default checkbox style"
+										  Style="{StaticResource MaterialCheckBoxStyle}" />
+								<CheckBox Content="Overridden checkbox style"
+										  Style="{StaticResource MaterialCheckBoxStyle}"
+										  local:ResourceExtensions.OverridePath="ms-appx:///Views/ControlResourcesOverride/Material/CheckBox.xaml" />
+
+								<!-- Material/CheckBox.xaml content: -->
+								<example:ResourceDictionary>
+									<!-- Checked state -->
+									<SolidColorBrush x:Key="CheckBoxGlyphForegroundChecked" Color="Red" />
+									<SolidColorBrush x:Key="CheckBoxBorderBrushChecked" Color="Green" />
+									<SolidColorBrush x:Key="CheckBoxBackgroundChecked" Color="White" />
+
+									<!-- Checked and pointer over state -->
+									<SolidColorBrush x:Key="CheckBoxGlyphForegroundCheckedPointerOver" Color="Blue" />
+									<SolidColorBrush x:Key="CheckBoxBorderBrushCheckedPointerOver" Color="Yellow" />
+									<SolidColorBrush x:Key="CheckBoxBackgroundCheckedPointerOver" Color="Black" />
+
+									<!-- Checked and pressed state -->
+									<SolidColorBrush x:Key="CheckBoxGlyphForegroundPressed" Color="Purple" />
+									<SolidColorBrush x:Key="CheckBoxBorderBrushCheckedPressed" Color="Silver" />
+									<SolidColorBrush x:Key="CheckBoxBackgroundCheckedPressed" Color="Cyan" />
+
+									<!-- Unchecked state -->
+									<StaticResource x:Key="CheckBoxBorderBrushUnchecked" ResourceKey="SecondaryBrush" />
+									<StaticResource x:Key="CheckBoxBackgroundUnchecked" ResourceKey="PrimaryLowBrush" />
+
+									<!-- Unchecked and pressed state -->
+									<SolidColorBrush x:Key="CheckBoxBorderBrushUncheckedPressed" Color="Lime" />
+									<SolidColorBrush x:Key="CheckBoxBackgroundUncheckedPressed" Color="Navy" />
+
+									<!-- Unchecked and pointer over state -->
+									<SolidColorBrush x:Key="CheckBoxBorderBrushUncheckedPointerOver" Color="Maroon" />
+									<SolidColorBrush x:Key="CheckBoxBackgroundUncheckedPointerOver" Color="Olive" />
+								</example:ResourceDictionary>
+							</StackPanel>
+						</smtx:XamlDisplay>
+
+						<!-- RadioButton -->
+						<smtx:XamlDisplay UniqueKey="LightweightExtensionSamplePage_RadioButton_Material"
+										  smtx:XamlDisplayExtensions.Description="The examples contrast ordinary Buttons with others that apply an Extension to override some properties, as defined in the Material/Buttons.xaml ResourceDictionary."
+										  smtx:XamlDisplayExtensions.IgnorePath="XamlDisplay\StackPanel">
+							<StackPanel Spacing="40">
+								<RadioButton GroupName="RadioButton_Material_A"
+											 Content="Default Radio Button Style - Unchecked"
+											 Style="{StaticResource MaterialRadioButtonStyle}" />
+
+								<RadioButton GroupName="RadioButton_Material_A"
+											 IsChecked="True"
+											 Content="Default Radio Button Style - Checked"
+											 Style="{StaticResource MaterialRadioButtonStyle}" />
+
+								<RadioButton GroupName="RadioButton_Material_A"
+											 Content="Default Radio Button Style - Disabled"
+											 IsEnabled="False"
+											 Style="{StaticResource MaterialRadioButtonStyle}" />
+
+								<RadioButton GroupName="RadioButton_Material_B"
+											 Content="Overridden Radio Button Style - Unchecked"
+											 Style="{StaticResource MaterialRadioButtonStyle}"
+											 local:ResourceExtensions.OverridePath="ms-appx:///Views/ControlResourcesOverride/Material/RadioButton.xaml" />
+
+								<!-- Material/RadioButton.xaml content: -->
+								<example:ResourceDictionary>
+									<SolidColorBrush x:Key="RadioButtonForeground" Color="DarkGreen" />
+									<SolidColorBrush x:Key="RadioButtonOuterEllipseStroke" Color="LightGreen" />
+									<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedStroke" Color="DarkGreen" />
+									<SolidColorBrush x:Key="RadioButtonOuterEllipseFill" Color="LightGreen" />
+									<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedFill" Color="DarkGreen" />
+
+									<SolidColorBrush x:Key="RadioButtonForegroundPointerOver" Color="DarkRed" />
+									<SolidColorBrush x:Key="RadioButtonOuterEllipseStrokePointerOver" Color="LightPink" />
+									<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedStrokePointerOver" Color="DarkRed" />
+									<SolidColorBrush x:Key="RadioButtonOuterEllipseFillPointerOver" Color="LightPink" />
+									<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedFillPointerOver" Color="DarkRed" />
+
+									<SolidColorBrush x:Key="RadioButtonForegroundPressed" Color="DarkBlue" />
+									<SolidColorBrush x:Key="RadioButtonOuterEllipseStrokePressed" Color="LightSteelBlue" />
+									<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedStrokePressed" Color="DarkBlue" />
+									<SolidColorBrush x:Key="RadioButtonOuterEllipseFillPressed" Color="LightSteelBlue" />
+									<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedFillPressed" Color="DarkBlue" />
+
+									<SolidColorBrush x:Key="RadioButtonForegroundDisabled" Color="LightSlateGray" />
+									<SolidColorBrush x:Key="RadioButtonOuterEllipseStrokeDisabled" Color="DarkGray" />
+									<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedStrokeDisabled" Color="LightSlateGray" />
+									<SolidColorBrush x:Key="RadioButtonOuterEllipseFillDisabled" Color="DarkGray" />
+									<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedFillDisabled" Color="LightSlateGray" />
+								</example:ResourceDictionary>
+
+
+								<RadioButton GroupName="RadioButton_Material_B"
+											 IsChecked="True"
+											 Content="Overridden Radio Button Style - Checked"
+											 Style="{StaticResource MaterialRadioButtonStyle}"
+											 local:ResourceExtensions.OverridePath="ms-appx:///Views/ControlResourcesOverride/Material/RadioButton.xaml" />
+
+								<RadioButton GroupName="RadioButton_Material_B"
+											 Content="Overridden Radio Button Style - Disabled"
+											 IsEnabled="False"
+											 Style="{StaticResource MaterialRadioButtonStyle}"
+											 local:ResourceExtensions.OverridePath="ms-appx:///Views/ControlResourcesOverride/Material/RadioButton.xaml" />
+							</StackPanel>
+						</smtx:XamlDisplay>
+					</StackPanel>
+				</DataTemplate>
+			</local:SamplePageLayout.MaterialTemplate>
+			<local:SamplePageLayout.FluentTemplate>
+				<DataTemplate>
+					<StackPanel Spacing="20">
+						<!-- Button -->
+						<smtx:XamlDisplay UniqueKey="LightweightExtensionSamplePage_Button_Fluent"
+										  smtx:XamlDisplayExtensions.Description="The examples contrast ordinary Buttons with others that apply an Extension to override some properties, as defined in the Fluent/Buttons.xaml ResourceDictionary."
+										  smtx:XamlDisplayExtensions.IgnorePath="XamlDisplay\StackPanel">
+							<StackPanel Spacing="40">
+								<Button Content="Default Button Style" />
+
+								<Button Content="Overridden Button Style"
+										BorderThickness="2"
+										local:ResourceExtensions.OverridePath="ms-appx:///Views/ControlResourcesOverride/Fluent/Button.xaml" />
+
+								<Button Content="Default Button Style - Disabled"
+										IsEnabled="False" />
+
+								<Button Content="Overridden Button Style - Disabled"
+										BorderThickness="2"
+										IsEnabled="False"
+										local:ResourceExtensions.OverridePath="ms-appx:///Views/ControlResourcesOverride/Fluent/Button.xaml" />
+
+								<!-- Fluent/Button.xaml content: -->
+								<example:ResourceDictionary>
+									<SolidColorBrush x:Key="ButtonForeground" Color="DarkGreen" />
+									<SolidColorBrush x:Key="ButtonBackground" Color="LightGreen" />
+									<SolidColorBrush x:Key="ButtonBorderBrush" Color="DarkGreen" />
+
+									<SolidColorBrush x:Key="ButtonForegroundPointerOver" Color="DarkRed" />
+									<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="LightPink" />
+									<SolidColorBrush x:Key="ButtonBorderBrushPointerOver" Color="DarkRed" />
+
+									<SolidColorBrush x:Key="ButtonForegroundPressed" Color="DarkBlue" />
+									<SolidColorBrush x:Key="ButtonBackgroundPressed" Color="LightSteelBlue" />
+									<SolidColorBrush x:Key="ButtonBorderBrushPressed" Color="DarkBlue" />
+
+									<SolidColorBrush x:Key="ButtonForegroundDisabled" Color="LightSlateGray" />
+									<SolidColorBrush x:Key="ButtonBackgroundDisabled" Color="DarkGray" />
+									<SolidColorBrush x:Key="ButtonBorderBrushDisabled" Color="LightSlateGray" />
+								</example:ResourceDictionary>
+
+							</StackPanel>
+						</smtx:XamlDisplay>
+
+						<!-- TextBox -->
+						<smtx:XamlDisplay UniqueKey="LightWeightExtensionSamplePage_FluentTextBox"
+										  smtx:XamlDisplayExtensions.Description="The example contrasts an ordinary TextBox with another that employs an Extension to override some properties, as defined in the Fluent/TextBox.xaml ResourceDictionary."
+										  smtx:XamlDisplayExtensions.IgnorePath="XamlDisplay\StackPanel">
+							<StackPanel Spacing="24">
+								<TextBox PlaceholderText="Default TextBox Style" />
+
+								<TextBox PlaceholderText="Overriden TextBox Style"
+										 local:ResourceExtensions.OverridePath="ms-appx:///Views/ControlResourcesOverride/Fluent/TextBox.xaml" />
+							</StackPanel>
+
+							<!-- Fluent/TextBox.xaml content: -->
+							<example:ResourceDictionary>
+								<!-- Default State -->
+								<SolidColorBrush x:Key="TextControlForeground" Color="Red" />
+								<SolidColorBrush x:Key="TextControlBackground" Color="Cyan" />
+
+								<!-- Pointer Over State -->
+								<SolidColorBrush x:Key="TextControlButtonBackgroundPointerOver" Color="Orange" />
+								<SolidColorBrush x:Key="TextControlBackgroundPointerOver" Color="Navy" />
+								<SolidColorBrush x:Key="TextControlForegroundPointerOver" Color="Gray" />
+
+								<!-- Focused State -->
+								<SolidColorBrush x:Key="TextControlForegroundFocused" Color="Yellow" />
+								<SolidColorBrush x:Key="TextControlBackgroundFocused" Color="RosyBrown" />
+							</example:ResourceDictionary>
+						</smtx:XamlDisplay>
+
+						<!-- CheckBox -->
+						<smtx:XamlDisplay UniqueKey="LightWeightExtensionSamplePage_FluentCheckBox"
+										  smtx:XamlDisplayExtensions.Description="The example contrasts an ordinary TextBox with another that employs an Extension to override some properties, as defined in the Fluent/TextBox.xaml ResourceDictionary."
+										  smtx:XamlDisplayExtensions.IgnorePath="XamlDisplay\StackPanel">
+							<StackPanel Spacing="24">
+								<CheckBox Content="Default checkbox style"
+										  BorderThickness="2" />
+								<CheckBox Content="Overridden checkbox style"
+										  BorderThickness="2"
+										  local:ResourceExtensions.OverridePath="ms-appx:///Views/ControlResourcesOverride/Fluent/Checkbox.xaml" />
+
+								<!-- Fluent/CheckBox.xaml content: -->
+								<example:ResourceDictionary>
+									<!-- Checked state -->
+									<SolidColorBrush x:Key="CheckBoxGlyphForegroundChecked" Color="Red" />
+									<SolidColorBrush x:Key="CheckBoxBorderBrushChecked" Color="Green" />
+									<SolidColorBrush x:Key="CheckBoxBackgroundChecked" Color="White" />
+
+									<!-- Checked and pointer over state -->
+									<SolidColorBrush x:Key="CheckBoxGlyphForegroundCheckedPointerOver" Color="Blue" />
+									<SolidColorBrush x:Key="CheckBoxBorderBrushCheckedPointerOver" Color="Yellow" />
+									<SolidColorBrush x:Key="CheckBoxBackgroundCheckedPointerOver" Color="Black" />
+
+									<!-- Checked and pressed state -->
+									<SolidColorBrush x:Key="CheckBoxGlyphForegroundPressed" Color="Purple" />
+									<SolidColorBrush x:Key="CheckBoxBorderBrushCheckedPressed" Color="Silver" />
+									<SolidColorBrush x:Key="CheckBoxBackgroundCheckedPressed" Color="Cyan" />
+
+									<!-- Unchecked state -->
+									<StaticResource x:Key="CheckBoxBorderBrushUnchecked" ResourceKey="SecondaryBrush" />
+									<StaticResource x:Key="CheckBoxBackgroundUnchecked" ResourceKey="PrimaryLowBrush" />
+
+									<!-- Unchecked and pressed state -->
+									<SolidColorBrush x:Key="CheckBoxBorderBrushUncheckedPressed" Color="Lime" />
+									<SolidColorBrush x:Key="CheckBoxBackgroundUncheckedPressed" Color="Navy" />
+
+									<!-- Unchecked and pointer over state -->
+									<SolidColorBrush x:Key="CheckBoxBorderBrushUncheckedPointerOver" Color="Maroon" />
+									<SolidColorBrush x:Key="CheckBoxBackgroundUncheckedPointerOver" Color="Olive" />
+								</example:ResourceDictionary>
+
+							</StackPanel>
+						</smtx:XamlDisplay>
+
+						<!-- RadioButton -->
+						<smtx:XamlDisplay UniqueKey="LightweightExtensionSamplePage_RadioButton_Fluent"
+										  smtx:XamlDisplayExtensions.Description="The examples contrast standard RadioButtons with others that employ an Extension to override some properties, as defined in the Fluent/RadioButtons.xaml ResourceDictionary."
+										  smtx:XamlDisplayExtensions.IgnorePath="XamlDisplay\StackPanel">
+							<StackPanel Spacing="40">
+								<RadioButton GroupName="RadioButton_Fluent_A"
+											 Content="Default Radio Button Style - Unchecked" />
+
+								<RadioButton GroupName="RadioButton_Fluentl_A"
+											 IsChecked="True"
+											 Content="Default Radio Button Style - Checked" />
+
+								<RadioButton GroupName="RadioButton_Fluent_A"
+											 Content="Default Radio Button Style - Disabled"
+											 IsEnabled="False" />
+
+								<RadioButton GroupName="RadioButton_Fluent_B"
+											 Content="Overridden Radio Button Style - Unchecked"
+											 local:ResourceExtensions.OverridePath="ms-appx:///Views/ControlResourcesOverride/Fluent/RadioButton.xaml" />
+
+								<!-- Fluent/RadioButton.xaml content: -->
+								<example:ResourceDictionary>
+									<SolidColorBrush x:Key="RadioButtonForeground" Color="DarkGreen" />
+									<SolidColorBrush x:Key="RadioButtonOuterEllipseStroke" Color="LightGreen" />
+									<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedStroke" Color="DarkGreen" />
+									<SolidColorBrush x:Key="RadioButtonOuterEllipseFill" Color="LightGreen" />
+									<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedFill" Color="DarkGreen" />
+
+									<SolidColorBrush x:Key="RadioButtonForegroundPointerOver" Color="DarkRed" />
+									<SolidColorBrush x:Key="RadioButtonOuterEllipseStrokePointerOver" Color="LightPink" />
+									<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedStrokePointerOver" Color="DarkRed" />
+									<SolidColorBrush x:Key="RadioButtonOuterEllipseFillPointerOver" Color="LightPink" />
+									<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedFillPointerOver" Color="DarkRed" />
+
+									<SolidColorBrush x:Key="RadioButtonForegroundPressed" Color="DarkBlue" />
+									<SolidColorBrush x:Key="RadioButtonOuterEllipseStrokePressed" Color="LightSteelBlue" />
+									<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedStrokePressed" Color="DarkBlue" />
+									<SolidColorBrush x:Key="RadioButtonOuterEllipseFillPressed" Color="LightSteelBlue" />
+									<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedFillPressed" Color="DarkBlue" />
+
+									<SolidColorBrush x:Key="RadioButtonForegroundDisabled" Color="LightSlateGray" />
+									<SolidColorBrush x:Key="RadioButtonOuterEllipseStrokeDisabled" Color="DarkGray" />
+									<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedStrokeDisabled" Color="LightSlateGray" />
+									<SolidColorBrush x:Key="RadioButtonOuterEllipseFillDisabled" Color="DarkGray" />
+									<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedFillDisabled" Color="LightSlateGray" />
+								</example:ResourceDictionary>
+
+								<RadioButton GroupName="RadioButton_Fluent_B"
+											 IsChecked="True"
+											 Content="Overridden Radio Button Style - Checked"
+											 local:ResourceExtensions.OverridePath="ms-appx:///Views/ControlResourcesOverride/Fluent/RadioButton.xaml" />
+
+								<RadioButton GroupName="RadioButton_Fluent_B"
+											 Content="Overridden Radio Button Style - Disabled"
+											 IsEnabled="False"
+											 local:ResourceExtensions.OverridePath="ms-appx:///Views/ControlResourcesOverride/Fluent/RadioButton.xaml" />
+							</StackPanel>
+						</smtx:XamlDisplay>
+					</StackPanel>
+				</DataTemplate>
+			</local:SamplePageLayout.FluentTemplate>
+		</local:SamplePageLayout>
+	</Grid>
+</Page>
diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/LightWeightExtensionSameplePage.xaml.cs b/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/LightWeightExtensionSameplePage.xaml.cs
new file mode 100644
index 000000000..5f5b9ee3e
--- /dev/null
+++ b/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/LightWeightExtensionSameplePage.xaml.cs
@@ -0,0 +1,13 @@
+using Microsoft.UI.Xaml.Controls;
+
+namespace Uno.Gallery.Views.SamplePages
+{
+	[SamplePage(SampleCategory.Theming, "Lightweight Extension", Description = "Using an extension with dictionaries centralizes key overrides, promoting reusability and consistency across controls, reducing the need for repetitive per-component customizations.", DocumentationLink = "https://learn.microsoft.com/en-us/windows/apps/design/style/xaml-styles#lightweight-styling")]
+	public sealed partial class LightWeightExtensionSameplePage : Page
+	{
+		public LightWeightExtensionSameplePage()
+		{
+			this.InitializeComponent();
+		}
+	}
+}
diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/Styles/Button.xaml b/Uno.Gallery/Uno.Gallery.Shared/Views/Styles/Button.xaml
index 0aeadf41c..9363f427e 100644
--- a/Uno.Gallery/Uno.Gallery.Shared/Views/Styles/Button.xaml
+++ b/Uno.Gallery/Uno.Gallery.Shared/Views/Styles/Button.xaml
@@ -3,9 +3,17 @@
 					xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 					xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 					xmlns:not_win="http://uno.ui/not_win"
+					xmlns:local="using:Uno.Gallery"
 					xmlns:um="using:Uno.Material"
 					mc:Ignorable="not_win">
 
+	<Style x:Key="OverridenMaterialButton"
+		   BasedOn="{StaticResource MaterialFilledButtonStyle}"
+		   TargetType="Button">
+		<Setter Property="local:ResourceExtensions.OverridePath"
+				Value="ms-appx:///Views/ControlResourcesOverride/Material/Button.xaml" />
+	</Style>
+
 	<!-- Xaml Display Copy Button Style -->
 	<Style x:Key="XamlDisplayCopyButtonStyle"
 		   TargetType="Button">