diff --git a/build.yaml b/build.yaml
index f7d234f..10a4064 100644
--- a/build.yaml
+++ b/build.yaml
@@ -17,3 +17,7 @@ include:
     shield: clavert_left
   - board: nice_nano_v2
     shield: clavert_right
+  - board: nice_nano_v2
+    shield: clavert_colemak_dh_left
+  - board: nice_nano_v2
+    shield: clavert_colemak_dh_right
diff --git a/config/boards/shields/clavert_colemak_dh/Kconfig.defconfig b/config/boards/shields/clavert_colemak_dh/Kconfig.defconfig
new file mode 100644
index 0000000..430f3bb
--- /dev/null
+++ b/config/boards/shields/clavert_colemak_dh/Kconfig.defconfig
@@ -0,0 +1,19 @@
+# Copyright (c) 2021 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+if SHIELD_CLAVERT_COLEMAK_DH_LEFT
+
+config ZMK_KEYBOARD_NAME
+	default "Clavert Colemak DH"
+
+config ZMK_SPLIT_ROLE_CENTRAL
+	default y
+
+endif
+
+if SHIELD_CLAVERT_COLEMAK_DH_LEFT || SHIELD_CLAVERT_COLEMAK_DH_RIGHT
+
+config ZMK_SPLIT
+	default y
+
+endif
\ No newline at end of file
diff --git a/config/boards/shields/clavert_colemak_dh/Kconfig.shield b/config/boards/shields/clavert_colemak_dh/Kconfig.shield
new file mode 100644
index 0000000..2f42982
--- /dev/null
+++ b/config/boards/shields/clavert_colemak_dh/Kconfig.shield
@@ -0,0 +1,7 @@
+# Copyright (c) 2021 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+config SHIELD_CLAVERT_COLEMAK_DH_LEFT
+	def_bool $(shields_list_contains,clavert_colemak_dh_left)
+
+config SHIELD_CLAVERT_COLEMAK_DH_RIGHT
+	def_bool $(shields_list_contains,clavert_colemak_dh_right)
\ No newline at end of file
diff --git a/config/boards/shields/clavert_colemak_dh/clavert_colemak_dh.dtsi b/config/boards/shields/clavert_colemak_dh/clavert_colemak_dh.dtsi
new file mode 100644
index 0000000..c6dfc7a
--- /dev/null
+++ b/config/boards/shields/clavert_colemak_dh/clavert_colemak_dh.dtsi
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2021 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+ 
+#include <dt-bindings/zmk/matrix_transform.h>
+
+/ {
+	chosen {
+		zmk,kscan = &kscan0;
+		zmk,matrix_transform = &default_transform;
+	};
+
+	default_transform: keymap_transform_0 {
+		compatible = "zmk,matrix-transform";
+		columns = <14>;
+		rows = <5>;
+// | SW1  | SW2  | SW3  | SW4  | SW5  | SW6  |                               | SW6  | SW5  | SW4  | SW3  | SW2  | SW1  |
+// | SW7  | SW8  | SW9  | SW10 | SW11 | SW12 | SW13 |                 | SW13 | SW12 | SW11 | SW10 | SW9  | SW8  | SW7  |
+// | SW14 | SW15 | SW16 | SW17 | SW18 | SW19 | SW20 |                 | SW20 | SW19 | SW18 | SW17 | SW16 | SW15 | SW14 |
+// | SW21 | SW22 | SW23 | SW24 | SW25 | SW26 | SW27 | SW28 |   | SW28 | SW27 | SW26 | SW25 | SW24 | SW23 | SW22 | SW21 |
+// | SW29 | SW30 | SW31 | SW32 |     SW33    | SW34 | SW35 |   | SW35 | SW34 |     SW33    | SW32 | SW31 | SW30 | SW29 |
+		map = <
+RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)                                 RC(0,8) RC(0,9)  RC(0,10) RC(0,11) RC(0,12) RC(0,13)
+RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(0,6)                 RC(0,7) RC(1,8) RC(1,9)  RC(1,10) RC(1,11) RC(1,12) RC(1,13)
+RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(1,6)                 RC(1,7) RC(2,8) RC(2,9)  RC(2,10) RC(2,11) RC(2,12) RC(2,13)
+RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(2,6) RC(3,6) RC(3,7) RC(2,7) RC(3,8) RC(3,9)  RC(3,10) RC(3,11) RC(3,12) RC(3,13)
+RC(4,0) RC(4,1) RC(4,2) RC(4,3)      RC(4,4)    RC(4,5) RC(4,6) RC(4,7) RC(4,8)     RC(4,9)      RC(4,10) RC(4,11) RC(4,12) RC(4,13)
+		>;
+	};
+
+	kscan0: kscan {
+		compatible = "zmk,kscan-gpio-matrix";
+		label = "KSCAN";
+
+		diode-direction = "col2row";
+		row-gpios
+			= <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			;
+		
+	};
+
+	left_encoder: encoder_left {
+		compatible = "alps,ec11";
+		label = "LEFT_ENCODER";
+		resolution = <4>;
+		a-gpios = <&pro_micro 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+		b-gpios = <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+	};
+
+	sensors {
+		compatible = "zmk,keymap-sensors";
+		sensors = <&left_encoder>;
+	};
+
+};
\ No newline at end of file
diff --git a/config/boards/shields/clavert/clavert_colemak_dh.keymap b/config/boards/shields/clavert_colemak_dh/clavert_colemak_dh.keymap
similarity index 100%
rename from config/boards/shields/clavert/clavert_colemak_dh.keymap
rename to config/boards/shields/clavert_colemak_dh/clavert_colemak_dh.keymap
diff --git a/config/boards/shields/clavert_colemak_dh/clavert_colemak_dh.zmk.yml b/config/boards/shields/clavert_colemak_dh/clavert_colemak_dh.zmk.yml
new file mode 100644
index 0000000..dfc8b9a
--- /dev/null
+++ b/config/boards/shields/clavert_colemak_dh/clavert_colemak_dh.zmk.yml
@@ -0,0 +1,11 @@
+file_format: "1"
+id: clavert_colemak_dh
+name: Clavert_colemak_dh
+type: shield
+url: https://github.com/thlintw/clavert
+requires: [pro_micro]
+features:
+  - keys
+siblings:
+  - clavert_colemak_dh_left
+  - clavert_colemak_dh_right
\ No newline at end of file
diff --git a/config/boards/shields/clavert_colemak_dh/clavert_colemak_dh_left.overlay b/config/boards/shields/clavert_colemak_dh/clavert_colemak_dh_left.overlay
new file mode 100644
index 0000000..76f3739
--- /dev/null
+++ b/config/boards/shields/clavert_colemak_dh/clavert_colemak_dh_left.overlay
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2021 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "clavert_colemak_dh.dtsi"
+
+&kscan0 {
+	col-gpios
+		= <&pro_micro 20 GPIO_ACTIVE_HIGH>
+		, <&pro_micro 19 GPIO_ACTIVE_HIGH>
+		, <&pro_micro 18 GPIO_ACTIVE_HIGH>
+		, <&pro_micro 15 GPIO_ACTIVE_HIGH>
+		, <&pro_micro 14 GPIO_ACTIVE_HIGH>
+		, <&pro_micro 16 GPIO_ACTIVE_HIGH>
+		, <&pro_micro 10 GPIO_ACTIVE_HIGH>
+		;
+};
+
+&left_encoder {
+    status = "okay";
+};
diff --git a/config/boards/shields/clavert_colemak_dh/clavert_colemak_dh_right.overlay b/config/boards/shields/clavert_colemak_dh/clavert_colemak_dh_right.overlay
new file mode 100644
index 0000000..609e011
--- /dev/null
+++ b/config/boards/shields/clavert_colemak_dh/clavert_colemak_dh_right.overlay
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2021 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "clavert_colemak_dh.dtsi"
+
+&default_transform {
+	col-offset = <7>;
+};
+
+&kscan0 {
+	col-gpios
+		= <&pro_micro 10 GPIO_ACTIVE_HIGH>
+		, <&pro_micro 16 GPIO_ACTIVE_HIGH>
+		, <&pro_micro 14 GPIO_ACTIVE_HIGH>
+		, <&pro_micro 15 GPIO_ACTIVE_HIGH>
+		, <&pro_micro 18 GPIO_ACTIVE_HIGH>
+		, <&pro_micro 19 GPIO_ACTIVE_HIGH>
+		, <&pro_micro 20 GPIO_ACTIVE_HIGH>
+		;
+};
diff --git a/config/clavert_colemak_dh.conf b/config/clavert_colemak_dh.conf
new file mode 100644
index 0000000..6bc547f
--- /dev/null
+++ b/config/clavert_colemak_dh.conf
@@ -0,0 +1,5 @@
+# Uncomment the following lines to enable the Redox RGB Underglow
+# CONFIG_ZMK_RGB_UNDERGLOW=y
+# CONFIG_WS2812_STRIP=y
+CONFIG_EC11=y
+CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
\ No newline at end of file