Suavity Ehan Refactor (#17694)

* info.json: apply friendly formatting, phase 1

* info.json: fix macro reference and layout

* info.json: apply friendly formatting, phase 2

Add key labels.

* refactor keymaps and layout macro

- apply four-space indent
- apply grid alignment to keycodes, matrix position identifiers, and matrix

* add LAYOUT_all

* ehan.h: add matrix diagram

* rename LAYOUT_ansi_default to LAYOUT_ansi_split_bs_rshift_lspace

* ehan.h: correct K3E position in LAYOUT_ansi_split_bs_rshift_lspace

Move location K3E to actually be on Column 14 (E); was previously on Column 13 (D) in source..

* add LAYOUT_iso_split_bs_rshift_lspace

Includes reference keymap.

5 files changed, 455 insertions, 64 deletions

diff --git a/keyboards/suavity/ehan/ehan.h b/keyboards/suavity/ehan/ehan.h
index 5d121056eb..fbc6d33a96 100644
--- a/keyboards/suavity/ehan/ehan.h
+++ b/keyboards/suavity/ehan/ehan.h
@@ -6,18 +6,70 @@
 #include "quantum.h"
 #define ___ KC_NO
 
-#define LAYOUT_ansi_default( \
-    K00, K01, K02, K03, K04, K05,      K06, K07, K08, K09,     K0A, K0B,K0C, K0D,   K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16,   K17, K18, K19, K1A, K1B, K1C, K1D,  K3E,   K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25,         K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35,         K36, K37, K38, K39, K3A, K3B,      K3C,                  \
-    K40,      K42, K43, K44, K45, K46,    K47, K48, K49, K4A, K4B, K4C,      K4D,   K4E, K4F,      \
-    K50,           K53, K54, K55,              K58,      K5A,      K5C,      K5D,   K5E, K5F, K5G  \
+/*
+ *              ┌───┐┌───┬───┬───┬───┐┌───┐        ┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┐
+ *              │00 ││01 │02 │03 │04 ││05 │        │06 │07 │08 │09 ││0A │0B │0C │0D ││0E │0F │0G │
+ *              └───┘└───┴───┴───┴───┘└───┘        └───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┘
+ *              ┌───┬───┬───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐      ┌───────┐
+ *              │10 │11 │12 │13 │14 │15 │16 │       │17 │18 │19 │1A │1B │1C │1D │3E ││1E │1F │1G │      │3E     │ 2u Backspace
+ *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤      └─┬─────┤
+ *              │20   │21 │22 │23 │24 │25 │       │26 │27 │28 │29 │2A │2B │2C │2D   ││2E │2F │2G │        │     │
+ *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐      └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘     ┌──┴┐3D  │ ISO Enter
+ *  LShift      │30    │31 │32 │33 │34 │35 │       │36 │37 │38 │39 │3A │3B │3C      │                  │3C │    │
+ * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐   ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐       ┌─┴───┴────┤
+ * │40      │   │40  │41 │42 │43 │44 │45 │46 │   │47 │48 │49 │4A │4B │4C │4D    │4E │    │4F │       │4D        │ 2.75u RShift
+ * └────────┘   ├────┴┬──┴─┬─┴───┼───┼───┴───┤   ├───┴───┴───┼───┴─┬─┴─┬─┴──┬───┴─┬─┘┌───┼───┼───┐   └──────────┘
+ *              │50   │    │53   │54 │55     │   │58         │5A   │5C │    │5D   │  │5E │5F │5G │
+ *              └─────┘    └─────┴───┴───────┘   └───────────┴─────┴───┘    └─────┘  └───┴───┴───┘
+ *                               ┌───────────┐   ┌──────────┬─────┬────┐
+ *                     3u LSpace │55         │   │58        │5A   │5C  │ 2.75u/1.5u/1.25u
+ *                               └───────────┘   └──────────┴─────┴────┘
+ */
+
+#define LAYOUT_all( \
+    K00, K01, K02, K03, K04, K05,        K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K0G, \
+    K10, K11, K12, K13, K14, K15, K16,   K17, K18, K19, K1A, K1B, K1C, K1D, K3E,   K1E, K1F, K1G, \
+    K20, K21, K22, K23, K24, K25,        K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K2E, K2F, K2G, \
+    K30, K31, K32, K33, K34, K35,        K36, K37, K38, K39, K3A, K3B, K3C, K3D,                  \
+    K40, K41, K42, K43, K44, K45, K46,   K47, K48, K49, K4A, K4B, K4C, K4D, K4E,        K4F,      \
+    K50,           K53, K54,      K55,   K58,           K5A, K5C,           K5D,   K5E, K5F, K5G  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___, ___, }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, ___, }, \
+    { K50, ___, ___, K53, K54, K55, ___, ___, K58, ___, K5A, ___, K5C, K5D, K5E, K5F, K5G, }  \
+}
+
+#define LAYOUT_ansi_split_bs_rshift_lspace( \
+    K00, K01, K02, K03, K04, K05,        K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K0G, \
+    K10, K11, K12, K13, K14, K15, K16,   K17, K18, K19, K1A, K1B, K1C, K1D, K3E,   K1E, K1F, K1G, \
+    K20, K21, K22, K23, K24, K25,        K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K2E, K2F, K2G, \
+    K30, K31, K32, K33, K34, K35,        K36, K37, K38, K39, K3A, K3B,      K3C,                  \
+    K40,      K42, K43, K44, K45, K46,   K47, K48, K49, K4A, K4B, K4C, K4D, K4E,        K4F,      \
+    K50,           K53, K54,      K55,   K58,           K5A, K5C,           K5D,   K5E, K5F, K5G  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___, K3E, ___, ___ }, \
+    { K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, ___ }, \
+    { K50, ___, ___, K53, K54, K55, ___, ___, K58, ___, K5A, ___, K5C, K5D, K5E, K5F, K5G }  \
+}
+
+#define LAYOUT_iso_split_bs_rshift_lspace( \
+    K00, K01, K02, K03, K04, K05,        K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K0G, \
+    K10, K11, K12, K13, K14, K15, K16,   K17, K18, K19, K1A, K1B, K1C, K1D, K3E,   K1E, K1F, K1G, \
+    K20, K21, K22, K23, K24, K25,        K26, K27, K28, K29, K2A, K2B, K2C,        K2E, K2F, K2G, \
+    K30, K31, K32, K33, K34, K35,        K36, K37, K38, K39, K3A, K3B, K3C, K3D,                  \
+    K40, K41, K42, K43, K44, K45, K46,   K47, K48, K49, K4A, K4B, K4C, K4D, K4E,        K4F,      \
+    K50,           K53, K54,      K55,   K58,           K5A, K5C,           K5D,   K5E, K5F, K5G  \
 ) { \
-    {    K00, K01, K02, K03, K04, K05,       K06, K07, K08, K09, K0A, K0B, K0C, K0D,       K0E, K0F, K0G,    }, \
-    {    K10, K11, K12, K13, K14, K15, K16,    K17, K18, K19, K1A, K1B, K1C, K1D,          K1E, K1F, K1G,    }, \
-    {    K20, K21, K22, K23, K24, K25,          K26, K27, K28, K29, K2A, K2B, K2C, K2D,    K2E, K2F, K2G,    }, \
-    {    K30, K31, K32, K33, K34, K35,          K36, K37, K38, K39, K3A, K3B, K3C,         K3E, ___, ___,    }, \
-    {    K40, ___, K42, K43, K44, K45, K46,     K47, K48, K49, K4A, K4B, K4C, K4D,         K4E, K4F, ___,    }, \
-    {    K50, ___, ___, K53, K54, K55,       ___, ___, K58, ___, K5A, ___, K5C, K5D,       K5E, K5F, K5G     }  \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E, K2F, K2G }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___, ___ }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, ___ }, \
+    { K50, ___, ___, K53, K54, K55, ___, ___, K58, ___, K5A, ___, K5C, K5D, K5E, K5F, K5G }  \
 }
diff --git a/keyboards/suavity/ehan/info.json b/keyboards/suavity/ehan/info.json
index bf37fdf6a4..0f2ad67561 100755
--- a/keyboards/suavity/ehan/info.json
+++ b/keyboards/suavity/ehan/info.json
@@ -3,8 +3,308 @@
     "url": "",
     "maintainer": "qmk",
     "layouts": {
-        "LAYOUT": {
-            "layout": [{"label":"PrtSc", "x":18.75, "y":0}, {"label":"Scroll Lock", "x":19.75, "y":0}, {"label":"Pause", "x":20.75, "y":0}, {"label":"Insert", "x":18.75, "y":1.5}, {"label":"Home", "x":19.75, "y":1.5}, {"label":"PgUp", "x":20.75, "y":1.5}, {"label":"Delete", "x":18.75, "y":2.5}, {"label":"End", "x":19.75, "y":2.5}, {"label":"PgDn", "x":20.75, "y":2.5}, {"label":"\u2191", "x":19.75, "y":4.5}, {"label":"\u2190", "x":18.75, "y":5.5}, {"label":"\u2193", "x":19.75, "y":5.5}, {"label":"\u2192", "x":20.75, "y":5.5}, {"label":"Esc", "x":2.5, "y":0}, {"label":"F1", "x":3.75, "y":0}, {"label":"F2", "x":4.75, "y":0}, {"label":"F3", "x":5.75, "y":0}, {"label":"F4", "x":6.75, "y":0}, {"label":"F5", "x":8, "y":0}, {"label":"~", "x":2.5, "y":1.5}, {"label":"!", "x":3.5, "y":1.5}, {"label":"@", "x":4.5, "y":1.5}, {"label":"#", "x":5.5, "y":1.5}, {"label":"$", "x":6.5, "y":1.5}, {"label":"%", "x":7.5, "y":1.5}, {"label":"^", "x":8.5, "y":1.5}, {"label":"Tab", "x":2.5, "y":2.5, "w":1.5}, {"label":"Q", "x":4, "y":2.5}, {"label":"W", "x":5, "y":2.5}, {"label":"E", "x":6, "y":2.5}, {"label":"R", "x":7, "y":2.5}, {"label":"T", "x":8, "y":2.5}, {"label":"Caps Lock", "x":2.5, "y":3.5, "w":1.75}, {"label":"A", "x":4.25, "y":3.5}, {"label":"S", "x":5.25, "y":3.5}, {"label":"D", "x":6.25, "y":3.5}, {"label":"F", "x":7.25, "y":3.5}, {"label":"G", "x":8.25, "y":3.5}, {"label":"Shift", "x":2.5, "y":4.5, "w":2.25}, {"label":"Z", "x":4.75, "y":4.5}, {"label":"X", "x":5.75, "y":4.5}, {"label":"C", "x":6.75, "y":4.5}, {"label":"V", "x":7.75, "y":4.5}, {"label":"B", "x":8.75, "y":4.5}, {"label":"Ctrl", "x":2.5, "y":5.5, "w":1.5}, {"label":"Alt", "x":5.25, "y":5.5, "w":1.5}, {"x":6.75, "y":5.5, "w":3}, {"label":"F6", "x":8.75, "y":3.25}, {"label":"F7", "x":9.75, "y":3.25}, {"label":"F8", "x":10.75, "y":3.25}, {"label":"F9", "x":11.75, "y":3.25}, {"label":"F10", "x":13.25, "y":3.25}, {"label":"F11", "x":14.25, "y":3.25}, {"label":"F12", "x":15.25, "y":3.25}, {"label":"F13", "x":16.25, "y":3.25}, {"label":"&", "x":9.25, "y":4.75}, {"label":"*", "x":10.25, "y":4.75}, {"label":"(", "x":11.25, "y":4.75}, {"label":")", "x":12.25, "y":4.75}, {"label":"_", "x":13.25, "y":4.75}, {"label":"+", "x":14.25, "y":4.75}, {"label":"Backspace", "x":15.25, "y":4.75, "w":2}, {"label":"Y", "x":8.75, "y":5.75}, {"label":"U", "x":9.75, "y":5.75}, {"label":"I", "x":10.75, "y":5.75}, {"label":"O", "x":11.75, "y":5.75}, {"label":"P", "x":12.75, "y":5.75}, {"label":"{", "x":13.75, "y":5.75}, {"label":"}", "x":14.75, "y":5.75}, {"label":"|", "x":15.75, "y":5.75, "w":1.5}, {"label":"H", "x":9, "y":6.75}, {"label":"J", "x":10, "y":6.75}, {"label":"K", "x":11, "y":6.75}, {"label":"L", "x":12, "y":6.75}, {"label":":", "x":13, "y":6.75}, {"label":"\"", "x":14, "y":6.75}, {"label":"Enter", "x":15, "y":6.75, "w":2.25}, {"label":"B", "x":8.5, "y":7.75}, {"label":"N", "x":9.5, "y":7.75}, {"label":"M", "x":10.5, "y":7.75}, {"label":"<", "x":11.5, "y":7.75}, {"label":">", "x":12.5, "y":7.75}, {"label":"?", "x":13.5, "y":7.75}, {"label":"Shift", "x":14.5, "y":7.75, "w":2.75}, {"x":8.5, "y":8.75, "w":3}, {"label":"Alt", "x":11.5, "y":8.75, "w":1.5}, {"label":"Win", "x":13, "y":8.75, "w":1.25}, {"label":"Ctrl", "x":15.5, "y":8.75, "w":1.5}]
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":8.5, "y":0},
+                {"label":"F7", "x":9.5, "y":0},
+                {"label":"F8", "x":10.5, "y":0},
+                {"label":"F9", "x":11.5, "y":0},
+                {"label":"F10", "x":13, "y":0},
+                {"label":"F11", "x":14, "y":0},
+                {"label":"F12", "x":15, "y":0},
+                {"label":"F13", "x":16, "y":0},
+                {"label":"PrtSc", "x":17.25, "y":0},
+                {"label":"Scroll Lock", "x":18.25, "y":0},
+                {"label":"Pause", "x":19.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.5},
+                {"label":"1!", "x":1, "y":1.5},
+                {"label":"2@", "x":2, "y":1.5},
+                {"label":"3#", "x":3, "y":1.5},
+                {"label":"4$", "x":4, "y":1.5},
+                {"label":"5%", "x":5, "y":1.5},
+                {"label":"6^", "x":6, "y":1.5},
+                {"label":"7&", "x":9, "y":1.5},
+                {"label":"8*", "x":10, "y":1.5},
+                {"label":"9(", "x":11, "y":1.5},
+                {"label":"0)", "x":12, "y":1.5},
+                {"label":"-_", "x":13, "y":1.5},
+                {"label":"=+", "x":14, "y":1.5},
+                {"label":"\\|", "x":15, "y":1.5},
+                {"label":"Backspace", "x":16, "y":1.5},
+                {"label":"Insert", "x":17.25, "y":1.5},
+                {"label":"Home", "x":18.25, "y":1.5},
+                {"label":"Page Up", "x":19.25, "y":1.5},
+
+                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.5},
+                {"label":"W", "x":2.5, "y":2.5},
+                {"label":"E", "x":3.5, "y":2.5},
+                {"label":"R", "x":4.5, "y":2.5},
+                {"label":"T", "x":5.5, "y":2.5},
+                {"label":"Y", "x":8.5, "y":2.5},
+                {"label":"U", "x":9.5, "y":2.5},
+                {"label":"I", "x":10.5, "y":2.5},
+                {"label":"O", "x":11.5, "y":2.5},
+                {"label":"P", "x":12.5, "y":2.5},
+                {"label":"[{", "x":13.5, "y":2.5},
+                {"label":"]}", "x":14.5, "y":2.5},
+                {"label":"\\|", "x":15.5, "y":2.5, "w":1.5},
+                {"label":"Delete", "x":17.25, "y":2.5},
+                {"label":"End", "x":18.25, "y":2.5},
+                {"label":"Page Down", "x":19.25, "y":2.5},
+
+                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.5},
+                {"label":"S", "x":2.75, "y":3.5},
+                {"label":"D", "x":3.75, "y":3.5},
+                {"label":"F", "x":4.75, "y":3.5},
+                {"label":"G", "x":5.75, "y":3.5},
+                {"label":"H", "x":8.75, "y":3.5},
+                {"label":"J", "x":9.75, "y":3.5},
+                {"label":"K", "x":10.75, "y":3.5},
+                {"label":"L", "x":11.75, "y":3.5},
+                {"label":";:", "x":12.75, "y":3.5},
+                {"label":"'\"", "x":13.75, "y":3.5},
+                {"label":"#~", "x":14.75, "y":3.5},
+                {"label":"Enter", "x":15.75, "y":3.5, "w":1.25},
+
+                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":4.5},
+                {"label":"Z", "x":2.25, "y":4.5},
+                {"label":"X", "x":3.25, "y":4.5},
+                {"label":"C", "x":4.25, "y":4.5},
+                {"label":"V", "x":5.25, "y":4.5},
+                {"label":"B", "x":6.25, "y":4.5},
+                {"label":"B", "x":8.25, "y":4.5},
+                {"label":"N", "x":9.25, "y":4.5},
+                {"label":"M", "x":10.25, "y":4.5},
+                {"label":",<", "x":11.25, "y":4.5},
+                {"label":".>", "x":12.25, "y":4.5},
+                {"label":"/?", "x":13.25, "y":4.5},
+                {"label":"Shift", "x":14.25, "y":4.5, "w":1.75},
+                {"label":"Fn", "x":16, "y":4.5},
+                {"label":"\u2191", "x":18.25, "y":4.5},
+
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5},
+                {"label":"Alt", "x":2.75, "y":5.5, "w":1.5},
+                {"label":"GUI", "x":4.25, "y":5.5},
+                {"label":"Space", "x":5.25, "y":5.5, "w":2},
+                {"label":"Space", "x":8.25, "y":5.5, "w":3},
+                {"label":"ALT", "x":11.25, "y":5.5, "w":1.5},
+                {"label":"GUI", "x":12.75, "y":5.5, "w":1},
+                {"label":"Ctrl", "x":15, "y":5.5, "w":1.5},
+                {"label":"\u2190", "x":17.25, "y":5.5},
+                {"label":"\u2193", "x":18.25, "y":5.5},
+                {"label":"\u2193", "x":19.25, "y":5.5}
+            ]
+        },
+        "LAYOUT_ansi_split_bs_rshift_lspace": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":8.5, "y":0},
+                {"label":"F7", "x":9.5, "y":0},
+                {"label":"F8", "x":10.5, "y":0},
+                {"label":"F9", "x":11.5, "y":0},
+                {"label":"F10", "x":13, "y":0},
+                {"label":"F11", "x":14, "y":0},
+                {"label":"F12", "x":15, "y":0},
+                {"label":"F13", "x":16, "y":0},
+                {"label":"PrtSc", "x":17.25, "y":0},
+                {"label":"Scroll Lock", "x":18.25, "y":0},
+                {"label":"Pause", "x":19.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.5},
+                {"label":"1!", "x":1, "y":1.5},
+                {"label":"2@", "x":2, "y":1.5},
+                {"label":"3#", "x":3, "y":1.5},
+                {"label":"4$", "x":4, "y":1.5},
+                {"label":"5%", "x":5, "y":1.5},
+                {"label":"6^", "x":6, "y":1.5},
+                {"label":"7&", "x":9, "y":1.5},
+                {"label":"8*", "x":10, "y":1.5},
+                {"label":"9(", "x":11, "y":1.5},
+                {"label":"0)", "x":12, "y":1.5},
+                {"label":"-_", "x":13, "y":1.5},
+                {"label":"=+", "x":14, "y":1.5},
+                {"label":"\\|", "x":15, "y":1.5},
+                {"label":"Backspace", "x":16, "y":1.5},
+                {"label":"Insert", "x":17.25, "y":1.5},
+                {"label":"Home", "x":18.25, "y":1.5},
+                {"label":"Page Up", "x":19.25, "y":1.5},
+
+                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.5},
+                {"label":"W", "x":2.5, "y":2.5},
+                {"label":"E", "x":3.5, "y":2.5},
+                {"label":"R", "x":4.5, "y":2.5},
+                {"label":"T", "x":5.5, "y":2.5},
+                {"label":"Y", "x":8.5, "y":2.5},
+                {"label":"U", "x":9.5, "y":2.5},
+                {"label":"I", "x":10.5, "y":2.5},
+                {"label":"O", "x":11.5, "y":2.5},
+                {"label":"P", "x":12.5, "y":2.5},
+                {"label":"[{", "x":13.5, "y":2.5},
+                {"label":"]}", "x":14.5, "y":2.5},
+                {"label":"\\|", "x":15.5, "y":2.5, "w":1.5},
+                {"label":"Delete", "x":17.25, "y":2.5},
+                {"label":"End", "x":18.25, "y":2.5},
+                {"label":"Page Down", "x":19.25, "y":2.5},
+
+                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.5},
+                {"label":"S", "x":2.75, "y":3.5},
+                {"label":"D", "x":3.75, "y":3.5},
+                {"label":"F", "x":4.75, "y":3.5},
+                {"label":"G", "x":5.75, "y":3.5},
+                {"label":"H", "x":8.75, "y":3.5},
+                {"label":"J", "x":9.75, "y":3.5},
+                {"label":"K", "x":10.75, "y":3.5},
+                {"label":"L", "x":11.75, "y":3.5},
+                {"label":";:", "x":12.75, "y":3.5},
+                {"label":"'\"", "x":13.75, "y":3.5},
+                {"label":"Enter", "x":14.75, "y":3.5, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.5},
+                {"label":"X", "x":3.25, "y":4.5},
+                {"label":"C", "x":4.25, "y":4.5},
+                {"label":"V", "x":5.25, "y":4.5},
+                {"label":"B", "x":6.25, "y":4.5},
+                {"label":"B", "x":8.25, "y":4.5},
+                {"label":"N", "x":9.25, "y":4.5},
+                {"label":"M", "x":10.25, "y":4.5},
+                {"label":",<", "x":11.25, "y":4.5},
+                {"label":".>", "x":12.25, "y":4.5},
+                {"label":"/?", "x":13.25, "y":4.5},
+                {"label":"Shift", "x":14.25, "y":4.5, "w":1.75},
+                {"label":"Fn", "x":16, "y":4.5},
+                {"label":"\u2191", "x":18.25, "y":4.5},
+
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5},
+                {"label":"Alt", "x":2.75, "y":5.5, "w":1.5},
+                {"label":"GUI", "x":4.25, "y":5.5},
+                {"label":"Space", "x":5.25, "y":5.5, "w":2},
+                {"label":"Space", "x":8.25, "y":5.5, "w":3},
+                {"label":"ALT", "x":11.25, "y":5.5, "w":1.5},
+                {"label":"GUI", "x":12.75, "y":5.5, "w":1},
+                {"label":"Ctrl", "x":15, "y":5.5, "w":1.5},
+                {"label":"\u2190", "x":17.25, "y":5.5},
+                {"label":"\u2193", "x":18.25, "y":5.5},
+                {"label":"\u2193", "x":19.25, "y":5.5}
+            ]
+        },
+        "LAYOUT_iso_split_bs_rshift_lspace": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":8.5, "y":0},
+                {"label":"F7", "x":9.5, "y":0},
+                {"label":"F8", "x":10.5, "y":0},
+                {"label":"F9", "x":11.5, "y":0},
+                {"label":"F10", "x":13, "y":0},
+                {"label":"F11", "x":14, "y":0},
+                {"label":"F12", "x":15, "y":0},
+                {"label":"F13", "x":16, "y":0},
+                {"label":"PrtSc", "x":17.25, "y":0},
+                {"label":"Scroll Lock", "x":18.25, "y":0},
+                {"label":"Pause", "x":19.25, "y":0},
+
+                {"label":"`\u00ac", "x":0, "y":1.5},
+                {"label":"1!", "x":1, "y":1.5},
+                {"label":"2\"", "x":2, "y":1.5},
+                {"label":"3\u00a3", "x":3, "y":1.5},
+                {"label":"4$", "x":4, "y":1.5},
+                {"label":"5%", "x":5, "y":1.5},
+                {"label":"6^", "x":6, "y":1.5},
+                {"label":"7&", "x":9, "y":1.5},
+                {"label":"8*", "x":10, "y":1.5},
+                {"label":"9(", "x":11, "y":1.5},
+                {"label":"0)", "x":12, "y":1.5},
+                {"label":"-_", "x":13, "y":1.5},
+                {"label":"=+", "x":14, "y":1.5},
+                {"label":"\\|", "x":15, "y":1.5},
+                {"label":"Backspace", "x":16, "y":1.5},
+                {"label":"Insert", "x":17.25, "y":1.5},
+                {"label":"Home", "x":18.25, "y":1.5},
+                {"label":"Page Up", "x":19.25, "y":1.5},
+
+                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.5},
+                {"label":"W", "x":2.5, "y":2.5},
+                {"label":"E", "x":3.5, "y":2.5},
+                {"label":"R", "x":4.5, "y":2.5},
+                {"label":"T", "x":5.5, "y":2.5},
+                {"label":"Y", "x":8.5, "y":2.5},
+                {"label":"U", "x":9.5, "y":2.5},
+                {"label":"I", "x":10.5, "y":2.5},
+                {"label":"O", "x":11.5, "y":2.5},
+                {"label":"P", "x":12.5, "y":2.5},
+                {"label":"[{", "x":13.5, "y":2.5},
+                {"label":"]}", "x":14.5, "y":2.5},
+                {"label":"Delete", "x":17.25, "y":2.5},
+                {"label":"End", "x":18.25, "y":2.5},
+                {"label":"Page Down", "x":19.25, "y":2.5},
+
+                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.5},
+                {"label":"S", "x":2.75, "y":3.5},
+                {"label":"D", "x":3.75, "y":3.5},
+                {"label":"F", "x":4.75, "y":3.5},
+                {"label":"G", "x":5.75, "y":3.5},
+                {"label":"H", "x":8.75, "y":3.5},
+                {"label":"J", "x":9.75, "y":3.5},
+                {"label":"K", "x":10.75, "y":3.5},
+                {"label":"L", "x":11.75, "y":3.5},
+                {"label":";:", "x":12.75, "y":3.5},
+                {"label":"'@", "x":13.75, "y":3.5},
+                {"label":"#~", "x":14.75, "y":3.5},
+                {"label":"Enter", "x":15.75, "y":2.5, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":4.5},
+                {"label":"Z", "x":2.25, "y":4.5},
+                {"label":"X", "x":3.25, "y":4.5},
+                {"label":"C", "x":4.25, "y":4.5},
+                {"label":"V", "x":5.25, "y":4.5},
+                {"label":"B", "x":6.25, "y":4.5},
+                {"label":"B", "x":8.25, "y":4.5},
+                {"label":"N", "x":9.25, "y":4.5},
+                {"label":"M", "x":10.25, "y":4.5},
+                {"label":",<", "x":11.25, "y":4.5},
+                {"label":".>", "x":12.25, "y":4.5},
+                {"label":"/?", "x":13.25, "y":4.5},
+                {"label":"Shift", "x":14.25, "y":4.5, "w":1.75},
+                {"label":"Fn", "x":16, "y":4.5},
+                {"label":"\u2191", "x":18.25, "y":4.5},
+
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5},
+                {"label":"Alt", "x":2.75, "y":5.5, "w":1.5},
+                {"label":"GUI", "x":4.25, "y":5.5},
+                {"label":"Space", "x":5.25, "y":5.5, "w":2},
+                {"label":"Space", "x":8.25, "y":5.5, "w":3},
+                {"label":"ALT", "x":11.25, "y":5.5, "w":1.5},
+                {"label":"GUI", "x":12.75, "y":5.5, "w":1},
+                {"label":"Ctrl", "x":15, "y":5.5, "w":1.5},
+                {"label":"\u2190", "x":17.25, "y":5.5},
+                {"label":"\u2193", "x":18.25, "y":5.5},
+                {"label":"\u2192", "x":19.25, "y":5.5}
+            ]
         }
     }
 }
diff --git a/keyboards/suavity/ehan/keymaps/default/keymap.c b/keyboards/suavity/ehan/keymaps/default/keymap.c
index f3cf35e1a1..5579f84ac6 100755
--- a/keyboards/suavity/ehan/keymaps/default/keymap.c
+++ b/keyboards/suavity/ehan/keymaps/default/keymap.c
@@ -17,21 +17,21 @@ 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_ansi_default(
-        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_F13,   KC_PSCR, KC_SLCK, 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_BSLS,  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,
-        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_LSFT,      KC_Z, KC_X, KC_C, KC_V, KC_B,       KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,      KC_RSFT,   MO(1),         KC_UP,
-        KC_LCTL,           KC_LALT, KC_LCMD, KC_SPC,                 KC_SPC,      KC_RALT,      KC_RWIN,      KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT),
+    [0] = LAYOUT_ansi_split_bs_rshift_lspace(
+        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_F13,              KC_PSCR, KC_SLCK, 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_BSLS, 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,
+        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_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,       KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                        KC_UP,
+        KC_LCTL,                   KC_LALT, KC_LCMD,          KC_SPC,     KC_SPC,                    KC_RALT, KC_RWIN,                   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
-
-
-  [1] = LAYOUT_ansi_default(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,
-        KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,   KC_TRNS,           KC_TRNS,
-        KC_TRNS,           KC_TRNS, KC_TRNS, KC_DEL,                 KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,                                  KC_TRNS, KC_TRNS, KC_TRNS),
+    [1] = LAYOUT_ansi_split_bs_rshift_lspace(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS,
+        KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_DEL,     KC_TRNS,                   KC_TRNS, KC_TRNS,                   KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
+    ),
 };
diff --git a/keyboards/suavity/ehan/keymaps/default_iso/keymap.c b/keyboards/suavity/ehan/keymaps/default_iso/keymap.c
new file mode 100644
index 0000000000..62c5550789
--- /dev/null
+++ b/keyboards/suavity/ehan/keymaps/default_iso/keymap.c
@@ -0,0 +1,37 @@
+/*
+Copyright 2021 Suavity Designs <henry@suavity.cc>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_iso_split_bs_rshift_lspace(
+        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_F13,              KC_PSCR, KC_SLCK, 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_BSLS, 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_DEL,  KC_END,  KC_PGDN,
+        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_NUHS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,       KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                        KC_UP,
+        KC_LCTL,                   KC_LALT, KC_LCMD,          KC_SPC,     KC_SPC,                    KC_RALT, KC_RWIN,                   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT_iso_split_bs_rshift_lspace(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS,
+        KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_DEL,     KC_TRNS,                   KC_TRNS, KC_TRNS,                   KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+};
diff --git a/keyboards/suavity/ehan/keymaps/via/keymap.c b/keyboards/suavity/ehan/keymaps/via/keymap.c
index c447dd3304..9b267698db 100644
--- a/keyboards/suavity/ehan/keymaps/via/keymap.c
+++ b/keyboards/suavity/ehan/keymaps/via/keymap.c
@@ -17,37 +17,39 @@ 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_ansi_default(
-        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_F13,   KC_PSCR, KC_SLCK, 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_BSLS,  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,
-        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_LSFT,      KC_Z, KC_X, KC_C, KC_V, KC_B,       KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,      KC_RSFT,   MO(1),         KC_UP,
-        KC_LCTL,           KC_LALT, KC_LCMD, KC_SPC,                 KC_SPC,      KC_RALT,      KC_RWIN,      KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT),
-
-
-   [1] = LAYOUT_ansi_default(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,
-        KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,   KC_TRNS,           KC_TRNS,
-        KC_TRNS,           KC_TRNS, KC_TRNS, KC_DEL,                 KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,                                  KC_TRNS, KC_TRNS, KC_TRNS),
-
-
-   [2] = LAYOUT_ansi_default(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,
-        KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,   KC_TRNS,           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_ansi_default(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,
-        KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,   KC_TRNS,           KC_TRNS,
-        KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,                                  KC_TRNS, KC_TRNS, KC_TRNS),
+    [0] = LAYOUT_ansi_split_bs_rshift_lspace(
+        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_F13,              KC_PSCR, KC_SLCK, 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_BSLS, 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,
+        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_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,       KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                        KC_UP,
+        KC_LCTL,                   KC_LALT, KC_LCMD,          KC_SPC,     KC_SPC,                    KC_RALT, KC_RWIN,                   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT_ansi_split_bs_rshift_lspace(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS,
+        KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_DEL,     KC_TRNS,                   KC_TRNS, KC_TRNS,                   KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [2] = LAYOUT_ansi_split_bs_rshift_lspace(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      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_ansi_split_bs_rshift_lspace(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS