Move 65% layouts to data driven (#20308)

2 files changed, 336 insertions, 491 deletions

diff --git a/keyboards/drewkeys/iskar/info.json b/keyboards/drewkeys/iskar/info.json
index 562c231c26..5aae75c86c 100644
--- a/keyboards/drewkeys/iskar/info.json
+++ b/keyboards/drewkeys/iskar/info.json
@@ -18,378 +18,378 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "Esc 0,0", "x": 0, "y": 0},
-                {"label": "1 0,1", "x": 1, "y": 0},
-                {"label": "2 0,2", "x": 2, "y": 0},
-                {"label": "3 0,3", "x": 3, "y": 0},
-                {"label": "4 0,4", "x": 4, "y": 0},
-                {"label": "5 0,5", "x": 5, "y": 0},
-                {"label": "6 0,6", "x": 6, "y": 0},
-                {"label": "7 0,7", "x": 7, "y": 0},
-                {"label": "8 0,8", "x": 8, "y": 0},
-                {"label": "9 0,9", "x": 9, "y": 0},
-                {"label": "0 0,10", "x": 10, "y": 0},
-                {"label": "- 0,11", "x": 11, "y": 0},
-                {"label": "= 0,12", "x": 12, "y": 0},
-                {"label": "bsp extra 0,13", "x": 13, "y": 0},
-                {"label": "bsp 0,14", "x": 14, "y": 0},
-                {"label": "del 0,15", "x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5},
-                {"label": "q 1,2", "x": 1.5, "y": 1},
-                {"label": "w 1,3", "x": 2.5, "y": 1},
-                {"label": "e 1,4", "x": 3.5, "y": 1},
-                {"label": "r 1,5", "x": 4.5, "y": 1},
-                {"label": "t 1,6", "x": 5.5, "y": 1},
-                {"label": "y 1,7", "x": 6.5, "y": 1},
-                {"label": "u 1,8", "x": 7.5, "y": 1},
-                {"label": "i 1,9", "x": 8.5, "y": 1},
-                {"label": "o 1,10", "x": 9.5, "y": 1},
-                {"label": "p 1,11", "x": 10.5, "y": 1},
-                {"label": "[ 1,12", "x": 11.5, "y": 1},
-                {"label": "] 1,13", "x": 12.5, "y": 1},
-                {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "home 1,15", "x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75},
-                {"label": "a 2,2", "x": 1.75, "y": 2},
-                {"label": "s 2,3", "x": 2.75, "y": 2},
-                {"label": "d 2,4", "x": 3.75, "y": 2},
-                {"label": "f 2,5", "x": 4.75, "y": 2},
-                {"label": "g 2,6", "x": 5.75, "y": 2},
-                {"label": "h 2,7", "x": 6.75, "y": 2},
-                {"label": "j 2,8", "x": 7.75, "y": 2},
-                {"label": "k 2,9", "x": 8.75, "y": 2},
-                {"label": "l 2,10", "x": 9.75, "y": 2},
-                {"label": "; 2,11", "x": 10.75, "y": 2},
-                {"label": "' 2,12", "x": 11.75, "y": 2},
-                {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "pg up 2,15", "x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25},
-                {"label": "z 3,2", "x": 2.25, "y": 3},
-                {"label": "x 3,3", "x": 3.25, "y": 3},
-                {"label": "c 3,4", "x": 4.25, "y": 3},
-                {"label": "v 3,5", "x": 5.25, "y": 3},
-                {"label": "b 3,6", "x": 6.25, "y": 3},
-                {"label": "n 3,7", "x": 7.25, "y": 3},
-                {"label": "m 3,8", "x": 8.25, "y": 3},
-                {"label": ", 3,9", "x": 9.25, "y": 3},
-                {"label": ". 3,10", "x": 10.25, "y": 3},
-                {"label": "/ 3,11", "x": 11.25, "y": 3},
-                {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75},
-                {"label": "up 3,14", "x": 14, "y": 3},
-                {"label": "pg dn 3,15", "x": 15, "y": 3},
+                {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.25},
-                {"label": "win 4,1", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "spacebar 4,6", "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "fn 4,10", "x": 10, "y": 4, "w": 1.25},
-                {"label": "ctrl 4,11", "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "left 4,13", "x": 13, "y": 4},
-                {"label": "down 4,14", "x": 14, "y": 4},
-                {"label": "right 4,15", "x": 15, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi": {
             "layout": [
-              {"label": "Esc 0,0", "x": 0, "y": 0},
-              {"label": "1 0,1", "x": 1, "y": 0},
-              {"label": "2 0,2", "x": 2, "y": 0},
-              {"label": "3 0,3", "x": 3, "y": 0},
-              {"label": "4 0,4", "x": 4, "y": 0},
-              {"label": "5 0,5", "x": 5, "y": 0},
-              {"label": "6 0,6", "x": 6, "y": 0},
-              {"label": "7 0,7", "x": 7, "y": 0},
-              {"label": "8 0,8", "x": 8, "y": 0},
-              {"label": "9 0,9", "x": 9, "y": 0},
-              {"label": "0 0,10", "x": 10, "y": 0},
-              {"label": "- 0,11", "x": 11, "y": 0},
-              {"label": "= 0,12", "x": 12, "y": 0},
-              {"label": "bsp 0,14", "x": 13, "y": 0, "w": 2},
-              {"label": "del 0,15", "x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-              {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5},
-              {"label": "q 1,2", "x": 1.5, "y": 1},
-              {"label": "w 1,3", "x": 2.5, "y": 1},
-              {"label": "e 1,4", "x": 3.5, "y": 1},
-              {"label": "r 1,5", "x": 4.5, "y": 1},
-              {"label": "t 1,6", "x": 5.5, "y": 1},
-              {"label": "y 1,7", "x": 6.5, "y": 1},
-              {"label": "u 1,8", "x": 7.5, "y": 1},
-              {"label": "i 1,9", "x": 8.5, "y": 1},
-              {"label": "o 1,10", "x": 9.5, "y": 1},
-              {"label": "p 1,11", "x": 10.5, "y": 1},
-              {"label": "[ 1,12", "x": 11.5, "y": 1},
-              {"label": "] 1,13", "x": 12.5, "y": 1},
-              {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5},
-              {"label": "home 1,15", "x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-              {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75},
-              {"label": "a 2,2", "x": 1.75, "y": 2},
-              {"label": "s 2,3", "x": 2.75, "y": 2},
-              {"label": "d 2,4", "x": 3.75, "y": 2},
-              {"label": "f 2,5", "x": 4.75, "y": 2},
-              {"label": "g 2,6", "x": 5.75, "y": 2},
-              {"label": "h 2,7", "x": 6.75, "y": 2},
-              {"label": "j 2,8", "x": 7.75, "y": 2},
-              {"label": "k 2,9", "x": 8.75, "y": 2},
-              {"label": "l 2,10", "x": 9.75, "y": 2},
-              {"label": "; 2,11", "x": 10.75, "y": 2},
-              {"label": "' 2,12", "x": 11.75, "y": 2},
-              {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25},
-              {"label": "pg up 2,15", "x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-              {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25},
-              {"label": "z 3,2", "x": 2.25, "y": 3},
-              {"label": "x 3,3", "x": 3.25, "y": 3},
-              {"label": "c 3,4", "x": 4.25, "y": 3},
-              {"label": "v 3,5", "x": 5.25, "y": 3},
-              {"label": "b 3,6", "x": 6.25, "y": 3},
-              {"label": "n 3,7", "x": 7.25, "y": 3},
-              {"label": "m 3,8", "x": 8.25, "y": 3},
-              {"label": ", 3,9", "x": 9.25, "y": 3},
-              {"label": ". 3,10", "x": 10.25, "y": 3},
-              {"label": "/ 3,11", "x": 11.25, "y": 3},
-              {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75},
-              {"label": "up 3,14", "x": 14, "y": 3},
-              {"label": "pg dn 3,15", "x": 15, "y": 3},
+                {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-              {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.25},
-              {"label": "win 4,1", "x": 1.25, "y": 4, "w": 1.25},
-              {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.25},
-              {"label": "spacebar 4,6", "x": 3.75, "y": 4, "w": 6.25},
-              {"label": "fn 4,10", "x": 10, "y": 4, "w": 1.25},
-              {"label": "ctrl 4,11", "x": 11.25, "y": 4, "w": 1.25},
-              {"label": "left 4,13", "x": 13, "y": 4},
-              {"label": "down 4,14", "x": 14, "y": 4},
-              {"label": "right 4,15", "x": 15, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_split_bs": {
             "layout": [
-              {"label": "Esc 0,0", "x": 0, "y": 0},
-              {"label": "1 0,1", "x": 1, "y": 0},
-              {"label": "2 0,2", "x": 2, "y": 0},
-              {"label": "3 0,3", "x": 3, "y": 0},
-              {"label": "4 0,4", "x": 4, "y": 0},
-              {"label": "5 0,5", "x": 5, "y": 0},
-              {"label": "6 0,6", "x": 6, "y": 0},
-              {"label": "7 0,7", "x": 7, "y": 0},
-              {"label": "8 0,8", "x": 8, "y": 0},
-              {"label": "9 0,9", "x": 9, "y": 0},
-              {"label": "0 0,10", "x": 10, "y": 0},
-              {"label": "- 0,11", "x": 11, "y": 0},
-              {"label": "= 0,12", "x": 12, "y": 0},
-              {"label": "bsp extra 0,13", "x": 13, "y": 0},
-              {"label": "bsp 0,14", "x": 14, "y": 0},
-              {"label": "del 0,15", "x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-              {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5},
-              {"label": "q 1,2", "x": 1.5, "y": 1},
-              {"label": "w 1,3", "x": 2.5, "y": 1},
-              {"label": "e 1,4", "x": 3.5, "y": 1},
-              {"label": "r 1,5", "x": 4.5, "y": 1},
-              {"label": "t 1,6", "x": 5.5, "y": 1},
-              {"label": "y 1,7", "x": 6.5, "y": 1},
-              {"label": "u 1,8", "x": 7.5, "y": 1},
-              {"label": "i 1,9", "x": 8.5, "y": 1},
-              {"label": "o 1,10", "x": 9.5, "y": 1},
-              {"label": "p 1,11", "x": 10.5, "y": 1},
-              {"label": "[ 1,12", "x": 11.5, "y": 1},
-              {"label": "] 1,13", "x": 12.5, "y": 1},
-              {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5},
-              {"label": "home 1,15", "x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-              {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75},
-              {"label": "a 2,2", "x": 1.75, "y": 2},
-              {"label": "s 2,3", "x": 2.75, "y": 2},
-              {"label": "d 2,4", "x": 3.75, "y": 2},
-              {"label": "f 2,5", "x": 4.75, "y": 2},
-              {"label": "g 2,6", "x": 5.75, "y": 2},
-              {"label": "h 2,7", "x": 6.75, "y": 2},
-              {"label": "j 2,8", "x": 7.75, "y": 2},
-              {"label": "k 2,9", "x": 8.75, "y": 2},
-              {"label": "l 2,10", "x": 9.75, "y": 2},
-              {"label": "; 2,11", "x": 10.75, "y": 2},
-              {"label": "' 2,12", "x": 11.75, "y": 2},
-              {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25},
-              {"label": "pg up 2,15", "x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-              {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25},
-              {"label": "z 3,2", "x": 2.25, "y": 3},
-              {"label": "x 3,3", "x": 3.25, "y": 3},
-              {"label": "c 3,4", "x": 4.25, "y": 3},
-              {"label": "v 3,5", "x": 5.25, "y": 3},
-              {"label": "b 3,6", "x": 6.25, "y": 3},
-              {"label": "n 3,7", "x": 7.25, "y": 3},
-              {"label": "m 3,8", "x": 8.25, "y": 3},
-              {"label": ", 3,9", "x": 9.25, "y": 3},
-              {"label": ". 3,10", "x": 10.25, "y": 3},
-              {"label": "/ 3,11", "x": 11.25, "y": 3},
-              {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75},
-              {"label": "up 3,14", "x": 14, "y": 3},
-              {"label": "pg dn 3,15", "x": 15, "y": 3},
+                {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-              {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.25},
-              {"label": "win 4,1", "x": 1.25, "y": 4, "w": 1.25},
-              {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.25},
-              {"label": "spacebar 4,6", "x": 3.75, "y": 4, "w": 6.25},
-              {"label": "fn 4,10", "x": 10, "y": 4, "w": 1.25},
-              {"label": "ctrl 4,11", "x": 11.25, "y": 4, "w": 1.25},
-              {"label": "left 4,13", "x": 13, "y": 4},
-              {"label": "down 4,14", "x": 14, "y": 4},
-              {"label": "right 4,15", "x": 15, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_tsangan": {
             "layout": [
-              {"label": "Esc 0,0", "x": 0, "y": 0},
-              {"label": "1 0,1", "x": 1, "y": 0},
-              {"label": "2 0,2", "x": 2, "y": 0},
-              {"label": "3 0,3", "x": 3, "y": 0},
-              {"label": "4 0,4", "x": 4, "y": 0},
-              {"label": "5 0,5", "x": 5, "y": 0},
-              {"label": "6 0,6", "x": 6, "y": 0},
-              {"label": "7 0,7", "x": 7, "y": 0},
-              {"label": "8 0,8", "x": 8, "y": 0},
-              {"label": "9 0,9", "x": 9, "y": 0},
-              {"label": "0 0,10", "x": 10, "y": 0},
-              {"label": "- 0,11", "x": 11, "y": 0},
-              {"label": "= 0,12", "x": 12, "y": 0},
-              {"label": "bsp 0,14", "x": 13, "y": 0, "w": 2},
-              {"label": "del 0,15", "x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-              {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5},
-              {"label": "q 1,2", "x": 1.5, "y": 1},
-              {"label": "w 1,3", "x": 2.5, "y": 1},
-              {"label": "e 1,4", "x": 3.5, "y": 1},
-              {"label": "r 1,5", "x": 4.5, "y": 1},
-              {"label": "t 1,6", "x": 5.5, "y": 1},
-              {"label": "y 1,7", "x": 6.5, "y": 1},
-              {"label": "u 1,8", "x": 7.5, "y": 1},
-              {"label": "i 1,9", "x": 8.5, "y": 1},
-              {"label": "o 1,10", "x": 9.5, "y": 1},
-              {"label": "p 1,11", "x": 10.5, "y": 1},
-              {"label": "[ 1,12", "x": 11.5, "y": 1},
-              {"label": "] 1,13", "x": 12.5, "y": 1},
-              {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5},
-              {"label": "home 1,15", "x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-              {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75},
-              {"label": "a 2,2", "x": 1.75, "y": 2},
-              {"label": "s 2,3", "x": 2.75, "y": 2},
-              {"label": "d 2,4", "x": 3.75, "y": 2},
-              {"label": "f 2,5", "x": 4.75, "y": 2},
-              {"label": "g 2,6", "x": 5.75, "y": 2},
-              {"label": "h 2,7", "x": 6.75, "y": 2},
-              {"label": "j 2,8", "x": 7.75, "y": 2},
-              {"label": "k 2,9", "x": 8.75, "y": 2},
-              {"label": "l 2,10", "x": 9.75, "y": 2},
-              {"label": "; 2,11", "x": 10.75, "y": 2},
-              {"label": "' 2,12", "x": 11.75, "y": 2},
-              {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25},
-              {"label": "pg up 2,15", "x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-              {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25},
-              {"label": "z 3,2", "x": 2.25, "y": 3},
-              {"label": "x 3,3", "x": 3.25, "y": 3},
-              {"label": "c 3,4", "x": 4.25, "y": 3},
-              {"label": "v 3,5", "x": 5.25, "y": 3},
-              {"label": "b 3,6", "x": 6.25, "y": 3},
-              {"label": "n 3,7", "x": 7.25, "y": 3},
-              {"label": "m 3,8", "x": 8.25, "y": 3},
-              {"label": ", 3,9", "x": 9.25, "y": 3},
-              {"label": ". 3,10", "x": 10.25, "y": 3},
-              {"label": "/ 3,11", "x": 11.25, "y": 3},
-              {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75},
-              {"label": "up 3,14", "x": 14, "y": 3},
-              {"label": "pg dn 3,15", "x": 15, "y": 3},
+                {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-              {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.5},
-              {"label": "win 4,1", "x": 1.5, "y": 4},
-              {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.5},
-              {"label": "spacebar 4,6", "x": 4, "y": 4, "w": 7},
-              {"label": "ctrl 4,11", "x": 11, "y": 4, "w": 1.5},
-              {"label": "left 4,13", "x": 13, "y": 4},
-              {"label": "down 4,14", "x": 14, "y": 4},
-              {"label": "right 4,15", "x": 15, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_tsangan_split_bs": {
             "layout": [
-              {"label": "Esc 0,0", "x": 0, "y": 0},
-              {"label": "1 0,1", "x": 1, "y": 0},
-              {"label": "2 0,2", "x": 2, "y": 0},
-              {"label": "3 0,3", "x": 3, "y": 0},
-              {"label": "4 0,4", "x": 4, "y": 0},
-              {"label": "5 0,5", "x": 5, "y": 0},
-              {"label": "6 0,6", "x": 6, "y": 0},
-              {"label": "7 0,7", "x": 7, "y": 0},
-              {"label": "8 0,8", "x": 8, "y": 0},
-              {"label": "9 0,9", "x": 9, "y": 0},
-              {"label": "0 0,10", "x": 10, "y": 0},
-              {"label": "- 0,11", "x": 11, "y": 0},
-              {"label": "= 0,12", "x": 12, "y": 0},
-              {"label": "bsp extra 0,13", "x": 13, "y": 0},
-              {"label": "bsp 0,14", "x": 14, "y": 0},
-              {"label": "del 0,15", "x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-              {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5},
-              {"label": "q 1,2", "x": 1.5, "y": 1},
-              {"label": "w 1,3", "x": 2.5, "y": 1},
-              {"label": "e 1,4", "x": 3.5, "y": 1},
-              {"label": "r 1,5", "x": 4.5, "y": 1},
-              {"label": "t 1,6", "x": 5.5, "y": 1},
-              {"label": "y 1,7", "x": 6.5, "y": 1},
-              {"label": "u 1,8", "x": 7.5, "y": 1},
-              {"label": "i 1,9", "x": 8.5, "y": 1},
-              {"label": "o 1,10", "x": 9.5, "y": 1},
-              {"label": "p 1,11", "x": 10.5, "y": 1},
-              {"label": "[ 1,12", "x": 11.5, "y": 1},
-              {"label": "] 1,13", "x": 12.5, "y": 1},
-              {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5},
-              {"label": "home 1,15", "x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-              {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75},
-              {"label": "a 2,2", "x": 1.75, "y": 2},
-              {"label": "s 2,3", "x": 2.75, "y": 2},
-              {"label": "d 2,4", "x": 3.75, "y": 2},
-              {"label": "f 2,5", "x": 4.75, "y": 2},
-              {"label": "g 2,6", "x": 5.75, "y": 2},
-              {"label": "h 2,7", "x": 6.75, "y": 2},
-              {"label": "j 2,8", "x": 7.75, "y": 2},
-              {"label": "k 2,9", "x": 8.75, "y": 2},
-              {"label": "l 2,10", "x": 9.75, "y": 2},
-              {"label": "; 2,11", "x": 10.75, "y": 2},
-              {"label": "' 2,12", "x": 11.75, "y": 2},
-              {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25},
-              {"label": "pg up 2,15", "x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-              {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25},
-              {"label": "z 3,2", "x": 2.25, "y": 3},
-              {"label": "x 3,3", "x": 3.25, "y": 3},
-              {"label": "c 3,4", "x": 4.25, "y": 3},
-              {"label": "v 3,5", "x": 5.25, "y": 3},
-              {"label": "b 3,6", "x": 6.25, "y": 3},
-              {"label": "n 3,7", "x": 7.25, "y": 3},
-              {"label": "m 3,8", "x": 8.25, "y": 3},
-              {"label": ", 3,9", "x": 9.25, "y": 3},
-              {"label": ". 3,10", "x": 10.25, "y": 3},
-              {"label": "/ 3,11", "x": 11.25, "y": 3},
-              {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75},
-              {"label": "up 3,14", "x": 14, "y": 3},
-              {"label": "pg dn 3,15", "x": 15, "y": 3},
+                {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-              {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.5},
-              {"label": "win 4,1", "x": 1.5, "y": 4},
-              {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.5},
-              {"label": "spacebar 4,6", "x": 4, "y": 4, "w": 7},
-              {"label": "ctrl 4,11", "x": 11, "y": 4, "w": 1.5},
-              {"label": "left 4,13", "x": 13, "y": 4},
-              {"label": "down 4,14", "x": 14, "y": 4},
-              {"label": "right 4,15", "x": 15, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/drewkeys/iskar/iskar.h b/keyboards/drewkeys/iskar/iskar.h
deleted file mode 100644
index 0ad2601d33..0000000000
--- a/keyboards/drewkeys/iskar/iskar.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/* Copyright 2021 Drewkeys
- *
- * 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"
-// Corresponding changes to the layout names and/or definitions must also be made to info.json
-
-/* Standard arrangement / LAYOUT
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │0f │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤───┤
- * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │1f │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤
- * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │2f │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤
- * │31      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │3f │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┬┴───┬┴┬───┼───┤───┤
- * │40  │41  │43  │        46              │4a  │4b  │▓│4d │4e │4f │
- * └────┴────┴────┴────────────────────────┴────┴────┴ ┴───┴───┘───┘
-*/
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,   k0F,    \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,   k1F,    \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,        k2F,    \
-         k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E,   k3F,    \
-    k40, k41, k42,                k46,                k4A, k4B,      k4D, k4E,   k4F     \
-) { \
-    { k00,   k01,   k02, k03,   k04,   k05,   k06, k07,   k08,   k09,   k0A, k0B, k0C,   k0D, k0E,   k0F }, \
-    { k10,   KC_NO, k12, k13,   k14,   k15,   k16, k17,   k18,   k19,   k1A, k1B, k1C,   k1D, k1E,   k1F }, \
-    { k20,   KC_NO, k22, k23,   k24,   k25,   k26, k27,   k28,   k29,   k2A, k2B, k2C,   k2D, KC_NO, k2F }, \
-    { KC_NO, k31,   k32, k33,   k34,   k35,   k36, k37,   k38,   k39,   k3A, k3B, KC_NO, k3D, k3E,   k3F }, \
-    { k40,   k41,   k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, KC_NO, k4D, k4E,   k4F }  \
-}
-
-/* Standard arrangement / 65 ANSI
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e     │0f │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤───┤
- * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │1f │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤
- * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │2f │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤
- * │31      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │3f │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┬┴───┬┴┬───┼───┤───┤
- * │40  │41  │43  │        46              │4a  │4b  │ │4d │4e │4f │
- * └────┴────┴────┴────────────────────────┴────┴────┴ ┴───┴───┘───┘
-*/
-#define LAYOUT_65_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,        k0E, k0F,    \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,   k1E, k1F,    \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,        k2F,    \
-         k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,   k3E, k3F,    \
-    k40, k41, k42,                k46,                k4A, k4B,      k4D,   k4E, k4F     \
-) { \
-    { k00,   k01,   k02, k03,   k04,   k05,   k06, k07,   k08,   k09,   k0A, k0B, k0C,   KC_NO, k0E, k0F }, \
-    { k10,   KC_NO, k12, k13,   k14,   k15,   k16, k17,   k18,   k19,   k1A, k1B, k1C,   k1D, k1E,   k1F }, \
-    { k20,   KC_NO, k22, k23,   k24,   k25,   k26, k27,   k28,   k29,   k2A, k2B, k2C,   k2D, KC_NO, k2F }, \
-    { KC_NO, k31,   k32, k33,   k34,   k35,   k36, k37,   k38,   k39,   k3A, k3B, KC_NO, k3D, k3E,   k3F }, \
-    { k40,   k41,   k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, KC_NO, k4D, k4E,   k4F }  \
-}
-
-/* Standard arrangement / 65 ANSI SPLIT
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │0f │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤───┤
- * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │1f │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤
- * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │2f │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤
- * │31      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │3f │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┬┴───┬┴┬───┼───┤───┤
- * │40  │41  │43  │        46              │4a  │4b  │ │4d │4e │4f │
- * └────┴────┴────┴────────────────────────┴────┴────┴ ┴───┴───┘───┘
-*/
-#define LAYOUT_65_ansi_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,   k0F,    \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,   k1F,    \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,        k2F,    \
-         k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E,   k3F,    \
-    k40, k41, k42,                k46,                k4A, k4B,      k4D, k4E,   k4F     \
-) { \
-    { k00,   k01,   k02, k03,   k04,   k05,   k06, k07,   k08,   k09,   k0A, k0B, k0C,   k0D, k0E,   k0F }, \
-    { k10,   KC_NO, k12, k13,   k14,   k15,   k16, k17,   k18,   k19,   k1A, k1B, k1C,   k1D, k1E,   k1F }, \
-    { k20,   KC_NO, k22, k23,   k24,   k25,   k26, k27,   k28,   k29,   k2A, k2B, k2C,   k2D, KC_NO, k2F }, \
-    { KC_NO, k31,   k32, k33,   k34,   k35,   k36, k37,   k38,   k39,   k3A, k3B, KC_NO, k3D, k3E,   k3F }, \
-    { k40,   k41,   k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, KC_NO, k4D, k4E,   k4F }  \
-}
-
-/* Standard arrangement / 65 TSANGAN
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e     │0f │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤───┤
- * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │1f │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤
- * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │2f │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤
- * │31      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │3f │
- * ├─────┬─┴─┬──┴─┬─┴───┴───┴───┴───┴───┴───┴───┬┴───┬┴┬───┼───┤───┤
- * │40   │41 │43  │        46                   │4b  │ │4d │4e │4f │
- * └─────┴───┴────┴─────────────────────────────┴────┴ ┴───┴───┘───┘
-*/
-#define LAYOUT_65_tsangan( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0E,  k0F,     \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,   k1F,    \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,        k2F,    \
-         k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E,   k3F,    \
-    k40, k41, k42,                k46,                     k4B,      k4D, k4E,   k4F     \
-) { \
-    { k00,   k01,   k02, k03,   k04,   k05,   k06, k07,   k08,   k09,   k0A, k0B, k0C,   KC_NO, k0E, k0F }, \
-    { k10,   KC_NO, k12, k13,   k14,   k15,   k16, k17,   k18,   k19,   k1A, k1B, k1C,   k1D, k1E,   k1F }, \
-    { k20,   KC_NO, k22, k23,   k24,   k25,   k26, k27,   k28,   k29,   k2A, k2B, k2C,   k2D, KC_NO, k2F }, \
-    { KC_NO, k31,   k32, k33,   k34,   k35,   k36, k37,   k38,   k39,   k3A, k3B, KC_NO, k3D, k3E,   k3F }, \
-    { k40,   k41,   k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, KC_NO, k4B, KC_NO, k4D, k4E, k4F }  \
-}
-
-/* Standard arrangement / 65 TSANGAN SPLIT
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │0f │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤───┤
- * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │1f │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤
- * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │2f │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤
- * │31      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │3f │
- * ├─────┬─┴─┬──┴─┬─┴───┴───┴───┴───┴───┴───┴───┬┴───┬┴┬───┼───┤───┤
- * │40   │41 │43  │        46                   │4b  │ │4d │4e │4f │
- * └─────┴───┴────┴─────────────────────────────┴────┴ ┴───┴───┘───┘
-*/
-#define LAYOUT_65_tsangan_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,   k0F,    \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,   k1F,    \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,        k2F,    \
-         k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E,   k3F,    \
-    k40, k41, k42,                k46,                     k4B,      k4D, k4E,   k4F     \
-) { \
-    { k00,   k01,   k02, k03,   k04,   k05,   k06, k07,   k08,   k09,   k0A, k0B, k0C,   k0D, k0E,   k0F }, \
-    { k10,   KC_NO, k12, k13,   k14,   k15,   k16, k17,   k18,   k19,   k1A, k1B, k1C,   k1D, k1E,   k1F }, \
-    { k20,   KC_NO, k22, k23,   k24,   k25,   k26, k27,   k28,   k29,   k2A, k2B, k2C,   k2D, KC_NO, k2F }, \
-    { KC_NO, k31,   k32, k33,   k34,   k35,   k36, k37,   k38,   k39,   k3A, k3B, KC_NO, k3D, k3E,   k3F }, \
-    { k40,   k41,   k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, KC_NO, k4B, KC_NO, k4D, k4E,   k4F }  \
-}