8 files changed, 12 insertions, 32 deletions
diff --git a/keyboards/akko/5087/config.h b/keyboards/akko/5087/config.h
index 70aefbc99b..a3245e36bf 100644
--- a/keyboards/akko/5087/config.h
+++ b/keyboards/akko/5087/config.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-
 /* LED Indicators */
 #define LED_MAC_OS_PIN C10
 #define LED_WIN_LOCK_PIN C11
@@ -41,11 +40,3 @@
 #define DRIVER_ADDR_2 0b1110111
 #define I2C1_OPMODE OPMODE_I2C
 #define I2C1_CLOCK_SPEED 400000 /* 400000 */
-
-#define RGB_MATRIX_LED_COUNT   87
-
-#define RGB_TRIGGER_ON_KEYDOWN
-#define RGB_MATRIX_SLEEP // turn off effects when suspended
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-
diff --git a/keyboards/akko/5087/info.json b/keyboards/akko/5087/info.json
index 1b4059b0d5..f5249029b3 100644
--- a/keyboards/akko/5087/info.json
+++ b/keyboards/akko/5087/info.json
@@ -155,7 +155,9 @@
             { "flags": 4, "matrix": [5, 15], "x":210, "y": 64},
             { "flags": 4, "matrix": [5, 16], "x":224, "y": 64}
 
-        ]
+        ],
+        "react_on_keyup": true,
+        "sleep": true
     },
     "community_layouts": ["tkl_ansi"],
     "layouts": {
diff --git a/keyboards/akko/5108/config.h b/keyboards/akko/5108/config.h
index 0f205d4b1f..6a509733d6 100644
--- a/keyboards/akko/5108/config.h
+++ b/keyboards/akko/5108/config.h
@@ -40,10 +40,4 @@
 #define I2C1_OPMODE OPMODE_I2C
 #define I2C1_CLOCK_SPEED 400000 /* 400000 */
 
-#define RGB_MATRIX_LED_COUNT    108
-
 #define RGB_TRIGGER_ON_KEYDOWN
-#define RGB_MATRIX_SLEEP // turn off effects when suspended
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_KEYRELEASES
diff --git a/keyboards/akko/5108/info.json b/keyboards/akko/5108/info.json
index 662a949a53..5e97d151c3 100644
--- a/keyboards/akko/5108/info.json
+++ b/keyboards/akko/5108/info.json
@@ -176,7 +176,9 @@
             { "flags": 4, "matrix": [5, 16], "x": 176, "y": 64 },
             { "flags": 4, "matrix": [5, 18], "x": 199, "y": 64 },
             { "flags": 4, "matrix": [5, 19], "x": 214, "y": 64 }
-    ]
+        ],
+        "react_on_keyup": true,
+        "sleep": true
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/akko/acr87/config.h b/keyboards/akko/acr87/config.h
index cbd3cb2a9c..cdc4b6011a 100644
--- a/keyboards/akko/acr87/config.h
+++ b/keyboards/akko/acr87/config.h
@@ -39,10 +39,4 @@
 #define I2C1_OPMODE OPMODE_I2C
 #define I2C1_CLOCK_SPEED 400000 /* 400000 */
 
-#define RGB_MATRIX_LED_COUNT   135
-
-#define RGB_MATRIX_SLEEP // turn off effects when suspended
 #define RGB_TRIGGER_ON_KEYDOWN
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_KEYRELEASES
diff --git a/keyboards/akko/acr87/info.json b/keyboards/akko/acr87/info.json
index 5ccb0c3f73..2702ee7915 100644
--- a/keyboards/akko/acr87/info.json
+++ b/keyboards/akko/acr87/info.json
@@ -200,7 +200,9 @@
             {"flags": 2, "x":196, "y":64},
             {"flags": 2, "x":210, "y":64},
             {"flags": 2, "x":224, "y":64}
-    ]
+        ],
+        "react_on_keyup": true,
+        "sleep": true
     }, 
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/akko/top40/config.h b/keyboards/akko/top40/config.h
index 36948fe1d3..a23cf6db92 100644
--- a/keyboards/akko/top40/config.h
+++ b/keyboards/akko/top40/config.h
@@ -37,11 +37,4 @@
 #define I2C1_OPMODE OPMODE_I2C
 #define I2C1_CLOCK_SPEED 400000 /* 400000 */
 
-#define RGB_MATRIX_LED_COUNT    76
-
-#define RGB_MATRIX_SLEEP // turn off effects when suspended
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_KEYRELEASES
 #define RGB_TRIGGER_ON_KEYDOWN
-
diff --git a/keyboards/akko/top40/info.json b/keyboards/akko/top40/info.json
index 243952ccc8..183c9242f4 100644
--- a/keyboards/akko/top40/info.json
+++ b/keyboards/akko/top40/info.json
@@ -139,7 +139,9 @@
             {"flags": 2, "x":185, "y":64},
             {"flags": 2, "x":205, "y":64},
             {"flags": 2, "x":224, "y":64}
-    ]
+        ],
+        "react_on_keyup": true,
+        "sleep": true
     }, 
    "layouts": {
         "LAYOUT": {