11 files changed, 28 insertions, 45 deletions
diff --git a/keyboards/input_club/infinity60/info.json b/keyboards/input_club/infinity60/info.json
index 423ac2a937..f99ab93ca8 100644
--- a/keyboards/input_club/infinity60/info.json
+++ b/keyboards/input_club/infinity60/info.json
@@ -3,6 +3,14 @@
     "manufacturer": "Input:Club",
     "url": "https://input.club/devices/infinity-keyboard/",
     "maintainer": "qmk",
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
     "usb": {
         "vid": "0x1C11",
         "pid": "0xB04D",
diff --git a/keyboards/input_club/infinity60/led/info.json b/keyboards/input_club/infinity60/led/keyboard.json
index f16554d245..f16554d245 100644
--- a/keyboards/input_club/infinity60/led/info.json
+++ b/keyboards/input_club/infinity60/led/keyboard.json
diff --git a/keyboards/input_club/infinity60/led/rules.mk b/keyboards/input_club/infinity60/led/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/input_club/infinity60/led/rules.mk
+++ /dev/null
diff --git a/keyboards/input_club/infinity60/rev1/info.json b/keyboards/input_club/infinity60/rev1/keyboard.json
index a5afb37751..a5afb37751 100644
--- a/keyboards/input_club/infinity60/rev1/info.json
+++ b/keyboards/input_club/infinity60/rev1/keyboard.json
diff --git a/keyboards/input_club/infinity60/rev1/rules.mk b/keyboards/input_club/infinity60/rev1/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/input_club/infinity60/rev1/rules.mk
+++ /dev/null
diff --git a/keyboards/input_club/infinity60/rules.mk b/keyboards/input_club/infinity60/rules.mk
index 5f885e1194..9c4b1e74c2 100644
--- a/keyboards/input_club/infinity60/rules.mk
+++ b/keyboards/input_club/infinity60/rules.mk
@@ -1,15 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 DEFAULT_FOLDER = input_club/infinity60/led
-
diff --git a/keyboards/input_club/k_type/i2c_master.c b/keyboards/input_club/k_type/i2c_master.c
index e25ae2ef6f..a55b2fb38c 100644
--- a/keyboards/input_club/k_type/i2c_master.c
+++ b/keyboards/input_club/k_type/i2c_master.c
@@ -27,10 +27,11 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-
-#include "quantum.h"
 #include "i2c_master.h"
+#include "gpio.h"
+#include "chibios_config.h"
 #include <string.h>
+#include <ch.h>
 #include <hal.h>
 
 static uint8_t i2c_address;
diff --git a/keyboards/input_club/k_type/info.json b/keyboards/input_club/k_type/keyboard.json
index 17076a82d8..a4e8e2419e 100644
--- a/keyboards/input_club/k_type/info.json
+++ b/keyboards/input_club/k_type/keyboard.json
@@ -56,6 +56,14 @@
         },
         "driver": "custom"
     },
+    "features": {
+        "bootmagic": false,
+        "command": false,
+        "console": false,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": true
+    },
     "matrix_pins": {
         "cols": ["B2", "B3", "B18", "B19", "C0", "C8", "C9", "D0", "D1", "D4"],
         "rows": ["D5", "D6", "D7", "C1", "C2", "C3", "C4", "C5", "C6", "C7"]
diff --git a/keyboards/input_club/k_type/rules.mk b/keyboards/input_club/k_type/rules.mk
deleted file mode 100644
index 684de50562..0000000000
--- a/keyboards/input_club/k_type/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-# RGB options
-RGB_MATRIX_ENABLE = no
diff --git a/keyboards/input_club/whitefox/info.json b/keyboards/input_club/whitefox/keyboard.json
index 0428907fb8..d2fd36bbd5 100644
--- a/keyboards/input_club/whitefox/info.json
+++ b/keyboards/input_club/whitefox/keyboard.json
@@ -33,6 +33,15 @@
         "driver": "is31fl3731",
         "sleep": true
     },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "console": false,
+        "extrakey": true,
+        "led_matrix": true,
+        "mousekey": true,
+        "nkro": true
+    },
     "matrix_pins": {
         "cols": ["B2", "B3", "B18", "B19", "C0", "C8", "C9", "C10", "C11"],
         "rows": ["D0", "D1", "D4", "D5", "D6", "D7", "C1", "C2"]
diff --git a/keyboards/input_club/whitefox/rules.mk b/keyboards/input_club/whitefox/rules.mk
deleted file mode 100644
index 821041ea83..0000000000
--- a/keyboards/input_club/whitefox/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-LED_MATRIX_ENABLE = yes
-