diff --git a/keyboards/42keebs/basketweave_s/config.h b/keyboards/42keebs/basketweave_s/config.h
index c1c4e05802..5cc200d0ff 100644
--- a/keyboards/42keebs/basketweave_s/config.h
+++ b/keyboards/42keebs/basketweave_s/config.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#include "config_common.h"
-
 #define VENDOR_ID       0x6B62
 #define PRODUCT_ID      0x6869
 #define DEVICE_VER      0x0001
diff --git a/keyboards/42keebs/mysterium/config.h b/keyboards/42keebs/mysterium/config.h
index b5aad178b8..6fb30c61f9 100644
--- a/keyboards/42keebs/mysterium/config.h
+++ b/keyboards/42keebs/mysterium/config.h
@@ -16,8 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
-
 #define VENDOR_ID       0x6B62
 #define PRODUCT_ID      0x8769
 #define DEVICE_VER      0x0001
diff --git a/keyboards/argo_works/ishi/80/mk0_avr/config.h b/keyboards/argo_works/ishi/80/mk0_avr/config.h
index 9f36bc521d..7c15e5faa7 100644
--- a/keyboards/argo_works/ishi/80/mk0_avr/config.h
+++ b/keyboards/argo_works/ishi/80/mk0_avr/config.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include "config_common.h"
-
 #define BOOTMAGIC_LITE_ROW 1
 #define BOOTMAGIC_LITE_COLUMN 0
 
diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/config.h b/keyboards/argo_works/ishi/80/mk0_avr_extra/config.h
index eef1ee614e..24cb7ccfa5 100644
--- a/keyboards/argo_works/ishi/80/mk0_avr_extra/config.h
+++ b/keyboards/argo_works/ishi/80/mk0_avr_extra/config.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include "config_common.h"
-
 #define BOOTMAGIC_LITE_ROW 1
 #define BOOTMAGIC_LITE_COLUMN 0
 
diff --git a/keyboards/binepad/kn01/config.h b/keyboards/binepad/kn01/config.h
index 7fbf1cfab1..c408f95d38 100644
--- a/keyboards/binepad/kn01/config.h
+++ b/keyboards/binepad/kn01/config.h
@@ -3,7 +3,5 @@
 
 #pragma once
 
-#include "config_common.h"
-
 #define WEAR_LEVELING_LOGICAL_SIZE 1024
 #define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
diff --git a/keyboards/crkbd/keymaps/vial/config.h b/keyboards/crkbd/keymaps/vial/config.h
index 604e928071..1036296872 100644
--- a/keyboards/crkbd/keymaps/vial/config.h
+++ b/keyboards/crkbd/keymaps/vial/config.h
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 4
 #define TAPPING_TERM 180
-#define IGNORE_MOD_TAP_INTERRUPT
 
 //#define USE_MATRIX_I2C
 #ifdef KEYBOARD_crkbd_rev1_legacy
diff --git a/keyboards/doio/kb04/config.h b/keyboards/doio/kb04/config.h
index b9e243defb..b3f17583d6 100644
--- a/keyboards/doio/kb04/config.h
+++ b/keyboards/doio/kb04/config.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#include "config_common.h"
-
 /* key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 8
@@ -38,7 +36,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
     /* RGB Matrix config */
-    #define RGB_DI_PIN A10
+    #define WS2812_DI_PIN A10
     #define RGB_MATRIX_LED_COUNT 8
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
     #define RGB_MATRIX_STARTUP_SPD 30
diff --git a/keyboards/fancy_customs/aletheia/config.h b/keyboards/fancy_customs/aletheia/config.h
index 487e0b0888..83b8711ad5 100644
--- a/keyboards/fancy_customs/aletheia/config.h
+++ b/keyboards/fancy_customs/aletheia/config.h
@@ -42,9 +42,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-#define RGB_DI_PIN B7
+#define WS2812_DI_PIN B7
 
-#ifdef RGB_DI_PIN
+#ifdef WS2812_DI_PIN
 	#define RGBLED_NUM 23
 	#define RGBLIGHT_HUE_STEP 8
 	#define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/getawayvan/config.h b/keyboards/getawayvan/config.h
index 870470f507..41544af8fa 100644
--- a/keyboards/getawayvan/config.h
+++ b/keyboards/getawayvan/config.h
@@ -32,7 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { A9, A8, A3, A5 }
 #define DIODE_DIRECTION COL2ROW
 
-#define RGB_DI_PIN B15
+#define WS2812_DI_PIN B15
 #define RGB_MATRIX_LED_COUNT 51
 #define RGBLED_NUM 51
 #define WS2812_SPI SPID2
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/vial/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/vial/config.h
index 8015d795b1..00e66fa38c 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/vial/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/vial/config.h
@@ -17,8 +17,6 @@
 
 #pragma once
 
-#include "config_common.h"
-
 #define DRIVER_1_LED_TOTAL 66
 #define DRIVER_2_LED_TOTAL 32
 #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/vial/config.h b/keyboards/gmmk/pro/rev1/iso/keymaps/vial/config.h
index 8f0c1e9686..5948625784 100644
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/vial/config.h
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/vial/config.h
@@ -17,8 +17,6 @@
 
 #pragma once
 
-#include "config_common.h"
-
 #define DRIVER_1_LED_TOTAL 66
 #define DRIVER_2_LED_TOTAL 33
 #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/grezeh/larva/larva2/config.h b/keyboards/grezeh/larva/larva2/config.h
index d61a1eb063..b614a40e70 100644
--- a/keyboards/grezeh/larva/larva2/config.h
+++ b/keyboards/grezeh/larva/larva2/config.h
@@ -63,7 +63,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #undef RGBLED_NUM
 //#define RGBLIGHT_EFFECT_STATIC_GRADIENT
 //#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGB_DI_PIN B5
+#define WS2812_DI_PIN B5
 #define RGBLED_NUM 2
 #define RGBLIGHT_DEFAULT_MODE	RGBLIGHT_MODE_STATIC_LIGHT
 #define RGBLIGHT_DEFAULT_HUE 222
diff --git a/keyboards/lazydesigners/apricot/config.h b/keyboards/lazydesigners/apricot/config.h
index 01e59975b6..2a80f87205 100644
--- a/keyboards/lazydesigners/apricot/config.h
+++ b/keyboards/lazydesigners/apricot/config.h
@@ -34,8 +34,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 
 /* RBG underglow */
-#define RGB_DI_PIN B3
-#ifdef RGB_DI_PIN
+#define WS2812_DI_PIN B3
+#ifdef WS2812_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD   
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mechwild/bde/rev2/keymaps/vial/config.h b/keyboards/mechwild/bde/rev2/keymaps/vial/config.h
index e2ec0a3241..e84c7697b7 100644
--- a/keyboards/mechwild/bde/rev2/keymaps/vial/config.h
+++ b/keyboards/mechwild/bde/rev2/keymaps/vial/config.h
@@ -15,8 +15,6 @@
  */
 
 #pragma once
-/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/
-#define IGNORE_MOD_TAP_INTERRUPT
 
 /* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/
 #define TAPPING_TERM 250
diff --git a/keyboards/mnk65_stm32/config.h b/keyboards/mnk65_stm32/config.h
index b539cb6348..cd01cea4b4 100644
--- a/keyboards/mnk65_stm32/config.h
+++ b/keyboards/mnk65_stm32/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-#include "config_common.h"
-
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
diff --git a/keyboards/rainkeebs/plop/config.h b/keyboards/rainkeebs/plop/config.h
index db7d4ead0b..ad07b06d1f 100644
--- a/keyboards/rainkeebs/plop/config.h
+++ b/keyboards/rainkeebs/plop/config.h
@@ -39,8 +39,8 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
+#define WS2812_DI_PIN F0
+#ifdef WS2812_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/reviung/reviung34/keymaps/vial/config.h b/keyboards/reviung/reviung34/keymaps/vial/config.h
index bf2525d1cc..56bbda1b3d 100644
--- a/keyboards/reviung/reviung34/keymaps/vial/config.h
+++ b/keyboards/reviung/reviung34/keymaps/vial/config.h
@@ -5,8 +5,8 @@
 #define VIAL_UNLOCK_COMBO_COLS {0, 5}
 
 // the non split version
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
+#define WS2812_DI_PIN D3
+#ifdef WS2812_DI_PIN
   #define RGBLED_NUM 9
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
diff --git a/keyboards/velocifire/sun20pro/config.h b/keyboards/velocifire/sun20pro/config.h
index 3781accbcc..91d8c6c8ee 100644
--- a/keyboards/velocifire/sun20pro/config.h
+++ b/keyboards/velocifire/sun20pro/config.h
@@ -42,7 +42,7 @@
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES
 
-#define RGB_DI_PIN C7
+#define WS2812_DI_PIN C7
 // RGB Matrix
 #   ifdef RGB_MATRIX_ENABLE
 #       define RGB_MATRIX_LED_COUNT 25