4 files changed, 16 insertions, 26 deletions
diff --git a/keyboards/clueboard/66_hotswap/gen1/info.json b/keyboards/clueboard/66_hotswap/gen1/info.json
index 76352b0771..18afe54126 100644
--- a/keyboards/clueboard/66_hotswap/gen1/info.json
+++ b/keyboards/clueboard/66_hotswap/gen1/info.json
@@ -4,7 +4,8 @@
   "maintainer": "skullydazed",
   "height": 5,
   "width": 16.5,
-  "debounce": "5",
+  "debounce": 5,
+  "processor": "STM32F303",
   "diode_direction": "COL2ROW",
   "features": {
     "audio": true,
@@ -12,13 +13,16 @@
     "command": true,
     "console": true,
     "extrakey": true,
-    "led_matrix": "IS31FL3731",
+    "led_matrix": true,
     "mousekey": true,
     "nkro": true
   },
+  "led_matrix": {
+    "driver": "IS31FL3731"
+  },
   "matrix_pins": {
-    "cols": ["B10", " B2", " B1", " B0", " A7", " B4", " B3", " B7"],
-    "rows": ["B11", " A6", " A3", " A2", " A1", " B5", " B6", " C15", " C14", " C13"]
+    "cols": ["B10", "B2", "B1", "B0", "A7", "B4", "B3", "B7"],
+    "rows": ["B11", "A6", "A3", "A2", "A1", "B5", "B6", "C15", "C14", "C13"]
   },
   "usb": {
     "device_ver": "0x0001",
diff --git a/keyboards/clueboard/66_hotswap/gen1/rules.mk b/keyboards/clueboard/66_hotswap/gen1/rules.mk
index f298df1677..e23f9a4b3c 100644
--- a/keyboards/clueboard/66_hotswap/gen1/rules.mk
+++ b/keyboards/clueboard/66_hotswap/gen1/rules.mk
@@ -1,5 +1,3 @@
-# MCU name
-MCU = STM32F303
 BOARD = QMK_PROTON_C
 LED_MATRIX_DRIVER = IS31FL3731
 
diff --git a/keyboards/clueboard/66_hotswap/prototype/info.json b/keyboards/clueboard/66_hotswap/prototype/info.json
index 1572223592..0b55b3b638 100644
--- a/keyboards/clueboard/66_hotswap/prototype/info.json
+++ b/keyboards/clueboard/66_hotswap/prototype/info.json
@@ -4,8 +4,9 @@
   "maintainer": "skullydazed",
   "height": 5,
   "width": 16.5,
-  "debounce": "5",
+  "debounce": 5,
   "diode_direction": "COL2ROW",
+  "processor": "atmega32u4",
   "features": {
     "audio": true,
     "backlight": true,
@@ -24,18 +25,18 @@
     "caps_lock": "B4"
   },
   "matrix_pins": {
-    "cols": ["F0", " F1", " F4", " F5", " F6", " F7", " E6", " B1"],
-    "rows": ["B2", " C7", " C6", " B6", " B5", " B0", " B3", " D5", " D3", " D2"]
+    "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "E6", "B1"],
+    "rows": ["B2", "C7", "C6", "B6", "B5", "B0", "B3", "D5", "D3", "D2"]
   },
   "rgblight": {
     "animations": {
       "all": true
     },
-    "brightness_steps": "17",
-    "hue_steps": "32",
-    "led_count": "26",
+    "brightness_steps": 17,
+    "hue_steps": 32,
+    "led_count": 26,
     "pin": "D7",
-    "saturation_steps": "17"
+    "saturation_steps": 17
   },
   "usb": {
     "device_ver": "0x0001",
diff --git a/keyboards/clueboard/66_hotswap/prototype/rules.mk b/keyboards/clueboard/66_hotswap/prototype/rules.mk
index 63dd64f7c1..f144042edd 100644
--- a/keyboards/clueboard/66_hotswap/prototype/rules.mk
+++ b/keyboards/clueboard/66_hotswap/prototype/rules.mk
@@ -1,16 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   comment out to disable the options.
 #