diff --git a/src/Avalonia.Controls.ColorPicker/ColorComponent.cs b/src/Avalonia.Controls.ColorPicker/ColorComponent.cs
index a0385c03b4..71725056cf 100644
--- a/src/Avalonia.Controls.ColorPicker/ColorComponent.cs
+++ b/src/Avalonia.Controls.ColorPicker/ColorComponent.cs
@@ -8,21 +8,21 @@
         /// <summary>
         /// Represents the alpha component.
         /// </summary>
-        Alpha,
+        Alpha = 0,
 
         /// <summary>
         /// Represents the first color component which is Red when RGB or Hue when HSV.
         /// </summary>
-        Component1,
+        Component1 = 1,
 
         /// <summary>
         /// Represents the second color component which is Green when RGB or Saturation when HSV.
         /// </summary>
-        Component2,
+        Component2 = 2,
 
         /// <summary>
         /// Represents the third color component which is Blue when RGB or Value when HSV.
         /// </summary>
-        Component3
+        Component3 = 3
     }
 }
diff --git a/src/Avalonia.Controls.ColorPicker/HsvComponent.cs b/src/Avalonia.Controls.ColorPicker/HsvComponent.cs
index 1132bd7bbb..1a7a13166a 100644
--- a/src/Avalonia.Controls.ColorPicker/HsvComponent.cs
+++ b/src/Avalonia.Controls.ColorPicker/HsvComponent.cs
@@ -12,13 +12,21 @@ namespace Avalonia.Controls
     /// </summary>
     public enum HsvComponent
     {
+        /// <summary>
+        /// The Alpha component.
+        /// </summary>
+        /// <remarks>
+        /// Also see: <see cref="HsvColor.A"/>
+        /// </remarks>
+        Alpha = 0,
+
         /// <summary>
         /// The Hue component.
         /// </summary>
         /// <remarks>
         /// Also see: <see cref="HsvColor.H"/>
         /// </remarks>
-        Hue,
+        Hue = 1,
 
         /// <summary>
         /// The Saturation component.
@@ -26,7 +34,7 @@ namespace Avalonia.Controls
         /// <remarks>
         /// Also see: <see cref="HsvColor.S"/>
         /// </remarks>
-        Saturation,
+        Saturation = 2,
 
         /// <summary>
         /// The Value component.
@@ -34,14 +42,6 @@ namespace Avalonia.Controls
         /// <remarks>
         /// Also see: <see cref="HsvColor.V"/>
         /// </remarks>
-        Value,
-
-        /// <summary>
-        /// The Alpha component.
-        /// </summary>
-        /// <remarks>
-        /// Also see: <see cref="HsvColor.A"/>
-        /// </remarks>
-        Alpha
+        Value = 3
     };
 }
diff --git a/src/Avalonia.Controls.ColorPicker/RgbComponent.cs b/src/Avalonia.Controls.ColorPicker/RgbComponent.cs
new file mode 100644
index 0000000000..c3591573bb
--- /dev/null
+++ b/src/Avalonia.Controls.ColorPicker/RgbComponent.cs
@@ -0,0 +1,42 @@
+using Avalonia.Media;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Defines a specific component in the RGB color model.
+    /// </summary>
+    public enum RgbComponent
+    {
+        /// <summary>
+        /// The Alpha component.
+        /// </summary>
+        /// <remarks>
+        /// Also see: <see cref="Color.A"/>
+        /// </remarks>
+        Alpha = 0,
+
+        /// <summary>
+        /// The Red component.
+        /// </summary>
+        /// <remarks>
+        /// Also see: <see cref="Color.R"/>
+        /// </remarks>
+        Red = 1,
+
+        /// <summary>
+        /// The Green component.
+        /// </summary>
+        /// <remarks>
+        /// Also see: <see cref="Color.G"/>
+        /// </remarks>
+        Green = 2,
+
+        /// <summary>
+        /// The Blue component.
+        /// </summary>
+        /// <remarks>
+        /// Also see: <see cref="Color.B"/>
+        /// </remarks>
+        Blue = 3
+    };
+}