diff --git a/app/boards/shields/naked60/Kconfig.defconfig b/app/boards/shields/naked60/Kconfig.defconfig
new file mode 100644
index 00000000..c0aad5ed
--- /dev/null
+++ b/app/boards/shields/naked60/Kconfig.defconfig
@@ -0,0 +1,9 @@
+# Copyright (c) 2020 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+if SHIELD_NAKED60
+
+config ZMK_KEYBOARD_NAME
+	default "naked60bmp"
+
+endif
\ No newline at end of file
diff --git a/app/boards/shields/naked60/Kconfig.shield b/app/boards/shields/naked60/Kconfig.shield
new file mode 100644
index 00000000..3c9a5650
--- /dev/null
+++ b/app/boards/shields/naked60/Kconfig.shield
@@ -0,0 +1,5 @@
+# Copyright (c) 2020 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+config SHIELD_NAKED60
+	def_bool $(shields_list_contains,naked60)
\ No newline at end of file
diff --git a/app/boards/shields/naked60/naked60.conf b/app/boards/shields/naked60/naked60.conf
new file mode 100644
index 00000000..b54cd310
--- /dev/null
+++ b/app/boards/shields/naked60/naked60.conf
@@ -0,0 +1,2 @@
+# Turn on logging, and set ZMK logging to debug output
+CONFIG_ZMK_USB_LOGGING=n
\ No newline at end of file
diff --git a/app/boards/shields/naked60/naked60.keymap b/app/boards/shields/naked60/naked60.keymap
new file mode 100644
index 00000000..5ea345e8
--- /dev/null
+++ b/app/boards/shields/naked60/naked60.keymap
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2020 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/keys.h>
+#include <dt-bindings/zmk/bt.h>
+
+#define TIMEOUT 100
+
+/ {
+    combos {
+        compatible = "zmk,combos";
+        combo_btclr {
+            timeout-ms = <TIMEOUT>;
+            key-positions = <0 41>;
+            bindings = <&bt BT_CLR>;
+        };
+        combo_reset {
+            timeout-ms = <TIMEOUT>;
+            key-positions = <0 16>;
+            bindings = <&reset>;
+        };
+        combo_bootloader {
+            timeout-ms = <TIMEOUT>;
+            key-positions = <0 11>;
+            bindings = <&bootloader>;
+        };
+        combo_bt_nxt {
+            timeout-ms = <TIMEOUT>;
+            key-positions = <0 54>;
+            bindings = <&bt BT_NXT>;
+        };
+    };
+	keymap0: keymap {
+		compatible = "zmk,keymap";
+
+		default_layer {
+            bindings = <
+    &kp ESC   &kp N1    &kp N2    &kp N3    &kp N4    &kp N5                            &kp N6      &kp N7      &kp N8      &kp N9      &kp N0    &kp BSPC
+    &kp TAB   &kp Q     &kp W     &kp E     &kp R     &kp T                             &kp Y       &kp U       &kp I       &kp O       &kp P     &kp BSLH
+    &mo 1     &kp A     &kp S     &kp D     &kp F     &kp G                             &kp H       &kp J       &kp K       &kp L       &kp SEMI  &kp APOS
+    &kp LSHFT &kp Z     &kp X     &kp C     &kp V     &kp B                             &kp B       &kp N       &kp M       &kp COMMA   &kp DOT   &kp FSLH
+              &kp LCTRL &kp LGUI  &kp LALT  &kp RET   &kp SPACE  &kp SPACE   &kp SPACE  &kp SPACE   &kp LEFT    &kp DOWN    &kp UP      &kp RIGHT   
+            >;
+        };    
+        fn_layer {
+            bindings = <
+    &kp GRAVE  &kp F1   &kp F2    &kp F3    &kp F4      &kp F5                            &kp F6      &kp F7      &kp F8      &kp F9      &kp F10    &kp DEL
+    &trans     &kp F11  &kp F12   &trans    &trans      &trans                            &trans      &trans      &trans      &trans      &kp PSCRN  &trans
+    &trans     &trans   &trans    &trans    &trans      &trans                            &trans      &trans      &trans      &trans      &trans     &trans
+    &trans     &trans   &trans    &trans    &trans      &trans                            &trans      &trans      &kp MINUS   &kp EQUAL   &trans     &trans
+               &trans   &trans    &trans    &kp C_MUTE  &trans    &trans     &trans       &trans      &kp HOME    &kp PG_DN   &kp PG_UP   &kp END
+            >;  
+        };
+    };
+};
\ No newline at end of file
diff --git a/app/boards/shields/naked60/naked60.overlay b/app/boards/shields/naked60/naked60.overlay
new file mode 100644
index 00000000..3357bfea
--- /dev/null
+++ b/app/boards/shields/naked60/naked60.overlay
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2020 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <dt-bindings/zmk/matrix_transform.h>
+
+/ {
+	chosen {
+		zmk,kscan = &kscan0;
+	};
+
+	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 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&pro_micro_d 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&pro_micro_d 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&pro_micro_d 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			;
+		col-gpios
+			= <&pro_micro_a 3 GPIO_ACTIVE_HIGH>
+			, <&pro_micro_a 2 GPIO_ACTIVE_HIGH>
+			, <&pro_micro_a 1 GPIO_ACTIVE_HIGH>
+			, <&pro_micro_a 0 GPIO_ACTIVE_HIGH>
+            , <&pro_micro_d 15 GPIO_ACTIVE_HIGH>
+			, <&pro_micro_d 14 GPIO_ACTIVE_HIGH>
+			, <&pro_micro_d 16 GPIO_ACTIVE_HIGH>
+			, <&pro_micro_d 6 GPIO_ACTIVE_HIGH>
+            , <&pro_micro_d 7 GPIO_ACTIVE_HIGH>
+			, <&pro_micro_d 8 GPIO_ACTIVE_HIGH>
+			, <&pro_micro_d 9 GPIO_ACTIVE_HIGH>
+			, <&pro_micro_d 1 GPIO_ACTIVE_HIGH>
+			;
+	};
+};
\ No newline at end of file