6 files changed, 402 insertions, 22 deletions
diff --git a/keyboards/minimon/index_tab/index_tab.h b/keyboards/minimon/index_tab/index_tab.h
index cb9d3c5ae6..e1419379ba 100644
--- a/keyboards/minimon/index_tab/index_tab.h
+++ b/keyboards/minimon/index_tab/index_tab.h
@@ -18,7 +18,31 @@
 
 #include "quantum.h"
 
-#define LAYOUT( \
+#define XXX KC_NO
+
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │40 │41 │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │50 │51 │52 │53 │54 │55 │56 │57 │58 │59 │5a │5b │5c │
+ * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
+ * ┌───┬───┬───┬───┬───────┬───────┬───┬───┬───┬───┬───┐
+ * │50 │51 │52 │53 │54     │56     │58 │59 │5a │5b │5c │ 2x2u
+ * └───┴───┴───┴───┴───────┴───────┴───┴───┴───┴───┴───┘
+ * ┌───┬───┬───┬───────────────────────────┬───┬───┬───┐
+ * │50 │51 │52 │            56             │5a │5b │5c │ 7u_space
+ * └───┴───┴───┴───────────────────────────┴───┴───┴───┘
+ */
+
+#define LAYOUT_ortho_6x13( \
   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, \
   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, \
   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, \
@@ -34,3 +58,37 @@
     { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4a, K4b, K4c }, \
     { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5a, K5b, K5c }  \
   }
+
+#define LAYOUT_2x2u( \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, \
+  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, \
+  K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4a, K4b, K4c, \
+  K50, K51, K52, K53, K54,      K56,      K58, K59, K5a, K5b, K5c  \
+) \
+  { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4a, K4b, K4c }, \
+    { K50, K51, K52, K53, K54, XXX, K56, XXX, K58, K59, K5a, K5b, K5c }  \
+  }
+
+#define LAYOUT_7u_space( \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, \
+  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, \
+  K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4a, K4b, K4c, \
+  K50, K51, K52,                K56,                K5a, K5b, K5c  \
+) \
+  { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4a, K4b, K4c }, \
+    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5a, K5b, K5c }  \
+  }
diff --git a/keyboards/minimon/index_tab/info.json b/keyboards/minimon/index_tab/info.json
index 21ff5a3cde..209d3044fe 100644
--- a/keyboards/minimon/index_tab/info.json
+++ b/keyboards/minimon/index_tab/info.json
@@ -1,17 +1,263 @@
 {
-  "keyboard_name": "Index Tab",
-  "maintainer": "kyrremann",
-  "url": "https://github.com/Kyrremann/index-tab",
-  "layouts": {
-    "LAYOUT_all": {
-      "layout": [
-        {"label":"CAPS", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0},
-        {"label":"<", "x":0, "y":1}, {"label":"1", "x":1, "y":1}, {"label":"2", "x":2, "y":1}, {"label":"3", "x":3, "y":1}, {"label":"4", "x":4, "y":1}, {"label":"5", "x":5, "y":1}, {"label":"6", "x":6, "y":1}, {"label":"7", "x":7, "y":1}, {"label":"8", "x":8, "y":1}, {"label":"9", "x":9, "y":1}, {"label":"0", "x":10, "y":1}, {"label":"+", "x":11, "y":1}, {"label":"\u00b4", "x":12, "y":1},
-        {"label":"TAB", "x":0, "y":2}, {"label":"q", "x":1, "y":2}, {"label":"w", "x":2, "y":2}, {"label":"e", "x":3, "y":2}, {"label":"r", "x":4, "y":2}, {"label":"t", "x":5, "y":2}, {"label":"y", "x":6, "y":2}, {"label":"u", "x":7, "y":2}, {"label":"i", "x":8, "y":2}, {"label":"o", "x":9, "y":2}, {"label":"p", "x":10, "y":2}, {"label":"\u00e5", "x":11, "y":2}, {"label":"BKSP", "x":12, "y":2},
-        {"label":"CTRL", "x":0, "y":3}, {"label":"a", "x":1, "y":3}, {"label":"s", "x":2, "y":3}, {"label":"d", "x":3, "y":3}, {"label":"f", "x":4, "y":3}, {"label":"g", "x":5, "y":3}, {"label":"h", "x":6, "y":3}, {"label":"j", "x":7, "y":3}, {"label":"k", "x":8, "y":3}, {"label":"l", "x":9, "y":3}, {"label":"\u00f8", "x":10, "y":3}, {"label":"\u00e6", "x":11, "y":3}, {"label":"\u00a8", "x":12, "y":3},
-        {"label":"SHIFT", "x":0, "y":4}, {"label":"z", "x":1, "y":4}, {"label":"x", "x":2, "y":4}, {"label":"c", "x":3, "y":4}, {"label":"v", "x":4, "y":4}, {"label":"b", "x":5, "y":4}, {"label":"n", "x":6, "y":4}, {"label":"m", "x":7, "y":4}, {"label":",", "x":8, "y":4}, {"label":".", "x":9, "y":4}, {"label":"-", "x":10, "y":4}, {"label":"\u2191", "x":11, "y":4}, {"label":"\u21b2", "x":12, "y":4},
-        {"label":"ESC", "x":0, "y":5}, {"label":"\u00a7", "x":1, "y":5}, {"label":"WIN", "x":2, "y":5}, {"label":"LALT", "x":3, "y":5}, {"x":4, "y":5, "w":2}, {"x":6, "y":5, "w":2}, {"label":"FN", "x":8, "y":5}, {"label":"@", "x":9, "y":5}, {"label":"\u2190", "x":10, "y":5}, {"label":"\u2193", "x":11, "y":5}, {"label":"\u2192", "x":12, "y":5}
-      ]
+    "keyboard_name": "Index Tab",
+    "maintainer": "kyrremann",
+    "url": "https://github.com/Kyrremann/index-tab",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_6x13"
+    },
+    "layouts": {
+        "LAYOUT_ortho_6x13": {
+            "layout": [
+                {"label":"CAPS", "x":0, "y":0},
+                {"label":"F1", "x":1, "y":0},
+                {"label":"F2", "x":2, "y":0},
+                {"label":"F3", "x":3, "y":0},
+                {"label":"F4", "x":4, "y":0},
+                {"label":"F5", "x":5, "y":0},
+                {"label":"F6", "x":6, "y":0},
+                {"label":"F7", "x":7, "y":0},
+                {"label":"F8", "x":8, "y":0},
+                {"label":"F9", "x":9, "y":0},
+                {"label":"F10", "x":10, "y":0},
+                {"label":"F11", "x":11, "y":0},
+                {"label":"F12", "x":12, "y":0},
+
+                {"label":"<>", "x":0, "y":1},
+                {"label":"1!", "x":1, "y":1},
+                {"label":"2\"", "x":2, "y":1},
+                {"label":"3#", "x":3, "y":1},
+                {"label":"4\u00a4", "x":4, "y":1},
+                {"label":"5%", "x":5, "y":1},
+                {"label":"6&", "x":6, "y":1},
+                {"label":"7/", "x":7, "y":1},
+                {"label":"8(", "x":8, "y":1},
+                {"label":"9)", "x":9, "y":1},
+                {"label":"0=", "x":10, "y":1},
+                {"label":"+?", "x":11, "y":1},
+                {"label":"\\`", "x":12, "y":1},
+
+                {"label":"TAB", "x":0, "y":2},
+                {"label":"Q", "x":1, "y":2},
+                {"label":"W", "x":2, "y":2},
+                {"label":"E", "x":3, "y":2},
+                {"label":"R", "x":4, "y":2},
+                {"label":"T", "x":5, "y":2},
+                {"label":"Y", "x":6, "y":2},
+                {"label":"U", "x":7, "y":2},
+                {"label":"I", "x":8, "y":2},
+                {"label":"O", "x":9, "y":2},
+                {"label":"P", "x":10, "y":2},
+                {"label":"\u00c5", "x":11, "y":2},
+                {"label":"BKSP", "x":12, "y":2},
+
+                {"label":"CTRL", "x":0, "y":3},
+                {"label":"A", "x":1, "y":3},
+                {"label":"S", "x":2, "y":3},
+                {"label":"D", "x":3, "y":3},
+                {"label":"F", "x":4, "y":3},
+                {"label":"G", "x":5, "y":3},
+                {"label":"H", "x":6, "y":3},
+                {"label":"J", "x":7, "y":3},
+                {"label":"K", "x":8, "y":3},
+                {"label":"L", "x":9, "y":3},
+                {"label":"\u00d8", "x":10, "y":3},
+                {"label":"\u00c6", "x":11, "y":3},
+                {"label":"\u00a8^", "x":12, "y":3},
+
+                {"label":"SHIFT", "x":0, "y":4},
+                {"label":"Z", "x":1, "y":4},
+                {"label":"X", "x":2, "y":4},
+                {"label":"C", "x":3, "y":4},
+                {"label":"V", "x":4, "y":4},
+                {"label":"B", "x":5, "y":4},
+                {"label":"N", "x":6, "y":4},
+                {"label":"M", "x":7, "y":4},
+                {"label":",;", "x":8, "y":4},
+                {"label":".:", "x":9, "y":4},
+                {"label":"-_", "x":10, "y":4},
+                {"label":"\u2191", "x":11, "y":4},
+                {"label":"\u21b2", "x":12, "y":4},
+
+                {"label":"ESC", "x":0, "y":5},
+                {"label":"|\u00a7", "x":1, "y":5},
+                {"label":"WIN", "x":2, "y":5},
+                {"label":"LALT", "x":3, "y":5},
+                {"label":"Space", "x":4, "y":5},
+                {"label":"Space", "x":5, "y":5},
+                {"label":"Space", "x":6, "y":5},
+                {"label":"Space", "x":7, "y":5},
+                {"label":"FN", "x":8, "y":5},
+                {"label":"'*", "x":9, "y":5},
+                {"label":"\u2190", "x":10, "y":5},
+                {"label":"\u2193", "x":11, "y":5},
+                {"label":"\u2192", "x":12, "y":5}
+            ]
+        },
+        "LAYOUT_2x2u": {
+            "layout": [
+                {"label":"CAPS", "x":0, "y":0},
+                {"label":"F1", "x":1, "y":0},
+                {"label":"F2", "x":2, "y":0},
+                {"label":"F3", "x":3, "y":0},
+                {"label":"F4", "x":4, "y":0},
+                {"label":"F5", "x":5, "y":0},
+                {"label":"F6", "x":6, "y":0},
+                {"label":"F7", "x":7, "y":0},
+                {"label":"F8", "x":8, "y":0},
+                {"label":"F9", "x":9, "y":0},
+                {"label":"F10", "x":10, "y":0},
+                {"label":"F11", "x":11, "y":0},
+                {"label":"F12", "x":12, "y":0},
+
+                {"label":"<>", "x":0, "y":1},
+                {"label":"1!", "x":1, "y":1},
+                {"label":"2\"", "x":2, "y":1},
+                {"label":"3#", "x":3, "y":1},
+                {"label":"4\u00a4", "x":4, "y":1},
+                {"label":"5%", "x":5, "y":1},
+                {"label":"6&", "x":6, "y":1},
+                {"label":"7/", "x":7, "y":1},
+                {"label":"8(", "x":8, "y":1},
+                {"label":"9)", "x":9, "y":1},
+                {"label":"0=", "x":10, "y":1},
+                {"label":"+?", "x":11, "y":1},
+                {"label":"\\`", "x":12, "y":1},
+
+                {"label":"TAB", "x":0, "y":2},
+                {"label":"Q", "x":1, "y":2},
+                {"label":"W", "x":2, "y":2},
+                {"label":"E", "x":3, "y":2},
+                {"label":"R", "x":4, "y":2},
+                {"label":"T", "x":5, "y":2},
+                {"label":"Y", "x":6, "y":2},
+                {"label":"U", "x":7, "y":2},
+                {"label":"I", "x":8, "y":2},
+                {"label":"O", "x":9, "y":2},
+                {"label":"P", "x":10, "y":2},
+                {"label":"\u00c5", "x":11, "y":2},
+                {"label":"BKSP", "x":12, "y":2},
+
+                {"label":"CTRL", "x":0, "y":3},
+                {"label":"A", "x":1, "y":3},
+                {"label":"S", "x":2, "y":3},
+                {"label":"D", "x":3, "y":3},
+                {"label":"F", "x":4, "y":3},
+                {"label":"G", "x":5, "y":3},
+                {"label":"H", "x":6, "y":3},
+                {"label":"J", "x":7, "y":3},
+                {"label":"K", "x":8, "y":3},
+                {"label":"L", "x":9, "y":3},
+                {"label":"\u00d8", "x":10, "y":3},
+                {"label":"\u00c6", "x":11, "y":3},
+                {"label":"\u00a8^", "x":12, "y":3},
+
+                {"label":"SHIFT", "x":0, "y":4},
+                {"label":"Z", "x":1, "y":4},
+                {"label":"X", "x":2, "y":4},
+                {"label":"C", "x":3, "y":4},
+                {"label":"V", "x":4, "y":4},
+                {"label":"B", "x":5, "y":4},
+                {"label":"N", "x":6, "y":4},
+                {"label":"M", "x":7, "y":4},
+                {"label":",;", "x":8, "y":4},
+                {"label":".:", "x":9, "y":4},
+                {"label":"-_", "x":10, "y":4},
+                {"label":"\u2191", "x":11, "y":4},
+                {"label":"\u21b2", "x":12, "y":4},
+
+                {"label":"ESC", "x":0, "y":5},
+                {"label":"|\u00a7", "x":1, "y":5},
+                {"label":"WIN", "x":2, "y":5},
+                {"label":"LALT", "x":3, "y":5},
+                {"label":"Space", "x":4, "y":5, "w":2},
+                {"label":"Space", "x":6, "y":5, "w":2},
+                {"label":"FN", "x":8, "y":5},
+                {"label":"'*", "x":9, "y":5},
+                {"label":"\u2190", "x":10, "y":5},
+                {"label":"\u2193", "x":11, "y":5},
+                {"label":"\u2192", "x":12, "y":5}
+            ]
+        },
+        "LAYOUT_7u_space": {
+            "layout": [
+                {"label":"Fn/Caps", "x":0, "y":0},
+                {"label":"F1", "x":1, "y":0},
+                {"label":"F2", "x":2, "y":0},
+                {"label":"F3", "x":3, "y":0},
+                {"label":"F4", "x":4, "y":0},
+                {"label":"F5", "x":5, "y":0},
+                {"label":"F6", "x":6, "y":0},
+                {"label":"F7", "x":7, "y":0},
+                {"label":"F8", "x":8, "y":0},
+                {"label":"F9", "x":9, "y":0},
+                {"label":"F10", "x":10, "y":0},
+                {"label":"F11", "x":11, "y":0},
+                {"label":"F12", "x":12, "y":0},
+
+                {"label":"<>", "x":0, "y":1},
+                {"label":"1!", "x":1, "y":1},
+                {"label":"2\"", "x":2, "y":1},
+                {"label":"3#", "x":3, "y":1},
+                {"label":"4\u00a4", "x":4, "y":1},
+                {"label":"5%", "x":5, "y":1},
+                {"label":"6&", "x":6, "y":1},
+                {"label":"7/", "x":7, "y":1},
+                {"label":"8(", "x":8, "y":1},
+                {"label":"9)", "x":9, "y":1},
+                {"label":"0=", "x":10, "y":1},
+                {"label":"+?", "x":11, "y":1},
+                {"label":"\\`", "x":12, "y":1},
+
+                {"label":"TAB", "x":0, "y":2},
+                {"label":"Q", "x":1, "y":2},
+                {"label":"W", "x":2, "y":2},
+                {"label":"E", "x":3, "y":2},
+                {"label":"R", "x":4, "y":2},
+                {"label":"T", "x":5, "y":2},
+                {"label":"Y", "x":6, "y":2},
+                {"label":"U", "x":7, "y":2},
+                {"label":"I", "x":8, "y":2},
+                {"label":"O", "x":9, "y":2},
+                {"label":"P", "x":10, "y":2},
+                {"label":"\u00c5", "x":11, "y":2},
+                {"label":"BKSP", "x":12, "y":2},
+
+                {"label":"CTRL", "x":0, "y":3},
+                {"label":"A", "x":1, "y":3},
+                {"label":"S", "x":2, "y":3},
+                {"label":"D", "x":3, "y":3},
+                {"label":"F", "x":4, "y":3},
+                {"label":"G", "x":5, "y":3},
+                {"label":"H", "x":6, "y":3},
+                {"label":"J", "x":7, "y":3},
+                {"label":"K", "x":8, "y":3},
+                {"label":"L", "x":9, "y":3},
+                {"label":"\u00d8", "x":10, "y":3},
+                {"label":"\u00c6", "x":11, "y":3},
+                {"label":"\u00a8^", "x":12, "y":3},
+
+                {"label":"SHIFT", "x":0, "y":4},
+                {"label":"Z", "x":1, "y":4},
+                {"label":"X", "x":2, "y":4},
+                {"label":"C", "x":3, "y":4},
+                {"label":"V", "x":4, "y":4},
+                {"label":"B", "x":5, "y":4},
+                {"label":"N", "x":6, "y":4},
+                {"label":"M", "x":7, "y":4},
+                {"label":",;", "x":8, "y":4},
+                {"label":".:", "x":9, "y":4},
+                {"label":"-_", "x":10, "y":4},
+                {"label":"\u2191", "x":11, "y":4},
+                {"label":"\u21b2", "x":12, "y":4},
+
+                {"label":"GESC", "x":0, "y":5},
+                {"label":"WIN", "x":1, "y":5},
+                {"label":"LALT", "x":2, "y":5},
+                {"label":"Space", "x":3, "y":5, "w":7},
+                {"label":"\u2190", "x":10, "y":5},
+                {"label":"\u2193", "x":11, "y":5},
+                {"label":"\u2192", "x":12, "y":5}
+            ]
+        }
     }
-  }
 }
diff --git a/keyboards/minimon/index_tab/keymaps/default/keymap.c b/keyboards/minimon/index_tab/keymaps/default/keymap.c
index 9f2a3d1320..95e2f3427e 100644
--- a/keyboards/minimon/index_tab/keymaps/default/keymap.c
+++ b/keyboards/minimon/index_tab/keymaps/default/keymap.c
@@ -15,7 +15,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-[0] = LAYOUT(
+[0] = LAYOUT_ortho_6x13(
        KC_CAPS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
        KC_NUBS, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,
        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_BSPC,
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_ESC,  KC_GRV,  KC_LGUI, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  KC_SPC,  TG(1),   KC_BSLS, KC_LEFT, KC_DOWN, KC_RGHT
      ),
 
-[1] = LAYOUT(
+[1] = LAYOUT_ortho_6x13(
        KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MPLY, KC_MPLY, KC_MPLY, KC_TRNS, KC_P0,   KC_P0,   KC_PDOT, KC_PENT
      ),
 
-[2] = LAYOUT(
+[2] = LAYOUT_ortho_6x13(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/minimon/index_tab/keymaps/default_2x2u/keymap.c b/keyboards/minimon/index_tab/keymaps/default_2x2u/keymap.c
new file mode 100644
index 0000000000..999e19fb69
--- /dev/null
+++ b/keyboards/minimon/index_tab/keymaps/default_2x2u/keymap.c
@@ -0,0 +1,37 @@
+/*
+Copyright 2020 Kyrre Havik Eriksen
+          2021 James Young for QMK (@noroadsleft)
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_2x2u(
+       KC_CAPS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+       KC_NUBS, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,
+       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_BSPC,
+       KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_RBRC,
+       KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_ENT,
+       KC_ESC,  KC_GRV,  KC_LGUI, KC_LALT,      KC_SPC,           KC_SPC,      TG(1),   KC_BSLS, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT_2x2u(
+       KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_P4,   KC_P5,   KC_P6,   KC_PCMM,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, KC_P1,   KC_P2,   KC_P3,   KC_PEQL,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_MPLY,          KC_MPLY,     KC_TRNS, KC_P0,   KC_P0,   KC_PDOT, KC_PENT
+    ),
+
+};
diff --git a/keyboards/minimon/index_tab/keymaps/default_7u_space/keymap.c b/keyboards/minimon/index_tab/keymaps/default_7u_space/keymap.c
new file mode 100644
index 0000000000..ea9e88568f
--- /dev/null
+++ b/keyboards/minimon/index_tab/keymaps/default_7u_space/keymap.c
@@ -0,0 +1,39 @@
+/*
+Copyright 2020 Kyrre Havik Eriksen
+          2021 James Young for QMK (@noroadsleft)
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+#define LT1_CAP LT(1, KC_CAPS)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_7u_space(
+       LT1_CAP, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+       KC_NUBS, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,
+       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_BSPC,
+       KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_RBRC,
+       KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_ENT,
+       KC_GESC, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT_7u_space(
+       KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_P4,   KC_P5,   KC_P6,   KC_PCMM,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, KC_P1,   KC_P2,   KC_P3,   KC_PEQL,
+       KC_TRNS, KC_TRNS, KC_TRNS,                            KC_MPLY,                            KC_P0,   KC_PDOT, KC_PENT
+    ),
+
+};
diff --git a/keyboards/minimon/index_tab/keymaps/via/keymap.c b/keyboards/minimon/index_tab/keymaps/via/keymap.c
index f6f0e0da1e..f3bac2aee8 100644
--- a/keyboards/minimon/index_tab/keymaps/via/keymap.c
+++ b/keyboards/minimon/index_tab/keymaps/via/keymap.c
@@ -15,7 +15,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-[0] = LAYOUT(
+[0] = LAYOUT_ortho_6x13(
        KC_CAPS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
        KC_NUBS, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,
        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_BSPC,
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_ESC,  KC_GRV,  KC_LGUI, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  KC_SPC,  TG(1),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
      ),
 
-[1] = LAYOUT(
+[1] = LAYOUT_ortho_6x13(
        KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSLS, KC_PAST, KC_PMNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_P0,   KC_P0,   KC_PDOT, KC_PEQL
      ),
 
-[2] = LAYOUT(
+[2] = LAYOUT_ortho_6x13(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
       ),
 
-[3] = LAYOUT(
+[3] = LAYOUT_ortho_6x13(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,