6 files changed, 14 insertions, 49 deletions
diff --git a/keyboards/vertex/angler2/config.h b/keyboards/vertex/angler2/config.h
index 7e71d1922e..fc71e667b8 100644
--- a/keyboards/vertex/angler2/config.h
+++ b/keyboards/vertex/angler2/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 16
 
 /*
  * Keyboard Matrix Assignments
@@ -37,10 +32,6 @@
 
 #define DIODE_DIRECTION COL2ROW
 
-#define LED_CAPS_LOCK_PIN  B0
-#define LED_SCROLL_LOCK_PIN B7
-#define LED_PIN_ON_STATE 0
-
 #define RGB_DI_PIN E6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/vertex/angler2/info.json b/keyboards/vertex/angler2/info.json
index 0580cef82e..3716ddbede 100644
--- a/keyboards/vertex/angler2/info.json
+++ b/keyboards/vertex/angler2/info.json
@@ -8,6 +8,13 @@
         "pid": "0x408F",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "B0",
+        "scroll_lock": "B7",
+        "on_state": 0
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "community_layouts": [
         "tkl_ansi",
         "tkl_ansi_tsangan",
diff --git a/keyboards/vertex/angler2/rules.mk b/keyboards/vertex/angler2/rules.mk
index 744a272535..b5cde0eb87 100644
--- a/keyboards/vertex/angler2/rules.mk
+++ b/keyboards/vertex/angler2/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/vertex/arc60/config.h b/keyboards/vertex/arc60/config.h
index 20ae0e71cc..633843021f 100644
--- a/keyboards/vertex/arc60/config.h
+++ b/keyboards/vertex/arc60/config.h
@@ -16,18 +16,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
 #define MATRIX_COL_PINS { B9, B8, B7, B6, B5, B4, B3, B11, A15, A10, A9, B14, B13, B12, A5 }
 #define MATRIX_ROW_PINS { B10, B1, B0, A7, A6 }
 #define DIODE_DIRECTION COL2ROW
 
-#define LED_CAPS_LOCK_PIN C13
-#define LED_PIN_ON_STATE 0
-
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -49,27 +41,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * Feature disable options
  *  These options are also useful to firmware size reduction.
  */
-/*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
-#define FORCE_NKRO
 
+#define FORCE_NKRO
 
 /* disable debug print */
 //#define NO_DEBUG
diff --git a/keyboards/vertex/arc60/info.json b/keyboards/vertex/arc60/info.json
index 7d2b2a452e..bfb8e4fc3a 100644
--- a/keyboards/vertex/arc60/info.json
+++ b/keyboards/vertex/arc60/info.json
@@ -8,6 +8,12 @@
         "pid": "0x8370",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "C13",
+        "on_state": 0
+    },
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
     "community_layouts": [
         "60_ansi",
         "60_ansi_split_bs_rshift",
diff --git a/keyboards/vertex/arc60/rules.mk b/keyboards/vertex/arc60/rules.mk
index 7b7725d5f7..5a90b0d7fe 100644
--- a/keyboards/vertex/arc60/rules.mk
+++ b/keyboards/vertex/arc60/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = STM32F103
-
-# Bootloader selection
-BOOTLOADER = stm32duino
-
 # Build Options
 #   change yes to no to disable
 #