diff --git a/config/boards/shields/totem/Kconfig.defconfig b/config/boards/shields/totem/Kconfig.defconfig
index d6059f0..69b4f8d 100644
--- a/config/boards/shields/totem/Kconfig.defconfig
+++ b/config/boards/shields/totem/Kconfig.defconfig
@@ -1,18 +1,19 @@
+# Copyright (c) 2022 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
 if SHIELD_TOTEM_LEFT
 
-    config ZMK_KEYBOARD_NAME
-        default "TOTEM"
-
-    config ZMK_SPLIT_BLE_ROLE_CENTRAL
-        default y
-
-endif # LEFT
-
+config ZMK_KEYBOARD_NAME
+    default "Totem"
+    
+config ZMK_SPLIT_ROLE_CENTRAL
+    default y
 
+endif
 
 if SHIELD_TOTEM
 
-    config ZMK_SPLIT
-        default y
+config ZMK_SPLIT
+    default y
 
-endif # LEFT RIGHT
\ No newline at end of file
+endif
diff --git a/config/boards/shields/totem/Kconfig.shield b/config/boards/shields/totem/Kconfig.shield
index 2f2d59a..9708754 100644
--- a/config/boards/shields/totem/Kconfig.shield
+++ b/config/boards/shields/totem/Kconfig.shield
@@ -1,3 +1,6 @@
+# Copyright (c) 2022 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
 config SHIELD_TOTEM
     bool
 
@@ -7,4 +10,4 @@ config SHIELD_TOTEM_LEFT
 
 config SHIELD_TOTEM_RIGHT
     def_bool $(shields_list_contains,totem_right)
-    select SHIELD_CLOG_V2
\ No newline at end of file
+    select SHIELD_TOTEM
diff --git a/config/boards/shields/totem/totem.dtsi b/config/boards/shields/totem/totem.dtsi
index 45c818e..fda1c67 100644
--- a/config/boards/shields/totem/totem.dtsi
+++ b/config/boards/shields/totem/totem.dtsi
@@ -7,22 +7,22 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
-	chosen {
+    chosen {
         zmk,kscan = &kscan0;
         zmk,matrix_transform = &default_transform;
-	};
+    };
 
     default_transform: keymap_transform_0 {
         compatible = "zmk,matrix-transform";
         columns = <10>;
         rows = <4>;
-		map = <
+        map = <
 				RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4)    RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9)
 				RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4)    RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9)
 		RC(3,0)	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) RC(3,9)
 			                    RC(3,2) RC(3,3) RC(3,4)    RC(3,5) RC(3,6) RC(3,7)         
-		>;
-	};
+        >;
+    };
 
 
     kscan0: kscan_0 {
@@ -31,10 +31,10 @@
         diode-direction = "row2col";
 
         row-gpios
-            = <&xiao_d 10 GPIO_ACTIVE_HIGH>
-            , <&xiao_d 9  GPIO_ACTIVE_HIGH>
-            , <&xiao_d 8  GPIO_ACTIVE_HIGH>
-            , <&xiao_d 7  GPIO_ACTIVE_HIGH>
+            = <&xiao_d 1 GPIO_ACTIVE_HIGH>
+            , <&xiao_d 2 GPIO_ACTIVE_HIGH>
+            , <&xiao_d 3 GPIO_ACTIVE_HIGH>
+            , <&xiao_d 4 GPIO_ACTIVE_HIGH>
             ;
     };
 };
\ No newline at end of file
diff --git a/config/boards/shields/totem/totem_left.overlay b/config/boards/shields/totem/totem_left.overlay
index 39c592f..8ab009c 100644
--- a/config/boards/shields/totem/totem_left.overlay
+++ b/config/boards/shields/totem/totem_left.overlay
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 GEIST
+ * Copyright (c) 2022 The ZMK Contributors
  *
  * SPDX-License-Identifier: MIT
  */
@@ -7,7 +7,7 @@
 #include "totem.dtsi"
 
 &kscan0 {
-	col-gpios
+    col-gpios
         = <&xiao_d 5  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
         , <&xiao_d 6  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
         , <&xiao_d 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
diff --git a/config/boards/shields/totem/totem_right.overlay b/config/boards/shields/totem/totem_right.overlay
index 5510a5e..a461818 100644
--- a/config/boards/shields/totem/totem_right.overlay
+++ b/config/boards/shields/totem/totem_right.overlay
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Pete Johanson
+ * Copyright (c) 2022 The ZMK Contributors
  *
  * SPDX-License-Identifier: MIT
  */
@@ -7,11 +7,11 @@
 #include "totem.dtsi"
 
 &default_transform {
-	col-offset = <5>;
+    col-offset = <5>;
 };
 
 &kscan0 {
-	col-gpios
+    col-gpios
         = <&xiao_d 5  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
         , <&xiao_d 6  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
         , <&xiao_d 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>