diff --git a/firmware/rev1/rev1.h b/firmware/rev1/rev1.h
index 2751bb7..12685f6 100644
--- a/firmware/rev1/rev1.h
+++ b/firmware/rev1/rev1.h
@@ -1,16 +1,15 @@
 #pragma once 
 
 #include "quantum.h"
-
 #include "angelwings.h"
 
 #define XXX KC_NO
 
-#define LAYOUT(\
-    L01, L02, L03, L04, L05, L06,   R00, R01, R02, R03, R04, R05, \
-    L11, L12, L13, L14, L15, L16,   R10, R11, R12, R13, R14, R15, \
-    L21, L22, L23, L24, L25, L26,   R20, R21, R22, R23, R24, R25, \
-         L00, L10, L34, L35, L36,   R30, R31, R32, R16, R06 \
+#define LAYOUT_3x7(\
+    L00, L01, L02, L03, L04, L05, L06,             R00, R01, R02, R03, R04, R05, R06, \
+    L10, L11, L12, L13, L14, L15, L16,             R10, R11, R12, R13, R14, R15, R16, \
+         L21, L22, L23, L24, L25, L26,             R20, R21, R22, R23, R24, R25, \
+                             L34, L35, L36,   R30, R31, R32 \
  )\
  {\
         {L00, L01, L02, L03, L04, L05, L06}, \
@@ -22,3 +21,22 @@
         {XXX, R25, R24, R23, R22, R21, R20}, \
         {XXX, XXX, XXX, XXX, R32, R31, R30} \
  }
+
+#define LAYOUT_3x6(\
+    L00, L01, L02, L03, L04, L05,             R00, R01, R02, R03, R04, R05, \
+    L10, L11, L12, L13, L14, L15,             R10, R11, R12, R13, R14, R15, \
+    L20, L21, L22, L23, L24, L25,             R20, R21, R22, R23, R24, R25, \
+                        L33, L34, L35,   R30, R31, R32 \
+ )\
+ {\
+        {XXX, L00, L01, L02, L03, L04, L05}, \
+        {XXX, L10, L11, L12, L13, L14, L15}, \
+        {XXX, L20, L21, L22, L23, L24, L25}, \
+        {XXX, XXX, XXX, XXX, L33, L34, L35}, \
+        {XXX, R05, R04, R03, R02, R01, R00}, \
+        {XXX, R15, R14, R13, R12, R11, R10}, \
+        {XXX, R25, R24, R23, R22, R21, R20}, \
+        {XXX, XXX, XXX, XXX, R32, R31, R30} \
+ }
+
+#define LAYOUT LAYOUT_3x7
\ No newline at end of file