diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Default/ColorPreviewer.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Default/ColorPreviewer.xaml
index 24242fc251..6ac0982408 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Default/ColorPreviewer.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Default/ColorPreviewer.xaml
@@ -9,8 +9,8 @@
     <converters:ToBrushConverter x:Key="ToBrush" />
     <converters:CornerRadiusFilterConverter x:Key="RightCornerRadiusFilterConverter" Filter="TopRight, BottomRight"/>
     <converters:CornerRadiusFilterConverter x:Key="LeftCornerRadiusFilterConverter" Filter="TopLeft, BottomLeft"/>
-    <x:Double x:Key="AccentColorSectionWidth">80</x:Double>
-    <x:Double x:Key="AccentColorSectionHeight">40</x:Double>
+    <x:Double x:Key="ColorPreviewerAccentSectionWidth">80</x:Double>
+    <x:Double x:Key="ColorPreviewerAccentSectionHeight">40</x:Double>
   </Styles.Resources>
 
   <Style Selector="ColorPreviewer">
@@ -21,8 +21,8 @@
         <Grid ColumnDefinitions="Auto,*,Auto">
           <!-- Left accent colors -->
           <Grid Grid.Column="0"
-                Height="{StaticResource AccentColorSectionHeight}"
-                Width="{StaticResource AccentColorSectionWidth}"
+                Height="{StaticResource ColorPreviewerAccentSectionHeight}"
+                Width="{StaticResource ColorPreviewerAccentSectionWidth}"
                 ColumnDefinitions="*,*"
                 Margin="0,0,-10,0"
                 VerticalAlignment="Center"
@@ -31,7 +31,7 @@
                     Grid.ColumnSpan="2"
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Stretch"
-                    Background="{StaticResource CheckeredBackgroundBrush}" />
+                    Background="{StaticResource ColorControlCheckeredBackgroundBrush}" />
             <Border x:Name="PART_AccentDecrement2Border"
                     Grid.Column="0"
                     CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}"
@@ -44,8 +44,8 @@
           </Grid>
           <!-- Right accent colors -->
           <Grid Grid.Column="2"
-                Height="{StaticResource AccentColorSectionHeight}"
-                Width="{StaticResource AccentColorSectionWidth}"
+                Height="{StaticResource ColorPreviewerAccentSectionHeight}"
+                Width="{StaticResource ColorPreviewerAccentSectionWidth}"
                 ColumnDefinitions="*,*"
                 Margin="-10,0,0,0"
                 VerticalAlignment="Center"
@@ -54,7 +54,7 @@
                     Grid.ColumnSpan="2"
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Stretch"
-                    Background="{StaticResource CheckeredBackgroundBrush}" />
+                    Background="{StaticResource ColorControlCheckeredBackgroundBrush}" />
             <Border x:Name="PART_AccentIncrement1Border"
                     Grid.Column="0"
                     Tag="1"
@@ -71,7 +71,7 @@
                   CornerRadius="{TemplateBinding CornerRadius}"
                   Margin="10">
             <Panel>
-              <Border Background="{StaticResource CheckeredBackgroundBrush}"
+              <Border Background="{StaticResource ColorControlCheckeredBackgroundBrush}"
                       CornerRadius="{TemplateBinding CornerRadius}" />
               <Border x:Name="PreviewBorder"
                       CornerRadius="{TemplateBinding CornerRadius}"
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Default/ColorSlider.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Default/ColorSlider.xaml
index 19f10201a5..bf2f632fd8 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Default/ColorSlider.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Default/ColorSlider.xaml
@@ -34,7 +34,7 @@
           <Grid Margin="{TemplateBinding Padding}">
             <Rectangle HorizontalAlignment="Stretch"
                        VerticalAlignment="Stretch"
-                       Fill="{StaticResource CheckeredBackgroundBrush}"
+                       Fill="{StaticResource ColorControlCheckeredBackgroundBrush}"
                        RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadius}}"
                        RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadius}}" />
             <Rectangle HorizontalAlignment="Stretch"
@@ -106,7 +106,7 @@
           <Grid Margin="{TemplateBinding Padding}">
             <Rectangle HorizontalAlignment="Stretch"
                        VerticalAlignment="Stretch"
-                       Fill="{StaticResource CheckeredBackgroundBrush}"
+                       Fill="{StaticResource ColorControlCheckeredBackgroundBrush}"
                        RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadius}}"
                        RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadius}}" />
             <Rectangle HorizontalAlignment="Stretch"
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Default/Default.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Default/Default.xaml
index 6d2f979f6e..84caa49421 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Default/Default.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Default/Default.xaml
@@ -2,7 +2,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
   <Styles.Resources>
-    <VisualBrush x:Key="CheckeredBackgroundBrush"
+    <VisualBrush x:Key="ColorControlCheckeredBackgroundBrush"
                  TileMode="Tile"
                  Stretch="Uniform"
                  DestinationRect="0,0,8,8">
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml
index 46d627b3a1..8d172d7031 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml
@@ -34,7 +34,7 @@
           <DropDownButton.Content>
             <!-- Preview color -->
             <Panel>
-              <Border Background="{StaticResource CheckeredBackgroundBrush}"
+              <Border Background="{StaticResource ColorControlCheckeredBackgroundBrush}"
                       CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}"
                       HorizontalAlignment="Stretch"
                       VerticalAlignment="Stretch"
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPreviewer.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPreviewer.xaml
index 41948900cd..8d77f8d3c1 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPreviewer.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPreviewer.xaml
@@ -9,8 +9,8 @@
     <converters:ToBrushConverter x:Key="ToBrush" />
     <converters:CornerRadiusFilterConverter x:Key="RightCornerRadiusFilterConverter" Filter="TopRight, BottomRight"/>
     <converters:CornerRadiusFilterConverter x:Key="LeftCornerRadiusFilterConverter" Filter="TopLeft, BottomLeft"/>
-    <x:Double x:Key="AccentColorSectionWidth">80</x:Double>
-    <x:Double x:Key="AccentColorSectionHeight">40</x:Double>
+    <x:Double x:Key="ColorPreviewerAccentSectionWidth">80</x:Double>
+    <x:Double x:Key="ColorPreviewerAccentSectionHeight">40</x:Double>
   </Styles.Resources>
 
   <Style Selector="ColorPreviewer">
@@ -21,8 +21,8 @@
         <Grid ColumnDefinitions="Auto,*,Auto">
           <!-- Left accent colors -->
           <Grid Grid.Column="0"
-                Height="{StaticResource AccentColorSectionHeight}"
-                Width="{StaticResource AccentColorSectionWidth}"
+                Height="{StaticResource ColorPreviewerAccentSectionHeight}"
+                Width="{StaticResource ColorPreviewerAccentSectionWidth}"
                 ColumnDefinitions="*,*"
                 Margin="0,0,-10,0"
                 VerticalAlignment="Center"
@@ -31,7 +31,7 @@
                     Grid.ColumnSpan="2"
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Stretch"
-                    Background="{StaticResource CheckeredBackgroundBrush}" />
+                    Background="{StaticResource ColorControlCheckeredBackgroundBrush}" />
             <Border x:Name="PART_AccentDecrement2Border"
                     Grid.Column="0"
                     CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}"
@@ -44,8 +44,8 @@
           </Grid>
           <!-- Right accent colors -->
           <Grid Grid.Column="2"
-                Height="{StaticResource AccentColorSectionHeight}"
-                Width="{StaticResource AccentColorSectionWidth}"
+                Height="{StaticResource ColorPreviewerAccentSectionHeight}"
+                Width="{StaticResource ColorPreviewerAccentSectionWidth}"
                 ColumnDefinitions="*,*"
                 Margin="-10,0,0,0"
                 VerticalAlignment="Center"
@@ -54,7 +54,7 @@
                     Grid.ColumnSpan="2"
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Stretch"
-                    Background="{StaticResource CheckeredBackgroundBrush}" />
+                    Background="{StaticResource ColorControlCheckeredBackgroundBrush}" />
             <Border x:Name="PART_AccentIncrement1Border"
                     Grid.Column="0"
                     Tag="1"
@@ -71,7 +71,7 @@
                   CornerRadius="{TemplateBinding CornerRadius}"
                   Margin="10">
             <Panel>
-              <Border Background="{StaticResource CheckeredBackgroundBrush}"
+              <Border Background="{StaticResource ColorControlCheckeredBackgroundBrush}"
                       CornerRadius="{TemplateBinding CornerRadius}" />
               <Border x:Name="PreviewBorder"
                       CornerRadius="{TemplateBinding CornerRadius}"
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSlider.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSlider.xaml
index 18a081721a..bb6e026f9e 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSlider.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSlider.xaml
@@ -34,7 +34,7 @@
           <Grid Margin="{TemplateBinding Padding}">
             <Rectangle HorizontalAlignment="Stretch"
                        VerticalAlignment="Stretch"
-                       Fill="{StaticResource CheckeredBackgroundBrush}"
+                       Fill="{StaticResource ColorControlCheckeredBackgroundBrush}"
                        RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadius}}"
                        RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadius}}" />
             <Rectangle HorizontalAlignment="Stretch"
@@ -106,7 +106,7 @@
           <Grid Margin="{TemplateBinding Padding}">
             <Rectangle HorizontalAlignment="Stretch"
                        VerticalAlignment="Stretch"
-                       Fill="{StaticResource CheckeredBackgroundBrush}"
+                       Fill="{StaticResource ColorControlCheckeredBackgroundBrush}"
                        RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadius}}"
                        RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadius}}" />
             <Rectangle HorizontalAlignment="Stretch"
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
index 563f230cc9..867e0f223f 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
@@ -13,10 +13,10 @@
     <converters:ColorToDisplayNameConverter x:Key="ColorToDisplayName" />
     <converters:ColorToHexConverter x:Key="ColorToHex" />
     <converters:EnumToBoolConverter x:Key="EnumToBool" />
-    <globalization:NumberFormatInfo x:Key="ComponentNumberFormatInfo" NumberDecimalDigits="0" />
+    <globalization:NumberFormatInfo x:Key="ColorViewComponentNumberFormat" NumberDecimalDigits="0" />
     <x:Double x:Key="ColorViewTabStripHeight">48</x:Double>
-    <x:Double x:Key="ComponentLabelWidth">30</x:Double>
-    <x:Double x:Key="ComponentTextInputWidth">80</x:Double>
+    <x:Double x:Key="ColorViewComponentLabelWidth">30</x:Double>
+    <x:Double x:Key="ColorViewComponentTextInputWidth">80</x:Double>
     <!-- Fluent UI System Icons : ic_fluent_inking_tool_20_regular.svg -->
     <PathGeometry x:Key="ColorViewSpectrumIconGeometry">
       M3 2C3.27614 2 3.5 2.22386 3.5 2.5V5.5C3.5 5.77614 3.72386 6 4 6H16C16.2761 6 16.5 5.77614
@@ -405,7 +405,7 @@
                 <Border Grid.Column="0"
                         Grid.Row="2"
                         Height="{Binding ElementName=Component1NumericUpDown, Path=Bounds.Height}"
-                        Width="{DynamicResource ComponentLabelWidth}"
+                        Width="{DynamicResource ColorViewComponentLabelWidth}"
                         Background="{DynamicResource TextControlBackgroundDisabled}"
                         BorderBrush="{DynamicResource TextControlBorderBrush}"
                         BorderThickness="1,1,0,1"
@@ -430,11 +430,11 @@
                                AllowSpin="True"
                                ShowButtonSpinner="False"
                                Height="32"
-                               Width="{DynamicResource ComponentTextInputWidth}"
+                               Width="{DynamicResource ColorViewComponentTextInputWidth}"
                                CornerRadius="0,4,4,0"
                                Margin="0,0,12,0"
                                VerticalAlignment="Center"
-                               NumberFormat="{StaticResource ComponentNumberFormatInfo}"
+                               NumberFormat="{StaticResource ColorViewComponentNumberFormat}"
                                Minimum="{Binding Minimum, ElementName=Component1Slider}"
                                Maximum="{Binding Maximum, ElementName=Component1Slider}"
                                Value="{Binding Value, ElementName=Component1Slider}"
@@ -455,7 +455,7 @@
                 <!-- Component 2 RGB:Green HSV:Saturation -->
                 <Border Grid.Column="0"
                         Grid.Row="3"
-                        Width="{DynamicResource ComponentLabelWidth}"
+                        Width="{DynamicResource ColorViewComponentLabelWidth}"
                         Height="{Binding ElementName=Component2NumericUpDown, Path=Bounds.Height}"
                         Background="{DynamicResource TextControlBackgroundDisabled}"
                         BorderBrush="{DynamicResource TextControlBorderBrush}"
@@ -481,11 +481,11 @@
                                AllowSpin="True"
                                ShowButtonSpinner="False"
                                Height="32"
-                               Width="{DynamicResource ComponentTextInputWidth}"
+                               Width="{DynamicResource ColorViewComponentTextInputWidth}"
                                CornerRadius="0,4,4,0"
                                Margin="0,0,12,0"
                                VerticalAlignment="Center"
-                               NumberFormat="{StaticResource ComponentNumberFormatInfo}"
+                               NumberFormat="{StaticResource ColorViewComponentNumberFormat}"
                                Minimum="{Binding Minimum, ElementName=Component2Slider}"
                                Maximum="{Binding Maximum, ElementName=Component2Slider}"
                                Value="{Binding Value, ElementName=Component2Slider}"
@@ -506,7 +506,7 @@
                 <!-- Component 3 RGB:Blue HSV:Value -->
                 <Border Grid.Column="0"
                         Grid.Row="4"
-                        Width="{DynamicResource ComponentLabelWidth}"
+                        Width="{DynamicResource ColorViewComponentLabelWidth}"
                         Height="{Binding ElementName=Component3NumericUpDown, Path=Bounds.Height}"
                         Background="{DynamicResource TextControlBackgroundDisabled}"
                         BorderBrush="{DynamicResource TextControlBorderBrush}"
@@ -532,11 +532,11 @@
                                AllowSpin="True"
                                ShowButtonSpinner="False"
                                Height="32"
-                               Width="{DynamicResource ComponentTextInputWidth}"
+                               Width="{DynamicResource ColorViewComponentTextInputWidth}"
                                CornerRadius="0,4,4,0"
                                Margin="0,0,12,0"
                                VerticalAlignment="Center"
-                               NumberFormat="{StaticResource ComponentNumberFormatInfo}"
+                               NumberFormat="{StaticResource ColorViewComponentNumberFormat}"
                                Minimum="{Binding Minimum, ElementName=Component3Slider}"
                                Maximum="{Binding Maximum, ElementName=Component3Slider}"
                                Value="{Binding Value, ElementName=Component3Slider}"
@@ -557,7 +557,7 @@
                 <!-- Alpha Component -->
                 <Border Grid.Column="0"
                         Grid.Row="5"
-                        Width="{DynamicResource ComponentLabelWidth}"
+                        Width="{DynamicResource ColorViewComponentLabelWidth}"
                         Height="{Binding ElementName=AlphaComponentNumericUpDown, Path=Bounds.Height}"
                         Background="{DynamicResource TextControlBackgroundDisabled}"
                         BorderBrush="{DynamicResource TextControlBorderBrush}"
@@ -586,11 +586,11 @@
                                AllowSpin="True"
                                ShowButtonSpinner="False"
                                Height="32"
-                               Width="{DynamicResource ComponentTextInputWidth}"
+                               Width="{DynamicResource ColorViewComponentTextInputWidth}"
                                CornerRadius="0,4,4,0"
                                Margin="0,0,12,0"
                                VerticalAlignment="Center"
-                               NumberFormat="{StaticResource ComponentNumberFormatInfo}"
+                               NumberFormat="{StaticResource ColorViewComponentNumberFormat}"
                                Minimum="{Binding Minimum, ElementName=AlphaComponentSlider}"
                                Maximum="{Binding Maximum, ElementName=AlphaComponentSlider}"
                                Value="{Binding Value, ElementName=AlphaComponentSlider}"
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/Fluent.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/Fluent.xaml
index 03e8238a44..f1206486e2 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/Fluent.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/Fluent.xaml
@@ -2,7 +2,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
   <Styles.Resources>
-    <VisualBrush x:Key="CheckeredBackgroundBrush"
+    <VisualBrush x:Key="ColorControlCheckeredBackgroundBrush"
                  TileMode="Tile"
                  Stretch="Uniform"
                  DestinationRect="0,0,8,8">