Wuque Promise87 ANSI Refactor (#17807)

19 files changed, 268 insertions, 91 deletions

diff --git a/keyboards/wuque/promise87/ansi/ansi.h b/keyboards/wuque/promise87/ansi/ansi.h
index 30f16793cf..513c3a8d2a 100644
--- a/keyboards/wuque/promise87/ansi/ansi.h
+++ b/keyboards/wuque/promise87/ansi/ansi.h
@@ -32,17 +32,17 @@
  * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
  * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c    │4d │    │4f │
  * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
- * │50  │51  │52  │56                      │5a  │5b  │5c  │5d  ||5e │5f │5g │
+ * │50  │51  │52  │56                      │5a  │5b  │5c  │5d  ││5e │5f │5g │
  * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
  */
 
 #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, K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                 \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,      K4F,       \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D, K5E, K5F, K5G   \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G,  \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, 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, K4C, K4D,             K4F,       \
+    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,        K5E, K5F, K5G   \
 ) { \
     { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
     { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
@@ -53,7 +53,7 @@
 }
 
 
-/* LAYOUT_87_ansi
+/* LAYOUT_tkl_f13_ansi
  * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
  * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
  * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
@@ -66,10 +66,10 @@
  * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───┐
  * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c        │    │4f │
  * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───┐
- * │50  │51  │52  │56                      │5a  │5b  │5c  │5d  ||5e │5f │5g │
+ * │50  │51  │52  │56                      │5a  │5b  │5c  │5d  ││5e │5f │5g │
  * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
  */
-#define LAYOUT_87_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,  \
@@ -86,7 +86,7 @@
 }
 
 
-/* LAYOUT_87_ansi_split_bs
+/* LAYOUT_tkl_f13_ansi_split_bs
  * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
  * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
  * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
@@ -99,16 +99,16 @@
  * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───┐
  * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c        │    │4f │
  * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴───┴───┼───┴┬────┬────┤┌───┼───┼───┐
- * │50  │51  │52  │56                      │5a  │5b  │5c  │5d  ||5e │5f │5g │
+ * │50  │51  │52  │56                      │5a  │5b  │5c  │5d  ││5e │5f │5g │
  * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
  */
-#define LAYOUT_87_ansi_split_bs( \
-    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,                 \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,           K4F,       \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D, K5E, K5F, K5G   \
+#define LAYOUT_tkl_f13_ansi_split_bs( \
+    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,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,             K4F,       \
+    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,        K5E, K5F, K5G   \
 ) { \
     { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
     { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
@@ -119,7 +119,7 @@
 }
 
 
-/* LAYOUT_87_ansi_split_lshift
+/* LAYOUT_tkl_f13_ansi_split_lshift
  * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
  * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
  * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
@@ -132,10 +132,10 @@
  * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───┐
  * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c        │    │4f │
  * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───┐
- * │50  │51  │52  │56                      │5a  │5b  │5c  │5d  ||5e │5f │5g │
+ * │50  │51  │52  │56                      │5a  │5b  │5c  │5d  ││5e │5f │5g │
  * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
  */
-#define LAYOUT_87_ansi_split_lshift( \
+#define LAYOUT_tkl_f13_ansi_split_lshift( \
     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,  \
@@ -152,7 +152,7 @@
 }
 
 
-/* LAYOUT_87_ansi_split_rshift
+/* LAYOUT_tkl_f13_ansi_split_rshift
  * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
  * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
  * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
@@ -165,10 +165,10 @@
  * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
  * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c    │4d │    │4f │
  * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
- * │50  │51  │52  │56                      │5a  │5b  │5c  │5d  ||5e │5f │5g │
+ * │50  │51  │52  │56                      │5a  │5b  │5c  │5d  ││5e │5f │5g │
  * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
  */
-#define LAYOUT_87_ansi_split_rshift( \
+#define LAYOUT_tkl_f13_ansi_split_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, K1E, K1F, K1G,  \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G,  \
@@ -183,3 +183,36 @@
     { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO  }, \
     { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
 }
+
+
+/* LAYOUT_tkl_f13_ansi_split_bs_rshift
+ * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+ * │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 │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+ * │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      │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c    │4d │    │4f │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+ * │50  │51  │52  │56                      │5a  │5b  │5c  │5d  ││5e │5f │5g │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+ */
+#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,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,      \
+    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,        K5E, K5F, K5G  \
+) { \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO  }, \
+    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO  }, \
+    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
+}
diff --git a/keyboards/wuque/promise87/ansi/info.json b/keyboards/wuque/promise87/ansi/info.json
index f8cf44b849..e62200480c 100644
--- a/keyboards/wuque/promise87/ansi/info.json
+++ b/keyboards/wuque/promise87/ansi/info.json
@@ -2,6 +2,12 @@
     "keyboard_name": "promise87",
     "url": "https://shop.wuquestudio.com/",
     "maintainer": "spbgzh",
+    "layout_aliases": {
+        "LAYOUT_87_ansi": "LAYOUT_tkl_f13_ansi",
+        "LAYOUT_87_ansi_split_bs": "LAYOUT_tkl_f13_ansi_split_bs",
+        "LAYOUT_87_ansi_split_lshift": "LAYOUT_tkl_f13_ansi_split_lshift",
+        "LAYOUT_87_ansi_split_rshift": "LAYOUT_tkl_f13_ansi_split_rshift"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
@@ -37,6 +43,7 @@
                 { "label": "-", "x": 11, "y": 1.25 },
                 { "label": "=", "x": 12, "y": 1.25 },
                 { "label": "Backspace", "x": 13, "y": 1.25 },
+                { "label": "Backspace1", "x": 14, "y": 1.25 },
                 { "label": "Insert", "x": 15.25, "y": 1.25 },
                 { "label": "Home", "x": 16.25, "y": 1.25 },
                 { "label": "PageUp", "x": 17.25, "y": 1.25 },
@@ -72,7 +79,6 @@
                 { "label": ";", "x": 10.75, "y": 3.25 },
                 { "label": "'", "x": 11.75, "y": 3.25 },
                 { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-                { "label": "Backspace1", "x": 14, "y": 1.25 },
 
                 { "label": "Shift1", "x": 0, "y": 4.25, "w": 1.25 },
                 { "label": "Shift2", "x": 1.25, "y": 4.25 },
@@ -103,7 +109,7 @@
                 { "label": "\u2192", "x": 17.25, "y": 5.25 }
             ]
         },
-        "LAYOUT_87_ansi": {
+        "LAYOUT_tkl_f13_ansi": {
             "layout": [
                 { "label": "Esc", "x": 0, "y": 0 },
                 { "label": "F1", "x": 1.25, "y": 0 },
@@ -200,7 +206,7 @@
                 { "label": "\u2192", "x": 17.25, "y": 5.25 }
             ]
         },
-        "LAYOUT_87_ansi_split_bs": {
+        "LAYOUT_tkl_f13_ansi_split_bs": {
             "layout": [
                 { "label": "Esc", "x": 0, "y": 0 },
                 { "label": "F1", "x": 1.25, "y": 0 },
@@ -234,6 +240,7 @@
                 { "label": "-", "x": 11, "y": 1.25 },
                 { "label": "=", "x": 12, "y": 1.25 },
                 { "label": "Backspace", "x": 13, "y": 1.25 },
+                { "label": "Backspace1", "x": 14, "y": 1.25 },
                 { "label": "Insert", "x": 15.25, "y": 1.25 },
                 { "label": "Home", "x": 16.25, "y": 1.25 },
                 { "label": "PageUp", "x": 17.25, "y": 1.25 },
@@ -269,7 +276,6 @@
                 { "label": ";", "x": 10.75, "y": 3.25 },
                 { "label": "'", "x": 11.75, "y": 3.25 },
                 { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-                { "label": "Backspace1", "x": 14, "y": 1.25 },
 
                 { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
                 { "label": "Z", "x": 2.25, "y": 4.25 },
@@ -298,7 +304,7 @@
                 { "label": "\u2192", "x": 17.25, "y": 5.25 }
             ]
         },
-        "LAYOUT_87_ansi_split_lshift": {
+        "LAYOUT_tkl_f13_ansi_split_lshift": {
             "layout": [
                 { "label": "Esc", "x": 0, "y": 0 },
                 { "label": "F1", "x": 1.25, "y": 0 },
@@ -396,7 +402,7 @@
                 { "label": "\u2192", "x": 17.25, "y": 5.25 }
             ]
         },
-        "LAYOUT_87_ansi_split_rshift": {
+        "LAYOUT_tkl_f13_ansi_split_rshift": {
             "layout": [
                 { "label": "Esc", "x": 0, "y": 0 },
                 { "label": "F1", "x": 1.25, "y": 0 },
@@ -493,6 +499,105 @@
                 { "label": "\u2193", "x": 16.25, "y": 5.25 },
                 { "label": "\u2192", "x": 17.25, "y": 5.25 }
             ]
+        },
+        "LAYOUT_tkl_f13_ansi_split_bs_rshift": {
+            "layout": [
+                { "label": "Esc", "x": 0, "y": 0 },
+                { "label": "F1", "x": 1.25, "y": 0 },
+                { "label": "F2", "x": 2.25, "y": 0 },
+                { "label": "F3", "x": 3.25, "y": 0 },
+                { "label": "F4", "x": 4.25, "y": 0 },
+                { "label": "F5", "x": 5.5, "y": 0 },
+                { "label": "F6", "x": 6.5, "y": 0 },
+                { "label": "F7", "x": 7.5, "y": 0 },
+                { "label": "F8", "x": 8.5, "y": 0 },
+                { "label": "F9", "x": 9.75, "y": 0 },
+                { "label": "F10", "x": 10.75, "y": 0 },
+                { "label": "F11", "x": 11.75, "y": 0 },
+                { "label": "F12", "x": 12.75, "y": 0 },
+                { "label": "F13", "x": 14, "y": 0 },
+                { "label": "Print", "x": 15.25, "y": 0 },
+                { "label": "Scroll", "x": 16.25, "y": 0 },
+                { "label": "Pause", "x": 17.25, "y": 0 },
+
+                { "label": "~", "x": 0, "y": 1.25 },
+                { "label": "1", "x": 1, "y": 1.25 },
+                { "label": "2", "x": 2, "y": 1.25 },
+                { "label": "3", "x": 3, "y": 1.25 },
+                { "label": "4", "x": 4, "y": 1.25 },
+                { "label": "5", "x": 5, "y": 1.25 },
+                { "label": "6", "x": 6, "y": 1.25 },
+                { "label": "7", "x": 7, "y": 1.25 },
+                { "label": "8", "x": 8, "y": 1.25 },
+                { "label": "9", "x": 9, "y": 1.25 },
+                { "label": "0", "x": 10, "y": 1.25 },
+                { "label": "-", "x": 11, "y": 1.25 },
+                { "label": "=", "x": 12, "y": 1.25 },
+                { "label": "Backspace", "x": 13, "y": 1.25 },
+                { "label": "Backspace1", "x": 14, "y": 1.25 },
+                { "label": "Insert", "x": 15.25, "y": 1.25 },
+                { "label": "Home", "x": 16.25, "y": 1.25 },
+                { "label": "PageUp", "x": 17.25, "y": 1.25 },
+
+                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
+                { "label": "Q", "x": 1.5, "y": 2.25 },
+                { "label": "W", "x": 2.5, "y": 2.25 },
+                { "label": "E", "x": 3.5, "y": 2.25 },
+                { "label": "R", "x": 4.5, "y": 2.25 },
+                { "label": "T", "x": 5.5, "y": 2.25 },
+                { "label": "Y", "x": 6.5, "y": 2.25 },
+                { "label": "U", "x": 7.5, "y": 2.25 },
+                { "label": "I", "x": 8.5, "y": 2.25 },
+                { "label": "O", "x": 9.5, "y": 2.25 },
+                { "label": "P", "x": 10.5, "y": 2.25 },
+                { "label": "[", "x": 11.5, "y": 2.25 },
+                { "label": "]", "x": 12.5, "y": 2.25 },
+                { "label": "\\", "x": 13.5,"y": 2.25, "w": 1.5 },
+                { "label": "Delete", "x": 15.25, "y": 2.25 },
+                { "label": "End", "x": 16.25, "y": 2.25 },
+                { "label": "PageDown", "x": 17.25, "y": 2.25 },
+
+                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
+                { "label": "A", "x": 1.75, "y": 3.25 },
+                { "label": "S", "x": 2.75, "y": 3.25 },
+                { "label": "D", "x": 3.75, "y": 3.25 },
+                { "label": "F", "x": 4.75, "y": 3.25 },
+                { "label": "G", "x": 5.75, "y": 3.25 },
+                { "label": "H", "x": 6.75, "y": 3.25 },
+                { "label": "J", "x": 7.75, "y": 3.25 },
+                { "label": "K", "x": 8.75, "y": 3.25 },
+                { "label": "L", "x": 9.75, "y": 3.25 },
+                { "label": ";", "x": 10.75, "y": 3.25 },
+                { "label": "'", "x": 11.75, "y": 3.25 },
+                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
+
+                { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
+                { "label": "Z", "x": 2.25, "y": 4.25 },
+                { "label": "X", "x": 3.25, "y": 4.25 },
+                { "label": "C", "x": 4.25, "y": 4.25 },
+                { "label": "V", "x": 5.25, "y": 4.25 },
+                { "label": "B", "x": 6.25, "y": 4.25 },
+                { "label": "N", "x": 7.25, "y": 4.25 },
+                { "label": "M", "x": 8.25, "y": 4.25 },
+                { "label": ",", "x": 9.25, "y": 4.25 },
+                { "label": ".", "x": 10.25, "y": 4.25 },
+                { "label": "/", "x": 11.25, "y": 4.25 },
+                { "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75 },
+                { "label": "Shift2", "x": 14, "y": 4.25 },
+                { "label": "\u2191", "x": 16.25, "y": 4.25 },
+
+                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
+                { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
+                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
+                { "label": "Space","x": 3.75, "y": 5.25, "w": 6.25 },
+                { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
+                { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
+                { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1.25 },
+                { "label": "Alt", "x": 13.75, "y": 5.25, "w": 1.25 },
+                { "label": "\u2190", "x": 15.25, "y": 5.25 },
+                { "label": "\u2193", "x": 16.25, "y": 5.25 },
+                { "label": "\u2192", "x": 17.25, "y": 5.25 }
+            ]
         }
     }
 }
diff --git a/keyboards/wuque/promise87/ansi/keymaps/87_ansi/readme.md b/keyboards/wuque/promise87/ansi/keymaps/87_ansi/readme.md
deleted file mode 100644
index 6aee31c744..0000000000
--- a/keyboards/wuque/promise87/ansi/keymaps/87_ansi/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The 87_ansi keymap for promise87
diff --git a/keyboards/wuque/promise87/ansi/keymaps/87_ansi_split_bs/readme.md b/keyboards/wuque/promise87/ansi/keymaps/87_ansi_split_bs/readme.md
deleted file mode 100644
index 3bfed281e7..0000000000
--- a/keyboards/wuque/promise87/ansi/keymaps/87_ansi_split_bs/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The 87_split_bs keymap for promise87
diff --git a/keyboards/wuque/promise87/ansi/keymaps/87_ansi_split_lshift/readme.md b/keyboards/wuque/promise87/ansi/keymaps/87_ansi_split_lshift/readme.md
deleted file mode 100644
index dda9e97643..0000000000
--- a/keyboards/wuque/promise87/ansi/keymaps/87_ansi_split_lshift/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The 87_split_lshift keymap for promise87
diff --git a/keyboards/wuque/promise87/ansi/keymaps/87_ansi_split_rshift/readme.md b/keyboards/wuque/promise87/ansi/keymaps/87_ansi_split_rshift/readme.md
deleted file mode 100644
index 48e51c385c..0000000000
--- a/keyboards/wuque/promise87/ansi/keymaps/87_ansi_split_rshift/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The 87_split_rshift keymap for promise87
diff --git a/keyboards/wuque/promise87/ansi/keymaps/default/keymap.c b/keyboards/wuque/promise87/ansi/keymaps/default/keymap.c
index 89b9705014..ea439bd2f6 100644
--- a/keyboards/wuque/promise87/ansi/keymaps/default/keymap.c
+++ b/keyboards/wuque/promise87/ansi/keymaps/default/keymap.c
@@ -18,19 +18,19 @@
 
 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_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_BSPC,
-		KC_LSFT, 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_RSFT,          KC_UP,
-		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_LGUI, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+        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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,                      KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_LGUI, MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RIGHT
     ),
     [1] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, RESET,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,             _______, _______, _______
     ),
 };
diff --git a/keyboards/wuque/promise87/ansi/keymaps/87_ansi/keymap.c b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi/keymap.c
index 67d72fb850..b4053256f9 100644
--- a/keyboards/wuque/promise87/ansi/keymaps/87_ansi/keymap.c
+++ b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi/keymap.c
@@ -17,7 +17,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
-    [0] = LAYOUT_87_ansi(
+    [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,
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
 		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_LGUI, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
     ),
-    [1] = LAYOUT_87_ansi(
+    [1] = LAYOUT_tkl_f13_ansi(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi/readme.md b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi/readme.md
new file mode 100644
index 0000000000..63cbbfc568
--- /dev/null
+++ b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi/readme.md
@@ -0,0 +1 @@
+# The tkl_f13_ansi keymap for promise87
diff --git a/keyboards/wuque/promise87/ansi/keymaps/87_ansi_split_bs/keymap.c b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_bs/keymap.c
index f238a4aa38..628e6211ad 100644
--- a/keyboards/wuque/promise87/ansi/keymaps/87_ansi_split_bs/keymap.c
+++ b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_bs/keymap.c
@@ -17,20 +17,20 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
-    [0] = LAYOUT_87_ansi_split_bs(
-        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_BSPC,
-		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_LGUI, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+    [0] = LAYOUT_tkl_f13_ansi_split_bs(
+        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_UP,
+		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_LGUI, MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RIGHT
     ),
-    [1] = LAYOUT_87_ansi_split_bs(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______
+    [1] = LAYOUT_tkl_f13_ansi_split_bs(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, RESET,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                      _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,             _______, _______, _______
     ),
 };
diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_bs/readme.md b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_split_bs/readme.md
new file mode 100644
index 0000000000..e61fd5af62
--- /dev/null
++