4 files changed, 21 insertions, 25 deletions
diff --git a/keyboards/matrix/noah/config.h b/keyboards/matrix/noah/config.h
index 5a74ab5206..452fef4cee 100644
--- a/keyboards/matrix/noah/config.h
+++ b/keyboards/matrix/noah/config.h
@@ -73,22 +73,3 @@
 #    define ENABLE_RGB_MATRIX_MULTISPLASH
 #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-/* indicator rgb */
-#define RGBLED_NUM 7
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-
-
-// tapping setting
-//#define TAPPING_TERM 200
-//#define RETRO_TAPPING
-//#define PERMISSIVE_HOLD
diff --git a/keyboards/matrix/noah/info.json b/keyboards/matrix/noah/info.json
index 33dedc6bce..507c36120e 100644
--- a/keyboards/matrix/noah/info.json
+++ b/keyboards/matrix/noah/info.json
@@ -8,11 +8,27 @@
     "pid": "0x0065",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "driver": "custom",
+    "led_count": 7,
+    "animations": {
+      "breathing": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "snake": true,
+      "knight": true,
+      "christmas": true,
+      "static_gradient": true,
+      "rgb_test": true,
+      "alternating": true,
+      "twinkle": true
+    }
+  },
   "ws2812": {
     "pin": "B1"
   },
   "rgb_matrix": {
-    "driver": "IS31FL3731"
+    "driver": "is31fl3731"
   },
   "community_layouts": ["65_iso_blocker"],
   "layouts": {
diff --git a/keyboards/matrix/noah/noah.c b/keyboards/matrix/noah/noah.c
index 671d272d85..0969998fa9 100644
--- a/keyboards/matrix/noah/noah.c
+++ b/keyboards/matrix/noah/noah.c
@@ -32,14 +32,14 @@ void rgblight_set(void) {
         }
     }
     if (noah_led_mode) {
-      uint8_t ind_led = host_keyboard_leds();
-      if (IS_LED_ON(ind_led, USB_LED_CAPS_LOCK)) {
+      led_t led_state = host_keyboard_led_state();
+      if (led_state.caps_lock) {
         noah_leds[0] = led[0];
       }
-      if (IS_LED_ON(ind_led, USB_LED_SCROLL_LOCK)) {
+      if (led_state.scroll_lock) {
         noah_leds[1] = led[1];
       }
-      if (IS_LED_ON(ind_led, USB_LED_NUM_LOCK)) {
+      if (led_state.num_lock) {
         noah_leds[2] = led[2];
       }
       for (int32_t i = 0; i < 4; i++) {
diff --git a/keyboards/matrix/noah/rules.mk b/keyboards/matrix/noah/rules.mk
index 55ea2f42b0..3b75264222 100644
--- a/keyboards/matrix/noah/rules.mk
+++ b/keyboards/matrix/noah/rules.mk
@@ -27,7 +27,6 @@ NO_USB_STARTUP_CHECK = yes	# Disable initialization only when usb is plugged in
 RGB_MATRIX_ENABLE = yes
 
 RGBLIGHT_ENABLE = yes
-RGBLIGHT_CUSTOM_DRIVER = yes
 WS2812_DRIVER_REQUIRED = yes
 
 CUSTOM_MATRIX = yes