Untangle layouts for Dimple rev3 and Infinity87 (#18462)

7 files changed, 245 insertions, 310 deletions

diff --git a/keyboards/lazydesigners/dimple/staggered/info.json b/keyboards/lazydesigners/dimple/staggered/info.json
index 36be5aefeb..cdce3c767c 100644
--- a/keyboards/lazydesigners/dimple/staggered/info.json
+++ b/keyboards/lazydesigners/dimple/staggered/info.json
@@ -7,54 +7,5 @@
         "vid": "0x4C44",
         "pid": "0x0040",
         "device_version": "0.0.1"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-              {"label":"Esc", "x":0, "y":0},
-              {"label":"Q", "x":1, "y":0},
-              {"label":"W", "x":2, "y":0},
-              {"label":"E", "x":3, "y":0},
-              {"label":"R", "x":4, "y":0},
-              {"label":"T", "x":5, "y":0},
-              {"label":"Y", "x":6, "y":0},
-              {"label":"U", "x":7, "y":0},
-              {"label":"I", "x":8, "y":0},
-              {"label":"O", "x":9, "y":0},
-              {"label":"P", "x":10, "y":0},
-              {"label":"Back<br>Space", "x":11, "y":0, "w":1.5},
-              {"label":"Tab", "x":0, "y":1, "w":1.25},
-              {"label":"A", "x":1.25, "y":1},
-              {"label":"S", "x":2.25, "y":1},
-              {"label":"D", "x":3.25, "y":1},
-              {"label":"F", "x":4.25, "y":1},
-              {"label":"G", "x":5.25, "y":1},
-              {"label":"H", "x":6.25, "y":1},
-              {"label":"J", "x":7.25, "y":1},
-              {"label":"K", "x":8.25, "y":1},
-              {"label":"L", "x":9.25, "y":1},
-              {"label":"'", "x":10.25, "y":1},
-              {"label":"Enter", "x":11.25, "y":1, "w":1.25},
-              {"label":"Shift", "x":0, "y":2, "w":1.75},
-              {"label":"Z", "x":1.75, "y":2},
-              {"label":"X", "x":2.75, "y":2},
-              {"label":"C", "x":3.75, "y":2},
-              {"label":"V", "x":4.75, "y":2},
-              {"label":"B", "x":5.75, "y":2},
-              {"label":"N", "x":6.75, "y":2},
-              {"label":"M", "x":7.75, "y":2},
-              {"label":",", "x":8.75, "y":2},
-              {"label":"Up", "x":9.75, "y":2},
-              {"label":".", "x":10.75, "y":2, "w":1.75},
-              {"label":"Ctrl", "x":0.75, "y":3},
-              {"label":"Gui", "x":1.75, "y":3},
-              {"label":"Alt", "x":2.75, "y":3},
-              {"label":"Space", "x":3.75, "y":3, "w":2.25},
-              {"label":"Space", "x":6, "y":3, "w":2.75},
-              {"label":"Left", "x":8.75, "y":3},
-              {"label":"Down", "x":9.75, "y":3},
-              {"label":"Right", "x":10.75, "y":3}
-           ]
-        }
     }
 }
diff --git a/keyboards/lazydesigners/dimple/staggered/rev1/info.json b/keyboards/lazydesigners/dimple/staggered/rev1/info.json
new file mode 100644
index 0000000000..7fe8c59ccb
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/staggered/rev1/info.json
@@ -0,0 +1,54 @@
+{
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0, "matrix": [0, 0]},
+                {"label":"Q", "x":1, "y":0, "matrix": [0, 1]},
+                {"label":"W", "x":2, "y":0, "matrix": [0, 2]},
+                {"label":"E", "x":3, "y":0, "matrix": [0, 3]},
+                {"label":"R", "x":4, "y":0, "matrix": [0, 4]},
+                {"label":"T", "x":5, "y":0, "matrix": [0, 5]},
+                {"label":"Y", "x":6, "y":0, "matrix": [0, 6]},
+                {"label":"U", "x":7, "y":0, "matrix": [0, 7]},
+                {"label":"I", "x":8, "y":0, "matrix": [0, 8]},
+                {"label":"O", "x":9, "y":0, "matrix": [0, 9]},
+                {"label":"P", "x":10, "y":0, "matrix": [0, 10]},
+                {"label":"Back<br>Space", "x":11, "y":0, "w":1.5, "matrix": [0, 11]},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.25, "matrix": [1, 0]},
+                {"label":"A", "x":1.25, "y":1, "matrix": [1, 1]},
+                {"label":"S", "x":2.25, "y":1, "matrix": [1, 2]},
+                {"label":"D", "x":3.25, "y":1, "matrix": [1, 3]},
+                {"label":"F", "x":4.25, "y":1, "matrix": [1, 4]},
+                {"label":"G", "x":5.25, "y":1, "matrix": [1, 5]},
+                {"label":"H", "x":6.25, "y":1, "matrix": [1, 6]},
+                {"label":"J", "x":7.25, "y":1, "matrix": [1, 7]},
+                {"label":"K", "x":8.25, "y":1, "matrix": [1, 8]},
+                {"label":"L", "x":9.25, "y":1, "matrix": [1, 9]},
+                {"label":"'", "x":10.25, "y":1, "matrix": [1, 10]},
+                {"label":"Enter", "x":11.25, "y":1, "w":1.25, "matrix": [1, 11]},
+
+                {"label":"Shift", "x":0, "y":2, "w":1.75, "matrix": [2, 0]},
+                {"label":"Z", "x":1.75, "y":2, "matrix": [2, 1]},
+                {"label":"X", "x":2.75, "y":2, "matrix": [2, 2]},
+                {"label":"C", "x":3.75, "y":2, "matrix": [2, 3]},
+                {"label":"V", "x":4.75, "y":2, "matrix": [2, 4]},
+                {"label":"B", "x":5.75, "y":2, "matrix": [2, 5]},
+                {"label":"N", "x":6.75, "y":2, "matrix": [2, 6]},
+                {"label":"M", "x":7.75, "y":2, "matrix": [2, 7]},
+                {"label":",", "x":8.75, "y":2, "matrix": [2, 8]},
+                {"label":"Up", "x":9.75, "y":2, "matrix": [2, 9]},
+                {"label":".", "x":10.75, "y":2, "w":1.75, "matrix": [2, 10]},
+
+                {"label":"Ctrl", "x":0.75, "y":3, "matrix": [3, 0]},
+                {"label":"Gui", "x":1.75, "y":3, "matrix": [3, 2]},
+                {"label":"Alt", "x":2.75, "y":3, "matrix": [3, 3]},
+                {"label":"Space", "x":3.75, "y":3, "w":2.25, "matrix": [3, 4]},
+                {"label":"Space", "x":6, "y":3, "w":2.75, "matrix": [3, 6]},
+                {"label":"Left", "x":8.75, "y":3, "matrix": [3, 7]},
+                {"label":"Down", "x":9.75, "y":3, "matrix": [3, 8]},
+                {"label":"Right", "x":10.75, "y":3, "matrix": [3, 9]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/lazydesigners/dimple/staggered/rev2/info.json b/keyboards/lazydesigners/dimple/staggered/rev2/info.json
new file mode 100644
index 0000000000..7fe8c59ccb
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/staggered/rev2/info.json
@@ -0,0 +1,54 @@
+{
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0, "matrix": [0, 0]},
+                {"label":"Q", "x":1, "y":0, "matrix": [0, 1]},
+                {"label":"W", "x":2, "y":0, "matrix": [0, 2]},
+                {"label":"E", "x":3, "y":0, "matrix": [0, 3]},
+                {"label":"R", "x":4, "y":0, "matrix": [0, 4]},
+                {"label":"T", "x":5, "y":0, "matrix": [0, 5]},
+                {"label":"Y", "x":6, "y":0, "matrix": [0, 6]},
+                {"label":"U", "x":7, "y":0, "matrix": [0, 7]},
+                {"label":"I", "x":8, "y":0, "matrix": [0, 8]},
+                {"label":"O", "x":9, "y":0, "matrix": [0, 9]},
+                {"label":"P", "x":10, "y":0, "matrix": [0, 10]},
+                {"label":"Back<br>Space", "x":11, "y":0, "w":1.5, "matrix": [0, 11]},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.25, "matrix": [1, 0]},
+                {"label":"A", "x":1.25, "y":1, "matrix": [1, 1]},
+                {"label":"S", "x":2.25, "y":1, "matrix": [1, 2]},
+                {"label":"D", "x":3.25, "y":1, "matrix": [1, 3]},
+                {"label":"F", "x":4.25, "y":1, "matrix": [1, 4]},
+                {"label":"G", "x":5.25, "y":1, "matrix": [1, 5]},
+                {"label":"H", "x":6.25, "y":1, "matrix": [1, 6]},
+                {"label":"J", "x":7.25, "y":1, "matrix": [1, 7]},
+                {"label":"K", "x":8.25, "y":1, "matrix": [1, 8]},
+                {"label":"L", "x":9.25, "y":1, "matrix": [1, 9]},
+                {"label":"'", "x":10.25, "y":1, "matrix": [1, 10]},
+                {"label":"Enter", "x":11.25, "y":1, "w":1.25, "matrix": [1, 11]},
+
+                {"label":"Shift", "x":0, "y":2, "w":1.75, "matrix": [2, 0]},
+                {"label":"Z", "x":1.75, "y":2, "matrix": [2, 1]},
+                {"label":"X", "x":2.75, "y":2, "matrix": [2, 2]},
+                {"label":"C", "x":3.75, "y":2, "matrix": [2, 3]},
+                {"label":"V", "x":4.75, "y":2, "matrix": [2, 4]},
+                {"label":"B", "x":5.75, "y":2, "matrix": [2, 5]},
+                {"label":"N", "x":6.75, "y":2, "matrix": [2, 6]},
+                {"label":"M", "x":7.75, "y":2, "matrix": [2, 7]},
+                {"label":",", "x":8.75, "y":2, "matrix": [2, 8]},
+                {"label":"Up", "x":9.75, "y":2, "matrix": [2, 9]},
+                {"label":".", "x":10.75, "y":2, "w":1.75, "matrix": [2, 10]},
+
+                {"label":"Ctrl", "x":0.75, "y":3, "matrix": [3, 0]},
+                {"label":"Gui", "x":1.75, "y":3, "matrix": [3, 2]},
+                {"label":"Alt", "x":2.75, "y":3, "matrix": [3, 3]},
+                {"label":"Space", "x":3.75, "y":3, "w":2.25, "matrix": [3, 4]},
+                {"label":"Space", "x":6, "y":3, "w":2.75, "matrix": [3, 6]},
+                {"label":"Left", "x":8.75, "y":3, "matrix": [3, 7]},
+                {"label":"Down", "x":9.75, "y":3, "matrix": [3, 8]},
+                {"label":"Right", "x":10.75, "y":3, "matrix": [3, 9]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/lazydesigners/dimple/staggered/rev3/info.json b/keyboards/lazydesigners/dimple/staggered/rev3/info.json
index eb1d8b14dc..d1e1568035 100644
--- a/keyboards/lazydesigners/dimple/staggered/rev3/info.json
+++ b/keyboards/lazydesigners/dimple/staggered/rev3/info.json
@@ -1,144 +1,150 @@
 {
-    "keyboard_name": "Dimple", 
-    "url": "http://lazydesigners.cn", 
-    "maintainer": "Jacky@LAZYDESIGNERS", 
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-              {"label":"Esc", "x":0, "y":0},
-              {"label":"Q", "x":1, "y":0},
-              {"label":"W", "x":2, "y":0},
-              {"label":"E", "x":3, "y":0},
-              {"label":"R", "x":4, "y":0},
-              {"label":"T", "x":5, "y":0},
-              {"label":"Y", "x":6, "y":0},
-              {"label":"U", "x":7, "y":0},
-              {"label":"I", "x":8, "y":0},
-              {"label":"O", "x":9, "y":0},
-              {"label":"P", "x":10, "y":0},
-              {"label":"Back<br>Space", "x":11, "y":0, "w":1.5},
-              {"label":"Tab", "x":0, "y":1, "w":1.25},
-              {"label":"A", "x":1.25, "y":1},
-              {"label":"S", "x":2.25, "y":1},
-              {"label":"D", "x":3.25, "y":1},
-              {"label":"F", "x":4.25, "y":1},
-              {"label":"G", "x":5.25, "y":1},
-              {"label":"H", "x":6.25, "y":1},
-              {"label":"J", "x":7.25, "y":1},
-              {"label":"K", "x":8.25, "y":1},
-              {"label":"L", "x":9.25, "y":1},
-              {"label":"'", "x":10.25, "y":1},
-              {"label":"Enter", "x":11.25, "y":1, "w":1.25},
-              {"label":"Shift", "x":0, "y":2, "w":1.75},
-              {"label":"Z", "x":1.75, "y":2},
-              {"label":"X", "x":2.75, "y":2},
-              {"label":"C", "x":3.75, "y":2},
-              {"label":"V", "x":4.75, "y":2},
-              {"label":"B", "x":5.75, "y":2},
-              {"label":"N", "x":6.75, "y":2},
-              {"label":"M", "x":7.75, "y":2},
-              {"label":",", "x":8.75, "y":2},
-              {"label":"Up", "x":9.75, "y":2},
-              {"label":".", "x":10.75, "y":2, "w":1.75},
-              {"label":"Ctrl", "x":0.75, "y":3},
-              {"label":"Gui", "x":1.75, "y":3},
-              {"label":"Alt", "x":2.75, "y":3},
-              {"label":"Space", "x":3.75, "y":3, "w":2.25},
-              {"label":"Space", "x":6, "y":3, "w":2.75},
-              {"label":"Left", "x":8.75, "y":3},
-              {"label":"Down", "x":9.75, "y":3},
-              {"label":"Right", "x":10.75, "y":3}
-           ]
+                {"label":"Esc", "x":0, "y":0, "matrix": [0, 0]},
+                {"label":"Q", "x":1, "y":0, "matrix": [0, 1]},
+                {"label":"W", "x":2, "y":0, "matrix": [0, 2]},
+                {"label":"E", "x":3, "y":0, "matrix": [0, 3]},
+                {"label":"R", "x":4, "y":0, "matrix": [0, 4]},
+                {"label":"T", "x":5, "y":0, "matrix": [0, 5]},
+                {"label":"Y", "x":6, "y":0, "matrix": [0, 6]},
+                {"label":"U", "x":7, "y":0, "matrix": [0, 7]},
+                {"label":"I", "x":8, "y":0, "matrix": [0, 8]},
+                {"label":"O", "x":9, "y":0, "matrix": [0, 9]},
+                {"label":"P", "x":10, "y":0, "matrix": [0, 10]},
+                {"label":"Back<br>Space", "x":11, "y":0, "w":1.5, "matrix": [0, 11]},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.25, "matrix": [1, 0]},
+                {"label":"A", "x":1.25, "y":1, "matrix": [1, 1]},
+                {"label":"S", "x":2.25, "y":1, "matrix": [1, 2]},
+                {"label":"D", "x":3.25, "y":1, "matrix": [1, 3]},
+                {"label":"F", "x":4.25, "y":1, "matrix": [1, 4]},
+                {"label":"G", "x":5.25, "y":1, "matrix": [1, 5]},
+                {"label":"H", "x":6.25, "y":1, "matrix": [1, 6]},
+                {"label":"J", "x":7.25, "y":1, "matrix": [1, 7]},
+                {"label":"K", "x":8.25, "y":1, "matrix": [1, 8]},
+                {"label":"L", "x":9.25, "y":1, "matrix": [1, 9]},
+                {"label":"'", "x":10.25, "y":1, "matrix": [1, 10]},
+                {"label":"Enter", "x":11.25, "y":1, "w":1.25, "matrix": [1, 11]},
+
+                {"label":"Shift", "x":0, "y":2, "w":1.75, "matrix": [2, 0]},
+                {"label":"Z", "x":1.75, "y":2, "matrix": [2, 1]},
+                {"label":"X", "x":2.75, "y":2, "matrix": [2, 2]},
+                {"label":"C", "x":3.75, "y":2, "matrix": [2, 3]},
+                {"label":"V", "x":4.75, "y":2, "matrix": [2, 4]},
+                {"label":"B", "x":5.75, "y":2, "matrix": [2, 5]},
+                {"label":"N", "x":6.75, "y":2, "matrix": [2, 6]},
+                {"label":"M", "x":7.75, "y":2, "matrix": [2, 7]},
+                {"label":",", "x":8.75, "y":2, "matrix": [2, 8]},
+                {"label":"Up", "x":9.75, "y":2, "matrix": [2, 9]},
+                {"label":".", "x":10.75, "y":2, "w":1.75, "matrix": [2, 10]},
+
+                {"label":"Ctrl", "x":0.75, "y":3, "matrix": [3, 0]},
+                {"label":"Gui", "x":1.75, "y":3, "matrix": [3, 2]},
+                {"label":"Alt", "x":2.75, "y":3, "matrix": [3, 3]},
+                {"label":"Space", "x":3.75, "y":3, "w":2.25, "matrix": [3, 4]},
+                {"label":"Space", "x":6, "y":3, "w":2.75, "matrix": [3, 6]},
+                {"label":"Left", "x":8.75, "y":3, "matrix": [3, 7]},
+                {"label":"Down", "x":9.75, "y":3, "matrix": [3, 8]},
+                {"label":"Right", "x":10.75, "y":3, "matrix": [3, 9]}
+            ]
         },
         "LAYOUT_iso": {
             "layout": [
-              {"label":"Esc", "x":0, "y":0},
-              {"label":"Q", "x":1, "y":0},
-              {"label":"W", "x":2, "y":0},
-              {"label":"E", "x":3, "y":0},
-              {"label":"R", "x":4, "y":0},
-              {"label":"T", "x":5, "y":0},
-              {"label":"Y", "x":6, "y":0},
-              {"label":"U", "x":7, "y":0},
-              {"label":"I", "x":8, "y":0},
-              {"label":"O", "x":9, "y":0},
-              {"label":"P", "x":10, "y":0},
-              {"label":"Tab", "x":0, "y":1, "w":1.25},
-              {"label":"A", "x":1.25, "y":1},
-              {"label":"S", "x":2.25, "y":1},
-              {"label":"D", "x":3.25, "y":1},
-              {"label":"F", "x":4.25, "y":1},
-              {"label":"G", "x":5.25, "y":1},
-              {"label":"H", "x":6.25, "y":1},
-              {"label":"J", "x":7.25, "y":1},
-              {"label":"K", "x":8.25, "y":1},
-              {"label":"L", "x":9.25, "y":1},
-              {"label":"'", "x":10.25, "y":1},
-              {"label":"Enter", "x":11.25, "y":0, "w":1.25,"h":2},
-              {"label":"Shift", "x":0, "y":2, "w":1.75},
-              {"label":"Z", "x":1.75, "y":2},
-              {"label":"X", "x":2.75, "y":2},
-              {"label":"C", "x":3.75, "y":2},
-              {"label":"V", "x":4.75, "y":2},
-              {"label":"B", "x":5.75, "y":2},
-              {"label":"N", "x":6.75, "y":2},
-              {"label":"M", "x":7.75, "y":2},
-              {"label":",", "x":8.75, "y":2},
-              {"label":"Up", "x":9.75, "y":2},
-              {"label":".", "x":10.75, "y":2, "w":1.75},
-              {"label":"Ctrl", "x":0.75, "y":3},
-              {"label":"Gui", "x":1.75, "y":3},
-              {"label":"Alt", "x":2.75, "y":3},
-              {"label":"Space", "x":3.75, "y":3, "w":2.25},
-              {"label":"Space", "x":6, "y":3, "w":2.75},
-              {"label":"Left", "x":8.75, "y":3},
-              {"label":"Down", "x":9.75, "y":3},
-              {"label":"Right", "x":10.75, "y":3}
-           ]
+                {"label":"Esc", "x":0, "y":0, "matrix": [0, 0]},
+                {"label":"Q", "x":1, "y":0, "matrix": [0, 1]},
+                {"label":"W", "x":2, "y":0, "matrix": [0, 2]},
+                {"label":"E", "x":3, "y":0, "matrix": [0, 3]},
+                {"label":"R", "x":4, "y":0, "matrix": [0, 4]},
+                {"label":"T", "x":5, "y":0, "matrix": [0, 5]},
+                {"label":"Y", "x":6, "y":0, "matrix": [0, 6]},
+                {"label":"U", "x":7, "y":0, "matrix": [0, 7]},
+                {"label":"I", "x":8, "y":0, "matrix": [0, 8]},
+                {"label":"O", "x":9, "y":0, "matrix": [0, 9]},
+                {"label":"P", "x":10, "y":0, "matrix": [0, 10]},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.25, "matrix": [1, 0]},
+                {"label":"A", "x":1.25, "y":1, "matrix": [1, 1]},
+                {"label":"S", "x":2.25, "y":1, "matrix": [1, 2]},
+                {"label":"D", "x":3.25, "y":1, "matrix": [1, 3]},
+                {"label":"F", "x":4.25, "y":1, "matrix": [1, 4]},
+                {"label":"G", "x":5.25, "y":1, "matrix": [1, 5]},
+                {"label":"H", "x":6.25, "y":1, "matrix": [1, 6]},
+                {"label":"J", "x":7.25, "y":1, "matrix": [1, 7]},
+                {"label":"K", "x":8.25, "y":1, "matrix": [1, 8]},
+                {"label":"L", "x":9.25, "y":1, "matrix": [1, 9]},
+                {"label":"'", "x":10.25, "y":1, "matrix": [1, 10]},
+                {"label":"Enter", "x":11.25, "y":0, "w":1.25,"h":2, "matrix": [1, 11]},
+
+                {"label":"Shift", "x":0, "y":2, "w":1.75, "matrix": [2, 0]},
+                {"label":"Z", "x":1.75, "y":2, "matrix": [2, 1]},
+                {"label":"X", "x":2.75, "y":2, "matrix": [2, 2]},
+                {"label":"C", "x":3.75, "y":2, "matrix": [2, 3]},
+                {"label":"V", "x":4.75, "y":2, "matrix": [2, 4]},
+                {"label":"B", "x":5.75, "y":2, "matrix": [2, 5]},
+                {"label":"N", "x":6.75, "y":2, "matrix": [2, 6]},
+                {"label":"M", "x":7.75, "y":2, "matrix": [2, 7]},
+                {"label":",", "x":8.75, "y":2, "matrix": [2, 8]},
+                {"label":"Up", "x":9.75, "y":2, "matrix": [2, 9]},
+                {"label":".", "x":10.75, "y":2, "w":1.75, "matrix": [2, 10]},
+
+                {"label":"Ctrl", "x":0.75, "y":3, "matrix": [3, 0]},
+                {"label":"Gui", "x":1.75, "y":3, "matrix": [3, 2]},
+                {"label":"Alt", "x":2.75, "y":3, "matrix": [3, 3]},
+                {"label":"Space", "x":3.75, "y":3, "w":2.25, "matrix": [3, 4]},
+                {"label":"Space", "x":6, "y":3, "w":2.75, "matrix": [3, 6]},
+                {"label":"Left", "x":8.75, "y":3, "matrix": [3, 7]},
+                {"label":"Down", "x":9.75, "y":3, "matrix": [3, 8]},
+                {"label":"Right", "x":10.75, "y":3, "matrix": [3, 9]}
+            ]
         },
         "LAYOUT_7u": {
             "layout": [
-                    {"label":"Esc", "x":0, "y":0},
-                    {"label":"Q", "x":1, "y":0},
-                    {"label":"W", "x":2, "y":0},
-                    {"label":"E", "x":3, "y":0},
-                    {"label":"R", "x":4, "y":0},
-                    {"label":"T", "x":5, "y":0},
-                    {"label":"Y", "x":6, "y":0},
-                    {"label":"U", "x":7, "y":0},
-                    {"label":"I", "x":8, "y":0},
-                    {"label":"O", "x":9, "y":0},
-                    {"label":"P", "x":10, "y":0},
-                    {"label":"Back<br>Space", "x":11, "y":0, "w":1.5},
-                    {"label":"Tab", "x":0, "y":1, "w":1.25},
-                    {"label":"A", "x":1.25, "y":1},
-                    {"label":"S", "x":2.25, "y":1},
-                    {"label":"D", "x":3.25, "y":1},
-                    {"label":"F", "x":4.25, "y":1},
-                    {"label":"G", "x":5.25, "y":1},
-                    {"label":"H", "x":6.25, "y":1},
-                    {"label":"J", "x":7.25, "y":1},
-                    {"label":"K", "x":8.25, "y":1},
-                    {"label":"L", "x":9.25, "y":1},
-                    {"label":"'", "x":10.25, "y":1},
-                    {"label":"Enter", "x":11.25, "y":1, "w":1.25},
-                    {"label":"Shift", "x":0, "y":2, "w":1.75},
-                    {"label":"Z", "x":1.75, "y":2},
-                    {"label":"X", "x":2.75, "y":2},
-                    {"label":"C", "x":3.75, "y":2},
-                    {"label":"V", "x":4.75, "y":2},
-                    {"label":"B", "x":5.75, "y":2},
-                    {"label":"N", "x":6.75, "y":2},
-                    {"label":"M", "x":7.75, "y":2},
-                    {"label":",", "x":8.75, "y":2},
-                    {"label":"Up", "x":9.75, "y":2},
-                    {"label":".", "x":10.75, "y":2, "w":1.75},
-                    {"label":"Ctrl", "x":0.75, "y":3},
-                    {"label":"Gui", "x":1.75, "y":3},
-                    {"label":"Space", "x":2.75, "y":3, "w":7},
-                    {"label":"Down", "x":9.75, "y":3},
-                    {"label":"Right", "x":10.75, "y":3}
-           ]
+                {"label":"Esc", "x":0, "y":0, "matrix": [0, 0]},
+                {"label":"Q", "x":1, "y":0, "matrix": [0, 1]},
+                {"label":"W", "x":2, "y":0, "matrix": [0, 2]},
+                {"label":"E", "x":3, "y":0, "matrix": [0, 3]},
+                {"label":"R", "x":4, "y":0, "matrix": [0, 4]},
+                {"label":"T", "x":5, "y":0, "matrix": [0, 5]},
+                {"label":"Y", "x":6, "y":0, "matrix": [0, 6]},
+                {"label":"U", "x":7, "y":0, "matrix": [0, 7]},
+                {"label":"I", "x":8, "y":0, "matrix": [0, 8]},
+                {"label":"O", "x":9, "y":0, "matrix": [0, 9]},
+                {"label":"P", "x":10, "y":0, "matrix": [0, 10]},
+                {"label":"Back<br>Space", "x":11, "y":0, "w":1.5, "matrix": [0, 11]},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.25, "matrix": [1, 0]},
+                {"label":"A", "x":1.25, "y":1, "matrix": [1, 1]},
+                {"label":"S", "x":2.25, "y":1, "matrix": [1, 2]},
+                {"label":"D", "x":3.25, "y":1, "matrix": [1, 3]},
+                {"label":"F", "x":4.25, "y":1, "matrix": [1, 4]},
+                {"label":"G", "x":5.25, "y":1, "matrix": [1, 5]},
+                {"label":"H", "x":6.25, "y":1, "matrix": [1, 6]},
+                {"label":"J", "x":7.25, "y":1, "matrix": [1, 7]},
+                {"label":"K", "x":8.25, "y":1, "matrix": [1, 8]},
+                {"label":"L", "x":9.25, "y":1, "matrix": [1, 9]},
+                {"label":"'", "x":10.25, "y":1, "matrix": [1, 10]},
+                {"label":"Enter", "x":11.25, "y":1, "w":1.25, "matrix": [1, 11]},
+
+                {"label":"Shift", "x":0, "y":2, "w":1.75, "matrix": [2, 0]},
+                {"label":"Z", "x":1.75, "y":2, "matrix": [2, 1]},
+                {"label":"X", "x":2.75, "y":2, "matrix": [2, 2]},
+                {"label":"C", "x":3.75, "y":2, "matrix": [2, 3]},
+                {"label":"V", "x":4.75, "y":2, "matrix": [2, 4]},
+                {"label":"B", "x":5.75, "y":2, "matrix": [2, 5]},
+                {"label":"N", "x":6.75, "y":2, "matrix": [2, 6]},
+                {"label":"M", "x":7.75, "y":2, "matrix": [2, 7]},
+                {"label":",", "x":8.75, "y":2, "matrix": [2, 8]},
+                {"label":"Up", "x":9.75, "y":2, "matrix": [2, 9]},
+                {"label":".", "x":10.75, "y":2, "w":1.75, "matrix": [2, 10]},
+
+                {"label":"Ctrl", "x":0.75, "y":3, "matrix": [3, 0]},
+                {"label":"Gui", "x":1.75, "y":3, "matrix": [3, 2]},
+                {"label":"Space", "x":2.75, "y":3, "w":7, "matrix": [3, 4]},
+                {"label":"Down", "x":9.75, "y":3, "matrix": [3, 8]},
+                {"label":"Right", "x":10.75, "y":3, "matrix": [3, 9]}
+            ]
         }
     }
 }
diff --git a/keyboards/lazydesigners/dimple/staggered/rev3/rev3.c b/keyboards/lazydesigners/dimple/staggered/rev3/rev3.c
deleted file mode 100644
index afa1d38b6d..0000000000
--- a/keyboards/lazydesigners/dimple/staggered/rev3/rev3.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Erovia
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev3.h"
diff --git a/keyboards/lazydesigners/dimple/staggered/rev3/rev3.h b/keyboards/lazydesigners/dimple/staggered/rev3/rev3.h
deleted file mode 100644
index 2aec210d9e..0000000000
--- a/keyboards/lazydesigners/dimple/staggered/rev3/rev3.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* Copyright 2019 Erovia
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/*
- *  ,---------------------------------------------------------------.
- *  |    |    |    |    |    |    |    |    |    |    |    |        |
- *  |---------------------------------------------------------------|
- *  |      |    |    |    |    |    |    |    |    |    |    |      |
- *  |---------------------------------------------------------------|
- *  |        |    |    |    |    |    |    |    |    |    |         |
- *  |---------------------------------------------------------------|
- *       |    |    |    |         |             |    |    |    |
- *       `-----------------------------------------------------'
- */
-
-#define LAYOUT_all( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210,       \
-	K300,       K302, K303, K304,       K306, K307, K308, K309  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011  }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111  }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  KC_NO }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  KC_NO, K306,  K307,  K308,  K309,  KC_NO, KC_NO }  \
-}
-
-/*
- *  ,---------------------------------------------------------------.
- *  |    |    |    |    |    |    |    |    |    |    |    |        |
- *  |--------------------------------------------------------       |
- *  |      |    |    |    |    |    |    |    |    |    |    |      |
- *  |---------------------------------------------------------------|
- *  |        |    |    |    |    |    |    |    |    |    |         |
- *  |---------------------------------------------------------------|
- *       |    |    |    |         |             |    |    |    |
- *       `-----------------------------------------------------'
- */
-
-#define LAYOUT_iso( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010,       \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210,       \
-	K300,       K302, K303, K304,       K306, K307, K308, K309              \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  KC_NO }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111  }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  KC_NO }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  KC_NO, K306,  K307,  K308,  K309,  KC_NO, KC_NO }  \
-}
-
-/*
- *  ,---------------------------------------------------------------.
- *  |    |    |    |    |    |    |    |    |    |    |    |        |
- *  |---------------------------------------------------------------|
- *  |      |    |    |    |    |    |    |    |    |    |    |      |
- *  |---------------------------------------------------------------|
- *  |        |    |    |    |    |    |    |    |    |    |         |
- *  |---------------------------------------------------------------|
- *       |    |    |                                 |    |    |
- *       `-----------------------------------------------------'
- */
-
-#define LAYOUT_7u( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210,       \
-	K300,       K302,       K304,                   K308, K309              \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011  }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111  }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  KC_NO }, \
-	{ K300,  KC_NO, K302,  KC_NO, K304,  KC_NO, KC_NO, KC_NO, K308,  K309,  KC_NO, KC_NO }  \
-}
diff --git a/keyboards/lazydesigners/dimple/staggered/staggered.h b/keyboards/lazydesigners/dimple/staggered/staggered.h
index 433de3b897..bdaddb7750 100644
--- a/keyboards/lazydesigners/dimple/staggered/staggered.h
+++ b/keyboards/lazydesigners/dimple/staggered/staggered.h
@@ -17,29 +17,5 @@
 
 #include "quantum.h"
 
-/*
- *  ,---------------------------------------------------------------.
- *  |    |    |    |    |    |    |    |    |    |    |    |        |
- *  |---------------------------------------------------------------|
- *  |      |    |    |    |    |    |    |    |    |    |    |      |
- *  |---------------------------------------------------------------|
- *  |        |    |    |    |    |    |    |    |    |    |         |
- *  |---------------------------------------------------------------|
- *       |    |    |    |         |             |    |    |    |
- *       `-----------------------------------------------------'
- */
-
-#define LAYOUT( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210,       \
-	K300,       K302, K303, K304,       K306, K307, K308, K309  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  KC_NO }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  KC_NO, K306,  K307,  K308,  K309,  KC_NO, KC_NO }  \
-}
-
 void dimple_led_on(void);
 void dimple_led_off(void);