diff --git a/keyboards/yandrstudio/tdcq64_2s/config.h b/keyboards/yandrstudio/tdcq64_2s/config.h
index 72924dff784a..ec52a6c91d2d 100644
--- a/keyboards/yandrstudio/tdcq64_2s/config.h
+++ b/keyboards/yandrstudio/tdcq64_2s/config.h
@@ -49,33 +49,8 @@
#define DEBOUNCE 5
-
-/* RGN Matrix */
-#ifdef RGB_MATRIX_ENABLE
-
-# define RGB_DI_PIN A7
-# define RGBLED_NUM 2
-# define DRIVER_LED_TOTAL RGBLED_NUM
-
-
-# define WS2812_SPI SPID1 // default: SPID1
-# define WS2812_SPI_MOSI_PAL_MODE 5
-
-# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
-# define RGBLIGHT_VAL_STEP 18
-# define RGB_DISABLE_WHEN_USB_SUSPENDED true
-# define RGB_MATRIX_CENTER { 32, 96 }
-# define RGB_MATRIX_KEYPRESSES
-# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-#endif
-
#define LED_CAPS_LOCK_PIN A5
#define LED_PIN_ON_STATE 0
-#define BACKLIGHT_PIN A6
-#define BACKLIGHT_BREATHING
-#define BACKLIGHT_PWM_DRIVER PWMD3
-#define BACKLIGHT_PWM_CHANNEL 1
-#define BACKLIGHT_PAL_MODE 2
+
diff --git a/keyboards/yandrstudio/tdcq64_2s/f401/board.h b/keyboards/yandrstudio/tdcq64_2s/f401/board.h
index 1b34ad76c1b9..d6432824e162 100644
--- a/keyboards/yandrstudio/tdcq64_2s/f401/board.h
+++ b/keyboards/yandrstudio/tdcq64_2s/f401/board.h
@@ -17,8 +17,9 @@
#include_next "board.h"
-#undef STM32_HSE_BYPASS
-#ifdef STM32_HSECLK
+
#undef STM32_HSECLK
-#endif // STM32_HSECLK
#define STM32_HSECLK 8000000
+
+
+#define BOARD_YANDR_BIU_F401
diff --git a/keyboards/yandrstudio/tdcq64_2s/f401/chconf.h b/keyboards/yandrstudio/tdcq64_2s/f401/chconf.h
new file mode 100644
index 000000000000..4820db8dcbeb
--- /dev/null
+++ b/keyboards/yandrstudio/tdcq64_2s/f401/chconf.h
@@ -0,0 +1,34 @@
+/* Copyright 2020 QMK
+ *
+ * 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
+
+#define CH_CFG_ST_FREQUENCY 10000
+
+#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
+
+#define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
+
+#define CH_CFG_FACTORY_SEMAPHORES TRUE
+
+#define CH_CFG_FACTORY_MAILBOXES TRUE
+
+#define CH_CFG_FACTORY_OBJ_FIFOS TRUE
+
+#define CH_CFG_FACTORY_PIPES TRUE
+
+#include_next
+
diff --git a/keyboards/yandrstudio/tdcq64_2s/f401/config.h b/keyboards/yandrstudio/tdcq64_2s/f401/config.h
new file mode 100644
index 000000000000..59ddbf1d51c4
--- /dev/null
+++ b/keyboards/yandrstudio/tdcq64_2s/f401/config.h
@@ -0,0 +1,70 @@
+/* Copyright 2021 JasonRen(biu)
+ *
+ * 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
+
+#include "config_common.h"
+
+
+/* RGN Matrix */
+#ifdef RGB_MATRIX_ENABLE
+
+# define RGB_DI_PIN A7
+# define RGBLED_NUM 2
+# define DRIVER_LED_TOTAL RGBLED_NUM
+
+#define WS2812_PWM_DRIVER PWMD3 // default: PWMD2
+#define WS2812_PWM_CHANNEL 2 // default: 2
+#define WS2812_PWM_PAL_MODE 2 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#define WS2812_DMA_CHANNEL 5 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+
+
+# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
+# define RGBLIGHT_VAL_STEP 18
+# define RGB_DISABLE_WHEN_USB_SUSPENDED true
+# define RGB_MATRIX_CENTER { 32, 96 }
+# define RGB_MATRIX_KEYPRESSES
+# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+#endif
+
+
+#ifdef RGBLIGHT_ENABLE
+
+# define RGB_DI_PIN A7
+# define RGBLED_NUM 2
+# define DRIVER_LED_TOTAL RGBLED_NUM
+
+
+#define WS2812_PWM_DRIVER PWMD3 // default: PWMD2
+#define WS2812_PWM_CHANNEL 2 // default: 2
+#define WS2812_PWM_PAL_MODE 2 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#define WS2812_DMA_CHANNEL 5 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+
+#endif
+
+
+
+#ifdef BACKLIGHT_ENABLE
+# define BACKLIGHT_PIN A6
+# define BACKLIGHT_BREATHING
+
+# define BACKLIGHT_PWM_DRIVER PWMD3
+# define BACKLIGHT_PWM_CHANNEL 1
+# define BACKLIGHT_PAL_MODE 2
+# define BACKLIGHT_ON_STATE 1
+#endif
diff --git a/keyboards/yandrstudio/tdcq64_2s/f401/halconf.h b/keyboards/yandrstudio/tdcq64_2s/f401/halconf.h
index d7394f6dc2ac..13f18c9c68d0 100644
--- a/keyboards/yandrstudio/tdcq64_2s/f401/halconf.h
+++ b/keyboards/yandrstudio/tdcq64_2s/f401/halconf.h
@@ -14,23 +14,19 @@
* along with this program. If not, see .
*/
-/*
- * This file was auto-generated by:
- * `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f401/halconf.h -r platforms/chibios/common/configs/halconf.h`
- */
-
#pragma once
-
+#include_next
#undef HAL_USE_PWM
#define HAL_USE_PWM TRUE
-// #define HAL_USE_SERIAL TRUE
+
#undef SERIAL_USB_BUFFERS_SIZE
#define SERIAL_USB_BUFFERS_SIZE 256
-#undef HAL_USE_SPI
-#define HAL_USE_SPI TRUE
+#undef SPI_USE_WAIT
+#define SPI_USE_WAIT TRUE
-#include_next
+#undef SPI_SELECT_MODE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
diff --git a/keyboards/yandrstudio/tdcq64_2s/f401/mcuconf.h b/keyboards/yandrstudio/tdcq64_2s/f401/mcuconf.h
index 5daa28ab6fa9..0000761217f1 100644
--- a/keyboards/yandrstudio/tdcq64_2s/f401/mcuconf.h
+++ b/keyboards/yandrstudio/tdcq64_2s/f401/mcuconf.h
@@ -14,24 +14,14 @@
* along with this program. If not, see .
*/
-/*
- * This file was auto-generated by:
- * `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f401/mcuconf.h -r platforms/chibios/BLACKPILL_STM32_F401/configs/mcuconf.h`
- */
-
#pragma once
#include_next
+
#undef STM32_PWM_USE_TIM3
#define STM32_PWM_USE_TIM3 TRUE
-#undef STM32_SERIAL_USE_USART1
-#define STM32_SERIAL_USE_USART1 FALSE
-
-#undef STM32_SPI_USE_SPI1
-#define STM32_SPI_USE_SPI1 TRUE
-
#undef STM32_NO_INIT
#undef STM32_HSI_ENABLED
diff --git a/keyboards/yandrstudio/tdcq64_2s/f401/rules.mk b/keyboards/yandrstudio/tdcq64_2s/f401/rules.mk
index 1f81ff6f41f1..9454a9d06f28 100644
--- a/keyboards/yandrstudio/tdcq64_2s/f401/rules.mk
+++ b/keyboards/yandrstudio/tdcq64_2s/f401/rules.mk
@@ -9,3 +9,7 @@ CUSTOM_MATRIX = lite # for using the A9 pin as matrix io
# # project specific file
QUANTUM_SRC += matrix.c
+
+
+WS2812_DRIVER = pwm
+BACKLIGHT_DRIVER = pwm
diff --git a/keyboards/yandrstudio/tdcq64_2s/rules.mk b/keyboards/yandrstudio/tdcq64_2s/rules.mk
index 453a280ebc2b..1d6b7abbe039 100644
--- a/keyboards/yandrstudio/tdcq64_2s/rules.mk
+++ b/keyboards/yandrstudio/tdcq64_2s/rules.mk
@@ -14,6 +14,4 @@ NKRO_ENABLE = yes # USB Nkey Rollover
RGB_MATRIX_ENABLE = yes
RGB_MATRIX_DRIVER = WS2812
BACKLIGHT_ENABLE = yes
-BACKLIGHT_DRIVER = pwm
-WS2812_DRIVER = spi
diff --git a/keyboards/yandrstudio/tdcq68/config.h b/keyboards/yandrstudio/tdcq68/config.h
index 0fa22e59b010..1061e517f690 100644
--- a/keyboards/yandrstudio/tdcq68/config.h
+++ b/keyboards/yandrstudio/tdcq68/config.h
@@ -50,24 +50,4 @@
-/* RGN Matrix */
-#ifdef RGB_MATRIX_ENABLE
-
-# define RGB_DI_PIN A7
-# define RGBLED_NUM 2
-# define DRIVER_LED_TOTAL RGBLED_NUM
-
-# define WS2812_SPI SPID1 // default: SPID1
-# define WS2812_SPI_MOSI_PAL_MODE 5
-
-# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
-# define RGBLIGHT_VAL_STEP 18
-# define RGB_DISABLE_WHEN_USB_SUSPENDED true
-# define RGB_MATRIX_CENTER { 32, 96 }
-# define RGB_MATRIX_KEYPRESSES
-# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-#endif
-
-
diff --git a/keyboards/yandrstudio/tdcq68/f401/board.h b/keyboards/yandrstudio/tdcq68/f401/board.h
index 1b34ad76c1b9..d6432824e162 100644
--- a/keyboards/yandrstudio/tdcq68/f401/board.h
+++ b/keyboards/yandrstudio/tdcq68/f401/board.h
@@ -17,8 +17,9 @@
#include_next "board.h"
-#undef STM32_HSE_BYPASS
-#ifdef STM32_HSECLK
+
#undef STM32_HSECLK
-#endif // STM32_HSECLK
#define STM32_HSECLK 8000000
+
+
+#define BOARD_YANDR_BIU_F401
diff --git a/keyboards/yandrstudio/tdcq68/f401/chconf.h b/keyboards/yandrstudio/tdcq68/f401/chconf.h
new file mode 100644
index 000000000000..4820db8dcbeb
--- /dev/null
+++ b/keyboards/yandrstudio/tdcq68/f401/chconf.h
@@ -0,0 +1,34 @@
+/* Copyright 2020 QMK
+ *
+ * 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
+
+#define CH_CFG_ST_FREQUENCY 10000
+
+#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
+
+#define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
+
+#define CH_CFG_FACTORY_SEMAPHORES TRUE
+
+#define CH_CFG_FACTORY_MAILBOXES TRUE
+
+#define CH_CFG_FACTORY_OBJ_FIFOS TRUE
+
+#define CH_CFG_FACTORY_PIPES TRUE
+
+#include_next
+
diff --git a/keyboards/yandrstudio/tdcq68/f401/config.h b/keyboards/yandrstudio/tdcq68/f401/config.h
new file mode 100644
index 000000000000..90860a37de4a
--- /dev/null
+++ b/keyboards/yandrstudio/tdcq68/f401/config.h
@@ -0,0 +1,61 @@
+/* Copyright 2021 JasonRen(biu)
+ *
+ * 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
+
+#include "config_common.h"
+
+
+/* RGN Matrix */
+#ifdef RGB_MATRIX_ENABLE
+
+# define RGB_DI_PIN A7
+# define RGBLED_NUM 2
+# define DRIVER_LED_TOTAL RGBLED_NUM
+
+#define WS2812_PWM_DRIVER PWMD3 // default: PWMD2
+#define WS2812_PWM_CHANNEL 2 // default: 2
+#define WS2812_PWM_PAL_MODE 2 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#define WS2812_DMA_CHANNEL 5 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+
+
+# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
+# define RGBLIGHT_VAL_STEP 18
+# define RGB_DISABLE_WHEN_USB_SUSPENDED true
+# define RGB_MATRIX_CENTER { 32, 96 }
+# define RGB_MATRIX_KEYPRESSES
+# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+#endif
+
+
+#ifdef RGBLIGHT_ENABLE
+
+# define RGB_DI_PIN A7
+# define RGBLED_NUM 2
+# define DRIVER_LED_TOTAL RGBLED_NUM
+
+
+#define WS2812_PWM_DRIVER PWMD3 // default: PWMD2
+#define WS2812_PWM_CHANNEL 2 // default: 2
+#define WS2812_PWM_PAL_MODE 2 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#define WS2812_DMA_CHANNEL 5 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+
+#endif
+
+
+
diff --git a/keyboards/yandrstudio/tdcq68/f401/halconf.h b/keyboards/yandrstudio/tdcq68/f401/halconf.h
index 28c799395bdf..13f18c9c68d0 100644
--- a/keyboards/yandrstudio/tdcq68/f401/halconf.h
+++ b/keyboards/yandrstudio/tdcq68/f401/halconf.h
@@ -14,19 +14,19 @@
* along with this program. If not, see .
*/
-/*
- * This file was auto-generated by:
- * `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f401/halconf.h -r platforms/chibios/common/configs/halconf.h`
- */
-
#pragma once
+#include_next
-#undef HAL_USE_SPI
-#define HAL_USE_SPI TRUE
+#undef HAL_USE_PWM
+#define HAL_USE_PWM TRUE
-// #define HAL_USE_SERIAL TRUE
+#undef SERIAL_USB_BUFFERS_SIZE
#define SERIAL_USB_BUFFERS_SIZE 256
-#include_next
+#undef SPI_USE_WAIT
+#define SPI_USE_WAIT TRUE
+
+#undef SPI_SELECT_MODE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
diff --git a/keyboards/yandrstudio/tdcq68/f401/mcuconf.h b/keyboards/yandrstudio/tdcq68/f401/mcuconf.h
index feb0f8aedb2a..0000761217f1 100644
--- a/keyboards/yandrstudio/tdcq68/f401/mcuconf.h
+++ b/keyboards/yandrstudio/tdcq68/f401/mcuconf.h
@@ -14,20 +14,13 @@
* along with this program. If not, see .
*/
-/*
- * This file was auto-generated by:
- * `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f401/mcuconf.h -r platforms/chibios/BLACKPILL_STM32_F401/configs/mcuconf.h`
- */
-
#pragma once
#include_next
-#undef STM32_SERIAL_USE_USART1
-#define STM32_SERIAL_USE_USART1 FALSE
-#undef STM32_SPI_USE_SPI1
-#define STM32_SPI_USE_SPI1 TRUE
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
#undef STM32_NO_INIT
@@ -88,31 +81,3 @@
-
-// #define STM32_NO_INIT FALSE
-// #define STM32_HSI_ENABLED TRUE
-// #define STM32_LSI_ENABLED TRUE
-// #define STM32_HSE_ENABLED TRUE
-// #define STM32_LSE_ENABLED FALSE
-// #define STM32_CLOCK48_REQUIRED TRUE
-// #define STM32_SW STM32_SW_PLL
-// #define STM32_PLLSRC STM32_PLLSRC_HSE
-// #define STM32_PLLM_VALUE 25
-// #define STM32_PLLN_VALUE 384
-// #define STM32_PLLP_VALUE 4
-// #define STM32_PLLQ_VALUE 8
-// #define STM32_HPRE STM32_HPRE_DIV1
-// #define STM32_PPRE1 STM32_PPRE1_DIV4
-// #define STM32_PPRE2 STM32_PPRE2_DIV2
-// #define STM32_RTCSEL STM32_RTCSEL_LSI
-// #define STM32_RTCPRE_VALUE 8
-// #define STM32_MCO1SEL STM32_MCO1SEL_HSI
-// #define STM32_MCO1PRE STM32_MCO1PRE_DIV1
-// #define STM32_MCO2SEL STM32_MCO2SEL_SYSCLK
-// #define STM32_MCO2PRE STM32_MCO2PRE_DIV5
-// #define STM32_I2SSRC STM32_I2SSRC_CKIN
-// #define STM32_PLLI2SN_VALUE 192
-// #define STM32_PLLI2SR_VALUE 5
-// #define STM32_PVD_ENABLE FALSE
-// #define STM32_PLS STM32_PLS_LEV0
-// #define STM32_BKPRAM_ENABLE FALSE
diff --git a/keyboards/yandrstudio/tdcq68/f401/rules.mk b/keyboards/yandrstudio/tdcq68/f401/rules.mk
index 1f81ff6f41f1..a03d74a387ea 100644
--- a/keyboards/yandrstudio/tdcq68/f401/rules.mk
+++ b/keyboards/yandrstudio/tdcq68/f401/rules.mk
@@ -9,3 +9,6 @@ CUSTOM_MATRIX = lite # for using the A9 pin as matrix io
# # project specific file
QUANTUM_SRC += matrix.c
+
+
+WS2812_DRIVER = pwm
diff --git a/keyboards/yandrstudio/tdcq68/rules.mk b/keyboards/yandrstudio/tdcq68/rules.mk
index bd13750b554e..b513b7df7794 100644
--- a/keyboards/yandrstudio/tdcq68/rules.mk
+++ b/keyboards/yandrstudio/tdcq68/rules.mk
@@ -11,7 +11,8 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
NKRO_ENABLE = yes # USB Nkey Rollover
+
RGB_MATRIX_ENABLE = yes
RGB_MATRIX_DRIVER = WS2812
-WS2812_DRIVER = spi
+
diff --git a/keyboards/yandrstudio/whiteMouse28T/f401/config.h b/keyboards/yandrstudio/whiteMouse28T/f401/config.h
index d342f2855e86..1ace919f7251 100644
--- a/keyboards/yandrstudio/whiteMouse28T/f401/config.h
+++ b/keyboards/yandrstudio/whiteMouse28T/f401/config.h
@@ -38,8 +38,8 @@
# define RGB_MATRIX_KEYPRESSES
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// # define WS2812_EXTERNAL_PULLUP
# define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
+
#endif
@@ -57,7 +57,6 @@
#define WS2812_DMA_CHANNEL 5 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
-// # define WS2812_EXTERNAL_PULLUP
# define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
#endif
@@ -82,13 +81,7 @@
# define DYNAMIC_KEYMAP_MACRO_COUNT 30
# define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 10240
# endif
-
-#else
-
-# define TRANSIENT_EEPROM_SIZE 1024
-
#endif
-// #define DEBUG_MATRIX_SCAN_RATE
diff --git a/keyboards/yandrstudio/whiteMouse28T/f401/halconf.h b/keyboards/yandrstudio/whiteMouse28T/f401/halconf.h
index 6ce8503fb4f8..ceffe801a72f 100644
--- a/keyboards/yandrstudio/whiteMouse28T/f401/halconf.h
+++ b/keyboards/yandrstudio/whiteMouse28T/f401/halconf.h
@@ -32,6 +32,7 @@
#undef SPI_USE_WAIT
#define SPI_USE_WAIT TRUE
+
#undef SPI_SELECT_MODE
#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
diff --git a/keyboards/yandrstudio/whiteMouse28T/f401/rules.mk b/keyboards/yandrstudio/whiteMouse28T/f401/rules.mk
index 32c777db1e7d..c92994b02a55 100644
--- a/keyboards/yandrstudio/whiteMouse28T/f401/rules.mk
+++ b/keyboards/yandrstudio/whiteMouse28T/f401/rules.mk
@@ -16,4 +16,4 @@ QUANTUM_SRC += matrix.c
WS2812_DRIVER = pwm
-# EEPROM_DRIVER = spi
+EEPROM_DRIVER = spi
diff --git a/keyboards/yandrstudio/whiteMouse28T/whiteMouse28T.c b/keyboards/yandrstudio/whiteMouse28T/whiteMouse28T.c
index e61ab4870a11..e57e8392d90c 100644
--- a/keyboards/yandrstudio/whiteMouse28T/whiteMouse28T.c
+++ b/keyboards/yandrstudio/whiteMouse28T/whiteMouse28T.c
@@ -37,27 +37,17 @@ led_config_t g_led_config = {
}
};
-// void rgb_matrix_indicators_kb(void) {
-// if (rgb_matrix_is_enabled()) {
-// if (biton32(layer_state) == 1) { // UPPER_LAYER = BLUE
-// rgb_matrix_set_color(57, 100, 0, 0);
-// rgb_matrix_set_color(58, 0, 100, 0);
-// rgb_matrix_set_color(60, 100, 0, 0);
-// rgb_matrix_set_color(61, 100, 0, 0);
-// }
-// }
-// }
#endif
-// #ifdef RGB_DISABLE_WHEN_USB_SUSPENDED
-// void suspend_power_down_kb(void) {
-// rgb_matrix_set_suspend_state(true);
-// suspend_power_down_user();
-// }
-
-// void suspend_wakeup_init_kb(void) {
-// rgb_matrix_set_suspend_state(false);
-// suspend_wakeup_init_user();
-// }
-// #endif
+#ifdef RGB_DISABLE_WHEN_USB_SUSPENDED
+void suspend_power_down_kb(void) {
+ rgb_matrix_set_suspend_state(true);
+ suspend_power_down_user();
+}
+
+void suspend_wakeup_init_kb(void) {
+ rgb_matrix_set_suspend_state(false);
+ suspend_wakeup_init_user();
+}
+#endif