diff --git a/keyboards/p3d/spacey/keyboard.json b/keyboards/p3d/spacey/keyboard.json
index ed23c327ade..9cdeeb1c882 100644
--- a/keyboards/p3d/spacey/keyboard.json
+++ b/keyboards/p3d/spacey/keyboard.json
@@ -29,6 +29,9 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_5x14"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/percent/skog/keyboard.json b/keyboards/percent/skog/keyboard.json
index 823c1638acd..b18b74c2764 100644
--- a/keyboards/percent/skog/keyboard.json
+++ b/keyboards/percent/skog/keyboard.json
@@ -51,8 +51,12 @@
     },
     "processor": "atmega32a",
     "bootloader": "bootloadhid",
+    "layout_aliases": {
+      "LAYOUT": "LAYOUT_all"
+  },
+    "community_layouts": ["tkl_ansi"],
     "layouts": {
-      "LAYOUT": {
+      "LAYOUT_all": {
         "layout": [
           {"matrix": [1, 1], "x": 0, "y": 0},
 
@@ -153,6 +157,110 @@
           {"matrix": [6, 11], "x": 12.5, "y": 5.5, "w": 1.25},
           {"matrix": [6, 12], "x": 13.75, "y": 5.5, "w": 1.25},
 
+          {"matrix": [6, 0], "x": 15.25, "y": 5.5},
+          {"matrix": [6, 13], "x": 16.25, "y": 5.5},
+          {"matrix": [6, 8], "x": 17.25, "y": 5.5}
+        ]
+      },
+      "LAYOUT_tkl_ansi": {
+        "layout": [
+          {"matrix": [1, 1], "x": 0, "y": 0},
+
+          {"matrix": [1, 3], "x": 2, "y": 0},
+          {"matrix": [1, 4], "x": 3, "y": 0},
+          {"matrix": [1, 5], "x": 4, "y": 0},
+          {"matrix": [1, 6], "x": 5, "y": 0},
+
+          {"matrix": [1, 8], "x": 6.5, "y": 0},
+          {"matrix": [1, 9], "x": 7.5, "y": 0},
+          {"matrix": [1, 10], "x": 8.5, "y": 0},
+          {"matrix": [1, 11], "x": 9.5, "y": 0},
+
+          {"matrix": [1, 12], "x": 11, "y": 0},
+          {"matrix": [1, 0], "x": 12, "y": 0},
+          {"matrix": [1, 13], "x": 13, "y": 0},
+          {"matrix": [1, 2], "x": 14, "y": 0},
+
+          {"matrix": [0, 2], "x": 15.25, "y": 0},
+          {"matrix": [0, 3], "x": 16.25, "y": 0},
+          {"matrix": [0, 0], "x": 17.25, "y": 0},
+
+          {"matrix": [2, 1], "x": 0, "y": 1.5},
+          {"matrix": [2, 2], "x": 1, "y": 1.5},
+          {"matrix": [2, 3], "x": 2, "y": 1.5},
+          {"matrix": [2, 4], "x": 3, "y": 1.5},
+          {"matrix": [2, 5], "x": 4, "y": 1.5},
+          {"matrix": [2, 6], "x": 5, "y": 1.5},
+          {"matrix": [2, 7], "x": 6, "y": 1.5},
+          {"matrix": [2, 8], "x": 7, "y": 1.5},
+          {"matrix": [2, 9], "x": 8, "y": 1.5},
+          {"matrix": [2, 10], "x": 9, "y": 1.5},
+          {"matrix": [2, 11], "x": 10, "y": 1.5},
+          {"matrix": [2, 12], "x": 11, "y": 1.5},
+          {"matrix": [2, 0], "x": 12, "y": 1.5},
+          {"matrix": [2, 13], "x": 13, "y": 1.5, "w": 2},
+
+          {"matrix": [0, 7], "x": 15.25, "y": 1.5},
+          {"matrix": [0, 6], "x": 16.25, "y": 1.5},
+          {"matrix": [0, 5], "x": 17.25, "y": 1.5},
+
+          {"matrix": [3, 1], "x": 0, "y": 2.5, "w": 1.5},
+          {"matrix": [3, 2], "x": 1.5, "y": 2.5},
+          {"matrix": [3, 3], "x": 2.5, "y": 2.5},
+          {"matrix": [3, 4], "x": 3.5, "y": 2.5},
+          {"matrix": [3, 5], "x": 4.5, "y": 2.5},
+          {"matrix": [3, 6], "x": 5.5, "y": 2.5},
+          {"matrix": [3, 7], "x": 6.5, "y": 2.5},
+          {"matrix": [3, 8], "x": 7.5, "y": 2.5},
+          {"matrix": [3, 9], "x": 8.5, "y": 2.5},
+          {"matrix": [3, 10], "x": 9.5, "y": 2.5},
+          {"matrix": [3, 11], "x": 10.5, "y": 2.5},
+          {"matrix": [3, 12], "x": 11.5, "y": 2.5},
+          {"matrix": [3, 0], "x": 12.5, "y": 2.5},
+          {"matrix": [3, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+          {"matrix": [0, 13], "x": 15.25, "y": 2.5},
+          {"matrix": [0, 9], "x": 16.25, "y": 2.5},
+          {"matrix": [0, 8], "x": 17.25, "y": 2.5},
+
+          {"matrix": [4, 1], "x": 0, "y": 3.5, "w": 1.75},
+          {"matrix": [4, 2], "x": 1.75, "y": 3.5},
+          {"matrix": [4, 3], "x": 2.75, "y": 3.5},
+          {"matrix": [4, 4], "x": 3.75, "y": 3.5},
+          {"matrix": [4, 5], "x": 4.75, "y": 3.5},
+          {"matrix": [4, 6], "x": 5.75, "y": 3.5},
+          {"matrix": [4, 7], "x": 6.75, "y": 3.5},
+          {"matrix": [4, 8], "x": 7.75, "y": 3.5},
+          {"matrix": [4, 9], "x": 8.75, "y": 3.5},
+          {"matrix": [4, 10], "x": 9.75, "y": 3.5},
+          {"matrix": [4, 11], "x": 10.75, "y": 3.5},
+          {"matrix": [4, 12], "x": 11.75, "y": 3.5},
+          {"matrix": [4, 0], "x": 12.75, "y": 3.5, "w": 2.25},
+
+          {"matrix": [5, 1], "x": 0, "y": 4.5, "w": 2.25},
+          {"matrix": [5, 2], "x": 2.25, "y": 4.5},
+          {"matrix": [5, 3], "x": 3.25, "y": 4.5},
+          {"matrix": [5, 4], "x": 4.25, "y": 4.5},
+          {"matrix": [5, 5], "x": 5.25, "y": 4.5},
+          {"matrix": [5, 6], "x": 6.25, "y": 4.5},
+          {"matrix": [5, 7], "x": 7.25, "y": 4.5},
+          {"matrix": [5, 8], "x": 8.25, "y": 4.5},
+          {"matrix": [5, 9], "x": 9.25, "y": 4.5},
+          {"matrix": [5, 10], "x": 10.25, "y": 4.5},
+          {"matrix": [5, 11], "x": 11.25, "y": 4.5},
+          {"matrix": [5, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+          {"matrix": [5, 13], "x": 16.25, "y": 4.5},
+
+          {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25},
+          {"matrix": [6, 2], "x": 1.25, "y": 5.5, "w": 1.25},
+          {"matrix": [6, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+          {"matrix": [6, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+          {"matrix": [6, 9], "x": 10, "y": 5.5, "w": 1.25},
+          {"matrix": [6, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+          {"matrix": [6, 11], "x": 12.5, "y": 5.5, "w": 1.25},
+          {"matrix": [6, 12], "x": 13.75, "y": 5.5, "w": 1.25},
+
           {"matrix": [6, 0], "x": 15.25, "y": 5.5},
           {"matrix": [6, 13], "x": 16.25, "y": 5.5},
           {"matrix": [6, 8], "x": 17.25, "y": 5.5}
diff --git a/keyboards/percent/skog/keymaps/default/keymap.c b/keyboards/percent/skog/keymaps/default/keymap.c
index 6f5f6d36cb4..8c75adf2a45 100644
--- a/keyboards/percent/skog/keymaps/default/keymap.c
+++ b/keyboards/percent/skog/keymaps/default/keymap.c
@@ -18,7 +18,7 @@ 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(
+    [0] = LAYOUT_all(
       KC_ESC,           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_PSCR, KC_SCRL, KC_PAUS,
       KC_GRV,  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_BSPC,                 KC_INS,  KC_HOME, KC_PGUP,
       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_RBRC,    KC_BSLS,                 KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/picolab/frusta_fundamental/keyboard.json b/keyboards/picolab/frusta_fundamental/keyboard.json
index 6a47fb13272..a8673ca2cce 100644
--- a/keyboards/picolab/frusta_fundamental/keyboard.json
+++ b/keyboards/picolab/frusta_fundamental/keyboard.json
@@ -44,8 +44,12 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_65_ansi_blocker"
+    },
+    "community_layouts": ["65_ansi_blocker"],
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_65_ansi_blocker": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
diff --git a/keyboards/picolab/frusta_fundamental/keymaps/default/keymap.c b/keyboards/picolab/frusta_fundamental/keymaps/default/keymap.c
index 20388835105..b7c9064c38b 100644
--- a/keyboards/picolab/frusta_fundamental/keymaps/default/keymap.c
+++ b/keyboards/picolab/frusta_fundamental/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
-    [_BASE] = LAYOUT(
+    [_BASE] = LAYOUT_65_ansi_blocker(
         QK_GESC,    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_BSPC,    RGB_TOG,
         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_RBRC,    KC_BSLS,    KC_HOME,
         KC_CAPS,    KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,   KC_SCLN,  KC_QUOT,    KC_ENT,                 KC_END,
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,    KC_LGUI, KC_LALT,        KC_SPC,                                  MO(1),  KC_LCTL,  KC_LEFT,    KC_DOWN,                KC_RGHT
     ),
 
-    [_FKEY] = LAYOUT(
+    [_FKEY] = LAYOUT_65_ansi_blocker(
         KC_TRNS,     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_TRNS,    RGB_MOD,
         KC_TRNS,     KC_TRNS,   KC_TRNS,    KC_TRNS,   QK_BOOT,      KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_PGUP,
         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_PGDN,
diff --git a/keyboards/picolab/frusta_fundamental/keymaps/via/keymap.c b/keyboards/picolab/frusta_fundamental/keymaps/via/keymap.c
index 8d18625a887..46ec59f8386 100644
--- a/keyboards/picolab/frusta_fundamental/keymaps/via/keymap.c
+++ b/keyboards/picolab/frusta_fundamental/keymaps/via/keymap.c
@@ -16,7 +16,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
+    [0] = LAYOUT_65_ansi_blocker(
         QK_GESC,    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_BSPC,    RGB_TOG,
         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_RBRC,    KC_BSLS,    KC_HOME,
         KC_CAPS,    KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,   KC_SCLN,  KC_QUOT,    KC_ENT,                 KC_END,
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     /* F-Keys */
-    [1] = LAYOUT(
+    [1] = LAYOUT_65_ansi_blocker(
         KC_TRNS,     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_TRNS,    RGB_MOD,
         KC_TRNS,     KC_TRNS,   KC_TRNS,    KC_TRNS,   QK_BOOT,      KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_PGUP,
         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_PGDN,
@@ -33,7 +33,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
     ),
 
-    [2] = LAYOUT(
+    [2] = LAYOUT_65_ansi_blocker(
         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,
@@ -41,7 +41,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
     ),
 
-    [3] = LAYOUT(
+    [3] = LAYOUT_65_ansi_blocker(
         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/quantrik/kyuu/keyboard.json b/keyboards/quantrik/kyuu/keyboard.json
index 6e3fe5b74cd..fedce5671dd 100644
--- a/keyboards/quantrik/kyuu/keyboard.json
+++ b/keyboards/quantrik/kyuu/keyboard.json
@@ -23,8 +23,90 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_65_ansi_blocker_tsangan_split_bs"
+    },
+    "community_layouts": ["65_ansi_blocker_tsangan", "65_ansi_blocker_tsangan_split_bs"],
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_65_ansi_blocker_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [2, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [2, 13], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [3, 13], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
diff --git a/keyboards/quantrik/kyuu/keymaps/default/keymap.c b/keyboards/quantrik/kyuu/keymaps/default/keymap.c
index 3b3c09f2d96..0f0282b4283 100644
--- a/keyboards/quantrik/kyuu/keymaps/default/keymap.c
+++ b/keyboards/quantrik/kyuu/keymaps/default/keymap.c
@@ -22,14 +22,14 @@ enum custom_keycodes {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
+    [0] = LAYOUT_65_ansi_blocker_tsangan_split_bs(
         KC_ESC,  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_BSLS, KC_GRV, KC_HOME,
         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_RBRC, KC_BSPC, KC_PGUP,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_PGDN,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_UP,   KC_END,
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [1] = LAYOUT(
+    [1] = LAYOUT_65_ansi_blocker_tsangan_split_bs(
         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, QMKBEST, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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,
diff --git a/keyboards/quantrik/kyuu/keymaps/via/keymap.c b/keyboards/quantrik/kyuu/keymaps/via/keymap.c
index 7f769d72bbb..041f4d41cda 100755
--- a/keyboards/quantrik/kyuu/keymaps/via/keymap.c
+++ b/keyboards/quantrik/kyuu/keymaps/via/keymap.c
@@ -16,28 +16,28 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
+    [0] = LAYOUT_65_ansi_blocker_tsangan_split_bs(
         KC_ESC,  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_BSLS, KC_GRV, KC_HOME,
         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_RBRC, KC_BSPC, KC_PGUP,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_PGDN,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_UP,   KC_END,
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [1] = LAYOUT(
+    [1] = LAYOUT_65_ansi_blocker_tsangan_split_bs(
         KC_TRNS, 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_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, 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
     ),
-    [2] = LAYOUT(
+    [2] = LAYOUT_65_ansi_blocker_tsangan_split_bs(
         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, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
-    [3] = LAYOUT(
+    [3] = LAYOUT_65_ansi_blocker_tsangan_split_bs(
         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/rainkeebs/yasui/keyboard.json b/keyboards/rainkeebs/yasui/keyboard.json
index 926b1084dd3..483dee26f27 100644
--- a/keyboards/rainkeebs/yasui/keyboard.json
+++ b/keyboards/rainkeebs/yasui/keyboard.json
@@ -44,8 +44,12 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_4x10"
+    },
+    "community_layouts": ["ortho_4x10"],
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_ortho_4x10": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
diff --git a/keyboards/rainkeebs/yasui/keymaps/default/keymap.c b/keyboards/rainkeebs/yasui/keymaps/default/keymap.c
index 3f90b06c41d..7d8d90e3c03 100644
--- a/keyboards/rainkeebs/yasui/keymaps/default/keymap.c
+++ b/keyboards/rainkeebs/yasui/keymaps/default/keymap.c
@@ -17,25 +17,25 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	LAYOUT(
+	LAYOUT_ortho_4x10(
 		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_ENT,
 		KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_BSPC,
 		KC_LCTL, KC_LALT, MO(1), KC_LSFT, KC_MPLY, KC_SPC, KC_SPC, MO(2), KC_RALT, KC_RCTL),
 
-	LAYOUT(
+	LAYOUT_ortho_4x10(
 		KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
 		KC_ESC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_MINS, KC_EQL, KC_QUOT, KC_SCLN, KC_TRNS,
 		KC_TAB, KC_DEL, KC_PSCR, KC_LBRC, KC_RBRC, KC_BSLS, KC_SLSH, 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),
 
-	LAYOUT(
+	LAYOUT_ortho_4x10(
 		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),
 
-	LAYOUT(
+	LAYOUT_ortho_4x10(
 		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/rainkeebs/yasui/keymaps/via/keymap.c b/keyboards/rainkeebs/yasui/keymaps/via/keymap.c
index 3f90b06c41d..7d8d90e3c03 100644
--- a/keyboards/rainkeebs/yasui/keymaps/via/keymap.c
+++ b/keyboards/rainkeebs/yasui/keymaps/via/keymap.c
@@ -17,25 +17,25 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	LAYOUT(
+	LAYOUT_ortho_4x10(
 		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_ENT,
 		KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_BSPC,
 		KC_LCTL, KC_LALT, MO(1), KC_LSFT, KC_MPLY, KC_SPC, KC_SPC, MO(2), KC_RALT, KC_RCTL),
 
-	LAYOUT(
+	LAYOUT_ortho_4x10(
 		KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
 		KC_ESC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_MINS, KC_EQL, KC_QUOT, KC_SCLN, KC_TRNS,
 		KC_TAB, KC_DEL, KC_PSCR, KC_LBRC, KC_RBRC, KC_BSLS, KC_SLSH, 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),
 
-	LAYOUT(
+	LAYOUT_ortho_4x10(
 		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),
 
-	LAYOUT(
+	LAYOUT_ortho_4x10(
 		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/rookiebwoy/neopad/rev1/info.json b/keyboards/rookiebwoy/neopad/rev1/info.json
index 0a0340c06df..8c3c1ff9567 100755
--- a/keyboards/rookiebwoy/neopad/rev1/info.json
+++ b/keyboards/rookiebwoy/neopad/rev1/info.json
@@ -24,8 +24,12 @@
     "tapping": {
         "toggle": 2
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_2x3"
+    },
+    "community_layouts": ["ortho_2x3"],
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_ortho_2x3": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
diff --git a/keyboards/rookiebwoy/neopad/rev1/keymaps/default/keymap.c b/keyboards/rookiebwoy/neopad/rev1/keymaps/default/keymap.c
index 08227c84f9e..8e57580aed2 100755
--- a/keyboards/rookiebwoy/neopad/rev1/keymaps/default/keymap.c
+++ b/keyboards/rookiebwoy/neopad/rev1/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     |   prev  |  play   |   next  |	R ENC: vol up/down
     \-----------------------------'
     */
-    [0] = LAYOUT(
+    [0] = LAYOUT_ortho_2x3(
                 TO(1),     KC_MSTP,  KC_MUTE,
     		    KC_MPRV,   KC_MPLY,  KC_MNXT
     ),
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     | move window | minimize | move window  | R ENC: change browser tab + change explorer window
     \---------------------------------------'
     */
-    [1] = LAYOUT(
+    [1] = LAYOUT_ortho_2x3(
 				TO(2),     		LGUI(KC_UP),    LGUI(KC_D),
 				LGUI(KC_LEFT),	LGUI(KC_DOWN),  LGUI(KC_RIGHT)
     ),
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     |   cut   |   copy  |   paste  | R ENC: mouse wheel up/down
     \------------------------------'
     */
-    [2] = LAYOUT(
+    [2] = LAYOUT_ortho_2x3(
                 TO(3),     		KC_ESC,    		LCTL(LSFT(KC_ESC)),
     		    LCTL(KC_X),		LCTL(KC_C),     LCTL(KC_V)
     ),
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     |   ctrl  |   play  |  pause  |	R ENC: mouse wheel up/down
     \-----------------------------'
     */
-    [3] = LAYOUT(
+    [3] = LAYOUT_ortho_2x3(
                 TO(0),     	LSFT(KC_R),    	KC_DEL,
     		    KC_LCTL,	KC_SPC,         KC_P
     ),