5 files changed, 13 insertions, 47 deletions
diff --git a/keyboards/geekboards/macropad_v2/config.h b/keyboards/geekboards/macropad_v2/config.h
index 7ddbefea2a..b9096da1d7 100644
--- a/keyboards/geekboards/macropad_v2/config.h
+++ b/keyboards/geekboards/macropad_v2/config.h
@@ -22,7 +22,7 @@
 #define DIRECT_PINS {{B13, B15, B3, B5}, {B12, B14, A13, B7}}
 
 #define RGBLED_NUM 42
-#define DRIVER_LED_TOTAL 42
+#define RGB_MATRIX_LED_COUNT 42
 #define RGB_DI_PIN A7
 
 // PWM RGB Underglow Defines
diff --git a/keyboards/geekboards/macropad_v2/info.json b/keyboards/geekboards/macropad_v2/info.json
index b62620af9b..bac03b43f1 100644
--- a/keyboards/geekboards/macropad_v2/info.json
+++ b/keyboards/geekboards/macropad_v2/info.json
@@ -9,48 +9,17 @@
     "device_version": "0.0.2"
   },
   "layouts": {
-    "LAYOUT": {
+    "LAYOUT_ortho_2x4": {
       "layout": [
-        {
-          "label": "K0",
-          "x": 0,
-          "y": 0
-        },
-        {
-          "label": "K1",
-          "x": 1,
-          "y": 0
-        },
-        {
-          "label": "K2",
-          "x": 2,
-          "y": 0
-        },
-        {
-          "label": "K3",
-          "x": 3,
-          "y": 0
-        },
-        {
-          "label": "K4",
-          "x": 0,
-          "y": 1
-        },
-        {
-          "label": "K5",
-          "x": 1,
-          "y": 1
-        },
-        {
-          "label": "K6",
-          "x": 2,
-          "y": 1
-        },
-        {
-          "label": "K7",
-          "x": 3,
-          "y": 1
-        }
+        {"label": "K0", "x": 0, "y": 0},
+        {"label": "K1", "x": 1, "y": 0},
+        {"label": "K2", "x": 2, "y": 0},
+        {"label": "K3", "x": 3, "y": 0},
+
+        {"label": "K4", "x": 0, "y": 1},
+        {"label": "K5", "x": 1, "y": 1},
+        {"label": "K6", "x": 2, "y": 1},
+        {"label": "K7", "x": 3, "y": 1}
       ]
     }
   }
diff --git a/keyboards/geekboards/macropad_v2/keymaps/via/config.h b/keyboards/geekboards/macropad_v2/keymaps/via/config.h
deleted file mode 100644
index 9d75edbe74..0000000000
--- a/keyboards/geekboards/macropad_v2/keymaps/via/config.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define DYNAMIC_KEYMAP_LAYER_COUNT 4
-#define VIA_QMK_RGBLIGHT_ENABLE
diff --git a/keyboards/geekboards/tester/config.h b/keyboards/geekboards/tester/config.h
index bdf2d39c98..c8f3aa4977 100644
--- a/keyboards/geekboards/tester/config.h
+++ b/keyboards/geekboards/tester/config.h
@@ -14,7 +14,6 @@
 
 #define DEBOUNCE 3
 #ifdef RGB_MATRIX_ENABLE
-#define RGB_DISABLE_AFTER_TIMEOUT 0
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_KEYPRESSES
 // RGB Matrix Animation modes. Explicitly enabled
@@ -71,5 +70,5 @@
 #    define DRIVER_COUNT 2
 #    define DRIVER_1_LED_TOTAL 8
 #    define DRIVER_2_LED_TOTAL 0
-#    define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 #endif
diff --git a/keyboards/geekboards/tester/tester.c b/keyboards/geekboards/tester/tester.c
index 70865c461f..f2d2301ec9 100644
--- a/keyboards/geekboards/tester/tester.c
+++ b/keyboards/geekboards/tester/tester.c
@@ -1,5 +1,5 @@
 #include "tester.h"
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location