diff --git a/keyboards/yandrstudio/tdcq68/config.h b/keyboards/yandrstudio/tdcq68/config.h
index e85c4990efb4..931ff18ebb3c 100644
--- a/keyboards/yandrstudio/tdcq68/config.h
+++ b/keyboards/yandrstudio/tdcq68/config.h
@@ -28,9 +28,9 @@
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
 
-//                         0   1   2   3   4    5    6    7    8   9  10  11  12  13  14
-#define MATRIX_COL_PINS { A6, B7, A8, A9,A10, A15, C13, C14, C15, B0, B1, B3, B4, B5, B6}
-#define MATRIX_ROW_PINS { A0, A1, A3, A4, A5}
+//                         0   1   2       3   4    5    6    7    8   9   10  11  12  13  14
+#define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A9,  A10, C13, C14, C15, A0, A1, A2, A3, A4}
+#define MATRIX_ROW_PINS { A15, B3, B4, B5, B7}
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/yandrstudio/tdcq68/rules.mk b/keyboards/yandrstudio/tdcq68/rules.mk
index 79231e242a13..794bd5ad2a18 100644
--- a/keyboards/yandrstudio/tdcq68/rules.mk
+++ b/keyboards/yandrstudio/tdcq68/rules.mk
@@ -2,11 +2,11 @@
 #   change yes to no to disable
 #
 BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
-KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
-MOUSEKEY_ENABLE = yes       # Mouse keys
+# KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
+MOUSEKEY_ENABLE = no       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
+COMMAND_ENABLE = yes         # Commands for debug and configuration
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 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
@@ -16,6 +16,6 @@ RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = WS2812
 
 # SPLIT_KEYBOARD = yes
-SERIAL_DRIVER = usart
+# SERIAL_DRIVER = usart
 WS2812_DRIVER = pwm