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

4 files changed, 708 insertions, 120 deletions

diff --git a/keyboards/wuque/creek70/info.json b/keyboards/wuque/creek70/info.json
index 003077e651..e00ec33b38 100644
--- a/keyboards/wuque/creek70/info.json
+++ b/keyboards/wuque/creek70/info.json
@@ -34,97 +34,658 @@
     "max_brightness": 200,
     "sleep": true
   },
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_all"
+  },
   "layouts": {
-    "LAYOUT": {
+    "LAYOUT_all": {
       "layout": [
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [0, 13], "x": 13, "y": 0},
-        {"matrix": [0, 14], "x": 14, "y": 0},
-
-        {"matrix": [2, 14], "x": 16.25, "y": 0},
-        {"matrix": [0, 15], "x": 17.25, "y": 0},
-        {"matrix": [0, 16], "x": 18.25, "y": 0},
-
-        {"matrix": [0, 17], "x": 0, "y": 1},
-        {"matrix": [1, 0], "x": 1, "y": 1, "w": 1.5},
-        {"matrix": [1, 1], "x": 2.5, "y": 1},
-        {"matrix": [1, 2], "x": 3.5, "y": 1},
-        {"matrix": [1, 3], "x": 4.5, "y": 1},
-        {"matrix": [1, 4], "x": 5.5, "y": 1},
-        {"matrix": [1, 5], "x": 6.5, "y": 1},
-        {"matrix": [1, 6], "x": 7.5, "y": 1},
-        {"matrix": [1, 7], "x": 8.5, "y": 1},
-        {"matrix": [1, 8], "x": 9.5, "y": 1},
-        {"matrix": [1, 9], "x": 10.5, "y": 1},
-        {"matrix": [1, 10], "x": 11.5, "y": 1},
-        {"matrix": [1, 11], "x": 12.5, "y": 1},
-        {"matrix": [1, 12], "x": 13.5, "y": 1},
-        {"matrix": [1, 13], "x": 14.5, "y": 1, "w": 1.5},
-
-        {"matrix": [1, 14], "x": 16.25, "y": 1},
-        {"matrix": [1, 15], "x": 17.25, "y": 1},
-        {"matrix": [1, 16], "x": 18.25, "y": 1},
-
-        {"matrix": [1, 17], "x": 0, "y": 2},
-        {"matrix": [2, 0], "x": 1, "y": 2, "w": 1.75},
-        {"matrix": [2, 1], "x": 2.75, "y": 2},
-        {"matrix": [2, 2], "x": 3.75, "y": 2},
-        {"matrix": [2, 3], "x": 4.75, "y": 2},
-        {"matrix": [2, 4], "x": 5.75, "y": 2},
-        {"matrix": [2, 5], "x": 6.75, "y": 2},
-        {"matrix": [2, 6], "x": 7.75, "y": 2},
-        {"matrix": [2, 7], "x": 8.75, "y": 2},
-        {"matrix": [2, 8], "x": 9.75, "y": 2},
-        {"matrix": [2, 9], "x": 10.75, "y": 2},
-        {"matrix": [2, 10], "x": 11.75, "y": 2},
-        {"matrix": [2, 11], "x": 12.75, "y": 2},
-        {"matrix": [2, 12], "x": 13.75, "y": 2, "w": 2.25},
-        {"matrix": [2, 13], "x": 15, "y": 0},
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+        {"matrix": [0, 5], "x": 5.25, "y": 0},
+        {"matrix": [0, 6], "x": 6.25, "y": 0},
+        {"matrix": [0, 7], "x": 7.25, "y": 0},
+        {"matrix": [0, 8], "x": 8.25, "y": 0},
+        {"matrix": [0, 9], "x": 9.25, "y": 0},
+        {"matrix": [0, 10], "x": 10.25, "y": 0},
+        {"matrix": [0, 11], "x": 11.25, "y": 0},
+        {"matrix": [0, 12], "x": 12.25, "y": 0},
+        {"matrix": [0, 13], "x": 13.25, "y": 0},
+        {"matrix": [0, 14], "x": 14.25, "y": 0},
+        {"matrix": [2, 14], "x": 15.25, "y": 0},
+
+        {"matrix": [0, 15], "x": 16.5, "y": 0},
+        {"matrix": [0, 16], "x": 17.5, "y": 0},
+        {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+
+        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 2.75, "y": 1},
+        {"matrix": [1, 3], "x": 3.75, "y": 1},
+        {"matrix": [1, 4], "x": 4.75, "y": 1},
+        {"matrix": [1, 5], "x": 5.75, "y": 1},
+        {"matrix": [1, 6], "x": 6.75, "y": 1},
+        {"matrix": [1, 7], "x": 7.75, "y": 1},
+        {"matrix": [1, 8], "x": 8.75, "y": 1},
+        {"matrix": [1, 9], "x": 9.75, "y": 1},
+        {"matrix": [1, 10], "x": 10.75, "y": 1},
+        {"matrix": [1, 11], "x": 11.75, "y": 1},
+        {"matrix": [1, 12], "x": 12.75, "y": 1},
+        {"matrix": [1, 13], "x": 13.75, "y": 1},
+        {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+
+        {"matrix": [1, 15], "x": 16.5, "y": 1},
+        {"matrix": [1, 16], "x": 17.5, "y": 1},
+        {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [2, 5], "x": 6, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+        {"matrix": [2, 7], "x": 8, "y": 2},
+        {"matrix": [2, 8], "x": 9, "y": 2},
+        {"matrix": [2, 9], "x": 10, "y": 2},
+        {"matrix": [2, 10], "x": 11, "y": 2},
+        {"matrix": [2, 11], "x": 12, "y": 2},
+        {"matrix": [2, 12], "x": 13, "y": 2},
+        {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
 
         {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [3, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3, "w": 1.25},
-        {"matrix": [3, 3], "x": 3.25, "y": 3},
-        {"matrix": [3, 4], "x": 4.25, "y": 3},
-        {"matrix": [3, 5], "x": 5.25, "y": 3},
-        {"matrix": [3, 6], "x": 6.25, "y": 3},
-        {"matrix": [3, 7], "x": 7.25, "y": 3},
-        {"matrix": [3, 8], "x": 8.25, "y": 3},
-        {"matrix": [3, 9], "x": 9.25, "y": 3},
-        {"matrix": [3, 10], "x": 10.25, "y": 3},
-        {"matrix": [3, 11], "x": 11.25, "y": 3},
-        {"matrix": [3, 12], "x": 12.25, "y": 3},
-        {"matrix": [3, 13], "x": 13.25, "y": 3, "w": 1.75},
-        {"matrix": [3, 14], "x": 15, "y": 3},
-
-        {"matrix": [3, 16], "x": 17.25, "y": 3},
+
+        {"matrix": [3, 1], "x": 1.25, "y": 3},
+        {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+        {"matrix": [3, 3], "x": 3.5, "y": 3},
+        {"matrix": [3, 4], "x": 4.5, "y": 3},
+        {"matrix": [3, 5], "x": 5.5, "y": 3},
+        {"matrix": [3, 6], "x": 6.5, "y": 3},
+        {"matrix": [3, 7], "x": 7.5, "y": 3},
+        {"matrix": [3, 8], "x": 8.5, "y": 3},
+        {"matrix": [3, 9], "x": 9.5, "y": 3},
+        {"matrix": [3, 10], "x": 10.5, "y": 3},
+        {"matrix": [3, 11], "x": 11.5, "y": 3},
+        {"matrix": [3, 12], "x": 12.5, "y": 3},
+        {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+        {"matrix": [3, 16], "x": 17.5, "y": 3},
 
         {"matrix": [4, 0], "x": 0, "y": 4},
-        {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
-        {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 6], "x": 4.75, "y": 4, "w": 2.5},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 5, "y": 4, "w": 2.25},
         {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 8], "x": 8.5, "y": 4, "w": 2.5},
-        {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.25},
-        {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.25},
-
-        {"matrix": [4, 15], "x": 16.25, "y": 4},
-        {"matrix": [4, 16], "x": 17.25, "y": 4},
-        {"matrix": [4, 17], "x": 18.25, "y": 4}
+        {"matrix": [4, 8], "x": 8.5, "y": 4, "w": 2.75},
+        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25},
+
+        {"matrix": [4, 15], "x": 16.5, "y": 4},
+        {"matrix": [4, 16], "x": 17.5, "y": 4},
+        {"matrix": [4, 17], "x": 18.5, "y": 4}
+      ]
+    },
+    "LAYOUT_ansi": {
+      "layout": [
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+        {"matrix": [0, 5], "x": 5.25, "y": 0},
+        {"matrix": [0, 6], "x": 6.25, "y": 0},
+        {"matrix": [0, 7], "x": 7.25, "y": 0},
+        {"matrix": [0, 8], "x": 8.25, "y": 0},
+        {"matrix": [0, 9], "x": 9.25, "y": 0},
+        {"matrix": [0, 10], "x": 10.25, "y": 0},
+        {"matrix": [0, 11], "x": 11.25, "y": 0},
+        {"matrix": [0, 12], "x": 12.25, "y": 0},
+        {"matrix": [0, 13], "x": 13.25, "y": 0},
+        {"matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
+
+        {"matrix": [0, 15], "x": 16.5, "y": 0},
+        {"matrix": [0, 16], "x": 17.5, "y": 0},
+        {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+
+        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 2.75, "y": 1},
+        {"matrix": [1, 3], "x": 3.75, "y": 1},
+        {"matrix": [1, 4], "x": 4.75, "y": 1},
+        {"matrix": [1, 5], "x": 5.75, "y": 1},
+        {"matrix": [1, 6], "x": 6.75, "y": 1},
+        {"matrix": [1, 7], "x": 7.75, "y": 1},
+        {"matrix": [1, 8], "x": 8.75, "y": 1},
+        {"matrix": [1, 9], "x": 9.75, "y": 1},
+        {"matrix": [1, 10], "x": 10.75, "y": 1},
+        {"matrix": [1, 11], "x": 11.75, "y": 1},
+        {"matrix": [1, 12], "x": 12.75, "y": 1},
+        {"matrix": [1, 13], "x": 13.75, "y": 1},
+        {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+
+        {"matrix": [1, 15], "x": 16.5, "y": 1},
+        {"matrix": [1, 16], "x": 17.5, "y": 1},
+        {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [2, 5], "x": 6, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+        {"matrix": [2, 7], "x": 8, "y": 2},
+        {"matrix": [2, 8], "x": 9, "y": 2},
+        {"matrix": [2, 9], "x": 10, "y": 2},
+        {"matrix": [2, 10], "x": 11, "y": 2},
+        {"matrix": [2, 11], "x": 12, "y": 2},
+        {"matrix": [2, 12], "x": 13, "y": 2},
+        {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+
+        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 3], "x": 3.5, "y": 3},
+        {"matrix": [3, 4], "x": 4.5, "y": 3},
+        {"matrix": [3, 5], "x": 5.5, "y": 3},
+        {"matrix": [3, 6], "x": 6.5, "y": 3},
+        {"matrix": [3, 7], "x": 7.5, "y": 3},
+        {"matrix": [3, 8], "x": 8.5, "y": 3},
+        {"matrix": [3, 9], "x": 9.5, "y": 3},
+        {"matrix": [3, 10], "x": 10.5, "y": 3},
+        {"matrix": [3, 11], "x": 11.5, "y": 3},
+        {"matrix": [3, 12], "x": 12.5, "y": 3},
+        {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 2.75},
+
+        {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25},
+
+        {"matrix": [4, 15], "x": 16.5, "y": 4},
+        {"matrix": [4, 16], "x": 17.5, "y": 4},
+        {"matrix": [4, 17], "x": 18.5, "y": 4}
+      ]
+    },
+    "LAYOUT_ansi_split_bs_rshift": {
+      "layout": [
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+        {"matrix": [0, 5], "x": 5.25, "y": 0},
+        {"matrix": [0, 6], "x": 6.25, "y": 0},
+        {"matrix": [0, 7], "x": 7.25, "y": 0},
+        {"matrix": [0, 8], "x": 8.25, "y": 0},
+        {"matrix": [0, 9], "x": 9.25, "y": 0},
+        {"matrix": [0, 10], "x": 10.25, "y": 0},
+        {"matrix": [0, 11], "x": 11.25, "y": 0},
+        {"matrix": [0, 12], "x": 12.25, "y": 0},
+        {"matrix": [0, 13], "x": 13.25, "y": 0},
+        {"matrix": [0, 14], "x": 14.25, "y": 0},
+        {"matrix": [2, 14], "x": 15.25, "y": 0},
+
+        {"matrix": [0, 15], "x": 16.5, "y": 0},
+        {"matrix": [0, 16], "x": 17.5, "y": 0},
+        {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+
+        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 2.75, "y": 1},
+        {"matrix": [1, 3], "x": 3.75, "y": 1},
+        {"matrix": [1, 4], "x": 4.75, "y": 1},
+        {"matrix": [1, 5], "x": 5.75, "y": 1},
+        {"matrix": [1, 6], "x": 6.75, "y": 1},
+        {"matrix": [1, 7], "x": 7.75, "y": 1},
+        {"matrix": [1, 8], "x": 8.75, "y": 1},
+        {"matrix": [1, 9], "x": 9.75, "y": 1},
+        {"matrix": [1, 10], "x": 10.75, "y": 1},
+        {"matrix": [1, 11], "x": 11.75, "y": 1},
+        {"matrix": [1, 12], "x": 12.75, "y": 1},
+        {"matrix": [1, 13], "x": 13.75, "y": 1},
+        {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+
+        {"matrix": [1, 15], "x": 16.5, "y": 1},
+        {"matrix": [1, 16], "x": 17.5, "y": 1},
+        {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [2, 5], "x": 6, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+        {"matrix": [2, 7], "x": 8, "y": 2},
+        {"matrix": [2, 8], "x": 9, "y": 2},
+        {"matrix": [2, 9], "x": 10, "y": 2},
+        {"matrix": [2, 10], "x": 11, "y": 2},
+        {"matrix": [2, 11], "x": 12, "y": 2},
+        {"matrix": [2, 12], "x": 13, "y": 2},
+        {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+
+        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 3], "x": 3.5, "y": 3},
+        {"matrix": [3, 4], "x": 4.5, "y": 3},
+        {"matrix": [3, 5], "x": 5.5, "y": 3},
+        {"matrix": [3, 6], "x": 6.5, "y": 3},
+        {"matrix": [3, 7], "x": 7.5, "y": 3},
+        {"matrix": [3, 8], "x": 8.5, "y": 3},
+        {"matrix": [3, 9], "x": 9.5, "y": 3},
+        {"matrix": [3, 10], "x": 10.5, "y": 3},
+        {"matrix": [3, 11], "x": 11.5, "y": 3},
+        {"matrix": [3, 12], "x": 12.5, "y": 3},
+        {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+        {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25},
+
+        {"matrix": [4, 15], "x": 16.5, "y": 4},
+        {"matrix": [4, 16], "x": 17.5, "y": 4},
+        {"matrix": [4, 17], "x": 18.5, "y": 4}
+      ]
+    },
+    "LAYOUT_ansi_split_space": {
+      "layout": [
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+        {"matrix": [0, 5], "x": 5.25, "y": 0},
+        {"matrix": [0, 6], "x": 6.25, "y": 0},
+        {"matrix": [0, 7], "x": 7.25, "y": 0},
+        {"matrix": [0, 8], "x": 8.25, "y": 0},
+        {"matrix": [0, 9], "x": 9.25, "y": 0},
+        {"matrix": [0, 10], "x": 10.25, "y": 0},
+        {"matrix": [0, 11], "x": 11.25, "y": 0},
+        {"matrix": [0, 12], "x": 12.25, "y": 0},
+        {"matrix": [0, 13], "x": 13.25, "y": 0},
+        {"matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
+
+        {"matrix": [0, 15], "x": 16.5, "y": 0},
+        {"matrix": [0, 16], "x": 17.5, "y": 0},
+        {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+
+        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 2.75, "y": 1},
+        {"matrix": [1, 3], "x": 3.75, "y": 1},
+        {"matrix": [1, 4], "x": 4.75, "y": 1},
+        {"matrix": [1, 5], "x": 5.75, "y": 1},
+        {"matrix": [1, 6], "x": 6.75, "y": 1},
+        {"matrix": [1, 7], "x": 7.75, "y": 1},
+        {"matrix": [1, 8], "x": 8.75, "y": 1},
+        {"matrix": [1, 9], "x": 9.75, "y": 1},
+        {"matrix": [1, 10], "x": 10.75, "y": 1},
+        {"matrix": [1, 11], "x": 11.75, "y": 1},
+        {"matrix": [1, 12], "x": 12.75, "y": 1},
+        {"matrix": [1, 13], "x": 13.75, "y": 1},
+        {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+
+        {"matrix": [1, 15], "x": 16.5, "y": 1},
+        {"matrix": [1, 16], "x": 17.5, "y": 1},
+        {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [2, 5], "x": 6, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+        {"matrix": [2, 7], "x": 8, "y": 2},
+        {"matrix": [2, 8], "x": 9, "y": 2},
+        {"matrix": [2, 9], "x": 10, "y": 2},
+        {"matrix": [2, 10], "x": 11, "y": 2},
+        {"matrix": [2, 11], "x": 12, "y": 2},
+        {"matrix": [2, 12], "x": 13, "y": 2},
+        {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+
+        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 3], "x": 3.5, "y": 3},
+        {"matrix": [3, 4], "x": 4.5, "y": 3},
+        {"matrix": [3, 5], "x": 5.5, "y": 3},
+        {"matrix": [3, 6], "x": 6.5, "y": 3},
+        {"matrix": [3, 7], "x": 7.5, "y": 3},
+        {"matrix": [3, 8], "x": 8.5, "y": 3},
+        {"matrix": [3, 9], "x": 9.5, "y": 3},
+        {"matrix": [3, 10], "x": 10.5, "y": 3},
+        {"matrix": [3, 11], "x": 11.5, "y": 3},
+        {"matrix": [3, 12], "x": 12.5, "y": 3},
+        {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 2.75},
+
+        {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 5, "y": 4, "w": 2.25},
+        {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 8], "x": 8.5, "y": 4, "w": 2.75},
+        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25},
+
+        {"matrix": [4, 15], "x": 16.5, "y": 4},
+        {"matrix": [4, 16], "x": 17.5, "y": 4},
+        {"matrix": [4, 17], "x": 18.5, "y": 4}
+      ]
+    },
+    "LAYOUT_ansi_split_space_split_bs_rshift": {
+      "layout": [
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+        {"matrix": [0, 5], "x": 5.25, "y": 0},
+        {"matrix": [0, 6], "x": 6.25, "y": 0},
+        {"matrix": [0, 7], "x": 7.25, "y": 0},
+        {"matrix": [0, 8], "x": 8.25, "y": 0},
+        {"matrix": [0, 9], "x": 9.25, "y": 0},
+        {"matrix": [0, 10], "x": 10.25, "y": 0},
+        {"matrix": [0, 11], "x": 11.25, "y": 0},
+        {"matrix": [0, 12], "x": 12.25, "y": 0},
+        {"matrix": [0, 13], "x": 13.25, "y": 0},
+        {"matrix": [0, 14], "x": 14.25, "y": 0},
+        {"matrix": [2, 14], "x": 15.25, "y": 0},
+
+        {"matrix": [0, 15], "x": 16.5, "y": 0},
+        {"matrix": [0, 16], "x": 17.5, "y": 0},
+        {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+
+        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 2.75, "y": 1},
+        {"matrix": [1, 3], "x": 3.75, "y": 1},
+        {"matrix": [1, 4], "x": 4.75, "y": 1},
+        {"matrix": [1, 5], "x": 5.75, "y": 1},
+        {"matrix": [1, 6], "x": 6.75, "y": 1},
+        {"matrix": [1, 7], "x": 7.75, "y": 1},
+        {"matrix": [1, 8], "x": 8.75, "y": 1},
+        {"matrix": [1, 9], "x": 9.75, "y": 1},
+        {"matrix": [1, 10], "x": 10.75, "y": 1},
+        {"matrix": [1, 11], "x": 11.75, "y": 1},
+        {"matrix": [1, 12], "x": 12.75, "y": 1},
+        {"matrix": [1, 13], "x": 13.75, "y": 1},
+        {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+
+        {"matrix": [1, 15], "x": 16.5, "y": 1},
+        {"matrix": [1, 16], "x": 17.5, "y": 1},
+        {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [2, 5], "x": 6, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+        {"matrix": [2, 7], "x": 8, "y": 2},
+        {"matrix": [2, 8], "x": 9, "y": 2},
+        {"matrix": [2, 9], "x": 10, "y": 2},
+        {"matrix": [2, 10], "x": 11, "y": 2},
+        {"matrix": [2, 11], "x": 12, "y": 2},
+        {"matrix": [2, 12], "x": 13, "y": 2},
+        {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+
+        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 3], "x": 3.5, "y": 3},
+        {"matrix": [3, 4], "x": 4.5, "y": 3},
+        {"matrix": [3, 5], "x": 5.5, "y": 3},
+        {"matrix": [3, 6], "x": 6.5, "y": 3},
+        {"matrix": [3, 7], "x": 7.5, "y": 3},
+        {"matrix": [3, 8], "x": 8.5, "y": 3},
+        {"matrix": [3, 9], "x": 9.5, "y": 3},
+        {"matrix": [3, 10], "x": 10.5, "y": 3},
+        {"matrix": [3, 11], "x": 11.5, "y": 3},
+        {"matrix": [3, 12], "x": 12.5, "y": 3},
+        {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+        {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 5, "y": 4, "w": 2.25},
+        {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 8], "x": 8.5, "y": 4, "w": 2.75},
+        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25},
+
+        {"matrix": [4, 15], "x": 16.5, "y": 4},
+        {"matrix": [4, 16], "x": 17.5, "y": 4},
+        {"matrix": [4, 17], "x": 18.5, "y": 4}
+      ]
+    },
+    "LAYOUT_ansi_tsangan": {
+      "layout": [
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+        {"matrix": [0, 5], "x": 5.25, "y": 0},
+        {"matrix": [0, 6], "x": 6.25, "y": 0},
+        {"matrix": [0, 7], "x": 7.25, "y": 0},
+        {"matrix": [0, 8], "x": 8.25, "y": 0},
+        {"matrix": [0, 9], "x": 9.25, "y": 0},
+        {"matrix": [0, 10], "x": 10.25, "y": 0},
+        {"matrix": [0, 11], "x": 11.25, "y": 0},
+        {"matrix": [0, 12], "x": 12.25, "y": 0},
+        {"matrix": [0, 13], "x": 13.25, "y": 0},
+        {"matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
+
+        {"matrix": [0, 15], "x": 16.5, "y": 0},
+        {"matrix": [0, 16], "x": 17.5, "y": 0},
+        {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+
+        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 2.75, "y": 1},
+        {"matrix": [1, 3], "x": 3.75, "y": 1},
+        {"matrix": [1, 4], "x": 4.75, "y": 1},
+        {"matrix": [1, 5], "x": 5.75, "y": 1},
+        {"matrix": [1, 6], "x": 6.75, "y": 1},
+        {"matrix": [1, 7], "x": 7.75, "y": 1},
+        {"matrix": [1, 8], "x": 8.75, "y": 1},
+        {"matrix": [1, 9], "x": 9.75, "y": 1},
+        {"matrix": [1, 10], "x": 10.75, "y": 1},
+        {"matrix": [1, 11], "x": 11.75, "y": 1},
+        {"matrix": [1, 12], "x": 12.75, "y": 1},
+        {"matrix": [1, 13], "x": 13.75, "y": 1},
+        {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+
+        {"matrix": [1, 15], "x": 16.5, "y": 1},
+        {"matrix": [1, 16], "x": 17.5, "y": 1},
+        {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [2, 5], "x": 6, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+        {"matrix": [2, 7], "x": 8, "y": 2},
+        {"matrix": [2, 8], "x": 9, "y": 2},
+        {"matrix": [2, 9], "x": 10, "y": 2},
+        {"matrix": [2, 10], "x": 11, "y": 2},
+        {"matrix": [2, 11], "x": 12, "y": 2},
+        {"matrix": [2, 12], "x": 13, "y": 2},
+        {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+
+        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 3], "x": 3.5, "y": 3},
+        {"matrix": [3, 4], "x": 4.5, "y": 3},
+        {"matrix": [3, 5], "x": 5.5, "y": 3},
+        {"matrix": [3, 6], "x": 6.5, "y": 3},
+        {"matrix": [3, 7], "x": 7.5, "y": 3},
+        {"matrix": [3, 8], "x": 8.5, "y": 3},
+        {"matrix": [3, 9], "x": 9.5, "y": 3},
+        {"matrix": [3, 10], "x": 10.5, "y": 3},
+        {"matrix": [3, 11], "x": 11.5, "y": 3},
+        {"matrix": [3, 12], "x": 12.5, "y": 3},
+        {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 2.75},
+
+        {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 2], "x": 2.75, "y": 4},
+        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
+        {"matrix": [4, 7], "x": 5.25, "y": 4, "w": 7},
+        {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 13], "x": 13.75, "y": 4},
+        {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.5},
+
+        {"matrix": [4, 15], "x": 16.5, "y": 4},
+        {"matrix": [4, 16], "x": 17.5, "y": 4},
+        {"matrix": [4, 17], "x": 18.5, "y": 4}
+      ]
+    },
+    "LAYOUT_ansi_tsangan_split_bs_rshift": {
+      "layout": [
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+        {"matrix": [0, 5], "x": 5.25, "y": 0},
+        {"matrix": [0, 6], "x": 6.25, "y": 0},
+        {"matrix": [0, 7], "x": 7.25, "y": 0},
+        {"matrix": [0, 8], "x": 8.25, "y": 0},
+        {"matrix": [0, 9], "x": 9.25, "y": 0},
+        {"matrix": [0, 10], "x": 10.25, "y": 0},
+        {"matrix": [0, 11], "x": 11.25, "y": 0},
+        {"matrix": [0, 12], "x": 12.25, "y": 0},
+        {"matrix": [0, 13], "x": 13.25, "y": 0},
+        {"matrix": [0, 14], "x": 14.25, "y": 0},
+        {"matrix": [2, 14], "x": 15.25, "y": 0},
+
+        {"matrix": [0, 15], "x": 16.5, "y": 0},
+        {"matrix": [0, 16], "x": 17.5, "y": 0},
+        {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+
+        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 2.75, "y": 1},
+        {"matrix": [1, 3], "x": 3.75, "y": 1},
+        {"matrix": [1, 4], "x": 4.75, "y": 1},
+        {"matrix": [1, 5], "x": 5.75, "y": 1},
+        {"matrix": [1, 6], "x": 6.75, "y": 1},
+        {"matrix": [1, 7], "x": 7.75, "y": 1},
+        {"matrix": [1, 8], "x": 8.75, "y": 1},
+        {"matrix": [1, 9], "x": 9.75, "y": 1},
+        {"matrix": [1, 10], "x": 10.75, "y": 1},
+        {"matrix": [1, 11], "x": 11.75, "y": 1},
+        {"matrix": [1, 12], "x": 12.75, "y": 1},
+        {"matrix": [1, 13], "x": 13.75, "y": 1},
+        {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+
+        {"matrix": [1, 15], "x": 16.5, "y": 1},
+        {"matrix": [1, 16], "x": 17.5, "y": 1},
+        {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [2, 5], "x": 6, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+        {"matrix": [2, 7], "x": 8, "y": 2},
+        {"matrix": [2, 8], "x": 9, "y": 2},
+        {"matrix": [2, 9], "x": 10, "y": 2},
+        {"matrix": [2, 10], "x": 11, "y": 2},
+        {"matrix": [2, 11], "x": 12, "y": 2},
+        {"matrix": [2, 12], "x": 13, "y": 2},
+        {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+
+        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 3], "x": 3.5, "y": 3},
+        {"matrix": [3, 4], "x": 4.5, "y": 3},
+        {"matrix": [3, 5], "x": 5.5, "y": 3},
+        {"matrix": [3, 6], "x": 6.5, "y": 3},
+        {"matrix": [3, 7], "x": 7.5, "y": 3},
+        {"matrix": [3, 8], "x": 8.5, "y": 3},
+        {"matrix": [3, 9], "x": 9.5, "y": 3},
+        {"matrix": [3, 10], "x": 10.5, "y": 3},
+        {"matrix": [3, 11], "x": 11.5, "y": 3},
+        {"matrix": [3, 12], "x": 12.5, "y": 3},
+        {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+        {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 2], "x": 2.75, "y": 4},
+        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
+        {"matrix": [4, 7], "x": 5.25, "y": 4, "w": 7},
+        {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 13], "x": 13.75, "y": 4},
+        {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.5},
+
+        {"matrix": [4, 15], "x": 16.5, "y": 4},
+        {"matrix": [4, 16], "x": 17.5, "y": 4},
+        {"matrix": [4, 17], "x": 18.5, "y": 4}
       ]
     }
   }
diff --git a/keyboards/wuque/creek70/keymaps/default/keymap.c b/keyboards/wuque/creek70/keymaps/default/keymap.c
index 4a06785254..167aebeaf9 100644
--- a/keyboards/wuque/creek70/keymaps/default/keymap.c
+++ b/keyboards/wuque/creek70/keymaps/default/keymap.c
@@ -17,18 +17,18 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
-    [0] = LAYOUT(
-		           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_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
-		KC_MUTE,   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_VOLU,   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_VOLD,   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_PAUSE,  KC_LCTL, KC_LGUI, KC_LALT,                    KC_SPC,  KC_SPC,  KC_SPC,                    KC_RALT, KC_LGUI, MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RIGHT
+    [0] = LAYOUT_all(
+                    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_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_MUTE,    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_VOLU,    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_VOLD,    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_PAUS,    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                    KC_RALT, KC_LGUI, MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [1] = LAYOUT(
-                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,   _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
-        _______, _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______,             _______, _______, _______
+    [1] = LAYOUT_all(
+                    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, QK_BOOT,
+        _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
+        _______,    _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______,             _______, _______, _______
     ),
 };
diff --git a/keyboards/wuque/creek70/keymaps/via/keymap.c b/keyboards/wuque/creek70/keymaps/via/keymap.c
index 9c0a99a986..10c12d41ba 100644
--- a/keyboards/wuque/creek70/keymaps/via/keymap.c
+++ b/keyboards/wuque/creek70/keymaps/via/keymap.c
@@ -17,32 +17,32 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
-    [0] = LAYOUT(
-		           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_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
-		KC_MUTE,   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_VOLU,   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_VOLD,   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_PAUSE,  KC_LCTL, KC_LGUI, KC_LALT,                    KC_SPC,  KC_SPC,  KC_SPC,                    KC_RALT, KC_LGUI, MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RIGHT
+    [0] = LAYOUT_all(
+                    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_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_MUTE,    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_VOLU,    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_VOLD,    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_PAUS,    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                    KC_RALT, KC_LGUI, MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [1] = LAYOUT(
-                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,   _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
-        _______, _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______,             _______, _______, _______
+    [1] = LAYOUT_all(
+                    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, QK_BOOT,
+        _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
+        _______,    _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______,             _______, _______, _______
     ),
-    [2] = LAYOUT(
-                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
-        _______, _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______,             _______, _______, _______
+    [2] = LAYOUT_all(
+                    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
+        _______,    _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______,             _______, _______, _______
     ),
-    [3] = LAYOUT(
-                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
-        _______, _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______,             _______, _______, _______
+    [3] = LAYOUT_all(
+                    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
+        _______,    _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______,             _______, _______, _______
     ),
 };
diff --git a/keyboards/wuque/creek70/matrix_diagram.md b/keyboards/wuque/creek70/matrix_diagram.md
new file mode 100644
index 0000000000..45585b71bb
--- /dev/null
+++ b/keyboards/wuque/creek70/matrix_diagram.md
@@ -0,0 +1,27 @@
+Keyboard Name: creek70
+Manufacturer: wuque studio
+```
+                                                         ┌───────┐
+                                            2u Backspace │0E     │
+                                                         └───────┘
+     ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
+     │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │2E ││0F │0G │0H │
+┌───┐├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+│10 ││11   │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E   ││1F │1G │1H │
+├───┤├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+│20 ││21    │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D      │
+├───┤├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
+│30 ││31  │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D    │3E │    │3G │
+├───┤├────┼───┴┬──┴─┬─┴───┴───┼───┴┬──┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+│40 ││41  │42  │43  │46       │47  │48       │4B  │4C  │4D  │4E  ││4F │4G │4H │
+└───┘└────┴────┴────┴─────────┴────┴─────────┴────┴────┴────┴────┘└───┴───┴───┘
+     ┌────────┐                                       ┌──────────┐
+     │31      │ 2.25u LShift             2.75u RShift │3D        │
+     └────────┘                                       └──────────┘
+     ┌────┬────┬────┬────────────────────────┬────┬────┬────┬────┐
+     │41  │42  │43  │47                      │4B  │4C  │4D  │4E  │ Standard
+     └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+     ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+     │41   │42 │43   │47                         │4C   │4D │4E   │ Tsangan/WKL
+     └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+```