diff --git a/keyboards/absolem/config.h b/keyboards/absolem/config.h
index 11880eb971..35101e277a 100644
--- a/keyboards/absolem/config.h
+++ b/keyboards/absolem/config.h
@@ -42,7 +42,7 @@
 
 #define RGB_DI_PIN F4
 #ifdef RGB_DI_PIN
-  #define RGBLED_NUM 13
+  #define RGBLIGHT_LED_COUNT 13
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
   #define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/crkbd/keymaps/sadekbaroudi/config.h b/keyboards/crkbd/keymaps/sadekbaroudi/config.h
index f26df105d8..57b4114caa 100644
--- a/keyboards/crkbd/keymaps/sadekbaroudi/config.h
+++ b/keyboards/crkbd/keymaps/sadekbaroudi/config.h
@@ -36,8 +36,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #undef SSD1306OLED
 
 #ifdef RGBLIGHT_ENABLE
-    #undef RGBLED_NUM
-    #define RGBLED_NUM 27
+    #undef RGBLIGHT_LED_COUNT
+    #define RGBLIGHT_LED_COUNT 27
     //#define RGBLED_SPLIT { 27, 27 }
     #define RGBLIGHT_LIMIT_VAL 120
     #define RGBLIGHT_LAYERS
diff --git a/keyboards/fingerpunch/barobord/config.h b/keyboards/fingerpunch/barobord/config.h
index b717834163..8c90ca780b 100644
--- a/keyboards/fingerpunch/barobord/config.h
+++ b/keyboards/fingerpunch/barobord/config.h
@@ -38,7 +38,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define WS2812_DI_PIN F0
 #ifdef RGBLIGHT_ENABLE
-  #define RGBLED_NUM 40
+  #define RGBLIGHT_LED_COUNT 40
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
   #define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/fingerpunch/barobord_byomcu/config.h b/keyboards/fingerpunch/barobord_byomcu/config.h
index 8b61cd1ada..f5f75ea8b0 100644
--- a/keyboards/fingerpunch/barobord_byomcu/config.h
+++ b/keyboards/fingerpunch/barobord_byomcu/config.h
@@ -38,7 +38,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define WS2812_DI_PIN D3
 #ifdef RGBLIGHT_ENABLE
-  #define RGBLED_NUM 40
+  #define RGBLIGHT_LED_COUNT 40
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
   #define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/fingerpunch/bgkeeb/config.h b/keyboards/fingerpunch/bgkeeb/config.h
index ebc8b0c0f5..e63ab796a5 100644
--- a/keyboards/fingerpunch/bgkeeb/config.h
+++ b/keyboards/fingerpunch/bgkeeb/config.h
@@ -45,7 +45,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #ifdef RGBLIGHT_ANIMATIONS
   #undef RGBLIGHT_ANIMATIONS
   #endif
-  #define RGBLED_NUM 36
+  #define RGBLIGHT_LED_COUNT 36
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
   #define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/fingerpunch/bigbarobord/config.h b/keyboards/fingerpunch/bigbarobord/config.h
index 8f98ea43b5..f36780cdfe 100644
--- a/keyboards/fingerpunch/bigbarobord/config.h
+++ b/keyboards/fingerpunch/bigbarobord/config.h
@@ -40,7 +40,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGBLIGHT_ENABLE
   // Use twinkle as the default rgb mode for the layers
   #define DEFAULT_RGB_LAYER_MODE RGBLIGHT_MODE_TWINKLE+2
-  #define RGBLED_NUM 52
+  #define RGBLIGHT_LED_COUNT 52
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
   #define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/fingerpunch/dweeeeep/config.h b/keyboards/fingerpunch/dweeeeep/config.h
index 9f1d60b582..299d699fb2 100644
--- a/keyboards/fingerpunch/dweeeeep/config.h
+++ b/keyboards/fingerpunch/dweeeeep/config.h
@@ -4,7 +4,7 @@
 
 #define WS2812_DI_PIN D3
 #ifdef RGBLIGHT_ENABLE
-  #define RGBLED_NUM 36
+  #define RGBLIGHT_LED_COUNT 36
   #define RGBLED_SPLIT {18, 18}
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
diff --git a/keyboards/fingerpunch/euclid36/config.h b/keyboards/fingerpunch/euclid36/config.h
index a5ba483e17..5575cbcd83 100644
--- a/keyboards/fingerpunch/euclid36/config.h
+++ b/keyboards/fingerpunch/euclid36/config.h
@@ -38,7 +38,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define WS2812_DI_PIN B3
 #ifdef WS2812_DI_PIN
-  #define RGBLED_NUM 13
+  #define RGBLIGHT_LED_COUNT 13
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
   #define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/fingerpunch/ffkb/atmega/v1/config.h b/keyboards/fingerpunch/ffkb/atmega/v1/config.h
index eaf8b825c4..0cb94cb8b6 100644
--- a/keyboards/fingerpunch/ffkb/atmega/v1/config.h
+++ b/keyboards/fingerpunch/ffkb/atmega/v1/config.h
@@ -40,7 +40,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGBLIGHT_ENABLE
   // Use twinkle as the default rgb mode for the layers
   #define DEFAULT_RGB_LAYER_MODE RGBLIGHT_MODE_TWINKLE+2
-  #define RGBLED_NUM 42
+  #define RGBLIGHT_LED_COUNT 42
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
   #define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/fingerpunch/ffkb/byomcu/config.h b/keyboards/fingerpunch/ffkb/byomcu/config.h
index 0f710b3bae..63b99ceaf9 100644
--- a/keyboards/fingerpunch/ffkb/byomcu/config.h
+++ b/keyboards/fingerpunch/ffkb/byomcu/config.h
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGBLIGHT_ENABLE
   // Use twinkle as the default rgb mode for the layers
   #define DEFAULT_RGB_LAYER_MODE RGBLIGHT_MODE_TWINKLE+2
-  #define RGBLED_NUM 42
+  #define RGBLIGHT_LED_COUNT 42
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
   #define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/fingerpunch/ffkb/lite/config.h b/keyboards/fingerpunch/ffkb/lite/config.h
index df2975e476..4cbb8f4e42 100644
--- a/keyboards/fingerpunch/ffkb/lite/config.h
+++ b/keyboards/fingerpunch/ffkb/lite/config.h
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGBLIGHT_ENABLE
   // #define DEFAULT_RGB_LAYER_MODE RGBLIGHT_MODE_TWINKLE+2
   #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
-  #define RGBLED_NUM 2
+  #define RGBLIGHT_LED_COUNT 2
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
   #define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/fingerpunch/ffkb/rp/config.h b/keyboards/fingerpunch/ffkb/rp/config.h
index 053cba964c..38c934ad68 100644
--- a/keyboards/fingerpunch/ffkb/rp/config.h
+++ b/keyboards/fingerpunch/ffkb/rp/config.h
@@ -30,9 +30,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   // Use twinkle as the default rgb mode for the layers
   #define DEFAULT_RGB_LAYER_MODE RGBLIGHT_MODE_TWINKLE+2
   // 6 column rgb config
-  #define RGBLED_NUM 42
+  #define RGBLIGHT_LED_COUNT 42
   // 5 column rgb config
-  // #define RGBLED_NUM 36
+  // #define RGBLIGHT_LED_COUNT 36
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
   #define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/fingerpunch/ffkb/rp/v1/keymaps/sadekbaroudi/config.h b/keyboards/fingerpunch/ffkb/rp/v1/keymaps/sadekbaroudi/config.h
index 031f54a8c9..b044ad85fe 100644
--- a/keyboards/fingerpunch/ffkb/rp/v1/keymaps/sadekbaroudi/config.h
+++ b/keyboards/fingerpunch/ffkb/rp/v1/keymaps/sadekbaroudi/config.h
@@ -2,10 +2,10 @@
 #ifdef FFKB_TRACKPOINT_BUILD
 #undef ENCODERS_PAD_A
 #undef ENCODERS_PAD_B
-#ifdef RGBLED_NUM
-    #undef RGBLED_NUM
+#ifdef RGBLIGHT_LED_COUNT
+    #undef RGBLIGHT_LED_COUNT
 #endif
-#define RGBLED_NUM 7
+#define RGBLIGHT_LED_COUNT 7
 #define PS2_CLOCK_PIN GP8
 #define PS2_DATA_PIN  GP7
 #endif
diff --git a/keyboards/fingerpunch/fflx/config.h b/keyboards/fingerpunch/fflx/config.h
index adfdde2cb7..d6c6643786 100644
--- a/keyboards/fingerpunch/fflx/config.h
+++ b/keyboards/fingerpunch/fflx/config.h
@@ -40,7 +40,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGBLIGHT_ENABLE
   // Use twinkle as the default rgb mode for the layers
   #define DEFAULT_RGB_LAYER_MODE RGBLIGHT_MODE_TWINKLE+2
-  #define RGBLED_NUM 19
+  #define RGBLIGHT_LED_COUNT 19
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
   #define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/fingerpunch/fpm101/config.h b/keyboards/fingerpunch/fpm101/config.h
index cd7e5ab8e6..31df9e88e0 100644
--- a/keyboards/fingerpunch/fpm101/config.h
+++ b/keyboards/fingerpunch/fpm101/config.h
@@ -38,7 +38,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define WS2812_DI_PIN D3
 #ifdef RGBLIGHT_ENABLE
-  #define RGBLED_NUM 65
+  #define RGBLIGHT_LED_COUNT 65
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
   #define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/fingerpunch/kucheza/config.h b/keyboards/fingerpunch/kucheza/config.h
index 1c30e81408..6feb81f053 100644
--- a/keyboards/fingerpunch/kucheza/config.h
+++ b/keyboards/fingerpunch/kucheza/config.h
@@ -58,7 +58,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define WS2812_DI_PIN GP9
 #ifdef RGBLIGHT_ENABLE
-  #define RGBLED_NUM 42
+  #define RGBLIGHT_LED_COUNT 42
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
   #define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/fingerpunch/luakeeb/config.h b/keyboards/fingerpunch/luakeeb/config.h
index c4e1f79a8a..99b05563f7 100644
--- a/keyboards/fingerpunch/luakeeb/config.h
+++ b/keyboards/fingerpunch/luakeeb/config.h
@@ -39,7 +39,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGBLIGHT_ENABLE
   #define RGBLIGHT_SPLIT
   #define RGBLED_SPLIT { 21, 21 }
-  #define RGBLED_NUM 42
+  #define RGBLIGHT_LED_COUNT 42
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
   #define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/fingerpunch/personal/barghoot/config.h b/keyboards/fingerpunch/personal/barghoot/config.h
index 063e2855d7..272560094d 100644
--- a/keyboards/fingerpunch/personal/barghoot/config.h
+++ b/keyboards/fingerpunch/personal/barghoot/config.h
@@ -71,7 +71,7 @@
 #endif //BACKLIGHT_ENABLE
 
 #define WS2812_DI_PIN GP25
-#define RGBLED_NUM 63
+#define RGBLIGHT_LED_COUNT 63
 
 #define RGBLIGHT_DEFAULT_HUE 180
 #define RGBLIGHT_DEFAULT_SAT 255
diff --git a/keyboards/fingerpunch/personal/barghoot/keymaps/alaa/config.h b/keyboards/fingerpunch/personal/barghoot/keymaps/alaa/config.h
index b7963e8fd0..8fd0e4d864 100644
--- a/keyboards/fingerpunch/personal/barghoot/keymaps/alaa/config.h
+++ b/keyboards/fingerpunch/personal/barghoot/keymaps/alaa/config.h
@@ -15,7 +15,7 @@
 
 
 #define RGB_MATRIX_KEYPRESSES
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_SLEEP
 
 #define ENABLE_RGB_MATRIX_CYCLE_ALL
 #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
diff --git a/keyboards/fingerpunch/personal/barghoot/keymaps/sadekbaroudi/config.h b/keyboards/fingerpunch/personal/barghoot/keymaps/sadekbaroudi/config.h
index e3ca88969d..7caedc5bc3 100644
--- a/keyboards/fingerpunch/personal/barghoot/keymaps/sadekbaroudi/config.h
+++ b/keyboards/fingerpunch/personal/barghoot/keymaps/sadekbaroudi/config.h
@@ -10,7 +10,7 @@
 
 
 #define RGB_MATRIX_KEYPRESSES
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_SLEEP
 
 #define ENABLE_RGB_MATRIX_CYCLE_ALL
 #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
diff --git a/keyboards/fingerpunch/personal/euclid36proto/config.h b/keyboards/fingerpunch/personal/euclid36proto/config.h
index f9caaf8eae..3036c8dd34 100644
--- a/keyboards/fingerpunch/personal/euclid36proto/config.h
+++ b/keyboards/fingerpunch/personal/euclid36proto/config.h
@@ -43,7 +43,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define WS2812_DI_PIN D3
 #ifdef WS2812_DI_PIN
-  #define RGBLED_NUM 13
+  #define RGBLIGHT_LED_COUNT 13
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
   #define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/fingerpunch/personal/halfdash/config.h b/keyboards/fingerpunch/personal/halfdash/config.h
index f828823a25..c2160ba561 100644
--- a/keyboards/fingerpunch/personal/halfdash/config.h
+++ b/keyboards/fingerpunch/personal/halfdash/config.h
@@ -54,4 +54,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* ws2812 RGB LED */
 #define WS2812_DI_PIN D3
 #define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 12
+#define RGBLIGHT_LED_COUNT 12
diff --git a/keyboards/fingerpunch/personal/handwired/barobordhw/config.h b/keyboards/fingerpunch/personal/handwired/barobordhw/config.h
index 4679509186..ce1c658736 100644
--- a/keyboards/fingerpunch/personal/handwired/barobordhw/config.h
+++ b/keyboards/fingerpunch/personal/handwired/barobordhw/config.h
@@ -38,7 +38,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define WS2812_DI_PIN D3
 #ifdef WS2812_DI_PIN
-  #define RGBLED_NUM 40
+  #define RGBLIGHT_LED_COUNT 40
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
   #define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/fingerpunch/personal/handwired/enigma36/v1/config.h b/keyboards/fingerpunch/personal/handwired/enigma36/v1/config.h
index ed0fc9e6e9..7ee616f082 100644
--- a/keyboards/fingerpunch/personal/handwired/enigma36/v1/config.h
+++ b/keyboards/fingerpunch/personal/handwired/enigma36/v1/config.h
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 12
+#define RGBLIGHT_LED_COUNT 12
 
 #ifdef THUMBSTICK_ENABLE
 #    define ANALOG_JOYSTICK_X_AXIS_PIN F4
diff --git a/keyboards/fingerpunch/personal/handwired/enigma36/v2/config.h b/keyboards/fingerpunch/personal/handwired/enigma36/v2/config.h
index cb8e948289..147ad64cbc 100644
--- a/keyboards/fingerpunch/personal/handwired/enigma36/v2/config.h
+++ b/keyboards/fingerpunch/personal/handwired/enigma36/v2/config.h
@@ -19,4 +19,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define DEVICE_VER      0x0002
 
-#define RGBLED_NUM 36
\ No newline at end of file
+#define RGBLIGHT_LED_COUNT 36
\ No newline at end of file
diff --git a/keyboards/fingerpunch/personal/klor/config.h b/keyboards/fingerpunch/personal/klor/config.h
index 0979e438a2..b48cefb493 100644
--- a/keyboards/fingerpunch/personal/klor/config.h
+++ b/keyboards/fingerpunch/personal/klor/config.h
@@ -74,13 +74,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // └─────────────────────────────────────────────────┘
 
 #define WS2812_DI_PIN D3
-#ifndef RGBLED_NUM
-#     define RGBLED_NUM 42
+#ifndef RGBLIGHT_LED_COUNT
+#     define RGBLIGHT_LED_COUNT 42
 #endif
 #ifndef RGBLED_SPLIT
 #     define RGBLED_SPLIT { 21, 21 }
 #endif
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLIGHT_LED_COUNT
 
 #ifdef RGB_MATRIX_ENABLE
 #    define SPLIT_TRANSPORT_MIRROR
@@ -93,7 +93,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
 #    define RGB_MATRIX_STARTUP_HUE 35
 #    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
+#    define RGB_MATRIX_SLEEP
 #    define RGB_MATRIX_KEYPRESSES
 #endif
 
diff --git a/keyboards/fingerpunch/personal/le_chiffre_democratique/config.h b/keyboards/fingerpunch/personal/le_chiffre_democratique/config.h
index 0b6d279681..6e2903111e 100644
--- a/keyboards/fingerpunch/personal/le_chiffre_democratique/config.h
+++ b/keyboards/fingerpunch/personal/le_chiffre_democratique/config.h
@@ -82,7 +82,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define WS2812_DI_PIN D4
 #ifdef RGBLIGHT_ENABLE
-  #define RGBLED_NUM 47
+  #define RGBLIGHT_LED_COUNT 47
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
   #define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/fingerpunch/personal/ximi/config.h b/keyboards/fingerpunch/personal/ximi/config.h
index 942f8e4022..15e18f0743 100644
--- a/keyboards/fingerpunch/personal/ximi/config.h
+++ b/keyboards/fingerpunch/personal/ximi/config.h
@@ -52,7 +52,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGBLIGHT_ENABLE
     #define RGBLIGHT_SPLIT
     #define RGBLED_SPLIT { 21, 21 }
-    #define RGBLED_NUM 42
+    #define RGBLIGHT_LED_COUNT 42
     #define RGBLIGHT_HUE_STEP 16
     #define RGBLIGHT_SAT_STEP 16
     #define RGBLIGHT_VAL_STEP 16
@@ -76,7 +76,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
     #define RGB_MATRIX_STARTUP_HUE 35
     #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-    #define RGB_DISABLE_WHEN_USB_SUSPENDED
+    #define RGB_MATRIX_SLEEP
     #define RGB_MATRIX_KEYPRESSES
     #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
     #define RGB_MATRIX_KEYREACTIVE_ENABLED
diff --git a/keyboards/fingerpunch/personal/ximihalf/config.h b/keyboards/fingerpunch/personal/ximihalf/config.h
index 5a2fed865d..d67bd6ebc7 100644
--- a/keyboards/fingerpunch/personal/ximihalf/config.h
+++ b/keyboards/fingerpunch/personal/ximihalf/config.h
@@ -41,7 +41,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define WS2812_DI_PIN GP26
 #ifdef RGBLIGHT_ENABLE
-    #define RGBLED_NUM 21
+    #define RGBLIGHT_LED_COUNT 21
     #define RGBLIGHT_HUE_STEP 16
     #define RGBLIGHT_SAT_STEP 16
     #define RGBLIGHT_VAL_STEP 16
@@ -63,7 +63,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
     #define RGB_MATRIX_STARTUP_HUE 35
     #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-    #define RGB_DISABLE_WHEN_USB_SUSPENDED
+    #define RGB_MATRIX_SLEEP
     #define RGB_MATRIX_KEYPRESSES
     #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
     #define RGB_MATRIX_KEYREACTIVE_ENABLED
diff --git a/keyboards/fingerpunch/personal/ximihalf_rp2040/config.h b/keyboards/fingerpunch/personal/ximihalf_rp2040/config.h
index b78aa6ed13..b0c0d1c825 100644
--- a/keyboards/fingerpunch/personal/ximihalf_rp2040/config.h
+++ b/keyboards/fingerpunch/personal/ximihalf_rp2040/config.h
@@ -44,7 +44,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGBLIGHT_ENABLE
     #define RGBLIGHT_SPLIT
     #define RGBLED_SPLIT { 21, 21 }
-    #define RGBLED_NUM 42
+    #define RGBLIGHT_LED_COUNT 42
     #define RGBLIGHT_HUE_STEP 16
     #define RGBLIGHT_SAT_STEP 16
     #define RGBLIGHT_VAL_STEP 16
@@ -68,7 +68,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
     #define RGB_MATRIX_STARTUP_HUE 35
     #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-    #define RGB_DISABLE_WHEN_USB_SUSPENDED
+    #define RGB_MATRIX_SLEEP
     #define RGB_MATRIX_KEYPRESSES
     #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
     #define RGB_MATRIX_KEYREACTIVE_ENABLED
diff --git a/keyboards/fingerpunch/personal/zazu/keymaps/alaa/config.h b/keyboards/fingerpunch/personal/zazu/keymaps/alaa/config.h
index a8a46e0ec2..5a542a18f4 100644
--- a/keyboards/fingerpunch/personal/zazu/keymaps/alaa/config.h
+++ b/keyboards/fingerpunch/personal/zazu/keymaps/alaa/config.h
@@ -4,7 +4,7 @@
 #define MOUSE_EXTENDED_REPORT
 
 #define RGB_MATRIX_KEYPRESSES
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_SLEEP
 
 #define ENABLE_RGB_MATRIX_CYCLE_ALL
 #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
diff --git a/keyboards/fingerpunch/pinkiesout/v1/config.h b/keyboards/fingerpunch/pinkiesout/v1/config.h
index 54e5cffcb5..ac29ca2230 100644
--- a/keyboards/fingerpunch/pinkiesout/v1/config.h
+++ b/keyboards/fingerpunch/pinkiesout/v1/config.h
@@ -30,7 +30,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define WS2812_DI_PIN D3
 #ifdef RGBLIGHT_ENABLE
-  #define RGBLED_NUM 66
+  #define RGBLIGHT_LED_COUNT 66
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
   #define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/fingerpunch/pinkiesout/v2/config.h b/keyboards/fingerpunch/pinkiesout/v2/config.h
index 4e8add9fc0..f1a38b383e 100644
--- a/keyboards/fingerpunch/pinkiesout/v2/config.h
+++ b/keyboards/fingerpunch/pinkiesout/v2/config.h
@@ -53,7 +53,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define WS2812_DI_PIN D3
 #ifdef RGBLIGHT_ENABLE
-  #define RGBLED_NUM 66
+  #define RGBLIGHT_LED_COUNT 66
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
   #define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/fingerpunch/pinkiesout/v2_ext/config.h b/keyboards/fingerpunch/pinkiesout/v2_ext/config.h
index 79e6f7f879..c8983d0a91 100644
--- a/keyboards/fingerpunch/pinkiesout/v2_ext/config.h
+++ b/keyboards/fingerpunch/pinkiesout/v2_ext/config.h
@@ -53,7 +53,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define WS2812_DI_PIN D3
 #ifdef RGBLIGHT_ENABLE
-  #define RGBLED_NUM 70
+  #define RGBLIGHT_LED_COUNT 70
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
   #define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/fingerpunch/pinkiesout/v3/config.h b/keyboards/fingerpunch/pinkiesout/v3/config.h
index e06160ccac..c7750192e7 100644
--- a/keyboards/fingerpunch/pinkiesout/v3/config.h
+++ b/keyboards/fingerpunch/pinkiesout/v3/config.h
@@ -56,7 +56,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define WS2812_DI_PIN GP25
 #ifdef RGBLIGHT_ENABLE
-  #define RGBLED_NUM 66
+  #define RGBLIGHT_LED_COUNT 66
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
   #define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/fingerpunch/rockon/config.h b/keyboards/fingerpunch/rockon/config.h
index 3ef145d224..f609f5d78e 100644
--- a/keyboards/fingerpunch/rockon/config.h
+++ b/keyboards/fingerpunch/rockon/config.h
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define WS2812_DI_PIN D3
 #ifdef RGBLIGHT_ENABLE
-  #define RGBLED_NUM 66
+  #define RGBLIGHT_LED_COUNT 66
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
   #define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/fingerpunch/rockon/v3/config.h b/keyboards/fingerpunch/rockon/v3/config.h
index 3f1c82f8e1..51b742fbe5 100644
--- a/keyboards/fingerpunch/rockon/v3/config.h
+++ b/keyboards/fingerpunch/rockon/v3/config.h
@@ -30,10 +30,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define WS2812_DI_PIN D3
 #ifdef RGBLIGHT_ENABLE
-  #ifdef RGBLED_NUM
-    #undef RGBLED_NUM
+  #ifdef RGBLIGHT_LED_COUNT
+    #undef RGBLIGHT_LED_COUNT
   #endif
-  #define RGBLED_NUM 69
+  #define RGBLIGHT_LED_COUNT 69
 #endif
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/fingerpunch/rockon_bp/config.h b/keyboards/fingerpunch/rockon_bp/config.h
index 00a45c59be..63b6d0d8e4 100644
--- a/keyboards/fingerpunch/rockon_bp/config.h
+++ b/keyboards/fingerpunch/rockon_bp/config.h
@@ -62,7 +62,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR    64
 
 #ifdef RGBLIGHT_ENABLE
-  #define RGBLED_NUM 66
+  #define RGBLIGHT_LED_COUNT 66
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
   #define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/fingerpunch/src/vik/config.h b/keyboards/fingerpunch/src/vik/config.h
index 5ec7e98af3..68354d9534 100644
--- a/keyboards/fingerpunch/src/vik/config.h
+++ b/keyboards/fingerpunch/src/vik/config.h
@@ -85,8 +85,8 @@
 #endif
 
 #ifdef VIK_PER56_CIRQUE_LEDS
-    #ifdef RGBLED_NUM
-        #undef RGBLED_NUM
+    #ifdef RGBLIGHT_LED_COUNT
+        #undef RGBLIGHT_LED_COUNT
     #endif
     #if !defined(VIK_RETAIN_KB_WS2812_DI_PIN)
         #ifdef WS2812_DI_PIN
@@ -94,7 +94,7 @@
         #endif
         #define WS2812_DI_PIN VIK_WS2812_DI_PIN
     #endif
-    #define RGBLED_NUM 4
+    #define RGBLIGHT_LED_COUNT 4
 #endif
 
 #ifdef VIK_PER56_PMW3360_LEDS
@@ -103,8 +103,8 @@
     #define PMW33XX_CPI 1000
     #define PMW33XX_CS_DIVISOR 8
 
-    #ifdef RGBLED_NUM
-        #undef RGBLED_NUM
+    #ifdef RGBLIGHT_LED_COUNT
+        #undef RGBLIGHT_LED_COUNT
     #endif
     #if !defined(VIK_RETAIN_KB_WS2812_DI_PIN)
         #ifdef WS2812_DI_PIN
@@ -112,7 +112,7 @@
         #endif
         #define WS2812_DI_PIN VIK_WS2812_DI_PIN
     #endif
-    #define RGBLED_NUM 4
+    #define RGBLIGHT_LED_COUNT 4
 #endif
 
 #ifdef VIK_PMW3360
@@ -174,8 +174,8 @@
 
 #ifdef VIK_EC11_EVQWGD001
     #ifdef VIK_RGB_ONLY
-        #ifdef RGBLED_NUM
-            #undef RGBLED_NUM
+        #ifdef RGBLIGHT_LED_COUNT
+            #undef RGBLIGHT_LED_COUNT
         #endif
         #if !defined(VIK_RETAIN_KB_WS2812_DI_PIN)
             #ifdef WS2812_DI_PIN
@@ -183,7 +183,7 @@
             #endif
             #define WS2812_DI_PIN VIK_WS2812_DI_PIN
         #endif
-        #define RGBLED_NUM 4
+        #define RGBLIGHT_LED_COUNT 4
     #endif
 #endif
 
diff --git a/keyboards/fingerpunch/svlinky/config.h b/keyboards/fingerpunch/svlinky/config.h
index 002209e846..f856d4635c 100644
--- a/keyboards/fingerpunch/svlinky/config.h
+++ b/keyboards/fingerpunch/svlinky/config.h
@@ -99,7 +99,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define WS2812_DI_PIN GP16
 #ifdef RGBLIGHT_ENABLE
-    #define RGBLED_NUM 10 // Arbitrary number, gets overridden by the vik module stuff below
+    #define RGBLIGHT_LED_COUNT 10 // Arbitrary number, gets overridden by the vik module stuff below
     #define RGBLIGHT_HUE_STEP 16
     #define RGBLIGHT_SAT_STEP 16
     #define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/fingerpunch/sweeeeep/config.h b/keyboards/fingerpunch/sweeeeep/config.h
index 319459a1ee..8a62a501f4 100644
--- a/keyboards/fingerpunch/sweeeeep/config.h
+++ b/keyboards/fingerpunch/sweeeeep/config.h
@@ -47,7 +47,7 @@
 
 #define WS2812_DI_PIN D3
 #ifdef RGBLIGHT_ENABLE
-  #define RGBLED_NUM 36
+  #define RGBLIGHT_LED_COUNT 36
   #define RGBLED_SPLIT {18, 18}
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
diff --git a/keyboards/fingerpunch/vulpes_majora/config.h b/keyboards/fingerpunch/vulpes_majora/config.h
index 17345c37c8..4def76e956 100644
--- a/keyboards/fingerpunch/vulpes_majora/config.h
+++ b/keyboards/fingerpunch/vulpes_majora/config.h
@@ -31,7 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define DEFAULT_RGB_LAYER_MODE RGBLIGHT_MODE_TWINKLE+2
 
   // 6 column rgb config
-  #define RGBLED_NUM 45
+  #define RGBLIGHT_LED_COUNT 45
   #define RGBLIGHT_HUE_STEP 4
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 16
@@ -39,26 +39,26 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
   // 6 column rgb config with center leds
   #ifdef FP_VM_RGB_6COL_WITH_CENTER
-    #undef RGBLED_NUM
-    #define RGBLED_NUM 49
+    #undef RGBLIGHT_LED_COUNT
+    #define RGBLIGHT_LED_COUNT 49
   #endif
 
   // 5 column rgb config
   #ifdef FP_VM_RGB_5COL
-    #undef RGBLED_NUM
-    #define RGBLED_NUM 39
+    #undef RGBLIGHT_LED_COUNT
+    #define RGBLIGHT_LED_COUNT 39
   #endif
 
   // 5 column rgb config with center leds
   #ifdef FP_VM_RGB_5COL_WITH_CENTER
-    #undef RGBLED_NUM
-    #define RGBLED_NUM 43
+    #undef RGBLIGHT_LED_COUNT
+    #define RGBLIGHT_LED_COUNT 43
   #endif
 
   // VIK only rgb config
   #ifdef FP_VM_RGB_CENTER_ONLY
-    #undef RGBLED_NUM
-    #define RGBLED_NUM 4
+    #undef RGBLIGHT_LED_COUNT
+    #define RGBLIGHT_LED_COUNT 4
     #undef RGBLIGHT_LIMIT_VAL
     #define RGBLIGHT_LIMIT_VAL 255
   #endif
diff --git a/keyboards/fingerpunch/vulpes_minora/config.h b/keyboards/fingerpunch/vulpes_minora/config.h
index cb239e23ab..c50b153ae9 100644
--- a/keyboards/fingerpunch/vulpes_minora/config.h
+++ b/keyboards/fingerpunch/vulpes_minora/config.h
@@ -39,11 +39,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_SPLIT
     #if defined(VIK_PER56_CIRQUE_LEDS) || defined(VIK_PER56_PMW3360_LEDS) || defined(VIK_EC11_EVQWGD001)
     #define RGBLED_SPLIT { 10, 6 }
-    #define RGBLED_NUM 16
+    #define RGBLIGHT_LED_COUNT 16
     #define RGBLIGHT_LED_MAP { 5, 4, 3, 2, 1, 0, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }
     #else
     #define RGBLED_SPLIT { 6, 6 }
-    #define RGBLED_NUM 12
+    #define RGBLIGHT_LED_COUNT 12
     #define RGBLIGHT_LED_MAP { 5, 4, 3, 2, 1, 0, 6, 7, 8, 9, 10, 11 }
     #endif
     #define RGBLIGHT_HUE_STEP 16
@@ -67,7 +67,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGB_MATRIX_SPLIT { 6, 6 }
     #define RGB_MATRIX_LED_COUNT 12
     #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-    #define RGB_DISABLE_WHEN_USB_SUSPENDED
+    #define RGB_MATRIX_SLEEP
     #define RGB_MATRIX_KEYPRESSES
     #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
     #define RGB_MATRIX_KEYREACTIVE_ENABLED
diff --git a/keyboards/fingerpunch/ximi/config.h b/keyboards/fingerpunch/ximi/config.h
index c7060ff629..c8e48f7dcf 100644
--- a/keyboards/fingerpunch/ximi/config.h
+++ b/keyboards/fingerpunch/ximi/config.h
@@ -54,7 +54,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGBLIGHT_ENABLE
     #define RGBLIGHT_SPLIT
     #define RGBLED_SPLIT { 21, 21 }
-    #define RGBLED_NUM 42
+    #define RGBLIGHT_LED_COUNT 42
     #define RGBLIGHT_HUE_STEP 16
     #define RGBLIGHT_SAT_STEP 16
     #define RGBLIGHT_VAL_STEP 16
@@ -78,7 +78,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130
     #define RGB_MATRIX_STARTUP_HUE 35
     #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-    #define RGB_DISABLE_WHEN_USB_SUSPENDED
+    #define RGB_MATRIX_SLEEP
     #define RGB_MATRIX_KEYPRESSES
     #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
     #define RGB_MATRIX_KEYREACTIVE_ENABLED
diff --git a/keyboards/fingerpunch/xivik/config.h b/keyboards/fingerpunch/xivik/config.h
index 92f8d7c8e4..cf1e8ab076 100644
--- a/keyboards/fingerpunch/xivik/config.h
+++ b/keyboards/fingerpunch/xivik/config.h
@@ -108,7 +108,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define WS2812_DI_PIN GP16
 #ifdef RGBLIGHT_ENABLE
-    #define RGBLED_NUM 10 // Arbitrary number, gets overridden by the vik module stuff below
+    #define RGBLIGHT_LED_COUNT 10 // Arbitrary number, gets overridden by the vik module stuff below
     #define RGBLIGHT_HUE_STEP 16
     #define RGBLIGHT_SAT_STEP 16
     #define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/minidox/keymaps/sadekbaroudi/config.h b/keyboards/minidox/keymaps/sadekbaroudi/config.h
index 7d29dd1243..4e6f9b4c1c 100644
--- a/keyboards/minidox/keymaps/sadekbaroudi/config.h
+++ b/keyboards/minidox/keymaps/sadekbaroudi/config.h
@@ -7,7 +7,7 @@
 #define RGB_DI_PIN B3
 
 #ifdef RGBLIGHT_ENABLE
-#    define RGBLED_NUM 18 // Number of LEDs
+#    define RGBLIGHT_LED_COUNT 18 // Number of LEDs
 #    define RGBLED_SPLIT \
         { 9, 9 }
 #    define RGBLIGHT_SPLIT
diff --git a/keyboards/minidox/keymaps/sadekbaroudi/keymap.c b/keyboards/minidox/keymaps/sadekbaroudi/keymap.c
index 27db7aaa2d..e65fdb3135 100644
--- a/keyboards/minidox/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/minidox/keymaps/sadekbaroudi/keymap.c
@@ -111,7 +111,7 @@ bool rgb_base_layer_keymap(layer_state_t state) {
 
     // Instead of having two separate firmware files, you can use these two lines, but they are a bit buggier
     //rgblight_sethsv_range(HSV_PURPLE, 0, 9);
-    //rgblight_sethsv_range(16, 255, 255, 9, RGBLED_NUM);
+    //rgblight_sethsv_range(16, 255, 255, 9, RGBLIGHT_LED_COUNT);
     #endif
 
     return true;
diff --git a/keyboards/preonic/keymaps/sadekbaroudi/config.h b/keyboards/preonic/keymaps/sadekbaroudi/config.h
index 7972e6c821..17bdc6bea1 100755
--- a/keyboards/preonic/keymaps/sadekbaroudi/config.h
+++ b/keyboards/preonic/keymaps/sadekbaroudi/config.h
@@ -27,8 +27,8 @@
 /* ws2812 RGB LED */
 #undef RGB_DI_PIN
 #define RGB_DI_PIN B3 
-#undef RGBLED_NUM
-#define RGBLED_NUM 16      // Number of LEDs
+#undef RGBLIGHT_LED_COUNT
+#define RGBLIGHT_LED_COUNT 16      // Number of LEDs
 
 // See rgb_stuff.c for how these are applied - I wanted to flip these for my red themed keycaps
 #define BASE_LAYER_RGB_HUE 0
diff --git a/keyboards/reviung39/keymaps/sadekbaroudi/config.h b/keyboards/reviung39/keymaps/sadekbaroudi/config.h
index 13e0758ff9..3c1cdb8bf2 100755
--- a/keyboards/reviung39/keymaps/sadekbaroudi/config.h
+++ b/keyboards/reviung39/keymaps/sadekbaroudi/config.h
@@ -20,6 +20,6 @@
 
 #define RGB_DI_PIN D3
 #ifdef RGB_DI_PIN
-  #define RGBLED_NUM 11
+  #define RGBLIGHT_LED_COUNT 11
 #endif
 
diff --git a/keyboards/reviung41/keymaps/sadekbaroudi/config.h b/keyboards/reviung41/keymaps/sadekbaroudi/config.h
index 13e0758ff9..3c1cdb8bf2 100755
--- a/keyboards/reviung41/keymaps/sadekbaroudi/config.h
+++ b/keyboards/reviung41/keymaps/sadekbaroudi/config.h
@@ -20,6 +20,6 @@
 
 #define RGB_DI_PIN D3
 #ifdef RGB_DI_PIN
-  #define RGBLED_NUM 11
+  #define RGBLIGHT_LED_COUNT 11
 #endif
 
diff --git a/users/sadekbaroudi/config.h b/users/sadekbaroudi/config.h
index 4543cd5ce1..8d181be4d9 100755
--- a/users/sadekbaroudi/config.h
+++ b/users/sadekbaroudi/config.h
@@ -172,8 +172,8 @@
 
 // To enable this, just pass RGB_LED_RING=yes at the command line when building
 #if defined(RGBLIGHT_ENABLE) && defined(RGB_LED_RING)
-#undef RGBLED_NUM
-#define RGBLED_NUM 12
+#undef RGBLIGHT_LED_COUNT
+#define RGBLIGHT_LED_COUNT 12
 #endif
 
 // To enable this, just pass RGB_MATRIX_BAND_VAL_LAYERS=yes at the command line when building