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

5 files changed, 542 insertions, 21 deletions

diff --git a/keyboards/superuser/ext/ext.h b/keyboards/superuser/ext/ext.h
index f83b5bed19..3bed0782d2 100644
--- a/keyboards/superuser/ext/ext.h
+++ b/keyboards/superuser/ext/ext.h
@@ -17,16 +17,88 @@
 
 #include "quantum.h"
 
-#define LAYOUT_tkl(\
-    KF10, KF11, K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K312,    K114, K115, K116,  \
-    KF20, KF21, K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,          K214, K215, K216,  \
-    KF30, KF31, K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,                             \
-    KF40, KF41, K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413,                K415,        \
-    KF50, KF51, K500, K501, K502,                   K506,                         K511, K512, K513,          K514, K515, K516   \
+#define ___ KC_NO
+
+/*
+ *              ┌───┬───┐┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐      ┌───────┐
+ *              │00 │01 ││02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │2E ││0G │0H │0I │      │0F     │ 2u Backspace
+ *              ├───┼───┤├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤      └─┬─────┤
+ *              │10 │11 ││12   │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │1F   ││1G │1H │1I │        │     │
+ *  2.25u       ├───┼───┤├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘     ┌──┴┐2F  │ ISO Enter
+ *  LShift      │20 │21 ││22    │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │2F      │                  │1F │    │
+ * ┌────────┐   ├───┼───┤├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐       ┌─┴───┴────┤
+ * │32      │   │30 │31 ││32  │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E    │3F │    │3H │       │3E        │ 2.75u RShift
+ * └────────┘   ├───┼───┤├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤┌───┼───┼───┐   └──────────┘
+ *              │40 │41 ││42   │43 │44   │48                         │4D   │4E │4F   ││4G │4H │4I │
+ *              └───┴───┘└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘
+ */
+
+#define LAYOUT_all(\
+    K00, K01,  K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K2E,    K0G, K0H, K0I,  \
+    K10, K11,  K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F,         K1G, K1H, K1I,  \
+    K20, K21,  K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F,                         \
+    K30, K31,  K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F,              K3H,       \
+    K40, K41,  K42, K43, K44,                K48,                     K4D, K4E, K4F,         K4G, K4H, K4I   \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, ___, ___, ___ }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, ___, K3H, ___ }, \
+    { K40, K41, K42, K43, K44, ___, ___, ___, K48, ___, ___, ___, ___, K4D, K4E, K4F, K4G, K4H, K4I }  \
+}
+
+#define LAYOUT_ansi(\
+    K00, K01,   K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F,   K0G, K0H, K0I, \
+    K10, K11,   K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F,   K1G, K1H, K1I, \
+    K20, K21,   K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F,                  \
+    K30, K31,   K32,      K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3E,        K3H,      \
+    K40, K41,   K42, K43, K44,                K48,                     K4D, K4E, K4F,   K4G, K4H, K4I  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F, ___, ___, ___ }, \
+    { K30, K31, K32, ___, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___, ___, K3H, ___ }, \
+    { K40, K41, K42, K43, K44, ___, ___, ___, K48, ___, ___, ___, ___, K4D, K4E, K4F, K4G, K4H, K4I }  \
+}
+
+#define LAYOUT_ansi_split_bs_rshift(\
+    K00, K01,   K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K2E,   K0G, K0H, K0I, \
+    K10, K11,   K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F,        K1G, K1H, K1I, \
+    K20, K21,   K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F,                       \
+    K30, K31,   K32,      K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F,             K3H,      \
+    K40, K41,   K42, K43, K44,                K48,                     K4D, K4E, K4F,        K4G, K4H, K4I  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, ___, ___, ___ }, \
+    { K30, K31, K32, ___, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, ___, K3H, ___ }, \
+    { K40, K41, K42, K43, K44, ___, ___, ___, K48, ___, ___, ___, ___, K4D, K4E, K4F, K4G, K4H, K4I }  \
+}
+
+#define LAYOUT_iso(\
+    K00, K01,   K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F,   K0G, K0H, K0I, \
+    K10, K11,   K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,        K1G, K1H, K1I, \
+    K20, K21,   K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K1F, K2F,                  \
+    K30, K31,   K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3E,        K3H,      \
+    K40, K41,   K42, K43, K44,                K48,                     K4D, K4E, K4F,   K4G, K4H, K4I  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F, ___, ___, ___ }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___, ___, K3H, ___ }, \
+    { K40, K41, K42, K43, K44, ___, ___, ___, K48, ___, ___, ___, ___, K4D, K4E, K4F, K4G, K4H, K4I }  \
+}
+
+#define LAYOUT_iso_split_bs_rshift(\
+    K00, K01,   K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K2E,   K0G, K0H, K0I, \
+    K10, K11,   K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,             K1G, K1H, K1I, \
+    K20, K21,   K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K1F, K2F,                       \
+    K30, K31,   K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F,             K3H,      \
+    K40, K41,   K42, K43, K44,                K48,                     K4D, K4E, K4F,        K4G, K4H, K4I  \
 ) { \
-    { KF10,  KF11,  K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115,  K116  }, \
-    { KF20,  KF21,  K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215,  K216  }, \
-    { KF30,  KF31,  K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO, KC_NO, KC_NO }, \
-    { KF40,  KF41,  K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413,  KC_NO, K415,  KC_NO }, \
-    { KF50,  KF51,  K500,  K501,  K502,  KC_NO, KC_NO, KC_NO, K506,  KC_NO, KC_NO, KC_NO, KC_NO, K511,  K512,  K513,  K514,  K515,  K516  }  \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, ___, ___, ___ }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, ___, K3H, ___ }, \
+    { K40, K41, K42, K43, K44, ___, ___, ___, K48, ___, ___, ___, ___, K4D, K4E, K4F, K4G, K4H, K4I }  \
 }
diff --git a/keyboards/superuser/ext/info.json b/keyboards/superuser/ext/info.json
index 272df98a9a..c19fc3a913 100644
--- a/keyboards/superuser/ext/info.json
+++ b/keyboards/superuser/ext/info.json
@@ -1,10 +1,459 @@
 {
     "keyboard_name": "ext",
     "url": "",
-    "maintainer": "superuser",
+    "maintainer": "kaylanm",
+    "layout_aliases": {
+        "LAYOUT_tkl": "LAYOUT_all"
+    },
     "layouts": {
-        "LAYOUT": {
-            "layout": [{"label":"F1", "x":0, "y":0}, {"label":"F2", "x":1, "y":0}, {"label":"~", "x":2.25, "y":0}, {"label":"!", "x":3.25, "y":0}, {"label":"@", "x":4.25, "y":0}, {"label":"#", "x":5.25, "y":0}, {"label":"$", "x":6.25, "y":0}, {"label":"%", "x":7.25, "y":0}, {"label":"^", "x":8.25, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Bksp", "x":15.25, "y":0}, {"label":"Bksp", "x":16.25, "y":0}, {"label":"Insert", "x":17.5, "y":0}, {"label":"Home", "x":18.5, "y":0}, {"label":"PgUp", "x":19.5, "y":0}, {"label":"F3", "x":0, "y":1}, {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.25, "y":1, "w":1.5}, {"label":"Q", "x":3.75, "y":1}, {"label":"W", "x":4.75, "y":1}, {"label":"E", "x":5.75, "y":1}, {"label":"R", "x":6.75, "y":1}, {"label":"T", "x":7.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"|", "x":15.75, "y":1, "w":1.5}, {"label":"Delete", "x":17.5, "y":1}, {"label":"End", "x":18.5, "y":1}, {"label":"PgDn", "x":19.5, "y":1}, {"label":"F5", "x":0, "y":2}, {"label":"F6", "x":1, "y":2}, {"label":"Caps Lock", "x":2.25, "y":2, "w":1.75}, {"label":"A", "x":4, "y":2}, {"label":"S", "x":5, "y":2}, {"label":"D", "x":6, "y":2}, {"label":"F", "x":7, "y":2}, {"label":"G", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"F7", "x":0, "y":3}, {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.25, "y":3, "w":1.25}, {"label":"|", "x":3.5, "y":3}, {"label":"Z", "x":4.5, "y":3}, {"label":"X", "x":5.5, "y":3}, {"label":"C", "x":6.5, "y":3}, {"label":"V", "x":7.5, "y":3}, {"label":"B", "x":8.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"Fn", "x":16.25, "y":3}, {"label":"\u2191", "x":18.5, "y":3}, {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Ctrl", "x":2.25, "y":4, "w":1.5}, {"label":"Win", "x":3.75, "y":4}, {"label":"Alt", "x":4.75, "y":4, "w":1.5}, {"x":6.25, "y":4, "w":7}, {"label":"Alt", "x":13.25, "y":4, "w":1.5}, {"label":"Win", "x":14.75, "y":4}, {"label":"Ctrl", "x":15.75, "y":4, "w":1.5}, {"label":"\u2190", "x":17.5, "y":4}, {"label":"\u2193", "x":18.5, "y":4}, {"label":"\u2192", "x":19.5, "y":4}]
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"F1", "x":0, "y":0},
+                {"label":"F2", "x":1, "y":0},
+                {"label":"`~", "x":2.25, "y":0},
+                {"label":"1!", "x":3.25, "y":0},
+                {"label":"2@", "x":4.25, "y":0},
+                {"label":"3#", "x":5.25, "y":0},
+                {"label":"4$", "x":6.25, "y":0},
+                {"label":"5%", "x":7.25, "y":0},
+                {"label":"6^", "x":8.25, "y":0},
+                {"label":"7&", "x":9.25, "y":0},
+                {"label":"8*", "x":10.25, "y":0},
+                {"label":"9(", "x":11.25, "y":0},
+                {"label":"0)", "x":12.25, "y":0},
+                {"label":"-_", "x":13.25, "y":0},
+                {"label":"=+", "x":14.25, "y":0},
+                {"label":"Bksp", "x":15.25, "y":0},
+                {"label":"Bksp", "x":16.25, "y":0},
+                {"label":"Insert", "x":17.5, "y":0},
+                {"label":"Home", "x":18.5, "y":0},
+                {"label":"PgUp", "x":19.5, "y":0},
+
+                {"label":"F3", "x":0, "y":1},
+                {"label":"F4", "x":1, "y":1},
+                {"label":"Tab", "x":2.25, "y":1, "w":1.5},
+                {"label":"Q", "x":3.75, "y":1},
+                {"label":"W", "x":4.75, "y":1},
+                {"label":"E", "x":5.75, "y":1},
+                {"label":"R", "x":6.75, "y":1},
+                {"label":"T", "x":7.75, "y":1},
+                {"label":"Y", "x":8.75, "y":1},
+                {"label":"U", "x":9.75, "y":1},
+                {"label":"I", "x":10.75, "y":1},
+                {"label":"O", "x":11.75, "y":1},
+                {"label":"P", "x":12.75, "y":1},
+                {"label":"[{", "x":13.75, "y":1},
+                {"label":"]}", "x":14.75, "y":1},
+                {"label":"\\|", "x":15.75, "y":1, "w":1.5},
+                {"label":"Delete", "x":17.5, "y":1},
+                {"label":"End", "x":18.5, "y":1},
+                {"label":"PgDn", "x":19.5, "y":1},
+
+                {"label":"F5", "x":0, "y":2},
+                {"label":"F6", "x":1, "y":2},
+                {"label":"Caps Lock", "x":2.25, "y":2, "w":1.75},
+                {"label":"A", "x":4, "y":2},
+                {"label":"S", "x":5, "y":2},
+                {"label":"D", "x":6, "y":2},
+                {"label":"F", "x":7, "y":2},
+                {"label":"G", "x":8, "y":2},
+                {"label":"H", "x":9, "y":2},
+                {"label":"J", "x":10, "y":2},
+                {"label":"K", "x":11, "y":2},
+                {"label":"L", "x":12, "y":2},
+                {"label":";:", "x":13, "y":2},
+                {"label":"'\"", "x":14, "y":2},
+                {"label":"Enter", "x":15, "y":2, "w":2.25},
+
+                {"label":"F7", "x":0, "y":3},
+                {"label":"F8", "x":1, "y":3},
+                {"label":"Shift", "x":2.25, "y":3, "w":1.25},
+                {"label":"\\|", "x":3.5, "y":3},
+                {"label":"Z", "x":4.5, "y":3},
+                {"label":"X", "x":5.5, "y":3},
+                {"label":"C", "x":6.5, "y":3},
+                {"label":"V", "x":7.5, "y":3},
+                {"label":"B", "x":8.5, "y":3},
+                {"label":"N", "x":9.5, "y":3},
+                {"label":"M", "x":10.5, "y":3},
+                {"label":",<", "x":11.5, "y":3},
+                {"label":".>", "x":12.5, "y":3},
+                {"label":"/?", "x":13.5, "y":3},
+                {"label":"Shift", "x":14.5, "y":3, "w":1.75},
+                {"label":"Fn", "x":16.25, "y":3},
+                {"label":"\u2191", "x":18.5, "y":3},
+
+                {"label":"F9", "x":0, "y":4},
+                {"label":"F10", "x":1, "y":4},
+                {"label":"Ctrl", "x":2.25, "y":4, "w":1.5},
+                {"label":"Win", "x":3.75, "y":4},
+                {"label":"Alt", "x":4.75, "y":4, "w":1.5},
+                {"label":"Space", "x":6.25, "y":4, "w":7},
+                {"label":"Alt", "x":13.25, "y":4, "w":1.5},
+                {"label":"Win", "x":14.75, "y":4},
+                {"label":"Ctrl", "x":15.75, "y":4, "w":1.5},
+                {"label":"\u2190", "x":17.5, "y":4},
+                {"label":"\u2193", "x":18.5, "y":4},
+                {"label":"\u2192", "x":19.5, "y":4}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"label":"F1", "x":0, "y":0},
+                {"label":"F2", "x":1, "y":0},
+                {"label":"`~", "x":2.25, "y":0},
+                {"label":"1!", "x":3.25, "y":0},
+                {"label":"2@", "x":4.25, "y":0},
+                {"label":"3#", "x":5.25, "y":0},
+                {"label":"4$", "x":6.25, "y":0},
+                {"label":"5%", "x":7.25, "y":0},
+                {"label":"6^", "x":8.25, "y":0},
+                {"label":"7&", "x":9.25, "y":0},
+                {"label":"8*", "x":10.25, "y":0},
+                {"label":"9(", "x":11.25, "y":0},
+                {"label":"0)", "x":12.25, "y":0},
+                {"label":"-_", "x":13.25, "y":0},
+                {"label":"=+", "x":14.25, "y":0},
+                {"label":"Bksp", "x":15.25, "y":0, "w":2},
+                {"label":"Insert", "x":17.5, "y":0},
+                {"label":"Home", "x":18.5, "y":0},
+                {"label":"PgUp", "x":19.5, "y":0},
+
+                {"label":"F3", "x":0, "y":1},
+                {"label":"F4", "x":1, "y":1},
+                {"label":"Tab", "x":2.25, "y":1, "w":1.5},
+                {"label":"Q", "x":3.75, "y":1},
+                {"label":"W", "x":4.75, "y":1},
+                {"label":"E", "x":5.75, "y":1},
+                {"label":"R", "x":6.75, "y":1},
+                {"label":"T", "x":7.75, "y":1},
+                {"label":"Y", "x":8.75, "y":1},
+                {"label":"U", "x":9.75, "y":1},
+                {"label":"I", "x":10.75, "y":1},
+                {"label":"O", "x":11.75, "y":1},
+                {"label":"P", "x":12.75, "y":1},
+                {"label":"[{", "x":13.75, "y":1},
+                {"label":"]}", "x":14.75, "y":1},
+                {"label":"\\|", "x":15.75, "y":1, "w":1.5},
+                {"label":"Delete", "x":17.5, "y":1},
+                {"label":"End", "x":18.5, "y":1},
+                {"label":"PgDn", "x":19.5, "y":1},
+
+                {"label":"F5", "x":0, "y":2},
+                {"label":"F6", "x":1, "y":2},
+                {"label":"Caps Lock", "x":2.25, "y":2, "w":1.75},
+                {"label":"A", "x":4, "y":2},
+                {"label":"S", "x":5, "y":2},
+                {"label":"D", "x":6, "y":2},
+                {"label":"F", "x":7, "y":2},
+                {"label":"G", "x":8, "y":2},
+                {"label":"H", "x":9, "y":2},
+                {"label":"J", "x":10, "y":2},
+                {"label":"K", "x":11, "y":2},
+                {"label":"L", "x":12, "y":2},
+                {"label":";:", "x":13, "y":2},
+                {"label":"'\"", "x":14, "y":2},
+                {"label":"Enter", "x":15, "y":2, "w":2.25},
+
+                {"label":"F7", "x":0, "y":3},
+                {"label":"F8", "x":1, "y":3},
+                {"label":"Shift", "x":2.25, "y":3, "w":2.25},
+                {"label":"Z", "x":4.5, "y":3},
+                {"label":"X", "x":5.5, "y":3},
+                {"label":"C", "x":6.5, "y":3},
+                {"label":"V", "x":7.5, "y":3},
+                {"label":"B", "x":8.5, "y":3},
+                {"label":"N", "x":9.5, "y":3},
+                {"label":"M", "x":10.5, "y":3},
+                {"label":",<", "x":11.5, "y":3},
+                {"label":".>", "x":12.5, "y":3},
+                {"label":"/?", "x":13.5, "y":3},
+                {"label":"Shift", "x":14.5, "y":3, "w":2.75},
+                {"label":"\u2191", "x":18.5, "y":3},
+
+                {"label":"F9", "x":0, "y":4},
+                {"label":"F10", "x":1, "y":4},
+                {"label":"Ctrl", "x":2.25, "y":4, "w":1.5},
+                {"label":"Win", "x":3.75, "y":4},
+                {"label":"Alt", "x":4.75, "y":4, "w":1.5},
+                {"label":"Space", "x":6.25, "y":4, "w":7},
+                {"label":"Alt", "x":13.25, "y":4, "w":1.5},
+                {"label":"Win", "x":14.75, "y":4},
+                {"label":"Ctrl", "x":15.75, "y":4, "w":1.5},
+                {"label":"\u2190", "x":17.5, "y":4},
+                {"label":"\u2193", "x":18.5, "y":4},
+                {"label":"\u2192", "x":19.5, "y":4}
+            ]
+        },
+        "LAYOUT_ansi_split_bs_rshift": {
+            "layout": [
+                {"label":"F1", "x":0, "y":0},
+                {"label":"F2", "x":1, "y":0},
+                {"label":"`~", "x":2.25, "y":0},
+                {"label":"1!", "x":3.25, "y":0},
+                {"label":"2@", "x":4.25, "y":0},
+                {"label":"3#", "x":5.25, "y":0},
+                {"label":"4$", "x":6.25, "y":0},
+                {"label":"5%", "x":7.25, "y":0},
+                {"label":"6^", "x":8.25, "y":0},
+                {"label":"7&", "x":9.25, "y":0},
+                {"label":"8*", "x":10.25, "y":0},
+                {"label":"9(", "x":11.25, "y":0},
+                {"label":"0)", "x":12.25, "y":0},
+                {"label":"-_", "x":13.25, "y":0},
+                {"label":"=+", "x":14.25, "y":0},
+                {"label":"Bksp", "x":15.25, "y":0},
+                {"label":"Bksp", "x":16.25, "y":0},
+                {"label":"Insert", "x":17.5, "y":0},
+                {"label":"Home", "x":18.5, "y":0},
+                {"label":"PgUp", "x":19.5, "y":0},
+
+                {"label":"F3", "x":0, "y":1},
+                {"label":"F4", "x":1, "y":1},
+                {"label":"Tab", "x":2.25, "y":1, "w":1.5},
+                {"label":"Q", "x":3.75, "y":1},
+                {"label":"W", "x":4.75, "y":1},
+                {"label":"E", "x":5.75, "y":1},
+                {"label":"R", "x":6.75, "y":1},
+                {"label":"T", "x":7.75, "y":1},
+                {"label":"Y", "x":8.75, "y":1},
+                {"label":"U", "x":9.75, "y":1},
+                {"label":"I", "x":10.75, "y":1},
+                {"label":"O", "x":11.75, "y":1},
+                {"label":"P", "x":12.75, "y":1},
+                {"label":"[{", "x":13.75, "y":1},
+                {"label":"]}", "x":14.75, "y":1},
+                {"label":"\\|", "x":15.75, "y":1, "w":1.5},
+                {"label":"Delete", "x":17.5, "y":1},
+                {"label":"End", "x":18.5, "y":1},
+                {"label":"PgDn", "x":19.5, "y":1},
+
+                {"label":"F5", "x":0, "y":2},
+                {"label":"F6", "x":1, "y":2},
+                {"label":"Caps Lock", "x":2.25, "y":2, "w":1.75},
+                {"label":"A", "x":4, "y":2},
+                {"label":"S", "x":5, "y":2},
+                {"label":"D", "x":6, "y":2},
+                {"label":"F", "x":7, "y":2},
+                {"label":"G", "x":8, "y":2},
+                {"label":"H", "x":9, "y":2},
+                {"label":"J", "x":10, "y":2},
+                {"label":"K", "x":11, "y":2},
+                {"label":"L", "x":12, "y":2},
+                {"label":";:", "x":13, "y":2},
+                {"label":"'\"", "x":14, "y":2},
+                {"label":"Enter", "x":15, "y":2, "w":2.25},
+
+                {"label":"F7", "x":0, "y":3},
+                {"label":"F8", "x":1, "y":3},
+                {"label":"Shift", "x":2.25, "y":3, "w":2.25},
+                {"label":"Z", "x":4.5, "y":3},
+                {"label":"X", "x":5.5, "y":3},
+                {"label":"C", "x":6.5, "y":3},
+                {"label":"V", "x":7.5, "y":3},
+                {"label":"B", "x":8.5, "y":3},
+                {"label":"N", "x":9.5, "y":3},
+                {"label":"M", "x":10.5, "y":3},
+                {"label":",<", "x":11.5, "y":3},
+                {"label":".>", "x":12.5, "y":3},
+                {"label":"/?", "x":13.5, "y":3},
+                {"label":"Shift", "x":14.5, "y":3, "w":1.75},
+                {"label":"Fn", "x":16.25, "y":3},
+                {"label":"\u2191", "x":18.5, "y":3},
+
+                {"label":"F9", "x":0, "y":4},
+                {"label":"F10", "x":1, "y":4},
+                {"label":"Ctrl", "x":2.25, "y":4, "w":1.5},
+                {"label":"Win", "x":3.75, "y":4},
+                {"label":"Alt", "x":4.75, "y":4, "w":1.5},
+                {"label":"Space", "x":6.25, "y":4, "w":7},
+                {"label":"Alt", "x":13.25, "y":4, "w":1.5},
+                {"label":"Win", "x":14.75, "y":4},
+                {"label":"Ctrl", "x":15.75, "y":4, "w":1.5},
+                {"label":"\u2190", "x":17.5, "y":4},
+                {"label":"\u2193", "x":18.5, "y":4},
+                {"label":"\u2192", "x":19.5, "y":4}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"label":"F1", "x":0, "y":0},
+                {"label":"F2", "x":1, "y":0},
+                {"label":"`\u00ac", "x":2.25, "y":0},
+                {"label":"1!", "x":3.25, "y":0},
+                {"label":"2\"", "x":4.25, "y":0},
+                {"label":"3\u00a3", "x":5.25, "y":0},
+                {"label":"4$", "x":6.25, "y":0},
+                {"label":"5%", "x":7.25, "y":0},
+                {"label":"6^", "x":8.25, "y":0},
+                {"label":"7&", "x":9.25, "y":0},
+                {"label":"8*", "x":10.25, "y":0},
+                {"label":"9(", "x":11.25, "y":0},
+                {"label":"0)", "x":12.25, "y":0},
+                {"label":"-_", "x":13.25, "y":0},
+                {"label":"=+", "x":14.25, "y":0},
+                {"label":"Bksp", "x":15.25, "y":0, "w":2},
+                {"label":"Insert", "x":17.5, "y":0},
+                {"label":"Home", "x":18.5, "y":0},
+                {"label":"PgUp", "x":19.5, "y":0},
+
+                {"label":"F3", "x":0, "y":1},
+                {"label":"F4", "x":1, "y":1},
+                {"label":"Tab", "x":2.25, "y":1, "w":1.5},
+                {"label":"Q", "x":3.75, "y":1},
+                {"label":"W", "x":4.75, "y":1},
+                {"label":"E", "x":5.75, "y":1},
+                {"label":"R", "x":6.75, "y":1},
+                {"label":"T", "x":7.75, "y":1},
+                {"label":"Y", "x":8.75, "y":1},
+                {"label":"U", "x":9.75, "y":1},
+                {"label":"I", "x":10.75, "y":1},
+                {"label":"O", "x":11.75, "y":1},
+                {"label":"P", "x":12.75, "y":1},
+                {"label":"[{", "x":13.75, "y":1},
+                {"label":"]}", "x":14.75, "y":1},
+                {"label":"Delete", "x":17.5, "y":1},
+                {"label":"End", "x":18.5, "y":1},
+                {"label":"PgDn", "x":19.5, "y":1},
+
+                {"label":"F5", "x":0, "y":2},
+                {"label":"F6", "x":1, "y":2},
+                {"label":"Caps Lock", "x":2.25, "y":2, "w":1.75},
+                {"label":"A", "x":4, "y":2},
+                {"label":"S", "x":5, "y":2},
+                {"label":"D", "x":6, "y":2},
+                {"label":"F", "x":7, "y":2},
+                {"label":"G", "x":8, "y":2},
+                {"label":"H", "x":9, "y":2},
+                {"label":"J", "x":10, "y":2},
+                {"label":"K", "x":11, "y":2},
+                {"label":"L", "x":12, "y":2},
+                {"label":";:", "x":13, "y":2},
+                {"label":"'@", "x":14, "y":2},
+                {"label":"#~", "x":15, "y":2},
+                {"label":"Enter", "x":16, "y":1, "w":1.25, "h":2},
+
+                {"label":"F7", "x":0, "y":3},
+                {"label":"F8", "x":1, "y":3},
+                {"label":"Shift", "x":2.25, "y":3, "w":1.25},
+                {"label":"\\|", "x":3.5, "y":3},
+                {"label":"Z", "x":4.5, "y":3},
+                {"label":"X", "x":5.5, "y":3},
+                {"label":"C", "x":6.5, "y":3},
+                {"label":"V", "x":7.5, "y":3},
+                {"label":"B", "x":8.5, "y":3},
+                {"label":"N", "x":9.5, "y":3},
+                {"label":"M", "x":10.5, "y":3},
+                {"label":",<", "x":11.5, "y":3},
+                {"label":".>", "x":12.5, "y":3},
+                {"label":"/?", "x":13.5, "y":3},
+                {"label":"Shift", "x":14.5, "y":3, "w":2.75},
+                {"label":"\u2191", "x":18.5, "y":3},
+
+                {"label":"F9", "x":0, "y":4},
+                {"label":"F10", "x":1, "y":4},
+                {"label":"Ctrl", "x":2.25, "y":4, "w":1.5},
+                {"label":"Win", "x":3.75, "y":4},
+                {"label":"Alt", "x":4.75, "y":4, "w":1.5},
+                {"label":"Space", "x":6.25, "y":4, "w":7},
+                {"label":"Alt", "x":13.25, "y":4, "w":1.5},
+                {"label":"Win", "x":14.75, "y":4},
+                {"label":"Ctrl", "x":15.75, "y":4, "w":1.5},
+                {"label":"\u2190", "x":17.5, "y":4},
+                {"label":"\u2193", "x":18.5, "y":4},
+                {"label":"\u2192", "x":19.5, "y":4}
+            ]
+        },
+        "LAYOUT_iso_split_bs_rshift": {
+            "layout": [
+                {"label":"F1", "x":0, "y":0},
+                {"label":"F2", "x":1, "y":0},
+                {"label":"`\u00ac", "x":2.25, "y":0},
+                {"label":"1!", "x":3.25, "y":0},
+                {"label":"2\"", "x":4.25, "y":0},
+                {"label":"3\u00a3", "x":5.25, "y":0},
+                {"label":"4$", "x":6.25, "y":0},
+                {"label":"5%", "x":7.25, "y":0},
+                {"label":"6^", "x":8.25, "y":0},
+                {"label":"7&", "x":9.25, "y":0},
+                {"label":"8*", "x":10.25, "y":0},
+                {"label":"9(", "x":11.25, "y":0},
+                {"label":"0)", "x":12.25, "y":0},
+                {"label":"-_", "x":13.25, "y":0},
+                {"label":"=+", "x":14.25, "y":0},
+                {"label":"Bksp", "x":15.25, "y":0},
+                {"label":"Bksp", "x":16.25, "y":0},
+                {"label":"Insert", "x":17.5, "y":0},
+                {"label":"Home", "x":18.5, "y":0},
+                {"label":"PgUp", "x":19.5, "y":0},
+
+                {"label":"F3", "x":0, "y":1},
+                {"label":"F4", "x":1, "y":1},
+                {"label":"Tab", "x":2.25, "y":1, "w":1.5},
+                {"label":"Q", "x":3.75, "y":1},
+                {"label":"W", "x":4.75, "y":1},
+                {"label":"E", "x":5.75, "y":1},
+                {"label":"R", "x":6.75, "y":1},
+                {"label":"T", "x":7.75, "y":1},
+                {"label":"Y", "x":8.75, "y":1},
+                {"label":"U", "x":9.75, "y":1},
+                {"label":"I", "x":10.75, "y":1},
+                {"label":"O", "x":11.75, "y":1},
+                {"label":"P", "x":12.75, "y":1},
+                {"label":"[{", "x":13.75, "y":1},
+                {"label":"]}", "x":14.75, "y":1},
+                {"label":"Delete", "x":17.5, "y":1},
+                {"label":"End", "x":18.5, "y":1},
+                {"label":"PgDn", "x":19.5, "y":1},
+
+                {"label":"F5", "x":0, "y":2},
+                {"label":"F6", "x":1, "y":2},
+                {"label":"Caps Lock", "x":2.25, "y":2, "w":1.75},
+                {"label":"A", "x":4, "y":2},
+                {"label":"S", "x":5, "y":2},
+                {"label":"D", "x":6, "y":2},
+                {"label":"F", "x":7, "y":2},
+                {"label":"G", "x":8, "y":2},
+                {"label":"H", "x":9, "y":2},
+                {"label":"J", "x":10, "y":2},
+                {"label":"K", "x":11, "y":2},
+                {"label":"L", "x":12, "y":2},
+                {"label":";:", "x":13, "y":2},
+                {"label":"'@", "x":14, "y":2},
+                {"label":"#~", "x":15, "y":2},
+                {"label":"Enter", "x":16, "y":1, "w":1.25, "h":2},
+
+                {"label":"F7", "x":0, "y":3},
+                {"label":"F8", "x":1, "y":3},
+                {"label":"Shift", "x":2.25, "y":3, "w":1.25},
+                {"label":"\\|", "x":3.5, "y":3},
+                {"label":"Z", "x":4.5, "y":3},
+                {"label":"X", "x":5.5, "y":3},
+                {"label":"C", "x":6.5, "y":3},
+                {"label":"V", "x":7.5, "y":3},
+                {"label":"B", "x":8.5, "y":3},
+                {"label":"N", "x":9.5, "y":3},
+                {"label":"M", "x":10.5, "y":3},
+                {"label":",<", "x":11.5, "y":3},
+                {"label":".>", "x":12.5, "y":3},
+                {"label":"/?", "x":13.5, "y":3},
+                {"label":"Shift", "x":14.5, "y":3, "w":1.75},
+                {"label":"Fn", "x":16.25, "y":3},
+                {"label":"\u2191", "x":18.5, "y":3},
+
+                {"label":"F9", "x":0, "y":4},
+                {"label":"F10", "x":1, "y":4},
+                {"label":"Ctrl", "x":2.25, "y":4, "w":1.5},
+                {"label":"Win", "x":3.75, "y":4},
+                {"label":"Alt", "x":4.75, "y":4, "w":1.5},
+                {"label":"Space", "x":6.25, "y":4, "w":7},
+                {"label":"Alt", "x":13.25, "y":4, "w":1.5},
+                {"label":"Win", "x":14.75, "y":4},
+                {"label":"Ctrl", "x":15.75, "y":4, "w":1.5},
+                {"label":"\u2190", "x":17.5, "y":4},
+                {"label":"\u2193", "x":18.5, "y":4},
+                {"label":"\u2192", "x":19.5, "y":4}
+            ]
         }
     }
 }
diff --git a/keyboards/superuser/ext/keymaps/default/keymap.c b/keyboards/superuser/ext/keymaps/default/keymap.c
index cc3259cd58..85a9bb91f6 100644
--- a/keyboards/superuser/ext/keymaps/default/keymap.c
+++ b/keyboards/superuser/ext/keymaps/default/keymap.c
@@ -17,14 +17,14 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [0] = LAYOUT_tkl(
+  [0] = LAYOUT_all(
     KC_F1,  KC_F2,  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_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
     KC_F3,  KC_F4,  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,
     KC_F5,  KC_F6,  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_F7,  KC_F8,  KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    KC_RSFT,    MO(1),                            KC_UP,
     KC_F9,  KC_F10, KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                                KC_RALT,    KC_RGUI,    KC_RCTL,                 KC_LEFT, KC_DOWN, KC_RGHT),
 
-  [1] = LAYOUT_tkl(
+  [1] = LAYOUT_all(
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, 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/superuser/ext/keymaps/via/keymap.c b/keyboards/superuser/ext/keymaps/via/keymap.c
index 919c45d884..78b258d526 100644
--- a/keyboards/superuser/ext/keymaps/via/keymap.c
+++ b/keyboards/superuser/ext/keymaps/via/keymap.c
@@ -17,28 +17,28 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [0] = LAYOUT_tkl(
+  [0] = LAYOUT_all(
     KC_F1,  KC_F2,  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_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
     KC_F3,  KC_F4,  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,
     KC_F5,  KC_F6,  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_F7,  KC_F8,  KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    KC_RSFT,    MO(1),                            KC_UP,
     KC_F9,  KC_F10, KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                                KC_RALT,    KC_RGUI,    KC_RCTL,                 KC_LEFT, KC_DOWN, KC_RGHT),
 
-  [1] = LAYOUT_tkl(
+  [1] = LAYOUT_all(
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,                          KC_TRNS,
     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_tkl(
+  [2] = LAYOUT_all(
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,                          KC_TRNS,
     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_tkl(
+  [3] = LAYOUT_all(
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, 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/superuser/ext/readme.md b/keyboards/superuser/ext/readme.md
index 1468d21dc1..3abd75faf8 100644
--- a/keyboards/superuser/ext/readme.md
+++ b/keyboards/superuser/ext/readme.md
@@ -2,7 +2,7 @@
 
 An EXT TKL PCB supporting 7u bottom row only.
 
-* Keyboard Maintainer: superuser
+* Keyboard Maintainer: [kaylanm](https://github.com/kaylanm)
 * Hardware Supported: superuser ext
 * Hardware Availability: Group buy