diff --git a/zmk-config/config/boards/shields/navi10/Kconfig.defconfig b/zmk-config/config/boards/shields/navi10/Kconfig.defconfig
new file mode 100644
index 00000000..08791627
--- /dev/null
+++ b/zmk-config/config/boards/shields/navi10/Kconfig.defconfig
@@ -0,0 +1,9 @@
+# Copyright (c) 2021 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+if SHIELD_NAVI10
+
+config ZMK_KEYBOARD_NAME
+    default "navi10"
+
+endif
diff --git a/zmk-config/config/boards/shields/navi10/Kconfig.shield b/zmk-config/config/boards/shields/navi10/Kconfig.shield
new file mode 100644
index 00000000..18621bd9
--- /dev/null
+++ b/zmk-config/config/boards/shields/navi10/Kconfig.shield
@@ -0,0 +1,5 @@
+# Copyright (c) 2021 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+config SHIELD_NAVI10
+	def_bool $(shields_list_contains,navi10)
diff --git a/zmk-config/config/boards/shields/navi10/navi10.conf b/zmk-config/config/boards/shields/navi10/navi10.conf
new file mode 100644
index 00000000..e69de29b
diff --git a/zmk-config/config/boards/shields/navi10/navi10.keymap b/zmk-config/config/boards/shields/navi10/navi10.keymap
new file mode 100644
index 00000000..ce0e66ba
--- /dev/null
+++ b/zmk-config/config/boards/shields/navi10/navi10.keymap
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2020 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/keys.h>
+
+/ {
+	keymap {
+		compatible = "zmk,keymap";
+
+		default_layer {
+			bindings = <
+&kp INSERT &kp HOME &kp PAGE_UP
+&kp DELETE &kp END  &kp PAGE_DOWN
+           &kp UP
+&kp LEFT   &kp DOWN &kp RIGHT
+			>;
+		};
+	};
+};
diff --git a/zmk-config/config/boards/shields/navi10/navi10.overlay b/zmk-config/config/boards/shields/navi10/navi10.overlay
new file mode 100644
index 00000000..5500e1b1
--- /dev/null
+++ b/zmk-config/config/boards/shields/navi10/navi10.overlay
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2020 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <dt-bindings/zmk/matrix_transform.h>
+
+/ {
+	kscan0: kscan {
+		compatible = "zmk,kscan-gpio-matrix";
+		label = "KSCAN";
+		
+		diode-direction = "col2row";
+
+        row-gpios
+			= <&pro_micro_d 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&pro_micro_d 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&pro_micro_d 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&pro_micro_d 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			;
+
+		col-gpios
+			= <&pro_micro_d 4 GPIO_ACTIVE_HIGH>
+			, <&pro_micro_d 7 GPIO_ACTIVE_HIGH>
+			, <&pro_micro_d 15 GPIO_ACTIVE_HIGH>
+			;
+	};
+
+	default_transform: keymap_transform_0 {
+		compatible = "zmk,matrix-transform";
+		rows = <4>;
+        columns = <3>;
+
+        map = <
+RC(0,0) RC(0,1) RC(0,2)
+RC(1,0) RC(1,1) RC(1,2)
+        RC(2,1)
+RC(3,0) RC(3,1) RC(3,2)
+		>;
+	};
+
+	chosen {
+		zmk,kscan = &kscan0;
+		zmk,matrix_transform = &default_transform;
+	};
+};