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

2 files changed, 441 insertions, 526 deletions

diff --git a/keyboards/charue/sunsetter/info.json b/keyboards/charue/sunsetter/info.json
index b499907a85..0a6d7696e2 100644
--- a/keyboards/charue/sunsetter/info.json
+++ b/keyboards/charue/sunsetter/info.json
@@ -22,434 +22,463 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"F1", "x":0, "y":0},
-                {"label":"F2", "x":1, "y":0},
-                {"label":"~", "x":2.25, "y":0},
-                {"label":"!", "x":3.25, "y":0},
-                {"label":"@", "x":4.25, "y":0},
-                {"label":"#", "x":5.25, "y":0},
-                {"label":"$", "x":6.25, "y":0},
-                {"label":"%", "x":7.25, "y":0},
-                {"label":"^", "x":8.25, "y":0},
-                {"label":"&", "x":9.25, "y":0},
-                {"label":"*", "x":10.25, "y":0},
-                {"label":"(", "x":11.25, "y":0},
-                {"label":")", "x":12.25, "y":0},
-                {"label":"_", "x":13.25, "y":0},
-                {"label":"+", "x":14.25, "y":0},
-                {"label":"Backspace", "x":15.25, "y":0},
-                {"label":"Backspace", "x":16.25, "y":0},
-                {"label":"<i class='kb kb-Multimedia-Volume-Up-1'></i>", "x":17.25, "y":0},
-
-                {"label":"F3", "x":0, "y":1},
-                {"label":"F4", "x":1, "y":1},
-                {"label":"Tab", "x":2.25, "y":1, "w":1.5},
-                {"label":"Q", "x":3.75, "y":1},
-                {"label":"W", "x":4.75, "y":1},
-                {"label":"E", "x":5.75, "y":1},
-                {"label":"R", "x":6.75, "y":1},
-                {"label":"T", "x":7.75, "y":1},
-                {"label":"Y", "x":8.75, "y":1},
-                {"label":"U", "x":9.75, "y":1},
-                {"label":"I", "x":10.75, "y":1},
-                {"label":"O", "x":11.75, "y":1},
-                {"label":"P", "x":12.75, "y":1},
-                {"label":"{", "x":13.75, "y":1},
-                {"label":"}", "x":14.75, "y":1},
-                {"label":"|", "x":15.75, "y":1, "w":1.5},
-                {"label":"<i class='kb kb-Multimedia-Volume-Down-1'></i>", "x":17.25, "y":1},
-
-                {"label":"F5", "x":0, "y":2},
-                {"label":"F6", "x":1, "y":2},
-                {"label":"Caps Lock", "x":2.25, "y":2, "w":1.25},
-                {"label":"A", "x":4, "y":2},
-                {"label":"S", "x":5, "y":2},
-                {"label":"D", "x":6, "y":2},
-                {"label":"F", "x":7, "y":2},
-                {"label":"G", "x":8, "y":2},
-                {"label":"H", "x":9, "y":2},
-                {"label":"J", "x":10, "y":2},
-                {"label":"K", "x":11, "y":2},
-                {"label":"L", "x":12, "y":2},
-                {"label":":", "x":13, "y":2},
-                {"label":"\"", "x":14, "y":2},
-                {"label":"~", "x":18.5, "y":2},
-                {"label":"Enter", "x":15, "y":2, "w":2.25},
-                {"label":"Enter", "x":19.5, "y":1, "w":1.25, "h":2},
-                {"label":"<i class='kb kb-Multimedia-Mute-1'></i>", "x":17.25, "y":2},
-
-                {"label":"F7", "x":0, "y":3},
-                {"label":"F8", "x":1, "y":3},
-                {"label":"Shift", "x":2.25, "y":3, "w":1.25},
-                {"label":"|", "x":3.5, "y":3},
-                {"label":"Z", "x":4.5, "y":3},
-                {"label":"X", "x":5.5, "y":3},
-                {"label":"C", "x":6.5, "y":3},
-                {"label":"V", "x":7.5, "y":3},
-                {"label":"B", "x":8.5, "y":3},
-                {"label":"N", "x":9.5, "y":3},
-                {"label":"M", "x":10.5, "y":3},
-                {"label":"<", "x":11.5, "y":3},
-                {"label":">", "x":12.5, "y":3},
-                {"label":"?", "x":13.5, "y":3},
-                {"label":"Shift", "x":14.5, "y":3, "w":1.75},
-                {"label":"<i class='kb kb-Arrows-Up'></i>", "x":16.25, "y":3},
-                {"label":"<i class='kb kb-Multimedia-Play-Pause'></i>", "x":17.25, "y":3},
-
-                {"label":"F9/11", "x":0, "y":4},
-                {"label":"F10/12", "x":1, "y":4},
-                {"label":"Ctrl", "x":2.25, "y":4, "w":1.25},
-                {"label":"Win", "x":3.5, "y":4, "w":1.25},
-                {"label":"Alt", "x":4.75, "y":4, "w":1.25},
-                {"label":"2.25", "x":6, "y":4, "w":2.25},
-                {"label":"1.25", "x":8.25, "y":4, "w":1.25},
-                {"label":"2.75", "x":9.5, "y":4, "w":2.75},
-                {"label":"Fn", "x":12.25, "y":4},
-                {"label":"Win", "x":13.25, "y":4},
-                {"label":"Ctrl", "x":14.25, "y":4},
-                {"label":"<i class='kb kb-Arrows-Left'></i>", "x":15.25, "y":4},
-                {"label":"<i class='kb kb-Arrows-Down'></i>", "x":16.25, "y":4},
-                {"label":"<i class='kb kb-Arrows-Right'></i>", "x":17.25, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "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": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 16], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 17], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.25},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 14], "x": 18.5, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
+                {"matrix": [2, 16], "x": 19.5, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 17], "x": 17.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3},
+                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 16], "x": 16.25, "y": 3},
+                {"matrix": [3, 17], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 12], "x": 12.25, "y": 4},
+                {"matrix": [4, 13], "x": 13.25, "y": 4},
+                {"matrix": [4, 14], "x": 14.25, "y": 4},
+                {"matrix": [4, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 16], "x": 16.25, "y": 4},
+                {"matrix": [4, 17], "x": 17.25, "y": 4}
             ]
         },
         "LAYOUT_1065_ansi": {
             "layout": [
-                {"label":"F1", "x":0, "y":0},
-                {"label":"F2", "x":1, "y":0},
-                {"label":"~", "x":2.25, "y":0},
-                {"label":"!", "x":3.25, "y":0},
-                {"label":"@", "x":4.25, "y":0},
-                {"label":"#", "x":5.25, "y":0},
-                {"label":"$", "x":6.25, "y":0},
-                {"label":"%", "x":7.25, "y":0},
-                {"label":"^", "x":8.25, "y":0},
-                {"label":"&", "x":9.25, "y":0},
-                {"label":"*", "x":10.25, "y":0},
-                {"label":"(", "x":11.25, "y":0},
-                {"label":")", "x":12.25, "y":0},
-                {"label":"_", "x":13.25, "y":0},
-                {"label":"+", "x":14.25, "y":0},
-                {"label":"Backspace", "x":15.25, "y":0, "w":2},
-                {"label":"<i class='kb kb-Multimedia-Volume-Up-1'></i>", "x":17.25, "y":0},
-
-                {"label":"F3", "x":0, "y":1},
-                {"label":"F4", "x":1, "y":1},
-                {"label":"Tab", "x":2.25, "y":1, "w":1.5},
-                {"label":"Q", "x":3.75, "y":1},
-                {"label":"W", "x":4.75, "y":1},
-                {"label":"E", "x":5.75, "y":1},
-                {"label":"R", "x":6.75, "y":1},
-                {"label":"T", "x":7.75, "y":1},
-                {"label":"Y", "x":8.75, "y":1},
-                {"label":"U", "x":9.75, "y":1},
-                {"label":"I", "x":10.75, "y":1},
-                {"label":"O", "x":11.75, "y":1},
-                {"label":"P", "x":12.75, "y":1},
-                {"label":"{", "x":13.75, "y":1},
-                {"label":"}", "x":14.75, "y":1},
-                {"label":"|", "x":15.75, "y":1, "w":1.5},
-                {"label":"<i class='kb kb-Multimedia-Volume-Down-1'></i>", "x":17.25, "y":1},
-
-                {"label":"F5", "x":0, "y":2},
-                {"label":"F6", "x":1, "y":2},
-                {"label":"Caps Lock", "x":2.25, "y":2, "w":1.25},
-                {"label":"A", "x":4, "y":2},
-                {"label":"S", "x":5, "y":2},
-                {"label":"D", "x":6, "y":2},
-                {"label":"F", "x":7, "y":2},
-                {"label":"G", "x":8, "y":2},
-                {"label":"H", "x":9, "y":2},
-                {"label":"J", "x":10, "y":2},
-                {"label":"K", "x":11, "y":2},
-                {"label":"L", "x":12, "y":2},
-                {"label":":", "x":13, "y":2},
-                {"label":"\"", "x":14, "y":2},
-                {"label":"Enter", "x":15, "y":2, "w":2.25},
-                {"label":"<i class='kb kb-Multimedia-Mute-1'></i>", "x":17.25, "y":2},
-
-                {"label":"F7", "x":0, "y":3},
-                {"label":"F8", "x":1, "y":3},
-                {"label":"Shift", "x":2.25, "y":3, "w":2.25},
-                {"label":"Z", "x":4.5, "y":3},
-                {"label":"X", "x":5.5, "y":3},
-                {"label":"C", "x":6.5, "y":3},
-                {"label":"V", "x":7.5, "y":3},
-                {"label":"B", "x":8.5, "y":3},
-                {"label":"N", "x":9.5, "y":3},
-                {"label":"M", "x":10.5, "y":3},
-                {"label":"<", "x":11.5, "y":3},
-                {"label":">", "x":12.5, "y":3},
-                {"label":"?", "x":13.5, "y":3},
-                {"label":"Shift", "x":14.5, "y":3, "w":1.75},
-                {"label":"<i class='kb kb-Arrows-Up'></i>", "x":16.25, "y":3},
-                {"label":"<i class='kb kb-Multimedia-Play-Pause'></i>", "x":17.25, "y":3},
-
-                {"label":"F9/11", "x":0, "y":4},
-                {"label":"F10/12", "x":1, "y":4},
-                {"label":"Ctrl", "x":2.25, "y":4, "w":1.25},
-                {"label":"Win", "x":3.5, "y":4, "w":1.25},
-                {"label":"Alt", "x":4.75, "y":4, "w":1.25},
-                {"label":"6.25", "x":6, "y":4, "w":6.25},
-                {"label":"Fn", "x":12.25, "y":4},
-                {"label":"<i class='kb kb-Arrows-Left'></i>", "x":15.25, "y":4},
-                {"label":"<i class='kb kb-Arrows-Down'></i>", "x":16.25, "y":4},
-                {"label":"<i class='kb kb-Arrows-Right'></i>", "x":17.25, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0},
+                {"matrix": [0, 16], "x": 15.25, "y": 0, "w": 2},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 16], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 17], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.25},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3},
+                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 16], "x": 16.25, "y": 3},
+                {"matrix": [3, 17], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 6, "y": 4, "w": 6.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4},
+
+                {"matrix": [4, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 16], "x": 16.25, "y": 4},
+                {"matrix": [4, 17], "x": 17.25, "y": 4}
             ]
         },
         "LAYOUT_1065_ansi_split_bs": {
             "layout": [
-                {"label":"F1", "x":0, "y":0},
-                {"label":"F2", "x":1, "y":0},
-                {"label":"~", "x":2.25, "y":0},
-                {"label":"!", "x":3.25, "y":0},
-                {"label":"@", "x":4.25, "y":0},
-                {"label":"#", "x":5.25, "y":0},
-                {"label":"$", "x":6.25, "y":0},
-                {"label":"%", "x":7.25, "y":0},
-                {"label":"^", "x":8.25, "y":0},
-                {"label":"&", "x":9.25, "y":0},
-                {"label":"*", "x":10.25, "y":0},
-                {"label":"(", "x":11.25, "y":0},
-                {"label":")", "x":12.25, "y":0},
-                {"label":"_", "x":13.25, "y":0},
-                {"label":"+", "x":14.25, "y":0},
-                {"label":"Backspace", "x":15.25, "y":0},
-                {"label":"Backspace", "x":16.25, "y":0},
-                {"label":"<i class='kb kb-Multimedia-Volume-Up-1'></i>", "x":17.25, "y":0},
-
-                {"label":"F3", "x":0, "y":1},
-                {"label":"F4", "x":1, "y":1},
-                {"label":"Tab", "x":2.25, "y":1, "w":1.5},
-                {"label":"Q", "x":3.75, "y":1},
-                {"label":"W", "x":4.75, "y":1},
-                {"label":"E", "x":5.75, "y":1},
-                {"label":"R", "x":6.75, "y":1},
-                {"label":"T", "x":7.75, "y":1},
-                {"label":"Y", "x":8.75, "y":1},
-                {"label":"U", "x":9.75, "y":1},
-                {"label":"I", "x":10.75, "y":1},
-                {"label":"O", "x":11.75, "y":1},
-                {"label":"P", "x":12.75, "y":1},
-                {"label":"{", "x":13.75, "y":1},
-                {"label":"}", "x":14.75, "y":1},
-                {"label":"|", "x":15.75, "y":1, "w":1.5},
-                {"label":"<i class='kb kb-Multimedia-Volume-Down-1'></i>", "x":17.25, "y":1},
-
-                {"label":"F5", "x":0, "y":2},
-                {"label":"F6", "x":1, "y":2},
-                {"label":"Caps Lock", "x":2.25, "y":2, "w":1.25},
-                {"label":"A", "x":4, "y":2},
-                {"label":"S", "x":5, "y":2},
-                {"label":"D", "x":6, "y":2},
-                {"label":"F", "x":7, "y":2},
-                {"label":"G", "x":8, "y":2},
-                {"label":"H", "x":9, "y":2},
-                {"label":"J", "x":10, "y":2},
-                {"label":"K", "x":11, "y":2},
-                {"label":"L", "x":12, "y":2},
-                {"label":":", "x":13, "y":2},
-                {"label":"\"", "x":14, "y":2},
-                {"label":"Enter", "x":15, "y":2, "w":2.25},
-                {"label":"<i class='kb kb-Multimedia-Mute-1'></i>", "x":17.25, "y":2},
-
-                {"label":"F7", "x":0, "y":3},
-                {"label":"F8", "x":1, "y":3},
-                {"label":"Shift", "x":2.25, "y":3, "w":2.25},
-                {"label":"Z", "x":4.5, "y":3},
-                {"label":"X", "x":5.5, "y":3},
-                {"label":"C", "x":6.5, "y":3},
-                {"label":"V", "x":7.5, "y":3},
-                {"label":"B", "x":8.5, "y":3},
-                {"label":"N", "x":9.5, "y":3},
-                {"label":"M", "x":10.5, "y":3},
-                {"label":"<", "x":11.5, "y":3},
-                {"label":">", "x":12.5, "y":3},
-                {"label":"?", "x":13.5, "y":3},
-                {"label":"Shift", "x":14.5, "y":3, "w":1.75},
-                {"label":"<i class='kb kb-Arrows-Up'></i>", "x":16.25, "y":3},
-                {"label":"<i class='kb kb-Multimedia-Play-Pause'></i>", "x":17.25, "y":3},
-
-                {"label":"F9/11", "x":0, "y":4},
-                {"label":"F10/12", "x":1, "y":4},
-                {"label":"Ctrl", "x":2.25, "y":4, "w":1.25},
-                {"label":"Win", "x":3.5, "y":4, "w":1.25},
-                {"label":"Alt", "x":4.75, "y":4, "w":1.25},
-                {"label":"6.25", "x":6, "y":4, "w":6.25},
-                {"label":"Fn", "x":12.25, "y":4},
-                {"label":"<i class='kb kb-Arrows-Left'></i>", "x":15.25, "y":4},
-                {"label":"<i class='kb kb-Arrows-Down'></i>", "x":16.25, "y":4},
-                {"label":"<i class='kb kb-Arrows-Right'></i>", "x":17.25, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "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": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 16], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 17], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.25},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3},
+                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 16], "x": 16.25, "y": 3},
+                {"matrix": [3, 17], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 6, "y": 4, "w": 6.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4},
+
+                {"matrix": [4, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 16], "x": 16.25, "y": 4},
+                {"matrix": [4, 17], "x": 17.25, "y": 4}
             ]
         },
         "LAYOUT_1065_iso": {
             "layout": [
-                {"label":"F1", "x":0, "y":0},
-                {"label":"F2", "x":1, "y":0},
-                {"label":"~", "x":2.25, "y":0},
-                {"label":"!", "x":3.25, "y":0},
-                {"label":"@", "x":4.25, "y":0},
-                {"label":"#", "x":5.25, "y":0},
-                {"label":"$", "x":6.25, "y":0},
-                {"label":"%", "x":7.25, "y":0},
-                {"label":"^", "x":8.25, "y":0},
-                {"label":"&", "x":9.25, "y":0},
-                {"label":"*", "x":10.25, "y":0},
-                {"label":"(", "x":11.25, "y":0},
-                {"label":")", "x":12.25, "y":0},
-                {"label":"_", "x":13.25, "y":0},
-                {"label":"+", "x":14.25, "y":0},
-                {"label":"Backspace", "x":15.25, "y":0, "w":2},
-                {"label":"<i class='kb kb-Multimedia-Volume-Up-1'></i>", "x":17.25, "y":0},
-
-                {"label":"F3", "x":0, "y":1},
-                {"label":"F4", "x":1, "y":1},
-                {"label":"Tab", "x":2.25, "y":1, "w":1.5},
-                {"label":"Q", "x":3.75, "y":1},
-                {"label":"W", "x":4.75, "y":1},
-                {"label":"E", "x":5.75, "y":1},
-                {"label":"R", "x":6.75, "y":1},
-                {"label":"T", "x":7.75, "y":1},
-                {"label":"Y", "x":8.75, "y":1},
-                {"label":"U", "x":9.75, "y":1},
-                {"label":"I", "x":10.75, "y":1},
-                {"label":"O", "x":11.75, "y":1},
-                {"label":"P", "x":12.75, "y":1},
-                {"label":"{", "x":13.75, "y":1},
-                {"label":"}", "x":14.75, "y":1},
-                {"label":"<i class='kb kb-Multimedia-Volume-Down-1'></i>", "x":17.25, "y":1},
-
-                {"label":"F5", "x":0, "y":2},
-                {"label":"F6", "x":1, "y":2},
-                {"label":"Caps Lock", "x":2.25, "y":2, "w":1.25},
-                {"label":"A", "x":4, "y":2},
-                {"label":"S", "x":5, "y":2},
-                {"label":"D", "x":6, "y":2},
-                {"label":"F", "x":7, "y":2},
-                {"label":"G", "x":8, "y":2},
-                {"label":"H", "x":9, "y":2},
-                {"label":"J", "x":10, "y":2},
-                {"label":"K", "x":11, "y":2},
-                {"label":"L", "x":12, "y":2},
-                {"label":":", "x":13, "y":2},
-                {"label":"\"", "x":14, "y":2},
-                {"label":"~", "x":15, "y":2},
-                {"label":"Enter", "x":16, "y":1, "w":1.25, "h":2},
-                {"label":"<i class='kb kb-Multimedia-Mute-1'></i>", "x":17.25, "y":2},
-
-                {"label":"F7", "x":0, "y":3},
-                {"label":"F8", "x":1, "y":3},
-                {"label":"Shift", "x":2.25, "y":3, "w":1.25},
-                {"label":"|", "x":3.5, "y":3},
-                {"label":"Z", "x":4.5, "y":3},
-                {"label":"X", "x":5.5, "y":3},
-                {"label":"C", "x":6.5, "y":3},
-                {"label":"V", "x":7.5, "y":3},
-                {"label":"B", "x":8.5, "y":3},
-                {"label":"N", "x":9.5, "y":3},
-                {"label":"M", "x":10.5, "y":3},
-                {"label":"<", "x":11.5, "y":3},
-                {"label":">", "x":12.5, "y":3},
-                {"label":"?", "x":13.5, "y":3},
-                {"label":"Shift", "x":14.5, "y":3, "w":1.75},
-                {"label":"<i class='kb kb-Arrows-Up'></i>", "x":16.25, "y":3},
-                {"label":"<i class='kb kb-Multimedia-Play-Pause'></i>", "x":17.25, "y":3},
-
-                {"label":"F9/11", "x":0, "y":4},
-                {"label":"F10/12", "x":1, "y":4},
-                {"label":"Ctrl", "x":2.25, "y":4, "w":1.25},
-                {"label":"Win", "x":3.5, "y":4, "w":1.25},
-                {"label":"Alt", "x":4.75, "y":4, "w":1.25},
-                {"label":"6.25", "x":6, "y":4, "w":6.25},
-                {"label":"Fn", "x":12.25, "y":4},
-                {"label":"<i class='kb kb-Arrows-Left'></i>", "x":15.25, "y":4},
-                {"label":"<i class='kb kb-Arrows-Down'></i>", "x":16.25, "y":4},
-                {"label":"<i class='kb kb-Arrows-Right'></i>", "x":17.25, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0},
+                {"matrix": [0, 16], "x": 15.25, "y": 0, "w": 2},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 17], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.25},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [2, 16], "x": 16, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 17], "x": 17.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3},
+                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 16], "x": 16.25, "y": 3},
+                {"matrix": [3, 17], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 6, "y": 4, "w": 6.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4},
+
+                {"matrix": [4, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 16], "x": 16.25, "y": 4},
+                {"matrix": [4, 17], "x": 17.25, "y": 4}
             ]
         },
         "LAYOUT_1065_iso_split_bs": {
             "layout": [
-                {"label":"F1", "x":0, "y":0},
-                {"label":"F2", "x":1, "y":0},
-                {"label":"~", "x":2.25, "y":0},
-                {"label":"!", "x":3.25, "y":0},
-                {"label":"@", "x":4.25, "y":0},
-                {"label":"#", "x":5.25, "y":0},
-                {"label":"$", "x":6.25, "y":0},
-                {"label":"%", "x":7.25, "y":0},
-                {"label":"^", "x":8.25, "y":0},
-                {"label":"&", "x":9.25, "y":0},
-                {"label":"*", "x":10.25, "y":0},
-                {"label":"(", "x":11.25, "y":0},
-                {"label":")", "x":12.25, "y":0},
-                {"label":"_", "x":13.25, "y":0},
-                {"label":"+", "x":14.25, "y":0},
-                {"label":"Backspace", "x":15.25, "y":0},
-                {"label":"Backspace", "x":16.25, "y":0},
-                {"label":"<i class='kb kb-Multimedia-Volume-Up-1'></i>", "x":17.25, "y":0},
-
-                {"label":"F3", "x":0, "y":1},
-                {"label":"F4", "x":1, "y":1},
-                {"label":"Tab", "x":2.25, "y":1, "w":1.5},
-                {"label":"Q", "x":3.75, "y":1},
-                {"label":"W", "x":4.75, "y":1},
-                {"label":"E", "x":5.75, "y":1},
-                {"label":"R", "x":6.75, "y":1},
-                {"label":"T", "x":7.75, "y":1},
-                {"label":"Y", "x":8.75, "y":1},
-                {"label":"U", "x":9.75, "y":1},
-                {"label":"I", "x":10.75, "y":1},
-                {"label":"O", "x":11.75, "y":1},
-                {"label":"P", "x":12.75, "y":1},
-                {"label":"{", "x":13.75, "y":1},
-                {"label":"}", "x":14.75, "y":1},
-                {"label":"<i class='kb kb-Multimedia-Volume-Down-1'></i>", "x":17.25, "y":1},
-
-                {"label":"F5", "x":0, "y":2},
-                {"label":"F6", "x":1, "y":2},
-                {"label":"Caps Lock", "x":2.25, "y":2, "w":1.25},
-                {"label":"A", "x":4, "y":2},
-                {"label":"S", "x":5, "y":2},
-                {"label":"D", "x":6, "y":2},
-                {"label":"F", "x":7, "y":2},
-                {"label":"G", "x":8, "y":2},
-                {"label":"H", "x":9, "y":2},
-                {"label":"J", "x":10, "y":2},
-                {"label":"K", "x":11, "y":2},
-                {"label":"L", "x":12, "y":2},
-                {"label":":", "x":13, "y":2},
-                {"label":"\"", "x":14, "y":2},
-                {"label":"~", "x":15, "y":2},
-                {"label":"Enter", "x":16, "y":1, "w":1.25, "h":2},
-                {"label":"<i class='kb kb-Multimedia-Mute-1'></i>", "x":17.25, "y":2},
-
-                {"label":"F7", "x":0, "y":3},
-                {"label":"F8", "x":1, "y":3},
-                {"label":"Shift", "x":2.25, "y":3, "w":1.25},
-                {"label":"|", "x":3.5, "y":3},
-                {"label":"Z", "x":4.5, "y":3},
-                {"label":"X", "x":5.5, "y":3},
-                {"label":"C", "x":6.5, "y":3},
-                {"label":"V", "x":7.5, "y":3},
-                {"label":"B", "x":8.5, "y":3},
-                {"label":"N", "x":9.5, "y":3},
-                {"label":"M", "x":10.5, "y":3},
-                {"label":"<", "x":11.5, "y":3},
-                {"label":">", "x":12.5, "y":3},
-                {"label":"?", "x":13.5, "y":3},
-                {"label":"Shift", "x":14.5, "y":3, "w":1.75},
-                {"label":"<i class='kb kb-Arrows-Up'></i>", "x":16.25, "y":3},
-                {"label":"<i class='kb kb-Multimedia-Play-Pause'></i>", "x":17.25, "y":3},
-
-                {"label":"F9/11", "x":0, "y":4},
-                {"label":"F10/12", "x":1, "y":4},
-                {"label":"Ctrl", "x":2.25, "y":4, "w":1.25},
-                {"label":"Win", "x":3.5, "y":4, "w":1.25},
-                {"label":"Alt", "x":4.75, "y":4, "w":1.25},
-                {"label":"6.25", "x":6, "y":4, "w":6.25},
-                {"label":"Fn", "x":12.25, "y":4},
-                {"label":"<i class='kb kb-Arrows-Left'></i>", "x":15.25, "y":4},
-                {"label":"<i class='kb kb-Arrows-Down'></i>", "x":16.25, "y":4},
-                {"label":"<i class='kb kb-Arrows-Right'></i>", "x":17.25, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "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": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 17], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.25},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [2, 16], "x": 16, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 17], "x": 17.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3},
+                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 16], "x": 16.25, "y": 3},
+                {"matrix": [3, 17], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 6, "y": 4, "w": 6.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4},
+
+                {"matrix": [4, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 16], "x": 16.25, "y": 4},
+                {"matrix": [4, 17], "x": 17.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/charue/sunsetter/sunsetter.h b/keyboards/charue/sunsetter/sunsetter.h
deleted file mode 100644
index 51dd26f4ec..0000000000
--- a/keyboards/charue/sunsetter/sunsetter.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-Copyright 2020 Michael Pio "Coarse" Mayol  <mfmayol@up.edu.ph>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-/* LAYOUT_all
- *                                                                           ┌───────┐
- *                                                                           │016    │2u Backspace
- *                                                                           └───────┘
- *              ┌───┬───┐┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- *              │000│001││002│003│004│005│006│007│008│009│010│011│012│013│014│015│016│017│
- *              ├───┼───┤├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤      ┌─────┐
- *              │100│101││102  │103│104│105│106│107│108│109│110│111│112│113│114│116  │117│      │     │ISO
- *  2.25u       ├───┼───┤├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐216 │Enter
- *  LShift      │200│201││202   │203│204│205│206│207│208│209│210│211│212│213│215     │217│   │214│    │
- * ┌────────┐   ├───┼───┤├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
- * │302     │   │300│301││302 │303│304│305│306│307│308│309│310│311│312│313│314   │316│317│
- * └────────┘   ├───┼───┤├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
- *              │400│401││402 │403 │404 │406     │408 │410       │412│413│414│415│416│417│
- *              └───┴───┘└────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┴───┘
- *                                      ┌────────────────────────┐   └───┬───┘
- *                                      │          408           │      (a)
- *                                      └────────────────────────┘
- *
- * (a) Positions 413 and 414 are present on the PCB, but inaccessible when using the standard Sunsetter top case.
- */
-
-#define LAYOUT_all( \
-    K000, K001,   K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, \
-    K100, K101,   K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K116,       K117, \
-    K200, K201,   K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217, \
-    K300, K301,   K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314,       K316, K317, \
-    K400, K401,   K402, K403, K404,             K406, K408, K410,             K412, K413, K414, K415, K416, K417  \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, ____, K116, K117 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, ____, K316, K317 }, \
-    { K400, K401, K402, K403, K404, ____, K406, ____, K408, ____, K410, ____, K412, K413, K414, K415, K416, K417 } \
-}
-
-#define LAYOUT_1065_ansi( \
-    K000, K001,   K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K016, K017, \
-    K100, K101,   K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K116, K117, \
-    K200, K201,   K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       K215, K217, \
-    K300, K301,   K302,       K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K316, K317, \
-    K400, K401,   K402, K403, K404,                   K408,                   K412,       K415, K416, K417 \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, ____, K016, K017 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, ____, K116, K117 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, ____, K215, ____, K217 }, \
-    { K300, K301, K302, ____, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, ____, K316, K317 }, \
-    { K400, K401, K402, K403, K404, ____, ____, ____, K408, ____, ____, ____, K412, ____, ____, K415, K416, K417 } \
-}
-
-#define LAYOUT_1065_ansi_split_bs( \
-    K000, K001,   K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, \
-    K100, K101,   K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K116, K117, \
-    K200, K201,   K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       K215, K217, \
-    K300, K301,   K302,       K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K316, K317, \
-    K400, K401,   K402, K403, K404,                   K408,                   K412,       K415, K416, K417 \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, ____, K116, K117 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, ____, K215, ____, K217 }, \
-    { K300, K301, K302, ____, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, ____, K316, K317 }, \
-    { K400, K401, K402, K403, K404, ____, ____, ____, K408, ____, ____, ____, K412, ____, ____, K415, K416, K417 } \
-}
-
-#define LAYOUT_1065_iso( \
-    K000, K001,   K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K016, K017, \
-    K100, K101,   K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114,       K117, \
-    K200, K201,   K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K216, K217, \
-    K300, K301,   K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K316, K317, \
-    K400, K401,   K402, K403, K404,                   K408,                   K412,       K415, K416, K417 \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, ____, K016, K017 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, ____, ____, K117 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, ____, K216, K217 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, ____, K316, K317 }, \
-    { K400, K401, K402, K403, K404, ____, ____, ____, K408, ____, ____, ____, K412, ____, ____, K415, K416, K417 } \
-}
-
-#define LAYOUT_1065_iso_split_bs( \
-    K000, K001,   K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, \
-    K100, K101,   K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114,       K117, \
-    K200, K201,   K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K216, K217, \
-    K300, K301,   K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K316, K317, \
-    K400, K401,   K402, K403, K404,                   K408,                   K412,       K415, K416, K417 \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, ____, ____, K117 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, ____, K216, K217 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, ____, K316, K317 }, \
-    { K400, K401, K402, K403, K404, ____, ____, ____, K408, ____, ____, ____, K412, ____, ____, K415, K416, K417 } \
-}