Merge remote-tracking branch 'origin/master' into develop

30 files changed, 179 insertions, 94 deletions

diff --git a/keyboards/adm42/adm42.h b/keyboards/adm42/adm42.h
index d4ac544a8f..536fb51da5 100644
--- a/keyboards/adm42/adm42.h
+++ b/keyboards/adm42/adm42.h
@@ -18,7 +18,7 @@
 
 #include "quantum.h"
 
-#define LAYOUT_adm42_3x12_6( \
+#define LAYOUT( \
     K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, \
     K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, \
     K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, \
diff --git a/keyboards/adm42/info.json b/keyboards/adm42/info.json
index bf57885afa..5834be2233 100644
--- a/keyboards/adm42/info.json
+++ b/keyboards/adm42/info.json
@@ -8,8 +8,11 @@
         "pid": "0xE873",
         "device_version": "0.0.1"
     },
+    "layout_aliases": {
+        "LAYOUT_adm42_3x12_6": "LAYOUT"
+    },
     "layouts": {
-        "LAYOUT_adm42_3x12_6": {
+        "LAYOUT": {
             "layout": [
                 {"label":"GUI/`~", "x":0, "y":0.8},
                 {"label":"Q", "x":1, "y":0.8},
diff --git a/keyboards/adm42/rev4/keymaps/default/keymap.c b/keyboards/adm42/rev4/keymaps/default/keymap.c
index 154073beb7..d066445025 100644
--- a/keyboards/adm42/rev4/keymaps/default/keymap.c
+++ b/keyboards/adm42/rev4/keymaps/default/keymap.c
@@ -54,38 +54,38 @@ enum custom_keycodes {
 
 // Not a mistake to have KC_LALT (also) on the right, RALT is kept for compose (LLS_RALT)
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_adm42_3x12_6(
+    [_QWERTY] = LAYOUT(
         LW_GRV,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    RW_EQU,
         LC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, RC_QUT,
         KC_LALT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LALT,
                                    LLS_ESC, LS_BPC,  LLA_DEL, LLE_ENT, RS_SPC,  LLS_RALT
     ),
-    [_COLEMAKDH] = LAYOUT_adm42_3x12_6(
+    [_COLEMAKDH] = LAYOUT(
         LW_GRV,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, RW_EQU,
         LC_TAB,  KC_A,    KC_R,    KC_S,    KC_T,    KC_G,    KC_M,    KC_N,    KC_E,    KC_I,    KC_O,    RC_QUT,
         KC_LALT, KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,    KC_K,    KC_H,    KC_COMM, KC_DOT,  KC_SLSH, KC_LALT,
                                    LLS_ESC, LS_BPC,  LLA_DEL, LLE_ENT, RS_SPC,  LLS_RALT
     ),
 
-    [_SPECIAL] = LAYOUT_adm42_3x12_6(
+    [_SPECIAL] = LAYOUT(
         _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    RW_BS,
         LC_CIRC, KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, KC_EXLM, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_MINS, RC_DLR,
         _______, KC_AMPR, KC_AT,   KC_LCBR, KC_RCBR, KC_PIPE, KC_UNDS, KC_ASTR, KC_HASH, KC_PERC, KC_TILD, _______,
                                    KC_ESC,  _______, KC_DEL,  KC_ENT,  _______, KC_RALT
     ),
-    [_EXTRA] = LAYOUT_adm42_3x12_6(
+    [_EXTRA] = LAYOUT(
         LW_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  RW_F12,
         KC_LCTL, KC_PAUS, KC_INS,  KC_VOLD, KC_VOLU, KC_MUTE, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_APP,  KC_RCTL,
         _______, KC_SLEP, KC_PWR,  KC_MSTP, KC_MNXT, KC_MPLY, _______, KC_BRID, KC_BRIU, KC_PSCR, KC_WAKE, _______,
                                    KC_CAPS, _______, _______, _______, _______, KC_CAPS
     ),
-    [_ADM] = LAYOUT_adm42_3x12_6(
+    [_ADM] = LAYOUT(
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_M_B, RGB_VAD, RGB_VAI, RGB_SAD, RGB_SAI, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUD, RGB_HUI, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  RGB_M_P, RGB_SPD, RGB_SPI, XXXXXXX, XXXXXXX, XXXXXXX,
                                    XXXXXXX, XXXXXXX, XXXXXXX, SETUP,   XXXXXXX, XXXXXXX
     ),
-    [_SETUP] = LAYOUT_adm42_3x12_6(
+    [_SETUP] = LAYOUT(
         REFLASH, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, DF_QWER, DF_COLE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR,
diff --git a/keyboards/ai/info.json b/keyboards/ai/info.json
index 3f0f7ffbca..13a0264cb1 100644
--- a/keyboards/ai/info.json
+++ b/keyboards/ai/info.json
@@ -23,8 +23,11 @@
         "pid": "0x0000",
         "vid": "0xFEED"
     },
+    "layout_aliases": {
+        "LAYOUT_ai_5x4_1": "LAYOUT"
+    },
     "layouts": {
-        "LAYOUT_ai_5x4_1": {
+        "LAYOUT": {
             "layout": [
                 { "matrix": [0, 0], "x": 0, "y": 0.5 },
                 { "matrix": [0, 1], "x": 1, "y": 0 },
diff --git a/keyboards/ai/keymaps/default/keymap.c b/keyboards/ai/keymaps/default/keymap.c
index c948476776..ab38cf945d 100644
--- a/keyboards/ai/keymaps/default/keymap.c
+++ b/keyboards/ai/keymaps/default/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * │NaN│App│GUI│Alt│
      * └───┴───┴───┴───┘
      */
-    [0] = LAYOUT_ai_5x4_1(
+    [0] = LAYOUT(
         KC_TAB,  KC_Q,    KC_W,    KC_E,
         KC_BSPC, KC_R,    KC_T,    KC_A,    
         KC_LSFT, KC_S,    KC_D,    KC_F, 
diff --git a/keyboards/b_sides/rev41lp/info.json b/keyboards/b_sides/rev41lp/info.json
index fb5b0c17c1..da3eb62a2f 100644
--- a/keyboards/b_sides/rev41lp/info.json
+++ b/keyboards/b_sides/rev41lp/info.json
@@ -8,8 +8,11 @@
         "pid": "0x5F10",
         "device_version": "0.0.1"
     },
+    "layout_aliases": {
+        "LAYOUT_rev41lp": "LAYOUT"
+    },
     "layouts": {
-        "LAYOUT_rev41lp": {
+        "LAYOUT": {
             "layout": [
                 {"label":"K00", "x":0, "y":0.54},
                 {"label":"K01", "x":1, "y":0.36},
diff --git a/keyboards/b_sides/rev41lp/keymaps/default/keymap.c b/keyboards/b_sides/rev41lp/keymaps/default/keymap.c
index 8ee9053c12..a873433953 100644
--- a/keyboards/b_sides/rev41lp/keymaps/default/keymap.c
+++ b/keyboards/b_sides/rev41lp/keymaps/default/keymap.c
@@ -17,28 +17,28 @@ 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_rev41lp(
+  [0] = LAYOUT(
     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,      KC_T,               KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     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_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,      KC_B,               KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  RSFT_T(KC_ENT),
                                             KC_LALT,   MO(1),    KC_SPC,   MO(2),    KC_LGUI
   ),
 
-  [1] = LAYOUT_rev41lp(
+  [1] = LAYOUT(
     _______,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,    KC_PERC,            KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  KC_DEL,
     _______,  KC_UNDS,  KC_PLUS,  KC_LCBR,  KC_RCBR,   KC_PIPE,            KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_GRV,   KC_TILD,
     _______,  KC_ESC,   KC_LGUI,  KC_LALT,  KC_CAPS,   KC_DQUO,            KC_HOME,  KC_END,   KC_PGUP,  KC_PGDN,  KC_PSCR,  RSFT_T(KC_SPC),
                                             _______,   _______,  KC_ENT,   MO(3),  _______
   ),
 
-  [2] = LAYOUT_rev41lp(
+  [2] = LAYOUT(
     _______,  KC_1,     KC_2,     KC_3,     KC_4,      KC_5,               KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_DEL,
     _______,  KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,   KC_BSLS,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,
     _______,  KC_ESC,   KC_RGUI,  KC_RALT,  KC_CAPS,   KC_QUOT,            KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,
                                             _______,   MO(3),  KC_BSPC,  _______,  _______
   ),
 
-  [3] = LAYOUT_rev41lp(
+  [3] = LAYOUT(
     XXXXXXX,   XXXXXXX, XXXXXXX,  XXXXXXX,   BL_DOWN,  BL_TOGG,            BL_BRTG,   BL_UP,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
     XXXXXXX,   XXXXXXX, XXXXXXX,  XXXXXXX,  XXXXXXX,   XXXXXXX,            XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
     XXXXXXX,   XXXXXXX, XXXXXXX,  XXXXXXX,  XXXXXXX,   XXXXXXX,            QK_BOOT,    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
diff --git a/keyboards/b_sides/rev41lp/rev41lp.h b/keyboards/b_sides/rev41lp/rev41lp.h
index 47afd295a0..5716d316b2 100644
--- a/keyboards/b_sides/rev41lp/rev41lp.h
+++ b/keyboards/b_sides/rev41lp/rev41lp.h
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "quantum.h"
 
-#define LAYOUT_rev41lp( \
+#define LAYOUT( \
     K00, K01, K02, K03, K04, K05,      K10, K11, K12, K13, K14, K15, \
     K20, K21, K22, K23, K24, K25,      K30, K31, K32, K33, K34, K35, \
     K40, K41, K42, K43, K44, K45,      K50, K51, K52, K53, K54, K55, \
diff --git a/keyboards/chord/zero/info.json b/keyboards/chord/zero/info.json
index c49a8a3c2f..9b7c87e1b6 100644
--- a/keyboards/chord/zero/info.json
+++ b/keyboards/chord/zero/info.json
@@ -24,8 +24,11 @@
         "cols": ["GP22", "GP9", "GP21", "GP11", "GP19", "GP12"],
         "rows": ["GP26", "GP20", "GP18", "GP17", "GP7", "GP10", "GP13", "GP14"]
     },
+    "layout_aliases": {
+        "LAYOUT_zero": "LAYOUT"
+    },
     "layouts": {
-        "LAYOUT_zero": {
+        "LAYOUT": {
             "layout": [
                 { "matrix": [0, 0], "y": 0, "x": 0 },
                 { "matrix": [0, 1], "y": 0, "x": 1 },
diff --git a/keyboards/chord/zero/keymaps/default/keymap.c b/keyboards/chord/zero/keymaps/default/keymap.c
index a394893e1b..0469288fd4 100644
--- a/keyboards/chord/zero/keymaps/default/keymap.c
+++ b/keyboards/chord/zero/keymaps/default/keymap.c
@@ -5,7 +5,7 @@
 #include "keymap_steno.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_zero(
+    [0] = LAYOUT(
         STN_FN,  STN_S1,  STN_TL,  STN_PL,  STN_HL,  STN_ST1,          STN_ST3, STN_FR,  STN_PR,  STN_LR,  STN_TR,  STN_DR,
         STN_PWR, STN_S2,  STN_KL,  STN_WL,  STN_RL,  STN_ST2,          STN_ST4, STN_RR,  STN_BR,  STN_GR,  STN_SR,  STN_ZR,
                                    STN_N1,  STN_A,   STN_O,            STN_E,   STN_U,   STN_N7
diff --git a/keyboards/crbn/crbn.h b/keyboards/crbn/crbn.h
index 54ff007074..26a186473b 100644
--- a/keyboards/crbn/crbn.h
+++ b/keyboards/crbn/crbn.h
@@ -17,7 +17,19 @@
 
 #include "quantum.h"
 
-#define LAYOUT_crbn_1x2u( \
+#define LAYOUT_ortho_4x12( \
+		K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
+		K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
+		K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
+		K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311  \
+) { \
+		{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }, \
+		{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111 }, \
+		{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211 }, \
+		{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311 }  \
+}
+
+#define LAYOUT_planck_mit( \
 		K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
 		K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
 		K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
@@ -29,7 +41,7 @@
 		{ K300,  K301,  K302,  K303,  K304,  K305, KC_NO,  K307,  K308,  K309,  K310,  K311 }  \
 }
 
-#define LAYOUT_crbn_2x2u( \
+#define LAYOUT_2x2u( \
 		K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
 		K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
 		K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
diff --git a/keyboards/crbn/info.json b/keyboards/crbn/info.json
index 0ae3a72434..9c6894a74d 100644
--- a/keyboards/crbn/info.json
+++ b/keyboards/crbn/info.json
@@ -8,8 +8,64 @@
     "pid": "0x0002",
     "device_version": "0.0.1"
   },
+  "community_layouts": [ "ortho_4x12", "planck_mit" ],
+  "layout_aliases": {
+    "LAYOUT_crbn_1x2u": "LAYOUT_1x2u",
+    "LAYOUT_crbn_2x2u": "LAYOUT_2x2u"
+  },
   "layouts": {
-    "LAYOUT_crbn_1x2u": {
+    "LAYOUT_ortho_4x12": {
+      "layout": [
+        { "w": 1, "x": 0, "y": 0 },
+        { "w": 1, "x": 1, "y": 0 },
+        { "w": 1, "x": 2, "y": 0 },
+        { "w": 1, "x": 3, "y": 0 },
+        { "w": 1, "x": 4, "y": 0 },
+        { "w": 1, "x": 5, "y": 0 },
+        { "w": 1, "x": 6, "y": 0 },
+        { "w": 1, "x": 7, "y": 0 },
+        { "w": 1, "x": 8, "y": 0 },
+        { "w": 1, "x": 9, "y": 0 },
+        { "w": 1, "x": 10, "y": 0 },
+        { "w": 1, "x": 11, "y": 0 },
+        { "w": 1, "x": 0, "y": 1 },
+        { "w": 1, "x": 1, "y": 1 },
+        { "w": 1, "x": 2, "y": 1 },
+        { "w": 1, "x": 3, "y": 1 },
+        { "w": 1, "x": 4, "y": 1 },
+        { "w": 1, "x": 5, "y": 1 },
+        { "w": 1, "x": 6, "y": 1 },
+        { "w": 1, "x": 7, "y": 1 },
+        { "w": 1, "x": 8, "y": 1 },
+        { "w": 1, "x": 9, "y": 1 },
+        { "w": 1, "x": 10, "y": 1 },
+        { "w": 1, "x": 11, "y": 1 },
+        { "w": 1, "x": 0, "y": 2 },
+        { "w": 1, "x": 1, "y": 2 },
+        { "w": 1, "x": 2, "y": 2 },
+        { "w": 1, "x": 3, "y": 2 },
+        { "w": 1, "x": 4, "y": 2 },
+        { "w": 1, "x": 5, "y": 2 },
+        { "w": 1, "x": 6, "y": 2 },
+        { "w": 1, "x": 7, "y": 2 },
+        { "w": 1, "x": 8, "y": 2 },
+        { "w": 1, "x": 9, "y": 2 },
+        { "w": 1, "x": 10, "y": 2 },
+        { "w": 1, "x": 11, "y": 2 },
+        { "w": 1, "x": 0, "y": 3 },
+        { "w": 1, "x": 1, "y": 3 },
+        { "w": 1, "x": 2, "y": 3 },
+        { "w": 1, "x": 3, "y": 3 },
+        { "w": 1, "x": 4, "y": 3 },
+        { "w": 1, "x": 5, "y": 3 },
+        { "w": 1, "x": 6, "y": 3 },
+        { "w": 1, "x": 7, "y": 3 },
+        { "w": 1, "x": 8, "y": 3 },
+        { "w": 1, "x": 9, "y": 3 },
+        { "w": 1, "x": 10, "y": 3 },
+        { "w": 1, "x": 11, "y": 3 } ]
+    },
+    "LAYOUT_planck_mit": {
       "layout": [
         { "w": 1, "x": 0, "y": 0 },
         { "w": 1, "x": 1, "y": 0 },
@@ -59,7 +115,7 @@
         { "w": 1, "x": 10, "y": 3 },
         { "w": 1, "x": 11, "y": 3 } ]
     },
-    "LAYOUT_crbn_2x2u": {
+    "LAYOUT_2x2u": {
       "layout": [
         { "w": 1, "x": 0, "y": 0 },
         { "w": 1, "x": 1, "y": 0 },
diff --git a/keyboards/crbn/keymaps/default/keymap.c b/keyboards/crbn/keymaps/default/keymap.c
index f05cadcdd7..06b8616ed9 100644
--- a/keyboards/crbn/keymaps/default/keymap.c
+++ b/keyboards/crbn/keymaps/default/keymap.c
@@ -18,28 +18,28 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-		LAYOUT_crbn_1x2u(
+		LAYOUT_ortho_4x12(
 				KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
 				KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
 				KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
-				MO(3), KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
+				MO(3), KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
 
-		LAYOUT_crbn_1x2u(
+		LAYOUT_ortho_4x12(
 				KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS,
 				KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
 				KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, LSFT(KC_NUHS), LSFT(KC_NUBS), KC_HOME, KC_END, KC_TRNS,
-				KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY),
+				KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY),
 
-		LAYOUT_crbn_1x2u(
+		LAYOUT_ortho_4x12(
 				KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
 				KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
 				KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, KC_TRNS,
-				KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY),
+				KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY),
 
-		LAYOUT_crbn_1x2u(
+		LAYOUT_ortho_4x12(
 				QK_BOOT, 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, 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/crbn/keymaps/via/keymap.c b/keyboards/crbn/keymaps/via/keymap.c
index 1f7533c33c..b5a77b9341 100644
--- a/keyboards/crbn/keymaps/via/keymap.c
+++ b/keyboards/crbn/keymaps/via/keymap.c
@@ -18,28 +18,28 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-		LAYOUT_crbn_1x2u(
-				KC_ESC,   KC_Q,     KC_W,     KC_E,     KC_R,   KC_T,  KC_Y,  KC_U,   KC_I,     KC_O,     KC_P,     KC_BSPC,
-				KC_TAB,   KC_A,     KC_S,     KC_D,     KC_F,   KC_G,  KC_H,  KC_J,   KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
-				KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,   KC_B,  KC_N,  KC_M,   KC_COMM,  KC_DOT,   KC_SLSH,  KC_ENT,
-				MO(3),    KC_LCTL,  KC_LALT,  KC_LGUI,  MO(1),     KC_SPC,    MO(2),  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT),
+		LAYOUT_ortho_4x12(
+				KC_ESC,   KC_Q,     KC_W,     KC_E,     KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,     KC_O,     KC_P,     KC_BSPC,
+				KC_TAB,   KC_A,     KC_S,     KC_D,     KC_F,   KC_G,   KC_H,   KC_J,   KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
+				KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,  KC_DOT,   KC_SLSH,  KC_ENT,
+				MO(3),    KC_LCTL,  KC_LALT,  KC_LGUI,  MO(1),  KC_SPC, KC_SPC, MO(2),  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT),
 
-		LAYOUT_crbn_1x2u(
+		LAYOUT_ortho_4x12(
 				KC_TILD,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,  KC_PERC,  KC_CIRC,  KC_AMPR,        KC_ASTR,        KC_LPRN,  KC_RPRN,  KC_TRNS,
 				KC_DEL,   KC_F1,    KC_F2,    KC_F3,    KC_F4,   KC_F5,    KC_F6,    KC_UNDS,        KC_PLUS,        KC_LCBR,  KC_RCBR,  KC_PIPE,
 				KC_TRNS,  KC_F7,    KC_F8,    KC_F9,    KC_F10,  KC_F11,   KC_F12,   LSFT(KC_NUHS),  LSFT(KC_NUBS),  KC_HOME,  KC_END,   KC_TRNS,
-				KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,       KC_TRNS,        KC_MNXT,        KC_VOLD,  KC_VOLU,  KC_MPLY),
+				KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,        KC_MNXT,        KC_VOLD,  KC_VOLU,  KC_MPLY),
 
-		LAYOUT_crbn_1x2u(
+		LAYOUT_ortho_4x12(
 				KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,    KC_5,    KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_TRNS,
 				KC_DEL,   KC_F1,    KC_F2,    KC_F3,    KC_F4,   KC_F5,   KC_F6,    KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  KC_BSLS,
 				KC_TRNS,  KC_F7,    KC_F8,    KC_F9,    KC_F10,  KC_F11,  KC_F12,   KC_NUHS,  KC_NUBS,  KC_PGUP,  KC_PGDN,  KC_TRNS,
-				KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,      KC_TRNS,  KC_MNXT,  KC_VOLD,  KC_VOLU,  KC_MPLY),
+				KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_MNXT,  KC_VOLD,  KC_VOLU,  KC_MPLY),
 
-		LAYOUT_crbn_1x2u(
-				QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		LAYOUT_ortho_4x12(
+				QK_BOOT, 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, 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/dm9records/plaid/info.json b/keyboards/dm9records/plaid/info.json
index 485ddfc005..d8e4f57e08 100644
--- a/keyboards/dm9records/plaid/info.json
+++ b/keyboards/dm9records/plaid/info.json
@@ -10,7 +10,7 @@
   },
   "community_layouts": ["ortho_4x12", "planck_mit"],
   "layouts": {
-    "LAYOUT_plaid_mit": {
+    "LAYOUT_planck_mit": {
       "layout": [
         { "w": 1, "x": 0, "y": 0 },
         { "w": 1, "x": 1, "y": 0 },
@@ -60,7 +60,7 @@
         { "w": 1, "x": 10, "y": 3 },
         { "w": 1, "x": 11, "y": 3 } ]
     },
-    "LAYOUT_plaid_grid": {
+    "LAYOUT_ortho_4x12": {
       "layout": [
         { "w": 1, "x": 0, "y": 0 },
         { "w": 1, "x": 1, "y": 0 },
diff --git a/keyboards/dm9records/plaid/keymaps/default/keymap.c b/keyboards/dm9records/plaid/keymaps/default/keymap.c
index 1c58053eba..419f2590ca 100644
--- a/keyboards/dm9records/plaid/keymaps/default/keymap.c
+++ b/keyboards/dm9records/plaid/keymaps/default/keymap.c
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * | Ctrl | RAlt | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
  * `-----------------------------------------------------------------------------------'
  */
-[_QWERTY] = LAYOUT_plaid_grid(
+[_QWERTY] = LAYOUT_ortho_4x12(
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
     KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
@@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * | Ctrl | RAlt | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
  * `-----------------------------------------------------------------------------------'
  */
-[_COLEMAK] = LAYOUT_plaid_grid(
+[_COLEMAK] = LAYOUT_ortho_4x12(
     KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
     KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
@@ -119,7 +119,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * | Ctrl | RAlt | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
  * `-----------------------------------------------------------------------------------'
  */
-[_DVORAK] = LAYOUT_plaid_grid(
+[_DVORAK] = LAYOUT_ortho_4x12(
     KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
     KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
     KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
@@ -137,7 +137,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
  * `-----------------------------------------------------------------------------------'
  */
-[_LOWER] = LAYOUT_plaid_grid(
+[_LOWER] = LAYOUT_ortho_4x12(
     KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
     KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE,
     _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END,  _______,
@@ -155,7 +155,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
  * `-----------------------------------------------------------------------------------'
  */
-[_RAISE] = LAYOUT_plaid_grid(
+[_RAISE] = LAYOUT_ortho_4x12(
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
     KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
     _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
@@ -174,7 +174,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 
-[_PLOVER] = LAYOUT_plaid_grid(
+[_PLOVER] = LAYOUT_ortho_4x12(
     KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
     XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
     XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
@@ -192,7 +192,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |      |      |      |      |      |             |      |      |      |      |      |
  * `-----------------------------------------------------------------------------------'
  */
-[_ADJUST] = LAYOUT_plaid_grid(
+[_ADJUST] = LAYOUT_ortho_4x12(
     QK_BOOT,LED_1, LED_2, LED_3, LED_4, LED_5,LED_6, LED_7, LED_8, LED_9, LED_0,KC_DEL ,
     _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
     _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
diff --git a/keyboards/dm9records/plaid/keymaps/via/keymap.c b/keyboards/dm9records/plaid/keymaps/via/keymap.c
index 7bb28c07ed..d326bac8ed 100644
--- a/keyboards/dm9records/plaid/keymaps/via/keymap.c
+++ b/keyboards/dm9records/plaid/keymaps/via/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * | Ctrl | RAlt | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
  * `-----------------------------------------------------------------------------------'
  */
-[0] = LAYOUT_plaid_grid(
+[0] = LAYOUT_ortho_4x12(
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
     KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
  * `-----------------------------------------------------------------------------------'
  */
-[1] = LAYOUT_plaid_grid(
+[1] = LAYOUT_ortho_4x12(
     KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
     KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE,
     _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END,  _______,
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |      |      |      |      |      |             |      |      |      |      |      |
  * `-----------------------------------------------------------------------------------'
  */
-[2] = LAYOUT_plaid_grid(
+[2] = LAYOUT_ortho_4x12(
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
     KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
     _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |      |      |      |      |      |             |      |      |      |      |      |
  * `-----------------------------------------------------------------------------------'
  */
-[3] = LAYOUT_plaid_grid(
+[3] = LAYOUT_ortho_4x12(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/dm9records/plaid/plaid.h b/keyboards/dm9records/plaid/plaid.h
index 0b1c837619..2969967884 100644
--- a/keyboards/dm9records/plaid/plaid.h
+++ b/keyboards/dm9records/plaid/plaid.h
@@ -18,7 +18,7 @@
 
 #include "quantum.h"
 
-#define LAYOUT_plaid_mit( \
+#define LAYOUT_planck_mit( \
 	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
 	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
 	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
@@ -31,7 +31,7 @@
 	{ k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3a, k3b } \
 }
 
-#define LAYOUT_plaid_grid( \
+#define LAYOUT_ortho_4x12( \
 	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
 	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
 	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
@@ -44,9 +44,9 @@
 	{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
 }
 
-#define LAYOUT LAYOUT_plaid_grid
-#define LAYOUT_ortho_4x12 LAYOUT_plaid_grid
-#define LAYOUT_planck_mit LAYOUT_plaid_mit
+#define LAYOUT LAYOUT_ortho_4x12
+#define LAYOUT_plaid_grid LAYOUT_ortho_4x12
+#define LAYOUT_plaid_mit LAYOUT_planck_mit
 
 #define LED_RED C5
 #define LED_GREEN C4
diff --git a/keyboards/flehrad/numbrero/info.json b/keyboards/flehrad/numbrero/info.json
index 30c93d035c..b900919920 100644
--- a/keyboards/flehrad/numbrero/info.json
+++ b/keyboards/flehrad/numbrero/info.json
@@ -8,8 +8,12 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "layout_aliases": {
+    "LAYOUT_numbrero_numpad": "LAYOUT_numpad",
+    "LAYOUT_numbrero_ortho": "LAYOUT_ortho"