KeebsForAll FreebirdTKL Layout Macro Refactor (#16146)

5 files changed, 486 insertions, 72 deletions

diff --git a/keyboards/keebsforall/freebirdtkl/freebirdtkl.h b/keyboards/keebsforall/freebirdtkl/freebirdtkl.h
index d091109d05..0064172732 100644
--- a/keyboards/keebsforall/freebirdtkl/freebirdtkl.h
+++ b/keyboards/keebsforall/freebirdtkl/freebirdtkl.h
@@ -20,31 +20,27 @@
 
 #define kxx KC_NO
 
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
+/*
+ * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐
+ * │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 │3d │ │1e │1f │1g │   │1d     │ 2u Backspace
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤   └───────┘
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   │ │2e │2f │2g │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───┐       ┌──────────┐
+ * │40      │41 │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b    │4d │     │4f │       │4b        │ 2.75u RShift
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───┐   └──────────┘
+ * │50  │52  │53  │55                      │58  │59  │5a  │5b  │ │5e │5f │5g │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+ * ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+ * │50   │52 │53   │55                         │59   │5a │5b   │ Tsangan/WKL
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
  */
-#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, k3d,  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, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b,      k4d,            k4f,      \
-    k50,      k52, k53,      k55,           k58, k59, k5a, k5b,                 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, kxx, kxx, kxx },  \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, kxx, k4d, kxx, k4f, kxx },  \
-    { k50, kxx, k52, k53, kxx, k55, kxx, kxx, k58, k59, k5a, k5b, kxx, kxx, k5e, k5f, k5g }  \
-}
 
-#define LAYOUT_ansi( \
+#define LAYOUT_tkl_f13_ansi( \
     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, \
@@ -60,7 +56,39 @@
     { k50, kxx, k52, k53, kxx, k55, kxx, kxx, k58, k59, k5a, k5b, kxx, kxx, k5e, k5f, k5g }  \
 }
 
-#define LAYOUT_tsangan( \
+#define LAYOUT_tkl_f13_ansi_split_bs_rshift( \
+    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, k3d,   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,      k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4d,             k4f,      \
+    k50, k52, k53,                k55,                k58, k59, k5a, k5b,        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, kxx, kxx, kxx }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, kxx, k4d, kxx, k4f, kxx }, \
+    { k50, kxx, k52, k53, kxx, k55, kxx, kxx, k58, k59, k5a, k5b, kxx, kxx, k5e, k5f, k5g }  \
+}
+
+#define LAYOUT_tkl_f13_ansi_tsangan( \
+    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,                  \
+    k40,      k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a,      k4b,        k4f,      \
+    k50, k52, k53,                k55,                     k59, k5a, k5b,   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, kxx, kxx, kxx, kxx }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, kxx, kxx, kxx, k4f, kxx }, \
+    { k50, kxx, k52, k53, kxx, k55, kxx, kxx, kxx, k59, k5a, k5b, kxx, kxx, k5e, k5f, k5g }  \
+}
+
+#define LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift( \
     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, k3d, k1e, k1f, k1g, \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      k2e, k2f, k2g, \
diff --git a/keyboards/keebsforall/freebirdtkl/info.json b/keyboards/keebsforall/freebirdtkl/info.json
index aedf8777af..0c21d22393 100644
--- a/keyboards/keebsforall/freebirdtkl/info.json
+++ b/keyboards/keebsforall/freebirdtkl/info.json
@@ -2,15 +2,401 @@
     "keyboard_name": "FreebirdTKL",
     "url": "https://keebsforall.com",
     "maintainer": "KnoblesseOblige",
+    "layout_aliases": {
+        "LAYOUT_ansi": "LAYOUT_tkl_f13_ansi",
+        "LAYOUT_tsangan": "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift",
+        "LAYOUT_all": "LAYOUT_tkl_f13_ansi_split_bs_rshift"
+    },
     "layouts": {
-        "LAYOUT_ansi": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1.25, "y":0}, {"label":"0,2", "x":2.25, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,4", "x":4.25, "y":0}, {"label":"0,5", "x":5.5, "y":0}, {"label":"0,6", "x":6.5, "y":0}, {"label":"0,7", "x":7.5, "y":0}, {"label":"0,8", "x":8.5, "y":0}, {"label":"0,9", "x":9.75, "y":0}, {"label":"0,10", "x":10.75, "y":0}, {"label":"0,11", "x":11.75, "y":0}, {"label":"0,12", "x":12.75, "y":0}, {"label":"0,13", "x":14, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,10", "x":10, "y":1.25}, {"label":"1,11", "x":11, "y":1.25}, {"label":"1,12", "x":12, "y":1.25}, {"label":"1,13", "x":13, "y":1.25, "w":2}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,10", "x":10.5, "y":2.25}, {"label":"2,11", "x":11.5, "y":2.25}, {"label":"2,12", "x":12.5, "y":2.25}, {"label":"2,13", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.25, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,10", "x":10.75, "y":3.25}, {"label":"3,11", "x":11.75, "y":3.25}, {"label":"3,12", "x":12.75, "y":3.25, "w":2.25}, {"label":"4,0", "x":0, "y":4.25, "w":2.25}, {"label":"4,1", "x":2.25, "y":4.25}, {"label":"4,2", "x":3.25, "y":4.25}, {"label":"4,3", "x":4.25, "y":4.25}, {"label":"4,4", "x":5.25, "y":4.25}, {"label":"4,5", "x":6.25, "y":4.25}, {"label":"4,6", "x":7.25, "y":4.25}, {"label":"4,7", "x":8.25, "y":4.25}, {"label":"4,8", "x":9.25, "y":4.25}, {"label":"4,9", "x":10.25, "y":4.25}, {"label":"4,10", "x":11.25, "y":4.25}, {"label":"4,11", "x":12.25, "y":4.25, "w":2.75}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,2", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,3", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,5", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,8", "x":10, "y":5.25, "w":1.25}, {"label":"5,9", "x":11.25, "y":5.25, "w":1.25}, {"label":"5,10", "x":12.5, "y":5.25, "w":1.25}, {"label":"5,11", "x":13.75, "y":5.25, "w":1.25}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}]
+        "LAYOUT_tkl_f13_ansi": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,1", "x":1.25, "y":0},
+                {"label":"0,2", "x":2.25, "y":0},
+                {"label":"0,3", "x":3.25, "y":0},
+                {"label":"0,4", "x":4.25, "y":0},
+                {"label":"0,5", "x":5.5, "y":0},
+                {"label":"0,6", "x":6.5, "y":0},
+                {"label":"0,7", "x":7.5, "y":0},
+                {"label":"0,8", "x":8.5, "y":0},
+                {"label":"0,9", "x":9.75, "y":0},
+                {"label":"0,10", "x":10.75, "y":0},
+                {"label":"0,11", "x":11.75, "y":0},
+                {"label":"0,12", "x":12.75, "y":0},
+                {"label":"0,13", "x":14, "y":0},
+                {"label":"0,14", "x":15.25, "y":0},
+                {"label":"0,15", "x":16.25, "y":0},
+                {"label":"0,16", "x":17.25, "y":0},
+
+                {"label":"1,0", "x":0, "y":1.25},
+                {"label":"1,1", "x":1, "y":1.25},
+                {"label":"1,2", "x":2, "y":1.25},
+                {"label":"1,3", "x":3, "y":1.25},
+                {"label":"1,4", "x":4, "y":1.25},
+                {"label":"1,5", "x":5, "y":1.25},
+                {"label":"1,6", "x":6, "y":1.25},
+                {"label":"1,7", "x":7, "y":1.25},
+                {"label":"1,8", "x":8, "y":1.25},
+                {"label":"1,9", "x":9, "y":1.25},
+                {"label":"1,10", "x":10, "y":1.25},
+                {"label":"1,11", "x":11, "y":1.25},
+                {"label":"1,12", "x":12, "y":1.25},
+                {"label":"1,13", "x":13, "y":1.25, "w":2},
+                {"label":"1,14", "x":15.25, "y":1.25},
+                {"label":"1,15", "x":16.25, "y":1.25},
+                {"label":"1,16", "x":17.25, "y":1.25},
+
+                {"label":"2,0", "x":0, "y":2.25, "w":1.5},
+                {"label":"2,1", "x":1.5, "y":2.25},
+                {"label":"2,2", "x":2.5, "y":2.25},
+                {"label":"2,3", "x":3.5, "y":2.25},
+                {"label":"2,4", "x":4.5, "y":2.25},
+                {"label":"2,5", "x":5.5, "y":2.25},
+                {"label":"2,6", "x":6.5, "y":2.25},
+                {"label":"2,7", "x":7.5, "y":2.25},
+                {"label":"2,8", "x":8.5, "y":2.25},
+                {"label":"2,9", "x":9.5, "y":2.25},
+                {"label":"2,10", "x":10.5, "y":2.25},
+                {"label":"2,11", "x":11.5, "y":2.25},
+                {"label":"2,12", "x":12.5, "y":2.25},
+                {"label":"2,13", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"2,14", "x":15.25, "y":2.25},
+                {"label":"2,15", "x":16.25, "y":2.25},
+                {"label":"2,16", "x":17.25, "y":2.25},
+
+                {"label":"3,0", "x":0, "y":3.25, "w":1.75},
+                {"label":"3,1", "x":1.75, "y":3.25},
+                {"label":"3,2", "x":2.75, "y":3.25},
+                {"label":"3,3", "x":3.75, "y":3.25},
+                {"label":"3,4", "x":4.75, "y":3.25},
+                {"label":"3,5", "x":5.75, "y":3.25},
+                {"label":"3,6", "x":6.75, "y":3.25},
+                {"label":"3,7", "x":7.75, "y":3.25},
+                {"label":"3,8", "x":8.75, "y":3.25},
+                {"label":"3,9", "x":9.75, "y":3.25},
+                {"label":"3,10", "x":10.75, "y":3.25},
+                {"label":"3,11", "x":11.75, "y":3.25},
+                {"label":"3,12", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"4,0", "x":0, "y":4.25, "w":2.25},
+                {"label":"4,1", "x":2.25, "y":4.25},
+                {"label":"4,2", "x":3.25, "y":4.25},
+                {"label":"4,3", "x":4.25, "y":4.25},
+                {"label":"4,4", "x":5.25, "y":4.25},
+                {"label":"4,5", "x":6.25, "y":4.25},
+                {"label":"4,6", "x":7.25, "y":4.25},
+                {"label":"4,7", "x":8.25, "y":4.25},
+                {"label":"4,8", "x":9.25, "y":4.25},
+                {"label":"4,9", "x":10.25, "y":4.25},
+                {"label":"4,10", "x":11.25, "y":4.25},
+                {"label":"4,11", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"4,15", "x":16.25, "y":4.25},
+
+                {"label":"5,0", "x":0, "y":5.25, "w":1.25},
+                {"label":"5,2", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"5,3", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"5,5", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"5,8", "x":10, "y":5.25, "w":1.25},
+                {"label":"5,9", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"5,10", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"5,11", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"5,14", "x":15.25, "y":5.25},
+                {"label":"5,15", "x":16.25, "y":5.25},
+                {"label":"5,16", "x":17.25, "y":5.25}
+            ]
         },
-        "LAYOUT_tsangan": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1.25, "y":0}, {"label":"0,2", "x":2.25, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,4", "x":4.25, "y":0}, {"label":"0,5", "x":5.5, "y":0}, {"label":"0,6", "x":6.5, "y":0}, {"label":"0,7", "x":7.5, "y":0}, {"label":"0,8", "x":8.5, "y":0}, {"label":"0,9", "x":9.75, "y":0}, {"label":"0,10", "x":10.75, "y":0}, {"label":"0,11", "x":11.75, "y":0}, {"label":"0,12", "x":12.75, "y":0}, {"label":"0,13", "x":14, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,10", "x":10, "y":1.25}, {"label":"1,11", "x":11, "y":1.25}, {"label":"1,12", "x":12, "y":1.25}, {"label":"1,13", "x":13, "y":1.25}, {"label":"3,13", "x":14, "y":1.25}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,10", "x":10.5, "y":2.25}, {"label":"2,11", "x":11.5, "y":2.25}, {"label":"2,12", "x":12.5, "y":2.25}, {"label":"2,13", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.25, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,10", "x":10.75, "y":3.25}, {"label":"3,11", "x":11.75, "y":3.25}, {"label":"3,12", "x":12.75, "y":3.25, "w":2.25}, {"label":"4,0", "x":0, "y":4.25, "w":2.25}, {"label":"4,1", "x":2.25, "y":4.25}, {"label":"4,2", "x":3.25, "y":4.25}, {"label":"4,3", "x":4.25, "y":4.25}, {"label":"4,4", "x":5.25, "y":4.25}, {"label":"4,5", "x":6.25, "y":4.25}, {"label":"4,6", "x":7.25, "y":4.25}, {"label":"4,7", "x":8.25, "y":4.25}, {"label":"4,8", "x":9.25, "y":4.25}, {"label":"4,9", "x":10.25, "y":4.25}, {"label":"4,10", "x":11.25, "y":4.25}, {"label":"4,11", "x":12.25, "y":4.25, "w":1.75}, {"label":"4,13", "x":14, "y":4.25}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.5}, {"label":"5,2", "x":1.5, "y":5.25}, {"label":"5,3", "x":2.5, "y":5.25, "w":1.5}, {"label":"5,5", "x":4, "y":5.25, "w":7}, {"label":"5,9", "x":11, "y":5.25, "w":1.5}, {"label":"5,10", "x":12.5, "y":5.25}, {"label":"5,11", "x":13.5, "y":5.25, "w":1.5}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}]
+        "LAYOUT_tkl_f13_ansi_split_bs_rshift": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,1", "x":1.25, "y":0},
+                {"label":"0,2", "x":2.25, "y":0},
+                {"label":"0,3", "x":3.25, "y":0},
+                {"label":"0,4", "x":4.25, "y":0},
+                {"label":"0,5", "x":5.5, "y":0},
+                {"label":"0,6", "x":6.5, "y":0},
+                {"label":"0,7", "x":7.5, "y":0},
+                {"label":"0,8", "x":8.5, "y":0},
+                {"label":"0,9", "x":9.75, "y":0},
+                {"label":"0,10", "x":10.75, "y":0},
+                {"label":"0,11", "x":11.75, "y":0},
+                {"label":"0,12", "x":12.75, "y":0},
+                {"label":"0,13", "x":14, "y":0},
+                {"label":"0,14", "x":15.25, "y":0},
+                {"label":"0,15", "x":16.25, "y":0},
+                {"label":"0,16", "x":17.25, "y":0},
+
+                {"label":"1,0", "x":0, "y":1.25},
+                {"label":"1,1", "x":1, "y":1.25},
+                {"label":"1,2", "x":2, "y":1.25},
+                {"label":"1,3", "x":3, "y":1.25},
+                {"label":"1,4", "x":4, "y":1.25},
+                {"label":"1,5", "x":5, "y":1.25},
+                {"label":"1,6", "x":6, "y":1.25},
+                {"label":"1,7", "x":7, "y":1.25},
+                {"label":"1,8", "x":8, "y":1.25},
+                {"label":"1,9", "x":9, "y":1.25},
+                {"label":"1,10", "x":10, "y":1.25},
+                {"label":"1,11", "x":11, "y":1.25},
+                {"label":"1,12", "x":12, "y":1.25},
+                {"label":"1,13", "x":13, "y":1.25},
+                {"label":"3,13", "x":14, "y":1.25},
+                {"label":"1,14", "x":15.25, "y":1.25},
+                {"label":"1,15", "x":16.25, "y":1.25},
+                {"label":"1,16", "x":17.25, "y":1.25},
+
+                {"label":"2,0", "x":0, "y":2.25, "w":1.5},
+                {"label":"2,1", "x":1.5, "y":2.25},
+                {"label":"2,2", "x":2.5, "y":2.25},
+                {"label":"2,3", "x":3.5, "y":2.25},
+                {"label":"2,4", "x":4.5, "y":2.25},
+                {"label":"2,5", "x":5.5, "y":2.25},
+                {"label":"2,6", "x":6.5, "y":2.25},
+                {"label":"2,7", "x":7.5, "y":2.25},
+                {"label":"2,8", "x":8.5, "y":2.25},
+                {"label":"2,9", "x":9.5, "y":2.25},
+                {"label":"2,10", "x":10.5, "y":2.25},
+                {"label":"2,11", "x":11.5, "y":2.25},
+                {"label":"2,12", "x":12.5, "y":2.25},
+                {"label":"2,13", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"2,14", "x":15.25, "y":2.25},
+                {"label":"2,15", "x":16.25, "y":2.25},
+                {"label":"2,16", "x":17.25, "y":2.25},
+
+                {"label":"3,0", "x":0, "y":3.25, "w":1.75},
+                {"label":"3,1", "x":1.75, "y":3.25},
+                {"label":"3,2", "x":2.75, "y":3.25},
+                {"label":"3,3", "x":3.75, "y":3.25},
+                {"label":"3,4", "x":4.75, "y":3.25},
+                {"label":"3,5", "x":5.75, "y":3.25},
+                {"label":"3,6", "x":6.75, "y":3.25},
+                {"label":"3,7", "x":7.75, "y":3.25},
+                {"label":"3,8", "x":8.75, "y":3.25},
+                {"label":"3,9", "x":9.75, "y":3.25},
+                {"label":"3,10", "x":10.75, "y":3.25},
+                {"label":"3,11", "x":11.75, "y":3.25},
+                {"label":"3,12", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"4,0", "x":0, "y":4.25, "w":2.25},
+                {"label":"4,1", "x":2.25, "y":4.25},
+                {"label":"4,2", "x":3.25, "y":4.25},
+                {"label":"4,3", "x":4.25, "y":4.25},
+                {"label":"4,4", "x":5.25, "y":4.25},
+                {"label":"4,5", "x":6.25, "y":4.25},
+                {"label":"4,6", "x":7.25, "y":4.25},
+                {"label":"4,7", "x":8.25, "y":4.25},
+                {"label":"4,8", "x":9.25, "y":4.25},
+                {"label":"4,9", "x":10.25, "y":4.25},
+                {"label":"4,10", "x":11.25, "y":4.25},
+                {"label":"4,11", "x":12.25, "y":4.25, "w":1.75},
+                {"label":"4,13", "x":14, "y":4.25},
+                {"label":"4,15", "x":16.25, "y":4.25},
+
+                {"label":"5,0", "x":0, "y":5.25, "w":1.25},
+                {"label":"5,2", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"5,3", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"5,5", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"5,8", "x":10, "y":5.25, "w":1.25},
+                {"label":"5,9", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"5,10", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"5,11", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"5,14", "x":15.25, "y":5.25},
+                {"label":"5,15", "x":16.25, "y":5.25},
+                {"label":"5,16", "x":17.25, "y":5.25}
+            ]
         },
-        "LAYOUT_all": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1.25, "y":0}, {"label":"0,2", "x":2.25, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,4", "x":4.25, "y":0}, {"label":"0,5", "x":5.5, "y":0}, {"label":"0,6", "x":6.5, "y":0}, {"label":"0,7", "x":7.5, "y":0}, {"label":"0,8", "x":8.5, "y":0}, {"label":"0,9", "x":9.75, "y":0}, {"label":"0,10", "x":10.75, "y":0}, {"label":"0,11", "x":11.75, "y":0}, {"label":"0,12", "x":12.75, "y":0}, {"label":"0,13", "x":14, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,10", "x":10, "y":1.25}, {"label":"1,11", "x":11, "y":1.25}, {"label":"1,12", "x":12, "y":1.25}, {"label":"1,13", "x":13, "y":1.25}, {"label":"3,13", "x":14, "y":1.25}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,10", "x":10.5, "y":2.25}, {"label":"2,11", "x":11.5, "y":2.25}, {"label":"2,12", "x":12.5, "y":2.25}, {"label":"2,13", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.25, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,10", "x":10.75, "y":3.25}, {"label":"3,11", "x":11.75, "y":3.25}, {"label":"3,12", "x":12.75, "y":3.25, "w":2.25}, {"label":"4,0", "x":0, "y":4.25, "w":2.25}, {"label":"4,1", "x":2.25, "y":4.25}, {"label":"4,2", "x":3.25, "y":4.25}, {"label":"4,3", "x":4.25, "y":4.25}, {"label":"4,4", "x":5.25, "y":4.25}, {"label":"4,5", "x":6.25, "y":4.25}, {"label":"4,6", "x":7.25, "y":4.25}, {"label":"4,7", "x":8.25, "y":4.25}, {"label":"4,8", "x":9.25, "y":4.25}, {"label":"4,9", "x":10.25, "y":4.25}, {"label":"4,10", "x":11.25, "y":4.25}, {"label":"4,11", "x":12.25, "y":4.25, "w":1.75}, {"label":"4,13", "x":14, "y":4.25}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,2", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,3", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,5", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,8", "x":10, "y":5.25, "w":1.25}, {"label":"5,9", "x":11.25, "y":5.25, "w":1.25}, {"label":"5,10", "x":12.5, "y":5.25, "w":1.25}, {"label":"5,11", "x":13.75, "y":5.25, "w":1.25}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}]
+        "LAYOUT_tkl_f13_ansi_tsangan": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,1", "x":1.25, "y":0},
+                {"label":"0,2", "x":2.25, "y":0},
+                {"label":"0,3", "x":3.25, "y":0},
+                {"label":"0,4", "x":4.25, "y":0},
+                {"label":"0,5", "x":5.5, "y":0},
+                {"label":"0,6", "x":6.5, "y":0},
+                {"label":"0,7", "x":7.5, "y":0},
+                {"label":"0,8", "x":8.5, "y":0},
+                {"label":"0,9", "x":9.75, "y":0},
+                {"label":"0,10", "x":10.75, "y":0},
+                {"label":"0,11", "x":11.75, "y":0},
+                {"label":"0,12", "x":12.75, "y":0},
+                {"label":"0,13", "x":14, "y":0},
+                {"label":"0,14", "x":15.25, "y":0},
+                {"label":"0,15", "x":16.25, "y":0},
+                {"label":"0,16", "x":17.25, "y":0},
+
+                {"label":"1,0", "x":0, "y":1.25},
+                {"label":"1,1", "x":1, "y":1.25},
+                {"label":"1,2", "x":2, "y":1.25},
+                {"label":"1,3", "x":3, "y":1.25},
+                {"label":"1,4", "x":4, "y":1.25},
+                {"label":"1,5", "x":5, "y":1.25},
+                {"label":"1,6", "x":6, "y":1.25},
+                {"label":"1,7", "x":7, "y":1.25},
+                {"label":"1,8", "x":8, "y":1.25},
+                {"label":"1,9", "x":9, "y":1.25},
+                {"label":"1,10", "x":10, "y":1.25},
+                {"label":"1,11", "x":11, "y":1.25},
+                {"label":"1,12", "x":12, "y":1.25},
+                {"label":"1,13", "x":13, "y":1.25, "w":2},
+                {"label":"1,14", "x":15.25, "y":1.25},
+                {"label":"1,15", "x":16.25, "y":1.25},
+                {"label":"1,16", "x":17.25, "y":1.25},
+
+                {"label":"2,0", "x":0, "y":2.25, "w":1.5},
+                {"label":"2,1", "x":1.5, "y":2.25},
+                {"label":"2,2", "x":2.5, "y":2.25},
+                {"label":"2,3", "x":3.5, "y":2.25},
+                {"label":"2,4", "x":4.5, "y":2.25},
+                {"label":"2,5", "x":5.5, "y":2.25},
+                {"label":"2,6", "x":6.5, "y":2.25},
+                {"label":"2,7", "x":7.5, "y":2.25},
+                {"label":"2,8", "x":8.5, "y":2.25},
+                {"label":"2,9", "x":9.5, "y":2.25},
+                {"label":"2,10", "x":10.5, "y":2.25},
+                {"label":"2,11", "x":11.5, "y":2.25},
+                {"label":"2,12", "x":12.5, "y":2.25},
+                {"label":"2,13", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"2,14", "x":15.25, "y":2.25},
+                {"label":"2,15", "x":16.25, "y":2.25},
+                {"label":"2,16", "x":17.25, "y":2.25},
+
+                {"label":"3,0", "x":0, "y":3.25, "w":1.75},
+                {"label":"3,1", "x":1.75, "y":3.25},
+                {"label":"3,2", "x":2.75, "y":3.25},
+                {"label":"3,3", "x":3.75, "y":3.25},
+                {"label":"3,4", "x":4.75, "y":3.25},
+                {"label":"3,5", "x":5.75, "y":3.25},
+                {"label":"3,6", "x":6.75, "y":3.25},
+                {"label":"3,7", "x":7.75, "y":3.25},
+                {"label":"3,8", "x":8.75, "y":3.25},
+                {"label":"3,9", "x":9.75, "y":3.25},
+                {"label":"3,10", "x":10.75, "y":3.25},
+                {"label":"3,11", "x":11.75, "y":3.25},
+                {"label":"3,12", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"4,0", "x":0, "y":4.25, "w":2.25},
+                {"label":"4,1", "x":2.25, "y":4.25},
+                {"label":"4,2", "x":3.25, "y":4.25},
+                {"label":"4,3", "x":4.25, "y":4.25},
+                {"label":"4,4", "x":5.25, "y":4.25},
+                {"label":"4,5", "x":6.25, "y":4.25},
+                {"label":"4,6", "x":7.25, "y":4.25},
+                {"label":"4,7", "x":8.25, "y":4.25},
+                {"label":"4,8", "x":9.25, "y":4.25},
+                {"label":"4,9", "x":10.25, "y":4.25},
+                {"label":"4,10", "x":11.25, "y":4.25},
+                {"label":"4,11", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"4,15", "x":16.25, "y":4.25},
+
+                {"label":"5,0", "x":0, "y":5.25, "w":1.5},
+                {"label":"5,2", "x":1.5, "y":5.25},
+                {"label":"5,3", "x":2.5, "y":5.25, "w":1.5},
+                {"label":"5,5", "x":4, "y":5.25, "w":7},
+                {"label":"5,9", "x":11, "y":5.25, "w":1.5},
+                {"label":"5,10", "x":12.5, "y":5.25},
+                {"label":"5,11", "x":13.5, "y":5.25, "w":1.5},
+                {"label":"5,14", "x":15.25, "y":5.25},
+                {"label":"5,15", "x":16.25, "y":5.25},
+                {"label":"5,16", "x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,1", "x":1.25, "y":0},
+                {"label":"0,2", "x":2.25, "y":0},
+                {"label":"0,3", "x":3.25, "y":0},
+                {"label":"0,4", "x":4.25, "y":0},
+                {"label":"0,5", "x":5.5, "y":0},
+                {"label":"0,6", "x":6.5, "y":0},
+                {"label":"0,7", "x":7.5, "y":0},
+                {"label":"0,8", "x":8.5, "y":0},
+                {"label":"0,9", "x":9.75, "y":0},
+                {"label":"0,10", "x":10.75, "y":0},
+                {"label":"0,11", "x":11.75, "y":0},
+                {"label":"0,12", "x":12.75, "y":0},
+                {"label":"0,13", "x":14, "y":0},
+                {"label":"0,14", "x":15.25, "y":0},
+                {"label":"0,15", "x":16.25, "y":0},
+                {"label":"0,16", "x":17.25, "y":0},
+
+                {"label":"1,0", "x":0, "y":1.25},
+                {"label":"1,1", "x":1, "y":1.25},
+                {"label":"1,2", "x":2, "y":1.25},
+                {"label":"1,3", "x":3, "y":1.25},
+                {"label":"1,4", "x":4, "y":1.25},
+                {"label":"1,5", "x":5, "y":1.25},
+                {"label":"1,6", "x":6, "y":1.25},
+                {"label":"1,7", "x":7, "y":1.25},
+                {"label":"1,8", "x":8, "y":1.25},
+                {"label":"1,9", "x":9, "y":1.25},
+                {"label":"1,10", "x":10, "y":1.25},
+                {"label":"1,11", "x":11, "y":1.25},
+                {"label":"1,12", "x":12, "y":1.25},
+                {"label":"1,13", "x":13, "y":1.25},
+                {"label":"3,13", "x":14, "y":1.25},
+                {"label":"1,14", "x":15.25, "y":1.25},
+                {"label":"1,15", "x":16.25, "y":1.25},
+                {"label":"1,16", "x":17.25, "y":1.25},
+
+                {"label":"2,0", "x":0, "y":2.25, "w":1.5},
+                {"label":"2,1", "x":1.5, "y":2.25},
+                {"label":"2,2", "x":2.5, "y":2.25},
+                {"label":"2,3", "x":3.5, "y":2.25},
+                {"label":"2,4", "x":4.5, "y":2.25},
+                {"label":"2,5", "x":5.5, "y":2.25},
+                {"label":"2,6", "x":6.5, "y":2.25},
+                {"label":"2,7", "x":7.5, "y":2.25},
+                {"label":"2,8", "x":8.5, "y":2.25},
+                {"label":"2,9", "x":9.5, "y":2.25},
+                {"label":"2,10", "x":10.5, "y":2.25},
+                {"label":"2,11", "x":11.5, "y":2.25},
+                {"label":"2,12", "x":12.5, "y":2.25},
+                {"label":"2,13", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"2,14", "x":15.25, "y":2.25},
+                {"label":"2,15", "x":16.25, "y":2.25},
+                {"label":"2,16", "x":17.25, "y":2.25},
+
+                {"label":"3,0", "x":0, "y":3.25, "w":1.75},
+                {"label":"3,1", "x":1.75, "y":3.25},
+                {"label":"3,2", "x":2.75, "y":3.25},
+                {"label":"3,3", "x":3.75, "y":3.25},
+                {"label":"3,4", "x":4.75, "y":3.25},
+                {"label":"3,5", "x":5.75, "y":3.25},
+                {"label":"3,6", "x":6.75, "y":3.25},
+                {"label":"3,7", "x":7.75, "y":3.25},
+                {"label":"3,8", "x":8.75, "y":3.25},
+                {"label":"3,9", "x":9.75, "y":3.25},
+                {"label":"3,10", "x":10.75, "y":3.25},
+                {"label":"3,11", "x":11.75, "y":3.25},
+                {"label":"3,12", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"4,0", "x":0, "y":4.25, "w":2.25},
+                {"label":"4,1", "x":2.25, "y":4.25},
+                {"label":"4,2", "x":3.25, "y":4.25},
+                {"label":"4,3", "x":4.25, "y":4.25},
+                {"label":"4,4", "x":5.25, "y":4.25},
+                {"label":"4,5", "x":6.25, "y":4.25},
+                {"label":"4,6", "x":7.25, "y":4.25},
+                {"label":"4,7", "x":8.25, "y":4.25},
+                {"label":"4,8", "x":9.25, "y":4.25},
+                {"label":"4,9", "x":10.25, "y":4.25},
+                {"label":"4,10", "x":11.25, "y":4.25},
+                {"label":"4,11", "x":12.25, "y":4.25, "w":1.75},
+                {"label":"4,13", "x":14, "y":4.25},
+                {"label":"4,15", "x":16.25, "y":4.25},
+
+                {"label":"5,0", "x":0, "y":5.25, "w":1.5},
+                {"label":"5,2", "x":1.5, "y":5.25},
+                {"label":"5,3", "x":2.5, "y":5.25, "w":1.5},
+                {"label":"5,5", "x":4, "y":5.25, "w":7},
+                {"label":"5,9", "x":11, "y":5.25, "w":1.5},
+                {"label":"5,10", "x":12.5, "y":5.25},
+                {"label":"5,11", "x":13.5, "y":5.25, "w":1.5},
+                {"label":"5,14", "x":15.25, "y":5.25},
+                {"label":"5,15", "x":16.25, "y":5.25},
+                {"label":"5,16", "x":17.25, "y":5.25}
+            ]
         }
     }
 }
diff --git a/keyboards/keebsforall/freebirdtkl/keymaps/default/keymap.c b/keyboards/keebsforall/freebirdtkl/keymaps/default/keymap.c
index dbeb08e123..16c3b4cdc9 100644
--- a/keyboards/keebsforall/freebirdtkl/keymaps/default/keymap.c
+++ b/keyboards/keebsforall/freebirdtkl/keymaps/default/keymap.c
@@ -17,12 +17,12 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
-    [0] = LAYOUT_ansi(
-        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_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_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    KC_RSFT,                                 KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT,  KC_MENU,    KC_RGUI,    KC_RCTL,   KC_LEFT, KC_DOWN, KC_RGHT
+    [0] = LAYOUT_tkl_f13_ansi(
+        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_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_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_MENU, KC_RGUI, KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
     )
 };
diff --git a/keyboards/keebsforall/freebirdtkl/keymaps/via/keymap.c b/keyboards/keebsforall/freebirdtkl/keymaps/via/keymap.c
index 6cae507d56..e96540e3ef 100644
--- a/keyboards/keebsforall/freebirdtkl/keymaps/via/keymap.c
+++ b/keyboards/keebsforall/freebirdtkl/keymaps/via/keymap.c
@@ -17,36 +17,36 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
-    [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_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_BSPC, 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_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    KC_RSFT,    KC_TRNS,                              KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_MENU, KC_RALT,  KC_RGUI,    KC_RCTL,               KC_LEFT, KC_DOWN, KC_RGHT
+    [0] = LAYOUT_tkl_f13_ansi_split_bs_rshift(
+        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_BSPC, 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_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_TRNS,                      KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_MENU, KC_RALT, KC_RGUI, KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [1] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    [1] = LAYOUT_tkl_f13_ansi_split_bs_rshift(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,             _______, _______, _______
     ),
-    [2] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    [2] = LAYOUT_tkl_f13_ansi_split_bs_rshift(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,             _______, _______, _______
     ),
-    [3] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    [3] = LAYOUT_tkl_f13_ansi_split_bs_rshift(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,             _______, _______, _______
     )
 };
diff --git a/keyboards/keebsforall/freebirdtkl/keymaps/wkl/keymap.c b/keyboards/keebsforall/freebirdtkl/keymaps/wkl/keymap.c
index 884c8c47b8..90f343f8d7 100644
--- a/keyboards/keebsforall/freebirdtkl/keymaps/wkl/keymap.c
+++ b/keyboards/keebsforall/freebirdtkl/keymaps/wkl/keymap.c
@@ -17,12 +17,12 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
-    [0] = LAYOUT_tsangan(
-        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_BSPC, 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_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    KC_RSFT,    KC_TRNS,                    KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RGUI,    KC_RCTL,           KC_LEFT, KC_DOWN, KC_RGHT
+    [0] = LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift(
+        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_BSPC, 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_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_TRNS,                      KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
     )
 };