Migrate some more layouts to data driven (#19889)

3 files changed, 410 insertions, 462 deletions

diff --git a/keyboards/toad/info.json b/keyboards/toad/info.json
index 318d08ef38..637dc40422 100644
--- a/keyboards/toad/info.json
+++ b/keyboards/toad/info.json
@@ -18,396 +18,436 @@
   "layouts": {
     "LAYOUT_all": {
       "layout": [
-        {"label":"K000", "x":0, "y":0},
-        {"label":"K001", "x":2, "y":0},
-        {"label":"K002", "x":3, "y":0},
-        {"label":"K003", "x":4, "y":0},
-        {"label":"K004", "x":5, "y":0},
-        {"label":"K005", "x":6.5, "y":0},
-        {"label":"K006", "x":7.5, "y":0},
-        {"label":"K007", "x":8.5, "y":0},
-        {"label":"K008", "x":9.5, "y":0},
-        {"label":"K009", "x":11, "y":0},
-        {"label":"K010", "x":12, "y":0},
-        {"label":"K011", "x":13, "y":0},
-        {"label":"K012", "x":14, "y":0},
-        {"label":"K100", "x":0, "y":1.5},
-        {"label":"K101", "x":1, "y":1.5},
-        {"label":"K102", "x":2, "y":1.5},
-        {"label":"K103", "x":3, "y":1.5},
-        {"label":"K104", "x":4, "y":1.5},
-        {"label":"K105", "x":5, "y":1.5},
-        {"label":"K106", "x":6, "y":1.5},
-        {"label":"K107", "x":7, "y":1.5},
-        {"label":"K108", "x":8, "y":1.5},
-        {"label":"K109", "x":9, "y":1.5},
-        {"label":"K110", "x":10, "y":1.5},
-        {"label":"K111", "x":11, "y":1.5},
-        {"label":"K112", "x":12, "y":1.5},
-        {"label":"K113", "x":13, "y":1.5},
-        {"label":"K013", "x":14, "y":1.5},
-        {"label":"K200", "x":0, "y":2.5, "w":1.5},
-        {"label":"K201", "x":1.5, "y":2.5},
-        {"label":"K202", "x":2.5, "y":2.5},
-        {"label":"K203", "x":3.5, "y":2.5},
-        {"label":"K204", "x":4.5, "y":2.5},
-        {"label":"K205", "x":5.5, "y":2.5},
-        {"label":"K206", "x":6.5, "y":2.5},
-        {"label":"K207", "x":7.5, "y":2.5},
-        {"label":"K208", "x":8.5, "y":2.5},
-        {"label":"K209", "x":9.5, "y":2.5},
-        {"label":"K210", "x":10.5, "y":2.5},
-        {"label":"K211", "x":11.5, "y":2.5},
-        {"label":"K212", "x":12.5, "y":2.5},
-        {"label":"K213", "x":13.5, "y":2.5, "w":1.5},
-        {"label":"K300", "x":0, "y":3.5, "w":1.75},
-        {"label":"K301", "x":1.75, "y":3.5},
-        {"label":"K302", "x":2.75, "y":3.5},
-        {"label":"K303", "x":3.75, "y":3.5},
-        {"label":"K304", "x":4.75, "y":3.5},
-        {"label":"K305", "x":5.75, "y":3.5},
-        {"label":"K306", "x":6.75, "y":3.5},
-        {"label":"K307", "x":7.75, "y":3.5},
-        {"label":"K308", "x":8.75, "y":3.5},
-        {"label":"K309", "x":9.75, "y":3.5},
-        {"label":"K310", "x":10.75, "y":3.5},
-        {"label":"K311", "x":11.75, "y":3.5},
-        {"label":"K312", "x":12.75, "y":3.5},
-        {"label":"K313", "x":13.75, "y":3.5, "w":1.25},
-        {"label":"K400", "x":0, "y":4.5, "w":1.25},
-        {"label":"K401", "x":1.25, "y":4.5},
-        {"label":"K402", "x":2.25, "y":4.5},
-        {"label":"K403", "x":3.25, "y":4.5},
-        {"label":"K404", "x":4.25, "y":4.5},
-        {"label":"K405", "x":5.25, "y":4.5},
-        {"label":"K406", "x":6.25, "y":4.5},
-        {"label":"K407", "x":7.25, "y":4.5},
-        {"label":"K408", "x":8.25, "y":4.5},
-        {"label":"K409", "x":9.25, "y":4.5},
-        {"label":"K410", "x":10.25, "y":4.5},
-        {"label":"K411", "x":11.25, "y":4.5},
-        {"label":"K412", "x":12.25, "y":4.5, "w":1.75},
-        {"label":"K413", "x":14, "y":4.5},
-        {"label":"K500", "x":0, "y":5.5, "w":1.25},
-        {"label":"K501", "x":1.25, "y":5.5, "w":1.25},
-        {"label":"K502", "x":2.5, "y":5.5, "w":1.25},
-        {"label":"K507", "x":3.75, "y":5.5, "w":6.25},
-        {"label":"K510", "x":10, "y":5.5, "w":1.25},
-        {"label":"K511", "x":11.25, "y":5.5, "w":1.25},
-        {"label":"K512", "x":12.5, "y":5.5, "w":1.25},
-        {"label":"K513", "x":13.75, "y":5.5, "w":1.25}
+        {"x":0, "y":0, "matrix": [0, 0]},
+
+        {"x":2, "y":0, "matrix": [0, 1]},
+        {"x":3, "y":0, "matrix": [0, 2]},
+        {"x":4, "y":0, "matrix": [0, 3]},
+        {"x":5, "y":0, "matrix": [0, 4]},
+
+        {"x":6.5, "y":0, "matrix": [0, 5]},
+        {"x":7.5, "y":0, "matrix": [0, 6]},
+        {"x":8.5, "y":0, "matrix": [0, 7]},
+        {"x":9.5, "y":0, "matrix": [0, 8]},
+
+        {"x":11, "y":0, "matrix": [0, 9]},
+        {"x":12, "y":0, "matrix": [0, 10]},
+        {"x":13, "y":0, "matrix": [0, 11]},
+        {"x":14, "y":0, "matrix": [0, 12]},
+
+        {"x":0, "y":1.5, "matrix": [1, 0]},
+        {"x":1, "y":1.5, "matrix": [1, 1]},
+        {"x":2, "y":1.5, "matrix": [1, 2]},
+        {"x":3, "y":1.5, "matrix": [1, 3]},
+        {"x":4, "y":1.5, "matrix": [1, 4]},
+        {"x":5, "y":1.5, "matrix": [1, 5]},
+        {"x":6, "y":1.5, "matrix": [1, 6]},
+        {"x":7, "y":1.5, "matrix": [1, 7]},
+        {"x":8, "y":1.5, "matrix": [1, 8]},
+        {"x":9, "y":1.5, "matrix": [1, 9]},
+        {"x":10, "y":1.5, "matrix": [1, 10]},
+        {"x":11, "y":1.5, "matrix": [1, 11]},
+        {"x":12, "y":1.5, "matrix": [1, 12]},
+        {"x":13, "y":1.5, "matrix": [1, 13]},
+        {"x":14, "y":1.5, "matrix": [0, 13]},
+
+        {"x":0, "y":2.5, "w":1.5, "matrix": [2, 0]},
+        {"x":1.5, "y":2.5, "matrix": [2, 1]},
+        {"x":2.5, "y":2.5, "matrix": [2, 2]},
+        {"x":3.5, "y":2.5, "matrix": [2, 3]},
+        {"x":4.5, "y":2.5, "matrix": [2, 4]},
+        {"x":5.5, "y":2.5, "matrix": [2, 5]},
+        {"x":6.5, "y":2.5, "matrix": [2, 6]},
+        {"x":7.5, "y":2.5, "matrix": [2, 7]},
+        {"x":8.5, "y":2.5, "matrix": [2, 8]},
+        {"x":9.5, "y":2.5, "matrix": [2, 9]},
+        {"x":10.5, "y":2.5, "matrix": [2, 10]},
+        {"x":11.5, "y":2.5, "matrix": [2, 11]},
+        {"x":12.5, "y":2.5, "matrix": [2, 12]},
+        {"x":13.5, "y":2.5, "w":1.5, "matrix": [2, 13]},
+
+        {"x":0, "y":3.5, "w":1.75, "matrix": [3, 0]},
+        {"x":1.75, "y":3.5, "matrix": [3, 1]},
+        {"x":2.75, "y":3.5, "matrix": [3, 2]},
+        {"x":3.75, "y":3.5, "matrix": [3, 3]},
+        {"x":4.75, "y":3.5, "matrix": [3, 4]},
+        {"x":5.75, "y":3.5, "matrix": [3, 5]},
+        {"x":6.75, "y":3.5, "matrix": [3, 6]},
+        {"x":7.75, "y":3.5, "matrix": [3, 7]},
+        {"x":8.75, "y":3.5, "matrix": [3, 8]},
+        {"x":9.75, "y":3.5, "matrix": [3, 9]},
+        {"x":10.75, "y":3.5, "matrix": [3, 10]},
+        {"x":11.75, "y":3.5, "matrix": [3, 11]},
+        {"x":12.75, "y":3.5, "matrix": [3, 12]},
+        {"x":13.75, "y":3.5, "w":1.25, "matrix": [3, 13]},
+
+        {"x":0, "y":4.5, "w":1.25, "matrix": [4, 0]},
+        {"x":1.25, "y":4.5, "matrix": [4, 1]},
+        {"x":2.25, "y":4.5, "matrix": [4, 2]},
+        {"x":3.25, "y":4.5, "matrix": [4, 3]},
+        {"x":4.25, "y":4.5, "matrix": [4, 4]},
+        {"x":5.25, "y":4.5, "matrix": [4, 5]},
+        {"x":6.25, "y":4.5, "matrix": [4, 6]},
+        {"x":7.25, "y":4.5, "matrix": [4, 7]},
+        {"x":8.25, "y":4.5, "matrix": [4, 8]},
+        {"x":9.25, "y":4.5, "matrix": [4, 9]},
+        {"x":10.25, "y":4.5, "matrix": [4, 10]},
+        {"x":11.25, "y":4.5, "matrix": [4, 11]},
+        {"x":12.25, "y":4.5, "w":1.75, "matrix": [4, 12]},
+        {"x":14, "y":4.5, "matrix": [4, 13]},
+
+        {"x":0, "y":5.5, "w":1.25, "matrix": [5, 0]},
+        {"x":1.25, "y":5.5, "w":1.25, "matrix": [5, 1]},
+        {"x":2.5, "y":5.5, "w":1.25, "matrix": [5, 2]},
+        {"x":3.75, "y":5.5, "w":6.25, "matrix": [5, 7]},
+        {"x":10, "y":5.5, "w":1.25, "matrix": [5, 10]},
+        {"x":11.25, "y":5.5, "w":1.25, "matrix": [5, 11]},
+        {"x":12.5, "y":5.5, "w":1.25, "matrix": [5, 12]},
+        {"x":13.75, "y":5.5, "w":1.25, "matrix": [5, 13]}
       ]
     },
 
     "LAYOUT_ansi_wk": {
       "layout": [
-        {"label":"K000", "x":0, "y":0}, 
-        {"label":"K001", "x":2, "y":0}, 
-        {"label":"K002", "x":3, "y":0}, 
-        {"label":"K003", "x":4, "y":0}, 
-        {"label":"K004", "x":5, "y":0}, 
-        {"label":"K005", "x":6.5, "y":0}, 
-        {"label":"K006", "x":7.5, "y":0}, 
-        {"label":"K007", "x":8.5, "y":0}, 
-        {"label":"K008", "x":9.5, "y":0}, 
-        {"label":"K009", "x":11, "y":0}, 
-        {"label":"K010", "x":12, "y":0}, 
-        {"label":"K011", "x":13, "y":0}, 
-        {"label":"K012", "x":14, "y":0}, 
-        {"label":"K100", "x":0, "y":1.5}, 
-        {"label":"K101", "x":1, "y":1.5}, 
-        {"label":"K102", "x":2, "y":1.5}, 
-        {"label":"K103", "x":3, "y":1.5}, 
-        {"label":"K104", "x":4, "y":1.5}, 
-        {"label":"K105", "x":5, "y":1.5}, 
-        {"label":"K106", "x":6, "y":1.5}, 
-        {"label":"K107", "x":7, "y":1.5}, 
-        {"label":"K108", "x":8, "y":1.5}, 
-        {"label":"K109", "x":9, "y":1.5}, 
-        {"label":"K110", "x":10, "y":1.5}, 
-        {"label":"K111", "x":11, "y":1.5}, 
-        {"label":"K112", "x":12, "y":1.5}, 
-        {"label":"K013", "x":13, "y":1.5, "w":2}, 
-        {"label":"K200", "x":0, "y":2.5, "w":1.5}, 
-        {"label":"K201", "x":1.5, "y":2.5}, 
-        {"label":"K202", "x":2.5, "y":2.5}, 
-        {"label":"K203", "x":3.5, "y":2.5}, 
-        {"label":"K204", "x":4.5, "y":2.5}, 
-        {"label":"K205", "x":5.5, "y":2.5}, 
-        {"label":"K206", "x":6.5, "y":2.5}, 
-        {"label":"K207", "x":7.5, "y":2.5}, 
-        {"label":"K208", "x":8.5, "y":2.5}, 
-        {"label":"K209", "x":9.5, "y":2.5}, 
-        {"label":"K210", "x":10.5, "y":2.5}, 
-        {"label":"K211", "x":11.5, "y":2.5}, 
-        {"label":"K212", "x":12.5, "y":2.5}, 
-        {"label":"K213", "x":13.5, "y":2.5, "w":1.5}, 
-        {"label":"K300", "x":0, "y":3.5, "w":1.75}, 
-        {"label":"K301", "x":1.75, "y":3.5}, 
-        {"label":"K302", "x":2.75, "y":3.5}, 
-        {"label":"K303", "x":3.75, "y":3.5}, 
-        {"label":"K304", "x":4.75, "y":3.5}, 
-        {"label":"K305", "x":5.75, "y":3.5}, 
-        {"label":"K306", "x":6.75, "y":3.5}, 
-        {"label":"K307", "x":7.75, "y":3.5}, 
-        {"label":"K308", "x":8.75, "y":3.5}, 
-        {"label":"K309", "x":9.75, "y":3.5}, 
-        {"label":"K310", "x":10.75, "y":3.5}, 
-        {"label":"K311", "x":11.75, "y":3.5}, 
-        {"label":"K313", "x":12.75, "y":3.5, "w":2.25}, 
-        {"label":"K400", "x":0, "y":4.5, "w":2.25}, 
-        {"label":"K402", "x":2.25, "y":4.5}, 
-        {"label":"K403", "x":3.25, "y":4.5}, 
-        {"label":"K404", "x":4.25, "y":4.5}, 
-        {"label":"K405", "x":5.25, "y":4.5}, 
-        {"label":"K406", "x":6.25, "y":4.5}, 
-        {"label":"K407", "x":7.25, "y":4.5}, 
-        {"label":"K408", "x":8.25, "y":4.5}, 
-        {"label":"K409", "x":9.25, "y":4.5}, 
-        {"label":"K410", "x":10.25, "y":4.5}, 
-        {"label":"K411", "x":11.25, "y":4.5}, 
-        {"label":"K412", "x":12.25, "y":4.5, "w":2.75}, 
-        {"label":"K500", "x":0, "y":5.5, "w":1.25}, 
-        {"label":"K501", "x":1.25, "y":5.5, "w":1.25}, 
-        {"label":"K502", "x":2.5, "y":5.5, "w":1.25}, 
-        {"label":"K507", "x":3.75, "y":5.5, "w":6.25}, 
-        {"label":"K510", "x":10, "y":5.5, "w":1.25}, 
-        {"label":"K511", "x":11.25, "y":5.5, "w":1.25}, 
-        {"label":"K512", "x":12.5, "y":5.5, "w":1.25}, 
-        {"label":"K513", "x":13.75, "y":5.5, "w":1.25}
+        {"x":0, "y":0, "matrix": [0, 0]},
+
+        {"x":2, "y":0, "matrix": [0, 1]},
+        {"x":3, "y":0, "matrix": [0, 2]},
+        {"x":4, "y":0, "matrix": [0, 3]},
+        {"x":5, "y":0, "matrix": [0, 4]},
+
+        {"x":6.5, "y":0, "matrix": [0, 5]},
+        {"x":7.5, "y":0, "matrix": [0, 6]},
+        {"x":8.5, "y":0, "matrix": [0, 7]},
+        {"x":9.5, "y":0, "matrix": [0, 8]},
+
+        {"x":11, "y":0, "matrix": [0, 9]},
+        {"x":12, "y":0, "matrix": [0, 10]},
+        {"x":13, "y":0, "matrix": [0, 11]},
+        {"x":14, "y":0, "matrix": [0, 12]},
+
+        {"x":0, "y":1.5, "matrix": [1, 0]},
+        {"x":1, "y":1.5, "matrix": [1, 1]},
+        {"x":2, "y":1.5, "matrix": [1, 2]},
+        {"x":3, "y":1.5, "matrix": [1, 3]},
+        {"x":4, "y":1.5, "matrix": [1, 4]},
+        {"x":5, "y":1.5, "matrix": [1, 5]},
+        {"x":6, "y":1.5, "matrix": [1, 6]},
+        {"x":7, "y":1.5, "matrix": [1, 7]},
+        {"x":8, "y":1.5, "matrix": [1, 8]},
+        {"x":9, "y":1.5, "matrix": [1, 9]},
+        {"x":10, "y":1.5, "matrix": [1, 10]},
+        {"x":11, "y":1.5, "matrix": [1, 11]},
+        {"x":12, "y":1.5, "matrix": [1, 12]},
+        {"x":13, "y":1.5, "w":2, "matrix": [0, 13]},
+
+        {"x":0, "y":2.5, "w":1.5, "matrix": [2, 0]},
+        {"x":1.5, "y":2.5, "matrix": [2, 1]},
+        {"x":2.5, "y":2.5, "matrix": [2, 2]},
+        {"x":3.5, "y":2.5, "matrix": [2, 3]},
+        {"x":4.5, "y":2.5, "matrix": [2, 4]},
+        {"x":5.5, "y":2.5, "matrix": [2, 5]},
+        {"x":6.5, "y":2.5, "matrix": [2, 6]},
+        {"x":7.5, "y":2.5, "matrix": [2, 7]},
+        {"x":8.5, "y":2.5, "matrix": [2, 8]},
+        {"x":9.5, "y":2.5, "matrix": [2, 9]},
+        {"x":10.5, "y":2.5, "matrix": [2, 10]},
+        {"x":11.5, "y":2.5, "matrix": [2, 11]},
+        {"x":12.5, "y":2.5, "matrix": [2, 12]},
+        {"x":13.5, "y":2.5, "w":1.5, "matrix": [2, 13]},
+
+        {"x":0, "y":3.5, "w":1.75, "matrix": [3, 0]},
+        {"x":1.75, "y":3.5, "matrix": [3, 1]},
+        {"x":2.75, "y":3.5, "matrix": [3, 2]},
+        {"x":3.75, "y":3.5, "matrix": [3, 3]},
+        {"x":4.75, "y":3.5, "matrix": [3, 4]},
+        {"x":5.75, "y":3.5, "matrix": [3, 5]},
+        {"x":6.75, "y":3.5, "matrix": [3, 6]},
+        {"x":7.75, "y":3.5, "matrix": [3, 7]},
+        {"x":8.75, "y":3.5, "matrix": [3, 8]},
+        {"x":9.75, "y":3.5, "matrix": [3, 9]},
+        {"x":10.75, "y":3.5, "matrix": [3, 10]},
+        {"x":11.75, "y":3.5, "matrix": [3, 11]},
+        {"x":12.75, "y":3.5, "w":2.25, "matrix": [3, 13]},
+
+        {"x":0, "y":4.5, "w":2.25, "matrix": [4, 0]},
+        {"x":2.25, "y":4.5, "matrix": [4, 2]},
+        {"x":3.25, "y":4.5, "matrix": [4, 3]},
+        {"x":4.25, "y":4.5, "matrix": [4, 4]},
+        {"x":5.25, "y":4.5, "matrix": [4, 5]},
+        {"x":6.25, "y":4.5, "matrix": [4, 6]},
+        {"x":7.25, "y":4.5, "matrix": [4, 7]},
+        {"x":8.25, "y":4.5, "matrix": [4, 8]},
+        {"x":9.25, "y":4.5, "matrix": [4, 9]},
+        {"x":10.25, "y":4.5, "matrix": [4, 10]},
+        {"x":11.25, "y":4.5, "matrix": [4, 11]},
+        {"x":12.25, "y":4.5, "w":2.75, "matrix": [4, 12]},
+
+        {"x":0, "y":5.5, "w":1.25, "matrix": [5, 0]},
+        {"x":1.25, "y":5.5, "w":1.25, "matrix": [5, 1]},
+        {"x":2.5, "y":5.5, "w":1.25, "matrix": [5, 2]},
+        {"x":3.75, "y":5.5, "w":6.25, "matrix": [5, 7]},
+        {"x":10, "y":5.5, "w":1.25, "matrix": [5, 10]},
+        {"x":11.25, "y":5.5, "w":1.25, "matrix": [5, 11]},
+        {"x":12.5, "y":5.5, "w":1.25, "matrix": [5, 12]},
+        {"x":13.75, "y":5.5, "w":1.25, "matrix": [5, 13]}
       ]
     },
  
     "LAYOUT_ansi_wkl": {
       "layout": [
-        {"label":"K000", "x":0, "y":0}, 
-        {"label":"K001", "x":2, "y":0}, 
-        {"label":"K002", "x":3, "y":0}, 
-        {"label":"K003", "x":4, "y":0}, 
-        {"label":"K004", "x":5, "y":0}, 
-        {"label":"K005", "x":6.5, "y":0}, 
-        {"label":"K006", "x":7.5, "y":0}, 
-        {"label":"K007", "x":8.5, "y":0}, 
-        {"label":"K008", "x":9.5, "y":0}, 
-        {"label":"K009", "x":11, "y":0}, 
-        {"label":"K010", "x":12, "y":0}, 
-        {"label":"K011", "x":13, "y":0}, 
-        {"label":"K012", "x":14, "y":0}, 
-        {"label":"K100", "x":0, "y":1.5}, 
-        {"label":"K101", "x":1, "y":1.5}, 
-        {"label":"K102", "x":2, "y":1.5}, 
-        {"label":"K103", "x":3, "y":1.5}, 
-        {"label":"K104", "x":4, "y":1.5}, 
-        {"label":"K105", "x":5, "y":1.5}, 
-        {"label":"K106", "x":6, "y":1.5}, 
-        {"label":"K107", "x":7, "y":1.5}, 
-        {"label":"K108", "x":8, "y":1.5}, 
-        {"label":"K109", "x":9, "y":1.5}, 
-        {"label":"K110", "x":10, "y":1.5}, 
-        {"label":"K111", "x":11, "y":1.5}, 
-        {"label":"K112", "x":12, "y":1.5}, 
-        {"label":"K013", "x":13, "y":1.5, "w":2}, 
-        {"label":"K200", "x":0, "y":2.5, "w":1.5}, 
-        {"label":"K201", "x":1.5, "y":2.5}, 
-        {"label":"K202", "x":2.5, "y":2.5}, 
-        {"label":"K203", "x":3.5, "y":2.5}, 
-        {"label":"K204", "x":4.5, "y":2.5}, 
-        {"label":"K205", "x":5.5, "y":2.5}, 
-        {"label":"K206", "x":6.5, "y":2.5}, 
-        {"label":"K207", "x":7.5, "y":2.5}, 
-        {"label":"K208", "x":8.5, "y":2.5}, 
-        {"label":"K209", "x":9.5, "y":2.5}, 
-        {"label":"K210", "x":10.5, "y":2.5}, 
-        {"label":"K211", "x":11.5, "y":2.5}, 
-        {"label":"K212", "x":12.5, "y":2.5}, 
-        {"label":"K213", "x":13.5, "y":2.5, "w":1.5}, 
-        {"label":"K300", "x":0, "y":3.5, "w":1.75}, 
-        {"label":"K301", "x":1.75, "y":3.5}, 
-        {"label":"K302", "x":2.75, "y":3.5}, 
-        {"label":"K303", "x":3.75, "y":3.5}, 
-        {"label":"K304", "x":4.75, "y":3.5}, 
-        {"label":"K305", "x":5.75, "y":3.5}, 
-        {"label":"K306", "x":6.75, "y":3.5}, 
-        {"label":"K307", "x":7.75, "y":3.5}, 
-        {"label":"K308", "x":8.75, "y":3.5}, 
-        {"label":"K309", "x":9.75, "y":3.5}, 
-        {"label":"K310", "x":10.75, "y":3.5}, 
-        {"label":"K311", "x":11.75, "y":3.5}, 
-        {"label":"K313", "x":12.75, "y":3.5, "w":2.25}, 
-        {"label":"K400", "x":0, "y":4.5, "w":2.25}, 
-        {"label":"K402", "x":2.25, "y":4.5}, 
-        {"label":"K403", "x":3.25, "y":4.5}, 
-        {"label":"K404", "x":4.25, "y":4.5}, 
-        {"label":"K405", "x":5.25, "y":4.5}, 
-        {"label":"K406", "x":6.25, "y":4.5}, 
-        {"label":"K407", "x":7.25, "y":4.5}, 
-        {"label":"K408", "x":8.25, "y":4.5}, 
-        {"label":"K409", "x":9.25, "y":4.5}, 
-        {"label":"K410", "x":10.25, "y":4.5}, 
-        {"label":"K411", "x":11.25, "y":4.5}, 
-        {"label":"K412", "x":12.25, "y":4.5, "w":2.75}, 
-        {"label":"K500", "x":0, "y":5.5, "w":1.5}, 
-        {"label":"K502", "x":2.5, "y":5.5, "w":1.5}, 
-        {"label":"K507", "x":4, "y":5.5, "w":7}, 
-        {"label":"K511", "x":11, "y":5.5, "w":1.5}, 
-        {"label":"K513", "x":13.5, "y":5.5, "w":1.5}
+        {"x":0, "y":0, "matrix": [0, 0]},
+
+        {"x":2, "y":0, "matrix": [0, 1]},
+        {"x":3, "y":0, "matrix": [0, 2]},
+        {"x":4, "y":0, "matrix": [0, 3]},
+        {"x":5, "y":0, "matrix": [0, 4]},
+
+        {"x":6.5, "y":0, "matrix": [0, 5]},
+        {"x":7.5, "y":0, "matrix": [0, 6]},
+        {"x":8.5, "y":0, "matrix": [0, 7]},
+        {"x":9.5, "y":0, "matrix": [0, 8]},
+
+        {"x":11, "y":0, "matrix": [0, 9]},
+        {"x":12, "y":0, "matrix": [0, 10]},
+        {"x":13, "y":0, "matrix": [0, 11]},
+        {"x":14, "y":0, "matrix": [0, 12]},
+
+        {"x":0, "y":1.5, "matrix": [1, 0]},
+        {"x":1, "y":1.5, "matrix": [1, 1]},
+        {"x":2, "y":1.5, "matrix": [1, 2]},
+        {"x":3, "y":1.5, "matrix": [1, 3]},
+        {"x":4, "y":1.5, "matrix": [1, 4]},
+        {"x":5, "y":1.5, "matrix": [1, 5]},
+        {"x":6, "y":1.5, "matrix": [1, 6]},
+        {"x":7, "y":1.5, "matrix": [1, 7]},
+        {"x":8, "y":1.5, "matrix": [1, 8]},
+        {"x":9, "y":1.5, "matrix": [1, 9]},
+        {"x":10, "y":1.5, "matrix": [1, 10]},
+        {"x":11, "y":1.5, "matrix": [1, 11]},
+        {"x":12, "y":1.5, "matrix": [1, 12]},
+        {"x":13, "y":1.5, "w":2, "matrix": [0, 13]},
+
+        {"x":0, "y":2.5, "w":1.5, "matrix": [2, 0]},
+        {"x":1.5, "y":2.5, "matrix": [2, 1]},
+        {"x":2.5, "y":2.5, "matrix": [2, 2]},
+        {"x":3.5, "y":2.5, "matrix": [2, 3]},
+        {"x":4.5, "y":2.5, "matrix": [2, 4]},
+        {"x":5.5, "y":2.5, "matrix": [2, 5]},
+        {"x":6.5, "y":2.5, "matrix": [2, 6]},
+        {"x":7.5, "y":2.5, "matrix": [2, 7]},
+        {"x":8.5, "y":2.5, "matrix": [2, 8]},
+        {"x":9.5, "y":2.5, "matrix": [2, 9]},
+        {"x":10.5, "y":2.5, "matrix": [2, 10]},
+        {"x":11.5, "y":2.5, "matrix": [2, 11]},
+        {"x":12.5, "y":2.5, "matrix": [2, 12]},
+        {"x":13.5, "y":2.5, "w":1.5, "matrix": [2, 13]},
+
+        {"x":0, "y":3.5, "w":1.75, "matrix": [3, 0]},
+        {"x":1.75, "y":3.5, "matrix": [3, 1]},
+        {"x":2.75, "y":3.5, "matrix": [3, 2]},
+        {"x":3.75, "y":3.5, "matrix": [3, 3]},
+        {"x":4.75, "y":3.5, "matrix": [3, 4]},
+        {"x":5.75, "y":3.5, "matrix": [3, 5]},
+        {"x":6.75, "y":3.5, "matrix": [3, 6]},
+        {"x":7.75, "y":3.5, "matrix": [3, 7]},
+        {"x":8.75, "y":3.5, "matrix": [3, 8]},
+        {"x":9.75, "y":3.5, "matrix": [3, 9]},
+        {"x":10.75, "y":3.5, "matrix": [3, 10]},
+        {"x":11.75, "y":3.5, "matrix": [3, 11]},
+        {"x":12.75, "y":3.5, "w":2.25, "matrix": [3, 13]},
+
+        {"x":0, "y":4.5, "w":2.25, "matrix": [4, 0]},
+        {"x":2.25, "y":4.5, "matrix": [4, 2]},
+        {"x":3.25, "y":4.5, "matrix": [4, 3]},
+        {"x":4.25, "y":4.5, "matrix": [4, 4]},
+        {"x":5.25, "y":4.5, "matrix": [4, 5]},
+        {"x":6.25, "y":4.5, "matrix": [4, 6]},
+        {"x":7.25, "y":4.5, "matrix": [4, 7]},
+        {"x":8.25, "y":4.5, "matrix": [4, 8]},
+        {"x":9.25, "y":4.5, "matrix": [4, 9]},
+        {"x":10.25, "y":4.5, "matrix": [4, 10]},
+        {"x":11.25, "y":4.5, "matrix": [4, 11]},
+        {"x":12.25, "y":4.5, "w":2.75, "matrix": [4, 12]},
+
+        {"x":0, "y":5.5, "w":1.5, "matrix": [5, 0]},
+        {"x":2.5, "y":5.5, "w":1.5, "matrix": [5, 2]},
+        {"x":4, "y":5.5, "w":7, "matrix": [5, 7]},
+        {"x":11, "y":5.5, "w":1.5, "matrix": [5, 11]},
+        {"x":13.5, "y":5.5, "w":1.5, "matrix": [5, 13]}
       ]
     },
 
     "LAYOUT_iso_wk": {
       "layout": [
-        {"label":"K000", "x":0, "y":0}, 
-        {"label":"K001", "x":2, "y":0}, 
-        {"label":"K002", "x":3, "y":0}, 
-        {"label":"K003", "x":4, "y":0}, 
-        {"label":"K004", "x":5, "y":0}, 
-        {"label":"K005", "x":6.5, "y":0}, 
-        {"label":"K006", "x":7.5, "y":0}, 
-        {"label":"K007", "x":8.5, "y":0}, 
-        {"label":"K008", "x":9.5, "y":0}, 
-        {"label":"K009", "x":11, "y":0}, 
-        {"label":"K010", "x":12, "y":0}, 
-        {"label":"K011", "x":13, "y":0}, 
-        {"label":"K012", "x":14, "y":0}, 
-        {"label":"K100", "x":0, "y":1.5}, 
-        {"label":"K101", "x":1, "y":1.5}, 
-        {"label":"K102", "x":2, "y":1.5}, 
-        {"label":"K103", "x":3, "y":1.5}, 
-        {"label":"K104", "x":4, "y":1.5}, 
-        {"label":"K105", "x":5, "y":1.5}, 
-        {"label":"K106", "x":6, "y":1.5}, 
-        {"label":"K107", "x":7, "y":1.5}, 
-        {"label":"K108", "x":8, "y":1.5}, 
-        {"label":"K109", "x":9, "y":1.5}, 
-        {"label":"K110", "x":10, "y":1.5}, 
-        {"label":"K111", "x":11, "y":1.5}, 
-        {"label":"K112", "x":12, "y":1.5}, 
-        {"label":"K013", "x":13, "y":1.5, "w":2}, 
-        {"label":"K200", "x":0, "y":2.5, "w":1.5}, 
-        {"label":"K201", "x":1.5, "y":2.5}, 
-        {"label":"K202", "x":2.5, "y":2.5}, 
-        {"label":"K203", "x":3.5, "y":2.5}, 
-        {"label":"K204", "x":4.5, "y":2.5}, 
-        {"label":"K205", "x":5.5, "y":2.5}, 
-        {"label":"K206", "x":6.5, "y":2.5}, 
-        {"label":"K207", "x":7.5, "y":2.5}, 
-        {"label":"K208", "x":8.5, "y":2.5}, 
-        {"label":"K209", "x":9.5, "y":2.5}, 
-        {"label":"K210", "x":10.5, "y":2.5}, 
-        {"label":"K211", "x":11.5, "y":2.5}, 
-        {"label":"K212", "x":12.5, "y":2.5}, 
-        {"label":"K300", "x":0, "y":3.5, "w":1.75}, 
-        {"label":"K301", "x":1.75, "y":3.5}, 
-        {"label":"K302", "x":2.75, "y":3.5}, 
-        {"label":"K303", "x":3.75, "y":3.5}, 
-        {"label":"K304", "x":4.75, "y":3.5}, 
-        {"label":"K305", "x":5.75, "y":3.5}, 
-        {"label":"K306", "x":6.75, "y":3.5}, 
-        {"label":"K307", "x":7.75, "y":3.5}, 
-        {"label":"K308", "x":8.75, "y":3.5}, 
-        {"label":"K309", "x":9.75, "y":3.5}, 
-        {"label":"K310", "x":10.75, "y":3.5}, 
-        {"label":"K311", "x":11.75, "y":3.5}, 
-        {"label":"K312", "x":12.75, "y":3.5}, 
-        {"label":"K313", "x":13.75, "y":2.5, "w":1.25, "h":2}, 
-        {"label":"K400", "x":0, "y":4.5, "w":1.25}, 
-        {"label":"K401", "x":1.25, "y":4.5}, 
-        {"label":"K402", "x":2.25, "y":4.5}, 
-        {"label":"K403", "x":3.25, "y":4.5}, 
-        {"label":"K404", "x":4.25, "y":4.5}, 
-        {"label":"K405", "x":5.25, "y":4.5}, 
-        {"label":"K406", "x":6.25, "y":4.5}, 
-        {"label":"K407", "x":7.25, "y":4.5}, 
-        {"label":"K408", "x":8.25, "y":4.5}, 
-        {"label":"K409", "x":9.25, "y":4.5}, 
-        {"label":"K410", "x":10.25, "y":4.5}, 
-        {"label":"K411", "x":11.25, "y":4.5}, 
-        {"label":"K412", "x":12.25, "y":4.5, "w":2.75}, 
-        {"label":"K500", "x":0, "y":5.5, "w":1.25}, 
-        {"label":"K501", "x":1.25, "y":5.5, "w":1.25}, 
-        {"label":"K502", "x":2.5, "y":5.5, "w":1.25}, 
-        {"label":"K507", "x":3.75, "y":5.5, "w":6.25}, 
-        {"label":"K510", "x":10, "y":5.5, "w":1.25}, 
-        {"label":"K511", "x":11.25, "y":5.5, "w":1.25}, 
-        {"label":"K512", "x":12.5, "y":5.5, "w":1.25}, 
-        {"label":"K513", "x":13.75, "y":5.5, "w":1.25}
+        {"x":0, "y":0, "matrix": [0, 0]},
+
+        {"x":2, "y":0, "matrix": [0, 1]},
+        {"x":3, "y":0, "matrix": [0, 2]},
+        {"x":4, "y":0, "matrix": [0, 3]},
+        {"x":5, "y":0, "matrix": [0, 4]},
+
+        {"x":6.5, "y":0, "matrix": [0, 5]},
+        {"x":7.5, "y":0, "matrix": [0, 6]},
+        {"x":8.5, "y":0, "matrix": [0, 7]},
+        {"x":9.5, "y":0, "matrix": [0, 8]},
+
+        {"x":11, "y":0, "matrix": [0, 9]},
+        {"x":12, "y":0, "matrix": [0, 10]},
+        {"x":13, "y":0, "matrix": [0, 11]},
+        {"x":14, "y":0, "matrix": [0, 12]},
+
+        {"x":0, "y":1.5, "matrix": [1, 0]},
+        {"x":1, "y":1.5, "matrix": [1, 1]},
+        {"x":2, "y":1.5, "matrix": [1, 2]},
+        {"x":3, "y":1.5, "matrix": [1, 3]},
+        {"x":4, "y":1.5, "matrix": [1, 4]},
+        {"x":5, "y":1.5, "matrix": [1, 5]},
+        {"x":6, "y":1.5, "matrix": [1, 6]},
+        {"x":7, "y":1.5, "matrix": [1, 7]},
+        {"x":8, "y":1.5, "matrix": [1, 8]},
+        {"x":9, "y":1.5, "matrix": [1, 9]},
+        {"x":10, "y":1.5, "matrix": [1, 10]},
+        {"x":11, "y":1.5, "matrix": [1, 11]},
+        {"x":12, "y":1.5, "matrix": [1, 12]},
+        {"x":13, "y":1.5, "w":2, "matrix": [0, 13]},
+
+        {"x":0, "y":2.5, "w":1.5, "matrix": [2, 0]},
+        {"x":1.5, "y":2.5, "matrix": [2, 1]},
+        {"x":2.5, "y":2.5, "matrix": [2, 2]},
+        {"x":3.5, "y":2.5, "matrix": [2, 3]},
+        {"x":4.5, "y":2.5, "matrix": [2, 4]},
+        {"x":5.5, "y":2.5, "matrix": [2, 5]},
+        {"x":6.5, "y":2.5, "matrix": [2, 6]},
+        {"x":7.5, "y":2.5, "matrix": [2, 7]},
+        {"x":8.5, "y":2.5, "matrix": [2, 8]},
+        {"x":9.5, "y":2.5, "matrix": [2, 9]},
+        {"x":10.5, "y":2.5, "matrix": [2, 10]},
+        {"x":11.5, "y":2.5, "matrix": [2, 11]},
+        {"x":12.5, "y":2.5, "matrix": [2, 12]},
+
+        {"x":0, "y":3.5, "w":1.75, "matrix": [3, 0]},
+        {"x":1.75, "y":3.5, "matrix": [3, 1]},
+        {"x":2.75, "y":3.5, "matrix": [3, 2]},
+        {"x":3.75, "y":3.5, "matrix": [3, 3]},
+        {"x":4.75, "y":3.5, "matrix": [3, 4]},
+        {"x":5.75, "y":3.5, "matrix": [3, 5]},
+        {"x":6.75, "y":3.5, "matrix": [3, 6]},
+        {"x":7.75, "y":3.5, "matrix": [3, 7]},
+        {"x":8.75, "y":3.5, "matrix": [3, 8]},
+        {"x":9.75, "y":3.5, "matrix": [3, 9]},
+        {"x":10.75, "y":3.5, "matrix": [3, 10]},
+        {"x":11.75, "y":3.5, "matrix": [3, 11]},
+        {"x":12.75, "y":3.5, "matrix": [3, 12]},
+        {"x":13.75, "y":2.5, "w":1.25, "h":2, "matrix": [3, 13]},
+
+        {"x":0, "y":4.5, "w":1.25, "matrix": [4, 0]},
+        {"x":1.25, "y":4.5, "matrix": [4, 1]},
+        {"x":2.25, "y":4.5, "matrix": [4, 2]},
+        {"x":3.25, "y":4.5, "matrix": [4, 3]},
+        {"x":4.25, "y":4.5, "matrix": [4, 4]},
+        {"x":5.25, "y":4.5, "matrix": [4, 5]},
+        {"x":6.25, "y":4.5, "matrix": [4, 6]},
+        {"x":7.25, "y":4.5, "matrix": [4, 7]},
+        {"x":8.25, "y":4.5, "matrix": [4, 8]},
+        {"x":9.25, "y":4.5, "matrix": [4, 9]},
+        {"x":10.25, "y":4.5, "matrix": [4, 10]},
+        {"x":11.25, "y":4.5, "matrix": [4, 11]},
+        {"x":12.25, "y":4.5, "w":2.75, "matrix": [4, 12]},
+
+        {"x":0, "y":5.5, "w":1.25, "matrix": [5, 0]},
+        {"x":1.25, "y":5.5, "w":1.25, "matrix": [5, 1]},
+        {"x":2.5, "y":5.5, "w":1.25, "matrix": [5, 2]},
+        {"x":3.75, "y":5.5, "w":6.25, "matrix": [5, 7]},
+        {"x":10, "y":5.5, "w":1.25, "matrix": [5, 10]},
+        {"x":11.25, "y":5.5, "w":1.25, "matrix": [5, 11]},
+        {"x":12.5, "y":5.5, "w":1.25, "matrix": [5, 12]},
+        {"x":13.75, "y":5.5, "w":1.25, "matrix": [5, 13]}
       ]
     },
  
     "LAYOUT_iso_wkl": {
       "layout": [
-        {"label":"K000", "x":0, "y":0}, 
-        {"label":"K001", "x":2, "y":0}, 
-        {"label":"K002", "x":3, "y":0}, 
-        {"label":"K003", "x":4, "y":0}, 
-        {"label":"K004", "x":5, "y":0}, 
-        {"label":"K005", "x":6.5, "y":0}, 
-        {"label":"K006", "x":7.5, "y":0}, 
-        {"label":"K007", "x":8.5, "y":0}, 
-        {"label":"K008", "x":9.5, "y":0}, 
-        {"label":"K009", "x":11, "y":0}, 
-        {"label":"K010", "x":12, "y":0}, 
-        {"label":"K011", "x":13, "y":0}, 
-        {"label":"K012", "x":14, "y":0}, 
-        {"label":"K100", "x":0, "y":1.5}, 
-        {"label":"K101", "x":1, "y":1.5}, 
-        {"label":"K102", "x":2, "y":1.5}, 
-        {"label":"K103", "x":3, "y":1.5}, 
-        {"label":"K104", "x":4, "y":1.5}, 
-        {"label":"K105", "x":5, "y":1.5}, 
-        {"label":"K106", "x":6, "y":1.5}, 
-        {"label":"K107", "x":7, "y":1.5}, 
-        {"label":"K108", "x":8, "y":1.5}, 
-        {"label":"K109", "x":9, "y":1.5}, 
-        {"label":"K110", "x":10, "y":1.5}, 
-        {"label":"K111", "x":11, "y":1.5}, 
-        {"label":"K112", "x":12, "y":1.5}, 
-        {"label":"K013", "x":13, "y":1.5, "w":2}, 
-        {"label":"K200", "x":0, "y":2.5, "w":1.5}, 
-        {"label":"K201", "x":1.5, "y":2.5}, 
-        {"label":"K202", "x":2.5, "y":2.5}, 
-        {"label":"K203", "x":3.5, "y":2.5}, 
-        {"label":"K204", "x":4.5, "y":2.5}, 
-        {"label":"K205", "x":5.5, "y":2.5}, 
-        {"label":"K206", "x":6.5, "y":2.5}, 
-        {"label":"K207", "x":7.5, "y":2.5}, 
-        {"label":"K208", "x":8.5, "y":2.5}, 
-        {"label":"K209", "x":9.5, "y":2.5}, 
-        {"label":"K210", "x":10.5, "y":2.5}, 
-        {"label":"K211", "x":11.5, "y":2.5}, 
-        {"label":"K212", "x":12.5, "y":2.5}, 
-        {"label":"K300", "x":0, "y":3.5, "w":1.75}, 
-        {"label":"K301", "x":1.75, "y":3.5}, 
-        {"label":"K302", "x":2.75, "y":3.5}, 
-        {"label":"K303", "x":3.75, "y":3.5}, 
-        {"label":"K304", "x":4.75, "y":3.5}, 
-        {"label":"K305", "x":5.75, "y":3.5}, 
-        {"label":"K306", "x":6.75, "y":3.5}, 
-        {"label":"K307", "x":7.75, "y":3.5}, 
-        {"label":"K308", "x":8.75, "y":3.5}, 
-        {"label":"K309", "x":9.75, "y":3.5}, 
-        {"label":"K310", "x":10.75, "y":3.5}, 
-        {"label":"K311", "x":11.75, "y":3.5}, 
-        {"label":"K312", "x":12.75, "y":3.5}, 
-        {"label":"K313", "x":13.75, "y":2.5, "w":1.25, "h":2}, 
-        {"label":"K400", "x":0, "y":4.5, "w":1.25}, 
-        {"label":"K401", "x":1.25, "y":4.5}, 
-        {"label":"K402", "x":2.25, "y":4.5}, 
-        {"label":"K403", "x":3.25, "y":4.5}, 
-        {"label":"K404", "x":4.25, "y":4.5}, 
-        {"label":"K405", "x":5.25, "y":4.5}, 
-        {"label":"K406", "x":6.25, "y":4.5}, 
-        {"label":"K407", "x":7.25, "y":4.5}, 
-        {"label":"K408", "x":8.25, "y":4.5}, 
-        {"label":"K409", "x":9.25, "y":4.5}, 
-        {"label":"K410", "x":10.25, "y":4.5}, 
-        {"label":"K411", "x":11.25, "y":4.5}, 
-        {"label":"K412", "x":12.25, "y":4.5, "w":2.75}, 
-        {"label":"K500", "x":0, "y":5.5, "w":1.5}, 
-        {"label":"K502", "x":2.5, "y":5.5, "w":1.5}, 
-        {"label":"K507", "x":4, "y":5.5, "w":7}, 
-        {"label":"K511", "x":11, "y":5.5, "w":1.5}, 
-        {"label":"K513", "x":13.5, "y":5.5, "w":1.5}
+        {"x":0, "y":0, "matrix": [0, 0]},
+
+        {"x":2, "y":0, "matrix": [0, 1]},
+        {"x":3, "y":0, "matrix": [0, 2]},
+        {"x":4, "y":0, "matrix": [0, 3]},
+        {"x":5, "y":0, "matrix": [0, 4]},
+
+        {"x":6.5, "y":0, "matrix": [0, 5]},
+        {"x":7.5, "y":0, "matrix": [0, 6]},
+        {"x":8.5, "y":0, "matrix": [0, 7]},
+        {"x":9.5, "y":0, "matrix": [0, 8]},
+
+        {"x":11, "y":0, "matrix": [0, 9]},
+        {"x":12, "y":0, "matrix": [0, 10]},
+        {"x":13, "y":0, "matrix": [0, 11]},
+        {"x":14, "y":0, "matrix": [0, 12]},
+
+        {"x":0, "y":1.5, "matrix": [1, 0]},
+        {"x":1, "y":1.5, "matrix": [1, 1]},
+        {"x":2, "y":1.5, "matrix": [1, 2]},
+        {"x":3, "y":1.5, "matrix": [1, 3]},
+        {"x":4, "y":1.5, "matrix": [1, 4]},
+        {"x":5, "y":1.5, "matrix": [1, 5]},
+        {"x":6, "y":1.5, "matrix": [1, 6]},
+        {"x":7, "y":1.5, "matrix": [1, 7]},
+        {"x":8, "y":1.5, "matrix": [1, 8]},
+        {"x":9, "y":1.5, "matrix": [1, 9]},
+        {"x":10, "y":1.5, "matrix": [1, 10]},
+        {"x":11, "y":1.5, "matrix": [1, 11]},
+        {"x":12, "y":1.5, "matrix": [1, 12]},
+        {"x":13, "y":1.5, "w":2, "matrix": [0, 13]},
+
+        {"x":0, "y":2.5, "w":1.5, "matrix": [2, 0]},
+        {"x":1.5, "y":2.5, "matrix": [2, 1]},
+        {"x":2.5, "y":2.5, "matrix": [2, 2]},
+        {"x":3.5, "y":2.5, "matrix": [2, 3]},
+        {"x":4.5, "y":2.5, "matrix": [2, 4]},
+        {"x":5.5, "y":2.5, "matrix": [2, 5]},
+        {"x":6.5, "y":2.5, "matrix": [2, 6]},
+        {"x":7.5, "y":2.5, "matrix": [2, 7]},
+        {"x":8.5, "y":2.5, "matrix": [2, 8]},
+        {"x":9.5, "y":2.5, "matrix": [2, 9]},
+        {"x":10.5, "y":2.5, "matrix": [2, 10]},
+        {"x":11.5, "y":2.5, "matrix": [2, 11]},
+        {"x":12.5, "y":2.5, "matrix": [2, 12]},
+
+        {"x":0, "y":3.5, "w":1.75, "matrix": [3, 0]},
+        {"x":1.75, "y":3.5, "matrix": [3, 1]},
+        {"x":2.75, "y":3.5, "matrix": [3, 2]},
+        {"x":3.75, "y":3.5, "matrix": [3, 3]},
+        {"x":4.75, "y":3.5, "matrix": [3, 4]},
+        {"x":5.75, "y":3.5, "matrix": [3, 5]},
+        {"x":6.75, "y":3.5, "matrix": [3, 6]},
+        {"x":7.75, "y":3.5, "matrix": [3, 7]},
+        {"x":8.75, "y":3.5, "matrix": [3, 8]},
+        {"x":9.75, "y":3.5, "matrix": [3, 9]},
+        {"x":10.75, "y":3.5, "matrix": [3, 10]},
+        {"x":11.75, "y":3.5, "matrix": [3, 11]},
+        {"x":12.75, "y":3.5, "matrix": [3, 12]},
+        {"x":13.75, "y":2.5, "w":1.25, "h":2, "matrix": [3, 13]},
+
+        {"x":0, "y":4.5, "w":1.25, "matrix": [4, 0]},
+        {"x":1.25, "y":4.5, "matrix": [4, 1]},
+        {"x":2.25, "y":4.5, "matrix": [4, 2]},
+        {"x":3.25, "y":4.5, "matrix": [4, 3]},
+        {"x":4.25, "y":4.5, "matrix": [4, 4]},
+        {"x":5.25, "y":4.5, "matrix": [4, 5]},
+        {"x":6.25, "y":4.5, "matrix": [4, 6]},
+        {"x":7.25, "y":4.5, "matrix": [4, 7]},
+        {"x":8.25, "y":4.5, "matrix": [4, 8]},
+        {"x":9.25, "y":4.5, "matrix": [4, 9]},
+        {"x":10.25, "y":4.5, "matrix": [4, 10]},
+        {"x":11.25, "y":4.5, "matrix": [4, 11]},
+        {"x":12.25, "y":4.5, "w":2.75, "matrix": [4, 12]},
+
+        {"x":0, "y":5.5, "w":1.5, "matrix": [5, 0]},
+        {"x":2.5, "y":5.5, "w":1.5, "matrix": [5, 2]},
+        {"x":4, "y":5.5, "w":7, "matrix": [5, 7]},
+        {"x":11, "y":5.5, "w":1.5, "matrix": [5, 11]},
+        {"x":13.5, "y":5.5, "w":1.5, "matrix": [5, 13]}
       ]
     }
   }
diff --git a/keyboards/toad/toad.c b/keyboards/toad/toad.c
deleted file mode 100644
index a58779507f..0000000000
--- a/keyboards/toad/toad.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "toad.h"
diff --git a/keyboards/toad/toad.h b/keyboards/toad/toad.h
deleted file mode 100644
index 154068e42a..0000000000
--- a/keyboards/toad/toad.h
+++ /dev/null
@@ -1,91 +0,0 @@
-#ifndef TOAD
-#define TOAD
-
-#include "quantum.h"
-
-// 70% keyboard: default - all keys
-#define LAYOUT_all( \
-	K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,        \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K013,  \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,        \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,        \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413,        \
-	K500, K501, K502,                         K507,             K510, K511, K512, K513         \
-) { \
-	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
-	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \
-	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \
-	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \
-	{ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413 }, \
-	{ K500, K501, K502, KC_NO,KC_NO,KC_NO,KC_NO,K507, KC_NO,KC_NO,K510, K511, K512, K513 }  \
-}
-
-// 70% keyboard: ANSI Winkey
-#define LAYOUT_ansi_wk( \
-	K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,  \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K013,  \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,  \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,  \
-	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,        \
-	K500, K501, K502,                         K507,             K510, K511, K512, K513   \
-) { \
-	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
-	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO}, \
-	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \
-	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO,K313 }, \
-	{ K400, KC_NO,K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, KC_NO}, \
-	{ K500, K501, K502, KC_NO,KC_NO,KC_NO,KC_NO,K507, KC_NO,KC_NO,K510, K511, K512, K513 }  \
-}
-
-// 70% keyboard: ANSI Winkeyless
-#define LAYOUT_ansi_wkl( \
-	K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,  \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K013,  \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,  \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,  \
-	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,        \
-	K500,       K502,                         K507,                   K511,       K513   \
-) { \
-	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
-	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO}, \
-	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \
-	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO,K313 }, \
-	{ K400, KC_NO,K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, KC_NO}, \
-	{ K500, KC_NO,K502, KC_NO,KC_NO,KC_NO,KC_NO,K507, KC_NO,KC_NO,KC_NO,K511, KC_NO,K513 }  \
-}
-
-// 70% keyboard: ISO Winkey
-#define LAYOUT_iso_wk( \
-	K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,  \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K013,  \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,        \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,  \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,        \
-	K500, K501, K502,                         K507,             K510, K511, K512, K513   \
-) { \
-	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
-	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO}, \
-	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO}, \
-	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \
-	{ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, KC_NO}, \
-	{ K500, K501, K502, KC_NO,KC_NO,KC_NO,KC_NO,K507, KC_NO,KC_NO,K510, K511, K512, K513 }  \
-}
-
-// 70% keyboard: ISO Winkeyless
-#define LAYOUT_iso_wkl( \
-	K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,  \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K013,  \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,        \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,  \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,        \
-	K500,       K502,                         K507,                   K511,       K513   \
-) { \
-	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
-	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO}, \
-	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO}, \
-	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \
-	{ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, KC_NO}, \
-	{ K500, KC_NO,K502, KC_NO,KC_NO,KC_NO,KC_NO,K507, KC_NO,KC_NO,KC_NO,K511, KC_NO,K513 }  \
-}
-
-#endif