diff --git a/app/boards/arm/preonic/preonic_rev3.dts b/app/boards/arm/preonic/preonic_rev3.dts
index 1a7d5e18..37ce8f9d 100644
--- a/app/boards/arm/preonic/preonic_rev3.dts
+++ b/app/boards/arm/preonic/preonic_rev3.dts
@@ -16,7 +16,7 @@
 		zephyr,sram = &sram0;
 		zephyr,flash = &flash0;
 		zmk,kscan = &kscan0;
-        zmk,matrix_transform = &my_transform;
+        zmk,matrix_transform = &default_transform;
 	};
 
     default_transform: keymap_transform_0 {
@@ -32,33 +32,47 @@ RC(8,0) RC(8,1) RC(8,2) RC(9,3) RC(9,4) RC(9,5) RC(9,0) RC(9,1) RC(9,2) RC(8,3)
 		>;
     };
 
-    my_transform: keymap_transform_0 {
-        compatible = "zmk,matrix-transform";
-        columns = <6>;
-        rows = <10>;
-        map = <
-RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(7,0) RC(7,1) RC(7,2) RC(7,3) RC(7,4) RC(7,5) 
-RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5)
-RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5) RC(5,0) RC(5,1) RC(5,2) RC(5,3) RC(5,4) RC(5,5) 
-RC(6,0) RC(6,1) RC(6,2) RC(6,3) RC(6,4) RC(6,5) RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)
-RC(8,0) RC(8,1) RC(8,2) RC(9,3) RC(9,4) RC(9,5) RC(9,0) RC(9,1) RC(9,2) RC(8,3) RC(8,4) RC(8,5)
-		>;
-    };
+//    mit_transform: keymap_transform_0 {
+//        compatible = "zmk,matrix-transform";
+//        columns = <6>;
+//        rows = <10>;
+//        map = <
+//RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5) 
+//RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(5,0) RC(5,1) RC(5,2) RC(5,3) RC(5,4) RC(5,5)
+//RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(6,0) RC(6,1) RC(6,2) RC(6,3) RC(6,4) RC(6,5) 
+//RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(7,0) RC(7,1) RC(7,2) RC(7,3) RC(7,4) RC(7,5)
+//RC(8,0) RC(8,1) RC(8,2) RC(9,3) RC(9,4)     RC(9,0)     RC(9,1) RC(9,2) RC(8,3) RC(8,4) RC(8,5)
+//		>;
+//    };
+
+//    two_u_transform: keymap_transform_0 {
+//        compatible = "zmk,matrix-transform";
+//        columns = <6>;
+//        rows = <10>;
+//        map = <
+//RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5) 
+//RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(5,0) RC(5,1) RC(5,2) RC(5,3) RC(5,4) RC(5,5)
+//RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(6,0) RC(6,1) RC(6,2) RC(6,3) RC(6,4) RC(6,5) 
+//RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(7,0) RC(7,1) RC(7,2) RC(7,3) RC(7,4) RC(7,5)
+//RC(8,0) RC(8,1) RC(8,2) RC(9,3)       RC(9,5)      RC(9,1)      RC(9,2) RC(8,3) RC(8,4) RC(8,5)
+//		>;
+//    };
+
 	kscan0: kscan_0 {
 		compatible = "zmk,kscan-gpio-matrix";
 		label = "KSCAN";
         diode-direction = "col2row";
 		row-gpios
 			= <&gpioa 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpiob 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
 			, <&gpioa 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpioa 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
 			, <&gpioa 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&gpioa 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&gpiob 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
 			, <&gpioc 13 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
 			, <&gpioc 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
 			, <&gpioc 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&gpioa 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
 			, <&gpioa 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&gpioa 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
 
 			;
 		col-gpios
diff --git a/app/boards/arm/preonic/preonic_rev3.keymap b/app/boards/arm/preonic/preonic_rev3.keymap
index 3c4c19e2..ddb88bd3 100644
--- a/app/boards/arm/preonic/preonic_rev3.keymap
+++ b/app/boards/arm/preonic/preonic_rev3.keymap
@@ -1,22 +1,28 @@
 #include <behaviors.dtsi>
 #include <dt-bindings/zmk/keys.h>
 
+#define DEFAULT 0
+#define LOWER   1
+#define RAISE   2
+#define ADJ     3
+
 / {
 	keymap {
 		compatible = "zmk,keymap";
 
 		default_layer {
 // -----------------------------------------------------------------------------------------
-// |  TAB  |  Q   |  W   |  E   |  R   |  T   |   Y   |  U    |  I   |  O   |   P   | BSPC  |
+// |  GRAV |  1   |  2   |  3   |  4   |  5   |   6   |  7    |  8   |  9   |   0   | BSPC  |
+// |  TAB  |  Q   |  W   |  E   |  R   |  T   |   Y   |  U    |  I   |  O   |   P   | DEL   |
 // |  ESC  |  A   |  S   |  D   |  F   |  G   |   H   |  J    |  K   |  L   |   ;   |  '    |
 // | SHIFT |  Z   |  X   |  C   |  V   |  B   |   N   |  M    |  ,   |  .   |   /   |  RET  |
-// | FN    | LGUI | LALT | LCTL | LOWR |     SPACE    |  RAIS | LARW | DARW | UARW  |  RARW |
+// |       | LGUI | LALT | LCTL | LOWR | SPC  |  SPC  |  RAIS | LARW | DARW | UARW  |  RARW |
 			bindings = <
-	&kp TAB  &kp NUM_1    &kp NUM_2 &kp NUM_3 &kp NUM_4 &kp NUM_5  &kp NUM_6   &kp NUM_7  &kp NUM_8    &kp NUM_9   &kp NUM_0    &kp DEL
-	&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 SCLN &kp QUOT
-	&kp LSFT &kp Z    &kp X &kp C &kp V &kp B  &kp N   &kp M  &kp CMMA &kp DOT &kp BSLH &kp RET
-	&trans   &kp LGUI &kp LALT &kp LCTL &trans &trans &kp SPC &trans &kp LARW &kp DARW &kp UARW &kp RARW
+	&kp GRAV &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 &kp NUM_5 &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0 &kp BKSP
+	&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 SCLN  &kp QUOT
+	&kp LSFT &kp Z     &kp X     &kp C     &kp V     &kp B     &kp N     &kp M     &kp CMMA  &kp DOT   &kp BSLH  &kp RET
+	&trans   &kp LCTL  &kp LALT  &kp LGUI  &mo LOWER &kp SPC   &kp SPC   &mo RAISE &kp LARW  &kp DARW  &kp UARW  &kp RARW
 			>;
 		};
 	};