qmk · dunk2k · Aug 28, 2023 · Aug 28, 2023 · Aug 28, 2023 · Aug 28, 2023
diff --git a/keyboards/0xcb/1337/keyboard.json b/keyboards/0xcb/1337/keyboard.json
@@ -78,8 +78,12 @@
       ["E6", "B4", "B2"]
     ]
   },
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_ortho_3x3"
+  },
+  "community_layouts": ["ortho_3x3"],
   "layouts": {
-    "LAYOUT": {
+    "LAYOUT_ortho_3x3": {
       "layout": [
         {"x": 0, "y": 0, "matrix": [0, 0]},
         {"x": 1, "y": 0, "matrix": [0, 1]},

diff --git a/keyboards/0xcb/1337/keymaps/default/keymap.c b/keyboards/0xcb/1337/keymaps/default/keymap.c
@@ -24,22 +24,22 @@ enum layer_names {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_HOME] = LAYOUT(
+[_HOME] = LAYOUT_ortho_3x3(
     KC_MPRV, KC_MNXT, KC_MPLY,
     KC_PGUP, KC_PGDN, TO(3),
     KC_HOME, KC_END,  TO(1)
 ),
-[_MISC] = LAYOUT(
+[_MISC] = LAYOUT_ortho_3x3(
     _______, _______, _______,
     _______, _______, TO(0),
     _______, _______, TO(2)
 ),
-[_RGB] = LAYOUT(
+[_RGB] = LAYOUT_ortho_3x3(
     RGB_HUI, RGB_HUD, RGB_MOD,
     RGB_SAI, RGB_SAD, TO(1),
     RGB_SPI, RGB_SPD, TO(3)
 ),
-[_BLED] = LAYOUT(
+[_BLED] = LAYOUT_ortho_3x3(
     BL_STEP, BL_BRTG, BL_TOGG,
     BL_ON,   BL_OFF,  TO(2),
     BL_UP,   BL_DOWN, TO(0)

diff --git a/keyboards/0xcb/1337/keymaps/via/keymap.c b/keyboards/0xcb/1337/keymaps/via/keymap.c
@@ -24,22 +24,22 @@ enum layer_names {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_HOME] = LAYOUT(
+[_HOME] = LAYOUT_ortho_3x3(
     KC_MPRV, KC_MNXT, KC_MPLY,
     KC_PGUP, KC_PGDN, TO(3),
     KC_HOME, KC_END,  TO(1)
 ),
-[_MISC] = LAYOUT(
+[_MISC] = LAYOUT_ortho_3x3(
     _______, _______, _______,
     _______, _______, TO(0),
     _______, _______, TO(2)
 ),
-[_RGB] = LAYOUT(
+[_RGB] = LAYOUT_ortho_3x3(
     RGB_HUI, RGB_HUD, RGB_MOD,
     RGB_SAI, RGB_SAD, TO(1),
     RGB_SPI, RGB_SPD, TO(3)
 ),
-[_BLED] = LAYOUT(
+[_BLED] = LAYOUT_ortho_3x3(
     BL_STEP, BL_BRTG, BL_TOGG,
     BL_ON,   BL_OFF,  TO(2),
     BL_UP,   BL_DOWN, TO(0)

diff --git a/keyboards/3w6/info.json b/keyboards/3w6/info.json
@@ -6,5 +6,9 @@
     "usb": {
         "vid": "0xFEED",
         "pid": "0x4658"
-    }
+    },
+        "layout_aliases": {
+            "LAYOUT": "LAYOUT_split_3x5_3"
+    },
+    "community_layouts": ["split_3x5_3"]
 }
diff --git a/keyboards/3w6/keymaps/default/keymap.c b/keyboards/3w6/keymaps/default/keymap.c
@@ -29,38 +29,38 @@ enum layers
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
-    [_ALPHA_QWERTY] = LAYOUT(
+    [_ALPHA_QWERTY] = LAYOUT_split_3x5_3(
         KC_Q,         KC_W,    KC_E,    KC_R,    KC_T,                                                KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,  
         KC_A,         KC_S,    KC_D,    KC_F,    KC_G,                                                KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,
         LSFT_T(KC_Z), KC_X,    KC_C,    KC_V,    KC_B,                                                KC_N,    KC_M,    KC_COMM, KC_DOT,  RSFT_T(KC_SLSH),
 
                         LCTL_T(KC_ESC), LT(_NUM,KC_SPC), LT(_NAV, KC_TAB),     LT(_SYM, KC_BSPC), KC_ENT, LALT_T(KC_DEL)         
     ),
-    [_ALPHA_COLEMAK] = LAYOUT(
+    [_ALPHA_COLEMAK] = LAYOUT_split_3x5_3(
         KC_Q,         KC_W,    KC_F,    KC_P,    KC_G,                                                KC_J,    KC_L,    KC_U,    KC_Y,    KC_QUOT,
         KC_A,         KC_R,    KC_S,    KC_T,    KC_D,                                                KC_H,    KC_N,    KC_E,    KC_I,    KC_O,
         LSFT_T(KC_Z), KC_X,    KC_C,    KC_V,    KC_B,                                                KC_K,    KC_M,    KC_COMM, KC_DOT,  RSFT_T(KC_SCLN),
                         LCTL_T(KC_ENT), LT(_NUM,KC_SPC), LT(_NAV, KC_TAB),     LT(_SYM, KC_BSPC), KC_ENT, LALT_T(KC_DEL)         
     ),
-    [_SYM] = LAYOUT(
+    [_SYM] = LAYOUT_split_3x5_3(
         KC_GRV , KC_CIRC,   KC_AT,  KC_DLR, KC_TILD,                                KC_AMPR, KC_EXLM, KC_PIPE, KC_UNDS, KC_HASH,
         KC_SLSH, KC_LBRC, KC_LCBR, KC_LPRN,  KC_EQL,                                KC_ASTR, KC_RPRN, KC_RCBR, KC_RBRC, KC_BSLS, 
         _______, KC_QUES, KC_PLUS, KC_PERC, XXXXXXX,                                XXXXXXX, XXXXXXX, KC_MINS, XXXXXXX, _______,
                                         XXXXXXX, MO(_CFG), XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX         
     ),
-    [_NAV] = LAYOUT(
+    [_NAV] = LAYOUT_split_3x5_3(
         XXXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, XXXXXXX,                                XXXXXXX, KC_PGDN,   KC_UP, KC_PGUP,  KC_DEL,
         KC_MPRV, KC_MPLY, KC_MSTP, KC_MNXT, XXXXXXX,                                KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT,  KC_END,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
                                         XXXXXXX, XXXXXXX, XXXXXXX,      XXXXXXX, MO(_CFG), XXXXXXX         
     ),
-    [_NUM] = LAYOUT(
+    [_NUM] = LAYOUT_split_3x5_3(
         XXXXXXX,  KC_F9, KC_F10, KC_F11, KC_F12,                                    KC_PPLS,  KC_P7,  KC_P8,  KC_P9, KC_PSLS,
         XXXXXXX,  KC_F5,  KC_F6,  KC_F7,  KC_F8,                                    KC_P0,  KC_P4,  KC_P5,  KC_P6, KC_PDOT,
         XXXXXXX,  KC_F1,  KC_F2,  KC_F3,  KC_F4,                                    KC_PMNS,  KC_P1,  KC_P2,  KC_P3, KC_PAST,
                                         XXXXXXX, XXXXXXX, XXXXXXX,      KC_PEQL, KC_PENT, XXXXXXX
     ),
-    [_CFG] = LAYOUT(
+    [_CFG] = LAYOUT_split_3x5_3(
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                XXXXXXX, XXXXXXX, XXXXXXX,DF(_ALPHA_QWERTY), DF(_ALPHA_COLEMAK),
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,

diff --git a/keyboards/3w6/rev1/info.json b/keyboards/3w6/rev1/info.json
@@ -5,7 +5,7 @@
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_split_3x5_3": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0.8},
                 {"matrix": [0, 1], "x": 1, "y": 0.2},

diff --git a/keyboards/3w6/rev2/info.json b/keyboards/3w6/rev2/info.json
@@ -5,7 +5,7 @@
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_split_3x5_3": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0.8},
                 {"matrix": [0, 1], "x": 1, "y": 0.2},