diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/NeumorphicColorsOverride.xaml b/Uno.Gallery/Uno.Gallery.Shared/Views/NeumorphicColorsOverride.xaml
index ffc1c251c..b7af13cae 100644
--- a/Uno.Gallery/Uno.Gallery.Shared/Views/NeumorphicColorsOverride.xaml
+++ b/Uno.Gallery/Uno.Gallery.Shared/Views/NeumorphicColorsOverride.xaml
@@ -36,973 +36,6 @@
 			<Color x:Key="TertiaryContainerColor">#00497D</Color>
 			<Color x:Key="OnTertiaryContainerColor">#D1E4FF</Color>
 
-			<!-- Workaround to add the SolidColorBrush until https://github.com/unoplatform/Uno.Themes/issues/1145 is fixed -->
-
-			<!--#region PrimaryColor-->
-			<SolidColorBrush x:Key="PrimaryBrush"
-							 Color="{StaticResource PrimaryColor}" />
-			<SolidColorBrush x:Key="PrimaryHoverBrush"
-							 Color="{StaticResource PrimaryColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="PrimaryFocusedBrush"
-							 Color="{StaticResource PrimaryColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryPressedBrush"
-							 Color="{StaticResource PrimaryColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryDraggedBrush"
-							 Color="{StaticResource PrimaryColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="PrimarySelectedBrush"
-							 Color="{StaticResource PrimaryColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryMediumBrush"
-							 Color="{StaticResource PrimaryColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="PrimaryLowBrush"
-							 Color="{StaticResource PrimaryColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="PrimaryDisabledBrush"
-							 Color="{StaticResource PrimaryColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="PrimaryDisabledLowBrush"
-							 Color="{StaticResource PrimaryColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion PrimaryColor-->
-			<!--#region PrimaryInverseColor-->
-			<SolidColorBrush x:Key="PrimaryInverseBrush"
-							 Color="{StaticResource PrimaryInverseColor}" />
-			<SolidColorBrush x:Key="PrimaryInverseHoverBrush"
-							 Color="{StaticResource PrimaryInverseColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="PrimaryInverseFocusedBrush"
-							 Color="{StaticResource PrimaryInverseColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryInversePressedBrush"
-							 Color="{StaticResource PrimaryInverseColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryInverseDraggedBrush"
-							 Color="{StaticResource PrimaryInverseColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryInverseSelectedBrush"
-							 Color="{StaticResource PrimaryInverseColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryInverseMediumBrush"
-							 Color="{StaticResource PrimaryInverseColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="PrimaryInverseLowBrush"
-							 Color="{StaticResource PrimaryInverseColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="PrimaryInverseDisabledBrush"
-							 Color="{StaticResource PrimaryInverseColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="PrimaryInverseDisabledLowBrush"
-							 Color="{StaticResource PrimaryInverseColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion PrimaryInverseColor-->
-			<!--#region OnPrimaryColor-->
-			<SolidColorBrush x:Key="OnPrimaryBrush"
-							 Color="{StaticResource OnPrimaryColor}" />
-			<SolidColorBrush x:Key="OnPrimaryHoverBrush"
-							 Color="{StaticResource OnPrimaryColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="OnPrimaryFocusedBrush"
-							 Color="{StaticResource OnPrimaryColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="OnPrimaryPressedBrush"
-							 Color="{StaticResource OnPrimaryColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="OnPrimaryDraggedBrush"
-							 Color="{StaticResource OnPrimaryColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="OnPrimarySelectedBrush"
-							 Color="{StaticResource OnPrimaryColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="OnPrimaryMediumBrush"
-							 Color="{StaticResource OnPrimaryColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="OnPrimaryLowBrush"
-							 Color="{StaticResource OnPrimaryColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="OnPrimaryDisabledBrush"
-							 Color="{StaticResource OnPrimaryColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="OnPrimaryDisabledLowBrush"
-							 Color="{StaticResource OnPrimaryColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion OnPrimaryColor-->
-			<!--#region PrimaryContainerColor-->
-			<SolidColorBrush x:Key="PrimaryContainerBrush"
-							 Color="{StaticResource PrimaryContainerColor}" />
-			<SolidColorBrush x:Key="PrimaryContainerHoverBrush"
-							 Color="{StaticResource PrimaryContainerColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="PrimaryContainerFocusedBrush"
-							 Color="{StaticResource PrimaryContainerColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryContainerPressedBrush"
-							 Color="{StaticResource PrimaryContainerColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryContainerDraggedBrush"
-							 Color="{StaticResource PrimaryContainerColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryContainerSelectedBrush"
-							 Color="{StaticResource PrimaryContainerColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryContainerMediumBrush"
-							 Color="{StaticResource PrimaryContainerColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="PrimaryContainerLowBrush"
-							 Color="{StaticResource PrimaryContainerColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="PrimaryContainerDisabledBrush"
-							 Color="{StaticResource PrimaryContainerColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="PrimaryContainerDisabledLowBrush"
-							 Color="{StaticResource PrimaryContainerColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion PrimaryContainerColor-->
-			<!--#region OnPrimaryContainerColor-->
-			<SolidColorBrush x:Key="OnPrimaryContainerBrush"
-							 Color="{StaticResource OnPrimaryContainerColor}" />
-			<SolidColorBrush x:Key="OnPrimaryContainerHoverBrush"
-							 Color="{StaticResource OnPrimaryContainerColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="OnPrimaryContainerFocusedBrush"
-							 Color="{StaticResource OnPrimaryContainerColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="OnPrimaryContainerPressedBrush"
-							 Color="{StaticResource OnPrimaryContainerColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="OnPrimaryContainerDraggedBrush"
-							 Color="{StaticResource OnPrimaryContainerColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="OnPrimaryContainerSelectedBrush"
-							 Color="{StaticResource OnPrimaryContainerColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="OnPrimaryContainerMediumBrush"
-							 Color="{StaticResource OnPrimaryContainerColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="OnPrimaryContainerLowBrush"
-							 Color="{StaticResource OnPrimaryContainerColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="OnPrimaryContainerDisabledBrush"
-							 Color="{StaticResource OnPrimaryContainerColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="OnPrimaryContainerDisabledLowBrush"
-							 Color="{StaticResource OnPrimaryContainerColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion OnPrimaryContainerColor-->
-			<!--#region PrimaryVariantLightColor-->
-			<SolidColorBrush x:Key="PrimaryVariantLightBrush"
-							 Color="{StaticResource PrimaryVariantLightColor}" />
-			<SolidColorBrush x:Key="PrimaryVariantLightHoverBrush"
-							 Color="{StaticResource PrimaryVariantLightColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="PrimaryVariantLightFocusedBrush"
-							 Color="{StaticResource PrimaryVariantLightColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryVariantLightPressedBrush"
-							 Color="{StaticResource PrimaryVariantLightColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryVariantLightDraggedBrush"
-							 Color="{StaticResource PrimaryVariantLightColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryVariantLightSelectedBrush"
-							 Color="{StaticResource PrimaryVariantLightColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryVariantLightMediumBrush"
-							 Color="{StaticResource PrimaryVariantLightColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="PrimaryVariantLightLowBrush"
-							 Color="{StaticResource PrimaryVariantLightColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="PrimaryVariantLightDisabledBrush"
-							 Color="{StaticResource PrimaryVariantLightColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="PrimaryVariantLightDisabledLowBrush"
-							 Color="{StaticResource PrimaryVariantLightColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion PrimaryVariantLightColor-->
-			<!--#region PrimaryVariantDarkColor-->
-			<SolidColorBrush x:Key="PrimaryVariantDarkBrush"
-							 Color="{StaticResource PrimaryVariantDarkColor}" />
-			<SolidColorBrush x:Key="PrimaryVariantDarkHoverBrush"
-							 Color="{StaticResource PrimaryVariantDarkColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="PrimaryVariantDarkFocusedBrush"
-							 Color="{StaticResource PrimaryVariantDarkColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryVariantDarkPressedBrush"
-							 Color="{StaticResource PrimaryVariantDarkColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryVariantDarkDraggedBrush"
-							 Color="{StaticResource PrimaryVariantDarkColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryVariantDarkSelectedBrush"
-							 Color="{StaticResource PrimaryVariantDarkColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryVariantDarkMediumBrush"
-							 Color="{StaticResource PrimaryVariantDarkColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="PrimaryVariantDarkLowBrush"
-							 Color="{StaticResource PrimaryVariantDarkColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="PrimaryVariantDarkDisabledBrush"
-							 Color="{StaticResource PrimaryVariantDarkColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="PrimaryVariantDarkDisabledLowBrush"
-							 Color="{StaticResource PrimaryVariantDarkColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion PrimaryVariantDarkColor-->
-			<!--#region SecondaryColor-->
-			<SolidColorBrush x:Key="SecondaryBrush"
-							 Color="{StaticResource SecondaryColor}" />
-			<SolidColorBrush x:Key="SecondaryHoverBrush"
-							 Color="{StaticResource SecondaryColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="SecondaryFocusedBrush"
-							 Color="{StaticResource SecondaryColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="SecondaryPressedBrush"
-							 Color="{StaticResource SecondaryColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="SecondaryDraggedBrush"
-							 Color="{StaticResource SecondaryColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="SecondarySelectedBrush"
-							 Color="{StaticResource SecondaryColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="SecondaryMediumBrush"
-							 Color="{StaticResource SecondaryColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="SecondaryLowBrush"
-							 Color="{StaticResource SecondaryColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="SecondaryDisabledBrush"
-							 Color="{StaticResource SecondaryColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="SecondaryDisabledLowBrush"
-							 Color="{StaticResource SecondaryColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion SecondaryColor-->
-			<!--#region OnSecondaryColor-->
-			<SolidColorBrush x:Key="OnSecondaryBrush"
-							 Color="{StaticResource OnSecondaryColor}" />
-			<SolidColorBrush x:Key="OnSecondaryHoverBrush"
-							 Color="{StaticResource OnSecondaryColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="OnSecondaryFocusedBrush"
-							 Color="{StaticResource OnSecondaryColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="OnSecondaryPressedBrush"
-							 Color="{StaticResource OnSecondaryColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="OnSecondaryDraggedBrush"
-							 Color="{StaticResource OnSecondaryColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="OnSecondarySelectedBrush"
-							 Color="{StaticResource OnSecondaryColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="OnSecondaryMediumBrush"
-							 Color="{StaticResource OnSecondaryColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="OnSecondaryLowBrush"
-							 Color="{StaticResource OnSecondaryColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="OnSecondaryDisabledBrush"
-							 Color="{StaticResource OnSecondaryColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="OnSecondaryDisabledLowBrush"
-							 Color="{StaticResource OnSecondaryColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion OnSecondaryColor-->
-			<!--#region SecondaryContainerColor-->
-			<SolidColorBrush x:Key="SecondaryContainerBrush"
-							 Color="{StaticResource SecondaryContainerColor}" />
-			<SolidColorBrush x:Key="SecondaryContainerHoverBrush"
-							 Color="{StaticResource SecondaryContainerColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="SecondaryContainerFocusedBrush"
-							 Color="{StaticResource SecondaryContainerColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="SecondaryContainerPressedBrush"
-							 Color="{StaticResource SecondaryContainerColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="SecondaryContainerDraggedBrush"
-							 Color="{StaticResource SecondaryContainerColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="SecondaryContainerSelectedBrush"
-							 Color="{StaticResource SecondaryContainerColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="SecondaryContainerMediumBrush"
-							 Color="{StaticResource SecondaryContainerColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="SecondaryContainerLowBrush"
-							 Color="{StaticResource SecondaryContainerColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="SecondaryContainerDisabledBrush"
-							 Color="{StaticResource SecondaryContainerColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="SecondaryContainerDisabledLowBrush"
-							 Color="{StaticResource SecondaryContainerColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion SecondaryContainerColor-->
-			<!--#region OnSecondaryContainerColor-->
-			<SolidColorBrush x:Key="OnSecondaryContainerBrush"
-							 Color="{StaticResource OnSecondaryContainerColor}" />
-			<SolidColorBrush x:Key="OnSecondaryContainerHoverBrush"
-							 Color="{StaticResource OnSecondaryContainerColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="OnSecondaryContainerFocusedBrush"
-							 Color="{StaticResource OnSecondaryContainerColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="OnSecondaryContainerPressedBrush"
-							 Color="{StaticResource OnSecondaryContainerColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="OnSecondaryContainerDraggedBrush"
-							 Color="{StaticResource OnSecondaryContainerColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="OnSecondaryContainerSelectedBrush"
-							 Color="{StaticResource OnSecondaryContainerColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="OnSecondaryContainerMediumBrush"
-							 Color="{StaticResource OnSecondaryContainerColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="OnSecondaryContainerLowBrush"
-							 Color="{StaticResource OnSecondaryContainerColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="OnSecondaryContainerDisabledBrush"
-							 Color="{StaticResource OnSecondaryContainerColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="OnSecondaryContainerDisabledLowBrush"
-							 Color="{StaticResource OnSecondaryContainerColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion OnSecondaryContainerColor-->
-			<!--#region SecondaryVariantLightColor-->
-			<SolidColorBrush x:Key="SecondaryVariantLightBrush"
-							 Color="{StaticResource SecondaryVariantLightColor}" />
-			<SolidColorBrush x:Key="SecondaryVariantLightHoverBrush"
-							 Color="{StaticResource SecondaryVariantLightColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="SecondaryVariantLightFocusedBrush"
-							 Color="{StaticResource SecondaryVariantLightColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="SecondaryVariantLightPressedBrush"
-							 Color="{StaticResource SecondaryVariantLightColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="SecondaryVariantLightDraggedBrush"
-							 Color="{StaticResource SecondaryVariantLightColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="SecondaryVariantLightSelectedBrush"
-							 Color="{StaticResource SecondaryVariantLightColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="SecondaryVariantLightMediumBrush"
-							 Color="{StaticResource SecondaryVariantLightColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="SecondaryVariantLightLowBrush"
-							 Color="{StaticResource SecondaryVariantLightColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="SecondaryVariantLightDisabledBrush"
-							 Color="{StaticResource SecondaryVariantLightColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="SecondaryVariantLightDisabledLowBrush"
-							 Color="{StaticResource SecondaryVariantLightColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion SecondaryVariantLightColor-->
-			<!--#region SecondaryVariantDarkColor-->
-			<SolidColorBrush x:Key="SecondaryVariantDarkBrush"
-							 Color="{StaticResource SecondaryVariantDarkColor}" />
-			<SolidColorBrush x:Key="SecondaryVariantDarkHoverBrush"
-							 Color="{StaticResource SecondaryVariantDarkColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="SecondaryVariantDarkFocusedBrush"
-							 Color="{StaticResource SecondaryVariantDarkColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="SecondaryVariantDarkPressedBrush"
-							 Color="{StaticResource SecondaryVariantDarkColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="SecondaryVariantDarkDraggedBrush"
-							 Color="{StaticResource SecondaryVariantDarkColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="SecondaryVariantDarkSelectedBrush"
-							 Color="{StaticResource SecondaryVariantDarkColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="SecondaryVariantDarkMediumBrush"
-							 Color="{StaticResource SecondaryVariantDarkColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="SecondaryVariantDarkLowBrush"
-							 Color="{StaticResource SecondaryVariantDarkColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="SecondaryVariantDarkDisabledBrush"
-							 Color="{StaticResource SecondaryVariantDarkColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="SecondaryVariantDarkDisabledLowBrush"
-							 Color="{StaticResource SecondaryVariantDarkColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion SecondaryVariantDarkColor-->
-			<!--#region TertiaryColor-->
-			<SolidColorBrush x:Key="TertiaryBrush"
-							 Color="{StaticResource TertiaryColor}" />
-			<SolidColorBrush x:Key="TertiaryHoverBrush"
-							 Color="{StaticResource TertiaryColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="TertiaryFocusedBrush"
-							 Color="{StaticResource TertiaryColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="TertiaryPressedBrush"
-							 Color="{StaticResource TertiaryColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="TertiaryDraggedBrush"
-							 Color="{StaticResource TertiaryColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="TertiarySelectedBrush"
-							 Color="{StaticResource TertiaryColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="TertiaryMediumBrush"
-							 Color="{StaticResource TertiaryColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="TertiaryLowBrush"
-							 Color="{StaticResource TertiaryColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="TertiaryDisabledBrush"
-							 Color="{StaticResource TertiaryColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="TertiaryDisabledLowBrush"
-							 Color="{StaticResource TertiaryColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion TertiaryColor-->
-			<!--#region OnTertiaryColor-->
-			<SolidColorBrush x:Key="OnTertiaryBrush"
-							 Color="{StaticResource OnTertiaryColor}" />
-			<SolidColorBrush x:Key="OnTertiaryHoverBrush"
-							 Color="{StaticResource OnTertiaryColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="OnTertiaryFocusedBrush"
-							 Color="{StaticResource OnTertiaryColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="OnTertiaryPressedBrush"
-							 Color="{StaticResource OnTertiaryColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="OnTertiaryDraggedBrush"
-							 Color="{StaticResource OnTertiaryColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="OnTertiarySelectedBrush"
-							 Color="{StaticResource OnTertiaryColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="OnTertiaryMediumBrush"
-							 Color="{StaticResource OnTertiaryColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="OnTertiaryLowBrush"
-							 Color="{StaticResource OnTertiaryColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="OnTertiaryDisabledBrush"
-							 Color="{StaticResource OnTertiaryColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="OnTertiaryDisabledLowBrush"
-							 Color="{StaticResource OnTertiaryColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion OnTertiaryColor-->
-			<!--#region TertiaryContainerColor-->
-			<SolidColorBrush x:Key="TertiaryContainerBrush"
-							 Color="{StaticResource TertiaryContainerColor}" />
-			<SolidColorBrush x:Key="TertiaryContainerHoverBrush"
-							 Color="{StaticResource TertiaryContainerColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="TertiaryContainerFocusedBrush"
-							 Color="{StaticResource TertiaryContainerColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="TertiaryContainerPressedBrush"
-							 Color="{StaticResource TertiaryContainerColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="TertiaryContainerDraggedBrush"
-							 Color="{StaticResource TertiaryContainerColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="TertiaryContainerSelectedBrush"
-							 Color="{StaticResource TertiaryContainerColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="TertiaryContainerMediumBrush"
-							 Color="{StaticResource TertiaryContainerColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="TertiaryContainerLowBrush"
-							 Color="{StaticResource TertiaryContainerColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="TertiaryContainerDisabledBrush"
-							 Color="{StaticResource TertiaryContainerColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="TertiaryContainerDisabledLowBrush"
-							 Color="{StaticResource TertiaryContainerColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion TertiaryContainerColor-->
-			<!--#region OnTertiaryContainerColor-->
-			<SolidColorBrush x:Key="OnTertiaryContainerBrush"
-							 Color="{StaticResource OnTertiaryContainerColor}" />
-			<SolidColorBrush x:Key="OnTertiaryContainerHoverBrush"
-							 Color="{StaticResource OnTertiaryContainerColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="OnTertiaryContainerFocusedBrush"
-							 Color="{StaticResource OnTertiaryContainerColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="OnTertiaryContainerPressedBrush"
-							 Color="{StaticResource OnTertiaryContainerColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="OnTertiaryContainerDraggedBrush"
-							 Color="{StaticResource OnTertiaryContainerColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="OnTertiaryContainerSelectedBrush"
-							 Color="{StaticResource OnTertiaryContainerColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="OnTertiaryContainerMediumBrush"
-							 Color="{StaticResource OnTertiaryContainerColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="OnTertiaryContainerLowBrush"
-							 Color="{StaticResource OnTertiaryContainerColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="OnTertiaryContainerDisabledBrush"
-							 Color="{StaticResource OnTertiaryContainerColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="OnTertiaryContainerDisabledLowBrush"
-							 Color="{StaticResource OnTertiaryContainerColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion OnTertiaryContainerColor-->
-			<!--#region ErrorColor-->
-			<SolidColorBrush x:Key="ErrorBrush"
-							 Color="{StaticResource ErrorColor}" />
-			<SolidColorBrush x:Key="ErrorHoverBrush"
-							 Color="{StaticResource ErrorColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="ErrorFocusedBrush"
-							 Color="{StaticResource ErrorColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="ErrorPressedBrush"
-							 Color="{StaticResource ErrorColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="ErrorDraggedBrush"
-							 Color="{StaticResource ErrorColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="ErrorSelectedBrush"
-							 Color="{StaticResource ErrorColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="ErrorMediumBrush"
-							 Color="{StaticResource ErrorColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="ErrorLowBrush"
-							 Color="{StaticResource ErrorColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="ErrorDisabledBrush"
-							 Color="{StaticResource ErrorColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="ErrorDisabledLowBrush"
-							 Color="{StaticResource ErrorColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion ErrorColor-->
-			<!--#region OnErrorColor-->
-			<SolidColorBrush x:Key="OnErrorBrush"
-							 Color="{StaticResource OnErrorColor}" />
-			<SolidColorBrush x:Key="OnErrorHoverBrush"
-							 Color="{StaticResource OnErrorColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="OnErrorFocusedBrush"
-							 Color="{StaticResource OnErrorColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="OnErrorPressedBrush"
-							 Color="{StaticResource OnErrorColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="OnErrorDraggedBrush"
-							 Color="{StaticResource OnErrorColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="OnErrorSelectedBrush"
-							 Color="{StaticResource OnErrorColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="OnErrorMediumBrush"
-							 Color="{StaticResource OnErrorColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="OnErrorLowBrush"
-							 Color="{StaticResource OnErrorColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="OnErrorDisabledBrush"
-							 Color="{StaticResource OnErrorColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="OnErrorDisabledLowBrush"
-							 Color="{StaticResource OnErrorColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion OnErrorColor-->
-			<!--#region ErrorContainerColor-->
-			<SolidColorBrush x:Key="ErrorContainerBrush"
-							 Color="{StaticResource ErrorContainerColor}" />
-			<SolidColorBrush x:Key="ErrorContainerHoverBrush"
-							 Color="{StaticResource ErrorContainerColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="ErrorContainerFocusedBrush"
-							 Color="{StaticResource ErrorContainerColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="ErrorContainerPressedBrush"
-							 Color="{StaticResource ErrorContainerColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="ErrorContainerDraggedBrush"
-							 Color="{StaticResource ErrorContainerColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="ErrorContainerSelectedBrush"
-							 Color="{StaticResource ErrorContainerColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="ErrorContainerMediumBrush"
-							 Color="{StaticResource ErrorContainerColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="ErrorContainerLowBrush"
-							 Color="{StaticResource ErrorContainerColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="ErrorContainerDisabledBrush"
-							 Color="{StaticResource ErrorContainerColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="ErrorContainerDisabledLowBrush"
-							 Color="{StaticResource ErrorContainerColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion ErrorContainerColor-->
-			<!--#region OnErrorContainerColor-->
-			<SolidColorBrush x:Key="OnErrorContainerBrush"
-							 Color="{StaticResource OnErrorContainerColor}" />
-			<SolidColorBrush x:Key="OnErrorContainerHoverBrush"
-							 Color="{StaticResource OnErrorContainerColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="OnErrorContainerFocusedBrush"
-							 Color="{StaticResource OnErrorContainerColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="OnErrorContainerPressedBrush"
-							 Color="{StaticResource OnErrorContainerColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="OnErrorContainerDraggedBrush"
-							 Color="{StaticResource OnErrorContainerColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="OnErrorContainerSelectedBrush"
-							 Color="{StaticResource OnErrorContainerColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="OnErrorContainerMediumBrush"
-							 Color="{StaticResource OnErrorContainerColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="OnErrorContainerLowBrush"
-							 Color="{StaticResource OnErrorContainerColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="OnErrorContainerDisabledBrush"
-							 Color="{StaticResource OnErrorContainerColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="OnErrorContainerDisabledLowBrush"
-							 Color="{StaticResource OnErrorContainerColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion OnErrorContainerColor-->
-			<!--#region BackgroundColor-->
-			<SolidColorBrush x:Key="BackgroundBrush"
-							 Color="{StaticResource BackgroundColor}" />
-			<SolidColorBrush x:Key="BackgroundHoverBrush"
-							 Color="{StaticResource BackgroundColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="BackgroundFocusedBrush"
-							 Color="{StaticResource BackgroundColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="BackgroundPressedBrush"
-							 Color="{StaticResource BackgroundColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="BackgroundDraggedBrush"
-							 Color="{StaticResource BackgroundColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="BackgroundSelectedBrush"
-							 Color="{StaticResource BackgroundColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="BackgroundMediumBrush"
-							 Color="{StaticResource BackgroundColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="BackgroundLowBrush"
-							 Color="{StaticResource BackgroundColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="BackgroundDisabledBrush"
-							 Color="{StaticResource BackgroundColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="BackgroundDisabledLowBrush"
-							 Color="{StaticResource BackgroundColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion BackgroundColor-->
-			<!--#region OnBackgroundColor-->
-			<SolidColorBrush x:Key="OnBackgroundBrush"
-							 Color="{StaticResource OnBackgroundColor}" />
-			<SolidColorBrush x:Key="OnBackgroundHoverBrush"
-							 Color="{StaticResource OnBackgroundColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="OnBackgroundFocusedBrush"
-							 Color="{StaticResource OnBackgroundColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="OnBackgroundPressedBrush"
-							 Color="{StaticResource OnBackgroundColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="OnBackgroundDraggedBrush"
-							 Color="{StaticResource OnBackgroundColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="OnBackgroundSelectedBrush"
-							 Color="{StaticResource OnBackgroundColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="OnBackgroundMediumBrush"
-							 Color="{StaticResource OnBackgroundColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="OnBackgroundLowBrush"
-							 Color="{StaticResource OnBackgroundColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="OnBackgroundDisabledBrush"
-							 Color="{StaticResource OnBackgroundColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="OnBackgroundDisabledLowBrush"
-							 Color="{StaticResource OnBackgroundColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion OnBackgroundColor-->
-			<!--#region SurfaceColor-->
-			<SolidColorBrush x:Key="SurfaceBrush"
-							 Color="{StaticResource SurfaceColor}" />
-			<SolidColorBrush x:Key="SurfaceHoverBrush"
-							 Color="{StaticResource SurfaceColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="SurfaceFocusedBrush"
-							 Color="{StaticResource SurfaceColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="SurfacePressedBrush"
-							 Color="{StaticResource SurfaceColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="SurfaceDraggedBrush"
-							 Color="{StaticResource SurfaceColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="SurfaceSelectedBrush"
-							 Color="{StaticResource SurfaceColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="SurfaceMediumBrush"
-							 Color="{StaticResource SurfaceColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="SurfaceLowBrush"
-							 Color="{StaticResource SurfaceColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="SurfaceDisabledBrush"
-							 Color="{StaticResource SurfaceColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="SurfaceDisabledLowBrush"
-							 Color="{StaticResource SurfaceColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion SurfaceColor-->
-			<!--#region OnSurfaceColor-->
-			<SolidColorBrush x:Key="OnSurfaceBrush"
-							 Color="{StaticResource OnSurfaceColor}" />
-			<SolidColorBrush x:Key="OnSurfaceHoverBrush"
-							 Color="{StaticResource OnSurfaceColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceFocusedBrush"
-							 Color="{StaticResource OnSurfaceColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="OnSurfacePressedBrush"
-							 Color="{StaticResource OnSurfaceColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceDraggedBrush"
-							 Color="{StaticResource OnSurfaceColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceSelectedBrush"
-							 Color="{StaticResource OnSurfaceColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceMediumBrush"
-							 Color="{StaticResource OnSurfaceColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceLowBrush"
-							 Color="{StaticResource OnSurfaceColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceDisabledBrush"
-							 Color="{StaticResource OnSurfaceColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceDisabledLowBrush"
-							 Color="{StaticResource OnSurfaceColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion OnSurfaceColor-->
-			<!--#region SurfaceVariantColor-->
-			<SolidColorBrush x:Key="SurfaceVariantBrush"
-							 Color="{StaticResource SurfaceVariantColor}" />
-			<SolidColorBrush x:Key="SurfaceVariantHoverBrush"
-							 Color="{StaticResource SurfaceVariantColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="SurfaceVariantFocusedBrush"
-							 Color="{StaticResource SurfaceVariantColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="SurfaceVariantPressedBrush"
-							 Color="{StaticResource SurfaceVariantColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="SurfaceVariantDraggedBrush"
-							 Color="{StaticResource SurfaceVariantColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="SurfaceVariantSelectedBrush"
-							 Color="{StaticResource SurfaceVariantColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="SurfaceVariantMediumBrush"
-							 Color="{StaticResource SurfaceVariantColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="SurfaceVariantLowBrush"
-							 Color="{StaticResource SurfaceVariantColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="SurfaceVariantDisabledBrush"
-							 Color="{StaticResource SurfaceVariantColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="SurfaceVariantDisabledLowBrush"
-							 Color="{StaticResource SurfaceVariantColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion SurfaceVariantColor-->
-			<!--#region OnSurfaceVariantColor-->
-			<SolidColorBrush x:Key="OnSurfaceVariantBrush"
-							 Color="{StaticResource OnSurfaceVariantColor}" />
-			<SolidColorBrush x:Key="OnSurfaceVariantHoverBrush"
-							 Color="{StaticResource OnSurfaceVariantColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceVariantFocusedBrush"
-							 Color="{StaticResource OnSurfaceVariantColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceVariantPressedBrush"
-							 Color="{StaticResource OnSurfaceVariantColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceVariantDraggedBrush"
-							 Color="{StaticResource OnSurfaceVariantColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceVariantSelectedBrush"
-							 Color="{StaticResource OnSurfaceVariantColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceVariantMediumBrush"
-							 Color="{StaticResource OnSurfaceVariantColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceVariantLowBrush"
-							 Color="{StaticResource OnSurfaceVariantColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceVariantDisabledBrush"
-							 Color="{StaticResource OnSurfaceVariantColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceVariantDisabledLowBrush"
-							 Color="{StaticResource OnSurfaceVariantColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion OnSurfaceVariantColor-->
-			<!--#region SurfaceInverseColor-->
-			<SolidColorBrush x:Key="SurfaceInverseBrush"
-							 Color="{StaticResource SurfaceInverseColor}" />
-			<SolidColorBrush x:Key="SurfaceInverseHoverBrush"
-							 Color="{StaticResource SurfaceInverseColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="SurfaceInverseFocusedBrush"
-							 Color="{StaticResource SurfaceInverseColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="SurfaceInversePressedBrush"
-							 Color="{StaticResource SurfaceInverseColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="SurfaceInverseDraggedBrush"
-							 Color="{StaticResource SurfaceInverseColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="SurfaceInverseSelectedBrush"
-							 Color="{StaticResource SurfaceInverseColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="SurfaceInverseMediumBrush"
-							 Color="{StaticResource SurfaceInverseColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="SurfaceInverseLowBrush"
-							 Color="{StaticResource SurfaceInverseColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="SurfaceInverseDisabledBrush"
-							 Color="{StaticResource SurfaceInverseColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="SurfaceInverseDisabledLowBrush"
-							 Color="{StaticResource SurfaceInverseColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion SurfaceInverseColor-->
-			<!--#region OnSurfaceInverseColor-->
-			<SolidColorBrush x:Key="OnSurfaceInverseBrush"
-							 Color="{StaticResource OnSurfaceInverseColor}" />
-			<SolidColorBrush x:Key="OnSurfaceInverseHoverBrush"
-							 Color="{StaticResource OnSurfaceInverseColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceInverseFocusedBrush"
-							 Color="{StaticResource OnSurfaceInverseColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceInversePressedBrush"
-							 Color="{StaticResource OnSurfaceInverseColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceInverseDraggedBrush"
-							 Color="{StaticResource OnSurfaceInverseColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceInverseSelectedBrush"
-							 Color="{StaticResource OnSurfaceInverseColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceInverseMediumBrush"
-							 Color="{StaticResource OnSurfaceInverseColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceInverseLowBrush"
-							 Color="{StaticResource OnSurfaceInverseColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceInverseDisabledBrush"
-							 Color="{StaticResource OnSurfaceInverseColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceInverseDisabledLowBrush"
-							 Color="{StaticResource OnSurfaceInverseColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion OnSurfaceInverseColor-->
-			<!--#region OutlineColor-->
-			<SolidColorBrush x:Key="OutlineBrush"
-							 Color="{StaticResource OutlineColor}" />
-			<SolidColorBrush x:Key="OutlineHoverBrush"
-							 Color="{StaticResource OutlineColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="OutlineFocusedBrush"
-							 Color="{StaticResource OutlineColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="OutlinePressedBrush"
-							 Color="{StaticResource OutlineColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="OutlineDraggedBrush"
-							 Color="{StaticResource OutlineColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="OutlineSelectedBrush"
-							 Color="{StaticResource OutlineColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="OutlineMediumBrush"
-							 Color="{StaticResource OutlineColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="OutlineLowBrush"
-							 Color="{StaticResource OutlineColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="OutlineDisabledBrush"
-							 Color="{StaticResource OutlineColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="OutlineDisabledLowBrush"
-							 Color="{StaticResource OutlineColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion OutlineColor-->
-			<!--#region OutlineVariantColor-->
-			<SolidColorBrush x:Key="OutlineVariantBrush"
-							 Color="{StaticResource OutlineVariantColor}" />
-			<SolidColorBrush x:Key="OutlineVariantHoverBrush"
-							 Color="{StaticResource OutlineVariantColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="OutlineVariantFocusedBrush"
-							 Color="{StaticResource OutlineVariantColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="OutlineVariantPressedBrush"
-							 Color="{StaticResource OutlineVariantColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="OutlineVariantDraggedBrush"
-							 Color="{StaticResource OutlineVariantColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="OutlineVariantSelectedBrush"
-							 Color="{StaticResource OutlineVariantColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="OutlineVariantMediumBrush"
-							 Color="{StaticResource OutlineVariantColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="OutlineVariantLowBrush"
-							 Color="{StaticResource OutlineVariantColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="OutlineVariantDisabledBrush"
-							 Color="{StaticResource OutlineVariantColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="OutlineVariantDisabledLowBrush"
-							 Color="{StaticResource OutlineVariantColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion OutlineColor-->
-
-			<SolidColorBrush x:Key="SurfaceTintBrush"
-							 Color="{StaticResource SurfaceTintColor}" />
-
 		</ResourceDictionary>
 
 		<ResourceDictionary x:Key="Light">
@@ -1040,943 +73,6 @@
 			<Color x:Key="TertiaryContainerColor">#CFE4FF</Color>
 			<Color x:Key="OnTertiaryContainerColor">#001D36</Color>
 
-			<!-- Workaround to add the SolidColorBrush until https://github.com/unoplatform/Uno.Themes/issues/1145 is fixed -->
-
-			<!--#region PrimaryColor-->
-			<SolidColorBrush x:Key="PrimaryBrush"
-							 Color="{StaticResource PrimaryColor}" />
-			<SolidColorBrush x:Key="PrimaryHoverBrush"
-							 Color="{StaticResource PrimaryColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="PrimaryFocusedBrush"
-							 Color="{StaticResource PrimaryColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryPressedBrush"
-							 Color="{StaticResource PrimaryColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryDraggedBrush"
-							 Color="{StaticResource PrimaryColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="PrimarySelectedBrush"
-							 Color="{StaticResource PrimaryColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryMediumBrush"
-							 Color="{StaticResource PrimaryColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="PrimaryLowBrush"
-							 Color="{StaticResource PrimaryColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="PrimaryDisabledBrush"
-							 Color="{StaticResource PrimaryColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="PrimaryDisabledLowBrush"
-							 Color="{StaticResource PrimaryColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion PrimaryColor-->
-			<!--#region PrimaryInverseColor-->
-			<SolidColorBrush x:Key="PrimaryInverseBrush"
-							 Color="{StaticResource PrimaryInverseColor}" />
-			<SolidColorBrush x:Key="PrimaryInverseHoverBrush"
-							 Color="{StaticResource PrimaryInverseColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="PrimaryInverseFocusedBrush"
-							 Color="{StaticResource PrimaryInverseColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryInversePressedBrush"
-							 Color="{StaticResource PrimaryInverseColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryInverseDraggedBrush"
-							 Color="{StaticResource PrimaryInverseColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryInverseSelectedBrush"
-							 Color="{StaticResource PrimaryInverseColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryInverseMediumBrush"
-							 Color="{StaticResource PrimaryInverseColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="PrimaryInverseLowBrush"
-							 Color="{StaticResource PrimaryInverseColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="PrimaryInverseDisabledBrush"
-							 Color="{StaticResource PrimaryInverseColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="PrimaryInverseDisabledLowBrush"
-							 Color="{StaticResource PrimaryInverseColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion PrimaryInverseColor-->
-			<!--#region OnPrimaryColor-->
-			<SolidColorBrush x:Key="OnPrimaryBrush"
-							 Color="{StaticResource OnPrimaryColor}" />
-			<SolidColorBrush x:Key="OnPrimaryHoverBrush"
-							 Color="{StaticResource OnPrimaryColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="OnPrimaryFocusedBrush"
-							 Color="{StaticResource OnPrimaryColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="OnPrimaryPressedBrush"
-							 Color="{StaticResource OnPrimaryColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="OnPrimaryDraggedBrush"
-							 Color="{StaticResource OnPrimaryColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="OnPrimarySelectedBrush"
-							 Color="{StaticResource OnPrimaryColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="OnPrimaryMediumBrush"
-							 Color="{StaticResource OnPrimaryColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="OnPrimaryLowBrush"
-							 Color="{StaticResource OnPrimaryColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="OnPrimaryDisabledBrush"
-							 Color="{StaticResource OnPrimaryColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="OnPrimaryDisabledLowBrush"
-							 Color="{StaticResource OnPrimaryColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion OnPrimaryColor-->
-			<!--#region PrimaryContainerColor-->
-			<SolidColorBrush x:Key="PrimaryContainerBrush"
-							 Color="{StaticResource PrimaryContainerColor}" />
-			<SolidColorBrush x:Key="PrimaryContainerHoverBrush"
-							 Color="{StaticResource PrimaryContainerColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="PrimaryContainerFocusedBrush"
-							 Color="{StaticResource PrimaryContainerColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryContainerPressedBrush"
-							 Color="{StaticResource PrimaryContainerColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryContainerDraggedBrush"
-							 Color="{StaticResource PrimaryContainerColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryContainerSelectedBrush"
-							 Color="{StaticResource PrimaryContainerColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryContainerMediumBrush"
-							 Color="{StaticResource PrimaryContainerColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="PrimaryContainerLowBrush"
-							 Color="{StaticResource PrimaryContainerColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="PrimaryContainerDisabledBrush"
-							 Color="{StaticResource PrimaryContainerColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="PrimaryContainerDisabledLowBrush"
-							 Color="{StaticResource PrimaryContainerColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion PrimaryContainerColor-->
-			<!--#region OnPrimaryContainerColor-->
-			<SolidColorBrush x:Key="OnPrimaryContainerBrush"
-							 Color="{StaticResource OnPrimaryContainerColor}" />
-			<SolidColorBrush x:Key="OnPrimaryContainerHoverBrush"
-							 Color="{StaticResource OnPrimaryContainerColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="OnPrimaryContainerFocusedBrush"
-							 Color="{StaticResource OnPrimaryContainerColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="OnPrimaryContainerPressedBrush"
-							 Color="{StaticResource OnPrimaryContainerColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="OnPrimaryContainerDraggedBrush"
-							 Color="{StaticResource OnPrimaryContainerColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="OnPrimaryContainerSelectedBrush"
-							 Color="{StaticResource OnPrimaryContainerColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="OnPrimaryContainerMediumBrush"
-							 Color="{StaticResource OnPrimaryContainerColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="OnPrimaryContainerLowBrush"
-							 Color="{StaticResource OnPrimaryContainerColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="OnPrimaryContainerDisabledBrush"
-							 Color="{StaticResource OnPrimaryContainerColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="OnPrimaryContainerDisabledLowBrush"
-							 Color="{StaticResource OnPrimaryContainerColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion OnPrimaryContainerColor-->
-			<!--#region PrimaryVariantLightColor-->
-			<SolidColorBrush x:Key="PrimaryVariantLightBrush"
-							 Color="{StaticResource PrimaryVariantLightColor}" />
-			<SolidColorBrush x:Key="PrimaryVariantLightHoverBrush"
-							 Color="{StaticResource PrimaryVariantLightColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="PrimaryVariantLightFocusedBrush"
-							 Color="{StaticResource PrimaryVariantLightColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryVariantLightPressedBrush"
-							 Color="{StaticResource PrimaryVariantLightColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryVariantLightDraggedBrush"
-							 Color="{StaticResource PrimaryVariantLightColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryVariantLightSelectedBrush"
-							 Color="{StaticResource PrimaryVariantLightColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryVariantLightMediumBrush"
-							 Color="{StaticResource PrimaryVariantLightColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="PrimaryVariantLightLowBrush"
-							 Color="{StaticResource PrimaryVariantLightColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="PrimaryVariantLightDisabledBrush"
-							 Color="{StaticResource PrimaryVariantLightColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="PrimaryVariantLightDisabledLowBrush"
-							 Color="{StaticResource PrimaryVariantLightColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion PrimaryVariantLightColor-->
-			<!--#region PrimaryVariantDarkColor-->
-			<SolidColorBrush x:Key="PrimaryVariantDarkBrush"
-							 Color="{StaticResource PrimaryVariantDarkColor}" />
-			<SolidColorBrush x:Key="PrimaryVariantDarkHoverBrush"
-							 Color="{StaticResource PrimaryVariantDarkColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="PrimaryVariantDarkFocusedBrush"
-							 Color="{StaticResource PrimaryVariantDarkColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryVariantDarkPressedBrush"
-							 Color="{StaticResource PrimaryVariantDarkColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryVariantDarkDraggedBrush"
-							 Color="{StaticResource PrimaryVariantDarkColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryVariantDarkSelectedBrush"
-							 Color="{StaticResource PrimaryVariantDarkColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="PrimaryVariantDarkMediumBrush"
-							 Color="{StaticResource PrimaryVariantDarkColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="PrimaryVariantDarkLowBrush"
-							 Color="{StaticResource PrimaryVariantDarkColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="PrimaryVariantDarkDisabledBrush"
-							 Color="{StaticResource PrimaryVariantDarkColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="PrimaryVariantDarkDisabledLowBrush"
-							 Color="{StaticResource PrimaryVariantDarkColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion PrimaryVariantDarkColor-->
-			<!--#region SecondaryColor-->
-			<SolidColorBrush x:Key="SecondaryBrush"
-							 Color="{StaticResource SecondaryColor}" />
-			<SolidColorBrush x:Key="SecondaryHoverBrush"
-							 Color="{StaticResource SecondaryColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="SecondaryFocusedBrush"
-							 Color="{StaticResource SecondaryColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="SecondaryPressedBrush"
-							 Color="{StaticResource SecondaryColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="SecondaryDraggedBrush"
-							 Color="{StaticResource SecondaryColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="SecondarySelectedBrush"
-							 Color="{StaticResource SecondaryColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="SecondaryMediumBrush"
-							 Color="{StaticResource SecondaryColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="SecondaryLowBrush"
-							 Color="{StaticResource SecondaryColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="SecondaryDisabledBrush"
-							 Color="{StaticResource SecondaryColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="SecondaryDisabledLowBrush"
-							 Color="{StaticResource SecondaryColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion SecondaryColor-->
-			<!--#region OnSecondaryColor-->
-			<SolidColorBrush x:Key="OnSecondaryBrush"
-							 Color="{StaticResource OnSecondaryColor}" />
-			<SolidColorBrush x:Key="OnSecondaryHoverBrush"
-							 Color="{StaticResource OnSecondaryColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="OnSecondaryFocusedBrush"
-							 Color="{StaticResource OnSecondaryColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="OnSecondaryPressedBrush"
-							 Color="{StaticResource OnSecondaryColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="OnSecondaryDraggedBrush"
-							 Color="{StaticResource OnSecondaryColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="OnSecondarySelectedBrush"
-							 Color="{StaticResource OnSecondaryColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="OnSecondaryMediumBrush"
-							 Color="{StaticResource OnSecondaryColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="OnSecondaryLowBrush"
-							 Color="{StaticResource OnSecondaryColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="OnSecondaryDisabledBrush"
-							 Color="{StaticResource OnSecondaryColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="OnSecondaryDisabledLowBrush"
-							 Color="{StaticResource OnSecondaryColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion OnSecondaryColor-->
-			<!--#region SecondaryContainerColor-->
-			<SolidColorBrush x:Key="SecondaryContainerBrush"
-							 Color="{StaticResource SecondaryContainerColor}" />
-			<SolidColorBrush x:Key="SecondaryContainerHoverBrush"
-							 Color="{StaticResource SecondaryContainerColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="SecondaryContainerFocusedBrush"
-							 Color="{StaticResource SecondaryContainerColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="SecondaryContainerPressedBrush"
-							 Color="{StaticResource SecondaryContainerColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="SecondaryContainerDraggedBrush"
-							 Color="{StaticResource SecondaryContainerColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="SecondaryContainerSelectedBrush"
-							 Color="{StaticResource SecondaryContainerColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="SecondaryContainerMediumBrush"
-							 Color="{StaticResource SecondaryContainerColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="SecondaryContainerLowBrush"
-							 Color="{StaticResource SecondaryContainerColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="SecondaryContainerDisabledBrush"
-							 Color="{StaticResource SecondaryContainerColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="SecondaryContainerDisabledLowBrush"
-							 Color="{StaticResource SecondaryContainerColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion SecondaryContainerColor-->
-			<!--#region OnSecondaryContainerColor-->
-			<SolidColorBrush x:Key="OnSecondaryContainerBrush"
-							 Color="{StaticResource OnSecondaryContainerColor}" />
-			<SolidColorBrush x:Key="OnSecondaryContainerHoverBrush"
-							 Color="{StaticResource OnSecondaryContainerColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="OnSecondaryContainerFocusedBrush"
-							 Color="{StaticResource OnSecondaryContainerColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="OnSecondaryContainerPressedBrush"
-							 Color="{StaticResource OnSecondaryContainerColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="OnSecondaryContainerDraggedBrush"
-							 Color="{StaticResource OnSecondaryContainerColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="OnSecondaryContainerSelectedBrush"
-							 Color="{StaticResource OnSecondaryContainerColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="OnSecondaryContainerMediumBrush"
-							 Color="{StaticResource OnSecondaryContainerColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="OnSecondaryContainerLowBrush"
-							 Color="{StaticResource OnSecondaryContainerColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="OnSecondaryContainerDisabledBrush"
-							 Color="{StaticResource OnSecondaryContainerColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="OnSecondaryContainerDisabledLowBrush"
-							 Color="{StaticResource OnSecondaryContainerColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion OnSecondaryContainerColor-->
-			<!--#region SecondaryVariantLightColor-->
-			<SolidColorBrush x:Key="SecondaryVariantLightBrush"
-							 Color="{StaticResource SecondaryVariantLightColor}" />
-			<SolidColorBrush x:Key="SecondaryVariantLightHoverBrush"
-							 Color="{StaticResource SecondaryVariantLightColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="SecondaryVariantLightFocusedBrush"
-							 Color="{StaticResource SecondaryVariantLightColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="SecondaryVariantLightPressedBrush"
-							 Color="{StaticResource SecondaryVariantLightColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="SecondaryVariantLightDraggedBrush"
-							 Color="{StaticResource SecondaryVariantLightColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="SecondaryVariantLightSelectedBrush"
-							 Color="{StaticResource SecondaryVariantLightColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="SecondaryVariantLightMediumBrush"
-							 Color="{StaticResource SecondaryVariantLightColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="SecondaryVariantLightLowBrush"
-							 Color="{StaticResource SecondaryVariantLightColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="SecondaryVariantLightDisabledBrush"
-							 Color="{StaticResource SecondaryVariantLightColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="SecondaryVariantLightDisabledLowBrush"
-							 Color="{StaticResource SecondaryVariantLightColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion SecondaryVariantLightColor-->
-			<!--#region SecondaryVariantDarkColor-->
-			<SolidColorBrush x:Key="SecondaryVariantDarkBrush"
-							 Color="{StaticResource SecondaryVariantDarkColor}" />
-			<SolidColorBrush x:Key="SecondaryVariantDarkHoverBrush"
-							 Color="{StaticResource SecondaryVariantDarkColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="SecondaryVariantDarkFocusedBrush"
-							 Color="{StaticResource SecondaryVariantDarkColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="SecondaryVariantDarkPressedBrush"
-							 Color="{StaticResource SecondaryVariantDarkColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="SecondaryVariantDarkDraggedBrush"
-							 Color="{StaticResource SecondaryVariantDarkColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="SecondaryVariantDarkSelectedBrush"
-							 Color="{StaticResource SecondaryVariantDarkColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="SecondaryVariantDarkMediumBrush"
-							 Color="{StaticResource SecondaryVariantDarkColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="SecondaryVariantDarkLowBrush"
-							 Color="{StaticResource SecondaryVariantDarkColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="SecondaryVariantDarkDisabledBrush"
-							 Color="{StaticResource SecondaryVariantDarkColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="SecondaryVariantDarkDisabledLowBrush"
-							 Color="{StaticResource SecondaryVariantDarkColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion SecondaryVariantDarkColor-->
-			<!--#region TertiaryColor-->
-			<SolidColorBrush x:Key="TertiaryBrush"
-							 Color="{StaticResource TertiaryColor}" />
-			<SolidColorBrush x:Key="TertiaryHoverBrush"
-							 Color="{StaticResource TertiaryColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="TertiaryFocusedBrush"
-							 Color="{StaticResource TertiaryColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="TertiaryPressedBrush"
-							 Color="{StaticResource TertiaryColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="TertiaryDraggedBrush"
-							 Color="{StaticResource TertiaryColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="TertiarySelectedBrush"
-							 Color="{StaticResource TertiaryColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="TertiaryMediumBrush"
-							 Color="{StaticResource TertiaryColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="TertiaryLowBrush"
-							 Color="{StaticResource TertiaryColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="TertiaryDisabledBrush"
-							 Color="{StaticResource TertiaryColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="TertiaryDisabledLowBrush"
-							 Color="{StaticResource TertiaryColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion TertiaryColor-->
-			<!--#region OnTertiaryColor-->
-			<SolidColorBrush x:Key="OnTertiaryBrush"
-							 Color="{StaticResource OnTertiaryColor}" />
-			<SolidColorBrush x:Key="OnTertiaryHoverBrush"
-							 Color="{StaticResource OnTertiaryColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="OnTertiaryFocusedBrush"
-							 Color="{StaticResource OnTertiaryColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="OnTertiaryPressedBrush"
-							 Color="{StaticResource OnTertiaryColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="OnTertiaryDraggedBrush"
-							 Color="{StaticResource OnTertiaryColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="OnTertiarySelectedBrush"
-							 Color="{StaticResource OnTertiaryColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="OnTertiaryMediumBrush"
-							 Color="{StaticResource OnTertiaryColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="OnTertiaryLowBrush"
-							 Color="{StaticResource OnTertiaryColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="OnTertiaryDisabledBrush"
-							 Color="{StaticResource OnTertiaryColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="OnTertiaryDisabledLowBrush"
-							 Color="{StaticResource OnTertiaryColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion OnTertiaryColor-->
-			<!--#region TertiaryContainerColor-->
-			<SolidColorBrush x:Key="TertiaryContainerBrush"
-							 Color="{StaticResource TertiaryContainerColor}" />
-			<SolidColorBrush x:Key="TertiaryContainerHoverBrush"
-							 Color="{StaticResource TertiaryContainerColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="TertiaryContainerFocusedBrush"
-							 Color="{StaticResource TertiaryContainerColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="TertiaryContainerPressedBrush"
-							 Color="{StaticResource TertiaryContainerColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="TertiaryContainerDraggedBrush"
-							 Color="{StaticResource TertiaryContainerColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="TertiaryContainerSelectedBrush"
-							 Color="{StaticResource TertiaryContainerColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="TertiaryContainerMediumBrush"
-							 Color="{StaticResource TertiaryContainerColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="TertiaryContainerLowBrush"
-							 Color="{StaticResource TertiaryContainerColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="TertiaryContainerDisabledBrush"
-							 Color="{StaticResource TertiaryContainerColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="TertiaryContainerDisabledLowBrush"
-							 Color="{StaticResource TertiaryContainerColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion TertiaryContainerColor-->
-			<!--#region OnTertiaryContainerColor-->
-			<SolidColorBrush x:Key="OnTertiaryContainerBrush"
-							 Color="{StaticResource OnTertiaryContainerColor}" />
-			<SolidColorBrush x:Key="OnTertiaryContainerHoverBrush"
-							 Color="{StaticResource OnTertiaryContainerColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="OnTertiaryContainerFocusedBrush"
-							 Color="{StaticResource OnTertiaryContainerColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="OnTertiaryContainerPressedBrush"
-							 Color="{StaticResource OnTertiaryContainerColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="OnTertiaryContainerDraggedBrush"
-							 Color="{StaticResource OnTertiaryContainerColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="OnTertiaryContainerSelectedBrush"
-							 Color="{StaticResource OnTertiaryContainerColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="OnTertiaryContainerMediumBrush"
-							 Color="{StaticResource OnTertiaryContainerColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="OnTertiaryContainerLowBrush"
-							 Color="{StaticResource OnTertiaryContainerColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="OnTertiaryContainerDisabledBrush"
-							 Color="{StaticResource OnTertiaryContainerColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="OnTertiaryContainerDisabledLowBrush"
-							 Color="{StaticResource OnTertiaryContainerColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion OnTertiaryContainerColor-->
-			<!--#region ErrorColor-->
-			<SolidColorBrush x:Key="ErrorBrush"
-							 Color="{StaticResource ErrorColor}" />
-			<SolidColorBrush x:Key="ErrorHoverBrush"
-							 Color="{StaticResource ErrorColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="ErrorFocusedBrush"
-							 Color="{StaticResource ErrorColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="ErrorPressedBrush"
-							 Color="{StaticResource ErrorColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="ErrorDraggedBrush"
-							 Color="{StaticResource ErrorColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="ErrorSelectedBrush"
-							 Color="{StaticResource ErrorColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="ErrorMediumBrush"
-							 Color="{StaticResource ErrorColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="ErrorLowBrush"
-							 Color="{StaticResource ErrorColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="ErrorDisabledBrush"
-							 Color="{StaticResource ErrorColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="ErrorDisabledLowBrush"
-							 Color="{StaticResource ErrorColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion ErrorColor-->
-			<!--#region OnErrorColor-->
-			<SolidColorBrush x:Key="OnErrorBrush"
-							 Color="{StaticResource OnErrorColor}" />
-			<SolidColorBrush x:Key="OnErrorHoverBrush"
-							 Color="{StaticResource OnErrorColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="OnErrorFocusedBrush"
-							 Color="{StaticResource OnErrorColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="OnErrorPressedBrush"
-							 Color="{StaticResource OnErrorColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="OnErrorDraggedBrush"
-							 Color="{StaticResource OnErrorColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="OnErrorSelectedBrush"
-							 Color="{StaticResource OnErrorColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="OnErrorMediumBrush"
-							 Color="{StaticResource OnErrorColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="OnErrorLowBrush"
-							 Color="{StaticResource OnErrorColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="OnErrorDisabledBrush"
-							 Color="{StaticResource OnErrorColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="OnErrorDisabledLowBrush"
-							 Color="{StaticResource OnErrorColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion OnErrorColor-->
-			<!--#region ErrorContainerColor-->
-			<SolidColorBrush x:Key="ErrorContainerBrush"
-							 Color="{StaticResource ErrorContainerColor}" />
-			<SolidColorBrush x:Key="ErrorContainerHoverBrush"
-							 Color="{StaticResource ErrorContainerColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="ErrorContainerFocusedBrush"
-							 Color="{StaticResource ErrorContainerColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="ErrorContainerPressedBrush"
-							 Color="{StaticResource ErrorContainerColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="ErrorContainerDraggedBrush"
-							 Color="{StaticResource ErrorContainerColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="ErrorContainerSelectedBrush"
-							 Color="{StaticResource ErrorContainerColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="ErrorContainerMediumBrush"
-							 Color="{StaticResource ErrorContainerColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="ErrorContainerLowBrush"
-							 Color="{StaticResource ErrorContainerColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="ErrorContainerDisabledBrush"
-							 Color="{StaticResource ErrorContainerColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="ErrorContainerDisabledLowBrush"
-							 Color="{StaticResource ErrorContainerColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion ErrorContainerColor-->
-			<!--#region OnErrorContainerColor-->
-			<SolidColorBrush x:Key="OnErrorContainerBrush"
-							 Color="{StaticResource OnErrorContainerColor}" />
-			<SolidColorBrush x:Key="OnErrorContainerHoverBrush"
-							 Color="{StaticResource OnErrorContainerColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="OnErrorContainerFocusedBrush"
-							 Color="{StaticResource OnErrorContainerColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="OnErrorContainerPressedBrush"
-							 Color="{StaticResource OnErrorContainerColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="OnErrorContainerDraggedBrush"
-							 Color="{StaticResource OnErrorContainerColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="OnErrorContainerSelectedBrush"
-							 Color="{StaticResource OnErrorContainerColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="OnErrorContainerMediumBrush"
-							 Color="{StaticResource OnErrorContainerColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="OnErrorContainerLowBrush"
-							 Color="{StaticResource OnErrorContainerColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="OnErrorContainerDisabledBrush"
-							 Color="{StaticResource OnErrorContainerColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="OnErrorContainerDisabledLowBrush"
-							 Color="{StaticResource OnErrorContainerColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion OnErrorContainerColor-->
-			<!--#region BackgroundColor-->
-			<SolidColorBrush x:Key="BackgroundBrush"
-							 Color="{StaticResource BackgroundColor}" />
-			<SolidColorBrush x:Key="BackgroundHoverBrush"
-							 Color="{StaticResource BackgroundColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="BackgroundFocusedBrush"
-							 Color="{StaticResource BackgroundColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="BackgroundPressedBrush"
-							 Color="{StaticResource BackgroundColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="BackgroundDraggedBrush"
-							 Color="{StaticResource BackgroundColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="BackgroundSelectedBrush"
-							 Color="{StaticResource BackgroundColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="BackgroundMediumBrush"
-							 Color="{StaticResource BackgroundColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="BackgroundLowBrush"
-							 Color="{StaticResource BackgroundColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="BackgroundDisabledBrush"
-							 Color="{StaticResource BackgroundColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="BackgroundDisabledLowBrush"
-							 Color="{StaticResource BackgroundColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion BackgroundColor-->
-			<!--#region OnBackgroundColor-->
-			<SolidColorBrush x:Key="OnBackgroundBrush"
-							 Color="{StaticResource OnBackgroundColor}" />
-			<SolidColorBrush x:Key="OnBackgroundHoverBrush"
-							 Color="{StaticResource OnBackgroundColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="OnBackgroundFocusedBrush"
-							 Color="{StaticResource OnBackgroundColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="OnBackgroundPressedBrush"
-							 Color="{StaticResource OnBackgroundColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="OnBackgroundDraggedBrush"
-							 Color="{StaticResource OnBackgroundColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="OnBackgroundSelectedBrush"
-							 Color="{StaticResource OnBackgroundColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="OnBackgroundMediumBrush"
-							 Color="{StaticResource OnBackgroundColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="OnBackgroundLowBrush"
-							 Color="{StaticResource OnBackgroundColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="OnBackgroundDisabledBrush"
-							 Color="{StaticResource OnBackgroundColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="OnBackgroundDisabledLowBrush"
-							 Color="{StaticResource OnBackgroundColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion OnBackgroundColor-->
-			<!--#region SurfaceColor-->
-			<SolidColorBrush x:Key="SurfaceBrush"
-							 Color="{StaticResource SurfaceColor}" />
-			<SolidColorBrush x:Key="SurfaceHoverBrush"
-							 Color="{StaticResource SurfaceColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="SurfaceFocusedBrush"
-							 Color="{StaticResource SurfaceColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="SurfacePressedBrush"
-							 Color="{StaticResource SurfaceColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="SurfaceDraggedBrush"
-							 Color="{StaticResource SurfaceColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="SurfaceSelectedBrush"
-							 Color="{StaticResource SurfaceColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="SurfaceMediumBrush"
-							 Color="{StaticResource SurfaceColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="SurfaceLowBrush"
-							 Color="{StaticResource SurfaceColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="SurfaceDisabledBrush"
-							 Color="{StaticResource SurfaceColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="SurfaceDisabledLowBrush"
-							 Color="{StaticResource SurfaceColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion SurfaceColor-->
-			<!--#region OnSurfaceColor-->
-			<SolidColorBrush x:Key="OnSurfaceBrush"
-							 Color="{StaticResource OnSurfaceColor}" />
-			<SolidColorBrush x:Key="OnSurfaceHoverBrush"
-							 Color="{StaticResource OnSurfaceColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceFocusedBrush"
-							 Color="{StaticResource OnSurfaceColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="OnSurfacePressedBrush"
-							 Color="{StaticResource OnSurfaceColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceDraggedBrush"
-							 Color="{StaticResource OnSurfaceColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceSelectedBrush"
-							 Color="{StaticResource OnSurfaceColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceMediumBrush"
-							 Color="{StaticResource OnSurfaceColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceLowBrush"
-							 Color="{StaticResource OnSurfaceColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceDisabledBrush"
-							 Color="{StaticResource OnSurfaceColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceDisabledLowBrush"
-							 Color="{StaticResource OnSurfaceColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion OnSurfaceColor-->
-			<!--#region SurfaceVariantColor-->
-			<SolidColorBrush x:Key="SurfaceVariantBrush"
-							 Color="{StaticResource SurfaceVariantColor}" />
-			<SolidColorBrush x:Key="SurfaceVariantHoverBrush"
-							 Color="{StaticResource SurfaceVariantColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="SurfaceVariantFocusedBrush"
-							 Color="{StaticResource SurfaceVariantColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="SurfaceVariantPressedBrush"
-							 Color="{StaticResource SurfaceVariantColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="SurfaceVariantDraggedBrush"
-							 Color="{StaticResource SurfaceVariantColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="SurfaceVariantSelectedBrush"
-							 Color="{StaticResource SurfaceVariantColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="SurfaceVariantMediumBrush"
-							 Color="{StaticResource SurfaceVariantColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="SurfaceVariantLowBrush"
-							 Color="{StaticResource SurfaceVariantColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="SurfaceVariantDisabledBrush"
-							 Color="{StaticResource SurfaceVariantColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="SurfaceVariantDisabledLowBrush"
-							 Color="{StaticResource SurfaceVariantColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion SurfaceVariantColor-->
-			<!--#region OnSurfaceVariantColor-->
-			<SolidColorBrush x:Key="OnSurfaceVariantBrush"
-							 Color="{StaticResource OnSurfaceVariantColor}" />
-			<SolidColorBrush x:Key="OnSurfaceVariantHoverBrush"
-							 Color="{StaticResource OnSurfaceVariantColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceVariantFocusedBrush"
-							 Color="{StaticResource OnSurfaceVariantColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceVariantPressedBrush"
-							 Color="{StaticResource OnSurfaceVariantColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceVariantDraggedBrush"
-							 Color="{StaticResource OnSurfaceVariantColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceVariantSelectedBrush"
-							 Color="{StaticResource OnSurfaceVariantColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceVariantMediumBrush"
-							 Color="{StaticResource OnSurfaceVariantColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceVariantLowBrush"
-							 Color="{StaticResource OnSurfaceVariantColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceVariantDisabledBrush"
-							 Color="{StaticResource OnSurfaceVariantColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceVariantDisabledLowBrush"
-							 Color="{StaticResource OnSurfaceVariantColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion OnSurfaceVariantColor-->
-			<!--#region SurfaceInverseColor-->
-			<SolidColorBrush x:Key="SurfaceInverseBrush"
-							 Color="{StaticResource SurfaceInverseColor}" />
-			<SolidColorBrush x:Key="SurfaceInverseHoverBrush"
-							 Color="{StaticResource SurfaceInverseColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="SurfaceInverseFocusedBrush"
-							 Color="{StaticResource SurfaceInverseColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="SurfaceInversePressedBrush"
-							 Color="{StaticResource SurfaceInverseColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="SurfaceInverseDraggedBrush"
-							 Color="{StaticResource SurfaceInverseColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="SurfaceInverseSelectedBrush"
-							 Color="{StaticResource SurfaceInverseColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="SurfaceInverseMediumBrush"
-							 Color="{StaticResource SurfaceInverseColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="SurfaceInverseLowBrush"
-							 Color="{StaticResource SurfaceInverseColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="SurfaceInverseDisabledBrush"
-							 Color="{StaticResource SurfaceInverseColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="SurfaceInverseDisabledLowBrush"
-							 Color="{StaticResource SurfaceInverseColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion SurfaceInverseColor-->
-			<!--#region OnSurfaceInverseColor-->
-			<SolidColorBrush x:Key="OnSurfaceInverseBrush"
-							 Color="{StaticResource OnSurfaceInverseColor}" />
-			<SolidColorBrush x:Key="OnSurfaceInverseHoverBrush"
-							 Color="{StaticResource OnSurfaceInverseColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceInverseFocusedBrush"
-							 Color="{StaticResource OnSurfaceInverseColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceInversePressedBrush"
-							 Color="{StaticResource OnSurfaceInverseColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceInverseDraggedBrush"
-							 Color="{StaticResource OnSurfaceInverseColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceInverseSelectedBrush"
-							 Color="{StaticResource OnSurfaceInverseColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceInverseMediumBrush"
-							 Color="{StaticResource OnSurfaceInverseColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceInverseLowBrush"
-							 Color="{StaticResource OnSurfaceInverseColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceInverseDisabledBrush"
-							 Color="{StaticResource OnSurfaceInverseColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceInverseDisabledLowBrush"
-							 Color="{StaticResource OnSurfaceInverseColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion OnSurfaceInverseColor-->
-			<!--#region OutlineColor-->
-			<SolidColorBrush x:Key="OutlineBrush"
-							 Color="{StaticResource OutlineColor}" />
-			<SolidColorBrush x:Key="OutlineHoverBrush"
-							 Color="{StaticResource OutlineColor}"
-							 Opacity="{StaticResource HoverOpacity}" />
-			<SolidColorBrush x:Key="OutlineFocusedBrush"
-							 Color="{StaticResource OutlineColor}"
-							 Opacity="{StaticResource FocusedOpacity}" />
-			<SolidColorBrush x:Key="OutlinePressedBrush"
-							 Color="{StaticResource OutlineColor}"
-							 Opacity="{StaticResource PressedOpacity}" />
-			<SolidColorBrush x:Key="OutlineDraggedBrush"
-							 Color="{StaticResource OutlineColor}"
-							 Opacity="{StaticResource DraggedOpacity}" />
-			<SolidColorBrush x:Key="OutlineSelectedBrush"
-							 Color="{StaticResource OutlineColor}"
-							 Opacity="{StaticResource SelectedOpacity}" />
-			<SolidColorBrush x:Key="OutlineMediumBrush"
-							 Color="{StaticResource OutlineColor}"
-							 Opacity="{StaticResource MediumOpacity}" />
-			<SolidColorBrush x:Key="OutlineLowBrush"
-							 Color="{StaticResource OutlineColor}"
-							 Opacity="{StaticResource LowOpacity}" />
-			<SolidColorBrush x:Key="OutlineDisabledBrush"
-							 Color="{StaticResource OutlineColor}"
-							 Opacity="{StaticResource DisabledOpacity}" />
-			<SolidColorBrush x:Key="OutlineDisabledLowBrush"
-							 Color="{StaticResource OutlineColor}"
-							 Opacity="{StaticResource DisabledLowOpacity}" />
-			<!--#endregion OutlineColor-->
-
-			<!--#region SurfaceTintColor-->
-			<SolidColorBrush x:Key="SurfaceTintBrush"
-							 Color="{StaticResource SurfaceTintColor}" />
-			<!--#endregion SurfaceTintColor-->
 		</ResourceDictionary>
 	</ResourceDictionary.ThemeDictionaries>
 
diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/ShadowContainerSamplePage.xaml b/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/ShadowContainerSamplePage.xaml
index bc16c40a6..308d5f925 100644
--- a/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/ShadowContainerSamplePage.xaml
+++ b/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/ShadowContainerSamplePage.xaml
@@ -16,12 +16,9 @@
 	<Page.Resources>
 		<ResourceDictionary>
 			<ResourceDictionary.MergedDictionaries>
-				<!-- Known issue at the moment where we cannot re-initialize MaterialToolkitTheme to override colors with a new palette for other platforms outside of Windows -->
-				<!-- https://github.com/unoplatform/Uno.Themes/issues/1145 -->
-				<!--<MaterialToolkitTheme xmlns="using:Uno.Toolkit.UI.Material"
-									  ColorOverrideSource="ms-appx:///Views/NeumorphicColorsOverride.xaml" />-->
-				<ResourceDictionary Source="../NeumorphicColorsOverride.xaml" />
-				<ResourceDictionary Source="../Styles/NeumorphicStyles.xaml" />
+
+				<MaterialToolkitTheme xmlns="using:Uno.Toolkit.UI.Material"
+									  ColorOverrideSource="ms-appx:///Views/NeumorphicColorsOverride.xaml" />
 			</ResourceDictionary.MergedDictionaries>
 
 			<!--#region Neumorphic Templates-->