diff --git a/keyboards/zmk-config/config/boards/shields/azarashi64/Kconfig.defconfig b/keyboards/zmk-config/config/boards/shields/azarashi64/Kconfig.defconfig
index cb8310c9..5128014c 100644
--- a/keyboards/zmk-config/config/boards/shields/azarashi64/Kconfig.defconfig
+++ b/keyboards/zmk-config/config/boards/shields/azarashi64/Kconfig.defconfig
@@ -6,6 +6,9 @@ if SHIELD_AZARASHI64_LEFT
 config ZMK_KEYBOARD_NAME
     default "Azarashi64 Left"
 
+config ZMK_SPLIT_BLE_ROLE_CENTRAL
+	default y
+
 endif
 
 if SHIELD_AZARASHI64_RIGHT
@@ -13,4 +16,14 @@ if SHIELD_AZARASHI64_RIGHT
 config ZMK_KEYBOARD_NAME
     default "Azarashi64 Right"
 
+config USB
+	default y
+
+endif
+
+if SHIELD_AZARASHI64_LEFT || SHIELD_AZARASHI64_RIGHT
+
+config ZMK_SPLIT
+	default y
+
 endif
diff --git a/keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64.dtsi b/keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64.dtsi
index a151f067..39d4d9bb 100644
--- a/keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64.dtsi
+++ b/keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64.dtsi
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <dt-bindings/zmk/matrix-transform.h>
+#include <dt-bindings/zmk/matrix_transform.h>
 
 / {
 	chosen {
diff --git a/keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64_left.conf b/keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64_left.conf
index 1e028a78..e69de29b 100644
--- a/keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64_left.conf
+++ b/keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64_left.conf
@@ -1,2 +0,0 @@
-CONFIG_ZMK_SPLIT=y
-CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y
diff --git a/keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64_right.conf b/keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64_right.conf
index 990cf7c0..e69de29b 100644
--- a/keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64_right.conf
+++ b/keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64_right.conf
@@ -1,2 +0,0 @@
-CONFIG_ZMK_SPLIT=y
-CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y
diff --git a/keyboards/zmk-config/config/boards/shields/pockettype/pockettype.dtsi b/keyboards/zmk-config/config/boards/shields/pockettype/pockettype.dtsi
index f1ffeef9..d3f1e475 100644
--- a/keyboards/zmk-config/config/boards/shields/pockettype/pockettype.dtsi
+++ b/keyboards/zmk-config/config/boards/shields/pockettype/pockettype.dtsi
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <dt-bindings/zmk/matrix-transform.h>
+#include <dt-bindings/zmk/matrix_transform.h>
 
 / {
 	leds {
diff --git a/keyboards/zmk-config/config/boards/shields/pockettype/pockettype_mdk.overlay b/keyboards/zmk-config/config/boards/shields/pockettype/pockettype_mdk.overlay
index 392498d7..741cd75d 100644
--- a/keyboards/zmk-config/config/boards/shields/pockettype/pockettype_mdk.overlay
+++ b/keyboards/zmk-config/config/boards/shields/pockettype/pockettype_mdk.overlay
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <dt-bindings/zmk/matrix-transform.h>
+#include <dt-bindings/zmk/matrix_transform.h>
 
 / {
 	chosen {
diff --git a/keyboards/zmk-config/config/boards/shields/pockettype/pockettype_peripheral.conf b/keyboards/zmk-config/config/boards/shields/pockettype/pockettype_peripheral.conf
index 990cf7c0..474dedaa 100644
--- a/keyboards/zmk-config/config/boards/shields/pockettype/pockettype_peripheral.conf
+++ b/keyboards/zmk-config/config/boards/shields/pockettype/pockettype_peripheral.conf
@@ -1,2 +1,2 @@
+CONFIG_USB=y
 CONFIG_ZMK_SPLIT=y
-CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y
diff --git a/keyboards/zmk-config/config/boards/shields/tg4x/tg4x.dtsi b/keyboards/zmk-config/config/boards/shields/tg4x/tg4x.dtsi
index 8559dda1..02ac3bc5 100644
--- a/keyboards/zmk-config/config/boards/shields/tg4x/tg4x.dtsi
+++ b/keyboards/zmk-config/config/boards/shields/tg4x/tg4x.dtsi
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <dt-bindings/zmk/matrix-transform.h>
+#include <dt-bindings/zmk/matrix_transform.h>
 
 / {
 	kscan0: kscan {
diff --git a/keyboards/zmk-config/config/boards/shields/tg4x/tg4x_mdk.overlay b/keyboards/zmk-config/config/boards/shields/tg4x/tg4x_mdk.overlay
index b0fac6f5..a27891b8 100644
--- a/keyboards/zmk-config/config/boards/shields/tg4x/tg4x_mdk.overlay
+++ b/keyboards/zmk-config/config/boards/shields/tg4x/tg4x_mdk.overlay
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <dt-bindings/zmk/matrix-transform.h>
+#include <dt-bindings/zmk/matrix_transform.h>
 
 / {
 	chosen {
diff --git a/keyboards/zmk-config/config/boards/shields/tg4x/tg4x_peripheral.conf b/keyboards/zmk-config/config/boards/shields/tg4x/tg4x_peripheral.conf
index 990cf7c0..474dedaa 100644
--- a/keyboards/zmk-config/config/boards/shields/tg4x/tg4x_peripheral.conf
+++ b/keyboards/zmk-config/config/boards/shields/tg4x/tg4x_peripheral.conf
@@ -1,2 +1,2 @@
+CONFIG_USB=y
 CONFIG_ZMK_SPLIT=y
-CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y