diff --git a/doc/material-colors.md b/doc/material-colors.md
index a8ecc930c..33b36e8bc 100644
--- a/doc/material-colors.md
+++ b/doc/material-colors.md
@@ -42,18 +42,17 @@ uid: Uno.Themes.Material.Colors
 | `OutlineVariantColor`        | `#C9C5D0`  | `#57545D` |
 
 ## Opacities
-
-| Key                  | Value |
-|----------------------|-------|
-| `HoverOpacity`       | 0.08  |
-| `FocusedOpacity`     | 0.12  |
-| `PressedOpacity`     | 0.12  |
-| `DraggedOpacity`     | 0.16  |
-| `SelectedOpacity`    | 0.16  |
-| `MediumOpacity`      | 0.54  |
-| `LowOpacity`         | 0.32  |
-| `DisabledOpacity`    | 0.38  |
-| `DisabledLowOpacity` | 0.12  |
+| Key                | Value |
+| ------------------ | ----- |
+| HoverOpacity       | 0.08  |
+| FocusedOpacity     | 0.12  |
+| PressedOpacity     | 0.12  |
+| DraggedOpacity     | 0.16  |
+| SelectedOpacity    | 0.16  |
+| MediumOpacity      | 0.64  |
+| LowOpacity         | 0.32  |
+| DisabledOpacity    | 0.12  |
+| DisabledLowOpacity    | 0.12  |
 
 ## Brushes
 
diff --git a/src/library/Uno.Material/Styles/Controls/v2/Button.xaml b/src/library/Uno.Material/Styles/Controls/v2/Button.xaml
index c472911f1..c95f7d568 100644
--- a/src/library/Uno.Material/Styles/Controls/v2/Button.xaml
+++ b/src/library/Uno.Material/Styles/Controls/v2/Button.xaml
@@ -38,7 +38,7 @@
 			<StaticResource x:Key="ElevatedButtonIconForegroundDisabled" ResourceKey="OnSurfaceDisabledBrush" />
 			<StaticResource x:Key="ElevatedButtonIconForegroundPointerFocused" ResourceKey="PrimaryBrush" />
 			<StaticResource x:Key="ElevatedButtonBackground" ResourceKey="SurfaceBrush" />
-			<StaticResource x:Key="ElevatedButtonBackgroundDisabled" ResourceKey="OnSurfaceDisabledLowBrush" />
+			<StaticResource x:Key="ElevatedButtonBackgroundDisabled" ResourceKey="OnSurfaceDisabledBrush" />
 			<StaticResource x:Key="ElevatedButtonBackgroundPointerOver" ResourceKey="SurfaceBrush" />
 			<StaticResource x:Key="ElevatedButtonBackgroundPressed" ResourceKey="SurfaceBrush" />
 			<StaticResource x:Key="ElevatedButtonBackgroundFocused" ResourceKey="SurfaceBrush" />
@@ -70,7 +70,7 @@
 			<StaticResource x:Key="FilledButtonBackground" ResourceKey="PrimaryBrush" />
 			<StaticResource x:Key="FilledButtonBackgroundPointerOver" ResourceKey="PrimaryBrush" />
 			<StaticResource x:Key="FilledButtonBackgroundPressed" ResourceKey="PrimaryBrush" />
-			<StaticResource x:Key="FilledButtonBackgroundDisabled" ResourceKey="OnSurfaceDisabledLowBrush" />
+			<StaticResource x:Key="FilledButtonBackgroundDisabled" ResourceKey="OnSurfaceDisabledBrush" />
 			<StaticResource x:Key="FilledButtonBackgroundFocused" ResourceKey="PrimaryBrush" />
 			<StaticResource x:Key="FilledButtonBackgroundPointerFocused" ResourceKey="PrimaryBrush" />
 			<StaticResource x:Key="FilledButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
@@ -100,7 +100,7 @@
 			<StaticResource x:Key="FilledTonalButtonBackground" ResourceKey="SecondaryContainerBrush" />
 			<StaticResource x:Key="FilledTonalButtonBackgroundPointerOver" ResourceKey="SecondaryContainerBrush" />
 			<StaticResource x:Key="FilledTonalButtonBackgroundPressed" ResourceKey="SecondaryContainerBrush" />
-			<StaticResource x:Key="FilledTonalButtonBackgroundDisabled" ResourceKey="OnSurfaceDisabledLowBrush" />
+			<StaticResource x:Key="FilledTonalButtonBackgroundDisabled" ResourceKey="OnSurfaceDisabledBrush" />
 			<StaticResource x:Key="FilledTonalButtonBackgroundFocused" ResourceKey="SecondaryContainerBrush" />
 			<StaticResource x:Key="FilledTonalButtonBackgroundPointerFocused" ResourceKey="SecondaryContainerBrush" />
 			<StaticResource x:Key="FilledTonalButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
@@ -130,7 +130,7 @@
 			<StaticResource x:Key="OutlinedButtonBackground" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="OutlinedButtonBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="OutlinedButtonBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
-			<StaticResource x:Key="OutlinedButtonBackgroundDisabled" ResourceKey="OnSurfaceDisabledLowBrush" />
+			<StaticResource x:Key="OutlinedButtonBackgroundDisabled" ResourceKey="OnSurfaceDisabledBrush" />
 			<StaticResource x:Key="OutlinedButtonBackgroundFocused" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="OutlinedButtonBackgroundPointerFocused" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="OutlinedButtonBorderBrush" ResourceKey="OutlineBrush" />
@@ -215,7 +215,7 @@
 			<StaticResource x:Key="ElevatedButtonIconForegroundDisabled" ResourceKey="OnSurfaceDisabledBrush" />
 			<StaticResource x:Key="ElevatedButtonIconForegroundPointerFocused" ResourceKey="PrimaryBrush" />
 			<StaticResource x:Key="ElevatedButtonBackground" ResourceKey="SurfaceBrush" />
-			<StaticResource x:Key="ElevatedButtonBackgroundDisabled" ResourceKey="OnSurfaceDisabledLowBrush" />
+			<StaticResource x:Key="ElevatedButtonBackgroundDisabled" ResourceKey="OnSurfaceDisabledBrush" />
 			<StaticResource x:Key="ElevatedButtonBackgroundPointerOver" ResourceKey="SurfaceBrush" />
 			<StaticResource x:Key="ElevatedButtonBackgroundPressed" ResourceKey="SurfaceBrush" />
 			<StaticResource x:Key="ElevatedButtonBackgroundFocused" ResourceKey="SurfaceBrush" />
@@ -247,7 +247,7 @@
 			<StaticResource x:Key="FilledButtonBackground" ResourceKey="PrimaryBrush" />
 			<StaticResource x:Key="FilledButtonBackgroundPointerOver" ResourceKey="PrimaryBrush" />
 			<StaticResource x:Key="FilledButtonBackgroundPressed" ResourceKey="PrimaryBrush" />
-			<StaticResource x:Key="FilledButtonBackgroundDisabled" ResourceKey="OnSurfaceDisabledLowBrush" />
+			<StaticResource x:Key="FilledButtonBackgroundDisabled" ResourceKey="OnSurfaceDisabledBrush" />
 			<StaticResource x:Key="FilledButtonBackgroundFocused" ResourceKey="PrimaryBrush" />
 			<StaticResource x:Key="FilledButtonBackgroundPointerFocused" ResourceKey="PrimaryBrush" />
 			<StaticResource x:Key="FilledButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
@@ -277,7 +277,7 @@
 			<StaticResource x:Key="FilledTonalButtonBackground" ResourceKey="SecondaryContainerBrush" />
 			<StaticResource x:Key="FilledTonalButtonBackgroundPointerOver" ResourceKey="SecondaryContainerBrush" />
 			<StaticResource x:Key="FilledTonalButtonBackgroundPressed" ResourceKey="SecondaryContainerBrush" />
-			<StaticResource x:Key="FilledTonalButtonBackgroundDisabled" ResourceKey="OnSurfaceDisabledLowBrush" />
+			<StaticResource x:Key="FilledTonalButtonBackgroundDisabled" ResourceKey="OnSurfaceDisabledBrush" />
 			<StaticResource x:Key="FilledTonalButtonBackgroundFocused" ResourceKey="SecondaryContainerBrush" />
 			<StaticResource x:Key="FilledTonalButtonBackgroundPointerFocused" ResourceKey="SecondaryContainerBrush" />
 			<StaticResource x:Key="FilledTonalButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
@@ -307,7 +307,7 @@
 			<StaticResource x:Key="OutlinedButtonBackground" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="OutlinedButtonBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="OutlinedButtonBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
-			<StaticResource x:Key="OutlinedButtonBackgroundDisabled" ResourceKey="OnSurfaceDisabledLowBrush" />
+			<StaticResource x:Key="OutlinedButtonBackgroundDisabled" ResourceKey="OnSurfaceDisabledBrush" />
 			<StaticResource x:Key="OutlinedButtonBackgroundFocused" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="OutlinedButtonBackgroundPointerFocused" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="OutlinedButtonBorderBrush" ResourceKey="OutlineBrush" />
diff --git a/src/library/Uno.Material/Styles/Controls/v2/FloatingActionButton.xaml b/src/library/Uno.Material/Styles/Controls/v2/FloatingActionButton.xaml
index 60bd06277..f23908cd0 100644
--- a/src/library/Uno.Material/Styles/Controls/v2/FloatingActionButton.xaml
+++ b/src/library/Uno.Material/Styles/Controls/v2/FloatingActionButton.xaml
@@ -22,7 +22,7 @@
 			<StaticResource x:Key="FabStateOverlayBackgroundPointerOver" ResourceKey="OnPrimaryContainerHoverBrush" />
 			<StaticResource x:Key="FabStateOverlayBackgroundFocused" ResourceKey="OnPrimaryContainerFocusedBrush" />
 			<StaticResource x:Key="FabStateOverlayBackgroundPressed" ResourceKey="OnPrimaryContainerPressedBrush" />
-			<StaticResource x:Key="FabStateOverlayBackgroundDisabled" ResourceKey="OnSurfaceDisabledLowBrush" />
+			<StaticResource x:Key="FabStateOverlayBackgroundDisabled" ResourceKey="OnSurfaceDisabledBrush" />
 			<!--#endregion-->
 
 			<!--#region Surface FAB Brushes-->
@@ -38,7 +38,7 @@
 			<StaticResource x:Key="FabSurfaceStateOverlayBackgroundPointerOver" ResourceKey="PrimaryHoverBrush" />
 			<StaticResource x:Key="FabSurfaceStateOverlayBackgroundFocused" ResourceKey="PrimaryFocusedBrush" />
 			<StaticResource x:Key="FabSurfaceStateOverlayBackgroundPressed" ResourceKey="PrimaryPressedBrush" />
-			<StaticResource x:Key="FabSurfaceStateOverlayBackgroundDisabled" ResourceKey="OnSurfaceDisabledLowBrush" />
+			<StaticResource x:Key="FabSurfaceStateOverlayBackgroundDisabled" ResourceKey="OnSurfaceDisabledBrush" />
 			<!--#endregion-->
 
 			<!--#region Secondary FAB Brushes-->
@@ -54,7 +54,7 @@
 			<StaticResource x:Key="FabSecondaryStateOverlayBackgroundPointerOver" ResourceKey="OnSecondaryContainerHoverBrush" />
 			<StaticResource x:Key="FabSecondaryStateOverlayBackgroundFocused" ResourceKey="OnSecondaryContainerFocusedBrush" />
 			<StaticResource x:Key="FabSecondaryStateOverlayBackgroundPressed" ResourceKey="OnSecondaryContainerPressedBrush" />
-			<StaticResource x:Key="FabSecondaryStateOverlayBackgroundDisabled" ResourceKey="OnSurfaceDisabledLowBrush" />
+			<StaticResource x:Key="FabSecondaryStateOverlayBackgroundDisabled" ResourceKey="OnSurfaceDisabledBrush" />
 			<!--#endregion-->
 
 			<!--#region Tertiary FAB Brushes-->
@@ -69,7 +69,7 @@
 			<StaticResource x:Key="FabTertiaryStateOverlayBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="FabTertiaryStateOverlayBackgroundFocused" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="FabTertiaryStateOverlayBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
-			<StaticResource x:Key="FabTertiaryStateOverlayBackgroundDisabled" ResourceKey="OnSurfaceDisabledLowBrush" />
+			<StaticResource x:Key="FabTertiaryStateOverlayBackgroundDisabled" ResourceKey="OnSurfaceDisabledBrush" />
 			<!--#endregion-->
 
 			<!--#region Default FAB Resources-->
@@ -107,7 +107,7 @@
 			<StaticResource x:Key="FabStateOverlayBackgroundPointerOver" ResourceKey="OnPrimaryContainerHoverBrush" />
 			<StaticResource x:Key="FabStateOverlayBackgroundFocused" ResourceKey="OnPrimaryContainerFocusedBrush" />
 			<StaticResource x:Key="FabStateOverlayBackgroundPressed" ResourceKey="OnPrimaryContainerPressedBrush" />
-			<StaticResource x:Key="FabStateOverlayBackgroundDisabled" ResourceKey="OnSurfaceDisabledLowBrush" />
+			<StaticResource x:Key="FabStateOverlayBackgroundDisabled" ResourceKey="OnSurfaceDisabledBrush" />
 			<!--#endregion-->
 
 			<!--#region Surface FAB Brushes-->
@@ -123,7 +123,7 @@
 			<StaticResource x:Key="FabSurfaceStateOverlayBackgroundPointerOver" ResourceKey="PrimaryHoverBrush" />
 			<StaticResource x:Key="FabSurfaceStateOverlayBackgroundFocused" ResourceKey="PrimaryFocusedBrush" />
 			<StaticResource x:Key="FabSurfaceStateOverlayBackgroundPressed" ResourceKey="PrimaryPressedBrush" />
-			<StaticResource x:Key="FabSurfaceStateOverlayBackgroundDisabled" ResourceKey="OnSurfaceDisabledLowBrush" />
+			<StaticResource x:Key="FabSurfaceStateOverlayBackgroundDisabled" ResourceKey="OnSurfaceDisabledBrush" />
 			<!--#endregion-->
 
 			<!--#region Secondary FAB Brushes-->
@@ -139,7 +139,7 @@
 			<StaticResource x:Key="FabSecondaryStateOverlayBackgroundPointerOver" ResourceKey="OnSecondaryContainerHoverBrush" />
 			<StaticResource x:Key="FabSecondaryStateOverlayBackgroundFocused" ResourceKey="OnSecondaryContainerFocusedBrush" />
 			<StaticResource x:Key="FabSecondaryStateOverlayBackgroundPressed" ResourceKey="OnSecondaryContainerPressedBrush" />
-			<StaticResource x:Key="FabSecondaryStateOverlayBackgroundDisabled" ResourceKey="OnSurfaceDisabledLowBrush" />
+			<StaticResource x:Key="FabSecondaryStateOverlayBackgroundDisabled" ResourceKey="OnSurfaceDisabledBrush" />
 			<!--#endregion-->
 
 			<!--#region Tertiary FAB Brushes-->
@@ -154,7 +154,7 @@
 			<StaticResource x:Key="FabTertiaryStateOverlayBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="FabTertiaryStateOverlayBackgroundFocused" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="FabTertiaryStateOverlayBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
-			<StaticResource x:Key="FabTertiaryStateOverlayBackgroundDisabled" ResourceKey="OnSurfaceDisabledLowBrush" />
+			<StaticResource x:Key="FabTertiaryStateOverlayBackgroundDisabled" ResourceKey="OnSurfaceDisabledBrush" />
 			<!--#endregion-->
 
 			<!--#region Default FAB Resources-->
diff --git a/src/library/Uno.Material/Styles/Controls/v2/NavigationView.xaml b/src/library/Uno.Material/Styles/Controls/v2/NavigationView.xaml
index 99e57f629..11453e053 100644
--- a/src/library/Uno.Material/Styles/Controls/v2/NavigationView.xaml
+++ b/src/library/Uno.Material/Styles/Controls/v2/NavigationView.xaml
@@ -165,7 +165,7 @@
             <StaticResource x:Key="NavigationViewButtonForeground" ResourceKey="OnSurfaceBrush" />
             <StaticResource x:Key="NavigationViewButtonForegroundPointerOver" ResourceKey="OnSurfaceBrush" />
             <StaticResource x:Key="NavigationViewButtonForegroundPressed" ResourceKey="OnSurfaceBrush" />
-            <StaticResource x:Key="NavigationViewButtonForegroundDisabled" ResourceKey="OnSurfaceDisabledLowBrush" />
+            <StaticResource x:Key="NavigationViewButtonForegroundDisabled" ResourceKey="OnSurfaceDisabledBrush" />
 
             <StaticResource x:Key="NavigationViewButtonBackground" ResourceKey="SystemControlTransparentBrush" />
             <StaticResource x:Key="NavigationViewButtonBackgroundPointerOver" ResourceKey="PrimaryHoverBrush" />
@@ -177,7 +177,7 @@
             <StaticResource x:Key="NavigationViewItemBackground" ResourceKey="SystemControlTransparentBrush" />
             <StaticResource x:Key="NavigationViewItemBackgroundPointerOver" ResourceKey="PrimaryHoverBrush" />
             <StaticResource x:Key="NavigationViewItemBackgroundPressed" ResourceKey="PrimaryPressedBrush" />
-            <StaticResource x:Key="NavigationViewItemBackgroundDisabled" ResourceKey="OnSurfaceDisabledLowBrush" />
+            <StaticResource x:Key="NavigationViewItemBackgroundDisabled" ResourceKey="OnSurfaceDisabledBrush" />
             <StaticResource x:Key="NavigationViewItemBackgroundSelected" ResourceKey="PrimarySelectedBrush" />
             <StaticResource x:Key="NavigationViewItemBackgroundSelectedPointerOver" ResourceKey="SystemControlTransparentBrush" />
             <StaticResource x:Key="NavigationViewItemBackgroundSelectedPressed" ResourceKey="SystemControlTransparentBrush" />
@@ -353,7 +353,7 @@
             <StaticResource x:Key="NavigationViewButtonForeground" ResourceKey="OnSurfaceBrush" />
             <StaticResource x:Key="NavigationViewButtonForegroundPointerOver" ResourceKey="OnSurfaceBrush" />
             <StaticResource x:Key="NavigationViewButtonForegroundPressed" ResourceKey="OnSurfaceBrush" />
-            <StaticResource x:Key="NavigationViewButtonForegroundDisabled" ResourceKey="OnSurfaceDisabledLowBrush" />
+            <StaticResource x:Key="NavigationViewButtonForegroundDisabled" ResourceKey="OnSurfaceDisabledBrush" />
 
             <StaticResource x:Key="NavigationViewButtonBackground" ResourceKey="SystemControlTransparentBrush" />
             <StaticResource x:Key="NavigationViewButtonBackgroundPointerOver" ResourceKey="PrimaryHoverBrush" />
@@ -365,7 +365,7 @@
             <StaticResource x:Key="NavigationViewItemBackground" ResourceKey="SystemControlTransparentBrush" />
             <StaticResource x:Key="NavigationViewItemBackgroundPointerOver" ResourceKey="PrimaryHoverBrush" />
             <StaticResource x:Key="NavigationViewItemBackgroundPressed" ResourceKey="PrimaryPressedBrush" />
-            <StaticResource x:Key="NavigationViewItemBackgroundDisabled" ResourceKey="OnSurfaceDisabledLowBrush" />
+            <StaticResource x:Key="NavigationViewItemBackgroundDisabled" ResourceKey="OnSurfaceDisabledBrush" />
             <StaticResource x:Key="NavigationViewItemBackgroundSelected" ResourceKey="PrimarySelectedBrush" />
             <StaticResource x:Key="NavigationViewItemBackgroundSelectedPointerOver" ResourceKey="SystemControlTransparentBrush" />
             <StaticResource x:Key="NavigationViewItemBackgroundSelectedPressed" ResourceKey="SystemControlTransparentBrush" />
@@ -541,7 +541,7 @@
             <StaticResource x:Key="NavigationViewButtonForeground" ResourceKey="OnSurfaceBrush" />
             <StaticResource x:Key="NavigationViewButtonForegroundPointerOver" ResourceKey="OnSurfaceBrush" />
             <StaticResource x:Key="NavigationViewButtonForegroundPressed" ResourceKey="OnSurfaceBrush" />
-            <StaticResource x:Key="NavigationViewButtonForegroundDisabled" ResourceKey="OnSurfaceDisabledLowBrush" />
+            <StaticResource x:Key="NavigationViewButtonForegroundDisabled" ResourceKey="OnSurfaceDisabledBrush" />
 
             <StaticResource x:Key="NavigationViewButtonBackground" ResourceKey="SystemControlTransparentBrush" />
             <StaticResource x:Key="NavigationViewButtonBackgroundPointerOver" ResourceKey="PrimaryHoverBrush" />
@@ -553,7 +553,7 @@
             <StaticResource x:Key="NavigationViewItemBackground" ResourceKey="SystemControlTransparentBrush" />
             <StaticResource x:Key="NavigationViewItemBackgroundPointerOver" ResourceKey="PrimaryHoverBrush" />
             <StaticResource x:Key="NavigationViewItemBackgroundPressed" ResourceKey="PrimaryPressedBrush" />
-            <StaticResource x:Key="NavigationViewItemBackgroundDisabled" ResourceKey="OnSurfaceDisabledLowBrush" />
+            <StaticResource x:Key="NavigationViewItemBackgroundDisabled" ResourceKey="OnSurfaceDisabledBrush" />
             <StaticResource x:Key="NavigationViewItemBackgroundSelected" ResourceKey="PrimarySelectedBrush" />
             <StaticResource x:Key="NavigationViewItemBackgroundSelectedPointerOver" ResourceKey="SystemControlTransparentBrush" />
             <StaticResource x:Key="NavigationViewItemBackgroundSelectedPressed" ResourceKey="SystemControlTransparentBrush" />
diff --git a/src/library/Uno.Material/Styles/Controls/v2/PasswordBox.xaml b/src/library/Uno.Material/Styles/Controls/v2/PasswordBox.xaml
index 61469e84a..1730c202f 100644
--- a/src/library/Uno.Material/Styles/Controls/v2/PasswordBox.xaml
+++ b/src/library/Uno.Material/Styles/Controls/v2/PasswordBox.xaml
@@ -65,7 +65,7 @@
 			<StaticResource x:Key="OutlinedPasswordBoxBorderBrush" ResourceKey="OutlineBrush" />
 			<StaticResource x:Key="OutlinedPasswordBoxBorderBrushPointerOver" ResourceKey="OnSurfaceBrush" />
 			<StaticResource x:Key="OutlinedPasswordBoxBorderBrushFocused" ResourceKey="PrimaryBrush" />
-			<StaticResource x:Key="OutlinedPasswordBoxBorderBrushDisabled" ResourceKey="OnSurfaceDisabledLowBrush" />
+			<StaticResource x:Key="OutlinedPasswordBoxBorderBrushDisabled" ResourceKey="OnSurfaceDisabledBrush" />
 
 			<StaticResource x:Key="OutlinedPasswordBoxForeground" ResourceKey="OnSurfaceBrush" />
 			<StaticResource x:Key="OutlinedPasswordBoxForegroundPointerOver" ResourceKey="OnSurfaceBrush" />
@@ -159,7 +159,7 @@
 			<StaticResource x:Key="OutlinedPasswordBoxBorderBrush" ResourceKey="OutlineBrush" />
 			<StaticResource x:Key="OutlinedPasswordBoxBorderBrushPointerOver" ResourceKey="OnSurfaceBrush" />
 			<StaticResource x:Key="OutlinedPasswordBoxBorderBrushFocused" ResourceKey="PrimaryBrush" />
-			<StaticResource x:Key="OutlinedPasswordBoxBorderBrushDisabled" ResourceKey="OnSurfaceDisabledLowBrush" />
+			<StaticResource x:Key="OutlinedPasswordBoxBorderBrushDisabled" ResourceKey="OnSurfaceDisabledBrush" />
 
 			<StaticResource x:Key="OutlinedPasswordBoxForeground" ResourceKey="OnSurfaceBrush" />
 			<StaticResource x:Key="OutlinedPasswordBoxForegroundPointerOver" ResourceKey="OnSurfaceBrush" />
diff --git a/src/library/Uno.Themes/Styles/Applications/Common/SharedColors.xaml b/src/library/Uno.Themes/Styles/Applications/Common/SharedColors.xaml
index de2b97939..2c0e137ed 100644
--- a/src/library/Uno.Themes/Styles/Applications/Common/SharedColors.xaml
+++ b/src/library/Uno.Themes/Styles/Applications/Common/SharedColors.xaml
@@ -14,7 +14,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="PrimaryDisabledLowBrush" Color="{StaticResource PrimaryColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion PrimaryColor-->
 			<!--#region PrimaryInverseColor -->
 			<SolidColorBrush x:Key="PrimaryInverseBrush" Color="{StaticResource PrimaryInverseColor}" />
@@ -26,7 +26,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="PrimaryInverseDisabledLowBrush" Color="{StaticResource PrimaryInverseColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion PrimaryInverseColor-->
 			<!--#region OnPrimaryColor -->
 			<SolidColorBrush x:Key="OnPrimaryBrush" Color="{StaticResource OnPrimaryColor}" />
@@ -38,7 +38,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnPrimaryDisabledLowBrush" Color="{StaticResource OnPrimaryColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnPrimaryColor-->
 			<!--#region PrimaryContainerColor -->
 			<SolidColorBrush x:Key="PrimaryContainerBrush" Color="{StaticResource PrimaryContainerColor}" />
@@ -50,7 +50,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="PrimaryContainerDisabledLowBrush" Color="{StaticResource PrimaryContainerColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion PrimaryContainerColor-->
 			<!--#region OnPrimaryContainerColor -->
 			<SolidColorBrush x:Key="OnPrimaryContainerBrush" Color="{StaticResource OnPrimaryContainerColor}" />
@@ -62,7 +62,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnPrimaryContainerDisabledLowBrush" Color="{StaticResource OnPrimaryContainerColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnPrimaryContainerColor-->
 			<!--#region PrimaryVariantLightColor -->
 			<SolidColorBrush x:Key="PrimaryVariantLightBrush" Color="{StaticResource PrimaryVariantLightColor}" />
@@ -74,7 +74,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="PrimaryVariantLightDisabledLowBrush" Color="{StaticResource PrimaryVariantLightColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion PrimaryVariantLightColor-->
 			<!--#region PrimaryVariantDarkColor -->
 			<SolidColorBrush x:Key="PrimaryVariantDarkBrush" Color="{StaticResource PrimaryVariantDarkColor}" />
@@ -86,7 +86,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="PrimaryVariantDarkDisabledLowBrush" Color="{StaticResource PrimaryVariantDarkColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion PrimaryVariantDarkColor-->
 			<!--#region SecondaryColor -->
 			<SolidColorBrush x:Key="SecondaryBrush" Color="{StaticResource SecondaryColor}" />
@@ -98,7 +98,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="SecondaryDisabledLowBrush" Color="{StaticResource SecondaryColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion SecondaryColor-->
 			<!--#region OnSecondaryColor -->
 			<SolidColorBrush x:Key="OnSecondaryBrush" Color="{StaticResource OnSecondaryColor}" />
@@ -110,7 +110,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnSecondaryDisabledLowBrush" Color="{StaticResource OnSecondaryColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnSecondaryColor-->
 			<!--#region SecondaryContainerColor -->
 			<SolidColorBrush x:Key="SecondaryContainerBrush" Color="{StaticResource SecondaryContainerColor}" />
@@ -122,7 +122,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="SecondaryContainerDisabledLowBrush" Color="{StaticResource SecondaryContainerColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion SecondaryContainerColor-->
 			<!--#region OnSecondaryContainerColor -->
 			<SolidColorBrush x:Key="OnSecondaryContainerBrush" Color="{StaticResource OnSecondaryContainerColor}" />
@@ -134,7 +134,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnSecondaryContainerDisabledLowBrush" Color="{StaticResource OnSecondaryContainerColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnSecondaryContainerColor-->
 			<!--#region SecondaryVariantLightColor -->
 			<SolidColorBrush x:Key="SecondaryVariantLightBrush" Color="{StaticResource SecondaryVariantLightColor}" />
@@ -146,7 +146,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="SecondaryVariantLightDisabledLowBrush" Color="{StaticResource SecondaryVariantLightColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion SecondaryVariantLightColor-->
 			<!--#region SecondaryVariantDarkColor -->
 			<SolidColorBrush x:Key="SecondaryVariantDarkBrush" Color="{StaticResource SecondaryVariantDarkColor}" />
@@ -158,7 +158,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="SecondaryVariantDarkDisabledLowBrush" Color="{StaticResource SecondaryVariantDarkColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion SecondaryVariantDarkColor-->
 			<!--#region TertiaryColor -->
 			<SolidColorBrush x:Key="TertiaryBrush" Color="{StaticResource TertiaryColor}" />
@@ -170,7 +170,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="TertiaryDisabledLowBrush" Color="{StaticResource TertiaryColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion TertiaryColor-->
 			<!--#region OnTertiaryColor -->
 			<SolidColorBrush x:Key="OnTertiaryBrush" Color="{StaticResource OnTertiaryColor}" />
@@ -182,7 +182,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnTertiaryDisabledLowBrush" Color="{StaticResource OnTertiaryColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnTertiaryColor-->
 			<!--#region TertiaryContainerColor -->
 			<SolidColorBrush x:Key="TertiaryContainerBrush" Color="{StaticResource TertiaryContainerColor}" />
@@ -194,7 +194,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="TertiaryContainerDisabledLowBrush" Color="{StaticResource TertiaryContainerColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion TertiaryContainerColor-->
 			<!--#region OnTertiaryContainerColor -->
 			<SolidColorBrush x:Key="OnTertiaryContainerBrush" Color="{StaticResource OnTertiaryContainerColor}" />
@@ -206,7 +206,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnTertiaryContainerDisabledLowBrush" Color="{StaticResource OnTertiaryContainerColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnTertiaryContainerColor-->
 			<!--#region ErrorColor -->
 			<SolidColorBrush x:Key="ErrorBrush" Color="{StaticResource ErrorColor}" />
@@ -218,7 +218,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="ErrorDisabledLowBrush" Color="{StaticResource ErrorColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion ErrorColor-->
 			<!--#region OnErrorColor -->
 			<SolidColorBrush x:Key="OnErrorBrush" Color="{StaticResource OnErrorColor}" />
@@ -230,7 +230,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnErrorDisabledLowBrush" Color="{StaticResource OnErrorColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnErrorColor-->
 			<!--#region ErrorContainerColor -->
 			<SolidColorBrush x:Key="ErrorContainerBrush" Color="{StaticResource ErrorContainerColor}" />
@@ -242,7 +242,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="ErrorContainerDisabledLowBrush" Color="{StaticResource ErrorContainerColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion ErrorContainerColor-->
 			<!--#region OnErrorContainerColor -->
 			<SolidColorBrush x:Key="OnErrorContainerBrush" Color="{StaticResource OnErrorContainerColor}" />
@@ -254,7 +254,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnErrorContainerDisabledLowBrush" Color="{StaticResource OnErrorContainerColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnErrorContainerColor-->
 			<!--#region BackgroundColor -->
 			<SolidColorBrush x:Key="BackgroundBrush" Color="{StaticResource BackgroundColor}" />
@@ -266,7 +266,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="BackgroundDisabledLowBrush" Color="{StaticResource BackgroundColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion BackgroundColor-->
 			<!--#region OnBackgroundColor -->
 			<SolidColorBrush x:Key="OnBackgroundBrush" Color="{StaticResource OnBackgroundColor}" />
@@ -278,7 +278,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnBackgroundDisabledLowBrush" Color="{StaticResource OnBackgroundColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnBackgroundColor-->
 			<!--#region SurfaceColor -->
 			<SolidColorBrush x:Key="SurfaceBrush" Color="{StaticResource SurfaceColor}" />
@@ -290,7 +290,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="SurfaceDisabledLowBrush" Color="{StaticResource SurfaceColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion SurfaceColor-->
 			<!--#region OnSurfaceColor -->
 			<SolidColorBrush x:Key="OnSurfaceBrush" Color="{StaticResource OnSurfaceColor}" />
@@ -302,7 +302,7 @@
 			<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 DisabledOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceDisabledLowBrush" Color="{StaticResource OnSurfaceColor}" Opacity="{StaticResource DisabledLowOpacity}" />
+			<SolidColorBrush x:Key="OnSurfaceDisabledLowBrush" Color="{StaticResource OnSurfaceColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnSurfaceColor-->
 			<!--#region SurfaceVariantColor -->
 			<SolidColorBrush x:Key="SurfaceVariantBrush" Color="{StaticResource SurfaceVariantColor}" />
@@ -314,7 +314,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="SurfaceVariantDisabledLowBrush" Color="{StaticResource SurfaceVariantColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion SurfaceVariantColor-->
 			<!--#region OnSurfaceVariantColor -->
 			<SolidColorBrush x:Key="OnSurfaceVariantBrush" Color="{StaticResource OnSurfaceVariantColor}" />
@@ -326,7 +326,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnSurfaceVariantDisabledLowBrush" Color="{StaticResource OnSurfaceVariantColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnSurfaceVariantColor-->
 			<!--#region SurfaceInverseColor -->
 			<SolidColorBrush x:Key="SurfaceInverseBrush" Color="{StaticResource SurfaceInverseColor}" />
@@ -338,7 +338,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="SurfaceInverseDisabledLowBrush" Color="{StaticResource SurfaceInverseColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion SurfaceInverseColor-->
 			<!--#region OnSurfaceInverseColor -->
 			<SolidColorBrush x:Key="OnSurfaceInverseBrush" Color="{StaticResource OnSurfaceInverseColor}" />
@@ -350,7 +350,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnSurfaceInverseDisabledLowBrush" Color="{StaticResource OnSurfaceInverseColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnSurfaceInverseColor-->
 			<!--#region OutlineColor -->
 			<SolidColorBrush x:Key="OutlineBrush" Color="{StaticResource OutlineColor}" />
@@ -362,7 +362,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OutlineDisabledLowBrush" Color="{StaticResource OutlineColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OutlineColor-->
 
 			<!--#region OutlineVariantColor -->
@@ -375,7 +375,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OutlineVariantDisabledLowBrush" Color="{StaticResource OutlineVariantColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OutlineColor-->
 
 			<SolidColorBrush x:Key="SurfaceTintBrush" Color="{StaticResource SurfaceTintColor}" />
@@ -393,7 +393,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="PrimaryDisabledLowBrush" Color="{StaticResource PrimaryColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion PrimaryColor-->
 			<!--#region PrimaryInverseColor -->
 			<SolidColorBrush x:Key="PrimaryInverseBrush" Color="{StaticResource PrimaryInverseColor}" />
@@ -405,7 +405,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="PrimaryInverseDisabledLowBrush" Color="{StaticResource PrimaryInverseColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion PrimaryInverseColor-->
 			<!--#region OnPrimaryColor -->
 			<SolidColorBrush x:Key="OnPrimaryBrush" Color="{StaticResource OnPrimaryColor}" />
@@ -417,7 +417,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnPrimaryDisabledLowBrush" Color="{StaticResource OnPrimaryColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnPrimaryColor-->
 			<!--#region PrimaryContainerColor -->
 			<SolidColorBrush x:Key="PrimaryContainerBrush" Color="{StaticResource PrimaryContainerColor}" />
@@ -429,7 +429,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="PrimaryContainerDisabledLowBrush" Color="{StaticResource PrimaryContainerColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion PrimaryContainerColor-->
 			<!--#region OnPrimaryContainerColor -->
 			<SolidColorBrush x:Key="OnPrimaryContainerBrush" Color="{StaticResource OnPrimaryContainerColor}" />
@@ -441,7 +441,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnPrimaryContainerDisabledLowBrush" Color="{StaticResource OnPrimaryContainerColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnPrimaryContainerColor-->
 			<!--#region PrimaryVariantLightColor -->
 			<SolidColorBrush x:Key="PrimaryVariantLightBrush" Color="{StaticResource PrimaryVariantLightColor}" />
@@ -453,7 +453,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="PrimaryVariantLightDisabledLowBrush" Color="{StaticResource PrimaryVariantLightColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion PrimaryVariantLightColor-->
 			<!--#region PrimaryVariantDarkColor -->
 			<SolidColorBrush x:Key="PrimaryVariantDarkBrush" Color="{StaticResource PrimaryVariantDarkColor}" />
@@ -465,7 +465,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="PrimaryVariantDarkDisabledLowBrush" Color="{StaticResource PrimaryVariantDarkColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion PrimaryVariantDarkColor-->
 			<!--#region SecondaryColor -->
 			<SolidColorBrush x:Key="SecondaryBrush" Color="{StaticResource SecondaryColor}" />
@@ -477,7 +477,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="SecondaryDisabledLowBrush" Color="{StaticResource SecondaryColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion SecondaryColor-->
 			<!--#region OnSecondaryColor -->
 			<SolidColorBrush x:Key="OnSecondaryBrush" Color="{StaticResource OnSecondaryColor}" />
@@ -489,7 +489,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnSecondaryDisabledLowBrush" Color="{StaticResource OnSecondaryColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnSecondaryColor-->
 			<!--#region SecondaryContainerColor -->
 			<SolidColorBrush x:Key="SecondaryContainerBrush" Color="{StaticResource SecondaryContainerColor}" />
@@ -501,7 +501,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="SecondaryContainerDisabledLowBrush" Color="{StaticResource SecondaryContainerColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion SecondaryContainerColor-->
 			<!--#region OnSecondaryContainerColor -->
 			<SolidColorBrush x:Key="OnSecondaryContainerBrush" Color="{StaticResource OnSecondaryContainerColor}" />
@@ -513,7 +513,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnSecondaryContainerDisabledLowBrush" Color="{StaticResource OnSecondaryContainerColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnSecondaryContainerColor-->
 			<!--#region SecondaryVariantLightColor -->
 			<SolidColorBrush x:Key="SecondaryVariantLightBrush" Color="{StaticResource SecondaryVariantLightColor}" />
@@ -525,7 +525,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="SecondaryVariantLightDisabledLowBrush" Color="{StaticResource SecondaryVariantLightColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion SecondaryVariantLightColor-->
 			<!--#region SecondaryVariantDarkColor -->
 			<SolidColorBrush x:Key="SecondaryVariantDarkBrush" Color="{StaticResource SecondaryVariantDarkColor}" />
@@ -537,7 +537,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="SecondaryVariantDarkDisabledLowBrush" Color="{StaticResource SecondaryVariantDarkColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion SecondaryVariantDarkColor-->
 			<!--#region TertiaryColor -->
 			<SolidColorBrush x:Key="TertiaryBrush" Color="{StaticResource TertiaryColor}" />
@@ -549,7 +549,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="TertiaryDisabledLowBrush" Color="{StaticResource TertiaryColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion TertiaryColor-->
 			<!--#region OnTertiaryColor -->
 			<SolidColorBrush x:Key="OnTertiaryBrush" Color="{StaticResource OnTertiaryColor}" />
@@ -561,7 +561,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnTertiaryDisabledLowBrush" Color="{StaticResource OnTertiaryColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnTertiaryColor-->
 			<!--#region TertiaryContainerColor -->
 			<SolidColorBrush x:Key="TertiaryContainerBrush" Color="{StaticResource TertiaryContainerColor}" />
@@ -573,7 +573,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="TertiaryContainerDisabledLowBrush" Color="{StaticResource TertiaryContainerColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion TertiaryContainerColor-->
 			<!--#region OnTertiaryContainerColor -->
 			<SolidColorBrush x:Key="OnTertiaryContainerBrush" Color="{StaticResource OnTertiaryContainerColor}" />
@@ -585,7 +585,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnTertiaryContainerDisabledLowBrush" Color="{StaticResource OnTertiaryContainerColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnTertiaryContainerColor-->
 			<!--#region ErrorColor -->
 			<SolidColorBrush x:Key="ErrorBrush" Color="{StaticResource ErrorColor}" />
@@ -597,7 +597,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="ErrorDisabledLowBrush" Color="{StaticResource ErrorColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion ErrorColor-->
 			<!--#region OnErrorColor -->
 			<SolidColorBrush x:Key="OnErrorBrush" Color="{StaticResource OnErrorColor}" />
@@ -609,7 +609,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnErrorDisabledLowBrush" Color="{StaticResource OnErrorColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnErrorColor-->
 			<!--#region ErrorContainerColor -->
 			<SolidColorBrush x:Key="ErrorContainerBrush" Color="{StaticResource ErrorContainerColor}" />
@@ -621,7 +621,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="ErrorContainerDisabledLowBrush" Color="{StaticResource ErrorContainerColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion ErrorContainerColor-->
 			<!--#region OnErrorContainerColor -->
 			<SolidColorBrush x:Key="OnErrorContainerBrush" Color="{StaticResource OnErrorContainerColor}" />
@@ -633,7 +633,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnErrorContainerDisabledLowBrush" Color="{StaticResource OnErrorContainerColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnErrorContainerColor-->
 			<!--#region BackgroundColor -->
 			<SolidColorBrush x:Key="BackgroundBrush" Color="{StaticResource BackgroundColor}" />
@@ -645,7 +645,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="BackgroundDisabledLowBrush" Color="{StaticResource BackgroundColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion BackgroundColor-->
 			<!--#region OnBackgroundColor -->
 			<SolidColorBrush x:Key="OnBackgroundBrush" Color="{StaticResource OnBackgroundColor}" />
@@ -657,7 +657,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnBackgroundDisabledLowBrush" Color="{StaticResource OnBackgroundColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnBackgroundColor-->
 			<!--#region SurfaceColor -->
 			<SolidColorBrush x:Key="SurfaceBrush" Color="{StaticResource SurfaceColor}" />
@@ -669,7 +669,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="SurfaceDisabledLowBrush" Color="{StaticResource SurfaceColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion SurfaceColor-->
 			<!--#region OnSurfaceColor -->
 			<SolidColorBrush x:Key="OnSurfaceBrush" Color="{StaticResource OnSurfaceColor}" />
@@ -681,7 +681,7 @@
 			<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 DisabledOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceDisabledLowBrush" Color="{StaticResource OnSurfaceColor}" Opacity="{StaticResource DisabledLowOpacity}" />
+			<SolidColorBrush x:Key="OnSurfaceDisabledLowBrush" Color="{StaticResource OnSurfaceColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnSurfaceColor-->
 			<!--#region SurfaceVariantColor -->
 			<SolidColorBrush x:Key="SurfaceVariantBrush" Color="{StaticResource SurfaceVariantColor}" />
@@ -693,7 +693,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="SurfaceVariantDisabledLowBrush" Color="{StaticResource SurfaceVariantColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion SurfaceVariantColor-->
 			<!--#region OnSurfaceVariantColor -->
 			<SolidColorBrush x:Key="OnSurfaceVariantBrush" Color="{StaticResource OnSurfaceVariantColor}" />
@@ -705,7 +705,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnSurfaceVariantDisabledLowBrush" Color="{StaticResource OnSurfaceVariantColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnSurfaceVariantColor-->
 			<!--#region SurfaceInverseColor -->
 			<SolidColorBrush x:Key="SurfaceInverseBrush" Color="{StaticResource SurfaceInverseColor}" />
@@ -717,7 +717,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="SurfaceInverseDisabledLowBrush" Color="{StaticResource SurfaceInverseColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion SurfaceInverseColor-->
 			<!--#region OnSurfaceInverseColor -->
 			<SolidColorBrush x:Key="OnSurfaceInverseBrush" Color="{StaticResource OnSurfaceInverseColor}" />
@@ -729,7 +729,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnSurfaceInverseDisabledLowBrush" Color="{StaticResource OnSurfaceInverseColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnSurfaceInverseColor-->
 			<!--#region OutlineColor -->
 			<SolidColorBrush x:Key="OutlineBrush" Color="{StaticResource OutlineColor}" />
@@ -741,7 +741,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OutlineDisabledLowBrush" Color="{StaticResource OutlineColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OutlineColor-->
 
 			<!--#region OutlineVariantColor -->
@@ -754,7 +754,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OutlineVariantDisabledLowBrush" Color="{StaticResource OutlineVariantColor}" Opacity="{StaticResource DisabledLOpacity}" />
 			<!--#endregion OutlineColor-->
 
 			<!-- #region SurfaceTintColor -->
@@ -773,7 +773,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="PrimaryDisabledLowBrush" Color="{StaticResource PrimaryColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion PrimaryColor-->
 			<!--#region PrimaryInverseColor -->
 			<SolidColorBrush x:Key="PrimaryInverseBrush" Color="{StaticResource PrimaryInverseColor}" />
@@ -785,7 +785,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="PrimaryInverseDisabledLowBrush" Color="{StaticResource PrimaryInverseColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion PrimaryInverseColor-->
 			<!--#region OnPrimaryColor -->
 			<SolidColorBrush x:Key="OnPrimaryBrush" Color="{StaticResource OnPrimaryColor}" />
@@ -797,7 +797,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnPrimaryDisabledLowBrush" Color="{StaticResource OnPrimaryColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnPrimaryColor-->
 			<!--#region PrimaryContainerColor -->
 			<SolidColorBrush x:Key="PrimaryContainerBrush" Color="{StaticResource PrimaryContainerColor}" />
@@ -809,7 +809,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="PrimaryContainerDisabledLowBrush" Color="{StaticResource PrimaryContainerColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion PrimaryContainerColor-->
 			<!--#region OnPrimaryContainerColor -->
 			<SolidColorBrush x:Key="OnPrimaryContainerBrush" Color="{StaticResource OnPrimaryContainerColor}" />
@@ -821,7 +821,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnPrimaryContainerDisabledLowBrush" Color="{StaticResource OnPrimaryContainerColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnPrimaryContainerColor-->
 			<!--#region PrimaryVariantLightColor -->
 			<SolidColorBrush x:Key="PrimaryVariantLightBrush" Color="{StaticResource PrimaryVariantLightColor}" />
@@ -833,7 +833,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="PrimaryVariantLightDisabledLowBrush" Color="{StaticResource PrimaryVariantLightColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion PrimaryVariantLightColor-->
 			<!--#region PrimaryVariantDarkColor -->
 			<SolidColorBrush x:Key="PrimaryVariantDarkBrush" Color="{StaticResource PrimaryVariantDarkColor}" />
@@ -845,7 +845,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="PrimaryVariantDarkDisabledLowBrush" Color="{StaticResource PrimaryVariantDarkColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion PrimaryVariantDarkColor-->
 			<!--#region SecondaryColor -->
 			<SolidColorBrush x:Key="SecondaryBrush" Color="{StaticResource SecondaryColor}" />
@@ -857,7 +857,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="SecondaryDisabledLowBrush" Color="{StaticResource SecondaryColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion SecondaryColor-->
 			<!--#region OnSecondaryColor -->
 			<SolidColorBrush x:Key="OnSecondaryBrush" Color="{StaticResource OnSecondaryColor}" />
@@ -869,7 +869,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnSecondaryDisabledLowBrush" Color="{StaticResource OnSecondaryColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnSecondaryColor-->
 			<!--#region SecondaryContainerColor -->
 			<SolidColorBrush x:Key="SecondaryContainerBrush" Color="{StaticResource SecondaryContainerColor}" />
@@ -881,7 +881,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="SecondaryContainerDisabledLowBrush" Color="{StaticResource SecondaryContainerColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion SecondaryContainerColor-->
 			<!--#region OnSecondaryContainerColor -->
 			<SolidColorBrush x:Key="OnSecondaryContainerBrush" Color="{StaticResource OnSecondaryContainerColor}" />
@@ -893,7 +893,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnSecondaryContainerDisabledLowBrush" Color="{StaticResource OnSecondaryContainerColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnSecondaryContainerColor-->
 			<!--#region SecondaryVariantLightColor -->
 			<SolidColorBrush x:Key="SecondaryVariantLightBrush" Color="{StaticResource SecondaryVariantLightColor}" />
@@ -905,7 +905,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="SecondaryVariantLightDisabledLowBrush" Color="{StaticResource SecondaryVariantLightColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion SecondaryVariantLightColor-->
 			<!--#region SecondaryVariantDarkColor -->
 			<SolidColorBrush x:Key="SecondaryVariantDarkBrush" Color="{StaticResource SecondaryVariantDarkColor}" />
@@ -917,7 +917,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="SecondaryVariantDarkDisabledLowBrush" Color="{StaticResource SecondaryVariantDarkColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion SecondaryVariantDarkColor-->
 			<!--#region TertiaryColor -->
 			<SolidColorBrush x:Key="TertiaryBrush" Color="{StaticResource TertiaryColor}" />
@@ -929,7 +929,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="TertiaryDisabledLowBrush" Color="{StaticResource TertiaryColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion TertiaryColor-->
 			<!--#region OnTertiaryColor -->
 			<SolidColorBrush x:Key="OnTertiaryBrush" Color="{StaticResource OnTertiaryColor}" />
@@ -941,7 +941,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnTertiaryDisabledLowBrush" Color="{StaticResource OnTertiaryColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnTertiaryColor-->
 			<!--#region TertiaryContainerColor -->
 			<SolidColorBrush x:Key="TertiaryContainerBrush" Color="{StaticResource TertiaryContainerColor}" />
@@ -953,7 +953,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="TertiaryContainerDisabledLowBrush" Color="{StaticResource TertiaryContainerColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion TertiaryContainerColor-->
 			<!--#region OnTertiaryContainerColor -->
 			<SolidColorBrush x:Key="OnTertiaryContainerBrush" Color="{StaticResource OnTertiaryContainerColor}" />
@@ -965,7 +965,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnTertiaryContainerDisabledLowBrush" Color="{StaticResource OnTertiaryContainerColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnTertiaryContainerColor-->
 			<!--#region ErrorColor -->
 			<SolidColorBrush x:Key="ErrorBrush" Color="{StaticResource ErrorColor}" />
@@ -977,7 +977,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="ErrorDisabledLowBrush" Color="{StaticResource ErrorColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion ErrorColor-->
 			<!--#region OnErrorColor -->
 			<SolidColorBrush x:Key="OnErrorBrush" Color="{StaticResource OnErrorColor}" />
@@ -989,7 +989,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnErrorDisabledLowBrush" Color="{StaticResource OnErrorColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnErrorColor-->
 			<!--#region ErrorContainerColor -->
 			<SolidColorBrush x:Key="ErrorContainerBrush" Color="{StaticResource ErrorContainerColor}" />
@@ -1001,7 +1001,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="ErrorContainerDisabledLowBrush" Color="{StaticResource ErrorContainerColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion ErrorContainerColor-->
 			<!--#region OnErrorContainerColor -->
 			<SolidColorBrush x:Key="OnErrorContainerBrush" Color="{StaticResource OnErrorContainerColor}" />
@@ -1013,7 +1013,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnErrorContainerDisabledLowBrush" Color="{StaticResource OnErrorContainerColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnErrorContainerColor-->
 			<!--#region BackgroundColor -->
 			<SolidColorBrush x:Key="BackgroundBrush" Color="{StaticResource BackgroundColor}" />
@@ -1025,7 +1025,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="BackgroundDisabledLowBrush" Color="{StaticResource BackgroundColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion BackgroundColor-->
 			<!--#region OnBackgroundColor -->
 			<SolidColorBrush x:Key="OnBackgroundBrush" Color="{StaticResource OnBackgroundColor}" />
@@ -1037,7 +1037,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnBackgroundDisabledLowBrush" Color="{StaticResource OnBackgroundColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnBackgroundColor-->
 			<!--#region SurfaceColor -->
 			<SolidColorBrush x:Key="SurfaceBrush" Color="{StaticResource SurfaceColor}" />
@@ -1049,7 +1049,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="SurfaceDisabledLowBrush" Color="{StaticResource SurfaceColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion SurfaceColor-->
 			<!--#region OnSurfaceColor -->
 			<SolidColorBrush x:Key="OnSurfaceBrush" Color="{StaticResource OnSurfaceColor}" />
@@ -1061,7 +1061,7 @@
 			<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 DisabledOpacity}" />
-			<SolidColorBrush x:Key="OnSurfaceDisabledLowBrush" Color="{StaticResource OnSurfaceColor}" Opacity="{StaticResource DisabledLowOpacity}" />
+			<SolidColorBrush x:Key="OnSurfaceDisabledLowBrush" Color="{StaticResource OnSurfaceColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnSurfaceColor-->
 			<!--#region SurfaceVariantColor -->
 			<SolidColorBrush x:Key="SurfaceVariantBrush" Color="{StaticResource SurfaceVariantColor}" />
@@ -1073,7 +1073,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="SurfaceVariantDisabledLowBrush" Color="{StaticResource SurfaceVariantColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion SurfaceVariantColor-->
 			<!--#region OnSurfaceVariantColor -->
 			<SolidColorBrush x:Key="OnSurfaceVariantBrush" Color="{StaticResource OnSurfaceVariantColor}" />
@@ -1085,7 +1085,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnSurfaceVariantDisabledLowBrush" Color="{StaticResource OnSurfaceVariantColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnSurfaceVariantColor-->
 			<!--#region SurfaceInverseColor -->
 			<SolidColorBrush x:Key="SurfaceInverseBrush" Color="{StaticResource SurfaceInverseColor}" />
@@ -1097,7 +1097,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="SurfaceInverseDisabledLowBrush" Color="{StaticResource SurfaceInverseColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion SurfaceInverseColor-->
 			<!--#region OnSurfaceInverseColor -->
 			<SolidColorBrush x:Key="OnSurfaceInverseBrush" Color="{StaticResource OnSurfaceInverseColor}" />
@@ -1109,7 +1109,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OnSurfaceInverseDisabledLowBrush" Color="{StaticResource OnSurfaceInverseColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OnSurfaceInverseColor-->
 			<!--#region OutlineColor -->
 			<SolidColorBrush x:Key="OutlineBrush" Color="{StaticResource OutlineColor}" />
@@ -1121,7 +1121,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OutlineDisabledLowBrush" Color="{StaticResource OutlineColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OutlineColor-->
 
 			<!--#region OutlineVariantColor -->
@@ -1134,7 +1134,7 @@
 			<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}" />
+			<SolidColorBrush x:Key="OutlineVariantDisabledLowBrush" Color="{StaticResource OutlineVariantColor}" Opacity="{StaticResource DisabledOpacity}" />
 			<!--#endregion OutlineColor-->
 
 			<!-- #region SurfaceTintColor -->