diff --git a/src/Avalonia.Controls/ColorPicker/ColorChangedEventArgs.cs b/src/Avalonia.Controls.ColorPicker/ColorChangedEventArgs.cs
similarity index 100%
rename from src/Avalonia.Controls/ColorPicker/ColorChangedEventArgs.cs
rename to src/Avalonia.Controls.ColorPicker/ColorChangedEventArgs.cs
diff --git a/src/Avalonia.Controls/ColorPicker/ColorSpectrum/ColorHelpers.cs b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorHelpers.cs
similarity index 100%
rename from src/Avalonia.Controls/ColorPicker/ColorSpectrum/ColorHelpers.cs
rename to src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorHelpers.cs
diff --git a/src/Avalonia.Controls/ColorPicker/ColorSpectrum/ColorSpectrum.Properties.cs b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.Properties.cs
similarity index 100%
rename from src/Avalonia.Controls/ColorPicker/ColorSpectrum/ColorSpectrum.Properties.cs
rename to src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.Properties.cs
diff --git a/src/Avalonia.Controls/ColorPicker/ColorSpectrum/ColorSpectrum.cs b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.cs
similarity index 100%
rename from src/Avalonia.Controls/ColorPicker/ColorSpectrum/ColorSpectrum.cs
rename to src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.cs
diff --git a/src/Avalonia.Controls/ColorPicker/ColorSpectrum/Hsv.cs b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/Hsv.cs
similarity index 100%
rename from src/Avalonia.Controls/ColorPicker/ColorSpectrum/Hsv.cs
rename to src/Avalonia.Controls.ColorPicker/ColorSpectrum/Hsv.cs
diff --git a/src/Avalonia.Controls/ColorPicker/ColorSpectrum/IncrementAmount.cs b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/IncrementAmount.cs
similarity index 100%
rename from src/Avalonia.Controls/ColorPicker/ColorSpectrum/IncrementAmount.cs
rename to src/Avalonia.Controls.ColorPicker/ColorSpectrum/IncrementAmount.cs
diff --git a/src/Avalonia.Controls/ColorPicker/ColorSpectrum/IncrementDirection.cs b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/IncrementDirection.cs
similarity index 100%
rename from src/Avalonia.Controls/ColorPicker/ColorSpectrum/IncrementDirection.cs
rename to src/Avalonia.Controls.ColorPicker/ColorSpectrum/IncrementDirection.cs
diff --git a/src/Avalonia.Controls/ColorPicker/ColorSpectrum/Rgb.cs b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/Rgb.cs
similarity index 100%
rename from src/Avalonia.Controls/ColorPicker/ColorSpectrum/Rgb.cs
rename to src/Avalonia.Controls.ColorPicker/ColorSpectrum/Rgb.cs
diff --git a/src/Avalonia.Controls/ColorPicker/ColorSpectrumChannels.cs b/src/Avalonia.Controls.ColorPicker/ColorSpectrumChannels.cs
similarity index 100%
rename from src/Avalonia.Controls/ColorPicker/ColorSpectrumChannels.cs
rename to src/Avalonia.Controls.ColorPicker/ColorSpectrumChannels.cs
diff --git a/src/Avalonia.Controls/ColorPicker/ColorSpectrumShape.cs b/src/Avalonia.Controls.ColorPicker/ColorSpectrumShape.cs
similarity index 100%
rename from src/Avalonia.Controls/ColorPicker/ColorSpectrumShape.cs
rename to src/Avalonia.Controls.ColorPicker/ColorSpectrumShape.cs
diff --git a/src/Avalonia.Controls/ColorPicker/HsvChannel.cs b/src/Avalonia.Controls.ColorPicker/HsvChannel.cs
similarity index 100%
rename from src/Avalonia.Controls/ColorPicker/HsvChannel.cs
rename to src/Avalonia.Controls.ColorPicker/HsvChannel.cs
diff --git a/src/Avalonia.Themes.Default/Controls/ColorSpectrum.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Default.xaml
similarity index 97%
rename from src/Avalonia.Themes.Default/Controls/ColorSpectrum.xaml
rename to src/Avalonia.Controls.ColorPicker/Themes/Default.xaml
index 338ea69dac..832daf8853 100644
--- a/src/Avalonia.Themes.Default/Controls/ColorSpectrum.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Default.xaml
@@ -1,14 +1,8 @@
-<Styles xmlns="https://github.com/avaloniaui"
+<Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:CompileBindings="True"
         xmlns:converters="using:Avalonia.Controls.Converters">
 
-  <Design.PreviewWith>
-    <Border Padding="20">
-      <ColorSpectrum Width="256" Height="256" />
-    </Border>
-  </Design.PreviewWith>
-
   <Styles.Resources>
     <converters:EnumValueEqualsConverter x:Key="EnumValueEquals" />
     <converters:CornerRadiusToDoubleConverter x:Key="TopLeftCornerRadius" Corner="TopLeft" />
@@ -136,5 +130,5 @@
     <Setter Property="Width" Value="48" />
     <Setter Property="Height" Value="48" />
   </Style>
-  
+
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ColorSpectrum.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent.xaml
similarity index 97%
rename from src/Avalonia.Themes.Fluent/Controls/ColorSpectrum.xaml
rename to src/Avalonia.Controls.ColorPicker/Themes/Fluent.xaml
index 5de6daea11..545702ea84 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ColorSpectrum.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent.xaml
@@ -1,14 +1,8 @@
-<Styles xmlns="https://github.com/avaloniaui"
+<Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:CompileBindings="True"
         xmlns:converters="using:Avalonia.Controls.Converters">
 
-  <Design.PreviewWith>
-    <Border Padding="20">
-      <ColorSpectrum Width="256" Height="256" />
-    </Border>
-  </Design.PreviewWith>
-
   <Styles.Resources>
     <converters:EnumValueEqualsConverter x:Key="EnumValueEquals" />
     <converters:CornerRadiusToDoubleConverter x:Key="TopLeftCornerRadius" Corner="TopLeft" />
@@ -136,5 +130,5 @@
     <Setter Property="Width" Value="48" />
     <Setter Property="Height" Value="48" />
   </Style>
-  
+
 </Styles>
diff --git a/src/Avalonia.Themes.Default/DefaultTheme.xaml b/src/Avalonia.Themes.Default/DefaultTheme.xaml
index 682f395e5b..468b723f5b 100644
--- a/src/Avalonia.Themes.Default/DefaultTheme.xaml
+++ b/src/Avalonia.Themes.Default/DefaultTheme.xaml
@@ -11,7 +11,6 @@
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/Carousel.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/CheckBox.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/CaptionButtons.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ColorSpectrum.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ComboBox.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ComboBoxItem.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ContentControl.xaml"/>
diff --git a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
index b7d35ad5cc..5b217e4764 100644
--- a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
@@ -11,7 +11,6 @@
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/Carousel.xaml"/>  
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/CheckBox.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ColorSpectrum.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ComboBox.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ContentControl.xaml"/>