Merge remote-tracking branch 'origin/master' into develop

keyboards/crkbd/keymaps/kidbrazil/keymap.c

@@ -54,7 +54,7 @@ void keyboard_post_init_user(void) {
     // Set RGB to known state
     rgb_matrix_enable_noeeprom();
     rgb_matrix_set_color_all(RGB_GREEN);
-    rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
+    rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR);
     user_led_enabled = true;
 }
 // [Process User Input] ------------------------------------------------------//

keyboards/dztech/dz60rgb/keymaps/piv3rt/keymap.c

@@ -93,8 +93,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 void reset_leds(void) {
     current_profile = OFF;
-    rgblight_enable();
-    rgblight_mode(RGBLIGHT_MODE_STATIC_LIGHT);
+    rgb_matrix_enable();
+    rgb_matrix_mode(RGB_MATRIX_SOLID_COLOR);
     rgb_matrix_sethsv(0x6a, 0x33, 0xff);
 }