2 files changed, 43 insertions, 42 deletions

diff --git a/keyboards/marksard/rhymestone/keymaps/default/keymap.c b/keyboards/marksard/rhymestone/keymaps/default/keymap.c
index f25955c917..0bc9819773 100644
--- a/keyboards/marksard/rhymestone/keymaps/default/keymap.c
+++ b/keyboards/marksard/rhymestone/keymaps/default/keymap.c
@@ -158,13 +158,14 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) {
   return rotation;
 }
 
-void oled_task_user(void) {
+bool oled_task_user(void) {
 
   if (is_keyboard_master()) {
     render_status();
   } else {
     render_logo();
   }
+    return false;
 }
 
 #else
diff --git a/keyboards/marksard/rhymestone/rev1/config.h b/keyboards/marksard/rhymestone/rev1/config.h
index 9833925110..4448e51268 100644
--- a/keyboards/marksard/rhymestone/rev1/config.h
+++ b/keyboards/marksard/rhymestone/rev1/config.h
@@ -102,50 +102,50 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGB_MATRIX_VAL_STEP 8
   #define RGB_MATRIX_SPD_STEP 10
 
-//   #define DISABLE_RGB_MATRIX_ALPHAS_MODS
-//   #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-//   #define DISABLE_RGB_MATRIX_BREATHING
-//   #define DISABLE_RGB_MATRIX_BAND_SAT
-//   #define DISABLE_RGB_MATRIX_BAND_VAL
-//   #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-//   #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-//   #define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-//   #define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-//   #define DISABLE_RGB_MATRIX_CYCLE_ALL
-//   #define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-//   #define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN
-//   #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN
-//   #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-//   #define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-//   #define DISABLE_RGB_MATRIX_CYCLE_PINWHEEL
-//   #define DISABLE_RGB_MATRIX_CYCLE_SPIRAL
-//   #define DISABLE_RGB_MATRIX_DUAL_BEACON
-//   #define DISABLE_RGB_MATRIX_RAINBOW_BEACON
-//   #define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-//   #define DISABLE_RGB_MATRIX_RAINDROPS
-//   #define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-
-  #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-//   #define DISABLE_RGB_MATRIX_TYPING_HEATMAP
-//   #define DISABLE_RGB_MATRIX_DIGITAL_RAIN
+//   #undef ENABLE_RGB_MATRIX_ALPHAS_MODS
+//   #undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+//   #undef ENABLE_RGB_MATRIX_BREATHING
+//   #undef ENABLE_RGB_MATRIX_BAND_SAT
+//   #undef ENABLE_RGB_MATRIX_BAND_VAL
+//   #undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+//   #undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+//   #undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+//   #undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+//   #undef ENABLE_RGB_MATRIX_CYCLE_ALL
+//   #undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+//   #undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+//   #undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+//   #undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+//   #undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+//   #undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+//   #undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+//   #undef ENABLE_RGB_MATRIX_DUAL_BEACON
+//   #undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
+//   #undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+//   #undef ENABLE_RGB_MATRIX_RAINDROPS
+//   #undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+
+#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+//   #undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
+//   #undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
 
 //   #define RGB_MATRIX_KEYPRESSES  // reacts to keypresses
 
-//   #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-//   #define DISABLE_RGB_MATRIX_SOLID_REACTIVE
-//   #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-//   #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-//   #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-//   #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-//   #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-//   #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-
-//   #define DISABLE_RGB_MATRIX_SPLASH
-//   #define DISABLE_RGB_MATRIX_MULTISPLASH
-//   #define DISABLE_RGB_MATRIX_SOLID_SPLASH
-//   #define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-  #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_TYPING_HEATMAP
+//   #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+//   #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
+//   #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+//   #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+//   #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+//   #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+//   #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+//   #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+
+//   #undef ENABLE_RGB_MATRIX_SPLASH
+//   #undef ENABLE_RGB_MATRIX_MULTISPLASH
+//   #undef ENABLE_RGB_MATRIX_SOLID_SPLASH
+//   #undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_TYPING_HEATMAP
 #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */