diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d7011283..afb17fbf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,6 +25,7 @@ jobs:
         shield:
           - bfo9000_left
           - bfo9000_right
+          - boardsource5x12
           - boardsource3x4
           - corne_left
           - corne_right
diff --git a/app/boards/shields/boardsource5x12/Kconfig.defconfig b/app/boards/shields/boardsource5x12/Kconfig.defconfig
new file mode 100644
index 00000000..870cf0ab
--- /dev/null
+++ b/app/boards/shields/boardsource5x12/Kconfig.defconfig
@@ -0,0 +1,6 @@
+if SHIELD_5X12
+
+config ZMK_KEYBOARD_NAME
+    default "5x12"
+
+endif
\ No newline at end of file
diff --git a/app/boards/shields/boardsource5x12/Kconfig.shield b/app/boards/shields/boardsource5x12/Kconfig.shield
new file mode 100644
index 00000000..7decafae
--- /dev/null
+++ b/app/boards/shields/boardsource5x12/Kconfig.shield
@@ -0,0 +1,2 @@
+config SHIELD_5X12
+    def_bool $(shields_list_contains,5x12)
\ No newline at end of file
diff --git a/app/boards/shields/boardsource5x12/boardsource5x12.conf b/app/boards/shields/boardsource5x12/boardsource5x12.conf
new file mode 100644
index 00000000..3c442a27
--- /dev/null
+++ b/app/boards/shields/boardsource5x12/boardsource5x12.conf
@@ -0,0 +1,5 @@
+# Copyright (c) 2021 Felix Sargent
+# SPDX-License-Identifier: MIT
+
+# Uncomment to enable USB logging
+CONFIG_ZMK_USB_LOGGING=y
\ No newline at end of file
diff --git a/app/boards/shields/boardsource5x12/boardsource5x12.keymap b/app/boards/shields/boardsource5x12/boardsource5x12.keymap
new file mode 100644
index 00000000..668d9cd8
--- /dev/null
+++ b/app/boards/shields/boardsource5x12/boardsource5x12.keymap
@@ -0,0 +1,42 @@
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/keys.h>
+#include <dt-bindings/zmk/bt.h>
+#define DEFAULT 0
+#define RAISE  1
+#define LOWER  2 
+
+/ {
+    keymap {
+        compatible = "zmk,keymap";
+
+        default_layer {
+            bindings = <
+                &kp GRAV    &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 DEL
+                &kp ESC     &kp A       &kp S    &kp D     &kp F     &kp G       &kp H     &kp J     &kp K     &kp L    &kp SEMI &kp SQT
+                &kp LSHIFT  &kp Z       &kp X    &kp C     &kp V     &kp B       &kp N     &kp M     &kp COMMA &kp DOT  &kp FSLH &kp RET
+                &kp PIPE    &kp RCTRL   &kp LALT &kp LGUI  &kp LOWER &kp SPACE   &kp SPACE &kp RAISE &kp LEFT  &kp DOWN &kp UP   &mo RIGHT
+                >;
+            };        
+            
+        RAISE {
+            bindings = <
+                &kp GRAV    &kp F1      &kp F2   &kp F3    &kp F4    &kp F5      &kp F6    &kp F7    &kp F8    &kp F9       &kp F10         &kp F11
+                &kp ESC     &kp N1      &kp N2   &kp N3    &kp N4    &kp N5      &kp N6    &kp N7    &kp N8    &kp N9       &kp N0          &kp F12
+                &kp ESC     &kp N4      &kp N5   &kp N6    &kp PLUS  &kp G       &kp H     &kp J     &kp K     &kp L        &kp SEMI        &kp SQT
+                &kp RET     &kp N7      &kp N8   &kp N9    &kp MINUS &kp B       &kp N     &kp M     &kp COMMA &kp DOT      &kp FSLH        &kp RET
+                &reset      &bootloader &kp LALT &kp LGUI  &kp LOWER &kp SPACE   &kp SPACE &kp RAISE &kp LEFT  &kp C_VOL_DN &kp C_VOL_UP    &mo C_PLAY_PAUSE
+                >;
+            };
+        LOWER {
+            bindings = <
+                &kp ESC    &kp F1       &kp F2   &kp F3    &kp F4    &kp F5      &kp F6    &kp F7    &kp F8    &kp F9   &kp F10  &kp F11
+                &kp TAB     &kp Q       &kp W    &kp E     &kp R     &kp T       &kp Y     &kp U     &kp I     &kp O    &kp P    &kp F12
+                &kp ESC     &kp A       &kp S    &kp D     &kp F     &kp G       &kp H     &kp J     &kp K     &kp L    &kp SEMI &kp SQT
+                &kp CAPS    &kp Z       &kp X    &kp C     &kp V     &kp B       &kp N     &kp M     &kp COMMA &kp DOT  &kp FSLH &kp RET
+                &kp PIPE    &kp RCTRL   &kp LALT &kp LGUI  &kp LOWER &kp SPACE   &kp SPACE &kp RAISE &kp LEFT  &kp DOWN &kp UP   &mo RIGHT
+                >;
+            };
+
+    };
+};  
\ No newline at end of file
diff --git a/app/boards/shields/boardsource5x12/boardsource5x12.overlay b/app/boards/shields/boardsource5x12/boardsource5x12.overlay
new file mode 100644
index 00000000..3628556f
--- /dev/null
+++ b/app/boards/shields/boardsource5x12/boardsource5x12.overlay
@@ -0,0 +1,42 @@
+/*
+ * 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 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro_d 1 (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)>
+            ;
+
+        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 10 GPIO_ACTIVE_HIGH>
+            , <&pro_micro_d 9 GPIO_ACTIVE_HIGH>
+            , <&pro_micro_d 8 GPIO_ACTIVE_HIGH>
+            , <&pro_micro_d 7 GPIO_ACTIVE_HIGH>
+            , <&pro_micro_d 6 GPIO_ACTIVE_HIGH>
+            ;
+    };
+}; 
\ No newline at end of file