`mokey/xox70`: clean up layouts (#16375)

5 files changed, 531 insertions, 310 deletions

diff --git a/keyboards/mokey/xox70/info.json b/keyboards/mokey/xox70/info.json
index 95089f6fc3..5baa620bc6 100644
--- a/keyboards/mokey/xox70/info.json
+++ b/keyboards/mokey/xox70/info.json
@@ -3,245 +3,428 @@
     "url": "",
     "maintainer": "Mokey",
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k01", "x":1, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":3, "y":0},
-                {"label":"k04", "x":4, "y":0},
-                {"label":"k05", "x":5, "y":0},
-                {"label":"k06", "x":6, "y":0},
-                {"label":"k07", "x":7, "y":0},
-                {"label":"k08", "x":8, "y":0},
-                {"label":"k09", "x":9, "y":0},
-                {"label":"k0a", "x":10, "y":0},
-                {"label":"k0b", "x":11, "y":0},
-                {"label":"k0c", "x":12, "y":0},
-                {"label":"k0e", "x":13, "y":0, "w":2},
-                {"label":"k0f", "x":15.25, "y":0},
-                {"label":"k0g", "x":16.25, "y":0},
-                {"label":"k0h", "x":17.25, "y":0},
-                
-                {"label":"k10", "x":0, "y":1, "w":1.5},
-                {"label":"k12", "x":1.5, "y":1},
-                {"label":"k13", "x":2.5, "y":1},
-                {"label":"k14", "x":3.5, "y":1},
-                {"label":"k15", "x":4.5, "y":1},
-                {"label":"k16", "x":5.5, "y":1},
-                {"label":"k17", "x":6.5, "y":1},
-                {"label":"k18", "x":7.5, "y":1},
-                {"label":"k19", "x":8.5, "y":1},
-                {"label":"k1a", "x":9.5, "y":1},
-                {"label":"k1b", "x":10.5, "y":1},
-                {"label":"k1c", "x":11.5, "y":1},
-                {"label":"k1d", "x":12.5, "y":1},
-                {"label":"k1e", "x":13.5, "y":1, "w":1.5},
-                {"label":"k1f", "x":15.25, "y":1},
-                {"label":"k1g", "x":16.25, "y":1},
-                {"label":"k1h", "x":17.25, "y":1},
-                
-                {"label":"k20", "x":0, "y":2, "w":1.75},
-                {"label":"k22", "x":1.75, "y":2},
-                {"label":"k23", "x":2.75, "y":2},
-                {"label":"k24", "x":3.75, "y":2},
-                {"label":"k25", "x":4.75, "y":2},
-                {"label":"k26", "x":5.75, "y":2},
-                {"label":"k27", "x":6.75, "y":2},
-                {"label":"k28", "x":7.75, "y":2},
-                {"label":"k29", "x":8.75, "y":2},
-                {"label":"k2a", "x":9.75, "y":2},
-                {"label":"k2b", "x":10.75, "y":2},
-                {"label":"k2c", "x":11.75, "y":2},
-                {"label":"k2d", "x":12.75, "y":2, "w":2.25},
-                
-                {"label":"k30", "x":0, "y":3, "w":2.25},
-                {"label":"k32", "x":2.25, "y":3},
-                {"label":"k33", "x":3.25, "y":3},
-                {"label":"k34", "x":4.25, "y":3},
-                {"label":"k35", "x":5.25, "y":3},
-                {"label":"k36", "x":6.25, "y":3},
-                {"label":"k37", "x":7.25, "y":3},
-                {"label":"k38", "x":8.25, "y":3},
-                {"label":"k39", "x":9.25, "y":3},
-                {"label":"k3a", "x":10.25, "y":3},
-                {"label":"k3b", "x":11.25, "y":3},
-                {"label":"k3d", "x":12.25, "y":3, "w":2.75},
-                {"label":"k3g", "x":16.25, "y":3},
-
-                {"label":"k40", "x":0, "y":4, "w":1.25},
-                {"label":"k41", "x":1.25, "y":4, "w":1.25},
-                {"label":"k43", "x":2.5, "y":4, "w":1.25},
-                {"label":"k46", "x":3.75, "y":4, "w":6.25},
-                {"label":"k4a", "x":10, "y":4, "w":1.25},
-                {"label":"k4b", "x":11.25, "y":4, "w":1.25},
-                {"label":"k4d", "x":12.5, "y":4, "w":1.25},
-                {"label":"k4e", "x":13.75, "y":4, "w":1.25},
-                {"label":"k4f", "x":15.25, "y":4},
-                {"label":"k4g", "x":16.25, "y":4},
-                {"label":"k4h", "x":17.25, "y":4}
+                {"label":"k00", "x": 0, "y": 0},
+                {"label":"k01", "x": 1, "y": 0},
+                {"label":"k02", "x": 2, "y": 0},
+                {"label":"k03", "x": 3, "y": 0},
+                {"label":"k04", "x": 4, "y": 0},
+                {"label":"k05", "x": 5, "y": 0},
+                {"label":"k06", "x": 6, "y": 0},
+                {"label":"k07", "x": 7, "y": 0},
+                {"label":"k08", "x": 8, "y": 0},
+                {"label":"k09", "x": 9, "y": 0},
+                {"label":"k0A", "x": 10, "y": 0},
+                {"label":"k0B", "x": 11, "y": 0},
+                {"label":"k0C", "x": 12, "y": 0},
+                {"label":"k0D", "x": 13, "y": 0},
+                {"label":"k0E", "x": 14, "y": 0},
+
+                {"label":"k0F", "x": 15.25, "y": 0},
+                {"label":"k0G", "x": 16.25, "y": 0},
+                {"label":"k0H", "x": 17.25, "y": 0},
+
+                {"label":"k10", "x": 0, "y": 1, "w": 1.5},
+                {"label":"k12", "x": 1.5, "y": 1},
+                {"label":"k13", "x": 2.5, "y": 1},
+                {"label":"k14", "x": 3.5, "y": 1},
+                {"label":"k15", "x": 4.5, "y": 1},
+                {"label":"k16", "x": 5.5, "y": 1},
+                {"label":"k17", "x": 6.5, "y": 1},
+                {"label":"k18", "x": 7.5, "y": 1},
+                {"label":"k19", "x": 8.5, "y": 1},
+                {"label":"k1A", "x": 9.5, "y": 1},
+                {"label":"k1B", "x": 10.5, "y": 1},
+                {"label":"k1C", "x": 11.5, "y": 1},
+                {"label":"k1D", "x": 12.5, "y": 1},
+                {"label":"k1E", "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label":"k1F", "x": 15.25, "y": 1},
+                {"label":"k1G", "x": 16.25, "y": 1},
+                {"label":"k1H", "x": 17.25, "y": 1},
+
+                {"label":"k20", "x": 0, "y": 2, "w": 1.75},
+                {"label":"k22", "x": 1.75, "y": 2},
+                {"label":"k23", "x": 2.75, "y": 2},
+                {"label":"k24", "x": 3.75, "y": 2},
+                {"label":"k25", "x": 4.75, "y": 2},
+                {"label":"k26", "x": 5.75, "y": 2},
+                {"label":"k27", "x": 6.75, "y": 2},
+                {"label":"k28", "x": 7.75, "y": 2},
+                {"label":"k29", "x": 8.75, "y": 2},
+                {"label":"k2A", "x": 9.75, "y": 2},
+                {"label":"k2B", "x": 10.75, "y": 2},
+                {"label":"k2C", "x": 11.75, "y": 2},
+                {"label":"k2D", "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label":"k30", "x": 0, "y": 3, "w": 1.25},
+                {"label":"k31", "x": 1.25, "y": 3},
+                {"label":"k32", "x": 2.25, "y": 3},
+                {"label":"k33", "x": 3.25, "y": 3},
+                {"label":"k34", "x": 4.25, "y": 3},
+                {"label":"k35", "x": 5.25, "y": 3},
+                {"label":"k36", "x": 6.25, "y": 3},
+                {"label":"k37", "x": 7.25, "y": 3},
+                {"label":"k38", "x": 8.25, "y": 3},
+                {"label":"k39", "x": 9.25, "y": 3},
+                {"label":"k3A", "x": 10.25, "y": 3},
+                {"label":"k3B", "x": 11.25, "y": 3},
+                {"label":"k3D", "x": 12.25, "y": 3, "w": 1.75},
+                {"label":"k3E", "x": 14, "y": 3},
+
+                {"label":"k3G", "x": 16.25, "y": 3},
+
+                {"label":"k40", "x": 0, "y": 4, "w": 1.5},
+                {"label":"k41", "x": 1.5, "y": 4},
+                {"label":"k43", "x": 2.5, "y": 4, "w": 1.5},
+                {"label":"k44", "x": 4, "y": 4, "w": 2.5},
+                {"label":"k46", "x": 6.5, "y": 4},
+                {"label":"k48", "x": 7.5, "y": 4, "w": 2.5},
+                {"label":"k4A", "x": 10, "y": 4, "w": 1.25},
+                {"label":"k4B", "x": 11.25, "y": 4, "w": 1.25},
+                {"label":"k4D", "x": 12.5, "y": 4, "w": 1.25},
+                {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25},
+
+                {"label":"k4F", "x": 15.25, "y": 4},
+                {"label":"k4G", "x": 16.25, "y": 4},
+                {"label":"k4H", "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_ansi": {
+            "layout": [
+                {"label":"k00", "x": 0, "y": 0},
+                {"label":"k01", "x": 1, "y": 0},
+                {"label":"k02", "x": 2, "y": 0},
+                {"label":"k03", "x": 3, "y": 0},
+                {"label":"k04", "x": 4, "y": 0},
+                {"label":"k05", "x": 5, "y": 0},
+                {"label":"k06", "x": 6, "y": 0},
+                {"label":"k07", "x": 7, "y": 0},
+                {"label":"k08", "x": 8, "y": 0},
+                {"label":"k09", "x": 9, "y": 0},
+                {"label":"k0A", "x": 10, "y": 0},
+                {"label":"k0B", "x": 11, "y": 0},
+                {"label":"k0C", "x": 12, "y": 0},
+                {"label":"k0E", "x": 13, "y": 0, "w": 2},
+
+                {"label":"k0F", "x": 15.25, "y": 0},
+                {"label":"k0G", "x": 16.25, "y": 0},
+                {"label":"k0H", "x": 17.25, "y": 0},
+
+                {"label":"k10", "x": 0, "y": 1, "w": 1.5},
+                {"label":"k12", "x": 1.5, "y": 1},
+                {"label":"k13", "x": 2.5, "y": 1},
+                {"label":"k14", "x": 3.5, "y": 1},
+                {"label":"k15", "x": 4.5, "y": 1},
+                {"label":"k16", "x": 5.5, "y": 1},
+                {"label":"k17", "x": 6.5, "y": 1},
+                {"label":"k18", "x": 7.5, "y": 1},
+                {"label":"k19", "x": 8.5, "y": 1},
+                {"label":"k1A", "x": 9.5, "y": 1},
+                {"label":"k1B", "x": 10.5, "y": 1},
+                {"label":"k1C", "x": 11.5, "y": 1},
+                {"label":"k1D", "x": 12.5, "y": 1},
+                {"label":"k1E", "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label":"k1F", "x": 15.25, "y": 1},
+                {"label":"k1G", "x": 16.25, "y": 1},
+                {"label":"k1H", "x": 17.25, "y": 1},
+
+                {"label":"k20", "x": 0, "y": 2, "w": 1.75},
+                {"label":"k22", "x": 1.75, "y": 2},
+                {"label":"k23", "x": 2.75, "y": 2},
+                {"label":"k24", "x": 3.75, "y": 2},
+                {"label":"k25", "x": 4.75, "y": 2},
+                {"label":"k26", "x": 5.75, "y": 2},
+                {"label":"k27", "x": 6.75, "y": 2},
+                {"label":"k28", "x": 7.75, "y": 2},
+                {"label":"k29", "x": 8.75, "y": 2},
+                {"label":"k2A", "x": 9.75, "y": 2},
+                {"label":"k2B", "x": 10.75, "y": 2},
+                {"label":"k2C", "x": 11.75, "y": 2},
+                {"label":"k2D", "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label":"k30", "x": 0, "y": 3, "w": 2.25},
+                {"label":"k32", "x": 2.25, "y": 3},
+                {"label":"k33", "x": 3.25, "y": 3},
+                {"label":"k34", "x": 4.25, "y": 3},
+                {"label":"k35", "x": 5.25, "y": 3},
+                {"label":"k36", "x": 6.25, "y": 3},
+                {"label":"k37", "x": 7.25, "y": 3},
+                {"label":"k38", "x": 8.25, "y": 3},
+                {"label":"k39", "x": 9.25, "y": 3},
+                {"label":"k3A", "x": 10.25, "y": 3},
+                {"label":"k3B", "x": 11.25, "y": 3},
+                {"label":"k3D", "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label":"k3G", "x": 16.25, "y": 3},
+
+                {"label":"k40", "x": 0, "y": 4, "w": 1.25},
+                {"label":"k41", "x": 1.25, "y": 4, "w": 1.25},
+                {"label":"k43", "x": 2.5, "y": 4, "w": 1.25},
+                {"label":"k46", "x": 3.75, "y": 4, "w": 6.25},
+                {"label":"k4A", "x": 10, "y": 4, "w": 1.25},
+                {"label":"k4B", "x": 11.25, "y": 4, "w": 1.25},
+                {"label":"k4D", "x": 12.5, "y": 4, "w": 1.25},
+                {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25},
+
+                {"label":"k4F", "x": 15.25, "y": 4},
+                {"label":"k4G", "x": 16.25, "y": 4},
+                {"label":"k4H", "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_iso": {
+            "layout": [
+                {"label":"k00", "x": 0, "y": 0},
+                {"label":"k01", "x": 1, "y": 0},
+                {"label":"k02", "x": 2, "y": 0},
+                {"label":"k03", "x": 3, "y": 0},
+                {"label":"k04", "x": 4, "y": 0},
+                {"label":"k05", "x": 5, "y": 0},
+                {"label":"k06", "x": 6, "y": 0},
+                {"label":"k07", "x": 7, "y": 0},
+                {"label":"k08", "x": 8, "y": 0},
+                {"label":"k09", "x": 9, "y": 0},
+                {"label":"k0A", "x": 10, "y": 0},
+                {"label":"k0B", "x": 11, "y": 0},
+                {"label":"k0C", "x": 12, "y": 0},
+                {"label":"k0E", "x": 13, "y": 0, "w": 2},
+
+                {"label":"k0F", "x": 15.25, "y": 0},
+                {"label":"k0G", "x": 16.25, "y": 0},
+                {"label":"k0H", "x": 17.25, "y": 0},
+
+                {"label":"k10", "x": 0, "y": 1, "w": 1.5},
+                {"label":"k12", "x": 1.5, "y": 1},
+                {"label":"k13", "x": 2.5, "y": 1},
+                {"label":"k14", "x": 3.5, "y": 1},
+                {"label":"k15", "x": 4.5, "y": 1},
+                {"label":"k16", "x": 5.5, "y": 1},
+                {"label":"k17", "x": 6.5, "y": 1},
+                {"label":"k18", "x": 7.5, "y": 1},
+                {"label":"k19", "x": 8.5, "y": 1},
+                {"label":"k1A", "x": 9.5, "y": 1},
+                {"label":"k1B", "x": 10.5, "y": 1},
+                {"label":"k1C", "x": 11.5, "y": 1},
+                {"label":"k1D", "x": 12.5, "y": 1},
+
+                {"label":"k1F", "x": 15.25, "y": 1},
+                {"label":"k1G", "x": 16.25, "y": 1},
+                {"label":"k1H", "x": 17.25, "y": 1},
+
+                {"label":"k20", "x": 0, "y": 2, "w": 1.75},
+                {"label":"k22", "x": 1.75, "y": 2},
+                {"label":"k23", "x": 2.75, "y": 2},
+                {"label":"k24", "x": 3.75, "y": 2},
+                {"label":"k25", "x": 4.75, "y": 2},
+                {"label":"k26", "x": 5.75, "y": 2},
+                {"label":"k27", "x": 6.75, "y": 2},
+                {"label":"k28", "x": 7.75, "y": 2},
+                {"label":"k29", "x": 8.75, "y": 2},
+                {"label":"k2A", "x": 9.75, "y": 2},
+                {"label":"k2B", "x": 10.75, "y": 2},
+                {"label":"k2C", "x": 11.75, "y": 2},
+                {"label":"k1E", "x": 12.75, "y": 2},
+                {"label":"k2D", "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label":"k30", "x": 0, "y": 3, "w": 1.25},
+                {"label":"k31", "x": 1.25, "y": 3},
+                {"label":"k32", "x": 2.25, "y": 3},
+                {"label":"k33", "x": 3.25, "y": 3},
+                {"label":"k34", "x": 4.25, "y": 3},
+                {"label":"k35", "x": 5.25, "y": 3},
+                {"label":"k36", "x": 6.25, "y": 3},
+                {"label":"k37", "x": 7.25, "y": 3},
+                {"label":"k38", "x": 8.25, "y": 3},
+                {"label":"k39", "x": 9.25, "y": 3},
+                {"label":"k3A", "x": 10.25, "y": 3},
+                {"label":"k3B", "x": 11.25, "y": 3},
+                {"label":"k3D", "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label":"k3G", "x": 16.25, "y": 3},
+
+                {"label":"k40", "x": 0, "y": 4, "w": 1.25},
+                {"label":"k41", "x": 1.25, "y": 4, "w": 1.25},
+                {"label":"k43", "x": 2.5, "y": 4, "w": 1.25},
+                {"label":"k46", "x": 3.75, "y": 4, "w": 6.25},
+                {"label":"k4A", "x": 10, "y": 4, "w": 1.25},
+                {"label":"k4B", "x": 11.25, "y": 4, "w": 1.25},
+                {"label":"k4D", "x": 12.5, "y": 4, "w": 1.25},
+                {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25},
+
+                {"label":"k4F", "x": 15.25, "y": 4},
+                {"label":"k4G", "x": 16.25, "y": 4},
+                {"label":"k4H", "x": 17.25, "y": 4}
             ]
         },
-        "LAYOUT_division_backspace":{
+        "LAYOUT_tkl_nofrow_ansi_split_bs": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k01", "x":1, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":3, "y":0},
-                {"label":"k04", "x":4, "y":0},
-                {"label":"k05", "x":5, "y":0},
-                {"label":"k06", "x":6, "y":0},
-                {"label":"k07", "x":7, "y":0},
-                {"label":"k08", "x":8, "y":0},
-                {"label":"k09", "x":9, "y":0},
-                {"label":"k0a", "x":10, "y":0},
-                {"label":"k0b", "x":11, "y":0},
-                {"label":"k0c", "x":12, "y":0},
-                {"label":"k0d", "x":13, "y":0},
-                {"label":"k0e", "x":14, "y":0},
-                {"label":"k0f", "x":15.25, "y":0},
-                {"label":"k0g", "x":16.25, "y":0},
-                {"label":"k0h", "x":17.25, "y":0},
-                
-                {"label":"k10", "x":0, "y":1, "w":1.5},
-                {"label":"k12", "x":1.5, "y":1},
-                {"label":"k13", "x":2.5, "y":1},
-                {"label":"k14", "x":3.5, "y":1},
-                {"label":"k15", "x":4.5, "y":1},
-                {"label":"k16", "x":5.5, "y":1},
-                {"label":"k17", "x":6.5, "y":1},
-                {"label":"k18", "x":7.5, "y":1},
-                {"label":"k19", "x":8.5, "y":1},
-                {"label":"k1a", "x":9.5, "y":1},
-                {"label":"k1b", "x":10.5, "y":1},
-                {"label":"k1c", "x":11.5, "y":1},
-                {"label":"k1d", "x":12.5, "y":1},
-                {"label":"k1f", "x":15.25, "y":1},
-                {"label":"k1g", "x":16.25, "y":1},
-                {"label":"k1h", "x":17.25, "y":1},
-                
-                {"label":"k20", "x":0, "y":2, "w":1.75},
-                {"label":"k22", "x":1.75, "y":2},
-                {"label":"k23", "x":2.75, "y":2},
-                {"label":"k24", "x":3.75, "y":2},
-                {"label":"k25", "x":4.75, "y":2},
-                {"label":"k26", "x":5.75, "y":2},
-                {"label":"k27", "x":6.75, "y":2},
-                {"label":"k28", "x":7.75, "y":2},
-                {"label":"k29", "x":8.75, "y":2},
-                {"label":"k2a", "x":9.75, "y":2},
-                {"label":"k2b", "x":10.75, "y":2},
-                {"label":"k2c", "x":11.75, "y":2},
-                {"label":"k1e", "x":12.75, "y":2},
-                {"label":"k2d", "x":13.75, "y":1, "w":1.25, "h": 2},
-                
-                {"label":"k30", "x":0, "y":3, "w":1.25},
-                {"label":"k31", "x":1.25, "y":3},
-                {"label":"k32", "x":2.25, "y":3},
-                {"label":"k33", "x":3.25, "y":3},
-                {"label":"k34", "x":4.25, "y":3},
-                {"label":"k35", "x":5.25, "y":3},
-                {"label":"k36", "x":6.25, "y":3},
-                {"label":"k37", "x":7.25, "y":3},
-                {"label":"k38", "x":8.25, "y":3},
-                {"label":"k39", "x":9.25, "y":3},
-                {"label":"k3a", "x":10.25, "y":3},
-                {"label":"k3b", "x":11.25, "y":3},
-                {"label":"k3d", "x":12.25, "y":3, "w":1.75},
-                {"label":"k3e", "x":14, "y":3},
-                {"label":"k3g", "x":16.25, "y":3},
-
-                {"label":"k40", "x":0, "y":4, "w":1.5},
-                {"label":"k41", "x":1.25, "y":4},
-                {"label":"k43", "x":2.5, "y":4, "w":1.5},
-                {"label":"k46", "x":4, "y":4, "w":7},
-                {"label":"k4b", "x":11, "y":4, "w":1.5},
-                {"label":"k4d", "x":12.5, "y":4},
-                {"label":"k4e", "x":13.75, "y":4, "w":1.5},
-                {"label":"k4f", "x":15.25, "y":4},
-                {"label":"k4g", "x":16.25, "y":4},
-                {"label":"k4h", "x":17.25, "y":4}
+                {"label":"k00", "x": 0, "y": 0},
+                {"label":"k01", "x": 1, "y": 0},
+                {"label":"k02", "x": 2, "y": 0},
+                {"label":"k03", "x": 3, "y": 0},
+                {"label":"k04", "x": 4, "y": 0},
+                {"label":"k05", "x": 5, "y": 0},
+                {"label":"k06", "x": 6, "y": 0},
+                {"label":"k07", "x": 7, "y": 0},
+                {"label":"k08", "x": 8, "y": 0},
+                {"label":"k09", "x": 9, "y": 0},
+                {"label":"k0A", "x": 10, "y": 0},
+                {"label":"k0B", "x": 11, "y": 0},
+                {"label":"k0C", "x": 12, "y": 0},
+                {"label":"k0D", "x": 13, "y": 0},
+                {"label":"k0E", "x": 14, "y": 0},
+
+                {"label":"k0F", "x": 15.25, "y": 0},
+                {"label":"k0G", "x": 16.25, "y": 0},
+                {"label":"k0H", "x": 17.25, "y": 0},
+
+                {"label":"k10", "x": 0, "y": 1, "w": 1.5},
+                {"label":"k12", "x": 1.5, "y": 1},
+                {"label":"k13", "x": 2.5, "y": 1},
+                {"label":"k14", "x": 3.5, "y": 1},
+                {"label":"k15", "x": 4.5, "y": 1},
+                {"label":"k16", "x": 5.5, "y": 1},
+                {"label":"k17", "x": 6.5, "y": 1},
+                {"label":"k18", "x": 7.5, "y": 1},
+                {"label":"k19", "x": 8.5, "y": 1},
+                {"label":"k1A", "x": 9.5, "y": 1},
+                {"label":"k1B", "x": 10.5, "y": 1},
+                {"label":"k1C", "x": 11.5, "y": 1},
+                {"label":"k1D", "x": 12.5, "y": 1},
+                {"label":"k1E", "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label":"k1F", "x": 15.25, "y": 1},
+                {"label":"k1G", "x": 16.25, "y": 1},
+                {"label":"k1H", "x": 17.25, "y": 1},
+
+                {"label":"k20", "x": 0, "y": 2, "w": 1.75},
+                {"label":"k22", "x": 1.75, "y": 2},
+                {"label":"k23", "x": 2.75, "y": 2},
+                {"label":"k24", "x": 3.75, "y": 2},
+                {"label":"k25", "x": 4.75, "y": 2},
+                {"label":"k26", "x": 5.75, "y": 2},
+                {"label":"k27", "x": 6.75, "y": 2},
+                {"label":"k28", "x": 7.75, "y": 2},
+                {"label":"k29", "x": 8.75, "y": 2},
+                {"label":"k2A", "x": 9.75, "y": 2},
+                {"label":"k2B", "x": 10.75, "y": 2},
+                {"label":"k2C", "x": 11.75, "y": 2},
+                {"label":"k2D", "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label":"k30", "x": 0, "y": 3, "w": 2.25},
+                {"label":"k32", "x": 2.25, "y": 3},
+                {"label":"k33", "x": 3.25, "y": 3},
+                {"label":"k34", "x": 4.25, "y": 3},
+                {"label":"k35", "x": 5.25, "y": 3},
+                {"label":"k36", "x": 6.25, "y": 3},
+                {"label":"k37", "x": 7.25, "y": 3},
+                {"label":"k38", "x": 8.25, "y": 3},
+                {"label":"k39", "x": 9.25, "y": 3},
+                {"label":"k3A", "x": 10.25, "y": 3},
+                {"label":"k3B", "x": 11.25, "y": 3},
+                {"label":"k3D", "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label":"k3G", "x": 16.25, "y": 3},
+
+                {"label":"k40", "x": 0, "y": 4, "w": 1.25},
+                {"label":"k41", "x": 1.25, "y": 4, "w": 1.25},
+                {"label":"k43", "x": 2.5, "y": 4, "w": 1.25},
+                {"label":"k46", "x": 3.75, "y": 4, "w": 6.25},
+                {"label":"k4A", "x": 10, "y": 4, "w": 1.25},
+                {"label":"k4B", "x": 11.25, "y": 4, "w": 1.25},
+                {"label":"k4D", "x": 12.5, "y": 4, "w": 1.25},
+                {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25},
+
+                {"label":"k4F", "x": 15.25, "y": 4},
+                {"label":"k4G", "x": 16.25, "y": 4},
+                {"label":"k4H", "x": 17.25, "y": 4}
             ]
         },
-        "LAYOUT_iso":{
+        "LAYOUT_tkl_nofrow_iso_split_bs": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k01", "x":1, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":3, "y":0},
-                {"label":"k04", "x":4, "y":0},
-                {"label":"k05", "x":5, "y":0},
-                {"label":"k06", "x":6, "y":0},
-                {"label":"k07", "x":7, "y":0},
-                {"label":"k08", "x":8, "y":0},
-                {"label":"k09", "x":9, "y":0},
-                {"label":"k0a", "x":10, "y":0},
-                {"label":"k0b", "x":11, "y":0},
-                {"label":"k0c", "x":12, "y":0},
-                {"label":"k0d", "x":13, "y":0},
-                {"label":"k0e", "x":14, "y":0},
-                {"label":"k0f", "x":15.25, "y":0},
-                {"label":"k0g", "x":16.25, "y":0},
-                {"label":"k0h", "x":17.25, "y":0},
-                
-                {"label":"k10", "x":0, "y":1, "w":1.5},
-                {"label":"k12", "x":1.5, "y":1},
-                {"label":"k13", "x":2.5, "y":1},
-                {"label":"k14", "x":3.5, "y":1},
-                {"label":"k15", "x":4.5, "y":1},
-                {"label":"k16", "x":5.5, "y":1},
-                {"label":"k17", "x":6.5, "y":1},
-                {"label":"k18", "x":7.5, "y":1},
-                {"label":"k19", "x":8.5, "y":1},
-                {"label":"k1a", "x":9.5, "y":1},
-                {"label":"k1b", "x":10.5, "y":1},
-                {"label":"k1c", "x":11.5, "y":1},
-                {"label":"k1d", "x":12.5, "y":1},
-                {"label":"k1f", "x":15.25, "y":1},
-                {"label":"k1g", "x":16.25, "y":1},
-                {"label":"k1h", "x":17.25, "y":1},
-                
-                {"label":"k20", "x":0, "y":2, "w":1.75},
-                {"label":"k22", "x":1.75, "y":2},
-                {"label":"k23", "x":2.75, "y":2},
-                {"label":"k24", "x":3.75, "y":2},
-                {"label":"k25", "x":4.75, "y":2},
-                {"label":"k26", "x":5.75, "y":2},
-                {"label":"k27", "x":6.75, "y":2},
-                {"label":"k28", "x":7.75, "y":2},
-                {"label":"k29", "x":8.75, "y":2},
-                {"label":"k2a", "x":9.75, "y":2},
-                {"label":"k2b", "x":10.75, "y":2},
-                {"label":"k2c", "x":11.75, "y":2},
-                {"label":"k1e", "x":12.75, "y":2},
-                {"label":"k2d", "x":13.75, "y":1, "w":1.25, "h": 2},
-                
-                {"label":"k30", "x":0, "y":3, "w":1.25},
-                {"label":"k31", "x":1.25, "y":3},
-                {"label":"k32", "x":2.25, "y":3},
-                {"label":"k33", "x":3.25, "y":3},
-                {"label":"k34", "x":4.25, "y":3},
-                {"label":"k35", "x":5.25, "y":3},
-                {"label":"k36", "x":6.25, "y":3},
-                {"label":"k37", "x":7.25, "y":3},
-                {"label":"k38", "x":8.25, "y":3},
-                {"label":"k39", "x":9.25, "y":3},
-                {"label":"k3a", "x":10.25, "y":3},
-                {"label":"k3b", "x":11.25, "y":3},
-                {"label":"k3d", "x":12.25, "y":3, "w":1.75},
-                {"label":"k3e", "x":14, "y":3},
-                {"label":"k3g", "x":16.25, "y":3},
-                
-                {"label":"k40", "x":0, "y":4, "w":1.5},
-                {"label":"k43", "x":2.5, "y":4, "w":1.5},
-                {"label":"k44", "x":4, "y":4, "w":3},
-                {"label":"k46", "x":7, "y":4},
-                {"label":"k48", "x":8, "y":4, "w":3},
-                {"label":"k4b", "x":11, "y":4, "w":1.5},
-                {"label":"k4e", "x":13.5, "y":4, "w":1.5},
-                {"label":"k4f", "x":15.25, "y":4},
-                {"label":"k4g", "x":16.25, "y":4},
-                {"label":"k4h", "x":17.25, "y":4}
+                {"label":"k00", "x": 0, "y": 0},
+                {"label":"k01", "x": 1, "y": 0},
+                {"label":"k02", "x": 2, "y": 0},
+                {"label":"k03", "x": 3, "y": 0},
+                {"label":"k04", "x": 4, "y": 0},
+                {"label":"k05", "x": 5, "y": 0},
+                {"label":"k06", "x": 6, "y": 0},
+                {"label":"k07", "x": 7, "y": 0},
+                {"label":"k08", "x": 8, "y": 0},
+                {"label":"k09", "x": 9, "y": 0},
+                {"label":"k0A", "x": 10, "y": 0},
+                {"label":"k0B", "x": 11, "y": 0},
+                {"label":"k0C", "x": 12, "y": 0},
+                {"label":"k0D", "x": 13, "y": 0},
+                {"label":"k0E", "x": 14, "y": 0},
+
+                {"label":"k0F", "x": 15.25, "y": 0},
+                {"label":"k0G", "x": 16.25, "y": 0},
+                {"label":"k0H", "x": 17.25, "y": 0},
+
+                {"label":"k10", "x": 0, "y": 1, "w": 1.5},
+                {"label":"k12", "x": 1.5, "y": 1},
+                {"label":"k13", "x": 2.5, "y": 1},
+                {"label":"k14", "x": 3.5, "y": 1},
+                {"label":"k15", "x": 4.5, "y": 1},
+                {"label":"k16", "x": 5.5, "y": 1},
+                {"label":"k17", "x": 6.5, "y": 1},
+                {"label":"k18", "x": 7.5, "y": 1},
+                {"label":"k19", "x": 8.5, "y": 1},
+                {"label":"k1A", "x": 9.5, "y": 1},
+                {"label":"k1B", "x": 10.5, "y": 1},
+                {"label":"k1C", "x": 11.5, "y": 1},
+                {"label":"k1D", "x": 12.5, "y": 1},
+
+                {"label":"k1F", "x": 15.25, "y": 1},
+                {"label":"k1G", "x": 16.25, "y": 1},
+                {"label":"k1H", "x": 17.25, "y": 1},
+
+                {"label":"k20", "x": 0, "y": 2, "w": 1.75},
+                {"label":"k22", "x": 1.75, "y": 2},
+                {"label":"k23", "x": 2.75, "y": 2},
+                {"label":"k24", "x": 3.75, "y": 2},
+                {"label":"k25", "x": 4.75, "y": 2},
+                {"label":"k26", "x": 5.75, "y": 2},
+                {"label":"k27", "x": 6.75, "y": 2},
+                {"label":"k28", "x": 7.75, "y": 2},
+                {"label":"k29", "x": 8.75, "y": 2},
+                {"label":"k2A", "x": 9.75, "y": 2},
+                {"label":"k2B", "x": 10.75, "y": 2},
+                {"label":"k2C", "x": 11.75, "y": 2},
+                {"label":"k1E", "x": 12.75, "y": 2},
+                {"label":"k2D", "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label":"k30", "x": 0, "y": 3, "w": 1.25},
+                {"label":"k31", "x": 1.25, "y": 3},
+                {"label":"k32", "x": 2.25, "y": 3},
+                {"label":"k33", "x": 3.25, "y": 3},
+                {"label":"k34", "x": 4.25, "y": 3},
+                {"label":"k35", "x": 5.25, "y": 3},
+                {"label":"k36", "x": 6.25, "y": 3},
+                {"label":"k37", "x": 7.25, "y": 3},
+                {"label":"k38", "x": 8.25, "y": 3},
+                {"label":"k39", "x": 9.25, "y": 3},
+                {"label":"k3A", "x": 10.25, "y": 3},
+                {"label":"k3B", "x": 11.25, "y": 3},
+                {"label":"k3D", "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label":"k3G", "x": 16.25, "y": 3},
+
+                {"label":"k40", "x": 0, "y": 4, "w": 1.25},
+                {"label":"k41", "x": 1.25, "y": 4, "w": 1.25},
+                {"label":"k43", "x": 2.5, "y": 4, "w": 1.25},
+                {"label":"k46", "x": 3.75, "y": 4, "w": 6.25},
+                {"label":"k4A", "x": 10, "y": 4, "w": 1.25},
+                {"label":"k4B", "x": 11.25, "y": 4, "w": 1.25},
+                {"label":"k4D", "x": 12.5, "y": 4, "w": 1.25},
+                {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25},
+
+                {"label":"k4F", "x": 15.25, "y": 4},
+                {"label":"k4G", "x": 16.25, "y": 4},
+                {"label":"k4H", "x": 17.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/mokey/xox70/keymaps/default/keymap.c b/keyboards/mokey/xox70/keymaps/default/keymap.c
index 710acc04cb..b19174948b 100644
--- a/keyboards/mokey/xox70/keymaps/default/keymap.c
+++ b/keyboards/mokey/xox70/keymaps/default/keymap.c
@@ -15,21 +15,12 @@
 
 #include QMK_KEYBOARD_H
 
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    LAYOUT(
-        KC_GESC, 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_INSERT, 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_DELETE, KC_END,  KC_PGDOWN,
+    LAYOUT_tkl_nofrow_ansi(
+        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                                 KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,               KC_RALT, KC_GRV, KC_MENU, KC_RCTL,                KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______,                            _______,                   _______, _______, _______, _______,            _______, _______, _______
+        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_RGUI, KC_APP,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
     )
 };
diff --git a/keyboards/mokey/xox70/keymaps/via/keymap.c b/keyboards/mokey/xox70/keymaps/via/keymap.c
index 66e227e333..304fe3968c 100644
--- a/keyboards/mokey/xox70/keymaps/via/keymap.c
+++ b/keyboards/mokey/xox70/keymaps/via/keymap.c
@@ -16,36 +16,32 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    LAYOUT(
-        KC_GESC, 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_INSERT, 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_DELETE, KC_END,  KC_PGDOWN,
+    LAYOUT_all(
+        KC_GESC, 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_GRV, KC_MENU, KC_RCTL,                KC_LEFT, KC_DOWN, KC_RGHT
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                        KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                    KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
     ),
-
-    LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+    LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______,                            _______,                   _______, _______, _______, _______,            _______, _______, _______
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
+        _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______,             _______, _______, _______
     ),
-
-    LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+    LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______,                            _______,                   _______, _______, _______, _______,            _______, _______, _______
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
+        _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______,             _______, _______, _______
     ),
-
-    LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+    LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______,                            _______,                   _______, _______, _______, _______,            _______, _______, _______
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
+        _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, ____