10 files changed, 14 insertions, 38 deletions
diff --git a/keyboards/keycapsss/kimiko/keymaps/default/rules.mk b/keyboards/keycapsss/kimiko/keymaps/default/rules.mk
index 75655f2bd5..ef4f0c0b43 100644
--- a/keyboards/keycapsss/kimiko/keymaps/default/rules.mk
+++ b/keyboards/keycapsss/kimiko/keymaps/default/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # ENables the use of one or more encoders
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 
@@ -8,4 +7,3 @@ RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 # This does not affect QMK Macros and Layers
 LTO_ENABLE = yes
 ENCODER_MAP_ENABLE = yes
-
diff --git a/keyboards/keycapsss/kimiko/keymaps/oriaj3/rules.mk b/keyboards/keycapsss/kimiko/keymaps/oriaj3/rules.mk
index 0229490d44..46cb8d8a94 100644
--- a/keyboards/keycapsss/kimiko/keymaps/oriaj3/rules.mk
+++ b/keyboards/keycapsss/kimiko/keymaps/oriaj3/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # ENables the use of one or more encoders
 RGBLIGHT_ENABLE = no      # Disable keyboard RGB underglow
 
@@ -10,7 +9,7 @@ LTO_ENABLE = yes
 
 #ENABLE RGB MATRIX WITH DRIVER WS2812
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
+RGB_MATRIX_DRIVER = ws2812
 
 #DEFINE SPLIT KEYBOARD AND SPLIT TRANSPORT MIRROR
 SPLIT_KEYBOARD = yes
@@ -18,4 +17,3 @@ SPLIT_KEYBOARD = yes
 #DEACTIVATED FOR MEMORY SAVING
 MOUSEKEY_ENABLE = no
 CONSOLE_ENABLE = no
-
diff --git a/keyboards/keycapsss/kimiko/rev1/config.h b/keyboards/keycapsss/kimiko/rev1/config.h
index 27049500bc..8e44b27ace 100644
--- a/keyboards/keycapsss/kimiko/rev1/config.h
+++ b/keyboards/keycapsss/kimiko/rev1/config.h
@@ -16,12 +16,6 @@
 
 #pragma once
 
-#ifdef RGBLIGHT_ENABLE
-#   define RGBLED_NUM 60  // Total number of LEDs
-#   define RGBLED_SPLIT { 30, 30 } // LEDs per side
-#   define RGBLIGHT_SPLIT
-#endif
-
 // Limit the power draw
 #ifdef IOS_DEVICE_ENABLE
   #define RGBLIGHT_LIMIT_VAL 40
diff --git a/keyboards/keycapsss/kimiko/rev1/info.json b/keyboards/keycapsss/kimiko/rev1/info.json
index 56028f3f81..e0106f4423 100644
--- a/keyboards/keycapsss/kimiko/rev1/info.json
+++ b/keyboards/keycapsss/kimiko/rev1/info.json
@@ -21,6 +21,10 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "rgblight": {
+        "led_count": 60,
+        "split_count": [30, 30]
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/keycapsss/o4l_5x12/config.h b/keyboards/keycapsss/o4l_5x12/config.h
index 804dabbf6d..783ce3f9d2 100644
--- a/keyboards/keycapsss/o4l_5x12/config.h
+++ b/keyboards/keycapsss/o4l_5x12/config.h
@@ -1,10 +1,5 @@
 #pragma once
 
-#    define RGBLED_NUM 12
-#    define RGBLIGHT_HUE_STEP 4
-#    define RGBLIGHT_SAT_STEP 4
-#    define RGBLIGHT_VAL_STEP 4
-//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/keycapsss/o4l_5x12/info.json b/keyboards/keycapsss/o4l_5x12/info.json
index 0766e0a2e4..090355464c 100644
--- a/keyboards/keycapsss/o4l_5x12/info.json
+++ b/keyboards/keycapsss/o4l_5x12/info.json
@@ -8,6 +8,12 @@
         "pid": "0x0512",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "hue_steps": 4,
+        "saturation_steps": 4,
+        "brightness_steps": 4,
+        "led_count": 12
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/keycapsss/plaid_pad/config.h b/keyboards/keycapsss/plaid_pad/config.h
deleted file mode 100644
index 984323f63c..0000000000
--- a/keyboards/keycapsss/plaid_pad/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2020 Ben Roesner (keycapsss.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// Fix for volume controll with encoder (steadily in/decrease)
-#define TAP_CODE_DELAY 60
diff --git a/keyboards/keycapsss/plaid_pad/info.json b/keyboards/keycapsss/plaid_pad/info.json
index 9fe02448d0..c66bd05f1b 100644
--- a/keyboards/keycapsss/plaid_pad/info.json
+++ b/keyboards/keycapsss/plaid_pad/info.json
@@ -7,6 +7,9 @@
         "pid": "0x5050",
         "max_power": 100
     },
+    "qmk": {
+        "tap_keycode_delay": 60
+    },
     "matrix_pins": {
         "cols": ["B0", "D7", "D6", "D5"],
         "rows": ["C0", "C1", "C2", "C3"]
diff --git a/keyboards/keycapsss/plaid_pad/keymaps/oled/rules.mk b/keyboards/keycapsss/plaid_pad/keymaps/oled/rules.mk
index 9ce6e078db..dc3e29cf8b 100644
--- a/keyboards/keycapsss/plaid_pad/keymaps/oled/rules.mk
+++ b/keyboards/keycapsss/plaid_pad/keymaps/oled/rules.mk
@@ -1,3 +1,2 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 COMBO_ENABLE = yes
diff --git a/keyboards/keycapsss/plaid_pad/rev3/rules.mk b/keyboards/keycapsss/plaid_pad/rev3/rules.mk
index e72f11863f..5ec06e9609 100644
--- a/keyboards/keycapsss/plaid_pad/rev3/rules.mk
+++ b/keyboards/keycapsss/plaid_pad/rev3/rules.mk
@@ -1,3 +1,2 @@
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays