From 2dadbbf04deac73309f740c06b9fae0c01d07f3c Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Mon, 10 Oct 2022 01:09:15 -0700
Subject: [PATCH] Vertex AngleR2 Layout Refactor (#18661)

---
 keyboards/vertex/angler2/angler2.h            | 178 +++-
 keyboards/vertex/angler2/info.json            | 821 +++++++++++++++++-
 .../vertex/angler2/keymaps/default/keymap.c   |  33 +-
 keyboards/vertex/angler2/keymaps/via/keymap.c |  72 +-
 keyboards/vertex/angler2/readme.md            |   4 +-
 5 files changed, 1022 insertions(+), 86 deletions(-)

diff --git a/keyboards/vertex/angler2/angler2.h b/keyboards/vertex/angler2/angler2.h
index 68f9d9f5aba0..04293a2fe6ce 100644
--- a/keyboards/vertex/angler2/angler2.h
+++ b/keyboards/vertex/angler2/angler2.h
@@ -19,18 +19,170 @@
 #include "quantum.h"
 
 #define XXX KC_NO
+
+/*
+ *              ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+ *              │00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D │ │0E │0F │3E │ Standard
+ *              └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+ *              ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐
+ *              │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D │ │0E │0F │3E │ F13 Row
+ *              └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘
+ *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+ *              │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     │ │1E │1F │3F │
+ *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤      ┌─────┐
+ *              │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │ │2E │2F │4D │      │     │
+ *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘   ┌──┴┐3D  │ ISO Enter
+ *  LShift      │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │                 │3C │    │
+ * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐       └───┴────┘
+ * │40      │   │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C        │     │4F │
+ * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐
+ *              │50  │51  │52  │56                      │5A  │5B  │5C  │5D  │ │5E │5F │4E │
+ *              └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+ *              ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+ *              │50   │51 │52   │56                         │5B   │5C │5D   │ Tsangan/WKL
+ *              └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ */
+
 #define LAYOUT_all( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \
-  K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C, K4D, K4F, \
-  K50, K51, K52,                K56,           K5A, K5B, K5C, K5D, K5E, K5F, K4E  \
-) { \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F}, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F}, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F}, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F}, \
-  { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F}, \
-  { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F}, \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K3E, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K3F, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K2E, K2F, K4D, \
+  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,        K4F,      \
+  K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,   K5E, K5F, K4E  \
+) { \
+  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
+  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
+  { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
+  { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F }  \
+}
+
+#define LAYOUT_tkl_ansi( \
+  K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K3E, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K3F, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K2E, K2F, K4D, \
+  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                  \
+  K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
+  K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,   K5E, K5F, K4E  \
+) { \
+  { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
+  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
+  { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
+  { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F }  \
+}
+
+#define LAYOUT_tkl_ansi_tsangan( \
+  K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K3E, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K3F, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K2E, K2F, K4D, \
+  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                  \
+  K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
+  K50, K51, K52,                K56,                     K5B, K5C, K5D,   K5E, K5F, K4E  \
+) { \
+  { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
+  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
+  { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
+  { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F }  \
+}
+
+#define LAYOUT_tkl_iso( \
+  K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K3E, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K3F, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,        K2E, K2F, K4D, \
+  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,        K4F,      \
+  K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,   K5E, K5F, K4E  \
+) { \
+  { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F }, \
+  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
+  { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
+  { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F }  \
+}
+
+#define LAYOUT_tkl_iso_tsangan( \
+  K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K3E, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K3F, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,        K2E, K2F, K4D, \
+  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,        K4F,      \
+  K50, K51, K52,                K56,                     K5B, K5C, K5D,   K5E, K5F, K4E  \
+) { \
+  { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F }, \
+  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
+  { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
+  { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F }  \
+}
+
+#define LAYOUT_tkl_f13_ansi( \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K3E, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K3F, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K2E, K2F, K4D, \
+  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                  \
+  K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
+  K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,   K5E, K5F, K4E  \
+) { \
+  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
+  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
+  { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
+  { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F }  \
+}
+
+#define LAYOUT_tkl_f13_ansi_tsangan( \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K3E, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K3F, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K2E, K2F, K4D, \
+  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                  \
+  K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
+  K50, K51, K52,                K56,                     K5B, K5C, K5D,   K5E, K5F, K4E  \
+) { \
+  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
+  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
+  { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
+  { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F }  \
+}
+
+#define LAYOUT_tkl_f13_iso( \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K3E, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K3F, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,        K2E, K2F, K4D, \
+  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,        K4F,      \
+  K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,   K5E, K5F, K4E  \
+) { \
+  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F }, \
+  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
+  { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
+  { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F }  \
+}
+
+#define LAYOUT_tkl_f13_iso_tsangan( \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K3E, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K3F, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,        K2E, K2F, K4D, \
+  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,        K4F,      \
+  K50, K51, K52,                K56,                     K5B, K5C, K5D,   K5E, K5F, K4E  \
+) { \
+  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F }, \
+  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
+  { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
+  { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F }  \
 }
diff --git a/keyboards/vertex/angler2/info.json b/keyboards/vertex/angler2/info.json
index 70feae3b648f..0580cef82ed8 100644
--- a/keyboards/vertex/angler2/info.json
+++ b/keyboards/vertex/angler2/info.json
@@ -2,12 +2,22 @@
     "keyboard_name": "Angler2",
     "manufacturer": "Vertex_eason",
     "url": "https://github.com/Vertex-kb",
-    "maintainer": "vertex",
+    "maintainer": "Vertex-kb",
     "usb": {
         "vid": "0x480E",
         "pid": "0x408F",
         "device_version": "0.0.1"
     },
+    "community_layouts": [
+        "tkl_ansi",
+        "tkl_ansi_tsangan",
+        "tkl_iso",
+        "tkl_iso_tsangan",
+        "tkl_f13_ansi",
+        "tkl_f13_ansi_tsangan",
+        "tkl_f13_iso",
+        "tkl_f13_iso_tsangan"
+    ],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
@@ -28,6 +38,7 @@
                 { "label": "K0E (F4,D0)", "x": 15.25, "y": 0 },
                 { "label": "K0F (F4,B1)", "x": 16.25, "y": 0 },
                 { "label": "K3E (D5,D0)", "x": 17.25, "y": 0 },
+
                 { "label": "K10 (B2,F5)", "x": 0, "y": 1.5 },
                 { "label": "K11 (B2,F6)", "x": 1, "y": 1.5 },
                 { "label": "K12 (B2,F7)", "x": 2, "y": 1.5 },
@@ -41,11 +52,12 @@
                 { "label": "K1A (B2,D7)", "x": 10, "y": 1.5 },
                 { "label": "K1B (B2,D6)", "x": 11, "y": 1.5 },
                 { "label": "K1C (B2,D4)", "x": 12, "y": 1.5 },
-                { "label": "K1D (B2,D3)", "x": 13, "y": 1.5,"w":2},
+                { "label": "K1D (B2,D3)", "x": 13, "y": 1.5, "w": 2 },
                 { "label": "K1E (B2,D0)", "x": 15.25, "y": 1.5 },
                 { "label": "K1F (B2,B1)", "x": 16.25, "y": 1.5 },
                 { "label": "K3F (D5,B1)", "x": 17.25, "y": 1.5 },
-                { "label": "K20 (F0,F5)", "x": 0,"y":2.5,"w":1.5},
+
+                { "label": "K20 (F0,F5)", "x": 0, "y": 2.5, "w": 1.5 },
                 { "label": "K21 (F0,F6)", "x": 1.5, "y": 2.5 },
                 { "label": "K22 (F0,F7)", "x": 2.5, "y": 2.5 },
                 { "label": "K23 (F0,E2)", "x": 3.5, "y": 2.5 },
@@ -58,14 +70,15 @@
                 { "label": "K2A (F0,D7)", "x": 10.5, "y": 2.5 },
                 { "label": "K2B (F0,D6)", "x": 11.5, "y": 2.5 },
                 { "label": "K2C (F0,D4)", "x": 12.5, "y": 2.5 },
-                { "label": "K2D (F0,D3)", "x": 13.5, "y": 2.5,"w":1.5},
+                { "label": "K2D (F0,D3)", "x": 13.5, "y": 2.5, "w": 1.5 },
                 { "label": "K2E (F0,D0)", "x": 15.25, "y": 2.5 },
                 { "label": "K2F (F0,B1)", "x": 16.25, "y": 2.5 },
                 { "label": "K4D (D1,D3)", "x": 17.25, "y": 2.5 },
-                { "label": "K30 (D5,F5)", "x": 0, "y": 3.5,"w":1.75},
+
+                { "label": "K30 (D5,F5)", "x": 0, "y": 3.5, "w": 1.75 },
                 { "label": "K31 (D5,F6)", "x": 1.75, "y": 3.5 },
                 { "label": "K32 (D5,F7)", "x": 2.75, "y": 3.5 },
-                { "label": "K33 (D5,E2)", "x": 3.75, "y": 3.5  },
+                { "label": "K33 (D5,E2)", "x": 3.75, "y": 3.5 },
                 { "label": "K34 (D5,C7)", "x": 4.75, "y": 3.5 },
                 { "label": "K35 (D5,C6)", "x": 5.75, "y": 3.5 },
                 { "label": "K36 (D5,B6)", "x": 6.75, "y": 3.5 },
@@ -75,8 +88,9 @@
                 { "label": "K3A (D5,D7)", "x": 10.75, "y": 3.5 },
                 { "label": "K3B (D5,D6)", "x": 11.75, "y": 3.5 },
                 { "label": "K3C (D5,D4)", "x": 12.75, "y": 3.5 },
-                { "label": "K3D (D5,D3)", "x": 13.75, "y": 3.5,"w":1.25 },
-                { "label": "K40 (D1,F5)", "x": 0, "y": 4.5,"w":1.25},
+                { "label": "K3D (D5,D3)", "x": 13.75, "y": 3.5, "w": 1.25 },
+
+                { "label": "K40 (D1,F5)", "x": 0, "y": 4.5, "w": 1.25 },
                 { "label": "K41 (D1,F6)", "x": 1.25, "y": 4.5 },
                 { "label": "K42 (D1,F7)", "x": 2.25, "y": 4.5 },
                 { "label": "K43 (D1,E2)", "x": 3.25, "y": 4.5 },
@@ -88,16 +102,789 @@
                 { "label": "K49 (D1,B4)", "x": 9.25, "y": 4.5 },
                 { "label": "K4A (D1,D7)", "x": 10.25, "y": 4.5 },
                 { "label": "K4B (D1,D6)", "x": 11.25, "y": 4.5 },
-                { "label": "K4C (D1,D4)", "x": 12.25, "y": 4.5,"w":2.75 },
+                { "label": "K4C (D1,D4)", "x": 12.25, "y": 4.5, "w": 2.75 },
                 { "label": "K4F (D1,B1)", "x": 16.25, "y": 4.5 },
-                { "label": "K50 (D2,F5)", "x": 0, "y": 5.5,"w":1.25 },
-                { "label": "K51 (D2,F6)", "x": 1.25, "y": 5.5,"w":1.25 },
-                { "label": "K52 (D2,F7)", "x": 2.5, "y": 5.5,"w":1.25 },
-                { "label": "K56 (D2,B6)", "x": 3.75, "y": 5.5,"w":6.25 },
-                { "label": "K5A (D2,D7)", "x": 10, "y": 5.5,"w":1.25 },
-                { "label": "K5B (D2,D6)", "x": 11.25, "y": 5.5,"w":1.25 },
-                { "label": "K5C (D2,D4)", "x": 12.5, "y": 5.5,"w":1.25 },
-                { "label": "K5D (D2,D3)", "x": 13.75, "y": 5.5,"w":1.25 },
+
+                { "label": "K50 (D2,F5)", "x": 0, "y": 5.5, "w": 1.25 },
+                { "label": "K51 (D2,F6)", "x": 1.25, "y": 5.5, "w": 1.25 },
+                { "label": "K52 (D2,F7)", "x": 2.5, "y": 5.5, "w": 1.25 },
+                { "label": "K56 (D2,B6)", "x": 3.75, "y": 5.5, "w": 6.25 },
+                { "label": "K5A (D2,D7)", "x": 10, "y": 5.5, "w": 1.25 },
+                { "label": "K5B (D2,D6)", "x": 11.25, "y": 5.5, "w": 1.25 },
+                { "label": "K5C (D2,D4)", "x": 12.5, "y": 5.5, "w": 1.25 },
+                { "label": "K5D (D2,D3)", "x": 13.75, "y": 5.5, "w": 1.25 },
+                { "label": "K5E (D2,D0)", "x": 15.25, "y": 5.5 },
+                { "label": "K5F (D2,B1)", "x": 16.25, "y": 5.5 },
+                { "label": "K4E (D1,D0)", "x": 17.25, "y": 5.5 }
+            ]
+        },
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                { "label": "K00 (F4,F5)", "x": 0, "y": 0 },
+                { "label": "K02 (F4,F7)", "x": 2, "y": 0 },
+                { "label": "K03 (F4,E2)", "x": 3, "y": 0 },
+                { "label": "K04 (F4,C7)", "x": 4, "y": 0 },
+                { "label": "K05 (F4,C6)", "x": 5, "y": 0 },
+                { "label": "K06 (F4,B6)", "x": 6.5, "y": 0 },
+                { "label": "K07 (F4,F1)", "x": 7.5, "y": 0 },
+                { "label": "K08 (F4,B5)", "x": 8.5, "y": 0 },
+                { "label": "K09 (F4,B4)", "x": 9.5, "y": 0 },
+                { "label": "K0A (F4,D7)", "x": 11, "y": 0 },
+                { "label": "K0B (F4,D6)", "x": 12, "y": 0 },
+                { "label": "K0C (F4,D4)", "x": 13, "y": 0 },
+                { "label": "K0D (F4,B1)", "x": 14, "y": 0 },
+                { "label": "K0E (F4,D0)", "x": 15.25, "y": 0 },
+                { "label": "K0F (F4,B1)", "x": 16.25, "y": 0 },
+                { "label": "K3E (D5,D0)", "x": 17.25, "y": 0 },
+
+                { "label": "K10 (B2,F5)", "x": 0, "y": 1.5 },
+                { "label": "K11 (B2,F6)", "x": 1, "y": 1.5 },
+                { "label": "K12 (B2,F7)", "x": 2, "y": 1.5 },
+                { "label": "K13 (B2,E2)", "x": 3, "y": 1.5 },
+                { "label": "K14 (B2,C7)", "x": 4, "y": 1.5 },
+                { "label": "K15 (B2,C6)", "x": 5, "y": 1.5 },
+                { "label": "K16 (B2,B6)", "x": 6, "y": 1.5 },
+                { "label": "K17 (B2,F1)", "x": 7, "y": 1.5 },
+                { "label": "K18 (B2,B5)", "x": 8, "y": 1.5 },
+                { "label": "K19 (B2,B4)", "x": 9, "y": 1.5 },
+                { "label": "K1A (B2,D7)", "x": 10, "y": 1.5 },
+                { "label": "K1B (B2,D6)", "x": 11, "y": 1.5 },
+                { "label": "K1C (B2,D4)", "x": 12, "y": 1.5 },
+                { "label": "K1D (B2,D3)", "x": 13, "y": 1.5, "w": 2 },
+                { "label": "K1E (B2,D0)", "x": 15.25, "y": 1.5 },
+                { "label": "K1F (B2,B1)", "x": 16.25, "y": 1.5 },
+                { "label": "K3F (D5,B1)", "x": 17.25, "y": 1.5 },
+
+                { "label": "K20 (F0,F5)", "x": 0, "y": 2.5, "w": 1.5 },
+                { "label": "K21 (F0,F6)", "x": 1.5, "y": 2.5 },
+                { "label": "K22 (F0,F7)", "x": 2.5, "y": 2.5 },
+                { "label": "K23 (F0,E2)", "x": 3.5, "y": 2.5 },
+                { "label": "K24 (F0,C7)", "x": 4.5, "y": 2.5 },
+                { "label": "K25 (F0,C6)", "x": 5.5, "y": 2.5 },
+                { "label": "K26 (F0,B6)", "x": 6.5, "y": 2.5 },
+                { "label": "K27 (F0,F1)", "x": 7.5, "y": 2.5 },
+                { "label": "K28 (F0,B5)", "x": 8.5, "y": 2.5 },
+                { "label": "K29 (F0,B4)", "x": 9.5, "y": 2.5 },
+                { "label": "K2A (F0,D7)", "x": 10.5, "y": 2.5 },
+                { "label": "K2B (F0,D6)", "x": 11.5, "y": 2.5 },
+                { "label": "K2C (F0,D4)", "x": 12.5, "y": 2.5 },
+                { "label": "K2D (F0,D3)", "x": 13.5, "y": 2.5, "w": 1.5 },
+                { "label": "K2E (F0,D0)", "x": 15.25, "y": 2.5 },
+                { "label": "K2F (F0,B1)", "x": 16.25, "y": 2.5 },
+                { "label": "K4D (D1,D3)", "x": 17.25, "y": 2.5 },
+
+                { "label": "K30 (D5,F5)", "x": 0, "y": 3.5, "w": 1.75 },
+                { "label": "K31 (D5,F6)", "x": 1.75, "y": 3.5 },
+                { "label": "K32 (D5,F7)", "x": 2.75, "y": 3.5 },
+                { "label": "K33 (D5,E2)", "x": 3.75, "y": 3.5 },
+                { "label": "K34 (D5,C7)", "x": 4.75, "y": 3.5 },
+                { "label": "K35 (D5,C6)", "x": 5.75, "y": 3.5 },
+                { "label": "K36 (D5,B6)", "x": 6.75, "y": 3.5 },
+                { "label": "K37 (D5,F1)", "x": 7.75, "y": 3.5 },
+                { "label": "K38 (D5,B5)", "x": 8.75, "y": 3.5 },
+                { "label": "K39 (D5,B4)", "x": 9.75, "y": 3.5 },
+                { "label": "K3A (D5,D7)", "x": 10.75, "y": 3.5 },
+                { "label": "K3B (D5,D6)", "x": 11.75, "y": 3.5 },
+                { "label": "K3D (D5,D3)", "x": 12.75, "y": 3.5, "w": 2.25 },
+
+                { "label": "K40 (D1,F5)", "x": 0, "y": 4.5, "w": 2.25 },
+                { "label": "K42 (D1,F7)", "x": 2.25, "y": 4.5 },
+                { "label": "K43 (D1,E2)", "x": 3.25, "y": 4.5 },
+                { "label": "K44 (D1,C7)", "x": 4.25, "y": 4.5 },
+                { "label": "K45 (D1,C6)", "x": 5.25, "y": 4.5 },
+                { "label": "K46 (D1,B6)", "x": 6.25, "y": 4.5 },
+                { "label": "K47 (D1,F1)", "x": 7.25, "y": 4.5 },
+                { "label": "K48 (D1,B5)", "x": 8.25, "y": 4.5 },
+                { "label": "K49 (D1,B4)", "x": 9.25, "y": 4.5 },
+                { "label": "K4A (D1,D7)", "x": 10.25, "y": 4.5 },
+                { "label": "K4B (D1,D6)", "x": 11.25, "y": 4.5 },
+                { "label": "K4C (D1,D4)", "x": 12.25, "y": 4.5, "w": 2.75 },
+                { "label": "K4F (D1,B1)", "x": 16.25, "y": 4.5 },
+
+                { "label": "K50 (D2,F5)", "x": 0, "y": 5.5, "w": 1.25 },
+                { "label": "K51 (D2,F6)", "x": 1.25, "y": 5.5, "w": 1.25 },
+                { "label": "K52 (D2,F7)", "x": 2.5, "y": 5.5, "w": 1.25 },
+                { "label": "K56 (D2,B6)", "x": 3.75, "y": 5.5, "w": 6.25 },
+                { "label": "K5A (D2,D7)", "x": 10, "y": 5.5, "w": 1.25 },
+                { "label": "K5B (D2,D6)", "x": 11.25, "y": 5.5, "w": 1.25 },
+                { "label": "K5C (D2,D4)", "x": 12.5, "y": 5.5, "w": 1.25 },
+                { "label": "K5D (D2,D3)", "x": 13.75, "y": 5.5, "w": 1.25 },
+                { "label": "K5E (D2,D0)", "x": 15.25, "y": 5.5 },
+                { "label": "K5F (D2,B1)", "x": 16.25, "y": 5.5 },
+                { "label": "K4E (D1,D0)", "x": 17.25, "y": 5.5 }
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                { "label": "K00 (F4,F5)", "x": 0, "y": 0 },
+                { "label": "K02 (F4,F7)", "x": 2, "y": 0 },
+                { "label": "K03 (F4,E2)", "x": 3, "y": 0 },
+                { "label": "K04 (F4,C7)", "x": 4, "y": 0 },
+                { "label": "K05 (F4,C6)", "x": 5, "y": 0 },
+                { "label": "K06 (F4,B6)", "x": 6.5, "y": 0 },
+                { "label": "K07 (F4,F1)", "x": 7.5, "y": 0 },
+                { "label": "K08 (F4,B5)", "x": 8.5, "y": 0 },
+                { "label": "K09 (F4,B4)", "x": 9.5, "y": 0 },
+                { "label": "K0A (F4,D7)", "x": 11, "y": 0 },
+                { "label": "K0B (F4,D6)", "x": 12, "y": 0 },
+                { "label": "K0C (F4,D4)", "x": 13, "y": 0 },
+                { "label": "K0D (F4,B1)", "x": 14, "y": 0 },
+                { "label": "K0E (F4,D0)", "x": 15.25, "y": 0 },
+                { "label": "K0F (F4,B1)", "x": 16.25, "y": 0 },
+                { "label": "K3E (D5,D0)", "x": 17.25, "y": 0 },
+
+                { "label": "K10 (B2,F5)", "x": 0, "y": 1.5 },
+                { "label": "K11 (B2,F6)", "x": 1, "y": 1.5 },
+                { "label": "K12 (B2,F7)", "x": 2, "y": 1.5 },
+                { "label": "K13 (B2,E2)", "x": 3, "y": 1.5 },
+                { "label": "K14 (B2,C7)", "x": 4, "y": 1.5 },
+                { "label": "K15 (B2,C6)", "x": 5, "y": 1.5 },
+                { "label": "K16 (B2,B6)", "x": 6, "y": 1.5 },
+                { "label": "K17 (B2,F1)", "x": 7, "y": 1.5 },
+                { "label": "K18 (B2,B5)", "x": 8, "y": 1.5 },
+                { "label": "K19 (B2,B4)", "x": 9, "y": 1.5 },
+                { "label": "K1A (B2,D7)", "x": 10, "y": 1.5 },
+                { "label": "K1B (B2,D6)", "x": 11, "y": 1.5 },
+                { "label": "K1C (B2,D4)", "x": 12, "y": 1.5 },
+                { "label": "K1D (B2,D3)", "x": 13, "y": 1.5, "w": 2 },
+                { "label": "K1E (B2,D0)", "x": 15.25, "y": 1.5 },
+                { "label": "K1F (B2,B1)", "x": 16.25, "y": 1.5 },
+                { "label": "K3F (D5,B1)", "x": 17.25, "y": 1.5 },
+
+                { "label": "K20 (F0,F5)", "x": 0, "y": 2.5, "w": 1.5 },
+                { "label": "K21 (F0,F6)", "x": 1.5, "y": 2.5 },
+                { "label": "K22 (F0,F7)", "x": 2.5, "y": 2.5 },
+                { "label": "K23 (F0,E2)", "x": 3.5, "y": 2.5 },
+                { "label": "K24 (F0,C7)", "x": 4.5, "y": 2.5 },
+                { "label": "K25 (F0,C6)", "x": 5.5, "y": 2.5 },
+                { "label": "K26 (F0,B6)", "x": 6.5, "y": 2.5 },
+                { "label": "K27 (F0,F1)", "x": 7.5, "y": 2.5 },
+                { "label": "K28 (F0,B5)", "x": 8.5, "y": 2.5 },
+                { "label": "K29 (F0,B4)", "x": 9.5, "y": 2.5 },
+                { "label": "K2A (F0,D7)", "x": 10.5, "y": 2.5 },
+                { "label": "K2B (F0,D6)", "x": 11.5, "y": 2.5 },
+                { "label": "K2C (F0,D4)", "x": 12.5, "y": 2.5 },
+                { "label": "K2D (F0,D3)", "x": 13.5, "y": 2.5, "w": 1.5 },
+                { "label": "K2E (F0,D0)", "x": 15.25, "y": 2.5 },
+                { "label": "K2F (F0,B1)", "x": 16.25, "y": 2.5 },
+                { "label": "K4D (D1,D3)", "x": 17.25, "y": 2.5 },
+
+                { "label": "K30 (D5,F5)", "x": 0, "y": 3.5, "w": 1.75 },
+                { "label": "K31 (D5,F6)", "x": 1.75, "y": 3.5 },
+                { "label": "K32 (D5,F7)", "x": 2.75, "y": 3.5 },
+                { "label": "K33 (D5,E2)", "x": 3.75, "y": 3.5 },
+                { "label": "K34 (D5,C7)", "x": 4.75, "y": 3.5 },
+                { "label": "K35 (D5,C6)", "x": 5.75, "y": 3.5 },
+                { "label": "K36 (D5,B6)", "x": 6.75, "y": 3.5 },
+                { "label": "K37 (D5,F1)", "x": 7.75, "y": 3.5 },
+                { "label": "K38 (D5,B5)", "x": 8.75, "y": 3.5 },
+                { "label": "K39 (D5,B4)", "x": 9.75, "y": 3.5 },
+                { "label": "K3A (D5,D7)", "x": 10.75, "y": 3.5 },
+                { "label": "K3B (D5,D6)", "x": 11.75, "y": 3.5 },
+                { "label": "K3D (D5,D3)", "x": 12.75, "y": 3.5, "w": 2.25 },
+
+                { "label": "K40 (D1,F5)", "x": 0, "y": 4.5, "w": 2.25 },
+                { "label": "K42 (D1,F7)", "x": 2.25, "y": 4.5 },
+                { "label": "K43 (D1,E2)", "x": 3.25, "y": 4.5 },
+                { "label": "K44 (D1,C7)", "x": 4.25, "y": 4.5 },
+                { "label": "K45 (D1,C6)", "x": 5.25, "y": 4.5 },
+                { "label": "K46 (D1,B6)", "x": 6.25, "y": 4.5 },
+                { "label": "K47 (D1,F1)", "x": 7.25, "y": 4.5 },
+                { "label": "K48 (D1,B5)", "x": 8.25, "y": 4.5 },
+                { "label": "K49 (D1,B4)", "x": 9.25, "y": 4.5 },
+                { "label": "K4A (D1,D7)", "x": 10.25, "y": 4.5 },
+                { "label": "K4B (D1,D6)", "x": 11.25, "y": 4.5 },
+                { "label": "K4C (D1,D4)", "x": 12.25, "y": 4.5, "w": 2.75 },
+                { "label": "K4F (D1,B1)", "x": 16.25, "y": 4.5 },
+
+                { "label": "K50 (D2,F5)", "x": 0, "y": 5.5, "w": 1.5 },
+                { "label": "K51 (D2,F6)", "x": 1.5, "y": 5.5 },
+                { "label": "K52 (D2,F7)", "x": 2.5, "y": 5.5, "w": 1.5 },
+                { "label": "K56 (D2,B6)", "x": 4, "y": 5.5, "w": 7 },
+                { "label": "K5B (D2,D6)", "x": 11, "y": 5.5, "w": 1.5 },
+                { "label": "K5C (D2,D4)", "x": 12.5, "y": 5.5 },
+                { "label": "K5D (D2,D3)", "x": 13.5, "y": 5.5, "w": 1.5 },
+                { "label": "K5E (D2,D0)", "x": 15.25, "y": 5.5 },
+                { "label": "K5F (D2,B1)", "x": 16.25, "y": 5.5 },
+                { "label": "K4E (D1,D0)", "x": 17.25, "y": 5.5 }
+            ]
+        },
+        "LAYOUT_tkl_iso": {
+            "layout": [
+                { "label": "K00 (F4,F5)", "x": 0, "y": 0 },
+                { "label": "K02 (F4,F7)", "x": 2, "y": 0 },
+                { "label": "K03 (F4,E2)", "x": 3, "y": 0 },
+                { "label": "K04 (F4,C7)", "x": 4, "y": 0 },
+                { "label": "K05 (F4,C6)", "x": 5, "y": 0 },
+                { "label": "K06 (F4,B6)", "x": 6.5, "y": 0 },
+                { "label": "K07 (F4,F1)", "x": 7.5, "y": 0 },
+                { "label": "K08 (F4,B5)", "x": 8.5, "y": 0 },
+                { "label": "K09 (F4,B4)", "x": 9.5, "y": 0 },
+                { "label": "K0A (F4,D7)", "x": 11, "y": 0 },
+                { "label": "K0B (F4,D6)", "x": 12, "y": 0 },
+                { "label": "K0C (F4,D4)", "x": 13, "y": 0 },
+                { "label": "K0D (F4,B1)", "x": 14, "y": 0 },
+                { "label": "K0E (F4,D0)", "x": 15.25, "y": 0 },
+                { "label": "K0F (F4,B1)", "x": 16.25, "y": 0 },
+                { "label": "K3E (D5,D0)", "x": 17.25, "y": 0 },
+
+                { "label": "K10 (B2,F5)", "x": 0, "y": 1.5 },
+                { "label": "K11 (B2,F6)", "x": 1, "y": 1.5 },
+                { "label": "K12 (B2,F7)", "x": 2, "y": 1.5 },
+                { "label": "K13 (B2,E2)", "x": 3, "y": 1.5 },
+                { "label": "K14 (B2,C7)", "x": 4, "y": 1.5 },
+                { "label": "K15 (B2,C6)", "x": 5, "y": 1.5 },
+                { "label": "K16 (B2,B6)", "x": 6, "y": 1.5 },
+                { "label": "K17 (B2,F1)", "x": 7, "y": 1.5 },
+                { "label": "K18 (B2,B5)", "x": 8, "y": 1.5 },
+                { "label": "K19 (B2,B4)", "x": 9, "y": 1.5 },
+                { "label": "K1A (B2,D7)", "x": 10, "y": 1.5 },
+                { "label": "K1B (B2,D6)", "x": 11, "y": 1.5 },
+                { "label": "K1C (B2,D4)", "x": 12, "y": 1.5 },
+                { "label": "K1D (B2,D3)", "x": 13, "y": 1.5, "w": 2 },
+                { "label": "K1E (B2,D0)", "x": 15.25, "y": 1.5 },
+                { "label": "K1F (B2,B1)", "x": 16.25, "y": 1.5 },
+                { "label": "K3F (D5,B1)", "x": 17.25, "y": 1.5 },
+
+                { "label": "K20 (F0,F5)", "x": 0, "y": 2.5, "w": 1.5 },
+                { "label": "K21 (F0,F6)", "x": 1.5, "y": 2.5 },
+                { "label": "K22 (F0,F7)", "x": 2.5, "y": 2.5 },
+                { "label": "K23 (F0,E2)", "x": 3.5, "y": 2.5 },
+                { "label": "K24 (F0,C7)", "x": 4.5, "y": 2.5 },
+                { "label": "K25 (F0,C6)", "x": 5.5, "y": 2.5 },
+                { "label": "K26 (F0,B6)", "x": 6.5, "y": 2.5 },
+                { "label": "K27 (F0,F1)", "x": 7.5, "y": 2.5 },
+                { "label": "K28 (F0,B5)", "x": 8.5, "y": 2.5 },
+                { "label": "K29 (F0,B4)", "x": 9.5, "y": 2.5 },
+                { "label": "K2A (F0,D7)", "x": 10.5, "y": 2.5 },
+                { "label": "K2B (F0,D6)", "x": 11.5, "y": 2.5 },
+                { "label": "K2C (F0,D4)", "x": 12.5, "y": 2.5 },
+                { "label": "K2E (F0,D0)", "x": 15.25, "y": 2.5 },
+                { "label": "K2F (F0,B1)", "x": 16.25, "y": 2.5 },
+                { "label": "K4D (D1,D3)", "x": 17.25, "y": 2.5 },
+
+                { "label": "K30 (D5,F5)", "x": 0, "y": 3.5, "w": 1.75 },
+                { "label": "K31 (D5,F6)", "x": 1.75, "y": 3.5 },
+                { "label": "K32 (D5,F7)", "x": 2.75, "y": 3.5 },
+                { "label": "K33 (D5,E2)", "x": 3.75, "y": 3.5 },
+                { "label": "K34 (D5,C7)", "x": 4.75, "y": 3.5 },
+                { "label": "K35 (D5,C6)", "x": 5.75, "y": 3.5 },
+                { "label": "K36 (D5,B6)", "x": 6.75, "y": 3.5 },
+                { "label": "K37 (D5,F1)", "x": 7.75, "y": 3.5 },
+                { "label": "K38 (D5,B5)", "x": 8.75, "y": 3.5 },
+                { "label": "K39 (D5,B4)", "x": 9.75, "y": 3.5 },
+                { "label": "K3A (D5,D7)", "x": 10.75, "y": 3.5 },
+                { "label": "K3B (D5,D6)", "x": 11.75, "y": 3.5 },
+                { "label": "K3C (D5,D4)", "x": 12.75, "y": 3.5 },
+                { "label": "K3D (D5,D3)", "x": 13.75, "y": 2.5, "w": 1.25, "h": 2 },
+
+                { "label": "K40 (D1,F5)", "x": 0, "y": 4.5, "w": 1.25 },
+                { "label": "K41 (D1,F6)", "x": 1.25, "y": 4.5 },
+                { "label": "K42 (D1,F7)", "x": 2.25, "y": 4.5 },
+                { "label": "K43 (D1,E2)", "x": 3.25, "y": 4.5 },
+                { "label": "K44 (D1,C7)", "x": 4.25, "y": 4.5 },
+                { "label": "K45 (D1,C6)", "x": 5.25, "y": 4.5 },
+                { "label": "K46 (D1,B6)", "x": 6.25, "y": 4.5 },
+                { "label": "K47 (D1,F1)", "x": 7.25, "y": 4.5 },
+                { "label": "K48 (D1,B5)", "x": 8.25, "y": 4.5 },
+                { "label": "K49 (D1,B4)", "x": 9.25, "y": 4.5 },
+                { "label": "K4A (D1,D7)", "x": 10.25, "y": 4.5 },
+                { "label": "K4B (D1,D6)", "x": 11.25, "y": 4.5 },
+                { "label": "K4C (D1,D4)", "x": 12.25, "y": 4.5, "w": 2.75 },
+                { "label": "K4F (D1,B1)", "x": 16.25, "y": 4.5 },
+
+                { "label": "K50 (D2,F5)", "x": 0, "y": 5.5, "w": 1.25 },
+                { "label": "K51 (D2,F6)", "x": 1.25, "y": 5.5, "w": 1.25 },
+                { "label": "K52 (D2,F7)", "x": 2.5, "y": 5.5, "w": 1.25 },
+                { "label": "K56 (D2,B6)", "x": 3.75, "y": 5.5, "w": 6.25 },
+                { "label": "K5A (D2,D7)", "x": 10, "y": 5.5, "w": 1.25 },
+                { "label": "K5B (D2,D6)", "x": 11.25, "y": 5.5, "w": 1.25 },
+                { "label": "K5C (D2,D4)", "x": 12.5, "y": 5.5, "w": 1.25 },
+                { "label": "K5D (D2,D3)", "x": 13.75, "y": 5.5, "w": 1.25 },
+                { "label": "K5E (D2,D0)", "x": 15.25, "y": 5.5 },
+                { "label": "K5F (D2,B1)", "x": 16.25, "y": 5.5 },
+                { "label": "K4E (D1,D0)", "x": 17.25, "y": 5.5 }
+            ]
+        },
+        "LAYOUT_tkl_iso_tsangan": {
+            "layout": [
+                { "label": "K00 (F4,F5)", "x": 0, "y": 0 },
+                { "label": "K02 (F4,F7)", "x": 2, "y": 0 },
+                { "label": "K03 (F4,E2)", "x": 3, "y": 0 },
+                { "label": "K04 (F4,C7)", "x": 4, "y": 0 },
+                { "label": "K05 (F4,C6)", "x": 5, "y": 0 },
+                { "label": "K06 (F4,B6)", "x": 6.5, "y": 0 },
+                { "label": "K07 (F4,F1)", "x": 7.5, "y": 0 },
+                { "label": "K08 (F4,B5)", "x": 8.5, "y": 0 },
+                { "label": "K09 (F4,B4)", "x": 9.5, "y": 0 },
+                { "label": "K0A (F4,D7)", "x": 11, "y": 0 },
+                { "label": "K0B (F4,D6)", "x": 12, "y": 0 },
+                { "label": "K0C (F4,D4)", "x": 13, "y": 0 },
+                { "label": "K0D (F4,B1)", "x": 14, "y": 0 },
+                { "label": "K0E (F4,D0)", "x": 15.25, "y": 0 },
+                { "label": "K0F (F4,B1)", "x": 16.25, "y": 0 },
+                { "label": "K3E (D5,D0)", "x": 17.25, "y": 0 },
+
+                { "label": "K10 (B2,F5)", "x": 0, "y": 1.5 },
+                { "label": "K11 (B2,F6)", "x": 1, "y": 1.5 },
+                { "label": "K12 (B2,F7)", "x": 2, "y": 1.5 },
+                { "label": "K13 (B2,E2)", "x": 3, "y": 1.5 },
+                { "label": "K14 (B2,C7)", "x": 4, "y": 1.5 },
+                { "label": "K15 (B2,C6)", "x": 5, "y": 1.5 },
+                { "label": "K16 (B2,B6)", "x": 6, "y": 1.5 },
+                { "label": "K17 (B2,F1)", "x": 7, "y": 1.5 },
+                { "label": "K18 (B2,B5)", "x": 8, "y": 1.5 },
+                { "label": "K19 (B2,B4)", "x": 9, "y": 1.5 },
+                { "label": "K1A (B2,D7)", "x": 10, "y": 1.5 },
+                { "label": "K1B (B2,D6)", "x": 11, "y": 1.5 },
+                { "label": "K1C (B2,D4)", "x": 12, "y": 1.5 },
+                { "label": "K1D (B2,D3)", "x": 13, "y": 1.5, "w": 2 },
+                { "label": "K1E (B2,D0)", "x": 15.25, "y": 1.5 },
+                { "label": "K1F (B2,B1)", "x": 16.25, "y": 1.5 },
+                { "label": "K3F (D5,B1)", "x": 17.25, "y": 1.5 },
+
+                { "label": "K20 (F0,F5)", "x": 0, "y": 2.5, "w": 1.5 },
+                { "label": "K21 (F0,F6)", "x": 1.5, "y": 2.5 },
+                { "label": "K22 (F0,F7)", "x": 2.5, "y": 2.5 },
+                { "label": "K23 (F0,E2)", "x": 3.5, "y": 2.5 },
+                { "label": "K24 (F0,C7)", "x": 4.5, "y": 2.5 },
+                { "label": "K25 (F0,C6)", "x": 5.5, "y": 2.5 },
+                { "label": "K26 (F0,B6)", "x": 6.5, "y": 2.5 },
+                { "label": "K27 (F0,F1)", "x": 7.5, "y": 2.5 },
+                { "label": "K28 (F0,B5)", "x": 8.5, "y": 2.5 },
+                { "label": "K29 (F0,B4)", "x": 9.5, "y": 2.5 },
+                { "label": "K2A (F0,D7)", "x": 10.5, "y": 2.5 },
+                { "label": "K2B (F0,D6)", "x": 11.5, "y": 2.5 },
+                { "label": "K2C (F0,D4)", "x": 12.5, "y": 2.5 },
+                { "label": "K2E (F0,D0)", "x": 15.25, "y": 2.5 },
+                { "label": "K2F (F0,B1)", "x": 16.25, "y": 2.5 },
+                { "label": "K4D (D1,D3)", "x": 17.25, "y": 2.5 },
+
+                { "label": "K30 (D5,F5)", "x": 0, "y": 3.5, "w": 1.75 },
+                { "label": "K31 (D5,F6)", "x": 1.75, "y": 3.5 },
+                { "label": "K32 (D5,F7)", "x": 2.75, "y": 3.5 },
+                { "label": "K33 (D5,E2)", "x": 3.75, "y": 3.5 },
+                { "label": "K34 (D5,C7)", "x": 4.75, "y": 3.5 },
+                { "label": "K35 (D5,C6)", "x": 5.75, "y": 3.5 },
+                { "label": "K36 (D5,B6)", "x": 6.75, "y": 3.5 },
+                { "label": "K37 (D5,F1)", "x": 7.75, "y": 3.5 },
+                { "label": "K38 (D5,B5)", "x": 8.75, "y": 3.5 },
+                { "label": "K39 (D5,B4)", "x": 9.75, "y": 3.5 },
+                { "label": "K3A (D5,D7)", "x": 10.75, "y": 3.5 },
+                { "label": "K3B (D5,D6)", "x": 11.75, "y": 3.5 },
+                { "label": "K3C (D5,D4)", "x": 12.75, "y": 3.5 },
+                { "label": "K3D (D5,D3)", "x": 13.75, "y": 2.5, "w": 1.25, "h": 2 },
+
+                { "label": "K40 (D1,F5)", "x": 0, "y": 4.5, "w": 1.25 },
+                { "label": "K41 (D1,F6)", "x": 1.25, "y": 4.5 },
+                { "label": "K42 (D1,F7)", "x": 2.25, "y": 4.5 },
+                { "label": "K43 (D1,E2)", "x": 3.25, "y": 4.5 },
+                { "label": "K44 (D1,C7)", "x": 4.25, "y": 4.5 },
+                { "label": "K45 (D1,C6)", "x": 5.25, "y": 4.5 },
+                { "label": "K46 (D1,B6)", "x": 6.25, "y": 4.5 },
+                { "label": "K47 (D1,F1)", "x": 7.25, "y": 4.5 },
+                { "label": "K48 (D1,B5)", "x": 8.25, "y": 4.5 },
+                { "label": "K49 (D1,B4)", "x": 9.25, "y": 4.5 },
+                { "label": "K4A (D1,D7)", "x": 10.25, "y": 4.5 },
+                { "label": "K4B (D1,D6)", "x": 11.25, "y": 4.5 },
+                { "label": "K4C (D1,D4)", "x": 12.25, "y": 4.5, "w": 2.75 },
+                { "label": "K4F (D1,B1)", "x": 16.25, "y": 4.5 },
+
+                { "label": "K50 (D2,F5)", "x": 0, "y": 5.5, "w": 1.5 },
+                { "label": "K51 (D2,F6)", "x": 1.5, "y": 5.5 },
+                { "label": "K52 (D2,F7)", "x": 2.5, "y": 5.5, "w": 1.5 },
+                { "label": "K56 (D2,B6)", "x": 4, "y": 5.5, "w": 7 },
+                { "label": "K5B (D2,D6)", "x": 11, "y": 5.5, "w": 1.5 },
+                { "label": "K5C (D2,D4)", "x": 12.5, "y": 5.5 },
+                { "label": "K5D (D2,D3)", "x": 13.5, "y": 5.5, "w": 1.5 },
+                { "label": "K5E (D2,D0)", "x": 15.25, "y": 5.5 },
+                { "label": "K5F (D2,B1)", "x": 16.25, "y": 5.5 },
+                { "label": "K4E (D1,D0)", "x": 17.25, "y": 5.5 }
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi": {
+            "layout": [
+                { "label": "K00 (F4,F5)", "x": 0, "y": 0 },
+                { "label": "K01 (F4,F6)", "x": 1.25, "y": 0 },
+                { "label": "K02 (F4,F7)", "x": 2.25, "y": 0 },
+                { "label": "K03 (F4,E2)", "x": 3.25, "y": 0 },
+                { "label": "K04 (F4,C7)", "x": 4.25, "y": 0 },
+                { "label": "K05 (F4,C6)", "x": 5.5, "y": 0 },
+                { "label": "K06 (F4,B6)", "x": 6.5, "y": 0 },
+                { "label": "K07 (F4,F1)", "x": 7.5, "y": 0 },
+                { "label": "K08 (F4,B5)", "x": 8.5, "y": 0 },
+                { "label": "K09 (F4,B4)", "x": 9.75, "y": 0 },
+                { "label": "K0A (F4,D7)", "x": 10.75, "y": 0 },
+                { "label": "K0B (F4,D6)", "x": 11.75, "y": 0 },
+                { "label": "K0C (F4,D4)", "x": 12.75, "y": 0 },
+                { "label": "K0D (F4,B1)", "x": 14, "y": 0 },
+                { "label": "K0E (F4,D0)", "x": 15.25, "y": 0 },
+                { "label": "K0F (F4,B1)", "x": 16.25, "y": 0 },
+                { "label": "K3E (D5,D0)", "x": 17.25, "y": 0 },
+
+                { "label": "K10 (B2,F5)", "x": 0, "y": 1.5 },
+                { "label": "K11 (B2,F6)", "x": 1, "y": 1.5 },
+                { "label": "K12 (B2,F7)", "x": 2, "y": 1.5 },
+                { "label": "K13 (B2,E2)", "x": 3, "y": 1.5 },
+                { "label": "K14 (B2,C7)", "x": 4, "y": 1.5 },
+                { "label": "K15 (B2,C6)", "x": 5, "y": 1.5 },
+                { "label": "K16 (B2,B6)", "x": 6, "y": 1.5 },
+                { "label": "K17 (B2,F1)", "x": 7, "y": 1.5 },
+                { "label": "K18 (B2,B5)", "x": 8, "y": 1.5 },
+                { "label": "K19 (B2,B4)", "x": 9, "y": 1.5 },
+                { "label": "K1A (B2,D7)", "x": 10, "y": 1.5 },
+                { "label": "K1B (B2,D6)", "x": 11, "y": 1.5 },
+                { "label": "K1C (B2,D4)", "x": 12, "y": 1.5 },
+                { "label": "K1D (B2,D3)", "x": 13, "y": 1.5, "w": 2 },
+                { "label": "K1E (B2,D0)", "x": 15.25, "y": 1.5 },
+                { "label": "K1F (B2,B1)", "x": 16.25, "y": 1.5 },
+                { "label": "K3F (D5,B1)", "x": 17.25, "y": 1.5 },
+
+                { "label": "K20 (F0,F5)", "x": 0, "y": 2.5, "w": 1.5 },
+                { "label": "K21 (F0,F6)", "x": 1.5, "y": 2.5 },
+                { "label": "K22 (F0,F7)", "x": 2.5, "y": 2.5 },
+                { "label": "K23 (F0,E2)", "x": 3.5, "y": 2.5 },
+                { "label": "K24 (F0,C7)", "x": 4.5, "y": 2.5 },
+                { "label": "K25 (F0,C6)", "x": 5.5, "y": 2.5 },
+                { "label": "K26 (F0,B6)", "x": 6.5, "y": 2.5 },
+                { "label": "K27 (F0,F1)", "x": 7.5, "y": 2.5 },
+                { "label": "K28 (F0,B5)", "x": 8.5, "y": 2.5 },
+                { "label": "K29 (F0,B4)", "x": 9.5, "y": 2.5 },
+                { "label": "K2A (F0,D7)", "x": 10.5, "y": 2.5 },
+                { "label": "K2B (F0,D6)", "x": 11.5, "y": 2.5 },
+                { "label": "K2C (F0,D4)", "x": 12.5, "y": 2.5 },
+                { "label": "K2D (F0,D3)", "x": 13.5, "y": 2.5, "w": 1.5 },
+                { "label": "K2E (F0,D0)", "x": 15.25, "y": 2.5 },
+                { "label": "K2F (F0,B1)", "x": 16.25, "y": 2.5 },
+                { "label": "K4D (D1,D3)", "x": 17.25, "y": 2.5 },
+
+                { "label": "K30 (D5,F5)", "x": 0, "y": 3.5, "w": 1.75 },
+                { "label": "K31 (D5,F6)", "x": 1.75, "y": 3.5 },
+                { "label": "K32 (D5,F7)", "x": 2.75, "y": 3.5 },
+                { "label": "K33 (D5,E2)", "x": 3.75, "y": 3.5 },
+                { "label": "K34 (D5,C7)", "x": 4.75, "y": 3.5 },
+                { "label": "K35 (D5,C6)", "x": 5.75, "y": 3.5 },
+                { "label": "K36 (D5,B6)", "x": 6.75, "y": 3.5 },
+                { "label": "K37 (D5,F1)", "x": 7.75, "y": 3.5 },
+                { "label": "K38 (D5,B5)", "x": 8.75, "y": 3.5 },
+                { "label": "K39 (D5,B4)", "x": 9.75, "y": 3.5 },
+                { "label": "K3A (D5,D7)", "x": 10.75, "y": 3.5 },
+                { "label": "K3B (D5,D6)", "x": 11.75, "y": 3.5 },
+                { "label": "K3D (D5,D3)", "x": 12.75, "y": 3.5, "w": 2.25 },
+
+                { "label": "K40 (D1,F5)", "x": 0, "y": 4.5, "w": 2.25 },
+                { "label": "K42 (D1,F7)", "x": 2.25, "y": 4.5 },
+                { "label": "K43 (D1,E2)", "x": 3.25, "y": 4.5 },
+                { "label": "K44 (D1,C7)", "x": 4.25, "y": 4.5 },
+                { "label": "K45 (D1,C6)", "x": 5.25, "y": 4.5 },
+                { "label": "K46 (D1,B6)", "x": 6.25, "y": 4.5 },
+                { "label": "K47 (D1,F1)", "x": 7.25, "y": 4.5 },
+                { "label": "K48 (D1,B5)", "x": 8.25, "y": 4.5 },
+                { "label": "K49 (D1,B4)", "x": 9.25, "y": 4.5 },
+                { "label": "K4A (D1,D7)", "x": 10.25, "y": 4.5 },
+                { "label": "K4B (D1,D6)", "x": 11.25, "y": 4.5 },
+                { "label": "K4C (D1,D4)", "x": 12.25, "y": 4.5, "w": 2.75 },
+                { "label": "K4F (D1,B1)", "x": 16.25, "y": 4.5 },
+
+                { "label": "K50 (D2,F5)", "x": 0, "y": 5.5, "w": 1.25 },
+                { "label": "K51 (D2,F6)", "x": 1.25, "y": 5.5, "w": 1.25 },
+                { "label": "K52 (D2,F7)", "x": 2.5, "y": 5.5, "w": 1.25 },
+                { "label": "K56 (D2,B6)", "x": 3.75, "y": 5.5, "w": 6.25 },
+                { "label": "K5A (D2,D7)", "x": 10, "y": 5.5, "w": 1.25 },
+                { "label": "K5B (D2,D6)", "x": 11.25, "y": 5.5, "w": 1.25 },
+                { "label": "K5C (D2,D4)", "x": 12.5, "y": 5.5, "w": 1.25 },
+                { "label": "K5D (D2,D3)", "x": 13.75, "y": 5.5, "w": 1.25 },
+                { "label": "K5E (D2,D0)", "x": 15.25, "y": 5.5 },
+                { "label": "K5F (D2,B1)", "x": 16.25, "y": 5.5 },
+                { "label": "K4E (D1,D0)", "x": 17.25, "y": 5.5 }
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_tsangan": {
+            "layout": [
+                { "label": "K00 (F4,F5)", "x": 0, "y": 0 },
+                { "label": "K01 (F4,F6)", "x": 1.25, "y": 0 },
+                { "label": "K02 (F4,F7)", "x": 2.25, "y": 0 },
+                { "label": "K03 (F4,E2)", "x": 3.25, "y": 0 },
+                { "label": "K04 (F4,C7)", "x": 4.25, "y": 0 },
+                { "label": "K05 (F4,C6)", "x": 5.5, "y": 0 },
+                { "label": "K06 (F4,B6)", "x": 6.5, "y": 0 },
+                { "label": "K07 (F4,F1)", "x": 7.5, "y": 0 },
+                { "label": "K08 (F4,B5)", "x": 8.5, "y": 0 },
+                { "label": "K09 (F4,B4)", "x": 9.75, "y": 0 },
+                { "label": "K0A (F4,D7)", "x": 10.75, "y": 0 },
+                { "label": "K0B (F4,D6)", "x": 11.75, "y": 0 },
+                { "label": "K0C (F4,D4)", "x": 12.75, "y": 0 },
+                { "label": "K0D (F4,B1)", "x": 14, "y": 0 },
+                { "label": "K0E (F4,D0)", "x": 15.25, "y": 0 },
+                { "label": "K0F (F4,B1)", "x": 16.25, "y": 0 },
+                { "label": "K3E (D5,D0)", "x": 17.25, "y": 0 },
+
+                { "label": "K10 (B2,F5)", "x": 0, "y": 1.5 },
+                { "label": "K11 (B2,F6)", "x": 1, "y": 1.5 },
+                { "label": "K12 (B2,F7)", "x": 2, "y": 1.5 },
+                { "label": "K13 (B2,E2)", "x": 3, "y": 1.5 },
+                { "label": "K14 (B2,C7)", "x": 4, "y": 1.5 },
+                { "label": "K15 (B2,C6)", "x": 5, "y": 1.5 },
+                { "label": "K16 (B2,B6)", "x": 6, "y": 1.5 },
+                { "label": "K17 (B2,F1)", "x": 7, "y": 1.5 },
+                { "label": "K18 (B2,B5)", "x": 8, "y": 1.5 },
+                { "label": "K19 (B2,B4)", "x": 9, "y": 1.5 },
+                { "label": "K1A (B2,D7)", "x": 10, "y": 1.5 },
+                { "label": "K1B (B2,D6)", "x": 11, "y": 1.5 },
+                { "label": "K1C (B2,D4)", "x": 12, "y": 1.5 },
+                { "label": "K1D (B2,D3)", "x": 13, "y": 1.5, "w": 2 },
+                { "label": "K1E (B2,D0)", "x": 15.25, "y": 1.5 },
+                { "label": "K1F (B2,B1)", "x": 16.25, "y": 1.5 },
+                { "label": "K3F (D5,B1)", "x": 17.25, "y": 1.5 },
+
+                { "label": "K20 (F0,F5)", "x": 0, "y": 2.5, "w": 1.5 },
+                { "label": "K21 (F0,F6)", "x": 1.5, "y": 2.5 },
+                { "label": "K22 (F0,F7)", "x": 2.5, "y": 2.5 },
+                { "label": "K23 (F0,E2)", "x": 3.5, "y": 2.5 },
+                { "label": "K24 (F0,C7)", "x": 4.5, "y": 2.5 },
+                { "label": "K25 (F0,C6)", "x": 5.5, "y": 2.5 },
+                { "label": "K26 (F0,B6)", "x": 6.5, "y": 2.5 },
+                { "label": "K27 (F0,F1)", "x": 7.5, "y": 2.5 },
+                { "label": "K28 (F0,B5)", "x": 8.5, "y": 2.5 },
+                { "label": "K29 (F0,B4)", "x": 9.5, "y": 2.5 },
+                { "label": "K2A (F0,D7)", "x": 10.5, "y": 2.5 },
+                { "label": "K2B (F0,D6)", "x": 11.5, "y": 2.5 },
+                { "label": "K2C (F0,D4)", "x": 12.5, "y": 2.5 },
+                { "label": "K2D (F0,D3)", "x": 13.5, "y": 2.5, "w": 1.5 },
+                { "label": "K2E (F0,D0)", "x": 15.25, "y": 2.5 },
+                { "label": "K2F (F0,B1)", "x": 16.25, "y": 2.5 },
+                { "label": "K4D (D1,D3)", "x": 17.25, "y": 2.5 },
+
+                { "label": "K30 (D5,F5)", "x": 0, "y": 3.5, "w": 1.75 },
+                { "label": "K31 (D5,F6)", "x": 1.75, "y": 3.5 },
+                { "label": "K32 (D5,F7)", "x": 2.75, "y": 3.5 },
+                { "label": "K33 (D5,E2)", "x": 3.75, "y": 3.5 },
+                { "label": "K34 (D5,C7)", "x": 4.75, "y": 3.5 },
+                { "label": "K35 (D5,C6)", "x": 5.75, "y": 3.5 },
+                { "label": "K36 (D5,B6)", "x": 6.75, "y": 3.5 },
+                { "label": "K37 (D5,F1)", "x": 7.75, "y": 3.5 },
+                { "label": "K38 (D5,B5)", "x": 8.75, "y": 3.5 },
+                { "label": "K39 (D5,B4)", "x": 9.75, "y": 3.5 },
+                { "label": "K3A (D5,D7)", "x": 10.75, "y": 3.5 },
+                { "label": "K3B (D5,D6)", "x": 11.75, "y": 3.5 },
+                { "label": "K3D (D5,D3)", "x": 12.75, "y": 3.5, "w": 2.25 },
+
+                { "label": "K40 (D1,F5)", "x": 0, "y": 4.5, "w": 2.25 },
+                { "label": "K42 (D1,F7)", "x": 2.25, "y": 4.5 },
+                { "label": "K43 (D1,E2)", "x": 3.25, "y": 4.5 },
+                { "label": "K44 (D1,C7)", "x": 4.25, "y": 4.5 },
+                { "label": "K45 (D1,C6)", "x": 5.25, "y": 4.5 },
+                { "label": "K46 (D1,B6)", "x": 6.25, "y": 4.5 },
+                { "label": "K47 (D1,F1)", "x": 7.25, "y": 4.5 },
+                { "label": "K48 (D1,B5)", "x": 8.25, "y": 4.5 },
+                { "label": "K49 (D1,B4)", "x": 9.25, "y": 4.5 },
+                { "label": "K4A (D1,D7)", "x": 10.25, "y": 4.5 },
+                { "label": "K4B (D1,D6)", "x": 11.25, "y": 4.5 },
+                { "label": "K4C (D1,D4)", "x": 12.25, "y": 4.5, "w": 2.75 },
+                { "label": "K4F (D1,B1)", "x": 16.25, "y": 4.5 },
+
+                { "label": "K50 (D2,F5)", "x": 0, "y": 5.5, "w": 1.5 },
+                { "label": "K51 (D2,F6)", "x": 1.5, "y": 5.5 },
+                { "label": "K52 (D2,F7)", "x": 2.5, "y": 5.5, "w": 1.5 },
+                { "label": "K56 (D2,B6)", "x": 4, "y": 5.5, "w": 7 },
+                { "label": "K5B (D2,D6)", "x": 11, "y": 5.5, "w": 1.5 },
+                { "label": "K5C (D2,D4)", "x": 12.5, "y": 5.5 },
+                { "label": "K5D (D2,D3)", "x": 13.5, "y": 5.5, "w": 1.5 },
+                { "label": "K5E (D2,D0)", "x": 15.25, "y": 5.5 },
+                { "label": "K5F (D2,B1)", "x": 16.25, "y": 5.5 },
+                { "label": "K4E (D1,D0)", "x": 17.25, "y": 5.5 }
+            ]
+        },
+        "LAYOUT_tkl_f13_iso": {
+            "layout": [
+                { "label": "K00 (F4,F5)", "x": 0, "y": 0 },
+                { "label": "K01 (F4,F6)", "x": 1.25, "y": 0 },
+                { "label": "K02 (F4,F7)", "x": 2.25, "y": 0 },
+                { "label": "K03 (F4,E2)", "x": 3.25, "y": 0 },
+                { "label": "K04 (F4,C7)", "x": 4.25, "y": 0 },
+                { "label": "K05 (F4,C6)", "x": 5.5, "y": 0 },
+                { "label": "K06 (F4,B6)", "x": 6.5, "y": 0 },
+                { "label": "K07 (F4,F1)", "x": 7.5, "y": 0 },
+                { "label": "K08 (F4,B5)", "x": 8.5, "y": 0 },
+                { "label": "K09 (F4,B4)", "x": 9.75, "y": 0 },
+                { "label": "K0A (F4,D7)", "x": 10.75, "y": 0 },
+                { "label": "K0B (F4,D6)", "x": 11.75, "y": 0 },
+                { "label": "K0C (F4,D4)", "x": 12.75, "y": 0 },
+                { "label": "K0D (F4,B1)", "x": 14, "y": 0 },
+                { "label": "K0E (F4,D0)", "x": 15.25, "y": 0 },
+                { "label": "K0F (F4,B1)", "x": 16.25, "y": 0 },
+                { "label": "K3E (D5,D0)", "x": 17.25, "y": 0 },
+
+                { "label": "K10 (B2,F5)", "x": 0, "y": 1.5 },
+                { "label": "K11 (B2,F6)", "x": 1, "y": 1.5 },
+                { "label": "K12 (B2,F7)", "x": 2, "y": 1.5 },
+                { "label": "K13 (B2,E2)", "x": 3, "y": 1.5 },
+                { "label": "K14 (B2,C7)", "x": 4, "y": 1.5 },
+                { "label": "K15 (B2,C6)", "x": 5, "y": 1.5 },
+                { "label": "K16 (B2,B6)", "x": 6, "y": 1.5 },
+                { "label": "K17 (B2,F1)", "x": 7, "y": 1.5 },
+                { "label": "K18 (B2,B5)", "x": 8, "y": 1.5 },
+                { "label": "K19 (B2,B4)", "x": 9, "y": 1.5 },
+                { "label": "K1A (B2,D7)", "x": 10, "y": 1.5 },
+                { "label": "K1B (B2,D6)", "x": 11, "y": 1.5 },
+                { "label": "K1C (B2,D4)", "x": 12, "y": 1.5 },
+                { "label": "K1D (B2,D3)", "x": 13, "y": 1.5, "w": 2 },
+                { "label": "K1E (B2,D0)", "x": 15.25, "y": 1.5 },
+                { "label": "K1F (B2,B1)", "x": 16.25, "y": 1.5 },
+                { "label": "K3F (D5,B1)", "x": 17.25, "y": 1.5 },
+
+                { "label": "K20 (F0,F5)", "x": 0, "y": 2.5, "w": 1.5 },
+                { "label": "K21 (F0,F6)", "x": 1.5, "y": 2.5 },
+                { "label": "K22 (F0,F7)", "x": 2.5, "y": 2.5 },
+                { "label": "K23 (F0,E2)", "x": 3.5, "y": 2.5 },
+                { "label": "K24 (F0,C7)", "x": 4.5, "y": 2.5 },
+                { "label": "K25 (F0,C6)", "x": 5.5, "y": 2.5 },
+                { "label": "K26 (F0,B6)", "x": 6.5, "y": 2.5 },
+                { "label": "K27 (F0,F1)", "x": 7.5, "y": 2.5 },
+                { "label": "K28 (F0,B5)", "x": 8.5, "y": 2.5 },
+                { "label": "K29 (F0,B4)", "x": 9.5, "y": 2.5 },
+                { "label": "K2A (F0,D7)", "x": 10.5, "y": 2.5 },
+                { "label": "K2B (F0,D6)", "x": 11.5, "y": 2.5 },
+                { "label": "K2C (F0,D4)", "x": 12.5, "y": 2.5 },
+                { "label": "K2E (F0,D0)", "x": 15.25, "y": 2.5 },
+                { "label": "K2F (F0,B1)", "x": 16.25, "y": 2.5 },
+                { "label": "K4D (D1,D3)", "x": 17.25, "y": 2.5 },
+
+                { "label": "K30 (D5,F5)", "x": 0, "y": 3.5, "w": 1.75 },
+                { "label": "K31 (D5,F6)", "x": 1.75, "y": 3.5 },
+                { "label": "K32 (D5,F7)", "x": 2.75, "y": 3.5 },
+                { "label": "K33 (D5,E2)", "x": 3.75, "y": 3.5 },
+                { "label": "K34 (D5,C7)", "x": 4.75, "y": 3.5 },
+                { "label": "K35 (D5,C6)", "x": 5.75, "y": 3.5 },
+                { "label": "K36 (D5,B6)", "x": 6.75, "y": 3.5 },
+                { "label": "K37 (D5,F1)", "x": 7.75, "y": 3.5 },
+                { "label": "K38 (D5,B5)", "x": 8.75, "y": 3.5 },
+                { "label": "K39 (D5,B4)", "x": 9.75, "y": 3.5 },
+                { "label": "K3A (D5,D7)", "x": 10.75, "y": 3.5 },
+                { "label": "K3B (D5,D6)", "x": 11.75, "y": 3.5 },
+                { "label": "K3C (D5,D4)", "x": 12.75, "y": 3.5 },
+                { "label": "K3D (D5,D3)", "x": 13.75, "y": 2.5, "w": 1.25, "h": 2 },
+
+                { "label": "K40 (D1,F5)", "x": 0, "y": 4.5, "w": 1.25 },
+                { "label": "K41 (D1,F6)", "x": 1.25, "y": 4.5 },
+                { "label": "K42 (D1,F7)", "x": 2.25, "y": 4.5 },
+                { "label": "K43 (D1,E2)", "x": 3.25, "y": 4.5 },
+                { "label": "K44 (D1,C7)", "x": 4.25, "y": 4.5 },
+                { "label": "K45 (D1,C6)", "x": 5.25, "y": 4.5 },
+                { "label": "K46 (D1,B6)", "x": 6.25, "y": 4.5 },
+                { "label": "K47 (D1,F1)", "x": 7.25, "y": 4.5 },
+                { "label": "K48 (D1,B5)", "x": 8.25, "y": 4.5 },
+                { "label": "K49 (D1,B4)", "x": 9.25, "y": 4.5 },
+                { "label": "K4A (D1,D7)", "x": 10.25, "y": 4.5 },
+                { "label": "K4B (D1,D6)", "x": 11.25, "y": 4.5 },
+                { "label": "K4C (D1,D4)", "x": 12.25, "y": 4.5, "w": 2.75 },
+                { "label": "K4F (D1,B1)", "x": 16.25, "y": 4.5 },
+
+                { "label": "K50 (D2,F5)", "x": 0, "y": 5.5, "w": 1.25 },
+                { "label": "K51 (D2,F6)", "x": 1.25, "y": 5.5, "w": 1.25 },
+                { "label": "K52 (D2,F7)", "x": 2.5, "y": 5.5, "w": 1.25 },
+                { "label": "K56 (D2,B6)", "x": 3.75, "y": 5.5, "w": 6.25 },
+                { "label": "K5A (D2,D7)", "x": 10, "y": 5.5, "w": 1.25 },
+                { "label": "K5B (D2,D6)", "x": 11.25, "y": 5.5, "w": 1.25 },
+                { "label": "K5C (D2,D4)", "x": 12.5, "y": 5.5, "w": 1.25 },
+                { "label": "K5D (D2,D3)", "x": 13.75, "y": 5.5, "w": 1.25 },
+                { "label": "K5E (D2,D0)", "x": 15.25, "y": 5.5 },
+                { "label": "K5F (D2,B1)", "x": 16.25, "y": 5.5 },
+                { "label": "K4E (D1,D0)", "x": 17.25, "y": 5.5 }
+            ]
+        },
+        "LAYOUT_tkl_f13_iso_tsangan": {
+            "layout": [
+                { "label": "K00 (F4,F5)", "x": 0, "y": 0 },
+                { "label": "K01 (F4,F6)", "x": 1.25, "y": 0 },
+                { "label": "K02 (F4,F7)", "x": 2.25, "y": 0 },
+                { "label": "K03 (F4,E2)", "x": 3.25, "y": 0 },
+                { "label": "K04 (F4,C7)", "x": 4.25, "y": 0 },
+                { "label": "K05 (F4,C6)", "x": 5.5, "y": 0 },
+                { "label": "K06 (F4,B6)", "x": 6.5, "y": 0 },
+                { "label": "K07 (F4,F1)", "x": 7.5, "y": 0 },
+                { "label": "K08 (F4,B5)", "x": 8.5, "y": 0 },
+                { "label": "K09 (F4,B4)", "x": 9.75, "y": 0 },
+                { "label": "K0A (F4,D7)", "x": 10.75, "y": 0 },
+                { "label": "K0B (F4,D6)", "x": 11.75, "y": 0 },
+                { "label": "K0C (F4,D4)", "x": 12.75, "y": 0 },
+                { "label": "K0D (F4,B1)", "x": 14, "y": 0 },
+                { "label": "K0E (F4,D0)", "x": 15.25, "y": 0 },
+                { "label": "K0F (F4,B1)", "x": 16.25, "y": 0 },
+                { "label": "K3E (D5,D0)", "x": 17.25, "y": 0 },
+
+                { "label": "K10 (B2,F5)", "x": 0, "y": 1.5 },
+                { "label": "K11 (B2,F6)", "x": 1, "y": 1.5 },
+                { "label": "K12 (B2,F7)", "x": 2, "y": 1.5 },
+                { "label": "K13 (B2,E2)", "x": 3, "y": 1.5 },
+                { "label": "K14 (B2,C7)", "x": 4, "y": 1.5 },
+                { "label": "K15 (B2,C6)", "x": 5, "y": 1.5 },
+                { "label": "K16 (B2,B6)", "x": 6, "y": 1.5 },
+                { "label": "K17 (B2,F1)", "x": 7, "y": 1.5 },
+                { "label": "K18 (B2,B5)", "x": 8, "y": 1.5 },
+                { "label": "K19 (B2,B4)", "x": 9, "y": 1.5 },
+                { "label": "K1A (B2,D7)", "x": 10, "y": 1.5 },
+                { "label": "K1B (B2,D6)", "x": 11, "y": 1.5 },
+                { "label": "K1C (B2,D4)", "x": 12, "y": 1.5 },
+                { "label": "K1D (B2,D3)", "x": 13, "y": 1.5, "w": 2 },
+                { "label": "K1E (B2,D0)", "x": 15.25, "y": 1.5 },
+                { "label": "K1F (B2,B1)", "x": 16.25, "y": 1.5 },
+                { "label": "K3F (D5,B1)", "x": 17.25, "y": 1.5 },
+
+                { "label": "K20 (F0,F5)", "x": 0, "y": 2.5, "w": 1.5 },
+                { "label": "K21 (F0,F6)", "x": 1.5, "y": 2.5 },
+                { "label": "K22 (F0,F7)", "x": 2.5, "y": 2.5 },
+                { "label": "K23 (F0,E2)", "x": 3.5, "y": 2.5 },
+                { "label": "K24 (F0,C7)", "x": 4.5, "y": 2.5 },
+                { "label": "K25 (F0,C6)", "x": 5.5, "y": 2.5 },
+                { "label": "K26 (F0,B6)", "x": 6.5, "y": 2.5 },
+                { "label": "K27 (F0,F1)", "x": 7.5, "y": 2.5 },
+                { "label": "K28 (F0,B5)", "x": 8.5, "y": 2.5 },
+                { "label": "K29 (F0,B4)", "x": 9.5, "y": 2.5 },
+                { "label": "K2A (F0,D7)", "x": 10.5, "y": 2.5 },
+                { "label": "K2B (F0,D6)", "x": 11.5, "y": 2.5 },
+                { "label": "K2C (F0,D4)", "x": 12.5, "y": 2.5 },
+                { "label": "K2E (F0,D0)", "x": 15.25, "y": 2.5 },
+                { "label": "K2F (F0,B1)", "x": 16.25, "y": 2.5 },
+                { "label": "K4D (D1,D3)", "x": 17.25, "y": 2.5 },
+
+                { "label": "K30 (D5,F5)", "x": 0, "y": 3.5, "w": 1.75 },
+                { "label": "K31 (D5,F6)", "x": 1.75, "y": 3.5 },
+                { "label": "K32 (D5,F7)", "x": 2.75, "y": 3.5 },
+                { "label": "K33 (D5,E2)", "x": 3.75, "y": 3.5 },
+                { "label": "K34 (D5,C7)", "x": 4.75, "y": 3.5 },
+                { "label": "K35 (D5,C6)", "x": 5.75, "y": 3.5 },
+                { "label": "K36 (D5,B6)", "x": 6.75, "y": 3.5 },
+                { "label": "K37 (D5,F1)", "x": 7.75, "y": 3.5 },
+                { "label": "K38 (D5,B5)", "x": 8.75, "y": 3.5 },
+                { "label": "K39 (D5,B4)", "x": 9.75, "y": 3.5 },
+                { "label": "K3A (D5,D7)", "x": 10.75, "y": 3.5 },
+                { "label": "K3B (D5,D6)", "x": 11.75, "y": 3.5 },
+                { "label": "K3C (D5,D4)", "x": 12.75, "y": 3.5 },
+                { "label": "K3D (D5,D3)", "x": 13.75, "y": 2.5, "w": 1.25, "h": 2 },
+
+                { "label": "K40 (D1,F5)", "x": 0, "y": 4.5, "w": 1.25 },
+                { "label": "K41 (D1,F6)", "x": 1.25, "y": 4.5 },
+                { "label": "K42 (D1,F7)", "x": 2.25, "y": 4.5 },
+                { "label": "K43 (D1,E2)", "x": 3.25, "y": 4.5 },
+                { "label": "K44 (D1,C7)", "x": 4.25, "y": 4.5 },
+                { "label": "K45 (D1,C6)", "x": 5.25, "y": 4.5 },
+                { "label": "K46 (D1,B6)", "x": 6.25, "y": 4.5 },
+                { "label": "K47 (D1,F1)", "x": 7.25, "y": 4.5 },
+                { "label": "K48 (D1,B5)", "x": 8.25, "y": 4.5 },
+                { "label": "K49 (D1,B4)", "x": 9.25, "y": 4.5 },
+                { "label": "K4A (D1,D7)", "x": 10.25, "y": 4.5 },
+                { "label": "K4B (D1,D6)", "x": 11.25, "y": 4.5 },
+                { "label": "K4C (D1,D4)", "x": 12.25, "y": 4.5, "w": 2.75 },
+                { "label": "K4F (D1,B1)", "x": 16.25, "y": 4.5 },
+
+                { "label": "K50 (D2,F5)", "x": 0, "y": 5.5, "w": 1.5 },
+                { "label": "K51 (D2,F6)", "x": 1.5, "y": 5.5 },
+                { "label": "K52 (D2,F7)", "x": 2.5, "y": 5.5, "w": 1.5 },
+                { "label": "K56 (D2,B6)", "x": 4, "y": 5.5, "w": 7 },
+                { "label": "K5B (D2,D6)", "x": 11, "y": 5.5, "w": 1.5 },
+                { "label": "K5C (D2,D4)", "x": 12.5, "y": 5.5 },
+                { "label": "K5D (D2,D3)", "x": 13.5, "y": 5.5, "w": 1.5 },
                 { "label": "K5E (D2,D0)", "x": 15.25, "y": 5.5 },
                 { "label": "K5F (D2,B1)", "x": 16.25, "y": 5.5 },
                 { "label": "K4E (D1,D0)", "x": 17.25, "y": 5.5 }
diff --git a/keyboards/vertex/angler2/keymaps/default/keymap.c b/keyboards/vertex/angler2/keymaps/default/keymap.c
index ae6d76e32604..b5127472efa8 100644
--- a/keyboards/vertex/angler2/keymaps/default/keymap.c
+++ b/keyboards/vertex/angler2/keymaps/default/keymap.c
@@ -18,23 +18,22 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [0] = LAYOUT_all(
+    [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_DEL,     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_NO,   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_BSLS, KC_ENT,
+        KC_LSFT, KC_SLSH, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_LSFT,             KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_LALT, MO(1),   KC_APP,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
-    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_DEL,  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_NO,  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_BSLS, KC_ENT,
-		KC_LSFT, KC_SLSH, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, KC_SLSH,          KC_LSFT,             KC_UP,
-		KC_LCTL, KC_LGUI, KC_LALT,                    KC_SPC,                     KC_LALT, MO(1),   KC_APP, KC_RCTL,    KC_LEFT, KC_DOWN,KC_RGHT
-  ),
-  [1] = LAYOUT_all(
-
-    QK_BOOT,  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
-    _______,RGB_TOG,RGB_VAI,RGB_VAD,RGB_HUI,RGB_HUD,RGB_MOD,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,           _______,
-    _______,_______,_______,                        _______,                        _______,_______,_______,_______,   _______,_______,_______
-  ),
+    [1] = LAYOUT_all(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, RGB_TOG, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_MOD, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,    _______, _______, _______
+    ),
 
 };
diff --git a/keyboards/vertex/angler2/keymaps/via/keymap.c b/keyboards/vertex/angler2/keymaps/via/keymap.c
index 03c46eee3a41..ec171be29bda 100644
--- a/keyboards/vertex/angler2/keymaps/via/keymap.c
+++ b/keyboards/vertex/angler2/keymaps/via/keymap.c
@@ -18,42 +18,40 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [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_DEL,  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_NO,  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_BSLS, KC_ENT,
-    KC_LSFT, KC_SLSH, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M, KC_COMM, KC_DOT, KC_SLSH,          KC_LSFT,             KC_UP,
-    KC_LCTL, KC_LGUI, KC_LALT,                    KC_SPC,                     KC_LALT, MO(1),   KC_APP, KC_RCTL,    KC_LEFT, KC_DOWN,KC_RGHT
-  ),
-  [1] = LAYOUT_all(
-
-    QK_BOOT,  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
-    _______,RGB_TOG,RGB_VAI,RGB_VAD,RGB_HUI,RGB_HUD,RGB_MOD,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,           _______,
-    _______,_______,_______,                        _______,                        _______,_______,_______,_______,   _______,_______,_______
-  ),
-  [2] = LAYOUT_all(
-
-    QK_BOOT,  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,           _______,
-    _______,_______,_______,                        _______,                        _______,_______,_______,_______,   _______,_______,_______
-  ),
-  [3] = LAYOUT_all(
-
-    QK_BOOT,  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,           _______,
-    _______,_______,_______,                        _______,                        _______,_______,_______,_______,   _______,_______,_______
-  ),
-
+    [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_DEL,     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_NO,   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_BSLS, KC_ENT,
+        KC_LSFT, KC_SLSH, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_LSFT,             KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_LALT, MO(1),   KC_APP,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT_all(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, RGB_TOG, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_MOD, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,    _______, _______, _______
+    ),
+
+    [2] = LAYOUT_all(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,    _______, _______, _______
+    ),
+
+    [3] = LAYOUT_all(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,    _______, _______, _______
+    ),
 
 };
diff --git a/keyboards/vertex/angler2/readme.md b/keyboards/vertex/angler2/readme.md
index e3de551e37a1..27147bfe06b6 100644
--- a/keyboards/vertex/angler2/readme.md
+++ b/keyboards/vertex/angler2/readme.md
@@ -1,4 +1,4 @@
-# angler2
+# AngleR2
 A customizable soldering 80% keyboard.
 
 * Keyboard Maintainer: [Vertex](https://github.com/Vertex-kb)
@@ -7,7 +7,7 @@ A customizable soldering 80% keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make Vertex/AngleR2:default
+    make vertex/angler2:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).