Move remaining `LAYOUT_all`s to data driven (#20463)

2 files changed, 233 insertions, 312 deletions

diff --git a/keyboards/rmi_kb/squishyfrl/info.json b/keyboards/rmi_kb/squishyfrl/info.json
index 7f68631da7..f6ab10f5d9 100644
--- a/keyboards/rmi_kb/squishyfrl/info.json
+++ b/keyboards/rmi_kb/squishyfrl/info.json
@@ -21,247 +21,259 @@
     "layouts": {
         "LAYOUT_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
+                {"matrix": [4, 0], "x": 0, "y": 0},
+                {"matrix": [4, 1], "x": 1, "y": 0},
+                {"matrix": [4, 2], "x": 2, "y": 0},
+                {"matrix": [4, 3], "x": 3, "y": 0},
+                {"matrix": [4, 4], "x": 4, "y": 0},
+                {"matrix": [4, 5], "x": 5, "y": 0},
+                {"matrix": [4, 6], "x": 6, "y": 0},
+                {"matrix": [4, 7], "x": 7, "y": 0},
+                {"matrix": [4, 8], "x": 8, "y": 0},
+                {"matrix": [4, 9], "x": 9, "y": 0},
+                {"matrix": [4, 10], "x": 10, "y": 0},
+                {"matrix": [4, 11], "x": 11, "y": 0},
+                {"matrix": [4, 12], "x": 12, "y": 0},
+                {"matrix": [4, 13], "x": 13, "y": 0, "w": 2},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15.25, "y":1},
-                {"x":16.25, "y":1},
-                {"x":17.25, "y":1},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
+                {"matrix": [5, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 1},
+                {"matrix": [5, 2], "x": 2.5, "y": 1},
+                {"matrix": [5, 3], "x": 3.5, "y": 1},
+                {"matrix": [5, 4], "x": 4.5, "y": 1},
+                {"matrix": [5, 5], "x": 5.5, "y": 1},
+                {"matrix": [5, 6], "x": 6.5, "y": 1},
+                {"matrix": [5, 7], "x": 7.5, "y": 1},
+                {"matrix": [5, 8], "x": 8.5, "y": 1},
+                {"matrix": [5, 9], "x": 9.5, "y": 1},
+                {"matrix": [5, 10], "x": 10.5, "y": 1},
+                {"matrix": [5, 11], "x": 11.5, "y": 1},
+                {"matrix": [5, 12], "x": 12.5, "y": 1},
+                {"matrix": [5, 14], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":16.25, "y":3},
+                {"matrix": [1, 15], "x": 15.25, "y": 1},
+                {"matrix": [1, 16], "x": 16.25, "y": 1},
+                {"matrix": [1, 17], "x": 17.25, "y": 1},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":12.5, "y":4, "w":1.25},
-                {"x":13.75, "y":4, "w":1.25},
-                {"x":15.25, "y":4},
-                {"x":16.25, "y":4},
-                {"x":17.25, "y":4}
+                {"matrix": [6, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [6, 1], "x": 1.75, "y": 2},
+                {"matrix": [6, 2], "x": 2.75, "y": 2},
+                {"matrix": [6, 3], "x": 3.75, "y": 2},
+                {"matrix": [6, 4], "x": 4.75, "y": 2},
+                {"matrix": [6, 5], "x": 5.75, "y": 2},
+                {"matrix": [6, 6], "x": 6.75, "y": 2},
+                {"matrix": [6, 7], "x": 7.75, "y": 2},
+                {"matrix": [6, 8], "x": 8.75, "y": 2},
+                {"matrix": [6, 9], "x": 9.75, "y": 2},
+                {"matrix": [6, 10], "x": 10.75, "y": 2},
+                {"matrix": [6, 11], "x": 11.75, "y": 2},
+                {"matrix": [6, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [7, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [7, 2], "x": 2.25, "y": 3},
+                {"matrix": [7, 3], "x": 3.25, "y": 3},
+                {"matrix": [7, 4], "x": 4.25, "y": 3},
+                {"matrix": [7, 5], "x": 5.25, "y": 3},
+                {"matrix": [7, 6], "x": 6.25, "y": 3},
+                {"matrix": [7, 7], "x": 7.25, "y": 3},
+                {"matrix": [7, 8], "x": 8.25, "y": 3},
+                {"matrix": [7, 9], "x": 9.25, "y": 3},
+                {"matrix": [7, 10], "x": 10.25, "y": 3},
+                {"matrix": [7, 11], "x": 11.25, "y": 3},
+                {"matrix": [7, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 14], "x": 14, "y": 3},
+
+                {"matrix": [2, 19], "x": 16.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 8], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [8, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 13], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 14], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [3, 18], "x": 15.25, "y": 4},
+                {"matrix": [3, 19], "x": 16.25, "y": 4},
+                {"matrix": [3, 20], "x": 17.25, "y": 4}
             ]
         },
         "LAYOUT_iso": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
+                {"matrix": [4, 0], "x": 0, "y": 0},
+                {"matrix": [4, 1], "x": 1, "y": 0},
+                {"matrix": [4, 2], "x": 2, "y": 0},
+                {"matrix": [4, 3], "x": 3, "y": 0},
+                {"matrix": [4, 4], "x": 4, "y": 0},
+                {"matrix": [4, 5], "x": 5, "y": 0},
+                {"matrix": [4, 6], "x": 6, "y": 0},
+                {"matrix": [4, 7], "x": 7, "y": 0},
+                {"matrix": [4, 8], "x": 8, "y": 0},
+                {"matrix": [4, 9], "x": 9, "y": 0},
+                {"matrix": [4, 10], "x": 10, "y": 0},
+                {"matrix": [4, 11], "x": 11, "y": 0},
+                {"matrix": [4, 12], "x": 12, "y": 0},
+                {"matrix": [4, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 1},
+                {"matrix": [5, 2], "x": 2.5, "y": 1},
+                {"matrix": [5, 3], "x": 3.5, "y": 1},
+                {"matrix": [5, 4], "x": 4.5, "y": 1},
+                {"matrix": [5, 5], "x": 5.5, "y": 1},
+                {"matrix": [5, 6], "x": 6.5, "y": 1},
+                {"matrix": [5, 7], "x": 7.5, "y": 1},
+                {"matrix": [5, 8], "x": 8.5, "y": 1},
+                {"matrix": [5, 9], "x": 9.5, "y": 1},
+                {"matrix": [5, 10], "x": 10.5, "y": 1},
+                {"matrix": [5, 11], "x": 11.5, "y": 1},
+                {"matrix": [5, 12], "x": 12.5, "y": 1},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15.25, "y":1},
-                {"x":16.25, "y":1},
-                {"x":17.25, "y":1},
+                {"matrix": [1, 15], "x": 15.25, "y": 1},
+                {"matrix": [1, 16], "x": 16.25, "y": 1},
+                {"matrix": [1, 17], "x": 17.25, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
+                {"matrix": [6, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [6, 1], "x": 1.75, "y": 2},
+                {"matrix": [6, 2], "x": 2.75, "y": 2},
+                {"matrix": [6, 3], "x": 3.75, "y": 2},
+                {"matrix": [6, 4], "x": 4.75, "y": 2},
+                {"matrix": [6, 5], "x": 5.75, "y": 2},
+                {"matrix": [6, 6], "x": 6.75, "y": 2},
+                {"matrix": [6, 7], "x": 7.75, "y": 2},
+                {"matrix": [6, 8], "x": 8.75, "y": 2},
+                {"matrix": [6, 9], "x": 9.75, "y": 2},
+                {"matrix": [6, 10], "x": 10.75, "y": 2},
+                {"matrix": [6, 11], "x": 11.75, "y": 2},
+                {"matrix": [6, 13], "x": 12.75, "y": 2},
+                {"matrix": [5, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":16.25, "y":3},
+                {"matrix": [7, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 1], "x": 1.25, "y": 3},
+                {"matrix": [7, 2], "x": 2.25, "y": 3},
+                {"matrix": [7, 3], "x": 3.25, "y": 3},
+                {"matrix": [7, 4], "x": 4.25, "y": 3},
+                {"matrix": [7, 5], "x": 5.25, "y": 3},
+                {"matrix": [7, 6], "x": 6.25, "y": 3},
+                {"matrix": [7, 7], "x": 7.25, "y": 3},
+                {"matrix": [7, 8], "x": 8.25, "y": 3},
+                {"matrix": [7, 9], "x": 9.25, "y": 3},
+                {"matrix": [7, 10], "x": 10.25, "y": 3},
+                {"matrix": [7, 11], "x": 11.25, "y": 3},
+                {"matrix": [7, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 14], "x": 14, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":12.5, "y":4, "w":1.25},
-                {"x":13.75, "y":4, "w":1.25},
-                {"x":15.25, "y":4},
-                {"x":16.25, "y":4},
-                {"x":17.25, "y":4}
+                {"matrix": [2, 19], "x": 16.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 8], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [8, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 13], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 14], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [3, 18], "x": 15.25, "y": 4},
+                {"matrix": [3, 19], "x": 16.25, "y": 4},
+                {"matrix": [3, 20], "x": 17.25, "y": 4}
             ]
         },
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
+                {"matrix": [4, 0], "x": 0, "y": 0},
+                {"matrix": [4, 1], "x": 1, "y": 0},
+                {"matrix": [4, 2], "x": 2, "y": 0},
+                {"matrix": [4, 3], "x": 3, "y": 0},
+                {"matrix": [4, 4], "x": 4, "y": 0},
+                {"matrix": [4, 5], "x": 5, "y": 0},
+                {"matrix": [4, 6], "x": 6, "y": 0},
+                {"matrix": [4, 7], "x": 7, "y": 0},
+                {"matrix": [4, 8], "x": 8, "y": 0},
+                {"matrix": [4, 9], "x": 9, "y": 0},
+                {"matrix": [4, 10], "x": 10, "y": 0},
+                {"matrix": [4, 11], "x": 11, "y": 0},
+                {"matrix": [4, 12], "x": 12, "y": 0},
+                {"matrix": [4, 13], "x": 13, "y": 0},
+                {"matrix": [4, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 1},
+                {"matrix": [5, 2], "x": 2.5, "y": 1},
+                {"matrix": [5, 3], "x": 3.5, "y": 1},
+                {"matrix": [5, 4], "x": 4.5, "y": 1},
+                {"matrix": [5, 5], "x": 5.5, "y": 1},
+                {"matrix": [5, 6], "x": 6.5, "y": 1},
+                {"matrix": [5, 7], "x": 7.5, "y": 1},
+                {"matrix": [5, 8], "x": 8.5, "y": 1},
+                {"matrix": [5, 9], "x": 9.5, "y": 1},
+                {"matrix": [5, 10], "x": 10.5, "y": 1},
+                {"matrix": [5, 11], "x": 11.5, "y": 1},
+                {"matrix": [5, 12], "x": 12.5, "y": 1},
+                {"matrix": [5, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1},
+                {"matrix": [1, 16], "x": 16.25, "y": 1},
+                {"matrix": [1, 17], "x": 17.25, "y": 1},
+
+                {"matrix": [6, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [6, 1], "x": 1.75, "y": 2},
+                {"matrix": [6, 2], "x": 2.75, "y": 2},
+                {"matrix": [6, 3], "x": 3.75, "y": 2},
+                {"matrix": [6, 4], "x": 4.75, "y": 2},
+                {"matrix": [6, 5], "x": 5.75, "y": 2},
+                {"matrix": [6, 6], "x": 6.75, "y": 2},
+                {"matrix": [6, 7], "x": 7.75, "y": 2},
+                {"matrix": [6, 8], "x": 8.75, "y": 2},
+                {"matrix": [6, 9], "x": 9.75, "y": 2},
+                {"matrix": [6, 10], "x": 10.75, "y": 2},
+                {"matrix": [6, 11], "x": 11.75, "y": 2},
+                {"matrix": [6, 13], "x": 12.75, "y": 2, "w": 2.25},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15.25, "y":1},
-                {"x":16.25, "y":1},
-                {"x":17.25, "y":1},
+                {"matrix": [7, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 1], "x": 1.25, "y": 3},
+                {"matrix": [7, 2], "x": 2.25, "y": 3},
+                {"matrix": [7, 3], "x": 3.25, "y": 3},
+                {"matrix": [7, 4], "x": 4.25, "y": 3},
+                {"matrix": [7, 5], "x": 5.25, "y": 3},
+                {"matrix": [7, 6], "x": 6.25, "y": 3},
+                {"matrix": [7, 7], "x": 7.25, "y": 3},
+                {"matrix": [7, 8], "x": 8.25, "y": 3},
+                {"matrix": [7, 9], "x": 9.25, "y": 3},
+                {"matrix": [7, 10], "x": 10.25, "y": 3},
+                {"matrix": [7, 11], "x": 11.25, "y": 3},
+                {"matrix": [7, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 14], "x": 14, "y": 3},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
+                {"matrix": [2, 19], "x": 16.25, "y": 3},
 
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":16.25, "y":3},
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 3},
+                {"matrix": [8, 8], "x": 6.75, "y": 4},
+                {"matrix": [8, 9], "x": 7.75, "y": 4, "w": 2.25},
+                {"matrix": [8, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 13], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 14], "x": 13.75, "y": 4, "w": 1.25},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":3},
-                {"x":6.75, "y":4},
-                {"x":7.75, "y":4, "w":2.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":12.5, "y":4, "w":1.25},
-                {"x":13.75, "y":4, "w":1.25},
-                {"x":15.25, "y":4},
-                {"x":16.25, "y":4},
-                {"x":17.25, "y":4}
+                {"matrix": [3, 18], "x": 15.25, "y": 4},
+                {"matrix": [3, 19], "x": 16.25, "y": 4},
+                {"matrix": [3, 20], "x": 17.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/rmi_kb/squishyfrl/squishyfrl.h b/keyboards/rmi_kb/squishyfrl/squishyfrl.h
deleted file mode 100644
index e98139da16..0000000000
--- a/keyboards/rmi_kb/squishyfrl/squishyfrl.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* Copyright 2021 Ramon Imbao
- *
- * 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"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define ___ KC_NO
-
-#define LAYOUT_ansi( \
-    k85, k86, k87, k88, k89, k8a, k8b, k8c, k8d, k8e, k8f, k8g, k8h,    k8i,    k4k, k4l, k4m, \
-    k95,   k96, k97, k98, k99, k9a, k9b, k9c, k9d, k9e, k9f, k9g, k9h,   k9j,   k5k, k5l, k5m, \
-    ka5,    ka6, ka7, ka8, ka9, kaa, kab, kac, kad, kae, kaf, kag,     kai,                    \
-    kb5,      kb7, kb8, kb9, kba, kbb, kbc, kbd, kbe, kbf, kbg,     kbi, kbj,        k6l,      \
-    kc5,  kc6,  kc7,                kcd,                kcf,  kcg,  kch,  kci,  k7k, k7l, k7m  \
-) { \
-    /*             0    1    2    3    4    5    6    7    8    9    10   11   12   13   14   15   16   17   18   19   20 */ \
-    /*             0    1    2    3    4    5    6    7    8    9    a    b    c    d    e    f    g    h    i    j    k  */ \
-    /* 0 | 0 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k4k, k4l, k4m, ___, ___, ___ }, \
-    /* 1 | 1 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k5k, k5l, k5m, ___, ___, ___ }, \
-    /* 2 | 2 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k6l, ___ }, \
-    /* 3 | 3 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k7k, k7l, k7m }, \
-    /* 4 | 4 */ { k85, k86, k87, k88, k89, k8a, k8b, k8c, k8d, k8e, k8f, k8g, k8h, k8i, ___, ___, ___, ___, ___, ___, ___ }, \
-    /* 5 | 5 */ { k95, k96, k97, k98, k99, k9a, k9b, k9c, k9d, k9e, k9f, k9g, k9h, ___, k9j, ___, ___, ___, ___, ___, ___ }, \
-    /* 6 | 6 */ { ka5, ka6, ka7, ka8, ka9, kaa, kab, kac, kad, kae, kaf, kag, ___, kai, ___, ___, ___, ___, ___, ___, ___ }, \
-    /* 7 | 7 */ { kb5, ___, kb7, kb8, kb9, kba, kbb, kbc, kbd, kbe, kbf, kbg, ___, kbi, kbj, ___, ___, ___, ___, ___, ___ }, \
-    /* 8 | 8 */ { kc5, kc6, kc7, ___, ___, ___, ___, ___, kcd, ___, kcf, kcg, ___, kch, kci, ___, ___, ___, ___, ___, ___ }, \
-}
-
-#define LAYOUT_iso( \
-    k85, k86, k87, k88, k89, k8a, k8b, k8c, k8d, k8e, k8f, k8g, k8h,    k8i,    k4k, k4l, k4m, \
-    k95,   k96, k97, k98, k99, k9a, k9b, k9c, k9d, k9e, k9f, k9g, k9h,          k5k, k5l, k5m, \
-    ka5,    ka6, ka7, ka8, ka9, kaa, kab, kac, kad, kae, kaf, kag, kai,   k9j,                 \
-    kb5, kb6, kb7, kb8, kb9, kba, kbb, kbc, kbd, kbe, kbf, kbg,     kbi,  kbj,       k6l,      \
-    kc5,  kc6,  kc7,                kcd,                kcf,  kcg,  kch,  kci,  k7k, k7l, k7m  \
-) { \
-    /*             0    1    2    3    4    5    6    7    8    9    10   11   12   13   14   15   16   17   18   19   20 */ \
-    /*             0    1    2    3    4    5    6    7    8    9    a    b    c    d    e    f    g    h    i    j    k  */ \
-    /* 0 | 0 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k4k, k4l, k4m, ___, ___, ___ }, \
-    /* 1 | 1 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k5k, k5l, k5m, ___, ___, ___ }, \
-    /* 2 | 2 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k6l, ___ }, \
-    /* 3 | 3 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k7k, k7l, k7m }, \
-    /* 4 | 4 */ { k85, k86, k87, k88, k89, k8a, k8b, k8c, k8d, k8e, k8f, k8g, k8h, k8i, ___, ___, ___, ___, ___, ___, ___ }, \
-    /* 5 | 5 */ { k95, k96, k97, k98, k99, k9a, k9b, k9c, k9d, k9e, k9f, k9g, k9h, ___, k9j, ___, ___, ___, ___, ___, ___ }, \
-    /* 6 | 6 */ { ka5, ka6, ka7, ka8, ka9, kaa, kab, kac, kad, kae, kaf, kag, ___, kai, ___, ___, ___, ___, ___, ___, ___ }, \
-    /* 7 | 7 */ { kb5, kb6, kb7, kb8, kb9, kba, kbb, kbc, kbd, kbe, kbf, kbg, ___, kbi, kbj, ___, ___, ___, ___, ___, ___ }, \
-    /* 8 | 8 */ { kc5, kc6, kc7, ___, ___, ___, ___, ___, kcd, ___, kcf, kcg, ___, kch, kci, ___, ___, ___, ___, ___, ___ }, \
-}
-
-
-#define LAYOUT_all( \
-    k85, k86, k87, k88, k89, k8a, k8b, k8c, k8d, k8e, k8f, k8g, k8h, k8i, k8j,  k4k, k4l, k4m, \
-    k95,   k96, k97, k98, k99, k9a, k9b, k9c, k9d, k9e, k9f, k9g, k9h,   k9j,   k5k, k5l, k5m, \
-    ka5,    ka6, ka7, ka8, ka9, kaa, kab, kac, kad, kae, kaf, kag,     kai,                    \
-    kb5, kb6, kb7, kb8, kb9, kba, kbb, kbc, kbd, kbe, kbf, kbg,     kbi, kbj,        k6l,      \
-    kc5,  kc6,  kc7,    kc8,        kcd,        kce,    kcf,  kcg,  kch,  kci,  k7k, k7l, k7m  \
-) { \
-    /*              0    1    2    3    4    5    6    7    8    9    10   11   12   13   14   15   16   17   18   19   20 */ \
-    /*              0    1    2    3    4    5    6    7    8    9    a    b    c    d    e    f    g    h    i    j    k  */ \
-    /* 0 | 0 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k4k, k4l, k4m, ___, ___, ___ }, \
-    /* 1 | 1 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k5k, k5l, k5m, ___, ___, ___ }, \
-    /* 2 | 2 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k6l, ___ }, \
-    /* 3 | 3 */ { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k7k, k7l, k7m }, \
-    /* 4 | 4 */ { k85, k86, k87, k88, k89, k8a, k8b, k8c, k8d, k8e, k8f, k8g, k8h, k8i, k8j, ___, ___, ___, ___, ___, ___ }, \
-    /* 5 | 5 */ { k95, k96, k97, k98, k99, k9a, k9b, k9c, k9d, k9e, k9f, k9g, k9h, ___, k9j, ___, ___, ___, ___, ___, ___ }, \
-    /* 6 | 6 */ { ka5, ka6, ka7, ka8, ka9, kaa, kab, kac, kad, kae, kaf, kag, ___, kai, ___, ___, ___, ___, ___, ___, ___ }, \
-    /* 7 | 7 */ { kb5, kb6, kb7, kb8, kb9, kba, kbb, kbc, kbd, kbe, kbf, kbg, ___, kbi, kbj, ___, ___, ___, ___, ___, ___ }, \
-    /* 8 | 8 */ { kc5, kc6, kc7, kc8, ___, ___, ___, ___, kcd, kce, kcf, kcg, ___, kch, kci, ___, ___, ___, ___, ___, ___ }, \
-}