4 files changed, 14 insertions, 32 deletions
diff --git a/keyboards/clueboard/2x1800/2018/info.json b/keyboards/clueboard/2x1800/2018/info.json
index b671174076..878b24ce17 100644
--- a/keyboards/clueboard/2x1800/2018/info.json
+++ b/keyboards/clueboard/2x1800/2018/info.json
@@ -4,7 +4,9 @@
   "maintainer": "skullydazed",
   "height": 6.5,
   "width": 24,
-  "debounce": "5",
+  "processor": "at90usb1286",
+  "bootloader": "halfkay",
+  "debounce": 5,
   "diode_direction": "ROW2COL",
   "features": {
     "audio": true,
@@ -24,18 +26,18 @@
     "scroll_lock": "B6"
   },
   "matrix_pins": {
-    "cols": ["D2", " D3", " D4", " D5", " D7", " E0", " E1", " B0", " E6", " B3", " B2"],
-    "rows": ["C0", " C1", " C2", " C3", " C7", " F7", " B1", " F2", " F3", " F4", " F5", " F6"]
+    "cols": ["D2", "D3", "D4", "D5", "D7", "E0", "E1", "B0", "E6", "B3", "B2"],
+    "rows": ["C0", "C1", "C2", "C3", "C7", "F7", "B1", "F2", "F3", "F4", "F5", "F6"]
   },
   "rgblight": {
     "animations": {
       "all": true
     },
-    "brightness_steps": "8",
-    "hue_steps": "8",
-    "led_count": "16",
+    "brightness_steps": 8,
+    "hue_steps": 8,
+    "led_count": 16,
     "pin": "C6",
-    "saturation_steps": "8"
+    "saturation_steps": 8
   },
   "usb": {
     "pid": "0x23A0"
diff --git a/keyboards/clueboard/2x1800/2018/rules.mk b/keyboards/clueboard/2x1800/2018/rules.mk
index c421eb862e..6e7633bfe0 100644
--- a/keyboards/clueboard/2x1800/2018/rules.mk
+++ b/keyboards/clueboard/2x1800/2018/rules.mk
@@ -1,12 +1 @@
-# MCU name
-MCU = at90usb1286
-
-# Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
-BOOTLOADER = halfkay
+# This file intentionally left blank
diff --git a/keyboards/clueboard/2x1800/2019/info.json b/keyboards/clueboard/2x1800/2019/info.json
index 96af671a8b..26185b7a48 100644
--- a/keyboards/clueboard/2x1800/2019/info.json
+++ b/keyboards/clueboard/2x1800/2019/info.json
@@ -4,7 +4,9 @@
   "maintainer": "skullydazed",
   "height": 8,
   "width": 24,
-  "debounce": "5",
+  "debounce": 5,
+  "processor": "at90usb1286",
+  "bootloader": "halfkay",
   "diode_direction": "ROW2COL",
   "features": {
     "audio": true,
diff --git a/keyboards/clueboard/2x1800/2019/rules.mk b/keyboards/clueboard/2x1800/2019/rules.mk
index c421eb862e..6e7633bfe0 100644
--- a/keyboards/clueboard/2x1800/2019/rules.mk
+++ b/keyboards/clueboard/2x1800/2019/rules.mk
@@ -1,12 +1 @@
-# MCU name
-MCU = at90usb1286
-
-# Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
-BOOTLOADER = halfkay
+# This file intentionally left blank