6 files changed, 19 insertions, 20 deletions
diff --git a/keyboards/cipulot/60xt/info.json b/keyboards/cipulot/60xt/keyboard.json
index 606e6b3363..606e6b3363 100644
--- a/keyboards/cipulot/60xt/info.json
+++ b/keyboards/cipulot/60xt/keyboard.json
diff --git a/keyboards/cipulot/60xt/rules.mk b/keyboards/cipulot/60xt/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/cipulot/60xt/rules.mk
+++ /dev/null
diff --git a/keyboards/cipulot/common/ec_board.c b/keyboards/cipulot/common/ec_board.c
index 2225d6da63..d9ba197589 100644
--- a/keyboards/cipulot/common/ec_board.c
+++ b/keyboards/cipulot/common/ec_board.c
@@ -15,7 +15,7 @@
  */
 
 #include "ec_switch_matrix.h"
-#include "quantum.h"
+#include "keyboard.h"
 
 void eeconfig_init_kb(void) {
     // Default values
diff --git a/keyboards/cipulot/ec_typek/ec_typek.c b/keyboards/cipulot/ec_typek/ec_typek.c
index 035c90303c..7c3874d6b3 100644
--- a/keyboards/cipulot/ec_typek/ec_typek.c
+++ b/keyboards/cipulot/ec_typek/ec_typek.c
@@ -101,19 +101,19 @@ layer_state_t layer_state_set_user(layer_state_t state) {
  */
 bool indicators_callback(void) {
     if ((eeprom_ec_config.num.enabled) && (host_keyboard_led_state().num_lock))
-        sethsv(eeprom_ec_config.num.h, eeprom_ec_config.num.s, eeprom_ec_config.num.v, (rgb_led_t *)&led[NUM_INDICATOR_INDEX]);
+        rgblight_sethsv_at(eeprom_ec_config.num.h, eeprom_ec_config.num.s, eeprom_ec_config.num.v, NUM_INDICATOR_INDEX);
     else
-        sethsv(0, 0, 0, (rgb_led_t *)&led[NUM_INDICATOR_INDEX]);
+        rgblight_sethsv_at(0, 0, 0, NUM_INDICATOR_INDEX);
 
     if ((eeprom_ec_config.caps.enabled) && (host_keyboard_led_state().caps_lock))
-        sethsv(eeprom_ec_config.caps.h, eeprom_ec_config.caps.s, eeprom_ec_config.caps.v, (rgb_led_t *)&led[CAPS_INDICATOR_INDEX]);
+        rgblight_sethsv_at(eeprom_ec_config.caps.h, eeprom_ec_config.caps.s, eeprom_ec_config.caps.v, CAPS_INDICATOR_INDEX);
     else
-        sethsv(0, 0, 0, (rgb_led_t *)&led[CAPS_INDICATOR_INDEX]);
+        rgblight_sethsv_at(0, 0, 0, CAPS_INDICATOR_INDEX);
 
     if ((eeprom_ec_config.scroll.enabled) && (host_keyboard_led_state().scroll_lock))
-        sethsv(eeprom_ec_config.scroll.h, eeprom_ec_config.scroll.s, eeprom_ec_config.scroll.v, (rgb_led_t *)&led[SCROLL_INDICATOR_INDEX]);
+        rgblight_sethsv_at(eeprom_ec_config.scroll.h, eeprom_ec_config.scroll.s, eeprom_ec_config.scroll.v, SCROLL_INDICATOR_INDEX);
     else
-        sethsv(0, 0, 0, (rgb_led_t *)&led[SCROLL_INDICATOR_INDEX]);
+        rgblight_sethsv_at(0, 0, 0, SCROLL_INDICATOR_INDEX);
 
     return true;
 }
diff --git a/keyboards/cipulot/kallos/info.json b/keyboards/cipulot/kallos/keyboard.json
index b2f265c13f..e92d634489 100644
--- a/keyboards/cipulot/kallos/info.json
+++ b/keyboards/cipulot/kallos/keyboard.json
@@ -26,6 +26,18 @@
     "ws2812": {
         "pin": "D0"
     },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "rgblight": true
+    },
     "matrix_pins": {
         "cols": ["F5", "F6", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "F7", "D2", "D1", "B7"],
         "rows": ["B3", "B2", "F0", "C7", "F4", "F1"]
diff --git a/keyboards/cipulot/kallos/rules.mk b/keyboards/cipulot/kallos/rules.mk
deleted file mode 100644
index f574845eef..0000000000
--- a/keyboards/cipulot/kallos/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # 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 = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-LTO_ENABLE = yes