diff --git a/keyboards/0xcb/1337/config.h b/keyboards/0xcb/1337/config.h
index a247d1b3678..9d1e7ab889a 100644
--- a/keyboards/0xcb/1337/config.h
+++ b/keyboards/0xcb/1337/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see .
#define TAP_CODE_DELAY 10
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 4
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -44,7 +43,6 @@ along with this program. If not, see .
#define RGBLIGHT_DEFAULT_SAT 232
#define RGBLIGHT_DEFAULT_VAR 255
#define RGBLIGHT_DEFAULT_SPD 2
-#endif
// clang-format on
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/1upkeyboards/1up60hse/config.h b/keyboards/1upkeyboards/1up60hse/config.h
index edcad67b869..7d0ad0b1415 100644
--- a/keyboards/1upkeyboards/1up60hse/config.h
+++ b/keyboards/1upkeyboards/1up60hse/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -34,7 +33,6 @@ along with this program. If not, see .
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_SLEEP
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/1upkeyboards/1up60hte/config.h b/keyboards/1upkeyboards/1up60hte/config.h
index 1aa9d54fe1b..59e80d7fd0b 100644
--- a/keyboards/1upkeyboards/1up60hte/config.h
+++ b/keyboards/1upkeyboards/1up60hte/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -40,4 +39,3 @@ along with this program. If not, see .
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/1upkeyboards/1up60rgb/config.h b/keyboards/1upkeyboards/1up60rgb/config.h
index 348604d71c0..6a83a74a89b 100644
--- a/keyboards/1upkeyboards/1up60rgb/config.h
+++ b/keyboards/1upkeyboards/1up60rgb/config.h
@@ -7,7 +7,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -22,4 +21,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/1upkeyboards/super16/config.h b/keyboards/1upkeyboards/super16/config.h
index ef1a458c9db..68701e6a587 100644
--- a/keyboards/1upkeyboards/super16/config.h
+++ b/keyboards/1upkeyboards/super16/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 16 // Add 12 if attaching the RGB LED ring
# define RGB_MATRIX_LED_COUNT RGBLED_NUM
# ifdef RGBLIGHT_ENABLE
@@ -90,7 +89,6 @@ along with this program. If not, see .
# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
# endif
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/1upkeyboards/super16v2/config.h b/keyboards/1upkeyboards/super16v2/config.h
index d3235d95ff4..c2f738c2ffe 100644
--- a/keyboards/1upkeyboards/super16v2/config.h
+++ b/keyboards/1upkeyboards/super16v2/config.h
@@ -21,10 +21,8 @@
#define RGB_DI_PIN B5
#define RGB_MATRIX_LED_COUNT 20
-#ifdef RGB_DI_PIN
# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
# define RGBLIGHT_LIMIT_VAL 255
-#endif
#ifdef RGB_MATRIX_ENABLE
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
diff --git a/keyboards/1upkeyboards/sweet16/v1/config.h b/keyboards/1upkeyboards/sweet16/v1/config.h
index bb68f2b5d40..426cd3ced7e 100644
--- a/keyboards/1upkeyboards/sweet16/v1/config.h
+++ b/keyboards/1upkeyboards/sweet16/v1/config.h
@@ -8,7 +8,6 @@
/* Underglow options */
#define RGB_DI_PIN B1
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -23,4 +22,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/25keys/aleth42/rev0/config.h b/keyboards/25keys/aleth42/rev0/config.h
index 0a8b6b948ee..26a56a63734 100644
--- a/keyboards/25keys/aleth42/rev0/config.h
+++ b/keyboards/25keys/aleth42/rev0/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/25keys/aleth42/rev1/config.h b/keyboards/25keys/aleth42/rev1/config.h
index 56ba105e5dc..af95a5657df 100644
--- a/keyboards/25keys/aleth42/rev1/config.h
+++ b/keyboards/25keys/aleth42/rev1/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN B3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/25keys/cassette42/config.h b/keyboards/25keys/cassette42/config.h
index 686eea8fc75..bc4f1ab4aa2 100644
--- a/keyboards/25keys/cassette42/config.h
+++ b/keyboards/25keys/cassette42/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 5
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -35,6 +34,5 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
#define OLED_FONT_H "keyboards/25keys/cassette42/common/glcdfont.c"
diff --git a/keyboards/40percentclub/gherkin/config.h b/keyboards/40percentclub/gherkin/config.h
index 627d9d6dbb4..5f360813239 100644
--- a/keyboards/40percentclub/gherkin/config.h
+++ b/keyboards/40percentclub/gherkin/config.h
@@ -5,20 +5,3 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-# define RGBLIGHT_EFFECT_BREATHING
-# define RGBLIGHT_EFFECT_RAINBOW_MOOD
-# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-# define RGBLIGHT_EFFECT_SNAKE
-# define RGBLIGHT_EFFECT_KNIGHT
-# define RGBLIGHT_EFFECT_CHRISTMAS
-# define RGBLIGHT_EFFECT_STATIC_GRADIENT
-# define RGBLIGHT_EFFECT_RGB_TEST
-# define RGBLIGHT_EFFECT_ALTERNATING
-# define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/abacus/config.h b/keyboards/abacus/config.h
index e579dea057f..df3253e700b 100644
--- a/keyboards/abacus/config.h
+++ b/keyboards/abacus/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see .
#define RGB_DI_PIN D1
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 17
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_SNAKE
# define RGBLIGHT_EFFECT_KNIGHT
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/abstract/ellipse/rev1/config.h b/keyboards/abstract/ellipse/rev1/config.h
index d3feabbe200..c0984e0297c 100644
--- a/keyboards/abstract/ellipse/rev1/config.h
+++ b/keyboards/abstract/ellipse/rev1/config.h
@@ -18,14 +18,12 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 3
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/acekeyboard/titan60/config.h b/keyboards/acekeyboard/titan60/config.h
index 3a01bebf93f..c3755e12e0a 100644
--- a/keyboards/acekeyboard/titan60/config.h
+++ b/keyboards/acekeyboard/titan60/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D0
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 6
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h
index 30b0b74c95f..a22e92e1b15 100644
--- a/keyboards/acheron/elongate/beta/config.h
+++ b/keyboards/acheron/elongate/beta/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D7
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 16
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/ada/ada1800mini/config.h b/keyboards/ada/ada1800mini/config.h
index 378ffa80b43..f32b0075bb7 100644
--- a/keyboards/ada/ada1800mini/config.h
+++ b/keyboards/ada/ada1800mini/config.h
@@ -18,7 +18,6 @@
//TODO: implement RGB matrix when I get the hardware
#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 100
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
// generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/ada/infinity81/config.h b/keyboards/ada/infinity81/config.h
index 0d64933ad9b..8f369e4ae77 100644
--- a/keyboards/ada/infinity81/config.h
+++ b/keyboards/ada/infinity81/config.h
@@ -4,7 +4,6 @@
#pragma once
#define RGB_DI_PIN D0
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 107
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -21,7 +20,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/adpenrose/kintsugi/config.h b/keyboards/adpenrose/kintsugi/config.h
index 0e10856cc81..2895613932c 100644
--- a/keyboards/adpenrose/kintsugi/config.h
+++ b/keyboards/adpenrose/kintsugi/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see .
/* Underglow options: */
#define RGB_DI_PIN F1
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 16
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -37,4 +36,3 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
-#endif
diff --git a/keyboards/adpenrose/obi/config.h b/keyboards/adpenrose/obi/config.h
index fd9156ca82f..2eb0a46c996 100644
--- a/keyboards/adpenrose/obi/config.h
+++ b/keyboards/adpenrose/obi/config.h
@@ -7,7 +7,6 @@
/* Underglow options: */
#define RGB_DI_PIN F7
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 16
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -23,4 +22,3 @@
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
-#endif
diff --git a/keyboards/ai03/polaris/config.h b/keyboards/ai03/polaris/config.h
index 3946e761c33..88099b805b2 100644
--- a/keyboards/ai03/polaris/config.h
+++ b/keyboards/ai03/polaris/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 14
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/ai03/voyager60_alps/config.h b/keyboards/ai03/voyager60_alps/config.h
index 704a6879f5c..7092a754a98 100644
--- a/keyboards/ai03/voyager60_alps/config.h
+++ b/keyboards/ai03/voyager60_alps/config.h
@@ -15,14 +15,12 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 14
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
/*
* Feature disable options
diff --git a/keyboards/alf/dc60/config.h b/keyboards/alf/dc60/config.h
index b62a2cc0acf..7a2b73ef067 100644
--- a/keyboards/alf/dc60/config.h
+++ b/keyboards/alf/dc60/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -33,7 +32,6 @@ along with this program. If not, see .
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/alf/x11/config.h b/keyboards/alf/x11/config.h
index 1c4361c5c51..d862c69cd31 100644
--- a/keyboards/alf/x11/config.h
+++ b/keyboards/alf/x11/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN F7
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 28
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/alf/x2/config.h b/keyboards/alf/x2/config.h
index 5faf0aad8b6..7e3e14a532e 100644
--- a/keyboards/alf/x2/config.h
+++ b/keyboards/alf/x2/config.h
@@ -23,7 +23,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -38,4 +37,3 @@
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/alfredslab/swift65/hotswap/config.h b/keyboards/alfredslab/swift65/hotswap/config.h
index 1fc317877dc..9f1b0656782 100644
--- a/keyboards/alfredslab/swift65/hotswap/config.h
+++ b/keyboards/alfredslab/swift65/hotswap/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 22
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,4 +34,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/alfredslab/swift65/solder/config.h b/keyboards/alfredslab/swift65/solder/config.h
index ae3dc8c2e09..8acc73207e8 100644
--- a/keyboards/alfredslab/swift65/solder/config.h
+++ b/keyboards/alfredslab/swift65/solder/config.h
@@ -18,7 +18,6 @@
#pragma once
#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 14
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,4 +34,3 @@
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/alpha/config.h b/keyboards/alpha/config.h
index 0f104a2a5c3..5b87358a060 100755
--- a/keyboards/alpha/config.h
+++ b/keyboards/alpha/config.h
@@ -7,7 +7,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN F4
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -22,4 +21,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/amjkeyboard/amj60/config.h b/keyboards/amjkeyboard/amj60/config.h
index 0f15b431618..0d56015351a 100644
--- a/keyboards/amjkeyboard/amj60/config.h
+++ b/keyboards/amjkeyboard/amj60/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 8
# define RGBLIGHT_HUE_STEP 10
# define RGBLIGHT_SAT_STEP 17
@@ -35,7 +34,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/amjkeyboard/amj96/config.h b/keyboards/amjkeyboard/amj96/config.h
index 8511574b047..483ecc6888a 100644
--- a/keyboards/amjkeyboard/amj96/config.h
+++ b/keyboards/amjkeyboard/amj96/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see .
#define DIODE_DIRECTION COL2ROW
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 16
//# define RGBLIGHT_HUE_STEP 8
//# define RGBLIGHT_SAT_STEP 8
@@ -54,7 +53,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/aos/tkl/config.h b/keyboards/aos/tkl/config.h
index 84928fb9750..dd4a0cae4e5 100644
--- a/keyboards/aos/tkl/config.h
+++ b/keyboards/aos/tkl/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -39,4 +38,3 @@ along with this program. If not, see .
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
# define RGBLIGHT_LIMIT_VAL 50
-#endif
diff --git a/keyboards/atlantis/ak81_ve/config.h b/keyboards/atlantis/ak81_ve/config.h
index 9790c755565..4736c10f18a 100644
--- a/keyboards/atlantis/ak81_ve/config.h
+++ b/keyboards/atlantis/ak81_ve/config.h
@@ -27,7 +27,6 @@
#define FORCE_NKRO
#define RGB_DI_PIN B1
-#ifdef RGB_DI_PIN
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
@@ -80,5 +79,3 @@
#define ENABLE_RGB_MATRIX_MULTISPLASH // Full gradient & value pulse away from multiple key hits then fades value out
#define ENABLE_RGB_MATRIX_SOLID_SPLASH // Hue & value pulse away from a single key hit then fades value out
#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH // Hue & value pulse away from multiple key hits then fades value out
-
-#endif
\ No newline at end of file
diff --git a/keyboards/atxkb/1894/config.h b/keyboards/atxkb/1894/config.h
index 637150ae7b4..e52677c73fe 100644
--- a/keyboards/atxkb/1894/config.h
+++ b/keyboards/atxkb/1894/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 14
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/aves60/config.h b/keyboards/aves60/config.h
index fef8226df6b..ac972e67637 100644
--- a/keyboards/aves60/config.h
+++ b/keyboards/aves60/config.h
@@ -4,7 +4,6 @@
#pragma once
#define RGB_DI_PIN D5
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 9
//# define RGBLIGHT_HUE_STEP 8
//# define RGBLIGHT_SAT_STEP 8
@@ -22,7 +21,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/bioi/f60/config.h b/keyboards/bioi/f60/config.h
index 1df5ab51040..173d4ca15a0 100644
--- a/keyboards/bioi/f60/config.h
+++ b/keyboards/bioi/f60/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN B1
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 5
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -35,4 +34,3 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
-#endif
diff --git a/keyboards/blockboy/ac980mini/config.h b/keyboards/blockboy/ac980mini/config.h
index 66101c91f1c..6547097b7f9 100644
--- a/keyboards/blockboy/ac980mini/config.h
+++ b/keyboards/blockboy/ac980mini/config.h
@@ -7,7 +7,6 @@
#define RGB_DI_PIN B7
// The number of LEDs connected
#define RGB_MATRIX_LED_COUNT 81
-//#ifdef RGB_DI_PIN
# define RGBLED_NUM 81
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/bluebell/swoop/config.h b/keyboards/bluebell/swoop/config.h
index f46df6af822..6c9c0d59fdb 100644
--- a/keyboards/bluebell/swoop/config.h
+++ b/keyboards/bluebell/swoop/config.h
@@ -25,7 +25,6 @@
// RGB underglow and per key
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
@@ -39,4 +38,3 @@
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
#define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/bolsa/bolsalice/config.h b/keyboards/bolsa/bolsalice/config.h
index ce64cbe57fb..36236ad0f7b 100644
--- a/keyboards/bolsa/bolsalice/config.h
+++ b/keyboards/bolsa/bolsalice/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN B1
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -34,4 +33,3 @@
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
-#endif
diff --git a/keyboards/bpiphany/four_banger/config.h b/keyboards/bpiphany/four_banger/config.h
index 6bacff31f01..6eab475cf2c 100644
--- a/keyboards/bpiphany/four_banger/config.h
+++ b/keyboards/bpiphany/four_banger/config.h
@@ -7,7 +7,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -22,4 +21,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/buildakb/potato65/config.h b/keyboards/buildakb/potato65/config.h
index 7ed15ef362b..06de33c6bdf 100644
--- a/keyboards/buildakb/potato65/config.h
+++ b/keyboards/buildakb/potato65/config.h
@@ -39,7 +39,6 @@ along with this program. If not, see .
//#define NO_ACTION_ONESHOT
#define RGB_DI_PIN B1
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -56,4 +55,3 @@ along with this program. If not, see .
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 240
#define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/buildakb/potato65hs/config.h b/keyboards/buildakb/potato65hs/config.h
index dba700af6cd..8af6f102585 100644
--- a/keyboards/buildakb/potato65hs/config.h
+++ b/keyboards/buildakb/potato65hs/config.h
@@ -24,7 +24,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN D5
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -41,4 +40,3 @@ along with this program. If not, see .
# define RGBLIGHT_VAL_STEP 8
# define RGBLIGHT_LIMIT_VAL 240
# define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/buildakb/potato65s/config.h b/keyboards/buildakb/potato65s/config.h
index 53ad1077bb5..4f13c2c49e6 100644
--- a/keyboards/buildakb/potato65s/config.h
+++ b/keyboards/buildakb/potato65s/config.h
@@ -24,7 +24,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN D5
-#ifdef RGB_DI_PIN
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -41,4 +40,3 @@ along with this program. If not, see .
# define RGBLIGHT_VAL_STEP 8
# define RGBLIGHT_LIMIT_VAL 240
# define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/cablecardesigns/cypher/rev6/config.h b/keyboards/cablecardesigns/cypher/rev6/config.h
index 8b17e3e1992..139341bd7c7 100644
--- a/keyboards/cablecardesigns/cypher/rev6/config.h
+++ b/keyboards/cablecardesigns/cypher/rev6/config.h
@@ -8,7 +8,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN D5
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 3
#define RGBLIGHT_HUE_STEP 12
#define RGBLIGHT_SAT_STEP 25
@@ -25,4 +24,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/canary/canary60rgb/v1/config.h b/keyboards/canary/canary60rgb/v1/config.h
index 999ec9f1082..b2059647968 100644
--- a/keyboards/canary/canary60rgb/v1/config.h
+++ b/keyboards/canary/canary60rgb/v1/config.h
@@ -16,7 +16,6 @@
#pragma once
#define RGB_DI_PIN B6
-#ifdef RGB_DI_PIN
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -32,7 +31,6 @@
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
# define RGBLIGHT_SLEEP
-#endif
#ifdef RGB_MATRIX_ENABLE
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/cannonkeys/adelie/config.h b/keyboards/cannonkeys/adelie/config.h
index 59f438cfca8..2dd64009a50 100644
--- a/keyboards/cannonkeys/adelie/config.h
+++ b/keyboards/cannonkeys/adelie/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 3
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/capsunlocked/cu7/config.h b/keyboards/capsunlocked/cu7/config.h
index 067756faab4..22cec290b17 100644
--- a/keyboards/capsunlocked/cu7/config.h
+++ b/keyboards/capsunlocked/cu7/config.h
@@ -22,7 +22,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN F1
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -40,4 +39,3 @@ along with this program. If not, see .
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
#define RGBLIGHT_LIMIT_VAL 50
-#endif
diff --git a/keyboards/charue/sunsetter_r2/config.h b/keyboards/charue/sunsetter_r2/config.h
index e720d702d47..570020b306f 100644
--- a/keyboards/charue/sunsetter_r2/config.h
+++ b/keyboards/charue/sunsetter_r2/config.h
@@ -5,7 +5,6 @@
/* RGB */
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 10
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -17,7 +16,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/cherrybstudio/cb1800/config.h b/keyboards/cherrybstudio/cb1800/config.h
index fbd6d0e2fdd..e59d5b31016 100644
--- a/keyboards/cherrybstudio/cb1800/config.h
+++ b/keyboards/cherrybstudio/cb1800/config.h
@@ -14,7 +14,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -29,4 +28,3 @@ along with this program. If not, see .
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/cherrybstudio/cb65/config.h b/keyboards/cherrybstudio/cb65/config.h
index 6251ae58ef1..4f962bc935e 100644
--- a/keyboards/cherrybstudio/cb65/config.h
+++ b/keyboards/cherrybstudio/cb65/config.h
@@ -15,7 +15,6 @@ along with this program. If not, see .
/* RGB Lighting */
#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -30,4 +29,3 @@ along with this program. If not, see .
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/cherrybstudio/cb87/config.h b/keyboards/cherrybstudio/cb87/config.h
index 2d7e2722e55..c936f7b66ed 100644
--- a/keyboards/cherrybstudio/cb87/config.h
+++ b/keyboards/cherrybstudio/cb87/config.h
@@ -14,7 +14,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -29,4 +28,3 @@ along with this program. If not, see .
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/cherrybstudio/cb87v2/config.h b/keyboards/cherrybstudio/cb87v2/config.h
index 03549bc495b..6a8c94b70b8 100644
--- a/keyboards/cherrybstudio/cb87v2/config.h
+++ b/keyboards/cherrybstudio/cb87v2/config.h
@@ -14,7 +14,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -29,4 +28,3 @@ along with this program. If not, see .
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/chlx/str_merro60/config.h b/keyboards/chlx/str_merro60/config.h
index 5a54a2ab895..1836493d9f6 100644
--- a/keyboards/chlx/str_merro60/config.h
+++ b/keyboards/chlx/str_merro60/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -36,7 +35,6 @@ along with this program. If not, see .
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
# define RGBLIGHT_SLEEP
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/cmm_studio/fuji65/config.h b/keyboards/cmm_studio/fuji65/config.h
index 5cf553bca9b..140473a3670 100644
--- a/keyboards/cmm_studio/fuji65/config.h
+++ b/keyboards/cmm_studio/fuji65/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -33,7 +32,6 @@
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
-#endif
// generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/contra/keymaps/enigma/config.h b/keyboards/contra/keymaps/enigma/config.h
index 87f01998761..da3e8250b6a 100644
--- a/keyboards/contra/keymaps/enigma/config.h
+++ b/keyboards/contra/keymaps/enigma/config.h
@@ -17,11 +17,9 @@
#pragma once
#define RGB_DI_PIN F7
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
#define RGBLIGHT_EFFECT_SNAKE
#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
\ No newline at end of file
diff --git a/keyboards/coseyfannitutti/mullet/config.h b/keyboards/coseyfannitutti/mullet/config.h
index d56fccaf1f9..9dd86992c11 100644
--- a/keyboards/coseyfannitutti/mullet/config.h
+++ b/keyboards/coseyfannitutti/mullet/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D5
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -34,7 +33,6 @@ along with this program. If not, see .
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_SLEEP
-#endif
/*
* Feature disable options
diff --git a/keyboards/craftwalk/config.h b/keyboards/craftwalk/config.h
index 5b878f779e7..9e0f2cf8ff1 100644
--- a/keyboards/craftwalk/config.h
+++ b/keyboards/craftwalk/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 19
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/crazy_keyboard_68/config.h b/keyboards/crazy_keyboard_68/config.h
index 5298ea8a77d..1cc20d3daff 100644
--- a/keyboards/crazy_keyboard_68/config.h
+++ b/keyboards/crazy_keyboard_68/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN F6
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 84
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/creatkeebs/glacier/config.h b/keyboards/creatkeebs/glacier/config.h
index 76fcf3fa590..81016b23a03 100644
--- a/keyboards/creatkeebs/glacier/config.h
+++ b/keyboards/creatkeebs/glacier/config.h
@@ -21,20 +21,3 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/creatkeebs/thera/config.h b/keyboards/creatkeebs/thera/config.h
deleted file mode 100644
index 72e4f39e53b..00000000000
--- a/keyboards/creatkeebs/thera/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2022 Tim (https://github.com/Timliuzhaolu)
- *
- * 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 .
- */
-
-#pragma once
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
-
-
diff --git a/keyboards/delikeeb/flatbread60/config.h b/keyboards/delikeeb/flatbread60/config.h
index 5a33d5d9812..cdb8d46ac7a 100644
--- a/keyboards/delikeeb/flatbread60/config.h
+++ b/keyboards/delikeeb/flatbread60/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN F7
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 19
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -37,8 +36,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/delikeeb/vaguettelite/config.h b/keyboards/delikeeb/vaguettelite/config.h
index 4bf4e669c10..6237b13a80e 100644
--- a/keyboards/delikeeb/vaguettelite/config.h
+++ b/keyboards/delikeeb/vaguettelite/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 9
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -34,7 +33,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
// # define RGBLIGHT_EFFECT_RGB_TEST
// # define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/delikeeb/vanana/rev1/config.h b/keyboards/delikeeb/vanana/rev1/config.h
index fe6ada22ec6..232c6ef8617 100644
--- a/keyboards/delikeeb/vanana/rev1/config.h
+++ b/keyboards/delikeeb/vanana/rev1/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see .
#define B7_AUDIO
#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 16
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -36,7 +35,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
//# define RGBLIGHT_EFFECT_RGB_TEST
//# define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/delikeeb/vanana/rev2/config.h b/keyboards/delikeeb/vanana/rev2/config.h
index 2f93c2a7993..2103fdd52f1 100644
--- a/keyboards/delikeeb/vanana/rev2/config.h
+++ b/keyboards/delikeeb/vanana/rev2/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see .
#define B7_AUDIO
#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 16
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -36,7 +35,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
//# define RGBLIGHT_EFFECT_RGB_TEST
//# define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/delikeeb/waaffle/rev3/config.h b/keyboards/delikeeb/waaffle/rev3/config.h
index 2bdd2a4f2c2..6f51a0bbc79 100644
--- a/keyboards/delikeeb/waaffle/rev3/config.h
+++ b/keyboards/delikeeb/waaffle/rev3/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 10
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -34,7 +33,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
// # define RGBLIGHT_EFFECT_RGB_TEST
// # define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/demiurge/config.h b/keyboards/demiurge/config.h
index ab19a9a57ec..de0e50da217 100755
--- a/keyboards/demiurge/config.h
+++ b/keyboards/demiurge/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN F1
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 21
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -31,7 +30,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLIGHT_LIMIT_VAL 153
-#endif
/*
* Feature disable options
diff --git a/keyboards/draculad/config.h b/keyboards/draculad/config.h
index 13bc6fedfe7..f1794bef02a 100644
--- a/keyboards/draculad/config.h
+++ b/keyboards/draculad/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#endif
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
@@ -34,7 +33,6 @@ along with this program. If not, see .
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_SLEEP
-#endif
#define EE_HANDS
diff --git a/keyboards/draytronics/daisy/config.h b/keyboards/draytronics/daisy/config.h
index 6be876da3d5..fd32344d067 100644
--- a/keyboards/draytronics/daisy/config.h
+++ b/keyboards/draytronics/daisy/config.h
@@ -40,7 +40,6 @@ along with this program. If not, see .
//Underglow
#define RGB_DI_PIN D4 // Underglow led pin
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 4
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -58,4 +57,3 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/draytronics/elise/config.h b/keyboards/draytronics/elise/config.h
index 601a3befa87..4fc60e596ea 100644
--- a/keyboards/draytronics/elise/config.h
+++ b/keyboards/draytronics/elise/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see .
// ws2812 options
#define RGB_DI_PIN D1 // pin the DI on the ws2812 is hooked-up to
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 7
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -43,4 +42,3 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/draytronics/elise_v2/config.h b/keyboards/draytronics/elise_v2/config.h
index 2c590e67c62..c7b5965ae9d 100644
--- a/keyboards/draytronics/elise_v2/config.h
+++ b/keyboards/draytronics/elise_v2/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see .
// ws2812 options
#define RGB_DI_PIN D1 // pin the DI on the ws2812 is hooked-up to
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 16
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -43,4 +42,3 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/dz60/config.h b/keyboards/dz60/config.h
index 02029670029..9340d17a1ac 100644
--- a/keyboards/dz60/config.h
+++ b/keyboards/dz60/config.h
@@ -1,7 +1,6 @@
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -17,7 +16,6 @@
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
# define RGBLIGHT_SLEEP
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/dztech/bocc/config.h b/keyboards/dztech/bocc/config.h
index b6b02cd5ec3..53e997559cb 100644
--- a/keyboards/dztech/bocc/config.h
+++ b/keyboards/dztech/bocc/config.h
@@ -16,7 +16,6 @@
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -32,7 +31,6 @@
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
# define RGBLIGHT_SLEEP
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/dztech/duo_s/config.h b/keyboards/dztech/duo_s/config.h
index 419464662b1..0f6db721ce7 100644
--- a/keyboards/dztech/duo_s/config.h
+++ b/keyboards/dztech/duo_s/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN B15
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -35,7 +34,7 @@
#define RGBLIGHT_SAT_STEP 10
#define RGBLIGHT_VAL_STEP 10
#define RGBLIGHT_SLEEP
-#endif
+
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/dztech/endless80/config.h b/keyboards/dztech/endless80/config.h
index 2200253ff11..eca064ab960 100644
--- a/keyboards/dztech/endless80/config.h
+++ b/keyboards/dztech/endless80/config.h
@@ -16,7 +16,6 @@
#pragma once
#define RGB_DI_PIN F7
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -34,4 +33,3 @@
#define RGBLIGHT_SAT_STEP 10
#define RGBLIGHT_VAL_STEP 10
#define RGBLIGHT_LIMIT_VAL 130 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
-#endif
diff --git a/keyboards/ealdin/quadrant/config.h b/keyboards/ealdin/quadrant/config.h
index efeb89011c5..59b20b1110f 100644
--- a/keyboards/ealdin/quadrant/config.h
+++ b/keyboards/ealdin/quadrant/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 7
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/eek/config.h b/keyboards/eek/config.h
index 54d5cae5b67..73004cc2158 100644
--- a/keyboards/eek/config.h
+++ b/keyboards/eek/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 36
#define RGBLIGHT_HUE_STEP 4
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
- #endif
#ifdef RGB_MATRIX_ENABLE
#define RGB_MATRIX_LED_COUNT 36
diff --git a/keyboards/ein_60/config.h b/keyboards/ein_60/config.h
index 077a3d6efe1..d59cc7f724b 100644
--- a/keyboards/ein_60/config.h
+++ b/keyboards/ein_60/config.h
@@ -30,7 +30,6 @@ along with this program. If not, see .
#endif
#define RGB_DI_PIN E7
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 38
# define RGBLIGHT_HUE_STEP 4
# define RGBLIGHT_SAT_STEP 8
@@ -47,7 +46,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_LED_COUNT 38
diff --git a/keyboards/elephant42/config.h b/keyboards/elephant42/config.h
index 8aa3a46e8a0..0346bc6f745 100644
--- a/keyboards/elephant42/config.h
+++ b/keyboards/elephant42/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLED_SPLIT { 27, 27 }
# define RGBLED_NUM 54 // backlight x42 + underglow x12
# define RGBLIGHT_HUE_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
#ifdef RGB_MATRIX_ENABLE
# define SPLIT_TRANSPORT_MIRROR
diff --git a/keyboards/emi20/config.h b/keyboards/emi20/config.h
deleted file mode 100644
index 06a88a7240c..00000000000
--- a/keyboards/emi20/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2021 Aquacylinder
- *
- * 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 .
- */
-
-#pragma once
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/exclusive/e65/config.h b/keyboards/exclusive/e65/config.h
index 9ec802d8d41..9e6e361cfdb 100644
--- a/keyboards/exclusive/e65/config.h
+++ b/keyboards/exclusive/e65/config.h
@@ -23,7 +23,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -38,4 +37,3 @@
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/exclusive/e6v2/le/config.h b/keyboards/exclusive/e6v2/le/config.h
index 865d5e5ead1..7929919544a 100644
--- a/keyboards/exclusive/e6v2/le/config.h
+++ b/keyboards/exclusive/e6v2/le/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -33,4 +32,3 @@ along with this program. If not, see .
#define RGBLIGHT_HUE_STEP 12
#define RGBLIGHT_SAT_STEP 12
#define RGBLIGHT_VAL_STEP 12
-#endif
diff --git a/keyboards/exclusive/e6v2/oe/config.h b/keyboards/exclusive/e6v2/oe/config.h
index b7fd9fcff4d..027e59246d6 100644
--- a/keyboards/exclusive/e6v2/oe/config.h
+++ b/keyboards/exclusive/e6v2/oe/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -33,4 +32,3 @@ along with this program. If not, see .
#define RGBLIGHT_HUE_STEP 12
#define RGBLIGHT_SAT_STEP 12
#define RGBLIGHT_VAL_STEP 12
-#endif
diff --git a/keyboards/exclusive/e7v1/config.h b/keyboards/exclusive/e7v1/config.h
index 6d2de149314..d0eaefef13f 100644
--- a/keyboards/exclusive/e7v1/config.h
+++ b/keyboards/exclusive/e7v1/config.h
@@ -7,7 +7,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -22,4 +21,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/exclusive/e7v1se/config.h b/keyboards/exclusive/e7v1se/config.h
index 81c34a03b1e..0225067acb6 100644
--- a/keyboards/exclusive/e7v1se/config.h
+++ b/keyboards/exclusive/e7v1se/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 16
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/exclusive/e85/config.h b/keyboards/exclusive/e85/config.h
index 98d2fd86344..7558ddd8291 100644
--- a/keyboards/exclusive/e85/config.h
+++ b/keyboards/exclusive/e85/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 18
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/fc660c/keymaps/default_rgb/config.h b/keyboards/fc660c/keymaps/default_rgb/config.h
index 48a7a053cb4..592c6beca0a 100644
--- a/keyboards/fc660c/keymaps/default_rgb/config.h
+++ b/keyboards/fc660c/keymaps/default_rgb/config.h
@@ -21,7 +21,6 @@
/*RGB*/
/*Repurpose Insert LED */
#define RGB_DI_PIN B5
- #ifdef RGB_DI_PIN
#define RGBLED_NUM 16
#define RGBLIGHT_DEFAULT_HUE 127
#define RGBLIGHT_HUE_STEP 8
@@ -39,4 +38,3 @@
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
//#define RGBLIGHT_EFFECT_RGB_TEST
//#define RGBLIGHT_EFFECT_ALTERNATING
- #endif
diff --git a/keyboards/fc660c/keymaps/via_rgb/config.h b/keyboards/fc660c/keymaps/via_rgb/config.h
index 48a7a053cb4..592c6beca0a 100644
--- a/keyboards/fc660c/keymaps/via_rgb/config.h
+++ b/keyboards/fc660c/keymaps/via_rgb/config.h
@@ -21,7 +21,6 @@
/*RGB*/
/*Repurpose Insert LED */
#define RGB_DI_PIN B5
- #ifdef RGB_DI_PIN
#define RGBLED_NUM 16
#define RGBLIGHT_DEFAULT_HUE 127
#define RGBLIGHT_HUE_STEP 8
@@ -39,4 +38,3 @@
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
//#define RGBLIGHT_EFFECT_RGB_TEST
//#define RGBLIGHT_EFFECT_ALTERNATING
- #endif
diff --git a/keyboards/flehrad/numbrero/config.h b/keyboards/flehrad/numbrero/config.h
index c04d29e83bc..5f360813239 100644
--- a/keyboards/flehrad/numbrero/config.h
+++ b/keyboards/flehrad/numbrero/config.h
@@ -5,20 +5,3 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 5
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/flehrad/snagpad/config.h b/keyboards/flehrad/snagpad/config.h
index 56d04557a7e..57ae7860260 100644
--- a/keyboards/flehrad/snagpad/config.h
+++ b/keyboards/flehrad/snagpad/config.h
@@ -8,20 +8,3 @@
/* prevent stuck modifiers */
//#define STRICT_LAYER_RELEASE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/flehrad/tradestation/config.h b/keyboards/flehrad/tradestation/config.h
index bd178662c54..41dafc075d8 100644
--- a/keyboards/flehrad/tradestation/config.h
+++ b/keyboards/flehrad/tradestation/config.h
@@ -20,20 +20,3 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
- #define RGBLED_NUM 5
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/flx/virgo/config.h b/keyboards/flx/virgo/config.h
index fe61b1ada85..77888f89edf 100644
--- a/keyboards/flx/virgo/config.h
+++ b/keyboards/flx/virgo/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN B3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 0
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -34,4 +33,3 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
-#endif
diff --git a/keyboards/foxlab/key65/hotswap/config.h b/keyboards/foxlab/key65/hotswap/config.h
index 2ae5d9b328e..35adcaa8b91 100644
--- a/keyboards/foxlab/key65/hotswap/config.h
+++ b/keyboards/foxlab/key65/hotswap/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -34,7 +33,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/foxlab/key65/universal/config.h b/keyboards/foxlab/key65/universal/config.h
index 48e6e2484e5..6672972dc73 100644
--- a/keyboards/foxlab/key65/universal/config.h
+++ b/keyboards/foxlab/key65/universal/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -34,7 +33,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/foxlab/leaf60/hotswap/config.h b/keyboards/foxlab/leaf60/hotswap/config.h
index 61763990524..e5dbe79cf4c 100644
--- a/keyboards/foxlab/leaf60/hotswap/config.h
+++ b/keyboards/foxlab/leaf60/hotswap/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,8 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/foxlab/leaf60/universal/config.h b/keyboards/foxlab/leaf60/universal/config.h
index 9d4ebe73a20..e5dbe79cf4c 100644
--- a/keyboards/foxlab/leaf60/universal/config.h
+++ b/keyboards/foxlab/leaf60/universal/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -34,7 +33,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/foxlab/time_re/hotswap/config.h b/keyboards/foxlab/time_re/hotswap/config.h
index 9431d13f2ec..b444fee6118 100644
--- a/keyboards/foxlab/time_re/hotswap/config.h
+++ b/keyboards/foxlab/time_re/hotswap/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 5
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -36,4 +35,3 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/foxlab/time_re/universal/config.h b/keyboards/foxlab/time_re/universal/config.h
index 9431d13f2ec..b444fee6118 100644
--- a/keyboards/foxlab/time_re/universal/config.h
+++ b/keyboards/foxlab/time_re/universal/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 5
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -36,4 +35,3 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/fractal/config.h b/keyboards/fractal/config.h
index b44dfaac527..5f360813239 100755
--- a/keyboards/fractal/config.h
+++ b/keyboards/fractal/config.h
@@ -5,20 +5,3 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/ft/mars65/config.h b/keyboards/ft/mars65/config.h
index abc2e5cea2e..94c74252763 100644
--- a/keyboards/ft/mars65/config.h
+++ b/keyboards/ft/mars65/config.h
@@ -4,7 +4,6 @@
#pragma once
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 24
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -21,7 +20,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
// generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/gh60/v1p3/config.h b/keyboards/gh60/v1p3/config.h
index 53826075894..52fab19b7ea 100644
--- a/keyboards/gh60/v1p3/config.h
+++ b/keyboards/gh60/v1p3/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 10
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,4 +34,3 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/gh80_3000/config.h b/keyboards/gh80_3000/config.h
index b44dfaac527..5f360813239 100644
--- a/keyboards/gh80_3000/config.h
+++ b/keyboards/gh80_3000/config.h
@@ -5,20 +5,3 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/ghs/rar/config.h b/keyboards/ghs/rar/config.h
index ea09e835d02..efc9f5f3f5c 100644
--- a/keyboards/ghs/rar/config.h
+++ b/keyboards/ghs/rar/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D0
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 17
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -30,7 +29,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/gkeyboard/gkb_m16/config.h b/keyboards/gkeyboard/gkb_m16/config.h
index 036340f2fd0..7be3421eeba 100644
--- a/keyboards/gkeyboard/gkb_m16/config.h
+++ b/keyboards/gkeyboard/gkb_m16/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN F1
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 4
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/gray_studio/aero75/config.h b/keyboards/gray_studio/aero75/config.h
index 70ee32e0a36..932b2592882 100644
--- a/keyboards/gray_studio/aero75/config.h
+++ b/keyboards/gray_studio/aero75/config.h
@@ -6,7 +6,6 @@
#define RGB_DI_PIN B10
#define RGBLIGHT_LAYERS
#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 1
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -25,7 +24,6 @@
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/gray_studio/apollo80/config.h b/keyboards/gray_studio/apollo80/config.h
index ceab86fb297..0b9d6bc1c08 100644
--- a/keyboards/gray_studio/apollo80/config.h
+++ b/keyboards/gray_studio/apollo80/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 22
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -37,5 +36,3 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
-
diff --git a/keyboards/gray_studio/cod67/config.h b/keyboards/gray_studio/cod67/config.h
index ee5248471a8..fb5934be406 100644
--- a/keyboards/gray_studio/cod67/config.h
+++ b/keyboards/gray_studio/cod67/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN B2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 20
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/gray_studio/space65/config.h b/keyboards/gray_studio/space65/config.h
index 1b3e39536fc..26718866d0f 100644
--- a/keyboards/gray_studio/space65/config.h
+++ b/keyboards/gray_studio/space65/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/gray_studio/space65r3/config.h b/keyboards/gray_studio/space65r3/config.h
index 089bb27b174..c0a4304abed 100644
--- a/keyboards/gray_studio/space65r3/config.h
+++ b/keyboards/gray_studio/space65r3/config.h
@@ -5,7 +5,6 @@
#define RGB_DI_PIN B10
#define RGBLIGHT_LAYERS
#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 5
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -24,7 +23,6 @@
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/gray_studio/think65/hotswap/config.h b/keyboards/gray_studio/think65/hotswap/config.h
index 1934bc77ad1..354b981ec23 100644
--- a/keyboards/gray_studio/think65/hotswap/config.h
+++ b/keyboards/gray_studio/think65/hotswap/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 22
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
// generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/gray_studio/think65/solder/config.h b/keyboards/gray_studio/think65/solder/config.h
index 1934bc77ad1..354b981ec23 100644
--- a/keyboards/gray_studio/think65/solder/config.h
+++ b/keyboards/gray_studio/think65/solder/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 22
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
// generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/grid600/press/config.h b/keyboards/grid600/press/config.h
index 38cde33eec6..82d7c06c485 100644
--- a/keyboards/grid600/press/config.h
+++ b/keyboards/grid600/press/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN B6
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 4
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/halfcliff/config.h b/keyboards/halfcliff/config.h
index 07d53e4e499..d477fb01e86 100644
--- a/keyboards/halfcliff/config.h
+++ b/keyboards/halfcliff/config.h
@@ -26,7 +26,6 @@ along with this program. If not, see .
#define MATRIX_COL_PINS { B4, E6, C6, B6, B2 }
#define RGB_DI_PIN D3
- #ifdef RGB_DI_PIN
#define RGBLED_NUM 10
#define RGBLIGHT_SPLIT
#define RGBLED_SPLIT { 5, 5 }
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
- #endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/handwired/2x5keypad/config.h b/keyboards/handwired/2x5keypad/config.h
index 4b1dc39862c..819f0f640f5 100644
--- a/keyboards/handwired/2x5keypad/config.h
+++ b/keyboards/handwired/2x5keypad/config.h
@@ -8,20 +8,3 @@
/* Tap dancing params */
#define TAPPING_TERM 250
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/handwired/bento/rev1/config.h b/keyboards/handwired/bento/rev1/config.h
index 62c3144cc55..e23bcab2861 100644
--- a/keyboards/handwired/bento/rev1/config.h
+++ b/keyboards/handwired/bento/rev1/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 4
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -34,7 +33,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/handwired/consolekeyboard/18key/config.h b/keyboards/handwired/consolekeyboard/18key/config.h
index 800ed9d19a4..5ada7d8564b 100644
--- a/keyboards/handwired/consolekeyboard/18key/config.h
+++ b/keyboards/handwired/consolekeyboard/18key/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN F4
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -33,4 +32,3 @@
// #define RGBLIGHT_EFFECT_STATIC_GRADIENT
// #define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
diff --git a/keyboards/handwired/consolekeyboard/20key/config.h b/keyboards/handwired/consolekeyboard/20key/config.h
index 800ed9d19a4..5ada7d8564b 100644
--- a/keyboards/handwired/consolekeyboard/20key/config.h
+++ b/keyboards/handwired/consolekeyboard/20key/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN F4
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -33,4 +32,3 @@
// #define RGBLIGHT_EFFECT_STATIC_GRADIENT
// #define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
diff --git a/keyboards/handwired/consolekeyboard/27key/config.h b/keyboards/handwired/consolekeyboard/27key/config.h
index 800ed9d19a4..5ada7d8564b 100644
--- a/keyboards/handwired/consolekeyboard/27key/config.h
+++ b/keyboards/handwired/consolekeyboard/27key/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN F4
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -33,4 +32,3 @@
// #define RGBLIGHT_EFFECT_STATIC_GRADIENT
// #define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
diff --git a/keyboards/handwired/consolekeyboard/30key/config.h b/keyboards/handwired/consolekeyboard/30key/config.h
index 305448feec8..d08d7e3c1aa 100644
--- a/keyboards/handwired/consolekeyboard/30key/config.h
+++ b/keyboards/handwired/consolekeyboard/30key/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN F4
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -33,4 +32,3 @@
// #define RGBLIGHT_EFFECT_STATIC_GRADIENT
// #define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
diff --git a/keyboards/handwired/croxsplit44/config.h b/keyboards/handwired/croxsplit44/config.h
index be2926baf4a..ffb07b649fa 100644
--- a/keyboards/handwired/croxsplit44/config.h
+++ b/keyboards/handwired/croxsplit44/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN C4
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 42
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -34,5 +33,3 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-
-#endif
\ No newline at end of file
diff --git a/keyboards/handwired/heisenberg/config.h b/keyboards/handwired/heisenberg/config.h
index ced4a9b4e5e..345e1da87a1 100644
--- a/keyboards/handwired/heisenberg/config.h
+++ b/keyboards/handwired/heisenberg/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D4
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 6
// #define RGBLIGHT_HUE_STEP 8
// #define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/handwired/hexon38/config.h b/keyboards/handwired/hexon38/config.h
deleted file mode 100644
index 599f0016617..00000000000
--- a/keyboards/handwired/hexon38/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// see https://github.com/pepaslabs/hexon38
-
-#pragma once
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/handwired/jopr/config.h b/keyboards/handwired/jopr/config.h
index 00bbcf507d9..e12034a6b8c 100644
--- a/keyboards/handwired/jopr/config.h
+++ b/keyboards/handwired/jopr/config.h
@@ -9,10 +9,8 @@
#define NO_ACTION_ONESHOT
#define TAPPING_TOGGLE 3
-/*#define RGB_DI_PIN F4*/
-#ifdef RGB_DI_PIN
+#define RGB_DI_PIN F4
#define RGBLED_NUM 1
#define RGBLIGHT_HUE_STEP 1
#define RGBLIGHT_SAT_STEP 1
#define RGBLIGHT_VAL_STEP 1
-#endif
diff --git a/keyboards/handwired/macroboard/config.h b/keyboards/handwired/macroboard/config.h
index a3de56d0767..5da6e9ac533 100644
--- a/keyboards/handwired/macroboard/config.h
+++ b/keyboards/handwired/macroboard/config.h
@@ -26,7 +26,6 @@ along with this program. If not, see .
#define WS2812_PWM_TARGET_PERIOD 800000
#define RGBLIGHT_LED_MAP { 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 23, 21, 19, 17, 15, 13, 11, 9, 7, 5, 3, 1 }
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 24
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -42,7 +41,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
//# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/handwired/marauder/config.h b/keyboards/handwired/marauder/config.h
index 1d6272b3d49..6c9be12a17d 100644
--- a/keyboards/handwired/marauder/config.h
+++ b/keyboards/handwired/marauder/config.h
@@ -19,11 +19,9 @@
#define LAYER_STATE_8BIT
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 7
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
diff --git a/keyboards/handwired/owlet60/config.h b/keyboards/handwired/owlet60/config.h
index 9eff47d07e4..4cb293cf888 100644
--- a/keyboards/handwired/owlet60/config.h
+++ b/keyboards/handwired/owlet60/config.h
@@ -41,7 +41,6 @@ along with this program. If not, see .
#define DIODE_DIRECTION COL2ROW
#define RGB_DI_PIN D0
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -58,7 +57,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/*
* Feature disable options
diff --git a/keyboards/handwired/space_oddity/config.h b/keyboards/handwired/space_oddity/config.h
index 9a1e829e46e..400303c8b9e 100644
--- a/keyboards/handwired/space_oddity/config.h
+++ b/keyboards/handwired/space_oddity/config.h
@@ -12,20 +12,3 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/handwired/symmetry60/config.h b/keyboards/handwired/symmetry60/config.h
index 776749f54af..0f33d65386d 100644
--- a/keyboards/handwired/symmetry60/config.h
+++ b/keyboards/handwired/symmetry60/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN B1
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -33,7 +32,6 @@ along with this program. If not, see .
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/handwired/tennie/config.h b/keyboards/handwired/tennie/config.h
index b24f5b8c970..2f4d7d4ad81 100644
--- a/keyboards/handwired/tennie/config.h
+++ b/keyboards/handwired/tennie/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
#define RGBW
#define RGB_DI_PIN D1
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 1
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -36,7 +35,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/handwired/traveller/config.h b/keyboards/handwired/traveller/config.h
index 4c71623b244..c09d1503d90 100644
--- a/keyboards/handwired/traveller/config.h
+++ b/keyboards/handwired/traveller/config.h
@@ -18,14 +18,12 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN B2
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 1
# define RGBLIGHT_HUE_STEP 10
# define RGBLIGHT_SAT_STEP 17
# define RGBLIGHT_VAL_STEP 17
//# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
//# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
/*
* Feature disable options
diff --git a/keyboards/handwired/tsubasa/config.h b/keyboards/handwired/tsubasa/config.h
index 6bfe3355930..7f21279edfd 100644
--- a/keyboards/handwired/tsubasa/config.h
+++ b/keyboards/handwired/tsubasa/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
#define MASTER_RIGHT
#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 12
# define RGBLIGHT_SPLIT
# define RGBLED_SPLIT {6, 6}
@@ -30,7 +29,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#endif
#define SPLIT_WPM_ENABLE
#define SPLIT_LAYER_STATE_ENABLE
diff --git a/keyboards/hineybush/h08_ocelot/config.h b/keyboards/hineybush/h08_ocelot/config.h
index 27c2811e688..88fbf862974 100644
--- a/keyboards/hineybush/h08_ocelot/config.h
+++ b/keyboards/hineybush/h08_ocelot/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN F1
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 7
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/hineybush/h60/config.h b/keyboards/hineybush/h60/config.h
index c0365b76e71..27e25fba401 100644
--- a/keyboards/hineybush/h60/config.h
+++ b/keyboards/hineybush/h60/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN B0
- #ifdef RGB_DI_PIN
#define RGBLED_NUM 16
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -46,7 +45,6 @@ along with this program. If not, see .
// #define RGBLIGHT_EFFECT_STATIC_GRADIENT
// #define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
- #endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/hineybush/h65/config.h b/keyboards/hineybush/h65/config.h
index 49d4991b065..df9fd8dee62 100644
--- a/keyboards/hineybush/h65/config.h
+++ b/keyboards/hineybush/h65/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 17
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/hineybush/h65_hotswap/config.h b/keyboards/hineybush/h65_hotswap/config.h
index 49d4991b065..df9fd8dee62 100644
--- a/keyboards/hineybush/h65_hotswap/config.h
+++ b/keyboards/hineybush/h65_hotswap/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 17
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/hineybush/h660s/config.h b/keyboards/hineybush/h660s/config.h
index 707d202266d..f63efa630a0 100644
--- a/keyboards/hineybush/h660s/config.h
+++ b/keyboards/hineybush/h660s/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 16
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -34,7 +33,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/hineybush/h75_singa/config.h b/keyboards/hineybush/h75_singa/config.h
index 45e93b7ebdf..4581ff80f00 100644
--- a/keyboards/hineybush/h75_singa/config.h
+++ b/keyboards/hineybush/h75_singa/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN B3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 22
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
- #endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/hineybush/h87a/config.h b/keyboards/hineybush/h87a/config.h
index 652b910febc..cf128b70091 100644
--- a/keyboards/hineybush/h87a/config.h
+++ b/keyboards/hineybush/h87a/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -40,4 +39,3 @@ along with this program. If not, see .
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 200
#define RGBLIGHT_SLEEP // RGB will turn off when PC is put to sleep
-#endif
diff --git a/keyboards/hineybush/h88/config.h b/keyboards/hineybush/h88/config.h
index 3f579063776..bd734e33035 100644
--- a/keyboards/hineybush/h88/config.h
+++ b/keyboards/hineybush/h88/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -39,4 +38,3 @@ along with this program. If not, see .
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_SLEEP // RGB will turn off when PC is put to sleep
-#endif
diff --git a/keyboards/hineybush/hbcp/config.h b/keyboards/hineybush/hbcp/config.h
index e0eed7f4146..678eacc21c1 100644
--- a/keyboards/hineybush/hbcp/config.h
+++ b/keyboards/hineybush/hbcp/config.h
@@ -39,7 +39,6 @@ along with this program. If not, see .
//#define DIODE_DIRECTION EITHERWAY
#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 27
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -57,8 +56,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/hineybush/hineyg80/config.h b/keyboards/hineybush/hineyg80/config.h
index b44dfaac527..5f360813239 100644
--- a/keyboards/hineybush/hineyg80/config.h
+++ b/keyboards/hineybush/hineyg80/config.h
@@ -5,20 +5,3 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/hineybush/physix/config.h b/keyboards/hineybush/physix/config.h
index 77d8169cfef..d5d533c6272 100644
--- a/keyboards/hineybush/physix/config.h
+++ b/keyboards/hineybush/physix/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 26
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
- #endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/hineybush/sm68/config.h b/keyboards/hineybush/sm68/config.h
index 95d44f631d4..7fcccd170f0 100644
--- a/keyboards/hineybush/sm68/config.h
+++ b/keyboards/hineybush/sm68/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D0
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 16
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -34,7 +33,6 @@ along with this program. If not, see .
// #define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/hnahkb/vn66/config.h b/keyboards/hnahkb/vn66/config.h
index 6e62054150f..c489d1bb885 100644
--- a/keyboards/hnahkb/vn66/config.h
+++ b/keyboards/hnahkb/vn66/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 20
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/hub20/config.h b/keyboards/hub20/config.h
index c619b2d24d9..879d8b947fa 100644
--- a/keyboards/hub20/config.h
+++ b/keyboards/hub20/config.h
@@ -22,9 +22,7 @@ along with this program. If not, see .
#define RGBLED_NUM 27
#define RGB_MATRIX_LED_COUNT 27
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 27
-#endif
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/idobao/id61/config.h b/keyboards/idobao/id61/config.h
index d2a803a1e46..2824a91000c 100644
--- a/keyboards/idobao/id61/config.h
+++ b/keyboards/idobao/id61/config.h
@@ -11,7 +11,7 @@
#define RGB_DI_PIN F0
// RGB Matrix config
-#if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE)
+#if defined(RGB_MATRIX_ENABLE)
#ifndef ID61_DISABLE_UNDERGLOW
#define RGB_MATRIX_LED_COUNT 71
diff --git a/keyboards/idobao/id63/config.h b/keyboards/idobao/id63/config.h
index 13a40688226..f3a8c7a3e9d 100644
--- a/keyboards/idobao/id63/config.h
+++ b/keyboards/idobao/id63/config.h
@@ -13,7 +13,7 @@
#define RGB_DI_PIN B7
// RGB Matrix config
-#if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE)
+#if defined(RGB_MATRIX_ENABLE)
/* Denwir case is solid back. Please disable underglow at compile with compile command line:
*
diff --git a/keyboards/idobao/id75/v1/config.h b/keyboards/idobao/id75/v1/config.h
index 4f15181dfd9..21f3ca0cc85 100644
--- a/keyboards/idobao/id75/v1/config.h
+++ b/keyboards/idobao/id75/v1/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_CHRISTMAS
@@ -34,7 +33,6 @@ along with this program. If not, see .
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/idobao/id80/v2/config.h b/keyboards/idobao/id80/v2/config.h
index fc65958e3ee..34f8b57fa97 100644
--- a/keyboards/idobao/id80/v2/config.h
+++ b/keyboards/idobao/id80/v2/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 20 /* 16 underglow LEDs, 4 top LEDs */
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -36,4 +35,3 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_SNAKE
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/idobao/id80/v3/ansi/config.h b/keyboards/idobao/id80/v3/ansi/config.h
index bdabde07822..515f2d8cfa3 100644
--- a/keyboards/idobao/id80/v3/ansi/config.h
+++ b/keyboards/idobao/id80/v3/ansi/config.h
@@ -10,7 +10,7 @@
#define RGB_DI_PIN E2
// RGB Matrix config
-#if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE)
+#if defined(RGB_MATRIX_ENABLE)
#define RGB_MATRIX_LED_COUNT 94
diff --git a/keyboards/idobao/id87/v1/config.h b/keyboards/idobao/id87/v1/config.h
index 881174152c5..f856e51c829 100644
--- a/keyboards/idobao/id87/v1/config.h
+++ b/keyboards/idobao/id87/v1/config.h
@@ -15,7 +15,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_CHRISTMAS
@@ -31,4 +30,3 @@ along with this program. If not, see .
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/idobao/id96/config.h b/keyboards/idobao/id96/config.h
index 1d968410b1a..41471a4e975 100644
--- a/keyboards/idobao/id96/config.h
+++ b/keyboards/idobao/id96/config.h
@@ -25,7 +25,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -40,4 +39,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/idobao/montex/v1/config.h b/keyboards/idobao/montex/v1/config.h
index 0cb9bb1f19a..85cbcfcc147 100644
--- a/keyboards/idobao/montex/v1/config.h
+++ b/keyboards/idobao/montex/v1/config.h
@@ -23,7 +23,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN B1
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_CHRISTMAS
@@ -39,4 +38,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/idobao/montex/v1rgb/config.h b/keyboards/idobao/montex/v1rgb/config.h
index 4851844dad0..e405e2059f2 100755
--- a/keyboards/idobao/montex/v1rgb/config.h
+++ b/keyboards/idobao/montex/v1rgb/config.h
@@ -5,7 +5,7 @@
#define RGB_DI_PIN B1
-#if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE)
+#if defined(RGB_MATRIX_ENABLE)
// The number of LEDs connected
#define RGB_MATRIX_LED_COUNT 31
diff --git a/keyboards/idobao/montex/v2/config.h b/keyboards/idobao/montex/v2/config.h
index 47e51e92684..a7527d4bb77 100755
--- a/keyboards/idobao/montex/v2/config.h
+++ b/keyboards/idobao/montex/v2/config.h
@@ -7,7 +7,7 @@
/* LED Matrix & Animations */
#define RGB_DI_PIN B1
-#if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE)
+#if defined(RGB_MATRIX_ENABLE)
#ifndef ID27_DISABLE_UNDERGLOW
#define RGB_MATRIX_LED_COUNT 31 // The number of LEDs connected
#else
diff --git a/keyboards/irene/config.h b/keyboards/irene/config.h
index 9386d03e740..fb7a568062b 100644
--- a/keyboards/irene/config.h
+++ b/keyboards/irene/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN F1
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 23
//# define RGBLIGHT_HUE_STEP 8
//# define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/jacky_studio/bear_65/config.h b/keyboards/jacky_studio/bear_65/config.h
index cde00d1c4d1..2f282d4c30a 100644
--- a/keyboards/jacky_studio/bear_65/config.h
+++ b/keyboards/jacky_studio/bear_65/config.h
@@ -10,7 +10,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLIGHT_LIMIT_VAL 200
#define RGBLIGHT_DEFAULT_VAL 50
#define RGBLIGHT_EFFECT_BREATHING
@@ -29,5 +28,3 @@
#define RGBLIGHT_VAL_STEP 8
/* If defined, the RGB lighting will be switched off when the host goes to sleep */
#define RGBLIGHT_SLEEP
-
-#endif
diff --git a/keyboards/jacky_studio/s7_elephant/rev1/config.h b/keyboards/jacky_studio/s7_elephant/rev1/config.h
index 7b1324e3f33..fa1b0289398 100644
--- a/keyboards/jacky_studio/s7_elephant/rev1/config.h
+++ b/keyboards/jacky_studio/s7_elephant/rev1/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -33,7 +32,6 @@
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_SLEEP
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/jacky_studio/s7_elephant/rev2/config.h b/keyboards/jacky_studio/s7_elephant/rev2/config.h
index 1359eafc9a7..a14efa38cab 100644
--- a/keyboards/jacky_studio/s7_elephant/rev2/config.h
+++ b/keyboards/jacky_studio/s7_elephant/rev2/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -34,7 +33,6 @@
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif // RGB_DI_PIN
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/jc65/v32u4/config.h b/keyboards/jc65/v32u4/config.h
index 68e8005dece..56fe6574276 100644
--- a/keyboards/jc65/v32u4/config.h
+++ b/keyboards/jc65/v32u4/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -33,4 +32,3 @@ along with this program. If not, see .
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/jones/v03/config.h b/keyboards/jones/v03/config.h
index fc1ae1ff774..11ea425f18a 100644
--- a/keyboards/jones/v03/config.h
+++ b/keyboards/jones/v03/config.h
@@ -49,7 +49,6 @@ along with this program. If not, see .
#endif
#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 6 // Left(4) + Right(2)
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -69,7 +68,6 @@ along with this program. If not, see .
// #define RGBLIGHT_EFFECT_STATIC_GRADIENT
// #define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/*
* Feature disable options
diff --git a/keyboards/jones/v03_1/config.h b/keyboards/jones/v03_1/config.h
index 548b98e6757..fe7a5efa9eb 100644
--- a/keyboards/jones/v03_1/config.h
+++ b/keyboards/jones/v03_1/config.h
@@ -49,7 +49,6 @@ along with this program. If not, see .
#endif
#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 14 // Left(4) + Right(2) + Under(8)
#define RGBLIGHT_LED_MAP {0,1,2,3,13,12,4,5,6,7,8,9,10,11} // Left --> Right --> Under
#define RGBLIGHT_HUE_STEP 8
@@ -70,7 +69,6 @@ along with this program. If not, see .
// #define RGBLIGHT_EFFECT_STATIC_GRADIENT
// #define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/*
* Feature disable options
diff --git a/keyboards/jones/v1/config.h b/keyboards/jones/v1/config.h
index acf9a541b3d..c4707355dd3 100644
--- a/keyboards/jones/v1/config.h
+++ b/keyboards/jones/v1/config.h
@@ -26,7 +26,6 @@ along with this program. If not, see .
/* RGBLIGHT */
#define RGB_DI_PIN F1
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 4 // Left(2) + Right(2)
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
/*== Lighting Layers ==*/
#define RGBLIGHT_LAYERS
#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF // Overriding RGB Lighting on/off status
-#endif
/* External EEPROM */
// Use 24LC64 EEPROM
diff --git a/keyboards/jones/v1/keymaps/via/keymap.c b/keyboards/jones/v1/keymaps/via/keymap.c
index 31a182733a3..3304b137004 100644
--- a/keyboards/jones/v1/keymaps/via/keymap.c
+++ b/keyboards/jones/v1/keymaps/via/keymap.c
@@ -212,7 +212,6 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
//------------------------------------------------------------------------------
void keyboard_post_init_user(void) {
debug_enable=true;
-#ifdef RGB_DI_PIN
#ifdef RGBLIGHT_LAYERS
// Enable the LED layers.
rgblight_layers = my_rgb_layers;
@@ -220,6 +219,5 @@ debug_enable=true;
// prevent RGB light overrides layer indicator.
layer_state_set(default_layer_state);
#endif
-#endif
}
diff --git a/keyboards/kabedon/kabedon78s/config.h b/keyboards/kabedon/kabedon78s/config.h
index d3ff10faa3e..c9f64287301 100644
--- a/keyboards/kabedon/kabedon78s/config.h
+++ b/keyboards/kabedon/kabedon78s/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 20
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -34,4 +33,3 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/kabedon/kabedon980/config.h b/keyboards/kabedon/kabedon980/config.h
index 1fac2485f77..552a23568d8 100644
--- a/keyboards/kabedon/kabedon980/config.h
+++ b/keyboards/kabedon/kabedon980/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see .
#define DYNAMIC_KEYMAP_LAYER_COUNT 3
#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 20
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -36,4 +35,3 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/kagizaraya/halberd/config.h b/keyboards/kagizaraya/halberd/config.h
index 175c33a7f3f..f7bf067a741 100644
--- a/keyboards/kagizaraya/halberd/config.h
+++ b/keyboards/kagizaraya/halberd/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -32,7 +31,6 @@ along with this program. If not, see .
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kagizaraya/scythe/config.h b/keyboards/kagizaraya/scythe/config.h
index 81892324aaf..f581bee9a4d 100644
--- a/keyboards/kagizaraya/scythe/config.h
+++ b/keyboards/kagizaraya/scythe/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#define RGBLIGHT_SPLIT 1
#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -33,7 +32,6 @@ along with this program. If not, see .
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kakunpc/angel17/rev1/config.h b/keyboards/kakunpc/angel17/rev1/config.h
index 637881b9179..759a25915b1 100644
--- a/keyboards/kakunpc/angel17/rev1/config.h
+++ b/keyboards/kakunpc/angel17/rev1/config.h
@@ -18,14 +18,12 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 17
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kakunpc/angel64/alpha/config.h b/keyboards/kakunpc/angel64/alpha/config.h
index 39d8fcf0cd7..b8f4396d699 100644
--- a/keyboards/kakunpc/angel64/alpha/config.h
+++ b/keyboards/kakunpc/angel64/alpha/config.h
@@ -30,7 +30,6 @@ along with this program. If not, see .
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 64
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -47,7 +46,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kakunpc/angel64/rev1/config.h b/keyboards/kakunpc/angel64/rev1/config.h
index 39d8fcf0cd7..b8f4396d699 100644
--- a/keyboards/kakunpc/angel64/rev1/config.h
+++ b/keyboards/kakunpc/angel64/rev1/config.h
@@ -30,7 +30,6 @@ along with this program. If not, see .
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 64
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -47,7 +46,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kakunpc/business_card/alpha/config.h b/keyboards/kakunpc/business_card/alpha/config.h
index e96decbc875..9c35d57bcae 100644
--- a/keyboards/kakunpc/business_card/alpha/config.h
+++ b/keyboards/kakunpc/business_card/alpha/config.h
@@ -18,14 +18,12 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kakunpc/business_card/alpha/keymaps/default/config.h b/keyboards/kakunpc/business_card/alpha/keymaps/default/config.h
index ff2381020a6..dec4c0dd7bf 100644
--- a/keyboards/kakunpc/business_card/alpha/keymaps/default/config.h
+++ b/keyboards/kakunpc/business_card/alpha/keymaps/default/config.h
@@ -16,8 +16,6 @@
#pragma once
-// place overrides here
-#ifdef RGB_DI_PIN
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -28,4 +26,3 @@
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/kakunpc/business_card/beta/config.h b/keyboards/kakunpc/business_card/beta/config.h
index e96decbc875..9c35d57bcae 100644
--- a/keyboards/kakunpc/business_card/beta/config.h
+++ b/keyboards/kakunpc/business_card/beta/config.h
@@ -18,14 +18,12 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kakunpc/business_card/beta/keymaps/default/config.h b/keyboards/kakunpc/business_card/beta/keymaps/default/config.h
index fb0c1ab3a31..dec4c0dd7bf 100644
--- a/keyboards/kakunpc/business_card/beta/keymaps/default/config.h
+++ b/keyboards/kakunpc/business_card/beta/keymaps/default/config.h
@@ -16,9 +16,6 @@
#pragma once
-// place overrides here
-
-#ifdef RGB_DI_PIN
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -29,4 +26,3 @@
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/kakunpc/rabbit_capture_plan/config.h b/keyboards/kakunpc/rabbit_capture_plan/config.h
index 1f12a638e2f..9167b2345e7 100644
--- a/keyboards/kakunpc/rabbit_capture_plan/config.h
+++ b/keyboards/kakunpc/rabbit_capture_plan/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_SPLIT {32, 37}
# define RGBLED_NUM 69
# define RGBLIGHT_HUE_STEP 8
@@ -36,7 +35,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kakunpc/suihankey/alpha/config.h b/keyboards/kakunpc/suihankey/alpha/config.h
index ee45daecdb9..825d820ed69 100644
--- a/keyboards/kakunpc/suihankey/alpha/config.h
+++ b/keyboards/kakunpc/suihankey/alpha/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 18
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kakunpc/suihankey/rev1/config.h b/keyboards/kakunpc/suihankey/rev1/config.h
index ee45daecdb9..825d820ed69 100644
--- a/keyboards/kakunpc/suihankey/rev1/config.h
+++ b/keyboards/kakunpc/suihankey/rev1/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 18
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kakunpc/suihankey/split/alpha/config.h b/keyboards/kakunpc/suihankey/split/alpha/config.h
index dae056200b1..59d95deb8d1 100644
--- a/keyboards/kakunpc/suihankey/split/alpha/config.h
+++ b/keyboards/kakunpc/suihankey/split/alpha/config.h
@@ -22,14 +22,12 @@ along with this program. If not, see .
#define SPLIT_HAND_PIN D2
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 18
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kakunpc/suihankey/split/rev1/config.h b/keyboards/kakunpc/suihankey/split/rev1/config.h
index bb80874beda..b71d359f012 100644
--- a/keyboards/kakunpc/suihankey/split/rev1/config.h
+++ b/keyboards/kakunpc/suihankey/split/rev1/config.h
@@ -22,7 +22,6 @@ along with this program. If not, see .
#define SPLIT_HAND_PIN D2
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 18
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -39,7 +38,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kakunpc/thedogkeyboard/config.h b/keyboards/kakunpc/thedogkeyboard/config.h
index fe05231b6f4..4297ca3d0b7 100644
--- a/keyboards/kakunpc/thedogkeyboard/config.h
+++ b/keyboards/kakunpc/thedogkeyboard/config.h
@@ -36,14 +36,12 @@ along with this program. If not, see .
#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6 }
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 111
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 50 /* The maximum brightness level */
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kapcave/gskt00/keymaps/default-poly/config.h b/keyboards/kapcave/gskt00/keymaps/default-poly/config.h
index 2db5749cb56..8a23e16f198 100644
--- a/keyboards/kapcave/gskt00/keymaps/default-poly/config.h
+++ b/keyboards/kapcave/gskt00/keymaps/default-poly/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see .
#define ENCODERS_PAD_B { D3 }
#define RGB_DI_PIN D0
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -35,5 +34,3 @@ along with this program. If not, see .
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 12
-#endif
-
diff --git a/keyboards/kapcave/paladin64/config.h b/keyboards/kapcave/paladin64/config.h
index e5da8487201..3d22c45494f 100755
--- a/keyboards/kapcave/paladin64/config.h
+++ b/keyboards/kapcave/paladin64/config.h
@@ -79,7 +79,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN D0
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -94,4 +93,3 @@ along with this program. If not, see .
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 12
-#endif
diff --git a/keyboards/kapcave/paladinpad/rev1/config.h b/keyboards/kapcave/paladinpad/rev1/config.h
index 4fcbe6d6987..b2cfbb1057b 100644
--- a/keyboards/kapcave/paladinpad/rev1/config.h
+++ b/keyboards/kapcave/paladinpad/rev1/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#define RGB_DI_PIN D0
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -33,4 +32,3 @@ along with this program. If not, see .
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 12
-#endif
diff --git a/keyboards/kapcave/paladinpad/rev2/config.h b/keyboards/kapcave/paladinpad/rev2/config.h
index 8229921777e..35167881f9e 100644
--- a/keyboards/kapcave/paladinpad/rev2/config.h
+++ b/keyboards/kapcave/paladinpad/rev2/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see .
#define RGB_DI_PIN D0
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -35,5 +34,3 @@ along with this program. If not, see .
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 12
-#endif
-
diff --git a/keyboards/kb_elmo/isolation/config.h b/keyboards/kb_elmo/isolation/config.h
index 4aeb5eaa000..4cf7eed2cd3 100644
--- a/keyboards/kb_elmo/isolation/config.h
+++ b/keyboards/kb_elmo/isolation/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
/* RGB backlight */
#define RGB_DI_PIN B2
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 3
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -35,4 +34,3 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/kbdfans/bounce/75/hotswap/config.h b/keyboards/kbdfans/bounce/75/hotswap/config.h
index 15550775e25..0d43c4783d1 100644
--- a/keyboards/kbdfans/bounce/75/hotswap/config.h
+++ b/keyboards/kbdfans/bounce/75/hotswap/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -35,5 +34,5 @@
#define RGBLIGHT_SAT_STEP 10
#define RGBLIGHT_VAL_STEP 10
#define RGBLIGHT_SLEEP
-#endif
+
#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
\ No newline at end of file
diff --git a/keyboards/kbdfans/bounce/75/soldered/config.h b/keyboards/kbdfans/bounce/75/soldered/config.h
index 7448ffef3d6..ef5e9ca7829 100644
--- a/keyboards/kbdfans/bounce/75/soldered/config.h
+++ b/keyboards/kbdfans/bounce/75/soldered/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -35,5 +34,5 @@
#define RGBLIGHT_SAT_STEP 10
#define RGBLIGHT_VAL_STEP 10
#define RGBLIGHT_SLEEP
-#endif
+
#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
\ No newline at end of file
diff --git a/keyboards/kbdfans/kbd19x/config.h b/keyboards/kbdfans/kbd19x/config.h
index 27228e040bf..51aeb2bf035 100644
--- a/keyboards/kbdfans/kbd19x/config.h
+++ b/keyboards/kbdfans/kbd19x/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -34,7 +33,6 @@ along with this program. If not, see .
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_SLEEP
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kbdfans/kbd4x/config.h b/keyboards/kbdfans/kbd4x/config.h
index b1a70ae4091..2e644f4d60a 100644
--- a/keyboards/kbdfans/kbd4x/config.h
+++ b/keyboards/kbdfans/kbd4x/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -34,7 +33,6 @@ along with this program. If not, see .
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_SLEEP
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kbdfans/kbd67/hotswap/config.h b/keyboards/kbdfans/kbd67/hotswap/config.h
index 9ea1e9b842d..084f366ac35 100644
--- a/keyboards/kbdfans/kbd67/hotswap/config.h
+++ b/keyboards/kbdfans/kbd67/hotswap/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN B4
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -37,7 +36,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLIGHT_SLEEP
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kbdfans/kbd67/rev1/config.h b/keyboards/kbdfans/kbd67/rev1/config.h
index d0a39afdf2f..5ab0791004c 100644
--- a/keyboards/kbdfans/kbd67/rev1/config.h
+++ b/keyboards/kbdfans/kbd67/rev1/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 20
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -36,7 +35,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kbdfans/kbd67/rev2/config.h b/keyboards/kbdfans/kbd67/rev2/config.h
index 28ce0dd7072..4b631cf615b 100644
--- a/keyboards/kbdfans/kbd67/rev2/config.h
+++ b/keyboards/kbdfans/kbd67/rev2/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -35,4 +34,3 @@ along with this program. If not, see .
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 240
#define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/config.h b/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/config.h
index 234a44ae705..9a72f850308 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/config.h
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/config.h
@@ -11,6 +11,4 @@
#define RETRO_TAPPING
/* turn off RGB when computer sleeps */
-#ifdef RGB_DI_PIN
#define RGBLIGHT_SLEEP
-#endif
\ No newline at end of file
diff --git a/keyboards/kbdfans/kbd6x/config.h b/keyboards/kbdfans/kbd6x/config.h
index 917b37c2b78..30a1e61130f 100644
--- a/keyboards/kbdfans/kbd6x/config.h
+++ b/keyboards/kbdfans/kbd6x/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -34,7 +33,6 @@ along with this program. If not, see .
#define RGBLIGHT_SAT_STEP 12
#define RGBLIGHT_VAL_STEP 12
#define RGBLIGHT_SLEEP
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kbdfans/kbd75/config.h b/keyboards/kbdfans/kbd75/config.h
index 38211cdee58..f22102c3612 100644
--- a/keyboards/kbdfans/kbd75/config.h
+++ b/keyboards/kbdfans/kbd75/config.h
@@ -10,7 +10,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -27,5 +26,3 @@
#define RGBLIGHT_VAL_STEP 8
/* If defined, the RGB lighting will be switched off when the host goes to sleep */
#define RGBLIGHT_SLEEP
-
-#endif
diff --git a/keyboards/kbdfans/kbd75/keymaps/tucznak/config.h b/keyboards/kbdfans/kbd75/keymaps/tucznak/config.h
index f93cd66bfbc..e42b60811c8 100644
--- a/keyboards/kbdfans/kbd75/keymaps/tucznak/config.h
+++ b/keyboards/kbdfans/kbd75/keymaps/tucznak/config.h
@@ -11,9 +11,7 @@
#define RETRO_TAPPING
/* turn off RGB when computer sleeps */
-#ifdef RGB_DI_PIN
#define RGBLIGHT_SLEEP
-#endif
#ifdef BACKLIGHT_LEVELS
#undef BACKLIGHT_LEVELS
diff --git a/keyboards/kbdfans/kbd75hs/config.h b/keyboards/kbdfans/kbd75hs/config.h
index 10fc5ca8b5f..09990d1cfcc 100644
--- a/keyboards/kbdfans/kbd75hs/config.h
+++ b/keyboards/kbdfans/kbd75hs/config.h
@@ -19,7 +19,6 @@
#define FORCE_NKRO
#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -37,5 +36,5 @@
#define RGBLIGHT_SAT_STEP 10
#define RGBLIGHT_VAL_STEP 10
#define RGBLIGHT_SLEEP
-#endif
+
#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/kbdfans/kbd8x/config.h b/keyboards/kbdfans/kbd8x/config.h
index d98d6cb41d6..1f7a62b929e 100644
--- a/keyboards/kbdfans/kbd8x/config.h
+++ b/keyboards/kbdfans/kbd8x/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -34,7 +33,6 @@ along with this program. If not, see .
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_SLEEP
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kbdfans/kbd8x_mk2/config.h b/keyboards/kbdfans/kbd8x_mk2/config.h
index 556f2f82d4a..ae7eadad0df 100644
--- a/keyboards/kbdfans/kbd8x_mk2/config.h
+++ b/keyboards/kbdfans/kbd8x_mk2/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN B3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 20
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kbdfans/kbdpad/mk2/config.h b/keyboards/kbdfans/kbdpad/mk2/config.h
index a2a29bccf7d..5ea4fba8e27 100644
--- a/keyboards/kbdfans/kbdpad/mk2/config.h
+++ b/keyboards/kbdfans/kbdpad/mk2/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN B5
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 16
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kbdfans/niu_mini/config.h b/keyboards/kbdfans/niu_mini/config.h
index 70f86c6dbcd..616fc639afe 100644
--- a/keyboards/kbdfans/niu_mini/config.h
+++ b/keyboards/kbdfans/niu_mini/config.h
@@ -24,7 +24,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -39,7 +38,6 @@ along with this program. If not, see .
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
/*
* Feature disable options
diff --git a/keyboards/kbdfans/niu_mini/keymaps/tucznak/config.h b/keyboards/kbdfans/niu_mini/keymaps/tucznak/config.h
index cfcda1bf7db..437907759db 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/tucznak/config.h
+++ b/keyboards/kbdfans/niu_mini/keymaps/tucznak/config.h
@@ -7,9 +7,7 @@
#define PRODUCT "Qt3.14"
/* turn off RGB when computer sleeps */
-#ifdef RGB_DI_PIN
#define RGBLIGHT_SLEEP
-#endif
/* send tap key if no layer key was used even after tap delay */
#define TAPPING_TERM 50
diff --git a/keyboards/kbdfans/odin/soldered/config.h b/keyboards/kbdfans/odin/soldered/config.h
index 28cb2aba4bd..49c3ab92337 100644
--- a/keyboards/kbdfans/odin/soldered/config.h
+++ b/keyboards/kbdfans/odin/soldered/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN B15
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 4
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -35,5 +34,5 @@
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 180
#define RGBLIGHT_SLEEP
-#endif
+
#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/kbdfans/odin/v2/config.h b/keyboards/kbdfans/odin/v2/config.h
index 13a06b32090..d156ae51036 100644
--- a/keyboards/kbdfans/odin/v2/config.h
+++ b/keyboards/kbdfans/odin/v2/config.h
@@ -18,7 +18,6 @@
#define RGB_DI_PIN B15
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 4
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -34,4 +33,3 @@
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 180
#define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/kbdfans/phaseone/config.h b/keyboards/kbdfans/phaseone/config.h
index 825a7f5bbce..68fc32caaa3 100644
--- a/keyboards/kbdfans/phaseone/config.h
+++ b/keyboards/kbdfans/phaseone/config.h
@@ -21,7 +21,6 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN B6
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -39,5 +38,5 @@
#define RGBLIGHT_SAT_STEP 10
#define RGBLIGHT_VAL_STEP 10
#define RGBLIGHT_SLEEP
-#endif
+
#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
\ No newline at end of file
diff --git a/keyboards/kc60/config.h b/keyboards/kc60/config.h
index b30d0e92b80..eae2b0da6e9 100644
--- a/keyboards/kc60/config.h
+++ b/keyboards/kc60/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN F5
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 16
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/keebformom/config.h b/keyboards/keebformom/config.h
index 08547b17a71..190f88658fe 100644
--- a/keyboards/keebformom/config.h
+++ b/keyboards/keebformom/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN F4
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 40
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -27,7 +26,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#endif
/*
* Feature disable options
diff --git a/keyboards/keebio/bamfk1/config.h b/keyboards/keebio/bamfk1/config.h
index 590cce19c5c..901a26fe8dd 100644
--- a/keyboards/keebio/bamfk1/config.h
+++ b/keyboards/keebio/bamfk1/config.h
@@ -12,7 +12,6 @@
#define ENCODERS_CCW_KEY { { 0, 1 }, { 2, 1 } }
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 16
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -28,7 +27,6 @@
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
-#endif
#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/keebio/bamfk4/config.h b/keyboards/keebio/bamfk4/config.h
index 8ef3598f385..426bde52b1c 100644
--- a/keyboards/keebio/bamfk4/config.h
+++ b/keyboards/keebio/bamfk4/config.h
@@ -4,7 +4,6 @@
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 32
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -69,7 +68,6 @@
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_KEYPRESSES
//# endif
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/keebio/bdn9/rev1/config.h b/keyboards/keebio/bdn9/rev1/config.h
index fbd33490d62..22d76430059 100644
--- a/keyboards/keebio/bdn9/rev1/config.h
+++ b/keyboards/keebio/bdn9/rev1/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 4
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/keebio/bdn9/rev2/config.h b/keyboards/keebio/bdn9/rev2/config.h
index ee2065f176e..30c53e2f864 100644
--- a/keyboards/keebio/bdn9/rev2/config.h
+++ b/keyboards/keebio/bdn9/rev2/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see .
#define TAP_CODE_DELAY 10
#define RGB_DI_PIN B15
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 11
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -91,7 +90,6 @@ along with this program. If not, see .
# define ENABLE_RGB_MATRIX_SOLID_SPLASH
# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
# endif
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/keebio/chocopad/config.h b/keyboards/keebio/chocopad/config.h
index 213ffd79369..3dc169cf79f 100644
--- a/keyboards/keebio/chocopad/config.h
+++ b/keyboards/keebio/chocopad/config.h
@@ -6,7 +6,6 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -20,6 +19,5 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
#define RGB_DI_PIN D3
#define RGBLED_NUM 4
diff --git a/keyboards/keebio/dilly/config.h b/keyboards/keebio/dilly/config.h
index 1d2a07e38ad..1b80f5bfd1e 100644
--- a/keyboards/keebio/dilly/config.h
+++ b/keyboards/keebio/dilly/config.h
@@ -6,7 +6,6 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -20,7 +19,6 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
#define RGB_DI_PIN D3
#define RGBLED_NUM 10
diff --git a/keyboards/keebio/dsp40/rev1/config.h b/keyboards/keebio/dsp40/rev1/config.h
index 1b45aa5ed66..3f722a58012 100644
--- a/keyboards/keebio/dsp40/rev1/config.h
+++ b/keyboards/keebio/dsp40/rev1/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#define BACKLIGHT_PAL_MODE 1
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 4
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -40,7 +39,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/keebio/ergodicity/config.h b/keyboards/keebio/ergodicity/config.h
index 3d35f8b66c9..dd4726a35d8 100644
--- a/keyboards/keebio/ergodicity/config.h
+++ b/keyboards/keebio/ergodicity/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN B2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/keebio/iris/rev6/config.h b/keyboards/keebio/iris/rev6/config.h
index 98ed5187f3b..0ed1cb78ebc 100644
--- a/keyboards/keebio/iris/rev6/config.h
+++ b/keyboards/keebio/iris/rev6/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see .
/* ws2812 RGB LED */
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 68
# define RGBLED_SPLIT { 34, 34 }
# define RGBLIGHT_HUE_STEP 8
@@ -88,4 +87,3 @@ along with this program. If not, see .
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_KEYPRESSES
# endif
-#endif
diff --git a/keyboards/keebio/iris/rev6a/config.h b/keyboards/keebio/iris/rev6a/config.h
index 430abd2ef05..fe802cef2e0 100644
--- a/keyboards/keebio/iris/rev6a/config.h
+++ b/keyboards/keebio/iris/rev6a/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see .
/* ws2812 RGB LED */
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 68
# define RGBLED_SPLIT { 34, 34 }
# define RGBLIGHT_HUE_STEP 8
@@ -88,4 +87,3 @@ along with this program. If not, see .
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_KEYPRESSES
//# endif
-#endif
diff --git a/keyboards/keebio/iris/rev6b/config.h b/keyboards/keebio/iris/rev6b/config.h
index 430abd2ef05..fe802cef2e0 100644
--- a/keyboards/keebio/iris/rev6b/config.h
+++ b/keyboards/keebio/iris/rev6b/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see .
/* ws2812 RGB LED */
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 68
# define RGBLED_SPLIT { 34, 34 }
# define RGBLIGHT_HUE_STEP 8
@@ -88,4 +87,3 @@ along with this program. If not, see .
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_KEYPRESSES
//# endif
-#endif
diff --git a/keyboards/keebio/iris/rev7/config.h b/keyboards/keebio/iris/rev7/config.h
index e51677e6d2d..f7599e3e4d3 100644
--- a/keyboards/keebio/iris/rev7/config.h
+++ b/keyboards/keebio/iris/rev7/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see .
/* ws2812 RGB LED */
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 68
# define RGBLED_SPLIT { 34, 34 }
# define RGBLIGHT_HUE_STEP 8
@@ -88,5 +87,3 @@ along with this program. If not, see .
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_KEYPRESSES
//# endif
-#endif
-
diff --git a/keyboards/keebio/stick/config.h b/keyboards/keebio/stick/config.h
index c4b27e4324a..f8582148f94 100644
--- a/keyboards/keebio/stick/config.h
+++ b/keyboards/keebio/stick/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
/* WS2812 RGB LED */
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 12
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -88,6 +87,5 @@ along with this program. If not, see .
# define ENABLE_RGB_MATRIX_SOLID_SPLASH
# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
# endif
-#endif
#define TAPPING_TERM 200
diff --git a/keyboards/keebio/tukey/config.h b/keyboards/keebio/tukey/config.h
index b62aef8a099..e93b57b8e78 100644
--- a/keyboards/keebio/tukey/config.h
+++ b/keyboards/keebio/tukey/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,9 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-
-#endif
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/keebio/wtf60/config.h b/keyboards/keebio/wtf60/config.h
index 6d29b5bb9e3..34869d51076 100644
--- a/keyboards/keebio/wtf60/config.h
+++ b/keyboards/keebio/wtf60/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
#define AUDIO_PIN C6
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 16
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -36,7 +35,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/keebmonkey/kbmg68/config.h b/keyboards/keebmonkey/kbmg68/config.h
index 7ed31afbd20..23429413408 100644
--- a/keyboards/keebmonkey/kbmg68/config.h
+++ b/keyboards/keebmonkey/kbmg68/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 68
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -34,7 +33,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
// generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/keebwerk/nano_slider/config.h b/keyboards/keebwerk/nano_slider/config.h
index 7d84b547ad0..92023404ecc 100644
--- a/keyboards/keebwerk/nano_slider/config.h
+++ b/keyboards/keebwerk/nano_slider/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see .
#define SLIDER_PIN D4
#define RGB_DI_PIN F6
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 4
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -38,7 +37,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kegen/gboy/config.h b/keyboards/kegen/gboy/config.h
index ce174f57bb5..c34099cfa8b 100644
--- a/keyboards/kegen/gboy/config.h
+++ b/keyboards/kegen/gboy/config.h
@@ -18,7 +18,6 @@
#pragma once
#define RGB_DI_PIN D1
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -33,4 +32,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/keybage/radpad/config.h b/keyboards/keybage/radpad/config.h
index fb5f8a8f60b..e8a729c95f1 100644
--- a/keyboards/keybage/radpad/config.h
+++ b/keyboards/keybage/radpad/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN F4
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 16
#define RGBLIGHT_SLEEP
#define RGBLIGHT_EFFECT_BREATHING
@@ -31,7 +30,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* OLED Configuration */
#ifdef OLED_ENABLE
diff --git a/keyboards/keycapsss/o4l_5x12/config.h b/keyboards/keycapsss/o4l_5x12/config.h
index 8abe34ac3d3..fc78e6bb03f 100644
--- a/keyboards/keycapsss/o4l_5x12/config.h
+++ b/keyboards/keycapsss/o4l_5x12/config.h
@@ -1,7 +1,6 @@
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 12
# define RGBLIGHT_HUE_STEP 4
# define RGBLIGHT_SAT_STEP 4
@@ -18,7 +17,6 @@
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/keyhive/absinthe/config.h b/keyboards/keyhive/absinthe/config.h
index f33378524b7..ded3dc8236a 100644
--- a/keyboards/keyhive/absinthe/config.h
+++ b/keyboards/keyhive/absinthe/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 32
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -34,7 +33,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
// #define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/keyhive/smallice/config.h b/keyboards/keyhive/smallice/config.h
index 450f0806841..a770d8e47d5 100644
--- a/keyboards/keyhive/smallice/config.h
+++ b/keyboards/keyhive/smallice/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 12
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -35,4 +34,3 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/keyhive/southpole/config.h b/keyboards/keyhive/southpole/config.h
index b44dfaac527..5f360813239 100644
--- a/keyboards/keyhive/southpole/config.h
+++ b/keyboards/keyhive/southpole/config.h
@@ -5,20 +5,3 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/keyhive/ut472/config.h b/keyboards/keyhive/ut472/config.h
index e96f645d6a5..c007f92fe7a 100644
--- a/keyboards/keyhive/ut472/config.h
+++ b/keyboards/keyhive/ut472/config.h
@@ -22,7 +22,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN C6
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -37,4 +36,3 @@ along with this program. If not, see .
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/keystonecaps/gameroyadvance/config.h b/keyboards/keystonecaps/gameroyadvance/config.h
index ccd1b1da6c9..20abd283ee0 100644
--- a/keyboards/keystonecaps/gameroyadvance/config.h
+++ b/keyboards/keystonecaps/gameroyadvance/config.h
@@ -24,7 +24,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -39,4 +38,3 @@ along with this program. If not, see .
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h b/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h
index 41bba326c43..a8da1ae0728 100644
--- a/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h
+++ b/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h
@@ -2,7 +2,6 @@
#define RGBLED_NUM 16
#define RGB_DI_PIN F4
-#ifdef RGB_DI_PIN
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
@@ -16,4 +15,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/kiwikey/borderland/config.h b/keyboards/kiwikey/borderland/config.h
index 08467cfd148..92436e41fbd 100644
--- a/keyboards/kiwikey/borderland/config.h
+++ b/keyboards/kiwikey/borderland/config.h
@@ -6,7 +6,6 @@
#define TAP_CODE_DELAY 10
#define RGB_DI_PIN B2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 18
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -23,7 +22,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kopibeng/mnk88/config.h b/keyboards/kopibeng/mnk88/config.h
index f2b51fa065a..45ad8961c68 100644
--- a/keyboards/kopibeng/mnk88/config.h
+++ b/keyboards/kopibeng/mnk88/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN A10
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 20
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -33,7 +32,6 @@
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kopibeng/xt60/config.h b/keyboards/kopibeng/xt60/config.h
index 6163c3555d8..269ad00f60e 100644
--- a/keyboards/kopibeng/xt60/config.h
+++ b/keyboards/kopibeng/xt60/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN F6
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 14
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -33,7 +32,6 @@
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kopibeng/xt60_singa/config.h b/keyboards/kopibeng/xt60_singa/config.h
index 6163c3555d8..269ad00f60e 100644
--- a/keyboards/kopibeng/xt60_singa/config.h
+++ b/keyboards/kopibeng/xt60_singa/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN F6
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 14
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -33,7 +32,6 @@
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kopibeng/xt65/config.h b/keyboards/kopibeng/xt65/config.h
index 04a7030393e..9e5acfa2e07 100644
--- a/keyboards/kopibeng/xt65/config.h
+++ b/keyboards/kopibeng/xt65/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN D5
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -34,7 +33,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kopibeng/xt8x/config.h b/keyboards/kopibeng/xt8x/config.h
index 053c826450f..4210713a65c 100644
--- a/keyboards/kopibeng/xt8x/config.h
+++ b/keyboards/kopibeng/xt8x/config.h
@@ -19,7 +19,6 @@
#define INDICATOR_PIN_0 B13
#define RGB_DI_PIN A10
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 19
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kprepublic/bm16s/config.h b/keyboards/kprepublic/bm16s/config.h
index c629c8721ab..26be1e81872 100755
--- a/keyboards/kprepublic/bm16s/config.h
+++ b/keyboards/kprepublic/bm16s/config.h
@@ -7,7 +7,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -22,4 +21,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/kprepublic/bm40hsrgb/config.h b/keyboards/kprepublic/bm40hsrgb/config.h
index 2e4942bf63f..60324e48b15 100755
--- a/keyboards/kprepublic/bm40hsrgb/config.h
+++ b/keyboards/kprepublic/bm40hsrgb/config.h
@@ -23,10 +23,8 @@
#define RGB_DI_PIN E2
#define RGB_MATRIX_LED_COUNT 53
-#ifdef RGB_DI_PIN
# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
# define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value
-#endif
#ifdef RGB_MATRIX_ENABLE
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
diff --git a/keyboards/kprepublic/bm43a/config.h b/keyboards/kprepublic/bm43a/config.h
index fd6a1a08064..fc549b862d3 100644
--- a/keyboards/kprepublic/bm43a/config.h
+++ b/keyboards/kprepublic/bm43a/config.h
@@ -18,14 +18,12 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 10
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
#endif
diff --git a/keyboards/kprepublic/bm43hsrgb/config.h b/keyboards/kprepublic/bm43hsrgb/config.h
index c19ed0598bd..151488c5169 100755
--- a/keyboards/kprepublic/bm43hsrgb/config.h
+++ b/keyboards/kprepublic/bm43hsrgb/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 53
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,4 +34,3 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
-#endif
diff --git a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h
index 50c75ee7f6a..6f98093e33a 100755
--- a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h
+++ b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
#define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_WINDOWS, UNICODE_MODE_LINUX, UNICODE_MODE_MACOS
#define UNICODE_CYCLE_PERSIST false
-#ifdef RGB_DI_PIN
#undef RGBLIGHT_EFFECT_BREATHING
#undef RGBLIGHT_EFFECT_RAINBOW_MOOD
#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -30,4 +29,3 @@ along with this program. If not, see .
#undef RGBLIGHT_EFFECT_RGB_TEST
#undef RGBLIGHT_EFFECT_ALTERNATING
#undef RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/config.h b/keyboards/kprepublic/bm60hsrgb/rev1/config.h
index c46ccd05a6a..df94a6d357b 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb/rev1/config.h
@@ -19,11 +19,9 @@ along with this program. If not, see .
#define RGB_DI_PIN E2
#define RGB_MATRIX_LED_COUNT 69
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 69
# define RGB_MATRIX_KEYPRESSES
# define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value
-#endif
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
// RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h
index 242d2dfffd2..bf7208c547a 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h
@@ -18,7 +18,6 @@
#define RGB_DI_PIN E2
#define RGB_MATRIX_LED_COUNT 69
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 69
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 140
@@ -65,5 +64,3 @@
#define ENABLE_RGB_MATRIX_MULTISPLASH
#define ENABLE_RGB_MATRIX_SOLID_SPLASH
#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#endif
-
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h
index 18b28b75602..bbfeb14e39d 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
#define RGB_DI_PIN E2
#define RGB_MATRIX_LED_COUNT 70
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 70
# define RGB_MATRIX_KEYPRESSES
// #define RGBLIGHT_HUE_STEP 8
@@ -27,7 +26,6 @@ along with this program. If not, see .
// #define RGBLIGHT_VAL_STEP 8
# define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value
// #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
// RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h
index 31751e62146..5382f10e8c8 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
#define RGB_DI_PIN E2
#define RGB_MATRIX_LED_COUNT 67
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 67
#define RGB_MATRIX_KEYPRESSES
#define RGBLIGHT_HUE_STEP 8
@@ -37,7 +36,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
// RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/config.h b/keyboards/kprepublic/bm65hsrgb/rev1/config.h
index 8ed57405b53..9bd8375e25e 100644
--- a/keyboards/kprepublic/bm65hsrgb/rev1/config.h
+++ b/keyboards/kprepublic/bm65hsrgb/rev1/config.h
@@ -21,10 +21,8 @@ along with this program. If not, see .
#define RGB_DI_PIN E2
// The number of LEDs connected
#define RGB_MATRIX_LED_COUNT 73
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 73
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h b/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h
index 7712c86201a..501e7d6a52a 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#define RGB_DI_PIN E2
#define RGB_MATRIX_LED_COUNT 74
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 74
#define RGB_MATRIX_KEYPRESSES
#define RGBLIGHT_HUE_STEP 8
@@ -92,4 +91,3 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
-#endif
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/config.h b/keyboards/kprepublic/bm68hsrgb/rev1/config.h
index b0266a13070..ee7d425a76a 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/config.h
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/config.h
@@ -21,11 +21,9 @@ along with this program. If not, see .
#define RGB_DI_PIN E2
// The number of LEDs connected
#define RGB_MATRIX_LED_COUNT 74
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 74
# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
# define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value
-#endif
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
// RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/kprepublic/bm80hsrgb/config.h b/keyboards/kprepublic/bm80hsrgb/config.h
index 0e1861574a1..8ae02d0c63c 100644
--- a/keyboards/kprepublic/bm80hsrgb/config.h
+++ b/keyboards/kprepublic/bm80hsrgb/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see .
// The number of LEDs connected
#define RGB_MATRIX_LED_COUNT 87
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 87
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
//#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
@@ -85,10 +84,6 @@ along with this program. If not, see .
// # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
// does not work for some reason, might revisit
-
-
-#endif
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/kprepublic/bm980hsrgb/config.h b/keyboards/kprepublic/bm980hsrgb/config.h
index 73cb52e6f8e..fa4093651f6 100644
--- a/keyboards/kprepublic/bm980hsrgb/config.h
+++ b/keyboards/kprepublic/bm980hsrgb/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see .
// The number of LEDs connected
#define RGB_MATRIX_LED_COUNT 98
-//#ifdef RGB_DI_PIN
# define RGBLED_NUM 98
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
//#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
diff --git a/keyboards/kprepublic/cospad/config.h b/keyboards/kprepublic/cospad/config.h
index a28b6c8c1f4..250391e5e02 100644
--- a/keyboards/kprepublic/cospad/config.h
+++ b/keyboards/kprepublic/cospad/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN F6
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 4
// #define RGBLIGHT_HUE_STEP 8
// #define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/ktec/daisy/config.h b/keyboards/ktec/daisy/config.h
index 3e49bfe194b..716b36a6e84 100644
--- a/keyboards/ktec/daisy/config.h
+++ b/keyboards/ktec/daisy/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 8
# define RGBLIGHT_HUE_STEP 12
# define RGBLIGHT_SAT_STEP 25
@@ -35,7 +34,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kwub/bloop/config.h b/keyboards/kwub/bloop/config.h
index 700e8856586..87dc81c24d5 100644
--- a/keyboards/kwub/bloop/config.h
+++ b/keyboards/kwub/bloop/config.h
@@ -21,20 +21,3 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-# define RGBLIGHT_EFFECT_BREATHING
-# define RGBLIGHT_EFFECT_RAINBOW_MOOD
-# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-# define RGBLIGHT_EFFECT_SNAKE
-# define RGBLIGHT_EFFECT_KNIGHT
-# define RGBLIGHT_EFFECT_CHRISTMAS
-# define RGBLIGHT_EFFECT_STATIC_GRADIENT
-# define RGBLIGHT_EFFECT_RGB_TEST
-# define RGBLIGHT_EFFECT_ALTERNATING
-# define RGBLIGHT_EFFECT_TWINKLE
-# define RGBLED_NUM 0
-# define RGBLIGHT_HUE_STEP 8
-# define RGBLIGHT_SAT_STEP 8
-# define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/latincompass/latin17rgb/config.h b/keyboards/latincompass/latin17rgb/config.h
index 5bbd2a8d237..ac78eb63304 100644
--- a/keyboards/latincompass/latin17rgb/config.h
+++ b/keyboards/latincompass/latin17rgb/config.h
@@ -86,7 +86,6 @@
#endif
#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -102,4 +101,3 @@
#define RGBLIGHT_SAT_STEP 5
#define RGBLIGHT_VAL_STEP 5
#define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/latincompass/latin47ble/config.h b/keyboards/latincompass/latin47ble/config.h
index a81c2f86ba8..13c9d76aa1d 100644
--- a/keyboards/latincompass/latin47ble/config.h
+++ b/keyboards/latincompass/latin47ble/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 3
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -34,7 +33,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
#define TAPPING_TERM 250
diff --git a/keyboards/lazydesigners/bolt/config.h b/keyboards/lazydesigners/bolt/config.h
index e5f50f6c287..53f60d653f4 100644
--- a/keyboards/lazydesigners/bolt/config.h
+++ b/keyboards/lazydesigners/bolt/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
/* RBG underglow */
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -35,4 +34,3 @@ along with this program. If not, see .
/* #define RGBLIGHT_HUE_STEP 8 */
/* #define RGBLIGHT_SAT_STEP 8 */
/* #define RGBLIGHT_VAL_STEP 8 */
-#endif
diff --git a/keyboards/lazydesigners/cassette8/config.h b/keyboards/lazydesigners/cassette8/config.h
index c7e4f41f748..467bd227357 100755
--- a/keyboards/lazydesigners/cassette8/config.h
+++ b/keyboards/lazydesigners/cassette8/config.h
@@ -18,7 +18,6 @@
/* RBG underglow */
#define RGB_DI_PIN C2
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -34,5 +33,3 @@
/* #define RGBLIGHT_HUE_STEP 8 */
/* #define RGBLIGHT_SAT_STEP 8 */
/* #define RGBLIGHT_VAL_STEP 8 */
-#endif
-
diff --git a/keyboards/lazydesigners/dimple/config.h b/keyboards/lazydesigners/dimple/config.h
index d35dbea6cef..4f129374cd5 100644
--- a/keyboards/lazydesigners/dimple/config.h
+++ b/keyboards/lazydesigners/dimple/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see .
/* RBG underglow */
#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -41,4 +40,3 @@ along with this program. If not, see .
/* #define RGBLIGHT_HUE_STEP 8 */
/* #define RGBLIGHT_SAT_STEP 8 */
/* #define RGBLIGHT_VAL_STEP 8 */
-#endif
diff --git a/keyboards/lazydesigners/dimpleplus/config.h b/keyboards/lazydesigners/dimpleplus/config.h
index 25b86175b76..d5722dd113b 100644
--- a/keyboards/lazydesigners/dimpleplus/config.h
+++ b/keyboards/lazydesigners/dimpleplus/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
/* RBG underglow */
#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -35,4 +34,3 @@ along with this program. If not, see .
/* #define RGBLIGHT_HUE_STEP 8 */
/* #define RGBLIGHT_SAT_STEP 8 */
/* #define RGBLIGHT_VAL_STEP 8 */
-#endif
diff --git a/keyboards/lazydesigners/the40/config.h b/keyboards/lazydesigners/the40/config.h
index 65b240df1e4..c2a827ca3e3 100644
--- a/keyboards/lazydesigners/the40/config.h
+++ b/keyboards/lazydesigners/the40/config.h
@@ -18,7 +18,6 @@
#pragma once
#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -34,4 +33,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/lazydesigners/the50/config.h b/keyboards/lazydesigners/the50/config.h
index 5e0e04031ac..b69bb222b68 100644
--- a/keyboards/lazydesigners/the50/config.h
+++ b/keyboards/lazydesigners/the50/config.h
@@ -7,7 +7,5 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 1
#define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/lazydesigners/the60/rev2/config.h b/keyboards/lazydesigners/the60/rev2/config.h
index 2c39a1e0476..41dc029181a 100755
--- a/keyboards/lazydesigners/the60/rev2/config.h
+++ b/keyboards/lazydesigners/the60/rev2/config.h
@@ -18,7 +18,6 @@
#pragma once
#define RGB_DI_PIN D1
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 10
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -34,4 +33,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/lfkeyboards/lfk78/config.h b/keyboards/lfkeyboards/lfk78/config.h
index e71fd362735..021f1876380 100644
--- a/keyboards/lfkeyboards/lfk78/config.h
+++ b/keyboards/lfkeyboards/lfk78/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see .
#define AUDIO_VOICES
#define RGB_DI_PIN C7 // Have to set it to something to get the ws2812 code to compile
-#ifdef RGB_DI_PIN
# define RGBLIGHT_HUE_STEP 10
# define RGBLIGHT_SAT_STEP 17
# define RGBLIGHT_VAL_STEP 17
@@ -40,8 +39,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/lfkeyboards/lfkpad/config.h b/keyboards/lfkeyboards/lfkpad/config.h
index 4db1c623ce6..80bfbee9d17 100644
--- a/keyboards/lfkeyboards/lfkpad/config.h
+++ b/keyboards/lfkeyboards/lfkpad/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN C7 // Have to set it to something to get the ws2812 code to compile
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 28
# define RGBLIGHT_HUE_STEP 10
# define RGBLIGHT_SAT_STEP 17
@@ -34,8 +33,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
-
#define TAPPING_TERM 200
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/lm_keyboard/lm60n/config.h b/keyboards/lm_keyboard/lm60n/config.h
index edbcf0fd480..50b7e405d2b 100644
--- a/keyboards/lm_keyboard/lm60n/config.h
+++ b/keyboards/lm_keyboard/lm60n/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 41
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/longnald/corin/config.h b/keyboards/longnald/corin/config.h
index 4786eed6afe..7ad280d7636 100644
--- a/keyboards/longnald/corin/config.h
+++ b/keyboards/longnald/corin/config.h
@@ -19,7 +19,6 @@
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 64
# define RGBLIGHT_HUE_STEP 20
# define RGBLIGHT_SAT_STEP 20
@@ -30,4 +29,3 @@
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
# define RGBLIGHT_EFFECT_SNAKE
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#endif
diff --git a/keyboards/makrosu/config.h b/keyboards/makrosu/config.h
index 98108cce785..64f4553f903 100644
--- a/keyboards/makrosu/config.h
+++ b/keyboards/makrosu/config.h
@@ -23,25 +23,3 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-
-
-// EEPROM usage
-
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/manta60/config.h b/keyboards/manta60/config.h
index 9051dd7f4e7..d7722de7c25 100644
--- a/keyboards/manta60/config.h
+++ b/keyboards/manta60/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see .
#define SELECT_SOFT_SERIAL_SPEED 1
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 68
# define RGBLIGHT_SPLIT
# define RGBLED_SPLIT { 34, 34 }
@@ -44,7 +43,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
#if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
# define USB_MAX_POWER_CONSUMPTION 400
diff --git a/keyboards/maple_computing/launchpad/keymaps/brandonschlack/config.h b/keyboards/maple_computing/launchpad/keymaps/brandonschlack/config.h
index 6aaf996e57a..b68a1ee51e8 100644
--- a/keyboards/maple_computing/launchpad/keymaps/brandonschlack/config.h
+++ b/keyboards/maple_computing/launchpad/keymaps/brandonschlack/config.h
@@ -16,12 +16,10 @@
#pragma once
/* Underlight Configuration */
-#ifdef RGB_DI_PIN
#undef RGB_DI_PIN
#define RGB_DI_PIN F4
#undef RGBLED_NUM
#define RGBLED_NUM 2 // Number of LEDs
-#endif
#define RGBLIGHT_EFFECT_BREATHING // Only have Breathing Animation
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/marksard/leftover30/config.h b/keyboards/marksard/leftover30/config.h
index 9a15aa3826e..81456d8caac 100644
--- a/keyboards/marksard/leftover30/config.h
+++ b/keyboards/marksard/leftover30/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/marksard/rhymestone/rev1/config.h b/keyboards/marksard/rhymestone/rev1/config.h
index b832cd5ce33..e8d681ff7fc 100644
--- a/keyboards/marksard/rhymestone/rev1/config.h
+++ b/keyboards/marksard/rhymestone/rev1/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see .
#define RGB_DI_PIN D3
#ifdef RGBLIGHT_ENABLE
-// #ifdef RGB_DI_PIN
#define RGBLED_NUM 40
#define RGBLED_SPLIT {20, 20}
#define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/marksard/treadstone32/lite/config.h b/keyboards/marksard/treadstone32/lite/config.h
index 1da59006d4f..3524cb7f453 100644
--- a/keyboards/marksard/treadstone32/lite/config.h
+++ b/keyboards/marksard/treadstone32/lite/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 6
#ifndef IOS_DEVICE_ENABLE
#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
@@ -39,7 +38,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
// #define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
#if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
// USB_MAX_POWER_CONSUMPTION value for treadstone32 keyboard
diff --git a/keyboards/marksard/treadstone32/rev1/config.h b/keyboards/marksard/treadstone32/rev1/config.h
index 573427ff75e..36f4dce58d6 100644
--- a/keyboards/marksard/treadstone32/rev1/config.h
+++ b/keyboards/marksard/treadstone32/rev1/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 6
#ifndef IOS_DEVICE_ENABLE
#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
@@ -39,7 +38,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
// #define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
#if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
// USB_MAX_POWER_CONSUMPTION value for treadstone32 keyboard
diff --git a/keyboards/marksard/treadstone48/rev1/config.h b/keyboards/marksard/treadstone48/rev1/config.h
index a9fd1ad8299..169c09cc0af 100644
--- a/keyboards/marksard/treadstone48/rev1/config.h
+++ b/keyboards/marksard/treadstone48/rev1/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#ifndef RS_EXTRA_LED
#define RGBLED_NUM 12
#define RGBLED_SPLIT {12, 0}
@@ -40,7 +39,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
// #define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/marksard/treadstone48/rev2/config.h b/keyboards/marksard/treadstone48/rev2/config.h
index 87136e222f6..4919c1072e0 100644
--- a/keyboards/marksard/treadstone48/rev2/config.h
+++ b/keyboards/marksard/treadstone48/rev2/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -34,7 +33,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
// #define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/matrix/cain_re/config.h b/keyboards/matrix/cain_re/config.h
index 77077bad341..70e5bca5909 100644
--- a/keyboards/matrix/cain_re/config.h
+++ b/keyboards/matrix/cain_re/config.h
@@ -21,7 +21,6 @@
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -40,7 +39,6 @@
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_SLEEP
#define RGBLIGHT_LED_MAP { 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 1, 2, 3 }
-#endif
#define CAPS_PIN D3
#define NUM_PIN F7
diff --git a/keyboards/matrix/m12og/rev2/config.h b/keyboards/matrix/m12og/rev2/config.h
index 415ab3dbdda..8494950e6d1 100644
--- a/keyboards/matrix/m12og/rev2/config.h
+++ b/keyboards/matrix/m12og/rev2/config.h
@@ -6,7 +6,6 @@
#define RGB_DI_PIN B3
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -23,4 +22,3 @@
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_SLEEP
#define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
-#endif
diff --git a/keyboards/mechanickeys/undead60m/config.h b/keyboards/mechanickeys/undead60m/config.h
index 9611e47e2ba..6b153b0c780 100644
--- a/keyboards/mechanickeys/undead60m/config.h
+++ b/keyboards/mechanickeys/undead60m/config.h
@@ -18,7 +18,6 @@
/* RGB Underglow */
#define RGB_DI_PIN F7
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 16
#define RGBLIGHT_SLEEP
#define RGBLIGHT_EFFECT_BREATHING
@@ -31,4 +30,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/mechbrewery/mb65s/config.h b/keyboards/mechbrewery/mb65s/config.h
index a9375a98336..c806fd05c79 100644
--- a/keyboards/mechbrewery/mb65s/config.h
+++ b/keyboards/mechbrewery/mb65s/config.h
@@ -18,7 +18,6 @@
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -35,4 +34,3 @@
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 240
#define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/mechkeys/espectro/config.h b/keyboards/mechkeys/espectro/config.h
index 644ebeda46a..feec17629e9 100755
--- a/keyboards/mechkeys/espectro/config.h
+++ b/keyboards/mechkeys/espectro/config.h
@@ -23,7 +23,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 18
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 10
@@ -39,6 +38,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-
-
-#endif
diff --git a/keyboards/mechkeys/mechmini/v2/config.h b/keyboards/mechkeys/mechmini/v2/config.h
index 35421a3b293..0b6a0e67600 100755
--- a/keyboards/mechkeys/mechmini/v2/config.h
+++ b/keyboards/mechkeys/mechmini/v2/config.h
@@ -22,7 +22,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -37,4 +36,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/mechkeys/mk60/config.h b/keyboards/mechkeys/mk60/config.h
index 7b63a204c38..810f25652ab 100644
--- a/keyboards/mechkeys/mk60/config.h
+++ b/keyboards/mechkeys/mk60/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mechlovin/foundation/config.h b/keyboards/mechlovin/foundation/config.h
index 0cf3af4a8a3..bc6d0e564c4 100644
--- a/keyboards/mechlovin/foundation/config.h
+++ b/keyboards/mechlovin/foundation/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN B15
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 22
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -35,6 +34,5 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
#define TAP_CODE_DELAY 10
\ No newline at end of file
diff --git a/keyboards/mechlovin/kay60/config.h b/keyboards/mechlovin/kay60/config.h
index aadc6fcaaa8..5643462b8ae 100644
--- a/keyboards/mechlovin/kay60/config.h
+++ b/keyboards/mechlovin/kay60/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 22
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
/*
* Feature disable options
diff --git a/keyboards/mechlovin/kay65/config.h b/keyboards/mechlovin/kay65/config.h
index c6168d930f8..e6064163fdf 100644
--- a/keyboards/mechlovin/kay65/config.h
+++ b/keyboards/mechlovin/kay65/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 24
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
/*
* Feature disable options
diff --git a/keyboards/mechlovin/pisces/config.h b/keyboards/mechlovin/pisces/config.h
index 75887406acb..7771a968a4f 100644
--- a/keyboards/mechlovin/pisces/config.h
+++ b/keyboards/mechlovin/pisces/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,4 +34,3 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/mechlovin/zed60/config.h b/keyboards/mechlovin/zed60/config.h
index ff9aea4a02f..36be5c04cab 100644
--- a/keyboards/mechlovin/zed60/config.h
+++ b/keyboards/mechlovin/zed60/config.h
@@ -25,8 +25,6 @@ along with this program. If not, see .
#define WS2812_SPI SPID1 // default: SPID1
#define WS2812_SPI_MOSI_PAL_MODE 5 // MOSI pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 5
-//#define RGB_DI_PIN E2
-//#ifdef RGB_DI_PIN
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mechlovin/zed65/mono_led/config.h b/keyboards/mechlovin/zed65/mono_led/config.h
index 9f8d4f46f59..917a3a9fc8a 100644
--- a/keyboards/mechlovin/zed65/mono_led/config.h
+++ b/keyboards/mechlovin/zed65/mono_led/config.h
@@ -62,7 +62,6 @@ along with this program. If not, see .
#endif
#define RGB_DI_PIN A7
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 24
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -79,4 +78,3 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h
index 7c9062f3195..39b8dcb84ab 100644
--- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h
+++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h
@@ -25,8 +25,6 @@ along with this program. If not, see .
#define WS2812_SPI SPID2 // default: SPID1
#define WS2812_SPI_MOSI_PAL_MODE 0 // MOSI pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 5
-//#define RGB_DI_PIN E2
-//#ifdef RGB_DI_PIN
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
@@ -42,4 +40,4 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/mechstudio/ud_40_ortho/config.h b/keyboards/mechstudio/ud_40_ortho/config.h
index 7c6f10131dc..5c82ff9eb7e 100644
--- a/keyboards/mechstudio/ud_40_ortho/config.h
+++ b/keyboards/mechstudio/ud_40_ortho/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN B7
- #ifdef RGB_DI_PIN
#define RGBLED_NUM 10
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -34,4 +33,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
- #endif
diff --git a/keyboards/mechwild/mokulua/mirrored/config.h b/keyboards/mechwild/mokulua/mirrored/config.h
index a91a4bf79cd..a326faf7101 100644
--- a/keyboards/mechwild/mokulua/mirrored/config.h
+++ b/keyboards/mechwild/mokulua/mirrored/config.h
@@ -18,7 +18,6 @@
/* RGB options */
#define RGB_DI_PIN B6
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 16
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@
//# define RGBLIGHT_EFFECT_STATIC_GRADIENT
//# define RGBLIGHT_EFFECT_RGB_TEST
//# define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mechwild/mokulua/standard/config.h b/keyboards/mechwild/mokulua/standard/config.h
index f33d6c59448..ed5eb12a66c 100644
--- a/keyboards/mechwild/mokulua/standard/config.h
+++ b/keyboards/mechwild/mokulua/standard/config.h
@@ -18,7 +18,6 @@
/* RGB options */
#define RGB_DI_PIN B6
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 16
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@
//# define RGBLIGHT_EFFECT_STATIC_GRADIENT
//# define RGBLIGHT_EFFECT_RGB_TEST
//# define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mechwild/murphpad/config.h b/keyboards/mechwild/murphpad/config.h
index 68217b33bf6..d9b0f0fa8df 100644
--- a/keyboards/mechwild/murphpad/config.h
+++ b/keyboards/mechwild/murphpad/config.h
@@ -22,7 +22,6 @@ along with this program. If not, see .
#define OLED_FONT_H "keyboards/mechwild/murphpad/lib/murphpadfont.c"
#define RGB_DI_PIN F4
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 8
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -39,7 +38,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mechwild/obe/config.h b/keyboards/mechwild/obe/config.h
index a130b99d1e6..bebb1126e97 100644
--- a/keyboards/mechwild/obe/config.h
+++ b/keyboards/mechwild/obe/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see .
/* RGB settings, uncomment this define to enable RGB */
#define RGB_DI_PIN A0
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 10
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -38,7 +37,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mechwild/puckbuddy/config.h b/keyboards/mechwild/puckbuddy/config.h
index 13e8bbfed26..eb1674aadd9 100644
--- a/keyboards/mechwild/puckbuddy/config.h
+++ b/keyboards/mechwild/puckbuddy/config.h
@@ -33,7 +33,6 @@
/* RGB settings, uncomment this define to enable RGB */
#define RGB_DI_PIN A3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 3
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -49,7 +48,6 @@
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mechwild/waka60/config.h b/keyboards/mechwild/waka60/config.h
index b427adc33cc..3babce4a10a 100644
--- a/keyboards/mechwild/waka60/config.h
+++ b/keyboards/mechwild/waka60/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see .
/* RGB settings, uncomment this define to enable RGB */
#define RGB_DI_PIN A1
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 3
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -38,7 +37,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/meletrix/zoom87/config.h b/keyboards/meletrix/zoom87/config.h
index fd83302d276..4c3bb24d3e7 100644
--- a/keyboards/meletrix/zoom87/config.h
+++ b/keyboards/meletrix/zoom87/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 20
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,5 +34,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
-
diff --git a/keyboards/melgeek/mj6xy/rev3/config.h b/keyboards/melgeek/mj6xy/rev3/config.h
index 71501284369..a5a8d8883f0 100755
--- a/keyboards/melgeek/mj6xy/rev3/config.h
+++ b/keyboards/melgeek/mj6xy/rev3/config.h
@@ -18,7 +18,6 @@
#define RGB_DI_PIN C6
-#ifdef RGB_DI_PIN
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -36,4 +35,3 @@
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
# define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/meow48/config.h b/keyboards/meow48/config.h
index fb0353c631a..f214ffbbf67 100644
--- a/keyboards/meow48/config.h
+++ b/keyboards/meow48/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see .
#define OLED_BRIGHTNESS 100
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 48
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -39,7 +38,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/*
* Feature disable options
diff --git a/keyboards/meson/config.h b/keyboards/meson/config.h
index c5f295bfeec..1ca066fcf9b 100644
--- a/keyboards/meson/config.h
+++ b/keyboards/meson/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see .
#define USE_I2C
#define RGB_DI_PIN B5
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 10
#define RGBLIGHT_SPLIT
#define RGBLED_SPLIT { 5, 5 }
@@ -39,7 +38,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/miniaxe/config.h b/keyboards/miniaxe/config.h
index 3b9010455c3..ffc36b1c0b7 100644
--- a/keyboards/miniaxe/config.h
+++ b/keyboards/miniaxe/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
/* Uncomment below if use underglow */
#define RGB_DI_PIN F4
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -34,7 +33,6 @@ along with this program. If not, see .
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/misonoworks/chocolatebar/config.h b/keyboards/misonoworks/chocolatebar/config.h
index dd6c07768b3..04a746121bd 100644
--- a/keyboards/misonoworks/chocolatebar/config.h
+++ b/keyboards/misonoworks/chocolatebar/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see .
#define FORCE_NKRO
#define RGB_DI_PIN B1
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 12
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -32,4 +31,3 @@ along with this program. If not, see .
// #define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/misonoworks/karina/config.h b/keyboards/misonoworks/karina/config.h
index e38f18b40aa..88500712e7b 100644
--- a/keyboards/misonoworks/karina/config.h
+++ b/keyboards/misonoworks/karina/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN D1
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 19
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -37,4 +36,3 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/misterknife/knife66/config.h b/keyboards/misterknife/knife66/config.h
index 4efe1466c65..188bfaa7c15 100644
--- a/keyboards/misterknife/knife66/config.h
+++ b/keyboards/misterknife/knife66/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
#define RGB_DI_PIN A9
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -36,7 +35,6 @@ along with this program. If not, see .
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 200
-#endif
#define WS2812_PWM_DRIVER PWMD1 // default: PWMD1
#define WS2812_PWM_CHANNEL 2 // default: 2
diff --git a/keyboards/misterknife/knife66_iso/config.h b/keyboards/misterknife/knife66_iso/config.h
index d13ee6a3346..3d9141e11e7 100644
--- a/keyboards/misterknife/knife66_iso/config.h
+++ b/keyboards/misterknife/knife66_iso/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
#define RGB_DI_PIN A9
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -36,7 +35,6 @@ along with this program. If not, see .
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 160
-#endif
#define WS2812_PWM_DRIVER PWMD1 // default: PWMD1
#define WS2812_PWM_CHANNEL 2 // default: 2
diff --git a/keyboards/mixi/config.h b/keyboards/mixi/config.h
index ed827231084..b96eeed91c7 100644
--- a/keyboards/mixi/config.h
+++ b/keyboards/mixi/config.h
@@ -7,7 +7,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN B5
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 5
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -26,4 +25,3 @@
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLIGHT_LAYERS
#define RGBLIGHT_LAYER_BLINK
-#endif
diff --git a/keyboards/mt/mt64rgb/config.h b/keyboards/mt/mt64rgb/config.h
index e7c1302a0b4..357553c9513 100644
--- a/keyboards/mt/mt64rgb/config.h
+++ b/keyboards/mt/mt64rgb/config.h
@@ -81,7 +81,6 @@
#endif
#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -97,7 +96,6 @@
#define RGBLIGHT_SAT_STEP 5
#define RGBLIGHT_VAL_STEP 5
#define RGBLIGHT_SLEEP
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mt/mt84/config.h b/keyboards/mt/mt84/config.h
index 394193bcddb..012c209f77c 100644
--- a/keyboards/mt/mt84/config.h
+++ b/keyboards/mt/mt84/config.h
@@ -84,7 +84,6 @@
#endif
#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
# define RGBLIGHT_EFFECT_BREATHING
@@ -93,7 +92,6 @@
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
# define RGBLIGHT_SLEEP
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mt/mt980/config.h b/keyboards/mt/mt980/config.h
index d6697fc0766..ff91085de3a 100644
--- a/keyboards/mt/mt980/config.h
+++ b/keyboards/mt/mt980/config.h
@@ -7,7 +7,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -23,4 +22,3 @@
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 185
-#endif
diff --git a/keyboards/mt/ncr80/hotswap/config.h b/keyboards/mt/ncr80/hotswap/config.h
index 29eb3ae608b..fd1cc98c7f4 100644
--- a/keyboards/mt/ncr80/hotswap/config.h
+++ b/keyboards/mt/ncr80/hotswap/config.h
@@ -18,7 +18,6 @@
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -34,4 +33,3 @@
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 180
-#endif
diff --git a/keyboards/mtbkeys/mtb60/hotswap/config.h b/keyboards/mtbkeys/mtb60/hotswap/config.h
index 114c8feab41..21b234cc194 100644
--- a/keyboards/mtbkeys/mtb60/hotswap/config.h
+++ b/keyboards/mtbkeys/mtb60/hotswap/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see .
/* Pin WS2812 RGB LEDs are connected to */
#define RGB_DI_PIN D4
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 16
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -38,7 +37,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_TWINKLE
# define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL /* Set default RGB */
-#endif /* RGB_DI_PIN */
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mtbkeys/mtb60/solder/config.h b/keyboards/mtbkeys/mtb60/solder/config.h
index 3ab3171076e..18a568fc487 100644
--- a/keyboards/mtbkeys/mtb60/solder/config.h
+++ b/keyboards/mtbkeys/mtb60/solder/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see .
/* Pin WS2812 RGB LEDs are connected to */
#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 16
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -38,7 +37,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_TWINKLE
# define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL /* Set default RGB */
-#endif /* RGB_DI_PIN */
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mwstudio/mw65_black/config.h b/keyboards/mwstudio/mw65_black/config.h
index 6ed183cb4c8..c54f6bf2812 100644
--- a/keyboards/mwstudio/mw65_black/config.h
+++ b/keyboards/mwstudio/mw65_black/config.h
@@ -17,9 +17,7 @@
#pragma once
#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 21
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/nightly_boards/adellein/config.h b/keyboards/nightly_boards/adellein/config.h
index 031895cf23d..cefed954f87 100644
--- a/keyboards/nightly_boards/adellein/config.h
+++ b/keyboards/nightly_boards/adellein/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D5
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 14
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -31,8 +30,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
-
/* Encoders */
#define ENCODERS_CW_KEY { { 3, 3 } }
#define ENCODERS_CCW_KEY { { 1, 3 } }
diff --git a/keyboards/nightly_boards/alter/rev1/config.h b/keyboards/nightly_boards/alter/rev1/config.h
index b576b720e3a..095aea8e072 100644
--- a/keyboards/nightly_boards/alter/rev1/config.h
+++ b/keyboards/nightly_boards/alter/rev1/config.h
@@ -15,7 +15,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN F1
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 18
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -32,7 +31,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/nightly_boards/conde60/config.h b/keyboards/nightly_boards/conde60/config.h
index 4fdd3f76a1b..6f005a97a0b 100644
--- a/keyboards/nightly_boards/conde60/config.h
+++ b/keyboards/nightly_boards/conde60/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D5
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 12
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -31,8 +30,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/nightly_boards/n2/config.h b/keyboards/nightly_boards/n2/config.h
index 3ca1b97be13..37e99fe7942 100644
--- a/keyboards/nightly_boards/n2/config.h
+++ b/keyboards/nightly_boards/n2/config.h
@@ -15,7 +15,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D4
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 2
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -32,7 +31,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/nightly_boards/n40_o/config.h b/keyboards/nightly_boards/n40_o/config.h
index 9a4fbf033bc..671e700ce36 100644
--- a/keyboards/nightly_boards/n40_o/config.h
+++ b/keyboards/nightly_boards/n40_o/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see .
#define DIODE_DIRECTION COL2ROW
#define RGB_DI_PIN B4
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 12
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -34,8 +33,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
-
/* Encoders */
#define ENCODERS_CW_KEY { { 2, 4 },{ 4, 4 },{ 6, 4 } }
#define ENCODERS_CCW_KEY { { 1, 4 },{ 3, 4 },{ 5, 4 } }
diff --git a/keyboards/nightly_boards/n60_s/config.h b/keyboards/nightly_boards/n60_s/config.h
index 0c240b4a475..c87c581a886 100644
--- a/keyboards/nightly_boards/n60_s/config.h
+++ b/keyboards/nightly_boards/n60_s/config.h
@@ -29,7 +29,6 @@ along with this program. If not, see .
/* Underglow */
#define RGB_DI_PIN D1
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -46,8 +45,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_ALTERNATING
-#endif
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/nightly_boards/n87/config.h b/keyboards/nightly_boards/n87/config.h
index 41defb8722b..90a38e8d6aa 100644
--- a/keyboards/nightly_boards/n87/config.h
+++ b/keyboards/nightly_boards/n87/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D0
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 16
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
#define AUDIO_PIN B7
diff --git a/keyboards/nightly_boards/n9/config.h b/keyboards/nightly_boards/n9/config.h
index d53385a03c9..f76c2bd3669 100644
--- a/keyboards/nightly_boards/n9/config.h
+++ b/keyboards/nightly_boards/n9/config.h
@@ -15,7 +15,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN F5
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -32,7 +31,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/nightly_boards/octopad/config.h b/keyboards/nightly_boards/octopad/config.h
index db8a106663a..25b30b0a416 100644
--- a/keyboards/nightly_boards/octopad/config.h
+++ b/keyboards/nightly_boards/octopad/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN F7
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 8
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -31,8 +30,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
-
/* Encoders */
#define ENCODERS_CW_KEY { { 3, 2 },{ 1, 2 } }
#define ENCODERS_CCW_KEY { { 2, 2 },{ 0, 2 } }
diff --git a/keyboards/nix_studio/oxalys80/config.h b/keyboards/nix_studio/oxalys80/config.h
index fe3a23e1108..058287b2811 100644
--- a/keyboards/nix_studio/oxalys80/config.h
+++ b/keyboards/nix_studio/oxalys80/config.h
@@ -22,7 +22,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN B3
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -39,4 +38,3 @@
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 200
#define RGBLIGHT_SLEEP // RGB will turn off when PC is put to sleep
-#endif
diff --git a/keyboards/novelkeys/nk1/config.h b/keyboards/novelkeys/nk1/config.h
index c168aca4926..c44f3c17a8a 100644
--- a/keyboards/novelkeys/nk1/config.h
+++ b/keyboards/novelkeys/nk1/config.h
@@ -18,7 +18,6 @@
#pragma once
#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 9
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* There is only 1 Button so limiting VIA to 1 layer */
#define DYNAMIC_KEYMAP_LAYER_COUNT 1
diff --git a/keyboards/novelkeys/novelpad/config.h b/keyboards/novelkeys/novelpad/config.h
index 5aa35ad4d80..e1d9ada1057 100755
--- a/keyboards/novelkeys/novelpad/config.h
+++ b/keyboards/novelkeys/novelpad/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 4
// #define RGBLIGHT_HUE_STEP 8
// #define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/noxary/268_2_rgb/config.h b/keyboards/noxary/268_2_rgb/config.h
index 9c615ac3882..8fcd63e7b24 100644
--- a/keyboards/noxary/268_2_rgb/config.h
+++ b/keyboards/noxary/268_2_rgb/config.h
@@ -16,7 +16,6 @@ along with this program. If not, see .
/* ws2812b options */
#define RGB_DI_PIN B5
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -32,7 +31,6 @@ along with this program. If not, see .
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16
/*#define RGBLIGHT_LIMIT_VAL 255 */
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/noxary/x268/config.h b/keyboards/noxary/x268/config.h
index fc391c7074e..8c659d5a21d 100644
--- a/keyboards/noxary/x268/config.h
+++ b/keyboards/noxary/x268/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
/* ws2812b options */
#define RGB_DI_PIN B5
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16
/*#define RGBLIGHT_LIMIT_VAL 255 */
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/omnikeyish/config.h b/keyboards/omnikeyish/config.h
index cc80606a978..daacf8f8a6c 100644
--- a/keyboards/omnikeyish/config.h
+++ b/keyboards/omnikeyish/config.h
@@ -23,23 +23,6 @@
/* force n-key rollover*/
#define FORCE_NKRO
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
-
#define DYNAMIC_MACRO_COUNT 12
#define DYNAMIC_MACRO_SIZE 48
#define DYNAMIC_MACRO_EEPROM_STORAGE
diff --git a/keyboards/orthocode/config.h b/keyboards/orthocode/config.h
index 7a221472ccd..62b80bcd5d7 100644
--- a/keyboards/orthocode/config.h
+++ b/keyboards/orthocode/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see .
#define TAP_CODE_DELAY 10
#define RGB_DI_PIN D5
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 10 /*Change for the number of leds on the strip you attach*/
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -37,7 +36,6 @@ along with this program. If not, see .
// #define RGBLIGHT_EFFECT_STATIC_GRADIENT
// #define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/owlab/jelly_epoch/hotswap/config.h b/keyboards/owlab/jelly_epoch/hotswap/config.h
index b4a9e0e6bc0..6544962d74e 100644
--- a/keyboards/owlab/jelly_epoch/hotswap/config.h
+++ b/keyboards/owlab/jelly_epoch/hotswap/config.h
@@ -22,7 +22,6 @@ along with this program. If not, see .
/* RGB Strip*/
#define RGB_DI_PIN B15
-#ifdef RGB_DI_PIN
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_CHRISTMAS
@@ -37,4 +36,3 @@ along with this program. If not, see .
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 10
# define RGBLIGHT_LIMIT_VAL 255
-#endif
diff --git a/keyboards/owlab/jelly_epoch/soldered/config.h b/keyboards/owlab/jelly_epoch/soldered/config.h
index b4a9e0e6bc0..6544962d74e 100644
--- a/keyboards/owlab/jelly_epoch/soldered/config.h
+++ b/keyboards/owlab/jelly_epoch/soldered/config.h
@@ -22,7 +22,6 @@ along with this program. If not, see .
/* RGB Strip*/
#define RGB_DI_PIN B15
-#ifdef RGB_DI_PIN
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_CHRISTMAS
@@ -37,4 +36,3 @@ along with this program. If not, see .
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 10
# define RGBLIGHT_LIMIT_VAL 255
-#endif
diff --git a/keyboards/owlab/spring/config.h b/keyboards/owlab/spring/config.h
index 6785a26580a..b0168c47633 100644
--- a/keyboards/owlab/spring/config.h
+++ b/keyboards/owlab/spring/config.h
@@ -22,7 +22,6 @@ along with this program. If not, see .
/* RGB Strip*/
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -40,6 +39,3 @@ along with this program. If not, see .
# define RGBLIGHT_LIMIT_VAL 255
# define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
# define RGBLIGHT_DEFAULT_VAL RGBLIGHT_LIMIT_VAL/2
-#endif
-
-
diff --git a/keyboards/owlab/voice65/hotswap/config.h b/keyboards/owlab/voice65/hotswap/config.h
index fb7ee7f1cc9..4bbbb43a33d 100644
--- a/keyboards/owlab/voice65/hotswap/config.h
+++ b/keyboards/owlab/voice65/hotswap/config.h
@@ -22,7 +22,6 @@ along with this program. If not, see .
/* RGB stripe */
#define RGB_DI_PIN B15
-#ifdef RGB_DI_PIN
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_CHRISTMAS
@@ -38,7 +37,6 @@ along with this program. If not, see .
# define RGBLIGHT_VAL_STEP 10
# define RGBLIGHT_LIMIT_VAL 180
# define OWL_VOLUME_RANGE 50
-#endif
/* RGB matrix */
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/owlab/voice65/soldered/config.h b/keyboards/owlab/voice65/soldered/config.h
index 444ca29714f..c873464c72d 100644
--- a/keyboards/owlab/voice65/soldered/config.h
+++ b/keyboards/owlab/voice65/soldered/config.h
@@ -22,7 +22,6 @@ along with this program. If not, see .
/* RGB stripe */
#define RGB_DI_PIN B15
-#ifdef RGB_DI_PIN
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_CHRISTMAS
@@ -38,7 +37,6 @@ along with this program. If not, see .
# define RGBLIGHT_VAL_STEP 10
# define RGBLIGHT_LIMIT_VAL 180
# define OWL_VOLUME_RANGE 50
-#endif
/* RGB matrix*/
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/panc40/config.h b/keyboards/panc40/config.h
index 89d5a52301d..96117cf81cf 100644
--- a/keyboards/panc40/config.h
+++ b/keyboards/panc40/config.h
@@ -7,7 +7,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -22,4 +21,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/pearlboards/atlas/config.h b/keyboards/pearlboards/atlas/config.h
index 8725d8ab07d..455b46c8eb0 100644
--- a/keyboards/pearlboards/atlas/config.h
+++ b/keyboards/pearlboards/atlas/config.h
@@ -32,7 +32,6 @@ along with this program. If not, see .
/*== all animations enabled ==*/
/* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */
#define RGB_DI_PIN B6
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_CHRISTMAS
@@ -47,7 +46,6 @@ along with this program. If not, see .
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_SLEEP
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/pearlboards/pandora/config.h b/keyboards/pearlboards/pandora/config.h
index 984541d1d6b..dea50e6a4d7 100644
--- a/keyboards/pearlboards/pandora/config.h
+++ b/keyboards/pearlboards/pandora/config.h
@@ -22,7 +22,6 @@ along with this program. If not, see .
/*== all animations enabled ==*/
/* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */
#define RGB_DI_PIN B1
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_CHRISTMAS
@@ -37,7 +36,6 @@ along with this program. If not, see .
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_SLEEP
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/pearlboards/pearl/config.h b/keyboards/pearlboards/pearl/config.h
index 5f9978cbdc9..47cb682e7a4 100644
--- a/keyboards/pearlboards/pearl/config.h
+++ b/keyboards/pearlboards/pearl/config.h
@@ -32,7 +32,6 @@ along with this program. If not, see .
/*== all animations enabled ==*/
/* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */
#define RGB_DI_PIN B3
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_CHRISTMAS
@@ -48,7 +47,6 @@ along with this program. If not, see .
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
# define RGBLIGHT_SLEEP
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/pearlboards/zeus/config.h b/keyboards/pearlboards/zeus/config.h
index 4185a8f8503..0b72f187a46 100644
--- a/keyboards/pearlboards/zeus/config.h
+++ b/keyboards/pearlboards/zeus/config.h
@@ -36,7 +36,6 @@ along with this program. If not, see .
/*== all animations enabled ==*/
/* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */
#define RGB_DI_PIN D5
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_CHRISTMAS
@@ -51,7 +50,6 @@ along with this program. If not, see .
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_SLEEP
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/pearlboards/zeuspad/config.h b/keyboards/pearlboards/zeuspad/config.h
index bc31fb049e5..c6c843dddd9 100644
--- a/keyboards/pearlboards/zeuspad/config.h
+++ b/keyboards/pearlboards/zeuspad/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
/*== all animations enabled ==*/
/* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */
#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_CHRISTMAS
@@ -42,7 +41,6 @@ along with this program. If not, see .
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_SLEEP
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/percent/booster/config.h b/keyboards/percent/booster/config.h
index 35a7541060d..2978c96efd2 100644
--- a/keyboards/percent/booster/config.h
+++ b/keyboards/percent/booster/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 10
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,4 +34,3 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/phantom/config.h b/keyboards/phantom/config.h
index 2496cdd216d..1e64cede558 100644
--- a/keyboards/phantom/config.h
+++ b/keyboards/phantom/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 20
# define RGBLIGHT_HUE_STEP 10
# define RGBLIGHT_SAT_STEP 17
@@ -35,7 +34,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/picolab/frusta_fundamental/config.h b/keyboards/picolab/frusta_fundamental/config.h
index 51b917771af..d8f00513d86 100644
--- a/keyboards/picolab/frusta_fundamental/config.h
+++ b/keyboards/picolab/frusta_fundamental/config.h
@@ -23,7 +23,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -38,4 +37,3 @@
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/pimentoso/paddino02/rev1/config.h b/keyboards/pimentoso/paddino02/rev1/config.h
index 47143f7cd63..5f360813239 100755
--- a/keyboards/pimentoso/paddino02/rev1/config.h
+++ b/keyboards/pimentoso/paddino02/rev1/config.h
@@ -5,22 +5,3 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/pimentoso/paddino02/rev2/left/config.h b/keyboards/pimentoso/paddino02/rev2/left/config.h
index 47143f7cd63..5f360813239 100755
--- a/keyboards/pimentoso/paddino02/rev2/left/config.h
+++ b/keyboards/pimentoso/paddino02/rev2/left/config.h
@@ -5,22 +5,3 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/pimentoso/paddino02/rev2/right/config.h b/keyboards/pimentoso/paddino02/rev2/right/config.h
index 47143f7cd63..5f360813239 100755
--- a/keyboards/pimentoso/paddino02/rev2/right/config.h
+++ b/keyboards/pimentoso/paddino02/rev2/right/config.h
@@ -5,22 +5,3 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/pimentoso/touhoupad/config.h b/keyboards/pimentoso/touhoupad/config.h
index 0916e7b7290..14ef447bed5 100644
--- a/keyboards/pimentoso/touhoupad/config.h
+++ b/keyboards/pimentoso/touhoupad/config.h
@@ -16,7 +16,6 @@
#pragma once
#define RGB_DI_PIN F4
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -27,4 +26,3 @@
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#endif
diff --git a/keyboards/pkb65/config.h b/keyboards/pkb65/config.h
index 7114397adfe..7f37e401190 100644
--- a/keyboards/pkb65/config.h
+++ b/keyboards/pkb65/config.h
@@ -26,22 +26,3 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/playkbtw/ca66/config.h b/keyboards/playkbtw/ca66/config.h
index f7e0e04949b..f5dcc375fab 100644
--- a/keyboards/playkbtw/ca66/config.h
+++ b/keyboards/playkbtw/ca66/config.h
@@ -7,7 +7,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN B1
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -22,4 +21,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/playkbtw/helen80/config.h b/keyboards/playkbtw/helen80/config.h
index 2a5d98951ab..2a8c2d30c38 100644
--- a/keyboards/playkbtw/helen80/config.h
+++ b/keyboards/playkbtw/helen80/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 87
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -34,4 +33,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/playkbtw/pk60/config.h b/keyboards/playkbtw/pk60/config.h
index dd2126d0726..398e8704623 100644
--- a/keyboards/playkbtw/pk60/config.h
+++ b/keyboards/playkbtw/pk60/config.h
@@ -7,7 +7,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -22,4 +21,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/playkbtw/pk64rgb/config.h b/keyboards/playkbtw/pk64rgb/config.h
index 4adfcb7db27..13b3cb90a2e 100644
--- a/keyboards/playkbtw/pk64rgb/config.h
+++ b/keyboards/playkbtw/pk64rgb/config.h
@@ -41,7 +41,6 @@
#endif
#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -56,7 +55,6 @@
# define RGBLIGHT_SAT_STEP 5
# define RGBLIGHT_VAL_STEP 5
# define RGBLIGHT_SLEEP
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/plut0nium/0x3e/config.h b/keyboards/plut0nium/0x3e/config.h
index 2e0377a2c9f..d3002770607 100644
--- a/keyboards/plut0nium/0x3e/config.h
+++ b/keyboards/plut0nium/0x3e/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see .
* RGB Underglow
*/
#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 12
#define RGBLIGHT_SAT_STEP 8
@@ -37,7 +36,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
// #define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/*
* Feature disable options
diff --git a/keyboards/plywrks/lune/config.h b/keyboards/plywrks/lune/config.h
index e6bfca0aa42..e96a51c2a49 100644
--- a/keyboards/plywrks/lune/config.h
+++ b/keyboards/plywrks/lune/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 8
//# define RGBLIGHT_HUE_STEP 8
//# define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/pohjolaworks/louhi/config.h b/keyboards/pohjolaworks/louhi/config.h
index 59c9e7b69ed..80408e3cf6b 100644
--- a/keyboards/pohjolaworks/louhi/config.h
+++ b/keyboards/pohjolaworks/louhi/config.h
@@ -18,14 +18,12 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN B5
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 14
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
# define RGBLIGHT_LIMIT_VAL 230 /* The maximum brightness level */
//# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/poker87c/config.h b/keyboards/poker87c/config.h
index dfec066dab4..db6b79a45a2 100644
--- a/keyboards/poker87c/config.h
+++ b/keyboards/poker87c/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 95
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -34,4 +33,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/poker87d/config.h b/keyboards/poker87d/config.h
index 2c30da76858..8d13c9fad89 100644
--- a/keyboards/poker87d/config.h
+++ b/keyboards/poker87d/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 125
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -34,4 +33,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/pom_keyboards/tnln95/config.h b/keyboards/pom_keyboards/tnln95/config.h
index 9b560ee1f5d..c09fcf6fbfe 100644
--- a/keyboards/pom_keyboards/tnln95/config.h
+++ b/keyboards/pom_keyboards/tnln95/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
/* RGB Configs */
#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 14
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -44,4 +43,3 @@ along with this program. If not, see .
// #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
// #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 225 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
// #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR // Sets the default mode, if none has been set
-#endif
diff --git a/keyboards/primekb/prime_r/config.h b/keyboards/primekb/prime_r/config.h
index 20892b683fa..2baa495f2c4 100644
--- a/keyboards/primekb/prime_r/config.h
+++ b/keyboards/primekb/prime_r/config.h
@@ -22,20 +22,3 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/program_yoink/config.h b/keyboards/program_yoink/config.h
index cd0eaa142b5..7e1c6cc7851 100644
--- a/keyboards/program_yoink/config.h
+++ b/keyboards/program_yoink/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
/*RGB*/
#define RGB_DI_PIN D4
- #ifdef RGB_DI_PIN
#define RGBLED_NUM 5
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
//#define RGBLIGHT_EFFECT_RGB_TEST
//#define RGBLIGHT_EFFECT_ALTERNATING
- #endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/quad_h/lb75/config.h b/keyboards/quad_h/lb75/config.h
index 25ceace9656..143efc9e0d3 100644
--- a/keyboards/quad_h/lb75/config.h
+++ b/keyboards/quad_h/lb75/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 16
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/qvex/lynepad/config.h b/keyboards/qvex/lynepad/config.h
index 7ba4700cde5..8779e34349d 100644
--- a/keyboards/qvex/lynepad/config.h
+++ b/keyboards/qvex/lynepad/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
/* LEDs */
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 240
-#endif
/* Definitions for encoder tilt/press support */
#define ENC_TILT_THRESHOLD 1
diff --git a/keyboards/qwertyydox/config.h b/keyboards/qwertyydox/config.h
index 44ad35a7ca0..a816a920e2a 100644
--- a/keyboards/qwertyydox/config.h
+++ b/keyboards/qwertyydox/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D6
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/rainkeebs/delilah/config.h b/keyboards/rainkeebs/delilah/config.h
index e08cc5152e4..e26458be8eb 100644
--- a/keyboards/rainkeebs/delilah/config.h
+++ b/keyboards/rainkeebs/delilah/config.h
@@ -23,7 +23,6 @@
#define RGB_DI_PIN B3
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -38,4 +37,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/rainkeebs/yasui/config.h b/keyboards/rainkeebs/yasui/config.h
index e256260367b..7d9d92abe35 100644
--- a/keyboards/rainkeebs/yasui/config.h
+++ b/keyboards/rainkeebs/yasui/config.h
@@ -23,7 +23,6 @@
#define RGB_DI_PIN D1
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -38,4 +37,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/rart/rart4x4/config.h b/keyboards/rart/rart4x4/config.h
index d4607263a45..c5334b42309 100644
--- a/keyboards/rart/rart4x4/config.h
+++ b/keyboards/rart/rart4x4/config.h
@@ -24,7 +24,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -41,4 +40,3 @@ along with this program. If not, see .
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 240
#define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/rart/rart67/config.h b/keyboards/rart/rart67/config.h
index ed3fe5d4640..983dca55057 100644
--- a/keyboards/rart/rart67/config.h
+++ b/keyboards/rart/rart67/config.h
@@ -24,7 +24,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -41,4 +40,3 @@ along with this program. If not, see .
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 240
#define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/rart/rart75hs/config.h b/keyboards/rart/rart75hs/config.h
index cb8685a3f82..bf5963648df 100644
--- a/keyboards/rart/rart75hs/config.h
+++ b/keyboards/rart/rart75hs/config.h
@@ -24,7 +24,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN C0
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -38,4 +37,3 @@ along with this program. If not, see .
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 240
#define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/rart/rart80/config.h b/keyboards/rart/rart80/config.h
index a48b3d4eea7..e98417be6d2 100644
--- a/keyboards/rart/rart80/config.h
+++ b/keyboards/rart/rart80/config.h
@@ -24,7 +24,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN D5
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -38,4 +37,3 @@ along with this program. If not, see .
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 240
#define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/rart/rartpad/config.h b/keyboards/rart/rartpad/config.h
index 344ebec1358..5da34f7ad3b 100644
--- a/keyboards/rart/rartpad/config.h
+++ b/keyboards/rart/rartpad/config.h
@@ -24,7 +24,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN F7
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -41,4 +40,3 @@ along with this program. If not, see .
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 240
#define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/recompile_keys/mio/config.h b/keyboards/recompile_keys/mio/config.h
index 9403ff760d5..cabcaa13885 100644
--- a/keyboards/recompile_keys/mio/config.h
+++ b/keyboards/recompile_keys/mio/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN B3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 8
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -35,4 +34,3 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/reversestudio/decadepad/config.h b/keyboards/reversestudio/decadepad/config.h
index f068ad9fd71..7c718c6bd25 100644
--- a/keyboards/reversestudio/decadepad/config.h
+++ b/keyboards/reversestudio/decadepad/config.h
@@ -24,7 +24,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN D5
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -39,7 +38,6 @@ along with this program. If not, see .
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
/*
* Feature disable options
diff --git a/keyboards/reviung/reviung33/config.h b/keyboards/reviung/reviung33/config.h
index 511011a96c2..26b116c7474 100644
--- a/keyboards/reviung/reviung33/config.h
+++ b/keyboards/reviung/reviung33/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 5
# define RGBLIGHT_HUE_STEP 16
# define RGBLIGHT_SAT_STEP 16
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/reviung/reviung34/keymaps/default_rgb/config.h b/keyboards/reviung/reviung34/keymaps/default_rgb/config.h
index 3ac57603a6c..f19b1a1f261 100644
--- a/keyboards/reviung/reviung34/keymaps/default_rgb/config.h
+++ b/keyboards/reviung/reviung34/keymaps/default_rgb/config.h
@@ -19,7 +19,6 @@
// place overrides here
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 9
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
@@ -37,4 +36,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/reviung/reviung34/keymaps/default_rgb2u/config.h b/keyboards/reviung/reviung34/keymaps/default_rgb2u/config.h
index 3ac57603a6c..f19b1a1f261 100644
--- a/keyboards/reviung/reviung34/keymaps/default_rgb2u/config.h
+++ b/keyboards/reviung/reviung34/keymaps/default_rgb2u/config.h
@@ -19,7 +19,6 @@
// place overrides here
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 9
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
@@ -37,4 +36,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/reviung/reviung39/keymaps/default/config.h b/keyboards/reviung/reviung39/keymaps/default/config.h
index 11a0609742a..fecd9083e6d 100644
--- a/keyboards/reviung/reviung39/keymaps/default/config.h
+++ b/keyboards/reviung/reviung39/keymaps/default/config.h
@@ -19,7 +19,6 @@
// place overrides here
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 11
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
@@ -36,4 +35,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/reviung/reviung39/keymaps/default_s/config.h b/keyboards/reviung/reviung39/keymaps/default_s/config.h
index a18a5083718..b8a8e3c6e18 100644
--- a/keyboards/reviung/reviung39/keymaps/default_s/config.h
+++ b/keyboards/reviung/reviung39/keymaps/default_s/config.h
@@ -19,7 +19,6 @@
// place overrides here
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
@@ -36,4 +35,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/reviung/reviung39/keymaps/toshi0383/config.h b/keyboards/reviung/reviung39/keymaps/toshi0383/config.h
index d27f9ee4a8a..3c1583a1c44 100644
--- a/keyboards/reviung/reviung39/keymaps/toshi0383/config.h
+++ b/keyboards/reviung/reviung39/keymaps/toshi0383/config.h
@@ -19,7 +19,6 @@
// place overrides here
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 11
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
@@ -42,4 +41,3 @@
// /*==== use exp() and sin() ====*/
// #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7
// #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255
-#endif
diff --git a/keyboards/reviung/reviung41/config.h b/keyboards/reviung/reviung41/config.h
index 3cfd68e72fa..f44fafc2b03 100644
--- a/keyboards/reviung/reviung41/config.h
+++ b/keyboards/reviung/reviung41/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 11
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/reviung/reviung41/keymaps/ciutadellla/config.h b/keyboards/reviung/reviung41/keymaps/ciutadellla/config.h
index 4e269076409..1d7ad67a629 100644
--- a/keyboards/reviung/reviung41/keymaps/ciutadellla/config.h
+++ b/keyboards/reviung/reviung41/keymaps/ciutadellla/config.h
@@ -16,12 +16,10 @@
#pragma once
#define RGBLIGHT_LAYERS
-#ifdef RGB_DI_PIN
// /*== or choose animations ==*/
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#endif
#define TAPPING_TERM 200
#define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS, UNICODE_MODE_LINUX, UNICODE_MODE_WINCOMPOSE
diff --git a/keyboards/reviung/reviung5/config.h b/keyboards/reviung/reviung5/config.h
index 7ed2eada3ea..da04717af0b 100644
--- a/keyboards/reviung/reviung5/config.h
+++ b/keyboards/reviung/reviung5/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 4
# define RGBLIGHT_HUE_STEP 16
# define RGBLIGHT_SAT_STEP 16
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/reviung/reviung53/config.h b/keyboards/reviung/reviung53/config.h
index 207bbe158e5..a2349059692 100644
--- a/keyboards/reviung/reviung53/config.h
+++ b/keyboards/reviung/reviung53/config.h
@@ -4,7 +4,6 @@
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 10
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
@@ -21,7 +20,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/reviung/reviung61/keymaps/default_rgb/config.h b/keyboards/reviung/reviung61/keymaps/default_rgb/config.h
index 280fd92954f..bf11c1c5b78 100644
--- a/keyboards/reviung/reviung61/keymaps/default_rgb/config.h
+++ b/keyboards/reviung/reviung61/keymaps/default_rgb/config.h
@@ -20,7 +20,6 @@
// --- RGB underglow ---
#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
@@ -37,5 +36,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-
-#endif
diff --git a/keyboards/rmi_kb/squishyfrl/config.h b/keyboards/rmi_kb/squishyfrl/config.h
index f7cae14b1b4..fd42b9f29bf 100644
--- a/keyboards/rmi_kb/squishyfrl/config.h
+++ b/keyboards/rmi_kb/squishyfrl/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN C15
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 16
//# define RGBLIGHT_HUE_STEP 8
//# define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/rmi_kb/squishytkl/config.h b/keyboards/rmi_kb/squishytkl/config.h
index f7cae14b1b4..fd42b9f29bf 100644
--- a/keyboards/rmi_kb/squishytkl/config.h
+++ b/keyboards/rmi_kb/squishytkl/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN C15
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 16
//# define RGBLIGHT_HUE_STEP 8
//# define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/rmi_kb/tkl_ff/v2/config.h b/keyboards/rmi_kb/tkl_ff/v2/config.h
index dd3984c8692..cdcae9d159f 100644
--- a/keyboards/rmi_kb/tkl_ff/v2/config.h
+++ b/keyboards/rmi_kb/tkl_ff/v2/config.h
@@ -20,7 +20,6 @@
#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 26
# define RGBLIGHT_HUE_STEP 32
# define RGBLIGHT_SAT_STEP 32
@@ -36,4 +35,3 @@
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
-#endif
diff --git a/keyboards/rmi_kb/wete/v2/config.h b/keyboards/rmi_kb/wete/v2/config.h
index 475cb250786..10d9733e05f 100644
--- a/keyboards/rmi_kb/wete/v2/config.h
+++ b/keyboards/rmi_kb/wete/v2/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see .
#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
#define RGB_DI_PIN D0
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 18
# define RGBLIGHT_HUE_STEP 32
# define RGBLIGHT_SAT_STEP 32
@@ -37,7 +36,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/runes/vaengr/config.h b/keyboards/runes/vaengr/config.h
index 0bc3b5bed41..592d5f5615d 100644
--- a/keyboards/runes/vaengr/config.h
+++ b/keyboards/runes/vaengr/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_VAL_STEP 17
// # define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
#define FORCE_NKRO
diff --git a/keyboards/ryanbaekr/rb18/config.h b/keyboards/ryanbaekr/rb18/config.h
index f93a6e3d04a..e7618bfdb6f 100644
--- a/keyboards/ryanbaekr/rb18/config.h
+++ b/keyboards/ryanbaekr/rb18/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
/* Underglow options */
#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -34,7 +33,6 @@ along with this program. If not, see .
#define RGBLED_HUE_STEP 8
#define RGBLED_SAT_STEP 8
#define RGBLED_VAL_STEP 8
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/ryanbaekr/rb69/config.h b/keyboards/ryanbaekr/rb69/config.h
index 2d312f69bb8..a9724ad47a6 100644
--- a/keyboards/ryanbaekr/rb69/config.h
+++ b/keyboards/ryanbaekr/rb69/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
/* Underglow options */
#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -34,7 +33,6 @@ along with this program. If not, see .
#define RGBLED_HUE_STEP 8
#define RGBLED_SAT_STEP 8
#define RGBLED_VAL_STEP 8
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/ryanbaekr/rb87/config.h b/keyboards/ryanbaekr/rb87/config.h
index d55efcf86b9..beeaf9e25ce 100644
--- a/keyboards/ryanbaekr/rb87/config.h
+++ b/keyboards/ryanbaekr/rb87/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
/* Underglow options */
#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -34,7 +33,6 @@ along with this program. If not, see .
#define RGBLED_HUE_STEP 8
#define RGBLED_SAT_STEP 8
#define RGBLED_VAL_STEP 8
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/ryloo_studio/m0110/config.h b/keyboards/ryloo_studio/m0110/config.h
index be974b6787f..4527345d8dd 100755
--- a/keyboards/ryloo_studio/m0110/config.h
+++ b/keyboards/ryloo_studio/m0110/config.h
@@ -24,7 +24,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -40,4 +39,3 @@ along with this program. If not, see .
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
# define RGBLIGHT_LIMIT_VAL 123
-#endif
diff --git a/keyboards/sam/s80/config.h b/keyboards/sam/s80/config.h
index 3d6d768957f..e2248fee361 100644
--- a/keyboards/sam/s80/config.h
+++ b/keyboards/sam/s80/config.h
@@ -17,13 +17,12 @@
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 20
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
# define RGBLIGHT_LIMIT_VAL 100 /* The maximum brightness level */
//# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
+
// generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/sam/sg81m/config.h b/keyboards/sam/sg81m/config.h
index 946649d0382..ad4a16b65a0 100644
--- a/keyboards/sam/sg81m/config.h
+++ b/keyboards/sam/sg81m/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN E6 //reserved pin for potential underglow rgb
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 10
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -34,4 +33,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/sawnsprojects/amber80/solder/config.h b/keyboards/sawnsprojects/amber80/solder/config.h
index a20ec04bdb7..9a9418e9b2c 100644
--- a/keyboards/sawnsprojects/amber80/solder/config.h
+++ b/keyboards/sawnsprojects/amber80/solder/config.h
@@ -18,7 +18,6 @@
/* RGB */
#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 22
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,4 +34,3 @@
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
-#endif
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/config.h b/keyboards/sawnsprojects/krush/krush60/solder/config.h
index 6a5ac54353e..0e918d90f66 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/config.h
+++ b/keyboards/sawnsprojects/krush/krush60/solder/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN F1
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 20
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,4 +34,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/config.h b/keyboards/sawnsprojects/krush/krush65/hotswap/config.h
index ef7cb262893..0a80e4d7f34 100644
--- a/keyboards/sawnsprojects/krush/krush65/hotswap/config.h
+++ b/keyboards/sawnsprojects/krush/krush65/hotswap/config.h
@@ -23,7 +23,6 @@
/* RGB */
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 20
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -41,4 +40,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/config.h b/keyboards/sawnsprojects/krush/krush65/solder/config.h
index 6a5ac54353e..fe32525c06c 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/config.h
+++ b/keyboards/sawnsprojects/krush/krush65/solder/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN F1
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 20
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -34,5 +33,4 @@
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#endif
\ No newline at end of file
+#define RGBLIGHT_EFFECT_TWINKLE
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/satxri6key/config.h b/keyboards/sawnsprojects/satxri6key/config.h
index a5f61e98e78..50f9d0cefde 100644
--- a/keyboards/sawnsprojects/satxri6key/config.h
+++ b/keyboards/sawnsprojects/satxri6key/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -34,7 +33,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
#define RGB_MATRIX_LED_COUNT 6
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
diff --git a/keyboards/sawnsprojects/vcl65/solder/config.h b/keyboards/sawnsprojects/vcl65/solder/config.h
index 5cb0b63ba94..2dd2cc25c9a 100644
--- a/keyboards/sawnsprojects/vcl65/solder/config.h
+++ b/keyboards/sawnsprojects/vcl65/solder/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 20
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -36,4 +35,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
\ No newline at end of file
diff --git a/keyboards/sck/osa/config.h b/keyboards/sck/osa/config.h
index b81c970db78..1d94c2ae02a 100644
--- a/keyboards/sck/osa/config.h
+++ b/keyboards/sck/osa/config.h
@@ -18,14 +18,12 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D4
- #ifdef RGB_DI_PIN
#define RGBLED_NUM 9
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
- #endif
/*
* Feature disable options
diff --git a/keyboards/sendyyeah/pix/config.h b/keyboards/sendyyeah/pix/config.h
index 5bbc6a38f9c..2f89717aa54 100644
--- a/keyboards/sendyyeah/pix/config.h
+++ b/keyboards/sendyyeah/pix/config.h
@@ -28,7 +28,6 @@
#define USB_MAX_POWER_CONSUMPTION 500
#define RGB_DI_PIN B5
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 15
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -47,4 +46,3 @@
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLIGHT_LAYERS
#define RGBLIGHT_LAYER_BLINK
-#endif
diff --git a/keyboards/sentraq/number_pad/config.h b/keyboards/sentraq/number_pad/config.h
index fe49e0c5210..0d1abf3c246 100644
--- a/keyboards/sentraq/number_pad/config.h
+++ b/keyboards/sentraq/number_pad/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 13
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,4 +34,3 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/sentraq/s60_x/rgb/config.h b/keyboards/sentraq/s60_x/rgb/config.h
index 85f6271c322..443b6d7649d 100644
--- a/keyboards/sentraq/s60_x/rgb/config.h
+++ b/keyboards/sentraq/s60_x/rgb/config.h
@@ -7,7 +7,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN F6
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -22,4 +21,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/sets3n/kk980/config.h b/keyboards/sets3n/kk980/config.h
index b360e531a88..734cdcc7ae1 100644
--- a/keyboards/sets3n/kk980/config.h
+++ b/keyboards/sets3n/kk980/config.h
@@ -34,7 +34,6 @@
#define RGBLIGHT_EFFECT_TWINKLE
#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 102
#define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,\
12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, \
@@ -50,7 +49,6 @@
#define RGBLIGHT_LIMIT_VAL 230
#define RGBLIGHT_LAYERS
#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#endif
#ifdef RGB_MATRIX_ENABLE
#define RGB_MATRIX_LED_COUNT RGBLED_NUM
diff --git a/keyboards/shambles/config.h b/keyboards/shambles/config.h
index db73ba34a9c..5f360813239 100644
--- a/keyboards/shambles/config.h
+++ b/keyboards/shambles/config.h
@@ -5,23 +5,3 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-/* key combination for command */
-
-
-#ifdef RGB_DI_PIN
-# define RGBLIGHT_EFFECT_BREATHING
-# define RGBLIGHT_EFFECT_RAINBOW_MOOD
-# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-# define RGBLIGHT_EFFECT_SNAKE
-# define RGBLIGHT_EFFECT_KNIGHT
-# define RGBLIGHT_EFFECT_CHRISTMAS
-# define RGBLIGHT_EFFECT_STATIC_GRADIENT
-# define RGBLIGHT_EFFECT_RGB_TEST
-# define RGBLIGHT_EFFECT_ALTERNATING
-# define RGBLIGHT_EFFECT_TWINKLE
-# define RGBLED_NUM 0
-# define RGBLIGHT_HUE_STEP 8
-# define RGBLIGHT_SAT_STEP 8
-# define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/silverbullet44/config.h b/keyboards/silverbullet44/config.h
index 70f72f1d000..f412f715e45 100644
--- a/keyboards/silverbullet44/config.h
+++ b/keyboards/silverbullet44/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see .
#define MASTER_RIGHT
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
//#define RGBLIGHT_SPLIT
#define RGBLED_SPLIT {26, 26}
#define RGBLED_NUM 52
@@ -66,7 +65,6 @@ along with this program. If not, see .
/*== customize knight effect ==*/
#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 6
#endif
-#endif
/* Audio */
#ifdef AUDIO_ENABLE
diff --git a/keyboards/skeletn87/hotswap/config.h b/keyboards/skeletn87/hotswap/config.h
index 7af4feb3631..6c80c4d3ee8 100644
--- a/keyboards/skeletn87/hotswap/config.h
+++ b/keyboards/skeletn87/hotswap/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN B3
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -35,4 +34,3 @@ along with this program. If not, see .
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 200
#define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/skeletn87/soldered/config.h b/keyboards/skeletn87/soldered/config.h
index 698eecb6fca..de02ac11f82 100644
--- a/keyboards/skeletn87/soldered/config.h
+++ b/keyboards/skeletn87/soldered/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN B2
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -35,4 +34,3 @@ along with this program. If not, see .
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 200
#define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/skeletonkbd/skeletonnumpad/config.h b/keyboards/skeletonkbd/skeletonnumpad/config.h
index c8ed85b89e6..b7b33999702 100644
--- a/keyboards/skeletonkbd/skeletonnumpad/config.h
+++ b/keyboards/skeletonkbd/skeletonnumpad/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D4
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 17
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -34,7 +33,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/sneakbox/aliceclone/config.h b/keyboards/sneakbox/aliceclone/config.h
index 31e6bd43c84..7c7cad23905 100644
--- a/keyboards/sneakbox/aliceclone/config.h
+++ b/keyboards/sneakbox/aliceclone/config.h
@@ -22,21 +22,3 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/sneakbox/disarray/ortho/config.h b/keyboards/sneakbox/disarray/ortho/config.h
index f71cc2ebbb2..25382dd5f1c 100644
--- a/keyboards/sneakbox/disarray/ortho/config.h
+++ b/keyboards/sneakbox/disarray/ortho/config.h
@@ -22,20 +22,3 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/sneakbox/disarray/staggered/config.h b/keyboards/sneakbox/disarray/staggered/config.h
index f71cc2ebbb2..25382dd5f1c 100644
--- a/keyboards/sneakbox/disarray/staggered/config.h
+++ b/keyboards/sneakbox/disarray/staggered/config.h
@@ -22,20 +22,3 @@ along with this program. If not, see .
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/soda/cherish/config.h b/keyboards/soda/cherish/config.h
index fdcd9d801bd..1f14d0f534c 100644
--- a/keyboards/soda/cherish/config.h
+++ b/keyboards/soda/cherish/config.h
@@ -39,7 +39,6 @@ along with this program. If not, see .
//#define NO_ACTION_ONESHOT
#define RGB_DI_PIN A13
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -54,4 +53,3 @@ along with this program. If not, see .
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
\ No newline at end of file
diff --git a/keyboards/soy20/config.h b/keyboards/soy20/config.h
index 6e73672c8d1..14fc40cd625 100644
--- a/keyboards/soy20/config.h
+++ b/keyboards/soy20/config.h
@@ -21,20 +21,3 @@ along with this program. If not, see .*/
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/spaceholdings/nebula12/config.h b/keyboards/spaceholdings/nebula12/config.h
index 8199836860b..36ed0fa73a5 100755
--- a/keyboards/spaceholdings/nebula12/config.h
+++ b/keyboards/spaceholdings/nebula12/config.h
@@ -41,7 +41,6 @@ along with this program. If not, see .
#define WS2812_SPI_SCK_PIN B13
#define RGB_DI_PIN B15
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 10 /* If number is smaller, buffer updates too fast causing glitches */
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -57,7 +56,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Backlight options */
diff --git a/keyboards/spaceholdings/nebula68/config.h b/keyboards/spaceholdings/nebula68/config.h
index a3b44e4afee..eaefff82df8 100755
--- a/keyboards/spaceholdings/nebula68/config.h
+++ b/keyboards/spaceholdings/nebula68/config.h
@@ -24,7 +24,6 @@ along with this program. If not, see .
#define WS2812_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
#define RGB_DI_PIN A7
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 10
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -40,7 +39,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Backlight options */
diff --git a/keyboards/star75/config.h b/keyboards/star75/config.h
index a9e98683c5e..5af3c1452a4 100644
--- a/keyboards/star75/config.h
+++ b/keyboards/star75/config.h
@@ -11,7 +11,6 @@ SPDX-License-Identifier: GPL-2.0-or-later */
#define RGB_DI_PIN B3
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -30,4 +29,3 @@ SPDX-License-Identifier: GPL-2.0-or-later */
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 180
#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#endif
diff --git a/keyboards/stello65/hs_rev1/config.h b/keyboards/stello65/hs_rev1/config.h
index 6511724728f..cf9c8a3b6b6 100644
--- a/keyboards/stello65/hs_rev1/config.h
+++ b/keyboards/stello65/hs_rev1/config.h
@@ -4,7 +4,6 @@
#pragma once
#define RGB_DI_PIN D0
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 4
//# define RGBLIGHT_HUE_STEP 8
//# define RGBLIGHT_SAT_STEP 8
@@ -22,7 +21,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/stello65/sl_rev1/config.h b/keyboards/stello65/sl_rev1/config.h
index 0247bae3a13..b806ad5cd68 100644
--- a/keyboards/stello65/sl_rev1/config.h
+++ b/keyboards/stello65/sl_rev1/config.h
@@ -4,7 +4,6 @@
#pragma once
#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 4
//# define RGBLIGHT_HUE_STEP 8
//# define RGBLIGHT_SAT_STEP 8
@@ -22,7 +21,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/studiokestra/bourgeau/config.h b/keyboards/studiokestra/bourgeau/config.h
index e17664611cb..2e9ef286153 100644
--- a/keyboards/studiokestra/bourgeau/config.h
+++ b/keyboards/studiokestra/bourgeau/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 24
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -36,7 +35,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/studiokestra/cascade/config.h b/keyboards/studiokestra/cascade/config.h
index d48b336fe73..08d63c80010 100644
--- a/keyboards/studiokestra/cascade/config.h
+++ b/keyboards/studiokestra/cascade/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 16
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/swiftrax/retropad/config.h b/keyboards/swiftrax/retropad/config.h
index 66a3ef6740e..49157532f21 100644
--- a/keyboards/swiftrax/retropad/config.h
+++ b/keyboards/swiftrax/retropad/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -33,7 +32,6 @@ along with this program. If not, see .
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
/*EEPROM for via*/
#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/takashicompany/center_enter/config.h b/keyboards/takashicompany/center_enter/config.h
index b2ec9d38956..49c2326a25d 100644
--- a/keyboards/takashicompany/center_enter/config.h
+++ b/keyboards/takashicompany/center_enter/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 6
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -34,7 +33,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/takashicompany/compacx/config.h b/keyboards/takashicompany/compacx/config.h
index 7ecb336fa1e..a095aa04c0a 100644
--- a/keyboards/takashicompany/compacx/config.h
+++ b/keyboards/takashicompany/compacx/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 12
# define RGBLED_SPLIT {6, 6}
# define RGBLIGHT_HUE_STEP 8
@@ -36,7 +35,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/takashicompany/dogtag/config.h b/keyboards/takashicompany/dogtag/config.h
index 2bb3073b6fb..6cc2fc87e50 100644
--- a/keyboards/takashicompany/dogtag/config.h
+++ b/keyboards/takashicompany/dogtag/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 4 * 2
# define RGBLED_SPLIT { 4, 4 }
# define RGBLIGHT_HUE_STEP 8
@@ -36,7 +35,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/takashicompany/endzone34/config.h b/keyboards/takashicompany/endzone34/config.h
index 48f3f2c1e42..4a26be606ec 100644
--- a/keyboards/takashicompany/endzone34/config.h
+++ b/keyboards/takashicompany/endzone34/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 9
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -36,7 +35,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/takashicompany/heavy_left/config.h b/keyboards/takashicompany/heavy_left/config.h
index 1b1e657583b..bacecb13db2 100644
--- a/keyboards/takashicompany/heavy_left/config.h
+++ b/keyboards/takashicompany/heavy_left/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 6 * 2
# define RGBLED_SPLIT {6, 6}
# define RGBLIGHT_HUE_STEP 8
@@ -36,7 +35,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/takashicompany/minizone/config.h b/keyboards/takashicompany/minizone/config.h
index 70c5c58f02a..f4d136f8089 100644
--- a/keyboards/takashicompany/minizone/config.h
+++ b/keyboards/takashicompany/minizone/config.h
@@ -4,7 +4,6 @@
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 11
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -20,7 +19,6 @@
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
//# define RGBLIGHT_EFFECT_RGB_TEST
//# define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/takashicompany/qoolee/config.h b/keyboards/takashicompany/qoolee/config.h
index b2ec9d38956..49c2326a25d 100644
--- a/keyboards/takashicompany/qoolee/config.h
+++ b/keyboards/takashicompany/qoolee/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 6
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -34,7 +33,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/takashicompany/radialex/config.h b/keyboards/takashicompany/radialex/config.h
index 28ef0950002..f6ab4c4b3aa 100644
--- a/keyboards/takashicompany/radialex/config.h
+++ b/keyboards/takashicompany/radialex/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 12
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/takashiski/hecomi/alpha/config.h b/keyboards/takashiski/hecomi/alpha/config.h
index 82e2bd70d6c..3f57dc23808 100644
--- a/keyboards/takashiski/hecomi/alpha/config.h
+++ b/keyboards/takashiski/hecomi/alpha/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see .
//#define USE_I2C
#define RGB_DI_PIN D4
- #ifdef RGB_DI_PIN
#define RGBLED_NUM 16
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
// #define RGBLIGHT_EFFECT_STATIC_GRADIENT
// #define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
- #endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/taleguers/taleguers75/config.h b/keyboards/taleguers/taleguers75/config.h
index d8fe1a3f66d..8ca22c4c3af 100644
--- a/keyboards/taleguers/taleguers75/config.h
+++ b/keyboards/taleguers/taleguers75/config.h
@@ -24,7 +24,6 @@
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -41,4 +40,3 @@
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/tanuki/config.h b/keyboards/tanuki/config.h
index abc8f0f6e05..4e8095c0bc4 100644
--- a/keyboards/tanuki/config.h
+++ b/keyboards/tanuki/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN D1
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -39,7 +38,6 @@ along with this program. If not, see .
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
#define RGBLIGHT_SLEEP
-#endif
#define TAPPING_TERM 200
/*
diff --git a/keyboards/teahouse/ayleen/config.h b/keyboards/teahouse/ayleen/config.h
index e172b87ae27..0c39df42725 100644
--- a/keyboards/teahouse/ayleen/config.h
+++ b/keyboards/teahouse/ayleen/config.h
@@ -6,7 +6,6 @@
#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 2
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -15,7 +14,6 @@
#define RGBLIGHT_LAYERS 2
#define RGBLIGHT_LAYER_BLINK
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
// generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/team0110/p1800fl/config.h b/keyboards/team0110/p1800fl/config.h
index 81132526c50..8f66213bc27 100644
--- a/keyboards/team0110/p1800fl/config.h
+++ b/keyboards/team0110/p1800fl/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
/* RGB Lighting */
#define RGB_DI_PIN C6
-#ifdef RGB_DI_PIN
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -36,7 +35,6 @@ along with this program. If not, see .
# define RGBLIGHT_VAL_STEP 8
# define RGBLIGHT_LIMIT_VAL 255
# define RGBLIGHT_SLEEP
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/tg4x/config.h b/keyboards/tg4x/config.h
index 83352fd922f..354e163b394 100644
--- a/keyboards/tg4x/config.h
+++ b/keyboards/tg4x/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/tkc/m0lly/config.h b/keyboards/tkc/m0lly/config.h
index 47d5d0c2dcd..1ffe54ec239 100644
--- a/keyboards/tkc/m0lly/config.h
+++ b/keyboards/tkc/m0lly/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D7
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 30
# define RGBLIGHT_HUE_STEP 5
# define RGBLIGHT_SAT_STEP 10
@@ -35,7 +34,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/tkc/osav2/config.h b/keyboards/tkc/osav2/config.h
index eec83e8dc0e..77c08941d7c 100644
--- a/keyboards/tkc/osav2/config.h
+++ b/keyboards/tkc/osav2/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D4
- #ifdef RGB_DI_PIN
#define RGBLED_NUM 9
// #define RGBLIGHT_HUE_STEP 10
// #define RGBLIGHT_SAT_STEP 17
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
- #endif
/*
* Feature disable options
diff --git a/keyboards/tkc/tkl_ab87/config.h b/keyboards/tkc/tkl_ab87/config.h
index dc3cfae9e63..af2168c7819 100644
--- a/keyboards/tkc/tkl_ab87/config.h
+++ b/keyboards/tkc/tkl_ab87/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see .
#define DYNAMIC_KEYMAP_LAYER_COUNT 2 //Reduced layer count due to memory space considerations
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 22
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -38,7 +37,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/tmo50/config.h b/keyboards/tmo50/config.h
index 267b5a65ace..d14e063f7d9 100644
--- a/keyboards/tmo50/config.h
+++ b/keyboards/tmo50/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 10
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/toad/config.h b/keyboards/toad/config.h
index b44dfaac527..5f360813239 100644
--- a/keyboards/toad/config.h
+++ b/keyboards/toad/config.h
@@ -5,20 +5,3 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/toffee_studio/blueberry/config.h b/keyboards/toffee_studio/blueberry/config.h
index ca65d24ae1b..72887d0490d 100644
--- a/keyboards/toffee_studio/blueberry/config.h
+++ b/keyboards/toffee_studio/blueberry/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN D0
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 22
/* RGB LED logical order map */
@@ -38,7 +37,6 @@
# define RGBLIGHT_EFFECT_CHRISTMAS
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/tokyokeyboard/alix40/config.h b/keyboards/tokyokeyboard/alix40/config.h
index d56a8a1a55f..bf30035c5c0 100644
--- a/keyboards/tokyokeyboard/alix40/config.h
+++ b/keyboards/tokyokeyboard/alix40/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -36,7 +35,6 @@ along with this program. If not, see .
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 10
#define RGBLIGHT_VAL_STEP 10
-#endif
/* Bluetooth */
#define BATTERY_LEVEL_PIN B6
diff --git a/keyboards/tokyokeyboard/tokyo60/config.h b/keyboards/tokyokeyboard/tokyo60/config.h
index bf86645ce54..c762abeac5e 100644
--- a/keyboards/tokyokeyboard/tokyo60/config.h
+++ b/keyboards/tokyokeyboard/tokyo60/config.h
@@ -10,7 +10,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN F7
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -25,4 +24,3 @@
#define RGBLIGHT_HUE_STEP 12
#define RGBLIGHT_SAT_STEP 12
#define RGBLIGHT_VAL_STEP 12
-#endif
diff --git a/keyboards/tominabox1/bigboy/config.h b/keyboards/tominabox1/bigboy/config.h
index b758c909d21..968161c7ea4 100755
--- a/keyboards/tominabox1/bigboy/config.h
+++ b/keyboards/tominabox1/bigboy/config.h
@@ -18,8 +18,6 @@
#define RGB_DI_PIN B5
-#ifdef RGB_DI_PIN
-
#define RGBLED_NUM 5
#define RGBLIGHT_HUE_STEP 8
@@ -35,5 +33,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-
-#endif /* RGB_DI_PIN */
diff --git a/keyboards/tominabox1/qaz/config.h b/keyboards/tominabox1/qaz/config.h
index e842bb0714e..05c3c915394 100644
--- a/keyboards/tominabox1/qaz/config.h
+++ b/keyboards/tominabox1/qaz/config.h
@@ -7,7 +7,6 @@
#define RGB_DI_PIN F7
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -22,4 +21,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/tr60w/config.h b/keyboards/tr60w/config.h
index 57fac54322f..dadd48d994e 100644
--- a/keyboards/tr60w/config.h
+++ b/keyboards/tr60w/config.h
@@ -7,7 +7,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN F7
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -22,4 +21,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/tszaboo/ortho4exent/config.h b/keyboards/tszaboo/ortho4exent/config.h
index ed4b55a4837..07495a6099b 100644
--- a/keyboards/tszaboo/ortho4exent/config.h
+++ b/keyboards/tszaboo/ortho4exent/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN B6
- #ifdef RGB_DI_PIN
#define RGBLED_NUM 18
#define RGBLIGHT_HUE_STEP 8
@@ -36,7 +35,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
- #endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/ubest/vn/config.h b/keyboards/ubest/vn/config.h
index 3922bd82518..5b5632009c6 100644
--- a/keyboards/ubest/vn/config.h
+++ b/keyboards/ubest/vn/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -33,4 +32,3 @@
// #define RGBLIGHT_EFFECT_STATIC_GRADIENT
// #define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
diff --git a/keyboards/uk78/config.h b/keyboards/uk78/config.h
index da31c3d9333..71422531366 100644
--- a/keyboards/uk78/config.h
+++ b/keyboards/uk78/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see .
/* ws2812b options */
#define RGB_DI_PIN F6
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -40,4 +39,3 @@ along with this program. If not, see .
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/unison/keymaps/via/config.h b/keyboards/unison/keymaps/via/config.h
index 8475af2baab..48fe417a5dc 100644
--- a/keyboards/unison/keymaps/via/config.h
+++ b/keyboards/unison/keymaps/via/config.h
@@ -16,10 +16,8 @@
#pragma once
-#ifdef RGB_DI_PIN
#undef RGBLED_NUM
#define RGBLED_NUM 17 // Layer Indicator(2) + Rotary Encoder(5) + Optional(2) + Under(8)
#undef RGBLIGHT_LED_MAP
#define RGBLIGHT_LED_MAP {2, 0, 1, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16} // Left to Right to Under
-#endif
diff --git a/keyboards/unison/keymaps/via/keymap.c b/keyboards/unison/keymaps/via/keymap.c
index fe3ff4e82f3..f61574ac123 100644
--- a/keyboards/unison/keymaps/via/keymap.c
+++ b/keyboards/unison/keymaps/via/keymap.c
@@ -128,10 +128,8 @@ layer_state_t layer_state_set_user(layer_state_t state) {
Post Initialize
------------------------------------------------------------------------------ */
void keyboard_post_init_user(void) {
- #ifdef RGB_DI_PIN
// RGB Lighting: Set effect range from just after indicator.
rgblight_set_effect_range(1, 16);
- #endif
#ifdef RGBLIGHT_LAYERS
// RGB Lighting Layers: Setup LED layers
rgblight_layers = my_rgb_layers;
diff --git a/keyboards/unison/v04/config.h b/keyboards/unison/v04/config.h
index ea285f40829..27309c9b727 100644
--- a/keyboards/unison/v04/config.h
+++ b/keyboards/unison/v04/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see .
/* RGB Lighting */
#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 7 // Layer Indicator(2) + Rotary Encoder(5)
#define RGBLIGHT_LED_MAP {1, 2, 0, 3, 4, 5, 6} // align LEDs from Left to Right
#define RGBLIGHT_HUE_STEP 4
@@ -49,7 +48,6 @@ along with this program. If not, see .
// #define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/*
* Feature disable options
diff --git a/keyboards/utd80/config.h b/keyboards/utd80/config.h
index ad29207062d..73f9e9e2c24 100644
--- a/keyboards/utd80/config.h
+++ b/keyboards/utd80/config.h
@@ -22,7 +22,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -37,4 +36,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/viktus/omnikey_bh/config.h b/keyboards/viktus/omnikey_bh/config.h
index d035c79a906..ada0ff6e76d 100644
--- a/keyboards/viktus/omnikey_bh/config.h
+++ b/keyboards/viktus/omnikey_bh/config.h
@@ -8,20 +8,3 @@
/* force n-key rollover*/
#define FORCE_NKRO
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/viktus/z150_bh/config.h b/keyboards/viktus/z150_bh/config.h
index d035c79a906..ada0ff6e76d 100644
--- a/keyboards/viktus/z150_bh/config.h
+++ b/keyboards/viktus/z150_bh/config.h
@@ -8,20 +8,3 @@
/* force n-key rollover*/
#define FORCE_NKRO
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/waldo/config.h b/keyboards/waldo/config.h
index 097b1818aed..bdb41e4e570 100644
--- a/keyboards/waldo/config.h
+++ b/keyboards/waldo/config.h
@@ -40,7 +40,6 @@ along with this program. If not, see .
// RGB LED
#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -56,4 +55,3 @@ along with this program. If not, see .
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/walletburner/cajal/config.h b/keyboards/walletburner/cajal/config.h
index 9b9506927fa..0bc18e3730e 100644
--- a/keyboards/walletburner/cajal/config.h
+++ b/keyboards/walletburner/cajal/config.h
@@ -23,7 +23,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN F7
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -38,4 +37,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/walletburner/neuron/config.h b/keyboards/walletburner/neuron/config.h
index 905e59e17e4..92f42ed9011 100644
--- a/keyboards/walletburner/neuron/config.h
+++ b/keyboards/walletburner/neuron/config.h
@@ -8,7 +8,6 @@
#define RGB_DI_PIN B1
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -23,4 +22,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/wavtype/foundation/config.h b/keyboards/wavtype/foundation/config.h
index 91ce68b9386..67683c158cf 100644
--- a/keyboards/wavtype/foundation/config.h
+++ b/keyboards/wavtype/foundation/config.h
@@ -4,7 +4,6 @@
#pragma once
#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 16
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -21,7 +20,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/wavtype/p01_ultra/config.h b/keyboards/wavtype/p01_ultra/config.h
index 534b0f83dad..1db4974e40e 100644
--- a/keyboards/wavtype/p01_ultra/config.h
+++ b/keyboards/wavtype/p01_ultra/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 18
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -35,7 +34,6 @@ along with this program. If not, see .
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/westfoxtrot/aanzee/config.h b/keyboards/westfoxtrot/aanzee/config.h
index c1e79e76991..bca35e1b853 100644
--- a/keyboards/westfoxtrot/aanzee/config.h
+++ b/keyboards/westfoxtrot/aanzee/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 9
#define RGBLIGHT_HUE_STEP 12
#define RGBLIGHT_SAT_STEP 25
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
#define RGBW
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/config.h b/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/config.h
index 947e340c323..080681e53f4 100644
--- a/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/config.h
+++ b/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN F7
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 15
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -28,6 +27,5 @@
#define RGBLIGHT_EFFECT_KNIGHT
#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 5
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
- #endif
// place overrides here
diff --git a/keyboards/westfoxtrot/cypher/rev5/config.h b/keyboards/westfoxtrot/cypher/rev5/config.h
index 050bb413f79..b4cdf23d933 100644
--- a/keyboards/westfoxtrot/cypher/rev5/config.h
+++ b/keyboards/westfoxtrot/cypher/rev5/config.h
@@ -28,7 +28,6 @@ along with this program. If not, see .
#define GRAVE_ESC_CTRL_OVERRIDE
#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 10
#define RGBLIGHT_HUE_STEP 12
#define RGBLIGHT_SAT_STEP 25
@@ -45,4 +44,3 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/wilba_tech/wt70_jb/config.h b/keyboards/wilba_tech/wt70_jb/config.h
index afc09fb5fe5..50759df7815 100644
--- a/keyboards/wilba_tech/wt70_jb/config.h
+++ b/keyboards/wilba_tech/wt70_jb/config.h
@@ -22,7 +22,6 @@
// RGBLIGHT configuation
#define RGB_DI_PIN B2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 2
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -37,4 +36,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/wolfmarkclub/wm1/config.h b/keyboards/wolfmarkclub/wm1/config.h
index 93b0d14a3a8..9a3613f6c51 100644
--- a/keyboards/wolfmarkclub/wm1/config.h
+++ b/keyboards/wolfmarkclub/wm1/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN A3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 18
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/wsk/alpha9/config.h b/keyboards/wsk/alpha9/config.h
index 9796f37b97f..9a9dd8e4701 100644
--- a/keyboards/wsk/alpha9/config.h
+++ b/keyboards/wsk/alpha9/config.h
@@ -23,7 +23,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN F4
-#ifdef RGB_DI_PIN
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -38,4 +37,3 @@
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/wsk/g4m3ralpha/config.h b/keyboards/wsk/g4m3ralpha/config.h
index 98d3d12d3d0..657fe0e273f 100644
--- a/keyboards/wsk/g4m3ralpha/config.h
+++ b/keyboards/wsk/g4m3ralpha/config.h
@@ -23,7 +23,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN F4
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -38,4 +37,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/wsk/gothic50/config.h b/keyboards/wsk/gothic50/config.h
index b893b35e691..1ad6c6652b6 100644
--- a/keyboards/wsk/gothic50/config.h
+++ b/keyboards/wsk/gothic50/config.h
@@ -1,7 +1,6 @@
#pragma once
#define RGB_DI_PIN F7
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -16,7 +15,6 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/wsk/gothic70/config.h b/keyboards/wsk/gothic70/config.h
index de29eadb143..ad03105a86c 100644
--- a/keyboards/wsk/gothic70/config.h
+++ b/keyboards/wsk/gothic70/config.h
@@ -1,7 +1,6 @@
#pragma once
#define RGB_DI_PIN F4
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -16,7 +15,6 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/wsk/jerkin/config.h b/keyboards/wsk/jerkin/config.h
index 68d4a8fef74..5f360813239 100644
--- a/keyboards/wsk/jerkin/config.h
+++ b/keyboards/wsk/jerkin/config.h
@@ -5,20 +5,3 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-// #define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/wsk/kodachi50/config.h b/keyboards/wsk/kodachi50/config.h
index eecc8ba082f..3227e9a0872 100644
--- a/keyboards/wsk/kodachi50/config.h
+++ b/keyboards/wsk/kodachi50/config.h
@@ -7,7 +7,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -22,4 +21,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/wsk/pain27/config.h b/keyboards/wsk/pain27/config.h
index 5ddf06145f5..56fee4fd44d 100644
--- a/keyboards/wsk/pain27/config.h
+++ b/keyboards/wsk/pain27/config.h
@@ -7,7 +7,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN D1
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -22,4 +21,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/wsk/sl40/config.h b/keyboards/wsk/sl40/config.h
index ed32129b597..80d7ef3f3da 100644
--- a/keyboards/wsk/sl40/config.h
+++ b/keyboards/wsk/sl40/config.h
@@ -23,7 +23,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN F1
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -38,4 +37,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/wsk/tkl30/config.h b/keyboards/wsk/tkl30/config.h
index 4cb0e034be7..4decec3392b 100644
--- a/keyboards/wsk/tkl30/config.h
+++ b/keyboards/wsk/tkl30/config.h
@@ -7,7 +7,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN B1
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -22,4 +21,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/wuque/creek70/config.h b/keyboards/wuque/creek70/config.h
index 4f17871ab05..89b02120ac4 100644
--- a/keyboards/wuque/creek70/config.h
+++ b/keyboards/wuque/creek70/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN D0
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 7
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -34,4 +33,3 @@
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/wuque/ikki68/config.h b/keyboards/wuque/ikki68/config.h
index 53b28706403..a73d36b72a7 100644
--- a/keyboards/wuque/ikki68/config.h
+++ b/keyboards/wuque/ikki68/config.h
@@ -24,7 +24,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -42,4 +41,3 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/wuque/ikki68_aurora/config.h b/keyboards/wuque/ikki68_aurora/config.h
index 496e22c07a5..26d5f82b09c 100644
--- a/keyboards/wuque/ikki68_aurora/config.h
+++ b/keyboards/wuque/ikki68_aurora/config.h
@@ -24,7 +24,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 20
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -42,4 +41,3 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/wuque/promise87/ansi/config.h b/keyboards/wuque/promise87/ansi/config.h
index 814dbd2d02f..fde25201aab 100644
--- a/keyboards/wuque/promise87/ansi/config.h
+++ b/keyboards/wuque/promise87/ansi/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 1
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -28,4 +27,3 @@
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#endif
diff --git a/keyboards/wuque/promise87/wkl/config.h b/keyboards/wuque/promise87/wkl/config.h
index 814dbd2d02f..fde25201aab 100644
--- a/keyboards/wuque/promise87/wkl/config.h
+++ b/keyboards/wuque/promise87/wkl/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 1
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -28,4 +27,3 @@
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#endif
diff --git a/keyboards/xiudi/xd75/config.h b/keyboards/xiudi/xd75/config.h
index 644c29d1fd2..0824eae60ee 100644
--- a/keyboards/xiudi/xd75/config.h
+++ b/keyboards/xiudi/xd75/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN F6
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 6
# define RGBLIGHT_HUE_STEP 12
# define RGBLIGHT_SAT_STEP 25
@@ -35,7 +34,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/xiudi/xd84pro/config.h b/keyboards/xiudi/xd84pro/config.h
index ed2af55ce63..ec27530f45f 100644
--- a/keyboards/xiudi/xd84pro/config.h
+++ b/keyboards/xiudi/xd84pro/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGB_DI_PIN F6
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 12
// #define RGBLIGHT_HUE_STEP 8
// #define RGBLIGHT_SAT_STEP 8
@@ -34,7 +33,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/xiudi/xd87/config.h b/keyboards/xiudi/xd87/config.h
index 29c8abfb23d..a5020cc807c 100644
--- a/keyboards/xiudi/xd87/config.h
+++ b/keyboards/xiudi/xd87/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -33,7 +32,6 @@ along with this program. If not, see .
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/xmmx/config.h b/keyboards/xmmx/config.h
index b44dfaac527..5f360813239 100644
--- a/keyboards/xmmx/config.h
+++ b/keyboards/xmmx/config.h
@@ -5,20 +5,3 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/ydkb/yd68/config.h b/keyboards/ydkb/yd68/config.h
index 788e0e02fe8..d47f6e39928 100644
--- a/keyboards/ydkb/yd68/config.h
+++ b/keyboards/ydkb/yd68/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN B3
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -33,7 +32,6 @@ along with this program. If not, see .
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
/*
* Feature disable options
diff --git a/keyboards/yeehaw/config.h b/keyboards/yeehaw/config.h
index 4ead2dc6f27..63780b4581b 100644
--- a/keyboards/yeehaw/config.h
+++ b/keyboards/yeehaw/config.h
@@ -16,7 +16,6 @@
#pragma once
#define RGB_DI_PIN B2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 7
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -33,4 +32,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/ymdk/melody96/config.h b/keyboards/ymdk/melody96/config.h
index 782e711cfd7..56495cac2c6 100644
--- a/keyboards/ymdk/melody96/config.h
+++ b/keyboards/ymdk/melody96/config.h
@@ -7,7 +7,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -22,4 +21,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/ymdk/np24/u4rgb6/config.h b/keyboards/ymdk/np24/u4rgb6/config.h
index cbb4974c099..3ab1f3b6042 100644
--- a/keyboards/ymdk/np24/u4rgb6/config.h
+++ b/keyboards/ymdk/np24/u4rgb6/config.h
@@ -16,7 +16,6 @@
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 6
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -28,4 +27,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/ymdk/wings/config.h b/keyboards/ymdk/wings/config.h
index 013df9fa123..d1812a65edc 100644
--- a/keyboards/ymdk/wings/config.h
+++ b/keyboards/ymdk/wings/config.h
@@ -16,7 +16,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 14
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -33,5 +32,3 @@ along with this program. If not, see .
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-
-#endif
diff --git a/keyboards/ymdk/wingshs/config.h b/keyboards/ymdk/wingshs/config.h
index 034d338d351..84b368eb330 100644
--- a/keyboards/ymdk/wingshs/config.h
+++ b/keyboards/ymdk/wingshs/config.h
@@ -14,7 +14,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 80
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -31,7 +30,3 @@ along with this program. If not, see .
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 160 /* The maximum brightness level */
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-
-#endif
-
-
diff --git a/keyboards/ymdk/ymd67/config.h b/keyboards/ymdk/ymd67/config.h
index dc7ebdc8bc9..c78fae6957c 100644
--- a/keyboards/ymdk/ymd67/config.h
+++ b/keyboards/ymdk/ymd67/config.h
@@ -6,7 +6,6 @@
/* prevent stuck modifiers */
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -21,4 +20,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/yoichiro/lunakey_macro/config.h b/keyboards/yoichiro/lunakey_macro/config.h
index 504d6ba5411..4e835b92f32 100644
--- a/keyboards/yoichiro/lunakey_macro/config.h
+++ b/keyboards/yoichiro/lunakey_macro/config.h
@@ -31,7 +31,6 @@ along with this program. If not, see .
#define DYNAMIC_KEYMAP_LAYER_COUNT 3
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 5
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -49,7 +48,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/*
* Feature disable options
diff --git a/keyboards/yoichiro/lunakey_mini/config.h b/keyboards/yoichiro/lunakey_mini/config.h
index b674473983d..4d680d53062 100644
--- a/keyboards/yoichiro/lunakey_mini/config.h
+++ b/keyboards/yoichiro/lunakey_mini/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 12
#define RGBLIGHT_SPLIT
#define RGBLED_SPLIT { 6, 6 }
@@ -39,7 +38,6 @@ along with this program. If not, see .
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Audio Support */
#define AUDIO_PIN C6
diff --git a/keyboards/yushakobo/navpad/10/config.h b/keyboards/yushakobo/navpad/10/config.h
index 4a567f22b19..3b3c9b14dc0 100644
--- a/keyboards/yushakobo/navpad/10/config.h
+++ b/keyboards/yushakobo/navpad/10/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 9
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -34,7 +33,6 @@ along with this program. If not, see .
//# define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_RGB_TEST
//# define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* disable action features */
//#define NO_ACTION_LAYER
diff --git a/keyboards/yushakobo/navpad/10/keymaps/default/config.h b/keyboards/yushakobo/navpad/10/keymaps/default/config.h
index b4d2122ab4e..10ba897cceb 100644
--- a/keyboards/yushakobo/navpad/10/keymaps/default/config.h
+++ b/keyboards/yushakobo/navpad/10/keymaps/default/config.h
@@ -17,9 +17,5 @@ along with this program. If not, see .
#pragma once
-#ifdef RGB_DI_PIN
-
#define RGBLIGHT_LAYERS
#define RGBLIGHT_MAX_LAYERS 6
-
-#endif
diff --git a/keyboards/yushakobo/navpad/10/keymaps/via/config.h b/keyboards/yushakobo/navpad/10/keymaps/via/config.h
index b4d2122ab4e..10ba897cceb 100644
--- a/keyboards/yushakobo/navpad/10/keymaps/via/config.h
+++ b/keyboards/yushakobo/navpad/10/keymaps/via/config.h
@@ -17,9 +17,5 @@ along with this program. If not, see .
#pragma once
-#ifdef RGB_DI_PIN
-
#define RGBLIGHT_LAYERS
#define RGBLIGHT_MAX_LAYERS 6
-
-#endif
diff --git a/keyboards/yushakobo/navpad/10/rev1/config.h b/keyboards/yushakobo/navpad/10/rev1/config.h
index 4c69a35deac..d4a4e48d776 100644
--- a/keyboards/yushakobo/navpad/10/rev1/config.h
+++ b/keyboards/yushakobo/navpad/10/rev1/config.h
@@ -17,6 +17,4 @@ along with this program. If not, see .
#pragma once
-#ifdef RGB_DI_PIN
# define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 8, 7 }
-#endif
diff --git a/keyboards/yushakobo/navpad/10_helix_r/config.h b/keyboards/yushakobo/navpad/10_helix_r/config.h
index ae49a16f3b1..5b59cf5d5ea 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/config.h
+++ b/keyboards/yushakobo/navpad/10_helix_r/config.h
@@ -19,17 +19,14 @@ along with this program. If not, see .
#define EE_HANDS
-#ifdef RGB_DI_PIN
-# define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 8, 7, \//navpad side
- 9, 10, 11, 12, 13, 14, \//helix side
+# define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 8, 7, \
+ 9, 10, 11, 12, 13, 14, \
20, 19, 18, 17, 16, 15, \
21, 22, 23, 24, 25, 26, \
33, 32, 31, 30, 29, 28, 27, \
34, 35, 36, 37, 38, 39, 40 }
-#endif
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 9+32
# define RGBLED_SPLIT { 9, 32 }
# define RGBLIGHT_HUE_STEP 8
@@ -46,7 +43,6 @@ along with this program. If not, see .
//# define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_RGB_TEST
//# define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* disable action features */
//#define NO_ACTION_LAYER
diff --git a/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/config.h b/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/config.h
index b4d2122ab4e..10ba897cceb 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/config.h
+++ b/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/config.h
@@ -17,9 +17,5 @@ along with this program. If not, see .
#pragma once
-#ifdef RGB_DI_PIN
-
#define RGBLIGHT_LAYERS
#define RGBLIGHT_MAX_LAYERS 6
-
-#endif
diff --git a/keyboards/yynmt/dozen0/config.h b/keyboards/yynmt/dozen0/config.h
index 4994ead6bcf..2eafd245863 100644
--- a/keyboards/yynmt/dozen0/config.h
+++ b/keyboards/yynmt/dozen0/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -33,7 +32,6 @@ along with this program. If not, see .
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/zj68/config.h b/keyboards/zj68/config.h
index 2df5b9daaf5..b60f50713b6 100644
--- a/keyboards/zj68/config.h
+++ b/keyboards/zj68/config.h
@@ -24,7 +24,6 @@ along with this program. If not, see .
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -39,4 +38,3 @@ along with this program. If not, see .
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/zlant/config.h b/keyboards/zlant/config.h
index f6311ba0132..b66aed55c74 100755
--- a/keyboards/zlant/config.h
+++ b/keyboards/zlant/config.h
@@ -7,7 +7,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN D6
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -22,4 +21,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/layouts/community/60_iso/unxmaal/config.h b/layouts/community/60_iso/unxmaal/config.h
index 026f20dc8f8..63d02fc807d 100644
--- a/layouts/community/60_iso/unxmaal/config.h
+++ b/layouts/community/60_iso/unxmaal/config.h
@@ -17,8 +17,7 @@ along with this program. If not, see .
#pragma once
-#ifndef RGB_DI_PIN
- #define RGB_DI_PIN F4
+#define RGB_DI_PIN F4
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -33,4 +32,3 @@ along with this program. If not, see .
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/users/miles2go/keymaps/handwired/ms_sculpt_mobile/keymap.c b/users/miles2go/keymaps/handwired/ms_sculpt_mobile/keymap.c
index 17122f4a639..12547ec5085 100644
--- a/users/miles2go/keymaps/handwired/ms_sculpt_mobile/keymap.c
+++ b/users/miles2go/keymaps/handwired/ms_sculpt_mobile/keymap.c
@@ -248,9 +248,7 @@ void keyboard_post_init_user(void) {
void matrix_init_user(void) {
#ifdef RGBLIGHT_ENABLE
- #ifdef RGB_DI_PIN
rgblight_setrgb(RGB_GREEN);
- #endif
#endif //RGB_matrix
}