7 files changed, 10 insertions, 10 deletions
diff --git a/keyboards/mss_studio/m63_rgb/config.h b/keyboards/mss_studio/m63_rgb/config.h
index a7220ab1c6..792cdcc6b3 100644
--- a/keyboards/mss_studio/m63_rgb/config.h
+++ b/keyboards/mss_studio/m63_rgb/config.h
@@ -37,7 +37,7 @@
 #define FORCE_NKRO
 
 #ifdef RGB_MATRIX_ENABLE
-    #define DRIVER_LED_TOTAL 75
+    #define RGB_MATRIX_LED_COUNT 75
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
     #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
     #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/mss_studio/m63_rgb/keymaps/default/keymap.c b/keyboards/mss_studio/m63_rgb/keymaps/default/keymap.c
index cdff70d69c..7ae43b355d 100644
--- a/keyboards/mss_studio/m63_rgb/keymaps/default/keymap.c
+++ b/keyboards/mss_studio/m63_rgb/keymaps/default/keymap.c
@@ -168,7 +168,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     HSV      hsv = rgb_matrix_config.hsv;
     uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
     hsv.h        = time;
@@ -185,4 +185,5 @@ void rgb_matrix_indicators_user(void) {
             rgb_matrix_set_color(28, 0, 0, 0);
         }
     }
+    return false;
 }
diff --git a/keyboards/mss_studio/m63_rgb/keymaps/via/config.h b/keyboards/mss_studio/m63_rgb/keymaps/via/config.h
index db20f3b87b..188407396a 100644
--- a/keyboards/mss_studio/m63_rgb/keymaps/via/config.h
+++ b/keyboards/mss_studio/m63_rgb/keymaps/via/config.h
@@ -18,7 +18,3 @@
 #pragma once
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 2
-
-#ifdef RGB_MATRIX_ENABLE
-    #define VIA_QMK_RGBLIGHT_ENABLE
-#endif
diff --git a/keyboards/mss_studio/m63_rgb/keymaps/via/keymap.c b/keyboards/mss_studio/m63_rgb/keymaps/via/keymap.c
index cdff70d69c..7ae43b355d 100644
--- a/keyboards/mss_studio/m63_rgb/keymaps/via/keymap.c
+++ b/keyboards/mss_studio/m63_rgb/keymaps/via/keymap.c
@@ -168,7 +168,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     HSV      hsv = rgb_matrix_config.hsv;
     uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
     hsv.h        = time;
@@ -185,4 +185,5 @@ void rgb_matrix_indicators_user(void) {
             rgb_matrix_set_color(28, 0, 0, 0);
         }
     }
+    return false;
 }
diff --git a/keyboards/mss_studio/m64_rgb/config.h b/keyboards/mss_studio/m64_rgb/config.h
index c9a1e3f3db..90b5ae5130 100644
--- a/keyboards/mss_studio/m64_rgb/config.h
+++ b/keyboards/mss_studio/m64_rgb/config.h
@@ -37,7 +37,7 @@
 #define FORCE_NKRO
 
 #ifdef RGB_MATRIX_ENABLE
-    #define DRIVER_LED_TOTAL 76
+    #define RGB_MATRIX_LED_COUNT 76
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
     #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
     #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/mss_studio/m64_rgb/keymaps/default/keymap.c b/keyboards/mss_studio/m64_rgb/keymaps/default/keymap.c
index da5c7c40c3..7e66cc4f32 100644
--- a/keyboards/mss_studio/m64_rgb/keymaps/default/keymap.c
+++ b/keyboards/mss_studio/m64_rgb/keymaps/default/keymap.c
@@ -164,7 +164,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     HSV      hsv = rgb_matrix_config.hsv;
     uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
     hsv.h        = time;
@@ -181,4 +181,5 @@ void rgb_matrix_indicators_user(void) {
             rgb_matrix_set_color(28, 0, 0, 0);
         }
     }
+    return false;
 }
diff --git a/keyboards/mss_studio/m64_rgb/keymaps/via/keymap.c b/keyboards/mss_studio/m64_rgb/keymaps/via/keymap.c
index da5c7c40c3..7e66cc4f32 100644
--- a/keyboards/mss_studio/m64_rgb/keymaps/via/keymap.c
+++ b/keyboards/mss_studio/m64_rgb/keymaps/via/keymap.c
@@ -164,7 +164,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
     HSV      hsv = rgb_matrix_config.hsv;
     uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
     hsv.h        = time;
@@ -181,4 +181,5 @@ void rgb_matrix_indicators_user(void) {
             rgb_matrix_set_color(28, 0, 0, 0);
         }
     }
+    return false;
 }