diff --git a/build.yaml b/build.yaml
index 7ab5d6a7..6b5dc114 100644
--- a/build.yaml
+++ b/build.yaml
@@ -14,6 +14,6 @@
 ---
 include:
   - board: nice_nano_v2
-    shield: corne_left
+    shield: think_corney_left nice_view
   - board: nice_nano_v2
-    shield: corne_right
+    shield: think_corney_right nice_view
diff --git a/config/boards/shields/think_corney/Kconfig.defconfig b/config/boards/shields/think_corney/Kconfig.defconfig
new file mode 100644
index 00000000..df144260
--- /dev/null
+++ b/config/boards/shields/think_corney/Kconfig.defconfig
@@ -0,0 +1,16 @@
+if SHIELD_THINK_CORNEY_LEFT
+
+config ZMK_KEYBOARD_NAME
+	default "ThinkCorney"
+
+config ZMK_SPLIT_ROLE_CENTRAL
+	default y
+
+endif
+
+if SHIELD_THINK_CORNEY_LEFT || SHIELD_THINK_CORNEY_RIGHT
+
+config ZMK_SPLIT
+	default y
+
+endif
diff --git a/config/boards/shields/think_corney/Kconfig.shield b/config/boards/shields/think_corney/Kconfig.shield
new file mode 100644
index 00000000..ec3f8657
--- /dev/null
+++ b/config/boards/shields/think_corney/Kconfig.shield
@@ -0,0 +1,8 @@
+# Copyright (c) 2020 Pete Johanson
+# SPDX-License-Identifier: MIT
+
+config SHIELD_THINK_CORNEY_LEFT
+	def_bool $(shields_list_contains,think_corney_left)
+
+config SHIELD_THINK_CORNEY_RIGHT
+	def_bool $(shields_list_contains,think_corney_right)
diff --git a/config/boards/shields/think_corney/think_corney.dtsi b/config/boards/shields/think_corney/think_corney.dtsi
new file mode 100644
index 00000000..a042f9c2
--- /dev/null
+++ b/config/boards/shields/think_corney/think_corney.dtsi
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2020 Pete Johanson
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <dt-bindings/zmk/matrix_transform.h>
+
+/*
+ * Matrix
+ */
+
+/ {
+	chosen {
+		zmk,kscan = &kscan0;
+		zmk,matrix_transform = &default_transform;
+	};
+
+	default_transform: keymap_transform_0 {
+		compatible = "zmk,matrix-transform";
+		columns = <12>;
+		rows = <4>;
+        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(0,10) RC(0,11)
+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(1,10) RC(1,11)
+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(2,10) RC(2,11)
+                        RC(3,3) RC(3,4) RC(3,5)  RC(3,6) RC(3,7) RC(3,8)
+        >;
+	};
+
+	kscan0: kscan {
+		compatible = "zmk,kscan-gpio-matrix";
+
+		diode-direction = "col2row";
+		row-gpios
+			= <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			;
+
+	};
+};
+
+/*
+ * Nice!View
+ */
+
+&pinctrl {
+    spi0_default: spi0_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_SCK, 0, 20)>,
+                <NRF_PSEL(SPIM_MOSI, 0, 17)>,
+                <NRF_PSEL(SPIM_MISO, 0, 25)>;
+        };
+    };
+    spi0_sleep: spi0_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_SCK, 0, 20)>,
+                <NRF_PSEL(SPIM_MOSI, 0, 17)>,
+                <NRF_PSEL(SPIM_MISO, 0, 25)>;
+            low-power-enable;
+        };
+    };
+};
+
+nice_view_spi: &spi0 {
+    compatible = "nordic,nrf-spim";
+    pinctrl-0 = <&spi0_default>;
+    pinctrl-1 = <&spi0_sleep>;
+    pinctrl-names = "default", "sleep";
+    cs-gpios = <&pro_micro 9 GPIO_ACTIVE_HIGH>; // Not the default 1
+};
+
+&pro_micro_i2c {
+    status = "disabled";
+};
diff --git a/config/boards/shields/think_corney/think_corney.zmk.yml b/config/boards/shields/think_corney/think_corney.zmk.yml
new file mode 100644
index 00000000..4f414d59
--- /dev/null
+++ b/config/boards/shields/think_corney/think_corney.zmk.yml
@@ -0,0 +1,12 @@
+file_format: "1"
+id: think_corney
+name: ThinkCorney
+type: shield
+url: https://github.com/infused-kim/kb_think_corney
+requires: [pro_micro]
+features:
+  - keys
+  - display
+siblings:
+  - think_corney_left
+  - think_corney_right
diff --git a/config/boards/shields/think_corney/think_corney_left.conf b/config/boards/shields/think_corney/think_corney_left.conf
new file mode 100644
index 00000000..e69de29b
diff --git a/config/boards/shields/think_corney/think_corney_left.overlay b/config/boards/shields/think_corney/think_corney_left.overlay
new file mode 100644
index 00000000..1d46eb27
--- /dev/null
+++ b/config/boards/shields/think_corney/think_corney_left.overlay
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2020 Pete Johanson
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "think_corney.dtsi"
+
+/*
+ * Matrix
+ */
+
+&kscan0 {
+	col-gpios
+		= <&pro_micro 21 GPIO_ACTIVE_HIGH>
+		, <&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>
+		;
+};
diff --git a/config/boards/shields/think_corney/think_corney_right.conf b/config/boards/shields/think_corney/think_corney_right.conf
new file mode 100644
index 00000000..e69de29b
diff --git a/config/boards/shields/think_corney/think_corney_right.overlay b/config/boards/shields/think_corney/think_corney_right.overlay
new file mode 100644
index 00000000..8a6a2638
--- /dev/null
+++ b/config/boards/shields/think_corney/think_corney_right.overlay
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2020 Pete Johanson
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "think_corney.dtsi"
+
+/*
+ * Matrix
+ */
+
+&default_transform {
+	col-offset = <6>;
+};
+
+&kscan0 {
+	col-gpios
+		= <&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>
+		, <&pro_micro 21 GPIO_ACTIVE_HIGH>
+		;
+};