diff --git a/quantum/rgb_matrix.h b/quantum/rgb_matrix.h
index b64ddec0743..e43532d11e7 100644
--- a/quantum/rgb_matrix.h
+++ b/quantum/rgb_matrix.h
@@ -50,17 +50,25 @@ typedef struct rgb_led {
 
 extern const rgb_led g_rgb_leds[DRIVER_LED_TOTAL];
 
+typedef struct
+{
+	HSV color;
+	uint8_t index;
+} rgb_indicator;
+
 typedef union {
   uint32_t raw;
   struct {
     bool     enable  :1;
     uint8_t  mode    :6;
+    uint16_t hue     :9;
+    uint8_t  sat     :8;
     uint8_t  val     :8;
     uint8_t  speed   :8;//EECONFIG needs to be increased to support this
   };
-} led_config_t;
+} rgb_config_t;
 
-enum _matrix_effects {
+enum rgb_matrix_effects {
 	RGB_MATRIX_SOLID_COLOR = 1,
 #ifndef DISABLE_RGB_MATRIX_ALPHAS_MODS
     RGB_MATRIX_ALPHAS_MODS,