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

13 files changed, 297 insertions, 292 deletions

diff --git a/keyboards/wuque/ikki68_aurora/ikki68_aurora.h b/keyboards/wuque/ikki68_aurora/ikki68_aurora.h
index 7a9a161b57..ad08c7b148 100644
--- a/keyboards/wuque/ikki68_aurora/ikki68_aurora.h
+++ b/keyboards/wuque/ikki68_aurora/ikki68_aurora.h
@@ -21,23 +21,23 @@
 
 /* Standard Arrangement
  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │2d │ │0e │0f │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │ │1e │1f │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    | └───┴───┘
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤ ┌───┐
- * │30  |31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    |3d │ │3e │
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │2d │ │0e │0f │        ISO
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┤      ┌─────┐
+ * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │ │1e │1f │      │1d   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┘   ┌──┴┐    │
+ * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c      │             │2c │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌───┐       └───┴────┘
+ * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    │3d │ │3e │
  * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬────┬┴─┬─┴─┼───┼───┐
- * │40  │41  │42  │44      |46  |48        │4a  │4b  │4c  │  │4d │4e │4f |
+ * │40  │41  │42  │44      │46  │48        │4a  │4b  │4c  │  │4d │4e │4f │
  * └────┴────┴────┴────────┴────┴──────────┴────┴────┴────┘  └───┴───┴───┘
  */
 #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,           \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,      \
-    K40, K41, K42,      K44,      K46,      K48,      K4A, K4B, K4C, K4D, K4E, K4F  \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D,   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,                  \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,        K3E,      \
+    K40, K41, K42,      K44,      K46,      K48,      K4A, K4B, K4C,        K4D, K4E, K4F  \
 ) { \
     { 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    }, \
@@ -57,15 +57,15 @@
  * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ ┌───┐
  * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c        │ │3e │
  * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬──┬─┴─┼───┼───┐
- * │40  │41  │42  │46                      │4a  │4b  │4c  │  │4d │4e │4f |
+ * │40  │41  │42  │46                      │4a  │4b  │4c  │  │4d │4e │4f │
  * └────┴────┴────┴────────────────────────┴────┴────┴────┘  └───┴───┴───┘
  */
 #define LAYOUT_68_ansi( \
-    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,                \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E,      \
-    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
+    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,             \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C,   K3E,      \
+    K40, K41, K42,                K46,                K4A, K4B, K4C,   K4D, K4E, K4F  \
 ) { \
     { 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    }, \
@@ -75,7 +75,7 @@
 }
 
 
-/* LAYOUT_68_split_lshift
+/* LAYOUT_68_ansi_split_lshift
  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┐
  * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d     │ │0e │0f │
  * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┤
@@ -83,17 +83,17 @@
  * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┘
  * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c      │
  * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ ┌───┐
- * │30  |31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c        │ │3e │
+ * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c        │ │3e │
  * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬──┬─┴─┼───┼───┐
- * │40  │41  │42  │46                      │4a  │4b  │4c  │  │4d │4e │4f |
+ * │40  │41  │42  │46                      │4a  │4b  │4c  │  │4d │4e │4f │
  * └────┴────┴────┴────────────────────────┴────┴────┴────┘  └───┴───┴───┘
  */
-#define LAYOUT_68_split_lshift( \
-    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,                \
-    K30, k31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E,      \
-    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
+#define LAYOUT_68_ansi_split_lshift( \
+    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,             \
+    K30, k31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C,   K3E,      \
+    K40, K41, K42,                K46,                K4A, K4B, K4C,   K4D, K4E, K4F  \
 ) { \
     { 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    }, \
@@ -103,7 +103,7 @@
 }
 
 
-/* LAYOUT_68_split_rshift
+/* LAYOUT_68_ansi_split_rshift
  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┐
  * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d     │ │0e │0f │
  * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┤
@@ -113,15 +113,15 @@
  * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌───┐
  * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    │3d │ │3e │
  * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴─┬─┴─┼───┼───┐
- * │40  │41  │42  │46                      │4a  │4b  │4c  │  │4d │4e │4f |
+ * │40  │41  │42  │46                      │4a  │4b  │4c  │  │4d │4e │4f │
  * └────┴────┴────┴────────────────────────┴────┴────┴────┘  └───┴───┴───┘
  */
-#define LAYOUT_68_split_rshift( \
-    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,                \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,      \
-    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
+#define LAYOUT_68_ansi_split_rshift( \
+    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,             \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,   K3E,      \
+    K40, K41, K42,                K46,                K4A, K4B, K4C,   K4D, K4E, K4F  \
 ) { \
     { 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    }, \
@@ -131,7 +131,7 @@
 }
 
 
-/* LAYOUT_68_split_bs
+/* LAYOUT_68_ansi_split_bs
  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┐
  * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │2d │ │0e │0f │
  * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┤
@@ -141,15 +141,15 @@
  * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ ┌───┐
  * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c        │ │3e │
  * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬──┬─┴─┼───┼───┐
- * │40  │41  │42  │46                      │4a  │4b  │4c  │  │4d │4e │4f |
+ * │40  │41  │42  │46                      │4a  │4b  │4c  │  │4d │4e │4f │
  * └────┴────┴────┴────────────────────────┴────┴────┴────┘  └───┴───┴───┘
  */
-#define LAYOUT_68_split_bs( \
-    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,           \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E,      \
-    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
+#define LAYOUT_68_ansi_split_bs( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D,   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,                  \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C,        K3E,      \
+    K40, K41, K42,                K46,                K4A, K4B, K4C,        K4D, K4E, K4F  \
 ) { \
     { 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    }, \
@@ -164,20 +164,20 @@
  * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d     │ │0e │0f │
  * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┤
  * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │ │1e │1f │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    | └───┴───┘
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │ └───┴───┘
  * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │    │
  * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ ┌───┐
  * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c        │ │3e │
  * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬──┬─┴─┼───┼───┐
- * │40  │41  │42  │46                      │4a  │4b  │4c  │  │4d │4e │4f |
+ * │40  │41  │42  │46                      │4a  │4b  │4c  │  │4d │4e │4f │
  * └────┴────┴────┴────────────────────────┴────┴────┴────┘  └───┴───┴───┘
  */
 #define LAYOUT_68_iso( \
-    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,                \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E,      \
-    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
+    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,        K1E, K1F, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D,             \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C,   K3E,      \
+    K40, K41, K42,                K46,                K4A, K4B, K4C,   K4D, K4E, K4F  \
 ) { \
     { 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    }, \
@@ -187,7 +187,7 @@
 }
 
 
-/* LAYOUT_68_split_space
+/* LAYOUT_68_ansi_split_space
  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┐
  * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d     │ │0e │0f │
  * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┤
@@ -197,15 +197,15 @@
  * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ ┌───┐
  * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c        │ │3e │
  * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬────┬──┬─┴─┼───┼───┐
- * │40  │41  │42  │44      |46  |48        │4a  │4b  │4c  │  │4d │4e │4f |
+ * │40  │41  │42  │44      │46  │48        │4a  │4b  │4c  │  │4d │4e │4f │
  * └────┴────┴────┴────────┴────┴──────────┴────┴────┴────┘  └───┴───┴───┘
  */
-#define LAYOUT_68_split_space( \
-    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,                \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E,      \
-    K40, K41, K42,      K44,      K46,      K48,      K4A, K4B, K4C, K4D, K4E, K4F  \
+#define LAYOUT_68_ansi_split_space( \
+    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,             \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C,   K3E,      \
+    K40, K41, K42,      K44,      K46,      K48,      K4A, K4B, K4C,   K4D, K4E, K4F  \
 ) { \
     { 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    }, \
diff --git a/keyboards/wuque/ikki68_aurora/info.json b/keyboards/wuque/ikki68_aurora/info.json
index 06cdad4d17..190f691e65 100644
--- a/keyboards/wuque/ikki68_aurora/info.json
+++ b/keyboards/wuque/ikki68_aurora/info.json
@@ -2,8 +2,8 @@
     "keyboard_name": "ikki68_aurora",
     "url": "https://ikki68.com/",
     "maintainer": "qmk",
-    "width": 17.5,
-    "height": 6,
+    "width": 17.25,
+    "height": 5,
     "layouts": {
         "LAYOUT_68_ansi": {
             "layout": [
@@ -21,8 +21,8 @@
                 { "label": "-", "x": 11, "y": 0 },
                 { "label": "=", "x": 12, "y": 0 },
                 { "label": "Backspace", "x": 13, "y": 0, "w": 2 },
-                { "label": "Insert", "x": 15.5, "y": 0 },
-                { "label": "PageUp", "x": 16.5, "y": 0 },
+                { "label": "Insert", "x": 15.25, "y": 0 },
+                { "label": "PageUp", "x": 16.25, "y": 0 },
 
                 { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
                 { "label": "Q", "x": 1.5, "y": 1 },
@@ -38,8 +38,8 @@
                 { "label": "[", "x": 11.5, "y": 1 },
                 { "label": "]", "x": 12.5, "y": 1 },
                 { "label": "\\", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "Delete", "x": 15.5, "y": 1 },
-                { "label": "PageDown", "x": 16.5, "y": 1 },
+                { "label": "Delete", "x": 15.25, "y": 1 },
+                { "label": "PageDown", "x": 16.25, "y": 1 },
 
                 { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
                 { "label": "A", "x": 1.75, "y": 2 },
@@ -67,7 +67,7 @@
                 { "label": ".", "x": 10.25, "y": 3 },
                 { "label": "/", "x": 11.25, "y": 3 },
                 { "label": "Shift", "x": 12.25, "y": 3, "w": 2.75 },
-                { "label": "\u2191", "x": 15.5, "y": 3 },
+                { "label": "\u2191", "x": 15.25, "y": 3 },
 
                 { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
                 { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
@@ -76,9 +76,9 @@
                 { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
                 { "label": "Ctrl", "x": 11.25, "y": 4, "w": 1.25 },
                 { "label": "Menu", "x": 12.5, "y": 4, "w": 1.25 },
-                { "label": "\u2190", "x": 14.5, "y": 4 },
-                { "label": "\u2193", "x": 15.5, "y": 4 },
-                { "label": "\u2192", "x": 16.5, "y": 4 }
+                { "label": "\u2190", "x": 14.25, "y": 4 },
+                { "label": "\u2193", "x": 15.25, "y": 4 },
+                { "label": "\u2192", "x": 16.25, "y": 4 }
             ]
         },
         "LAYOUT_all": {
@@ -98,8 +98,8 @@
                 { "label": "=", "x": 12, "y": 0 },
                 { "label": "Backspace", "x": 13, "y": 0 },
                 { "label": "Backspace", "x": 14, "y": 0 },
-                { "label": "Insert", "x": 15.5, "y": 0 },
-                { "label": "PageUp", "x": 16.5, "y": 0 },
+                { "label": "Insert", "x": 15.25, "y": 0 },
+                { "label": "PageUp", "x": 16.25, "y": 0 },
 
                 { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
                 { "label": "Q", "x": 1.5, "y": 1 },
@@ -114,9 +114,9 @@
                 { "label": "P", "x": 10.5, "y": 1 },
                 { "label": "[", "x": 11.5, "y": 1 },
                 { "label": "]", "x": 12.5, "y": 1 },
-                { "label": "ISO", "x": 13.75, "y": 1, "w": 1.25, "h": 2 },
-                { "label": "Delete", "x": 15.5, "y": 1 },
-                { "label": "PageDown", "x": 16.5, "y": 1 },
+                { "label": "\\", "x": 13.5,"y": 1, "w": 1.5 },
+                { "label": "Delete", "x": 15.25, "y": 1 },
+                { "label": "PageDown", "x": 16.25, "y": 1 },
 
                 { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
                 { "label": "A", "x": 1.75, "y": 2 },
@@ -130,7 +130,7 @@
                 { "label": "L", "x": 9.75, "y": 2 },
                 { "label": ";", "x": 10.75, "y": 2 },
                 { "label": "'", "x": 11.75, "y": 2 },
-                { "label": "\\", "x": 12.75,"y": 2 },
+                { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
 
                 { "label": "Shift1", "x": 0, "y": 3, "w": 1.25 },
                 { "label": "Shift2", "x": 1.25, "y": 3 },
@@ -146,7 +146,7 @@
                 { "label": "/", "x": 11.25, "y": 3 },
                 { "label": "Shift1", "x": 12.25, "y": 3, "w": 1.75 },
                 { "label": "Shift2", "x": 14, "y": 3},
-                { "label": "\u2191", "x": 15.5, "y": 3 },
+                { "label": "\u2191", "x": 15.25, "y": 3 },
 
                 { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
                 { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
@@ -157,12 +157,12 @@
                 { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
                 { "label": "Ctrl", "x": 11.25, "y": 4, "w": 1.25 },
                 { "label": "Menu", "x": 12.5, "y": 4, "w": 1.25 },
-                { "label": "\u2190", "x": 14.5, "y": 4 },
-                { "label": "\u2193", "x": 15.5, "y": 4 },
-                { "label": "\u2192", "x": 16.5, "y": 4 }
+                { "label": "\u2190", "x": 14.25, "y": 4 },
+                { "label": "\u2193", "x": 15.25, "y": 4 },
+                { "label": "\u2192", "x": 16.25, "y": 4 }
             ]
         },
-        "LAYOUT_68_split_lshift": {
+        "LAYOUT_68_ansi_split_lshift": {
             "layout": [
                 { "label": "Esc", "x": 0, "y": 0 },
                 { "label": "1", "x": 1, "y": 0 },
@@ -178,8 +178,8 @@
                 { "label": "-", "x": 11, "y": 0 },
                 { "label": "=", "x": 12, "y": 0 },
                 { "label": "Backspace", "x": 13, "y": 0, "w": 2 },
-                { "label": "Insert", "x": 15.5, "y": 0 },
-                { "label": "PageUp", "x": 16.5, "y": 0 },
+                { "label": "Insert", "x": 15.25, "y": 0 },
+                { "label": "PageUp", "x": 16.25, "y": 0 },
 
                 { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
                 { "label": "Q", "x": 1.5, "y": 1 },
@@ -195,8 +195,8 @@
                 { "label": "[", "x": 11.5, "y": 1 },
                 { "label": "]", "x": 12.5, "y": 1 },
                 { "label": "\\", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "Delete", "x": 15.5, "y": 1 },
-                { "label": "PageDown", "x": 16.5, "y": 1 },
+                { "label": "Delete", "x": 15.25, "y": 1 },
+                { "label": "PageDown", "x": 16.25, "y": 1 },
 
                 { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
                 { "label": "A", "x": 1.75, "y": 2 },
@@ -225,7 +225,7 @@
                 { "label": ".", "x": 10.25, "y": 3 },
                 { "label": "/", "x": 11.25, "y": 3 },
                 { "label": "Shift", "x": 12.25, "y": 3, "w": 2.75 },
-                { "label": "\u2191", "x": 15.5, "y": 3 },
+                { "label": "\u2191", "x": 15.25, "y": 3 },
 
                 { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
                 { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
@@ -234,12 +234,12 @@
                 { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
                 { "label": "Ctrl", "x": 11.25, "y": 4, "w": 1.25 },
                 { "label": "Menu", "x": 12.5, "y": 4, "w": 1.25 },
-                { "label": "\u2190", "x": 14.5, "y": 4 },
-                { "label": "\u2193", "x": 15.5, "y": 4 },
-                { "label": "\u2192", "x": 16.5, "y": 4 }
+                { "label": "\u2190", "x": 14.25, "y": 4 },
+                { "label": "\u2193", "x": 15.25, "y": 4 },
+                { "label": "\u2192", "x": 16.25, "y": 4 }
             ]
         },
-        "LAYOUT_68_split_rshift": {
+        "LAYOUT_68_ansi_split_rshift": {
             "layout": [
                 { "label": "Esc", "x": 0, "y": 0 },
                 { "label": "1", "x": 1, "y": 0 },
@@ -255,8 +255,8 @@
                 { "label": "-", "x": 11, "y": 0 },
                 { "label": "=", "x": 12, "y": 0 },
                 { "label": "Backspace", "x": 13, "y": 0, "w": 2 },
-                { "label": "Insert", "x": 15.5, "y": 0 },
-                { "label": "PageUp", "x": 16.5, "y": 0 },
+                { "label": "Insert", "x": 15.25, "y": 0 },
+                { "label": "PageUp", "x": 16.25, "y": 0 },
 
                 { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
                 { "label": "Q", "x": 1.5, "y": 1 },
@@ -272,8 +272,8 @@
                 { "label": "[", "x": 11.5, "y": 1 },
                 { "label": "]", "x": 12.5, "y": 1 },
                 { "label": "\\", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "Delete", "x": 15.5, "y": 1 },
-                { "label": "PageDown", "x": 16.5, "y": 1 },
+                { "label": "Delete", "x": 15.25, "y": 1 },
+                { "label": "PageDown", "x": 16.25, "y": 1 },
 
                 { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
                 { "label": "A", "x": 1.75, "y": 2 },
@@ -302,7 +302,7 @@
                 { "label": "/", "x": 11.25, "y": 3 },
                 { "label": "Shift1", "x": 12.25, "y": 3, "w": 1.75 },
                 { "label": "Shift2", "x": 14, "y": 3},
-                { "label": "\u2191", "x": 15.5, "y": 3 },
+                { "label": "\u2191", "x": 15.25, "y": 3 },
 
                 { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
                 { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
@@ -311,12 +311,12 @@
                 { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
                 { "label": "Ctrl", "x": 11.25, "y": 4, "w": 1.25 },
                 { "label": "Menu", "x": 12.5, "y": 4, "w": 1.25 },
-                { "label": "\u2190", "x": 14.5, "y": 4 },
-                { "label": "\u2193", "x": 15.5, "y": 4 },
-                { "label": "\u2192", "x": 16.5, "y": 4 }
+                { "label": "\u2190", "x": 14.25, "y": 4 },
+                { "label": "\u2193", "x": 15.25, "y": 4 },
+                { "label": "\u2192", "x": 16.25, "y": 4 }
             ]
         },
-        "LAYOUT_68_split_bs": {
+        "LAYOUT_68_ansi_split_bs": {
             "layout": [
                 { "label": "Esc", "x": 0, "y": 0 },
                 { "label": "1", "x": 1, "y": 0 },
@@ -333,8 +333,8 @@
                 { "label": "=", "x": 12, "y": 0 },
                 { "label": "Backspace1", "x": 13, "y": 0},
                 { "label": "Backspace2", "x": 14, "y": 0},
-                { "label": "Insert", "x": 15.5, "y": 0 },
-                { "label": "PageUp", "x": 16.5, "y": 0 },
+                { "label": "Insert", "x": 15.25, "y": 0 },
+                { "label": "PageUp", "x": 16.25, "y": 0 },
 
                 { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
                 { "label": "Q", "x": 1.5, "y": 1 },
@@ -350,8 +350,8 @@
                 { "label": "[", "x": 11.5, "y": 1 },
                 { "label": "]", "x": 12.5, "y": 1 },
                 { "label": "\\", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "Delete", "x": 15.5, "y": 1 },
-                { "label": "PageDown", "x": 16.5, "y": 1 },
+                { "label": "Delete", "x": 15.25, "y": 1 },
+                { "label": "PageDown", "x": 16.25, "y": 1 },
 
                 { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
                 { "label": "A", "x": 1.75, "y": 2 },
@@ -379,7 +379,7 @@
                 { "label": ".", "x": 10.25, "y": 3 },
                 { "label": "/", "x": 11.25, "y": 3 },
                 { "label": "Shift", "x": 12.25, "y": 3, "w": 2.75 },
-                { "label": "\u2191", "x": 15.5, "y": 3 },
+                { "label": "\u2191", "x": 15.25, "y": 3 },
 
                 { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
                 { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
@@ -388,9 +388,9 @@
                 { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
                 { "label": "Ctrl", "x": 11.25, "y": 4, "w": 1.25 },
                 { "label": "Menu", "x": 12.5, "y": 4, "w": 1.25 },
-                { "label": "\u2190", "x": 14.5, "y": 4 },
-                { "label": "\u2193", "x": 15.5, "y": 4 },
-                { "label": "\u2192", "x": 16.5, "y": 4 }
+                { "label": "\u2190", "x": 14.25, "y": 4 },
+                { "label": "\u2193", "x": 15.25, "y": 4 },
+                { "label": "\u2192", "x": 16.25, "y": 4 }
             ]
         },
         "LAYOUT_68_iso": {
@@ -409,8 +409,8 @@
                 { "label": "-", "x": 11, "y": 0 },
                 { "label": "=", "x": 12, "y": 0 },
                 { "label": "Backspace", "x": 13, "y": 0, "w": 2 },
-                { "label": "Insert", "x": 15.5, "y": 0 },
-                { "label": "PageUp", "x": 16.5, "y": 0 },
+                { "label": "Insert", "x": 15.25, "y": 0 },
+                { "label": "PageUp", "x": 16.25, "y": 0 },
 
                 { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
                 { "label": "Q", "x": 1.5, "y": 1 },
@@ -425,9 +425,8 @@
                 { "label": "P", "x": 10.5, "y": 1 },
                 { "label": "[", "x": 11.5, "y": 1 },
                 { "label": "]", "x": 12.5, "y": 1 },
-                { "label": "ISO", "x": 13.75, "y": 1, "w": 1.25, "h": 2 },
-                { "label": "Delete", "x": 15.5, "y": 1 },
-                { "label": "PageDown", "x": 16.5, "y": 1 },
+                { "label": "Delete", "x": 15.25, "y": 1 },
+                { "label": "PageDown", "x": 16.25, "y": 1 },
 
                 { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
                 { "label": "A", "x": 1.75, "y": 2 },
@@ -442,6 +441,7 @@
                 { "label": ";", "x": 10.75, "y": 2 },
                 { "label": "'", "x": 11.75, "y": 2 },
                 { "label": "\\", "x": 12.75,"y": 2 },
+                { "label": "ISO", "x": 13.75, "y": 1, "w": 1.25, "h": 2 },
 
                 { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
                 { "label": "Z", "x": 2.25, "y": 3 },
@@ -455,7 +455,7 @@
                 { "label": ".", "x": 10.25, "y": 3 },
                 { "label": "/", "x": 11.25, "y": 3 },
                 { "label": "Shift", "x": 12.25, "y": 3, "w": 2.75 },
-                { "label": "\u2191", "x": 15.5, "y": 3 },
+                { "label": "\u2191", "x": 15.25, "y": 3 },
 
                 { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
                 { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
@@ -464,12 +464,12 @@
                 { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
                 { "label": "Ctrl", "x": 11.25, "y": 4, "w": 1.25 },
                 { "label": "Menu", "x": 12.5, "y": 4, "w": 1.25 },
-                { "label": "\u2190", "x": 14.5, "y": 4 },
-                { "label": "\u2193", "x": 15.5, "y": 4 },
-                { "label": "\u2192", "x": 16.5, "y": 4 }
+                { "label": "\u2190", "x": 14.25, "y": 4 },
+                { "label": "\u2193", "x": 15.25, "y": 4 },
+                { "label": "\u2192", "x": 16.25, "y": 4 }
             ]
         },
-        "LAYOUT_68_split_space": {
+        "LAYOUT_68_ansi_split_space": {
             "layout": [
                 { "label": "Esc", "x": 0, "y": 0 },
                 { "label": "1", "x": 1, "y": 0 },
@@ -485,8 +485,8 @@
                 { "label": "-", "x": 11, "y": 0 },
                 { "label": "=", "x": 12, "y": 0 },
                 { "label": "Backspace", "x": 13, "y": 0, "w": 2 },
-                { "label": "Insert", "x": 15.5, "y": 0 },
-                { "label": "PageUp", "x": 16.5, "y": 0 },
+                { "label": "Insert", "x": 15.25, "y": 0 },
+                { "label": "PageUp", "x": 16.25, "y": 0 },
 
                 { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
                 { "label": "Q", "x": 1.5, "y": 1 },
@@ -502,8 +502,8 @@
                 { "label": "[", "x": 11.5, "y": 1 },
                 { "label": "]", "x": 12.5, "y": 1 },
                 { "label": "\\", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "Delete", "x": 15.5, "y": 1 },
-                { "label": "PageDown", "x": 16.5, "y": 1 },
+                { "label": "Delete", "x": 15.25, "y": 1 },
+                { "label": "PageDown", "x": 16.25, "y": 1 },
 
                 { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
                 { "label": "A", "x": 1.75, "y": 2 },
@@ -531,7 +531,7 @@
                 { "label": ".", "x": 10.25, "y": 3 },
                 { "label": "/", "x": 11.25, "y": 3 },
                 { "label": "Shift", "x": 12.25, "y": 3, "w": 2.75 },
-                { "label": "\u2191", "x": 15.5, "y": 3 },
+                { "label": "\u2191", "x": 15.25, "y": 3 },
 
                 { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
                 { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
@@ -542,9 +542,9 @@
                 { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
                 { "label": "Ctrl", "x": 11.25, "y": 4, "w": 1.25 },
                 { "label": "Menu", "x": 12.5, "y": 4, "w": 1.25 },
-                { "label": "\u2190", "x": 14.5, "y": 4 },
-                { "label": "\u2193", "x": 15.5, "y": 4 },
-                { "label": "\u2192", "x": 16.5, "y": 4 }
+                { "label": "\u2190", "x": 14.25, "y": 4 },
+                { "label": "\u2193", "x": 15.25, "y": 4 },
+                { "label": "\u2192", "x": 16.25, "y": 4 }
             ]
         }
     }
diff --git a/keyboards/wuque/ikki68_aurora/keymaps/68_ansi/keymap.c b/keyboards/wuque/ikki68_aurora/keymaps/68_ansi/keymap.c
index 3d6149b9f1..cf20b434f0 100644
--- a/keyboards/wuque/ikki68_aurora/keymaps/68_ansi/keymap.c
+++ b/keyboards/wuque/ikki68_aurora/keymaps/68_ansi/keymap.c
@@ -18,31 +18,31 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_68_ansi(
-        KC_ESC,  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_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_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,