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

2 files changed, 59 insertions, 56 deletions

diff --git a/keyboards/melgeek/mj6xy/info.json b/keyboards/melgeek/mj6xy/info.json
index 5f0db8e1a7..5e9724716d 100755
--- a/keyboards/melgeek/mj6xy/info.json
+++ b/keyboards/melgeek/mj6xy/info.json
@@ -476,6 +476,7 @@
                 {"x": 12.75, "y": 2, "w": 2.25},
 
                 {"x": 0, "y": 3, "w": 2},
+                {"x": 2, "y": 3},
                 {"x": 3, "y": 3},
                 {"x": 4, "y": 3},
                 {"x": 5, "y": 3},
@@ -547,6 +548,7 @@
                 {"x": 12.75, "y": 2, "w": 2.25},
 
                 {"x": 0, "y": 3, "w": 2},
+                {"x": 2, "y": 3},
                 {"x": 3, "y": 3},
                 {"x": 4, "y": 3},
                 {"x": 5, "y": 3},
@@ -618,6 +620,7 @@
                 {"x": 12.75, "y": 2, "w": 2.25},
 
                 {"x": 0, "y": 3, "w": 2},
+                {"x": 2, "y": 3},
                 {"x": 3, "y": 3},
                 {"x": 4, "y": 3},
                 {"x": 5, "y": 3},
@@ -691,6 +694,7 @@
                 {"x": 12.75, "y": 2, "w": 2.25},
 
                 {"x": 0, "y": 3, "w": 2},
+                {"x": 2, "y": 3},
                 {"x": 3, "y": 3},
                 {"x": 4, "y": 3},
                 {"x": 5, "y": 3},
@@ -746,7 +750,6 @@
                 {"x": 10.5, "y": 1},
                 {"x": 11.5, "y": 1},
                 {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
 
                 {"x": 0, "y": 2, "w": 1.75},
                 {"x": 1.75, "y": 2},
@@ -761,7 +764,7 @@
                 {"x": 10.75, "y": 2},
                 {"x": 11.75, "y": 2},
                 {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 3, "w": 2.25},
                 {"x": 2.25, "y": 3},
@@ -816,7 +819,6 @@
                 {"x": 10.5, "y": 1},
                 {"x": 11.5, "y": 1},
                 {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
 
                 {"x": 0, "y": 2, "w": 1.75},
                 {"x": 1.75, "y": 2},
@@ -831,7 +833,7 @@
                 {"x": 10.75, "y": 2},
                 {"x": 11.75, "y": 2},
                 {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 3, "w": 1.25},
                 {"x": 1.25, "y": 3},
@@ -888,7 +890,6 @@
                 {"x": 10.5, "y": 1},
                 {"x": 11.5, "y": 1},
                 {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
 
                 {"x": 0, "y": 2, "w": 1.75},
                 {"x": 1.75, "y": 2},
@@ -903,7 +904,7 @@
                 {"x": 10.75, "y": 2},
                 {"x": 11.75, "y": 2},
                 {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 3, "w": 1.25},
                 {"x": 1.25, "y": 3},
@@ -959,7 +960,6 @@
                 {"x": 10.5, "y": 1},
                 {"x": 11.5, "y": 1},
                 {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
 
                 {"x": 0, "y": 2, "w": 1.75},
                 {"x": 1.75, "y": 2},
@@ -974,7 +974,7 @@
                 {"x": 10.75, "y": 2},
                 {"x": 11.75, "y": 2},
                 {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 3, "w": 2.25},
                 {"x": 2.25, "y": 3},
@@ -1031,7 +1031,6 @@
                 {"x": 10.5, "y": 1},
                 {"x": 11.5, "y": 1},
                 {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
 
                 {"x": 0, "y": 2, "w": 1.75},
                 {"x": 1.75, "y": 2},
@@ -1046,7 +1045,7 @@
                 {"x": 10.75, "y": 2},
                 {"x": 11.75, "y": 2},
                 {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 3, "w": 2.25},
                 {"x": 2.25, "y": 3},
@@ -1103,7 +1102,6 @@
                 {"x": 10.5, "y": 1},
                 {"x": 11.5, "y": 1},
                 {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
 
                 {"x": 0, "y": 2, "w": 1.75},
                 {"x": 1.75, "y": 2},
@@ -1118,7 +1116,7 @@
                 {"x": 10.75, "y": 2},
                 {"x": 11.75, "y": 2},
                 {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 3, "w": 2.25},
                 {"x": 2.25, "y": 3},
@@ -1177,7 +1175,6 @@
                 {"x": 10.5, "y": 1},
                 {"x": 11.5, "y": 1},
                 {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
 
                 {"x": 0, "y": 2, "w": 1.75},
                 {"x": 1.75, "y": 2},
@@ -1192,7 +1189,7 @@
                 {"x": 10.75, "y": 2},
                 {"x": 11.75, "y": 2},
                 {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 3, "w": 2.25},
                 {"x": 2.25, "y": 3},
@@ -1250,7 +1247,6 @@
                 {"x": 10.5, "y": 1},
                 {"x": 11.5, "y": 1},
                 {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
 
                 {"x": 0, "y": 2, "w": 1.75},
                 {"x": 1.75, "y": 2},
@@ -1265,7 +1261,7 @@
                 {"x": 10.75, "y": 2},
                 {"x": 11.75, "y": 2},
                 {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 3, "w": 2.25},
                 {"x": 2.25, "y": 3},
@@ -1320,7 +1316,6 @@
                 {"x": 10.5, "y": 1},
                 {"x": 11.5, "y": 1},
                 {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
 
                 {"x": 0, "y": 2, "w": 1.75},
                 {"x": 1.75, "y": 2},
@@ -1335,9 +1330,10 @@
                 {"x": 10.75, "y": 2},
                 {"x": 11.75, "y": 2},
                 {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 3, "w": 2},
+                {"x": 2, "y": 3},
                 {"x": 3, "y": 3},
                 {"x": 4, "y": 3},
                 {"x": 5, "y": 3},
@@ -1392,7 +1388,6 @@
                 {"x": 10.5, "y": 1},
                 {"x": 11.5, "y": 1},
                 {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
 
                 {"x": 0, "y": 2, "w": 1.75},
                 {"x": 1.75, "y": 2},
@@ -1407,9 +1402,10 @@
                 {"x": 10.75, "y": 2},
                 {"x": 11.75, "y": 2},
                 {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 3, "w": 2},
+                {"x": 2, "y": 3},
                 {"x": 3, "y": 3},
                 {"x": 4, "y": 3},
                 {"x": 5, "y": 3},
@@ -1464,7 +1460,6 @@
                 {"x": 10.5, "y": 1},
                 {"x": 11.5, "y": 1},
                 {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
 
                 {"x": 0, "y": 2, "w": 1.75},
                 {"x": 1.75, "y": 2},
@@ -1479,9 +1474,10 @@
                 {"x": 10.75, "y": 2},
                 {"x": 11.75, "y": 2},
                 {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 3, "w": 2},
+                {"x": 2, "y": 3},
                 {"x": 3, "y": 3},
                 {"x": 4, "y": 3},
                 {"x": 5, "y": 3},
@@ -1538,7 +1534,6 @@
                 {"x": 10.5, "y": 1},
                 {"x": 11.5, "y": 1},
                 {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
 
                 {"x": 0, "y": 2, "w": 1.75},
                 {"x": 1.75, "y": 2},
@@ -1553,9 +1548,10 @@
                 {"x": 10.75, "y": 2},
                 {"x": 11.75, "y": 2},
                 {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 3, "w": 2},
+                {"x": 2, "y": 3},
                 {"x": 3, "y": 3},
                 {"x": 4, "y": 3},
                 {"x": 5, "y": 3},
@@ -1611,7 +1607,6 @@
                 {"x": 10.5, "y": 1},
                 {"x": 11.5, "y": 1},
                 {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
 
                 {"x": 0, "y": 2, "w": 1.75},
                 {"x": 1.75, "y": 2},
@@ -1626,7 +1621,7 @@
                 {"x": 10.75, "y": 2},
                 {"x": 11.75, "y": 2},
                 {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 3},
                 {"x": 1, "y": 3},
@@ -1683,7 +1678,6 @@
                 {"x": 10.5, "y": 1},
                 {"x": 11.5, "y": 1},
                 {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
 
                 {"x": 0, "y": 2, "w": 1.75},
                 {"x": 1.75, "y": 2},
@@ -1698,7 +1692,7 @@
                 {"x": 10.75, "y": 2},
                 {"x": 11.75, "y": 2},
                 {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 3},
                 {"x": 1, "y": 3},
@@ -2202,6 +2196,7 @@
                 {"x": 12.75, "y": 2, "w": 2.25},
 
                 {"x": 0, "y": 3, "w": 2},
+                {"x": 2, "y": 3},
                 {"x": 3, "y": 3},
                 {"x": 4, "y": 3},
                 {"x": 5, "y": 3},
@@ -2274,6 +2269,7 @@
                 {"x": 12.75, "y": 2, "w": 2.25},
 
                 {"x": 0, "y": 3, "w": 2},
+                {"x": 2, "y": 3},
                 {"x": 3, "y": 3},
                 {"x": 4, "y": 3},
                 {"x": 5, "y": 3},
@@ -2346,6 +2342,7 @@
                 {"x": 12.75, "y": 2, "w": 2.25},
 
                 {"x": 0, "y": 3, "w": 2},
+                {"x": 2, "y": 3},
                 {"x": 3, "y": 3},
                 {"x": 4, "y": 3},
                 {"x": 5, "y": 3},
@@ -2420,6 +2417,7 @@
                 {"x": 12.75, "y": 2, "w": 2.25},
 
                 {"x": 0, "y": 3, "w": 2},
+                {"x": 2, "y": 3},
                 {"x": 3, "y": 3},
                 {"x": 4, "y": 3},
                 {"x": 5, "y": 3},
@@ -2476,7 +2474,6 @@
                 {"x": 10.5, "y": 1},
                 {"x": 11.5, "y": 1},
                 {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
 
                 {"x": 0, "y": 2, "w": 1.75},
                 {"x": 1.75, "y": 2},
@@ -2491,7 +2488,7 @@
                 {"x": 10.75, "y": 2},
                 {"x": 11.75, "y": 2},
                 {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 3, "w": 2.25},
                 {"x": 2.25, "y": 3},
@@ -2547,7 +2544,6 @@
                 {"x": 10.5, "y": 1},
                 {"x": 11.5, "y": 1},
                 {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
 
                 {"x": 0, "y": 2, "w": 1.75},
                 {"x": 1.75, "y": 2},
@@ -2562,7 +2558,7 @@
                 {"x": 10.75, "y": 2},
                 {"x": 11.75, "y": 2},
                 {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 3, "w": 1.25},
                 {"x": 1.25, "y": 3},
@@ -2620,7 +2616,6 @@
                 {"x": 10.5, "y": 1},
                 {"x": 11.5, "y": 1},
                 {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
 
                 {"x": 0, "y": 2, "w": 1.75},
                 {"x": 1.75, "y": 2},
@@ -2635,7 +2630,7 @@
                 {"x": 10.75, "y": 2},
                 {"x": 11.75, "y": 2},
                 {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 3, "w": 1.25},
                 {"x": 1.25, "y": 3},
@@ -2692,7 +2687,6 @@
                 {"x": 10.5, "y": 1},
                 {"x": 11.5, "y": 1},
                 {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
 
                 {"x": 0, "y": 2, "w": 1.75},
                 {"x": 1.75, "y": 2},
@@ -2707,7 +2701,7 @@
                 {"x": 10.75, "y": 2},
                 {"x": 11.75, "y": 2},
                 {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 3, "w": 2.25},
                 {"x": 2.25, "y": 3},
@@ -2765,7 +2759,6 @@
                 {"x": 10.5, "y": 1},
                 {"x": 11.5, "y": 1},
                 {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
 
                 {"x": 0, "y": 2, "w": 1.75},
                 {"x": 1.75, "y": 2},
@@ -2780,7 +2773,7 @@
                 {"x": 10.75, "y": 2},
                 {"x": 11.75, "y": 2},
                 {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 3, "w": 2.25},
                 {"x": 2.25, "y": 3},
@@ -2838,7 +2831,6 @@
                 {"x": 10.5, "y": 1},
                 {"x": 11.5, "y": 1},
                 {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
 
                 {"x": 0, "y": 2, "w": 1.75},
                 {"x": 1.75, "y": 2},
@@ -2853,7 +2845,7 @@
                 {"x": 10.75, "y": 2},
                 {"x": 11.75, "y": 2},
                 {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 3, "w": 2.25},
                 {"x": 2.25, "y": 3},
@@ -2913,7 +2905,6 @@
                 {"x": 10.5, "y": 1},
                 {"x": 11.5, "y": 1},
                 {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
 
                 {"x": 0, "y": 2, "w": 1.75},
                 {"x": 1.75, "y": 2},
@@ -2928,7 +2919,7 @@
                 {"x": 10.75, "y": 2},
                 {"x": 11.75, "y": 2},
                 {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 3, "w": 2.25},
                 {"x": 2.25, "y": 3},
@@ -2987,7 +2978,6 @@
                 {"x": 10.5, "y": 1},
                 {"x": 11.5, "y": 1},
                 {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
 
                 {"x": 0, "y": 2, "w": 1.75},
                 {"x": 1.75, "y": 2},
@@ -3002,7 +2992,7 @@
                 {"x": 10.75, "y": 2},
                 {"x": 11.75, "y": 2},
                 {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 3, "w": 2.25},
                 {"x": 2.25, "y": 3},
@@ -3044,7 +3034,6 @@
                 {"x": 13, "y": 0},
                 {"x": 14, "y": 0},
 
-
                 {"x": 0, "y": 1, "w": 1.5},
                 {"x": 1.5, "y": 1},
                 {"x": 2.5, "y": 1},
@@ -3058,7 +3047,6 @@
                 {"x": 10.5, "y": 1},
                 {"x": 11.5, "y": 1},
                 {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
 
                 {"x": 0, "y": 2, "w": 1.75},
                 {"x": 1.75, "y": 2},
@@ -3073,9 +3061,10 @@
                 {"x": 10.75, "y": 2},
                 {"x": 11.75, "y": 2},
                 {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 3, "w": 2},
+                {"x": 2, "y": 3},
                 {"x": 3, "y": 3},
                 {"x": 4, "y": 3},
                 {"x": 5, "y": 3},
@@ -3131,7 +3120,6 @@
                 {"x": 10.5, "y": 1},
                 {"x": 11.5, "y": 1},
                 {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
 
                 {"x": 0, "y": 2, "w": 1.75},
                 {"x": 1.75, "y": 2},
@@ -3146,9 +3134,10 @@
                 {"x": 10.75, "y": 2},
                 {"x": 11.75, "y": 2},
                 {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 3, "w": 2},
+                {"x": 2, "y": 3},
                 {"x": 3, "y": 3},
                 {"x": 4, "y": 3},
                 {"x": 5, "y": 3},
@@ -3204,7 +3193,6 @@
                 {"x": 10.5, "y": 1},
                 {"x": 11.5, "y": 1},
                 {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
 
                 {"x": 0, "y": 2, "w": 1.75},
                 {"x": 1.75, "y": 2},
@@ -3219,9 +3207,10 @@
                 {"x": 10.75, "y": 2},
                 {"x": 11.75, "y": 2},
                 {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 3, "w": 2},
+                {"x": 2, "y": 3},
                 {"x": 3, "y": 3},
                 {"x": 4, "y": 3},
                 {"x": 5, "y": 3},
@@ -3294,9 +3283,10 @@
                 {"x": 10.75, "y": 2},
                 {"x": 11.75, "y": 2},
                 {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 3, "w": 2},
+                {"x": 2, "y": 3},
                 {"x": 3, "y": 3},
                 {"x": 4, "y": 3},
                 {"x": 5, "y": 3},
@@ -3353,7 +3343,6 @@
                 {"x": 10.5, "y": 1},
                 {"x": 11.5, "y": 1},
                 {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
 
                 {"x": 0, "y": 2, "w": 1.75},
                 {"x": 1.75, "y": 2},
@@ -3368,7 +3357,7 @@
                 {"x": 10.75, "y": 2},
                 {"x": 11.75, "y": 2},
                 {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 3},
                 {"x": 1, "y": 3},
@@ -3412,7 +3401,7 @@
                 {"x": 12, "y": 0},
                 {"x": 13, "y": 0},
                 {"x": 14, "y": 0},
-
+ 
                 {"x": 0, "y": 1, "w": 1.5},
                 {"x": 1.5, "y": 1},
                 {"x": 2.5, "y": 1},
@@ -3441,7 +3430,7 @@
                 {"x": 10.75, "y": 2},
                 {"x": 11.75, "y": 2},
                 {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 3},
                 {"x": 1, "y": 3},
diff --git a/keyboards/melgeek/mj6xy/keymaps/via/keymap.c b/keyboards/melgeek/mj6xy/keymaps/via/keymap.c
index 4bedb0d400..be2bcc247e 100755
--- a/keyboards/melgeek/mj6xy/keymaps/via/keymap.c
+++ b/keyboards/melgeek/mj6xy/keymaps/via/keymap.c
@@ -30,6 +30,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, RESET,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS, 
 		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS),
+	
+	LAYOUT_60_ansi(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 
+		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS),
+	
+	LAYOUT_60_ansi(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 
+		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS)
 };