diff --git a/app/boards/arm/tornblue/led_driver.c b/app/boards/arm/tornblue/led_driver.c
index 5a3d6218..ddc26f0a 100644
--- a/app/boards/arm/tornblue/led_driver.c
+++ b/app/boards/arm/tornblue/led_driver.c
@@ -1,3 +1,5 @@
+#ifdef CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL
+
 #include <init.h>
 #include <device.h>
 #include <devicetree.h>
@@ -67,3 +69,5 @@ ZMK_LISTENER(led, led_event_handler);
 ZMK_SUBSCRIPTION(led, zmk_layer_state_changed);
 
 SYS_INIT(led_init, APPLICATION, CONFIG_APPLICATION_INIT_PRIORITY);
+
+#endif
\ No newline at end of file
diff --git a/app/boards/arm/tornblue/tornblue.dtsi b/app/boards/arm/tornblue/tornblue.dtsi
index 314671cd..4426289d 100644
--- a/app/boards/arm/tornblue/tornblue.dtsi
+++ b/app/boards/arm/tornblue/tornblue.dtsi
@@ -42,34 +42,6 @@ RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)  RC(2,6) RC(2,7) RC(2,8) RC(2,9)
 		label = "KSCAN";
 
 		diode-direction = "col2row";
-		row-gpios
-			= <&gpio1 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpio1 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpio1 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpio1 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			;
-	};
-
-	leds {
-		compatible = "gpio-leds";
-		led1: led1 {
-			gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
-			label = "LED 1";
-		};
-		led2: led2 {
-			gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
-			label = "LED 2";
-		};
-		led3: led3 {
-			gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>;
-			label = "LED 3";
-		};
-	};
-
-	ext-power {
-		compatible = "zmk,ext-power-generic";
-		label = "EXT_POWER";
-		control-gpios = <&gpio0 19 GPIO_ACTIVE_LOW>;
 	};
 
 	vbatt {
diff --git a/app/boards/arm/tornblue/tornblue_left.dts b/app/boards/arm/tornblue/tornblue_left.dts
index c9bfd800..27d3b8d5 100644
--- a/app/boards/arm/tornblue/tornblue_left.dts
+++ b/app/boards/arm/tornblue/tornblue_left.dts
@@ -7,10 +7,17 @@
 #include "tornblue.dtsi"
 
 &kscan0 {
+    row-gpios
+        = <&gpio1 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&gpio1 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&gpio1 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&gpio1 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        ;
+
 	col-gpios
-        = <&gpio0 31 GPIO_ACTIVE_HIGH>
+        = <&gpio0 5  GPIO_ACTIVE_HIGH>
         , <&gpio0 4  GPIO_ACTIVE_HIGH>
-        , <&gpio0 5  GPIO_ACTIVE_HIGH>
+        , <&gpio0 31 GPIO_ACTIVE_HIGH>
         , <&gpio0 7  GPIO_ACTIVE_HIGH>
         , <&gpio1 9  GPIO_ACTIVE_HIGH>
         , <&gpio0 12 GPIO_ACTIVE_HIGH>
@@ -30,6 +37,28 @@
             compatible = "zmk,keymap-sensors";
             sensors = <&left_encoder>;
     };
+
+    leds {
+        compatible = "gpio-leds";
+        led1: led1 {
+            gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
+            label = "LED 1";
+        };
+        led2: led2 {
+            gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
+            label = "LED 2";
+        };
+        led3: led3 {
+            gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>;
+            label = "LED 3";
+        };
+    };
+
+    ext-power {
+        compatible = "zmk,ext-power-generic";
+        label = "EXT_POWER";
+        control-gpios = <&gpio0 19 GPIO_ACTIVE_LOW>;
+    };
 };
 
 &left_encoder {
diff --git a/app/boards/arm/tornblue/tornblue_right.dts b/app/boards/arm/tornblue/tornblue_right.dts
index 2b62cb6d..521e0036 100644
--- a/app/boards/arm/tornblue/tornblue_right.dts
+++ b/app/boards/arm/tornblue/tornblue_right.dts
@@ -11,12 +11,43 @@
 };
 
 &kscan0 {
+    row-gpios
+        = <&gpio1 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&gpio1 13 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&gpio1 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        , <&gpio1 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        ;
+
 	col-gpios
-        = <&gpio0 12 GPIO_ACTIVE_HIGH>
+        = <&gpio0 19 GPIO_ACTIVE_HIGH>
+        , <&gpio0 21 GPIO_ACTIVE_HIGH>
+        , <&gpio0 23 GPIO_ACTIVE_HIGH>
+        , <&gpio0 12 GPIO_ACTIVE_HIGH>
         , <&gpio1 9  GPIO_ACTIVE_HIGH>
         , <&gpio0 7  GPIO_ACTIVE_HIGH>
-        , <&gpio0 5  GPIO_ACTIVE_HIGH>
-        , <&gpio0 4  GPIO_ACTIVE_HIGH>
-        , <&gpio0 31 GPIO_ACTIVE_HIGH>
 		;
 };
+
+/ {
+    leds {
+        compatible = "gpio-leds";
+        led1: led1 {
+            gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>;
+            label = "LED 1";
+        };
+        led2: led2 {
+            gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
+            label = "LED 2";
+        };
+        led3: led3 {
+            gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
+            label = "LED 3";
+        };
+    };
+
+    ext-power {
+        compatible = "zmk,ext-power-generic";
+        label = "EXT_POWER";
+        control-gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
+    };
+};