diff --git a/zmk-config/config/boards/shields/ownkb/ownkb.dtsi b/zmk-config/config/boards/shields/ownkb/ownkb.dtsi
index 9487dc9..5b4aef3 100644
--- a/zmk-config/config/boards/shields/ownkb/ownkb.dtsi
+++ b/zmk-config/config/boards/shields/ownkb/ownkb.dtsi
@@ -14,19 +14,19 @@
 
     default_transform: keymap_transform_0 {
         compatible = "zmk,matrix-transform";
-        columns = <16>;
-        rows = <4>;
+        columns = <5>;
+        rows = <10>;
 // | SW6  | SW5  | SW4  | SW3  | SW2  | SW1  |                 | SW1  | SW2  | SW3  | SW4  | SW5  | SW6  |
 // | SW12 | SW11 | SW10 | SW9  | SW8  | SW7  |                 | SW7  | SW8  | SW9  | SW10 | SW11 | SW12 |
 // | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 |                 | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 |
 // | SW24 | SW23 | SW22 | SW21 | SW20 | SW19 | SW25 |   | SW25 | SW19 | SW20 | SW21 | SW22 | SW23 | SW24 |
 //               | SW30 | SW29 | SW28 | SW27 | SW26 |   | SW26 | SW27 | SW28 | SW29 | SW30 |
         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,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(4,5) RC(4,6) RC(3,6) RC(3,7) RC(3,8)  RC(3,9) RC(3,10) RC(3,11)
-                RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,7) RC(4,8) RC(4,9) RC(4,10) RC(4,11)
+RC(0,0) RC(1,0) RC(2,0) RC(3,0) RC(4,0) RC(5,0)                 RC(6,0) RC(7,0) RC(8,0)  RC(9,0) RC(10,0) RC(11,0)
+RC(0,1) RC(1,1) RC(2,1) RC(3,1) RC(4,1) RC(5,1)                 RC(6,1) RC(7,1) RC(8,1)  RC(9,1) RC(10,1) RC(11,1)
+RC(0,2) RC(1,2) RC(2,2) RC(3,2) RC(4,2) RC(5,2)                 RC(6,2) RC(7,2) RC(8,2)  RC(9,2) RC(10,2) RC(11,2)
+RC(0,3) RC(1,3) RC(2,3) RC(3,3) RC(4,3) RC(5,3) RC(5,4) RC(6,4) RC(6,3) RC(7,3) RC(8,3)  RC(9,3) RC(10,3) RC(11,3)
+                RC(0,4) RC(1,4) RC(2,4) RC(3,4) RC(4,4) RC(7,4) RC(8,4) RC(9,4) RC(10,4) RC(11,4)
         >;
     };
 
@@ -38,8 +38,8 @@ RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(4,5) RC(4,6) RC(3,6) RC(3,7)
     left_encoder: encoder_left {
         compatible = "alps,ec11";
         label = "LEFT_ENCODER";
-        a-gpios = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-        b-gpios = <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        a-gpios = <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        b-gpios = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
         resolution = <4>;
         status = "disabled";
     };
@@ -47,8 +47,8 @@ RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(4,5) RC(4,6) RC(3,6) RC(3,7)
     right_encoder: encoder_right {
         compatible = "alps,ec11";
         label = "RIGHT_ENCODER";
-        a-gpios = <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-        b-gpios = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        a-gpios = <&pro_micro 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        b-gpios = <&pro_micro 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
         resolution = <4>;
         status = "disabled";
     };
diff --git a/zmk-config/config/boards/shields/ownkb/ownkb_left.overlay b/zmk-config/config/boards/shields/ownkb/ownkb_left.overlay
index 9befd32..5917d43 100644
--- a/zmk-config/config/boards/shields/ownkb/ownkb_left.overlay
+++ b/zmk-config/config/boards/shields/ownkb/ownkb_left.overlay
@@ -8,19 +8,19 @@
 &kscan0 {
     diode-direction = "row2col";
     row-gpios
-        = <&pro_micro 4 (GPIO_ACTIVE_LOW)>
-        , <&pro_micro 5 (GPIO_ACTIVE_LOW)>
-        , <&pro_micro 6 (GPIO_ACTIVE_LOW)>
-        , <&pro_micro 7 (GPIO_ACTIVE_LOW)>
-        , <&pro_micro 8 (GPIO_ACTIVE_LOW)>
-        , <&pro_micro 9 (GPIO_ACTIVE_LOW)>
+        = <&pro_micro 19 GPIO_ACTIVE_HIGH>  // ROW 0 (outer)
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>  // ROW 1 (pinky)
+        , <&pro_micro 15 GPIO_ACTIVE_HIGH>  // ROW 2 (ring)
+        , <&pro_micro 14 GPIO_ACTIVE_HIGH>  // ROW 3 (middle)
+        , <&pro_micro 16 GPIO_ACTIVE_HIGH>  // ROW 4 (index)
+        , <&pro_micro 10 GPIO_ACTIVE_HIGH>  // ROW 5 (inner)
         ;
     col-gpios
-        = <&pro_micro 18 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-        , <&pro_micro 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-        , <&pro_micro 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-        , <&pro_micro 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
-        , <&pro_micro 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+        = <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>  // COL 0 (NUM)
+        , <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>  // COL 1 (UPPER)
+        , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>  // COL 2 (HOME)
+        , <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>  // COL 3 (LOWER)
+        , <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>  // COL 4 (THUMB + ROT)
         ;
 };
 
diff --git a/zmk-config/ownkb.conf b/zmk-config/ownkb.conf
new file mode 100644
index 0000000..285781d
--- /dev/null
+++ b/zmk-config/ownkb.conf
@@ -0,0 +1,7 @@
+# Uncomment these two lines to add support for encoders
+CONFIG_EC11=y
+CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
+
+# Uncomment the following line to enable the Sofle OLED Display
+CONFIG_ZMK_DISPLAY=y
+